summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Next/SHA1s247
-rw-r--r--Next/Trees249
-rw-r--r--Next/merge.log5166
-rw-r--r--Next/quilt-import.log4
-rw-r--r--localversion-next1
5 files changed, 5667 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 000000000000..211afbaa787e
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,247 @@
+Name SHA1
+---- ----
+origin 9fe68cad6e74967b88d0c6aeca7d9cd6b6e91942
+fixes 30066ce675d3af350bc5a53858991c0b518dda00
+kbuild-current 989cea5c14be024e879c0055dc6d033680a52610
+arc-current 9868c77a82f7fc1ec447e26fe485e7270e851c1c
+arm-current 6127d124ee4eb9c39983813cc9803f3654ab7e16
+m68k-current 6736e65effc3a5a866cf8a03cda9ad277b712d3f
+metag-fixes 35d04077ad96ed33ceea2501f5a4f1eacda77218
+powerpc-fixes 09b7e37b18eecc1e347f4b1a3bc863f32801f634
+sparc ee9e83973d54d94ff776892219b723de54429548
+net 44060abe1dd609d5efa641cce3784777ff5d507f
+ipsec 7f92083eb58f85ea114d97f65fcbe22be5b0468d
+netfilter 7034b566a4e7d550621c2dfafd380b77b3787cd9
+ipvs ea43f860d984b00c3e3fa02049412ce94ce9ed5e
+wireless-drivers 1ea2643961b0d1b8d0e4a11af5aa69b0f92d0533
+mac80211 b4f0fd4baa90ecce798e0d26d1cce8f4457f2028
+sound-current 9b50898ad96c793a8f7cde9d8f281596d752a7dd
+pci-current 02a1b8f4167eac709d269341f7c3c340984c28a6
+driver-core.current 07d9a380680d1c0eb51ef87ff2eab5c994949e69
+tty.current 1001354ca34179f3db924eb66672442a173147dc
+usb.current b76032396d7958f006bccf5fb2535beb5526837c
+usb-gadget-fixes a1aa8cf6471b17c0fa7132ea5eeef0ae07ca07cd
+usb-serial-fixes 07d9a380680d1c0eb51ef87ff2eab5c994949e69
+usb-chipidea-fixes 6b7f456e67a1723354f3ccbd10e4e47a56bc7b06
+phy 1001354ca34179f3db924eb66672442a173147dc
+staging.current e866dd8aab76b6a0ee8428491e65fa5c83a6ae5a
+char-misc.current 407a3aee6ee2d2cb46d9ba3fc380bc29f35d020c
+input-current 324ae0958cab5ccdf2851ef0348ba1cb8ad4e34a
+crypto-current 6d4952d9d9d4dc2bb9c0255d95a09405a1e958f7
+ide 797cee982eef9195736afc5e7f3b8f613c41d19a
+rr-fixes 8244062ef1e54502ef55f54cced659913f244c3e
+vfio-fixes c8952a707556e04374d7b2fdb3a079d63ddf6f2f
+kselftest-fixes 29b4817d4018df78086157ea3a55c1d9424a7cfc
+backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f
+ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600
+mfd-fixes 5baaf3b9efe127d239038de9219d381f4d882b26
+drm-intel-fixes 07d9a380680d1c0eb51ef87ff2eab5c994949e69
+kbuild fbcbee25745d38610f327260589875e53944d837
+asm-generic de4be6b87b6b8816b61c9ba798d21ae8075d955c
+arc 1001354ca34179f3db924eb66672442a173147dc
+arm 509d3b3effe2716234a6339084dd72935145e3ce
+arm-perf 694d0d0bb2030d2e36df73e2d23d5770511dbc8d
+arm-soc 83cb44244ff6b8ee5e998345c4d5bd15895583d1
+pinctrl 969cc0f87517abcef2d94594624003a72fcf97af
+amlogic 5a0803bd5ae289fbacd4d207e8c5e6719224ef92
+at91 0f59c948faed3715331c2648b46d6d0033d86f5c
+bcm2835 1443dff71db6b021d8528f18ab02109f5d5159be
+berlin 5153351425c92f3e89358c8eb62ca8d901437581
+cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4
+imx-mxs 4020cd6682d6b5ec756519ca39b24bc11a1c4cdc
+keystone fb2a68db621a3710307363809b3d5929beed372f
+mvebu 81f448072d1d612d0854c6744c9e00ca8736ade5
+omap 624018387bcfd66cfbdcfb2ada45e5f50710f89d
+omap-pending c20c8f750d9f8f8617f07ee2352d3ff560e66bc2
+qcom c49806e0fa1eb57f934b2c1c2e8316eae577a63e
+renesas 9522d6ff696e2a922c5e0358d72a4c149f17288a
+rockchip 8a3339648bb5aef95650878fa943cd5d5ae39a93
+rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590
+samsung 1a695a905c18548062509178b98bc91e67510864
+samsung-krzk 19350594a556b708fe18fc373f85021e6443a37a
+tegra 74e8115883f585eb6607e4dec9241f7b2cdab018
+arm64 db68f3e7594aca77632d56c449bd36c6c931d59a
+blackfin 391e74a51ea2ce54f4d4a213a207a6bfb73e0b33
+c6x ca3060d39ae7a0964f8c123a4833029981e86476
+cris 2dc024e94578c53e2c579a48725c8fe2527f9d5e
+h8300 58c57526711f7c87046b7c5a650535acbab2d3fb
+hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a
+ia64 fbb0e4da96f4503e65bc4fb627cf4e1d7c8c64e6
+m68k 6736e65effc3a5a866cf8a03cda9ad277b712d3f
+m68knommu baa6ae0f015b14f6c19e1e076b17b288e2d3cebc
+metag f5d163aad31e4ec30f7258e655503824a2b03d45
+microblaze 52e9e6e05617264e6e609a8699098380d6b7a6aa
+mips 1001354ca34179f3db924eb66672442a173147dc
+nios2 476080a79367b950cb860ccf8a3a53fd24f6cccc
+parisc-hd c8d2bc9bc39ebea8437fd974fdbc21847bb897a3
+powerpc 08bf75ba852ef8304a84b6a030466b4b4850382e
+fsl e0b80f00bb96b925995d53980e0c764430bedb42
+mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0
+s390 86651b6aa355ca232b4db98f43c0d190cec0a3b1
+sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc
+sh e61c10e468a42512f5fad74c00b62af5cc19f65f
+tile bf55d575234bcb6eb20d4eb8b21270a1e36eec85
+uml dad2232844073295c64e9cc2d734a0ade043e0f6
+unicore32 1ace5d1e3d4b4368acbc08a55b3ca9a6c0a2aee3
+xtensa a4c6be5ad1d0c7af0c5421b68a00b6406b28a325
+befs 3c8a965ad630341ac1508eeaa818d08c3f59a697
+btrfs 8b8b08cbfb9021af4b54b4175fc4c51d655aac8c
+btrfs-kdave 54626da802174e3009e6bf20eb0917e59db43e69
+ceph 5130ccea7cf4646a24c005be1309b7f86f1e91c9
+cifs faad81c4f5815b4e0f9ec9a91c503f07721b1689
+configfs 42857cf512cb34c2c8cb50f1e766689d979d64e0
+ecryptfs be280b25c3288824ed4c201b452c3e87a7074d7c
+ext3 e952813e210b3addaea063da64ef68c3f30c0aa2
+ext4 d74f3d25289aa9722cf777a7482eeee2eacdf46e
+f2fs f050cd02875515d62d1f2b4959d315979b3e274b
+freevxfs bf1bb4b460c8dc3a33793bff21464a9d816697ad
+fscache d52bd54db8be8999df6df5a776f38c4f8b5e9cea
+fuse 0ce267ff95a0302cf6fb2a552833abbfb7861a43
+gfs2 a3443cda5588985a2724d6d0f4a5f04e625be6eb
+jfs 240c5185c52d00725ae7da7d1ee82ad8b8306d52
+nfs 14155cafeadda946376260e2ad5d39a0528a332f
+nfsd 3fdbf6464db29d1544a60f0176df910f91ed2fbf
+orangefs 804b1737d71253f01621d2a37a0dce6279a2d440
+overlayfs 204f6afd0743c103b92df28e4efb0ee74489b122
+v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc
+ubifs c83ed4c9dbb358b9e7707486e167e940d48bfeed
+xfs b77428b12b55437b28deae738d9ce8b2e0663b55
+file-locks 07d9a380680d1c0eb51ef87ff2eab5c994949e69
+vfs b26b5ef5ec7eab0e1d84c5b281e87b2f2a5e0586
+vfs-jk 030b533c4fd4d2ec3402363323de4bb2983c9cee
+vfs-miklos c8d2bc9bc39ebea8437fd974fdbc21847bb897a3
+pci 1001354ca34179f3db924eb66672442a173147dc
+pstore f88baf68ebe5b2efced64725fd98548af9b8f510
+hid d7ff87349d2005a15e0e44b5ae727a333e529896
+i2c 533169d164c6b4c8571d0d48779f6ff6be593d72
+jdelvare-hwmon 08d27eb2066622cd659b91d877d0406ebd651225
+dmi c8d2bc9bc39ebea8437fd974fdbc21847bb897a3
+hwmon-staging c2d95c252f6596549841e5d0cb3dab8efaea4c5b
+jc_docs 75a163c4a3ee8235072f0e1bd4875dd2443cdb8e
+v4l-dvb 778de01402328ca88cda84491d819bfc949935ff
+pm bcafe7d76f52a631a57dd7d6b8f58fff36c9c71e
+idle f55532a0c0b8bb6148f4e07853b876ef73bc69ca
+thermal 3105f234e0aba43e44e277c20f9b32ee8add43d4
+thermal-soc c6935931c1894ff857616ff8549b61236a19148f
+ieee1394 6449e31ddebdce68508cfaf0915d31aad3835f4f
+dlm aa9f1012858bc7f44368f1e4453c989d873b0860
+swiotlb 386744425e35e04984c6e741c7750fd6eef1a9df
+net-next 432490f9d455fb842d70219f22d9d2c812371676
+ipsec-next 2258d927a691ddd2ab585adb17ea9f96e89d0638
+netfilter-next 1b830996c1603225a96e233c3b09bf2b12607d78
+ipvs-next ae9442f688c3e6efe1f39cc9e0b906f0a7cd0421
+wireless-drivers-next 15b95a15950238eff4d7f24be1716086eea67835
+bluetooth 604907eeed85ca3e0e6eb5a6cbb0a9246b7217cc
+mac80211-next 7a50e995ad32f6c9200629aa837e6ce373a37178
+rdma 2937f375751922ffce9ef1d5fa84491840b0c8e0
+rdma-leon 1001354ca34179f3db924eb66672442a173147dc
+rdma-leon-test 358a01eead9fd7b11c093a1effdb3febe00c6388
+mtd 1001354ca34179f3db924eb66672442a173147dc
+l2-mtd 69db4aa44fdd8befc2eccd1313d841c5128c385c
+nand 668592492409498afc277da41e84799e1d2255c2
+crypto d7db7a882debaffc78f91aabedee973aa1f73390
+drm 5481e27f6fd06b7cb902072e81d6b083db8155eb
+drm-panel c96f566273bf086fe18a294ac37edf2d451ff024
+drm-intel ed4596ea992db45a27bfc3a0e401fb95ef2d5f23
+drm-tegra 08ee01789eebf433c27e8b3eecc3ddbb5f7c4d51
+drm-misc 97ac0e47aed5f635893b0e2df634c64b38ca7541
+drm-exynos 7d1e042314619115153a0f6f06e4552c09a50e13
+drm-msm 7a3bcc0a8e2ad5fa7fe6d627e01c66b3488149b7
+hdlcd 523d939ef98fd712632d93a5a2b588e477a7565e
+mali-dp 156f3a886cf05a99f6c07daa01834305c95470af
+sunxi 3896002338d5c698b7a8a0e765d43550225d0557
+kspp 09dd109d8241cd570391d4488337b77a4525f24e
+kconfig 5bcba792bb304e8341217d759ec486969a3b4258
+regmap 1001354ca34179f3db924eb66672442a173147dc
+sound 9b50898ad96c793a8f7cde9d8f281596d752a7dd
+sound-asoc b0cd1cc471817de911fe9ba4341af59d041b21d1
+modules a467a672cf097ec11332a9b22db6e31d3ef50359
+input 77b425399f6d5f1b04c58738bc10ca6decb10c9a
+block 5613beb8642fb903901e8758c7595397475b9976
+lightnvm 07d9a380680d1c0eb51ef87ff2eab5c994949e69
+device-mapper 5c5eb3db28930d31adf3bb80e81b4a8f4dd492b5
+pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8
+mmc e6bc54e2d9d168daf3d6e99fed05099732190472
+kgdb 7a6653fca50077f342bcdc39222d78928e3f0feb
+md e980cc74735ac2c08c7e108092a2e7d9d392e704
+mfd b8d336ed90f541097a2ce583be430bb3e895dfbd
+backlight 0c9501f823a40a061f755d3789c4705c9fe85f14
+battery 44fccac4ff17371054f795f89e23f0b60bb516c1
+omap_dss2 c456a2f30de53e77a2eb8eeb4202d742516aa76b
+regulator 1fcfba65309494db487e68c360f02cc4ac8e2a81
+security 07d9a380680d1c0eb51ef87ff2eab5c994949e69
+integrity 56078b570983d6365cbe0ba7eed2cf4c00bffa0a
+keys ed51e44e914c634bfd8435037474ebb0b47db956
+selinux 1306d8e1c09fdc8ecb9ef235e2116352f810f9c5
+tpmdd 213ebc81ac3fa7269be43a145b6908248e621bc7
+watchdog 39487f6688a557ebfc69816d7e02f210bf8fb2a3
+iommu 13a08259187c5cd3f63d98efa159ab42976d85a4
+dwmw2-iommu 2566278551d3db875bc3bbfc41b42f2e80392108
+vfio 61771468e0a567f007fc450725063bb9cf7eb199
+trivial 380cc42d5a6c98f3ac7ec196b32d79168293501f
+audit 7ff89ac608d9e856cae6fa651553fa0709bf9c50
+devicetree 87e5fc99b0280b492724cc7f2d8d9ad37b980087
+mailbox a649244de727b87d38fe46d86ef98c8d1fc49551
+spi 21a27175ab0090432e30525e227ed90aeb4dfd8a
+tip 842cd3e03ace524d5d6ba3daf7b71d751ab3c365
+clockevents 1d661bf5327a2c059ec967f850e89362e637f4e6
+edac 12f0721c5a70408e86257c5c99605cf743cd44c6
+edac-amd 90e493d7d51c791a2adc2de962cbd5000f1b7460
+irqchip 0ccb54a7dba0d73101e52b1631d1071119875205
+ftrace f971cc9aabc287120bbe7f3f1abe70c13e61ee94
+rcu 367b548872c81d86432e81efc8fafadcf14aa1a4
+kvm 07d9a380680d1c0eb51ef87ff2eab5c994949e69
+kvm-arm 0099b7701f5296a758d9e6b945ec96f96847cc2f
+kvm-mips 07d9a380680d1c0eb51ef87ff2eab5c994949e69
+kvm-ppc c63517c2e3810071359af926f621c1f784388c3f
+kvm-ppc-paulus fa73c3b25bd8d0d393dc6109a1dba3c2aef0451e
+kvms390 b0eb91ae630a4f2771790e306bb4df323127a397
+xen-tip a6a198bc60e6c980a56eca24d33dc7f29139f8ea
+percpu 3ca45a46f8af8c4a92dd8a08eac57787242d5021
+workqueues 8bc4a04455969c36bf54a942ad9d28d80969ed51
+drivers-x86 304887041d953b6692c0d4a9f8fafb252d32e9a0
+chrome-platform 31b764171cb545cc1f750c573eef713329936660
+hsi 7ac5d7b1a1254ceb4be19ba93ef7a6ee4e7ac382
+leds 08d825d8b698d3bef8da153ffebf902b07e6c2ab
+ipmi bd85f4b37ddf2da22ccf5b29d264b2459b6722df
+driver-core 07d9a380680d1c0eb51ef87ff2eab5c994949e69
+tty 1001354ca34179f3db924eb66672442a173147dc
+usb 6110c425d98b7ed036bba3670e635a9363dd072e
+usb-gadget 1001354ca34179f3db924eb66672442a173147dc
+usb-serial a98b69002a1656f1d50e24d6c189a66a5f55f783
+usb-chipidea-next c6900310b6cc7d5a97e550849419c200c8786562
+phy-next 7809cd2ce6abd4f431e4b14e6b1276a7cc842ac4
+staging 54dc7ed37d390f75e31a323defe30424835490c7
+char-misc 07d9a380680d1c0eb51ef87ff2eab5c994949e69
+extcon 67fafcf82c3ed0ac1350dee1bf05b0220f88e8bd
+slave-dma 3277a5ccb332cafa0a7483a2bca18c28b3f3f756
+cgroup 4221d2ce6e57dbcb58015ec3495d9cd675e05d3c
+scsi 85d3116d8d507196a813dd78dade5dbffef9137a
+target-updates 291e3e51a34d2f546608bfd31f185151621135b7
+target-merge 2994a75183173defc21f0d26ce23b63232211b88
+libata 19f14deb00b304ce71bbcbbb6021fd10232a7d5a
+binfmt_misc 4af75df6a410ce76d9f60f27b07e5645ecc2c5ed
+vhost 789ffaecf80b4aca4c5bcc983dc406e075daf979
+remoteproc 7a6271a80cae8f464d38b326fce0266f0448d77e
+rpmsg 20b1f39a51dc54a4d151b73f82a8fe16958dcafc
+gpio af223dd86d988666038e4d2cc431f1a45dea75a3
+dma-mapping 1001354ca34179f3db924eb66672442a173147dc
+pwm dc8e6e1e8f2d2719dd396708b0f56d8b73c9ea52
+dma-buf 194cad44c4e1553fd8fcfbc940d27e756324ec3a
+userns ce99dd5fd5f600f9f4f0d37bb8847c1cb7c6e4fc
+ktest 2dcd0af568b0cf583645c8a317dd12e344b1c72a
+clk 7ae74aaf3850c20e4873a4ddf45243637dd01437
+random 59b8d4f1f5d26e4ca92172ff6dcd1492cdb39613
+aio b562e44f507e863c6792946e4e1b1449fbbac85d
+kselftest fecf861e765b2f9ce1a0487c3940afaed80ef7a8
+y2038 549eb7b22e245064dcdc17380538718492f4ca9c
+luto-misc 2dcd0af568b0cf583645c8a317dd12e344b1c72a
+borntraeger dcc37f9044436438360402714b7544a8e8779b07
+livepatching 2992ef29ae01af998399d55ed7c692a2505fb8af
+coresight e87d6305b8580200d01a42852f1e2892090d667f
+rtc 290cd0f07f0c55f4071aee47b5d4cc3c83da588c
+hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828
+nvdimm e476f94482fc20a23b7b33b3d8e50f1953f71828
+dax-misc 4d9a2c8746671efbb0c27d3ae28c7474597a7aad
+akpm-current 000cf9328226c4de9bc6d87a3c0ccd70e33c46cb
+akpm a518fb4d8bae38f80368377e4f98271a839d8057
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 000000000000..3c5115bd1b4b
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,249 @@
+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
+phy git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git#fixes
+staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus
+char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus
+input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus
+crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master
+ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master
+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
+kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#for-next
+asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master
+arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next
+arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next
+arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf
+arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next
+pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.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/jcmvbkbc/linux-xtensa.git#xtensa-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 git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next
+vfs-jk git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#vfs
+vfs-miklos git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#next
+pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next
+pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore
+hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next
+i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next
+jdelvare-hwmon quilt http://jdelvare.nerim.net/devel/linux/jdelvare-hwmon/
+dmi quilt http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/
+hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next
+jc_docs git git://git.lwn.net/linux.git#docs-next
+v4l-dvb git git://linuxtv.org/mchehab/media-next.git#master
+pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next
+idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next
+thermal git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next
+thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#next
+ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next
+dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next
+swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next
+net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master
+ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master
+netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master
+ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master
+wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master
+bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master
+mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master
+rdma git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git#for-next
+rdma-leon git git://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma.git#rdma-next
+rdma-leon-test git git://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma.git#testing/rdma-next
+mtd git git://git.infradead.org/mtd-2.6.git#master
+l2-mtd git git://git.infradead.org/l2-mtd.git#master
+nand git git://github.com/linux-nand/linux.git#nand/next
+crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master
+drm git git://people.freedesktop.org/~airlied/linux.git#drm-next
+drm-panel git git://anongit.freedesktop.org/tegra/linux.git#drm/panel/for-next
+drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next
+drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next
+drm-misc git git://anongit.freedesktop.org/drm-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
+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 git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next
+kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next
+md git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git#for-next
+mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next
+backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next
+battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next
+omap_dss2 git git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git#for-next
+regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next
+security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next
+integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next
+keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next
+selinux git git://git.infradead.org/users/pcmoore/selinux#next
+tpmdd git git://git.infradead.org/users/jjs/linux-tpmdd.git#next
+watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master
+iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next
+dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master
+vfio git git://github.com/awilliam/linux-vfio.git#next
+trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next
+audit git git://git.infradead.org/users/pcmoore/audit#next
+devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next
+mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next
+spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next
+tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest
+clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#clockevents/next
+edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_next
+edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next
+irqchip git git://git.infradead.org/users/jcooper/linux.git#irqchip/for-next
+ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next
+rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next
+kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next
+kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next
+kvm-mips git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/kvm-mips.git#next
+kvm-ppc git git://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
+phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git#next
+staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next
+char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next
+extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next
+slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next
+cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next
+scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next
+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
+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..2c0aaca331aa
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,5166 @@
+$ date -R
+Wed, 26 Oct 2016 09:24:53 +1100
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at 07d9a380680d Linux 4.9-rc2
+Merging origin/master (9fe68cad6e74 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
+$ git merge origin/master
+Updating 07d9a380680d..9fe68cad6e74
+Fast-forward
+ .../devicetree/bindings/clock/uniphier-clock.txt | 16 ++++----
+ Documentation/gpio/board.txt | 11 ++++--
+ arch/x86/xen/enlighten.c | 2 +
+ drivers/char/hw_random/core.c | 6 +--
+ drivers/clk/at91/clk-programmable.c | 2 +-
+ drivers/clk/bcm/clk-bcm2835.c | 11 ++----
+ drivers/clk/clk-max77686.c | 1 +
+ drivers/clk/hisilicon/clk-hi6220.c | 4 +-
+ drivers/clk/mediatek/Kconfig | 2 +
+ drivers/clk/mvebu/armada-37xx-periph.c | 11 +++---
+ drivers/clk/samsung/clk-exynos-audss.c | 1 +
+ drivers/clk/uniphier/clk-uniphier-core.c | 20 ++++++----
+ drivers/clk/uniphier/clk-uniphier-mio.c | 2 +-
+ drivers/clk/uniphier/clk-uniphier-mux.c | 2 +-
+ drivers/clk/uniphier/clk-uniphier.h | 2 +-
+ drivers/gpio/Kconfig | 2 +-
+ drivers/gpio/gpio-ath79.c | 1 +
+ drivers/gpio/gpio-mpc8xxx.c | 2 +-
+ drivers/gpio/gpio-mxs.c | 8 +++-
+ drivers/gpio/gpio-stmpe.c | 2 +-
+ drivers/gpio/gpio-ts4800.c | 1 +
+ drivers/gpio/gpiolib-acpi.c | 7 +++-
+ drivers/gpio/gpiolib.c | 42 +++++++++++++++++++-
+ drivers/xen/manage.c | 45 ++++++++++++++--------
+ drivers/xen/xenbus/xenbus_dev_frontend.c | 4 +-
+ drivers/xen/xenbus/xenbus_probe_frontend.c | 4 +-
+ fs/proc/base.c | 18 ++++-----
+ include/linux/clk-provider.h | 2 +-
+ include/linux/mm.h | 4 --
+ mm/gup.c | 3 +-
+ mm/nommu.c | 2 +-
+ virt/kvm/kvm_main.c | 10 ++---
+ 32 files changed, 158 insertions(+), 92 deletions(-)
+Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
+$ git merge fixes/master
+Already up-to-date.
+Merging kbuild-current/rc-fixes (989cea5c14be kbuild: prevent lib-ksyms.o rebuilds)
+$ git merge kbuild-current/rc-fixes
+Merge made by the 'recursive' strategy.
+ scripts/Makefile.build | 3 +++
+ 1 file changed, 3 insertions(+)
+Merging arc-current/for-curr (9868c77a82f7 ARC: build: retire old toggles)
+$ git merge arc-current/for-curr
+Merge made by the 'recursive' strategy.
+ arch/arc/Kconfig | 19 +++++----
+ arch/arc/Makefile | 3 --
+ arch/arc/boot/Makefile | 16 +++++++-
+ arch/arc/include/asm/arcregs.h | 3 +-
+ arch/arc/include/asm/cache.h | 2 +-
+ arch/arc/include/asm/elf.h | 2 +-
+ arch/arc/include/asm/mcip.h | 16 ++++++++
+ arch/arc/include/asm/setup.h | 1 +
+ arch/arc/include/asm/syscalls.h | 1 +
+ arch/arc/include/uapi/asm/unistd.h | 9 ++--
+ arch/arc/kernel/mcip.c | 31 +++++---------
+ arch/arc/kernel/process.c | 33 +++++++++++++++
+ arch/arc/kernel/setup.c | 84 ++++++++++++++++++++------------------
+ arch/arc/mm/cache.c | 19 ++++-----
+ arch/arc/mm/dma.c | 4 +-
+ 15 files changed, 152 insertions(+), 91 deletions(-)
+Merging arm-current/fixes (6127d124ee4e ARM: wire up new pkey syscalls)
+$ git merge arm-current/fixes
+Merge made by the 'recursive' strategy.
+ arch/arm/include/asm/unistd.h | 2 +-
+ arch/arm/include/uapi/asm/unistd.h | 3 +++
+ arch/arm/kernel/calls.S | 3 +++
+ arch/arm/mm/abort-lv4t.S | 34 ++++++++++++++++++++++++----------
+ 4 files changed, 31 insertions(+), 11 deletions(-)
+Merging m68k-current/for-linus (6736e65effc3 m68k: Migrate exception table users off module.h and onto extable.h)
+$ git merge m68k-current/for-linus
+Already up-to-date.
+Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally)
+$ git merge metag-fixes/fixes
+Already up-to-date.
+Merging powerpc-fixes/fixes (09b7e37b18ee powerpc/64: Fix race condition in setting lock bit in idle/wakeup code)
+$ git merge powerpc-fixes/fixes
+Merge made by the 'recursive' strategy.
+ arch/powerpc/include/asm/cpuidle.h | 2 +-
+ arch/powerpc/kernel/idle_book3s.S | 35 +++++++++++++++++++++++++++++------
+ arch/powerpc/kvm/book3s_hv_rm_xics.c | 1 +
+ drivers/misc/cxl/api.c | 2 ++
+ drivers/misc/cxl/file.c | 22 +++++++++++++---------
+ 5 files changed, 46 insertions(+), 16 deletions(-)
+Merging sparc/master (ee9e83973d54 sparc32: Fix old style declaration GCC warnings)
+$ git merge sparc/master
+Merge made by the 'recursive' strategy.
+ arch/sparc/include/asm/cpudata_64.h | 5 ++--
+ arch/sparc/include/asm/spinlock_32.h | 2 +-
+ arch/sparc/include/asm/spinlock_64.h | 12 +++++-----
+ arch/sparc/include/asm/topology_64.h | 8 ++++++-
+ arch/sparc/kernel/mdesc.c | 46 ++++++++++++++++++++++--------------
+ arch/sparc/kernel/smp_64.c | 8 +++++++
+ 6 files changed, 53 insertions(+), 28 deletions(-)
+Merging net/master (44060abe1dd6 Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth)
+$ git merge net/master
+Resolved 'drivers/net/ethernet/qlogic/Kconfig' using previous resolution.
+Auto-merging net/core/dev.c
+Auto-merging include/net/cfg80211.h
+Auto-merging drivers/net/ethernet/qlogic/Kconfig
+CONFLICT (content): Merge conflict in drivers/net/ethernet/qlogic/Kconfig
+Auto-merging drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master c6bd9b12c214] Merge remote-tracking branch 'net/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/networking/netdev-FAQ.txt | 8 +-
+ Documentation/networking/nf_conntrack-sysctl.txt | 18 --
+ drivers/bluetooth/btwilink.c | 2 +-
+ drivers/bluetooth/hci_bcm.c | 8 +
+ drivers/infiniband/ulp/ipoib/ipoib.h | 20 +-
+ drivers/infiniband/ulp/ipoib/ipoib_cm.c | 15 +-
+ drivers/infiniband/ulp/ipoib/ipoib_ib.c | 12 +-
+ drivers/infiniband/ulp/ipoib/ipoib_main.c | 54 ++++--
+ drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 6 +-
+ drivers/net/dsa/b53/b53_mmap.c | 1 +
+ drivers/net/dsa/bcm_sf2.c | 16 ++
+ drivers/net/ethernet/aurora/nb8800.c | 1 +
+ drivers/net/ethernet/broadcom/bcm63xx_enet.c | 3 +-
+ drivers/net/ethernet/broadcom/bnx2.c | 17 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +-
+ drivers/net/ethernet/chelsio/cxgb4/sched.c | 4 +-
+ drivers/net/ethernet/ezchip/nps_enet.c | 1 +
+ drivers/net/ethernet/freescale/fec_main.c | 6 +-
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 1 +
+ drivers/net/ethernet/hisilicon/hns_mdio.c | 1 +
+ drivers/net/ethernet/ibm/ibmvnic.c | 4 +-
+ drivers/net/ethernet/ibm/ibmvnic.h | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/en_cq.c | 10 +-
+ drivers/net/ethernet/mellanox/mlxsw/pci.c | 10 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 16 +-
+ drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 1 +
+ drivers/net/ethernet/qlogic/Kconfig | 3 +
+ drivers/net/ethernet/qlogic/qed/Makefile | 2 +-
+ drivers/net/ethernet/qlogic/qed/qed_cxt.c | 15 +-
+ drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 2 +
+ drivers/net/ethernet/qlogic/qed/qed_debug.c | 53 ++---
+ drivers/net/ethernet/qlogic/qed/qed_dev.c | 19 +-
+ drivers/net/ethernet/qlogic/qed/qed_ll2.c | 27 ++-
+ drivers/net/ethernet/qlogic/qed/qed_ll2.h | 20 --
+ drivers/net/ethernet/qlogic/qed/qed_main.c | 31 ++-
+ drivers/net/ethernet/qlogic/qed/qed_roce.c | 216 ++++++---------------
+ drivers/net/ethernet/qlogic/qed/qed_roce.h | 95 +++++----
+ drivers/net/ethernet/qlogic/qed/qed_sp.h | 1 -
+ drivers/net/ethernet/qlogic/qed/qed_spq.c | 4 -
+ drivers/net/ethernet/qlogic/qede/Makefile | 2 +-
+ drivers/net/ethernet/qlogic/qede/qede.h | 3 +-
+ drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 99 ++++++----
+ drivers/net/ethernet/qlogic/qede/qede_main.c | 11 +-
+ drivers/net/ethernet/qualcomm/emac/emac-mac.c | 8 +-
+ drivers/net/ethernet/qualcomm/emac/emac.c | 1 +
+ drivers/net/ethernet/realtek/r8169.c | 3 +-
+ drivers/net/ethernet/rocker/rocker_ofdpa.c | 4 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 7 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac.h | 2 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 13 +-
+ drivers/net/ethernet/synopsys/dwc_eth_qos.c | 4 +-
+ drivers/net/geneve.c | 2 +-
+ drivers/net/hyperv/netvsc_drv.c | 2 +-
+ drivers/net/usb/asix_common.c | 8 +-
+ drivers/net/vmxnet3/vmxnet3_drv.c | 17 +-
+ drivers/net/vrf.c | 2 +
+ drivers/net/vxlan.c | 2 +-
+ drivers/net/wan/Kconfig | 2 +-
+ drivers/net/wan/slic_ds26522.c | 8 +
+ drivers/net/wireless/ath/ath10k/core.h | 1 +
+ drivers/net/wireless/ath/ath10k/debug.c | 75 +++----
+ drivers/net/wireless/ath/ath6kl/sdio.c | 1 +
+ drivers/net/wireless/ath/ath9k/ar9003_calib.c | 25 +--
+ drivers/net/wireless/ath/ath9k/hw.h | 1 -
+ .../net/wireless/marvell/mwifiex/11n_rxreorder.c | 2 +-
+ drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 4 +-
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 8 +-
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 4 +
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 11 +-
+ drivers/net/wireless/realtek/rtlwifi/core.c | 2 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/sw.c | 8 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/sw.c | 13 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/sw.c | 12 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/sw.c | 6 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/sw.c | 8 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/sw.c | 9 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/sw.c | 12 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/sw.c | 6 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/sw.c | 18 +-
+ drivers/net/wireless/realtek/rtlwifi/wifi.h | 2 -
+ drivers/net/wireless/ti/wlcore/sdio.c | 1 -
+ fs/afs/cmservice.c | 6 +-
+ fs/afs/fsclient.c | 4 +-
+ fs/afs/internal.h | 2 +-
+ fs/afs/rxrpc.c | 3 +-
+ include/linux/ipv6.h | 17 +-
+ include/linux/netdevice.h | 41 +++-
+ include/linux/qed/qed_if.h | 1 +
+ include/linux/qed/qede_roce.h | 2 +-
+ include/net/addrconf.h | 1 +
+ include/net/cfg80211.h | 32 ++-
+ include/net/if_inet6.h | 2 +-
+ include/net/ip.h | 8 +-
+ include/net/tcp.h | 13 +-
+ include/net/udp.h | 1 +
+ include/uapi/linux/ethtool.h | 3 +-
+ include/uapi/linux/rtnetlink.h | 2 +-
+ lib/test_bpf.c | 2 +-
+ net/8021q/vlan.c | 2 +-
+ net/bluetooth/hci_request.c | 49 +++--
+ net/bluetooth/hci_request.h | 2 +
+ net/bluetooth/mgmt.c | 26 ++-
+ net/bridge/br_multicast.c | 23 ++-
+ net/core/dev.c | 11 +-
+ net/core/flow_dissector.c | 6 +-
+ net/core/net_namespace.c | 35 ++--
+ net/core/pktgen.c | 17 +-
+ net/core/sock_reuseport.c | 1 -
+ net/ethernet/eth.c | 2 +-
+ net/hsr/hsr_forward.c | 4 -
+ net/ipv4/af_inet.c | 2 +-
+ net/ipv4/fou.c | 4 +-
+ net/ipv4/gre_offload.c | 2 +-
+ net/ipv4/inet_hashtables.c | 8 +-
+ net/ipv4/ip_output.c | 3 -
+ net/ipv4/ping.c | 2 +-
+ net/ipv4/raw.c | 2 +-
+ net/ipv4/sysctl_net_ipv4.c | 8 +-
+ net/ipv4/tcp_ipv4.c | 3 -
+ net/ipv4/udp.c | 13 +-
+ net/ipv4/udp_offload.c | 2 +-
+ net/ipv6/addrconf.c | 101 ++++------
+ net/ipv6/inet6_hashtables.c | 7 +-
+ net/ipv6/ip6_offload.c | 2 +-
+ net/ipv6/ip6_tunnel.c | 2 +
+ net/ipv6/ipv6_sockglue.c | 3 +-
+ net/ipv6/mcast.c | 17 +-
+ net/ipv6/ping.c | 2 +-
+ net/ipv6/raw.c | 2 +-
+ net/ipv6/reassembly.c | 3 +-
+ net/l2tp/l2tp_ip.c | 2 +-
+ net/l2tp/l2tp_ip6.c | 2 +-
+ net/mac80211/aes_ccm.c | 46 +++--
+ net/mac80211/aes_ccm.h | 8 +-
+ net/mac80211/aes_gcm.c | 43 ++--
+ net/mac80211/aes_gcm.h | 6 +-
+ net/mac80211/aes_gmac.c | 26 +--
+ net/mac80211/aes_gmac.h | 4 +
+ net/mac80211/offchannel.c | 2 +-
+ net/mac80211/rx.c | 51 ++++-
+ net/mac80211/wpa.c | 22 +--
+ net/ncsi/internal.h | 2 +
+ net/ncsi/ncsi-aen.c | 18 +-
+ net/ncsi/ncsi-manage.c | 126 +++++++++---
+ net/netfilter/core.c | 13 +-
+ net/netfilter/nf_conntrack_core.c | 2 +-
+ net/netfilter/nf_internals.h | 2 +-
+ net/netfilter/nf_queue.c | 48 +++--
+ net/netfilter/nf_tables_api.c | 2 +-
+ net/netfilter/nft_dynset.c | 6 +-
+ net/netfilter/nft_exthdr.c | 3 +-
+ net/netfilter/nft_hash.c | 1 +
+ net/netfilter/nft_range.c | 26 ++-
+ net/netfilter/x_tables.c | 2 +-
+ net/netfilter/xt_NFLOG.c | 1 +
+ net/netfilter/xt_hashlimit.c | 4 +-
+ net/netfilter/xt_ipcomp.c | 2 +
+ net/rxrpc/call_object.c | 2 +-
+ net/rxrpc/peer_object.c | 4 +-
+ net/sched/act_mirred.c | 5 +-
+ net/sctp/socket.c | 5 +-
+ net/switchdev/switchdev.c | 9 +
+ net/wireless/util.c | 34 ++--
+ 165 files changed, 1223 insertions(+), 976 deletions(-)
+$ git am -3 ../patches/0001-qed-merge-fix-for-CONFIG_INFINIBAND_QEDR-Kconfig-mov.patch
+Applying: qed*: merge fix for CONFIG_INFINIBAND_QEDR Kconfig move
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/infiniband/hw/qedr/Kconfig
+$ git add -A .
+$ git commit -v -a --amend
+[master 420966bae7c2] Merge remote-tracking branch 'net/master'
+ Date: Wed Oct 26 09:33:15 2016 +1100
+Merging ipsec/master (7f92083eb58f vti6: flush x-netns xfrm cache when vti interface is removed)
+$ git merge ipsec/master
+Merge made by the 'recursive' strategy.
+ net/ipv6/ip6_vti.c | 31 +++++++++++++++++++++++++++++++
+ 1 file changed, 31 insertions(+)
+Merging netfilter/master (7034b566a4e7 netfilter: fix nf_queue handling)
+$ 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 (1ea2643961b0 ath6kl: add Dell OEM SDIO I/O for the Venue 8 Pro)
+$ git merge wireless-drivers/master
+Already up-to-date.
+Merging mac80211/master (b4f0fd4baa90 qed: Use list_move_tail instead of list_del/list_add_tail)
+$ git merge mac80211/master
+Already up-to-date.
+Merging sound-current/for-linus (9b50898ad96c ALSA: seq: Fix time account regression)
+$ git merge sound-current/for-linus
+Merge made by the 'recursive' strategy.
+ sound/core/seq/seq_timer.c | 4 ++--
+ sound/pci/asihpi/hpioctl.c | 2 +-
+ sound/pci/hda/hda_intel.c | 7 +++++--
+ sound/pci/hda/patch_realtek.c | 30 +++++++++++++++++++++++++++---
+ 4 files changed, 35 insertions(+), 8 deletions(-)
+Merging pci-current/for-linus (02a1b8f4167e PCI: designware-plat: Update author email address)
+$ git merge pci-current/for-linus
+Already up-to-date.
+Merging driver-core.current/driver-core-linus (07d9a380680d Linux 4.9-rc2)
+$ git merge driver-core.current/driver-core-linus
+Already up-to-date.
+Merging tty.current/tty-linus (1001354ca341 Linux 4.9-rc1)
+$ git merge tty.current/tty-linus
+Already up-to-date.
+Merging usb.current/usb-linus (b76032396d79 usb: renesas_usbhs: add wait after initialization for R-Car Gen3)
+$ git merge usb.current/usb-linus
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/usb/dwc2.txt | 5 +-
+ drivers/usb/dwc2/core.c | 11 ++-
+ drivers/usb/dwc2/core.h | 7 ++
+ drivers/usb/dwc2/gadget.c | 53 +++++++++---
+ drivers/usb/dwc3/gadget.c | 26 ++++--
+ drivers/usb/gadget/function/f_fs.c | 107 +++++++++++++++++++++----
+ drivers/usb/gadget/function/u_ether.c | 5 +-
+ drivers/usb/gadget/udc/atmel_usba_udc.c | 2 +-
+ drivers/usb/host/ehci-platform.c | 2 +-
+ drivers/usb/host/ohci-at91.c | 9 ++-
+ drivers/usb/host/ohci-hcd.c | 2 +-
+ drivers/usb/host/xhci-hub.c | 41 +++++++++-
+ drivers/usb/host/xhci-pci.c | 10 ++-
+ drivers/usb/host/xhci.h | 3 +
+ drivers/usb/musb/musb_gadget.c | 4 +
+ drivers/usb/musb/omap2430.c | 7 +-
+ drivers/usb/renesas_usbhs/rcar3.c | 8 +-
+ drivers/usb/serial/cp210x.c | 4 +-
+ drivers/usb/serial/ftdi_sio.c | 3 +-
+ drivers/usb/serial/ftdi_sio_ids.h | 5 +-
+ drivers/usb/serial/usb-serial.c | 3 +-
+ drivers/usb/wusbcore/crypto.c | 61 +++++++++-----
+ 22 files changed, 294 insertions(+), 84 deletions(-)
+Merging usb-gadget-fixes/fixes (a1aa8cf6471b Revert "Documentation: devicetree: dwc2: Deprecate g-tx-fifo-size")
+$ git merge usb-gadget-fixes/fixes
+Already up-to-date.
+Merging usb-serial-fixes/usb-linus (07d9a380680d Linux 4.9-rc2)
+$ git merge usb-serial-fixes/usb-linus
+Already up-to-date.
+Merging usb-chipidea-fixes/ci-for-usb-stable (6b7f456e67a1 usb: chipidea: host: fix NULL ptr dereference during shutdown)
+$ git merge usb-chipidea-fixes/ci-for-usb-stable
+Auto-merging drivers/usb/chipidea/host.c
+Merge made by the 'recursive' strategy.
+ drivers/usb/chipidea/host.c | 2 ++
+ 1 file changed, 2 insertions(+)
+Merging phy/fixes (1001354ca341 Linux 4.9-rc1)
+$ git merge phy/fixes
+Already up-to-date.
+Merging staging.current/staging-linus (e866dd8aab76 greybus: fix a leak on error in gb_module_create())
+$ git merge staging.current/staging-linus
+Merge made by the 'recursive' strategy.
+ drivers/iio/adc/Kconfig | 2 ++
+ drivers/iio/chemical/atlas-ph-sensor.c | 7 +++--
+ drivers/iio/temperature/maxim_thermocouple.c | 16 ++++++-----
+ drivers/staging/android/ion/ion.c | 6 ++--
+ drivers/staging/android/ion/ion_of.c | 2 +-
+ drivers/staging/greybus/arche-platform.c | 1 +
+ drivers/staging/greybus/es2.c | 3 +-
+ drivers/staging/greybus/gpio.c | 6 ++--
+ drivers/staging/greybus/module.c | 2 +-
+ drivers/staging/greybus/uart.c | 2 +-
+ drivers/staging/iio/accel/sca3000_core.c | 2 ++
+ drivers/staging/lustre/lustre/llite/lproc_llite.c | 34 +++++++++++------------
+ drivers/staging/wilc1000/host_interface.c | 1 -
+ 13 files changed, 46 insertions(+), 38 deletions(-)
+Merging char-misc.current/char-misc-linus (407a3aee6ee2 hv: do not lose pending heartbeat vmbus packets)
+$ git merge char-misc.current/char-misc-linus
+Merge made by the 'recursive' strategy.
+ drivers/android/binder.c | 35 ++++++++++++++++++++++++++---------
+ drivers/hv/hv_util.c | 10 +++++++---
+ drivers/misc/mei/hw-txe.c | 6 ++++--
+ 3 files changed, 37 insertions(+), 14 deletions(-)
+Merging input-current/for-linus (324ae0958cab Input: psmouse - cleanup Focaltech code)
+$ git merge input-current/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/input/mouse/focaltech.c | 6 +++---
+ drivers/input/serio/i8042-x86ia64io.h | 7 +++++++
+ 2 files changed, 10 insertions(+), 3 deletions(-)
+Merging crypto-current/master (6d4952d9d9d4 hwrng: core - Don't use a stack buffer in add_early_randomness())
+$ 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 (07d9a380680d Linux 4.9-rc2)
+$ git merge drm-intel-fixes/for-linux-next-fixes
+Already up-to-date.
+Merging kbuild/for-next (fbcbee25745d Merge branches 'kbuild/kbuild' and 'kbuild/misc' into kbuild/for-next)
+$ git merge kbuild/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
+$ git merge asm-generic/master
+Resolved 'include/asm-generic/percpu.h' using previous resolution.
+Auto-merging include/asm-generic/percpu.h
+CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master cda02e92f102] Merge remote-tracking branch 'asm-generic/master'
+$ git diff -M --stat --summary HEAD^..
+ include/asm-generic/page.h | 2 +-
+ include/asm-generic/percpu.h | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+Merging arc/for-next (1001354ca341 Linux 4.9-rc1)
+$ git merge arc/for-next
+Already up-to-date.
+Merging arm/for-next (509d3b3effe2 Merge branches 'fixes', 'misc', 'sa1100-base' and 'syscalls' into for-next)
+$ git merge arm/for-next
+Removing arch/arm/mach-sa1100/include/mach/SA-1101.h
+Removing arch/arm/kernel/calls.S
+Removing arch/arm/include/asm/mach-types.h
+Merge made by the 'recursive' strategy.
+ arch/arm/Makefile | 5 +-
+ arch/arm/include/asm/Kbuild | 3 +
+ arch/arm/include/asm/delay.h | 27 +
+ arch/arm/include/asm/mach-types.h | 1 -
+ arch/arm/include/asm/unistd.h | 26 +-
+ arch/arm/include/uapi/asm/Kbuild | 3 +
+ arch/arm/include/uapi/asm/unistd.h | 424 +-----------
+ arch/arm/kernel/calls.S | 415 ------------
+ arch/arm/kernel/entry-common.S | 76 ++-
+ arch/arm/lib/delay-loop.S | 15 +-
+ arch/arm/mach-sa1100/include/mach/SA-1101.h | 925 ---------------------------
+ arch/arm/mach-sa1100/include/mach/hardware.h | 4 -
+ arch/arm/tools/Makefile | 68 +-
+ arch/arm/tools/syscall.tbl | 413 ++++++++++++
+ arch/arm/tools/syscallhdr.sh | 30 +
+ arch/arm/tools/syscallnr.sh | 33 +
+ arch/arm/tools/syscalltbl.sh | 21 +
+ 17 files changed, 675 insertions(+), 1814 deletions(-)
+ delete mode 100644 arch/arm/include/asm/mach-types.h
+ delete mode 100644 arch/arm/kernel/calls.S
+ delete mode 100644 arch/arm/mach-sa1100/include/mach/SA-1101.h
+ create mode 100644 arch/arm/tools/syscall.tbl
+ create mode 100644 arch/arm/tools/syscallhdr.sh
+ create mode 100644 arch/arm/tools/syscallnr.sh
+ create mode 100644 arch/arm/tools/syscalltbl.sh
+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 (83cb44244ff6 Merge branch 'fixes' into for-next)
+$ git merge arm-soc/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 1 +
+ arch/arm/boot/dts/ste-snowball.dts | 15 +++++++++++++--
+ arch/arm/configs/multi_v7_defconfig | 1 +
+ arch/arm/mach-mvebu/Kconfig | 4 +---
+ arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi | 2 +-
+ drivers/bus/Kconfig | 1 +
+ 6 files changed, 18 insertions(+), 6 deletions(-)
+Merging pinctrl/for-next (969cc0f87517 Merge branch 'devel' into for-next)
+$ git merge pinctrl/for-next
+Removing drivers/gpio/gpio-sx150x.c
+Auto-merging drivers/gpio/Kconfig
+Removing Documentation/devicetree/bindings/gpio/gpio-sx150x.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/gpio/gpio-sx150x.txt | 41 -
+ .../devicetree/bindings/gpio/gpio_oxnas.txt | 2 +-
+ .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 16 +
+ .../devicetree/bindings/pinctrl/oxnas,pinctrl.txt | 2 +-
+ .../devicetree/bindings/pinctrl/pinctrl-sx150x.txt | 69 ++
+ .../bindings/pinctrl/st,stm32-pinctrl.txt | 10 +-
+ drivers/gpio/Kconfig | 13 +-
+ drivers/gpio/Makefile | 1 -
+ drivers/gpio/gpio-sx150x.c | 792 ---------------
+ drivers/pinctrl/Kconfig | 14 +
+ drivers/pinctrl/Makefile | 1 +
+ drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 2 +-
+ drivers/pinctrl/bcm/pinctrl-nsp-gpio.c | 2 +-
+ drivers/pinctrl/freescale/pinctrl-imx.c | 1 +
+ drivers/pinctrl/pinctrl-oxnas.c | 605 +++++++++--
+ drivers/pinctrl/pinctrl-st.c | 2 +-
+ drivers/pinctrl/pinctrl-sx150x.c | 1062 ++++++++++++++++++++
+ drivers/pinctrl/stm32/pinctrl-stm32.c | 8 +-
+ drivers/pinctrl/sunxi/pinctrl-sunxi.c | 232 ++++-
+ 19 files changed, 1899 insertions(+), 976 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-sx150x.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-sx150x.txt
+ delete mode 100644 drivers/gpio/gpio-sx150x.c
+ create mode 100644 drivers/pinctrl/pinctrl-sx150x.c
+Merging amlogic/for-next (5a0803bd5ae2 ARM64: dts: meson-gxbb-odroidc2: Enable USB Nodes)
+$ git merge amlogic/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/amlogic.txt | 11 +
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ arch/arm64/boot/dts/amlogic/Makefile | 4 +
+ arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 208 +++++
+ .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 109 +++
+ .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 31 +-
+ arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 2 +-
+ .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 2 +-
+ arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 908 +++++++++------------
+ .../boot/dts/amlogic/meson-gxl-s905d-p230.dts | 51 ++
+ .../boot/dts/amlogic/meson-gxl-s905d-p231.dts | 51 ++
+ .../boot/dts/amlogic/meson-gxl-s905d-p23x.dtsi | 63 ++
+ arch/arm64/boot/dts/amlogic/meson-gxl-s905d.dtsi | 48 ++
+ .../boot/dts/amlogic/meson-gxl-s905x-p212.dts | 69 ++
+ arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi | 48 ++
+ arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 48 ++
+ 16 files changed, 1136 insertions(+), 518 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-gx.dtsi
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dts
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p23x.dtsi
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905d.dtsi
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
+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 (1443dff71db6 Merge branch anholt/bcm2835-dt-64-next into for-next)
+$ git merge bcm2835/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 2 +-
+ arch/arm/boot/dts/bcm2835-rpi-a.dts | 2 +-
+ arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 2 +-
+ arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 2 +-
+ arch/arm/boot/dts/bcm2835-rpi-b.dts | 2 +-
+ arch/arm/boot/dts/bcm2835-rpi-zero.dts | 2 +-
+ arch/arm/boot/dts/bcm2835-rpi.dtsi | 15 +-
+ arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 2 +-
+ arch/arm/boot/dts/bcm283x.dtsi | 203 +++++++++++++++++++++
+ arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts | 1 +
+ .../boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi | 1 +
+ drivers/gpu/drm/vc4/vc4_gem.c | 9 +-
+ drivers/pinctrl/bcm/pinctrl-bcm2835.c | 6 -
+ include/dt-bindings/pinctrl/bcm2835.h | 5 +
+ 14 files changed, 231 insertions(+), 23 deletions(-)
+ create mode 120000 arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi
+Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
+$ git merge berlin/berlin/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
+$ git merge cortex-m/for-next
+Already up-to-date.
+Merging imx-mxs/for-next (4020cd6682d6 Merge branch 'zte/dt64' into for-next)
+$ git merge imx-mxs/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/fsl.txt | 34 +-
+ .../devicetree/bindings/ata/ahci-fsl-qoriq.txt | 2 +-
+ .../devicetree/bindings/clock/qoriq-clock.txt | 3 +
+ .../devicetree/bindings/i2c/trivial-devices.txt | 2 +
+ arch/arm/boot/dts/Makefile | 7 +-
+ arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 253 ++++++
+ arch/arm/boot/dts/imx6q-apalis-ixora.dts | 22 -
+ arch/arm/boot/dts/imx6q-b650v3.dts | 6 +
+ arch/arm/boot/dts/imx6q-novena.dts | 4 +
+ arch/arm/boot/dts/imx6qdl-apalis.dtsi | 9 +
+ arch/arm/boot/dts/imx6qdl-apf6dev.dtsi | 14 +-
+ arch/arm/boot/dts/imx6qdl-colibri.dtsi | 890 +++++++++++++++++++++
+ arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 4 +-
+ arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 4 +-
+ arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 4 +-
+ arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 6 +-
+ arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 4 +-
+ arch/arm/boot/dts/imx6qdl-tx6.dtsi | 32 +-
+ arch/arm/boot/dts/imx6qdl-wandboard-revb1.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 4 +-
+ arch/arm/boot/dts/imx6qdl.dtsi | 6 +-
+ arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts | 69 ++
+ arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts | 54 ++
+ arch/arm/boot/dts/imx6sx-udoo-neo-full.dts | 69 ++
+ arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 293 +++++++
+ arch/arm/boot/dts/imx6sx.dtsi | 4 +-
+ arch/arm/boot/dts/imx6ul-liteboard.dts | 147 ++++
+ arch/arm/boot/dts/imx6ul-litesom.dtsi | 82 ++
+ arch/arm/boot/dts/ls1021a.dtsi | 84 +-
+ arch/arm/boot/dts/vf-colibri.dtsi | 4 +
+ arch/arm/boot/dts/vf500.dtsi | 2 +-
+ arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 14 -
+ arch/arm/boot/dts/vfxxx.dtsi | 12 +
+ arch/arm/configs/imx_v6_v7_defconfig | 2 +
+ arch/arm/mach-imx/gpc.c | 15 +-
+ arch/arm/mach-imx/mach-imx6q.c | 2 +-
+ arch/arm/mach-imx/mmdc.c | 459 ++++++++++-
+ arch/arm64/boot/dts/freescale/Makefile | 2 +
+ arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts | 2 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts | 2 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 79 ++
+ arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts | 212 +++++
+ arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 150 ++++
+ arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 515 ++++++++++++
+ arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts | 2 +-
+ arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts | 2 +-
+ arch/arm64/boot/dts/freescale/fsl-ls2080a-simu.dts | 2 +-
+ arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 117 ++-
+ arch/arm64/boot/dts/zte/zx296718.dtsi | 24 +
+ 51 files changed, 3630 insertions(+), 107 deletions(-)
+ create mode 100644 arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
+ create mode 100644 arch/arm/boot/dts/imx6qdl-colibri.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts
+ create mode 100644 arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts
+ create mode 100644 arch/arm/boot/dts/imx6sx-udoo-neo-full.dts
+ create mode 100644 arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6ul-liteboard.dts
+ create mode 100644 arch/arm/boot/dts/imx6ul-litesom.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
+Merging keystone/next (fb2a68db621a Merge branch 'for_4.9/keystone_dts' into next)
+$ git merge keystone/next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging mvebu/for-next (81f448072d1d Merge branch 'mvebu/dt64' into mvebu/for-next)
+$ git merge mvebu/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/armada-370-netgear-rn104.dts | 5 +-
+ arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 7 +-
+ arch/arm/plat-orion/gpio.c | 6 +-
+ arch/arm64/boot/dts/marvell/Makefile | 1 +
+ .../boot/dts/marvell/armada-3720-espressobin.dts | 82 ++++++++++++++++++++++
+ 5 files changed, 96 insertions(+), 5 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
+Merging omap/for-next (624018387bcf Merge branch 'omap-for-v4.9/dt-v2' into for-next)
+$ git merge omap/for-next
+Merge made by the 'recursive' strategy.
+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 (c49806e0fa1e Merge branch 'arm64-for-5.0' into all-for-5.0)
+$ git merge qcom/for-next
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/qcom.txt | 1 +
+ Documentation/devicetree/bindings/arm/swir.txt | 12 +
+ MAINTAINERS | 1 +
+ arch/arm/boot/dts/Makefile | 3 +-
+ arch/arm/boot/dts/qcom-apq8060-dragonboard.dts | 119 +++++
+ arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts | 77 ++-
+ arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 74 +++
+ arch/arm/boot/dts/qcom-apq8064.dtsi | 321 ++++++++++++
+ arch/arm/boot/dts/qcom-mdm9615.dtsi | 557 +++++++++++++++++++++
+ arch/arm/boot/dts/qcom-msm8660.dtsi | 17 +
+ .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 29 ++
+ arch/arm/boot/dts/swir-wp8548-mangoh-green.dts | 281 +++++++++++
+ arch/arm/boot/dts/swir-wp8548.dtsi | 170 +++++++
+ arch/arm/configs/qcom_defconfig | 4 +-
+ arch/arm64/Kconfig.platforms | 1 +
+ arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 76 ++-
+ .../boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi | 15 +
+ arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 2 +
+ arch/arm64/boot/dts/qcom/msm8916.dtsi | 62 ++-
+ arch/arm64/boot/dts/qcom/msm8996.dtsi | 82 +++
+ arch/arm64/boot/dts/qcom/pm8916.dtsi | 45 +-
+ arch/arm64/boot/dts/qcom/pm8994.dtsi | 1 +
+ drivers/firmware/qcom_scm.c | 4 +-
+ include/dt-bindings/pinctrl/qcom,pmic-gpio.h | 4 +
+ include/dt-bindings/pinctrl/qcom,pmic-mpp.h | 6 +
+ include/linux/soc/qcom/wcnss_ctrl.h | 13 +
+ 26 files changed, 1963 insertions(+), 14 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/swir.txt
+ create mode 100644 arch/arm/boot/dts/qcom-mdm9615.dtsi
+ create mode 100644 arch/arm/boot/dts/swir-wp8548-mangoh-green.dts
+ create mode 100644 arch/arm/boot/dts/swir-wp8548.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi
+Merging renesas/next (9522d6ff696e Merge branch 'dt-for-v4.10' into next)
+$ git merge renesas/next
+Removing arch/arm/mach-shmobile/setup-r8a7794.c
+Removing arch/arm/mach-shmobile/setup-r8a7793.c
+Removing arch/arm/mach-shmobile/setup-r8a7792.c
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/shmobile.txt | 8 +-
+ .../devicetree/bindings/media/renesas,fcp.txt | 8 +-
+ .../bindings/power/renesas,rcar-sysc.txt | 7 +-
+ arch/arm/boot/dts/emev2.dtsi | 3 +-
+ arch/arm/boot/dts/r7s72100-rskrza1.dts | 5 +
+ arch/arm/boot/dts/r7s72100.dtsi | 55 +++++++
+ arch/arm/boot/dts/r8a7740.dtsi | 4 +-
+ arch/arm/boot/dts/r8a7778.dtsi | 4 +-
+ arch/arm/boot/dts/r8a7779-marzen.dts | 2 +-
+ arch/arm/boot/dts/r8a7779.dtsi | 6 +-
+ arch/arm/boot/dts/r8a7790-lager.dts | 66 +++++++-
+ arch/arm/boot/dts/r8a7790.dtsi | 6 +-
+ arch/arm/boot/dts/r8a7791-koelsch.dts | 101 +++++++++++-
+ arch/arm/boot/dts/r8a7791.dtsi | 9 +-
+ arch/arm/boot/dts/r8a7792-wheat.dts | 126 +++++++++++++++
+ arch/arm/boot/dts/r8a7792.dtsi | 51 +++++-
+ arch/arm/boot/dts/r8a7793-gose.dts | 12 +-
+ arch/arm/boot/dts/r8a7793.dtsi | 33 +++-
+ arch/arm/boot/dts/r8a7794-alt.dts | 22 ++-
+ arch/arm/boot/dts/r8a7794.dtsi | 67 ++++----
+ arch/arm/boot/dts/sh73a0.dtsi | 4 +-
+ arch/arm/configs/shmobile_defconfig | 1 +
+ arch/arm/mach-shmobile/Kconfig | 10 +-
+ arch/arm/mach-shmobile/Makefile | 3 -
+ arch/arm/mach-shmobile/setup-r8a7792.c | 35 -----
+ arch/arm/mach-shmobile/setup-r8a7793.c | 33 ----
+ arch/arm/mach-shmobile/setup-r8a7794.c | 33 ----
+ arch/arm/mach-shmobile/setup-rcar-gen2.c | 33 ++++
+ arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 69 ++++++++-
+ arch/arm64/boot/dts/renesas/r8a7795.dtsi | 24 +--
+ arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 149 ++++++++++++++++++
+ arch/arm64/boot/dts/renesas/r8a7796.dtsi | 171 +++++++++++++++++++++
+ drivers/soc/renesas/Makefile | 1 +
+ drivers/soc/renesas/r8a7743-sysc.c | 32 ++++
+ drivers/soc/renesas/rcar-sysc.c | 3 +
+ drivers/soc/renesas/rcar-sysc.h | 1 +
+ include/dt-bindings/clock/r7s72100-clock.h | 7 +
+ include/dt-bindings/power/r8a7743-sysc.h | 25 +++
+ 38 files changed, 1027 insertions(+), 202 deletions(-)
+ delete mode 100644 arch/arm/mach-shmobile/setup-r8a7792.c
+ delete mode 100644 arch/arm/mach-shmobile/setup-r8a7793.c
+ delete mode 100644 arch/arm/mach-shmobile/setup-r8a7794.c
+ create mode 100644 drivers/soc/renesas/r8a7743-sysc.c
+ create mode 100644 include/dt-bindings/power/r8a7743-sysc.h
+Merging rockchip/for-next (8a3339648bb5 Merge branch 'v4.10-clk/next' into for-next)
+$ git merge rockchip/for-next
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/rockchip.txt | 12 +
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ arch/arm/boot/dts/Makefile | 2 +
+ arch/arm/boot/dts/rk3036-evb.dts | 2 +-
+ arch/arm/boot/dts/rk3036-kylin.dts | 2 +-
+ arch/arm/boot/dts/rk3036.dtsi | 4 +-
+ arch/arm/boot/dts/rk3066a-bqcurie2.dts | 2 +-
+ arch/arm/boot/dts/rk3066a-marsboard.dts | 2 +-
+ arch/arm/boot/dts/rk3066a-mk808.dts | 195 ++++++++++++
+ arch/arm/boot/dts/rk3066a-rayeager.dts | 2 +-
+ arch/arm/boot/dts/rk3066a.dtsi | 10 +-
+ arch/arm/boot/dts/rk3188-px3-evb.dts | 328 +++++++++++++++++++++
+ arch/arm/boot/dts/rk3188-radxarock.dts | 2 +-
+ arch/arm/boot/dts/rk3188.dtsi | 2 +-
+ arch/arm/boot/dts/rk3228-evb.dts | 2 +-
+ arch/arm/boot/dts/rk3229-evb.dts | 2 +-
+ arch/arm/boot/dts/rk322x.dtsi | 4 +-
+ arch/arm/boot/dts/rk3288-evb.dtsi | 2 +-
+ arch/arm/boot/dts/rk3288-fennec.dts | 2 +-
+ arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 2 +-
+ arch/arm/boot/dts/rk3288-firefly.dtsi | 2 +-
+ arch/arm/boot/dts/rk3288-miqi.dts | 2 +-
+ arch/arm/boot/dts/rk3288-popmetal.dts | 34 ++-
+ arch/arm/boot/dts/rk3288-r89.dts | 2 +-
+ arch/arm/boot/dts/rk3288-rock2-som.dtsi | 2 +-
+ arch/arm/boot/dts/rk3288-veyron.dtsi | 2 +-
+ arch/arm/boot/dts/rk3288.dtsi | 6 +-
+ arch/arm/boot/dts/rk3xxx.dtsi | 4 +-
+ arch/arm64/boot/dts/rockchip/Makefile | 1 +
+ arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts | 3 -
+ .../boot/dts/rockchip/rk3368-orion-r68-meta.dts | 4 -
+ arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts | 314 ++++++++++++++++++++
+ arch/arm64/boot/dts/rockchip/rk3368.dtsi | 12 +-
+ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +
+ drivers/clk/rockchip/clk-ddr.c | 5 +-
+ drivers/clk/rockchip/clk-rk3188.c | 12 +-
+ drivers/clk/rockchip/clk-rk3399.c | 1 +
+ drivers/soc/rockchip/pm_domains.c | 16 +-
+ include/dt-bindings/clock/rk3188-cru-common.h | 8 +-
+ include/dt-bindings/pinctrl/rockchip.h | 33 +++
+ 40 files changed, 975 insertions(+), 70 deletions(-)
+ create mode 100644 arch/arm/boot/dts/rk3066a-mk808.dts
+ create mode 100644 arch/arm/boot/dts/rk3188-px3-evb.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts
+Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
+$ git merge rpi/for-rpi-next
+Already up-to-date.
+Merging samsung/for-next (1a695a905c18 Linux 4.7-rc1)
+$ git merge samsung/for-next
+Already up-to-date.
+Merging samsung-krzk/for-next (19350594a556 Merge branch 'next/dt' into for-next)
+$ git merge samsung-krzk/for-next
+Auto-merging arch/arm/configs/multi_v7_defconfig
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ .../bindings/arm/samsung/samsung-boards.txt | 3 +
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/exynos4412-itop-elite.dts | 240 ++++++++++
+ arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi | 501 +++++++++++++++++++++
+ arch/arm/boot/dts/exynos4x12.dtsi | 2 +-
+ arch/arm/boot/dts/exynos5410-odroidxu.dts | 69 +++
+ arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 9 +
+ arch/arm/boot/dts/exynos5410.dtsi | 59 +++
+ arch/arm/configs/exynos_defconfig | 1 +
+ arch/arm/configs/multi_v7_defconfig | 1 +
+ 10 files changed, 885 insertions(+), 1 deletion(-)
+ create mode 100644 arch/arm/boot/dts/exynos4412-itop-elite.dts
+ create mode 100644 arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi
+Merging tegra/for-next (74e8115883f5 Merge branch for-4.9/arm64/dt into for-next)
+$ git merge tegra/for-next
+Merge made by the 'recursive' strategy.
+ drivers/clk/tegra/clk-tegra-pmc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging arm64/for-next/core (db68f3e7594a arm64: tlbflush.h: add __tlbi() macro)
+$ 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 0750192c3623] 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 (2dc024e94578 cris: return of class_create should be considered)
+$ 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 (6736e65effc3 m68k: Migrate exception table users off module.h and onto extable.h)
+$ git merge m68k/for-next
+Already up-to-date.
+Merging m68knommu/for-next (baa6ae0f015b m68knommu: AMCORE board, add iMX i2c support)
+$ git merge m68knommu/for-next
+Merge made by the 'recursive' strategy.
+ arch/m68k/Kconfig.machine | 6 ++
+ arch/m68k/coldfire/Makefile | 1 +
+ arch/m68k/coldfire/amcore.c | 156 ++++++++++++++++++++++++++++++++++++
+ arch/m68k/coldfire/device.c | 159 +++++++++++++++++++++++++++++++++++++
+ arch/m68k/coldfire/m5206.c | 12 +++
+ arch/m68k/coldfire/m520x.c | 24 +++++-
+ arch/m68k/coldfire/m523x.c | 18 +++++
+ arch/m68k/coldfire/m5249.c | 25 ++++++
+ arch/m68k/coldfire/m525x.c | 10 ++-
+ arch/m68k/coldfire/m527x.c | 28 +++++++
+ arch/m68k/coldfire/m528x.c | 18 +++++
+ arch/m68k/coldfire/m5307.c | 14 ++++
+ arch/m68k/coldfire/m53xx.c | 20 ++++-
+ arch/m68k/coldfire/m5407.c | 14 ++++
+ arch/m68k/coldfire/m5441x.c | 12 +--
+ arch/m68k/coldfire/m54xx.c | 17 ++++
+ arch/m68k/configs/amcore_defconfig | 117 +++++++++++++++++++++++++++
+ arch/m68k/include/asm/m5206sim.h | 8 ++
+ arch/m68k/include/asm/m520xsim.h | 8 ++
+ arch/m68k/include/asm/m523xsim.h | 10 ++-
+ arch/m68k/include/asm/m527xsim.h | 8 ++
+ arch/m68k/include/asm/m528xsim.h | 9 +++
+ arch/m68k/include/asm/m5307sim.h | 9 ++-
+ arch/m68k/include/asm/m53xxsim.h | 8 ++
+ arch/m68k/include/asm/m5407sim.h | 8 ++
+ arch/m68k/include/asm/m54xxsim.h | 11 +++
+ 26 files changed, 712 insertions(+), 18 deletions(-)
+ create mode 100644 arch/m68k/coldfire/amcore.c
+ create mode 100644 arch/m68k/configs/amcore_defconfig
+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 (1001354ca341 Linux 4.9-rc1)
+$ git merge mips/mips-for-linux-next
+Already up-to-date.
+Merging nios2/for-next (476080a79367 nios2: use of_property_read_bool)
+$ git merge nios2/for-next
+Already up-to-date.
+Merging parisc-hd/for-next (c8d2bc9bc39e Linux 4.8)
+$ git merge parisc-hd/for-next
+Already up-to-date.
+Merging powerpc/next (08bf75ba852e powerpc/mm/hash64: Fix might_have_hea() check)
+$ git merge powerpc/next
+Already up-to-date.
+Merging fsl/next (e0b80f00bb96 arch/powerpc: Add CONFIG_FSL_DPAA to corenetXX_smp_defconfig)
+$ 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 (86651b6aa355 s390/cio: clean up DEV_STATE_SENSE_PGID)
+$ git merge s390/features
+Merge made by the 'recursive' strategy.
+ arch/s390/include/asm/ftrace.h | 4 +-
+ arch/s390/include/asm/processor.h | 2 +-
+ arch/s390/include/asm/timex.h | 4 +-
+ arch/s390/include/asm/unistd.h | 3 +
+ arch/s390/include/asm/vdso.h | 2 +
+ arch/s390/kernel/asm-offsets.c | 2 +
+ arch/s390/kernel/dis.c | 4 +-
+ arch/s390/kernel/dumpstack.c | 63 ++++-------
+ arch/s390/kernel/early.c | 2 +-
+ arch/s390/kernel/perf_event.c | 2 +-
+ arch/s390/kernel/stacktrace.c | 4 +-
+ arch/s390/kernel/time.c | 192 ++++++++++++++++++--------------
+ arch/s390/kernel/vdso32/clock_gettime.S | 23 +++-
+ arch/s390/kernel/vdso32/gettimeofday.S | 23 +++-
+ arch/s390/kernel/vdso64/clock_gettime.S | 11 +-
+ arch/s390/kernel/vdso64/gettimeofday.S | 11 +-
+ arch/s390/mm/hugetlbpage.c | 1 +
+ arch/s390/mm/init.c | 38 ++++---
+ arch/s390/oprofile/init.c | 2 +-
+ drivers/s390/block/dasd.c | 16 +--
+ drivers/s390/block/dasd_eckd.c | 4 +-
+ drivers/s390/cio/chp.c | 6 +-
+ drivers/s390/cio/device.h | 1 -
+ drivers/s390/cio/device_fsm.c | 6 -
+ 24 files changed, 248 insertions(+), 178 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 (bf55d575234b tile: migrate exception table users off module.h and onto extable.h)
+$ git merge tile/master
+Merge made by the 'recursive' strategy.
+ arch/tile/kernel/module.c | 11 +++++------
+ arch/tile/kernel/pci_gx.c | 2 +-
+ arch/tile/kernel/unaligned.c | 2 +-
+ arch/tile/lib/cacheflush.c | 8 +-------
+ arch/tile/mm/extable.c | 2 +-
+ arch/tile/mm/fault.c | 2 +-
+ 6 files changed, 10 insertions(+), 17 deletions(-)
+Merging uml/linux-next (dad223284407 um: Don't discard .text.exit section)
+$ git merge uml/linux-next
+Already up-to-date.
+Merging unicore32/unicore32 (1ace5d1e3d4b unicore32-oldabi: add oldabi syscall interface)
+$ git merge unicore32/unicore32
+Merge made by the 'recursive' strategy.
+ arch/unicore32/Kconfig | 14 +
+ arch/unicore32/include/asm/Kbuild | 3 -
+ arch/unicore32/include/asm/signal.h | 21 +
+ arch/unicore32/include/asm/syscalls.h | 25 +
+ arch/unicore32/include/uapi/asm/sigcontext.h | 14 +
+ arch/unicore32/include/uapi/asm/stat-oldabi.h | 71 +++
+ arch/unicore32/include/uapi/asm/stat.h | 19 +
+ arch/unicore32/include/uapi/asm/unistd-oldabi.h | 770 ++++++++++++++++++++++++
+ arch/unicore32/include/uapi/asm/unistd.h | 8 +
+ arch/unicore32/kernel/entry.S | 17 +
+ arch/unicore32/kernel/signal.c | 41 ++
+ 11 files changed, 1000 insertions(+), 3 deletions(-)
+ create mode 100644 arch/unicore32/include/asm/signal.h
+ create mode 100644 arch/unicore32/include/asm/syscalls.h
+ create mode 100644 arch/unicore32/include/uapi/asm/stat-oldabi.h
+ create mode 100644 arch/unicore32/include/uapi/asm/stat.h
+ create mode 100644 arch/unicore32/include/uapi/asm/unistd-oldabi.h
+Merging xtensa/xtensa-for-next (a4c6be5ad1d0 xtensa: disable MMU initialization option on MMUv2 cores)
+$ git merge xtensa/xtensa-for-next
+Already up-to-date.
+Merging befs/for-next (3c8a965ad630 befs: remove signatures from comments)
+$ git merge befs/for-next
+Merge made by the 'recursive' strategy.
+ fs/befs/befs.h | 3 ++-
+ fs/befs/befs_fs_types.h | 8 +++---
+ fs/befs/btree.h | 6 ++---
+ fs/befs/datastream.c | 2 --
+ fs/befs/datastream.h | 5 ++--
+ fs/befs/debug.c | 14 ++++++-----
+ fs/befs/inode.c | 12 ++++-----
+ fs/befs/inode.h | 3 +--
+ fs/befs/io.c | 7 +++---
+ fs/befs/linuxvfs.c | 66 ++++++++++++++++++++++++-------------------------
+ fs/befs/super.h | 4 +--
+ 11 files changed, 61 insertions(+), 69 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 (54626da80217 Merge branch 'for-next-next-4.9-20161024' into for-next-20161024)
+$ git merge btrfs-kdave/for-next
+Auto-merging fs/btrfs/send.c
+Auto-merging fs/btrfs/ioctl.c
+Auto-merging fs/btrfs/inode.c
+Auto-merging fs/btrfs/file.c
+Auto-merging fs/btrfs/ctree.h
+Merge made by the 'recursive' strategy.
+ fs/btrfs/ctree.h | 4 +-
+ fs/btrfs/delayed-ref.c | 14 ++++
+ fs/btrfs/delayed-ref.h | 8 ++
+ fs/btrfs/disk-io.c | 15 ++--
+ fs/btrfs/extent-tree.c | 196 +++++++++++++++++++++++++++++++------------
+ fs/btrfs/extent_io.c | 8 +-
+ fs/btrfs/file.c | 1 -
+ fs/btrfs/inode.c | 80 +++++++++++++++---
+ fs/btrfs/ioctl.c | 12 +--
+ fs/btrfs/relocation.c | 9 +-
+ fs/btrfs/send.c | 58 +++++++++++++
+ fs/btrfs/super.c | 4 -
+ fs/btrfs/uuid-tree.c | 8 +-
+ fs/btrfs/volumes.c | 42 +++++-----
+ include/trace/events/btrfs.h | 11 +--
+ 15 files changed, 353 insertions(+), 117 deletions(-)
+Merging ceph/master (5130ccea7cf4 ceph: fix non static symbol warning)
+$ git merge ceph/master
+Already up-to-date.
+Merging cifs/for-next (faad81c4f581 CIFS: iterate over posix acl xattr entry correctly in ACL_to_cifs_posix())
+$ git merge cifs/for-next
+Merge made by the 'recursive' strategy.
+ fs/cifs/cifsencrypt.c | 11 ++++++++---
+ fs/cifs/cifssmb.c | 4 ++--
+ fs/cifs/connect.c | 25 ++++++++++++++++++-------
+ 3 files changed, 28 insertions(+), 12 deletions(-)
+Merging configfs/for-next (42857cf512cb configfs: Return -EFBIG from configfs_write_bin_file.)
+$ git merge configfs/for-next
+Already up-to-date.
+Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
+$ git merge ecryptfs/next
+Auto-merging fs/ecryptfs/main.c
+Auto-merging fs/ecryptfs/ecryptfs_kernel.h
+Merge made by the 'recursive' strategy.
+ fs/ecryptfs/crypto.c | 15 ---------------
+ fs/ecryptfs/ecryptfs_kernel.h | 9 ++++++++-
+ fs/ecryptfs/keystore.c | 2 +-
+ fs/ecryptfs/main.c | 2 +-
+ fs/ecryptfs/miscdev.c | 2 +-
+ 5 files changed, 11 insertions(+), 19 deletions(-)
+Merging ext3/for_next (e952813e210b ext2: avoid bogus -Wmaybe-uninitialized warning)
+$ git merge ext3/for_next
+Already up-to-date.
+Merging ext4/dev (d74f3d25289a ext4: add missing KERN_CONT to a few more debugging uses)
+$ git merge ext4/dev
+Already up-to-date.
+Merging f2fs/dev (f050cd028755 f2fs: use BIO_MAX_PAGES for bio allocation)
+$ git merge f2fs/dev
+Merge made by the 'recursive' strategy.
+ fs/f2fs/checkpoint.c | 13 ++--
+ fs/f2fs/data.c | 41 ++++-------
+ fs/f2fs/debug.c | 11 +--
+ fs/f2fs/dir.c | 3 +-
+ fs/f2fs/f2fs.h | 16 +++--
+ fs/f2fs/file.c | 8 ++-
+ fs/f2fs/gc.c | 4 +-
+ fs/f2fs/inline.c | 6 +-
+ fs/f2fs/inode.c | 25 +++++--
+ fs/f2fs/node.c | 193 ++++++++++++++++++++++++++++++---------------------
+ fs/f2fs/node.h | 13 ++--
+ fs/f2fs/segment.c | 12 ++--
+ fs/f2fs/segment.h | 24 +++----
+ fs/f2fs/shrinker.c | 10 +--
+ fs/f2fs/super.c | 1 -
+ 15 files changed, 216 insertions(+), 164 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 (0ce267ff95a0 fuse: fix root dentry initialization)
+$ git merge fuse/for-next
+Merge made by the 'recursive' strategy.
+ fs/fuse/dir.c | 5 +++++
+ fs/fuse/fuse_i.h | 1 +
+ fs/fuse/inode.c | 3 ++-
+ 3 files changed, 8 insertions(+), 1 deletion(-)
+Merging gfs2/for-next (a3443cda5588 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security)
+$ git merge gfs2/for-next
+Already up-to-date.
+Merging jfs/jfs-next (240c5185c52d jfs: Simplify code)
+$ git merge jfs/jfs-next
+Already up-to-date.
+Merging nfs/linux-next (14155cafeadd btrfs: assign error values to the correct bio structs)
+$ git merge nfs/linux-next
+Already up-to-date.
+Merging nfsd/nfsd-next (3fdbf6464db2 nfsd: catch errors in decode_fattr earlier)
+$ git merge nfsd/nfsd-next
+Merge made by the 'recursive' strategy.
+ fs/nfsd/netns.h | 5 ++
+ fs/nfsd/nfs4proc.c | 43 ++++------------
+ fs/nfsd/nfs4state.c | 28 +++++-----
+ fs/nfsd/nfs4xdr.c | 53 +++++++++++--------
+ fs/nfsd/nfsd.h | 27 +++++-----
+ net/sunrpc/auth_gss/auth_gss.c | 13 +++--
+ net/sunrpc/auth_gss/gss_krb5_crypto.c | 82 +++++++++++++++++-------------
+ net/sunrpc/auth_gss/svcauth_gss.c | 21 +++++---
+ net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 1 +
+ net/sunrpc/xprtsock.c | 1 +
+ 10 files changed, 149 insertions(+), 125 deletions(-)
+Merging orangefs/for-next (804b1737d712 orangefs: don't use d_time)
+$ git merge orangefs/for-next
+Merge made by the 'recursive' strategy.
+ fs/orangefs/dcache.c | 5 +++--
+ fs/orangefs/file.c | 14 +++++++-------
+ fs/orangefs/namei.c | 8 ++++----
+ fs/orangefs/orangefs-kernel.h | 7 +++++++
+ 4 files changed, 21 insertions(+), 13 deletions(-)
+Merging overlayfs/overlayfs-next (204f6afd0743 ovl: split super.c)
+$ git merge overlayfs/overlayfs-next
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/overlayfs.txt | 6 +-
+ fs/ioctl.c | 7 +-
+ fs/namei.c | 6 +-
+ fs/namespace.c | 7 +-
+ fs/nfsd/vfs.c | 3 +-
+ fs/open.c | 15 +-
+ fs/overlayfs/Makefile | 2 +-
+ fs/overlayfs/copy_up.c | 8 +
+ fs/overlayfs/dir.c | 142 +++-------
+ fs/overlayfs/inode.c | 45 +--
+ fs/overlayfs/namei.c | 267 ++++++++++++++++++
+ fs/overlayfs/overlayfs.h | 45 ++-
+ fs/overlayfs/ovl_entry.h | 51 ++++
+ fs/overlayfs/super.c | 483 +-------------------------------
+ fs/overlayfs/util.c | 235 ++++++++++++++++
+ fs/read_write.c | 13 +-
+ fs/xattr.c | 13 +-
+ include/linux/fs.h | 13 +
+ net/unix/af_unix.c | 6 +-
+ 19 files changed, 685 insertions(+), 682 deletions(-)
+ create mode 100644 fs/overlayfs/namei.c
+ create mode 100644 fs/overlayfs/ovl_entry.h
+ create mode 100644 fs/overlayfs/util.c
+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 (c83ed4c9dbb3 ubifs: Abort readdir upon error)
+$ git merge ubifs/linux-next
+Already up-to-date.
+Merging xfs/for-next (b77428b12b55 xfs: defer should abort intent items if the trans roll fails)
+$ git merge xfs/for-next
+Merge made by the 'recursive' strategy.
+ fs/iomap.c | 5 +-
+ fs/xfs/libxfs/xfs_bmap.c | 418 ++++++++++++++++++++---------------
+ fs/xfs/libxfs/xfs_bmap.h | 8 +-
+ fs/xfs/libxfs/xfs_btree.c | 2 +-
+ fs/xfs/libxfs/xfs_defer.c | 17 +-
+ fs/xfs/libxfs/xfs_dquot_buf.c | 3 +-
+ fs/xfs/libxfs/xfs_format.h | 1 -
+ fs/xfs/libxfs/xfs_inode_buf.c | 13 +-
+ fs/xfs/libxfs/xfs_inode_buf.h | 2 +
+ fs/xfs/xfs_file.c | 232 +++-----------------
+ fs/xfs/xfs_icache.c | 8 +-
+ fs/xfs/xfs_iomap.c | 57 +++--
+ fs/xfs/xfs_mount.c | 1 +
+ fs/xfs/xfs_reflink.c | 499 +++++++++++++++++++++++-------------------
+ fs/xfs/xfs_reflink.h | 11 +-
+ fs/xfs/xfs_sysfs.c | 4 +-
+ fs/xfs/xfs_trace.h | 4 +-
+ include/linux/iomap.h | 17 +-
+ 18 files changed, 645 insertions(+), 657 deletions(-)
+Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2)
+$ git merge file-locks/linux-next
+Already up-to-date.
+Merging vfs/for-next (b26b5ef5ec7e Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
+$ git merge vfs/for-next
+Already up-to-date.
+Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
+$ git merge vfs-jk/vfs
+Already up-to-date.
+Merging vfs-miklos/next (c8d2bc9bc39e Linux 4.8)
+$ git merge vfs-miklos/next
+Already up-to-date.
+Merging pci/next (1001354ca341 Linux 4.9-rc1)
+$ git merge pci/next
+Already up-to-date.
+Merging pstore/for-next/pstore (f88baf68ebe5 ramoops: move spin_lock_init after kmalloc error checking)
+$ git merge pstore/for-next/pstore
+Already up-to-date.
+Merging hid/for-next (d7ff87349d20 Merge branches 'for-4.10/i2c-hid' and 'for-4.10/sony' into for-next)
+$ git merge hid/for-next
+Merge made by the 'recursive' strategy.
+ drivers/hid/hid-core.c | 2 +
+ drivers/hid/hid-ids.h | 1 +
+ drivers/hid/hid-input.c | 1 +
+ drivers/hid/hid-sony.c | 277 +++++++++++++---------
+ drivers/hid/i2c-hid/i2c-hid.c | 78 ++-----
+ drivers/hid/wacom_sys.c | 92 ++++++--
+ drivers/hid/wacom_wac.c | 533 ++++++++++++++++++++++++++++++++++++------
+ drivers/hid/wacom_wac.h | 75 +++++-
+ include/linux/hid.h | 4 +
+ 9 files changed, 794 insertions(+), 269 deletions(-)
+Merging i2c/i2c/for-next (533169d164c6 i2c: imx: defer probe if bus recovery GPIOs are not ready)
+$ git merge i2c/i2c/for-next
+Merge made by the 'recursive' strategy.
+ drivers/i2c/busses/Kconfig | 12 ++++++------
+ drivers/i2c/busses/i2c-designware-core.c | 17 ++++++++++++++---
+ drivers/i2c/busses/i2c-digicolor.c | 1 +
+ drivers/i2c/busses/i2c-i801.c | 16 +++++++++++++---
+ drivers/i2c/busses/i2c-imx.c | 11 +++++++----
+ drivers/i2c/busses/i2c-jz4780.c | 1 +
+ drivers/i2c/busses/i2c-rk3x.c | 2 ++
+ drivers/i2c/busses/i2c-xgene-slimpro.c | 2 +-
+ drivers/i2c/busses/i2c-xlp9xx.c | 1 +
+ drivers/i2c/busses/i2c-xlr.c | 1 +
+ drivers/i2c/i2c-core.c | 11 ++++++++++-
+ 11 files changed, 57 insertions(+), 18 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 (c8d2bc9bc39e Linux 4.8)
+$ git merge dmi/master
+Already up-to-date.
+Merging hwmon-staging/hwmon-next (c2d95c252f65 hwmon: (adm1275) Enable adm1278 VOUT sampling)
+$ git merge hwmon-staging/hwmon-next
+Auto-merging Documentation/devicetree/bindings/i2c/trivial-devices.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/i2c/trivial-devices.txt | 2 +
+ Documentation/hwmon/tc654 | 31 ++
+ drivers/hwmon/Kconfig | 11 +
+ drivers/hwmon/Makefile | 1 +
+ drivers/hwmon/pmbus/adm1275.c | 20 +-
+ drivers/hwmon/tc654.c | 514 +++++++++++++++++++++
+ 6 files changed, 575 insertions(+), 4 deletions(-)
+ create mode 100644 Documentation/hwmon/tc654
+ create mode 100644 drivers/hwmon/tc654.c
+Merging jc_docs/docs-next (75a163c4a3ee vme: Convert documentation to reStructuredText, move under driver APIs)
+$ git merge jc_docs/docs-next
+Auto-merging MAINTAINERS
+Auto-merging Documentation/driver-api/vme.rst
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/uio-howto.tmpl | 62 +++++++++++
+ Documentation/blockdev/cciss.txt | 2 +-
+ Documentation/conf.py | 2 +-
+ Documentation/device-mapper/dm-raid.txt | 8 +-
+ Documentation/driver-api/index.rst | 1 +
+ Documentation/{vme_api.txt => driver-api/vme.rst} | 115 ++++++++++++++++-----
+ .../sphinx/{kernel-doc.py => kerneldoc.py} | 0
+ Documentation/trace/uprobetracer.txt | 6 +-
+ MAINTAINERS | 2 +-
+ 9 files changed, 161 insertions(+), 37 deletions(-)
+ rename Documentation/{vme_api.txt => driver-api/vme.rst} (92%)
+ rename Documentation/sphinx/{kernel-doc.py => kerneldoc.py} (100%)
+Merging v4l-dvb/master (778de0140232 Merge branch 'v4l_for_linus' into to_next)
+$ git merge v4l-dvb/master
+Auto-merging drivers/media/platform/omap/omap_vout.c
+Auto-merging drivers/media/pci/ivtv/ivtv-yuv.c
+Removing drivers/media/dvb-core/dvb_filter.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/media/i2c/adv7604.txt | 3 +-
+ .../devicetree/bindings/media/mediatek-mdp.txt | 109 ++
+ .../devicetree/bindings/media/mediatek-vcodec.txt | 57 +-
+ Documentation/media/uapi/v4l/hsv-formats.rst | 19 +
+ Documentation/media/uapi/v4l/pixfmt-002.rst | 5 +
+ Documentation/media/uapi/v4l/pixfmt-003.rst | 5 +
+ Documentation/media/uapi/v4l/pixfmt-006.rst | 31 +-
+ Documentation/media/uapi/v4l/pixfmt-013.rst | 5 +
+ Documentation/media/uapi/v4l/pixfmt-packed-hsv.rst | 157 +++
+ Documentation/media/uapi/v4l/pixfmt-reserved.rst | 10 +-
+ Documentation/media/uapi/v4l/pixfmt.rst | 1 +
+ Documentation/media/uapi/v4l/v4l2.rst | 9 +
+ .../media/v4l-drivers/au0828-cardlist.rst | 18 +-
+ Documentation/media/v4l-drivers/bttv-cardlist.rst | 340 ++---
+ .../media/v4l-drivers/cx23885-cardlist.rst | 122 +-
+ Documentation/media/v4l-drivers/cx88-cardlist.rst | 188 +--
+ .../media/v4l-drivers/em28xx-cardlist.rst | 206 +--
+ Documentation/media/v4l-drivers/gspca-cardlist.rst | 843 ++++++------
+ Documentation/media/v4l-drivers/ivtv-cardlist.rst | 61 +-
+ .../media/v4l-drivers/saa7134-cardlist.rst | 400 +++---
+ .../media/v4l-drivers/saa7164-cardlist.rst | 36 +-
+ .../media/v4l-drivers/tm6000-cardlist.rst | 39 +-
+ Documentation/media/v4l-drivers/tuner-cardlist.rst | 188 +--
+ .../media/v4l-drivers/usbvision-cardlist.rst | 142 +-
+ Documentation/media/videodev2.h.rst.exceptions | 4 +
+ MAINTAINERS | 18 +
+ arch/arm64/boot/dts/mediatek/mt8173.dtsi | 128 ++
+ drivers/media/common/b2c2/flexcop-common.h | 1 -
+ drivers/media/common/b2c2/flexcop-eeprom.c | 3 +-
+ drivers/media/common/b2c2/flexcop-i2c.c | 14 +-
+ drivers/media/common/b2c2/flexcop-misc.c | 9 +-
+ drivers/media/common/b2c2/flexcop.c | 3 +-
+ drivers/media/common/cx2341x.c | 12 +-
+ drivers/media/common/tveeprom.c | 77 +-
+ drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 411 ++++--
+ drivers/media/dvb-core/Kconfig | 13 +
+ drivers/media/dvb-core/Makefile | 2 +-
+ drivers/media/dvb-core/demux.h | 5 +-
+ drivers/media/dvb-core/dmxdev.c | 28 +-
+ drivers/media/dvb-core/dvb-usb-ids.h | 2 +
+ drivers/media/dvb-core/dvb_ca_en50221.c | 57 +-
+ drivers/media/dvb-core/dvb_demux.c | 115 +-
+ drivers/media/dvb-core/dvb_demux.h | 2 -
+ drivers/media/dvb-core/dvb_filter.c | 603 --------
+ drivers/media/dvb-core/dvb_frontend.c | 12 +-
+ drivers/media/dvb-core/dvb_net.c | 85 +-
+ drivers/media/dvb-core/dvbdev.c | 25 +-
+ drivers/media/dvb-frontends/au8522_common.c | 4 +-
+ drivers/media/dvb-frontends/cx24110.c | 4 +-
+ drivers/media/dvb-frontends/cx24113.c | 4 +-
+ drivers/media/dvb-frontends/cx24116.c | 8 +-
+ drivers/media/dvb-frontends/cx24117.c | 4 +-
+ drivers/media/dvb-frontends/cx24120.c | 3 +-
+ drivers/media/dvb-frontends/cx24123.c | 4 +-
+ drivers/media/dvb-frontends/ds3000.c | 15 +-
+ drivers/media/dvb-frontends/dvb-pll.c | 19 +-
+ drivers/media/dvb-frontends/lgdt330x.c | 3 +-
+ drivers/media/dvb-frontends/m88rs2000.c | 11 +-
+ drivers/media/dvb-frontends/mb86a20s.c | 1 +
+ drivers/media/dvb-frontends/mt312.c | 7 +-
+ drivers/media/dvb-frontends/nxt200x.c | 11 +-
+ drivers/media/dvb-frontends/nxt6000.c | 136 +-
+ drivers/media/dvb-frontends/or51132.c | 6 +-
+ drivers/media/dvb-frontends/or51211.c | 3 +-
+ drivers/media/dvb-frontends/s5h1409.c | 4 +-
+ drivers/media/dvb-frontends/s5h1411.c | 4 +-
+ drivers/media/dvb-frontends/s5h1432.c | 4 +-
+ drivers/media/dvb-frontends/s921.c | 4 +-
+ drivers/media/dvb-frontends/si21xx.c | 8 +-
+ drivers/media/dvb-frontends/sp887x.c | 3 +-
+ drivers/media/dvb-frontends/stv0288.c | 11 +-
+ drivers/media/dvb-frontends/stv0297.c | 4 +-
+ drivers/media/dvb-frontends/stv0299.c | 7 +-
+ drivers/media/dvb-frontends/stv0900_sw.c | 3 +-
+ drivers/media/dvb-frontends/tda10021.c | 3 +-
+ drivers/media/dvb-frontends/tda10023.c | 6 +-
+ drivers/media/dvb-frontends/tda10048.c | 12 +-
+ drivers/media/dvb-frontends/ves1820.c | 8 +-
+ drivers/media/dvb-frontends/zl10036.c | 4 +-
+ drivers/media/dvb-frontends/zl10039.c | 3 +-
+ drivers/media/firewire/firedtv-avc.c | 4 +-
+ drivers/media/firewire/firedtv-rc.c | 5 +-
+ drivers/media/i2c/ad5820.c | 5 +-
+ drivers/media/i2c/adv7604.c | 6 +-
+ drivers/media/i2c/cx25840/cx25840-core.c | 11 +-
+ drivers/media/i2c/cx25840/cx25840-ir.c | 7 +-
+ drivers/media/i2c/smiapp-pll.c | 3 +-
+ drivers/media/i2c/smiapp/smiapp-core.c | 946 ++++++-------
+ drivers/media/i2c/smiapp/smiapp-regs.c | 4 +-
+ drivers/media/i2c/smiapp/smiapp.h | 28 +-
+ drivers/media/i2c/soc_camera/ov772x.c | 3 +-
+ drivers/media/i2c/soc_camera/ov9740.c | 3 +-
+ drivers/media/i2c/soc_camera/tw9910.c | 3 +-
+ drivers/media/i2c/tvaudio.c | 5 +-
+ drivers/media/i2c/tvp514x.c | 6 +-
+ drivers/media/pci/b2c2/flexcop-dma.c | 6 +-
+ drivers/media/pci/b2c2/flexcop-pci.c | 7 +-
+ drivers/media/pci/bt8xx/bttv-cards.c | 9 +-
+ drivers/media/pci/bt8xx/bttv-driver.c | 6 +-
+ drivers/media/pci/bt8xx/bttv-i2c.c | 6 +-
+ drivers/media/pci/bt8xx/bttv-input.c | 4 +-
+ drivers/media/pci/cx18/cx18-alsa-main.c | 8 +-
+ drivers/media/pci/cx18/cx18-av-core.c | 17 +-
+ drivers/media/pci/cx18/cx18-av-firmware.c | 3 +-
+ drivers/media/pci/cx18/cx18-controls.c | 9 +-
+ drivers/media/pci/cx18/cx18-driver.c | 35 +-
+ drivers/media/pci/cx18/cx18-dvb.c | 6 +-
+ drivers/media/pci/cx18/cx18-fileops.c | 6 +-
+ drivers/media/pci/cx18/cx18-ioctl.c | 6 +-
+ drivers/media/pci/cx18/cx18-irq.c | 4 +-
+ drivers/media/pci/cx18/cx18-mailbox.c | 39 +-
+ drivers/media/pci/cx18/cx18-queue.c | 8 +-
+ drivers/media/pci/cx18/cx18-streams.c | 7 +-
+ drivers/media/pci/cx23885/cimax2.c | 7 +-
+ drivers/media/pci/cx23885/cx23885-417.c | 18 +-
+ drivers/media/pci/cx23885/cx23885-alsa.c | 15 +-
+ drivers/media/pci/cx23885/cx23885-cards.c | 8 +-
+ drivers/media/pci/cx23885/cx23885-core.c | 15 +-
+ drivers/media/pci/cx23885/cx23885-dvb.c | 3 +-
+ drivers/media/pci/cx23885/cx23885-video.c | 3 +-
+ drivers/media/pci/cx23885/cx23888-ir.c | 7 +-
+ drivers/media/pci/cx88/cx88-alsa.c | 15 +-
+ drivers/media/pci/cx88/cx88-cards.c | 14 +-
+ drivers/media/pci/cx88/cx88-dsp.c | 12 +-
+ drivers/media/pci/cx88/cx88-dvb.c | 8 +-
+ drivers/media/pci/cx88/cx88-i2c.c | 3 +-
+ drivers/media/pci/cx88/cx88-mpeg.c | 15 +-
+ drivers/media/pci/cx88/cx88-tvaudio.c | 6 +-
+ drivers/media/pci/cx88/cx88-video.c | 4 +-
+ drivers/media/pci/ddbridge/ddbridge-core.c | 6 +-
+ drivers/media/pci/dm1105/dm1105.c | 3 +-
+ drivers/media/pci/ivtv/ivtv-alsa-main.c | 12 +-
+ drivers/media/pci/ivtv/ivtv-driver.c | 37 +-
+ drivers/media/pci/ivtv/ivtv-firmware.c | 4 +-
+ drivers/media/pci/ivtv/ivtv-yuv.c | 8 +-
+ drivers/media/pci/ivtv/ivtvfb.c | 3 +-
+ drivers/media/pci/meye/meye.c | 12 +-
+ drivers/media/pci/pt1/pt1.c | 7 +-
+ drivers/media/pci/saa7134/saa7134-alsa.c | 3 +-
+ drivers/media/pci/saa7134/saa7134-cards.c | 8 +-
+ drivers/media/pci/saa7134/saa7134-core.c | 39 +-
+ drivers/media/pci/saa7134/saa7134-dvb.c | 32 +-
+ drivers/media/pci/saa7134/saa7134-input.c | 13 +-
+ drivers/media/pci/saa7164/saa7164-buffer.c | 3 +-
+ drivers/media/pci/saa7164/saa7164-bus.c | 4 +-
+ drivers/media/pci/saa7164/saa7164-cards.c | 4 +-
+ drivers/media/pci/saa7164/saa7164-cmd.c | 12 +-
+ drivers/media/pci/saa7164/saa7164-core.c | 66 +-
+ drivers/media/pci/saa7164/saa7164-dvb.c | 34 +-
+ drivers/media/pci/saa7164/saa7164-encoder.c | 18 +-
+ drivers/media/pci/saa7164/saa7164-fw.c | 10 +-
+ drivers/media/pci/saa7164/saa7164-vbi.c | 14 +-
+ drivers/media/pci/solo6x10/solo6x10-v4l2.c | 4 +-
+ drivers/media/pci/ttpci/Makefile | 2 +-
+ drivers/media/pci/ttpci/av7110.c | 30 +-
+ drivers/media/pci/ttpci/av7110_hw.c | 12 +-
+ drivers/media/pci/ttpci/budget-av.c | 3 +-
+ drivers/media/pci/ttpci/budget-ci.c | 4 +-
+ drivers/media/pci/ttpci/budget-patch.c | 3 +-
+ drivers/media/pci/ttpci/budget.c | 3 +-
+ drivers/media/pci/ttpci/dvb_filter.c | 114 ++
+ drivers/media/{dvb-core => pci/ttpci}/dvb_filter.h | 0
+ drivers/media/pci/ttpci/ttpci-eeprom.c | 3 +-
+ drivers/media/pci/tw5864/tw5864-reg.h | 8 +
+ drivers/media/pci/tw5864/tw5864-video.c | 13 +-
+ drivers/media/pci/tw68/tw68-video.c | 16 +-
+ drivers/media/platform/Kconfig | 19 +-
+ drivers/media/platform/Makefile | 2 +
+ drivers/media/platform/atmel/atmel-isc.c | 8 +-
+ drivers/media/platform/coda/coda-common.c | 7 +-
+ drivers/media/platform/coda/coda-h264.c | 1 +
+ drivers/media/platform/davinci/dm355_ccdc.c | 4 +-
+ drivers/media/platform/davinci/dm644x_ccdc.c | 4 +-
+ drivers/media/platform/davinci/vpbe.c | 15 +-
+ drivers/media/platform/davinci/vpfe_capture.c | 6 +-
+ drivers/media/platform/davinci/vpif_capture.c | 9 +-
+ drivers/media/platform/davinci/vpif_display.c | 9 +-
+ drivers/media/platform/davinci/vpss.c | 7 +-
+ drivers/media/platform/exynos4-is/media-dev.c | 3 +-
+ drivers/media/platform/marvell-ccic/mcam-core.c | 26 +-
+ drivers/media/platform/mtk-mdp/Makefile | 9 +
+ drivers/media/platform/mtk-mdp/mtk_mdp_comp.c | 159 +++
+ drivers/media/platform/mtk-mdp/mtk_mdp_comp.h | 72 +
+ drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 294 ++++
+ drivers/media/platform/mtk-mdp/mtk_mdp_core.h | 260 ++++
+ drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h | 126 ++
+ drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 1279 +++++++++++++++++
+ drivers/media/platform/mtk-mdp/mtk_mdp_m2m.h | 22 +
+ drivers/media/platform/mtk-mdp/mtk_mdp_regs.c | 156 +++
+ drivers/media/platform/mtk-mdp/mtk_mdp_regs.h | 31 +
+ drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c | 145 ++
+ drivers/media/platform/mtk-mdp/mtk_mdp_vpu.h | 41 +
+ drivers/media/platform/mtk-vcodec/Makefile | 15 +-
+ drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 1447 ++++++++++++++++++++
+ drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h | 88 ++
+ .../media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 394 ++++++
+ .../media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 202 +++
+ .../media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h | 28 +
+ drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 62 +-
+ .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 8 +-
+ .../media/platform/mtk-vcodec/mtk_vcodec_intr.c | 3 +-
+ .../media/platform/mtk-vcodec/mtk_vcodec_util.c | 33 +-
+ .../media/platform/mtk-vcodec/mtk_vcodec_util.h | 5 +
+ .../media/platform/mtk-vcodec/vdec/vdec_h264_if.c | 507 +++++++
+ .../media/platform/mtk-vcodec/vdec/vdec_vp8_if.c | 634 +++++++++
+ .../media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 967 +++++++++++++
+ drivers/media/platform/mtk-vcodec/vdec_drv_base.h | 56 +
+ drivers/media/platform/mtk-vcodec/vdec_drv_if.c | 122 ++
+ drivers/media/platform/mtk-vcodec/vdec_drv_if.h | 101 ++
+ drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h | 103 ++
+ drivers/media/platform/mtk-vcodec/vdec_vpu_if.c | 170 +++
+ drivers/media/platform/mtk-vcodec/vdec_vpu_if.h | 96 ++
+ drivers/media/platform/mtk-vpu/mtk_vpu.c | 21 +-
+ drivers/media/platform/mtk-vpu/mtk_vpu.h | 48 +-
+ drivers/media/platform/mx2_emmaprp.c | 10 +-
+ drivers/media/platform/omap/omap_vout.c | 24 +-
+ drivers/media/platform/omap/omap_vout_vrfb.c | 5 +-
+ drivers/media/platform/omap3isp/isp.c | 4 +-
+ drivers/media/platform/omap3isp/ispccdc.c | 9 +-
+ drivers/media/platform/omap3isp/ispcsi2.c | 13 +-
+ drivers/media/platform/omap3isp/ispcsiphy.c | 4 +-
+ drivers/media/platform/omap3isp/isph3a_aewb.c | 8 +-
+ drivers/media/platform/omap3isp/isph3a_af.c | 8 +-
+ drivers/media/platform/omap3isp/ispstat.c | 58 +-
+ drivers/media/platform/pxa_camera.c | 18 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc.c | 1 +
+ drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 13 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 7 +-
+ drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 1 +
+ .../media/platform/sti/c8sectpfe/c8sectpfe-core.c | 16 +-
+ drivers/media/platform/ti-vpe/vpdma.c | 22 +-
+ drivers/media/platform/ti-vpe/vpe.c | 3 +-
+ drivers/media/platform/via-camera.c | 7 +-
+ drivers/media/platform/vivid/vivid-core.h | 3 +-
+ drivers/media/platform/vivid/vivid-ctrls.c | 25 +
+ drivers/media/platform/vivid/vivid-vid-cap.c | 17 +-
+ drivers/media/platform/vivid/vivid-vid-common.c | 68 +-
+ drivers/media/platform/vivid/vivid-vid-out.c | 1 +
+ drivers/media/platform/vsp1/vsp1_pipe.c | 8 +
+ drivers/media/platform/vsp1/vsp1_rwpf.c | 2 +
+ drivers/media/platform/vsp1/vsp1_video.c | 5 +
+ drivers/media/radio/radio-gemtek.c | 8 +-
+ drivers/media/radio/radio-wl1273.c | 3 +-
+ drivers/media/radio/si470x/radio-si470x-i2c.c | 7 +-
+ drivers/media/radio/si470x/radio-si470x-usb.c | 15 +-
+ drivers/media/radio/si4713/si4713.c | 13 +-
+ drivers/media/radio/wl128x/fmdrv_common.c | 30 +-
+ drivers/media/radio/wl128x/fmdrv_rx.c | 8 +-
+ drivers/media/rc/ati_remote.c | 3 +-
+ drivers/media/rc/ene_ir.c | 3 +-
+ drivers/media/rc/imon.c | 61 +-
+ drivers/media/rc/ite-cir.c | 11 +-
+ drivers/media/rc/mceusb.c | 4 +-
+ drivers/media/rc/nuvoton-cir.c | 50 +-
+ drivers/media/rc/rc-ir-raw.c | 17 +-
+ drivers/media/rc/rc-main.c | 61 +-
+ drivers/media/rc/redrat3.c | 18 +-
+ drivers/media/rc/streamzap.c | 11 +-
+ drivers/media/rc/winbond-cir.c | 9 +-
+ drivers/media/spi/gs1662.c | 4 +-
+ drivers/media/tuners/fc0011.c | 7 +-
+ drivers/media/tuners/mc44s803.c | 4 +-
+ drivers/media/tuners/mt20xx.c | 21 +-
+ drivers/media/tuners/tda18271-common.c | 4 +-
+ drivers/media/tuners/tda18271-fe.c | 3 +-
+ drivers/media/tuners/tda18271-maps.c | 6 +-
+ drivers/media/tuners/tda8290.c | 4 +-
+ drivers/media/tuners/tea5761.c | 6 +-
+ drivers/media/tuners/tuner-simple.c | 45 +-
+ drivers/media/tuners/tuner-xc2028.c | 116 +-
+ drivers/media/tuners/xc4000.c | 25 +-
+ drivers/media/usb/au0828/au0828-video.c | 3 +-
+ drivers/media/usb/b2c2/flexcop-usb.c | 116 +-
+ drivers/media/usb/b2c2/flexcop-usb.h | 4 +
+ drivers/media/usb/cpia2/cpia2_usb.c | 38 +-
+ drivers/media/usb/cx231xx/cx231xx-core.c | 10 +-
+ drivers/media/usb/cx231xx/cx231xx-dvb.c | 4 +-
+ drivers/media/usb/dvb-usb-v2/af9035.c | 2 +
+ drivers/media/usb/dvb-usb-v2/dvbsky.c | 4 +
+ drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.c | 12 +-
+ drivers/media/usb/dvb-usb-v2/mxl111sf.c | 10 +-
+ drivers/media/usb/dvb-usb/af9005.c | 319 +++--
+ drivers/media/usb/dvb-usb/cinergyT2-core.c | 96 +-
+ drivers/media/usb/dvb-usb/cinergyT2-fe.c | 100 +-
+ drivers/media/usb/dvb-usb/cxusb.c | 62 +-
+ drivers/media/usb/dvb-usb/cxusb.h | 6 +
+ drivers/media/usb/dvb-usb/dib0700_core.c | 36 +-
+ drivers/media/usb/dvb-usb/dib0700_devices.c | 28 +-
+ drivers/media/usb/dvb-usb/dibusb-common.c | 113 +-
+ drivers/media/usb/dvb-usb/dibusb.h | 3 +
+ drivers/media/usb/dvb-usb/digitv.c | 26 +-
+ drivers/media/usb/dvb-usb/digitv.h | 5 +-
+ drivers/media/usb/dvb-usb/dtt200u-fe.c | 128 +-
+ drivers/media/usb/dvb-usb/dtt200u.c | 120 +-
+ drivers/media/usb/dvb-usb/dtv5100.c | 10 +-
+ drivers/media/usb/dvb-usb/dvb-usb-dvb.c | 3 +-
+ drivers/media/usb/dvb-usb/dvb-usb-firmware.c | 6 +-
+ drivers/media/usb/dvb-usb/dvb-usb.h | 6 +-
+ drivers/media/usb/dvb-usb/dw2102.c | 14 +-
+ drivers/media/usb/dvb-usb/friio.c | 4 +-
+ drivers/media/usb/dvb-usb/gp8psk.c | 28 +-
+ drivers/media/usb/dvb-usb/nova-t-usb2.c | 25 +-
+ drivers/media/usb/dvb-usb/opera1.c | 3 +-
+ drivers/media/usb/dvb-usb/pctv452e.c | 136 +-
+ drivers/media/usb/dvb-usb/technisat-usb2.c | 19 +-
+ drivers/media/usb/em28xx/em28xx-audio.c | 45 +-
+ drivers/media/usb/em28xx/em28xx-camera.c | 53 +-
+ drivers/media/usb/em28xx/em28xx-cards.c | 158 +--
+ drivers/media/usb/em28xx/em28xx-core.c | 105 +-
+ drivers/media/usb/em28xx/em28xx-dvb.c | 73 +-
+ drivers/media/usb/em28xx/em28xx-i2c.c | 183 +--
+ drivers/media/usb/em28xx/em28xx-input.c | 29 +-
+ drivers/media/usb/em28xx/em28xx-vbi.c | 7 +-
+ drivers/media/usb/em28xx/em28xx-video.c | 105 +-
+ drivers/media/usb/em28xx/em28xx.h | 18 +-
+ drivers/media/usb/gspca/gspca.c | 3 +-
+ drivers/media/usb/gspca/m5602/m5602_core.c | 11 +-
+ drivers/media/usb/gspca/mr97310a.c | 3 +-
+ drivers/media/usb/gspca/ov519.c | 3 +-
+ drivers/media/usb/gspca/pac207.c | 4 +-
+ drivers/media/usb/gspca/pac7302.c | 3 +-
+ drivers/media/usb/gspca/sn9c20x.c | 6 +-
+ drivers/media/usb/gspca/spca506.c | 3 +-
+ drivers/media/usb/gspca/sq905.c | 3 +-
+ drivers/media/usb/gspca/sq905c.c | 4 +-
+ drivers/media/usb/gspca/stv06xx/stv06xx.c | 27 +-
+ drivers/media/usb/gspca/sunplus.c | 3 +-
+ drivers/media/usb/gspca/topro.c | 3 +-
+ drivers/media/usb/gspca/zc3xx.c | 3 +-
+ drivers/media/usb/hdpvr/hdpvr-core.c | 9 +-
+ drivers/media/usb/hdpvr/hdpvr-i2c.c | 7 +-
+ drivers/media/usb/hdpvr/hdpvr-video.c | 4 +-
+ drivers/media/usb/pvrusb2/pvrusb2-audio.c | 4 +-
+ drivers/media/usb/pvrusb2/pvrusb2-cs53l32a.c | 4 +-
+ drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.c | 4 +-
+ drivers/media/usb/pvrusb2/pvrusb2-debugifc.c | 4 +-
+ drivers/media/usb/pvrusb2/pvrusb2-eeprom.c | 7 +-
+ drivers/media/usb/pvrusb2/pvrusb2-encoder.c | 29 +-
+ drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 181 +--
+ drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c | 33 +-
+ drivers/media/usb/pvrusb2/pvrusb2-io.c | 35 +-
+ drivers/media/usb/pvrusb2/pvrusb2-ioread.c | 36 +-
+ drivers/media/usb/pvrusb2/pvrusb2-std.c | 3 +-
+ drivers/media/usb/pvrusb2/pvrusb2-sysfs.c | 1 -
+ drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 10 +-
+ drivers/media/usb/pvrusb2/pvrusb2-video-v4l.c | 4 +-
+ drivers/media/usb/pvrusb2/pvrusb2-wm8775.c | 3 +-
+ drivers/media/usb/pwc/pwc-if.c | 4 +-
+ drivers/media/usb/pwc/pwc-v4l.c | 6 +-
+ drivers/media/usb/s2255/s2255drv.c | 15 +-
+ drivers/media/usb/siano/smsusb.c | 4 +-
+ drivers/media/usb/stkwebcam/stk-sensor.c | 4 +-
+ drivers/media/usb/stkwebcam/stk-webcam.c | 19 +-
+ drivers/media/usb/tm6000/tm6000-alsa.c | 4 +-
+ drivers/media/usb/tm6000/tm6000-core.c | 14 +-
+ drivers/media/usb/tm6000/tm6000-dvb.c | 16 +-
+ drivers/media/usb/tm6000/tm6000-i2c.c | 3 +-
+ drivers/media/usb/tm6000/tm6000-stds.c | 3 +-
+ drivers/media/usb/tm6000/tm6000-video.c | 18 +-
+ drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | 3 +-
+ drivers/media/usb/ttusb-dec/ttusb_dec.c | 78 +-
+ drivers/media/usb/usbvision/usbvision-core.c | 20 +-
+ drivers/media/usb/usbvision/usbvision-video.c | 4 +-
+ drivers/media/usb/uvc/uvc_driver.c | 148 +-
+ drivers/media/usb/zr364xx/zr364xx.c | 6 +-
+ drivers/media/v4l2-core/tuner-core.c | 15 +-
+ drivers/media/v4l2-core/v4l2-flash-led-class.c | 16 +-
+ drivers/media/v4l2-core/v4l2-ioctl.c | 95 +-
+ drivers/media/v4l2-core/videobuf-core.c | 3 +-
+ drivers/media/v4l2-core/videobuf2-core.c | 25 +-
+ drivers/media/v4l2-core/videobuf2-v4l2.c | 10 +-
+ drivers/media/v4l2-core/videobuf2-vmalloc.c | 3 +-
+ drivers/staging/media/bcm2048/radio-bcm2048.c | 2 +
+ drivers/staging/media/bcm2048/radio-bcm2048.h | 5 -
+ drivers/staging/media/lirc/lirc_imon.c | 6 +-
+ drivers/staging/media/st-cec/stih-cec.c | 1 -
+ include/media/rc-core.h | 18 +
+ include/media/v4l2-tpg.h | 24 +-
+ include/uapi/linux/videodev2.h | 38 +-
+ 379 files changed, 13573 insertions(+), 5449 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/media/mediatek-mdp.txt
+ create mode 100644 Documentation/media/uapi/v4l/hsv-formats.rst
+ create mode 100644 Documentation/media/uapi/v4l/pixfmt-packed-hsv.rst
+ delete mode 100644 drivers/media/dvb-core/dvb_filter.c
+ create mode 100644 drivers/media/pci/ttpci/dvb_filter.c
+ rename drivers/media/{dvb-core => pci/ttpci}/dvb_filter.h (100%)
+ create mode 100644 drivers/media/platform/mtk-mdp/Makefile
+ create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_comp.c
+ create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_comp.h
+ create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_core.c
+ create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_core.h
+ create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h
+ create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
+ create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_m2m.h
+ create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_regs.c
+ create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_regs.h
+ create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c
+ create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_vpu.h
+ create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
+ create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h
+ create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
+ create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
+ create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h
+ create mode 100644 drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c
+ create mode 100644 drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c
+ create mode 100644 drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c
+ create mode 100644 drivers/media/platform/mtk-vcodec/vdec_drv_base.h
+ create mode 100644 drivers/media/platform/mtk-vcodec/vdec_drv_if.c
+ create mode 100644 drivers/media/platform/mtk-vcodec/vdec_drv_if.h
+ create mode 100644 drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h
+ create mode 100644 drivers/media/platform/mtk-vcodec/vdec_vpu_if.c
+ create mode 100644 drivers/media/platform/mtk-vcodec/vdec_vpu_if.h
+Merging pm/linux-next (bcafe7d76f52 Merge branches 'pm-cpufreq-fixes', 'pm-cpuidle', 'pm-sleep' and 'pm-domains' into linux-next)
+$ git merge pm/linux-next
+Resolved 'arch/arm/mach-imx/gpc.c' using previous resolution.
+Auto-merging arch/arm/mach-imx/gpc.c
+CONFLICT (content): Merge conflict in arch/arm/mach-imx/gpc.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 5d174840411a] Merge remote-tracking branch 'pm/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/cpu-freq/intel-pstate.txt | 9 +-
+ .../devicetree/bindings/power/power_domain.txt | 43 +++
+ Documentation/power/devices.txt | 14 +-
+ arch/arm/mach-imx/gpc.c | 17 +-
+ arch/x86/kernel/acpi/boot.c | 1 +
+ drivers/acpi/acpi_apd.c | 7 +-
+ drivers/acpi/acpica/acglobal.h | 5 +-
+ drivers/acpi/acpica/aclocal.h | 19 +-
+ drivers/acpi/acpica/tbxfload.c | 6 +-
+ drivers/acpi/apei/ghes.c | 2 +-
+ drivers/acpi/pci_link.c | 38 ++-
+ drivers/base/power/domain.c | 358 +++++++++++++++++----
+ drivers/base/power/opp/of.c | 6 +-
+ drivers/base/power/opp/opp.h | 1 -
+ drivers/base/power/runtime.c | 19 +-
+ drivers/cpufreq/cppc_cpufreq.c | 7 +
+ drivers/cpufreq/intel_pstate.c | 49 ++-
+ drivers/cpuidle/governor.c | 4 -
+ drivers/cpuidle/governors/ladder.c | 2 -
+ drivers/cpuidle/governors/menu.c | 2 -
+ drivers/idle/i7300_idle.c | 11 +-
+ drivers/power/avs/rockchip-io-domain.c | 2 +-
+ include/acpi/acconfig.h | 2 +-
+ include/acpi/acpixf.h | 9 +-
+ include/linux/acpi.h | 1 +
+ include/linux/cpuidle.h | 2 -
+ include/linux/pm_domain.h | 28 +-
+ include/linux/pm_runtime.h | 11 +-
+ kernel/power/suspend.c | 4 +-
+ .../acpi/os_specific/service_layers/osunixxf.c | 13 +-
+ 30 files changed, 533 insertions(+), 159 deletions(-)
+Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
+$ git merge idle/next
+Already up-to-date.
+Merging thermal/next (3105f234e0ab thermal/powerclamp: correct cpu support check)
+$ git merge thermal/next
+Merge made by the 'recursive' strategy.
+ drivers/thermal/intel_pch_thermal.c | 60 +++++++++++++++++++++++++++++++++++++
+ drivers/thermal/intel_powerclamp.c | 14 ++-------
+ 2 files changed, 62 insertions(+), 12 deletions(-)
+Merging thermal-soc/next (c6935931c189 Linux 4.8-rc5)
+$ git merge thermal-soc/next
+Already up-to-date.
+Merging ieee1394/for-next (6449e31ddebd firewire: nosy: do not ignore errors in ioremap_nocache())
+$ git merge ieee1394/for-next
+Already up-to-date.
+Merging dlm/next (aa9f1012858b dlm: don't specify WQ_UNBOUND for the ast callback workqueue)
+$ git merge dlm/next
+Merge made by the 'recursive' strategy.
+ fs/dlm/ast.c | 2 +-
+ fs/dlm/config.c | 2 +-
+ fs/dlm/debug_fs.c | 2 +-
+ fs/dlm/dlm_internal.h | 1 -
+ fs/dlm/lockspace.c | 2 ++
+ fs/dlm/lowcomms.c | 25 ++++++++++++-------------
+ fs/dlm/main.c | 2 ++
+ fs/dlm/netlink.c | 2 +-
+ fs/dlm/user.c | 1 -
+ 9 files changed, 20 insertions(+), 19 deletions(-)
+Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
+$ git merge swiotlb/linux-next
+Already up-to-date.
+Merging net-next/master (432490f9d455 net: ip, diag -- Add diag interface for raw sockets)
+$ git merge net-next/master
+Resolved 'drivers/net/ethernet/ibm/ibmvnic.c' using previous resolution.
+Resolved 'include/linux/netdevice.h' using previous resolution.
+Resolved 'include/net/udp.h' using previous resolution.
+Resolved 'net/core/dev.c' using previous resolution.
+Auto-merging tools/testing/selftests/bpf/test_verifier.c
+Removing samples/bpf/test_maps.c
+Auto-merging net/sunrpc/xprtsock.c
+Auto-merging net/sched/act_mirred.c
+Auto-merging net/ipv6/raw.c
+Auto-merging net/ipv6/ip6_vti.c
+Auto-merging net/ipv6/ip6_tunnel.c
+Auto-merging net/ipv4/udp.c
+Auto-merging net/ipv4/tcp_ipv4.c
+Auto-merging net/ipv4/raw.c
+Auto-merging net/ethernet/eth.c
+Auto-merging net/core/net_namespace.c
+Auto-merging net/core/dev.c
+CONFLICT (content): Merge conflict in net/core/dev.c
+Auto-merging net/8021q/vlan.c
+Auto-merging include/net/udp.h
+CONFLICT (content): Merge conflict in include/net/udp.h
+Auto-merging include/linux/netdevice.h
+CONFLICT (content): Merge conflict in include/linux/netdevice.h
+Removing include/dt-bindings/net/mscc-phy-vsc8531.h
+Auto-merging drivers/usb/gadget/function/u_ether.c
+Auto-merging drivers/net/vxlan.c
+Auto-merging drivers/net/vmxnet3/vmxnet3_drv.c
+Auto-merging drivers/net/hyperv/netvsc_drv.c
+Auto-merging drivers/net/geneve.c
+Auto-merging drivers/net/ethernet/synopsys/dwc_eth_qos.c
+Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac.h
+Auto-merging drivers/net/ethernet/realtek/r8169.c
+Auto-merging drivers/net/ethernet/qualcomm/emac/emac.c
+Auto-merging drivers/net/ethernet/qlogic/qede/qede_main.c
+Auto-merging drivers/net/ethernet/qlogic/qede/qede_ethtool.c
+Auto-merging drivers/net/ethernet/qlogic/qede/qede.h
+Auto-merging drivers/net/ethernet/qlogic/qed/qed_spq.c
+Auto-merging drivers/net/ethernet/qlogic/qed/qed_sp.h
+Auto-merging drivers/net/ethernet/qlogic/qed/qed_roce.c
+Auto-merging drivers/net/ethernet/mellanox/mlxsw/switchx2.c
+Auto-merging drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
+Auto-merging drivers/net/ethernet/mellanox/mlxsw/pci.c
+Auto-merging drivers/net/ethernet/ibm/ibmvnic.c
+CONFLICT (content): Merge conflict in drivers/net/ethernet/ibm/ibmvnic.c
+Auto-merging drivers/net/ethernet/hisilicon/hns/hns_enet.c
+Auto-merging drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
+Auto-merging drivers/net/ethernet/freescale/fec_main.c
+Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+Auto-merging drivers/net/ethernet/broadcom/bnx2.c
+Auto-merging drivers/net/ethernet/broadcom/bcm63xx_enet.c
+Auto-merging drivers/net/ethernet/aurora/nb8800.c
+Auto-merging drivers/media/dvb-core/dvb_net.c
+Auto-merging drivers/infiniband/ulp/ipoib/ipoib_main.c
+Auto-merging arch/arm/boot/dts/vf610-zii-dev-rev-b.dts
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 9fba39fd558f] Merge remote-tracking branch 'net-next/master'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/net/dsa/marvell.txt | 21 +-
+ .../devicetree/bindings/net/mscc-phy-vsc8531.txt | 51 +-
+ .../devicetree/bindings/net/smsc-lan91c111.txt | 2 +
+ .../devicetree/bindings/net/ti,dp83867.txt | 12 +
+ MAINTAINERS | 3 +-
+ arch/arm/boot/dts/dra72-evm-revc.dts | 10 +-
+ arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 51 ++
+ arch/arm/mach-pxa/idp.c | 1 +
+ arch/arm/mach-pxa/mainstone.c | 1 +
+ arch/arm/mach-pxa/stargate2.c | 1 +
+ arch/arm64/configs/defconfig | 1 +
+ arch/m68k/emu/nfeth.c | 1 -
+ arch/mn10300/unit-asb2303/include/unit/smc91111.h | 2 +-
+ arch/um/drivers/net_kern.c | 8 -
+ drivers/char/pcmcia/synclink_cs.c | 1 -
+ drivers/firewire/net.c | 18 +-
+ drivers/hsi/clients/ssi_protocol.c | 14 +-
+ drivers/infiniband/core/core_priv.h | 9 +-
+ drivers/infiniband/core/roce_gid_mgmt.c | 42 +-
+ drivers/infiniband/hw/nes/nes.c | 1 -
+ drivers/infiniband/hw/nes/nes.h | 4 +-
+ drivers/infiniband/hw/nes/nes_nic.c | 10 +-
+ drivers/infiniband/ulp/ipoib/ipoib_main.c | 38 +-
+ drivers/isdn/hysdn/hysdn_net.c | 1 -
+ drivers/media/dvb-core/dvb_net.c | 2 +-
+ drivers/message/fusion/mptlan.c | 15 +-
+ drivers/misc/sgi-xp/xpnet.c | 21 +-
+ drivers/net/appletalk/ipddp.c | 1 -
+ drivers/net/bonding/bond_alb.c | 82 ++-
+ drivers/net/bonding/bond_main.c | 17 +-
+ drivers/net/cris/eth_v10.c | 1 -
+ drivers/net/dsa/mv88e6xxx/chip.c | 250 ++++++-
+ drivers/net/dsa/mv88e6xxx/global2.c | 139 +++-
+ drivers/net/dsa/mv88e6xxx/global2.h | 11 +
+ drivers/net/dsa/mv88e6xxx/mv88e6xxx.h | 31 +
+ drivers/net/ethernet/3com/3c509.c | 1 -
+ drivers/net/ethernet/3com/3c515.c | 1 -
+ drivers/net/ethernet/3com/3c574_cs.c | 1 -
+ drivers/net/ethernet/3com/3c589_cs.c | 1 -
+ drivers/net/ethernet/3com/3c59x.c | 2 -
+ drivers/net/ethernet/3com/typhoon.c | 1 -
+ drivers/net/ethernet/8390/8390.c | 1 -
+ drivers/net/ethernet/8390/8390p.c | 1 -
+ drivers/net/ethernet/8390/ax88796.c | 1 -
+ drivers/net/ethernet/8390/axnet_cs.c | 1 -
+ drivers/net/ethernet/8390/etherh.c | 1 -
+ drivers/net/ethernet/8390/hydra.c | 1 -
+ drivers/net/ethernet/8390/mac8390.c | 1 -
+ drivers/net/ethernet/8390/mcf8390.c | 1 -
+ drivers/net/ethernet/8390/ne2k-pci.c | 1 -
+ drivers/net/ethernet/8390/pcnet_cs.c | 1 -
+ drivers/net/ethernet/8390/smc-ultra.c | 1 -
+ drivers/net/ethernet/8390/wd.c | 1 -
+ drivers/net/ethernet/8390/zorro8390.c | 1 -
+ drivers/net/ethernet/adaptec/starfire.c | 1 -
+ drivers/net/ethernet/adi/bfin_mac.c | 1 -
+ drivers/net/ethernet/agere/et131x.c | 7 +-
+ drivers/net/ethernet/allwinner/sun4i-emac.c | 1 -
+ drivers/net/ethernet/alteon/acenic.c | 5 +-
+ drivers/net/ethernet/altera/altera_tse.h | 1 -
+ drivers/net/ethernet/altera/altera_tse_main.c | 14 +-
+ drivers/net/ethernet/amazon/ena/ena_netdev.c | 9 +-
+ drivers/net/ethernet/amd/a2065.c | 1 -
+ drivers/net/ethernet/amd/am79c961a.c | 1 -
+ drivers/net/ethernet/amd/amd8111e.c | 5 +-
+ drivers/net/ethernet/amd/ariadne.c | 1 -
+ drivers/net/ethernet/amd/atarilance.c | 1 -
+ drivers/net/ethernet/amd/au1000_eth.c | 1 -
+ drivers/net/ethernet/amd/declance.c | 1 -
+ drivers/net/ethernet/amd/hplance.c | 1 -
+ drivers/net/ethernet/amd/lance.c | 1 -
+ drivers/net/ethernet/amd/mvme147.c | 1 -
+ drivers/net/ethernet/amd/ni65.c | 1 -
+ drivers/net/ethernet/amd/nmclan_cs.c | 1 -
+ drivers/net/ethernet/amd/pcnet32.c | 1 -
+ drivers/net/ethernet/amd/sun3lance.c | 1 -
+ drivers/net/ethernet/amd/sunlance.c | 1 -
+ drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 5 -
+ drivers/net/ethernet/amd/xgbe/xgbe-main.c | 2 +
+ drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 7 +-
+ drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 1 +
+ drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 19 +-
+ drivers/net/ethernet/apple/bmac.c | 1 -
+ drivers/net/ethernet/apple/mace.c | 1 -
+ drivers/net/ethernet/apple/macmace.c | 1 -
+ drivers/net/ethernet/arc/emac_main.c | 2 +-
+ drivers/net/ethernet/atheros/alx/hw.h | 1 -
+ drivers/net/ethernet/atheros/alx/main.c | 10 +-
+ drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 41 +-
+ drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 12 +-
+ drivers/net/ethernet/atheros/atlx/atl1.c | 15 +-
+ drivers/net/ethernet/atheros/atlx/atl2.c | 16 +-
+ drivers/net/ethernet/atheros/atlx/atl2.h | 3 -
+ drivers/net/ethernet/aurora/nb8800.c | 5 +-
+ drivers/net/ethernet/broadcom/b44.c | 9 +-
+ drivers/net/ethernet/broadcom/bcm63xx_enet.c | 35 +-
+ drivers/net/ethernet/broadcom/bnx2.c | 16 +-
+ drivers/net/ethernet/broadcom/bnx2.h | 6 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 6 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 8 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 22 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 7 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.c | 7 +-
+ drivers/net/ethernet/broadcom/sb1250-mac.c | 12 +-
+ drivers/net/ethernet/broadcom/tg3.c | 9 +-
+ drivers/net/ethernet/brocade/bna/bnad.c | 7 +-
+ drivers/net/ethernet/cadence/macb.c | 193 +++--
+ drivers/net/ethernet/cadence/macb.h | 3 +
+ drivers/net/ethernet/calxeda/xgmac.c | 20 +-
+ drivers/net/ethernet/cavium/liquidio/lio_main.c | 15 +-
+ .../net/ethernet/cavium/liquidio/octeon_network.h | 2 +-
+ drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 13 +-
+ drivers/net/ethernet/cavium/thunder/nicvf_main.c | 10 +-
+ drivers/net/ethernet/chelsio/cxgb/common.h | 5 +
+ drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 18 +-
+ drivers/net/ethernet/chelsio/cxgb/pm3393.c | 8 +-
+ drivers/net/ethernet/chelsio/cxgb/vsc7326.c | 5 -
+ drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 4 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 6 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c | 2 +-
+ .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 6 +-
+ drivers/net/ethernet/cirrus/cs89x0.c | 1 -
+ drivers/net/ethernet/cirrus/ep93xx_eth.c | 1 -
+ drivers/net/ethernet/cirrus/mac89x0.c | 1 -
+ drivers/net/ethernet/cisco/enic/enic_main.c | 7 +-
+ drivers/net/ethernet/cisco/enic/enic_res.h | 2 +-
+ drivers/net/ethernet/davicom/dm9000.c | 1 -
+ drivers/net/ethernet/dec/tulip/de2104x.c | 1 -
+ drivers/net/ethernet/dec/tulip/de4x5.c | 1 -
+ drivers/net/ethernet/dec/tulip/dmfe.c | 1 -
+ drivers/net/ethernet/dec/tulip/tulip_core.c | 1 -
+ drivers/net/ethernet/dec/tulip/uli526x.c | 1 -
+ drivers/net/ethernet/dec/tulip/winbond-840.c | 1 -
+ drivers/net/ethernet/dec/tulip/xircom_cb.c | 1 -
+ drivers/net/ethernet/dlink/dl2k.c | 22 +-
+ drivers/net/ethernet/dlink/sundance.c | 6 +-
+ drivers/net/ethernet/dnet.c | 1 -
+ drivers/net/ethernet/ec_bhf.c | 1 -
+ drivers/net/ethernet/emulex/benet/be_main.c | 22 +-
+ drivers/net/ethernet/fealnx.c | 1 -
+ drivers/net/ethernet/freescale/fec_main.c | 26 +-
+ drivers/net/ethernet/freescale/fec_mpc52xx.c | 1 -
+ drivers/net/ethernet/freescale/fman/mac.c | 8 +-
+ .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 44 +-
+ drivers/net/ethernet/freescale/fs_enet/fs_enet.h | 1 -
+ drivers/net/ethernet/freescale/gianfar.c | 9 +-
+ drivers/net/ethernet/freescale/ucc_geth.c | 1 -
+ drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 1 -
+ drivers/net/ethernet/hisilicon/hip04_eth.c | 2 -
+ drivers/net/ethernet/hisilicon/hisi_femac.c | 1 -
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 3 +-
+ drivers/net/ethernet/hisilicon/hns/hns_enet.c | 11 +-
+ drivers/net/ethernet/hp/hp100.c | 2 -
+ drivers/net/ethernet/i825xx/82596.c | 1 -
+ drivers/net/ethernet/i825xx/ether1.c | 1 -
+ drivers/net/ethernet/i825xx/lib82596.c | 1 -
+ drivers/net/ethernet/i825xx/sun3_82586.c | 1 -
+ drivers/net/ethernet/ibm/ehea/ehea_main.c | 13 +-
+ drivers/net/ethernet/ibm/emac/core.c | 10 +-
+ drivers/net/ethernet/ibm/ibmveth.c | 6 +-
+ drivers/net/ethernet/ibm/ibmvnic.c | 16 +-
+ drivers/net/ethernet/intel/e100.c | 9 -
+ drivers/net/ethernet/intel/e1000/e1000_main.c | 12 +-
+ drivers/net/ethernet/intel/e1000e/netdev.c | 14 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 15 +-
+ drivers/net/ethernet/intel/i40e/i40e_main.c | 10 +-
+ drivers/net/ethernet/intel/i40evf/i40evf_main.c | 8 +-
+ drivers/net/ethernet/intel/igb/e1000_defines.h | 3 +-
+ drivers/net/ethernet/intel/igb/igb_main.c | 15 +-
+ drivers/net/ethernet/intel/igbvf/defines.h | 3 +-
+ drivers/net/ethernet/intel/igbvf/netdev.c | 14 +-
+ drivers/net/ethernet/intel/ixgb/ixgb_main.c | 16 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 145 ++--
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 33 +-
+ drivers/net/ethernet/jme.c | 12 +-
+ drivers/net/ethernet/korina.c | 1 -
+ drivers/net/ethernet/lantiq_etop.c | 18 +-
+ drivers/net/ethernet/marvell/mv643xx_eth.c | 171 +++--
+ drivers/net/ethernet/marvell/mvneta.c | 36 +-
+ drivers/net/ethernet/marvell/mvpp2.c | 36 +-
+ drivers/net/ethernet/marvell/pxa168_eth.c | 7 +-
+ drivers/net/ethernet/marvell/skge.c | 13 +-
+ drivers/net/ethernet/marvell/skge.h | 4 +-
+ drivers/net/ethernet/marvell/sky2.c | 18 +-
+ drivers/net/ethernet/mediatek/mtk_eth_soc.c | 3 +-
+ drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 8 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 24 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 2 +-
+ drivers/net/ethernet/mellanox/mlxsw/cmd.h | 5 +
+ drivers/net/ethernet/mellanox/mlxsw/core.c | 32 +-
+ drivers/net/ethernet/mellanox/mlxsw/core.h | 44 +-
+ drivers/net/ethernet/mellanox/mlxsw/item.h | 50 +-
+ drivers/net/ethernet/mellanox/mlxsw/pci.c | 142 +---
+ drivers/net/ethernet/mellanox/mlxsw/reg.h | 502 ++++---------
+ drivers/net/ethernet/mellanox/mlxsw/resources.h | 121 +++
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 86 ++-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 5 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 39 +-
+ .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 7 +-
+ drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 5 +-
+ drivers/net/ethernet/micrel/ks8851.c | 1 -
+ drivers/net/ethernet/micrel/ks8851_mll.c | 1 -
+ drivers/net/ethernet/micrel/ksz884x.c | 33 +-
+ drivers/net/ethernet/microchip/enc28j60.c | 1 -
+ drivers/net/ethernet/moxa/moxart_ether.c | 1 -
+ drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 22 +-
+ drivers/net/ethernet/natsemi/jazzsonic.c | 1 -
+ drivers/net/ethernet/natsemi/macsonic.c | 1 -
+ drivers/net/ethernet/natsemi/natsemi.c | 7 +-
+ drivers/net/ethernet/natsemi/ns83820.c | 11 +-
+ drivers/net/ethernet/natsemi/xtsonic.c | 1 -
+ drivers/net/ethernet/neterion/s2io.c | 9 +-
+ drivers/net/ethernet/neterion/vxge/vxge-config.h | 2 +-
+ drivers/net/ethernet/neterion/vxge/vxge-main.c | 9 +-
+ .../net/ethernet/netronome/nfp/nfp_net_common.c | 10 +-
+ .../net/ethernet/netronome/nfp/nfp_net_offload.c | 2 +-
+ drivers/net/ethernet/netx-eth.c | 1 -
+ drivers/net/ethernet/nuvoton/w90p910_ether.c | 1 -
+ drivers/net/ethernet/nvidia/forcedeth.c | 9 +-
+ drivers/net/ethernet/nxp/lpc_eth.c | 1 -
+ .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 13 +-
+ drivers/net/ethernet/packetengines/hamachi.c | 1 -
+ drivers/net/ethernet/packetengines/yellowfin.c | 1 -
+ drivers/net/ethernet/pasemi/pasemi_mac.c | 12 +-
+ drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | 12 -
+ .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 7 +
+ drivers/net/ethernet/qlogic/qed/qed_l2.c | 12 +-
+ drivers/net/ethernet/qlogic/qed/qed_roce.c | 1 -
+ drivers/net/ethernet/qlogic/qed/qed_sp.h | 4 +-
+ drivers/net/ethernet/qlogic/qed/qed_spq.c | 97 ++-
+ drivers/net/ethernet/qlogic/qed/qed_sriov.c | 114 ++-
+ drivers/net/ethernet/qlogic/qed/qed_sriov.h | 1 +
+ drivers/net/ethernet/qlogic/qed/qed_vf.c | 4 +-
+ drivers/net/ethernet/qlogic/qed/qed_vf.h | 1 +
+ drivers/net/ethernet/qlogic/qede/qede.h | 6 +-
+ drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 8 -
+ drivers/net/ethernet/qlogic/qede/qede_main.c | 75 +-
+ drivers/net/ethernet/qlogic/qla3xxx.c | 1 -
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 6 -
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 4 +
+ drivers/net/ethernet/qlogic/qlge/qlge_main.c | 7 +
+ drivers/net/ethernet/qualcomm/emac/emac.c | 13 +-
+ drivers/net/ethernet/qualcomm/qca_framing.h | 6 +-
+ drivers/net/ethernet/qualcomm/qca_spi.c | 16 +-
+ drivers/net/ethernet/rdc/r6040.c | 1 -
+ drivers/net/ethernet/realtek/8139cp.c | 8 +-
+ drivers/net/ethernet/realtek/8139too.c | 13 +-
+ drivers/net/ethernet/realtek/atp.c | 1 -
+ drivers/net/ethernet/realtek/r8169.c | 8 +-
+ drivers/net/ethernet/renesas/ravb_main.c | 1 -
+ drivers/net/ethernet/renesas/sh_eth.c | 2 -
+ drivers/net/ethernet/rocker/rocker_main.c | 43 +-
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 17 +-
+ drivers/net/ethernet/seeq/ether3.c | 1 -
+ drivers/net/ethernet/seeq/sgiseeq.c | 1 -
+ drivers/net/ethernet/sfc/efx.c | 14 +-
+ drivers/net/ethernet/sgi/ioc3-eth.c | 1 -
+ drivers/net/ethernet/sgi/meth.c | 1 -
+ drivers/net/ethernet/silan/sc92031.c | 1 -
+ drivers/net/ethernet/sis/sis190.c | 1 -
+ drivers/net/ethernet/sis/sis900.c | 1 -
+ drivers/net/ethernet/smsc/epic100.c | 1 -
+ drivers/net/ethernet/smsc/smc911x.c | 1 -
+ drivers/net/ethernet/smsc/smc9194.c | 1 -
+ drivers/net/ethernet/smsc/smc91c92_cs.c | 1 -
+ drivers/net/ethernet/smsc/smc91x.c | 6 +-
+ drivers/net/ethernet/smsc/smc91x.h | 80 +-
+ drivers/net/ethernet/smsc/smsc911x.c | 1 -
+ .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 4 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 -
+ .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 115 +--
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 65 +-
+ drivers/net/ethernet/sun/cassini.c | 7 +-
+ drivers/net/ethernet/sun/ldmvsw.c | 5 +-
+ drivers/net/ethernet/sun/niu.c | 7 +-
+ drivers/net/ethernet/sun/sunbmac.c | 1 -
+ drivers/net/ethernet/sun/sungem.c | 11 +-
+ drivers/net/ethernet/sun/sunhme.c | 1 -
+ drivers/net/ethernet/sun/sunqe.c | 1 -
+ drivers/net/ethernet/sun/sunvnet.c | 5 +-
+ drivers/net/ethernet/sun/sunvnet_common.c | 10 -
+ drivers/net/ethernet/sun/sunvnet_common.h | 3 +-
+ drivers/net/ethernet/synopsys/dwc_eth_qos.c | 2 +-
+ drivers/net/ethernet/tehuti/tehuti.c | 14 +-
+ drivers/net/ethernet/tehuti/tehuti.h | 3 +
+ drivers/net/ethernet/ti/cpmac.c | 1 -
+ drivers/net/ethernet/ti/cpsw.c | 18 +-
+ drivers/net/ethernet/ti/netcp_core.c | 20 +-
+ drivers/net/ethernet/ti/netcp_ethss.c | 42 +-
+ drivers/net/ethernet/ti/tlan.c | 1 -
+ drivers/net/ethernet/tile/tilegx.c | 21 +-
+ drivers/net/ethernet/tile/tilepro.c | 27 +-
+ drivers/net/ethernet/toshiba/ps3_gelic_net.c | 23 +-
+ drivers/net/ethernet/toshiba/ps3_gelic_net.h | 1 -
+ drivers/net/ethernet/toshiba/ps3_gelic_wireless.c | 1 -
+ drivers/net/ethernet/toshiba/spider_net.c | 24 +-
+ drivers/net/ethernet/toshiba/tc35815.c | 1 -
+ drivers/net/ethernet/tundra/tsi108_eth.c | 1 -
+ drivers/net/ethernet/via/via-rhine.c | 1 -
+ drivers/net/ethernet/via/via-velocity.c | 11 +-
+ drivers/net/ethernet/wiznet/w5100.c | 1 -
+ drivers/net/ethernet/wiznet/w5300.c | 1 -
+ drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 7 +-
+ drivers/net/ethernet/xircom/xirc2ps_cs.c | 1 -
+ drivers/net/ethernet/xscale/ixp4xx_eth.c | 1 -
+ drivers/net/fddi/skfp/skfddi.c | 1 -
+ drivers/net/fjes/Makefile | 2 +-
+ drivers/net/fjes/fjes.h | 16 +
+ drivers/net/fjes/fjes_debugfs.c | 117 +++
+ drivers/net/fjes/fjes_ethtool.c | 181 ++++-
+ drivers/net/fjes/fjes_hw.c | 171 ++++-
+ drivers/net/fjes/fjes_hw.h | 34 +
+ drivers/net/fjes/fjes_main.c | 65 +-
+ drivers/net/fjes/fjes_trace.c | 30 +
+ drivers/net/fjes/fjes_trace.h | 380 ++++++++++
+ drivers/net/geneve.c | 48 +-
+ drivers/net/hippi/rrunner.c | 1 -
+ drivers/net/hyperv/hyperv_net.h | 4 +-
+ drivers/net/hyperv/netvsc.c | 7 +
+ drivers/net/hyperv/netvsc_drv.c | 14 +-
+ drivers/net/ipvlan/ipvlan_main.c | 2 +-
+ drivers/net/macsec.c | 2 +
+ drivers/net/macvlan.c | 8 +-
+ drivers/net/ntb_netdev.c | 3 +
+ drivers/net/phy/Kconfig | 13 +
+ drivers/net/phy/Makefile | 1 +
+ drivers/net/phy/aquantia.c | 28 +
+ drivers/net/phy/dp83867.c | 28 +
+ drivers/net/phy/mscc.c | 135 ++--
+ drivers/net/phy/phy.c | 109 ++-
+ drivers/net/phy/phy_device.c | 7 +-
+ drivers/net/phy/phy_led_triggers.c | 136 ++++
+ drivers/net/plip/plip.c | 1 -
+ drivers/net/rionet.c | 15 +-
+ drivers/net/sb1000.c | 1 -
+ drivers/net/slip/slip.c | 11 +-
+ drivers/net/tun.c | 20 +-
+ drivers/net/usb/asix_devices.c | 4 +-
+ drivers/net/usb/ax88179_178a.c | 4 +-
+ drivers/net/usb/catc.c | 1 -
+ drivers/net/usb/cdc-phonet.c | 12 +-
+ drivers/net/usb/cdc_ether.c | 28 +
+ drivers/net/usb/cdc_ncm.c | 5 +-
+ drivers/net/usb/kaweth.c | 1 -
+ drivers/net/usb/lan78xx.c | 78 +-
+ drivers/net/usb/pegasus.c | 1 -
+ drivers/net/usb/r8152.c | 24 +-
+ drivers/net/usb/rtl8150.c | 1 -
+ drivers/net/usb/sierra_net.c | 13 +-
+ drivers/net/usb/smsc75xx.c | 4 +-
+ drivers/net/usb/usbnet.c | 4 +-
+ drivers/net/veth.c | 17 +-
+ drivers/net/virtio_net.c | 23 +-
+ drivers/net/vmxnet3/vmxnet3_drv.c | 7 +-
+ drivers/net/vxlan.c | 64 +-
+ drivers/net/wan/c101.c | 1 -
+ drivers/net/wan/cosa.c | 1 -
+ drivers/net/wan/dscc4.c | 1 -
+ drivers/net/wan/farsync.c | 1 -
+ drivers/net/wan/fsl_ucc_hdlc.c | 1 -
+ drivers/net/wan/hdlc.c | 11 +-
+ drivers/net/wan/hdlc_fr.c | 3 +-
+ drivers/net/wan/hostess_sv11.c | 1 -
+ drivers/net/wan/ixp4xx_hss.c | 1 -
+ drivers/net/wan/lmc/lmc_main.c | 1 -
+ drivers/net/wan/n2.c | 1 -
+ drivers/net/wan/pc300too.c | 1 -
+ drivers/net/wan/pci200syn.c | 1 -
+ drivers/net/wan/sbni.c | 1 -
+ drivers/net/wan/sealevel.c | 1 -
+ drivers/net/wan/wanxl.c | 1 -
+ drivers/net/wan/x25_asy.c | 5 +-
+ drivers/net/wimax/i2400m/netdev.c | 22 +-
+ drivers/net/wireless/ath/wil6210/netdev.c | 17 +-
+ drivers/net/wireless/atmel/atmel.c | 13 +-
+ drivers/net/wireless/cisco/airo.c | 14 +-
+ drivers/net/wireless/intel/ipw2x00/ipw2100.c | 3 +-
+ drivers/net/wireless/intel/ipw2x00/ipw2200.c | 8 +-
+ drivers/net/wireless/intel/ipw2x00/libipw.h | 1 -
+ drivers/net/wireless/intel/ipw2x00/libipw_module.c | 9 -
+ drivers/net/wireless/intersil/hostap/hostap_main.c | 15 +-
+ drivers/net/wireless/intersil/orinoco/main.c | 6 +-
+ drivers/net/wireless/intersil/prism54/islpci_dev.c | 1 -
+ drivers/net/wireless/mac80211_hwsim.c | 1 -
+ drivers/net/wireless/marvell/libertas/main.c | 1 -
+ drivers/net/wireless/ray_cs.c | 1 -
+ drivers/net/wireless/wl3501_cs.c | 1 -
+ drivers/net/wireless/zydas/zd1201.c | 1 -
+ drivers/net/xen-netback/interface.c | 5 +-
+ drivers/net/xen-netfront.c | 2 +
+ drivers/s390/net/ctcm_main.c | 5 +-
+ drivers/s390/net/lcs.c | 2 +-
+ drivers/s390/net/netiucv.c | 41 +-
+ drivers/s390/net/qeth_core_main.c | 4 -
+ drivers/s390/net/qeth_l2_main.c | 2 +
+ drivers/s390/net/qeth_l3_main.c | 2 +
+ drivers/staging/octeon/ethernet.c | 22 +-
+ drivers/staging/rtl8188eu/os_dep/mon.c | 1 -
+ drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 1 -
+ drivers/staging/rtl8192u/r8192U_core.c | 1 -
+ drivers/staging/slicoss/slicoss.c | 1 -
+ drivers/staging/unisys/include/iochannel.h | 10 +-
+ drivers/staging/unisys/visornic/visornic_main.c | 4 +-
+ drivers/staging/wlan-ng/p80211netdev.c | 18 +-
+ drivers/tty/n_gsm.c | 12 +-
+ drivers/tty/synclink.c | 1 -
+ drivers/tty/synclink_gt.c | 1 -
+ drivers/tty/synclinkmp.c | 1 -
+ drivers/usb/gadget/function/f_phonet.c | 11 +-
+ drivers/usb/gadget/function/u_ether.c | 14 +-
+ include/dt-bindings/net/mscc-phy-vsc8531.h | 21 -
+ include/linux/bpf.h | 1 +
+ include/linux/bpf_verifier.h | 2 +-
+ include/linux/fddidevice.h | 1 -
+ include/linux/hdlc.h | 2 -
+ include/linux/hippidevice.h | 1 -
+ include/linux/netdevice.h | 120 +--
+ include/linux/phy.h | 27 +-
+ include/linux/phy_led_triggers.h | 51 ++
+ include/linux/qed/qed_eth_if.h | 3 +-
+ include/linux/smc91x.h | 1 +
+ include/net/lwtunnel.h | 10 +-
+ include/net/raw.h | 6 +
+ include/net/rawv6.h | 7 +
+ include/net/sctp/structs.h | 3 +-
+ include/net/sock.h | 4 +
+ include/net/tc_act/tc_mirred.h | 6 +-
+ include/net/udp.h | 4 +
+ include/uapi/linux/bpf.h | 6 +
+ include/uapi/linux/if_ether.h | 3 +
+ include/uapi/linux/inet_diag.h | 17 +
+ kernel/bpf/core.c | 1 +
+ kernel/bpf/helpers.c | 12 +
+ kernel/bpf/verifier.c | 61 +-
+ kernel/trace/bpf_trace.c | 2 +
+ net/802/fddi.c | 11 +-
+ net/802/hippi.c | 14 +-
+ net/8021q/vlan.c | 7 +-
+ net/8021q/vlan_dev.c | 3 +
+ net/atm/br2684.c | 6 +-
+ net/atm/lec.c | 11 +-
+ net/batman-adv/soft-interface.c | 13 +-
+ net/bluetooth/bnep/netdev.c | 3 +-
+ net/bridge/br_device.c | 3 +-
+ net/bridge/br_fdb.c | 10 +-
+ net/core/datagram.c | 36 +-
+ net/core/dev.c | 493 +++++--------
+ net/core/filter.c | 2 +
+ net/core/lwtunnel.c | 13 +
+ net/core/net_namespace.c | 9 +-
+ net/core/sock.c | 64 +-
+ net/dsa/slave.c | 16 +-
+ net/ethernet/eth.c | 5 +-
+ net/hsr/hsr_device.c | 1 +
+ net/ipv4/Kconfig | 8 +
+ net/ipv4/Makefile | 1 +
+ net/ipv4/inet_diag.c | 25 +-
+ net/ipv4/ip_tunnel.c | 6 +-
+ net/ipv4/raw.c | 21 +-
+ net/ipv4/raw_diag.c | 261 +++++++
+ net/ipv4/tcp_ipv4.c | 6 +-
+ net/ipv4/udp.c | 149 +++-
+ net/ipv6/ila/ila_lwt.c | 92 ++-
+ net/ipv6/ip6_tunnel.c | 4 +-
+ net/ipv6/ip6_vti.c | 21 +-
+ net/ipv6/raw.c | 7 +-
+ net/ipv6/sit.c | 14 +-
+ net/ipv6/udp.c | 34 +-
+ net/irda/irlan/irlan_eth.c | 4 +-
+ net/iucv/af_iucv.c | 34 +-
+ net/l2tp/l2tp_eth.c | 2 +
+ net/mac80211/iface.c | 15 +-
+ net/mpls/mpls_iptunnel.c | 5 +-
+ net/openvswitch/actions.c | 24 +-
+ net/openvswitch/datapath.c | 2 -
+ net/openvswitch/vport-internal_dev.c | 10 -
+ net/openvswitch/vport-netdev.c | 1 -
+ net/openvswitch/vport.c | 17 -
+ net/openvswitch/vport.h | 1 -
+ net/phonet/pep-gprs.c | 12 +-
+ net/rds/connection.c | 15 -
+ net/rds/rds.h | 4 -
+ net/rds/threads.c | 3 +-
+ net/sched/act_mirred.c | 84 ++-
+ net/sched/em_meta.c | 9 +-
+ net/sched/sch_teql.c | 5 +-
+ net/sctp/chunk.c | 32 +-
+ net/sctp/output.c | 6 +-
+ net/sctp/outqueue.c | 4 +-
+ net/sunrpc/svcsock.c | 20 +-
+ net/sunrpc/xprtsock.c | 2 +-
+ samples/bpf/Makefile | 3 -
+ samples/bpf/test_maps.c | 503 -------------
+ tools/include/linux/filter.h | 24 +
+ tools/testing/selftests/Makefile | 3 +-
+ tools/testing/selftests/bpf/.gitignore | 2 +
+ tools/testing/selftests/bpf/Makefile | 13 +
+ tools/testing/selftests/bpf/bpf_sys.h | 108 +++
+ tools/testing/selftests/bpf/config | 5 +
+ tools/testing/selftests/bpf/test_kmod.sh | 39 +
+ tools/testing/selftests/bpf/test_maps.c | 525 +++++++++++++
+ .../testing/selftests}/bpf/test_verifier.c | 811 ++++++++++++++-------
+ tools/testing/selftests/net/.gitignore | 1 +
+ tools/testing/selftests/net/Makefile | 11 +-
+ tools/testing/selftests/net/reuseport_bpf_numa.c | 255 +++++++
+ 505 files changed, 6834 insertions(+), 4389 deletions(-)
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/resources.h
+ create mode 100644 drivers/net/fjes/fjes_debugfs.c
+ create mode 100644 drivers/net/fjes/fjes_trace.c
+ create mode 100644 drivers/net/fjes/fjes_trace.h
+ create mode 100644 drivers/net/phy/phy_led_triggers.c
+ delete mode 100644 include/dt-bindings/net/mscc-phy-vsc8531.h
+ create mode 100644 include/linux/phy_led_triggers.h
+ create mode 100644 net/ipv4/raw_diag.c
+ delete mode 100644 samples/bpf/test_maps.c
+ create mode 100644 tools/testing/selftests/bpf/.gitignore
+ create mode 100644 tools/testing/selftests/bpf/Makefile
+ create mode 100644 tools/testing/selftests/bpf/bpf_sys.h
+ create mode 100644 tools/testing/selftests/bpf/config
+ create mode 100755 tools/testing/selftests/bpf/test_kmod.sh
+ create mode 100644 tools/testing/selftests/bpf/test_maps.c
+ rename {samples => tools/testing/selftests}/bpf/test_verifier.c (78%)
+ create mode 100644 tools/testing/selftests/net/reuseport_bpf_numa.c
+Merging ipsec-next/master (2258d927a691 xfrm: remove unused helper)
+$ git merge ipsec-next/master
+Merge made by the 'recursive' strategy.
+ net/xfrm/xfrm_state.c | 8 --------
+ 1 file changed, 8 deletions(-)
+Merging netfilter-next/master (1b830996c160 Merge branch 's390-net')
+$ git merge netfilter-next/master
+Already up-to-date.
+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 (15b95a159502 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git)
+$ git merge wireless-drivers-next/master
+Already up-to-date.
+Merging bluetooth/master (604907eeed85 Bluetooth: btwilink: Fix probe return value)
+$ git merge bluetooth/master
+Merge made by the 'recursive' strategy.
+ drivers/bluetooth/hci_bcsp.c | 4 +---
+ drivers/bluetooth/hci_h5.c | 4 +---
+ drivers/bluetooth/hci_qca.c | 9 +++------
+ include/net/bluetooth/bluetooth.h | 25 +++++++++++++------------
+ 4 files changed, 18 insertions(+), 24 deletions(-)
+Merging mac80211-next/master (7a50e995ad32 cfg80211: fix beacon interval in interface combination iteration)
+$ git merge mac80211-next/master
+Auto-merging net/wireless/util.c
+Auto-merging net/mac80211/wpa.c
+Auto-merging net/mac80211/rx.c
+Auto-merging net/mac80211/iface.c
+Auto-merging include/net/cfg80211.h
+Auto-merging drivers/net/wireless/mac80211_hwsim.c
+Merge made by the 'recursive' strategy.
+ Documentation/networking/mac80211_hwsim/README | 2 +-
+ drivers/net/wireless/Kconfig | 13 ++++
+ drivers/net/wireless/ath/ath10k/mac.c | 1 +
+ drivers/net/wireless/ath/ath9k/init.c | 6 ++
+ drivers/net/wireless/broadcom/b43/main.c | 2 +
+ drivers/net/wireless/broadcom/b43legacy/main.c | 2 +
+ .../broadcom/brcm80211/brcmfmac/cfg80211.c | 22 +++---
+ drivers/net/wireless/mac80211_hwsim.c | 79 ++++++++++----------
+ drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 6 +-
+ drivers/net/wireless/ti/wlcore/main.c | 1 +
+ include/net/cfg80211.h | 84 ++++++++++++++--------
+ include/net/ieee80211_radiotap.h | 4 +-
+ include/net/mac80211.h | 19 +++--
+ include/uapi/linux/nl80211.h | 8 ++-
+ net/mac80211/agg-rx.c | 8 +--
+ net/mac80211/cfg.c | 32 ++-------
+ net/mac80211/debugfs.c | 1 +
+ net/mac80211/debugfs_netdev.c | 11 +++
+ net/mac80211/debugfs_sta.c | 9 ++-
+ net/mac80211/ieee80211_i.h | 22 +++++-
+ net/mac80211/iface.c | 16 +++++
+ net/mac80211/main.c | 4 ++
+ net/mac80211/mlme.c | 2 +-
+ net/mac80211/rx.c | 11 +--
+ net/mac80211/sta_info.c | 23 +++---
+ net/mac80211/sta_info.h | 4 +-
+ net/mac80211/tx.c | 55 ++++++++++----
+ net/mac80211/util.c | 51 ++++++-------
+ net/mac80211/wme.c | 23 ++++--
+ net/mac80211/wpa.c | 2 +-
+ net/wireless/core.c | 18 +++--
+ net/wireless/core.h | 2 +-
+ net/wireless/nl80211.c | 71 ++++++++----------
+ net/wireless/sme.c | 2 +-
+ net/wireless/util.c | 71 ++++++++++++------
+ 35 files changed, 429 insertions(+), 258 deletions(-)
+Merging rdma/for-next (2937f3757519 staging/lustre: Disable InfiniBand support)
+$ git merge rdma/for-next
+Already up-to-date.
+Merging rdma-leon/rdma-next (1001354ca341 Linux 4.9-rc1)
+$ git merge rdma-leon/rdma-next
+Already up-to-date.
+Merging rdma-leon-test/testing/rdma-next (358a01eead9f Merge branch 'testing/queue-next' into testing/rdma-next)
+$ git merge rdma-leon-test/testing/rdma-next
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+Merge made by the 'recursive' strategy.
+ drivers/infiniband/core/uverbs.h | 1 +
+ drivers/infiniband/core/uverbs_cmd.c | 209 ++++++----
+ drivers/infiniband/core/uverbs_main.c | 1 +
+ drivers/infiniband/core/verbs.c | 18 +-
+ drivers/infiniband/hw/mlx5/cq.c | 30 +-
+ drivers/infiniband/hw/mlx5/main.c | 88 ++++-
+ drivers/infiniband/hw/mlx5/mlx5_ib.h | 9 +-
+ drivers/infiniband/hw/mlx5/qp.c | 71 +++-
+ drivers/infiniband/hw/mlx5/srq.c | 15 +-
+ drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 13 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en.h | 14 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c | 47 ++-
+ drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 72 ++--
+ .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 31 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 6 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 41 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eq.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 85 ++--
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 22 +-
+ .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 63 +--
+ drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 47 ++-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h | 9 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 406 +++++++++++++------
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 7 +
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 1 +
+ .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 13 +
+ drivers/net/ethernet/mellanox/mlx5/core/rl.c | 65 +++
+ drivers/net/ethernet/mellanox/mlx5/core/srq.c | 150 ++++++-
+ include/linux/mlx5/device.h | 35 ++
+ include/linux/mlx5/driver.h | 5 +
+ include/linux/mlx5/fs.h | 43 +-
+ include/linux/mlx5/mlx5_ifc.h | 440 ++++++++++++++++++++-
+ include/linux/mlx5/port.h | 3 +
+ include/linux/mlx5/srq.h | 7 +-
+ include/rdma/ib_verbs.h | 63 ++-
+ include/uapi/rdma/ib_user_verbs.h | 47 ++-
+ include/uapi/rdma/mlx5-abi.h | 31 +-
+ 37 files changed, 1714 insertions(+), 496 deletions(-)
+Merging mtd/master (1001354ca341 Linux 4.9-rc1)
+$ git merge mtd/master
+Already up-to-date.
+Merging l2-mtd/master (69db4aa44fdd Merge tag '4.9/mtd-pairing-scheme' of github.com:linux-nand/linux)
+$ git merge l2-mtd/master
+Already up-to-date.
+Merging nand/nand/next (668592492409 mtd: nand: Add OX820 NAND Support)
+$ git merge nand/nand/next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mtd/oxnas-nand.txt | 41 +++++
+ drivers/mtd/nand/Kconfig | 5 +
+ drivers/mtd/nand/Makefile | 1 +
+ drivers/mtd/nand/nand_ids.c | 3 +
+ drivers/mtd/nand/omap2.c | 1 +
+ drivers/mtd/nand/oxnas_nand.c | 195 +++++++++++++++++++++
+ drivers/mtd/nand/sunxi_nand.c | 4 +
+ 7 files changed, 250 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/mtd/oxnas-nand.txt
+ create mode 100644 drivers/mtd/nand/oxnas_nand.c
+Merging crypto/master (d7db7a882deb crypto: acomp - update testmgr with support for acomp)
+$ git merge crypto/master
+Auto-merging arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/crypto/fsl-sec4.txt | 20 ++
+ Documentation/devicetree/bindings/rng/omap_rng.txt | 14 +-
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ arch/arm/crypto/aes-ce-glue.c | 5 +
+ .../boot/dts/marvell/armada-cp110-master.dtsi | 8 +
+ .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 8 +
+ arch/arm64/crypto/aes-ce-ccm-core.S | 53 +--
+ arch/arm64/crypto/aes-ce-cipher.c | 25 +-
+ arch/arm64/crypto/aes-ce.S | 1 +
+ arch/arm64/crypto/aes-modes.S | 3 +-
+ arch/arm64/crypto/aes-neon.S | 25 +-
+ arch/arm64/crypto/ghash-ce-core.S | 6 +-
+ arch/arm64/crypto/sha1-ce-core.S | 4 +-
+ arch/arm64/crypto/sha2-ce-core.S | 4 +-
+ crypto/842.c | 81 ++++-
+ crypto/Kconfig | 17 +-
+ crypto/Makefile | 3 +
+ crypto/acompress.c | 169 ++++++++++
+ crypto/api.c | 20 +-
+ crypto/cipher.c | 4 -
+ crypto/cmac.c | 14 +-
+ crypto/compress.c | 4 -
+ crypto/crypto_engine.c | 26 +-
+ crypto/crypto_user.c | 19 ++
+ crypto/deflate.c | 111 ++++++-
+ crypto/gcm.c | 2 +-
+ crypto/internal.h | 3 -
+ crypto/lz4.c | 91 +++++-
+ crypto/lz4hc.c | 92 +++++-
+ crypto/lzo.c | 97 +++++-
+ crypto/scompress.c | 356 +++++++++++++++++++++
+ crypto/testmgr.c | 158 ++++++++-
+ drivers/char/hw_random/Kconfig | 2 +-
+ drivers/char/hw_random/meson-rng.c | 2 +-
+ drivers/char/hw_random/omap-rng.c | 162 +++++++---
+ drivers/crypto/amcc/crypto4xx_core.c | 3 +-
+ drivers/crypto/atmel-aes-regs.h | 4 +
+ drivers/crypto/atmel-aes.c | 187 ++++++++++-
+ drivers/crypto/caam/ctrl.c | 35 +-
+ drivers/crypto/ccp/ccp-dev-v3.c | 4 -
+ drivers/crypto/ccp/ccp-dev-v5.c | 20 +-
+ drivers/crypto/ccp/ccp-dev.c | 6 +-
+ drivers/crypto/ccp/ccp-dev.h | 45 ++-
+ drivers/crypto/marvell/cesa.c | 4 -
+ drivers/crypto/marvell/cesa.h | 5 +-
+ drivers/crypto/marvell/cipher.c | 8 +-
+ drivers/crypto/marvell/hash.c | 65 +++-
+ drivers/crypto/marvell/tdma.c | 33 +-
+ include/crypto/acompress.h | 269 ++++++++++++++++
+ include/crypto/engine.h | 6 +-
+ include/crypto/internal/acompress.h | 81 +++++
+ include/crypto/internal/scompress.h | 136 ++++++++
+ include/crypto/internal/skcipher.h | 2 -
+ include/linux/ccp.h | 6 +-
+ include/linux/crypto.h | 3 +
+ include/uapi/linux/cryptouser.h | 5 +
+ kernel/padata.c | 4 -
+ 57 files changed, 2220 insertions(+), 321 deletions(-)
+ create mode 100644 crypto/acompress.c
+ create mode 100644 crypto/scompress.c
+ create mode 100644 include/crypto/acompress.h
+ create mode 100644 include/crypto/internal/acompress.h
+ create mode 100644 include/crypto/internal/scompress.h
+Merging drm/drm-next (5481e27f6fd0 Merge tag 'drm-intel-next-2016-10-24' of git://anongit.freedesktop.org/drm-intel into drm-next)
+$ git merge drm/drm-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/gpu/drm-kms.rst | 3 +
+ Documentation/gpu/drm-uapi.rst | 6 +
+ Documentation/gpu/i915.rst | 9 +
+ MAINTAINERS | 10 +
+ drivers/dma-buf/reservation.c | 112 +-
+ drivers/dma-buf/sync_file.c | 2 +-
+ drivers/gpu/drm/Makefile | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 14 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 9 +-
+ drivers/gpu/drm/arm/hdlcd_crtc.c | 5 +-
+ drivers/gpu/drm/arm/malidp_hw.c | 7 +-
+ drivers/gpu/drm/arm/malidp_planes.c | 13 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 3 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 41 +-
+ drivers/gpu/drm/cirrus/cirrus_fbdev.c | 6 +-
+ drivers/gpu/drm/cirrus/cirrus_main.c | 4 +-
+ drivers/gpu/drm/drm_atomic.c | 33 +-
+ drivers/gpu/drm/drm_atomic_helper.c | 109 +-
+ drivers/gpu/drm/drm_blend.c | 35 +
+ drivers/gpu/drm/drm_crtc.c | 37 +-
+ drivers/gpu/drm/drm_debugfs.c | 34 +-
+ drivers/gpu/drm/drm_debugfs_crc.c | 352 +++
+ drivers/gpu/drm/drm_dp_dual_mode_helper.c | 103 +
+ drivers/gpu/drm/drm_edid.c | 46 +-
+ drivers/gpu/drm/drm_fb_cma_helper.c | 26 +-
+ drivers/gpu/drm/drm_fb_helper.c | 28 +-
+ drivers/gpu/drm/drm_fops.c | 4 +
+ drivers/gpu/drm/drm_fourcc.c | 281 +--
+ drivers/gpu/drm/drm_framebuffer.c | 102 +-
+ drivers/gpu/drm/drm_internal.h | 16 +
+ drivers/gpu/drm/drm_irq.c | 4 +-
+ drivers/gpu/drm/drm_modes.c | 51 +-
+ drivers/gpu/drm/drm_modeset_helper.c | 17 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gem.c | 24 +-
+ drivers/gpu/drm/exynos/exynos_drm_drv.c | 3 +-
+ drivers/gpu/drm/gma500/framebuffer.c | 23 +-
+ drivers/gpu/drm/gma500/gtt.c | 2 +
+ drivers/gpu/drm/i915/Kconfig | 25 +
+ drivers/gpu/drm/i915/Makefile | 5 +-
+ drivers/gpu/drm/i915/gvt/Makefile | 4 +-
+ drivers/gpu/drm/i915/gvt/aperture_gm.c | 352 +++
+ drivers/gpu/drm/i915/gvt/cfg_space.c | 288 +++
+ drivers/gpu/drm/i915/gvt/cmd_parser.c | 2831 +++++++++++++++++++++++
+ drivers/gpu/drm/i915/gvt/cmd_parser.h | 49 +
+ drivers/gpu/drm/i915/gvt/debug.h | 29 +-
+ drivers/gpu/drm/i915/gvt/display.c | 330 +++
+ drivers/gpu/drm/i915/gvt/display.h | 163 ++
+ drivers/gpu/drm/i915/gvt/edid.c | 532 +++++
+ drivers/gpu/drm/i915/gvt/edid.h | 150 ++
+ drivers/gpu/drm/i915/gvt/execlist.c | 860 +++++++
+ drivers/gpu/drm/i915/gvt/execlist.h | 188 ++
+ drivers/gpu/drm/i915/gvt/firmware.c | 312 +++
+ drivers/gpu/drm/i915/gvt/gtt.c | 2232 ++++++++++++++++++
+ drivers/gpu/drm/i915/gvt/gtt.h | 270 +++
+ drivers/gpu/drm/i915/gvt/gvt.c | 172 +-
+ drivers/gpu/drm/i915/gvt/gvt.h | 325 ++-
+ drivers/gpu/drm/i915/gvt/handlers.c | 2797 ++++++++++++++++++++++
+ drivers/gpu/drm/i915/gvt/hypercall.h | 34 +
+ drivers/gpu/drm/i915/gvt/interrupt.c | 741 ++++++
+ drivers/gpu/drm/i915/gvt/interrupt.h | 233 ++
+ drivers/gpu/drm/i915/gvt/mmio.c | 306 +++
+ drivers/gpu/drm/i915/gvt/mmio.h | 105 +
+ drivers/gpu/drm/i915/gvt/mpt.h | 220 ++
+ drivers/gpu/drm/i915/gvt/opregion.c | 344 +++
+ drivers/gpu/drm/i915/gvt/reg.h | 80 +
+ drivers/gpu/drm/i915/gvt/render.c | 291 +++
+ drivers/gpu/drm/i915/gvt/render.h | 43 +
+ drivers/gpu/drm/i915/gvt/sched_policy.c | 294 +++
+ drivers/gpu/drm/i915/gvt/sched_policy.h | 58 +
+ drivers/gpu/drm/i915/gvt/scheduler.c | 578 +++++
+ drivers/gpu/drm/i915/gvt/scheduler.h | 139 ++
+ drivers/gpu/drm/i915/gvt/trace.h | 286 +++
+ drivers/gpu/drm/i915/gvt/trace_points.c | 36 +
+ drivers/gpu/drm/i915/gvt/vgpu.c | 274 +++
+ drivers/gpu/drm/i915/i915_cmd_parser.c | 3 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 388 ++--
+ drivers/gpu/drm/i915/i915_drv.c | 148 +-
+ drivers/gpu/drm/i915/i915_drv.h | 409 ++--
+ drivers/gpu/drm/i915/i915_gem.c | 217 +-
+ drivers/gpu/drm/i915/i915_gem_context.c | 17 +-
+ drivers/gpu/drm/i915/i915_gem_evict.c | 3 +-
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 88 +-
+ drivers/gpu/drm/i915/i915_gem_fence.c | 32 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 383 +--
+ drivers/gpu/drm/i915/i915_gem_gtt.h | 7 +-
+ drivers/gpu/drm/i915/i915_gem_render_state.c | 6 +-
+ drivers/gpu/drm/i915/i915_gem_request.c | 5 +-
+ drivers/gpu/drm/i915/i915_gem_shrinker.c | 5 +-
+ drivers/gpu/drm/i915/i915_gem_stolen.c | 17 +-
+ drivers/gpu/drm/i915/i915_gem_tiling.c | 7 +-
+ drivers/gpu/drm/i915/i915_gpu_error.c | 593 +++--
+ drivers/gpu/drm/i915/i915_guc_submission.c | 12 +-
+ drivers/gpu/drm/i915/i915_irq.c | 283 ++-
+ drivers/gpu/drm/i915/i915_params.c | 9 +
+ drivers/gpu/drm/i915/i915_params.h | 1 +
+ drivers/gpu/drm/i915/i915_pci.c | 7 -
+ drivers/gpu/drm/i915/i915_reg.h | 18 +-
+ drivers/gpu/drm/i915/i915_suspend.c | 8 +-
+ drivers/gpu/drm/i915/i915_sysfs.c | 25 +-
+ drivers/gpu/drm/i915/intel_atomic_plane.c | 3 +-
+ drivers/gpu/drm/i915/intel_audio.c | 302 +--
+ drivers/gpu/drm/i915/intel_bios.c | 175 +-
+ drivers/gpu/drm/i915/intel_breadcrumbs.c | 6 +-
+ drivers/gpu/drm/i915/intel_color.c | 16 +-
+ drivers/gpu/drm/i915/intel_crt.c | 118 +-
+ drivers/gpu/drm/i915/intel_ddi.c | 160 +-
+ drivers/gpu/drm/i915/intel_device_info.c | 18 +-
+ drivers/gpu/drm/i915/intel_display.c | 709 +++---
+ drivers/gpu/drm/i915/intel_dp.c | 314 +--
+ drivers/gpu/drm/i915/intel_dp_link_training.c | 3 -
+ drivers/gpu/drm/i915/intel_dp_mst.c | 1 +
+ drivers/gpu/drm/i915/intel_dpll_mgr.c | 10 +-
+ drivers/gpu/drm/i915/intel_drv.h | 82 +-
+ drivers/gpu/drm/i915/intel_dsi.c | 38 +-
+ drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 48 +-
+ drivers/gpu/drm/i915/intel_dsi_pll.c | 26 +-
+ drivers/gpu/drm/i915/intel_dvo.c | 16 +-
+ drivers/gpu/drm/i915/intel_engine_cs.c | 167 +-
+ drivers/gpu/drm/i915/intel_fbc.c | 69 +-
+ drivers/gpu/drm/i915/intel_fifo_underrun.c | 10 +-
+ drivers/gpu/drm/i915/intel_guc_loader.c | 42 +-
+ drivers/gpu/drm/i915/intel_gvt.c | 10 +-
+ drivers/gpu/drm/i915/intel_gvt.h | 2 +-
+ drivers/gpu/drm/i915/intel_hdmi.c | 143 +-
+ drivers/gpu/drm/i915/intel_i2c.c | 14 +-
+ drivers/gpu/drm/i915/intel_lrc.c | 93 +-
+ drivers/gpu/drm/i915/intel_lspcon.c | 136 ++
+ drivers/gpu/drm/i915/intel_lvds.c | 32 +-
+ drivers/gpu/drm/i915/intel_overlay.c | 6 +-
+ drivers/gpu/drm/i915/intel_pm.c | 749 +++---
+ drivers/gpu/drm/i915/intel_psr.c | 22 +-
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 96 +-
+ drivers/gpu/drm/i915/intel_ringbuffer.h | 42 +-
+ drivers/gpu/drm/i915/intel_runtime_pm.c | 15 +-
+ drivers/gpu/drm/i915/intel_sdvo.c | 26 +-
+ drivers/gpu/drm/i915/intel_sprite.c | 56 +-
+ drivers/gpu/drm/i915/intel_tv.c | 52 +-
+ drivers/gpu/drm/i915/intel_uncore.c | 602 +++--
+ drivers/gpu/drm/mediatek/mtk_drm_drv.c | 3 +-
+ drivers/gpu/drm/msm/msm_atomic.c | 3 +-
+ drivers/gpu/drm/nouveau/nouveau_gem.c | 21 +-
+ drivers/gpu/drm/omapdrm/omap_crtc.c | 13 +-
+ drivers/gpu/drm/omapdrm/omap_drv.c | 53 +-
+ drivers/gpu/drm/omapdrm/omap_plane.c | 22 +-
+ drivers/gpu/drm/radeon/radeon_fb.c | 20 +-
+ drivers/gpu/drm/radeon/radeon_gem.c | 3 +-
+ drivers/gpu/drm/rcar-du/rcar_du_kms.c | 3 +-
+ drivers/gpu/drm/rockchip/Kconfig | 1 -
+ drivers/gpu/drm/savage/savage_state.c | 1 +
+ drivers/gpu/drm/sti/sti_drv.c | 3 +-
+ drivers/gpu/drm/tegra/Kconfig | 1 -
+ drivers/gpu/drm/tegra/drm.c | 3 +-
+ drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 18 +-
+ drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 -
+ drivers/gpu/drm/tilcdc/tilcdc_plane.c | 7 +-
+ drivers/gpu/drm/vc4/vc4_kms.c | 3 +-
+ drivers/gpu/drm/virtio/Kconfig | 6 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 12 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 2 +-
+ drivers/gpu/ipu-v3/Kconfig | 1 -
+ drivers/gpu/vga/vgaarb.c | 15 +-
+ drivers/video/hdmi.c | 4 +
+ include/drm/drm_atomic.h | 42 +-
+ include/drm/drm_blend.h | 8 +
+ include/drm/drm_crtc.h | 48 +-
+ include/drm/drm_debugfs_crc.h | 73 +
+ include/drm/drm_dp_dual_mode_helper.h | 27 +
+ include/drm/drm_encoder.h | 2 +-
+ include/drm/drm_fourcc.h | 23 +-
+ include/drm/drm_plane.h | 3 +-
+ include/drm/i915_component.h | 6 +-
+ include/linux/fence.h | 56 +-
+ include/linux/hdmi.h | 2 +
+ include/sound/hda_i915.h | 11 +-
+ include/uapi/drm/drm_mode.h | 24 +-
+ sound/hda/hdac_i915.c | 18 +-
+ sound/pci/hda/patch_hdmi.c | 7 +-
+ sound/soc/codecs/hdac_hdmi.c | 2 +-
+ 178 files changed, 21543 insertions(+), 3702 deletions(-)
+ create mode 100644 drivers/gpu/drm/drm_debugfs_crc.c
+ create mode 100644 drivers/gpu/drm/i915/gvt/aperture_gm.c
+ create mode 100644 drivers/gpu/drm/i915/gvt/cfg_space.c
+ create mode 100644 drivers/gpu/drm/i915/gvt/cmd_parser.c
+ create mode 100644 drivers/gpu/drm/i915/gvt/cmd_parser.h
+ create mode 100644 drivers/gpu/drm/i915/gvt/display.c
+ create mode 100644 drivers/gpu/drm/i915/gvt/display.h
+ create mode 100644 drivers/gpu/drm/i915/gvt/edid.c
+ create mode 100644 drivers/gpu/drm/i915/gvt/edid.h
+ create mode 100644 drivers/gpu/drm/i915/gvt/execlist.c
+ create mode 100644 drivers/gpu/drm/i915/gvt/execlist.h
+ create mode 100644 drivers/gpu/drm/i915/gvt/firmware.c
+ create mode 100644 drivers/gpu/drm/i915/gvt/gtt.c
+ create mode 100644 drivers/gpu/drm/i915/gvt/gtt.h
+ create mode 100644 drivers/gpu/drm/i915/gvt/handlers.c
+ create mode 100644 drivers/gpu/drm/i915/gvt/interrupt.c
+ create mode 100644 drivers/gpu/drm/i915/gvt/interrupt.h
+ create mode 100644 drivers/gpu/drm/i915/gvt/mmio.c
+ create mode 100644 drivers/gpu/drm/i915/gvt/mmio.h
+ create mode 100644 drivers/gpu/drm/i915/gvt/opregion.c
+ create mode 100644 drivers/gpu/drm/i915/gvt/reg.h
+ create mode 100644 drivers/gpu/drm/i915/gvt/render.c
+ create mode 100644 drivers/gpu/drm/i915/gvt/render.h
+ create mode 100644 drivers/gpu/drm/i915/gvt/sched_policy.c
+ create mode 100644 drivers/gpu/drm/i915/gvt/sched_policy.h
+ create mode 100644 drivers/gpu/drm/i915/gvt/scheduler.c
+ create mode 100644 drivers/gpu/drm/i915/gvt/scheduler.h
+ create mode 100644 drivers/gpu/drm/i915/gvt/trace.h
+ create mode 100644 drivers/gpu/drm/i915/gvt/trace_points.c
+ create mode 100644 drivers/gpu/drm/i915/gvt/vgpu.c
+ create mode 100644 drivers/gpu/drm/i915/intel_lspcon.c
+ create mode 100644 include/drm/drm_debugfs_crc.h
+Merging drm-panel/drm/panel/for-next (c96f566273bf drm/panel: Add JDI LT070ME05000 WUXGA DSI Panel)
+$ git merge drm-panel/drm/panel/for-next
+Already up-to-date.
+Merging drm-intel/for-linux-next (ed4596ea992d drm/i915/guc: WA to address the Ringbuffer coherency issue)
+$ git merge drm-intel/for-linux-next
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/i915/Kconfig | 12 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 141 +++++--
+ drivers/gpu/drm/i915/i915_drv.c | 27 +-
+ drivers/gpu/drm/i915/i915_drv.h | 30 +-
+ drivers/gpu/drm/i915/i915_gem.c | 98 +++--
+ drivers/gpu/drm/i915/i915_gem_evict.c | 2 +-
+ drivers/gpu/drm/i915/i915_gem_fence.c | 14 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 72 +---
+ drivers/gpu/drm/i915/i915_gem_tiling.c | 4 -
+ drivers/gpu/drm/i915/i915_gpu_error.c | 27 +-
+ drivers/gpu/drm/i915/i915_guc_submission.c | 603 ++++++++++++++++++++++++++++-
+ drivers/gpu/drm/i915/i915_irq.c | 159 ++++++--
+ drivers/gpu/drm/i915/i915_reg.h | 16 +-
+ drivers/gpu/drm/i915/intel_display.c | 2 +-
+ drivers/gpu/drm/i915/intel_drv.h | 23 +-
+ drivers/gpu/drm/i915/intel_fbc.c | 4 +-
+ drivers/gpu/drm/i915/intel_guc.h | 30 +-
+ drivers/gpu/drm/i915/intel_guc_fwif.h | 82 +++-
+ drivers/gpu/drm/i915/intel_guc_loader.c | 10 +-
+ drivers/gpu/drm/i915/intel_pm.c | 1 -
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 4 +-
+ drivers/gpu/drm/i915/intel_runtime_pm.c | 3 +-
+ 22 files changed, 1124 insertions(+), 240 deletions(-)
+Merging drm-tegra/drm/tegra/for-next (08ee01789eeb drm/tegra: Fix window[0] base address corruption)
+$ git merge drm-tegra/drm/tegra/for-next
+Already up-to-date.
+Merging drm-misc/topic/drm-misc (97ac0e47aed5 drm: convert DT component matching to component_match_add_release())
+$ git merge drm-misc/topic/drm-misc
+Auto-merging include/trace/events/dma_fence.h
+Removing include/linux/fence-array.h
+Auto-merging include/linux/dma-fence.h
+Auto-merging drivers/dma-buf/dma-fence.c
+Auto-merging drivers/dma-buf/dma-fence-array.c
+Merge made by the 'recursive' strategy.
+ Documentation/sync_file.txt | 14 +-
+ drivers/base/Kconfig | 6 +-
+ drivers/dma-buf/Kconfig | 2 +-
+ drivers/dma-buf/Makefile | 2 +-
+ drivers/dma-buf/dma-buf.c | 28 +--
+ .../dma-buf/{fence-array.c => dma-fence-array.c} | 91 ++++----
+ drivers/dma-buf/{fence.c => dma-fence.c} | 201 ++++++++---------
+ drivers/dma-buf/reservation.c | 94 ++++----
+ drivers/dma-buf/seqno-fence.c | 18 +-
+ drivers/dma-buf/sw_sync.c | 48 ++---
+ drivers/dma-buf/sync_debug.c | 13 +-
+ drivers/dma-buf/sync_debug.h | 9 +-
+ drivers/dma-buf/sync_file.c | 63 +++---
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 54 ++---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 16 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 22 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 14 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 16 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 58 ++---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 22 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 14 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 24 +--
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 48 +++--
+ drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 12 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 10 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 26 +--
+ drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 26 +--
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 79 +++----
+ drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 12 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/si_dma.c | 6 +-
+ drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h | 4 +-
+ drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 67 +++---
+ drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 26 +--
+ drivers/gpu/drm/amd/scheduler/sched_fence.c | 48 +++--
+ drivers/gpu/drm/arm/hdlcd_drv.c | 3 +-
+ drivers/gpu/drm/arm/malidp_drv.c | 4 +-
+ drivers/gpu/drm/armada/armada_drv.c | 2 +-
+ drivers/gpu/drm/drm_atomic.c | 8 +-
+ drivers/gpu/drm/drm_atomic_helper.c | 8 +-
+ drivers/gpu/drm/drm_blend.c | 32 +--
+ drivers/gpu/drm/drm_edid.c | 79 +++++--
+ drivers/gpu/drm/drm_fb_helper.c | 7 +-
+ drivers/gpu/drm/drm_fops.c | 6 +-
+ drivers/gpu/drm/drm_of.c | 28 ++-
+ drivers/gpu/drm/etnaviv/etnaviv_drv.c | 5 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gem.c | 6 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 46 ++--
+ drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 4 +-
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 7 +-
+ drivers/gpu/drm/i2c/tda998x_drv.c | 3 +-
+ drivers/gpu/drm/i915/i915_gem_request.c | 32 +--
+ drivers/gpu/drm/i915/i915_gem_request.h | 18 +-
+ drivers/gpu/drm/i915/i915_sw_fence.c | 41 ++--
+ drivers/gpu/drm/i915/i915_sw_fence.h | 8 +-
+ drivers/gpu/drm/i915/i915_trace.h | 2 +-
+ drivers/gpu/drm/i915/intel_breadcrumbs.c | 4 +-
+ drivers/gpu/drm/i915/intel_dp.c | 11 +-
+ drivers/gpu/drm/i915/intel_engine_cs.c | 2 +-
+ drivers/gpu/drm/mediatek/mtk_drm_drv.c | 4 +-
+ drivers/gpu/drm/msm/adreno/adreno_device.c | 3 -
+ drivers/gpu/drm/msm/adreno/adreno_gpu.h | 3 +
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 35 +--
+ drivers/gpu/drm/msm/msm_debugfs.c | 1 +
+ drivers/gpu/drm/msm/msm_drv.c | 12 +-
+ drivers/gpu/drm/msm/msm_drv.h | 2 +-
+ drivers/gpu/drm/msm/msm_fence.c | 28 +--
+ drivers/gpu/drm/msm/msm_fence.h | 2 +-
+ drivers/gpu/drm/msm/msm_gem.c | 14 +-
+ drivers/gpu/drm/msm/msm_gem.h | 2 +-
+ drivers/gpu/drm/msm/msm_gem_submit.c | 8 +-
+ drivers/gpu/drm/msm/msm_gpu.c | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_bo.c | 6 +-
+ drivers/gpu/drm/nouveau/nouveau_fence.c | 80 +++----
+ drivers/gpu/drm/nouveau/nouveau_fence.h | 6 +-
+ drivers/gpu/drm/nouveau/nouveau_gem.c | 2 +-
+ drivers/gpu/drm/nouveau/nv04_fence.c | 2 +-
+ drivers/gpu/drm/nouveau/nv10_fence.c | 2 +-
+ drivers/gpu/drm/nouveau/nv17_fence.c | 2 +-
+ drivers/gpu/drm/nouveau/nv50_fence.c | 2 +-
+ drivers/gpu/drm/nouveau/nv84_fence.c | 2 +-
+ drivers/gpu/drm/qxl/qxl_drv.h | 4 +-
+ drivers/gpu/drm/qxl/qxl_release.c | 35 +--
+ drivers/gpu/drm/radeon/radeon.h | 10 +-
+ drivers/gpu/drm/radeon/radeon_device.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_display.c | 8 +-
+ drivers/gpu/drm/radeon/radeon_fence.c | 56 ++---
+ drivers/gpu/drm/radeon/radeon_sync.c | 6 +-
+ drivers/gpu/drm/radeon/radeon_uvd.c | 2 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 6 +-
+ drivers/gpu/drm/sti/sti_drv.c | 5 +-
+ drivers/gpu/drm/sun4i/sun4i_drv.c | 3 +-
+ drivers/gpu/drm/tilcdc/tilcdc_external.c | 4 +-
+ drivers/gpu/drm/ttm/ttm_bo.c | 24 +--
+ drivers/gpu/drm/ttm/ttm_bo_util.c | 22 +-
+ drivers/gpu/drm/ttm/ttm_bo_vm.c | 8 +-
+ drivers/gpu/drm/ttm/ttm_execbuf_util.c | 3 +-
+ drivers/gpu/drm/vgem/vgem_fence.c | 53 ++---
+ drivers/gpu/drm/virtio/virtgpu_drv.h | 2 +-
+ drivers/gpu/drm/virtio/virtgpu_fence.c | 26 +--
+ drivers/gpu/drm/virtio/virtgpu_ioctl.c | 12 +-
+ drivers/gpu/drm/virtio/virtgpu_kms.c | 2 +-
+ drivers/gpu/drm/virtio/virtgpu_plane.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 44 ++--
+ drivers/gpu/drm/vmwgfx/vmwgfx_fence.h | 8 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 2 +-
+ include/drm/drmP.h | 4 +-
+ include/drm/drm_blend.h | 2 -
+ include/drm/drm_crtc.h | 7 +-
+ include/drm/drm_dp_helper.h | 6 +
+ include/drm/drm_of.h | 12 ++
+ include/drm/drm_plane.h | 2 +-
+ include/drm/ttm/ttm_bo_api.h | 2 +-
+ include/drm/ttm/ttm_bo_driver.h | 6 +-
+ include/drm/ttm/ttm_execbuf_util.h | 2 +-
+ include/linux/dma-buf.h | 4 +-
+ include/linux/dma-fence-array.h | 86 ++++++++
+ include/linux/{fence.h => dma-fence.h} | 237 +++++++++++----------
+ include/linux/fence-array.h | 83 --------
+ include/linux/reservation.h | 28 +--
+ include/linux/seqno-fence.h | 20 +-
+ include/linux/sync_file.h | 14 +-
+ include/trace/events/{fence.h => dma_fence.h} | 44 ++--
+ 134 files changed, 1428 insertions(+), 1327 deletions(-)
+ rename drivers/dma-buf/{fence-array.c => dma-fence-array.c} (51%)
+ rename drivers/dma-buf/{fence.c => dma-fence.c} (64%)
+ create mode 100644 include/linux/dma-fence-array.h
+ rename include/linux/{fence.h => dma-fence.h} (59%)
+ delete mode 100644 include/linux/fence-array.h
+ rename include/trace/events/{fence.h => dma_fence.h} (72%)
+Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
+$ git merge drm-exynos/exynos-drm/for-next
+Already up-to-date.
+Merging drm-msm/msm-next (7a3bcc0a8e2a drm/msm: bump kernel api version for explicit fencing)
+$ 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 (156f3a886cf0 drm/arm: mark symbols static where possible)
+$ git merge mali-dp/for-upstream/mali-dp
+Resolved 'drivers/gpu/drm/arm/malidp_planes.c' using previous resolution.
+Auto-merging drivers/gpu/drm/arm/malidp_planes.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/arm/malidp_planes.c
+Auto-merging drivers/gpu/drm/arm/malidp_hw.c
+Auto-merging drivers/gpu/drm/arm/malidp_drv.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master b592782b796c] Merge remote-tracking branch 'mali-dp/for-upstream/mali-dp'
+$ git diff -M --stat --summary HEAD^..
+ drivers/gpu/drm/arm/malidp_drv.c | 19 +++++---
+ drivers/gpu/drm/arm/malidp_drv.h | 3 ++
+ drivers/gpu/drm/arm/malidp_hw.c | 3 ++
+ drivers/gpu/drm/arm/malidp_hw.h | 9 ++++
+ drivers/gpu/drm/arm/malidp_planes.c | 87 ++++++++++++++++++++++++++-----------
+ 5 files changed, 90 insertions(+), 31 deletions(-)
+Merging sunxi/sunxi/for-next (3896002338d5 Merge branches 'sunxi/clk-fixes-for-4.9', 'sunxi/clk-for-4.10', 'sunxi/defconfig-for-4.10', 'sunxi/drm-fixes-for-4.9', 'sunxi/drm-for-4.10', 'sunxi/dt-for-4.10' and 'sunxi/fixes-for-4.9' into sunxi/for-next)
+$ git merge sunxi/sunxi/for-next
+Auto-merging drivers/gpu/drm/sun4i/sun4i_drv.c
+Auto-merging arch/arm/configs/multi_v7_defconfig
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ .../bindings/display/sunxi/sun4i-drm.txt | 10 +-
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/ntc-gr8-chip-pro.dts | 266 +++++++++++++++++++++
+ arch/arm/boot/dts/ntc-gr8.dtsi | 47 +++-
+ arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 4 +-
+ arch/arm/boot/dts/sun5i-a10s.dtsi | 4 +-
+ arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 54 +++++
+ arch/arm/boot/dts/sun5i-r8-chip.dts | 69 ++++++
+ arch/arm/boot/dts/sun5i.dtsi | 24 ++
+ arch/arm/boot/dts/sun6i-a31.dtsi | 247 +++++++++++++++----
+ arch/arm/boot/dts/sun6i-a31s.dtsi | 8 +
+ arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 4 +
+ arch/arm/boot/dts/sun8i-a23-a33.dtsi | 4 +
+ arch/arm/configs/multi_v7_defconfig | 1 +
+ arch/arm/configs/sunxi_defconfig | 1 +
+ drivers/clk/sunxi-ng/Kconfig | 3 -
+ drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 12 +
+ drivers/clk/sunxi-ng/ccu_div.h | 6 +-
+ drivers/clk/sunxi-ng/ccu_frac.c | 12 +-
+ drivers/clk/sunxi-ng/ccu_frac.h | 14 +-
+ drivers/clk/sunxi-ng/ccu_mp.h | 4 +-
+ drivers/clk/sunxi-ng/ccu_mult.c | 33 ++-
+ drivers/clk/sunxi-ng/ccu_mult.h | 17 +-
+ drivers/clk/sunxi-ng/ccu_nk.c | 43 ++--
+ drivers/clk/sunxi-ng/ccu_nk.h | 4 +-
+ drivers/clk/sunxi-ng/ccu_nkm.c | 45 ++--
+ drivers/clk/sunxi-ng/ccu_nkm.h | 6 +-
+ drivers/clk/sunxi-ng/ccu_nkmp.c | 55 +++--
+ drivers/clk/sunxi-ng/ccu_nkmp.h | 8 +-
+ drivers/clk/sunxi-ng/ccu_nm.c | 58 ++++-
+ drivers/clk/sunxi-ng/ccu_nm.h | 6 +-
+ drivers/clk/sunxi/clk-mod0.c | 2 +-
+ drivers/gpu/drm/sun4i/sun4i_backend.c | 1 +
+ drivers/gpu/drm/sun4i/sun4i_drv.c | 5 +
+ drivers/gpu/drm/sun4i/sun4i_rgb.c | 20 +-
+ drivers/gpu/drm/sun4i/sun4i_tcon.c | 43 ++--
+ drivers/gpu/drm/sun4i/sun4i_tcon.h | 11 +-
+ drivers/gpu/drm/sun4i/sun6i_drc.c | 2 +
+ 38 files changed, 954 insertions(+), 200 deletions(-)
+ create mode 100644 arch/arm/boot/dts/ntc-gr8-chip-pro.dts
+Merging kspp/for-next/kspp (09dd109d8241 latent_entropy: Mark functions with __latent_entropy)
+$ git merge kspp/for-next/kspp
+Resolved 'scripts/gcc-plugins/latent_entropy_plugin.c' using previous resolution.
+Auto-merging scripts/gcc-plugins/latent_entropy_plugin.c
+CONFLICT (add/add): Merge conflict in scripts/gcc-plugins/latent_entropy_plugin.c
+Auto-merging mm/page_alloc.c
+Auto-merging Documentation/kernel-parameters.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 3755cc352cba] Merge remote-tracking branch 'kspp/for-next/kspp'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/kernel-parameters.txt | 5 +++++
+ mm/page_alloc.c | 21 +++++++++++++++++++++
+ 2 files changed, 26 insertions(+)
+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 (1001354ca341 Linux 4.9-rc1)
+$ git merge regmap/for-next
+Already up-to-date.
+Merging sound/for-next (9b50898ad96c ALSA: seq: Fix time account regression)
+$ git merge sound/for-next
+Already up-to-date.
+Merging sound-asoc/for-next (b0cd1cc47181 Merge remote-tracking branches 'asoc/topic/wm9705', 'asoc/topic/wm9712' and 'asoc/topic/wm9713' into asoc-next)
+$ git merge sound-asoc/for-next
+Removing sound/soc/codecs/wm9712.h
+Removing sound/soc/codecs/wm9705.h
+Removing sound/soc/codecs/ak4641.h
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/sound/cs35l34.txt | 64 +
+ .../devicetree/bindings/sound/davinci-mcbsp.txt | 2 +-
+ .../devicetree/bindings/sound/qcom,apq8016-sbc.txt | 5 +-
+ .../bindings/sound/qcom,msm8916-wcd-analog.txt | 85 ++
+ .../bindings/sound/qcom,msm8916-wcd-digital.txt | 20 +
+ Documentation/devicetree/bindings/sound/rt5514.txt | 3 +
+ Documentation/devicetree/bindings/sound/rt5663.txt | 6 +-
+ Documentation/devicetree/bindings/sound/wm8580.txt | 4 +-
+ drivers/regulator/rk808-regulator.c | 9 +-
+ include/sound/cs35l34.h | 35 +
+ include/sound/dmaengine_pcm.h | 6 -
+ include/sound/rt5514.h | 20 +
+ include/sound/soc-dai.h | 18 +-
+ include/sound/soc.h | 16 +-
+ include/uapi/sound/asoc.h | 21 +-
+ sound/soc/atmel/atmel_wm8904.c | 2 +-
+ sound/soc/codecs/Kconfig | 16 +-
+ sound/soc/codecs/Makefile | 7 +-
+ sound/soc/codecs/ak4641.c | 22 +-
+ sound/soc/codecs/ak4641.h | 47 -
+ sound/soc/codecs/arizona.c | 100 +-
+ sound/soc/codecs/arizona.h | 2 +
+ sound/soc/codecs/cs35l34.c | 1251 ++++++++++++++++++++
+ sound/soc/codecs/cs35l34.h | 269 +++++
+ sound/soc/codecs/cs4270.c | 8 +-
+ sound/soc/codecs/cs42l56.c | 6 -
+ sound/soc/codecs/cs42l73.c | 4 -
+ sound/soc/codecs/cs42xx8.c | 10 -
+ sound/soc/codecs/cs47l24.c | 6 +-
+ sound/soc/codecs/da7219-aad.c | 18 +-
+ sound/soc/codecs/da7219.c | 139 ++-
+ sound/soc/codecs/da7219.h | 5 +
+ sound/soc/codecs/es8328.h | 37 -
+ sound/soc/codecs/msm8916-wcd-analog.c | 890 ++++++++++++++
+ sound/soc/codecs/msm8916-wcd-digital.c | 923 +++++++++++++++
+ sound/soc/codecs/rl6347a.c | 2 +-
+ sound/soc/codecs/rt298.c | 5 +
+ sound/soc/codecs/rt5514.c | 17 +
+ sound/soc/codecs/rt5514.h | 2 +
+ sound/soc/codecs/rt5640.c | 3 +
+ sound/soc/codecs/rt5640.h | 2 +
+ sound/soc/codecs/rt5660.c | 4 +
+ sound/soc/codecs/rt5660.h | 3 +
+ sound/soc/codecs/rt5663.c | 1141 +++++++++---------
+ sound/soc/codecs/rt5663.h | 1162 +++++++++---------
+ sound/soc/codecs/rt5670.c | 4 +-
+ sound/soc/codecs/rt5670.h | 1 +
+ sound/soc/codecs/tas571x.c | 37 +-
+ sound/soc/codecs/wm5102.c | 9 +-
+ sound/soc/codecs/wm5110.c | 10 +-
+ sound/soc/codecs/wm8580.c | 98 +-
+ sound/soc/codecs/wm8753.h | 3 -
+ sound/soc/codecs/wm8997.c | 9 +-
+ sound/soc/codecs/wm8998.c | 6 +-
+ sound/soc/codecs/wm9705.c | 138 +--
+ sound/soc/codecs/wm9705.h | 11 -
+ sound/soc/codecs/wm9712.c | 175 ++-
+ sound/soc/codecs/wm9712.h | 11 -
+ sound/soc/codecs/wm9713.h | 4 -
+ sound/soc/codecs/wm_adsp.c | 1 -
+ sound/soc/fsl/fsl-asoc-card.c | 2 +-
+ sound/soc/fsl/imx-wm8962.c | 2 +-
+ sound/soc/generic/simple-card.c | 2 +-
+ sound/soc/generic/simple-scu-card.c | 2 +-
+ sound/soc/intel/Kconfig | 3 +-
+ sound/soc/intel/atom/sst/sst_acpi.c | 1 +
+ sound/soc/intel/boards/bdw-rt5677.c | 2 +-
+ sound/soc/intel/boards/broadwell.c | 2 +-
+ sound/soc/intel/boards/bxt_da7219_max98357a.c | 10 +-
+ sound/soc/intel/boards/bxt_rt298.c | 4 +-
+ sound/soc/intel/boards/bytcr_rt5640.c | 4 +-
+ sound/soc/intel/boards/bytcr_rt5651.c | 4 +-
+ sound/soc/intel/boards/cht_bsw_max98090_ti.c | 4 +-
+ sound/soc/intel/boards/cht_bsw_rt5645.c | 4 +-
+ sound/soc/intel/boards/cht_bsw_rt5672.c | 4 +-
+ sound/soc/intel/boards/haswell.c | 2 +-
+ sound/soc/intel/boards/skl_nau88l25_max98357a.c | 6 +-
+ sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 6 +-
+ sound/soc/intel/boards/skl_rt286.c | 4 +-
+ sound/soc/intel/skylake/skl-pcm.c | 18 +-
+ sound/soc/intel/skylake/skl.c | 3 +-
+ sound/soc/kirkwood/armada-370-db.c | 2 +-
+ sound/soc/mxs/mxs-sgtl5000.c | 2 +-
+ sound/soc/pxa/Kconfig | 2 +-
+ sound/soc/pxa/e740_wm9705.c | 1 -
+ sound/soc/pxa/e750_wm9705.c | 1 -
+ sound/soc/pxa/e800_wm9712.c | 1 -
+ sound/soc/pxa/em-x270.c | 1 -
+ sound/soc/pxa/hx4700.c | 2 -
+ sound/soc/pxa/palm27x.c | 1 -
+ sound/soc/pxa/pxa-ssp.h | 6 -
+ sound/soc/pxa/pxa2xx-i2s.h | 3 -
+ sound/soc/pxa/tosa.c | 1 -
+ sound/soc/qcom/apq8016_sbc.c | 11 +-
+ sound/soc/qcom/storm.c | 2 +-
+ sound/soc/rockchip/rk3399_gru_sound.c | 8 +-
+ sound/soc/rockchip/rockchip_max98090.c | 2 +-
+ sound/soc/rockchip/rockchip_rt5645.c | 2 +-
+ sound/soc/samsung/dmaengine.c | 8 +-
+ sound/soc/samsung/i2s.c | 8 +-
+ sound/soc/samsung/s3c2412-i2s.c | 2 -
+ sound/soc/samsung/s3c24xx-i2s.c | 47 +-
+ sound/soc/samsung/s3c24xx_uda134x.c | 79 +-
+ sound/soc/sh/rcar/core.c | 141 ++-
+ sound/soc/sh/rcar/dma.c | 31 +-
+ sound/soc/sh/rcar/dvc.c | 2 -
+ sound/soc/sh/rcar/rsnd.h | 68 +-
+ sound/soc/sh/rcar/src.c | 2 +-
+ sound/soc/sh/rcar/ssi.c | 19 +-
+ sound/soc/soc-generic-dmaengine-pcm.c | 13 +-
+ sound/soc/tegra/tegra_alc5632.c | 2 +-
+ sound/soc/tegra/tegra_max98090.c | 2 +-
+ sound/soc/tegra/tegra_rt5640.c | 2 +-
+ sound/soc/tegra/tegra_rt5677.c | 2 +-
+ sound/soc/tegra/tegra_sgtl5000.c | 2 +-
+ sound/soc/tegra/tegra_wm8753.c | 2 +-
+ sound/soc/tegra/tegra_wm8903.c | 2 +-
+ sound/soc/tegra/trimslice.c | 2 +-
+ 118 files changed, 5659 insertions(+), 1848 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/cs35l34.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-analog.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-digital.txt
+ create mode 100644 include/sound/cs35l34.h
+ create mode 100644 include/sound/rt5514.h
+ delete mode 100644 sound/soc/codecs/ak4641.h
+ create mode 100644 sound/soc/codecs/cs35l34.c
+ create mode 100644 sound/soc/codecs/cs35l34.h
+ create mode 100644 sound/soc/codecs/msm8916-wcd-analog.c
+ create mode 100644 sound/soc/codecs/msm8916-wcd-digital.c
+ delete mode 100644 sound/soc/codecs/wm9705.h
+ delete mode 100644 sound/soc/codecs/wm9712.h
+Merging modules/modules-next (a467a672cf09 MAINTAINERS: Begin module maintainer transition)
+$ git merge modules/modules-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 1 +
+ 1 file changed, 1 insertion(+)
+Merging input/next (77b425399f6d Input: i8042 - use chassis info to skip selftest on Asus laptops)
+$ git merge input/next
+Auto-merging drivers/input/serio/i8042-x86ia64io.h
+Merge made by the 'recursive' strategy.
+ drivers/input/serio/i8042-x86ia64io.h | 74 +--------------------------------
+ drivers/input/touchscreen/melfas_mip4.c | 40 +++++++++++++++++-
+ 2 files changed, 39 insertions(+), 75 deletions(-)
+Merging block/for-next (5613beb8642f Merge branch 'for-4.10/block' into for-next)
+$ git merge block/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-block | 29 ++
+ block/Kconfig | 8 +
+ block/Makefile | 1 +
+ block/blk-core.c | 4 +
+ block/blk-settings.c | 5 +
+ block/blk-sysfs.c | 29 ++
+ block/blk-zoned.c | 348 ++++++++++++++++++
+ block/ioctl.c | 4 +
+ drivers/block/brd.c | 39 +-
+ drivers/scsi/Makefile | 1 +
+ drivers/scsi/sd.c | 148 ++++++--
+ drivers/scsi/sd.h | 70 ++++
+ drivers/scsi/sd_zbc.c | 644 ++++++++++++++++++++++++++++++++++
+ include/linux/blk_types.h | 2 +
+ include/linux/blkdev.h | 99 ++++++
+ include/scsi/scsi_proto.h | 17 +
+ include/uapi/linux/Kbuild | 1 +
+ include/uapi/linux/blkzoned.h | 143 ++++++++
+ include/uapi/linux/fs.h | 4 +
+ 19 files changed, 1524 insertions(+), 72 deletions(-)
+ create mode 100644 block/blk-zoned.c
+ create mode 100644 drivers/scsi/sd_zbc.c
+ create mode 100644 include/uapi/linux/blkzoned.h
+Merging lightnvm/for-next (07d9a380680d Linux 4.9-rc2)
+$ git merge lightnvm/for-next
+Already up-to-date.
+Merging device-mapper/for-next (5c5eb3db2893 dm cache metadata: DM_CACHE_FEATURE_INCOMPAT_SEP_DIRTY_BITS)
+$ git merge device-mapper/for-next
+Auto-merging drivers/md/dm.c
+Auto-merging drivers/md/dm-rq.c
+Auto-merging Documentation/device-mapper/dm-raid.txt
+Merge made by the 'recursive' strategy.
+ Documentation/device-mapper/cache.txt | 3 +
+ Documentation/device-mapper/dm-raid.txt | 1 +
+ drivers/md/Kconfig | 10 +-
+ drivers/md/dm-cache-metadata.c | 374 ++++++++++++++++++++++----
+ drivers/md/dm-cache-metadata.h | 19 +-
+ drivers/md/dm-cache-target.c | 33 ++-
+ drivers/md/dm-raid.c | 15 +-
+ drivers/md/dm-raid1.c | 22 +-
+ drivers/md/dm-rq.c | 7 +-
+ drivers/md/dm-table.c | 24 +-
+ drivers/md/dm.c | 4 +-
+ drivers/md/persistent-data/dm-array.c | 21 ++
+ drivers/md/persistent-data/dm-array.h | 1 +
+ drivers/md/persistent-data/dm-bitset.c | 146 ++++++++++
+ drivers/md/persistent-data/dm-bitset.h | 39 +++
+ drivers/md/persistent-data/dm-block-manager.c | 19 +-
+ drivers/md/persistent-data/dm-btree.c | 11 +
+ drivers/md/persistent-data/dm-btree.h | 1 +
+ 18 files changed, 629 insertions(+), 121 deletions(-)
+Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
+$ git merge pcmcia/master
+Already up-to-date.
+Merging mmc/next (e6bc54e2d9d1 Merge branch 'fixes' into next)
+$ git merge mmc/next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mmc/brcm,sdhci-iproc.txt | 1 +
+ drivers/mmc/core/mmc.c | 13 --
+ drivers/mmc/core/mmc_ops.c | 138 ++++++++++++---------
+ drivers/mmc/core/mmc_ops.h | 2 +-
+ drivers/mmc/core/slot-gpio.c | 8 ++
+ drivers/mmc/host/dw_mmc-exynos.c | 24 ++--
+ drivers/mmc/host/dw_mmc-k3.c | 39 ++----
+ drivers/mmc/host/dw_mmc-pci.c | 29 ++---
+ drivers/mmc/host/dw_mmc-pltfm.c | 33 ++---
+ drivers/mmc/host/dw_mmc-rockchip.c | 42 ++++++-
+ drivers/mmc/host/dw_mmc.c | 46 ++++---
+ drivers/mmc/host/dw_mmc.h | 6 +-
+ drivers/mmc/host/mtk-sd.c | 1 +
+ drivers/mmc/host/rtsx_usb_sdmmc.c | 3 +
+ drivers/mmc/host/sdhci-iproc.c | 35 +++++-
+ drivers/mmc/host/sdhci-msm.c | 68 +++++++++-
+ drivers/mmc/host/sdhci-of-at91.c | 1 +
+ drivers/mmc/host/sdhci.c | 19 ++-
+ drivers/mmc/host/sunxi-mmc.c | 15 ++-
+ include/linux/mmc/slot-gpio.h | 1 +
+ include/uapi/linux/mmc/ioctl.h | 2 +-
+ 21 files changed, 324 insertions(+), 202 deletions(-)
+Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
+$ git merge kgdb/kgdb-next
+Merge made by the 'recursive' strategy.
+ kernel/debug/kdb/kdb_io.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging md/for-next (e980cc74735a md: don't fail an array if there are unacknowledged bad blocks)
+$ git merge md/for-next
+Merge made by the 'recursive' strategy.
+ drivers/md/md.c | 86 +++++++++---------
+ drivers/md/md.h | 3 +
+ drivers/md/raid1.c | 7 +-
+ drivers/md/raid10.c | 7 +-
+ drivers/md/raid5-cache.c | 4 +
+ lib/raid6/avx2.c | 232 ++++++++++++++++++++++++++++++++++++++++++++++-
+ 6 files changed, 290 insertions(+), 49 deletions(-)
+Merging mfd/for-mfd-next (b8d336ed90f5 mfd: arizona: Handle probe deferral for reset GPIO)
+$ git merge mfd/for-mfd-next
+Already up-to-date.
+Merging backlight/for-backlight-next (0c9501f823a4 backlight: pwm_bl: Handle gpio that can sleep)
+$ git merge backlight/for-backlight-next
+Already up-to-date.
+Merging battery/for-next (44fccac4ff17 power: supply: lp8788: remove an unneeded NULL check)
+$ git merge battery/for-next
+Merge made by the 'recursive' strategy.
+ drivers/power/reset/Kconfig | 10 +++
+ drivers/power/reset/Makefile | 1 +
+ drivers/power/reset/at91-poweroff.c | 1 +
+ drivers/power/reset/at91-reset.c | 2 +
+ drivers/power/reset/piix4-poweroff.c | 113 +++++++++++++++++++++++++++++++
+ drivers/power/reset/syscon-reboot-mode.c | 1 +
+ drivers/power/reset/zx-reboot.c | 1 +
+ drivers/power/supply/ab8500_fg.c | 8 +--
+ drivers/power/supply/axp288_fuel_gauge.c | 1 +
+ drivers/power/supply/bq27xxx_battery.c | 3 +-
+ drivers/power/supply/lp8788-charger.c | 3 -
+ drivers/power/supply/max17040_battery.c | 52 ++++++--------
+ drivers/power/supply/max8997_charger.c | 1 +
+ drivers/power/supply/power_supply_core.c | 4 +-
+ 14 files changed, 159 insertions(+), 42 deletions(-)
+ create mode 100644 drivers/power/reset/piix4-poweroff.c
+Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
+$ git merge omap_dss2/for-next
+Already up-to-date.
+Merging regulator/for-next (1fcfba653094 Merge remote-tracking branches 'regulator/topic/arizona' and 'regulator/topic/tps6507x' into regulator-next)
+$ git merge regulator/for-next
+Merge made by the 'recursive' strategy.
+ drivers/regulator/arizona-ldo1.c | 2 ++
+ drivers/regulator/tps6507x-regulator.c | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+Merging security/next (07d9a380680d Linux 4.9-rc2)
+$ git merge security/next
+Already up-to-date.
+Merging integrity/next (56078b570983 module: Fully remove the kernel_module_from_file hook)
+$ git merge integrity/next
+Merge made by the 'recursive' strategy.
+Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next)
+$ git merge keys/keys-next
+Merge made by the 'recursive' strategy.
+ Documentation/crypto/asymmetric-keys.txt | 26 ++-
+ Documentation/security/keys.txt | 217 ++++++++++++++++++++
+ certs/Kconfig | 18 ++
+ certs/Makefile | 6 +
+ certs/blacklist.c | 174 ++++++++++++++++
+ certs/blacklist.h | 3 +
+ certs/blacklist_hashes.c | 6 +
+ certs/blacklist_nohashes.c | 5 +
+ crypto/asymmetric_keys/Kconfig | 10 +
+ crypto/asymmetric_keys/Makefile | 13 ++
+ crypto/asymmetric_keys/asymmetric_keys.h | 3 +
+ crypto/asymmetric_keys/asymmetric_type.c | 59 +++++-
+ crypto/asymmetric_keys/pkcs7_parser.c | 1 +
+ crypto/asymmetric_keys/pkcs7_parser.h | 1 +
+ crypto/asymmetric_keys/pkcs7_verify.c | 32 ++-
+ crypto/asymmetric_keys/pkcs8.asn1 | 24 +++
+ crypto/asymmetric_keys/pkcs8_parser.c | 184 +++++++++++++++++
+ crypto/asymmetric_keys/public_key.c | 195 ++++++++++++++++--
+ crypto/asymmetric_keys/signature.c | 95 +++++++++
+ crypto/asymmetric_keys/x509_cert_parser.c | 21 +-
+ crypto/asymmetric_keys/x509_parser.h | 1 +
+ crypto/asymmetric_keys/x509_public_key.c | 15 ++
+ include/crypto/public_key.h | 14 +-
+ include/keys/asymmetric-subtype.h | 9 +
+ include/keys/system_keyring.h | 12 ++
+ include/linux/key-type.h | 11 +
+ include/linux/keyctl.h | 46 +++++
+ include/uapi/linux/keyctl.h | 30 +++
+ security/keys/Makefile | 1 +
+ security/keys/compat.c | 18 ++
+ security/keys/internal.h | 39 ++++
+ security/keys/keyctl.c | 24 +++
+ security/keys/keyctl_pkey.c | 323 ++++++++++++++++++++++++++++++
+ 33 files changed, 1584 insertions(+), 52 deletions(-)
+ create mode 100644 certs/blacklist.c
+ create mode 100644 certs/blacklist.h
+ create mode 100644 certs/blacklist_hashes.c
+ create mode 100644 certs/blacklist_nohashes.c
+ create mode 100644 crypto/asymmetric_keys/pkcs8.asn1
+ create mode 100644 crypto/asymmetric_keys/pkcs8_parser.c
+ create mode 100644 include/linux/keyctl.h
+ create mode 100644 security/keys/keyctl_pkey.c
+Merging selinux/next (1306d8e1c09f Merge tag 'tpmdd-next-20160927' of git://git.infradead.org/users/jjs/linux-tpmdd into ra-next)
+$ git merge selinux/next
+Already up-to-date.
+Merging tpmdd/next (213ebc81ac3f tmp/tpm_crb: implement runtime pm for tpm_crb)
+$ git merge tpmdd/next
+Merge made by the 'recursive' strategy.
+ drivers/char/tpm/tpm-interface.c | 8 +-
+ drivers/char/tpm/tpm_crb.c | 176 +++++++++++++++++++++++++++++++++------
+ 2 files changed, 157 insertions(+), 27 deletions(-)
+Merging watchdog/master (39487f6688a5 watchdog: imx2_wdt: add pretimeout function support)
+$ git merge watchdog/master
+Already up-to-date.
+Merging iommu/next (13a08259187c Merge branches 'x86/amd', 'x86/vt-d', 'arm/exynos', 'arm/mediatek', 'arm/renesas' and 'arm/smmu' into next)
+$ git merge iommu/next
+Already up-to-date.
+Merging dwmw2-iommu/master (2566278551d3 Merge git://git.infradead.org/intel-iommu)
+$ git merge dwmw2-iommu/master
+Already up-to-date.
+Merging vfio/next (61771468e0a5 vfio_pci: use pci_alloc_irq_vectors)
+$ git merge vfio/next
+Already up-to-date.
+Merging trivial/for-next (380cc42d5a6c nvme: add missing \n to end of dev_warn message)
+$ git merge trivial/for-next
+Auto-merging net/netfilter/core.c
+Auto-merging drivers/nvme/host/pci.c
+Auto-merging drivers/nvme/host/lightnvm.c
+Merge made by the 'recursive' strategy.
+ drivers/char/agp/intel-agp.c | 2 +-
+ drivers/nvme/host/lightnvm.c | 2 +-
+ drivers/nvme/host/pci.c | 2 +-
+ net/netfilter/core.c | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+Merging audit/next (7ff89ac608d9 audit: add exclude filter extension to feature bitmap)
+$ git merge audit/next
+Already up-to-date.
+Merging devicetree/for-next (87e5fc99b028 DT: irqchip: renesas-irqc: document R8A7743/5 support)
+$ git merge devicetree/for-next
+Already up-to-date.
+Merging mailbox/mailbox-for-next (a649244de727 dt-bindings: mailbox: Add Amlogic Meson MHU Bindings)
+$ git merge mailbox/mailbox-for-next
+Already up-to-date.
+Merging spi/for-next (21a27175ab00 Merge remote-tracking branch 'spi/topic/spidev' into spi-next)
+$ git merge spi/for-next
+Merge made by the 'recursive' strategy.
+ drivers/spi/spi-dw.c | 1 +
+ drivers/spi/spi-fsl-espi.c | 135 +++++++++++++++++++++---------------------
+ drivers/spi/spi-imx.c | 21 ++++++-
+ drivers/spi/spi-omap2-mcspi.c | 11 +---
+ drivers/spi/spi.c | 14 ++++-
+ drivers/spi/spidev.c | 1 +
+ include/linux/spi/spi.h | 1 +
+ 7 files changed, 100 insertions(+), 84 deletions(-)
+Merging tip/auto-latest (842cd3e03ace Merge branch 'x86/microcode')
+$ git merge tip/auto-latest
+Removing include/linux/mutex-debug.h
+Removing include/asm-generic/mutex.h
+Removing include/asm-generic/mutex-xchg.h
+Removing include/asm-generic/mutex-null.h
+Removing include/asm-generic/mutex-dec.h
+Auto-merging drivers/gpu/drm/i915/i915_gem_shrinker.c
+Removing arch/xtensa/include/asm/mutex.h
+Removing arch/x86/kernel/cpu/microcode/intel_lib.c
+Removing arch/x86/kernel/cpu/bugs_64.c
+Auto-merging arch/x86/kernel/acpi/boot.c
+Removing arch/x86/include/asm/mutex_64.h
+Removing arch/x86/include/asm/mutex_32.h
+Removing arch/x86/include/asm/mutex.h
+Removing arch/unicore32/include/asm/mutex.h
+Removing arch/sh/include/asm/mutex.h
+Removing arch/sh/include/asm/mutex-llsc.h
+Removing arch/score/include/asm/mutex.h
+Removing arch/s390/include/asm/mutex.h
+Removing arch/powerpc/include/asm/mutex.h
+Removing arch/openrisc/include/asm/mutex.h
+Removing arch/nios2/include/asm/mutex.h
+Removing arch/mn10300/include/asm/mutex.h
+Removing arch/microblaze/include/asm/mutex.h
+Removing arch/m32r/include/asm/mutex.h
+Removing arch/ia64/include/asm/mutex.h
+Removing arch/hexagon/include/asm/mutex.h
+Removing arch/h8300/include/asm/mutex.h
+Removing arch/frv/include/asm/mutex.h
+Removing arch/cris/include/asm/mutex.h
+Removing arch/c6x/include/asm/mutex.h
+Removing arch/avr32/include/asm/mutex.h
+Removing arch/arm/include/asm/mutex.h
+Removing arch/arc/include/asm/mutex.h
+Removing arch/alpha/include/asm/mutex.h
+Auto-merging Documentation/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ CREDITS | 4 +
+ Documentation/kernel-parameters.txt | 12 -
+ arch/alpha/include/asm/mutex.h | 9 -
+ arch/arc/include/asm/mutex.h | 18 -
+ arch/arm/include/asm/mutex.h | 21 -
+ arch/arm64/include/asm/Kbuild | 1 -
+ arch/avr32/include/asm/mutex.h | 9 -
+ arch/blackfin/include/asm/Kbuild | 1 -
+ arch/c6x/include/asm/mutex.h | 6 -
+ arch/cris/include/asm/mutex.h | 9 -
+ arch/frv/include/asm/mutex.h | 9 -
+ arch/h8300/include/asm/mutex.h | 9 -
+ arch/hexagon/include/asm/mutex.h | 8 -
+ arch/ia64/include/asm/mutex.h | 90 -
+ arch/m32r/include/asm/mutex.h | 9 -
+ arch/m68k/include/asm/Kbuild | 1 -
+ arch/metag/include/asm/Kbuild | 1 -
+ arch/microblaze/include/asm/mutex.h | 1 -
+ arch/mips/include/asm/Kbuild | 1 -
+ arch/mn10300/include/asm/mutex.h | 16 -
+ arch/nios2/include/asm/mutex.h | 1 -
+ arch/openrisc/include/asm/mutex.h | 27 -
+ arch/parisc/include/asm/Kbuild | 1 -
+ arch/powerpc/include/asm/mutex.h | 132 -
+ arch/s390/include/asm/mutex.h | 9 -
+ arch/score/include/asm/mutex.h | 6 -
+ arch/sh/include/asm/mutex-llsc.h | 109 -
+ arch/sh/include/asm/mutex.h | 12 -
+ arch/sparc/include/asm/Kbuild | 1 -
+ arch/tile/include/asm/Kbuild | 1 -
+ arch/um/include/asm/Kbuild | 1 -
+ arch/unicore32/include/asm/mutex.h | 20 -
+ arch/x86/crypto/crc32c-intel_glue.c | 22 +-
+ arch/x86/entry/Makefile | 4 +-
+ arch/x86/entry/calling.h | 33 +-
+ arch/x86/entry/entry_32.S | 141 +-
+ arch/x86/entry/entry_64.S | 16 +-
+ arch/x86/events/intel/cstate.c | 30 +-
+ arch/x86/include/asm/cpufeatures.h | 1 -
+ arch/x86/include/asm/fpu/internal.h | 139 +-
+ arch/x86/include/asm/fpu/types.h | 34 -
+ arch/x86/include/asm/fpu/xstate.h | 17 +-
+ arch/x86/include/asm/microcode.h | 18 +-
+ arch/x86/include/asm/microcode_amd.h | 30 +-
+ arch/x86/include/asm/microcode_intel.h | 4 -
+ arch/x86/include/asm/mutex.h | 5 -
+ arch/x86/include/asm/mutex_32.h | 110 -
+ arch/x86/include/asm/mutex_64.h | 127 -
+ arch/x86/include/asm/trace/fpu.h | 5 +-
+ arch/x86/include/asm/unwind.h | 16 +-
+ arch/x86/kernel/acpi/boot.c | 2 +
+ arch/x86/kernel/cpu/Makefile | 4 +-
+ arch/x86/kernel/cpu/bugs.c | 26 +-
+ arch/x86/kernel/cpu/bugs_64.c | 33 -
+ arch/x86/kernel/cpu/common.c | 60 +-
+ arch/x86/kernel/cpu/microcode/Makefile | 2 +-
+ arch/x86/kernel/cpu/microcode/amd.c | 421 +-
+ arch/x86/kernel/cpu/microcode/core.c | 83 +-
+ arch/x86/kernel/cpu/microcode/intel.c | 834 ++--
+ arch/x86/kernel/cpu/microcode/intel_lib.c | 184 -
+ arch/x86/kernel/cpu/vmware.c | 37 +-
+ arch/x86/kernel/dumpstack.c | 24 +-
+ arch/x86/kernel/fpu/core.c | 47 +-
+ arch/x86/kernel/fpu/init.c | 91 +-
+ arch/x86/kernel/fpu/signal.c | 8 +-
+ arch/x86/kernel/fpu/xstate.c | 9 -
+ arch/x86/kernel/head_32.S | 49 +-
+ arch/x86/kernel/head_64.S | 42 +-
+ arch/x86/kernel/process_32.c | 5 +-
+ arch/x86/kernel/process_64.c | 16 +-
+ arch/x86/kernel/quirks.c | 3 +-
+ arch/x86/kernel/smpboot.c | 8 +-
+ arch/x86/kernel/unwind_frame.c | 111 +-
+ arch/x86/kernel/unwind_guess.c | 9 +-
+ arch/x86/kernel/vmlinux.lds.S | 2 +-
+ arch/x86/kvm/cpuid.c | 4 +-
+ arch/x86/kvm/x86.c | 14 +-
+ arch/x86/mm/pkeys.c | 3 +-
+ arch/x86/platform/intel-mid/pwr.c | 1 -
+ arch/xtensa/include/asm/mutex.h | 9 -
+ drivers/firmware/efi/arm-init.c | 4 +-
+ drivers/firmware/efi/efi.c | 4 +-
+ drivers/firmware/efi/test/efi_test.c | 15 +-
+ drivers/gpu/drm/i915/i915_gem_shrinker.c | 20 +-
+ drivers/gpu/drm/msm/msm_gem_shrinker.c | 23 +-
+ drivers/video/fbdev/efifb.c | 59 +-
+ include/asm-generic/mutex-dec.h | 88 -
+ include/asm-generic/mutex-null.h | 19 -
+ include/asm-generic/mutex-xchg.h | 120 -
+ include/asm-generic/mutex.h | 9 -
+ include/linux/kvm_host.h | 1 -
+ include/linux/mutex-debug.h | 24 -
+ include/linux/mutex.h | 46 +-
+ include/linux/sched.h | 52 +-
+ include/linux/sched/sysctl.h | 1 -
+ kernel/Kconfig.locks | 2 +-
+ kernel/locking/mutex-debug.c | 13 -
+ kernel/locking/mutex-debug.h | 10 -
+ kernel/locking/mutex.c | 569 +--
+ kernel/locking/mutex.h | 26 -
+ kernel/sched/core.c | 17 +-
+ kernel/sched/fair.c | 7 -
+ kernel/sysctl.c | 7 -
+ tools/arch/x86/include/asm/cpufeatures.h | 1 -
+ tools/include/asm-generic/bitops.h | 1 +
+ tools/include/asm-generic/bitops/__ffz.h | 12 +
+ tools/include/asm-generic/bitops/find.h | 28 +
+ tools/include/linux/bitops.h | 5 +
+ tools/lib/find_bit.c | 25 +
+ tools/lib/traceevent/Makefile | 40 +-
+ tools/perf/Build | 1 +
+ tools/perf/Documentation/jitdump-specification.txt | 170 +
+ tools/perf/Documentation/perf-c2c.txt | 282 ++
+ tools/perf/Documentation/perf-record.txt | 9 +-
+ tools/perf/Documentation/perf-script.txt | 6 +-
+ tools/perf/Documentation/perf-trace.txt | 5 +
+ tools/perf/MANIFEST | 1 +
+ tools/perf/Makefile.config | 2 +-
+ tools/perf/arch/arm/util/cs-etm.c | 2 -
+ tools/perf/arch/x86/entry/syscalls/syscall_64.tbl | 4 +-
+ tools/perf/bench/futex-hash.c | 5 +-
+ tools/perf/bench/mem-functions.c | 77 +-
+ tools/perf/builtin-c2c.c | 2754 +++++++++++++
+ tools/perf/builtin-report.c | 12 +-
+ tools/perf/builtin-script.c | 24 +-
+ tools/perf/builtin-trace.c | 19 +-
+ tools/perf/builtin.h | 1 +
+ tools/perf/jvmti/jvmti_agent.c | 38 +-
+ tools/perf/jvmti/libjvmti.c | 39 +-
+ tools/perf/perf.c | 1 +
+ tools/perf/pmu-events/arch/powerpc/mapfile.csv | 21 +
+ .../perf/pmu-events/arch/powerpc/power8/cache.json | 176 +
+ .../arch/powerpc/power8/floating-point.json | 14 +
+ .../pmu-events/arch/powerpc/power8/frontend.json | 470 +++
+ .../pmu-events/arch/powerpc/power8/marked.json | 794 ++++
+ .../pmu-events/arch/powerpc/power8/memory.json | 212 +
+ .../perf/pmu-events/arch/powerpc/power8/other.json | 4064 ++++++++++++++++++
+ .../pmu-events/arch/powerpc/power8/pipeline.json | 350 ++
+ tools/perf/pmu-events/arch/powerpc/power8/pmc.json | 140 +
+ .../arch/powerpc/power8/translation.json | 176 +
+ tools/perf/pmu-events/arch/x86/bonnell/cache.json | 746 ++++
+ .../arch/x86/bonnell/floating-point.json | 261 ++
+ .../perf/pmu-events/arch/x86/bonnell/frontend.json | 83 +
+ tools/perf/pmu-events/arch/x86/bonnell/memory.json | 154 +
+ tools/perf/pmu-events/arch/x86/bonnell/other.json | 450 ++
+ .../perf/pmu-events/arch/x86/bonnell/pipeline.json | 364 ++
+ .../arch/x86/bonnell/virtual-memory.json | 124 +
+ .../perf/pmu-events/arch/x86/broadwell/cache.json | 3198 +++++++++++++++
+ .../arch/x86/broadwell/floating-point.json | 171 +
+ .../pmu-events/arch/x86/broadwell/frontend.json | 286 ++
+ .../perf/pmu-events/arch/x86/broadwell/memory.json | 2845 +++++++++++++
+ .../perf/pmu-events/arch/x86/broadwell/other.json | 44 +
+ .../pmu-events/arch/x86/broadwell/pipeline.json | 1417 +++++++
+ .../arch/x86/broadwell/virtual-memory.json | 388 ++
+ .../pmu-events/arch/x86/broadwellde/cache.json | 774 ++++
+ .../arch/x86/broadwellde/floating-point.json | 171 +
+ .../pmu-events/arch/x86/broadwellde/frontend.json | 286 ++
+ .../pmu-events/arch/x86/broadwellde/memory.json | 433 ++
+ .../pmu-events/arch/x86/broadwellde/other.json | 44 +
+ .../pmu-events/arch/x86/broadwellde/pipeline.json | 1417 +++++++
+ .../arch/x86/broadwellde/virtual-memory.json | 388 ++
+ .../perf/pmu-events/arch/x86/broadwellx/cache.json | 942 +++++
+ .../arch/x86/broadwellx/floating-point.json | 171 +
+ .../pmu-events/arch/x86/broadwellx/frontend.json | 286 ++
+ .../pmu-events/arch/x86/broadwellx/memory.json | 649 +++
+ .../perf/pmu-events/arch/x86/broadwellx/other.json | 44 +
+ .../pmu-events/arch/x86/broadwellx/pipeline.json | 1417 +++++++
+ .../arch/x86/broadwellx/virtual-memory.json | 388 ++
+ tools/perf/pmu-events/arch/x86/goldmont/cache.json | 1127 +++++
+ .../pmu-events/arch/x86/goldmont/frontend.json | 52 +
+ .../perf/pmu-events/arch/x86/goldmont/memory.json | 34 +
+ tools/perf/pmu-events/arch/x86/goldmont/other.json | 52 +
+ .../pmu-events/arch/x86/goldmont/pipeline.json | 433 ++
+ .../arch/x86/goldmont/virtual-memory.json | 75 +
+ tools/perf/pmu-events/arch/x86/haswell/cache.json | 1041 +++++
+ .../arch/x86/haswell/floating-point.json | 83 +
+ .../perf/pmu-events/arch/x86/haswell/frontend.json | 294 ++
+ tools/perf/pmu-events/arch/x86/haswell/memory.json | 655 +++
+ tools/perf/pmu-events/arch/x86/haswell/other.json | 43 +
+ .../perf/pmu-events/arch/x86/haswell/pipeline.json | 1329 ++++++
+ .../arch/x86/haswell/virtual-memory.json | 484 +++
+ tools/perf/pmu-events/arch/x86/haswellx/cache.json | 1077 +++++
+ .../arch/x86/haswellx/floating-point.json | 83 +
+ .../pmu-events/arch/x86/haswellx/frontend.json | 294 ++
+ .../perf/pmu-events/arch/x86/haswellx/memory.json | 739 ++++
+ tools/perf/pmu-events/arch/x86/haswellx/other.json | 43 +
+ .../pmu-events/arch/x86/haswellx/pipeline.json | 1329 ++++++
+ .../arch/x86/haswellx/virtual-memory.json | 484 +++
+ .../perf/pmu-events/arch/x86/ivybridge/cache.json | 1123 +++++
+ .../arch/x86/ivybridge/floating-point.json | 151 +
+ .../pmu-events/arch/x86/ivybridge/frontend.json | 305 ++
+ .../perf/pmu-events/arch/x86/ivybridge/memory.json | 236 ++
+ .../perf/pmu-events/arch/x86/ivybridge/other.json | 44 +
+ .../pmu-events/arch/x86/ivybridge/pipeline.json | 1307 ++++++
+ .../arch/x86/ivybridge/virtual-memory.json | 180 +
+ tools/perf/pmu-events/arch/x86/ivytown/cache.json | 1272 ++++++
+ .../arch/x86/ivytown/floating-point.json | 151 +
+ .../perf/pmu-events/arch/x86/ivytown/frontend.json | 305 ++
+ tools/perf/pmu-events/arch/x86/ivytown/memory.json | 503 +++
+ tools/perf/pmu-events/arch/x86/ivytown/other.json | 44 +
+ .../perf/pmu-events/arch/x86/ivytown/pipeline.json | 1307 ++++++
+ .../arch/x86/ivytown/virtual-memory.json | 198 +
+ tools/perf/pmu-events/arch/x86/jaketown/cache.json | 1290 ++++++
+ .../arch/x86/jaketown/floating-point.json | 138 +
+ .../pmu-events/arch/x86/jaketown/frontend.json | 305 ++
+ .../perf/pmu-events/arch/x86/jaketown/memory.json | 422 ++
+ tools/perf/pmu-events/arch/x86/jaketown/other.json | 58 +
+ .../pmu-events/arch/x86/jaketown/pipeline.json | 1220 ++++++
+ .../arch/x86/jaketown/virtual-memory.json | 149 +
+ .../pmu-events/arch/x86/knightslanding/cache.json | 2305 +++++++++++
+ .../arch/x86/knightslanding/frontend.json | 34 +
+ .../pmu-events/arch/x86/knightslanding/memory.json | 1110 +++++
+ .../arch/x86/knightslanding/pipeline.json | 435 ++
+ .../arch/x86/knightslanding/virtual-memory.json | 65 +
+ tools/perf/pmu-events/arch/x86/mapfile.csv | 35 +
+ .../perf/pmu-events/arch/x86/nehalemep/cache.json | 3229 +++++++++++++++
+ .../arch/x86/nehalemep/floating-point.json | 229 ++
+ .../pmu-events/arch/x86/nehalemep/frontend.json | 26 +
+ .../perf/pmu-events/arch/x86/nehalemep/memory.json | 739 ++++
+ .../perf/pmu-events/arch/x86/nehalemep/other.json | 210 +
+ .../pmu-events/arch/x86/nehalemep/pipeline.json | 881 ++++
+ .../arch/x86/nehalemep/virtual-memory.json | 109 +
+ .../perf/pmu-events/arch/x86/nehalemex/cache.json | 3184 +++++++++++++++
+ .../arch/x86/nehalemex/floating-point.json | 229 ++
+ .../pmu-events/arch/x86/nehalemex/frontend.json | 26 +
+ .../perf/pmu-events/arch/x86/nehalemex/memory.json | 739 ++++
+ .../perf/pmu-events/arch/x86/nehalemex/other.json | 210 +
+ .../pmu-events/arch/x86/nehalemex/pipeline.json | 881 ++++
+ .../arch/x86/nehalemex/virtual-memory.json | 109 +
+ .../pmu-events/arch/x86/sandybridge/cache.json | 1879 +++++++++
+ .../arch/x86/sandybridge/floating-point.json | 138 +
+ .../pmu-events/arch/x86/sandybridge/frontend.json | 305 ++
+ .../pmu-events/arch/x86/sandybridge/memory.json | 445 ++
+ .../pmu-events/arch/x86/sandybridge/other.json | 58 +
+ .../pmu-events/arch/x86/sandybridge/pipeline.json | 1220 ++++++
+ .../arch/x86/sandybridge/virtual-memory.json | 149 +
+ .../perf/pmu-events/arch/x86/silvermont/cache.json | 811 ++++
+ .../pmu-events/arch/x86/silvermont/frontend.json | 47 +
+ .../pmu-events/arch/x86/silvermont/memory.json | 11 +
+ .../pmu-events/arch/x86/silvermont/pipeline.json | 359 ++
+ .../arch/x86/silvermont/virtual-memory.json | 69 +
+ tools/perf/pmu-events/arch/x86/skylake/cache.json | 4299 ++++++++++++++++++++
+ .../arch/x86/skylake/floating-point.json | 68 +
+ .../perf/pmu-events/arch/x86/skylake/frontend.json | 472 +++
+ tools/perf/pmu-events/arch/x86/skylake/memory.json | 2309 +++++++++++
+ tools/perf/pmu-events/arch/x86/skylake/other.json | 12 +
+ .../perf/pmu-events/arch/x86/skylake/pipeline.json | 939 +++++
+ .../arch/x86/skylake/virtual-memory.json | 272 ++
+ .../pmu-events/arch/x86/westmereep-dp/cache.json | 2817 +++++++++++++
+ .../arch/x86/westmereep-dp/floating-point.json | 229 ++
+ .../arch/x86/westmereep-dp/frontend.json | 26 +
+ .../pmu-events/arch/x86/westmereep-dp/memory.json | 758 ++++
+ .../pmu-events/arch/x86/westmereep-dp/other.json | 287 ++
+ .../arch/x86/westmereep-dp/pipeline.json | 899 ++++
+ .../arch/x86/westmereep-dp/virtual-memory.json | 173 +
+ .../pmu-events/arch/x86/westmereep-sp/cache.json | 3233 +++++++++++++++
+ .../arch/x86/westmereep-sp/floating-point.json | 229 ++
+ .../arch/x86/westmereep-sp/frontend.json | 26 +
+ .../pmu-events/arch/x86/westmereep-sp/memory.json | 739 ++++
+ .../pmu-events/arch/x86/westmereep-sp/other.json | 287 ++
+ .../arch/x86/westmereep-sp/pipeline.json | 899 ++++
+ .../arch/x86/westmereep-sp/virtual-memory.json | 149 +
+ .../perf/pmu-events/arch/x86/westmereex/cache.json | 3225 +++++++++++++++
+ .../arch/x86/westmereex/floating-point.json | 229 ++
+ .../pmu-events/arch/x86/westmereex/frontend.json | 26 +
+ .../pmu-events/arch/x86/westmereex/memory.json | 747 ++++
+ .../perf/pmu-events/arch/x86/westmereex/other.json | 287 ++
+ .../pmu-events/arch/x86/westmereex/pipeline.json | 905 ++++
+ .../arch/x86/westmereex/virtual-memory.json | 173 +
+ tools/perf/tests/backward-ring-buffer.c | 2 +-
+ tools/perf/tests/bpf.c | 2 +-
+ tools/perf/ui/browsers/hists.c | 7 +-
+ tools/perf/ui/browsers/hists.h | 1 +
+ tools/perf/util/Build | 2 +-
+ tools/perf/util/bpf-loader.c | 14 +-
+ tools/perf/util/event.h | 3 +
+ tools/perf/util/evsel.c | 9 +
+ tools/perf/util/evsel.h | 2 +
+ tools/perf/util/genelf.c | 113 +-
+ tools/perf/util/genelf.h | 5 +-
+ tools/perf/util/header.c | 19 +-
+ tools/perf/util/hist.c | 1 +
+ tools/perf/util/hist.h | 1 +
+ tools/perf/util/intel-bts.c | 9 +-
+ .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 2 +
+ .../perf/util/intel-pt-decoder/intel-pt-decoder.h | 1 +
+ .../util/intel-pt-decoder/intel-pt-insn-decoder.c | 13 +-
+ .../util/intel-pt-decoder/intel-pt-insn-decoder.h | 6 +-
+ tools/perf/util/intel-pt-decoder/intel-pt-log.c | 4 +-
+ tools/perf/util/intel-pt.c | 19 +-
+ tools/perf/util/jitdump.c | 82 +-
+ tools/perf/util/jitdump.h | 12 +
+ tools/perf/util/llvm-utils.c | 2 +-
+ tools/perf/util/map.c | 17 +-
+ tools/perf/util/mem-events.c | 128 +
+ tools/perf/util/mem-events.h | 37 +
+ tools/perf/util/parse-branch-options.c | 85 +-
+ tools/perf/util/parse-branch-options.h | 3 +-
+ tools/perf/util/parse-events.c | 15 +-
+ tools/perf/util/pmu.c | 10 +-
+ tools/perf/util/quote.c | 2 +-
+ tools/perf/util/session.c | 10 -
+ tools/perf/util/sort.c | 2 +-
+ tools/perf/util/sort.h | 1 +
+ tools/perf/util/string.c | 21 +-
+ tools/perf/util/unwind-libunwind-local.c | 4 +-
+ tools/perf/util/util.h | 1 +
+ tools/perf/util/values.c | 81 +-
+ tools/perf/util/values.h | 4 +-
+ 309 files changed, 95432 insertions(+), 3275 deletions(-)
+ delete mode 100644 arch/alpha/include/asm/mutex.h
+ delete mode 100644 arch/arc/include/asm/mutex.h
+ delete mode 100644 arch/arm/include/asm/mutex.h
+ delete mode 100644 arch/avr32/include/asm/mutex.h
+ delete mode 100644 arch/c6x/include/asm/mutex.h
+ delete mode 100644 arch/cris/include/asm/mutex.h
+ delete mode 100644 arch/frv/include/asm/mutex.h
+ delete mode 100644 arch/h8300/include/asm/mutex.h
+ delete mode 100644 arch/hexagon/include/asm/mutex.h
+ delete mode 100644 arch/ia64/include/asm/mutex.h
+ delete mode 100644 arch/m32r/include/asm/mutex.h
+ delete mode 100644 arch/microblaze/include/asm/mutex.h
+ delete mode 100644 arch/mn10300/include/asm/mutex.h
+ delete mode 100644 arch/nios2/include/asm/mutex.h
+ delete mode 100644 arch/openrisc/include/asm/mutex.h
+ delete mode 100644 arch/powerpc/include/asm/mutex.h
+ delete mode 100644 arch/s390/include/asm/mutex.h
+ delete mode 100644 arch/score/include/asm/mutex.h
+ delete mode 100644 arch/sh/include/asm/mutex-llsc.h
+ delete mode 100644 arch/sh/include/asm/mutex.h
+ delete mode 100644 arch/unicore32/include/asm/mutex.h
+ delete mode 100644 arch/x86/include/asm/mutex.h
+ delete mode 100644 arch/x86/include/asm/mutex_32.h
+ delete mode 100644 arch/x86/include/asm/mutex_64.h
+ delete mode 100644 arch/x86/kernel/cpu/bugs_64.c
+ delete mode 100644 arch/x86/kernel/cpu/microcode/intel_lib.c
+ delete mode 100644 arch/xtensa/include/asm/mutex.h
+ delete mode 100644 include/asm-generic/mutex-dec.h
+ delete mode 100644 include/asm-generic/mutex-null.h
+ delete mode 100644 include/asm-generic/mutex-xchg.h
+ delete mode 100644 include/asm-generic/mutex.h
+ delete mode 100644 include/linux/mutex-debug.h
+ create mode 100644 tools/include/asm-generic/bitops/__ffz.h
+ create mode 100644 tools/perf/Documentation/jitdump-specification.txt
+ create mode 100644 tools/perf/Documentation/perf-c2c.txt
+ create mode 100644 tools/perf/builtin-c2c.c
+ create mode 100644 tools/perf/pmu-events/arch/powerpc/mapfile.csv
+ create mode 100644 tools/perf/pmu-events/arch/powerpc/power8/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/powerpc/power8/floating-point.json
+ create mode 100644 tools/perf/pmu-events/arch/powerpc/power8/frontend.json
+ create mode 100644 tools/perf/pmu-events/arch/powerpc/power8/marked.json
+ create mode 100644 tools/perf/pmu-events/arch/powerpc/power8/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/powerpc/power8/other.json
+ create mode 100644 tools/perf/pmu-events/arch/powerpc/power8/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/powerpc/power8/pmc.json
+ create mode 100644 tools/perf/pmu-events/arch/powerpc/power8/translation.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/bonnell/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/bonnell/floating-point.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/bonnell/frontend.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/bonnell/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/bonnell/other.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/bonnell/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/bonnell/virtual-memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/broadwell/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/broadwell/floating-point.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/broadwell/frontend.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/broadwell/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/broadwell/other.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/broadwell/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/broadwell/virtual-memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/broadwellde/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/broadwellde/floating-point.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/broadwellde/frontend.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/broadwellde/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/broadwellde/other.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/broadwellde/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/broadwellde/virtual-memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/broadwellx/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/broadwellx/floating-point.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/broadwellx/frontend.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/broadwellx/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/broadwellx/other.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/broadwellx/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/broadwellx/virtual-memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/goldmont/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/goldmont/frontend.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/goldmont/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/goldmont/other.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/goldmont/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/goldmont/virtual-memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/haswell/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/haswell/floating-point.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/haswell/frontend.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/haswell/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/haswell/other.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/haswell/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/haswell/virtual-memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/haswellx/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/haswellx/floating-point.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/haswellx/frontend.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/haswellx/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/haswellx/other.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/haswellx/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/haswellx/virtual-memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/ivybridge/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/ivybridge/floating-point.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/ivybridge/frontend.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/ivybridge/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/ivybridge/other.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/ivybridge/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/ivybridge/virtual-memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/ivytown/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/ivytown/floating-point.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/ivytown/frontend.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/ivytown/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/ivytown/other.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/ivytown/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/ivytown/virtual-memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/jaketown/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/jaketown/floating-point.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/jaketown/frontend.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/jaketown/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/jaketown/other.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/jaketown/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/jaketown/virtual-memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/knightslanding/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/knightslanding/frontend.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/knightslanding/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/knightslanding/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/knightslanding/virtual-memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/mapfile.csv
+ create mode 100644 tools/perf/pmu-events/arch/x86/nehalemep/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/nehalemep/floating-point.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/nehalemep/frontend.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/nehalemep/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/nehalemep/other.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/nehalemep/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/nehalemep/virtual-memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/nehalemex/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/nehalemex/floating-point.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/nehalemex/frontend.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/nehalemex/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/nehalemex/other.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/nehalemex/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/nehalemex/virtual-memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/sandybridge/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/sandybridge/floating-point.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/sandybridge/frontend.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/sandybridge/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/sandybridge/other.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/sandybridge/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/sandybridge/virtual-memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/silvermont/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/silvermont/frontend.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/silvermont/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/silvermont/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/silvermont/virtual-memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/skylake/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/skylake/floating-point.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/skylake/frontend.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/skylake/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/skylake/other.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/skylake/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/skylake/virtual-memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/westmereep-dp/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/westmereep-dp/floating-point.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/westmereep-dp/frontend.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/westmereep-dp/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/westmereep-dp/other.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/westmereep-dp/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/westmereep-dp/virtual-memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/westmereep-sp/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/westmereep-sp/floating-point.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/westmereep-sp/frontend.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/westmereep-sp/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/westmereep-sp/other.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/westmereep-sp/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/westmereep-sp/virtual-memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/westmereex/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/westmereex/floating-point.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/westmereex/frontend.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/westmereex/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/westmereex/other.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/westmereex/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/westmereex/virtual-memory.json
+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 (90e493d7d51c EDAC, altera: Disable IRQs while injecting SDRAM errors)
+$ git merge edac-amd/for-next
+Merge made by the 'recursive' strategy.
+ drivers/edac/altera_edac.c | 4 ++++
+ drivers/edac/sb_edac.c | 14 ++++++++------
+ drivers/edac/skx_edac.c | 7 ++++---
+ 3 files changed, 16 insertions(+), 9 deletions(-)
+Merging irqchip/irqchip/for-next (0ccb54a7dba0 Merge branch 'irqchip/core' into irqchip/for-next)
+$ git merge irqchip/irqchip/for-next
+Merge made by the 'recursive' strategy.
+Merging ftrace/for-next (f971cc9aabc2 tracing: Have max_latency be defined for HWLAT_TRACER as well)
+$ git merge ftrace/for-next
+Already up-to-date.
+Merging rcu/rcu/next (367b548872c8 Documentation/RCU: Fix minor typo)
+$ git merge rcu/rcu/next
+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 | 25 +-
+ Documentation/RCU/whatisRCU.txt | 2 +-
+ 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 | 37 +-
+ include/linux/rculist.h | 8 +-
+ include/trace/events/rcu.h | 5 +-
+ kernel/rcu/Makefile | 3 +-
+ kernel/rcu/rcutorture.c | 11 +-
+ kernel/rcu/tree.c | 17 +-
+ kernel/rcu/tree.h | 1 +
+ kernel/rcu/tree_exp.h | 12 +-
+ kernel/rcu/waketorture.c | 537 +++++++++++++
+ lib/Kconfig.debug | 35 +-
+ lib/list_debug.c | 99 +--
+ tools/testing/selftests/rcutorture/.gitignore | 2 -
+ .../selftests/rcutorture/bin/kvm-recheck-wake.sh | 39 +
+ .../selftests/rcutorture/bin/kvm-recheck.sh | 2 +-
+ tools/testing/selftests/rcutorture/bin/kvm.sh | 7 +-
+ .../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 ++
+ 40 files changed, 5850 insertions(+), 110 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 (07d9a380680d Linux 4.9-rc2)
+$ git merge kvm/linux-next
+Already up-to-date.
+Merging kvm-arm/next (0099b7701f52 KVM: arm/arm64: vgic: Don't flush/sync without a working vgic)
+$ git merge kvm-arm/next
+Already up-to-date.
+Merging kvm-mips/next (07d9a380680d Linux 4.9-rc2)
+$ git merge kvm-mips/next
+Already up-to-date.
+Merging kvm-ppc/kvm-ppc-next (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 (fa73c3b25bd8 KVM: PPC: Book3s PR: Allow access to unprivileged MMCR2 register)
+$ git merge kvm-ppc-paulus/kvm-ppc-next
+Already up-to-date.
+Merging kvms390/next (b0eb91ae630a Merge remote-tracking branch 'kvms390/s390forkvm' into kvms390next)
+$ git merge kvms390/next
+Already up-to-date.
+Merging xen-tip/linux-next (a6a198bc60e6 xen/x86: Update topology map for PV VCPUs)
+$ git merge xen-tip/linux-next
+Already up-to-date.
+Merging percpu/for-next (3ca45a46f8af percpu: ensure the requested alignment is power of two)
+$ git merge percpu/for-next
+Merge made by the 'recursive' strategy.
+ include/linux/kernel.h | 1 +
+ mm/percpu.c | 3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+Merging workqueues/for-next (8bc4a0445596 Merge branch 'for-4.9' into for-4.10)
+$ git merge workqueues/for-next
+Merge made by the 'recursive' strategy.
+ arch/x86/kernel/cpu/mcheck/mce.c | 2 +-
+ drivers/tty/vt/vt.c | 4 --
+ include/linux/workqueue.h | 11 ++---
+ init/main.c | 10 ++++
+ kernel/power/qos.c | 11 +----
+ kernel/workqueue.c | 103 ++++++++++++++++++++++++++++++++-------
+ lib/debugobjects.c | 2 +-
+ mm/slab.c | 7 +--
+ 8 files changed, 102 insertions(+), 48 deletions(-)
+Merging drivers-x86/for-next (304887041d95 platform/x86: Introduce support for Mellanox hotplug driver)
+$ git merge drivers-x86/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 7 +
+ drivers/platform/x86/Kconfig | 11 +
+ drivers/platform/x86/Makefile | 1 +
+ drivers/platform/x86/mlxcpld-hotplug.c | 515 ++++++++++++++++++++++++++
+ include/linux/platform_data/mlxcpld-hotplug.h | 99 +++++
+ 5 files changed, 633 insertions(+)
+ create mode 100644 drivers/platform/x86/mlxcpld-hotplug.c
+ create mode 100644 include/linux/platform_data/mlxcpld-hotplug.h
+Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
+$ git merge chrome-platform/for-next
+Merge made by the 'recursive' strategy.
+Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h)
+$ git merge hsi/for-next
+Already up-to-date.
+Merging leds/for-next (08d825d8b698 leds: leds-pca963x: workaround group blink scaling issue)
+$ git merge leds/for-next
+Auto-merging include/uapi/linux/Kbuild
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-class-led | 14 +-
+ Documentation/devicetree/bindings/leds/pca963x.txt | 3 +
+ Documentation/leds/leds-lp5523.txt | 4 +-
+ Documentation/leds/uleds.txt | 36 ++++
+ drivers/leds/Kconfig | 8 +
+ drivers/leds/Makefile | 3 +
+ drivers/leds/led-class.c | 3 +-
+ drivers/leds/led-core.c | 8 +-
+ drivers/leds/leds-lp3952.c | 1 +
+ drivers/leds/leds-mc13783.c | 5 +-
+ drivers/leds/leds-pca963x.c | 18 +-
+ drivers/leds/trigger/ledtrig-cpu.c | 2 +-
+ drivers/leds/trigger/ledtrig-heartbeat.c | 12 +-
+ drivers/leds/uleds.c | 229 +++++++++++++++++++++
+ include/linux/leds.h | 1 -
+ include/uapi/linux/Kbuild | 1 +
+ include/uapi/linux/uleds.h | 23 +++
+ tools/Makefile | 7 +-
+ tools/leds/.gitignore | 1 +
+ tools/leds/Makefile | 13 ++
+ tools/leds/uledmon.c | 62 ++++++
+ 21 files changed, 430 insertions(+), 24 deletions(-)
+ create mode 100644 Documentation/leds/uleds.txt
+ create mode 100644 drivers/leds/uleds.c
+ create mode 100644 include/uapi/linux/uleds.h
+ create mode 100644 tools/leds/.gitignore
+ create mode 100644 tools/leds/Makefile
+ create mode 100644 tools/leds/uledmon.c
+Merging ipmi/for-next (bd85f4b37ddf ipmi: fix crash on reading version from proc after unregisted bmc)
+$ git merge ipmi/for-next
+Already up-to-date.
+Merging driver-core/driver-core-next (07d9a380680d Linux 4.9-rc2)
+$ git merge driver-core/driver-core-next
+Already up-to-date.
+Merging tty/tty-next (1001354ca341 Linux 4.9-rc1)
+$ git merge tty/tty-next
+Already up-to-date.
+Merging usb/usb-next (6110c425d98b usb: ohci-da8xx: Remove code that references mach)
+$ git merge usb/usb-next
+Auto-merging drivers/usb/host/ohci-at91.c
+Auto-merging drivers/usb/gadget/udc/atmel_usba_udc.c
+Merge made by the 'recursive' strategy.
+ drivers/usb/class/usbtmc.c | 5 +-
+ drivers/usb/gadget/function/rndis.c | 9 ++-
+ drivers/usb/gadget/function/u_serial.c | 4 +-
+ drivers/usb/gadget/udc/at91_udc.h | 2 +-
+ drivers/usb/gadget/udc/atmel_usba_udc.c | 4 +-
+ drivers/usb/gadget/udc/fsl_usb2_udc.h | 2 +-
+ drivers/usb/gadget/udc/m66592-udc.c | 4 +-
+ drivers/usb/gadget/udc/omap_udc.h | 2 +-
+ drivers/usb/gadget/udc/pxa25x_udc.h | 2 +-
+ drivers/usb/host/Kconfig | 1 +
+ drivers/usb/host/ehci-pci.c | 3 +-
+ drivers/usb/host/isp1362-hcd.c | 27 +++----
+ drivers/usb/host/ohci-at91.c | 121 ++++++++------------------------
+ drivers/usb/host/ohci-da8xx.c | 102 ++++++++++++++-------------
+ drivers/usb/isp1760/isp1760-if.c | 2 +-
+ drivers/usb/misc/chaoskey.c | 14 +---
+ include/linux/usb.h | 2 +-
+ 17 files changed, 122 insertions(+), 184 deletions(-)
+Merging usb-gadget/next (1001354ca341 Linux 4.9-rc1)
+$ git merge usb-gadget/next
+Already up-to-date.
+Merging usb-serial/usb-next (a98b69002a16 USB: serial: ch341: add debug output for chip version)
+$ git merge usb-serial/usb-next
+Auto-merging drivers/usb/serial/cp210x.c
+Merge made by the 'recursive' strategy.
+ drivers/usb/serial/ch341.c | 113 ++++++++-----
+ drivers/usb/serial/cp210x.c | 403 ++++++++++++++++++++++++++++++++++++++++++--
+ 2 files changed, 464 insertions(+), 52 deletions(-)
+Merging usb-chipidea-next/ci-for-usb-next (c6900310b6cc usb: chipidea: imx: Disable internal 60Mhz clock with ULPI PHY)
+$ git merge usb-chipidea-next/ci-for-usb-next
+Merge made by the 'recursive' strategy.
+ drivers/usb/chipidea/ci_hdrc_imx.c | 4 ++
+ drivers/usb/chipidea/ci_hdrc_imx.h | 1 +
+ drivers/usb/chipidea/udc.c | 6 +--
+ drivers/usb/chipidea/udc.h | 12 +++---
+ drivers/usb/chipidea/usbmisc_imx.c | 86 +++++++++++++++++++++++++++++++-------
+ 5 files changed, 86 insertions(+), 23 deletions(-)
+Merging phy-next/next (7809cd2ce6ab phy: meson: add USB2 PHY support for Meson8b and GXBB)
+$ git merge phy-next/next
+Auto-merging Documentation/devicetree/bindings/phy/meson8b-usb2-phy.txt
+Merge made by the 'recursive' strategy.
+ .../{meson-usb2-phy.txt => meson8b-usb2-phy.txt} | 6 +-
+ drivers/phy/Kconfig | 13 +
+ drivers/phy/Makefile | 1 +
+ drivers/phy/phy-meson8b-usb2.c | 284 +++++++++++++++++++++
+ 4 files changed, 301 insertions(+), 3 deletions(-)
+ rename Documentation/devicetree/bindings/phy/{meson-usb2-phy.txt => meson8b-usb2-phy.txt} (87%)
+ create mode 100644 drivers/phy/phy-meson8b-usb2.c
+Merging staging/staging-next (54dc7ed37d39 Staging: media: davinci_vpfe: fix indentation issue in vpfe_video.c)
+$ git merge staging/staging-next
+Resolved 'Documentation/devicetree/bindings/i2c/trivial-devices.txt' using previous resolution.
+Resolved 'drivers/staging/wlan-ng/p80211netdev.c' using previous resolution.
+Auto-merging drivers/staging/wlan-ng/p80211netdev.c
+CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/p80211netdev.c
+Auto-merging drivers/staging/wilc1000/host_interface.c
+Auto-merging drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+Auto-merging drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
+Removing drivers/staging/sm750fb/ddk750_help.h
+Removing drivers/staging/sm750fb/ddk750_help.c
+Auto-merging drivers/staging/slicoss/slicoss.c
+Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+Auto-merging drivers/staging/media/bcm2048/radio-bcm2048.c
+Removing drivers/staging/lustre/lustre/obdclass/linux/linux-obdo.c
+Removing drivers/staging/lustre/lustre/llite/llite_close.c
+Removing drivers/staging/iio/ring_hw.h
+Removing drivers/staging/iio/adc/ad7606_ring.c
+Auto-merging drivers/staging/iio/adc/ad7606.c
+Removing drivers/staging/iio/accel/sca3000_ring.c
+CONFLICT (modify/delete): drivers/staging/iio/accel/sca3000_core.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/iio/accel/sca3000_core.c left in tree.
+Removing drivers/staging/iio/accel/sca3000.h
+Auto-merging drivers/staging/greybus/uart.c
+Auto-merging drivers/staging/greybus/es2.c
+Auto-merging drivers/staging/greybus/arche-platform.c
+Auto-merging drivers/staging/android/ion/ion.c
+Auto-merging drivers/iio/light/isl29018.c
+Auto-merging drivers/iio/adc/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Auto-merging Documentation/devicetree/bindings/i2c/trivial-devices.txt
+CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/i2c/trivial-devices.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f drivers/staging/iio/accel/sca3000_core.c
+drivers/staging/iio/accel/sca3000_core.c: needs merge
+rm 'drivers/staging/iio/accel/sca3000_core.c'
+$ git commit -v -a
+[master ca201b84c4db] Merge remote-tracking branch 'staging/staging-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-bus-iio | 18 +
+ .../ABI/testing/sysfs-bus-iio-counter-104-quad-8 | 125 +
+ .../ABI/testing/sysfs-bus-iio-light-isl29018 | 19 +
+ .../devicetree/bindings/i2c/trivial-devices.txt | 6 +
+ .../devicetree/bindings/iio/adc/ti-adc161s626.txt | 2 +
+ .../devicetree/bindings/iio/dac/mcp4725.txt | 35 +
+ .../devicetree/bindings/iio/humidity/hts221.txt | 22 +
+ .../devicetree/bindings/iio/light/isl29018.txt | 28 +
+ .../bindings/iio/potentiostat/lmp91000.txt | 30 +
+ .../devicetree/bindings/vendor-prefixes.txt | 3 +
+ MAINTAINERS | 9 +-
+ drivers/iio/Kconfig | 2 +
+ drivers/iio/Makefile | 2 +
+ drivers/iio/accel/Kconfig | 42 +
+ drivers/iio/accel/Makefile | 5 +
+ drivers/iio/accel/da280.c | 183 ++
+ drivers/iio/accel/da311.c | 305 +++
+ drivers/iio/accel/dmard10.c | 266 +++
+ drivers/iio/accel/mma7660.c | 2 +-
+ drivers/iio/accel/mma8452.c | 79 +-
+ drivers/iio/accel/sca3000.c | 1576 +++++++++++++
+ drivers/iio/adc/Kconfig | 14 +
+ drivers/iio/adc/Makefile | 1 +
+ drivers/iio/adc/ad7766.c | 330 +++
+ drivers/iio/adc/max1027.c | 17 +-
+ drivers/iio/adc/ti-adc0832.c | 106 +-
+ drivers/iio/adc/ti-adc161s626.c | 55 +-
+ drivers/iio/counter/104-quad-8.c | 593 +++++
+ drivers/iio/counter/Kconfig | 24 +
+ drivers/iio/counter/Makefile | 7 +
+ drivers/iio/dac/ad5592r.c | 2 +-
+ drivers/iio/dac/mcp4725.c | 176 +-
+ drivers/iio/humidity/Kconfig | 24 +
+ drivers/iio/humidity/Makefile | 7 +
+ drivers/iio/humidity/hdc100x.c | 130 +-
+ drivers/iio/humidity/hts221.h | 73 +
+ drivers/iio/humidity/hts221_buffer.c | 169 ++
+ drivers/iio/humidity/hts221_core.c | 687 ++++++
+ drivers/iio/humidity/hts221_i2c.c | 110 +
+ drivers/iio/humidity/hts221_spi.c | 125 +
+ drivers/iio/imu/bmi160/bmi160_core.c | 3 +-
+ drivers/iio/industrialio-buffer.c | 7 +-
+ drivers/iio/industrialio-core.c | 2 +
+ drivers/iio/industrialio-trigger.c | 21 +
+ drivers/iio/inkern.c | 39 +-
+ drivers/iio/light/Kconfig | 12 +
+ drivers/iio/light/Makefile | 1 +
+ drivers/{staging => }/iio/light/isl29018.c | 159 +-
+ drivers/iio/light/ltr501.c | 111 +-
+ drivers/iio/light/max44000.c | 5 +-
+ drivers/iio/magnetometer/ak8974.c | 8 +-
+ drivers/iio/magnetometer/ak8975.c | 16 +-
+ drivers/iio/potentiostat/Kconfig | 22 +
+ drivers/iio/potentiostat/Makefile | 6 +
+ drivers/iio/potentiostat/lmp91000.c | 446 ++++
+ drivers/iio/pressure/Kconfig | 10 +
+ drivers/iio/pressure/Makefile | 1 +
+ drivers/iio/pressure/abp060mg.c | 276 +++
+ drivers/iio/pressure/mpl3115.c | 26 +-
+ drivers/iio/pressure/ms5611_core.c | 19 +-
+ drivers/iio/pressure/zpa2326.c | 4 -
+ drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 2 -
+ drivers/staging/android/ion/ion.c | 2 +-
+ drivers/staging/android/ion/ion_dummy_driver.c | 2 +-
+ drivers/staging/android/ion/ion_system_heap.c | 2 +-
+ drivers/staging/android/uapi/ion_test.h | 1 -
+ .../clocking-wizard/clk-xlnx-clock-wizard.c | 2 +-
+ drivers/staging/comedi/comedi.h | 55 +-
+ drivers/staging/comedi/drivers/cb_pcidda.c | 4 +-
+ drivers/staging/comedi/drivers/mite.c | 2 +-
+ drivers/staging/comedi/drivers/ni_mio_common.c | 150 +-
+ drivers/staging/comedi/drivers/ni_stc.h | 14 +
+ drivers/staging/comedi/drivers/pcl818.c | 6 +-
+ drivers/staging/dgnc/dgnc_driver.c | 15 +-
+ drivers/staging/dgnc/dgnc_tty.c | 55 +-
+ drivers/staging/dgnc/dgnc_tty.h | 2 -
+ drivers/staging/emxx_udc/emxx_udc.c | 8 +-
+ drivers/staging/fbtft/fb_agm1264k-fl.c | 68 +-
+ drivers/staging/fbtft/fb_ili9325.c | 19 +-
+ drivers/staging/fbtft/fb_ili9481.c | 2 +-
+ drivers/staging/fbtft/fb_ili9486.c | 2 +-
+ drivers/staging/fbtft/fb_s6d02a1.c | 2 +-
+ drivers/staging/fbtft/fb_st7735r.c | 2 +-
+ drivers/staging/fbtft/fbtft-core.c | 2 +-
+ drivers/staging/fbtft/fbtft.h | 4 +-
+ drivers/staging/fbtft/fbtft_device.c | 12 +-
+ drivers/staging/fbtft/flexfb.c | 373 ++-
+ drivers/staging/fsl-mc/bus/Kconfig | 24 +-
+ drivers/staging/fsl-mc/{include => bus}/dpbp-cmd.h | 0
+ drivers/staging/fsl-mc/bus/dpbp.c | 3 +-
+ .../staging/fsl-mc/{include => bus}/dpcon-cmd.h | 0
+ drivers/staging/fsl-mc/bus/dpmcp.h | 84 +-
+ drivers/staging/fsl-mc/bus/dprc-driver.c | 2 +-
+ drivers/staging/fsl-mc/bus/fsl-mc-allocator.c | 4 +-
+ drivers/staging/fsl-mc/bus/fsl-mc-private.h | 3 +
+ .../staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c | 2 +-
+ drivers/staging/fwserial/fwserial.c | 6 -
+ drivers/staging/greybus/arche-apb-ctrl.c | 8 +-
+ drivers/staging/greybus/arche-platform.c | 3 +-
+ drivers/staging/greybus/audio_codec.c | 5 +-
+ drivers/staging/greybus/audio_codec.h | 1 -
+ drivers/staging/greybus/audio_manager.h | 3 +-
+ drivers/staging/greybus/audio_manager_module.c | 35 +-
+ drivers/staging/greybus/audio_manager_sysfs.c | 16 +-
+ drivers/staging/greybus/audio_module.c | 3 +-
+ drivers/staging/greybus/audio_topology.c | 8 +-
+ drivers/staging/greybus/camera.c | 7 +-
+ drivers/staging/greybus/es2.c | 5 +-
+ drivers/staging/greybus/log.c | 6 +-
+ drivers/staging/greybus/timesync.c | 6 +-
+ drivers/staging/greybus/uart.c | 2 +-
+ drivers/staging/gs_fpgaboot/gs_fpgaboot.c | 2 +-
+ drivers/staging/i4l/act2000/act2000_isa.c | 1 +
+ drivers/staging/i4l/act2000/capi.c | 7 +-
+ drivers/staging/i4l/act2000/module.c | 24 +-
+ drivers/staging/i4l/icn/icn.c | 3 +-
+ drivers/staging/i4l/icn/icn.h | 5 +-
+ drivers/staging/i4l/pcbit/callbacks.c | 2 +-
+ drivers/staging/i4l/pcbit/capi.c | 5 +-
+ drivers/staging/i4l/pcbit/drv.c | 5 +-
+ drivers/staging/i4l/pcbit/edss1.c | 2 +-
+ drivers/staging/i4l/pcbit/layer2.c | 2 +-
+ drivers/staging/iio/TODO | 70 +-
+ drivers/staging/iio/accel/Kconfig | 10 -
+ drivers/staging/iio/accel/Makefile | 3 -
+ drivers/staging/iio/accel/sca3000.h | 279 ---
+ drivers/staging/iio/accel/sca3000_core.c | 1210 ----------
+ drivers/staging/iio/accel/sca3000_ring.c | 350 ---
+ drivers/staging/iio/adc/Makefile | 1 -
+ drivers/staging/iio/adc/ad7192.c | 84 +-
+ drivers/staging/iio/adc/ad7280a.c | 2 +-
+ .../staging/iio/adc/{ad7606_core.c => ad7606.c} | 436 ++--
+ drivers/staging/iio/adc/ad7606.h | 58 +-
+ drivers/staging/iio/adc/ad7606_par.c | 23 +-
+ drivers/staging/iio/adc/ad7606_ring.c | 102 -
+ drivers/staging/iio/adc/ad7606_spi.c | 19 +-
+ drivers/staging/iio/adc/ad7816.c | 2 +-
+ drivers/staging/iio/addac/adt7316.c | 4 +-
+ drivers/staging/iio/cdc/ad7150.c | 2 +-
+ drivers/staging/iio/cdc/ad7152.c | 140 +-
+ drivers/staging/iio/cdc/ad7746.c | 120 +-
+ drivers/staging/iio/impedance-analyzer/ad5933.c | 17 +-
+ drivers/staging/iio/light/Kconfig | 12 -
+ drivers/staging/iio/light/Makefile | 1 -
+ drivers/staging/iio/meter/ade7758_core.c | 86 +-
+ drivers/staging/iio/ring_hw.h | 27 -
+ drivers/staging/ks7010/ks7010_sdio.c | 37 +-
+ drivers/staging/ks7010/ks7010_sdio.h | 2 +-
+ drivers/staging/ks7010/ks_hostif.c | 124 +-
+ drivers/staging/ks7010/ks_wlan.h | 5 +-
+ drivers/staging/ks7010/ks_wlan_net.c | 247 +-
+ drivers/staging/ks7010/michael_mic.h | 12 +-
+ .../staging/lustre/lnet/libcfs/linux/linux-cpu.c | 55 +-
+ drivers/staging/lustre/lustre/include/cl_object.h | 113 +-
+ .../lustre/lustre/include/lustre/ll_fiemap.h | 75 +-
+ .../lustre/lustre/include/lustre/lustre_idl.h | 102 +-
+ .../lustre/lustre/include/lustre/lustre_ioctl.h | 4 +-
+ .../lustre/lustre/include/lustre/lustre_user.h | 23 +-
+ .../staging/lustre/lustre/include/lustre_compat.h | 2 +
+ drivers/staging/lustre/lustre/include/lustre_dlm.h | 2 +-
+ drivers/staging/lustre/lustre/include/lustre_ha.h | 1 +
+ drivers/staging/lustre/lustre/include/lustre_mdc.h | 20 +-
+ drivers/staging/lustre/lustre/include/lustre_net.h | 714 +-----
+ drivers/staging/lustre/lustre/include/lustre_nrs.h | 717 ++++++
+ .../lustre/lustre/include/lustre_nrs_fifo.h | 70 +
+ .../lustre/lustre/include/lustre_req_layout.h | 4 -
+ drivers/staging/lustre/lustre/include/obd.h | 174 +-
+ drivers/staging/lustre/lustre/include/obd_class.h | 181 +-
+ .../staging/lustre/lustre/include/obd_support.h | 10 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 18 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 7 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 5 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 282 ++-
+ drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 26 -
+ drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 6 -
+ drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 11 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 4 -
+ drivers/staging/lustre/lustre/llite/Makefile | 2 +-
+ drivers/staging/lustre/lustre/llite/dir.c | 157 +-
+ drivers/staging/lustre/lustre/llite/file.c | 509 ++--
+ drivers/staging/lustre/lustre/llite/glimpse.c | 139 +-
+ drivers/staging/lustre/lustre/llite/lcommon_cl.c | 28 +-
+ drivers/staging/lustre/lustre/llite/lcommon_misc.c | 39 +-
+ drivers/staging/lustre/lustre/llite/llite_close.c | 395 ----
+ .../staging/lustre/lustre/llite/llite_internal.h | 87 +-
+ drivers/staging/lustre/lustre/llite/llite_lib.c | 242 +-
+ drivers/staging/lustre/lustre/llite/namei.c | 8 -
+ drivers/staging/lustre/lustre/llite/rw.c | 218 +-
+ drivers/staging/lustre/lustre/llite/rw26.c | 4 -
+ drivers/staging/lustre/lustre/llite/vvp_dev.c | 3 +-
+ drivers/staging/lustre/lustre/llite/vvp_internal.h | 33 +-
+ drivers/staging/lustre/lustre/llite/vvp_io.c | 76 +-
+ drivers/staging/lustre/lustre/llite/vvp_object.c | 25 +-
+ drivers/staging/lustre/lustre/llite/vvp_page.c | 40 +-
+ drivers/staging/lustre/lustre/llite/vvp_req.c | 13 +-
+ drivers/staging/lustre/lustre/llite/xattr.c | 234 +-
+ drivers/staging/lustre/lustre/lmv/lmv_obd.c | 198 +-
+ .../staging/lustre/lustre/lov/lov_cl_internal.h | 3 +-
+ drivers/staging/lustre/lustre/lov/lov_ea.c | 195 +-
+ drivers/staging/lustre/lustre/lov/lov_internal.h | 94 +-
+ drivers/staging/lustre/lustre/lov/lov_io.c | 111 +-
+ drivers/staging/lustre/lustre/lov/lov_merge.c | 50 -
+ drivers/staging/lustre/lustre/lov/lov_obd.c | 677 +-----
+ drivers/staging/lustre/lustre/lov/lov_object.c | 570 ++++-
+ drivers/staging/lustre/lustre/lov/lov_pack.c | 186 +-
+ drivers/staging/lustre/lustre/lov/lov_page.c | 46 -
+ drivers/staging/lustre/lustre/lov/lov_request.c | 292 ---
+ drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 38 +
+ drivers/staging/lustre/lustre/mdc/mdc_internal.h | 5 +-
+ drivers/staging/lustre/lustre/mdc/mdc_lib.c | 23 +-
+ drivers/staging/lustre/lustre/mdc/mdc_locks.c | 2 -
+ drivers/staging/lustre/lustre/mdc/mdc_reint.c | 62 +-
+ drivers/staging/lustre/lustre/mdc/mdc_request.c | 197 +-
+ drivers/staging/lustre/lustre/mgc/mgc_request.c | 94 +-
+ drivers/staging/lustre/lustre/obdclass/Makefile | 2 +-
+ drivers/staging/lustre/lustre/obdclass/cl_io.c | 58 +-
+ drivers/staging/lustre/lustre/obdclass/cl_object.c | 63 +-
+ drivers/staging/lustre/lustre/obdclass/cl_page.c | 47 -
+ drivers/staging/lustre/lustre/obdclass/genops.c | 57 +
+ .../lustre/lustre/obdclass/linux/linux-obdo.c | 80 -
+ .../lustre/lustre/obdclass/lprocfs_status.c | 7 +-
+ drivers/staging/lustre/lustre/obdclass/lu_object.c | 63 +-
+ drivers/staging/lustre/lustre/obdclass/obd_mount.c | 2 +-
+ drivers/staging/lustre/lustre/obdclass/obdo.c | 65 -
+ .../staging/lustre/lustre/obdecho/echo_client.c | 102 +-
+ drivers/staging/lustre/lustre/osc/lproc_osc.c | 3 +-
+ drivers/staging/lustre/lustre/osc/osc_cache.c | 3 +-
+ .../staging/lustre/lustre/osc/osc_cl_internal.h | 1 -
+ drivers/staging/lustre/lustre/osc/osc_internal.h | 32 +-
+ drivers/staging/lustre/lustre/osc/osc_io.c | 184 +-
+ drivers/staging/lustre/lustre/osc/osc_lock.c | 14 +-
+ drivers/staging/lustre/lustre/osc/osc_object.c | 91 +-
+ drivers/staging/lustre/lustre/osc/osc_page.c | 20 -
+ drivers/staging/lustre/lustre/osc/osc_quota.c | 44 -
+ drivers/staging/lustre/lustre/osc/osc_request.c | 363 +--
+ drivers/staging/lustre/lustre/ptlrpc/client.c | 8 +-
+ drivers/staging/lustre/lustre/ptlrpc/import.c | 25 +-
+ drivers/staging/lustre/lustre/ptlrpc/layout.c | 26 +-
+ .../staging/lustre/lustre/ptlrpc/pack_generic.c | 57 +-
+ drivers/staging/lustre/lustre/ptlrpc/sec.c | 2 +-
+ drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 248 +-
+ drivers/staging/media/bcm2048/radio-bcm2048.c | 2 +-
+ drivers/staging/media/cxd2099/cxd2099.c | 3 +-
+ drivers/staging/media/davinci_vpfe/vpfe_video.c | 4 +-
+ drivers/staging/media/lirc/lirc_sasem.c | 9 +-
+ drivers/staging/media/lirc/lirc_zilog.c | 4 +-
+ drivers/staging/media/omap4iss/iss_csi2.c | 2 +-
+ drivers/staging/most/aim-network/networking.c | 47 +-
+ drivers/staging/most/hdm-dim2/dim2_hdm.c | 5 +-
+ drivers/staging/most/hdm-usb/hdm_usb.c | 189 +-
+ drivers/staging/most/mostcore/core.c | 39 +-
+ drivers/staging/netlogic/xlr_net.c | 20 +-
+ drivers/staging/rtl8188eu/core/rtw_cmd.c | 6 +-
+ drivers/staging/rtl8188eu/core/rtw_led.c | 78 +-
+ drivers/staging/rtl8188eu/core/rtw_mlme.c | 4 +-
+ drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 32 +-
+ drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 4 +-
+ drivers/staging/rtl8188eu/core/rtw_recv.c | 46 +-
+ drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 4 +-
+ drivers/staging/rtl8188eu/core/rtw_xmit.c | 9 +-
+ drivers/staging/rtl8188eu/hal/odm.c | 1 -
+ drivers/staging/rtl8188eu/hal/phy.c | 69 +-
+ drivers/staging/rtl8188eu/hal/rf.c | 22 +-
+ drivers/staging/rtl8188eu/hal/rf_cfg.c | 70 +-
+ drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 51 +-
+ drivers/staging/rtl8188eu/hal/rtl8188eu_led.c | 20 +-
+ drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 25 +-
+ drivers/staging/rtl8188eu/hal/usb_halinit.c | 21 +-
+ drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h | 11 -
+ drivers/staging/rtl8188eu/include/drv_types.h | 2 -
+ drivers/staging/rtl8188eu/include/hal_intf.h | 1 +
+ drivers/staging/rtl8188eu/include/odm.h | 6 -
+ drivers/staging/rtl8188eu/include/osdep_intf.h | 3 +-
+ drivers/staging/rtl8188eu/include/recv_osdep.h | 2 -
+ drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 20 -
+ drivers/staging/rtl8188eu/include/rtl8188e_recv.h | 2 -
+ drivers/staging/rtl8188eu/include/rtw_led.h | 12 -
+ drivers/staging/rtl8188eu/include/rtw_recv.h | 13 +-
+ drivers/staging/rtl8188eu/include/usb_ops_linux.h | 2 +-
+ drivers/staging/rtl8188eu/include/xmit_osdep.h | 4 +-
+ drivers/staging/rtl8188eu/os_dep/os_intfs.c | 33 +-
+ drivers/staging/rtl8188eu/os_dep/osdep_service.c | 27 +-
+ drivers/staging/rtl8188eu/os_dep/recv_linux.c | 6 -
+ drivers/staging/rtl8188eu/os_dep/usb_intf.c | 19 +-
+ drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 56 +-
+ drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 8 +-
+ .../staging/rtl8192e/rtl8192e/r8192E_firmware.c | 4 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +-
+ drivers/staging/rtl8192e/rtllib_rx.c | 2 +-
+ .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 2 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 2 +-
+ drivers/staging/rtl8712/osdep_service.h | 9 -
+ drivers/staging/rtl8712/rtl871x_mlme.h | 18 -
+ drivers/staging/rtl8712/rtl871x_xmit.h | 6 -
+ drivers/staging/rts5208/ms.c | 393 ++--
+ drivers/staging/rts5208/ms.h | 4 +-
+ drivers/staging/rts5208/rtsx.c | 55 +-
+ drivers/staging/rts5208/rtsx.h | 2 +-
+ drivers/staging/rts5208/rtsx_card.c | 94 +-
+ drivers/staging/rts5208/rtsx_card.h | 16 +-
+ drivers/staging/rts5208/rtsx_chip.c | 17 +-
+ drivers/staging/rts5208/rtsx_chip.h | 137 +-
+ drivers/staging/rts5208/rtsx_scsi.c | 319 +--
+ drivers/staging/rts5208/rtsx_scsi.h | 4 +-
+ drivers/staging/rts5208/rtsx_sys.h | 4 +-
+ drivers/staging/rts5208/rtsx_transport.h | 30 +-
+ drivers/staging/rts5208/sd.c | 813 +++----
+ drivers/staging/rts5208/sd.h | 5 +-
+ drivers/staging/rts5208/spi.c | 144 +-
+ drivers/staging/rts5208/xd.c | 461 ++--
+ drivers/staging/rts5208/xd.h | 2 +-
+ drivers/staging/skein/skein_api.c | 26 +-
+ drivers/staging/slicoss/slicoss.c | 2 +-
+ drivers/staging/sm750fb/Makefile | 2 +-
+ drivers/staging/sm750fb/ddk750.h | 23 +-
+ drivers/staging/sm750fb/ddk750_chip.c | 96 +-
+ drivers/staging/sm750fb/ddk750_chip.h | 89 +-
+ drivers/staging/sm750fb/ddk750_display.c | 2 +-
+ drivers/staging/sm750fb/ddk750_display.h | 30 +-
+ drivers/staging/sm750fb/ddk750_dvi.c | 2 +-
+ drivers/staging/sm750fb/ddk750_help.c | 17 -
+ drivers/staging/sm750fb/ddk750_help.h | 21 -
+ drivers/staging/sm750fb/ddk750_hwi2c.c | 11 +-
+ drivers/staging/sm750fb/ddk750_mode.c | 37 +-
+ drivers/staging/sm750fb/ddk750_power.c | 14 +-
+ drivers/staging/sm750fb/ddk750_power.h | 12 +-
+ drivers/staging/sm750fb/ddk750_sii164.c | 3 +-
+ drivers/staging/sm750fb/ddk750_swi2c.c | 29 +-
+ drivers/staging/sm750fb/ddk750_swi2c.h | 24 +-
+ drivers/staging/sm750fb/sm750.c | 16 +-
+ drivers/staging/sm750fb/sm750.h | 6 +-
+ drivers/staging/sm750fb/sm750_accel.c | 40 +-
+ drivers/staging/sm750fb/sm750_hw.c | 36 +-
+ drivers/staging/unisys/visorbus/visorchannel.c | 31 +-
+ drivers/staging/unisys/visorbus/visorchipset.c | 2 +-
+ drivers/staging/vc04_services/interface/vchi/TODO | 50 +
+ .../interface/vchiq_arm/vchiq_2835_arm.c | 23 +-
+ .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 44 +-
+ .../vc04_services/interface/vchiq_arm/vchiq_core.c | 335 ++-
+ .../vc04_services/interface/vchiq_arm/vchiq_core.h | 9 +-
+ .../interface/vchiq_arm/vchiq_debugfs.c | 4 +-
+ .../interface/vchiq_arm/vchiq_kern_lib.c | 9 +-
+ .../interface/vchiq_arm/vchiq_pagelist.h | 12 +-
+ .../vc04_services/interface/vchiq_arm/vchiq_shim.c | 22 +-
+ drivers/staging/vt6655/baseband.c | 58 +-
+ drivers/staging/vt6655/baseband.h | 11 -
+ drivers/staging/vt6655/card.c | 38 +-
+ drivers/staging/vt6655/card.h | 6 +-
+ drivers/staging/vt6655/channel.c | 4 -
+ drivers/staging/vt6655/channel.h | 4 -
+ drivers/staging/vt6655/desc.h | 4 -
+ drivers/staging/vt6655/device.h | 16 +-
+ drivers/staging/vt6655/device_cfg.h | 4 -
+ drivers/staging/vt6655/device_main.c | 5 -
+ drivers/staging/vt6655/dpc.c | 4 -
+ drivers/staging/vt6655/dpc.h | 4 -
+ drivers/staging/vt6655/key.c | 5 -
+ drivers/staging/vt6655/key.h | 5 -
+ drivers/staging/vt6655/mac.c | 8 +-
+ drivers/staging/vt6655/mac.h | 327 ++-
+ drivers/staging/vt6655/power.c | 6 -
+ drivers/staging/vt6655/power.h | 5 -
+ drivers/staging/vt6655/rf.c | 707 +++---
+ drivers/staging/vt6655/rf.h | 5 -
+ drivers/staging/vt6655/rxtx.c | 4 -
+ drivers/staging/vt6655/rxtx.h | 4 -
+ drivers/staging/vt6655/srom.c | 36 +-
+ drivers/staging/vt6655/srom.h | 11 +-
+ drivers/staging/vt6655/tmacro.h | 4 -
+ drivers/staging/vt6655/upc.h | 4 -
+ drivers/staging/vt6656/baseband.h | 20 +-
+ drivers/staging/vt6656/card.c | 15 +-
+ drivers/staging/vt6656/mac.c | 2 +-
+ drivers/staging/vt6656/main_usb.c | 8 +-
+ drivers/staging/vt6656/rf.c | 4 +-
+ drivers/staging/wilc1000/coreconfigurator.c | 4 +-
+ drivers/staging/wilc1000/host_interface.c | 12 +-
+ drivers/staging/wilc1000/host_interface.h | 1 -
+ drivers/staging/wilc1000/linux_wlan.c | 17 +-
+ drivers/staging/wilc1000/wilc_debugfs.c | 6 +-
+ drivers/staging/wilc1000/wilc_sdio.c | 3 +-
+ drivers/staging/wilc1000/wilc_spi.c | 6 +-
+ drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 24 +-
+ drivers/staging/wilc1000/wilc_wfi_netdevice.h | 1 -
+ drivers/staging/wilc1000/wilc_wlan.h | 6 -
+ drivers/staging/wlan-ng/cfg80211.c | 6 +-
+ drivers/staging/wlan-ng/hfa384x.h | 99 +-
+ drivers/staging/wlan-ng/hfa384x_usb.c | 2445 ++++++++++----------
+ drivers/staging/wlan-ng/p80211conv.c | 320 +--
+ drivers/staging/wlan-ng/p80211conv.h | 100 +-
+ drivers/staging/wlan-ng/p80211hdr.h | 114 +-
+ drivers/staging/wlan-ng/p80211ioctl.h | 120 +-
+ drivers/staging/wlan-ng/p80211metadef.h | 88 +-
+ drivers/staging/wlan-ng/p80211mgmt.h | 194 +-
+ drivers/staging/wlan-ng/p80211msg.h | 90 +-
+ drivers/staging/wlan-ng/p80211netdev.c | 635 ++---
+ drivers/staging/wlan-ng/p80211netdev.h | 100 +-
+ drivers/staging/wlan-ng/p80211req.c | 172 +-
+ drivers/staging/wlan-ng/p80211req.h | 90 +-
+ drivers/staging/wlan-ng/p80211wep.c | 94 +-
+ drivers/staging/wlan-ng/prism2fw.c | 496 ++--
+ drivers/staging/wlan-ng/prism2mgmt.c | 530 ++---
+ drivers/staging/wlan-ng/prism2mgmt.h | 125 +-
+ drivers/staging/wlan-ng/prism2mib.c | 102 +-
+ drivers/staging/wlan-ng/prism2sta.c | 206 +-
+ drivers/staging/xgifb/XGI_main_26.c | 4 +-
+ drivers/staging/xgifb/vb_setmode.c | 25 +-
+ include/linux/iio/adc/ad_sigma_delta.h | 1 +
+ include/linux/iio/consumer.h | 13 +
+ include/linux/iio/dac/mcp4725.h | 12 +-
+ include/linux/iio/iio.h | 2 +-
+ include/linux/iio/sysfs.h | 24 +
+ include/linux/iio/trigger.h | 2 +
+ include/soc/bcm2835/raspberrypi-firmware.h | 21 +
+ include/uapi/linux/iio/types.h | 2 +
+ tools/iio/iio_generic_buffer.c | 18 +-
+ 416 files changed, 17362 insertions(+), 15521 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-counter-104-quad-8
+ create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-light-isl29018
+ create mode 100644 Documentation/devicetree/bindings/iio/dac/mcp4725.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/humidity/hts221.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/light/isl29018.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/potentiostat/lmp91000.txt
+ create mode 100644 drivers/iio/accel/da280.c
+ create mode 100644 drivers/iio/accel/da311.c
+ create mode 100644 drivers/iio/accel/dmard10.c
+ create mode 100644 drivers/iio/accel/sca3000.c
+ create mode 100644 drivers/iio/adc/ad7766.c
+ create mode 100644 drivers/iio/counter/104-quad-8.c
+ create mode 100644 drivers/iio/counter/Kconfig
+ create mode 100644 drivers/iio/counter/Makefile
+ create mode 100644 drivers/iio/humidity/hts221.h
+ create mode 100644 drivers/iio/humidity/hts221_buffer.c
+ create mode 100644 drivers/iio/humidity/hts221_core.c
+ create mode 100644 drivers/iio/humidity/hts221_i2c.c
+ create mode 100644 drivers/iio/humidity/hts221_spi.c
+ rename drivers/{staging => }/iio/light/isl29018.c (88%)
+ create mode 100644 drivers/iio/potentiostat/Kconfig
+ create mode 100644 drivers/iio/potentiostat/Makefile
+ create mode 100644 drivers/iio/potentiostat/lmp91000.c
+ create mode 100644 drivers/iio/pressure/abp060mg.c
+ rename drivers/staging/fsl-mc/{include => bus}/dpbp-cmd.h (100%)
+ rename drivers/staging/fsl-mc/{include => bus}/dpcon-cmd.h (100%)
+ delete mode 100644 drivers/staging/iio/accel/sca3000.h
+ delete mode 100644 drivers/staging/iio/accel/sca3000_core.c
+ delete mode 100644 drivers/staging/iio/accel/sca3000_ring.c
+ rename drivers/staging/iio/adc/{ad7606_core.c => ad7606.c} (50%)
+ delete mode 100644 drivers/staging/iio/adc/ad7606_ring.c
+ delete mode 100644 drivers/staging/iio/ring_hw.h
+ create mode 100644 drivers/staging/lustre/lustre/include/lustre_nrs.h
+ create mode 100644 drivers/staging/lustre/lustre/include/lustre_nrs_fifo.h
+ delete mode 100644 drivers/staging/lustre/lustre/llite/llite_close.c
+ delete mode 100644 drivers/staging/lustre/lustre/obdclass/linux/linux-obdo.c
+ delete mode 100644 drivers/staging/sm750fb/ddk750_help.c
+ delete mode 100644 drivers/staging/sm750fb/ddk750_help.h
+ create mode 100644 drivers/staging/vc04_services/interface/vchi/TODO
+Merging char-misc/char-misc-next (07d9a380680d Linux 4.9-rc2)
+$ git merge char-misc/char-misc-next
+Already up-to-date.
+Merging extcon/extcon-next (67fafcf82c3e extcon: usb-gpio: Add VBUS detection support)
+$ git merge extcon/extcon-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/extcon/extcon-usb-gpio.txt | 3 +
+ drivers/extcon/extcon-qcom-spmi-misc.c | 2 +-
+ drivers/extcon/extcon-usb-gpio.c | 169 ++++++++++++++++-----
+ 3 files changed, 133 insertions(+), 41 deletions(-)
+Merging slave-dma/next (3277a5ccb332 Merge branch 'topic/st_fdma' into next)
+$ git merge slave-dma/next
+Auto-merging arch/arm/configs/multi_v7_defconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/dma/qcom_hidma_mgmt.txt | 12 +-
+ Documentation/devicetree/bindings/dma/st_fdma.txt | 87 ++
+ MAINTAINERS | 3 +
+ arch/arm/configs/multi_v7_defconfig | 6 +
+ drivers/dma/Kconfig | 14 +
+ drivers/dma/Makefile | 1 +
+ drivers/dma/edma.c | 1 +
+ drivers/dma/ioat/dma.c | 10 +-
+ drivers/dma/omap-dma.c | 124 ++-
+ drivers/dma/pxa_dma.c | 28 -
+ drivers/dma/qcom/hidma.h | 2 +
+ drivers/dma/qcom/hidma_dbg.c | 1 -
+ drivers/dma/qcom/hidma_ll.c | 49 +-
+ drivers/dma/qcom/hidma_mgmt.c | 9 +-
+ drivers/dma/st_fdma.c | 889 +++++++++++++++++++++
+ drivers/dma/st_fdma.h | 249 ++++++
+ drivers/of/irq.c | 1 +
+ drivers/remoteproc/Kconfig | 25 +-
+ drivers/remoteproc/Makefile | 1 +
+ drivers/remoteproc/st_slim_rproc.c | 364 +++++++++
+ include/linux/remoteproc/st_slim_rproc.h | 58 ++
+ 21 files changed, 1833 insertions(+), 101 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/dma/st_fdma.txt
+ create mode 100644 drivers/dma/st_fdma.c
+ create mode 100644 drivers/dma/st_fdma.h
+ create mode 100644 drivers/remoteproc/st_slim_rproc.c
+ create mode 100644 include/linux/remoteproc/st_slim_rproc.h
+Merging cgroup/for-next (4221d2ce6e57 Merge branch 'for-4.9' into for-next)
+$ git merge cgroup/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging scsi/for-next (85d3116d8d50 Merge branch 'misc' into for-next)
+$ git merge scsi/for-next
+Removing drivers/scsi/g_NCR5380_mmio.c
+Auto-merging drivers/scsi/Makefile
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/scsi/hisilicon-sas.txt | 1 +
+ MAINTAINERS | 6 +-
+ drivers/message/fusion/mptscsih.c | 11 +-
+ drivers/scsi/Kconfig | 34 +-
+ drivers/scsi/Makefile | 1 -
+ drivers/scsi/NCR5380.c | 143 +--
+ drivers/scsi/NCR5380.h | 87 +-
+ drivers/scsi/arcmsr/arcmsr.h | 5 +-
+ drivers/scsi/arcmsr/arcmsr_hba.c | 82 +-
+ drivers/scsi/arm/cumana_1.c | 98 +-
+ drivers/scsi/arm/oak.c | 34 +-
+ drivers/scsi/atari_scsi.c | 77 +-
+ drivers/scsi/be2iscsi/be_main.c | 37 +-
+ drivers/scsi/dmx3191d.c | 20 +-
+ drivers/scsi/fcoe/fcoe.c | 25 +-
+ drivers/scsi/fcoe/fcoe_ctlr.c | 132 ++-
+ drivers/scsi/fcoe/fcoe_sysfs.c | 83 +-
+ drivers/scsi/fnic/fnic_trace.c | 4 +-
+ drivers/scsi/fnic/fnic_trace.h | 2 +-
+ drivers/scsi/g_NCR5380.c | 290 +++---
+ drivers/scsi/g_NCR5380.h | 32 +-
+ drivers/scsi/g_NCR5380_mmio.c | 10 -
+ drivers/scsi/hisi_sas/hisi_sas.h | 2 +
+ drivers/scsi/hisi_sas/hisi_sas_main.c | 7 +
+ drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 5 +-
+ drivers/scsi/hpsa.c | 3 +-
+ drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 1096 +++++++++-----------
+ drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.h | 5 +-
+ drivers/scsi/ipr.c | 173 +--
+ drivers/scsi/ipr.h | 7 +-
+ drivers/scsi/libfc/fc_disc.c | 38 +-
+ drivers/scsi/libfc/fc_exch.c | 149 ++-
+ drivers/scsi/libfc/fc_fcp.c | 196 +++-
+ drivers/scsi/libfc/fc_lport.c | 17 +-
+ drivers/scsi/libfc/fc_rport.c | 441 ++++++--
+ drivers/scsi/libiscsi.c | 4 +-
+ drivers/scsi/lpfc/lpfc.h | 6 +
+ drivers/scsi/lpfc/lpfc_attr.c | 160 +--
+ drivers/scsi/lpfc/lpfc_bsg.c | 45 +
+ drivers/scsi/lpfc/lpfc_bsg.h | 10 +
+ drivers/scsi/lpfc/lpfc_crtn.h | 2 -
+ drivers/scsi/lpfc/lpfc_els.c | 2 +-
+ drivers/scsi/lpfc/lpfc_hw4.h | 18 +-
+ drivers/scsi/lpfc/lpfc_init.c | 116 ++-
+ drivers/scsi/lpfc/lpfc_scsi.c | 49 +-
+ drivers/scsi/lpfc/lpfc_sli.c | 41 +-
+ drivers/scsi/lpfc/lpfc_version.h | 2 +-
+ drivers/scsi/mac_scsi.c | 83 +-
+ drivers/scsi/sun3_scsi.c | 80 +-
+ drivers/scsi/ufs/ufs-qcom.c | 10 +-
+ drivers/scsi/ufs/ufshcd.c | 17 +-
+ drivers/scsi/ufs/ufshcd.h | 8 +-
+ include/scsi/libfc.h | 9 +-
+ 53 files changed, 2259 insertions(+), 1756 deletions(-)
+ delete mode 100644 drivers/scsi/g_NCR5380_mmio.c
+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 (19f14deb00b3 Merge branch 'for-4.9-fixes' into for-next)
+$ git merge libata/for-next
+Auto-merging include/linux/blkdev.h
+Auto-merging block/blk-core.c
+Merge made by the 'recursive' strategy.
+ block/blk-core.c | 4 ++-
+ drivers/ata/ahci.c | 41 +++++++++++++-----------
+ drivers/ata/ahci_qoriq.c | 16 ++++++++--
+ drivers/ata/libahci.c | 1 +
+ drivers/ata/libata-core.c | 35 ++++++++++++++++++++-
+ drivers/ata/libata-scsi.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++-
+ drivers/ata/libata.h | 2 +-
+ include/linux/ata.h | 6 ++++
+ include/linux/blkdev.h | 14 +++++++++
+ include/linux/libata.h | 5 +++
+ 10 files changed, 178 insertions(+), 26 deletions(-)
+Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
+$ git merge binfmt_misc/for-next
+Already up-to-date.
+Merging vhost/linux-next (789ffaecf80b virtio_pci: Limit DMA mask to 44 bits for legacy virtio devices)
+$ git merge vhost/linux-next
+Merge made by the 'recursive' strategy.
+ drivers/virtio/virtio_pci_legacy.c | 16 ++++++++++++----
+ 1 file changed, 12 insertions(+), 4 deletions(-)
+Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
+$ git merge remoteproc/for-next
+Resolved 'drivers/remoteproc/remoteproc_core.c' using previous resolution.
+Auto-merging drivers/remoteproc/remoteproc_core.c
+CONFLICT (content): Merge conflict in drivers/remoteproc/remoteproc_core.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master b62a377a25c9] Merge remote-tracking branch 'remoteproc/for-next'
+$ git diff -M --stat --summary HEAD^..
+Merging rpmsg/for-next (20b1f39a51dc Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
+$ git merge rpmsg/for-next
+Merge made by the 'recursive' strategy.
+ drivers/remoteproc/qcom_q6v5_pil.c | 1 +
+ drivers/remoteproc/qcom_wcnss.c | 1 +
+ drivers/remoteproc/qcom_wcnss_iris.c | 1 +
+ drivers/remoteproc/remoteproc_core.c | 31 ++++++++++++++++---------------
+ include/linux/remoteproc.h | 2 +-
+ 5 files changed, 20 insertions(+), 16 deletions(-)
+Merging gpio/for-next (af223dd86d98 Merge branch 'devel' into for-next)
+$ git merge gpio/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/acpi/gpio-properties.txt | 62 ++++++++
+ drivers/gpio/Kconfig | 9 ++
+ drivers/gpio/Makefile | 2 +
+ drivers/gpio/gpio-altera-a10sr.c | 130 +++++++++++++++++
+ drivers/gpio/gpio-max77620.c | 10 +-
+ drivers/gpio/gpio-merrifield.c | 2 +-
+ drivers/gpio/gpio-mxs.c | 45 ++++--
+ drivers/gpio/gpio-pca953x.c | 2 +
+ drivers/gpio/gpiolib-acpi.c | 106 ++++++++++++--
+ drivers/gpio/gpiolib-devprop.c | 62 ++++++++
+ drivers/gpio/gpiolib-of.c | 61 ++------
+ drivers/gpio/gpiolib.c | 57 ++++++--
+ drivers/gpio/gpiolib.h | 2 +
+ include/linux/gpio/driver.h | 2 +-
+ tools/gpio/gpio-hammer.c | 67 +++------
+ tools/gpio/gpio-utils.c | 256 +++++++++++++++++++++++++++++++++
+ tools/gpio/gpio-utils.h | 16 +++
+ 17 files changed, 745 insertions(+), 146 deletions(-)
+ create mode 100644 drivers/gpio/gpio-altera-a10sr.c
+ create mode 100644 drivers/gpio/gpiolib-devprop.c
+Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
+$ git merge dma-mapping/dma-mapping-next
+Already up-to-date.
+Merging pwm/for-next (dc8e6e1e8f2d Merge branch 'for-4.9/drivers' into for-next)
+$ git merge pwm/for-next
+Already up-to-date.
+Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
+$ git merge dma-buf/for-next
+Recorded preimage for 'drivers/dma-buf/Kconfig'
+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
+Recorded resolution for 'drivers/dma-buf/Kconfig'.
+[master 5f9d9e7ff522] Merge remote-tracking branch 'dma-buf/for-next'
+$ git diff -M --stat --summary HEAD^..
+Merging userns/for-next (ce99dd5fd5f6 mm: Add a user_ns owner to mm_struct and fix ptrace_may_access)
+$ git merge userns/for-next
+Auto-merging kernel/ptrace.c
+Merge made by the 'recursive' strategy.
+ include/linux/mm_types.h | 1 +
+ kernel/fork.c | 9 ++++++---
+ kernel/ptrace.c | 17 ++++++-----------
+ mm/init-mm.c | 2 ++
+ 4 files changed, 15 insertions(+), 14 deletions(-)
+Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
+$ git merge ktest/for-next
+Already up-to-date.
+Merging clk/clk-next (7ae74aaf3850 Merge branch 'clk-next-oxnas' into clk-next)
+$ git merge clk/clk-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/clock/oxnas,stdclk.txt | 19 +-
+ drivers/clk/clk-oxnas.c | 232 ++++++++++++++-------
+ include/dt-bindings/clock/oxsemi,ox810se.h | 30 +++
+ include/dt-bindings/clock/oxsemi,ox820.h | 40 ++++
+ 4 files changed, 231 insertions(+), 90 deletions(-)
+ create mode 100644 include/dt-bindings/clock/oxsemi,ox810se.h
+ create mode 100644 include/dt-bindings/clock/oxsemi,ox820.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 (fecf861e765b selftests/futex: Check ANSI terminal color support)
+$ git merge kselftest/next
+Already up-to-date.
+Merging y2038/y2038 (549eb7b22e24 AFS: Correctly use 64-bit time for UUID)
+$ git merge y2038/y2038
+Resolved 'fs/afs/main.c' using previous resolution.
+Auto-merging fs/afs/main.c
+CONFLICT (content): Merge conflict in fs/afs/main.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 30a008a9a5f8] Merge remote-tracking branch 'y2038/y2038'
+$ git diff -M --stat --summary HEAD^..
+ fs/afs/main.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
+$ git merge luto-misc/next
+Already up-to-date.
+Merging borntraeger/linux-next (dcc37f904443 processor.h: remove cpu_relax_lowlatency)
+$ git merge borntraeger/linux-next
+Auto-merging kernel/locking/mutex.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_request.c
+Auto-merging arch/s390/include/asm/processor.h
+Merge made by the 'recursive' strategy.
+ arch/alpha/include/asm/processor.h | 2 +-
+ arch/arc/include/asm/processor.h | 4 ++--
+ arch/arm/include/asm/processor.h | 2 +-
+ arch/arm64/include/asm/processor.h | 2 +-
+ arch/avr32/include/asm/processor.h | 2 +-
+ arch/blackfin/include/asm/processor.h | 2 +-
+ arch/c6x/include/asm/processor.h | 2 +-
+ arch/cris/include/asm/processor.h | 2 +-
+ arch/frv/include/asm/processor.h | 2 +-
+ arch/h8300/include/asm/processor.h | 2 +-
+ arch/hexagon/include/asm/processor.h | 2 +-
+ arch/ia64/include/asm/processor.h | 2 +-
+ arch/m32r/include/asm/processor.h | 2 +-
+ arch/m68k/include/asm/processor.h | 2 +-
+ arch/metag/include/asm/processor.h | 2 +-
+ arch/microblaze/include/asm/processor.h | 2 +-
+ arch/mips/include/asm/processor.h | 2 +-
+ arch/mn10300/include/asm/processor.h | 2 +-
+ arch/nios2/include/asm/processor.h | 2 +-
+ arch/openrisc/include/asm/processor.h | 2 +-
+ arch/parisc/include/asm/processor.h | 2 +-
+ arch/powerpc/include/asm/processor.h | 2 +-
+ arch/s390/include/asm/processor.h | 4 ++--
+ arch/s390/kernel/processor.c | 4 ++--
+ arch/score/include/asm/processor.h | 2 +-
+ arch/sh/include/asm/processor.h | 2 +-
+ arch/sparc/include/asm/processor_32.h | 2 +-
+ arch/sparc/include/asm/processor_64.h | 2 +-
+ arch/tile/include/asm/processor.h | 2 +-
+ arch/unicore32/include/asm/processor.h | 2 +-
+ arch/x86/include/asm/processor.h | 2 +-
+ arch/x86/um/asm/processor.h | 2 +-
+ arch/xtensa/include/asm/processor.h | 2 +-
+ drivers/gpu/drm/i915/i915_gem_request.c | 2 +-
+ drivers/vhost/net.c | 4 ++--
+ kernel/locking/mcs_spinlock.h | 4 ++--
+ kernel/locking/mutex.c | 4 ++--
+ kernel/locking/osq_lock.c | 6 +++---
+ kernel/locking/qrwlock.c | 6 +++---
+ kernel/locking/rwsem-xadd.c | 4 ++--
+ kernel/stop_machine.c | 2 +-
+ lib/lockref.c | 2 +-
+ 42 files changed, 53 insertions(+), 53 deletions(-)
+Merging livepatching/for-next (2992ef29ae01 livepatch/module: make TAINT_LIVEPATCH module-specific)
+$ git merge livepatching/for-next
+Already up-to-date.
+Merging coresight/next (e87d6305b858 coresight: reset "enable_sink" flag when need be)
+$ git merge coresight/next
+Merge made by the 'recursive' strategy.
+ drivers/hwtracing/coresight/coresight-etm-perf.c | 31 ++++-----
+ drivers/hwtracing/coresight/coresight-etm.h | 5 ++
+ .../hwtracing/coresight/coresight-etm3x-sysfs.c | 12 +++-
+ drivers/hwtracing/coresight/coresight-priv.h | 4 +-
+ drivers/hwtracing/coresight/coresight-stm.c | 4 +-
+ drivers/hwtracing/coresight/coresight.c | 74 ++++++++++++++++++++--
+ 6 files changed, 105 insertions(+), 25 deletions(-)
+Merging rtc/rtc-next (290cd0f07f0c rtc: cmos: don't refer to asm-generic/rtc.h)
+$ git merge rtc/rtc-next
+Merge made by the 'recursive' strategy.
+ drivers/rtc/Kconfig | 4 +--
+ drivers/rtc/rtc-cmos.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++--
+ 2 files changed, 74 insertions(+), 5 deletions(-)
+Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
+$ git merge hwspinlock/for-next
+Already up-to-date.
+Merging nvdimm/libnvdimm-for-next (e476f94482fc Merge branch 'for-4.9/dax' into libnvdimm-for-next)
+$ 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 (000cf9328226 kdump, vmcoreinfo: report actual value of phys_base)
+$ git merge --no-ff akpm-current/current
+Auto-merging mm/slab.c
+Auto-merging include/linux/kernel.h
+Auto-merging arch/powerpc/platforms/85xx/corenet_generic.c
+Auto-merging arch/powerpc/kernel/traps.c
+Auto-merging arch/powerpc/kernel/misc_64.S
+Auto-merging arch/powerpc/kernel/misc_32.S
+Auto-merging arch/powerpc/kernel/head_64.S
+Auto-merging arch/powerpc/kernel/Makefile
+Auto-merging arch/powerpc/include/asm/unistd.h
+Auto-merging arch/powerpc/Makefile
+Auto-merging arch/Kconfig
+Auto-merging Documentation/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/kernel-parameters.txt | 4 +
+ Kbuild | 12 +-
+ arch/Kconfig | 3 +
+ arch/arm/include/asm/page.h | 2 +
+ arch/ia64/kernel/Makefile | 8 +-
+ arch/powerpc/Kconfig | 16 +-
+ arch/powerpc/Makefile | 1 +
+ arch/powerpc/boot/string.S | 67 ++--
+ arch/powerpc/configs/powernv_defconfig | 2 +
+ arch/powerpc/configs/ppc64_defconfig | 2 +
+ arch/powerpc/configs/pseries_defconfig | 2 +
+ arch/powerpc/include/asm/debug.h | 2 +-
+ arch/powerpc/include/asm/elf_util.h | 92 +++++
+ arch/powerpc/include/asm/ima.h | 29 ++
+ arch/powerpc/include/asm/kexec.h | 28 +-
+ arch/powerpc/include/asm/kexec_elf_64.h | 10 +
+ arch/powerpc/include/asm/machdep.h | 4 +-
+ arch/powerpc/include/asm/module.h | 14 +-
+ arch/powerpc/include/asm/smp.h | 2 +-
+ arch/powerpc/include/asm/systbl.h | 1 +
+ arch/powerpc/include/asm/unistd.h | 2 +-
+ arch/powerpc/include/uapi/asm/unistd.h | 1 +
+ arch/powerpc/kernel/Makefile | 8 +-
+ arch/powerpc/kernel/elf_util.c | 476 ++++++++++++++++++++++++++
+ arch/powerpc/kernel/elf_util_64.c | 376 ++++++++++++++++++++
+ arch/powerpc/kernel/head_64.S | 2 +-
+ arch/powerpc/kernel/ima_kexec.c | 223 ++++++++++++
+ arch/powerpc/kernel/kexec_elf_64.c | 282 +++++++++++++++
+ arch/powerpc/kernel/machine_kexec_64.c | 474 +++++++++++++++++++++++++
+ arch/powerpc/kernel/misc_32.S | 2 +-
+ arch/powerpc/kernel/misc_64.S | 6 +-
+ arch/powerpc/kernel/module_64.c | 329 +++---------------
+ arch/powerpc/kernel/prom.c | 2 +-
+ arch/powerpc/kernel/setup_64.c | 4 +-
+ arch/powerpc/kernel/smp.c | 6 +-
+ arch/powerpc/kernel/traps.c | 2 +-
+ arch/powerpc/platforms/85xx/corenet_generic.c | 2 +-
+ arch/powerpc/platforms/85xx/smp.c | 8 +-
+ arch/powerpc/platforms/cell/spu_base.c | 2 +-
+ arch/powerpc/platforms/powernv/setup.c | 6 +-
+ arch/powerpc/platforms/ps3/setup.c | 4 +-
+ arch/powerpc/platforms/pseries/Makefile | 2 +-
+ arch/powerpc/platforms/pseries/setup.c | 4 +-
+ arch/powerpc/purgatory/.gitignore | 2 +
+ arch/powerpc/purgatory/Makefile | 48 +++
+ arch/powerpc/purgatory/console-ppc64.c | 38 ++
+ arch/powerpc/purgatory/crashdump-ppc64.h | 42 +++
+ arch/powerpc/purgatory/crashdump_backup.c | 36 ++
+ arch/powerpc/purgatory/crtsavres.S | 5 +
+ arch/powerpc/purgatory/hvCall.S | 27 ++
+ arch/powerpc/purgatory/hvCall.h | 8 +
+ arch/powerpc/purgatory/kexec-sha256.h | 11 +
+ arch/powerpc/purgatory/ppc64_asm.h | 20 ++
+ arch/powerpc/purgatory/printf.c | 164 +++++++++
+ arch/powerpc/purgatory/purgatory-ppc64.c | 41 +++
+ arch/powerpc/purgatory/purgatory-ppc64.h | 6 +
+ arch/powerpc/purgatory/purgatory.c | 62 ++++
+ arch/powerpc/purgatory/purgatory.h | 11 +
+ arch/powerpc/purgatory/sha256.c | 6 +
+ arch/powerpc/purgatory/sha256.h | 1 +
+ arch/powerpc/purgatory/string.S | 2 +
+ arch/powerpc/purgatory/v2wrap.S | 134 ++++++++
+ arch/um/Makefile | 2 +-
+ arch/x86/kernel/crash.c | 37 +-
+ arch/x86/kernel/kexec-bzimage64.c | 48 +--
+ arch/x86/kernel/machine_kexec_64.c | 1 +
+ arch/x86/um/shared/sysdep/kernel-offsets.h | 2 +-
+ arch/x86/um/user-offsets.c | 4 +-
+ block/genhd.c | 2 +-
+ include/linux/crc64_ecma.h | 56 +++
+ include/linux/ima.h | 12 +
+ include/linux/kbuild.h | 2 +-
+ include/linux/kernel.h | 15 +
+ include/linux/kexec.h | 38 +-
+ include/linux/llist.h | 26 +-
+ include/trace/events/zsmalloc.h | 76 ++++
+ kernel/kcov.c | 9 +-
+ kernel/kexec_file.c | 145 ++++----
+ kernel/kexec_internal.h | 16 -
+ kernel/watchdog.c | 1 -
+ lib/Kconfig | 7 +
+ lib/Makefile | 1 +
+ lib/crc64_ecma.c | 341 ++++++++++++++++++
+ mm/page_owner.c | 4 +-
+ mm/slab.c | 2 +-
+ mm/zsmalloc.c | 27 +-
+ scripts/mod/Makefile | 11 +-
+ security/integrity/ima/Kconfig | 12 +
+ security/integrity/ima/Makefile | 1 +
+ security/integrity/ima/ima.h | 31 ++
+ security/integrity/ima/ima_crypto.c | 6 +-
+ security/integrity/ima/ima_fs.c | 30 +-
+ security/integrity/ima/ima_init.c | 2 +
+ security/integrity/ima/ima_kexec.c | 168 +++++++++
+ security/integrity/ima/ima_main.c | 1 +
+ security/integrity/ima/ima_queue.c | 76 +++-
+ security/integrity/ima/ima_template.c | 293 +++++++++++++++-
+ security/integrity/ima/ima_template_lib.c | 7 +-
+ 98 files changed, 4147 insertions(+), 553 deletions(-)
+ create mode 100644 arch/powerpc/include/asm/elf_util.h
+ create mode 100644 arch/powerpc/include/asm/ima.h
+ create mode 100644 arch/powerpc/include/asm/kexec_elf_64.h
+ create mode 100644 arch/powerpc/kernel/elf_util.c
+ create mode 100644 arch/powerpc/kernel/elf_util_64.c
+ create mode 100644 arch/powerpc/kernel/ima_kexec.c
+ create mode 100644 arch/powerpc/kernel/kexec_elf_64.c
+ create mode 100644 arch/powerpc/purgatory/.gitignore
+ create mode 100644 arch/powerpc/purgatory/Makefile
+ create mode 100644 arch/powerpc/purgatory/console-ppc64.c
+ create mode 100644 arch/powerpc/purgatory/crashdump-ppc64.h
+ create mode 100644 arch/powerpc/purgatory/crashdump_backup.c
+ create mode 100644 arch/powerpc/purgatory/crtsavres.S
+ create mode 100644 arch/powerpc/purgatory/hvCall.S
+ create mode 100644 arch/powerpc/purgatory/hvCall.h
+ create mode 100644 arch/powerpc/purgatory/kexec-sha256.h
+ create mode 100644 arch/powerpc/purgatory/ppc64_asm.h
+ create mode 100644 arch/powerpc/purgatory/printf.c
+ create mode 100644 arch/powerpc/purgatory/purgatory-ppc64.c
+ create mode 100644 arch/powerpc/purgatory/purgatory-ppc64.h
+ create mode 100644 arch/powerpc/purgatory/purgatory.c
+ create mode 100644 arch/powerpc/purgatory/purgatory.h
+ create mode 100644 arch/powerpc/purgatory/sha256.c
+ create mode 100644 arch/powerpc/purgatory/sha256.h
+ create mode 100644 arch/powerpc/purgatory/string.S
+ create mode 100644 arch/powerpc/purgatory/v2wrap.S
+ create mode 100644 include/linux/crc64_ecma.h
+ create mode 100644 include/trace/events/zsmalloc.h
+ create mode 100644 lib/crc64_ecma.c
+ create mode 100644 security/integrity/ima/ima_kexec.c
+$ git am -3 ../patches/0001-powerpc-merge-fix-for-CONFIG_WORD_SIZE-BITS-rename.patch
+Applying: powerpc: merge fix for CONFIG_WORD_SIZE -> BITS rename
+$ git reset HEAD^
+Unstaged changes after reset:
+M arch/powerpc/kernel/Makefile
+M arch/powerpc/purgatory/Makefile
+$ git add -A .
+$ git commit -v -a --amend
+[master 147235128555] Merge branch 'akpm-current/current'
+ Date: Wed Oct 26 13:23:17 2016 +1100
+$ git am -3 ../patches/0001-powerpc-include-asm-ima.h-for-setup_ima_buffer.patch
+Applying: powerpc: include asm/ima.h for setup_ima_buffer
+$ git reset HEAD^
+Unstaged changes after reset:
+M arch/powerpc/kernel/machine_kexec_64.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 17632812820a] Merge branch 'akpm-current/current'
+ Date: Wed Oct 26 13:23:17 2016 +1100
+$ git am -3 ../patches/0001-powerpc-disable-KEXEC_FILE-for-now.patch
+Applying: powerpc: disable KEXEC_FILE for now
+$ git reset HEAD^
+Unstaged changes after reset:
+M arch/powerpc/Kconfig
+$ git add -A .
+$ git commit -v -a --amend
+[master 4ef8c0e43191] Merge branch 'akpm-current/current'
+ Date: Wed Oct 26 13:23:17 2016 +1100
+$ 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
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + 7aff762187ab...a518fb4d8bae akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (a518fb4d8bae drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression)
+$ git merge --no-ff akpm/master
+Merge made by the 'recursive' strategy.
+ drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Next/quilt-import.log b/Next/quilt-import.log
new file mode 100644
index 000000000000..11e7573849f4
--- /dev/null
+++ b/Next/quilt-import.log
@@ -0,0 +1,4 @@
+Importing jdelvare-hwmon based on 08d27eb2066622cd659b91d877d0406ebd651225
+Unchanged quilt series jdelvare-hwmon
+Importing dmi based on 4.8
+Unchanged quilt series dmi
diff --git a/localversion-next b/localversion-next
new file mode 100644
index 000000000000..61c9d3ae9492
--- /dev/null
+++ b/localversion-next
@@ -0,0 +1 @@
+-next-20161026