diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-07-29 14:43:03 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-07-29 14:43:03 +1000 |
| commit | d4cef4349fe6295725447473a6f7af6a7d2d7f8d (patch) | |
| tree | 1da342603dff6285ec903005c37ad777d621ef37 | |
| parent | 4d77ae8280d4aca706a27de5835dd32250ba4040 (diff) | |
| download | linux-next-next-20160729.tar.gz | |
Add linux-next specific files for 20160729next-20160729
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 242 | ||||
| -rw-r--r-- | Next/Trees | 244 | ||||
| -rw-r--r-- | Next/merge.log | 7921 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 8412 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..baa16686b634 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,242 @@ +Name SHA1 +---- ---- +origin 884316deb4c9fdf9becfa31831a9e40717e3026c +fixes 3fc9d690936fb2e20e180710965ba2cc3a0881f8 +kbuild-current b36fad65d61fffe4b662d4bfb1ed673c455a36a2 +arc-current 9bd54517ee86cb164c734f72ea95aeba4804f10b +arm-current f6492164ecb19d43687875fdb456845acc504590 +m68k-current 6bd80f372371a7b3f5ff13e4e8a560066299c001 +metag-fixes 0164a711c97b0beeb7994b7d32ccddf586b6d81a +powerpc-fixes bfa37087aa04e45f56c41142dfceecb79b8e6ef9 +powerpc-merge-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +sparc 344e3c7734d5090b148c19ac6539b8947fed6767 +net 6a492b0f23d28e1f946cdf08e54617484400dafb +ipsec 7677c7560c3e80fde08a7e710d378dedabf950c3 +netfilter ea43f860d984b00c3e3fa02049412ce94ce9ed5e +ipvs ea43f860d984b00c3e3fa02049412ce94ce9ed5e +wireless-drivers 034fdd4a17ff089c2428ece18efa65c5396810d2 +mac80211 16a910a6722b7a8680409e634c7c0dac073c01e4 +sound-current 0984d159c8ad6618c6ebd9f00bc3f374fa52bc35 +pci-current ef0dab4aae14e25efddf1577736f8450132800c5 +driver-core.current 523d939ef98fd712632d93a5a2b588e477a7565e +tty.current 0e06f5c0deeef0332a5da2ecb8f1fcf3e024d958 +usb.current e65805251f2db69c9f67ed8062ab82526be5a374 +usb-gadget-fixes 50c763f8c1bac0dc00f7788a75f227276c0efd54 +usb-serial-fixes 4c2e07c6a29e0129e975727b9f57eede813eea85 +usb-chipidea-fixes ea1d39a31d3b1b6060b6e83e5a29c069a124c68a +staging.current 0e06f5c0deeef0332a5da2ecb8f1fcf3e024d958 +char-misc.current 0e06f5c0deeef0332a5da2ecb8f1fcf3e024d958 +input-current 0808882863774ab69066d83f49f511606be024e0 +crypto-current 64ec6ccb76e6ef13c40ad68e125545f8807a26c8 +ide d4f8c2e0f827a0b3a322c449ac331ae41feeb359 +rr-fixes 8244062ef1e54502ef55f54cced659913f244c3e +vfio-fixes ce7585f3c4d76bca1dff4b66ae1ea32552954f9e +kselftest-fixes f80eb4289491f6ddb0788636ce0bd6f5d3a2012a +backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f +ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600 +mfd-fixes 5baaf3b9efe127d239038de9219d381f4d882b26 +drm-intel-fixes ed2eebbd61af8d378ca39ad7aef7017f29eed6f3 +asm-generic b0da6d44157aa6e652de7634343708251ba64146 +arc 3925a16ae980c79d1a8fd182d7f9487da1edd4dc +arm bf9cb43591825d32c24b244e48ae690fb5516222 +arm-perf 1a695a905c18548062509178b98bc91e67510864 +arm-soc 9914c2a608443fde9179e2e63d100868729da50f +amlogic 4d9b3db03bd42c672863c07956cbc32e940fd3d2 +at91 0f59c948faed3715331c2648b46d6d0033d86f5c +bcm2835 aa5c0a1e15c2e6a0e12cdb3719b4cc8ec56d487c +berlin d433580f3b4ef47f16f418a9723c22a78680f931 +cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4 +imx-mxs 63a404a3f177cc9127a05536580cab2b92752c1f +keystone eef6bb9fc17a5c7b8b624db8b81158b632740319 +mvebu feaf6b0beba8adc0d16cb724ec6ab33f576f7e5c +omap 370c3261ba8a48ea546ecb3095c9ed3bef19684d +omap-pending c20c8f750d9f8f8617f07ee2352d3ff560e66bc2 +qcom 289f9fb05d0c81122af489ae59f9f0601c237389 +renesas 314a0bb0dd88cbe80033adcdc6d1912a92613152 +rockchip ebbfb5d5627d635d24e2270fa0de2f3017fe3cb5 +rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590 +samsung 1a695a905c18548062509178b98bc91e67510864 +samsung-krzk 253256f6429442f65a9d3287f1e4ab4674bbceb7 +tegra 6083e0f837acb04782b25d81043950ddcafcdc41 +arm64 fd6380b75065fd2ff51b5f7cbbe6be77d71ea9c7 +blackfin 391e74a51ea2ce54f4d4a213a207a6bfb73e0b33 +c6x ca3060d39ae7a0964f8c123a4833029981e86476 +cris f9f3f864b5e8c09d7837d8980edba4ad52969819 +h8300 58c57526711f7c87046b7c5a650535acbab2d3fb +hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a +ia64 fbb0e4da96f4503e65bc4fb627cf4e1d7c8c64e6 +m68k 6bd80f372371a7b3f5ff13e4e8a560066299c001 +m68knommu 33688abb2802ff3a230bd2441f765477b94cc89e +metag fb2bb461e2d8c3af659c8a501d642a735b3ddadc +microblaze 52e9e6e05617264e6e609a8699098380d6b7a6aa +mips 737a004afb2c76d3eadb9e0db48fe70123af8af7 +nios2 9fa78f63a8921ce37252be34ef8eea2f4bfbb13f +parisc-hd 5975b2c0c10adbc7894a54ab7b30db4fbcdd8c41 +powerpc fbef66f0adcddf4475e19f3d09df22fb34e633f6 +powerpc-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +fsl 9f595fd8b54809fed13fc30906ef1e90a3fcfbc9 +mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0 +s390 370fc4a8d9f861f3920ede4f3fffd7d3449d7999 +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +sh 0748d718ba7e825c2ec19e1f3fdf389927a43e3b +tile 74050a3188c83a2f12e4714892507b48eee885bf +uml a78ff1112263fdd871d3506dbcff44f6f12e8423 +unicore32 c83d8b2fc98606ac6a9a0cb5f42908488314ea22 +xtensa 9da8320bb97768e35f2e64fa7642015271d672eb +btrfs 8b8b08cbfb9021af4b54b4175fc4c51d655aac8c +btrfs-kdave d84c090ad3e96f6e66c28fd4b48a69c4eb141fb5 +ceph a0f2b65275413b3438e9f55b1427273cd893c3b2 +cifs 7893242e2465aea6f2cbc2639da8fa5ce96e8cc2 +configfs 3dc3afadeb0403fd967b97ee282ab9053d36da2b +ecryptfs 2bdcdbea80bd161467f1dc32b09ccc67ddeefdc0 +ext3 e008bb6134a6e68fd2c827a46b27d017d920de8f +ext4 7bc9491645118c9461bd21099c31755ff6783593 +f2fs 194dc870a5890e855ecffb30f3b80ba7c88f96d6 +freevxfs bf1bb4b460c8dc3a33793bff21464a9d816697ad +fscache b00c2ae2ed3c0c40e0740549fe0e42e234a97dc2 +fuse d26034dfc1cc45b26b6401d64c18ec0d14c42df7 +gfs2 e1cb6be9e142e6cc6246f3ab2776b4d7a2b3d9f0 +jfs 6ed71e9819ac3412fc6a3495f5ce141df274c916 +nfs 698c937b0d17dd55227622b919482fc720cc1095 +nfsd 4b954bf8b629c7a7e4532ac8390151bf84c30f2d +orangefs 78fee0b6846f27872321338db6afe280f059ae99 +overlayfs e9c5d5a5b27213d7b48e92f75949b0e40cadd5a1 +v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc +ubifs 4ac1c17b2044a1b4b2fbed74451947e905fc2992 +xfs f2bdfda9a1c668539bc85baf5625f6f14bc510b1 +file-locks 5af9c2e19da6514a1a50b07d97d93b74a7711873 +vfs 38a8a5e62f9a7bab820a065ff47d4717892ba65b +pci bef6d4c887067b6bbfc141cb77af47549741bbf7 +pstore 35da60941e44dbf57868e67686dd24cc1a33125a +hid de1bcd764ea0adabdc32ed7f74af2da65ae07c51 +i2c c35d490516e622901425e3edce1b4b2cd6b1d5a5 +jdelvare-hwmon 08d27eb2066622cd659b91d877d0406ebd651225 +dmi 0deb6b2c087a9303386143963a6e6ce2bef08f04 +hwmon-staging 1d3dd4ce210f347dd214913544e22fd9a8122901 +v4l-dvb bcbadf9d8331b27ab3fd67999782ebe77368ca6e +pm e5467ddd7ea4fc688c9a52381a3542332581bc12 +idle f55532a0c0b8bb6148f4e07853b876ef73bc69ca +thermal 2c5ce98e1e836184a45f4268a598a18a5a02af06 +thermal-soc 9a1d2bd3e7fd393b209cb8d66e24c04dca2d2ab4 +ieee1394 384fbb96f9268eee0b703b39cb07557403bd9aac +dlm 5c93f56f770e69c4cf2dbaebecd6bcca205949f9 +swiotlb 386744425e35e04984c6e741c7750fd6eef1a9df +slave-dma 61fa0c29434762f166cacf23d6247da3d09f6c13 +net-next 6a492b0f23d28e1f946cdf08e54617484400dafb +ipsec-next cb866e3298cd7412503fc7e2c265753c853fab9d +netfilter-next 4b512e1c1f8de6b9ceb796ecef8658e0a083cab7 +ipvs-next ae9442f688c3e6efe1f39cc9e0b906f0a7cd0421 +wireless-drivers-next cb6a115188500a448709df1f2d7698a4e1b7a099 +bluetooth 4f67818362065ee8d89b9253dbf03ff6f3701f9c +mac80211-next 7d27a0ba7adc8ef30c2aae7592fce4c162aee4df +rdma fb92d8fb1b9c2de7d7d50c199e6d3020544702e8 +rdma-leon 4c2e07c6a29e0129e975727b9f57eede813eea85 +rdma-leon-test 92d21ac74a9e3c09b0b01c764e530657e4c85c49 +mtd 7ce9ea7e6b35a652034486133174d4e17055cef5 +l2-mtd 1dcff2e4ae728a36876bdb108173f4cbcae128bf +nand 8490c03bd9d40ce71d9b67dcf93e73788ba0516d +crypto 0f95e2ffc58f5d32a90eb1051d17aeebc21cf91d +drm 162b20d2f9ef9dfa833cc329b1e8957beb672349 +drm-panel 9bb34c4c730dbfaf9c91af57bf41d0a453067e87 +drm-intel f15f6ca1e706e11fd07611bd4c7f903625349b33 +drm-tegra 64ea25c3bc86c05c7da6c683b86663f4c90158d6 +drm-misc 12ae57aab43880eac500c43590e26d9d4411961b +drm-exynos 25364a9e54fb8296837061bf684b76d20eec01fb +drm-msm 0a677125d0ff726ed3d75ab311cf54674bf512bc +hdlcd 523d939ef98fd712632d93a5a2b588e477a7565e +mali-dp 59ba2422b4308b02438506d35d5042df5d42c249 +sunxi 25d6a931b3f386f397b3400c63102f055a9ec77e +kbuild f6830d5346c932d89187a7b84c4aff1e8f1440f2 +kspp 6fbe16013e52205efaa7ea18ecf88b1d0b5fa390 +kconfig 5bcba792bb304e8341217d759ec486969a3b4258 +regmap efeb1a3ab91dc6bead3b5a522c0ceca1d711feb1 +sound 0984d159c8ad6618c6ebd9f00bc3f374fa52bc35 +sound-asoc e70a386d6f073bb820803e6427546466b31b31ab +modules 0d21f8f36ab1a201ee592925bdb03fa9545fc191 +input 192bd2be1a75036d4a640c70e6037a46d70df11d +block b013517951a168c4f60a633e3f39185897cd052f +lightnvm 191d684c5d4f478dcd225ea424b1a3e09f06ace2 +device-mapper b5ab4a9ba5574430870391e93b125ada31217c4c +pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8 +mmc-uh d7ccea3cf9b9136e33e4e6b5bed46229b28e300c +md 5d8817833c7609c24da9a92f71c53caa9c1424eb +mfd f37be01e6dc606f2fcc5e95c9933d948ce19bd35 +backlight 602553073892c18f723f8aa090153a23b1312a16 +battery 4fcd504edbf7c793325511c2df8dcd083958e28a +omap_dss2 ab366b40b8513e7590858229ecbb5e1434a52b54 +regulator a485f5fc8c8e631c32c65e5ee2bb5719400435d6 +security 7616ac70d1bb4f2e9d25c1a82d283f3368a7b632 +integrity 544e1cea03e6674e3c12a3b8e8cc507c3dbeaf0c +keys 05638c9bc586a0c8897f7e909aaa0a3d1ff052e0 +selinux 3f09354ac84c6904787189d85fb306bf60f714b8 +tpmdd 82cc1a49b6358394938e759dc4c22b2be773bbad +watchdog 1ac06563434e5f3302259608d3589bf7002431fe +iommu f360d3241f5557f241d55b959e6e65070e77992e +dwmw2-iommu 2566278551d3db875bc3bbfc41b42f2e80392108 +vfio 0991bbdbf5b85bd14a26e783f087b0f2913c93b1 +jc_docs a88b1672d4ddf9895eb53e6980926d5e960dea8e +trivial 34df117414d73cb56d128bf7016a4c151f95c313 +audit 43761473c254b45883a64441dd0bc85a42f3645c +devicetree e973f4ec130ac0eefb9e69b5139ed8a2768250aa +mailbox a68b216676e89fa959a23b583b56f9ce7df81b37 +spi 2932c287108e2987454449b8214eae6db066da85 +tip 0bd99d3b2034e5d44328a54ac386ed9ae205206f +clockevents 1d661bf5327a2c059ec967f850e89362e637f4e6 +edac 12f0721c5a70408e86257c5c99605cf743cd44c6 +edac-amd a67adb32d9413fc6277851994481b9d400128c1c +irqchip 77d50b17c990ab55cae8e95b2475ed6427e22af4 +ftrace 78aebca2c955c1c5aeb48e12645e13fe3c3461f2 +rcu 5bc94664884aa0f3a943b9b18cca1be880a643b6 +kvm 912902ce78b0d48f717f9128e61fb9bffbd65f86 +kvm-arm 3f312db6b65baf393bee02f6dfdfaa94d786dd0f +kvm-ppc c63517c2e3810071359af926f621c1f784388c3f +kvm-ppc-paulus 93d17397e4e2182fdaad503e2f9da46202c0f1c3 +kvms390 9acc317b183fdd3ed3bca218271875c0e808daae +xen-tip d34c30cc1fa80f509500ff192ea6bc7d30671061 +percpu 6710e594f71ccaad8101bc64321152af7cd9ea28 +workqueues d945b5e9f0e35cb56a3783d849b5f0f37da0a7f1 +drivers-x86 c37636b450aebcefbceeca3c19fb0eb804d3050f +chrome-platform 31b764171cb545cc1f750c573eef713329936660 +hsi 9c99e5e51988798af2a687ef9b1716dd79388550 +leds 5706c01fcfb313cef7aed6a283b43c5452cf8336 +ipmi 92cad0931b08226e71110380304ad28e12547dcb +driver-core 523d939ef98fd712632d93a5a2b588e477a7565e +tty 0e06f5c0deeef0332a5da2ecb8f1fcf3e024d958 +usb 0bf048abebb6e69be3c1630878419d80944c3cfd +usb-gadget 15e4292a2d21e9997fdb2b8c014cc461b3f268f0 +usb-serial 3161da970d38cd6ed2ba8cadec93874d1d06e11e +usb-chipidea-next 229d43daf8edca4a7f789b7ba9f13775385c8c73 +staging 0e06f5c0deeef0332a5da2ecb8f1fcf3e024d958 +char-misc 0e06f5c0deeef0332a5da2ecb8f1fcf3e024d958 +extcon c2692f2dad4f3228579bb0b2cf2d6d9bf283f31a +cgroup 1cab4a96cab6310bd6d2c0945210d9b5b67f4eec +scsi d242e6680e81cea0343bd93ba862efa70a91a56c +target-updates 291e3e51a34d2f546608bfd31f185151621135b7 +target-merge 2994a75183173defc21f0d26ce23b63232211b88 +libata 737bee9308c457090711684b976e0fe02785a094 +binfmt_misc 4af75df6a410ce76d9f60f27b07e5645ecc2c5ed +pinctrl 9573e7923007961799beff38bc5c5a7635634eef +vhost 139ab4d4e68b8cf2a611b06c006a2195dc6bedf1 +remoteproc 7a6271a80cae8f464d38b326fce0266f0448d77e +rpmsg e937b335a738c1d13cd0ff8466c3ff2b8d5da8ac +gpio 152b09f20130ac12ad1a60ff788352f7d026d59d +dma-mapping d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 +pwm 53de7c26ded7f5e954bfc202dffc43c0dd165337 +dma-buf 194cad44c4e1553fd8fcfbc940d27e756324ec3a +userns aeaa4a79ff6a5ed912b7362f206cf8576fca538b +ktest 2dcd0af568b0cf583645c8a317dd12e344b1c72a +clk d22527fed2f094c2e4f9a66f35b68a090c3d906a +random 59b8d4f1f5d26e4ca92172ff6dcd1492cdb39613 +aio b562e44f507e863c6792946e4e1b1449fbbac85d +kselftest d78388dbec256b179f1c42e714cf4acf630067c6 +y2038 549eb7b22e245064dcdc17380538718492f4ca9c +luto-misc 2dcd0af568b0cf583645c8a317dd12e344b1c72a +borntraeger b562e44f507e863c6792946e4e1b1449fbbac85d +livepatching 6d9122078097233dbfc4ad3a45512393cddf8540 +coresight 27ee11458de390f1f1491ea0da11d831bdf70866 +rtc 144d2fe0ad371c940063ab2acca81a2915bcef3d +hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828 +nvdimm 0606263f24f3d64960de742c55894190b5df903b +dax-misc 4d9a2c8746671efbb0c27d3ae28c7474597a7aad +akpm-current af431322b90093dce3a907888c213d803f5c10b5 +akpm ea2942c55b5e12f073b933776c572d03bb392778 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..784580b474a8 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,244 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#rc-fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +metag-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#fixes +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +powerpc-merge-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master +mac80211 git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +usb-chipidea-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-stable +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master +rr-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#fixes +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +ftrace-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next-urgent +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git#at91-next +bcm2835 git git://github.com/anholt/linux.git#for-next +berlin git git://git.infradead.org/users/hesselba/linux-berlin.git#berlin/for-next +cortex-m git git://git.pengutronix.de/git/ukl/linux.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mvebu git git://git.infradead.org/linux-mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +omap-pending git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +rpi git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-rpi-next +samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +blackfin git http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux.git#for-linus +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +cris git git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git#for-next +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next +hexagon git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git#linux-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +metag git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git#mips-for-linux-next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +powerpc-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#next +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +mpc5xxx git git://git.denx.de/linux-denx-agust.git#next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +sh git git://git.libc.org/linux-sh#for-next +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +unicore32 git git://github.com/gxt/linux.git#unicore32 +xtensa git git://github.com/czankel/xtensa-linux.git#for_next +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 +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +jdelvare-hwmon quilt http://jdelvare.nerim.net/devel/linux/jdelvare-hwmon/ +dmi quilt http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +v4l-dvb git git://linuxtv.org/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next +thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git#for-next +rdma-leon git git://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma.git#rdma-next +rdma-leon-test git git://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma.git#testing/rdma-next +mtd git git://git.infradead.org/mtd-2.6.git#master +l2-mtd git git://git.infradead.org/l2-mtd.git#master +nand git git://github.com/linux-nand/linux.git#nand/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://people.freedesktop.org/~airlied/linux.git#drm-next +drm-panel git git://anongit.freedesktop.org/tegra/linux.git#drm/panel/for-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-misc git git://anongit.freedesktop.org/drm-intel#topic/drm-misc +drm-exynos git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#exynos-drm/for-next +drm-msm git git://people.freedesktop.org/~robclark/linux#msm-next +hdlcd git git://linux-arm.org/linux-ld#for-upstream/hdlcd +mali-dp git git://linux-arm.org/linux-ld#for-upstream/mali-dp +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi/for-next +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#for-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +lightnvm git git://github.com/OpenChannelSSD/linux.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git#master +mmc-uh git git://git.linaro.org/people/ulf.hansson/mmc.git#next +md git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.infradead.org/battery-2.6.git#master +omap_dss2 git git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +selinux git git://git.infradead.org/users/pcmoore/selinux#next +tpmdd git git://git.infradead.org/users/jjs/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +vfio git git://github.com/awilliam/linux-vfio.git#next +jc_docs git git://git.lwn.net/linux.git#docs-next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.infradead.org/users/pcmoore/audit#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#clockevents/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +irqchip git git://git.infradead.org/users/jcooper/linux.git#irqchip/for-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvm-ppc git git://github.com/agraf/linux-2.6.git#kvm-ppc-next +kvm-ppc-paulus git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#kvm-ppc-next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git#for-next +ipmi git git://git.code.sf.net/p/openipmi/linux-ipmi#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next +target-merge git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next-merge +libata git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#for-next +binfmt_misc git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/binfmt_misc.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +remoteproc git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git#for-next +rpmsg git git://github.com/andersson/remoteproc.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +dma-mapping git git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git#dma-mapping-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +dma-buf git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +aio git git://git.kvack.org/~bcrl/aio-next.git#master +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +y2038 git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038 +luto-misc git git://git.kernel.org/pub/scm/linux/kernel/git/luto/linux.git#next +borntraeger git git://git.kernel.org/pub/scm/linux/kernel/git/borntraeger/linux.git#linux-next +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching#for-next +coresight git git://git.linaro.org/kernel/coresight.git#next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +hwspinlock git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git#for-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +dax-misc git git://git.kernel.org/cgit/linux/kernel/git/nvdimm/nvdimm.git#dax-misc +akpm-current mmotm http://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm http://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..a09b269ef257 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,7921 @@ +$ date -R +Fri, 29 Jul 2016 09:37:49 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 8448cefe499a Merge tag 'hsi-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi +Merging origin/master (884316deb4c9 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid) +$ git merge origin/master +Updating 8448cefe499a..884316deb4c9 +Fast-forward + Documentation/block/biodoc.txt | 3 +- + Documentation/filesystems/Locking | 18 +- + Documentation/filesystems/vfs.txt | 51 ++- + Documentation/hid/hid-alps.txt | 139 +++++++ + MAINTAINERS | 5 - + Makefile | 1 + + arch/arm/include/asm/io.h | 2 +- + drivers/block/drbd/drbd_debugfs.c | 4 - + drivers/char/random.c | 3 +- + drivers/gpu/drm/armada/armada_gem.c | 4 +- + drivers/gpu/drm/drm_gem.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 2 +- + drivers/gpu/drm/i915/i915_debugfs.c | 3 +- + drivers/gpu/drm/i915/i915_gem.c | 10 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 2 +- + drivers/gpu/drm/ttm/ttm_tt.c | 4 +- + drivers/hid/Kconfig | 31 +- + drivers/hid/Makefile | 3 +- + drivers/hid/hid-alps.c | 506 +++++++++++++++++++++++ + drivers/hid/hid-apple.c | 2 + + drivers/hid/hid-core.c | 10 +- + drivers/hid/hid-ids.h | 10 + + drivers/hid/hid-led.c | 523 ++++++++++++++++++++++++ + drivers/hid/hid-thingm.c | 263 ------------ + drivers/hid/i2c-hid/i2c-hid.c | 11 +- + drivers/hid/uhid.c | 33 +- + drivers/iommu/dmar.c | 3 +- + drivers/iommu/intel-iommu.c | 3 +- + drivers/scsi/qla2xxx/qla_nx.h | 1 - + drivers/staging/lustre/lustre/llite/statahead.c | 8 +- + drivers/usb/misc/Kconfig | 9 - + drivers/usb/misc/Makefile | 1 - + drivers/usb/misc/usbled.c | 273 ------------- + fs/9p/fid.h | 4 + + fs/9p/vfs_addr.c | 1 - + fs/9p/vfs_inode.c | 10 +- + fs/9p/vfs_inode_dotl.c | 16 +- + fs/adfs/dir.c | 2 +- + fs/affs/namei.c | 8 +- + fs/autofs4/waitq.c | 2 +- + fs/binfmt_misc.c | 12 +- + fs/block_dev.c | 16 +- + fs/cachefiles/proc.c | 1 - + fs/ceph/inode.c | 4 +- + fs/ceph/mds_client.c | 2 +- + fs/cifs/cifs_debug.c | 7 - + fs/cifs/dir.c | 2 +- + fs/coda/pioctl.c | 1 - + fs/dcache.c | 231 ++++------- + fs/debugfs/inode.c | 7 - + fs/efivarfs/super.c | 4 +- + fs/ext4/mballoc.c | 1 - + fs/ext4/sysfs.c | 1 - + fs/f2fs/super.c | 1 - + fs/fat/inode.c | 4 +- + fs/fat/namei_msdos.c | 2 +- + fs/fat/namei_vfat.c | 4 +- + fs/fscache/histogram.c | 1 - + fs/fscache/object-list.c | 1 - + fs/fscache/stats.c | 1 - + fs/fuse/dev.c | 2 - + fs/fuse/dir.c | 3 +- + fs/hfs/inode.c | 2 +- + fs/hfs/string.c | 2 +- + fs/hfsplus/inode.c | 2 +- + fs/hfsplus/unicode.c | 2 +- + fs/hpfs/dentry.c | 2 +- + fs/isofs/compress.c | 1 - + fs/isofs/inode.c | 14 +- + fs/jffs2/dir.c | 8 +- + fs/jffs2/readinode.c | 2 +- + fs/jffs2/scan.c | 2 +- + fs/jffs2/summary.c | 2 +- + fs/jffs2/write.c | 4 +- + fs/jfs/jfs_debug.c | 1 - + fs/jfs/jfs_logmgr.c | 1 - + fs/jfs/jfs_metapage.c | 1 - + fs/jfs/jfs_txnmgr.c | 2 - + fs/jfs/jfs_xtree.c | 1 - + fs/jfs/namei.c | 2 +- + fs/kernfs/dir.c | 4 +- + fs/lockd/procfs.c | 1 - + fs/logfs/dir.c | 6 +- + fs/namei.c | 49 ++- + fs/ncpfs/dir.c | 2 +- + fs/nfs/client.c | 2 - + fs/nfs/dir.c | 15 +- + fs/nfs/direct.c | 4 +- + fs/nfsd/nfsctl.c | 3 - + fs/nfsd/stats.c | 1 - + fs/ntfs/inode.c | 2 +- + fs/ntfs/namei.c | 2 +- + fs/ocfs2/aops.c | 2 +- + fs/ocfs2/dlm/dlmcommon.h | 2 +- + fs/ocfs2/quota_global.c | 2 +- + fs/ocfs2/xattr.c | 2 +- + fs/open.c | 8 +- + fs/orangefs/inode.c | 2 +- + fs/orangefs/namei.c | 10 +- + fs/orangefs/orangefs-kernel.h | 6 +- + fs/orangefs/symlink.c | 2 +- + fs/overlayfs/inode.c | 31 +- + fs/overlayfs/overlayfs.h | 2 +- + fs/overlayfs/super.c | 20 +- + fs/proc/proc_sysctl.c | 2 +- + fs/quota/dquot.c | 16 +- + fs/sysv/namei.c | 2 +- + fs/tracefs/inode.c | 7 - + fs/ufs/dir.c | 17 +- + fs/xfs/xfs_stats.c | 1 - + include/linux/dcache.h | 41 +- + include/linux/fs.h | 8 +- + include/linux/fsnotify.h | 12 - + include/linux/fsnotify_backend.h | 20 +- + include/linux/quota.h | 4 +- + include/linux/stringhash.h | 12 +- + include/linux/sunrpc/svcauth.h | 4 +- + init/Kconfig | 4 +- + lib/test_hash.c | 4 +- + mm/hugetlb.c | 2 +- + net/core/dev.c | 2 +- + security/inode.c | 15 +- + security/smack/smack_access.c | 4 +- + security/tomoyo/memory.c | 2 +- + security/tomoyo/util.c | 2 +- + sound/soc/codecs/max9877.h | 2 - + 126 files changed, 1606 insertions(+), 1102 deletions(-) + create mode 100644 Documentation/hid/hid-alps.txt + create mode 100644 drivers/hid/hid-alps.c + create mode 100644 drivers/hid/hid-led.c + delete mode 100644 drivers/hid/hid-thingm.c + delete mode 100644 drivers/usb/misc/usbled.c +Merging fixes/master (3fc9d690936f Merge branch 'for-4.8/drivers' of git://git.kernel.dk/linux-block) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (b36fad65d61f kbuild: Initialize exported variables) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (9bd54517ee86 arc: unwind: warn only once if DW2_UNWIND is disabled) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (f6492164ecb1 ARM: 8577/1: Fix Cortex-A15 798181 errata initialization) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/kernel/smp_tlb.c | 44 ++++++++++++++++++++++++++++++++++++++++---- + 1 file changed, 40 insertions(+), 4 deletions(-) +Merging m68k-current/for-linus (6bd80f372371 m68k/defconfig: Update defconfigs for v4.7-rc2) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging powerpc-fixes/fixes (bfa37087aa04 powerpc: Initialise pci_io_base as early as possible) +$ git merge powerpc-fixes/fixes +Already up-to-date. +Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-merge-mpe/fixes +Already up-to-date. +Merging sparc/master (344e3c7734d5 sparc: serial: sunhv: fix a double lock bug) +$ git merge sparc/master +Merge made by the 'recursive' strategy. + arch/sparc/kernel/dtlb_prot.S | 4 ++-- + arch/sparc/kernel/irq_32.c | 4 ++-- + arch/sparc/kernel/ktlb.S | 12 ++++++++++++ + arch/sparc/kernel/tsb.S | 12 ++++++++++-- + drivers/tty/serial/sunhv.c | 6 ------ + 5 files changed, 26 insertions(+), 12 deletions(-) +Merging net/master (6a492b0f23d2 Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) +$ git merge net/master +Already up-to-date. +Merging ipsec/master (7677c7560c3e xfrm: get rid of another incorrect WARN) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/xfrm/xfrm_user.c | 13 ++++--------- + 1 file changed, 4 insertions(+), 9 deletions(-) +Merging netfilter/master (ea43f860d984 Merge branch 'ethoc-fixes') +$ 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 (034fdd4a17ff Merge ath-current from ath.git) +$ git merge wireless-drivers/master +Already up-to-date. +Merging mac80211/master (16a910a6722b cfg80211: handle failed skb allocation) +$ git merge mac80211/master +Already up-to-date. +Merging sound-current/for-linus (0984d159c8ad sound: oss: Use kernel_read_file_from_path() for mod_firmware_load()) +$ git merge sound-current/for-linus +Removing sound/sound_firmware.c +Removing sound/soc/samsung/odroidx2_max98090.c +Removing sound/soc/mediatek/mtk-afe-common.h +Auto-merging sound/soc/mediatek/mt8173/mt8173-rt5650.c +Auto-merging sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c +Auto-merging sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c +Auto-merging sound/soc/mediatek/mt8173/mt8173-max98090.c +Auto-merging sound/soc/mediatek/mt8173/mt8173-afe-pcm.c +Auto-merging include/linux/of.h +Auto-merging include/linux/acpi.h +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/adi,adau17x1.txt | 8 + + .../devicetree/bindings/sound/adi,adau7002.txt | 19 + + .../bindings/sound/brcm,cygnus-audio.txt | 67 + + Documentation/devicetree/bindings/sound/bt-sco.txt | 2 +- + .../devicetree/bindings/sound/cs35l33.txt | 126 ++ + .../devicetree/bindings/sound/cs53l30.txt | 44 + + .../devicetree/bindings/sound/designware-i2s.txt | 4 + + .../devicetree/bindings/sound/fsl-asoc-card.txt | 2 +- + .../devicetree/bindings/sound/max98504.txt | 44 + + .../devicetree/bindings/sound/max9860.txt | 28 + + .../devicetree/bindings/sound/mt2701-afe-pcm.txt | 150 ++ + .../devicetree/bindings/sound/mt2701-cs42448.txt | 43 + + .../devicetree/bindings/sound/mt8173-rt5650.txt | 10 +- + .../devicetree/bindings/sound/omap-mcpdm.txt | 10 + + .../devicetree/bindings/sound/renesas,rsnd.txt | 2 + + .../devicetree/bindings/sound/rockchip-i2s.txt | 5 + + Documentation/devicetree/bindings/sound/rt5514.txt | 5 + + .../bindings/sound/samsung,odroidx2-max98090.txt | 35 - + .../devicetree/bindings/sound/sgtl5000.txt | 18 +- + .../devicetree/bindings/sound/st,sti-asoc-card.txt | 20 +- + .../devicetree/bindings/sound/sun4i-i2s.txt | 34 + + Documentation/sound/alsa/soc/machine.txt | 2 +- + Documentation/sound/alsa/timestamping.txt | 12 +- + MAINTAINERS | 11 +- + drivers/base/property.c | 28 + + include/acpi/acpi_bus.h | 7 + + include/linux/acpi.h | 6 + + include/linux/mfd/arizona/core.h | 10 + + include/linux/of.h | 14 +- + include/linux/property.h | 3 + + include/sound/compress_driver.h | 5 + + include/sound/cs35l33.h | 48 + + include/sound/hdmi-codec.h | 13 +- + include/sound/simple_card.h | 11 +- + include/sound/simple_card_utils.h | 36 + + include/sound/soc-dapm.h | 8 +- + include/sound/soc.h | 11 + + sound/Makefile | 1 - + sound/core/compress_offload.c | 67 +- + sound/core/control.c | 32 + + sound/core/seq/oss/seq_oss_synth.c | 10 +- + sound/core/seq/seq_timer.c | 23 +- + sound/core/seq/seq_timer.h | 2 +- + sound/hda/hdmi_chmap.c | 28 +- + sound/i2c/other/ak4114.c | 2 +- + sound/i2c/other/ak4117.c | 2 +- + sound/isa/ad1848/ad1848.c | 13 +- + sound/isa/adlib.c | 13 +- + sound/isa/cmi8328.c | 13 +- + sound/isa/cs423x/cs4231.c | 13 +- + sound/isa/galaxy/galaxy.c | 13 +- + sound/isa/gus/gusclassic.c | 13 +- + sound/isa/gus/gusextreme.c | 13 +- + sound/isa/gus/gusmax.c | 13 +- + sound/isa/sb/jazz16.c | 13 +- + sound/isa/sb/sb8.c | 13 +- + sound/isa/sc6000.c | 13 +- + sound/oss/ad1848.c | 2 +- + sound/oss/aedsp16.c | 14 +- + sound/oss/sound_firmware.h | 29 +- + sound/oss/sound_timer.c | 2 +- + sound/oss/sys_timer.c | 2 +- + sound/pci/ctxfi/cthw20k2.c | 34 +- + sound/pci/echoaudio/echoaudio.c | 6 +- + sound/pci/hda/hda_codec.c | 8 +- + sound/pci/hda/hda_generic.c | 4 - + sound/pci/hda/patch_hdmi.c | 5 + + sound/pci/hda/patch_realtek.c | 38 +- + sound/pci/mixart/mixart_mixer.c | 2 +- + sound/pci/riptide/riptide.c | 2 +- + sound/ppc/awacs.c | 1 + + sound/sh/aica.c | 16 +- + sound/soc/atmel/Kconfig | 1 + + sound/soc/atmel/atmel-classd.c | 5 - + sound/soc/atmel/atmel-pdmic.c | 5 - + sound/soc/atmel/atmel_ssc_dai.c | 2 +- + sound/soc/bcm/Kconfig | 9 + + sound/soc/bcm/Makefile | 5 + + sound/soc/bcm/cygnus-pcm.c | 861 ++++++++++ + sound/soc/bcm/cygnus-ssp.c | 1529 ++++++++++++++++++ + sound/soc/bcm/cygnus-ssp.h | 139 ++ + sound/soc/codecs/Kconfig | 38 +- + sound/soc/codecs/Makefile | 14 + + sound/soc/codecs/adau-utils.c | 61 + + sound/soc/codecs/adau-utils.h | 7 + + sound/soc/codecs/adau1373.c | 38 +- + sound/soc/codecs/adau1761-i2c.c | 2 +- + sound/soc/codecs/adau1761-spi.c | 2 +- + sound/soc/codecs/adau1781-i2c.c | 2 +- + sound/soc/codecs/adau1781-spi.c | 2 +- + sound/soc/codecs/adau17x1.c | 251 +-- + sound/soc/codecs/adau17x1.h | 6 + + sound/soc/codecs/adau7002.c | 80 + + sound/soc/codecs/ak4613.c | 12 +- + sound/soc/codecs/ak4642.c | 13 +- + sound/soc/codecs/arizona.c | 91 +- + sound/soc/codecs/arizona.h | 22 +- + sound/soc/codecs/bt-sco.c | 52 +- + sound/soc/codecs/cs35l33.c | 1303 +++++++++++++++ + sound/soc/codecs/cs35l33.h | 221 +++ + sound/soc/codecs/cs47l24.c | 19 + + sound/soc/codecs/cs53l30.c | 1143 ++++++++++++++ + sound/soc/codecs/cs53l30.h | 459 ++++++ + sound/soc/codecs/da7219-aad.c | 103 +- + sound/soc/codecs/da7219.c | 34 +- + sound/soc/codecs/hdac_hdmi.c | 7 +- + sound/soc/codecs/hdmi-codec.c | 15 +- + sound/soc/codecs/max98504.c | 383 +++++ + sound/soc/codecs/max98504.h | 59 + + sound/soc/codecs/max9860.c | 753 +++++++++ + sound/soc/codecs/max9860.h | 162 ++ + sound/soc/codecs/max9867.c | 0 + sound/soc/codecs/max9867.h | 0 + sound/soc/codecs/nau8825.c | 1256 +++++++++++++-- + sound/soc/codecs/nau8825.h | 127 +- + sound/soc/codecs/pcm1681.c | 2 +- + sound/soc/codecs/pcm179x.c | 2 +- + sound/soc/codecs/pcm5102a.c | 1 - + sound/soc/codecs/rt286.c | 7 + + sound/soc/codecs/rt5514-spi.c | 447 ++++++ + sound/soc/codecs/rt5514-spi.h | 38 + + sound/soc/codecs/rt5514.c | 168 +- + sound/soc/codecs/rt5514.h | 7 + + sound/soc/codecs/rt5645.c | 24 +- + sound/soc/codecs/rt5645.h | 3 + + sound/soc/codecs/rt5670.c | 3 +- + sound/soc/codecs/sgtl5000.c | 431 ++--- + sound/soc/codecs/sgtl5000.h | 2 + + sound/soc/codecs/tas571x.c | 188 +++ + sound/soc/codecs/tas571x.h | 40 + + sound/soc/codecs/tlv320aic31xx.h | 134 +- + sound/soc/codecs/tpa6130a2.c | 394 ++--- + sound/soc/codecs/tpa6130a2.h | 14 +- + sound/soc/codecs/wm5102.c | 1 + + sound/soc/codecs/wm5110.c | 19 + + sound/soc/codecs/wm8731.c | 5 +- + sound/soc/codecs/wm8753.c | 3 +- + sound/soc/codecs/wm8985.c | 143 +- + sound/soc/codecs/wm8985.h | 38 + + sound/soc/codecs/wm8998.c | 1 + + sound/soc/codecs/wm_adsp.c | 34 +- + sound/soc/codecs/wm_adsp.h | 4 + + sound/soc/davinci/davinci-mcasp.c | 9 +- + sound/soc/dwc/Kconfig | 9 + + sound/soc/dwc/Makefile | 4 +- + sound/soc/dwc/designware_i2s.c | 231 ++- + sound/soc/dwc/designware_pcm.c | 225 +++ + sound/soc/dwc/local.h | 128 ++ + sound/soc/fsl/Kconfig | 1 + + sound/soc/fsl/fsl_spdif.c | 2 +- + sound/soc/generic/Kconfig | 4 + + sound/soc/generic/Makefile | 2 + + sound/soc/generic/simple-card-utils.c | 97 ++ + sound/soc/generic/simple-card.c | 276 ++-- + sound/soc/intel/Kconfig | 73 +- + sound/soc/intel/atom/sst/sst_acpi.c | 44 +- + sound/soc/intel/boards/Makefile | 2 + + sound/soc/intel/boards/bxt_da7219_max98357a.c | 460 ++++++ + sound/soc/intel/boards/bxt_rt298.c | 118 ++ + sound/soc/intel/boards/cht_bsw_rt5645.c | 20 +- + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 51 +- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 51 +- + sound/soc/intel/boards/skl_rt286.c | 9 + + sound/soc/intel/common/Makefile | 4 +- + sound/soc/intel/common/sst-acpi.h | 4 +- + sound/soc/intel/common/sst-dsp-priv.h | 4 - + sound/soc/intel/common/sst-dsp.c | 69 +- + sound/soc/intel/common/sst-dsp.h | 2 +- + sound/soc/intel/common/sst-firmware.c | 68 + + sound/soc/intel/haswell/sst-haswell-pcm.c | 1 - + sound/soc/intel/skylake/Makefile | 2 +- + sound/soc/intel/skylake/bxt-sst.c | 202 ++- + sound/soc/intel/skylake/skl-messages.c | 53 +- + sound/soc/intel/skylake/skl-nhlt.c | 40 + + sound/soc/intel/skylake/skl-nhlt.h | 22 + + sound/soc/intel/skylake/skl-pcm.c | 93 +- + sound/soc/intel/skylake/skl-sst-dsp.c | 260 ++- + sound/soc/intel/skylake/skl-sst-dsp.h | 102 +- + sound/soc/intel/skylake/skl-sst-ipc.c | 4 +- + sound/soc/intel/skylake/skl-sst-ipc.h | 18 + + sound/soc/intel/skylake/skl-sst-utils.c | 256 +++ + sound/soc/intel/skylake/skl-sst.c | 124 +- + sound/soc/intel/skylake/skl-topology.c | 230 ++- + sound/soc/intel/skylake/skl-topology.h | 7 +- + sound/soc/intel/skylake/skl.c | 39 +- + sound/soc/intel/skylake/skl.h | 10 + + sound/soc/mediatek/Kconfig | 38 +- + sound/soc/mediatek/Makefile | 10 +- + sound/soc/mediatek/common/Makefile | 16 + + sound/soc/mediatek/common/mtk-afe-fe-dai.c | 379 +++++ + sound/soc/mediatek/common/mtk-afe-fe-dai.h | 45 + + .../soc/mediatek/common/mtk-afe-platform-driver.c | 90 ++ + .../soc/mediatek/common/mtk-afe-platform-driver.h | 23 + + sound/soc/mediatek/common/mtk-base-afe.h | 104 ++ + sound/soc/mediatek/mt2701/Makefile | 19 + + sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.c | 464 ++++++ + sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.h | 38 + + sound/soc/mediatek/mt2701/mt2701-afe-common.h | 172 ++ + sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 1656 ++++++++++++++++++++ + sound/soc/mediatek/mt2701/mt2701-cs42448.c | 412 +++++ + sound/soc/mediatek/mt2701/mt2701-reg.h | 186 +++ + sound/soc/mediatek/mt8173/Makefile | 7 + + sound/soc/mediatek/mt8173/mt8173-afe-common.h | 73 + + .../{mtk-afe-pcm.c => mt8173/mt8173-afe-pcm.c} | 925 +++++------ + sound/soc/mediatek/{ => mt8173}/mt8173-max98090.c | 2 +- + .../mediatek/{ => mt8173}/mt8173-rt5650-rt5514.c | 2 +- + .../mediatek/{ => mt8173}/mt8173-rt5650-rt5676.c | 4 +- + sound/soc/mediatek/{ => mt8173}/mt8173-rt5650.c | 73 +- + sound/soc/mediatek/mtk-afe-common.h | 101 -- + sound/soc/omap/Kconfig | 3 +- + sound/soc/omap/omap-mcpdm.c | 74 +- + sound/soc/omap/rx51.c | 46 +- + sound/soc/rockchip/rockchip_i2s.c | 71 +- + sound/soc/rockchip/rockchip_i2s.h | 11 +- + sound/soc/rockchip/rockchip_max98090.c | 65 +- + sound/soc/rockchip/rockchip_spdif.c | 17 +- + sound/soc/samsung/Kconfig | 8 - + sound/soc/samsung/Makefile | 2 - + sound/soc/samsung/ac97.c | 3 +- + sound/soc/samsung/dma.h | 9 +- + sound/soc/samsung/dmaengine.c | 31 +- + sound/soc/samsung/i2s.c | 53 +- + sound/soc/samsung/odroidx2_max98090.c | 185 --- + sound/soc/samsung/pcm.c | 3 +- + sound/soc/samsung/s3c-i2s-v2.c | 2 +- + sound/soc/samsung/s3c2412-i2s.c | 3 +- + sound/soc/samsung/s3c24xx-i2s.c | 3 +- + sound/soc/samsung/spdif.c | 3 +- + sound/soc/sh/Kconfig | 1 + + sound/soc/sh/rcar/adg.c | 18 + + sound/soc/sh/rcar/gen.c | 12 +- + sound/soc/sh/rcar/rsrc-card.c | 99 +- + sound/soc/soc-compress.c | 5 +- + sound/soc/soc-dapm.c | 61 +- + sound/soc/soc-pcm.c | 43 +- + sound/soc/sti/uniperif_player.c | 4 +- + sound/soc/sunxi/Kconfig | 9 + + sound/soc/sunxi/Makefile | 2 +- + sound/soc/sunxi/sun4i-i2s.c | 701 +++++++++ + sound/sound_firmware.c | 77 - + sound/usb/mixer_maps.c | 6 +- + 241 files changed, 19420 insertions(+), 3301 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/adi,adau7002.txt + create mode 100644 Documentation/devicetree/bindings/sound/brcm,cygnus-audio.txt + create mode 100644 Documentation/devicetree/bindings/sound/cs35l33.txt + create mode 100644 Documentation/devicetree/bindings/sound/cs53l30.txt + create mode 100644 Documentation/devicetree/bindings/sound/max98504.txt + create mode 100644 Documentation/devicetree/bindings/sound/max9860.txt + create mode 100644 Documentation/devicetree/bindings/sound/mt2701-afe-pcm.txt + create mode 100644 Documentation/devicetree/bindings/sound/mt2701-cs42448.txt + delete mode 100644 Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt + create mode 100644 Documentation/devicetree/bindings/sound/sun4i-i2s.txt + create mode 100644 include/sound/cs35l33.h + create mode 100644 include/sound/simple_card_utils.h + create mode 100644 sound/soc/bcm/cygnus-pcm.c + create mode 100644 sound/soc/bcm/cygnus-ssp.c + create mode 100644 sound/soc/bcm/cygnus-ssp.h + create mode 100644 sound/soc/codecs/adau-utils.c + create mode 100644 sound/soc/codecs/adau-utils.h + create mode 100644 sound/soc/codecs/adau7002.c + create mode 100644 sound/soc/codecs/cs35l33.c + create mode 100644 sound/soc/codecs/cs35l33.h + create mode 100644 sound/soc/codecs/cs53l30.c + create mode 100644 sound/soc/codecs/cs53l30.h + create mode 100644 sound/soc/codecs/max98504.c + create mode 100644 sound/soc/codecs/max98504.h + create mode 100644 sound/soc/codecs/max9860.c + create mode 100644 sound/soc/codecs/max9860.h + mode change 100755 => 100644 sound/soc/codecs/max9867.c + mode change 100755 => 100644 sound/soc/codecs/max9867.h + create mode 100644 sound/soc/codecs/rt5514-spi.c + create mode 100644 sound/soc/codecs/rt5514-spi.h + create mode 100644 sound/soc/dwc/designware_pcm.c + create mode 100644 sound/soc/dwc/local.h + create mode 100644 sound/soc/generic/simple-card-utils.c + create mode 100644 sound/soc/intel/boards/bxt_da7219_max98357a.c + create mode 100644 sound/soc/intel/skylake/skl-sst-utils.c + create mode 100644 sound/soc/mediatek/common/Makefile + create mode 100644 sound/soc/mediatek/common/mtk-afe-fe-dai.c + create mode 100644 sound/soc/mediatek/common/mtk-afe-fe-dai.h + create mode 100644 sound/soc/mediatek/common/mtk-afe-platform-driver.c + create mode 100644 sound/soc/mediatek/common/mtk-afe-platform-driver.h + create mode 100644 sound/soc/mediatek/common/mtk-base-afe.h + create mode 100644 sound/soc/mediatek/mt2701/Makefile + create mode 100644 sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.c + create mode 100644 sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.h + create mode 100644 sound/soc/mediatek/mt2701/mt2701-afe-common.h + create mode 100644 sound/soc/mediatek/mt2701/mt2701-afe-pcm.c + create mode 100644 sound/soc/mediatek/mt2701/mt2701-cs42448.c + create mode 100644 sound/soc/mediatek/mt2701/mt2701-reg.h + create mode 100644 sound/soc/mediatek/mt8173/Makefile + create mode 100644 sound/soc/mediatek/mt8173/mt8173-afe-common.h + rename sound/soc/mediatek/{mtk-afe-pcm.c => mt8173/mt8173-afe-pcm.c} (51%) + rename sound/soc/mediatek/{ => mt8173}/mt8173-max98090.c (99%) + rename sound/soc/mediatek/{ => mt8173}/mt8173-rt5650-rt5514.c (99%) + rename sound/soc/mediatek/{ => mt8173}/mt8173-rt5650-rt5676.c (99%) + rename sound/soc/mediatek/{ => mt8173}/mt8173-rt5650.c (80%) + delete mode 100644 sound/soc/mediatek/mtk-afe-common.h + delete mode 100644 sound/soc/samsung/odroidx2_max98090.c + create mode 100644 sound/soc/sunxi/sun4i-i2s.c + delete mode 100644 sound/sound_firmware.c +Merging pci-current/for-linus (ef0dab4aae14 PCI: Fix unaligned accesses in VC code) +$ git merge pci-current/for-linus +Already up-to-date. +Merging driver-core.current/driver-core-linus (523d939ef98f Linux 4.7) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (0e06f5c0deee Merge branch 'akpm' (patches from Andrew)) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (e65805251f2d Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (50c763f8c1ba usb: dwc3: Set the ClearPendIN bit on Clear Stall EP command) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (4c2e07c6a29e Linux 4.7-rc5) +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +Merging usb-chipidea-fixes/ci-for-usb-stable (ea1d39a31d3b usb: common: otg-fsm: add license to usb-otg-fsm) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Already up-to-date. +Merging staging.current/staging-linus (0e06f5c0deee Merge branch 'akpm' (patches from Andrew)) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (0e06f5c0deee Merge branch 'akpm' (patches from Andrew)) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (080888286377 Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up-to-date. +Merging crypto-current/master (64ec6ccb76e6 crypto: marvell - Update cache with input sg only when it is unmapped) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + drivers/crypto/marvell/cesa.c | 7 ++++--- + drivers/crypto/marvell/cipher.c | 14 ++++++-------- + drivers/crypto/marvell/hash.c | 12 ++++++------ + 3 files changed, 16 insertions(+), 17 deletions(-) +Merging ide/master (d4f8c2e0f827 ide: missing break statement in set_timings_mdma()) +$ git merge ide/master +Merge made by the 'recursive' strategy. + drivers/ide/cmd640.c | 2 +- + drivers/ide/hpt366.c | 2 +- + drivers/ide/ide-tape.c | 6 +++--- + drivers/ide/pmac.c | 1 + + 4 files changed, 6 insertions(+), 5 deletions(-) +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 (ce7585f3c4d7 vfio/pci: Allow VPD short read) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (f80eb4289491 selftests/exec: Makefile is a run-time dependency, add it to the install list) +$ git merge kselftest-fixes/fixes +Merge made by the 'recursive' strategy. + tools/testing/selftests/exec/Makefile | 3 +- + tools/testing/selftests/timers/Makefile | 3 +- + tools/testing/selftests/timers/set-tz.c | 119 ++++++++++++++++++++++++++++++++ + 3 files changed, 123 insertions(+), 2 deletions(-) + create mode 100644 tools/testing/selftests/timers/set-tz.c +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 (ed2eebbd61af drm/i915: add missing condition for committing planes on crtc) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up-to-date. +Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (3925a16ae980 ARC: mm: don't loose PTE_SPECIAL in pte_modify()) +$ git merge arc/for-next +Merge made by the 'recursive' strategy. + arch/arc/include/asm/pgtable.h | 2 +- + arch/arc/kernel/setup.c | 1 + + arch/arc/mm/dma.c | 3 ++- + arch/arc/mm/ioremap.c | 2 +- + 4 files changed, 5 insertions(+), 3 deletions(-) +Merging arm/for-next (bf9cb4359182 Merge branches 'component', 'cpuidle', 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Auto-merging arch/arm/kernel/setup.c +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 54 +++++++++++ + arch/arm/Makefile | 1 + + arch/arm/boot/Makefile | 6 +- + arch/arm/include/asm/assembler.h | 4 +- + arch/arm/include/asm/barrier.h | 4 +- + arch/arm/include/asm/delay.h | 6 +- + arch/arm/include/asm/floppy.h | 2 +- + arch/arm/include/asm/ptrace.h | 10 ++ + arch/arm/include/asm/uaccess.h | 114 ++++++++++------------ + arch/arm/kernel/asm-offsets.c | 5 +- + arch/arm/kernel/cpuidle.c | 23 +++-- + arch/arm/kernel/devtree.c | 3 + + arch/arm/kernel/entry-armv.S | 19 ++-- + arch/arm/kernel/entry-common.S | 2 +- + arch/arm/kernel/entry-header.S | 12 ++- + arch/arm/kernel/entry-v7m.S | 2 +- + arch/arm/kernel/process.c | 14 ++- + arch/arm/kernel/setup.c | 2 +- + arch/arm/kernel/vmlinux.lds.S | 4 +- + arch/arm/lib/Makefile | 5 +- + arch/arm/lib/delay-loop.S | 15 +-- + arch/arm/mm/Kconfig | 6 -- + arch/arm/mm/dma-mapping.c | 144 ++++++++++++++++++++-------- + arch/arm/mm/proc-v7.S | 43 +++++++++ + drivers/gpu/drm/arm/hdlcd_drv.c | 10 +- + drivers/gpu/drm/armada/armada_drv.c | 9 +- + drivers/gpu/drm/drm_of.c | 13 ++- + drivers/gpu/drm/msm/msm_drv.c | 8 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 13 ++- + drivers/gpu/drm/sti/sti_drv.c | 9 +- + drivers/gpu/drm/tilcdc/tilcdc_external.c | 9 +- + drivers/iommu/mtk_iommu.c | 13 ++- + 32 files changed, 398 insertions(+), 186 deletions(-) +Merging arm-perf/for-next/perf (1a695a905c18 Linux 4.7-rc1) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (9914c2a60844 arm-soc: document merge) +$ git merge arm-soc/for-next +Resolved 'arch/arm/Kconfig' using previous resolution. +Resolved 'arch/arm/mach-mxs/Kconfig' using previous resolution. +Resolved 'arch/arm64/boot/dts/apm/apm-shadowcat.dtsi' using previous resolution. +Resolved 'arch/arm64/boot/dts/broadcom/ns2-svk.dts' using previous resolution. +Resolved 'arch/arm64/boot/dts/broadcom/ns2.dtsi' using previous resolution. +Resolved 'drivers/net/ethernet/freescale/fec.h' using previous resolution. +Removing include/linux/platform_data/clk-ux500.h +Auto-merging drivers/soc/samsung/pm_domains.c +Removing drivers/soc/brcmstb/Kconfig +Auto-merging drivers/soc/bcm/brcmstb/biuctrl.c +Auto-merging drivers/power/reset/Makefile +Auto-merging drivers/power/reset/Kconfig +Auto-merging drivers/net/ethernet/freescale/fec_main.c +Auto-merging drivers/net/ethernet/freescale/fec.h +CONFLICT (content): Merge conflict in drivers/net/ethernet/freescale/fec.h +Auto-merging drivers/cpufreq/s5pv210-cpufreq.c +Auto-merging drivers/clocksource/clps711x-timer.c +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/boot/dts/rockchip/rk3399.dtsi +Auto-merging arch/arm64/boot/dts/mediatek/mt8173.dtsi +Auto-merging arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi +Auto-merging arch/arm64/boot/dts/broadcom/ns2.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/broadcom/ns2.dtsi +Auto-merging arch/arm64/boot/dts/broadcom/ns2-svk.dts +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/broadcom/ns2-svk.dts +Auto-merging arch/arm64/boot/dts/apm/apm-storm.dtsi +Auto-merging arch/arm64/boot/dts/apm/apm-shadowcat.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/apm/apm-shadowcat.dtsi +Removing arch/arm/mach-ux500/id.h +Removing arch/arm/mach-ux500/id.c +Removing arch/arm/mach-ux500/cpu.c +Removing arch/arm/mach-ux500/cache-l2x0.c +Removing arch/arm/mach-ux500/board-mop500-regulators.h +Removing arch/arm/mach-ux500/board-mop500-regulators.c +Removing arch/arm/mach-uniphier/uniphier.c +Auto-merging arch/arm/mach-u300/Kconfig +Auto-merging arch/arm/mach-prima2/Kconfig +Auto-merging arch/arm/mach-mxs/Kconfig +CONFLICT (content): Merge conflict in arch/arm/mach-mxs/Kconfig +Auto-merging arch/arm/mach-moxart/Kconfig +Auto-merging arch/arm/mach-keystone/Kconfig +Auto-merging arch/arm/mach-integrator/Kconfig +Removing arch/arm/mach-imx/pm-imx3.c +Removing arch/arm/mach-imx/eukrea-baseboards.h +Removing arch/arm/mach-imx/devices/platform-mxc_rnga.c +Removing arch/arm/mach-exynos/s5p-dev-mfc.c +Removing arch/arm/mach-exynos/mfc.h +Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c +Removing arch/arm/mach-clps711x/include/mach/uncompress.h +Removing arch/arm/mach-clps711x/include/mach/hardware.h +Removing arch/arm/mach-clps711x/include/mach/clps711x.h +Auto-merging arch/arm/mach-bcm/Kconfig +Removing arch/arm/configs/bcm_defconfig +Auto-merging arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi +Auto-merging arch/arm/boot/dts/socfpga_arria10.dtsi +Auto-merging arch/arm/boot/dts/sama5d2.dtsi +Auto-merging arch/arm/boot/dts/rk3288.dtsi +Auto-merging arch/arm/boot/dts/rk322x.dtsi +Auto-merging arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts +Removing arch/arm/boot/dts/exynos5422-cpu-thermal.dtsi +Auto-merging arch/arm/boot/dts/dra7.dtsi +Auto-merging arch/arm/boot/dts/dm814x.dtsi +Auto-merging arch/arm/boot/dts/bcm-nsp.dtsi +Auto-merging arch/arm/boot/dts/am4372.dtsi +Auto-merging arch/arm/boot/dts/am33xx.dtsi +Auto-merging arch/arm/Makefile +Auto-merging arch/arm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e6dc14ce5d3b] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/arm/Atmel/README | 10 +- + Documentation/devicetree/bindings/arm/arm,scpi.txt | 34 + + .../bindings/arm/bcm/brcm,bcm11351-cpu-method.txt | 6 +- + .../bindings/arm/bcm/brcm,bcm23550-cpu-method.txt | 36 + + .../devicetree/bindings/arm/bcm/brcm,bcm23550.txt | 15 + + .../devicetree/bindings/arm/bcm/brcm,bcm2835.txt | 4 + + Documentation/devicetree/bindings/arm/cpus.txt | 3 + + .../bindings/arm/hisilicon/hi3519-sysctrl.txt | 14 + + Documentation/devicetree/bindings/arm/mediatek.txt | 4 + + Documentation/devicetree/bindings/arm/olimex.txt | 8 +- + Documentation/devicetree/bindings/arm/rockchip.txt | 3 + + .../bindings/arm/samsung/samsung-boards.txt | 1 + + Documentation/devicetree/bindings/arm/shmobile.txt | 6 + + Documentation/devicetree/bindings/arm/tegra.txt | 4 + + .../devicetree/bindings/ata/ahci-platform.txt | 1 + + .../bindings/bus/nvidia,tegra210-aconnect.txt | 45 + + .../devicetree/bindings/clock/clps711x-clock.txt | 4 +- + .../devicetree/bindings/clock/renesas,cpg-mssr.txt | 7 +- + .../bindings/clock/renesas,cpg-mstp-clocks.txt | 1 + + .../clock/renesas,rcar-gen2-cpg-clocks.txt | 1 + + .../bindings/display/cirrus,clps711x-fb.txt | 4 +- + Documentation/devicetree/bindings/dma/ti-edma.txt | 4 +- + .../devicetree/bindings/firmware/qcom,scm.txt | 28 + + .../devicetree/bindings/iio/adc/at91_adc.txt | 12 +- + .../devicetree/bindings/input/clps711x-keypad.txt | 4 +- + .../interrupt-controller/cirrus,clps711x-intc.txt | 4 +- + .../interrupt-controller/mediatek,sysirq.txt | 1 + + .../devicetree/bindings/media/nokia,n900-ir | 20 + + .../bindings/memory-controllers/atmel,ebi.txt | 136 + + .../devicetree/bindings/net/apm-xgene-enet.txt | 4 +- + Documentation/devicetree/bindings/net/fsl-fec.txt | 3 + + .../devicetree/bindings/pci/layerscape-pci.txt | 4 + + .../bindings/phy/nvidia,tegra124-xusb-padctl.txt | 2 +- + .../devicetree/bindings/pinctrl/meson,pinctrl.txt | 2 + + .../devicetree/bindings/power/renesas,apmu.txt | 31 + + .../bindings/power/renesas,rcar-sysc.txt | 1 + + .../bindings/pwm/cirrus,clps711x-pwm.txt | 5 +- + .../devicetree/bindings/pwm/pwm-omap-dmtimer.txt | 4 + + .../devicetree/bindings/pwm/pwm-tiecap.txt | 38 +- + .../devicetree/bindings/pwm/pwm-tiehrpwm.txt | 38 +- + .../devicetree/bindings/pwm/pwm-tipwmss.txt | 33 +- + .../bindings/reset/amlogic,meson-reset.txt | 18 + + .../bindings/reset/hisilicon,hi6220-reset.txt | 4 +- + .../devicetree/bindings/reset/ti-syscon-reset.txt | 91 + + .../devicetree/bindings/rng/amlogic,meson-rng.txt | 14 + + .../bindings/serial/cirrus,clps711x-uart.txt | 4 +- + .../devicetree/bindings/serial/mtk-uart.txt | 1 + + .../devicetree/bindings/soc/qcom/qcom,smp2p.txt | 4 +- + .../devicetree/bindings/soc/qcom/qcom,smsm.txt | 4 +- + .../devicetree/bindings/soc/qcom/qcom,wcnss.txt | 116 + + .../bindings/timer/cirrus,clps711x-timer.txt | 6 +- + .../devicetree/bindings/usb/atmel-usb.txt | 14 +- + .../bindings/usb/nvidia,tegra124-xusb.txt | 8 +- + Documentation/driver-model/devres.txt | 4 + + MAINTAINERS | 44 +- + arch/arm/Kconfig | 48 +- + arch/arm/Kconfig.debug | 65 +- + arch/arm/Makefile | 1 - + arch/arm/arm-soc-for-next-contents.txt | 343 +++ + arch/arm/boot/dts/Makefile | 43 +- + arch/arm/boot/dts/aks-cdu.dts | 2 +- + arch/arm/boot/dts/am335x-bone-common.dtsi | 12 +- + arch/arm/boot/dts/am335x-boneblack.dts | 11 + + arch/arm/boot/dts/am335x-evm.dts | 2 +- + arch/arm/boot/dts/am335x-evmsk.dts | 2 +- + arch/arm/boot/dts/am335x-icev2.dts | 7 + + arch/arm/boot/dts/am33xx.dtsi | 126 +- + arch/arm/boot/dts/am3517-craneboard.dts | 2 +- + arch/arm/boot/dts/am4372.dtsi | 111 +- + arch/arm/boot/dts/am437x-gp-evm.dts | 6 +- + arch/arm/boot/dts/am437x-idk-evm.dts | 1 + + arch/arm/boot/dts/am437x-sbc-t43.dts | 2 +- + arch/arm/boot/dts/am43x-epos-evm.dts | 2 +- + arch/arm/boot/dts/am43xx-clocks.dtsi | 8 + + arch/arm/boot/dts/am57xx-sbc-am57x.dts | 2 +- + arch/arm/boot/dts/animeo_ip.dts | 11 +- + arch/arm/boot/dts/armada-388-clearfog.dts | 16 - + arch/arm/boot/dts/at91-ariag25.dts | 11 +- + arch/arm/boot/dts/at91-cosino.dtsi | 9 - + arch/arm/boot/dts/at91-foxg20.dts | 13 +- + arch/arm/boot/dts/at91-kizbox.dts | 4 +- + arch/arm/boot/dts/at91-qil_a9260.dts | 13 +- + arch/arm/boot/dts/at91-sam9_l9260.dts | 121 + + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 41 +- + arch/arm/boot/dts/at91-sama5d3_xplained.dts | 2 +- + arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi | 11 +- + arch/arm/boot/dts/at91-sama5d4_ma5d4evk.dts | 2 +- + arch/arm/boot/dts/at91-sama5d4_xplained.dts | 4 +- + arch/arm/boot/dts/at91-sama5d4ek.dts | 20 - + arch/arm/boot/dts/at91-vinco.dts | 2 +- + arch/arm/boot/dts/at91rm9200.dtsi | 2 +- + arch/arm/boot/dts/at91sam9260.dtsi | 16 +- + arch/arm/boot/dts/at91sam9260ek.dts | 211 ++ + arch/arm/boot/dts/at91sam9261.dtsi | 2 +- + arch/arm/boot/dts/at91sam9263.dtsi | 2 +- + arch/arm/boot/dts/at91sam9263ek.dts | 2 +- + arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 4 +- + arch/arm/boot/dts/at91sam9g25ek.dts | 26 + + arch/arm/boot/dts/at91sam9g45.dtsi | 28 +- + arch/arm/boot/dts/at91sam9n12.dtsi | 2 +- + arch/arm/boot/dts/at91sam9rl.dtsi | 30 +- + arch/arm/boot/dts/at91sam9rlek.dts | 4 +- + arch/arm/boot/dts/at91sam9x5.dtsi | 32 +- + arch/arm/boot/dts/at91sam9x5ek.dtsi | 33 - + arch/arm/boot/dts/axp209.dtsi | 1 + + arch/arm/boot/dts/axp22x.dtsi | 12 + + arch/arm/boot/dts/axp809.dtsi | 53 + + arch/arm/boot/dts/bcm-cygnus.dtsi | 11 + + arch/arm/boot/dts/bcm-nsp.dtsi | 55 +- + arch/arm/boot/dts/bcm11351.dtsi | 2 +- + arch/arm/boot/dts/bcm21664.dtsi | 2 +- + arch/arm/boot/dts/bcm23550-sparrow.dts | 80 + + arch/arm/boot/dts/bcm23550.dtsi | 415 +++ + arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 1 + + arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 1 + + arch/arm/boot/dts/bcm2835-rpi-b.dts | 1 + + arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 1 + + arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi | 19 + + arch/arm/boot/dts/bcm283x-rpi-smsc9514.dtsi | 19 + + arch/arm/boot/dts/bcm283x.dtsi | 2 + + arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 4 + + arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 4 + + arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 4 + + arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 40 + + arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 4 + + arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 6 +- + arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi | 15 + + arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi | 16 +- + arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi | 18 + + arch/arm/boot/dts/bcm5301x.dtsi | 47 + + arch/arm/boot/dts/bcm953012er.dts | 104 + + arch/arm/boot/dts/bcm958525xmc.dts | 109 + + arch/arm/boot/dts/bcm958625hr.dts | 111 + + arch/arm/boot/dts/compulab-sb-som.dtsi | 2 +- + arch/arm/boot/dts/dm814x.dtsi | 2 +- + arch/arm/boot/dts/dra7.dtsi | 242 +- + arch/arm/boot/dts/dra72-evm-common.dtsi | 12 +- + arch/arm/boot/dts/dra72x.dtsi | 16 - + arch/arm/boot/dts/dra74x.dtsi | 25 +- + arch/arm/boot/dts/emev2-kzm9d.dts | 24 +- + arch/arm/boot/dts/emev2.dtsi | 26 +- + arch/arm/boot/dts/ep7209.dtsi | 191 ++ + arch/arm/boot/dts/ep7211-edb7211.dts | 100 + + arch/arm/boot/dts/ep7211.dtsi | 12 + + arch/arm/boot/dts/ethernut5.dts | 4 +- + arch/arm/boot/dts/evk-pro3.dts | 4 +- + arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi | 35 + + arch/arm/boot/dts/exynos3250-rinato.dts | 4 - + arch/arm/boot/dts/exynos3250.dtsi | 1 - + arch/arm/boot/dts/exynos4.dtsi | 1 - + arch/arm/boot/dts/exynos4210-origen.dts | 7 +- + arch/arm/boot/dts/exynos4210-smdkv310.dts | 7 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 29 +- + arch/arm/boot/dts/exynos4412-odroidu3.dts | 18 + + arch/arm/boot/dts/exynos4412-odroidx.dts | 11 + + arch/arm/boot/dts/exynos4412-odroidx2.dts | 11 + + arch/arm/boot/dts/exynos4412-origen.dts | 23 +- + arch/arm/boot/dts/exynos4412-smdk4412.dts | 7 +- + arch/arm/boot/dts/exynos4412-trats2.dts | 4 +- + arch/arm/boot/dts/exynos5.dtsi | 215 +- + arch/arm/boot/dts/exynos5250-arndale.dts | 6 +- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 6 +- + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 2 +- + arch/arm/boot/dts/exynos5250-spring.dts | 6 +- + arch/arm/boot/dts/exynos5250.dtsi | 1701 ++++++------ + arch/arm/boot/dts/exynos5410-odroidxu.dts | 580 ++++ + arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 210 ++ + arch/arm/boot/dts/exynos5410-smdk5410.dts | 6 +- + arch/arm/boot/dts/exynos5410.dtsi | 333 ++- + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 6 +- + arch/arm/boot/dts/exynos5420-peach-pit.dts | 32 +- + arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 12 +- + arch/arm/boot/dts/exynos5420-smdk5420.dts | 6 +- + arch/arm/boot/dts/exynos5420.dtsi | 2770 +++++++++----------- + arch/arm/boot/dts/exynos5422-cpu-thermal.dtsi | 103 - + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 104 +- + arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts | 35 +- + arch/arm/boot/dts/exynos5422-odroidxu3.dts | 35 +- + arch/arm/boot/dts/exynos54xx-odroidxu-leds.dtsi | 50 + + arch/arm/boot/dts/exynos54xx.dtsi | 199 ++ + arch/arm/boot/dts/exynos5800-peach-pi.dts | 32 +- + arch/arm/boot/dts/ge863-pro3.dtsi | 9 - + arch/arm/boot/dts/hi3519-demb.dts | 42 + + arch/arm/boot/dts/hi3519.dtsi | 187 ++ + arch/arm/boot/dts/imx1-ads.dts | 4 +- + arch/arm/boot/dts/imx1-apf9328.dts | 4 +- + arch/arm/boot/dts/imx23-sansa.dts | 207 ++ + arch/arm/boot/dts/imx23-xfi3.dts | 179 ++ + arch/arm/boot/dts/imx23.dtsi | 48 + + .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 4 +- + arch/arm/boot/dts/imx25-pdk.dts | 2 +- + arch/arm/boot/dts/imx25-pinfunc.h | 627 ++--- + arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi | 2 +- + .../boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts | 6 +- + arch/arm/boot/dts/imx27-pdk.dts | 2 +- + arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts | 6 +- + arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 4 +- + arch/arm/boot/dts/imx28-apf28dev.dts | 2 +- + arch/arm/boot/dts/imx28-cfa10049.dts | 2 +- + arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi | 4 + + arch/arm/boot/dts/imx28-evk.dts | 2 +- + arch/arm/boot/dts/imx28-tx28.dts | 2 +- + arch/arm/boot/dts/imx28.dtsi | 5 + + arch/arm/boot/dts/imx31-bug.dts | 2 +- + .../boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts | 4 +- + arch/arm/boot/dts/imx35-pdk.dts | 2 +- + arch/arm/boot/dts/imx51-babbage.dts | 4 +- + .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 4 +- + arch/arm/boot/dts/imx51-ts4800.dts | 27 + + arch/arm/boot/dts/imx53-smd.dts | 2 +- + arch/arm/boot/dts/imx53-tqma53.dtsi | 2 +- + arch/arm/boot/dts/imx53-tx53.dtsi | 6 +- + arch/arm/boot/dts/imx6dl-riotboard.dts | 1 + + arch/arm/boot/dts/imx6q-apalis-ixora.dts | 4 +- + arch/arm/boot/dts/imx6q-arm2.dts | 3 +- + arch/arm/boot/dts/imx6q-ba16.dtsi | 2 +- + arch/arm/boot/dts/imx6q-bx50v3.dtsi | 6 + + arch/arm/boot/dts/imx6q-cm-fx6.dts | 281 +- + arch/arm/boot/dts/imx6q-h100.dts | 395 +++ + arch/arm/boot/dts/imx6q-tbs2910.dts | 2 +- + arch/arm/boot/dts/imx6q-utilite-pro.dts | 197 ++ + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-apf6dev.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-aristainetos.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-microsom.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 3 +- + arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 19 +- + arch/arm/boot/dts/imx6qdl-tx6.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 3 +- + arch/arm/boot/dts/imx6qdl.dtsi | 4 +- + arch/arm/boot/dts/imx6sl-warp.dts | 2 +- + arch/arm/boot/dts/imx6sl.dtsi | 13 +- + arch/arm/boot/dts/imx6sx-nitrogen6sx.dts | 2 +- + arch/arm/boot/dts/imx6sx-sdb.dtsi | 14 +- + arch/arm/boot/dts/imx6sx.dtsi | 12 +- + arch/arm/boot/dts/imx6ul-14x14-evk.dts | 63 +- + arch/arm/boot/dts/imx6ul-pico-hobbit.dts | 6 +- + arch/arm/boot/dts/imx6ul-tx6ul-mainboard.dts | 4 +- + arch/arm/boot/dts/imx6ul-tx6ul.dtsi | 6 +- + arch/arm/boot/dts/imx6ul.dtsi | 9 +- + arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 148 ++ + arch/arm/boot/dts/imx7-colibri.dtsi | 571 ++++ + arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 1 - + arch/arm/boot/dts/imx7d-colibri-eval-v3.dts | 66 + + arch/arm/boot/dts/imx7d-colibri.dtsi | 54 + + arch/arm/boot/dts/imx7d-nitrogen7.dts | 3 +- + arch/arm/boot/dts/imx7d-pinfunc.h | 2 +- + arch/arm/boot/dts/imx7d-sdb.dts | 131 +- + arch/arm/boot/dts/imx7d.dtsi | 923 +------ + arch/arm/boot/dts/imx7s-colibri-eval-v3.dts | 51 + + arch/arm/boot/dts/imx7s-colibri.dtsi | 50 + + arch/arm/boot/dts/imx7s.dtsi | 933 +++++++ + arch/arm/boot/dts/keystone-k2e.dtsi | 7 +- + arch/arm/boot/dts/keystone-k2g-evm.dts | 11 + + arch/arm/boot/dts/keystone-k2g.dtsi | 8 + + arch/arm/boot/dts/keystone-k2l.dtsi | 149 ++ + arch/arm/boot/dts/keystone.dtsi | 7 +- + arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts | 4 +- + arch/arm/boot/dts/ls1021a.dtsi | 1 + + arch/arm/boot/dts/meson8b.dtsi | 7 + + arch/arm/boot/dts/mpa1600.dts | 11 +- + arch/arm/boot/dts/omap24xx-clocks.dtsi | 2 +- + arch/arm/boot/dts/omap3-beagle-xm.dts | 10 +- + arch/arm/boot/dts/omap3-beagle.dts | 10 +- + arch/arm/boot/dts/omap3-cm-t3x.dtsi | 2 +- + arch/arm/boot/dts/omap3-devkit8000-common.dtsi | 12 +- + arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi | 4 +- + arch/arm/boot/dts/omap3-devkit8000-lcd43.dts | 2 +- + arch/arm/boot/dts/omap3-devkit8000-lcd70.dts | 2 +- + arch/arm/boot/dts/omap3-gta04.dtsi | 72 +- + arch/arm/boot/dts/omap3-ha-lcd.dts | 2 +- + arch/arm/boot/dts/omap3-igep0020-common.dtsi | 8 +- + arch/arm/boot/dts/omap3-n900.dts | 12 + + arch/arm/boot/dts/omap3-overo-common-dvi.dtsi | 8 +- + arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi | 2 +- + arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi | 2 +- + arch/arm/boot/dts/omap3-pandora-common.dtsi | 2 +- + arch/arm/boot/dts/omap3-sb-t35.dtsi | 8 +- + arch/arm/boot/dts/omap3-thunder.dts | 2 +- + arch/arm/boot/dts/omap3.dtsi | 10 + + arch/arm/boot/dts/omap4-duovero-parlor.dts | 2 +- + arch/arm/boot/dts/omap4-duovero.dtsi | 5 + + arch/arm/boot/dts/omap4-panda-common.dtsi | 21 +- + arch/arm/boot/dts/omap4-sdp.dts | 13 +- + arch/arm/boot/dts/omap4-var-om44customboard.dtsi | 2 +- + arch/arm/boot/dts/omap4-var-som-om44.dtsi | 5 + + arch/arm/boot/dts/omap5-board-common.dtsi | 13 +- + arch/arm/boot/dts/omap5-cm-t54.dts | 15 +- + arch/arm/boot/dts/pm9g45.dts | 9 - + arch/arm/boot/dts/pxa27x.dtsi | 7 + + arch/arm/boot/dts/pxa2xx.dtsi | 8 + + arch/arm/boot/dts/pxa3xx.dtsi | 133 +- + arch/arm/boot/dts/qcom-apq8060-dragonboard.dts | 626 +++++ + ...tsi => qcom-apq8064-arrow-sd-600eval-pins.dtsi} | 0 + ...b600c.dts => qcom-apq8064-arrow-sd-600eval.dts} | 10 +- + arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts | 6 - + arch/arm/boot/dts/qcom-apq8064-pins.dtsi | 40 + + .../arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts | 44 +- + arch/arm/boot/dts/qcom-apq8064.dtsi | 10 +- + arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 247 ++ + arch/arm/boot/dts/qcom-apq8084.dtsi | 8 + + arch/arm/boot/dts/qcom-ipq4019.dtsi | 6 + + arch/arm/boot/dts/qcom-msm8660-surf.dts | 11 + + arch/arm/boot/dts/qcom-msm8660.dtsi | 166 +- + .../boot/dts/qcom-msm8974-sony-xperia-honami.dts | 4 + + arch/arm/boot/dts/qcom-msm8974.dtsi | 28 +- + arch/arm/boot/dts/qcom-pma8084.dtsi | 20 +- + arch/arm/boot/dts/r7s72100-genmai.dts | 6 +- + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 12 +- + arch/arm/boot/dts/r8a73a4.dtsi | 34 +- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 20 +- + arch/arm/boot/dts/r8a7740.dtsi | 2 +- + arch/arm/boot/dts/r8a7778-bockw.dts | 7 +- + arch/arm/boot/dts/r8a7778.dtsi | 28 +- + arch/arm/boot/dts/r8a7779-marzen.dts | 10 +- + arch/arm/boot/dts/r8a7790-lager.dts | 30 +- + arch/arm/boot/dts/r8a7790.dtsi | 237 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 20 +- + arch/arm/boot/dts/r8a7791-porter.dts | 12 +- + arch/arm/boot/dts/r8a7791.dtsi | 227 +- + arch/arm/boot/dts/r8a7792-blanche.dts | 66 + + arch/arm/boot/dts/r8a7792.dtsi | 385 +++ + arch/arm/boot/dts/r8a7793-gose.dts | 18 +- + arch/arm/boot/dts/r8a7793.dtsi | 213 +- + arch/arm/boot/dts/r8a7794-alt.dts | 4 +- + arch/arm/boot/dts/r8a7794-silk.dts | 22 +- + arch/arm/boot/dts/r8a7794.dtsi | 132 +- + arch/arm/boot/dts/rk3228-evb.dts | 2 +- + arch/arm/boot/dts/rk3229-evb.dts | 90 + + arch/arm/boot/dts/{rk3228.dtsi => rk322x.dtsi} | 118 +- + arch/arm/boot/dts/rk3288-firefly.dtsi | 31 +- + arch/arm/boot/dts/rk3288-miqi.dts | 26 +- + arch/arm/boot/dts/rk3288-popmetal.dts | 31 +- + arch/arm/boot/dts/rk3288-rock2-som.dtsi | 31 +- + arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi | 101 + + arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 1 + + arch/arm/boot/dts/rk3288-veyron.dtsi | 31 +- + arch/arm/boot/dts/rk3288.dtsi | 5 + + arch/arm/boot/dts/sama5d2.dtsi | 37 +- + arch/arm/boot/dts/sama5d3.dtsi | 44 +- + arch/arm/boot/dts/sama5d31ek.dts | 1 + + arch/arm/boot/dts/sama5d33ek.dts | 1 + + arch/arm/boot/dts/sama5d34ek.dts | 1 + + arch/arm/boot/dts/sama5d35ek.dts | 2 + + arch/arm/boot/dts/sama5d36ek.dts | 2 + + arch/arm/boot/dts/sama5d3xcm.dtsi | 34 - + arch/arm/boot/dts/sama5d3xmb.dtsi | 12 - + arch/arm/boot/dts/sama5d3xmb_emac.dtsi | 26 + + arch/arm/boot/dts/sama5d3xmb_gmac.dtsi | 48 + + arch/arm/boot/dts/sama5d4.dtsi | 40 +- + arch/arm/boot/dts/sh73a0-kzm9g.dts | 19 +- + arch/arm/boot/dts/sh73a0.dtsi | 2 +- + arch/arm/boot/dts/socfpga_arria10.dtsi | 24 +- + arch/arm/boot/dts/socfpga_arria10_socdk.dtsi | 7 +- + arch/arm/boot/dts/ste-dbx5x0.dtsi | 1 + + arch/arm/boot/dts/ste-href-tvk1281618.dtsi | 62 +- + arch/arm/boot/dts/ste-href.dtsi | 1 - + arch/arm/boot/dts/ste-hrefv60plus.dtsi | 120 + + arch/arm/boot/dts/ste-snowball.dts | 84 +- + arch/arm/boot/dts/stih410-clock.dtsi | 9 + + arch/arm/boot/dts/sun4i-a10-a1000.dts | 4 +- + arch/arm/boot/dts/sun4i-a10-hackberry.dts | 1 + + arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 1 + + arch/arm/boot/dts/sun4i-a10.dtsi | 227 +- + arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 19 + + arch/arm/boot/dts/sun5i-a10s-mk802.dts | 32 + + arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 7 + + arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts | 10 +- + arch/arm/boot/dts/sun5i-a10s.dtsi | 14 + + arch/arm/boot/dts/sun5i-a13-difrnce-dit4350.dts | 178 +- + arch/arm/boot/dts/sun5i-a13-q8-tablet.dts | 40 +- + arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 180 +- + arch/arm/boot/dts/sun5i-a13.dtsi | 122 + + arch/arm/boot/dts/sun5i-r8.dtsi | 120 +- + ...mon.dtsi => sun5i-reference-design-tablet.dtsi} | 36 +- + arch/arm/boot/dts/sun5i.dtsi | 2 +- + arch/arm/boot/dts/sun6i-a31-m9.dts | 96 +- + arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts | 96 +- + arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 229 ++ + arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 80 +- + arch/arm/boot/dts/sun7i-a20.dtsi | 474 ++-- + arch/arm/boot/dts/sun8i-a23-inet86dz.dts | 58 + + .../boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts | 50 + + .../boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts | 195 +- + arch/arm/boot/dts/sun8i-a23-q8-tablet.dts | 15 - + arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts | 77 +- + arch/arm/boot/dts/sun8i-a33-q8-tablet.dts | 15 - + arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts | 195 ++ + arch/arm/boot/dts/sun8i-h3.dtsi | 21 +- + arch/arm/boot/dts/sun8i-q8-common.dtsi | 139 +- + arch/arm/boot/dts/sun8i-r16-parrot.dts | 351 +++ + .../boot/dts/sun8i-reference-design-tablet.dtsi | 216 ++ + arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 164 +- + arch/arm/boot/dts/sun9i-a80-optimus.dts | 195 +- + ...mon.dtsi => sunxi-reference-design-tablet.dtsi} | 0 + arch/arm/boot/dts/tegra114-dalmore.dts | 2 +- + arch/arm/boot/dts/tegra114-roth.dts | 4 +- + arch/arm/boot/dts/tegra114-tn7.dts | 2 +- + arch/arm/boot/dts/tegra124-apalis-emc.dtsi | 1502 +++++++++++ + arch/arm/boot/dts/tegra124-apalis-eval.dts | 284 ++ + arch/arm/boot/dts/tegra124-apalis.dtsi | 2100 +++++++++++++++ + arch/arm/boot/dts/tegra124-jetson-tk1-emc.dtsi | 6 +- + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 92 +- + arch/arm/boot/dts/tegra124-nyan-big-emc.dtsi | 6 +- + arch/arm/boot/dts/tegra124-nyan-big.dts | 4 +- + arch/arm/boot/dts/tegra124-nyan-blaze-emc.dtsi | 6 +- + arch/arm/boot/dts/tegra124-nyan-blaze.dts | 2 +- + arch/arm/boot/dts/tegra124-nyan.dtsi | 60 +- + arch/arm/boot/dts/tegra124-venice2.dts | 70 +- + arch/arm/boot/dts/tegra124.dtsi | 125 +- + arch/arm/boot/dts/tegra20-colibri-512.dtsi | 2 +- + arch/arm/boot/dts/tegra20-harmony.dts | 2 +- + arch/arm/boot/dts/tegra20-paz00.dts | 2 +- + arch/arm/boot/dts/tegra20-seaboard.dts | 2 +- + arch/arm/boot/dts/tegra20-tamonten.dtsi | 2 +- + arch/arm/boot/dts/tegra20-trimslice.dts | 2 +- + arch/arm/boot/dts/tegra20-ventana.dts | 2 +- + arch/arm/boot/dts/tegra20-whistler.dts | 2 +- + arch/arm/boot/dts/tegra30-apalis.dtsi | 7 +- + arch/arm/boot/dts/tegra30-beaver.dts | 2 +- + arch/arm/boot/dts/tegra30-cardhu.dtsi | 2 +- + arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 2 +- + arch/arm/boot/dts/tegra30-colibri.dtsi | 2 +- + arch/arm/boot/dts/tny_a9260_common.dtsi | 9 - + arch/arm/boot/dts/tny_a9263.dts | 11 +- + arch/arm/boot/dts/uniphier-common32.dtsi | 12 +- + arch/arm/boot/dts/uniphier-ph1-ld4.dtsi | 2 +- + arch/arm/boot/dts/uniphier-ph1-ld6b.dtsi | 2 +- + arch/arm/boot/dts/uniphier-ph1-pro4.dtsi | 2 +- + arch/arm/boot/dts/uniphier-ph1-pro5.dtsi | 2 +- + arch/arm/boot/dts/uniphier-ph1-sld8.dtsi | 2 +- + arch/arm/boot/dts/uniphier-pinctrl.dtsi | 5 + + arch/arm/boot/dts/uniphier-proxstream2-gentil.dts | 8 +- + arch/arm/boot/dts/uniphier-proxstream2-vodka.dts | 8 +- + arch/arm/boot/dts/uniphier-proxstream2.dtsi | 2 +- + arch/arm/boot/dts/usb_a9260_common.dtsi | 13 +- + arch/arm/boot/dts/usb_a9263.dts | 11 +- + arch/arm/boot/dts/usb_a9g20_common.dtsi | 5 +- + arch/arm/configs/bcm_defconfig | 141 - + arch/arm/configs/exynos_defconfig | 29 +- + arch/arm/configs/imx_v6_v7_defconfig | 4 +- + arch/arm/configs/keystone_defconfig | 1 + + arch/arm/configs/lpc18xx_defconfig | 2 + + arch/arm/configs/multi_v4t_defconfig | 106 + + arch/arm/configs/multi_v5_defconfig | 54 +- + arch/arm/configs/multi_v7_defconfig | 52 +- + arch/arm/configs/omap2plus_defconfig | 5 +- + arch/arm/configs/qcom_defconfig | 8 + + arch/arm/configs/sama5_defconfig | 3 + + arch/arm/configs/shmobile_defconfig | 1 + + arch/arm/configs/socfpga_defconfig | 16 +- + arch/arm/configs/sunxi_defconfig | 2 + + arch/arm/include/debug/at91.S | 10 +- + arch/arm/include/debug/clps711x.S | 4 +- + arch/arm/include/debug/exynos.S | 6 +- + arch/arm/include/debug/samsung.S | 8 + + arch/arm/mach-at91/Kconfig | 2 +- + arch/arm/mach-at91/pm.c | 5 +- + arch/arm/mach-bcm/Kconfig | 19 +- + arch/arm/mach-bcm/Makefile | 5 +- + arch/arm/mach-bcm/board_bcm21664.c | 42 - + arch/arm/mach-bcm/board_bcm23550.c | 25 + + arch/arm/mach-bcm/kona_l2_cache.c | 1 + + arch/arm/mach-bcm/platsmp.c | 174 +- + arch/arm/mach-berlin/Kconfig | 2 +- + arch/arm/mach-clps711x/Kconfig | 53 +- + arch/arm/mach-clps711x/Makefile | 14 +- + arch/arm/mach-clps711x/Makefile.boot | 5 - + arch/arm/mach-clps711x/board-dt.c | 82 + + arch/arm/mach-clps711x/common.c | 4 +- + arch/arm/mach-clps711x/include/mach/clps711x.h | 204 -- + arch/arm/mach-clps711x/include/mach/hardware.h | 53 - + arch/arm/mach-clps711x/include/mach/uncompress.h | 55 - + arch/arm/mach-davinci/board-dm355-evm.c | 4 +- + arch/arm/mach-davinci/board-dm365-evm.c | 8 +- + arch/arm/mach-davinci/board-dm644x-evm.c | 4 +- + arch/arm/mach-davinci/board-neuros-osd2.c | 4 +- + arch/arm/mach-davinci/da850.c | 16 + + arch/arm/mach-davinci/davinci.h | 8 +- + arch/arm/mach-davinci/dm355.c | 3 +- + arch/arm/mach-davinci/dm365.c | 6 +- + arch/arm/mach-davinci/dm644x.c | 3 +- + arch/arm/mach-davinci/psc.h | 2 + + arch/arm/mach-digicolor/Kconfig | 2 +- + arch/arm/mach-exynos/Kconfig | 3 +- + arch/arm/mach-exynos/Makefile | 3 - + arch/arm/mach-exynos/common.h | 5 +- + arch/arm/mach-exynos/exynos.c | 20 +- + arch/arm/mach-exynos/firmware.c | 18 +- + arch/arm/mach-exynos/headsmp.S | 3 + + arch/arm/mach-exynos/mfc.h | 16 - + arch/arm/mach-exynos/platsmp.c | 4 +- + arch/arm/mach-exynos/pm.c | 6 +- + arch/arm/mach-exynos/s5p-dev-mfc.c | 93 - + arch/arm/mach-exynos/suspend.c | 12 +- + arch/arm/mach-hisi/hisilicon.c | 28 - + arch/arm/mach-hisi/platsmp.c | 4 +- + arch/arm/mach-imx/Kconfig | 6 +- + arch/arm/mach-imx/Makefile | 4 +- + arch/arm/mach-imx/avic.c | 19 +- + arch/arm/mach-imx/common.h | 3 +- + arch/arm/mach-imx/cpu-imx5.c | 8 - + arch/arm/mach-imx/cpu.c | 2 - + arch/arm/mach-imx/cpuidle-imx6q.c | 20 + + arch/arm/mach-imx/devices/Kconfig | 4 - + arch/arm/mach-imx/devices/devices.c | 3 + + arch/arm/mach-imx/devices/platform-gpio-mxc.c | 1 + + arch/arm/mach-imx/devices/platform-mxc_rnga.c | 53 - + arch/arm/mach-imx/eukrea-baseboards.h | 42 - + arch/arm/mach-imx/imx27-dt.c | 1 + + arch/arm/mach-imx/imx31-dt.c | 12 + + arch/arm/mach-imx/imx35-dt.c | 10 +- + arch/arm/mach-imx/irq-common.c | 6 +- + arch/arm/mach-imx/mach-imx50.c | 1 - + arch/arm/mach-imx/mach-imx51.c | 3 +- + arch/arm/mach-imx/mach-imx53.c | 1 - + arch/arm/mach-imx/mach-imx6q.c | 4 +- + arch/arm/mach-imx/mach-imx6sl.c | 2 + + arch/arm/mach-imx/mach-imx6sx.c | 2 + + arch/arm/mach-imx/mach-imx7d.c | 1 + + arch/arm/mach-imx/mm-imx1.c | 2 +- + arch/arm/mach-imx/mm-imx27.c | 2 + + arch/arm/mach-imx/mm-imx3.c | 32 +- + arch/arm/mach-imx/mxc.h | 101 - + arch/arm/mach-imx/pm-imx27.c | 8 +- + arch/arm/mach-imx/pm-imx3.c | 38 - + arch/arm/mach-imx/system.c | 58 +- + arch/arm/mach-imx/tzic.c | 16 +- + arch/arm/mach-integrator/Kconfig | 4 +- + arch/arm/mach-keystone/Kconfig | 2 +- + arch/arm/mach-keystone/pm_domain.c | 2 + + arch/arm/mach-meson/Kconfig | 5 +- + arch/arm/mach-mmp/Kconfig | 2 +- + arch/arm/mach-moxart/Kconfig | 2 +- + arch/arm/mach-mv78xx0/Kconfig | 2 +- + arch/arm/mach-mvebu/Kconfig | 4 +- + arch/arm/mach-mvebu/coherency.h | 1 + + arch/arm/mach-mvebu/cpu-reset.c | 2 + + arch/arm/mach-mvebu/kirkwood-pm.c | 4 +- + arch/arm/mach-mvebu/kirkwood.c | 2 +- + arch/arm/mach-mvebu/pm.c | 1 + + arch/arm/mach-mvebu/pmsu.c | 3 +- + arch/arm/mach-mvebu/system-controller.c | 2 +- + arch/arm/mach-mxs/Kconfig | 2 +- + arch/arm/mach-nomadik/Kconfig | 2 +- + arch/arm/mach-omap1/ams-delta-fiq.c | 2 +- + arch/arm/mach-omap1/include/mach/mtd-xip.h | 2 +- + arch/arm/mach-omap2/Kconfig | 2 +- + arch/arm/mach-omap2/Makefile | 9 +- + arch/arm/mach-omap2/board-ldp.c | 3 +- + arch/arm/mach-omap2/board-rx51-peripherals.c | 5 - + arch/arm/mach-omap2/board-rx51-video.c | 4 +- + arch/arm/mach-omap2/clockdomain.c | 36 +- + arch/arm/mach-omap2/clockdomain.h | 2 + + arch/arm/mach-omap2/cm33xx.c | 3 + + arch/arm/mach-omap2/cm3xxx.c | 2 +- + arch/arm/mach-omap2/common.h | 8 +- + arch/arm/mach-omap2/cpuidle44xx.c | 2 +- + arch/arm/mach-omap2/display.c | 2 +- + arch/arm/mach-omap2/display.h | 5 + + arch/arm/mach-omap2/dss-common.c | 2 +- + arch/arm/mach-omap2/io.c | 3 + + arch/arm/mach-omap2/mcbsp.c | 31 +- + arch/arm/mach-omap2/mux34xx.c | 4 +- + arch/arm/mach-omap2/omap-headsmp.S | 18 +- + arch/arm/mach-omap2/omap-hotplug.c | 6 + + arch/arm/mach-omap2/omap-mpuss-lowpower.c | 31 +- + arch/arm/mach-omap2/omap-smp.c | 98 +- + arch/arm/mach-omap2/omap4-common.c | 16 +- + arch/arm/mach-omap2/omap_device.c | 19 +- + arch/arm/mach-omap2/omap_hwmod.c | 82 +- + .../mach-omap2/omap_hwmod_33xx_43xx_common_data.h | 18 - + .../omap_hwmod_33xx_43xx_interconnect_data.c | 64 - + .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 85 +- + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 9 - + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 24 +- + arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 54 - + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 41 - + arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 2 +- + arch/arm/mach-omap2/pdata-quirks.c | 28 +- + arch/arm/mach-omap2/pm.c | 8 +- + arch/arm/mach-omap2/powerdomain.c | 20 +- + arch/arm/mach-omap2/prcm43xx.h | 1 + + arch/arm/mach-omap2/prm33xx.h | 2 - + arch/arm/mach-omap2/sdrc.h | 4 +- + arch/arm/mach-omap2/timer.c | 3 +- + arch/arm/mach-orion5x/Kconfig | 2 +- + arch/arm/mach-orion5x/irq.c | 2 +- + arch/arm/mach-oxnas/Kconfig | 4 +- + arch/arm/mach-picoxcell/Kconfig | 2 +- + arch/arm/mach-prima2/Kconfig | 2 +- + arch/arm/mach-qcom/Kconfig | 4 + + arch/arm/mach-qcom/board.c | 1 + + arch/arm/mach-rockchip/Kconfig | 2 +- + arch/arm/mach-s3c24xx/Kconfig | 2 +- + arch/arm/mach-s3c24xx/include/mach/regs-gpio.h | 2 +- + arch/arm/mach-s3c24xx/iotiming-s3c2410.c | 2 +- + arch/arm/mach-s3c24xx/mach-n30.c | 2 +- + arch/arm/mach-s3c24xx/mach-osiris-dvs.c | 2 +- + arch/arm/mach-s3c24xx/pll-s3c2410.c | 3 +- + arch/arm/mach-s3c24xx/pll-s3c2440-12000000.c | 1 + + arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c | 1 + + arch/arm/mach-s3c64xx/Kconfig | 2 +- + arch/arm/mach-s3c64xx/common.h | 1 + + arch/arm/mach-s3c64xx/include/mach/map.h | 2 +- + arch/arm/mach-s3c64xx/mach-smartq.c | 1 + + arch/arm/mach-s5pv210/Kconfig | 2 +- + arch/arm/mach-shmobile/Kconfig | 6 +- + arch/arm/mach-shmobile/Makefile | 1 + + arch/arm/mach-shmobile/common.h | 1 + + arch/arm/mach-shmobile/platsmp-apmu.c | 94 +- + arch/arm/mach-shmobile/platsmp.c | 6 + + arch/arm/mach-shmobile/pm-r8a7779.c | 6 +- + arch/arm/mach-shmobile/pm-rcar-gen2.c | 19 +- + arch/arm/mach-shmobile/pm-rmobile.c | 2 +- + arch/arm/mach-shmobile/setup-r8a7790.c | 1 + + arch/arm/mach-shmobile/setup-r8a7791.c | 1 + + arch/arm/mach-shmobile/setup-r8a7792.c | 35 + + arch/arm/mach-shmobile/setup-rcar-gen2.c | 45 +- + arch/arm/mach-spear/Kconfig | 2 +- + arch/arm/mach-sti/Kconfig | 2 +- + arch/arm/mach-sti/board-dt.c | 11 +- + arch/arm/mach-sunxi/Kconfig | 2 +- + arch/arm/mach-tango/Makefile | 1 + + arch/arm/mach-tango/platsmp.c | 35 + + arch/arm/mach-tango/pm.c | 32 + + arch/arm/mach-tango/smc.h | 5 +- + arch/arm/mach-tegra/Kconfig | 2 +- + arch/arm/mach-tegra/common.h | 22 + + arch/arm/mach-tegra/cpuidle-tegra114.c | 1 + + arch/arm/mach-tegra/cpuidle-tegra20.c | 1 + + arch/arm/mach-tegra/cpuidle-tegra30.c | 1 + + arch/arm/mach-tegra/cpuidle.h | 2 + + arch/arm/mach-tegra/hotplug.c | 1 + + arch/arm/mach-tegra/irq.c | 1 + + arch/arm/mach-tegra/pm.h | 2 +- + arch/arm/mach-tegra/tegra.c | 24 +- + arch/arm/mach-u300/Kconfig | 2 +- + arch/arm/mach-uniphier/Makefile | 1 - + arch/arm/mach-uniphier/platsmp.c | 18 +- + arch/arm/mach-uniphier/uniphier.c | 30 - + arch/arm/mach-ux500/Kconfig | 2 +- + arch/arm/mach-ux500/Makefile | 6 +- + arch/arm/mach-ux500/board-mop500-regulators.c | 1065 -------- + arch/arm/mach-ux500/board-mop500-regulators.h | 24 - + arch/arm/mach-ux500/cache-l2x0.c | 67 - + arch/arm/mach-ux500/cpu-db8500.c | 139 +- + arch/arm/mach-ux500/cpu.c | 148 -- + arch/arm/mach-ux500/id.c | 116 - + arch/arm/mach-ux500/id.h | 144 - + arch/arm/mach-ux500/platsmp.c | 1 - + arch/arm/mach-ux500/setup.h | 12 - + arch/arm/mach-vexpress/Kconfig | 2 +- + arch/arm/mach-vexpress/hotplug.c | 2 + + arch/arm/mach-vexpress/spc.c | 6 +- + arch/arm/mach-vt8500/Kconfig | 2 +- + arch/arm/plat-iop/setup.c | 4 +- + arch/arm/plat-samsung/cpu.c | 10 +- + arch/arm/plat-samsung/include/plat/cpu-freq-core.h | 2 +- + arch/arm/plat-samsung/include/plat/cpu.h | 1 + + arch/arm/plat-samsung/include/plat/fb-s3c2410.h | 2 +- + arch/arm/plat-samsung/include/plat/gpio-cfg.h | 2 +- + arch/arm/plat-samsung/pm-check.c | 2 +- + arch/arm/plat-samsung/pm-common.c | 8 +- + arch/arm/plat-samsung/watchdog-reset.c | 2 +- + arch/arm/plat-versatile/platsmp.c | 2 + + arch/arm64/Kconfig.platforms | 28 + + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 20 + + arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 9 + + .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 3 + + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 170 +- + arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 68 +- + arch/arm64/boot/dts/apm/apm-storm.dtsi | 44 +- + arch/arm64/boot/dts/arm/juno-base.dtsi | 357 +++ + arch/arm64/boot/dts/arm/juno-r1.dts | 40 + + arch/arm64/boot/dts/arm/juno-r2.dts | 40 + + arch/arm64/boot/dts/arm/juno.dts | 24 + + arch/arm64/boot/dts/broadcom/Makefile | 1 + + arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts | 30 + + arch/arm64/boot/dts/broadcom/bcm2837.dtsi | 76 + + arch/arm64/boot/dts/broadcom/ns2-svk.dts | 37 + + arch/arm64/boot/dts/broadcom/ns2.dtsi | 119 + + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 5 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 24 +- + arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 44 +- + arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 143 + + arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 18 + + arch/arm64/boot/dts/lg/Makefile | 1 + + arch/arm64/boot/dts/lg/lg1313-ref.dts | 36 + + arch/arm64/boot/dts/lg/lg1313.dtsi | 351 +++ + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 35 + + arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 8 +- + .../boot/dts/marvell/armada-cp110-master.dtsi | 18 + + arch/arm64/boot/dts/mediatek/Makefile | 1 + + arch/arm64/boot/dts/mediatek/mt6755-evb.dts | 38 + + arch/arm64/boot/dts/mediatek/mt6755.dtsi | 145 + + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 223 ++ + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 249 ++ + arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 45 + + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 319 +++ + arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 314 +++ + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 292 ++- + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 16 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 78 +- + arch/arm64/boot/dts/qcom/msm8996-pins.dtsi | 303 +++ + arch/arm64/boot/dts/qcom/msm8996.dtsi | 103 +- + arch/arm64/boot/dts/renesas/Makefile | 1 + + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 14 +- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 124 +- + arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 50 + + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 138 + + arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 16 + + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 16 +- + arch/arm64/boot/dts/rockchip/rk3399-evb.dts | 12 + + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 313 ++- + .../boot/dts/socionext/uniphier-ph1-ld20.dtsi | 20 +- + arch/arm64/configs/defconfig | 49 +- + arch/arm64/include/asm/dma-mapping.h | 17 +- + drivers/bus/Kconfig | 13 + + drivers/bus/Makefile | 1 + + drivers/bus/mvebu-mbus.c | 10 +- + drivers/bus/tegra-aconnect.c | 112 + + drivers/clk/clk-clps711x.c | 2 +- + drivers/clk/hisilicon/clk-hi6220.c | 2 + + drivers/clk/renesas/Kconfig | 2 + + drivers/clk/renesas/Makefile | 4 +- + drivers/clk/renesas/r8a7795-cpg-mssr.c | 374 +-- + drivers/clk/renesas/r8a7796-cpg-mssr.c | 192 ++ + drivers/clk/renesas/rcar-gen3-cpg.c | 359 +++ + drivers/clk/renesas/rcar-gen3-cpg.h | 43 + + drivers/clk/renesas/renesas-cpg-mssr.c | 6 + + drivers/clk/renesas/renesas-cpg-mssr.h | 1 + + drivers/clk/st/clk-flexgen.c | 4 +- + drivers/clk/st/clkgen-fsyn.c | 10 +- + drivers/clk/st/clkgen-pll.c | 27 +- + drivers/clk/tegra/clk-id.h | 1 - + drivers/clk/tegra/clk-tegra-periph.c | 23 +- + drivers/clk/tegra/clk-tegra210.c | 101 +- + drivers/clk/ti/clk-33xx.c | 3 + + drivers/clk/ti/clk-43xx.c | 7 + + drivers/clk/ux500/u8500_of_clk.c | 16 +- + drivers/clk/ux500/u8540_clk.c | 16 +- + drivers/clk/ux500/u9540_clk.c | 4 +- + drivers/clocksource/clps711x-timer.c | 2 +- + drivers/cpufreq/s5pv210-cpufreq.c | 68 +- + drivers/firmware/Kconfig | 12 +- + drivers/firmware/Makefile | 1 + + drivers/firmware/arm_scpi.c | 42 +- + drivers/firmware/qcom_scm-32.c | 327 ++- + drivers/firmware/qcom_scm-64.c | 307 ++- + drivers/firmware/qcom_scm.c | 353 ++- + drivers/firmware/qcom_scm.h | 47 +- + drivers/firmware/scpi_pm_domain.c | 163 ++ + drivers/input/keyboard/clps711x-keypad.c | 4 +- + drivers/irqchip/irq-clps711x.c | 2 +- + drivers/media/rc/Kconfig | 2 +- + drivers/media/rc/ir-rx51.c | 229 +- + drivers/memory/Kconfig | 11 + + drivers/memory/Makefile | 1 + + drivers/memory/atmel-ebi.c | 766 ++++++ + drivers/memory/atmel-sdramc.c | 11 +- + drivers/memory/omap-gpmc.c | 136 +- + drivers/memory/samsung/exynos-srom.c | 41 +- + drivers/memory/tegra/mc.c | 10 +- + drivers/memory/tegra/tegra124-emc.c | 8 +- + drivers/mfd/ab8500-core.c | 4 - + drivers/mfd/ab8500-sysctrl.c | 34 - + drivers/mfd/db8500-prcmu.c | 10 +- + drivers/net/ethernet/freescale/fec.h | 4 +- + drivers/net/ethernet/freescale/fec_main.c | 12 + + drivers/power/reset/Kconfig | 10 + + drivers/power/reset/Makefile | 1 + + drivers/power/reset/brcm-kona-reset.c | 73 + + drivers/power/reset/vexpress-poweroff.c | 4 +- + drivers/pwm/pwm-clps711x.c | 2 +- + drivers/pwm/pwm-omap-dmtimer.c | 12 +- + drivers/regulator/ab8500-ext.c | 465 +++- + drivers/reset/Kconfig | 14 + + drivers/reset/Makefile | 2 + + drivers/reset/core.c | 37 + + drivers/reset/hisilicon/hi6220_reset.c | 122 +- + drivers/reset/reset-ath79.c | 3 +- + drivers/reset/reset-meson.c | 136 + + drivers/reset/reset-oxnas.c | 12 +- + drivers/reset/reset-pistachio.c | 12 +- + drivers/reset/reset-socfpga.c | 12 +- + drivers/reset/reset-sunxi.c | 12 +- + drivers/reset/reset-ti-syscon.c | 237 ++ + drivers/reset/reset-zynq.c | 12 +- + drivers/reset/sti/Kconfig | 1 - + drivers/soc/Kconfig | 2 +- + drivers/soc/Makefile | 2 +- + drivers/soc/bcm/Kconfig | 18 +- + drivers/soc/bcm/Makefile | 1 + + drivers/soc/{ => bcm}/brcmstb/Makefile | 0 + drivers/soc/{ => bcm}/brcmstb/biuctrl.c | 1 + + drivers/soc/{ => bcm}/brcmstb/common.c | 0 + drivers/soc/brcmstb/Kconfig | 10 - + drivers/soc/qcom/smem_state.c | 12 +- + drivers/soc/qcom/smp2p.c | 7 +- + drivers/soc/qcom/smsm.c | 2 +- + drivers/soc/qcom/wcnss_ctrl.c | 125 +- + drivers/soc/renesas/Makefile | 2 + + drivers/soc/renesas/r8a7792-sysc.c | 34 + + drivers/soc/renesas/r8a7796-sysc.c | 48 + + drivers/soc/renesas/rcar-sysc.c | 45 +- + drivers/soc/renesas/rcar-sysc.h | 2 + + drivers/soc/samsung/Kconfig | 4 + + drivers/soc/samsung/Makefile | 1 + + drivers/soc/samsung/exynos3250-pmu.c | 2 +- + drivers/soc/samsung/exynos5420-pmu.c | 2 +- + .../soc/samsung}/pm_domains.c | 36 +- + drivers/soc/tegra/pmc.c | 149 +- + drivers/soc/ux500/Kconfig | 7 + + drivers/soc/ux500/Makefile | 1 + + drivers/soc/ux500/ux500-soc-id.c | 222 ++ + drivers/spi/spi-st-ssc4.c | 36 +- + drivers/tty/serial/clps711x.c | 2 +- + drivers/video/fbdev/clps711x-fb.c | 4 +- + include/dt-bindings/clock/exynos5410.h | 76 +- + include/dt-bindings/clock/hi6220-clock.h | 5 +- + include/dt-bindings/clock/r8a7792-clock.h | 102 + + include/dt-bindings/clock/r8a7794-clock.h | 1 - + include/dt-bindings/clock/r8a7796-cpg-mssr.h | 69 + + include/dt-bindings/clock/rk3228-cru.h | 15 + + include/dt-bindings/clock/stih407-clks.h | 4 + + include/dt-bindings/clock/tegra210-car.h | 2 +- + include/dt-bindings/pinctrl/keystone.h | 39 + + include/dt-bindings/power/r8a7792-sysc.h | 26 + + include/dt-bindings/power/r8a7796-sysc.h | 36 + + .../dt-bindings/reset/amlogic,meson-gxbb-reset.h | 210 ++ + include/dt-bindings/reset/amlogic,meson8b-reset.h | 175 ++ + include/dt-bindings/reset/hisi,hi6220-resets.h | 8 + + include/dt-bindings/reset/ti-syscon.h | 38 + + include/linux/mbus.h | 2 +- + include/linux/mfd/abx500/ab8500-sysctrl.h | 6 - + include/linux/mfd/dbx500-prcmu.h | 10 - + include/linux/platform_data/asoc-ti-mcbsp.h | 4 +- + include/linux/platform_data/clk-ux500.h | 17 - + include/linux/platform_data/media/ir-rx51.h | 3 - + include/linux/platform_data/omapdss.h | 42 + + include/linux/qcom_scm.h | 8 + + include/linux/reset-controller.h | 4 + + include/linux/reset.h | 4 +- + include/linux/scpi_protocol.h | 2 + + include/linux/soc/qcom/wcnss_ctrl.h | 8 + + include/linux/soc/renesas/rcar-sysc.h | 2 +- + include/soc/imx/cpuidle.h | 25 + + include/soc/tegra/cpuidle.h | 2 +- + include/video/omapdss.h | 31 +- + sound/soc/codecs/ab8500-codec.c | 33 +- + sound/soc/omap/mcbsp.c | 21 +- + sound/soc/omap/mcbsp.h | 3 +- + sound/soc/omap/omap-mcbsp.c | 5 +- + 859 files changed, 33269 insertions(+), 11915 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm23550-cpu-method.txt + create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm23550.txt + create mode 100644 Documentation/devicetree/bindings/arm/hisilicon/hi3519-sysctrl.txt + create mode 100644 Documentation/devicetree/bindings/bus/nvidia,tegra210-aconnect.txt + create mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.txt + create mode 100644 Documentation/devicetree/bindings/media/nokia,n900-ir + create mode 100644 Documentation/devicetree/bindings/memory-controllers/atmel,ebi.txt + create mode 100644 Documentation/devicetree/bindings/power/renesas,apmu.txt + create mode 100644 Documentation/devicetree/bindings/reset/amlogic,meson-reset.txt + create mode 100644 Documentation/devicetree/bindings/reset/ti-syscon-reset.txt + create mode 100644 Documentation/devicetree/bindings/rng/amlogic,meson-rng.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,wcnss.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/at91-sam9_l9260.dts + create mode 100644 arch/arm/boot/dts/at91sam9260ek.dts + create mode 100644 arch/arm/boot/dts/axp809.dtsi + create mode 100644 arch/arm/boot/dts/bcm23550-sparrow.dts + create mode 100644 arch/arm/boot/dts/bcm23550.dtsi + create mode 100644 arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi + create mode 100644 arch/arm/boot/dts/bcm283x-rpi-smsc9514.dtsi + create mode 100644 arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi + create mode 100644 arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi + create mode 100644 arch/arm/boot/dts/bcm953012er.dts + create mode 100644 arch/arm/boot/dts/bcm958525xmc.dts + create mode 100644 arch/arm/boot/dts/bcm958625hr.dts + create mode 100644 arch/arm/boot/dts/ep7209.dtsi + create mode 100644 arch/arm/boot/dts/ep7211-edb7211.dts + create mode 100644 arch/arm/boot/dts/ep7211.dtsi + create mode 100644 arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi + create mode 100644 arch/arm/boot/dts/exynos5410-odroidxu.dts + delete mode 100644 arch/arm/boot/dts/exynos5422-cpu-thermal.dtsi + create mode 100644 arch/arm/boot/dts/exynos54xx-odroidxu-leds.dtsi + create mode 100644 arch/arm/boot/dts/exynos54xx.dtsi + create mode 100644 arch/arm/boot/dts/hi3519-demb.dts + create mode 100644 arch/arm/boot/dts/hi3519.dtsi + create mode 100644 arch/arm/boot/dts/imx23-sansa.dts + create mode 100644 arch/arm/boot/dts/imx23-xfi3.dts + create mode 100644 arch/arm/boot/dts/imx6q-h100.dts + create mode 100644 arch/arm/boot/dts/imx6q-utilite-pro.dts + create mode 100644 arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi + create mode 100644 arch/arm/boot/dts/imx7-colibri.dtsi + create mode 100644 arch/arm/boot/dts/imx7d-colibri-eval-v3.dts + create mode 100644 arch/arm/boot/dts/imx7d-colibri.dtsi + create mode 100644 arch/arm/boot/dts/imx7s-colibri-eval-v3.dts + create mode 100644 arch/arm/boot/dts/imx7s-colibri.dtsi + create mode 100644 arch/arm/boot/dts/imx7s.dtsi + create mode 100644 arch/arm/boot/dts/qcom-apq8060-dragonboard.dts + rename arch/arm/boot/dts/{qcom-apq8064-arrow-db600c-pins.dtsi => qcom-apq8064-arrow-sd-600eval-pins.dtsi} (100%) + rename arch/arm/boot/dts/{qcom-apq8064-arrow-db600c.dts => qcom-apq8064-arrow-sd-600eval.dts} (96%) + create mode 100644 arch/arm/boot/dts/r8a7792-blanche.dts + create mode 100644 arch/arm/boot/dts/r8a7792.dtsi + create mode 100644 arch/arm/boot/dts/rk3229-evb.dts + rename arch/arm/boot/dts/{rk3228.dtsi => rk322x.dtsi} (80%) + create mode 100644 arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi + create mode 100644 arch/arm/boot/dts/sama5d3xmb_emac.dtsi + create mode 100644 arch/arm/boot/dts/sama5d3xmb_gmac.dtsi + rename arch/arm/boot/dts/{sun5i-q8-common.dtsi => sun5i-reference-design-tablet.dtsi} (85%) + create mode 100644 arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts + create mode 100644 arch/arm/boot/dts/sun8i-a23-inet86dz.dts + create mode 100644 arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts + create mode 100644 arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts + create mode 100644 arch/arm/boot/dts/sun8i-r16-parrot.dts + create mode 100644 arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi + rename arch/arm/boot/dts/{sunxi-q8-common.dtsi => sunxi-reference-design-tablet.dtsi} (100%) + create mode 100644 arch/arm/boot/dts/tegra124-apalis-emc.dtsi + create mode 100644 arch/arm/boot/dts/tegra124-apalis-eval.dts + create mode 100644 arch/arm/boot/dts/tegra124-apalis.dtsi + delete mode 100644 arch/arm/configs/bcm_defconfig + create mode 100644 arch/arm/configs/multi_v4t_defconfig + create mode 100644 arch/arm/mach-bcm/board_bcm23550.c + create mode 100644 arch/arm/mach-clps711x/board-dt.c + delete mode 100644 arch/arm/mach-clps711x/include/mach/clps711x.h + delete mode 100644 arch/arm/mach-clps711x/include/mach/hardware.h + delete mode 100644 arch/arm/mach-clps711x/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-exynos/mfc.h + delete mode 100644 arch/arm/mach-exynos/s5p-dev-mfc.c + delete mode 100644 arch/arm/mach-imx/devices/platform-mxc_rnga.c + delete mode 100644 arch/arm/mach-imx/eukrea-baseboards.h + delete mode 100644 arch/arm/mach-imx/pm-imx3.c + create mode 100644 arch/arm/mach-shmobile/setup-r8a7792.c + create mode 100644 arch/arm/mach-tango/pm.c + delete mode 100644 arch/arm/mach-uniphier/uniphier.c + delete mode 100644 arch/arm/mach-ux500/board-mop500-regulators.c + delete mode 100644 arch/arm/mach-ux500/board-mop500-regulators.h + delete mode 100644 arch/arm/mach-ux500/cache-l2x0.c + delete mode 100644 arch/arm/mach-ux500/cpu.c + delete mode 100644 arch/arm/mach-ux500/id.c + delete mode 100644 arch/arm/mach-ux500/id.h + create mode 100644 arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts + create mode 100644 arch/arm64/boot/dts/broadcom/bcm2837.dtsi + create mode 100644 arch/arm64/boot/dts/lg/lg1313-ref.dts + create mode 100644 arch/arm64/boot/dts/lg/lg1313.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt6755-evb.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt6755.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8996-pins.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a7796.dtsi + create mode 100644 drivers/bus/tegra-aconnect.c + create mode 100644 drivers/clk/renesas/r8a7796-cpg-mssr.c + create mode 100644 drivers/clk/renesas/rcar-gen3-cpg.c + create mode 100644 drivers/clk/renesas/rcar-gen3-cpg.h + create mode 100644 drivers/firmware/scpi_pm_domain.c + create mode 100644 drivers/memory/atmel-ebi.c + create mode 100644 drivers/power/reset/brcm-kona-reset.c + create mode 100644 drivers/reset/reset-meson.c + create mode 100644 drivers/reset/reset-ti-syscon.c + rename drivers/soc/{ => bcm}/brcmstb/Makefile (100%) + rename drivers/soc/{ => bcm}/brcmstb/biuctrl.c (98%) + rename drivers/soc/{ => bcm}/brcmstb/common.c (100%) + delete mode 100644 drivers/soc/brcmstb/Kconfig + create mode 100644 drivers/soc/renesas/r8a7792-sysc.c + create mode 100644 drivers/soc/renesas/r8a7796-sysc.c + rename {arch/arm/mach-exynos => drivers/soc/samsung}/pm_domains.c (84%) + create mode 100644 drivers/soc/ux500/Kconfig + create mode 100644 drivers/soc/ux500/Makefile + create mode 100644 drivers/soc/ux500/ux500-soc-id.c + create mode 100644 include/dt-bindings/clock/r8a7792-clock.h + create mode 100644 include/dt-bindings/clock/r8a7796-cpg-mssr.h + create mode 100644 include/dt-bindings/pinctrl/keystone.h + create mode 100644 include/dt-bindings/power/r8a7792-sysc.h + create mode 100644 include/dt-bindings/power/r8a7796-sysc.h + create mode 100644 include/dt-bindings/reset/amlogic,meson-gxbb-reset.h + create mode 100644 include/dt-bindings/reset/amlogic,meson8b-reset.h + create mode 100644 include/dt-bindings/reset/ti-syscon.h + delete mode 100644 include/linux/platform_data/clk-ux500.h + create mode 100644 include/linux/platform_data/omapdss.h + create mode 100644 include/linux/soc/qcom/wcnss_ctrl.h + create mode 100644 include/soc/imx/cpuidle.h +$ git am -3 ../patches/0001-clocksource-drivers-clps_711x-fixup-for-ARM-clps711x.patch +Applying: clocksource/drivers/clps_711x: fixup for "ARM: clps711x: Switch to MULTIPLATFORM" +$ git reset HEAD^ +Unstaged changes after reset: +M arch/arm/mach-clps711x/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master 8b81f0de4cd5] Merge remote-tracking branch 'arm-soc/for-next' + Date: Fri Jul 29 09:55:42 2016 +1000 +Merging amlogic/for-next (4d9b3db03bd4 Merge remote-tracking branch 'clk/clk-s905' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Removing drivers/clk/meson/clkc.c +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + .../bindings/clock/amlogic,gxbb-clkc.txt | 36 + + arch/arm64/configs/defconfig | 2 + + drivers/clk/Kconfig | 1 + + drivers/clk/Makefile | 2 +- + drivers/clk/meson/Kconfig | 19 + + drivers/clk/meson/Makefile | 5 +- + drivers/clk/meson/clk-cpu.c | 73 +- + drivers/clk/meson/clk-mpll.c | 94 ++ + drivers/clk/meson/clk-pll.c | 104 +-- + drivers/clk/meson/clkc.c | 249 ------ + drivers/clk/meson/clkc.h | 179 ++-- + drivers/clk/meson/gxbb.c | 954 +++++++++++++++++++++ + drivers/clk/meson/gxbb.h | 271 ++++++ + drivers/clk/meson/meson8b-clkc.c | 436 ++++++++-- + include/dt-bindings/clock/gxbb-clkc.h | 12 + + include/dt-bindings/clock/meson8b-clkc.h | 4 +- + 16 files changed, 1846 insertions(+), 595 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/amlogic,gxbb-clkc.txt + create mode 100644 drivers/clk/meson/Kconfig + create mode 100644 drivers/clk/meson/clk-mpll.c + delete mode 100644 drivers/clk/meson/clkc.c + create mode 100644 drivers/clk/meson/gxbb.c + create mode 100644 drivers/clk/meson/gxbb.h + create mode 100644 include/dt-bindings/clock/gxbb-clkc.h +Merging at91/at91-next (0f59c948faed Merge tag 'at91-ab-4.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next) +$ git merge at91/at91-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging bcm2835/for-next (aa5c0a1e15c2 Merge branch anholt/bcm2835-dt-64-next into for-next) +$ git merge bcm2835/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/vc4/vc4_dpi.c | 14 +++----------- + 1 file changed, 3 insertions(+), 11 deletions(-) +Merging berlin/berlin/for-next (d433580f3b4e Merge branches 'berlin64/dt' and 'berlin/dt' into berlin/for-next) +$ git merge berlin/berlin/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/berlin2.dtsi | 2 -- + arch/arm/boot/dts/berlin2q.dtsi | 2 -- + arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 12 +++++++++--- + 3 files changed, 9 insertions(+), 7 deletions(-) +Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings) +$ git merge cortex-m/for-next +Already up-to-date. +Merging imx-mxs/for-next (63a404a3f177 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Merge made by the 'recursive' strategy. + drivers/clk/imx/clk-imx6q.c | 14 +++++++------- + drivers/clk/imx/clk-imx6sl.c | 14 +++++++------- + drivers/clk/imx/clk-imx6sx.c | 14 +++++++------- + drivers/clk/imx/clk-imx6ul.c | 18 +++++++++--------- + drivers/clk/imx/clk-imx7d.c | 14 +++++++------- + drivers/clk/imx/clk-pllv3.c | 28 ++++++++++++++++------------ + 6 files changed, 53 insertions(+), 49 deletions(-) +Merging keystone/next (eef6bb9fc17a Merge branch 'for_4.8/keystone' into next) +$ git merge keystone/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (feaf6b0beba8 Merge branch 'mvebu/defconfig64' into mvebu/for-next) +$ git merge mvebu/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (370c3261ba8a Merge branch 'omap-for-v4.8/soc' into for-next) +$ git merge omap/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/dm814x-clocks.dtsi | 4 ++-- + arch/arm/mach-omap2/cm33xx.c | 6 ------ + arch/arm/mach-omap2/cminst44xx.c | 6 ------ + arch/arm/mach-omap2/omap_hwmod.c | 8 ++++++++ + arch/arm/mach-omap2/omap_hwmod.h | 4 ++++ + arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 2 ++ + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 12 ++++++++++++ + 7 files changed, 28 insertions(+), 14 deletions(-) +Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence) +$ git merge omap-pending/for-next +Already up-to-date. +Merging qcom/for-next (289f9fb05d0c ARM: dts: msm8916: Add smsm and smp2p nodes) +$ git merge qcom/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/qcom/msm8916.dtsi | 82 +++++++++++++++++++++++++++++++++++ + 1 file changed, 82 insertions(+) +Merging renesas/next (314a0bb0dd88 Merge branch 'heads/soc-fixes-for-v4.8' into next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. + arch/arm/mach-shmobile/platsmp.c | 3 +++ + 1 file changed, 3 insertions(+) +Merging rockchip/for-next (ebbfb5d5627d Merge branch 'v4.8-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Auto-merging drivers/clk/rockchip/clk-rk3399.c +Auto-merging arch/arm64/boot/dts/rockchip/rk3399.dtsi +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/rockchip.txt | 4 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/rk3288-evb-act8846.dts | 4 + + arch/arm/boot/dts/rk3288-evb-rk808.dts | 4 + + arch/arm/boot/dts/rk3288-evb.dtsi | 45 ++- + arch/arm/boot/dts/rk3288-fennec.dts | 382 +++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 178 ++++++++++ + drivers/clk/rockchip/clk-rk3228.c | 125 ++++--- + drivers/clk/rockchip/clk-rk3399.c | 11 +- + 9 files changed, 701 insertions(+), 53 deletions(-) + create mode 100644 arch/arm/boot/dts/rk3288-fennec.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 (253256f64294 Merge branch 'next/soc' into for-next) +$ git merge samsung-krzk/for-next +Resolved 'arch/arm/boot/dts/exynos5420.dtsi' using previous resolution. +Auto-merging arch/arm/boot/dts/exynos5420.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/exynos5420.dtsi +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 27bfcbbe53ad] Merge remote-tracking branch 'samsung-krzk/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging tegra/for-next (6083e0f837ac Merge branch for-4.8/arm64/defconfig into for-next) +$ git merge tegra/for-next +Auto-merging drivers/i2c/i2c-core.c +Auto-merging Documentation/devicetree/bindings/i2c/i2c.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/i2c/i2c.txt | 8 + + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 18 + + drivers/clk/tegra/clk-pll.c | 505 +++++++++++++++++++++++++ + drivers/clk/tegra/clk-tegra-periph.c | 2 +- + drivers/clk/tegra/clk-tegra114.c | 156 +------- + drivers/clk/tegra/clk-tegra124.c | 156 +------- + drivers/clk/tegra/clk-tegra210.c | 194 +--------- + drivers/clk/tegra/clk-tegra30.c | 113 +----- + drivers/clk/tegra/clk.h | 17 + + drivers/i2c/i2c-core.c | 10 +- + drivers/pci/host/pci-tegra.c | 54 ++- + 11 files changed, 597 insertions(+), 636 deletions(-) +Merging arm64/for-next/core (fd6380b75065 arm64: arm: Fix-up the removal of the arm64 regs_query_register_name() prototype) +$ 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 0f97419d2e80] Merge remote-tracking branch 'blackfin/for-linus' +$ git diff -M --stat --summary HEAD^.. +Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code) +$ git merge cris/for-next +Already up-to-date. +Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h) +$ git merge h8300/h8300-next +Merge made by the 'recursive' strategy. + arch/h8300/include/asm/io.h | 2 ++ + 1 file changed, 2 insertions(+) +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 +Auto-merging include/linux/efi.h +Merge made by the 'recursive' strategy. + arch/ia64/kernel/efi.c | 4 ++-- + arch/ia64/kernel/salinfo.c | 38 ++++++++++---------------------------- + arch/ia64/kernel/time.c | 2 +- + include/linux/efi.h | 2 +- + 4 files changed, 14 insertions(+), 32 deletions(-) +Merging m68k/for-next (6bd80f372371 m68k/defconfig: Update defconfigs for v4.7-rc2) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (33688abb2802 Linux 4.7-rc4) +$ git merge m68knommu/for-next +Already up-to-date. +Merging metag/for-next (fb2bb461e2d8 metag: Remove duplicate KERN_<LEVEL> prefix) +$ git merge metag/for-next +Auto-merging arch/metag/mm/fault.c +Merge made by the 'recursive' strategy. + arch/metag/include/asm/metag_mem.h | 2 +- + arch/metag/include/asm/metag_regs.h | 2 +- + arch/metag/kernel/cachepart.c | 2 +- + arch/metag/lib/divsi3.S | 4 ++-- + arch/metag/mm/fault.c | 2 +- + 5 files changed, 6 insertions(+), 6 deletions(-) +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 (737a004afb2c Merge branch '4.7-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 10 ++ + arch/mips/Kconfig | 24 ++--- + arch/mips/cavium-octeon/octeon-irq.c | 14 +-- + arch/mips/cavium-octeon/octeon-platform.c | 114 +++++++++++--------- + arch/mips/cavium-octeon/setup.c | 20 +++- + arch/mips/configs/ath25_defconfig | 119 +++++++++++++++++++++ + arch/mips/configs/cavium_octeon_defconfig | 2 + + arch/mips/include/asm/elf.h | 1 + + arch/mips/include/asm/mach-cavium-octeon/irq.h | 2 - + .../include/asm/mach-cavium-octeon/mangle-port.h | 42 +++----- + arch/mips/include/asm/msa.h | 2 + + arch/mips/include/uapi/asm/auxvec.h | 2 + + arch/mips/kernel/cevt-r4k.c | 7 +- + arch/mips/kernel/csrc-r4k.c | 4 +- + arch/mips/kernel/scall64-n32.S | 2 +- + arch/mips/kernel/scall64-o32.S | 2 +- + arch/mips/kernel/segment.c | 13 ++- + arch/mips/kernel/smp-cps.c | 41 +++++-- + arch/mips/kernel/traps.c | 4 +- + arch/mips/lantiq/irq.c | 27 ++--- + arch/mips/loongson64/loongson-3/hpet.c | 14 +-- + arch/mips/mm/c-r4k.c | 12 +-- + arch/mips/mm/sc-rm7k.c | 2 +- + arch/mips/mm/tlbex.c | 2 +- + arch/mips/mm/uasm.c | 6 +- + arch/mips/net/bpf_jit.c | 2 +- + arch/mips/pistachio/init.c | 25 ----- + drivers/ssb/driver_gpio.c | 22 ++-- + 28 files changed, 333 insertions(+), 204 deletions(-) + create mode 100644 arch/mips/configs/ath25_defconfig +Merging nios2/for-next (9fa78f63a892 nios2: Add order-only DTC dependency to %.dtb target) +$ git merge nios2/for-next +Already up-to-date. +Merging parisc-hd/for-next (5975b2c0c10a Merge branch 'parisc-4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (fbef66f0adcd powerpc/mm: Parenthesise IS_ENABLED() in if condition) +$ git merge powerpc/next +Auto-merging include/linux/of.h +Auto-merging drivers/scsi/cxlflash/main.h +Auto-merging drivers/crypto/vmx/vmx.c +Auto-merging arch/powerpc/mm/hugetlbpage.c +Auto-merging arch/powerpc/kernel/idle_book3s.S +Auto-merging arch/powerpc/include/asm/ppc_asm.h +Auto-merging arch/powerpc/include/asm/ppc-opcode.h +Auto-merging arch/powerpc/configs/ppc6xx_defconfig +Auto-merging arch/powerpc/configs/pmac32_defconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + .../bindings/powerpc/opal/oppanel-opal.txt | 14 + + Documentation/devicetree/bindings/rtc/rtc-opal.txt | 2 +- + Documentation/kernel-parameters.txt | 9 + + MAINTAINERS | 7 + + arch/powerpc/Kconfig | 65 +- + arch/powerpc/Kconfig.debug | 4 +- + arch/powerpc/Makefile | 7 +- + arch/powerpc/boot/Makefile | 4 +- + arch/powerpc/boot/opal-calls.S | 58 ++ + arch/powerpc/boot/opal.c | 98 +++ + arch/powerpc/boot/ops.h | 1 + + arch/powerpc/boot/ppc_asm.h | 4 + + arch/powerpc/boot/serial.c | 2 + + arch/powerpc/boot/types.h | 10 + + arch/powerpc/configs/40x/acadia_defconfig | 1 - + arch/powerpc/configs/40x/ep405_defconfig | 1 - + arch/powerpc/configs/40x/kilauea_defconfig | 1 - + arch/powerpc/configs/40x/klondike_defconfig | 3 - + arch/powerpc/configs/40x/makalu_defconfig | 1 - + arch/powerpc/configs/40x/obs600_defconfig | 1 - + arch/powerpc/configs/40x/virtex_defconfig | 1 - + arch/powerpc/configs/40x/walnut_defconfig | 1 - + arch/powerpc/configs/44x/akebono_defconfig | 8 +- + arch/powerpc/configs/44x/arches_defconfig | 1 - + arch/powerpc/configs/44x/bamboo_defconfig | 1 - + arch/powerpc/configs/44x/bluestone_defconfig | 2 +- + arch/powerpc/configs/44x/canyonlands_defconfig | 1 - + arch/powerpc/configs/44x/currituck_defconfig | 8 +- + arch/powerpc/configs/44x/ebony_defconfig | 1 - + arch/powerpc/configs/44x/eiger_defconfig | 2 - + arch/powerpc/configs/44x/icon_defconfig | 4 +- + arch/powerpc/configs/44x/iss476-smp_defconfig | 8 +- + arch/powerpc/configs/44x/katmai_defconfig | 1 - + arch/powerpc/configs/44x/rainier_defconfig | 1 - + arch/powerpc/configs/44x/redwood_defconfig | 2 - + arch/powerpc/configs/44x/sam440ep_defconfig | 6 +- + arch/powerpc/configs/44x/sequoia_defconfig | 1 - + arch/powerpc/configs/44x/taishan_defconfig | 1 - + arch/powerpc/configs/44x/virtex5_defconfig | 1 - + arch/powerpc/configs/44x/warp_defconfig | 5 +- + arch/powerpc/configs/52xx/cm5200_defconfig | 4 +- + arch/powerpc/configs/52xx/lite5200b_defconfig | 4 +- + arch/powerpc/configs/52xx/motionpro_defconfig | 4 +- + arch/powerpc/configs/52xx/pcm030_defconfig | 4 +- + arch/powerpc/configs/52xx/tqm5200_defconfig | 4 +- + arch/powerpc/configs/83xx/asp8347_defconfig | 4 +- + arch/powerpc/configs/83xx/kmeter1_defconfig | 1 - + arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | 4 +- + arch/powerpc/configs/83xx/mpc8315_rdb_defconfig | 4 +- + arch/powerpc/configs/83xx/mpc832x_mds_defconfig | 4 +- + arch/powerpc/configs/83xx/mpc832x_rdb_defconfig | 4 +- + arch/powerpc/configs/83xx/mpc834x_itx_defconfig | 4 +- + arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig | 4 +- + arch/powerpc/configs/83xx/mpc834x_mds_defconfig | 4 +- + arch/powerpc/configs/83xx/mpc836x_mds_defconfig | 4 +- + arch/powerpc/configs/83xx/mpc836x_rdk_defconfig | 4 +- + arch/powerpc/configs/83xx/mpc837x_mds_defconfig | 4 +- + arch/powerpc/configs/83xx/mpc837x_rdb_defconfig | 4 +- + arch/powerpc/configs/83xx/sbc834x_defconfig | 5 +- + arch/powerpc/configs/85xx/ge_imp3a_defconfig | 4 +- + arch/powerpc/configs/85xx/kmp204x_defconfig | 3 +- + arch/powerpc/configs/85xx/ksi8560_defconfig | 4 +- + arch/powerpc/configs/85xx/mpc8540_ads_defconfig | 4 +- + arch/powerpc/configs/85xx/mpc8560_ads_defconfig | 4 +- + arch/powerpc/configs/85xx/mpc85xx_cds_defconfig | 4 +- + arch/powerpc/configs/85xx/sbc8548_defconfig | 1 - + arch/powerpc/configs/85xx/socrates_defconfig | 4 +- + arch/powerpc/configs/85xx/stx_gp3_defconfig | 4 +- + arch/powerpc/configs/85xx/tqm8540_defconfig | 4 +- + arch/powerpc/configs/85xx/tqm8541_defconfig | 4 +- + arch/powerpc/configs/85xx/tqm8548_defconfig | 1 - + arch/powerpc/configs/85xx/tqm8555_defconfig | 4 +- + arch/powerpc/configs/85xx/tqm8560_defconfig | 4 +- + arch/powerpc/configs/85xx/xes_mpc85xx_defconfig | 4 +- + arch/powerpc/configs/adder875_defconfig | 1 - + arch/powerpc/configs/amigaone_defconfig | 2 - + arch/powerpc/configs/c2k_defconfig | 8 +- + arch/powerpc/configs/cell_defconfig | 2 +- + arch/powerpc/configs/chrp32_defconfig | 1 - + arch/powerpc/configs/ep8248e_defconfig | 5 +- + arch/powerpc/configs/ep88xc_defconfig | 1 - + arch/powerpc/configs/fsl-emb-nonhw.config | 4 +- + arch/powerpc/configs/g5_defconfig | 7 +- + arch/powerpc/configs/gamecube_defconfig | 5 +- + arch/powerpc/configs/holly_defconfig | 3 +- + arch/powerpc/configs/linkstation_defconfig | 4 +- + arch/powerpc/configs/maple_defconfig | 5 +- + arch/powerpc/configs/mgcoge_defconfig | 1 - + arch/powerpc/configs/mpc512x_defconfig | 8 +- + arch/powerpc/configs/mpc5200_defconfig | 4 +- + arch/powerpc/configs/mpc7448_hpc2_defconfig | 4 +- + arch/powerpc/configs/mpc8272_ads_defconfig | 4 +- + arch/powerpc/configs/mpc83xx_defconfig | 4 +- + arch/powerpc/configs/mpc866_ads_defconfig | 4 +- + arch/powerpc/configs/mpc885_ads_defconfig | 1 - + arch/powerpc/configs/mvme5100_defconfig | 4 +- + arch/powerpc/configs/pasemi_defconfig | 3 +- + arch/powerpc/configs/pmac32_defconfig | 5 +- + arch/powerpc/configs/powernv_defconfig | 8 +- + arch/powerpc/configs/ppc40x_defconfig | 4 +- + arch/powerpc/configs/ppc44x_defconfig | 4 +- + arch/powerpc/configs/ppc64_defconfig | 6 +- + arch/powerpc/configs/ppc64e_defconfig | 6 +- + arch/powerpc/configs/ppc6xx_defconfig | 9 +- + arch/powerpc/configs/pq2fads_defconfig | 4 +- + arch/powerpc/configs/ps3_defconfig | 1 - + arch/powerpc/configs/pseries_defconfig | 7 +- + arch/powerpc/configs/storcenter_defconfig | 4 +- + arch/powerpc/configs/tqm8xx_defconfig | 1 - + arch/powerpc/configs/wii_defconfig | 5 +- + arch/powerpc/include/asm/asm-compat.h | 2 + + arch/powerpc/include/asm/asm-prototypes.h | 75 ++ + arch/powerpc/include/asm/book3s/64/mmu-hash.h | 50 +- + arch/powerpc/include/asm/book3s/64/mmu.h | 5 + + arch/powerpc/include/asm/book3s/64/pgtable-4k.h | 6 +- + arch/powerpc/include/asm/book3s/64/pgtable-64k.h | 6 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 99 ++- + .../powerpc/include/asm/book3s/64/tlbflush-radix.h | 4 +- + arch/powerpc/include/asm/code-patching.h | 10 +- + arch/powerpc/include/asm/cpufeature.h | 40 + + arch/powerpc/include/asm/cpuidle.h | 2 + + arch/powerpc/include/asm/eeh.h | 4 +- + arch/powerpc/include/asm/exception-64s.h | 2 + + arch/powerpc/include/asm/feature-fixups.h | 4 + + arch/powerpc/include/asm/firmware.h | 6 + + arch/powerpc/include/asm/ftrace.h | 8 +- + arch/powerpc/include/asm/hvcall.h | 11 - + arch/powerpc/include/asm/hw_irq.h | 2 + + arch/powerpc/include/asm/iommu.h | 1 - + arch/powerpc/include/asm/kprobes.h | 8 +- + arch/powerpc/include/asm/kvm_book3s_asm.h | 2 +- + arch/powerpc/include/asm/linkage.h | 6 +- + arch/powerpc/include/asm/machdep.h | 44 +- + arch/powerpc/include/asm/mmu.h | 9 +- + arch/powerpc/include/asm/mpc52xx.h | 2 +- + arch/powerpc/include/asm/nohash/32/pte-44x.h | 2 +- + arch/powerpc/include/asm/nohash/64/pgtable-64k.h | 1 + + arch/powerpc/include/asm/opal-api.h | 46 +- + arch/powerpc/include/asm/opal.h | 34 +- + arch/powerpc/include/asm/page.h | 6 +- + arch/powerpc/include/asm/pci-bridge.h | 2 + + arch/powerpc/include/asm/pgtable-be-types.h | 15 + + arch/powerpc/include/asm/pmac_feature.h | 2 +- + arch/powerpc/include/asm/pnv-pci.h | 47 + + arch/powerpc/include/asm/ppc-opcode.h | 47 +- + arch/powerpc/include/asm/ppc-pci.h | 2 - + arch/powerpc/include/asm/ppc4xx.h | 2 +- + arch/powerpc/include/asm/ppc_asm.h | 4 +- + arch/powerpc/include/asm/processor.h | 7 +- + arch/powerpc/include/asm/ps3.h | 2 + + arch/powerpc/include/asm/ps3av.h | 2 +- + arch/powerpc/include/asm/pte-common.h | 2 +- + arch/powerpc/include/asm/ptrace.h | 2 +- + arch/powerpc/include/asm/reg.h | 87 +- + arch/powerpc/include/asm/rtas.h | 7 +- + arch/powerpc/include/asm/sections.h | 4 +- + arch/powerpc/include/asm/setup.h | 12 + + arch/powerpc/include/asm/smp.h | 9 +- + arch/powerpc/include/asm/smu.h | 9 +- + arch/powerpc/include/asm/spinlock.h | 38 +- + arch/powerpc/include/asm/string.h | 4 - + arch/powerpc/include/asm/synch.h | 1 - + arch/powerpc/include/asm/tce.h | 3 - + arch/powerpc/include/asm/time.h | 6 +- + arch/powerpc/include/asm/tsi108.h | 2 +- + arch/powerpc/include/asm/types.h | 8 + + arch/powerpc/include/asm/xics.h | 6 + + arch/powerpc/kernel/Makefile | 5 +- + arch/powerpc/kernel/align.c | 18 +- + arch/powerpc/kernel/asm-offsets.c | 49 -- + arch/powerpc/kernel/cpu_setup_6xx.S | 2 +- + arch/powerpc/kernel/cpu_setup_power.S | 20 +- + arch/powerpc/kernel/cputable.c | 4 +- + arch/powerpc/kernel/crash.c | 15 +- + arch/powerpc/kernel/eeh_cache.c | 8 +- + arch/powerpc/kernel/eeh_dev.c | 17 +- + arch/powerpc/kernel/eeh_driver.c | 2 +- + arch/powerpc/kernel/entry_64.S | 2 +- + arch/powerpc/kernel/exceptions-64e.S | 2 +- + arch/powerpc/kernel/exceptions-64s.S | 66 +- + arch/powerpc/kernel/fadump.c | 3 +- + arch/powerpc/kernel/ftrace.c | 39 +- + arch/powerpc/kernel/head_64.S | 7 +- + .../kernel/{idle_power7.S => idle_book3s.S} | 371 +++++--- + arch/powerpc/kernel/irq.c | 17 +- + arch/powerpc/kernel/kprobes.c | 17 +- + arch/powerpc/kernel/machine_kexec_64.c | 10 +- + arch/powerpc/kernel/misc_32.S | 14 - + arch/powerpc/kernel/misc_64.S | 4 +- + arch/powerpc/kernel/module_64.c | 9 +- + arch/powerpc/kernel/pci-common.c | 82 +- + arch/powerpc/kernel/pci_64.c | 2 +- + arch/powerpc/kernel/pci_dn.c | 34 +- + arch/powerpc/kernel/process.c | 48 +- + arch/powerpc/kernel/prom.c | 25 + + arch/powerpc/kernel/rtas-proc.c | 2 +- + arch/powerpc/kernel/rtas.c | 8 +- + arch/powerpc/kernel/rtasd.c | 28 +- + arch/powerpc/kernel/setup-common.c | 189 +++- + arch/powerpc/kernel/setup.h | 58 ++ + arch/powerpc/kernel/setup_32.c | 113 +-- + arch/powerpc/kernel/setup_64.c | 287 ++----- + arch/powerpc/kernel/signal_64.c | 11 +- + arch/powerpc/kernel/smp.c | 3 + + arch/powerpc/kernel/sysfs.c | 2 +- + arch/powerpc/kernel/time.c | 67 +- + arch/powerpc/kernel/tm.S | 3 +- + arch/powerpc/kernel/traps.c | 13 +- + arch/powerpc/kernel/vector.S | 9 +- + arch/powerpc/kernel/vmlinux.lds.S | 2 +- + arch/powerpc/kvm/book3s_64_mmu_host.c | 18 +- + arch/powerpc/kvm/book3s_64_vio.c | 3 +- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 4 +- + arch/powerpc/kvm/book3s_interrupts.S | 2 +- + arch/powerpc/kvm/book3s_pr.c | 6 +- + arch/powerpc/kvm/book3s_rmhandlers.S | 2 +- + arch/powerpc/lib/checksum_64.S | 12 +- + arch/powerpc/lib/feature-fixups.c | 32 +- + arch/powerpc/lib/locks.c | 16 - + arch/powerpc/lib/ppc_ksyms.c | 4 - + arch/powerpc/lib/rheap.c | 2 +- + arch/powerpc/lib/string.S | 44 +- + arch/powerpc/lib/vmx-helper.c | 1 + + arch/powerpc/mm/hash64_4k.c | 18 +- + arch/powerpc/mm/hash64_64k.c | 39 +- + arch/powerpc/mm/hash_native_64.c | 36 +- + arch/powerpc/mm/hash_utils_64.c | 153 ++-- + arch/powerpc/mm/hugepage-hash64.c | 17 +- + arch/powerpc/mm/hugetlbpage-hash64.c | 4 +- + arch/powerpc/mm/hugetlbpage.c | 7 + + arch/powerpc/mm/init_32.c | 5 +- + arch/powerpc/mm/mem.c | 18 +- + arch/powerpc/mm/mmu_context_book3s64.c | 5 +- + arch/powerpc/mm/numa.c | 36 +- + arch/powerpc/mm/pgtable-radix.c | 17 +- + arch/powerpc/mm/tlb-radix.c | 65 +- + arch/powerpc/net/Makefile | 4 + + arch/powerpc/net/bpf_jit.h | 235 ++--- + arch/powerpc/net/bpf_jit32.h | 139 +++ + arch/powerpc/net/bpf_jit64.h | 102 +++ + arch/powerpc/net/bpf_jit_asm.S | 2 +- + arch/powerpc/net/bpf_jit_asm64.S | 180 ++++ + arch/powerpc/net/bpf_jit_comp.c | 10 +- + arch/powerpc/net/bpf_jit_comp64.c | 954 +++++++++++++++++++++ + arch/powerpc/oprofile/cell/spu_task_sync.c | 2 +- + arch/powerpc/perf/Makefile | 2 +- + arch/powerpc/perf/core-book3s.c | 2 +- + arch/powerpc/perf/hv-24x7.c | 2 +- + arch/powerpc/perf/hv-24x7.h | 2 +- + arch/powerpc/perf/isa207-common.c | 263 ++++++ + arch/powerpc/perf/isa207-common.h | 236 +++++ + arch/powerpc/perf/power8-pmu.c | 477 +---------- + arch/powerpc/perf/power9-events-list.h | 55 ++ + arch/powerpc/perf/power9-pmu.c | 330 +++++++ + arch/powerpc/platforms/40x/ep405.c | 4 +- + arch/powerpc/platforms/40x/ppc40x_simple.c | 2 +- + arch/powerpc/platforms/40x/virtex.c | 4 +- + arch/powerpc/platforms/40x/walnut.c | 4 +- + arch/powerpc/platforms/44x/canyonlands.c | 5 +- + arch/powerpc/platforms/44x/ebony.c | 4 +- + arch/powerpc/platforms/44x/iss4xx.c | 4 +- + arch/powerpc/platforms/44x/ppc44x_simple.c | 3 +- + arch/powerpc/platforms/44x/ppc476.c | 10 +- + arch/powerpc/platforms/44x/sam440ep.c | 4 +- + arch/powerpc/platforms/44x/virtex.c | 4 +- + arch/powerpc/platforms/44x/warp.c | 4 +- + arch/powerpc/platforms/512x/clock-commonclk.c | 2 +- + arch/powerpc/platforms/512x/mpc5121_ads.c | 8 +- + arch/powerpc/platforms/512x/mpc512x.h | 2 +- + arch/powerpc/platforms/512x/mpc512x_generic.c | 8 +- + arch/powerpc/platforms/512x/mpc512x_shared.c | 2 +- + arch/powerpc/platforms/512x/pdm360ng.c | 8 +- + arch/powerpc/platforms/52xx/efika.c | 3 +- + arch/powerpc/platforms/52xx/lite5200.c | 2 +- + arch/powerpc/platforms/52xx/media5200.c | 2 +- + arch/powerpc/platforms/52xx/mpc5200_simple.c | 2 +- + arch/powerpc/platforms/52xx/mpc52xx_common.c | 3 +- + arch/powerpc/platforms/82xx/ep8248e.c | 3 +- + arch/powerpc/platforms/82xx/km82xx.c | 3 +- + arch/powerpc/platforms/82xx/mpc8272_ads.c | 3 +- + arch/powerpc/platforms/82xx/pq2.c | 2 +- + arch/powerpc/platforms/82xx/pq2.h | 2 +- + arch/powerpc/platforms/82xx/pq2fads.c | 3 +- + arch/powerpc/platforms/83xx/asp834x.c | 3 +- + arch/powerpc/platforms/83xx/km83xx.c | 3 +- + arch/powerpc/platforms/83xx/misc.c | 2 +- + arch/powerpc/platforms/83xx/mpc830x_rdb.c | 2 +- + arch/powerpc/platforms/83xx/mpc831x_rdb.c | 2 +- + arch/powerpc/platforms/83xx/mpc832x_mds.c | 4 +- + arch/powerpc/platforms/83xx/mpc832x_rdb.c | 4 +- + arch/powerpc/platforms/83xx/mpc834x_itx.c | 4 +- + arch/powerpc/platforms/83xx/mpc834x_mds.c | 4 +- + arch/powerpc/platforms/83xx/mpc836x_mds.c | 4 +- + arch/powerpc/platforms/83xx/mpc836x_rdk.c | 4 +- + arch/powerpc/platforms/83xx/mpc837x_mds.c | 4 +- + arch/powerpc/platforms/83xx/mpc837x_rdb.c | 2 +- + arch/powerpc/platforms/83xx/mpc83xx.h | 2 +- + arch/powerpc/platforms/83xx/sbc834x.c | 4 +- + arch/powerpc/platforms/85xx/bsc913x_qds.c | 4 +- + arch/powerpc/platforms/85xx/bsc913x_rdb.c | 4 +- + arch/powerpc/platforms/85xx/c293pcie.c | 4 +- + arch/powerpc/platforms/85xx/corenet_generic.c | 5 +- + arch/powerpc/platforms/85xx/ge_imp3a.c | 7 +- + arch/powerpc/platforms/85xx/ksi8560.c | 6 +- + arch/powerpc/platforms/85xx/mpc8536_ds.c | 4 +- + arch/powerpc/platforms/85xx/mpc85xx_ads.c | 4 +- + arch/powerpc/platforms/85xx/mpc85xx_cds.c | 6 +- + arch/powerpc/platforms/85xx/mpc85xx_ds.c | 16 +- + arch/powerpc/platforms/85xx/mpc85xx_mds.c | 12 +- + arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 43 +- + arch/powerpc/platforms/85xx/mvme2500.c | 4 +- + arch/powerpc/platforms/85xx/p1010rdb.c | 6 +- + arch/powerpc/platforms/85xx/p1022_ds.c | 4 +- + arch/powerpc/platforms/85xx/p1022_rdk.c | 4 +- + arch/powerpc/platforms/85xx/p1023_rdb.c | 4 +- + arch/powerpc/platforms/85xx/ppa8548.c | 4 +- + arch/powerpc/platforms/85xx/qemu_e500.c | 4 +- + arch/powerpc/platforms/85xx/sbc8548.c | 4 +- + arch/powerpc/platforms/85xx/socrates.c | 4 +- + arch/powerpc/platforms/85xx/stx_gp3.c | 4 +- + arch/powerpc/platforms/85xx/tqm85xx.c | 2 +- + arch/powerpc/platforms/85xx/twr_p102x.c | 4 +- + arch/powerpc/platforms/85xx/xes_mpc85xx.c | 12 +- + arch/powerpc/platforms/86xx/gef_ppc9a.c | 4 +- + arch/powerpc/platforms/86xx/gef_sbc310.c | 4 +- + arch/powerpc/platforms/86xx/gef_sbc610.c | 4 +- + arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 4 +- + arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 6 +- + arch/powerpc/platforms/86xx/sbc8641d.c | 4 +- + arch/powerpc/platforms/8xx/adder875.c | 3 +- + arch/powerpc/platforms/8xx/ep88xc.c | 3 +- + arch/powerpc/platforms/8xx/m8xx_setup.c | 2 +- + arch/powerpc/platforms/8xx/mpc86xads_setup.c | 3 +- + arch/powerpc/platforms/8xx/mpc885ads_setup.c | 3 +- + arch/powerpc/platforms/8xx/mpc8xx.h | 2 +- + arch/powerpc/platforms/8xx/tqm8xx_setup.c | 4 +- + arch/powerpc/platforms/amigaone/setup.c | 6 +- + arch/powerpc/platforms/cell/iommu.c | 4 +- + arch/powerpc/platforms/cell/setup.c | 7 +- + arch/powerpc/platforms/cell/spider-pic.c | 2 +- + arch/powerpc/platforms/cell/spu_base.c | 4 +- + arch/powerpc/platforms/cell/spu_manage.c | 3 +- + arch/powerpc/platforms/cell/spufs/file.c | 2 +- + arch/powerpc/platforms/cell/spufs/run.c | 2 +- + arch/powerpc/platforms/cell/spufs/sched.c | 2 +- + arch/powerpc/platforms/chrp/setup.c | 7 +- + arch/powerpc/platforms/embedded6xx/c2k.c | 10 +- + arch/powerpc/platforms/embedded6xx/gamecube.c | 19 +- + arch/powerpc/platforms/embedded6xx/holly.c | 6 +- + arch/powerpc/platforms/embedded6xx/linkstation.c | 12 +- + arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 6 +- + arch/powerpc/platforms/embedded6xx/mvme5100.c | 6 +- + arch/powerpc/platforms/embedded6xx/storcenter.c | 6 +- + arch/powerpc/platforms/embedded6xx/wii.c | 19 +- + arch/powerpc/platforms/maple/pci.c | 34 +- + arch/powerpc/platforms/maple/setup.c | 37 +- + arch/powerpc/platforms/pasemi/iommu.c | 15 +- + arch/powerpc/platforms/pasemi/pasemi.h | 1 - + arch/powerpc/platforms/pasemi/pci.c | 3 - + arch/powerpc/platforms/pasemi/setup.c | 18 +- + arch/powerpc/platforms/powermac/low_i2c.c | 2 +- + arch/powerpc/platforms/powermac/pci.c | 38 +- + arch/powerpc/platforms/powermac/setup.c | 54 +- + arch/powerpc/platforms/powermac/smp.c | 3 +- + arch/powerpc/platforms/powernv/Makefile | 1 + + arch/powerpc/platforms/powernv/eeh-powernv.c | 49 +- + arch/powerpc/platforms/powernv/idle.c | 188 +++- + arch/powerpc/platforms/powernv/npu-dma.c | 8 +- + arch/powerpc/platforms/powernv/opal-async.c | 5 + + .../powerpc/platforms/powernv/opal-memory-errors.c | 2 +- + arch/powerpc/platforms/powernv/opal-sensor.c | 2 +- + arch/powerpc/platforms/powernv/opal-sysparam.c | 4 +- + arch/powerpc/platforms/powernv/opal-tracepoints.c | 1 + + arch/powerpc/platforms/powernv/opal-wrappers.S | 72 +- + arch/powerpc/platforms/powernv/opal.c | 30 +- + arch/powerpc/platforms/powernv/pci-cxl.c | 385 +++++++++ + arch/powerpc/platforms/powernv/pci-ioda.c | 905 ++++++++++--------- + arch/powerpc/platforms/powernv/pci.c | 132 ++- + arch/powerpc/platforms/powernv/pci.h | 43 +- + arch/powerpc/platforms/powernv/powernv.h | 1 + + arch/powerpc/platforms/powernv/setup.c | 16 +- + arch/powerpc/platforms/powernv/smp.c | 4 +- + arch/powerpc/platforms/ps3/htab.c | 12 +- + arch/powerpc/platforms/ps3/repository.c | 2 +- + arch/powerpc/platforms/ps3/setup.c | 23 +- + arch/powerpc/platforms/pseries/cmm.c | 2 +- + arch/powerpc/platforms/pseries/dlpar.c | 56 +- + arch/powerpc/platforms/pseries/eeh_pseries.c | 2 +- + arch/powerpc/platforms/pseries/event_sources.c | 53 +- + arch/powerpc/platforms/pseries/firmware.c | 48 +- + arch/powerpc/platforms/pseries/hotplug-cpu.c | 13 - + arch/powerpc/platforms/pseries/hotplug-memory.c | 184 ++-- + arch/powerpc/platforms/pseries/io_event_irq.c | 2 +- + arch/powerpc/platforms/pseries/iommu.c | 53 +- + arch/powerpc/platforms/pseries/kexec.c | 23 +- + arch/powerpc/platforms/pseries/lpar.c | 41 +- + arch/powerpc/platforms/pseries/nvram.c | 2 - + arch/powerpc/platforms/pseries/power.c | 2 + + arch/powerpc/platforms/pseries/pseries.h | 21 +- + arch/powerpc/platforms/pseries/pseries_energy.c | 8 +- + arch/powerpc/platforms/pseries/ras.c | 39 + + arch/powerpc/platforms/pseries/setup.c | 241 ++---- + arch/powerpc/platforms/pseries/smp.c | 31 +- + arch/powerpc/sysdev/dart_iommu.c | 184 ++-- + arch/powerpc/sysdev/fsl_soc.c | 8 +- + arch/powerpc/sysdev/fsl_soc.h | 6 +- + arch/powerpc/sysdev/xics/Makefile | 2 +- + arch/powerpc/sysdev/xics/icp-opal.c | 144 ++++ + arch/powerpc/sysdev/xics/xics-common.c | 5 +- + arch/powerpc/xmon/xmon.c | 93 +- + drivers/char/Kconfig | 14 + + drivers/char/Makefile | 1 + + drivers/char/powernv-op-panel.c | 223 +++++ + drivers/cpuidle/cpuidle-powernv.c | 101 ++- + drivers/crypto/vmx/Kconfig | 2 +- + drivers/crypto/vmx/vmx.c | 6 +- + drivers/i2c/busses/i2c-opal.c | 2 +- + drivers/leds/leds-powernv.c | 2 +- + drivers/macintosh/smu.c | 9 +- + drivers/misc/cxl/Kconfig | 17 +- + drivers/misc/cxl/Makefile | 2 +- + drivers/misc/cxl/api.c | 168 +++- + drivers/misc/cxl/base.c | 104 ++- + drivers/misc/cxl/context.c | 6 +- + drivers/misc/cxl/cxl.h | 87 +- + drivers/misc/cxl/debugfs.c | 35 +- + drivers/misc/cxl/file.c | 64 +- + drivers/misc/cxl/flash.c | 4 +- + drivers/misc/cxl/guest.c | 26 +- + drivers/misc/cxl/irq.c | 32 +- + drivers/misc/cxl/main.c | 5 + + drivers/misc/cxl/native.c | 207 ++++- + drivers/misc/cxl/pci.c | 484 ++++++++++- + drivers/misc/cxl/phb.c | 44 + + drivers/misc/cxl/vphb.c | 78 +- + drivers/mtd/devices/powernv_flash.c | 2 +- + drivers/of/base.c | 22 + + drivers/pci/hotplug/Kconfig | 13 + + drivers/pci/hotplug/Makefile | 3 + + drivers/pci/hotplug/pnv_php.c | 711 +++++++++++++++ + drivers/pci/hotplug/rpaphp_slot.c | 17 +- + drivers/pci/setup-bus.c | 5 + + drivers/rtc/rtc-opal.c | 4 +- + drivers/scsi/cxlflash/main.h | 4 - + drivers/tty/hvc/hvc_console.h | 1 + + drivers/tty/hvc/hvc_irq.c | 9 +- + drivers/tty/hvc/hvc_opal.c | 11 +- + include/linux/of.h | 2 + + include/linux/pci.h | 1 + + include/misc/cxl-base.h | 14 + + include/misc/cxl.h | 114 +++ + include/uapi/misc/cxl.h | 17 + + tools/testing/selftests/powerpc/Makefile | 3 +- + .../testing/selftests/powerpc/alignment/.gitignore | 5 + + tools/testing/selftests/powerpc/alignment/Makefile | 10 + + .../powerpc/alignment/copy_first_unaligned.c | 41 + + .../alignment/copy_paste_unaligned_common.c | 53 ++ + .../alignment/copy_paste_unaligned_common.h | 26 + + .../selftests/powerpc/alignment/copy_unaligned.c | 41 + + .../powerpc/alignment/paste_last_unaligned.c | 43 + + .../selftests/powerpc/alignment/paste_unaligned.c | 43 + + .../selftests/powerpc/benchmarks/.gitignore | 2 + + .../testing/selftests/powerpc/benchmarks/Makefile | 3 +- + .../selftests/powerpc/benchmarks/context_switch.c | 17 +- + .../selftests/powerpc/benchmarks/futex_bench.c | 42 + + .../selftests/powerpc/benchmarks/mmap_bench.c | 41 + + tools/testing/selftests/powerpc/instructions.h | 68 ++ + tools/testing/selftests/powerpc/mm/.gitignore | 1 + + tools/testing/selftests/powerpc/mm/Makefile | 4 +- + tools/testing/selftests/powerpc/mm/prot_sao.c | 42 + + tools/testing/selftests/powerpc/pmu/ebb/.gitignore | 2 + + tools/testing/selftests/powerpc/pmu/ebb/Makefile | 2 +- + tools/testing/selftests/powerpc/pmu/ebb/ebb_lmr.c | 143 +++ + tools/testing/selftests/powerpc/pmu/ebb/ebb_lmr.h | 39 + + .../selftests/powerpc/pmu/ebb/ebb_lmr_regs.c | 37 + + .../powerpc/pmu/ebb/instruction_count_test.c | 2 +- + tools/testing/selftests/powerpc/pmu/lib.c | 6 +- + tools/testing/selftests/powerpc/reg.h | 5 + + tools/testing/selftests/powerpc/tm/.gitignore | 1 + + tools/testing/selftests/powerpc/tm/Makefile | 7 +- + tools/testing/selftests/powerpc/tm/tm-exec.c | 70 ++ + tools/testing/selftests/powerpc/tm/tm-syscall.c | 15 - + tools/testing/selftests/powerpc/tm/tm.h | 23 +- + tools/testing/selftests/powerpc/utils.h | 5 + + 484 files changed, 10202 insertions(+), 3872 deletions(-) + create mode 100644 Documentation/devicetree/bindings/powerpc/opal/oppanel-opal.txt + create mode 100644 arch/powerpc/boot/opal-calls.S + create mode 100644 arch/powerpc/boot/opal.c + create mode 100644 arch/powerpc/include/asm/asm-prototypes.h + create mode 100644 arch/powerpc/include/asm/cpufeature.h + rename arch/powerpc/kernel/{idle_power7.S => idle_book3s.S} (61%) + create mode 100644 arch/powerpc/kernel/setup.h + create mode 100644 arch/powerpc/net/bpf_jit32.h + create mode 100644 arch/powerpc/net/bpf_jit64.h + create mode 100644 arch/powerpc/net/bpf_jit_asm64.S + create mode 100644 arch/powerpc/net/bpf_jit_comp64.c + create mode 100644 arch/powerpc/perf/isa207-common.c + create mode 100644 arch/powerpc/perf/isa207-common.h + create mode 100644 arch/powerpc/perf/power9-events-list.h + create mode 100644 arch/powerpc/perf/power9-pmu.c + create mode 100644 arch/powerpc/platforms/powernv/pci-cxl.c + create mode 100644 arch/powerpc/sysdev/xics/icp-opal.c + create mode 100644 drivers/char/powernv-op-panel.c + create mode 100644 drivers/misc/cxl/phb.c + create mode 100644 drivers/pci/hotplug/pnv_php.c + create mode 100644 tools/testing/selftests/powerpc/alignment/.gitignore + create mode 100644 tools/testing/selftests/powerpc/alignment/Makefile + create mode 100644 tools/testing/selftests/powerpc/alignment/copy_first_unaligned.c + create mode 100644 tools/testing/selftests/powerpc/alignment/copy_paste_unaligned_common.c + create mode 100644 tools/testing/selftests/powerpc/alignment/copy_paste_unaligned_common.h + create mode 100644 tools/testing/selftests/powerpc/alignment/copy_unaligned.c + create mode 100644 tools/testing/selftests/powerpc/alignment/paste_last_unaligned.c + create mode 100644 tools/testing/selftests/powerpc/alignment/paste_unaligned.c + create mode 100644 tools/testing/selftests/powerpc/benchmarks/futex_bench.c + create mode 100644 tools/testing/selftests/powerpc/benchmarks/mmap_bench.c + create mode 100644 tools/testing/selftests/powerpc/instructions.h + create mode 100644 tools/testing/selftests/powerpc/mm/prot_sao.c + create mode 100644 tools/testing/selftests/powerpc/pmu/ebb/ebb_lmr.c + create mode 100644 tools/testing/selftests/powerpc/pmu/ebb/ebb_lmr.h + create mode 100644 tools/testing/selftests/powerpc/pmu/ebb/ebb_lmr_regs.c + create mode 100644 tools/testing/selftests/powerpc/tm/tm-exec.c +Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-mpe/next +Already up-to-date. +Merging fsl/next (9f595fd8b548 powerpc/8xx: Force VIRT_IMMR_BASE to be a positive number) +$ git merge fsl/next +Resolved 'arch/powerpc/Kconfig' using previous resolution. +Auto-merging arch/powerpc/xmon/xmon.c +Auto-merging arch/powerpc/platforms/86xx/Kconfig +Auto-merging arch/powerpc/include/asm/reg.h +Auto-merging arch/powerpc/include/asm/ppc_asm.h +Auto-merging arch/powerpc/include/asm/exception-64s.h +Auto-merging arch/powerpc/configs/pq2fads_defconfig +Auto-merging arch/powerpc/Kconfig.debug +Auto-merging arch/powerpc/Kconfig +CONFLICT (content): Merge conflict in arch/powerpc/Kconfig +Auto-merging Documentation/devicetree/bindings/soc/fsl/cpm_qe/qe.txt +Removing Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/network.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2f0425b3a252] Merge remote-tracking branch 'fsl/next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/powerpc/fsl/cpm_qe/network.txt | 43 ------ + .../bindings/{powerpc => soc}/fsl/cpm_qe/cpm.txt | 0 + .../{powerpc => soc}/fsl/cpm_qe/cpm/brg.txt | 0 + .../{powerpc => soc}/fsl/cpm_qe/cpm/i2c.txt | 0 + .../{powerpc => soc}/fsl/cpm_qe/cpm/pic.txt | 0 + .../{powerpc => soc}/fsl/cpm_qe/cpm/usb.txt | 0 + .../bindings/{powerpc => soc}/fsl/cpm_qe/gpio.txt | 0 + .../devicetree/bindings/soc/fsl/cpm_qe/network.txt | 124 ++++++++++++++++ + .../bindings/{powerpc => soc}/fsl/cpm_qe/qe.txt | 52 +++++++ + .../{powerpc => soc}/fsl/cpm_qe/qe/firmware.txt | 0 + .../{powerpc => soc}/fsl/cpm_qe/qe/par_io.txt | 0 + .../{powerpc => soc}/fsl/cpm_qe/qe/pincfg.txt | 0 + .../{powerpc => soc}/fsl/cpm_qe/qe/ucc.txt | 0 + .../{powerpc => soc}/fsl/cpm_qe/qe/usb.txt | 0 + .../{powerpc => soc}/fsl/cpm_qe/serial.txt | 0 + .../bindings/soc/fsl/cpm_qe/uqe_serial.txt | 17 +++ + arch/powerpc/Kconfig | 6 + + arch/powerpc/Kconfig.debug | 1 - + arch/powerpc/boot/Makefile | 4 + + arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi | 1 + + arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi | 1 + + arch/powerpc/boot/dts/fsl/kmcoge4.dts | 37 +++++ + arch/powerpc/boot/dts/fsl/mvme7100.dts | 153 ++++++++++++++++++++ + arch/powerpc/boot/dts/fsl/qonverge-usb2-dr-0.dtsi | 2 +- + arch/powerpc/boot/dts/fsl/t1040si-post.dtsi | 49 ++++++- + arch/powerpc/boot/dts/fsl/t104xd4rdb.dtsi | 38 +++++ + arch/powerpc/boot/dts/fsl/t104xqds.dtsi | 38 +++++ + arch/powerpc/boot/dts/fsl/t104xrdb.dtsi | 38 +++++ + arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi | 2 + + arch/powerpc/boot/motload-head.S | 11 ++ + arch/powerpc/boot/mvme7100.c | 59 ++++++++ + arch/powerpc/boot/ppcboot.h | 2 +- + arch/powerpc/boot/wrapper | 5 + + arch/powerpc/configs/86xx-hw.config | 4 +- + arch/powerpc/configs/mpc86xx_basic_defconfig | 1 + + arch/powerpc/configs/pq2fads_defconfig | 1 - + arch/powerpc/include/asm/accounting.h | 24 ++++ + arch/powerpc/include/asm/cputime.h | 14 +- + arch/powerpc/include/asm/exception-64s.h | 2 +- + arch/powerpc/include/asm/fixmap.h | 7 + + arch/powerpc/include/asm/mmu-8xx.h | 3 + + arch/powerpc/include/asm/paca.h | 9 +- + arch/powerpc/include/asm/ppc_asm.h | 24 ++-- + arch/powerpc/include/asm/reg.h | 1 + + arch/powerpc/include/asm/thread_info.h | 4 + + arch/powerpc/kernel/asm-offsets.c | 31 +++- + arch/powerpc/kernel/entry_32.S | 17 +++ + arch/powerpc/kernel/entry_64.S | 6 +- + arch/powerpc/kernel/exceptions-64e.S | 4 +- + arch/powerpc/kernel/head_8xx.S | 159 +++++++++++---------- + arch/powerpc/kernel/time.c | 81 +++++++---- + arch/powerpc/mm/8xx_mmu.c | 131 +++++++++++------ + arch/powerpc/mm/mmu_decl.h | 3 +- + arch/powerpc/platforms/86xx/Kconfig | 8 +- + arch/powerpc/platforms/86xx/Makefile | 1 + + arch/powerpc/platforms/86xx/mvme7100.c | 121 ++++++++++++++++ + arch/powerpc/platforms/Kconfig.cputype | 1 - + arch/powerpc/sysdev/cpm_common.c | 22 ++- + arch/powerpc/sysdev/fsl_85xx_l2ctlr.c | 8 +- + arch/powerpc/xmon/xmon.c | 14 +- + 60 files changed, 1133 insertions(+), 251 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/network.txt + rename Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/cpm.txt (100%) + rename Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/cpm/brg.txt (100%) + rename Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/cpm/i2c.txt (100%) + rename Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/cpm/pic.txt (100%) + rename Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/cpm/usb.txt (100%) + rename Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/gpio.txt (100%) + create mode 100644 Documentation/devicetree/bindings/soc/fsl/cpm_qe/network.txt + rename Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/qe.txt (75%) + rename Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/qe/firmware.txt (100%) + rename Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/qe/par_io.txt (100%) + rename Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/qe/pincfg.txt (100%) + rename Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/qe/ucc.txt (100%) + rename Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/qe/usb.txt (100%) + rename Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/serial.txt (100%) + create mode 100644 Documentation/devicetree/bindings/soc/fsl/cpm_qe/uqe_serial.txt + create mode 100644 arch/powerpc/boot/dts/fsl/mvme7100.dts + create mode 100644 arch/powerpc/boot/motload-head.S + create mode 100644 arch/powerpc/boot/mvme7100.c + create mode 100644 arch/powerpc/include/asm/accounting.h + create mode 100644 arch/powerpc/platforms/86xx/mvme7100.c +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 (370fc4a8d9f8 s390/zcrypt: Fix zcrypt suspend/resume behavior) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/include/asm/pgtable.h | 20 ++++++------- + arch/s390/mm/hugetlbpage.c | 52 ++++++++++++++++++++++++--------- + drivers/s390/cio/chp.c | 58 +++++++++++++++++++++++-------------- + drivers/s390/crypto/ap_bus.c | 46 +++++++++++++++++++++++++++-- + drivers/s390/crypto/ap_bus.h | 1 + + drivers/s390/crypto/zcrypt_cex2a.c | 2 +- + drivers/s390/crypto/zcrypt_cex4.c | 2 +- + drivers/s390/crypto/zcrypt_pcixcc.c | 2 +- + 8 files changed, 132 insertions(+), 51 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 (0748d718ba7e sh: Delete unnecessary checks before the function call "mempool_destroy") +$ git merge sh/for-next +Resolved 'arch/sh/include/asm/spinlock.h' using previous resolution. +Auto-merging arch/sh/include/asm/spinlock.h +CONFLICT (content): Merge conflict in arch/sh/include/asm/spinlock.h +Auto-merging arch/sh/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f31fe63ebdaf] Merge remote-tracking branch 'sh/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/sh/Kconfig | 34 +++++ + arch/sh/Makefile | 3 + + arch/sh/boards/board-secureedge5410.c | 3 +- + arch/sh/boards/of-generic.c | 15 ++- + arch/sh/boot/dts/Makefile | 3 + + arch/sh/drivers/heartbeat.c | 32 +---- + arch/sh/include/asm/atomic.h | 8 ++ + arch/sh/include/asm/barrier.h | 5 + + arch/sh/include/asm/bitops-cas.h | 93 +++++++++++++ + arch/sh/include/asm/bitops.h | 2 + + arch/sh/include/asm/cmpxchg-cas.h | 24 ++++ + arch/sh/include/asm/cmpxchg-xchg.h | 2 +- + arch/sh/include/asm/cmpxchg.h | 2 + + arch/sh/include/asm/futex-cas.h | 34 +++++ + arch/sh/include/asm/futex-irq.h | 86 ------------- + arch/sh/include/asm/futex-llsc.h | 41 ++++++ + arch/sh/include/asm/futex.h | 97 ++++++++------ + arch/sh/include/asm/processor.h | 2 +- + arch/sh/include/asm/spinlock-cas.h | 111 ++++++++++++++++ + arch/sh/include/asm/spinlock-llsc.h | 218 +++++++++++++++++++++++++++++++ + arch/sh/include/asm/spinlock.h | 222 +------------------------------- + arch/sh/include/uapi/asm/cpu-features.h | 1 + + arch/sh/include/uapi/asm/sigcontext.h | 3 - + arch/sh/kernel/cpu/init.c | 6 +- + arch/sh/kernel/cpu/proc.c | 1 + + arch/sh/kernel/cpu/sh2/Makefile | 4 + + arch/sh/kernel/cpu/sh2/entry.S | 55 ++++++++ + arch/sh/kernel/cpu/sh2/probe.c | 36 +++++- + arch/sh/kernel/cpu/sh2/smp-j2.c | 138 ++++++++++++++++++++ + arch/sh/kernel/dwarf.c | 6 +- + arch/sh/kernel/head_32.S | 6 +- + arch/sh/kernel/setup.c | 6 +- + arch/sh/kernel/time.c | 3 +- + arch/sh/mm/Makefile | 3 +- + arch/sh/mm/asids-debugfs.c | 5 +- + arch/sh/mm/cache-j2.c | 58 +++++++++ + arch/sh/mm/cache.c | 13 +- + 37 files changed, 984 insertions(+), 397 deletions(-) + create mode 100644 arch/sh/boot/dts/Makefile + create mode 100644 arch/sh/include/asm/bitops-cas.h + create mode 100644 arch/sh/include/asm/cmpxchg-cas.h + create mode 100644 arch/sh/include/asm/futex-cas.h + create mode 100644 arch/sh/include/asm/futex-llsc.h + create mode 100644 arch/sh/include/asm/spinlock-cas.h + create mode 100644 arch/sh/include/asm/spinlock-llsc.h + create mode 100644 arch/sh/kernel/cpu/sh2/smp-j2.c + create mode 100644 arch/sh/mm/cache-j2.c +$ git am -3 ../patches/0001-locking-spinlock-arch-merge-fix-for-sh-add-J2-atomic.patch +Applying: locking/spinlock, arch: merge fix for "sh: add J2 atomics using the cas.l instruction" +$ git reset HEAD^ +Unstaged changes after reset: +M arch/sh/include/asm/spinlock-cas.h +M arch/sh/include/asm/spinlock-llsc.h +$ git add -A . +$ git commit -v -a --amend +[master 1b2b15ceb882] Merge remote-tracking branch 'sh/for-next' + Date: Fri Jul 29 10:26:09 2016 +1000 +Merging tile/master (74050a3188c8 tile-srom: avoid krealloc(... __GFP_ZERO) pattern) +$ git merge tile/master +Merge made by the 'recursive' strategy. + drivers/char/tile-srom.c | 28 +++++++++++++++------------- + 1 file changed, 15 insertions(+), 13 deletions(-) +Merging uml/linux-next (a78ff1112263 um: add extended processor state save/restore support) +$ git merge uml/linux-next +Already up-to-date. +Merging unicore32/unicore32 (c83d8b2fc986 unicore32: mm: Add missing parameter to arch_vma_access_permitted) +$ git merge unicore32/unicore32 +Merge made by the 'recursive' strategy. + arch/unicore32/include/asm/mmu_context.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant) +$ git merge xtensa/for_next +Already up-to-date. +Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults) +$ git merge btrfs/next +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/extent-tree.c +Auto-merging fs/btrfs/ctree.h +Merge made by the 'recursive' strategy. + fs/btrfs/ctree.h | 15 +- + fs/btrfs/delayed-inode.c | 68 ++-- + fs/btrfs/extent-tree.c | 731 +++++++++++++++++++++++++++---------------- + fs/btrfs/file.c | 16 +- + fs/btrfs/inode.c | 7 +- + fs/btrfs/relocation.c | 45 +-- + include/trace/events/btrfs.h | 139 +++++++- + 7 files changed, 677 insertions(+), 344 deletions(-) +Merging btrfs-kdave/for-next (d84c090ad3e9 Fixup: fs_info/root cleanups and qgroups patches) +$ git merge btrfs-kdave/for-next +Resolved 'fs/btrfs/compression.c' using previous resolution. +Resolved 'fs/btrfs/extent_io.c' using previous resolution. +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/scrub.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/extent_io.c +CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c +Auto-merging fs/btrfs/extent-tree.c +Auto-merging fs/btrfs/disk-io.h +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/ctree.h +Auto-merging fs/btrfs/compression.c +CONFLICT (content): Merge conflict in fs/btrfs/compression.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3a621e905070] Merge remote-tracking branch 'btrfs-kdave/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/acl.c | 3 +- + fs/btrfs/async-thread.c | 31 ++- + fs/btrfs/async-thread.h | 6 +- + fs/btrfs/backref.c | 366 ++++++++++++++++++++++++++++++++- + fs/btrfs/compression.c | 10 +- + fs/btrfs/ctree.c | 91 +++++--- + fs/btrfs/ctree.h | 101 +++++---- + fs/btrfs/dedupe.h | 24 +++ + fs/btrfs/delayed-inode.c | 4 +- + fs/btrfs/delayed-ref.c | 17 +- + fs/btrfs/dev-replace.c | 4 +- + fs/btrfs/disk-io.c | 181 +++++++++++----- + fs/btrfs/disk-io.h | 5 +- + fs/btrfs/extent-tree.c | 137 +++++++----- + fs/btrfs/extent_io.c | 48 ++++- + fs/btrfs/extent_map.c | 2 +- + fs/btrfs/file-item.c | 9 +- + fs/btrfs/file.c | 20 +- + fs/btrfs/free-space-cache.c | 8 +- + fs/btrfs/free-space-tree.c | 16 +- + fs/btrfs/inode-map.c | 16 +- + fs/btrfs/inode.c | 264 ++++++++++++++---------- + fs/btrfs/ioctl.c | 40 ++-- + fs/btrfs/ordered-data.c | 2 +- + fs/btrfs/props.c | 6 +- + fs/btrfs/qgroup.c | 25 +-- + fs/btrfs/qgroup.h | 9 +- + fs/btrfs/relocation.c | 115 ++++++++++- + fs/btrfs/root-tree.c | 10 +- + fs/btrfs/scrub.c | 12 +- + fs/btrfs/send.c | 125 ++++++++++- + fs/btrfs/super.c | 218 +++++++++----------- + fs/btrfs/sysfs.c | 2 + + fs/btrfs/tests/btrfs-tests.c | 67 +++++- + fs/btrfs/tests/btrfs-tests.h | 36 +--- + fs/btrfs/tests/extent-buffer-tests.c | 23 ++- + fs/btrfs/tests/free-space-tests.c | 14 +- + fs/btrfs/tests/free-space-tree-tests.c | 18 +- + fs/btrfs/tests/inode-tests.c | 46 +++-- + fs/btrfs/tests/qgroup-tests.c | 23 ++- + fs/btrfs/transaction.c | 37 ++-- + fs/btrfs/transaction.h | 1 + + fs/btrfs/tree-log.c | 107 ++++++++-- + fs/btrfs/volumes.c | 138 ++++++++----- + include/trace/events/btrfs.h | 295 ++++++++++++++------------ + include/uapi/linux/btrfs.h | 2 +- + 46 files changed, 1871 insertions(+), 863 deletions(-) + create mode 100644 fs/btrfs/dedupe.h +Merging ceph/master (a0f2b6527541 ceph: fix symbol versioning for ceph_monc_do_statfs) +$ git merge ceph/master +Auto-merging fs/ceph/mds_client.c +Auto-merging fs/ceph/inode.c +Auto-merging drivers/block/rbd.c +Merge made by the 'recursive' strategy. + drivers/block/rbd.c | 15 +- + fs/ceph/addr.c | 77 +++- + fs/ceph/cache.c | 2 +- + fs/ceph/caps.c | 873 ++++++++++++++++++++------------------ + fs/ceph/dir.c | 73 ++-- + fs/ceph/file.c | 77 +++- + fs/ceph/inode.c | 40 +- + fs/ceph/ioctl.c | 30 +- + fs/ceph/mds_client.c | 358 ++++++++-------- + fs/ceph/mds_client.h | 19 +- + fs/ceph/snap.c | 10 +- + fs/ceph/super.c | 43 +- + fs/ceph/super.h | 48 +-- + fs/ceph/xattr.c | 101 +++-- + include/linux/ceph/ceph_fs.h | 55 ++- + include/linux/ceph/decode.h | 55 +++ + include/linux/ceph/libceph.h | 4 +- + include/linux/ceph/mon_client.h | 7 +- + include/linux/ceph/msgpool.h | 1 - + include/linux/ceph/osd_client.h | 1 + + include/linux/ceph/osdmap.h | 15 +- + include/linux/ceph/string_table.h | 62 +++ + net/ceph/Makefile | 2 +- + net/ceph/ceph_common.c | 2 + + net/ceph/ceph_fs.c | 30 +- + net/ceph/debugfs.c | 12 +- + net/ceph/mon_client.c | 4 +- + net/ceph/msgpool.c | 1 + + net/ceph/osd_client.c | 49 ++- + net/ceph/osdmap.c | 58 ++- + net/ceph/string_table.c | 111 +++++ + 31 files changed, 1412 insertions(+), 823 deletions(-) + create mode 100644 include/linux/ceph/string_table.h + create mode 100644 net/ceph/string_table.c +Merging cifs/for-next (7893242e2465 CIFS: Fix a possible invalid memory access in smb2_query_symlink()) +$ git merge cifs/for-next +Auto-merging fs/cifs/dir.c +Merge made by the 'recursive' strategy. + fs/cifs/cifs_fs_sb.h | 4 ++++ + fs/cifs/cifsencrypt.c | 16 ++++++++++------ + fs/cifs/cifsfs.c | 14 +++++++++++++- + fs/cifs/connect.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++- + fs/cifs/dir.c | 44 +++++++++++++++++++++++++++++++++++++----- + fs/cifs/inode.c | 22 +++++++++++++++++++-- + fs/cifs/smb2ops.c | 32 ++++++++++++++++++++++++++++++- + 7 files changed, 169 insertions(+), 16 deletions(-) +Merging configfs/for-next (3dc3afadeb04 configfs: don't set buffer_needs_fill to zero if show() returns error) +$ git merge configfs/for-next +Merge made by the 'recursive' strategy. + fs/configfs/file.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging ecryptfs/next (2bdcdbea80bd ecryptfs: don't allow mmap when the lower fs doesn't support it) +$ git merge ecryptfs/next +Merge made by the 'recursive' strategy. +Merging ext3/for_next (e008bb6134a6 quota: use time64_t internally) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (7bc949164511 ext4: verify extent header depth) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (194dc870a589 Add braces to avoid "ambiguous ‘else’" compiler warnings) +$ git merge f2fs/dev +Already up-to-date. +Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information) +$ git merge freevxfs/for-next +Merge made by the 'recursive' strategy. + fs/freevxfs/Kconfig | 13 ++- + fs/freevxfs/vxfs.h | 185 +++++++++++++++++--------------- + fs/freevxfs/vxfs_bmap.c | 70 +++++++----- + fs/freevxfs/vxfs_dir.h | 17 +-- + fs/freevxfs/vxfs_extern.h | 10 +- + fs/freevxfs/vxfs_fshead.c | 37 +++---- + fs/freevxfs/vxfs_fshead.h | 29 ++--- + fs/freevxfs/vxfs_inode.c | 265 +++++++++++++++++++++------------------------- + fs/freevxfs/vxfs_inode.h | 146 +++++++++++++------------ + fs/freevxfs/vxfs_lookup.c | 226 +++++++++++++++++++-------------------- + fs/freevxfs/vxfs_olt.c | 15 ++- + fs/freevxfs/vxfs_olt.h | 70 ++++++------ + fs/freevxfs/vxfs_super.c | 162 +++++++++++++++++++--------- + 13 files changed, 661 insertions(+), 584 deletions(-) +Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed) +$ git merge fscache/fscache +Merge made by the 'recursive' strategy. +Merging fuse/for-next (d26034dfc1cc fuse: fix wrong assignment of ->flags in fuse_send_init()) +$ git merge fuse/for-next +Auto-merging mm/filemap.c +Auto-merging include/linux/fs.h +Auto-merging fs/fuse/dev.c +Auto-merging fs/f2fs/node.c +Auto-merging fs/btrfs/tree-log.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/ctree.h +Merge made by the 'recursive' strategy. + fs/btrfs/ctree.h | 1 - + fs/btrfs/inode.c | 15 --------------- + fs/btrfs/tree-log.c | 4 ++-- + fs/f2fs/node.c | 7 ++----- + fs/fuse/dev.c | 30 +++--------------------------- + fs/fuse/file.c | 35 +++++++++++++++++++++++------------ + fs/fuse/fuse_i.h | 1 + + fs/fuse/inode.c | 2 +- + include/linux/fs.h | 1 + + include/linux/wait.h | 13 +++++++++++++ + mm/filemap.c | 3 ++- + 11 files changed, 48 insertions(+), 64 deletions(-) +$ git am -3 ../patches/0001-btrfs-merge-fix-for-mm-export-filemap_check_errors-t.patch +Applying: btrfs: merge fix for "mm: export filemap_check_errors() to modules" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/btrfs/file.c +$ git add -A . +$ git commit -v -a --amend +[master 017fa9624c83] Merge remote-tracking branch 'fuse/for-next' + Date: Fri Jul 29 10:37:43 2016 +1000 +Merging gfs2/for-next (e1cb6be9e142 GFS2: Fix gfs2_replay_incr_blk for multiple journal sizes) +$ git merge gfs2/for-next +Already up-to-date. +Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats) +$ git merge jfs/jfs-next +Already up-to-date. +Merging nfs/linux-next (698c937b0d17 NFSv4: Clean up lookup of SECINFO_NO_NAME) +$ git merge nfs/linux-next +Removing net/sunrpc/xprtrdma/physical_ops.c +Auto-merging fs/nfs/direct.c +Auto-merging fs/nfs/dir.c +Auto-merging fs/nfs/client.c +Merge made by the 'recursive' strategy. + fs/nfs/Makefile | 2 +- + fs/nfs/blocklayout/dev.c | 110 +++++++--- + fs/nfs/blocklayout/extent_tree.c | 27 ++- + fs/nfs/callback_proc.c | 64 ++++-- + fs/nfs/callback_xdr.c | 6 +- + fs/nfs/client.c | 22 +- + fs/nfs/dir.c | 52 +++-- + fs/nfs/direct.c | 93 +++----- + fs/nfs/file.c | 100 +++------ + fs/nfs/filelayout/filelayout.c | 18 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 23 +- + fs/nfs/inode.c | 138 ++++++------ + fs/nfs/internal.h | 62 +++++- + fs/nfs/io.c | 147 +++++++++++++ + fs/nfs/nfs3client.c | 14 +- + fs/nfs/nfs42proc.c | 24 ++- + fs/nfs/nfs42xdr.c | 12 +- + fs/nfs/nfs4_fs.h | 1 + + fs/nfs/nfs4client.c | 26 ++- + fs/nfs/nfs4file.c | 16 +- + fs/nfs/nfs4proc.c | 153 ++++++------- + fs/nfs/nfs4xdr.c | 11 +- + fs/nfs/nfstrace.h | 1 - + fs/nfs/pnfs.c | 191 ++++++++++------- + fs/nfs/pnfs.h | 34 ++- + fs/nfs/pnfs_nfs.c | 13 +- + fs/nfs/super.c | 14 +- + fs/nfs/write.c | 44 ++-- + include/linux/nfs_fs.h | 3 +- + include/linux/nfs_xdr.h | 5 +- + include/linux/sunrpc/auth.h | 9 +- + include/linux/sunrpc/gss_api.h | 2 + + include/linux/sunrpc/sched.h | 5 + + include/linux/sunrpc/xprtsock.h | 1 + + net/sunrpc/auth.c | 8 +- + net/sunrpc/auth_generic.c | 9 +- + net/sunrpc/auth_gss/auth_gss.c | 3 + + net/sunrpc/auth_gss/gss_krb5_mech.c | 2 + + net/sunrpc/auth_gss/gss_mech_switch.c | 12 ++ + net/sunrpc/auth_null.c | 1 + + net/sunrpc/auth_unix.c | 1 + + net/sunrpc/clnt.c | 2 +- + net/sunrpc/sched.c | 67 ++++-- + net/sunrpc/svc.c | 8 +- + net/sunrpc/xprt.c | 14 +- + net/sunrpc/xprtmultipath.c | 8 +- + net/sunrpc/xprtrdma/Makefile | 2 +- + net/sunrpc/xprtrdma/fmr_ops.c | 378 +++++++++++++++------------------ + net/sunrpc/xprtrdma/frwr_ops.c | 369 ++++++++++++-------------------- + net/sunrpc/xprtrdma/physical_ops.c | 122 ----------- + net/sunrpc/xprtrdma/rpc_rdma.c | 274 ++++++++++++------------ + net/sunrpc/xprtrdma/transport.c | 40 ++-- + net/sunrpc/xprtrdma/verbs.c | 242 ++++++++++++++------- + net/sunrpc/xprtrdma/xprt_rdma.h | 118 ++++------ + net/sunrpc/xprtsock.c | 125 ++++++----- + 55 files changed, 1747 insertions(+), 1501 deletions(-) + create mode 100644 fs/nfs/io.c + delete mode 100644 net/sunrpc/xprtrdma/physical_ops.c +Merging nfsd/nfsd-next (4b954bf8b629 nfsd: check that S_IFDIR implies d_can_lookup) +$ git merge nfsd/nfsd-next +Auto-merging net/sunrpc/svc.c +Auto-merging include/linux/nfs_xdr.h +Auto-merging fs/nfsd/blocklayoutxdr.c +Auto-merging fs/nfsd/blocklayout.c +Auto-merging fs/Kconfig +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 6 ++ + fs/Kconfig | 6 ++ + fs/nfsd/Kconfig | 19 +++++ + fs/nfsd/Makefile | 1 + + fs/nfsd/blocklayout.c | 2 + + fs/nfsd/blocklayoutxdr.c | 4 +- + fs/nfsd/export.c | 14 +++- + fs/nfsd/export.h | 2 +- + fs/nfsd/flexfilelayout.c | 133 +++++++++++++++++++++++++++++ + fs/nfsd/flexfilelayoutxdr.c | 115 +++++++++++++++++++++++++ + fs/nfsd/flexfilelayoutxdr.h | 49 +++++++++++ + fs/nfsd/nfs3proc.c | 1 - + fs/nfsd/nfs4layouts.c | 16 +++- + fs/nfsd/nfs4proc.c | 48 +++++++++-- + fs/nfsd/nfs4state.c | 75 ++++++++++------- + fs/nfsd/nfs4xdr.c | 82 ++++++++---------- + fs/nfsd/nfsd.h | 5 ++ + fs/nfsd/nfsfh.c | 18 ++-- + fs/nfsd/nfsproc.c | 8 +- + fs/nfsd/nfsxdr.c | 2 +- + fs/nfsd/pnfs.h | 4 + + fs/nfsd/state.h | 1 + + fs/nfsd/vfs.c | 131 +++++++++++++---------------- + fs/nfsd/vfs.h | 3 + + fs/nfsd/xdr4.h | 5 ++ + fs/xfs/Makefile | 3 +- + fs/xfs/xfs_export.c | 2 +- + fs/xfs/xfs_pnfs.h | 4 +- + include/linux/nfs4.h | 11 +++ + include/linux/nfs_xdr.h | 11 --- + include/linux/sunrpc/cache.h | 2 - + include/linux/sunrpc/svc.h | 17 +--- + include/linux/sunrpc/svc_xprt.h | 3 +- + include/trace/events/sunrpc.h | 118 ++++++++++++++++++++++---- + net/sunrpc/auth_gss/svcauth_gss.c | 5 +- + net/sunrpc/cache.c | 2 +- + net/sunrpc/svc.c | 6 -- + net/sunrpc/svc_xprt.c | 88 +++++++++---------- + net/sunrpc/svcsock.c | 163 +++++++++--------------------------- + 39 files changed, 783 insertions(+), 402 deletions(-) + create mode 100644 fs/nfsd/flexfilelayout.c + create mode 100644 fs/nfsd/flexfilelayoutxdr.c + create mode 100644 fs/nfsd/flexfilelayoutxdr.h +Merging orangefs/for-next (78fee0b6846f orangefs: fix namespace handling) +$ git merge orangefs/for-next +Already up-to-date. +Merging overlayfs/overlayfs-next (e9c5d5a5b272 Revert "ovl: get_write_access() in truncate") +$ git merge overlayfs/overlayfs-next +Auto-merging include/linux/fsnotify.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/dcache.h +Auto-merging fs/inode.c +Merge made by the 'recursive' strategy. + fs/inode.c | 38 +++++-- + fs/locks.c | 53 ++++++---- + fs/namespace.c | 2 +- + fs/open.c | 17 ++- + fs/overlayfs/copy_up.c | 1 + + fs/overlayfs/dir.c | 226 ++++++++++++++++++++++----------------- + fs/overlayfs/inode.c | 267 +++++++++++++++++++++++++---------------------- + fs/overlayfs/overlayfs.h | 30 ++++-- + fs/overlayfs/super.c | 183 ++++++++++++++++++++++++++------ + include/linux/dcache.h | 5 +- + include/linux/fs.h | 16 ++- + include/linux/fsnotify.h | 14 ++- + include/uapi/linux/fs.h | 1 + + 13 files changed, 554 insertions(+), 299 deletions(-) +Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (4ac1c17b2044 UBIFS: Implement ->migratepage()) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (f2bdfda9a1c6 Merge branch 'xfs-4.8-misc-fixes-4' into for-next) +$ git merge xfs/for-next +Already up-to-date. +Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew)) +$ git merge file-locks/linux-next +Already up-to-date. +Merging vfs/for-next (38a8a5e62f9a Merge branch 'work.const-qstr' into for-next) +$ git merge vfs/for-next +Resolved 'fs/f2fs/dir.c' using previous resolution. +Resolved 'fs/f2fs/f2fs.h' using previous resolution. +Auto-merging include/linux/nfs_xdr.h +Auto-merging include/linux/dcache.h +Auto-merging fs/proc/proc_sysctl.c +Auto-merging fs/nfs/nfs4proc.c +Auto-merging fs/nfs/nfs4_fs.h +Auto-merging fs/logfs/dir.c +Auto-merging fs/hfsplus/hfsplus_fs.h +Auto-merging fs/fuse/inode.c +Auto-merging fs/fuse/fuse_i.h +Auto-merging fs/fuse/dir.c +Auto-merging fs/fat/namei_vfat.c +Auto-merging fs/f2fs/f2fs.h +CONFLICT (content): Merge conflict in fs/f2fs/f2fs.h +Auto-merging fs/f2fs/dir.c +CONFLICT (content): Merge conflict in fs/f2fs/dir.c +Auto-merging fs/ext2/ext2.h +Auto-merging fs/dcache.c +Auto-merging fs/autofs4/waitq.c +Auto-merging fs/adfs/dir.c +Auto-merging drivers/staging/lustre/lustre/llite/statahead.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9b2ad883da81] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/staging/lustre/lustre/llite/statahead.c | 4 ++-- + fs/adfs/dir.c | 4 ++-- + fs/autofs4/root.c | 8 ++++---- + fs/autofs4/waitq.c | 4 ++-- + fs/dcache.c | 4 ++-- + fs/ext2/dir.c | 6 +++--- + fs/ext2/ext2.h | 4 ++-- + fs/f2fs/dir.c | 4 ++-- + fs/f2fs/f2fs.h | 4 ++-- + fs/fat/namei_vfat.c | 6 +++--- + fs/fuse/dir.c | 6 +++--- + fs/fuse/fuse_i.h | 4 ++-- + fs/fuse/inode.c | 8 ++------ + fs/hfs/catalog.c | 12 ++++++------ + fs/hfs/hfs_fs.h | 14 +++++++------- + fs/hfs/inode.c | 2 +- + fs/hfs/trans.c | 2 +- + fs/hfsplus/catalog.c | 12 ++++++------ + fs/hfsplus/hfsplus_fs.h | 10 +++++----- + fs/logfs/dir.c | 4 ++-- + fs/nfs/nfs3proc.c | 8 ++++---- + fs/nfs/nfs4_fs.h | 5 +++-- + fs/nfs/nfs4namespace.c | 4 ++-- + fs/nfs/nfs4proc.c | 16 ++++++++-------- + fs/nfs/proc.c | 8 ++++---- + fs/nfs/unlink.c | 2 +- + fs/ocfs2/dlm/dlmdomain.c | 4 +--- + fs/ocfs2/dlmfs/dlmfs.c | 4 ++-- + fs/ocfs2/dlmfs/userdlm.c | 2 +- + fs/ocfs2/dlmfs/userdlm.h | 2 +- + fs/proc/proc_sysctl.c | 2 +- + include/linux/dcache.h | 2 +- + include/linux/lsm_hooks.h | 2 +- + include/linux/nfs_xdr.h | 8 ++++---- + include/linux/security.h | 4 ++-- + security/security.c | 2 +- + security/selinux/hooks.c | 2 +- + 37 files changed, 97 insertions(+), 102 deletions(-) +$ git am -3 ../patches/0001-qstr-unconstify-fuse_reverse_inval_entry-parameter.patch +Applying: qstr: unconstify fuse_reverse_inval_entry parameter +$ git reset HEAD^ +Unstaged changes after reset: +M fs/fuse/dir.c +M fs/fuse/fuse_i.h +$ git add -A . +$ git commit -v -a --amend +[master 41aedcf195ea] Merge remote-tracking branch 'vfs/for-next' + Date: Fri Jul 29 10:58:18 2016 +1000 +Merging pci/next (bef6d4c88706 Merge branch 'pci/msi-affinity' into next) +$ git merge pci/next +Resolved 'drivers/pci/host/pci-tegra.c' using previous resolution. +Auto-merging include/linux/pci.h +Auto-merging include/linux/pci-ecam.h +Auto-merging drivers/scsi/lpfc/lpfc_init.c +Auto-merging drivers/pci/setup-bus.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/host/pci-tegra.c +CONFLICT (content): Merge conflict in drivers/pci/host/pci-tegra.c +Auto-merging drivers/nvme/host/pci.c +Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +Auto-merging drivers/net/ethernet/intel/igb/igb_main.c +Auto-merging drivers/net/ethernet/intel/i40e/i40e_main.c +Auto-merging drivers/net/ethernet/intel/fm10k/fm10k_pci.c +Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c +Auto-merging drivers/irqchip/Kconfig +Auto-merging drivers/acpi/Makefile +Auto-merging drivers/acpi/Kconfig +Auto-merging arch/x86/pci/vmd.c +Auto-merging arch/powerpc/kernel/pci-common.c +Auto-merging arch/arm64/boot/dts/marvell/armada-37xx.dtsi +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e946ad40f2db] Merge remote-tracking branch 'pci/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/PCI/MSI-HOWTO.txt | 469 ++------- + .../devicetree/bindings/pci/aardvark-pci.txt | 56 ++ + .../devicetree/bindings/pci/axis,artpec6-pcie.txt | 46 + + Documentation/kernel-parameters.txt | 9 + + MAINTAINERS | 17 + + arch/arm/Kconfig | 2 +- + arch/arm/include/asm/mach/pci.h | 1 + + arch/arm/kernel/bios32.c | 45 +- + arch/arm64/Kconfig | 6 +- + arch/arm64/boot/dts/marvell/armada-3720-db.dts | 5 + + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 25 + + arch/arm64/kernel/pci.c | 159 +++- + arch/microblaze/include/asm/pci.h | 3 - + arch/microblaze/pci/pci-common.c | 73 +- + arch/mips/include/asm/pci.h | 10 - + arch/mips/pci/pci.c | 19 +- + arch/powerpc/include/asm/pci.h | 3 - + arch/powerpc/kernel/pci-common.c | 79 +- + arch/sparc/include/asm/pci_64.h | 3 - + arch/sparc/kernel/pci.c | 20 +- + arch/unicore32/kernel/pci.c | 9 +- + arch/x86/pci/common.c | 2 +- + arch/x86/pci/vmd.c | 41 +- + drivers/acpi/Kconfig | 3 + + drivers/acpi/Makefile | 1 + + drivers/acpi/pci_mcfg.c | 92 ++ + drivers/acpi/pci_root.c | 35 + + drivers/irqchip/Kconfig | 18 +- + drivers/misc/genwqe/card_base.c | 18 +- + drivers/net/ethernet/atheros/alx/main.c | 12 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 6 +- + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 11 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 9 +- + drivers/net/ethernet/intel/igb/igb_main.c | 10 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 9 +- + drivers/nvme/host/pci.c | 15 +- + drivers/pci/Kconfig | 2 +- + drivers/pci/bus.c | 31 +- + drivers/pci/ecam.c | 6 +- + drivers/pci/host/Kconfig | 48 +- + drivers/pci/host/Makefile | 2 + + drivers/pci/host/pci-aardvark.c | 1001 ++++++++++++++++++++ + drivers/pci/host/pci-dra7xx.c | 4 +- + drivers/pci/host/pci-host-common.c | 44 +- + drivers/pci/host/pci-host-generic.c | 13 +- + drivers/pci/host/pci-hyperv.c | 30 +- + drivers/pci/host/pci-keystone.c | 10 +- + drivers/pci/host/pci-layerscape.c | 10 +- + drivers/pci/host/pci-mvebu.c | 28 +- + drivers/pci/host/pci-rcar-gen2.c | 27 +- + drivers/pci/host/pci-tegra.c | 47 +- + drivers/pci/host/pci-thunder-ecam.c | 11 +- + drivers/pci/host/pci-thunder-pem.c | 14 +- + drivers/pci/host/pci-versatile.c | 29 +- + drivers/pci/host/pci-xgene.c | 24 +- + drivers/pci/host/pcie-altera.c | 83 +- + drivers/pci/host/pcie-armada8k.c | 14 +- + drivers/pci/host/pcie-artpec6.c | 280 ++++++ + drivers/pci/host/pcie-designware-plat.c | 10 +- + drivers/pci/host/pcie-designware.c | 34 +- + drivers/pci/host/pcie-hisi.c | 13 +- + drivers/pci/host/pcie-iproc.c | 4 + + drivers/pci/host/pcie-rcar.c | 44 +- + drivers/pci/host/pcie-xilinx-nwl.c | 20 +- + drivers/pci/host/pcie-xilinx.c | 22 +- + drivers/pci/hotplug/acpiphp_glue.c | 4 + + drivers/pci/hotplug/pciehp_hpc.c | 4 + + drivers/pci/msi.c | 266 ++++-- + drivers/pci/pci-driver.c | 5 +- + drivers/pci/pci-sysfs.c | 5 + + drivers/pci/pci.c | 281 +++++- + drivers/pci/pci.h | 11 + + drivers/pci/pcie/Kconfig | 5 +- + drivers/pci/pcie/aspm.c | 2 +- + drivers/pci/pcie/pcie-dpc.c | 19 +- + drivers/pci/pcie/portdrv_core.c | 3 + + drivers/pci/pcie/portdrv_pci.c | 52 +- + drivers/pci/probe.c | 22 +- + drivers/pci/proc.c | 9 +- + drivers/pci/quirks.c | 16 +- + drivers/pci/remove.c | 2 + + drivers/pci/setup-bus.c | 68 ++ + drivers/scsi/lpfc/lpfc_init.c | 15 +- + drivers/usb/host/xhci-pci.c | 2 +- + include/linux/pci-acpi.h | 2 + + drivers/pci/ecam.h => include/linux/pci-ecam.h | 4 +- + include/linux/pci.h | 93 +- + 87 files changed, 2989 insertions(+), 1147 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pci/aardvark-pci.txt + create mode 100644 Documentation/devicetree/bindings/pci/axis,artpec6-pcie.txt + create mode 100644 drivers/acpi/pci_mcfg.c + create mode 100644 drivers/pci/host/pci-aardvark.c + create mode 100644 drivers/pci/host/pcie-artpec6.c + rename drivers/pci/ecam.h => include/linux/pci-ecam.h (95%) +Merging pstore/for-next/pstore (35da60941e44 pstore/ram: add Device Tree bindings) +$ git merge pstore/for-next/pstore +Already up-to-date. +Merging hid/for-next (de1bcd764ea0 Merge branch 'for-4.8/upstream' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. +Merging i2c/i2c/for-next (c35d490516e6 Merge branch 'i2c/for-4.8' into i2c/for-next) +$ git merge i2c/i2c/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge jdelvare-hwmon/master +Already up-to-date. +Merging dmi/master (0deb6b2c087a dmi-id: don't free dev structure after calling device_register) +$ git merge dmi/master +Merge made by the 'recursive' strategy. + drivers/firmware/dmi-id.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging hwmon-staging/hwmon-next (1d3dd4ce210f Documentation: dtb: xgene: Add hwmon dts binding documentation) +$ git merge hwmon-staging/hwmon-next +Already up-to-date. +Merging v4l-dvb/master (bcbadf9d8331 Merge branch 'topic/docs-next' into to_next) +$ git merge v4l-dvb/master +Merge made by the 'recursive' strategy. + drivers/media/v4l2-core/v4l2-ioctl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging pm/linux-next (e5467ddd7ea4 Merge branches 'acpi-ec' and 'acpi-button' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + arch/x86/power/hibernate_asm_64.S | 4 +--- + drivers/acpi/button.c | 4 ++++ + drivers/acpi/ec.c | 13 ++++++++++++- + drivers/pnp/pnpbios/core.c | 1 + + 4 files changed, 18 insertions(+), 4 deletions(-) +Merging idle/next (f55532a0c0b8 Linux 4.6-rc1) +$ git merge idle/next +Already up-to-date. +Merging thermal/next (2c5ce98e1e83 thermal: sysfs: add comments describing locking strategy) +$ git merge thermal/next +Merge made by the 'recursive' strategy. + drivers/thermal/Makefile | 3 +- + drivers/thermal/thermal_core.c | 1363 +++++++++---------------------------- + drivers/thermal/thermal_core.h | 26 + + drivers/thermal/thermal_helpers.c | 144 ++++ + drivers/thermal/thermal_sysfs.c | 851 +++++++++++++++++++++++ + include/linux/thermal.h | 4 +- + 6 files changed, 1334 insertions(+), 1057 deletions(-) + create mode 100644 drivers/thermal/thermal_helpers.c + create mode 100644 drivers/thermal/thermal_sysfs.c +Merging thermal-soc/next (9a1d2bd3e7fd Merge branch 'work-fixes' into work-next) +$ git merge thermal-soc/next +Resolved 'drivers/thermal/thermal_core.c' using previous resolution. +Resolved 'drivers/thermal/thermal_helpers.c' using previous resolution. +Resolved 'drivers/thermal/thermal_sysfs.c' using previous resolution. +Auto-merging include/linux/thermal.h +Auto-merging drivers/thermal/thermal_sysfs.c +CONFLICT (add/add): Merge conflict in drivers/thermal/thermal_sysfs.c +Auto-merging drivers/thermal/thermal_helpers.c +CONFLICT (add/add): Merge conflict in drivers/thermal/thermal_helpers.c +Auto-merging drivers/thermal/thermal_core.c +CONFLICT (content): Merge conflict in drivers/thermal/thermal_core.c +Auto-merging drivers/thermal/Makefile +Auto-merging drivers/acpi/thermal.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 29825dc95961] Merge remote-tracking branch 'thermal-soc/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/thermal/qcom-tsens.txt | 21 ++ + .../devicetree/bindings/thermal/thermal.txt | 10 +- + Documentation/thermal/sysfs-api.txt | 19 ++ + drivers/acpi/thermal.c | 1 - + drivers/platform/x86/acerhdf.c | 1 - + drivers/thermal/Kconfig | 5 + + drivers/thermal/Makefile | 1 + + drivers/thermal/gov_bang_bang.c | 2 +- + drivers/thermal/imx_thermal.c | 1 - + drivers/thermal/of-thermal.c | 47 ++-- + drivers/thermal/qcom/Kconfig | 11 + + drivers/thermal/qcom/Makefile | 2 + + drivers/thermal/qcom/tsens-8916.c | 113 ++++++++ + drivers/thermal/qcom/tsens-8960.c | 292 +++++++++++++++++++++ + drivers/thermal/qcom/tsens-8974.c | 244 +++++++++++++++++ + drivers/thermal/qcom/tsens-8996.c | 84 ++++++ + drivers/thermal/qcom/tsens-common.c | 141 ++++++++++ + drivers/thermal/qcom/tsens.c | 200 ++++++++++++++ + drivers/thermal/qcom/tsens.h | 94 +++++++ + drivers/thermal/rcar_thermal.c | 1 + + drivers/thermal/rockchip_thermal.c | 93 ++++++- + drivers/thermal/thermal_core.c | 54 ++++ + drivers/thermal/thermal_helpers.c | 30 +++ + drivers/thermal/thermal_sysfs.c | 4 + + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 30 +-- + include/linux/thermal.h | 24 +- + 26 files changed, 1456 insertions(+), 69 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/qcom-tsens.txt + create mode 100644 drivers/thermal/qcom/Kconfig + create mode 100644 drivers/thermal/qcom/Makefile + create mode 100644 drivers/thermal/qcom/tsens-8916.c + create mode 100644 drivers/thermal/qcom/tsens-8960.c + create mode 100644 drivers/thermal/qcom/tsens-8974.c + create mode 100644 drivers/thermal/qcom/tsens-8996.c + create mode 100644 drivers/thermal/qcom/tsens-common.c + create mode 100644 drivers/thermal/qcom/tsens.c + create mode 100644 drivers/thermal/qcom/tsens.h +Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (5c93f56f770e dlm: Use kmemdup instead of kmalloc and memcpy) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging slave-dma/next (61fa0c294347 Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Auto-merging drivers/dma/xilinx/xilinx_dma.c +Removing Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/dma/mv-xor-v2.txt | 24 + + .../devicetree/bindings/dma/xilinx/xilinx_dma.txt | 94 +- + .../devicetree/bindings/dma/xilinx/xilinx_vdma.txt | 107 -- + .../devicetree/bindings/dma/xilinx/zynqmp_dma.txt | 27 + + drivers/dma/Kconfig | 32 +- + drivers/dma/Makefile | 1 + + drivers/dma/amba-pl08x.c | 10 +- + drivers/dma/at_xdmac.c | 8 +- + drivers/dma/bcm2835-dma.c | 7 +- + drivers/dma/bestcomm/bestcomm.c | 2 - + drivers/dma/coh901318.c | 32 +- + drivers/dma/cppi41.c | 3 - + drivers/dma/dma-axi-dmac.c | 8 +- + drivers/dma/dma-jz4740.c | 14 + + drivers/dma/dmatest.c | 43 +- + drivers/dma/edma.c | 52 +- + drivers/dma/fsl-edma.c | 49 +- + drivers/dma/fsl_raid.c | 9 +- + drivers/dma/fsldma.c | 2 - + drivers/dma/imx-dma.c | 31 +- + drivers/dma/imx-sdma.c | 32 +- + drivers/dma/ioat/init.c | 4 +- + drivers/dma/k3dma.c | 19 +- + drivers/dma/mmp_pdma.c | 19 + + drivers/dma/mmp_tdma.c | 9 +- + drivers/dma/moxart-dma.c | 8 +- + drivers/dma/mpc512x_dma.c | 1 + + drivers/dma/mv_xor.c | 2 +- + drivers/dma/mv_xor_v2.c | 878 +++++++++++++++ + drivers/dma/nbpfaxi.c | 18 +- + drivers/dma/omap-dma.c | 100 +- + drivers/dma/pl330.c | 11 +- + drivers/dma/ppc4xx/adma.c | 2 - + drivers/dma/pxa_dma.c | 16 +- + drivers/dma/qcom/bam_dma.c | 109 +- + drivers/dma/qcom/hidma.c | 1 + + drivers/dma/qcom/hidma_ll.c | 1 + + drivers/dma/qcom/hidma_mgmt.c | 7 +- + drivers/dma/s3c24xx-dma.c | 29 +- + drivers/dma/sh/rcar-dmac.c | 41 +- + drivers/dma/sh/shdmac.c | 9 +- + drivers/dma/sh/sudmac.c | 9 +- + drivers/dma/sirf-dma.c | 12 +- + drivers/dma/ste_dma40.c | 6 +- + drivers/dma/ste_dma40_ll.c | 2 +- + drivers/dma/sun6i-dma.c | 2 +- + drivers/dma/tegra20-apb-dma.c | 49 +- + drivers/dma/ti-dma-crossbar.c | 2 +- + drivers/dma/timb_dma.c | 8 +- + drivers/dma/txx9dmac.c | 9 +- + drivers/dma/xilinx/Makefile | 3 +- + drivers/dma/xilinx/{xilinx_vdma.c => xilinx_dma.c} | 489 ++++++++- + drivers/dma/xilinx/zynqmp_dma.c | 1151 ++++++++++++++++++++ + 53 files changed, 3232 insertions(+), 381 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/mv-xor-v2.txt + delete mode 100644 Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt + create mode 100644 Documentation/devicetree/bindings/dma/xilinx/zynqmp_dma.txt + create mode 100644 drivers/dma/mv_xor_v2.c + rename drivers/dma/xilinx/{xilinx_vdma.c => xilinx_dma.c} (83%) + create mode 100644 drivers/dma/xilinx/zynqmp_dma.c +Merging net-next/master (6a492b0f23d2 Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) +$ git merge net-next/master +Already up-to-date. +Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error) +$ git merge ipsec-next/master +Already up-to-date. +Merging netfilter-next/master (4b512e1c1f8d netfilter: nft_compat: fix crash when related match/target module is removed) +$ 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 (cb6a11518850 wlcore: spi: fix build warning caused by redundant variable) +$ git merge wireless-drivers-next/master +Already up-to-date. +Merging bluetooth/master (4f6781836206 mac802154: use rate limited warnings for malformed frames) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + include/net/bluetooth/hci_core.h | 2 ++ + net/6lowpan/ndisc.c | 2 -- + net/bluetooth/af_bluetooth.c | 5 +++++ + net/bluetooth/leds.c | 27 +++++++++++++++++++++++++++ + net/bluetooth/leds.h | 10 ++++++++++ + net/mac802154/iface.c | 1 + + net/mac802154/rx.c | 9 +++++++-- + 7 files changed, 52 insertions(+), 4 deletions(-) +Merging mac80211-next/master (7d27a0ba7adc cfg80211: Add mesh peer AID setting API) +$ git merge mac80211-next/master +Already up-to-date. +Merging rdma/for-next (fb92d8fb1b9c Merge branches 'cxgb4-4.8', 'mlx5-4.8' and 'fw-version' into k.o/for-4.8) +$ git merge rdma/for-next +Auto-merging include/linux/mlx5/qp.h +Auto-merging include/linux/mlx5/driver.h +Auto-merging drivers/infiniband/hw/mlx5/qp.c +Auto-merging drivers/infiniband/hw/mlx5/main.c +Auto-merging drivers/infiniband/hw/mlx4/main.c +Auto-merging drivers/infiniband/hw/i40iw/i40iw_verbs.c +Auto-merging drivers/infiniband/core/verbs.c +Auto-merging drivers/infiniband/core/uverbs_cmd.c +Auto-merging drivers/infiniband/core/sysfs.c +Merge made by the 'recursive' strategy. + drivers/infiniband/core/device.c | 9 + + drivers/infiniband/core/sysfs.c | 15 +- + drivers/infiniband/core/uverbs.h | 13 + + drivers/infiniband/core/uverbs_cmd.c | 535 +++++++++++++++- + drivers/infiniband/core/uverbs_main.c | 38 ++ + drivers/infiniband/core/verbs.c | 163 ++++- + drivers/infiniband/hw/cxgb3/iwch_provider.c | 27 +- + drivers/infiniband/hw/cxgb4/cm.c | 181 ++++-- + drivers/infiniband/hw/cxgb4/cq.c | 42 +- + drivers/infiniband/hw/cxgb4/device.c | 2 +- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 22 + + drivers/infiniband/hw/cxgb4/mem.c | 111 ++-- + drivers/infiniband/hw/cxgb4/provider.c | 31 +- + drivers/infiniband/hw/cxgb4/qp.c | 10 +- + drivers/infiniband/hw/hfi1/hfi.h | 2 + + drivers/infiniband/hw/hfi1/verbs.c | 15 + + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 24 +- + drivers/infiniband/hw/mlx4/main.c | 24 +- + drivers/infiniband/hw/mlx5/cq.c | 87 ++- + drivers/infiniband/hw/mlx5/main.c | 429 ++++++++++++- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 74 +++ + drivers/infiniband/hw/mlx5/mr.c | 4 + + drivers/infiniband/hw/mlx5/qp.c | 691 ++++++++++++++++++++- + drivers/infiniband/hw/mlx5/srq.c | 112 ++-- + drivers/infiniband/hw/mlx5/user.h | 88 ++- + drivers/infiniband/hw/mthca/mthca_provider.c | 24 +- + drivers/infiniband/hw/nes/nes_verbs.c | 33 +- + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 19 +- + drivers/infiniband/hw/usnic/usnic_ib_main.c | 16 + + drivers/infiniband/hw/usnic/usnic_ib_sysfs.c | 17 - + drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 6 +- + drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 2 + + drivers/net/ethernet/mellanox/mlx5/core/srq.c | 265 ++++---- + drivers/net/ethernet/mellanox/mlx5/core/transobj.c | 4 + + include/linux/mlx5/cq.h | 2 + + include/linux/mlx5/driver.h | 6 +- + include/linux/mlx5/qp.h | 4 +- + include/linux/mlx5/srq.h | 25 + + include/rdma/ib_verbs.h | 102 ++- + include/uapi/rdma/ib_user_verbs.h | 95 +++ + 40 files changed, 2888 insertions(+), 481 deletions(-) +Merging rdma-leon/rdma-next (4c2e07c6a29e Linux 4.7-rc5) +$ git merge rdma-leon/rdma-next +Already up-to-date. +Merging rdma-leon-test/testing/rdma-next (92d21ac74a9e Linux 4.7-rc7) +$ git merge rdma-leon-test/testing/rdma-next +Already up-to-date. +Merging mtd/master (7ce9ea7e6b35 mtd: nand: omap2: Add check for old elm binding) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (1dcff2e4ae72 mtd: spi-nor: don't build Cadence QuadSPI on non-ARM) +$ git merge l2-mtd/master +Resolved 'drivers/mtd/devices/Kconfig' using previous resolution. +Auto-merging drivers/mtd/nand/omap2.c +Auto-merging drivers/mtd/devices/Kconfig +CONFLICT (content): Merge conflict in drivers/mtd/devices/Kconfig +Auto-merging drivers/memory/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 16d2bd8dc92b] Merge remote-tracking branch 'l2-mtd/master' +$ git diff -M --stat --summary HEAD^.. + .../bindings/memory-controllers/omap-gpmc.txt | 7 +- + .../devicetree/bindings/mtd/atmel-quadspi.txt | 32 + + .../devicetree/bindings/mtd/brcm,brcmnand.txt | 1 + + .../devicetree/bindings/mtd/cadence-quadspi.txt | 56 + + .../devicetree/bindings/mtd/gpmc-nand.txt | 2 +- + .../bindings/mtd/hisilicon,fmc-spi-nor.txt | 24 + + Documentation/devicetree/bindings/mtd/mtk-nand.txt | 160 ++ + .../devicetree/bindings/mtd/sunxi-nand.txt | 6 + + arch/cris/arch-v10/drivers/axisflashmap.c | 2 +- + arch/cris/arch-v32/drivers/axisflashmap.c | 2 +- + drivers/memory/Kconfig | 2 +- + drivers/memory/fsl_ifc.c | 4 +- + drivers/mtd/chips/cfi_cmdset_0020.c | 2 +- + drivers/mtd/devices/Kconfig | 16 +- + drivers/mtd/devices/m25p80.c | 37 +- + drivers/mtd/maps/physmap_of.c | 2 +- + drivers/mtd/maps/pmcmsp-flash.c | 6 +- + drivers/mtd/maps/sa1100-flash.c | 4 +- + drivers/mtd/nand/Kconfig | 10 +- + drivers/mtd/nand/Makefile | 1 + + drivers/mtd/nand/brcmnand/brcmnand.c | 173 ++- + drivers/mtd/nand/jz4780_bch.c | 2 +- + drivers/mtd/nand/jz4780_nand.c | 2 +- + drivers/mtd/nand/mtk_ecc.c | 530 +++++++ + drivers/mtd/nand/mtk_ecc.h | 50 + + drivers/mtd/nand/mtk_nand.c | 1526 ++++++++++++++++++++ + drivers/mtd/nand/nand_base.c | 2 +- + drivers/mtd/nand/nand_ids.c | 1 + + drivers/mtd/nand/omap2.c | 11 +- + drivers/mtd/nand/sunxi_nand.c | 397 ++++- + drivers/mtd/nand/xway_nand.c | 231 +-- + drivers/mtd/onenand/onenand_base.c | 4 +- + drivers/mtd/spi-nor/Kconfig | 27 + + drivers/mtd/spi-nor/Makefile | 3 + + drivers/mtd/spi-nor/atmel-quadspi.c | 732 ++++++++++ + drivers/mtd/spi-nor/cadence-quadspi.c | 1299 +++++++++++++++++ + drivers/mtd/spi-nor/fsl-quadspi.c | 29 +- + drivers/mtd/spi-nor/hisi-sfc.c | 489 +++++++ + drivers/mtd/spi-nor/mtk-quadspi.c | 43 +- + drivers/mtd/spi-nor/nxp-spifi.c | 25 +- + drivers/mtd/spi-nor/spi-nor.c | 127 +- + drivers/mtd/ssfdc.c | 3 +- + drivers/mtd/tests/nandbiterrs.c | 2 +- + include/linux/mtd/nand.h | 1 + + include/linux/mtd/spi-nor.h | 8 +- + 45 files changed, 5837 insertions(+), 256 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/atmel-quadspi.txt + create mode 100644 Documentation/devicetree/bindings/mtd/cadence-quadspi.txt + create mode 100644 Documentation/devicetree/bindings/mtd/hisilicon,fmc-spi-nor.txt + create mode 100644 Documentation/devicetree/bindings/mtd/mtk-nand.txt + create mode 100644 drivers/mtd/nand/mtk_ecc.c + create mode 100644 drivers/mtd/nand/mtk_ecc.h + create mode 100644 drivers/mtd/nand/mtk_nand.c + create mode 100644 drivers/mtd/spi-nor/atmel-quadspi.c + create mode 100644 drivers/mtd/spi-nor/cadence-quadspi.c + create mode 100644 drivers/mtd/spi-nor/hisi-sfc.c +Merging nand/nand/next (8490c03bd9d4 mtd: nand: jz4780: Update MODULE_AUTHOR email address) +$ git merge nand/nand/next +Already up-to-date. +Merging crypto/master (0f95e2ffc58f Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge crypto/master +Already up-to-date. +Merging drm/drm-next (162b20d2f9ef Merge branch 'drm-next-4.8' of git://people.freedesktop.org/~agd5f/linux into drm-next) +$ git merge drm/drm-next +Recorded preimage for 'drivers/gpu/drm/i915/i915_debugfs.c' +Resolved 'Documentation/index.rst' using previous resolution. +Resolved 'drivers/gpu/drm/msm/msm_drv.c' using previous resolution. +Resolved 'drivers/gpu/drm/rockchip/rockchip_drm_drv.c' using previous resolution. +Resolved 'drivers/gpu/drm/sti/sti_drv.c' using previous resolution. +Resolved 'drivers/media/platform/omap/omap_voutdef.h' using previous resolution. +Auto-merging include/video/omapfb_dss.h +Auto-merging include/linux/fence.h +CONFLICT (modify/delete): drivers/staging/android/sync.h deleted in HEAD and modified in drm/drm-next. Version drm/drm-next of drivers/staging/android/sync.h left in tree. +Auto-merging drivers/media/platform/omap/omap_voutdef.h +CONFLICT (content): Merge conflict in drivers/media/platform/omap/omap_voutdef.h +Auto-merging drivers/media/platform/omap/omap_vout.c +Auto-merging drivers/gpu/drm/ttm/ttm_tt.c +Auto-merging drivers/gpu/drm/sti/sti_drv.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/sti/sti_drv.c +Auto-merging drivers/gpu/drm/rockchip/rockchip_drm_drv.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/rockchip/rockchip_drm_drv.c +Removing drivers/gpu/drm/rcar-du/rcar_du_hdmicon.h +Removing drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c +Auto-merging drivers/gpu/drm/omapdrm/omap_gem.c +Auto-merging drivers/gpu/drm/msm/msm_drv.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_drv.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Removing drivers/gpu/drm/i915/i915_dma.c +Auto-merging drivers/gpu/drm/i915/i915_debugfs.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_debugfs.c +Auto-merging drivers/gpu/drm/drm_gem.c +Auto-merging drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +Auto-merging drivers/gpu/drm/bridge/adv7511/adv7511.h +Auto-merging drivers/gpu/drm/armada/armada_drv.c +Auto-merging drivers/gpu/drm/arm/hdlcd_drv.c +Auto-merging MAINTAINERS +Auto-merging Documentation/index.rst +CONFLICT (content): Merge conflict in Documentation/index.rst +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Removing Documentation/devicetree/bindings/display/msm/mdp.txt +Removing Documentation/DocBook/gpu.tmpl +Auto-merging Documentation/DocBook/device-drivers.tmpl +Auto-merging Documentation/DocBook/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/android/sync.h +drivers/staging/android/sync.h: needs merge +rm 'drivers/staging/android/sync.h' +$ git commit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/i915_debugfs.c'. +[master c5b76b797f96] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/Makefile | 2 +- + Documentation/DocBook/device-drivers.tmpl | 4 + + Documentation/DocBook/gpu.tmpl | 3540 -------------------- + .../devicetree/bindings/display/arm,malidp.txt | 65 + + .../bindings/display/bridge/adi,adv7511.txt | 26 +- + .../bindings/display/bridge/analogix_dp.txt | 1 + + .../devicetree/bindings/display/bridge/sii902x.txt | 35 + + .../bindings/display/bridge/toshiba,tc358767.txt | 53 + + .../bindings/display/connector/hdmi-connector.txt | 1 + + .../devicetree/bindings/display/fsl,dcu.txt | 9 +- + .../bindings/display/mediatek/mediatek,hdmi.txt | 148 + + .../devicetree/bindings/display/msm/dsi.txt | 117 +- + .../devicetree/bindings/display/msm/mdp.txt | 59 - + .../devicetree/bindings/display/msm/mdp4.txt | 112 + + .../devicetree/bindings/display/msm/mdp5.txt | 160 + + .../bindings/display/panel/lg,lp079qx1-sp0v.txt | 7 + + .../bindings/display/panel/lg,lp097qx1-spa1.txt | 7 + + .../bindings/display/panel/panel-dpi.txt | 2 + + .../display/panel/samsung,lsn122dl01-c01.txt | 7 + + .../bindings/display/panel/sharp,lq101k1ly04.txt | 7 + + .../bindings/display/panel/sharp,lq123p1jx31.txt | 7 + + .../bindings/display/panel/starry,kr122ea0sra.txt | 7 + + .../display/rockchip/analogix_dp-rockchip.txt | 9 +- + .../display/tegra/nvidia,tegra20-host1x.txt | 13 +- + .../pinctrl/nvidia,tegra124-dpaux-padctl.txt | 60 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + Documentation/gpu/drm-internals.rst | 381 +++ + Documentation/gpu/drm-kms-helpers.rst | 260 ++ + Documentation/gpu/drm-kms.rst | 653 ++++ + Documentation/gpu/drm-mm.rst | 454 +++ + Documentation/gpu/drm-uapi.rst | 111 + + Documentation/gpu/i915.rst | 347 ++ + Documentation/gpu/index.rst | 14 + + Documentation/gpu/introduction.rst | 51 + + Documentation/gpu/kms-properties.csv | 128 + + Documentation/gpu/vga-switcheroo.rst | 98 + + Documentation/index.rst | 1 + + MAINTAINERS | 42 +- + arch/arc/boot/dts/nsimosci.dts | 14 +- + arch/arc/boot/dts/nsimosci_hs.dts | 14 +- + arch/arc/boot/dts/nsimosci_hs_idu.dts | 14 +- + arch/arc/boot/dts/vdk_axs10x_mb.dtsi | 13 +- + arch/arc/boot/dts/vdk_hs38_smp.dts | 2 +- + arch/arc/configs/nsimosci_defconfig | 3 +- + arch/arc/configs/nsimosci_hs_defconfig | 3 +- + arch/arc/configs/nsimosci_hs_smp_defconfig | 3 +- + arch/arc/configs/vdk_hs38_smp_defconfig | 7 +- + arch/x86/kernel/early-quirks.c | 404 ++- + drivers/char/agp/intel-gtt.c | 8 + + drivers/dma-buf/Kconfig | 15 +- + drivers/dma-buf/Makefile | 2 +- + drivers/dma-buf/dma-buf.c | 59 +- + drivers/dma-buf/fence-array.c | 144 + + drivers/dma-buf/fence.c | 8 +- + drivers/dma-buf/sync_file.c | 2 +- + drivers/gpu/drm/Makefile | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 98 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 66 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 41 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 271 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 44 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 12 + + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 80 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 257 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 172 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 221 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 90 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 115 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 104 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 334 +- + drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 1 + + drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 212 +- + drivers/gpu/drm/amd/amdgpu/ci_dpm.h | 1 + + drivers/gpu/drm/amd/amdgpu/cik.c | 23 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 29 +- + drivers/gpu/drm/amd/amdgpu/cz_dpm.c | 1 + + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 21 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 83 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 118 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.h | 7 - + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 449 ++- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.h | 1 - + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 41 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.h | 7 - + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 46 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.h | 7 - + drivers/gpu/drm/amd/amdgpu/iceland_dpm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/iceland_smc.c | 2 +- + .../amdgpu/{iceland_smumgr.h => iceland_smum.h} | 0 + drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 8 +- + drivers/gpu/drm/amd/amdgpu/ppsmc.h | 4 + + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 56 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 27 +- + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 30 + + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 29 + + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 71 +- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 143 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 57 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 3 - + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 4 +- + drivers/gpu/drm/amd/include/amd_pcie.h | 14 + + drivers/gpu/drm/amd/include/amd_shared.h | 11 +- + .../gpu/drm/amd/include/asic_reg/gca/gfx_8_0_d.h | 3 + + .../drm/amd/include/asic_reg/gca/gfx_8_0_sh_mask.h | 108 +- + drivers/gpu/drm/amd/include/cgs_common.h | 7 +- + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 151 +- + .../gpu/drm/amd/powerplay/eventmgr/eventtasks.c | 3 +- + .../drm/amd/powerplay/hwmgr/cz_clockpowergating.c | 3 +- + drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 17 +- + drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c | 374 ++- + drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.h | 3 - + .../gpu/drm/amd/powerplay/hwmgr/fiji_powertune.c | 74 +- + .../gpu/drm/amd/powerplay/hwmgr/fiji_powertune.h | 15 + + .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 26 +- + drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 8 +- + .../powerplay/hwmgr/polaris10_clockpowergating.c | 6 + + .../gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c | 387 ++- + .../gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.h | 4 - + .../drm/amd/powerplay/hwmgr/polaris10_powertune.c | 59 + + .../drm/amd/powerplay/hwmgr/polaris10_powertune.h | 15 + + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c | 303 +- + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.h | 1 + + .../gpu/drm/amd/powerplay/hwmgr/processpptables.c | 33 +- + .../gpu/drm/amd/powerplay/hwmgr/processpptables.h | 17 +- + drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c | 167 +- + drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.h | 3 - + .../amd/powerplay/hwmgr/tonga_processpptables.c | 3 - + drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 7 + + .../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 1 + + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 10 +- + drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 29 + + drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 5 +- + drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h | 4 +- + drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 184 +- + drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 60 +- + drivers/gpu/drm/amd/scheduler/sched_fence.c | 81 +- + drivers/gpu/drm/arc/Kconfig | 1 - + drivers/gpu/drm/arc/Makefile | 2 +- + drivers/gpu/drm/arc/arcpgu.h | 2 +- + drivers/gpu/drm/arc/arcpgu_crtc.c | 16 +- + drivers/gpu/drm/arc/arcpgu_drv.c | 64 +- + drivers/gpu/drm/arc/arcpgu_hdmi.c | 18 - + drivers/gpu/drm/arc/arcpgu_sim.c | 128 + + drivers/gpu/drm/arm/Kconfig | 17 +- + drivers/gpu/drm/arm/Makefile | 2 + + drivers/gpu/drm/arm/hdlcd_crtc.c | 19 - + drivers/gpu/drm/arm/hdlcd_drv.c | 13 +- + drivers/gpu/drm/arm/malidp_crtc.c | 216 ++ + drivers/gpu/drm/arm/malidp_drv.c | 512 +++ + drivers/gpu/drm/arm/malidp_drv.h | 54 + + drivers/gpu/drm/arm/malidp_hw.c | 691 ++++ + drivers/gpu/drm/arm/malidp_hw.h | 241 ++ + drivers/gpu/drm/arm/malidp_planes.c | 298 ++ + drivers/gpu/drm/arm/malidp_regs.h | 172 + + drivers/gpu/drm/armada/Kconfig | 4 - + drivers/gpu/drm/armada/armada_crtc.c | 16 +- + drivers/gpu/drm/armada/armada_drv.c | 3 +- + drivers/gpu/drm/armada/armada_overlay.c | 1 + + drivers/gpu/drm/ast/Kconfig | 4 - + drivers/gpu/drm/ast/ast_drv.c | 2 +- + drivers/gpu/drm/ast/ast_fb.c | 3 - + drivers/gpu/drm/ast/ast_main.c | 3 +- + drivers/gpu/drm/ast/ast_mode.c | 10 +- + drivers/gpu/drm/ast/ast_ttm.c | 13 +- + drivers/gpu/drm/atmel-hlcdc/Kconfig | 1 - + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 6 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 19 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 12 - + drivers/gpu/drm/bochs/Kconfig | 4 - + drivers/gpu/drm/bochs/bochs_drv.c | 2 +- + drivers/gpu/drm/bochs/bochs_mm.c | 15 +- + drivers/gpu/drm/bridge/Kconfig | 19 + + drivers/gpu/drm/bridge/Makefile | 3 + + drivers/gpu/drm/bridge/adv7511/Kconfig | 15 + + drivers/gpu/drm/bridge/adv7511/Makefile | 3 + + drivers/gpu/drm/{i2c => bridge/adv7511}/adv7511.h | 103 + + .../adv7511.c => bridge/adv7511/adv7511_drv.c} | 324 +- + drivers/gpu/drm/bridge/adv7511/adv7533.c | 265 ++ + drivers/gpu/drm/bridge/analogix-anx78xx.c | 8 - + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 3 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 8 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 12 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h | 5 +- + drivers/gpu/drm/bridge/dw-hdmi.c | 30 +- + drivers/gpu/drm/bridge/nxp-ptn3460.c | 8 - + drivers/gpu/drm/bridge/parade-ps8622.c | 10 - + drivers/gpu/drm/bridge/sii902x.c | 467 +++ + drivers/gpu/drm/bridge/tc358767.c | 1413 ++++++++ + drivers/gpu/drm/cirrus/Kconfig | 4 - + drivers/gpu/drm/cirrus/cirrus_drv.c | 2 +- + drivers/gpu/drm/cirrus/cirrus_main.c | 4 +- + drivers/gpu/drm/cirrus/cirrus_mode.c | 11 +- + drivers/gpu/drm/cirrus/cirrus_ttm.c | 13 +- + drivers/gpu/drm/drm_atomic.c | 105 +- + drivers/gpu/drm/drm_atomic_helper.c | 566 +++- + drivers/gpu/drm/drm_auth.c | 285 +- + drivers/gpu/drm/drm_bridge.c | 2 +- + drivers/gpu/drm/drm_bufs.c | 8 +- + drivers/gpu/drm/drm_cache.c | 1 + + drivers/gpu/drm/drm_crtc.c | 717 ++-- + drivers/gpu/drm/drm_crtc_helper.c | 36 +- + drivers/gpu/drm/drm_crtc_internal.h | 88 +- + drivers/gpu/drm/drm_debugfs.c | 3 - + drivers/gpu/drm/drm_dp_aux_dev.c | 3 +- + drivers/gpu/drm/drm_dp_helper.c | 56 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 14 +- + drivers/gpu/drm/drm_drv.c | 245 +- + drivers/gpu/drm/drm_edid_load.c | 2 +- + drivers/gpu/drm/drm_fb_cma_helper.c | 43 +- + drivers/gpu/drm/drm_fb_helper.c | 56 +- + drivers/gpu/drm/drm_fops.c | 149 +- + drivers/gpu/drm/drm_fourcc.c | 320 ++ + drivers/gpu/drm/drm_gem.c | 2 +- + drivers/gpu/drm/drm_info.c | 117 +- + drivers/gpu/drm/drm_internal.h | 21 +- + drivers/gpu/drm/drm_ioctl.c | 176 +- + drivers/gpu/drm/drm_irq.c | 243 +- + drivers/gpu/drm/drm_legacy.h | 8 +- + drivers/gpu/drm/drm_lock.c | 240 +- + drivers/gpu/drm/drm_memory.c | 2 +- + drivers/gpu/drm/drm_mipi_dsi.c | 38 + + drivers/gpu/drm/drm_mm.c | 4 +- + drivers/gpu/drm/drm_modes.c | 4 +- + drivers/gpu/drm/drm_modeset_lock.c | 13 +- + drivers/gpu/drm/drm_pci.c | 51 - + drivers/gpu/drm/drm_plane_helper.c | 38 +- + drivers/gpu/drm/drm_platform.c | 18 - + drivers/gpu/drm/drm_prime.c | 10 +- + drivers/gpu/drm/drm_probe_helper.c | 21 +- + drivers/gpu/drm/drm_scatter.c | 2 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 206 ++ + drivers/gpu/drm/drm_sysfs.c | 71 - + drivers/gpu/drm/drm_vm.c | 58 +- + drivers/gpu/drm/drm_vma_manager.c | 3 + + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 5 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 54 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 2 +- + drivers/gpu/drm/etnaviv/state_hi.xml.h | 7 + + drivers/gpu/drm/exynos/Kconfig | 6 +- + drivers/gpu/drm/exynos/exynos_dp.c | 4 +- + drivers/gpu/drm/exynos/exynos_drm_dpi.c | 9 - + drivers/gpu/drm/exynos/exynos_drm_drv.c | 18 +- + drivers/gpu/drm/exynos/exynos_drm_drv.h | 2 - + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 9 - + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 3 +- + drivers/gpu/drm/exynos/exynos_drm_iommu.c | 77 +- + drivers/gpu/drm/exynos/exynos_drm_iommu.h | 91 + + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 8 - + drivers/gpu/drm/exynos/exynos_hdmi.c | 10 +- + drivers/gpu/drm/fsl-dcu/Kconfig | 5 - + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 44 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 49 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h | 2 + + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_kms.c | 15 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_output.h | 3 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 16 + + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.h | 1 + + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 87 +- + drivers/gpu/drm/fsl-dcu/fsl_tcon.c | 1 + + drivers/gpu/drm/gma500/Kconfig | 4 - + drivers/gpu/drm/gma500/gma_display.c | 11 +- + drivers/gpu/drm/gma500/gma_display.h | 4 +- + drivers/gpu/drm/gma500/psb_intel_display.c | 7 - + drivers/gpu/drm/hisilicon/kirin/Kconfig | 1 + + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 34 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 11 +- + drivers/gpu/drm/i2c/Kconfig | 6 - + drivers/gpu/drm/i2c/Makefile | 2 - + drivers/gpu/drm/i2c/ch7006_drv.c | 9 +- + drivers/gpu/drm/i915/Kconfig | 22 + + drivers/gpu/drm/i915/Kconfig.debug | 3 + + drivers/gpu/drm/i915/Makefile | 12 +- + drivers/gpu/drm/i915/gvt/Makefile | 5 + + drivers/gpu/drm/i915/gvt/debug.h | 34 + + drivers/gpu/drm/i915/gvt/gvt.c | 145 + + drivers/gpu/drm/i915/gvt/gvt.h | 69 + + drivers/gpu/drm/i915/gvt/hypercall.h | 38 + + drivers/gpu/drm/i915/gvt/mpt.h | 49 + + drivers/gpu/drm/i915/i915_cmd_parser.c | 53 +- + drivers/gpu/drm/i915/i915_debugfs.c | 570 ++-- + drivers/gpu/drm/i915/i915_dma.c | 1587 --------- + drivers/gpu/drm/i915/i915_drv.c | 2120 ++++++++---- + drivers/gpu/drm/i915/i915_drv.h | 786 +++-- + drivers/gpu/drm/i915/i915_gem.c | 1262 ++++--- + drivers/gpu/drm/i915/i915_gem_batch_pool.c | 6 +- + drivers/gpu/drm/i915/i915_gem_context.c | 515 +-- + drivers/gpu/drm/i915/i915_gem_dmabuf.h | 45 + + drivers/gpu/drm/i915/i915_gem_evict.c | 55 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 44 +- + drivers/gpu/drm/i915/i915_gem_fence.c | 38 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 390 ++- + drivers/gpu/drm/i915/i915_gem_gtt.h | 84 +- + drivers/gpu/drm/i915/i915_gem_render_state.c | 45 +- + drivers/gpu/drm/i915/i915_gem_shrinker.c | 58 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 10 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 8 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 12 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 203 +- + drivers/gpu/drm/i915/i915_guc_reg.h | 6 +- + drivers/gpu/drm/i915/i915_guc_submission.c | 538 +-- + drivers/gpu/drm/i915/i915_irq.c | 807 ++--- + drivers/gpu/drm/i915/i915_params.c | 23 +- + drivers/gpu/drm/i915/i915_params.h | 5 +- + drivers/gpu/drm/i915/i915_pci.c | 503 +++ + drivers/gpu/drm/i915/i915_pvinfo.h | 113 + + drivers/gpu/drm/i915/i915_reg.h | 65 +- + drivers/gpu/drm/i915/i915_suspend.c | 8 +- + drivers/gpu/drm/i915/i915_sysfs.c | 40 +- + drivers/gpu/drm/i915/i915_trace.h | 54 +- + drivers/gpu/drm/i915/i915_vgpu.c | 44 +- + drivers/gpu/drm/i915/i915_vgpu.h | 92 +- + drivers/gpu/drm/i915/intel_atomic.c | 5 +- + drivers/gpu/drm/i915/intel_audio.c | 50 +- + drivers/gpu/drm/i915/intel_bios.c | 23 +- + drivers/gpu/drm/i915/intel_bios.h | 16 +- + drivers/gpu/drm/i915/intel_breadcrumbs.c | 595 ++++ + drivers/gpu/drm/i915/intel_color.c | 23 +- + drivers/gpu/drm/i915/intel_crt.c | 78 +- + drivers/gpu/drm/i915/intel_csr.c | 25 +- + drivers/gpu/drm/i915/intel_ddi.c | 274 +- + drivers/gpu/drm/i915/intel_device_info.c | 388 +++ + drivers/gpu/drm/i915/intel_display.c | 2673 ++++++++------- + drivers/gpu/drm/i915/intel_dp.c | 1087 +++--- + drivers/gpu/drm/i915/intel_dp_aux_backlight.c | 172 + + drivers/gpu/drm/i915/intel_dp_mst.c | 25 +- + drivers/gpu/drm/i915/intel_dpio_phy.c | 470 +++ + drivers/gpu/drm/i915/intel_dpll_mgr.c | 63 +- + drivers/gpu/drm/i915/intel_drv.h | 353 +- + drivers/gpu/drm/i915/intel_dsi.c | 135 +- + drivers/gpu/drm/i915/intel_dsi.h | 4 + + drivers/gpu/drm/i915/intel_dsi_dcs_backlight.c | 179 + + drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 90 +- + drivers/gpu/drm/i915/intel_dsi_pll.c | 42 +- + drivers/gpu/drm/i915/intel_dvo.c | 41 +- + drivers/gpu/drm/i915/intel_fbc.c | 116 +- + drivers/gpu/drm/i915/intel_fbdev.c | 122 +- + drivers/gpu/drm/i915/intel_fifo_underrun.c | 30 +- + drivers/gpu/drm/i915/intel_guc.h | 50 +- + drivers/gpu/drm/i915/intel_guc_fwif.h | 3 +- + drivers/gpu/drm/i915/intel_guc_loader.c | 222 +- + drivers/gpu/drm/i915/intel_gvt.c | 104 + + drivers/gpu/drm/i915/intel_gvt.h | 45 + + drivers/gpu/drm/i915/intel_hdmi.c | 429 +-- + drivers/gpu/drm/i915/intel_hotplug.c | 134 +- + drivers/gpu/drm/i915/intel_i2c.c | 22 +- + drivers/gpu/drm/i915/intel_lrc.c | 964 +++--- + drivers/gpu/drm/i915/intel_lrc.h | 24 +- + drivers/gpu/drm/i915/intel_lvds.c | 58 +- + drivers/gpu/drm/i915/intel_mocs.c | 100 +- + drivers/gpu/drm/i915/intel_modes.c | 4 +- + drivers/gpu/drm/i915/intel_opregion.c | 210 +- + drivers/gpu/drm/i915/intel_overlay.c | 151 +- + drivers/gpu/drm/i915/intel_panel.c | 48 +- + drivers/gpu/drm/i915/intel_pm.c | 1466 ++++---- + drivers/gpu/drm/i915/intel_psr.c | 118 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 1323 ++++---- + drivers/gpu/drm/i915/intel_ringbuffer.h | 176 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 282 +- + drivers/gpu/drm/i915/intel_sdvo.c | 87 +- + drivers/gpu/drm/i915/intel_sideband.c | 32 +- + drivers/gpu/drm/i915/intel_sprite.c | 75 +- + drivers/gpu/drm/i915/intel_tv.c | 19 +- + drivers/gpu/drm/i915/intel_uncore.c | 328 +- + drivers/gpu/drm/i915/intel_vbt_defs.h | 6 + + drivers/gpu/drm/imx/Kconfig | 1 - + drivers/gpu/drm/imx/dw_hdmi-imx.c | 32 +- + drivers/gpu/drm/imx/imx-drm-core.c | 121 +- + drivers/gpu/drm/imx/imx-drm.h | 21 +- + drivers/gpu/drm/imx/imx-ldb.c | 192 +- + drivers/gpu/drm/imx/imx-tve.c | 97 +- + drivers/gpu/drm/imx/ipuv3-crtc.c | 400 +-- + drivers/gpu/drm/imx/ipuv3-plane.c | 548 ++- + drivers/gpu/drm/imx/ipuv3-plane.h | 16 - + drivers/gpu/drm/imx/parallel-display.c | 149 +- + drivers/gpu/drm/mediatek/Kconfig | 9 +- + drivers/gpu/drm/mediatek/Makefile | 7 + + drivers/gpu/drm/mediatek/mtk_cec.c | 265 ++ + drivers/gpu/drm/mediatek/mtk_cec.h | 26 + + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 13 +- + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 1 + + drivers/gpu/drm/mediatek/mtk_dsi.c | 9 - + drivers/gpu/drm/mediatek/mtk_hdmi.c | 1828 ++++++++++ + drivers/gpu/drm/mediatek/mtk_hdmi.h | 23 + + drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c | 358 ++ + drivers/gpu/drm/mediatek/mtk_hdmi_regs.h | 238 ++ + drivers/gpu/drm/mediatek/mtk_mipi_tx.c | 2 +- + drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c | 515 +++ + drivers/gpu/drm/mgag200/Kconfig | 4 - + drivers/gpu/drm/mgag200/mgag200_drv.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 9 +- + drivers/gpu/drm/mgag200/mgag200_ttm.c | 13 +- + drivers/gpu/drm/msm/Kconfig | 1 + + drivers/gpu/drm/msm/Makefile | 2 + + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 17 +- + drivers/gpu/drm/msm/dsi/dsi.c | 2 +- + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 8 + + drivers/gpu/drm/msm/dsi/dsi_cfg.h | 2 + + drivers/gpu/drm/msm/dsi/dsi_host.c | 69 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 32 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 2 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c | 4 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 4 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 2 + + drivers/gpu/drm/msm/edp/edp_connector.c | 10 - + drivers/gpu/drm/msm/hdmi/hdmi.c | 117 +- + drivers/gpu/drm/msm/hdmi/hdmi.h | 14 + + drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 8 - + drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c | 31 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 44 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h | 2 + + drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c | 9 - + drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h | 203 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c | 113 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c | 14 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 16 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.c | 26 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c | 10 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c | 125 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 339 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 16 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_mdss.c | 235 ++ + drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.c | 22 +- + drivers/gpu/drm/msm/msm_atomic.c | 39 +- + drivers/gpu/drm/msm/msm_drv.c | 267 +- + drivers/gpu/drm/msm/msm_drv.h | 24 +- + drivers/gpu/drm/msm/msm_fb.c | 12 +- + drivers/gpu/drm/msm/msm_fbdev.c | 17 +- + drivers/gpu/drm/msm/msm_gem.c | 139 +- + drivers/gpu/drm/msm/msm_gem.h | 23 +- + drivers/gpu/drm/msm/msm_gem_prime.c | 4 +- + drivers/gpu/drm/msm/msm_gem_shrinker.c | 168 + + drivers/gpu/drm/msm/msm_gem_submit.c | 26 +- + drivers/gpu/drm/msm/msm_iommu.c | 6 +- + drivers/gpu/drm/msm/msm_kms.h | 8 +- + drivers/gpu/drm/msm/msm_perf.c | 7 +- + drivers/gpu/drm/msm/msm_rd.c | 71 +- + drivers/gpu/drm/msm/msm_ringbuffer.c | 6 +- + drivers/gpu/drm/nouveau/Kconfig | 6 - + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 12 +- + drivers/gpu/drm/nouveau/dispnv04/disp.c | 10 - + drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 9 +- + drivers/gpu/drm/nouveau/include/nvif/cl0080.h | 1 + + drivers/gpu/drm/nouveau/include/nvif/class.h | 10 + + drivers/gpu/drm/nouveau/include/nvkm/core/device.h | 18 +- + drivers/gpu/drm/nouveau/include/nvkm/core/tegra.h | 1 + + drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h | 2 + + drivers/gpu/drm/nouveau/include/nvkm/engine/disp.h | 2 + + drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h | 1 + + drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h | 1 + + drivers/gpu/drm/nouveau/include/nvkm/subdev/bios.h | 10 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h | 4 + + drivers/gpu/drm/nouveau/include/nvkm/subdev/ltc.h | 1 + + drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h | 14 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/pci.h | 1 + + .../gpu/drm/nouveau/include/nvkm/subdev/secboot.h | 3 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/top.h | 9 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/volt.h | 3 + + drivers/gpu/drm/nouveau/nouveau_abi16.c | 1 + + drivers/gpu/drm/nouveau/nouveau_bo.c | 75 +- + drivers/gpu/drm/nouveau/nouveau_chan.c | 3 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 27 +- + drivers/gpu/drm/nouveau/nouveau_display.h | 3 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 36 +- + drivers/gpu/drm/nouveau/nouveau_fence.h | 3 +- + drivers/gpu/drm/nouveau/nouveau_hwmon.c | 36 + + drivers/gpu/drm/nouveau/nouveau_ttm.c | 1 + + drivers/gpu/drm/nouveau/nouveau_usif.c | 1 - + drivers/gpu/drm/nouveau/nv50_display.c | 11 +- + drivers/gpu/drm/nouveau/nvkm/core/subdev.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/engine/ce/Kbuild | 2 + + drivers/gpu/drm/nouveau/nvkm/engine/ce/gp100.c | 102 + + drivers/gpu/drm/nouveau/nvkm/engine/ce/gp104.c | 44 + + drivers/gpu/drm/nouveau/nvkm/engine/ce/priv.h | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 72 + + drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c | 1 - + drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 12 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/user.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild | 9 + + .../gpu/drm/nouveau/nvkm/engine/disp/basegp104.c | 38 + + .../gpu/drm/nouveau/nvkm/engine/disp/channv50.h | 1 + + .../gpu/drm/nouveau/nvkm/engine/disp/coregf119.c | 2 +- + .../gpu/drm/nouveau/nvkm/engine/disp/coregp100.c | 38 + + .../gpu/drm/nouveau/nvkm/engine/disp/coregp104.c | 78 + + .../gpu/drm/nouveau/nvkm/engine/disp/dmacgf119.c | 2 +- + .../gpu/drm/nouveau/nvkm/engine/disp/dmacgp104.c | 66 + + .../gpu/drm/nouveau/nvkm/engine/disp/dmacnv50.h | 10 + + drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c | 9 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/gk104.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/disp/gk110.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/disp/gm107.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/disp/gm200.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/disp/gp100.c | 55 + + drivers/gpu/drm/nouveau/nvkm/engine/disp/gp104.c | 81 + + drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c | 136 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h | 2 + + .../gpu/drm/nouveau/nvkm/engine/disp/ovlygk104.c | 2 +- + .../gpu/drm/nouveau/nvkm/engine/disp/ovlygp104.c | 38 + + .../gpu/drm/nouveau/nvkm/engine/disp/rootgp100.c | 58 + + .../gpu/drm/nouveau/nvkm/engine/disp/rootgp104.c | 58 + + .../gpu/drm/nouveau/nvkm/engine/disp/rootnv50.h | 2 + + drivers/gpu/drm/nouveau/nvkm/engine/fifo/Kbuild | 2 + + .../gpu/drm/nouveau/nvkm/engine/fifo/changk104.h | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c | 9 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gp100.c | 67 + + .../gpu/drm/nouveau/nvkm/engine/fifo/gpfifogp100.c | 34 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/Kbuild | 2 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h | 2 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf117.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp100.c | 179 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 18 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h | 2 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c | 1 - + drivers/gpu/drm/nouveau/nvkm/engine/gr/gm200.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gp100.c | 171 + + drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c | 59 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bios/dp.c | 8 + + drivers/gpu/drm/nouveau/nvkm/subdev/bios/image.c | 7 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bios/pll.c | 20 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bios/pmu.c | 20 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bios/rammap.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/gf100.c | 28 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk104.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.c | 394 +-- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.h | 96 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/gm20b.c | 896 ++++- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild | 3 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c | 6 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.c | 19 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.h | 2 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk20a.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm107.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm200.c | 19 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp100.c | 69 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp104.c | 43 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h | 5 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c | 146 + + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gf100.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gm107.c | 12 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gp100.c | 75 + + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/priv.h | 3 + + drivers/gpu/drm/nouveau/nvkm/subdev/mc/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c | 118 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/g84.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/g98.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/gf100.c | 11 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/gk104.c | 2 + + drivers/gpu/drm/nouveau/nvkm/subdev/mc/gk20a.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/mc/gp100.c | 103 + + drivers/gpu/drm/nouveau/nvkm/subdev/mc/gt215.c | 9 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv04.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv11.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv17.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv44.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv50.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/priv.h | 12 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pci/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c | 14 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pci/gp100.c | 44 + + drivers/gpu/drm/nouveau/nvkm/subdev/secboot/base.c | 28 +- + .../gpu/drm/nouveau/nvkm/subdev/secboot/gm200.c | 88 +- + .../gpu/drm/nouveau/nvkm/subdev/secboot/gm20b.c | 54 +- + drivers/gpu/drm/nouveau/nvkm/subdev/secboot/priv.h | 18 +- + drivers/gpu/drm/nouveau/nvkm/subdev/top/base.c | 28 +- + drivers/gpu/drm/nouveau/nvkm/subdev/top/gk104.c | 39 +- + drivers/gpu/drm/nouveau/nvkm/subdev/volt/base.c | 14 +- + drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c | 27 +- + drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.h | 11 +- + drivers/gpu/drm/nouveau/nvkm/subdev/volt/gm20b.c | 40 +- + drivers/gpu/drm/omapdrm/Kconfig | 5 - + drivers/gpu/drm/omapdrm/displays/Kconfig | 28 +- + drivers/gpu/drm/omapdrm/displays/Makefile | 28 +- + .../gpu/drm/omapdrm/displays/connector-analog-tv.c | 11 +- + drivers/gpu/drm/omapdrm/displays/connector-dvi.c | 5 +- + drivers/gpu/drm/omapdrm/displays/connector-hdmi.c | 4 +- + drivers/gpu/drm/omapdrm/displays/encoder-opa362.c | 3 +- + drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c | 3 +- + .../gpu/drm/omapdrm/displays/encoder-tpd12s015.c | 3 +- + drivers/gpu/drm/omapdrm/displays/panel-dpi.c | 26 +- + drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 4 +- + .../omapdrm/displays/panel-lgphilips-lb035q02.c | 22 +- + .../drm/omapdrm/displays/panel-nec-nl8048hl11.c | 2 +- + .../drm/omapdrm/displays/panel-sharp-ls037v7dw01.c | 4 +- + .../drm/omapdrm/displays/panel-sony-acx565akm.c | 3 +- + .../drm/omapdrm/displays/panel-tpo-td028ttec1.c | 3 +- + .../drm/omapdrm/displays/panel-tpo-td043mtea1.c | 2 +- + drivers/gpu/drm/omapdrm/dss/core.c | 5 +- + drivers/gpu/drm/omapdrm/dss/dispc.c | 471 ++- + drivers/gpu/drm/omapdrm/dss/dispc.h | 5 + + drivers/gpu/drm/omapdrm/dss/dispc_coefs.c | 2 +- + drivers/gpu/drm/omapdrm/dss/display.c | 2 +- + drivers/gpu/drm/omapdrm/dss/dpi.c | 136 +- + drivers/gpu/drm/omapdrm/dss/dsi.c | 57 +- + drivers/gpu/drm/omapdrm/dss/dss-of.c | 10 +- + drivers/gpu/drm/omapdrm/dss/dss.c | 255 +- + drivers/gpu/drm/omapdrm/dss/dss.h | 45 +- + drivers/gpu/drm/omapdrm/dss/dss_features.c | 46 +- + drivers/gpu/drm/omapdrm/dss/dss_features.h | 1 - + drivers/gpu/drm/omapdrm/dss/hdmi.h | 6 +- + drivers/gpu/drm/omapdrm/dss/hdmi4.c | 11 +- + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 11 +- + drivers/gpu/drm/omapdrm/dss/hdmi_common.c | 2 +- + drivers/gpu/drm/omapdrm/dss/hdmi_phy.c | 2 +- + drivers/gpu/drm/omapdrm/dss/hdmi_pll.c | 78 +- + drivers/gpu/drm/omapdrm/dss/hdmi_wp.c | 2 +- + drivers/gpu/drm/omapdrm/dss/omapdss.h | 871 ++++- + drivers/gpu/drm/omapdrm/dss/output.c | 3 +- + drivers/gpu/drm/omapdrm/dss/pll.c | 129 +- + drivers/gpu/drm/omapdrm/dss/rfbi.c | 2 +- + drivers/gpu/drm/omapdrm/dss/sdi.c | 2 +- + drivers/gpu/drm/omapdrm/dss/venc.c | 3 +- + drivers/gpu/drm/omapdrm/dss/video-pll.c | 9 +- + drivers/gpu/drm/omapdrm/omap_connector.c | 10 - + drivers/gpu/drm/omapdrm/omap_crtc.c | 56 + + drivers/gpu/drm/omapdrm/omap_drv.c | 16 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 14 - + drivers/gpu/drm/omapdrm/omap_fb.c | 16 - + drivers/gpu/drm/omapdrm/omap_fbdev.c | 8 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 15 +- + drivers/gpu/drm/panel/panel-simple.c | 166 +- + drivers/gpu/drm/qxl/Kconfig | 5 - + drivers/gpu/drm/qxl/qxl_cmd.c | 2 +- + drivers/gpu/drm/qxl/qxl_display.c | 8 +- + drivers/gpu/drm/qxl/qxl_draw.c | 5 +- + drivers/gpu/drm/qxl/qxl_drv.c | 2 +- + drivers/gpu/drm/qxl/qxl_drv.h | 1 - + drivers/gpu/drm/qxl/qxl_fb.c | 4 - + drivers/gpu/drm/qxl/qxl_kms.c | 10 +- + drivers/gpu/drm/qxl/qxl_release.c | 2 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 10 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 4 +- + drivers/gpu/drm/radeon/atombios_encoders.c | 1 + + drivers/gpu/drm/radeon/cik.c | 17 +- + drivers/gpu/drm/radeon/evergreen_cs.c | 7 + + drivers/gpu/drm/radeon/evergreend.h | 1 + + drivers/gpu/drm/radeon/radeon.h | 2 +- + drivers/gpu/drm/radeon/radeon_atpx_handler.c | 65 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 15 +- + drivers/gpu/drm/radeon/radeon_device.c | 4 + + drivers/gpu/drm/radeon/radeon_display.c | 18 +- + drivers/gpu/drm/radeon/radeon_drv.c | 26 +- + drivers/gpu/drm/radeon/radeon_kms.c | 5 +- + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 4 +- + drivers/gpu/drm/radeon/radeon_pm.c | 13 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 10 +- + drivers/gpu/drm/radeon/si.c | 45 +- + drivers/gpu/drm/rcar-du/Kconfig | 1 - + drivers/gpu/drm/rcar-du/Makefile | 4 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 17 +- + drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 15 +- + drivers/gpu/drm/rcar-du/rcar_du_encoder.h | 10 +- + drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c | 117 - + drivers/gpu/drm/rcar-du/rcar_du_hdmicon.h | 31 - + drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c | 68 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 10 +- + drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 1 - + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 20 +- + drivers/gpu/drm/rcar-du/rcar_du_regs.h | 5 +- + drivers/gpu/drm/rcar-du/rcar_du_vgacon.c | 3 - + drivers/gpu/drm/rockchip/Kconfig | 5 +- + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 189 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 9 - + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 1 - + drivers/gpu/drm/rockchip/inno_hdmi.c | 9 - + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 210 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 12 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 81 +- + drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 5 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 90 +- + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 7 +- + drivers/gpu/drm/shmobile/Kconfig | 1 - + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 4 +- + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 3 +- + drivers/gpu/drm/sis/sis_mm.c | 2 +- + drivers/gpu/drm/sti/Kconfig | 1 + + drivers/gpu/drm/sti/sti_awg_utils.c | 4 +- + drivers/gpu/drm/sti/sti_compositor.c | 22 + + drivers/gpu/drm/sti/sti_compositor.h | 3 + + drivers/gpu/drm/sti/sti_crtc.c | 71 +- + drivers/gpu/drm/sti/sti_cursor.c | 39 +- + drivers/gpu/drm/sti/sti_drv.c | 148 +- + drivers/gpu/drm/sti/sti_drv.h | 1 + + drivers/gpu/drm/sti/sti_dvo.c | 43 +- + drivers/gpu/drm/sti/sti_gdp.c | 46 +- + drivers/gpu/drm/sti/sti_hda.c | 43 +- + drivers/gpu/drm/sti/sti_hdmi.c | 350 +- + drivers/gpu/drm/sti/sti_hdmi.h | 13 + + drivers/gpu/drm/sti/sti_hqvdp.c | 40 +- + drivers/gpu/drm/sti/sti_mixer.c | 12 +- + drivers/gpu/drm/sti/sti_mixer.h | 2 + + drivers/gpu/drm/sti/sti_plane.c | 40 +- + drivers/gpu/drm/sti/sti_plane.h | 9 +- + drivers/gpu/drm/sti/sti_tvout.c | 43 +- + drivers/gpu/drm/sti/sti_vid.c | 12 +- + drivers/gpu/drm/sti/sti_vid.h | 2 + + drivers/gpu/drm/sti/sti_vtg.c | 3 +- + drivers/gpu/drm/sun4i/sun4i_crtc.c | 12 + + drivers/gpu/drm/sun4i/sun4i_drv.c | 13 +- + drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 3 +- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 10 - + drivers/gpu/drm/sun4i/sun4i_tv.c | 9 - + drivers/gpu/drm/tegra/dc.c | 176 +- + drivers/gpu/drm/tegra/dpaux.c | 245 +- + drivers/gpu/drm/tegra/drm.c | 4 +- + drivers/gpu/drm/tegra/drm.h | 2 - + drivers/gpu/drm/tegra/dsi.c | 248 +- + drivers/gpu/drm/tegra/fb.c | 2 +- + drivers/gpu/drm/tegra/hdmi.c | 508 ++- + drivers/gpu/drm/tegra/hdmi.h | 21 +- + drivers/gpu/drm/tegra/output.c | 9 +- + drivers/gpu/drm/tegra/rgb.c | 1 - + drivers/gpu/drm/tegra/sor.c | 717 ++-- + drivers/gpu/drm/tegra/sor.h | 3 + + drivers/gpu/drm/tilcdc/Kconfig | 1 - + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 2 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 3 +- + drivers/gpu/drm/ttm/ttm_bo.c | 165 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 112 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 19 +- + drivers/gpu/drm/ttm/ttm_tt.c | 19 +- + drivers/gpu/drm/udl/Kconfig | 5 - + drivers/gpu/drm/udl/udl_drv.c | 1 - + drivers/gpu/drm/udl/udl_modeset.c | 2 +- + drivers/gpu/drm/vc4/vc4_bo.c | 2 - + drivers/gpu/drm/vc4/vc4_crtc.c | 183 +- + drivers/gpu/drm/vc4/vc4_dpi.c | 9 - + drivers/gpu/drm/vc4/vc4_drv.c | 70 +- + drivers/gpu/drm/vc4/vc4_drv.h | 12 +- + drivers/gpu/drm/vc4/vc4_gem.c | 11 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 22 +- + drivers/gpu/drm/vc4/vc4_kms.c | 15 +- + drivers/gpu/drm/vc4/vc4_plane.c | 13 +- + drivers/gpu/drm/vc4/vc4_qpu_defines.h | 17 +- + drivers/gpu/drm/vc4/vc4_regs.h | 22 +- + drivers/gpu/drm/vc4/vc4_validate.c | 13 +- + drivers/gpu/drm/vc4/vc4_validate_shaders.c | 449 ++- + drivers/gpu/drm/vgem/Makefile | 2 +- + drivers/gpu/drm/vgem/vgem_drv.c | 291 +- + drivers/gpu/drm/vgem/vgem_drv.h | 20 +- + drivers/gpu/drm/vgem/vgem_fence.c | 283 ++ + drivers/gpu/drm/via/via_mm.c | 2 +- + drivers/gpu/drm/virtio/Kconfig | 4 - + drivers/gpu/drm/virtio/virtgpu_display.c | 187 +- + drivers/gpu/drm/virtio/virtgpu_drm_bus.c | 10 - + drivers/gpu/drm/virtio/virtgpu_drv.c | 3 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 3 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 150 +- + drivers/gpu/drm/virtio/virtgpu_ttm.c | 6 + + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 7 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 4 +- + drivers/gpu/host1x/cdma.c | 42 +- + drivers/gpu/host1x/channel.c | 5 +- + drivers/gpu/host1x/debug.c | 38 +- + drivers/gpu/host1x/dev.c | 16 +- + drivers/gpu/host1x/dev.h | 38 +- + drivers/gpu/host1x/hw/cdma_hw.c | 23 +- + drivers/gpu/host1x/hw/channel_hw.c | 5 +- + drivers/gpu/host1x/hw/debug_hw.c | 36 +- + drivers/gpu/host1x/hw/intr_hw.c | 30 +- + drivers/gpu/host1x/hw/syncpt_hw.c | 10 +- + drivers/gpu/host1x/intr.c | 16 +- + drivers/gpu/host1x/intr.h | 4 +- + drivers/gpu/host1x/job.c | 8 +- + drivers/gpu/host1x/syncpt.c | 58 +- + drivers/gpu/host1x/syncpt.h | 8 +- + drivers/gpu/ipu-v3/ipu-dc.c | 9 +- + drivers/gpu/ipu-v3/ipu-di.c | 3 - + drivers/gpu/ipu-v3/ipu-dmfc.c | 213 +- + drivers/gpu/vga/vga_switcheroo.c | 62 +- + drivers/media/platform/omap/omap_vout.c | 2 +- + drivers/media/platform/omap/omap_voutdef.h | 2 +- + drivers/media/platform/omap/omap_voutlib.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/pd.c | 4 +- + drivers/pinctrl/pinconf-generic.c | 8 + + .../omap2/omapfb/displays/connector-analog-tv.c | 10 +- + .../fbdev/omap2/omapfb/displays/connector-dvi.c | 60 +- + .../fbdev/omap2/omapfb/displays/connector-hdmi.c | 44 +- + .../fbdev/omap2/omapfb/displays/encoder-opa362.c | 2 +- + .../fbdev/omap2/omapfb/displays/encoder-tfp410.c | 46 +- + .../omap2/omapfb/displays/encoder-tpd12s015.c | 3 +- + .../video/fbdev/omap2/omapfb/displays/panel-dpi.c | 2 +- + .../fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 54 +- + .../omapfb/displays/panel-lgphilips-lb035q02.c | 58 +- + .../omap2/omapfb/displays/panel-nec-nl8048hl11.c | 47 +- + .../omapfb/displays/panel-sharp-ls037v7dw01.c | 83 +- + .../omap2/omapfb/displays/panel-sony-acx565akm.c | 2 +- + .../omap2/omapfb/displays/panel-tpo-td028ttec1.c | 45 +- + .../omap2/omapfb/displays/panel-tpo-td043mtea1.c | 46 +- + drivers/video/fbdev/omap2/omapfb/dss/apply.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/core.c | 4 +- + .../video/fbdev/omap2/omapfb/dss/dispc-compat.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/dispc_coefs.c | 2 +- + .../video/fbdev/omap2/omapfb/dss/display-sysfs.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/display.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/dpi.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/dss-of.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/dss.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/dss.h | 11 + + .../video/fbdev/omap2/omapfb/dss/dss_features.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi.h | 3 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi_common.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi_wp.c | 2 +- + .../video/fbdev/omap2/omapfb/dss/manager-sysfs.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/manager.c | 3 +- + drivers/video/fbdev/omap2/omapfb/dss/output.c | 2 +- + .../video/fbdev/omap2/omapfb/dss/overlay-sysfs.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/overlay.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/pll.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/rfbi.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/sdi.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/venc.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/video-pll.c | 2 +- + drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c | 2 +- + drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 2 +- + drivers/video/fbdev/omap2/omapfb/omapfb-sysfs.c | 2 +- + drivers/video/fbdev/omap2/omapfb/omapfb.h | 2 +- + include/drm/bridge/analogix_dp.h | 9 +- + include/drm/drmP.h | 167 +- + include/drm/drm_atomic.h | 82 +- + include/drm/drm_atomic_helper.h | 42 +- + include/drm/drm_auth.h | 59 + + include/drm/drm_crtc.h | 858 +++-- + include/drm/drm_crtc_helper.h | 3 - + include/drm/drm_dp_helper.h | 11 +- + include/drm/drm_dp_mst_helper.h | 141 +- + include/drm/drm_fb_cma_helper.h | 1 + + include/drm/drm_fb_helper.h | 11 - + include/drm/drm_fourcc.h | 37 + + include/drm/drm_irq.h | 183 + + include/drm/drm_legacy.h | 2 + + include/drm/drm_mipi_dsi.h | 3 + + include/drm/drm_modes.h | 2 + + include/drm/drm_modeset_helper_vtables.h | 49 +- + include/drm/drm_plane_helper.h | 1 + + include/drm/drm_simple_kms_helper.h | 94 + + include/drm/i915_drm.h | 3 + + include/drm/intel-gtt.h | 3 + + include/drm/ttm/ttm_bo_api.h | 4 +- + include/drm/ttm/ttm_bo_driver.h | 44 +- + include/linux/dma-buf.h | 2 - + include/linux/fence-array.h | 73 + + include/linux/fence.h | 13 +- + include/linux/io-mapping.h | 10 +- + include/linux/pinctrl/pinconf-generic.h | 2 + + include/linux/platform_data/omapdss.h | 5 - + include/linux/vga_switcheroo.h | 2 + + include/sound/omap-hdmi-audio.h | 9 +- + include/uapi/drm/amdgpu_drm.h | 32 +- + include/uapi/drm/i915_drm.h | 3 + + include/uapi/drm/msm_drm.h | 25 +- + include/uapi/drm/vc4_drm.h | 13 + + include/uapi/drm/vgem_drm.h | 62 + + include/video/imx-ipu-v3.h | 3 - + include/video/omap-panel-data.h | 157 - + include/video/{omapdss.h => omapfb_dss.h} | 49 +- + sound/soc/omap/omap-hdmi-audio.c | 1 - + 891 files changed, 46834 insertions(+), 24757 deletions(-) + delete mode 100644 Documentation/DocBook/gpu.tmpl + create mode 100644 Documentation/devicetree/bindings/display/arm,malidp.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/sii902x.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/toshiba,tc358767.txt + create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,hdmi.txt + delete mode 100644 Documentation/devicetree/bindings/display/msm/mdp.txt + create mode 100644 Documentation/devicetree/bindings/display/msm/mdp4.txt + create mode 100644 Documentation/devicetree/bindings/display/msm/mdp5.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/lg,lp079qx1-sp0v.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/lg,lp097qx1-spa1.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/samsung,lsn122dl01-c01.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/sharp,lq101k1ly04.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/sharp,lq123p1jx31.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/starry,kr122ea0sra.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/nvidia,tegra124-dpaux-padctl.txt + create mode 100644 Documentation/gpu/drm-internals.rst + create mode 100644 Documentation/gpu/drm-kms-helpers.rst + create mode 100644 Documentation/gpu/drm-kms.rst + create mode 100644 Documentation/gpu/drm-mm.rst + create mode 100644 Documentation/gpu/drm-uapi.rst + create mode 100644 Documentation/gpu/i915.rst + create mode 100644 Documentation/gpu/index.rst + create mode 100644 Documentation/gpu/introduction.rst + create mode 100644 Documentation/gpu/kms-properties.csv + create mode 100644 Documentation/gpu/vga-switcheroo.rst + create mode 100644 drivers/dma-buf/fence-array.c + rename drivers/gpu/drm/amd/amdgpu/{iceland_smumgr.h => iceland_smum.h} (100%) + create mode 100644 drivers/gpu/drm/arc/arcpgu_sim.c + create mode 100644 drivers/gpu/drm/arm/malidp_crtc.c + create mode 100644 drivers/gpu/drm/arm/malidp_drv.c + create mode 100644 drivers/gpu/drm/arm/malidp_drv.h + create mode 100644 drivers/gpu/drm/arm/malidp_hw.c + create mode 100644 drivers/gpu/drm/arm/malidp_hw.h + create mode 100644 drivers/gpu/drm/arm/malidp_planes.c + create mode 100644 drivers/gpu/drm/arm/malidp_regs.h + create mode 100644 drivers/gpu/drm/bridge/adv7511/Kconfig + create mode 100644 drivers/gpu/drm/bridge/adv7511/Makefile + rename drivers/gpu/drm/{i2c => bridge/adv7511}/adv7511.h (82%) + rename drivers/gpu/drm/{i2c/adv7511.c => bridge/adv7511/adv7511_drv.c} (80%) + create mode 100644 drivers/gpu/drm/bridge/adv7511/adv7533.c + create mode 100644 drivers/gpu/drm/bridge/sii902x.c + create mode 100644 drivers/gpu/drm/bridge/tc358767.c + create mode 100644 drivers/gpu/drm/drm_fourcc.c + create mode 100644 drivers/gpu/drm/drm_simple_kms_helper.c + create mode 100644 drivers/gpu/drm/i915/gvt/Makefile + create mode 100644 drivers/gpu/drm/i915/gvt/debug.h + create mode 100644 drivers/gpu/drm/i915/gvt/gvt.c + create mode 100644 drivers/gpu/drm/i915/gvt/gvt.h + create mode 100644 drivers/gpu/drm/i915/gvt/hypercall.h + create mode 100644 drivers/gpu/drm/i915/gvt/mpt.h + delete mode 100644 drivers/gpu/drm/i915/i915_dma.c + create mode 100644 drivers/gpu/drm/i915/i915_gem_dmabuf.h + create mode 100644 drivers/gpu/drm/i915/i915_pci.c + create mode 100644 drivers/gpu/drm/i915/i915_pvinfo.h + create mode 100644 drivers/gpu/drm/i915/intel_breadcrumbs.c + create mode 100644 drivers/gpu/drm/i915/intel_device_info.c + create mode 100644 drivers/gpu/drm/i915/intel_dp_aux_backlight.c + create mode 100644 drivers/gpu/drm/i915/intel_dpio_phy.c + create mode 100644 drivers/gpu/drm/i915/intel_dsi_dcs_backlight.c + create mode 100644 drivers/gpu/drm/i915/intel_gvt.c + create mode 100644 drivers/gpu/drm/i915/intel_gvt.h + create mode 100644 drivers/gpu/drm/mediatek/mtk_cec.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_cec.h + create mode 100644 drivers/gpu/drm/mediatek/mtk_hdmi.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_hdmi.h + create mode 100644 drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_hdmi_regs.h + create mode 100644 drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c + create mode 100644 drivers/gpu/drm/msm/mdp/mdp5/mdp5_mdss.c + create mode 100644 drivers/gpu/drm/msm/msm_gem_shrinker.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/ce/gp100.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/ce/gp104.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/basegp104.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/coregp100.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/coregp104.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacgp104.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/gp100.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/gp104.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/ovlygp104.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgp100.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgp104.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/gp100.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogp100.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp100.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/gr/gp100.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp100.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp104.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gp100.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mc/gp100.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/pci/gp100.c + delete mode 100644 drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c + delete mode 100644 drivers/gpu/drm/rcar-du/rcar_du_hdmicon.h + create mode 100644 drivers/gpu/drm/vgem/vgem_fence.c + create mode 100644 include/drm/drm_auth.h + create mode 100644 include/drm/drm_fourcc.h + create mode 100644 include/drm/drm_irq.h + create mode 100644 include/drm/drm_simple_kms_helper.h + create mode 100644 include/linux/fence-array.h + create mode 100644 include/uapi/drm/vgem_drm.h + rename include/video/{omapdss.h => omapfb_dss.h} (94%) +$ git am -3 ../patches/0001-staging-android-merge-fix-up-for-sync.h-renaming.patch +Applying: staging/android: merge fix up for sync.h renaming +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/staging/android/sync_debug.h +$ git add -A . +$ git commit -v -a --amend +[master 68516cdc22de] Merge remote-tracking branch 'drm/drm-next' + Date: Fri Jul 29 11:43:33 2016 +1000 +Merging drm-panel/drm/panel/for-next (9bb34c4c730d drm/panel: simple: Add support for Starry KR122EA0SRA panel) +$ git merge drm-panel/drm/panel/for-next +Already up-to-date. +Merging drm-intel/for-linux-next (f15f6ca1e706 drm/i915/gen9: Add WaInPlaceDecompressionHang) +$ git merge drm-intel/for-linux-next +Already up-to-date. +Merging drm-tegra/drm/tegra/for-next (64ea25c3bc86 drm/tegra: sor: Reject HDMI 2.0 modes) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging drm-misc/topic/drm-misc (12ae57aab438 drm/arm: mali-dp: Fix error return code in malidp_bind()) +$ git merge drm-misc/topic/drm-misc +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/arm/malidp_drv.c | 19 ++++++--- + drivers/gpu/drm/bridge/parade-ps8622.c | 4 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 16 +++---- + drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 3 +- + drivers/gpu/drm/gma500/cdv_intel_lvds.c | 9 ++-- + drivers/gpu/drm/gma500/framebuffer.c | 9 ---- + drivers/gpu/drm/gma500/psb_drv.c | 6 +-- + drivers/gpu/drm/gma500/psb_intel_lvds.c | 9 ++-- + drivers/gpu/drm/mgag200/mgag200_main.c | 4 +- + drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 3 +- + drivers/gpu/drm/omapdrm/omap_fb.c | 4 +- + drivers/gpu/drm/qxl/qxl_display.c | 3 +- + drivers/gpu/drm/sti/sti_compositor.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 4 +- + drivers/platform/x86/apple-gmux.c | 55 +++++++++++++------------ + 15 files changed, 66 insertions(+), 86 deletions(-) +Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid) +$ git merge drm-exynos/exynos-drm/for-next +Already up-to-date. +Merging drm-msm/msm-next (0a677125d0ff drm/msm: Delete an unnecessary check before drm_gem_object_unreference()) +$ git merge drm-msm/msm-next +Already up-to-date. +Merging hdlcd/for-upstream/hdlcd (523d939ef98f Linux 4.7) +$ git merge hdlcd/for-upstream/hdlcd +Already up-to-date. +Merging mali-dp/for-upstream/mali-dp (59ba2422b430 MAINTAINERS: Add entry for Mali-DP driver) +$ git merge mali-dp/for-upstream/mali-dp +Already up-to-date. +Merging sunxi/sunxi/for-next (25d6a931b3f3 Merge branches 'sunxi/clk-fixes-for-4.7', 'sunxi/defconfig-for-4.8', 'sunxi/drm-fixes-for-4.7' and 'sunxi/dt-for-4.8' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging kbuild/for-next (f6830d5346c9 Merge branch 'kbuild/misc' into kbuild/for-next) +$ git merge kbuild/for-next +Resolved 'Makefile' using previous resolution. +Auto-merging lib/Kconfig.debug +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging arch/x86/entry/vdso/Makefile +Auto-merging arch/x86/boot/Makefile +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/boot/compressed/Makefile +Auto-merging arch/powerpc/boot/Makefile +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging arch/Kconfig +Auto-merging Makefile +CONFLICT (content): Merge conflict in Makefile +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 187c971dd5fe] Merge remote-tracking branch 'kbuild/for-next' +$ git diff -M --stat --summary HEAD^.. + .cocciconfig | 3 + + .gitignore | 2 + + Documentation/coccinelle.txt | 148 +++- + Documentation/dontdiff | 1 + + Documentation/gcc-plugins.txt | 87 +++ + MAINTAINERS | 9 + + Makefile | 39 +- + arch/Kconfig | 37 + + arch/alpha/boot/Makefile | 2 +- + arch/arm/Kconfig | 1 + + arch/arm64/Kconfig | 1 + + arch/powerpc/boot/Makefile | 2 +- + arch/powerpc/kvm/Makefile | 2 +- + arch/s390/boot/compressed/Makefile | 4 +- + arch/um/Kconfig.common | 1 + + arch/um/Makefile | 4 +- + arch/x86/Kconfig | 1 + + arch/x86/boot/Makefile | 2 +- + arch/x86/entry/vdso/Makefile | 3 +- + arch/x86/purgatory/Makefile | 2 + + arch/x86/realmode/rm/Makefile | 2 +- + include/asm-generic/vmlinux.lds.h | 2 +- + include/linux/export.h | 2 +- + include/linux/kconfig.h | 31 +- + lib/Kconfig.debug | 2 + + scripts/Kbuild.include | 2 +- + scripts/Makefile | 2 +- + scripts/Makefile.build | 2 +- + scripts/Makefile.clean | 4 +- + scripts/Makefile.gcc-plugins | 43 ++ + scripts/Makefile.host | 55 +- + scripts/Makefile.lib | 7 +- + scripts/basic/bin2c.c | 3 +- + scripts/coccicheck | 96 ++- + scripts/coccinelle/free/devm_free.cocci | 26 + + scripts/coccinelle/free/ifnullfree.cocci | 4 +- + scripts/coccinelle/free/kfree.cocci | 18 +- + scripts/coccinelle/free/kfreeaddr.cocci | 6 +- + .../iterators/device_node_continue.cocci | 3 + + scripts/coccinelle/misc/noderef.cocci | 18 +- + scripts/gcc-plugin.sh | 51 ++ + scripts/gcc-plugins/Makefile | 27 + + scripts/gcc-plugins/cyc_complexity_plugin.c | 73 ++ + scripts/gcc-plugins/gcc-common.h | 830 +++++++++++++++++++++ + scripts/gcc-plugins/gcc-generate-gimple-pass.h | 175 +++++ + scripts/gcc-plugins/gcc-generate-ipa-pass.h | 289 +++++++ + scripts/gcc-plugins/gcc-generate-rtl-pass.h | 175 +++++ + scripts/gcc-plugins/gcc-generate-simple_ipa-pass.h | 175 +++++ + scripts/gcc-plugins/sancov_plugin.c | 144 ++++ + scripts/link-vmlinux.sh | 2 +- + scripts/package/builddeb | 12 +- + scripts/setlocalversion | 2 +- + 52 files changed, 2563 insertions(+), 71 deletions(-) + create mode 100644 .cocciconfig + create mode 100644 Documentation/gcc-plugins.txt + create mode 100644 scripts/Makefile.gcc-plugins + create mode 100755 scripts/gcc-plugin.sh + create mode 100644 scripts/gcc-plugins/Makefile + create mode 100644 scripts/gcc-plugins/cyc_complexity_plugin.c + create mode 100644 scripts/gcc-plugins/gcc-common.h + create mode 100644 scripts/gcc-plugins/gcc-generate-gimple-pass.h + create mode 100644 scripts/gcc-plugins/gcc-generate-ipa-pass.h + create mode 100644 scripts/gcc-plugins/gcc-generate-rtl-pass.h + create mode 100644 scripts/gcc-plugins/gcc-generate-simple_ipa-pass.h + create mode 100644 scripts/gcc-plugins/sancov_plugin.c +Merging kspp/for-next/kspp (6fbe16013e52 Merge branch 'for-next/ro_after_init' into for-next/kspp) +$ git merge kspp/for-next/kspp +Resolved 'arch/arm64/include/asm/uaccess.h' using previous resolution. +Resolved 'arch/powerpc/Kconfig' using previous resolution. +Resolved 'arch/x86/kernel/x86_init.c' using previous resolution. +Resolved 'drivers/char/random.c' using previous resolution. +Resolved 'mm/page_alloc.c' using previous resolution. +Auto-merging net/core/dev.c +Auto-merging mm/slub.c +Auto-merging mm/slab.c +Auto-merging mm/page_alloc.c +CONFLICT (content): Merge conflict in mm/page_alloc.c +Auto-merging mm/Makefile +Auto-merging lib/random32.c +Auto-merging kernel/time/timer.c +Auto-merging kernel/sched/fair.c +Auto-merging kernel/rcu/tree.c +Auto-merging kernel/fork.c +Auto-merging init/Kconfig +Auto-merging include/linux/slab.h +Auto-merging include/linux/random.h +Auto-merging include/linux/mmzone.h +Auto-merging include/linux/genhd.h +Auto-merging include/linux/compiler.h +Auto-merging fs/namespace.c +Auto-merging drivers/char/random.c +CONFLICT (content): Merge conflict in drivers/char/random.c +Auto-merging arch/x86/kvm/vmx.c +Auto-merging arch/x86/kernel/x86_init.c +CONFLICT (content): Merge conflict in arch/x86/kernel/x86_init.c +Auto-merging arch/x86/kernel/setup_percpu.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/kernel/reboot.c +Auto-merging arch/x86/kernel/cpu/common.c +Auto-merging arch/x86/kernel/apic/x2apic_uv_x.c +Auto-merging arch/x86/kernel/apic/x2apic_phys.c +Auto-merging arch/x86/kernel/apic/x2apic_cluster.c +Auto-merging arch/x86/kernel/apic/probe_32.c +Auto-merging arch/x86/kernel/apic/bigsmp_32.c +Auto-merging arch/x86/kernel/apic/apic_noop.c +Auto-merging arch/x86/kernel/apic/apic_flat_64.c +Auto-merging arch/x86/include/asm/uaccess.h +Auto-merging arch/x86/include/asm/thread_info.h +Auto-merging arch/x86/include/asm/fpu/xstate.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/lib/uaccess.c +Auto-merging arch/s390/Kconfig +Auto-merging arch/powerpc/kernel/Makefile +Auto-merging arch/powerpc/Kconfig +CONFLICT (content): Merge conflict in arch/powerpc/Kconfig +Auto-merging arch/ia64/Kconfig +Auto-merging arch/arm64/include/asm/uaccess.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/uaccess.h +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/kernel/setup.c +Auto-merging arch/arm/kernel/cpuidle.c +Auto-merging arch/arm/include/asm/uaccess.h +Auto-merging arch/arm/Kconfig +Auto-merging Makefile +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d806935e4f3f] Merge remote-tracking branch 'kspp/for-next/kspp' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 5 + + Makefile | 7 - + arch/Kconfig | 32 ++ + arch/arm/Kconfig | 1 + + arch/arm/include/asm/uaccess.h | 11 +- + arch/arm/kernel/cpuidle.c | 2 +- + arch/arm/kernel/setup.c | 10 +- + arch/arm/kernel/smp.c | 2 +- + arch/arm/lib/delay.c | 2 +- + arch/arm/mm/mmu.c | 9 +- + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/uaccess.h | 15 +- + arch/ia64/Kconfig | 1 + + arch/ia64/include/asm/uaccess.h | 18 +- + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/uaccess.h | 21 +- + arch/powerpc/kernel/Makefile | 5 + + arch/s390/Kconfig | 1 + + arch/s390/lib/uaccess.c | 2 + + arch/sparc/Kconfig | 1 + + arch/sparc/include/asm/uaccess_32.h | 14 +- + arch/sparc/include/asm/uaccess_64.h | 11 +- + arch/x86/Kconfig | 2 + + arch/x86/include/asm/desc.h | 2 +- + arch/x86/include/asm/fpu/xstate.h | 3 +- + arch/x86/include/asm/thread_info.h | 44 ++ + arch/x86/include/asm/uaccess.h | 10 +- + arch/x86/include/asm/uaccess_32.h | 2 + + arch/x86/include/asm/uaccess_64.h | 2 + + arch/x86/kernel/apic/apic_flat_64.c | 6 +- + arch/x86/kernel/apic/apic_noop.c | 2 +- + arch/x86/kernel/apic/bigsmp_32.c | 2 +- + arch/x86/kernel/apic/msi.c | 2 +- + arch/x86/kernel/apic/probe_32.c | 4 +- + arch/x86/kernel/apic/x2apic_cluster.c | 2 +- + arch/x86/kernel/apic/x2apic_phys.c | 2 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 2 +- + arch/x86/kernel/cpu/common.c | 11 +- + arch/x86/kernel/cpu/mtrr/main.c | 4 +- + arch/x86/kernel/cpu/mtrr/mtrr.h | 2 +- + arch/x86/kernel/ksysfs.c | 2 +- + arch/x86/kernel/kvmclock.c | 2 +- + arch/x86/kernel/paravirt.c | 2 +- + arch/x86/kernel/ptrace.c | 6 +- + arch/x86/kernel/reboot.c | 2 +- + arch/x86/kernel/setup.c | 4 +- + arch/x86/kernel/setup_percpu.c | 2 +- + arch/x86/kernel/x86_init.c | 6 +- + arch/x86/kvm/svm.c | 2 +- + arch/x86/kvm/vmx.c | 2 +- + arch/x86/pci/pcbios.c | 7 +- + block/blk-softirq.c | 2 +- + drivers/char/random.c | 4 +- + fs/namespace.c | 1 + + include/linux/compiler-gcc.h | 7 + + include/linux/compiler.h | 4 + + include/linux/fdtable.h | 2 +- + include/linux/genhd.h | 2 +- + include/linux/init.h | 5 +- + include/linux/mmzone.h | 2 + + include/linux/random.h | 15 +- + include/linux/slab.h | 12 + + include/linux/thread_info.h | 24 ++ + init/Kconfig | 2 + + init/main.c | 1 + + kernel/fork.c | 7 +- + kernel/rcu/tiny.c | 2 +- + kernel/rcu/tree.c | 2 +- + kernel/sched/fair.c | 2 +- + kernel/softirq.c | 4 +- + kernel/time/timer.c | 2 +- + lib/irq_poll.c | 2 +- + lib/random32.c | 2 +- + mm/Makefile | 4 + + mm/page_alloc.c | 32 ++ + mm/slab.c | 30 ++ + mm/slub.c | 40 ++ + mm/usercopy.c | 268 ++++++++++++ + net/core/dev.c | 4 +- + scripts/Kbuild.include | 10 +- + scripts/Makefile.gcc-plugins | 45 +- + scripts/gcc-plugin.sh | 14 + + scripts/gcc-plugins/Makefile | 11 +- + scripts/gcc-plugins/latent_entropy_plugin.c | 639 ++++++++++++++++++++++++++++ + security/Kconfig | 28 ++ + 85 files changed, 1424 insertions(+), 120 deletions(-) + create mode 100644 mm/usercopy.c + create mode 100644 scripts/gcc-plugins/latent_entropy_plugin.c +Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate") +$ git merge kconfig/for-next +Already up-to-date. +Merging regmap/for-next (efeb1a3ab91d Merge remote-tracking branches 'regmap/topic/bulk', 'regmap/topic/i2c', 'regmap/topic/iopoll', 'regmap/topic/irq' and 'regmap/topic/maintainers' into regmap-next) +$ git merge regmap/for-next +Already up-to-date. +Merging sound/for-next (0984d159c8ad sound: oss: Use kernel_read_file_from_path() for mod_firmware_load()) +$ git merge sound/for-next +Already up-to-date. +Merging sound-asoc/for-next (e70a386d6f07 Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + sound/soc/sh/rcar/src.c | 6 +++++- + sound/soc/soc-dapm.c | 10 ++++++++++ + 2 files changed, 15 insertions(+), 1 deletion(-) +Merging modules/modules-next (0d21f8f36ab1 modules: add ro_after_init support) +$ git merge modules/modules-next +Auto-merging init/Kconfig +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 3 + + Documentation/module-signing.txt | 6 ++ + include/linux/extable.h | 30 +++++++++ + include/linux/module.h | 37 +++-------- + include/uapi/linux/elf.h | 1 + + init/Kconfig | 1 + + kernel/jump_label.c | 5 +- + kernel/livepatch/core.c | 2 +- + kernel/module.c | 121 +++++++++++++++++++++++++++++------- + 9 files changed, 154 insertions(+), 52 deletions(-) + create mode 100644 include/linux/extable.h +Merging input/next (192bd2be1a75 Input: add driver for Silead touchscreens) +$ git merge input/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/rotary-encoder.txt | 4 + + .../bindings/input/touchscreen/silead_gsl1680.txt | 36 ++ + drivers/input/joystick/xpad.c | 43 ++ + drivers/input/keyboard/cros_ec_keyb.c | 19 +- + drivers/input/misc/rotary_encoder.c | 23 +- + drivers/input/mouse/elantech.c | 8 +- + drivers/input/rmi4/rmi_bus.c | 5 +- + drivers/input/serio/i8042.c | 16 +- + drivers/input/serio/libps2.c | 10 +- + drivers/input/touchscreen/Kconfig | 12 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/silead.c | 568 +++++++++++++++++++++ + include/linux/i8042.h | 6 - + include/linux/serio.h | 24 +- + 14 files changed, 722 insertions(+), 53 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/silead_gsl1680.txt + create mode 100644 drivers/input/touchscreen/silead.c +Merging block/for-next (b013517951a1 Merge branch 'for-4.8/core' into for-next) +$ git merge block/for-next +Merge made by the 'recursive' strategy. +Merging lightnvm/for-next (191d684c5d4f Merge branch 'for-4.8/drivers' into for-next) +$ git merge lightnvm/for-next +Already up-to-date. +Merging device-mapper/for-next (b5ab4a9ba557 dm: allow bio-based table to be upgraded to bio-based with DAX support) +$ git merge device-mapper/for-next +Already up-to-date. +Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) +$ git merge pcmcia/master +Already up-to-date. +Merging mmc-uh/next (d7ccea3cf9b9 mmc: rtsx_pci: Remove deprecated create_singlethread_workqueue) +$ git merge mmc-uh/next +Removing drivers/mmc/host/sdhci-bcm2835.c +Auto-merging drivers/mmc/host/sdhci-acpi.c +Auto-merging drivers/mmc/card/block.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/mmc/brcm,bcm2835-sdhci.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/arasan,sdhci.txt | 35 +- + .../devicetree/bindings/mmc/brcm,bcm2835-sdhci.txt | 18 - + .../devicetree/bindings/mmc/brcm,bcm7425-sdhci.txt | 36 + + .../devicetree/bindings/mmc/fsl-imx-esdhc.txt | 2 + + Documentation/devicetree/bindings/mmc/mmc.txt | 4 + + .../devicetree/bindings/phy/rockchip-emmc-phy.txt | 9 + + Documentation/mmc/mmc-dev-attrs.txt | 2 + + MAINTAINERS | 8 + + drivers/mmc/card/block.c | 13 +- + drivers/mmc/core/bus.c | 3 +- + drivers/mmc/core/core.c | 95 ++- + drivers/mmc/core/debugfs.c | 3 +- + drivers/mmc/core/host.c | 8 + + drivers/mmc/core/mmc.c | 253 ++++--- + drivers/mmc/core/mmc_ops.c | 27 +- + drivers/mmc/core/quirks.c | 2 + + drivers/mmc/core/sd.c | 19 + + drivers/mmc/host/Kconfig | 22 +- + drivers/mmc/host/Makefile | 2 +- + drivers/mmc/host/dw_mmc-exynos.c | 2 +- + drivers/mmc/host/dw_mmc-k3.c | 7 + + drivers/mmc/host/dw_mmc-rockchip.c | 11 +- + drivers/mmc/host/dw_mmc.c | 126 ++-- + drivers/mmc/host/dw_mmc.h | 10 +- + drivers/mmc/host/mtk-sd.c | 70 +- + drivers/mmc/host/mxcmmc.c | 2 +- + drivers/mmc/host/rtsx_pci_sdmmc.c | 16 +- + drivers/mmc/host/s3cmci.c | 2 +- + drivers/mmc/host/s3cmci.h | 2 +- + drivers/mmc/host/sdhci-acpi.c | 8 +- + drivers/mmc/host/sdhci-bcm-kona.c | 8 +- + drivers/mmc/host/sdhci-bcm2835.c | 204 ------ + drivers/mmc/host/sdhci-brcmstb.c | 143 ++++ + drivers/mmc/host/sdhci-cns3xxx.c | 2 +- + drivers/mmc/host/sdhci-dove.c | 2 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 153 +++-- + drivers/mmc/host/sdhci-iproc.c | 15 +- + drivers/mmc/host/sdhci-msm.c | 117 +++- + drivers/mmc/host/sdhci-of-arasan.c | 332 ++++++++- + drivers/mmc/host/sdhci-of-at91.c | 2 +- + drivers/mmc/host/sdhci-of-esdhc.c | 16 +- + drivers/mmc/host/sdhci-of-hlwd.c | 2 +- + drivers/mmc/host/sdhci-pci-core.c | 83 +-- + drivers/mmc/host/sdhci-pci.h | 2 +- + drivers/mmc/host/sdhci-pltfm.c | 13 +- + drivers/mmc/host/sdhci-pltfm.h | 7 - + drivers/mmc/host/sdhci-pxav2.c | 2 +- + drivers/mmc/host/sdhci-pxav3.c | 9 +- + drivers/mmc/host/sdhci-s3c.c | 9 +- + drivers/mmc/host/sdhci-sirf.c | 4 +- + drivers/mmc/host/sdhci-st.c | 2 +- + drivers/mmc/host/sdhci-tegra.c | 51 +- + drivers/mmc/host/sdhci.c | 745 ++++++++++++++------- + drivers/mmc/host/sdhci.h | 30 +- + drivers/mmc/host/sdhci_f_sdh30.c | 2 +- + drivers/mmc/host/sh_mmcif.c | 53 +- + drivers/mmc/host/sh_mobile_sdhi.c | 14 +- + drivers/mmc/host/tmio_mmc.h | 2 +- + drivers/mmc/host/tmio_mmc_pio.c | 2 +- + drivers/phy/phy-rockchip-emmc.c | 241 +++++-- + include/linux/mmc/card.h | 36 +- + include/linux/mmc/dw_mmc.h | 9 - + include/linux/mmc/host.h | 14 + + include/linux/mmc/mmc.h | 3 + + include/linux/platform_data/mmc-esdhc-imx.h | 1 + + 65 files changed, 2127 insertions(+), 1020 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mmc/brcm,bcm2835-sdhci.txt + create mode 100644 Documentation/devicetree/bindings/mmc/brcm,bcm7425-sdhci.txt + delete mode 100644 drivers/mmc/host/sdhci-bcm2835.c + create mode 100644 drivers/mmc/host/sdhci-brcmstb.c +Merging md/for-next (5d8817833c76 MD: fix null pointer deference) +$ git merge md/for-next +Resolved 'drivers/md/raid1.c' using previous resolution. +Resolved 'drivers/md/raid10.c' using previous resolution. +Auto-merging drivers/md/raid5.c +Auto-merging drivers/md/raid10.c +CONFLICT (content): Merge conflict in drivers/md/raid10.c +Auto-merging drivers/md/raid1.c +CONFLICT (content): Merge conflict in drivers/md/raid1.c +Auto-merging drivers/md/multipath.c +Auto-merging drivers/md/md.h +Auto-merging drivers/md/md.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f00422ada628] Merge remote-tracking branch 'md/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/md/md.c | 74 +++++++++++---- + drivers/md/md.h | 10 +- + drivers/md/multipath.c | 29 +++--- + drivers/md/raid1.c | 133 +++++++++++++------------- + drivers/md/raid10.c | 250 ++++++++++++++++++++++++++++++------------------- + drivers/md/raid10.h | 3 +- + drivers/md/raid5.c | 45 +++++---- + 7 files changed, 330 insertions(+), 214 deletions(-) +Merging mfd/for-mfd-next (f37be01e6dc6 mfd: qcom_rpm: Parametrize also ack selector size) +$ git merge mfd/for-mfd-next +Auto-merging drivers/mfd/max77620.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/twl6040.txt | 4 +- + MAINTAINERS | 11 ++ + drivers/mfd/Kconfig | 17 ++- + drivers/mfd/Makefile | 2 + + drivers/mfd/altera-a10sr.c | 169 ++++++++++++++++++++++ + drivers/mfd/arizona-core.c | 4 +- + drivers/mfd/arizona-irq.c | 16 +- + drivers/mfd/axp20x.c | 17 +++ + drivers/mfd/dm355evm_msp.c | 7 +- + drivers/mfd/hi655x-pmic.c | 59 +++++--- + drivers/mfd/kempld-core.c | 16 ++ + drivers/mfd/max14577.c | 2 +- + drivers/mfd/max77620.c | 75 +++++++--- + drivers/mfd/max77843.c | 24 +-- + drivers/mfd/max8925-i2c.c | 14 +- + drivers/mfd/max8997.c | 30 +--- + drivers/mfd/max8998.c | 27 +--- + drivers/mfd/omap-usb-tll.c | 2 + + drivers/mfd/qcom_rpm.c | 57 ++++++-- + drivers/mfd/si476x-i2c.c | 2 +- + drivers/mfd/smsc-ece1099.c | 11 +- + drivers/mfd/stmpe.c | 40 +++-- + drivers/mfd/ti_am335x_tscadc.c | 135 +++++++---------- + drivers/mfd/tps6507x.c | 4 +- + drivers/mfd/twl-core.c | 28 ++-- + drivers/mfd/twl6040.c | 41 ++++-- + include/linux/mfd/altera-a10sr.h | 85 +++++++++++ + include/linux/mfd/arizona/registers.h | 6 - + include/linux/mfd/hi655x-pmic.h | 25 +++- + include/linux/mfd/stmpe.h | 22 +-- + include/linux/mfd/ti_am335x_tscadc.h | 2 +- + include/linux/mfd/twl6040.h | 5 +- + 32 files changed, 635 insertions(+), 324 deletions(-) + create mode 100644 drivers/mfd/altera-a10sr.c + create mode 100644 include/linux/mfd/altera-a10sr.h +Merging backlight/for-backlight-next (602553073892 backlight: lp855x: Add enable regulator) +$ git merge backlight/for-backlight-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/backlight/lp855x.txt | 2 ++ + drivers/video/backlight/lp855x_bl.c | 29 ++++++++++++++++++++++ + 2 files changed, 31 insertions(+) +Merging battery/master (4fcd504edbf7 power: reset: add reboot mode driver) +$ git merge battery/master +Already up-to-date. +Merging omap_dss2/for-next (ab366b40b851 fbdev: Use IS_ENABLED() instead of checking for built-in or module) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (a485f5fc8c8e Merge remote-tracking branches 'regulator/topic/qcom-spmi', 'regulator/topic/rn5t618', 'regulator/topic/tps65218' and 'regulator/topic/twl' into regulator-next) +$ git merge regulator/for-next +Already up-to-date. +Merging security/next (7616ac70d1bb apparmor: fix SECURITY_APPARMOR_HASH_DEFAULT parameter handling) +$ git merge security/next +Resolved 'Documentation/devicetree/bindings/vendor-prefixes.txt' using previous resolution. +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging security/apparmor/lsm.c +Auto-merging net/iucv/af_iucv.c +Auto-merging net/ipv6/tcp_ipv6.c +Auto-merging net/ipv6/af_inet6.c +Auto-merging net/ipv4/tcp_input.c +Auto-merging net/dccp/ipv6.c +Auto-merging include/uapi/linux/Kbuild +Auto-merging arch/x86/entry/vsyscall/vsyscall_64.c +Auto-merging arch/x86/entry/common.c +Auto-merging arch/powerpc/kernel/ptrace.c +Auto-merging arch/arm64/kernel/ptrace.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt +Auto-merging Documentation/devicetree/bindings/i2c/trivial-devices.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 965cf559d7b1] Merge remote-tracking branch 'security/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/i2c/trivial-devices.txt | 1 + + .../bindings/security/tpm/tpm_tis_spi.txt | 24 + + .../devicetree/bindings/vendor-prefixes.txt | 2 + + Documentation/ioctl/ioctl-number.txt | 1 + + Documentation/tpm/tpm_vtpm_proxy.txt | 71 + + MAINTAINERS | 4 +- + arch/arm/kernel/ptrace.c | 13 +- + arch/arm64/kernel/ptrace.c | 8 +- + arch/mips/kernel/ptrace.c | 9 +- + arch/parisc/kernel/ptrace.c | 9 +- + arch/powerpc/kernel/ptrace.c | 46 +- + arch/s390/kernel/ptrace.c | 21 +- + arch/tile/kernel/ptrace.c | 11 +- + arch/um/kernel/skas/syscall.c | 9 +- + arch/x86/entry/common.c | 106 +- + arch/x86/entry/vsyscall/vsyscall_64.c | 2 +- + arch/x86/include/asm/ptrace.h | 6 - + drivers/char/tpm/Kconfig | 30 + + drivers/char/tpm/Makefile | 3 + + drivers/char/tpm/st33zp24/Kconfig | 11 +- + drivers/char/tpm/st33zp24/i2c.c | 70 +- + drivers/char/tpm/st33zp24/spi.c | 184 ++- + drivers/char/tpm/st33zp24/st33zp24.c | 129 +- + drivers/char/tpm/st33zp24/st33zp24.h | 14 +- + drivers/char/tpm/tpm-chip.c | 299 ++-- + drivers/char/tpm/tpm-dev.c | 15 +- + drivers/char/tpm/tpm-interface.c | 132 +- + drivers/char/tpm/tpm-sysfs.c | 78 +- + drivers/char/tpm/tpm.h | 82 +- + drivers/char/tpm/tpm2-cmd.c | 59 +- + drivers/char/tpm/tpm_atmel.c | 63 +- + drivers/char/tpm/tpm_atmel.h | 16 +- + drivers/char/tpm/tpm_crb.c | 85 +- + drivers/char/tpm/tpm_eventlog.c | 2 +- + drivers/char/tpm/tpm_eventlog.h | 4 +- + drivers/char/tpm/tpm_i2c_atmel.c | 45 +- + drivers/char/tpm/tpm_i2c_infineon.c | 59 +- + drivers/char/tpm/tpm_i2c_nuvoton.c | 131 +- + drivers/char/tpm/tpm_ibmvtpm.c | 38 +- + drivers/char/tpm/tpm_infineon.c | 22 +- + drivers/char/tpm/tpm_nsc.c | 84 +- + drivers/char/tpm/tpm_tis.c | 829 +---------- + drivers/char/tpm/tpm_tis_core.c | 835 +++++++++++ + drivers/char/tpm/tpm_tis_core.h | 156 +++ + drivers/char/tpm/tpm_tis_spi.c | 272 ++++ + drivers/char/tpm/tpm_vtpm_proxy.c | 637 +++++++++ + drivers/char/tpm/xen-tpmfront.c | 36 +- + include/keys/rxrpc-type.h | 2 +- + include/linux/capability.h | 5 + + include/linux/platform_data/st33zp24.h | 2 +- + include/linux/seccomp.h | 14 +- + include/linux/tpm.h | 5 + + include/net/calipso.h | 91 ++ + include/net/inet_sock.h | 7 +- + include/net/ipv6.h | 10 +- + include/net/netlabel.h | 101 +- + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/audit.h | 2 + + include/uapi/linux/in6.h | 1 + + include/uapi/linux/vtpm_proxy.h | 36 + + kernel/capability.c | 46 +- + kernel/seccomp.c | 144 +- + net/dccp/ipv6.c | 12 +- + net/ipv4/cipso_ipv4.c | 88 +- + net/ipv4/tcp_input.c | 3 + + net/ipv6/Makefile | 1 + + net/ipv6/af_inet6.c | 9 +- + net/ipv6/calipso.c | 1473 ++++++++++++++++++++ + net/ipv6/exthdrs.c | 76 + + net/ipv6/exthdrs_core.c | 2 +- + net/ipv6/ipv6_sockglue.c | 1 - + net/ipv6/sysctl_net_ipv6.c | 19 + + net/ipv6/tcp_ipv6.c | 12 +- + net/iucv/af_iucv.c | 5 +- + net/netlabel/Kconfig | 1 + + net/netlabel/Makefile | 2 +- + net/netlabel/netlabel_calipso.c | 740 ++++++++++ + net/netlabel/netlabel_calipso.h | 151 ++ + net/netlabel/netlabel_domainhash.c | 293 +++- + net/netlabel/netlabel_domainhash.h | 17 +- + net/netlabel/netlabel_kapi.c | 394 +++++- + net/netlabel/netlabel_mgmt.c | 85 +- + net/netlabel/netlabel_mgmt.h | 27 +- + net/netlabel/netlabel_unlabeled.c | 5 +- + net/netlabel/netlabel_user.c | 5 + + net/sysctl_net.c | 2 +- + samples/Kconfig | 7 + + samples/seccomp/Makefile | 2 +- + scripts/sign-file.c | 34 +- + security/apparmor/Kconfig | 21 +- + security/apparmor/apparmorfs.c | 11 +- + security/apparmor/audit.c | 3 +- + security/apparmor/crypto.c | 3 + + security/apparmor/domain.c | 22 +- + security/apparmor/file.c | 3 +- + security/apparmor/include/apparmor.h | 1 + + security/apparmor/include/match.h | 1 + + security/apparmor/include/policy.h | 2 + + security/apparmor/lsm.c | 30 +- + security/apparmor/match.c | 16 +- + security/apparmor/path.c | 61 +- + security/apparmor/policy.c | 61 +- + security/apparmor/policy_unpack.c | 7 +- + security/apparmor/resource.c | 6 +- + security/integrity/iint.c | 2 + + security/integrity/ima/ima.h | 11 +- + security/integrity/ima/ima_api.c | 21 +- + security/integrity/ima/ima_appraise.c | 3 +- + security/integrity/ima/ima_fs.c | 9 +- + security/integrity/ima/ima_init.c | 3 +- + security/integrity/ima/ima_main.c | 12 +- + security/integrity/ima/ima_policy.c | 35 +- + security/integrity/ima/ima_queue.c | 13 +- + security/integrity/integrity.h | 1 + + security/keys/persistent.c | 2 +- + security/keys/request_key.c | 2 +- + security/security.c | 29 +- + security/selinux/hooks.c | 21 +- + security/selinux/include/netlabel.h | 4 +- + security/selinux/netlabel.c | 36 +- + security/selinux/selinuxfs.c | 2 +- + security/selinux/ss/ebitmap.c | 2 +- + security/selinux/ss/services.c | 70 +- + security/smack/smack_lsm.c | 5 +- + security/tomoyo/gc.c | 9 +- + tools/testing/selftests/seccomp/seccomp_bpf.c | 176 ++- + 126 files changed, 7281 insertions(+), 2131 deletions(-) + create mode 100644 Documentation/devicetree/bindings/security/tpm/tpm_tis_spi.txt + create mode 100644 Documentation/tpm/tpm_vtpm_proxy.txt + create mode 100644 drivers/char/tpm/tpm_tis_core.c + create mode 100644 drivers/char/tpm/tpm_tis_core.h + create mode 100644 drivers/char/tpm/tpm_tis_spi.c + create mode 100644 drivers/char/tpm/tpm_vtpm_proxy.c + create mode 100644 include/net/calipso.h + create mode 100644 include/uapi/linux/vtpm_proxy.h + create mode 100644 net/ipv6/calipso.c + create mode 100644 net/netlabel/netlabel_calipso.c + create mode 100644 net/netlabel/netlabel_calipso.h +Merging integrity/next (544e1cea03e6 ima: extend the measurement entry specific pcr) +$ git merge integrity/next +Already up-to-date. +Merging keys/keys-next (05638c9bc586 Merge branch 'keys-asym-keyctl' into keys-next) +$ git merge keys/keys-next +Auto-merging crypto/asymmetric_keys/pkcs7_verify.c +Auto-merging Documentation/crypto/asymmetric-keys.txt +Merge made by the 'recursive' strategy. + Documentation/crypto/asymmetric-keys.txt | 26 ++- + Documentation/security/keys.txt | 217 ++++++++++++++++++++ + certs/Kconfig | 18 ++ + certs/Makefile | 6 + + certs/blacklist.c | 174 ++++++++++++++++ + certs/blacklist.h | 3 + + certs/blacklist_hashes.c | 6 + + certs/blacklist_nohashes.c | 5 + + crypto/asymmetric_keys/Kconfig | 10 + + crypto/asymmetric_keys/Makefile | 13 ++ + crypto/asymmetric_keys/asymmetric_keys.h | 3 + + crypto/asymmetric_keys/asymmetric_type.c | 59 +++++- + crypto/asymmetric_keys/pkcs7_parser.c | 1 + + crypto/asymmetric_keys/pkcs7_parser.h | 1 + + crypto/asymmetric_keys/pkcs7_verify.c | 32 ++- + crypto/asymmetric_keys/pkcs8.asn1 | 24 +++ + crypto/asymmetric_keys/pkcs8_parser.c | 184 +++++++++++++++++ + crypto/asymmetric_keys/public_key.c | 195 ++++++++++++++++-- + crypto/asymmetric_keys/signature.c | 95 +++++++++ + crypto/asymmetric_keys/x509_cert_parser.c | 21 +- + crypto/asymmetric_keys/x509_parser.h | 1 + + crypto/asymmetric_keys/x509_public_key.c | 15 ++ + include/crypto/public_key.h | 14 +- + include/keys/asymmetric-subtype.h | 9 + + include/keys/system_keyring.h | 12 ++ + include/linux/key-type.h | 11 + + include/linux/keyctl.h | 46 +++++ + include/uapi/linux/keyctl.h | 30 +++ + security/keys/Makefile | 1 + + security/keys/compat.c | 18 ++ + security/keys/internal.h | 39 ++++ + security/keys/keyctl.c | 24 +++ + security/keys/keyctl_pkey.c | 323 ++++++++++++++++++++++++++++++ + 33 files changed, 1584 insertions(+), 52 deletions(-) + create mode 100644 certs/blacklist.c + create mode 100644 certs/blacklist.h + create mode 100644 certs/blacklist_hashes.c + create mode 100644 certs/blacklist_nohashes.c + create mode 100644 crypto/asymmetric_keys/pkcs8.asn1 + create mode 100644 crypto/asymmetric_keys/pkcs8_parser.c + create mode 100644 include/linux/keyctl.h + create mode 100644 security/keys/keyctl_pkey.c +Merging selinux/next (3f09354ac84c netlabel: Implement CALIPSO config functions for SMACK.) +$ git merge selinux/next +Already up-to-date. +Merging tpmdd/next (82cc1a49b635 tpm: Add TPM 2.0 support to the Nuvoton i2c driver (NPCT6xx family)) +$ git merge tpmdd/next +Already up-to-date. +Merging watchdog/master (1ac06563434e watchdog: gpio_wdt: Fix missing platform_set_drvdata() in gpio_wdt_probe()) +$ git merge watchdog/master +Auto-merging arch/arm/boot/dts/qcom-ipq4019.dtsi +Auto-merging arch/arm/boot/dts/qcom-apq8064.dtsi +Auto-merging MAINTAINERS +Auto-merging Documentation/driver-model/devres.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/watchdog/aspeed-wdt.txt | 16 ++ + .../bindings/watchdog/meson-gxbb-wdt.txt | 16 ++ + .../devicetree/bindings/watchdog/qcom-wdt.txt | 4 + + .../devicetree/bindings/watchdog/renesas-wdt.txt | 6 +- + Documentation/driver-model/devres.txt | 3 + + Documentation/watchdog/hpwdt.txt | 5 +- + Documentation/watchdog/src/watchdog-test.c | 39 +-- + Documentation/watchdog/watchdog-kernel-api.txt | 9 +- + MAINTAINERS | 6 + + arch/arm/boot/dts/qcom-apq8064.dtsi | 3 +- + arch/arm/boot/dts/qcom-ipq4019.dtsi | 2 +- + arch/arm/boot/dts/qcom-ipq8064.dtsi | 3 +- + arch/arm/boot/dts/qcom-msm8960.dtsi | 3 +- + drivers/platform/x86/intel_pmc_ipc.c | 10 +- + drivers/watchdog/Kconfig | 33 ++- + drivers/watchdog/Makefile | 3 + + drivers/watchdog/aspeed_wdt.c | 212 ++++++++++++++++ + drivers/watchdog/bcm2835_wdt.c | 11 +- + drivers/watchdog/da9063_wdt.c | 2 + + drivers/watchdog/f71808e_wdt.c | 28 ++- + drivers/watchdog/gpio_wdt.c | 2 + + drivers/watchdog/iTCO_wdt.c | 2 + + drivers/watchdog/max77620_wdt.c | 227 +++++++++++++++++ + drivers/watchdog/meson_gxbb_wdt.c | 270 +++++++++++++++++++++ + drivers/watchdog/nv_tco.c | 2 + + drivers/watchdog/pcwd.c | 14 +- + drivers/watchdog/pic32-dmt.c | 5 +- + drivers/watchdog/pic32-wdt.c | 9 +- + drivers/watchdog/qcom-wdt.c | 69 ++++-- + drivers/watchdog/sbsa_gwdt.c | 16 +- + drivers/watchdog/sirfsoc_wdt.c | 15 +- + drivers/watchdog/softdog.c | 92 ++----- + drivers/watchdog/tangox_wdt.c | 4 +- + drivers/watchdog/watchdog_core.c | 39 ++- + drivers/watchdog/watchdog_dev.c | 61 +++-- + drivers/watchdog/ziirave_wdt.c | 2 +- + include/linux/watchdog.h | 6 +- + 37 files changed, 1062 insertions(+), 187 deletions(-) + create mode 100644 Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/meson-gxbb-wdt.txt + create mode 100644 drivers/watchdog/aspeed_wdt.c + create mode 100644 drivers/watchdog/max77620_wdt.c + create mode 100644 drivers/watchdog/meson_gxbb_wdt.c +Merging iommu/next (f360d3241f55 Merge branches 'x86/amd', 'x86/vt-d', 'arm/exynos', 'arm/mediatek', 'arm/msm', 'arm/rockchip', 'arm/smmu' and 'core' into next) +$ git merge iommu/next +Resolved 'drivers/iommu/mtk_iommu.c' using previous resolution. +Auto-merging drivers/iommu/mtk_iommu.c +CONFLICT (content): Merge conflict in drivers/iommu/mtk_iommu.c +Removing drivers/iommu/msm_iommu_dev.c +Auto-merging drivers/iommu/intel-iommu.c +Auto-merging drivers/iommu/dmar.c +Auto-merging drivers/iommu/amd_iommu_v2.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1001a4dfeba3] Merge remote-tracking branch 'iommu/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/iommu/arm,smmu-v3.txt | 2 +- + .../devicetree/bindings/iommu/mediatek,iommu.txt | 13 +- + .../devicetree/bindings/iommu/msm,iommu-v0.txt | 64 ++ + .../memory-controllers/mediatek,smi-common.txt | 21 +- + .../memory-controllers/mediatek,smi-larb.txt | 4 +- + MAINTAINERS | 1 + + drivers/iommu/Kconfig | 21 +- + drivers/iommu/Makefile | 3 +- + drivers/iommu/amd_iommu.c | 1032 ++++++++------------ + drivers/iommu/amd_iommu_types.h | 1 - + drivers/iommu/amd_iommu_v2.c | 2 +- + drivers/iommu/arm-smmu-v3.c | 2 + + drivers/iommu/arm-smmu.c | 28 +- + drivers/iommu/dmar.c | 21 +- + drivers/iommu/exynos-iommu.c | 107 +- + drivers/iommu/intel-iommu.c | 6 +- + drivers/iommu/io-pgtable-arm.c | 2 +- + drivers/iommu/iommu.c | 32 +- + drivers/iommu/msm_iommu.c | 870 +++++++++-------- + drivers/iommu/msm_iommu.h | 73 +- + drivers/iommu/msm_iommu_dev.c | 381 -------- + drivers/iommu/mtk_iommu.c | 49 +- + drivers/iommu/mtk_iommu.h | 77 ++ + drivers/iommu/mtk_iommu_v1.c | 727 ++++++++++++++ + drivers/iommu/rockchip-iommu.c | 181 +++- + drivers/memory/mtk-smi.c | 167 +++- + include/dt-bindings/memory/mt2701-larb-port.h | 85 ++ + include/linux/iommu.h | 3 + + 28 files changed, 2316 insertions(+), 1659 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iommu/msm,iommu-v0.txt + delete mode 100644 drivers/iommu/msm_iommu_dev.c + create mode 100644 drivers/iommu/mtk_iommu.h + create mode 100644 drivers/iommu/mtk_iommu_v1.c + create mode 100644 include/dt-bindings/memory/mt2701-larb-port.h +Merging dwmw2-iommu/master (2566278551d3 Merge git://git.infradead.org/intel-iommu) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (0991bbdbf5b8 vfio: platform: check reset call return code during release) +$ git merge vfio/next +Merge made by the 'recursive' strategy. + drivers/vfio/pci/vfio_pci.c | 88 +++++++++++- + drivers/vfio/pci/vfio_pci_private.h | 8 ++ + drivers/vfio/platform/vfio_amba.c | 1 + + drivers/vfio/platform/vfio_platform.c | 5 + + drivers/vfio/platform/vfio_platform_common.c | 198 +++++++++++++++++++++----- + drivers/vfio/platform/vfio_platform_private.h | 9 +- + drivers/vfio/vfio.c | 2 +- + 7 files changed, 267 insertions(+), 44 deletions(-) +Merging jc_docs/docs-next (a88b1672d4dd doc-rst: kernel-doc: fix handling of address_space tags) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging trivial/for-next (34df117414d7 fat: fix error message for bogus number of directory entries) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/next (43761473c254 audit: fix a double fetch in audit_log_single_execve_arg()) +$ git merge audit/next +Resolved 'arch/s390/kernel/ptrace.c' using previous resolution. +Auto-merging kernel/auditsc.c +Auto-merging kernel/audit.h +Auto-merging kernel/audit.c +Auto-merging arch/s390/kernel/ptrace.c +CONFLICT (content): Merge conflict in arch/s390/kernel/ptrace.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9a24944ae02f] Merge remote-tracking branch 'audit/next' +$ git diff -M --stat --summary HEAD^.. + arch/s390/kernel/ptrace.c | 11 +- + include/linux/audit.h | 2 - + kernel/audit.c | 4 +- + kernel/audit.h | 2 + + kernel/auditfilter.c | 147 +++++++------------- + kernel/auditsc.c | 342 +++++++++++++++++++++++----------------------- + 6 files changed, 236 insertions(+), 272 deletions(-) +Merging devicetree/for-next (e973f4ec130a xtensa: Partially Revert "xtensa: Remove unnecessary of_platform_populate with default match table") +$ git merge devicetree/for-next +Resolved 'arch/arc/kernel/setup.c' using previous resolution. +Resolved 'arch/arm/mach-bcm/board_bcm21664.c' using previous resolution. +Resolved 'arch/arm/mach-imx/mach-imx51.c' using previous resolution. +Auto-merging drivers/of/of_reserved_mem.c +Auto-merging drivers/of/fdt.c +Auto-merging drivers/of/base.c +Auto-merging drivers/memory/omap-gpmc.c +Auto-merging arch/sh/boards/of-generic.c +Auto-merging arch/mips/pistachio/init.c +Removing arch/c6x/platforms/platform.c +Auto-merging arch/arm64/kernel/setup.c +Auto-merging arch/arm/mach-tegra/tegra.c +Auto-merging arch/arm/mach-mvebu/kirkwood.c +Auto-merging arch/arm/mach-imx/mach-imx7d.c +Auto-merging arch/arm/mach-imx/mach-imx6ul.c +Auto-merging arch/arm/mach-imx/mach-imx6sx.c +Auto-merging arch/arm/mach-imx/mach-imx6sl.c +Auto-merging arch/arm/mach-imx/mach-imx6q.c +Auto-merging arch/arm/mach-imx/mach-imx53.c +Auto-merging arch/arm/mach-imx/mach-imx51.c +CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx51.c +Auto-merging arch/arm/mach-exynos/exynos.c +Auto-merging arch/arm/mach-bcm/board_bcm21664.c +CONFLICT (content): Merge conflict in arch/arm/mach-bcm/board_bcm21664.c +Auto-merging arch/arm/kernel/setup.c +Auto-merging arch/arm/boot/dts/imx51-ts4800.dts +Auto-merging arch/arc/kernel/setup.c +CONFLICT (content): Merge conflict in arch/arc/kernel/setup.c +Auto-merging Documentation/devicetree/bindings/net/dsa/dsa.txt +Auto-merging Documentation/devicetree/bindings/i2c/trivial-devices.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 882567e35a1f] Merge remote-tracking branch 'devicetree/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/arm/coresight.txt | 35 +- + Documentation/devicetree/bindings/arm/l2c2x0.txt | 4 +- + .../devicetree/bindings/i2c/trivial-devices.txt | 8 +- + .../devicetree/bindings/net/cavium-pip.txt | 6 + + Documentation/devicetree/bindings/net/dsa/dsa.txt | 2 +- + .../devicetree/bindings/powerpc/fsl/fman.txt | 4 +- + .../devicetree/bindings/regmap/regmap.txt | 2 +- + .../devicetree/bindings/serial/qcom,msm-uartdm.txt | 4 +- + .../devicetree/bindings/sound/simple-card.txt | 2 +- + .../bindings/timer/allwinner,sun5i-a13-hstimer.txt | 2 +- + arch/arc/kernel/setup.c | 7 - + arch/arm/boot/dts/imx28-m28.dtsi | 2 +- + arch/arm/boot/dts/imx51-ts4800.dts | 2 +- + arch/arm/boot/dts/imx53-m53.dtsi | 2 +- + arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 2 +- + arch/arm/boot/dts/socfpga_cyclone5_socrates.dts | 2 +- + arch/arm/kernel/setup.c | 8 +- + arch/arm/mach-artpec/board-artpec6.c | 3 - + arch/arm/mach-at91/at91rm9200.c | 2 +- + arch/arm/mach-at91/at91sam9.c | 2 +- + arch/arm/mach-at91/sama5.c | 2 +- + arch/arm/mach-bcm/board_bcm21664.c | 3 - + arch/arm/mach-bcm/board_bcm281xx.c | 2 - + arch/arm/mach-bcm/board_bcm2835.c | 10 - + arch/arm/mach-cns3xxx/core.c | 3 +- + arch/arm/mach-exynos/exynos.c | 3 - + arch/arm/mach-highbank/highbank.c | 3 - + arch/arm/mach-imx/mach-imx51.c | 2 - + arch/arm/mach-imx/mach-imx53.c | 2 - + arch/arm/mach-imx/mach-imx6q.c | 2 +- + arch/arm/mach-imx/mach-imx6sl.c | 2 +- + arch/arm/mach-imx/mach-imx6sx.c | 2 +- + arch/arm/mach-imx/mach-imx6ul.c | 1 - + arch/arm/mach-imx/mach-imx7d.c | 1 - + arch/arm/mach-integrator/integrator_ap.c | 3 +- + arch/arm/mach-integrator/integrator_cp.c | 3 +- + arch/arm/mach-keystone/keystone.c | 1 - + arch/arm/mach-lpc32xx/phy3250.c | 3 +- + arch/arm/mach-mvebu/board-v7.c | 3 - + arch/arm/mach-mvebu/dove.c | 2 - + arch/arm/mach-mvebu/kirkwood.c | 2 +- + arch/arm/mach-mxs/mach-mxs.c | 3 +- + arch/arm/mach-nspire/nspire.c | 3 +- + arch/arm/mach-orion5x/board-dt.c | 3 +- + arch/arm/mach-picoxcell/common.c | 2 - + arch/arm/mach-rockchip/rockchip.c | 1 - + arch/arm/mach-s3c24xx/mach-s3c2416-dt.c | 2 - + arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c | 3 - + arch/arm/mach-shmobile/setup-r8a7740.c | 3 - + arch/arm/mach-shmobile/setup-sh73a0.c | 2 - + arch/arm/mach-spear/spear1310.c | 2 - + arch/arm/mach-spear/spear1340.c | 1 - + arch/arm/mach-spear/spear300.c | 3 +- + arch/arm/mach-spear/spear310.c | 3 +- + arch/arm/mach-spear/spear320.c | 3 +- + arch/arm/mach-spear/spear6xx.c | 3 +- + arch/arm/mach-tegra/tegra.c | 2 +- + arch/arm/mach-u300/core.c | 3 +- + arch/arm/mach-versatile/versatile_dt.c | 3 +- + arch/arm/mach-vt8500/vt8500.c | 3 - + arch/arm/mach-zynq/common.c | 2 +- + arch/arm64/kernel/setup.c | 15 - + arch/c6x/platforms/Makefile | 2 +- + arch/c6x/platforms/platform.c | 17 - + arch/cris/kernel/setup.c | 8 - + arch/metag/kernel/setup.c | 5 +- + arch/mips/ath79/setup.c | 2 - + arch/mips/jz4740/setup.c | 8 - + arch/mips/mti-sead3/sead3-setup.c | 8 - + arch/mips/pic32/pic32mzda/init.c | 3 +- + arch/mips/pistachio/init.c | 13 - + arch/mips/xilfpga/init.c | 13 - + arch/nios2/platform/platform.c | 4 +- + arch/powerpc/boot/dts/ac14xx.dts | 2 +- + arch/powerpc/boot/dts/akebono.dts | 2 +- + arch/powerpc/boot/dts/bluestone.dts | 2 +- + arch/powerpc/boot/dts/canyonlands.dts | 2 +- + arch/powerpc/boot/dts/currituck.dts | 2 +- + arch/powerpc/boot/dts/fsl/mpc8569mds.dts | 2 +- + arch/powerpc/boot/dts/fsl/p1022rdk.dts | 2 +- + arch/powerpc/boot/dts/glacier.dts | 2 +- + arch/powerpc/boot/dts/icon.dts | 2 +- + arch/powerpc/boot/dts/mpc5121ads.dts | 2 +- + arch/powerpc/boot/dts/mpc8349emitx.dts | 2 +- + arch/powerpc/boot/dts/mpc836x_rdk.dts | 2 +- + arch/powerpc/boot/dts/pdm360ng.dts | 2 +- + arch/powerpc/boot/dts/sam440ep.dts | 2 +- + arch/powerpc/boot/dts/xcalibur1501.dts | 2 +- + arch/powerpc/boot/dts/xpedite5200.dts | 2 +- + arch/powerpc/boot/dts/xpedite5200_xmon.dts | 2 +- + arch/powerpc/boot/dts/xpedite5301.dts | 2 +- + arch/powerpc/boot/dts/xpedite5330.dts | 2 +- + arch/powerpc/boot/dts/xpedite5370.dts | 2 +- + arch/sh/boards/of-generic.c | 16 - + arch/xtensa/kernel/setup.c | 3 +- + drivers/bus/imx-weim.c | 5 +- + drivers/bus/uniphier-system-bus.c | 3 +- + drivers/iommu/of_iommu.c | 5 +- + drivers/memory/omap-gpmc.c | 3 +- + drivers/of/address.c | 49 +- + drivers/of/base.c | 41 +- + drivers/of/dynamic.c | 49 +- + drivers/of/fdt.c | 25 +- + drivers/of/fdt_address.c | 35 +- + drivers/of/irq.c | 4 + + drivers/of/of_pci.c | 6 +- + drivers/of/of_private.h | 3 + + drivers/of/of_reserved_mem.c | 22 +- + drivers/of/overlay.c | 43 +- + drivers/of/platform.c | 37 +- + drivers/of/resolver.c | 8 + + drivers/of/unittest.c | 5 +- + include/linux/of_iommu.h | 2 - + scripts/dtc/dt_to_config | 1213 ++++++++++++++++++++ + scripts/dtc/dtx_diff | 2 +- + 115 files changed, 1510 insertions(+), 413 deletions(-) + delete mode 100644 arch/c6x/platforms/platform.c + create mode 100755 scripts/dtc/dt_to_config +Merging mailbox/mailbox-for-next (a68b216676e8 mailbox: Fix format and type mismatches in Broadcom PDC driver) +$ git merge mailbox/mailbox-for-next +Merge made by the 'recursive' strategy. + .../bindings/mailbox/brcm,iproc-pdc-mbox.txt | 23 + + drivers/mailbox/Kconfig | 9 + + drivers/mailbox/Makefile | 2 + + drivers/mailbox/bcm-pdc-mailbox.c | 1531 ++++++++++++++++++++ + drivers/mailbox/mailbox-test.c | 1 + + drivers/mailbox/pl320-ipc.c | 46 +- + include/linux/mailbox/brcm-message.h | 56 + + 7 files changed, 1645 insertions(+), 23 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mailbox/brcm,iproc-pdc-mbox.txt + create mode 100644 drivers/mailbox/bcm-pdc-mailbox.c + create mode 100644 include/linux/mailbox/brcm-message.h +Merging spi/for-next (2932c287108e spi: img-spfi: Remove spi_master_put in img_spfi_remove()) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + drivers/spi/spi-img-spfi.c | 2 -- + drivers/spi/spi-mt65xx.c | 1 - + drivers/spi/spi-qup.c | 1 - + 3 files changed, 4 deletions(-) +Merging tip/auto-latest (0bd99d3b2034 Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Resolved 'arch/arm/xen/enlighten.c' using previous resolution. +Auto-merging virt/kvm/kvm_main.c +Auto-merging kernel/workqueue.c +Auto-merging kernel/time/timer.c +Auto-merging kernel/rcu/tree.c +Auto-merging kernel/events/core.c +Auto-merging include/linux/perf_event.h +Auto-merging drivers/perf/arm_pmu.c +Auto-merging drivers/idle/intel_idle.c +Auto-merging drivers/acpi/processor_driver.c +Auto-merging arch/x86/xen/enlighten.c +Auto-merging arch/x86/mm/srat.c +Auto-merging arch/x86/mm/numa.c +Auto-merging arch/x86/kernel/x86_init.c +Auto-merging arch/x86/kernel/smpboot.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/kernel/reboot.c +Auto-merging arch/x86/kernel/ptrace.c +Auto-merging arch/x86/kernel/paravirt.c +Auto-merging arch/x86/kernel/cpu/mtrr/main.c +Auto-merging arch/x86/kernel/cpu/common.c +Auto-merging arch/x86/kernel/apic/x2apic_uv_x.c +Auto-merging arch/x86/kernel/apic/x2apic_cluster.c +Auto-merging arch/x86/kernel/apic/probe_32.c +Auto-merging arch/x86/kernel/apic/apic_noop.c +Auto-merging arch/x86/kernel/apic/apic_flat_64.c +Auto-merging arch/x86/kernel/apic/apic.c +Auto-merging arch/x86/kernel/acpi/boot.c +Auto-merging arch/x86/include/asm/thread_info.h +Auto-merging arch/x86/events/amd/ibs.c +Auto-merging arch/x86/entry/common.c +Auto-merging arch/s390/kernel/perf_cpum_sf.c +Auto-merging arch/powerpc/perf/core-book3s.c +Auto-merging arch/powerpc/mm/numa.c +Auto-merging arch/arm64/kernel/armv8_deprecated.c +Auto-merging arch/arm/xen/enlighten.c +CONFLICT (content): Merge conflict in arch/arm/xen/enlighten.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7ea523877fac] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/x86/early-microcode.txt | 5 +- + arch/arc/kernel/time.c | 48 ++--- + arch/arm/kernel/smp_twd.c | 31 ++- + arch/arm/mach-mvebu/coherency.c | 19 +- + arch/arm/mm/cache-l2x0.c | 27 ++- + arch/arm/vfp/vfpmodule.c | 28 +-- + arch/arm/xen/enlighten.c | 41 ++-- + arch/arm64/kernel/armv8_deprecated.c | 22 +-- + arch/blackfin/kernel/perf_event.c | 26 +-- + arch/metag/kernel/perf/perf_event.c | 26 +-- + arch/mips/oprofile/op_model_loongson3.c | 35 ++-- + arch/powerpc/mm/numa.c | 48 ++--- + arch/powerpc/perf/core-book3s.c | 30 +-- + arch/s390/kernel/perf_cpum_cf.c | 46 ++--- + arch/s390/kernel/perf_cpum_sf.c | 45 ++--- + arch/sh/kernel/perf_event.c | 23 +-- + arch/x86/entry/common.c | 6 +- + arch/x86/entry/vdso/vdso2c.h | 6 + + arch/x86/entry/vdso/vma.c | 20 +- + arch/x86/events/amd/core.c | 6 +- + arch/x86/events/amd/ibs.c | 67 +++---- + arch/x86/events/amd/iommu.c | 2 +- + arch/x86/events/amd/power.c | 60 ++---- + arch/x86/events/amd/uncore.c | 122 ++++-------- + arch/x86/events/core.c | 106 +++++++---- + arch/x86/events/intel/core.c | 4 +- + arch/x86/events/intel/cqm.c | 49 ++--- + arch/x86/events/intel/cstate.c | 51 ++--- + arch/x86/events/intel/rapl.c | 84 +++------ + arch/x86/events/intel/uncore.c | 135 +++++-------- + arch/x86/events/intel/uncore.h | 1 - + arch/x86/events/msr.c | 2 +- + arch/x86/include/asm/cpufeature.h | 90 +++++---- + arch/x86/include/asm/cpufeatures.h | 2 +- + arch/x86/include/asm/disabled-features.h | 2 + + arch/x86/include/asm/intel-family.h | 2 +- + arch/x86/include/asm/livepatch.h | 1 - + arch/x86/include/asm/microcode.h | 26 --- + arch/x86/include/asm/microcode_amd.h | 1 - + arch/x86/include/asm/microcode_intel.h | 5 - + arch/x86/include/asm/mwait.h | 2 +- + arch/x86/include/asm/page_32_types.h | 3 +- + arch/x86/include/asm/required-features.h | 2 + + arch/x86/include/asm/syscall.h | 5 +- + arch/x86/include/asm/thread_info.h | 3 + + arch/x86/include/asm/topology.h | 1 + + arch/x86/kernel/acpi/boot.c | 2 +- + arch/x86/kernel/acpi/cstate.c | 2 +- + arch/x86/kernel/amd_gart_64.c | 1 - + arch/x86/kernel/amd_nb.c | 39 ++-- + arch/x86/kernel/apb_timer.c | 29 +-- + arch/x86/kernel/apic/apic.c | 2 +- + arch/x86/kernel/apic/apic_flat_64.c | 2 +- + arch/x86/kernel/apic/apic_noop.c | 1 - + arch/x86/kernel/apic/hw_nmi.c | 2 +- + arch/x86/kernel/apic/io_apic.c | 2 +- + arch/x86/kernel/apic/ipi.c | 1 - + arch/x86/kernel/apic/probe_32.c | 2 +- + arch/x86/kernel/apic/probe_64.c | 3 +- + arch/x86/kernel/apic/x2apic_cluster.c | 80 +++----- + arch/x86/kernel/apic/x2apic_uv_x.c | 2 +- + arch/x86/kernel/cpu/common.c | 2 +- + arch/x86/kernel/cpu/hypervisor.c | 3 +- + arch/x86/kernel/cpu/intel.c | 7 +- + arch/x86/kernel/cpu/match.c | 2 +- + arch/x86/kernel/cpu/microcode/amd.c | 33 ++-- + arch/x86/kernel/cpu/microcode/core.c | 10 +- + arch/x86/kernel/cpu/microcode/intel.c | 261 ++++++++++++++++---------- + arch/x86/kernel/cpu/microcode/intel_lib.c | 2 - + arch/x86/kernel/cpu/mshyperv.c | 3 +- + arch/x86/kernel/cpu/mtrr/cleanup.c | 1 - + arch/x86/kernel/cpu/mtrr/generic.c | 2 +- + arch/x86/kernel/cpu/mtrr/if.c | 1 - + arch/x86/kernel/cpu/mtrr/main.c | 2 +- + arch/x86/kernel/cpu/perfctr-watchdog.c | 2 +- + arch/x86/kernel/cpu/vmware.c | 3 +- + arch/x86/kernel/crash.c | 2 +- + arch/x86/kernel/dumpstack_32.c | 2 +- + arch/x86/kernel/dumpstack_64.c | 2 +- + arch/x86/kernel/hpet.c | 69 ++++--- + arch/x86/kernel/hw_breakpoint.c | 3 +- + arch/x86/kernel/i386_ksyms_32.c | 3 +- + arch/x86/kernel/i8253.c | 2 +- + arch/x86/kernel/io_delay.c | 2 +- + arch/x86/kernel/irq_32.c | 1 - + arch/x86/kernel/irq_64.c | 1 - + arch/x86/kernel/kdebugfs.c | 2 +- + arch/x86/kernel/kvm.c | 2 +- + arch/x86/kernel/mpparse.c | 1 - + arch/x86/kernel/paravirt-spinlocks.c | 2 +- + arch/x86/kernel/paravirt.c | 3 +- + arch/x86/kernel/pci-swiotlb.c | 2 +- + arch/x86/kernel/pmem.c | 2 +- + arch/x86/kernel/process.c | 5 +- + arch/x86/kernel/process_32.c | 2 +- + arch/x86/kernel/process_64.c | 2 +- + arch/x86/kernel/ptrace.c | 15 +- + arch/x86/kernel/reboot.c | 2 +- + arch/x86/kernel/setup.c | 2 +- + arch/x86/kernel/signal.c | 26 ++- + arch/x86/kernel/smpboot.c | 2 +- + arch/x86/kernel/stacktrace.c | 2 +- + arch/x86/kernel/tboot.c | 25 +-- + arch/x86/kernel/test_rodata.c | 5 - + arch/x86/kernel/traps.c | 2 +- + arch/x86/kernel/tsc.c | 2 +- + arch/x86/kernel/x8664_ksyms_64.c | 3 +- + arch/x86/kernel/x86_init.c | 2 +- + arch/x86/kvm/cpuid.c | 2 +- + arch/x86/kvm/emulate.c | 1 - + arch/x86/kvm/iommu.c | 2 +- + arch/x86/kvm/irq.c | 2 +- + arch/x86/kvm/lapic.c | 2 +- + arch/x86/kvm/mmu.c | 3 +- + arch/x86/kvm/x86.c | 38 +--- + arch/x86/lib/cache-smp.c | 2 +- + arch/x86/lib/cpu.c | 3 +- + arch/x86/lib/csum-partial_64.c | 2 +- + arch/x86/lib/csum-wrappers_64.c | 2 +- + arch/x86/lib/delay.c | 2 +- + arch/x86/lib/memcpy_32.c | 2 +- + arch/x86/lib/mmx_32.c | 2 +- + arch/x86/lib/msr-reg-export.c | 2 +- + arch/x86/lib/msr-smp.c | 2 +- + arch/x86/lib/msr.c | 3 +- + arch/x86/lib/string_32.c | 2 +- + arch/x86/lib/usercopy.c | 2 +- + arch/x86/lib/usercopy_32.c | 2 +- + arch/x86/lib/usercopy_64.c | 2 +- + arch/x86/mm/amdtopology.c | 1 - + arch/x86/mm/dump_pagetables.c | 6 +- + arch/x86/mm/highmem_32.c | 2 +- + arch/x86/mm/init.c | 7 - + arch/x86/mm/init_32.c | 1 - + arch/x86/mm/init_64.c | 1 - + arch/x86/mm/iomap_32.c | 2 +- + arch/x86/mm/ioremap.c | 1 - + arch/x86/mm/kmemcheck/kmemcheck.c | 1 - + arch/x86/mm/kmemcheck/shadow.c | 2 +- + arch/x86/mm/kmmio.c | 2 +- + arch/x86/mm/mmio-mod.c | 2 +- + arch/x86/mm/numa.c | 1 - + arch/x86/mm/numa_32.c | 2 +- + arch/x86/mm/pat.c | 1 - + arch/x86/mm/pat_rbtree.c | 1 - + arch/x86/mm/pf_in.c | 1 - + arch/x86/mm/pgtable_32.c | 1 - + arch/x86/mm/physaddr.c | 2 +- + arch/x86/mm/srat.c | 2 +- + arch/x86/mm/tlb.c | 2 +- + arch/x86/pci/xen.c | 2 +- + arch/x86/platform/ce4100/ce4100.c | 2 - + arch/x86/platform/efi/efi_64.c | 2 +- + arch/x86/platform/intel-mid/intel-mid.c | 2 +- + arch/x86/platform/intel-mid/pwr.c | 4 +- + arch/x86/platform/intel-mid/sfi.c | 2 +- + arch/x86/platform/olpc/olpc.c | 2 +- + arch/x86/platform/olpc/olpc_ofw.c | 5 +- + arch/x86/platform/ts5500/ts5500.c | 6 +- + arch/x86/platform/uv/uv_irq.c | 2 +- + arch/x86/platform/uv/uv_nmi.c | 2 +- + arch/x86/um/delay.c | 2 +- + arch/x86/xen/debugfs.c | 1 - + arch/x86/xen/enlighten.c | 2 +- + arch/x86/xen/mmu.c | 3 +- + arch/x86/xen/p2m.c | 2 +- + arch/x86/xen/platform-pci-unplug.c | 2 +- + arch/x86/xen/setup.c | 2 +- + arch/xtensa/kernel/perf_event.c | 26 +-- + drivers/acpi/processor_driver.c | 11 +- + drivers/bus/arm-cci.c | 53 +++--- + drivers/bus/arm-ccn.c | 57 +++--- + drivers/clocksource/arm_arch_timer.c | 54 +++--- + drivers/clocksource/arm_global_timer.c | 39 +--- + drivers/clocksource/dummy_timer.c | 36 +--- + drivers/clocksource/exynos_mct.c | 46 ++--- + drivers/clocksource/metag_generic.c | 33 +--- + drivers/clocksource/mips-gic-timer.c | 38 ++-- + drivers/clocksource/qcom-timer.c | 41 ++-- + drivers/clocksource/time-armada-370-xp.c | 41 ++-- + drivers/clocksource/timer-atlas7.c | 41 +--- + drivers/hwtracing/coresight/coresight-etm3x.c | 90 +++++---- + drivers/hwtracing/coresight/coresight-etm4x.c | 87 +++++---- + drivers/idle/intel_idle.c | 2 +- + drivers/irqchip/irq-armada-370-xp.c | 44 ++--- + drivers/irqchip/irq-bcm2836.c | 34 ++-- + drivers/irqchip/irq-gic-v3.c | 22 +-- + drivers/irqchip/irq-gic.c | 23 +-- + drivers/irqchip/irq-hip04.c | 25 +-- + drivers/leds/trigger/ledtrig-cpu.c | 32 ++-- + drivers/perf/arm_pmu.c | 59 +++--- + include/linux/cpu.h | 11 -- + include/linux/cpuhotplug.h | 76 ++++++++ + include/linux/hrtimer.h | 7 + + include/linux/perf/arm_pmu.h | 2 +- + include/linux/perf_event.h | 44 +---- + include/linux/rcutiny.h | 7 + + include/linux/rcutree.h | 7 + + include/linux/smp.h | 5 + + include/linux/timer.h | 6 + + include/linux/workqueue.h | 6 + + kernel/cpu.c | 66 +++++++ + kernel/events/core.c | 56 +----- + kernel/profile.c | 181 +++++++----------- + kernel/rcu/tree.c | 105 +++++------ + kernel/smp.c | 79 ++++---- + kernel/stop_machine.c | 8 + + kernel/time/hrtimer.c | 40 +--- + kernel/time/timer.c | 25 +-- + kernel/workqueue.c | 108 +++++------ + lib/earlycpio.c | 5 +- + tools/lib/bpf/libbpf.c | 7 +- + tools/objtool/.gitignore | 1 + + tools/perf/arch/s390/util/Build | 2 + + tools/perf/arch/s390/util/machine.c | 19 ++ + tools/perf/util/machine.c | 8 + + tools/perf/util/machine.h | 1 + + virt/kvm/arm/arch_timer.c | 35 ++-- + virt/kvm/arm/vgic.c | 39 +--- + virt/kvm/arm/vgic/vgic-init.c | 31 +-- + virt/kvm/kvm_main.c | 32 +--- + 221 files changed, 1802 insertions(+), 2385 deletions(-) + create mode 100644 tools/perf/arch/s390/util/machine.c +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 (a67adb32d941 ARM: dts: Add Arria10 Ethernet EDAC devicetree entry) +$ git merge edac-amd/for-next +Already up-to-date. +Merging irqchip/irqchip/for-next (77d50b17c990 Merge branch 'irqchip/misc' into irqchip/for-next) +$ git merge irqchip/irqchip/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging ftrace/for-next (78aebca2c955 printk, tracing: Avoiding unneeded blank lines) +$ git merge ftrace/for-next +Auto-merging samples/Kconfig +Auto-merging fs/nfs/nfstrace.h +Merge made by the 'recursive' strategy. + Documentation/trace/kprobetrace.txt | 3 + + Documentation/trace/uprobetracer.txt | 3 + + fs/nfs/nfs4trace.h | 4 +- + fs/nfs/nfstrace.h | 4 +- + include/linux/ftrace.h | 12 +- + include/ras/ras_event.h | 4 +- + include/trace/events/printk.h | 12 +- + include/trace/perf.h | 2 +- + include/trace/trace_events.h | 2 +- + kernel/trace/Kconfig | 1 + + kernel/trace/ftrace.c | 313 ++++++++++++++---------------- + kernel/trace/trace.c | 358 +++++++++++++++++++++++++++++------ + kernel/trace/trace.h | 48 ++++- + kernel/trace/trace_entries.h | 4 +- + kernel/trace/trace_events.c | 219 +++------------------ + kernel/trace/trace_functions.c | 2 +- + kernel/trace/trace_functions_graph.c | 19 +- + kernel/trace/trace_kprobe.c | 1 + + kernel/trace/trace_mmiotrace.c | 10 +- + kernel/trace/trace_probe.c | 33 ++++ + kernel/trace/trace_probe.h | 10 + + samples/Kconfig | 7 + + samples/Makefile | 2 +- + samples/trace_printk/Makefile | 6 + + samples/trace_printk/trace-printk.c | 56 ++++++ + 25 files changed, 667 insertions(+), 468 deletions(-) + create mode 100644 samples/trace_printk/Makefile + create mode 100644 samples/trace_printk/trace-printk.c +Merging rcu/rcu/next (5bc94664884a rcu: Avoid redundant quiescent-state chasing) +$ git merge rcu/rcu/next +Resolved 'kernel/rcu/tree.c' using previous resolution. +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sched/core.c +Auto-merging kernel/rcu/tree_exp.h +Auto-merging kernel/rcu/tree.c +CONFLICT (content): Merge conflict in kernel/rcu/tree.c +Auto-merging kernel/cpu.c +Auto-merging include/linux/rcupdate.h +Auto-merging include/linux/list.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c43079ab2e46] Merge remote-tracking branch 'rcu/rcu/next' +$ git diff -M --stat --summary HEAD^.. + .../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 ++++++++ + Documentation/RCU/torture.txt | 15 - + include/linux/list.h | 7 +- + include/linux/rcupdate.h | 1 + + kernel/cpu.c | 1 + + kernel/rcu/Makefile | 3 +- + kernel/rcu/rcutorture.c | 7 +- + kernel/rcu/tree.c | 47 +- + kernel/rcu/tree.h | 1 + + kernel/rcu/tree_exp.h | 124 +-- + kernel/rcu/tree_plugin.h | 1 + + kernel/rcu/tree_trace.c | 7 +- + kernel/rcu/update.c | 3 +- + kernel/rcu/waketorture.c | 537 +++++++++++++ + kernel/sched/core.c | 7 + + kernel/torture.c | 27 +- + lib/Kconfig.debug | 20 + + .../selftests/rcutorture/bin/kvm-recheck-wake.sh | 39 + + .../selftests/rcutorture/bin/kvm-recheck.sh | 2 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 2 +- + .../selftests/rcutorture/configs/wake/CFLIST | 1 + + .../selftests/rcutorture/configs/wake/CFcommon | 2 + + tools/testing/selftests/rcutorture/configs/wake/SH | 19 + + .../selftests/rcutorture/configs/wake/SH.boot | 1 + + .../testing/selftests/rcutorture/configs/wake/STI | 19 + + .../selftests/rcutorture/configs/wake/STI.boot | 1 + + .../rcutorture/configs/wake/ver_functions.sh | 43 ++ + 38 files changed, 5782 insertions(+), 98 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 (912902ce78b0 Merge tag 'kvm-arm-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into next) +$ git merge kvm/linux-next +Resolved 'arch/powerpc/include/asm/paca.h' using previous resolution. +Resolved 'arch/powerpc/kernel/Makefile' using previous resolution. +Resolved 'arch/powerpc/kernel/exceptions-64s.S' using previous resolution. +Resolved 'arch/powerpc/kernel/idle_book3s.S' using previous resolution. +Resolved 'arch/powerpc/kernel/traps.c' using previous resolution. +Resolved 'arch/s390/hypfs/hypfs_diag.c' using previous resolution. +Resolved 'arch/s390/mm/gmap.c' using previous resolution. +Resolved 'arch/x86/kvm/vmx.c' using previous resolution. +Resolved 'include/linux/irqchip/arm-gic-v3.h' using previous resolution. +Resolved 'virt/kvm/kvm_main.c' using previous resolution. +Auto-merging virt/kvm/kvm_main.c +CONFLICT (content): Merge conflict in virt/kvm/kvm_main.c +Auto-merging virt/kvm/arm/vgic/vgic-init.c +Removing virt/kvm/arm/vgic.h +CONFLICT (modify/delete): virt/kvm/arm/vgic.c deleted in kvm/linux-next and modified in HEAD. Version HEAD of virt/kvm/arm/vgic.c left in tree. +Removing virt/kvm/arm/vgic-v3.c +Removing virt/kvm/arm/vgic-v3-emul.c +Removing virt/kvm/arm/vgic-v2.c +Removing virt/kvm/arm/vgic-v2-emul.c +Auto-merging mm/gup.c +Auto-merging include/linux/irqchip/arm-gic-v3.h +CONFLICT (content): Merge conflict in include/linux/irqchip/arm-gic-v3.h +Auto-merging include/linux/context_tracking.h +Removing include/kvm/vgic/vgic.h +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx.c +CONFLICT (content): Merge conflict in arch/x86/kvm/vmx.c +Auto-merging arch/x86/kvm/svm.c +Auto-merging arch/x86/kvm/mmu.c +Auto-merging arch/x86/kvm/lapic.c +Auto-merging arch/x86/kvm/iommu.c +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/s390/mm/pgtable.c +Auto-merging arch/s390/mm/pgalloc.c +Auto-merging arch/s390/mm/gmap.c +CONFLICT (content): Merge conflict in arch/s390/mm/gmap.c +Auto-merging arch/s390/mm/fault.c +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/s390/kvm/intercept.c +Auto-merging arch/s390/include/asm/processor.h +Auto-merging arch/s390/include/asm/pgtable.h +Auto-merging arch/s390/include/asm/page.h +Auto-merging arch/s390/include/asm/mmu_context.h +Auto-merging arch/s390/include/asm/mmu.h +Auto-merging arch/s390/include/asm/kvm_host.h +Auto-merging arch/s390/include/asm/diag.h +Auto-merging arch/s390/hypfs/hypfs_diag.c +CONFLICT (content): Merge conflict in arch/s390/hypfs/hypfs_diag.c +Auto-merging arch/powerpc/platforms/powernv/opal-wrappers.S +Auto-merging arch/powerpc/kvm/book3s_pr.c +Auto-merging arch/powerpc/kvm/book3s_hv_rmhandlers.S +Auto-merging arch/powerpc/kernel/traps.c +CONFLICT (content): Merge conflict in arch/powerpc/kernel/traps.c +Auto-merging arch/powerpc/kernel/idle_book3s.S +CONFLICT (content): Merge conflict in arch/powerpc/kernel/idle_book3s.S +Auto-merging arch/powerpc/kernel/exceptions-64s.S +CONFLICT (content): Merge conflict in arch/powerpc/kernel/exceptions-64s.S +Auto-merging arch/powerpc/kernel/Makefile +CONFLICT (content): Merge conflict in arch/powerpc/kernel/Makefile +Auto-merging arch/powerpc/include/asm/paca.h +CONFLICT (content): Merge conflict in arch/powerpc/include/asm/paca.h +Auto-merging arch/mips/mm/uasm.c +Auto-merging arch/mips/mm/c-r4k.c +Removing arch/mips/kvm/locore.S +Auto-merging arch/mips/kernel/traps.c +Auto-merging arch/arm64/kvm/hyp/switch.c +Auto-merging arch/arm64/kernel/cpufeature.c +Auto-merging arch/arm64/include/asm/virt.h +Auto-merging arch/arm64/include/asm/cpufeature.h +Auto-merging arch/arm/kvm/arm.c +Auto-merging arch/arm/include/asm/pgtable.h +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f virt/kvm/arm/vgic.c +virt/kvm/arm/vgic.c: needs merge +rm 'virt/kvm/arm/vgic.c' +$ git commit -v -a +[master 70e9482abf2e] Merge remote-tracking branch 'kvm/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/virtual/kvm/api.txt | 82 +- + Documentation/virtual/kvm/devices/arm-vgic.txt | 25 +- + Documentation/virtual/kvm/devices/vm.txt | 87 +- + Documentation/virtual/kvm/locking.txt | 4 +- + arch/arm/include/asm/kvm_asm.h | 2 + + arch/arm/include/asm/kvm_host.h | 27 +- + arch/arm/include/asm/kvm_hyp.h | 3 - + arch/arm/include/asm/kvm_mmu.h | 15 +- + arch/arm/include/asm/pgtable.h | 4 +- + arch/arm/include/asm/virt.h | 4 + + arch/arm/kvm/Kconfig | 7 - + arch/arm/kvm/Makefile | 6 - + arch/arm/kvm/arm.c | 46 +- + arch/arm/kvm/emulate.c | 2 +- + arch/arm/kvm/guest.c | 2 +- + arch/arm/kvm/init.S | 56 +- + arch/arm/kvm/mmu.c | 142 +- + arch/arm/kvm/reset.c | 2 +- + arch/arm64/include/asm/cpufeature.h | 3 +- + arch/arm64/include/asm/kvm_arm.h | 2 +- + arch/arm64/include/asm/kvm_host.h | 19 +- + arch/arm64/include/asm/kvm_hyp.h | 23 - + arch/arm64/include/asm/kvm_mmu.h | 96 +- + arch/arm64/include/asm/pgtable-hwdef.h | 1 + + arch/arm64/include/asm/pgtable-prot.h | 4 +- + arch/arm64/include/asm/virt.h | 4 + + arch/arm64/include/uapi/asm/kvm.h | 2 + + arch/arm64/kernel/cpufeature.c | 19 + + arch/arm64/kvm/Kconfig | 8 +- + arch/arm64/kvm/Makefile | 9 +- + arch/arm64/kvm/guest.c | 2 +- + arch/arm64/kvm/hyp-init.S | 61 +- + arch/arm64/kvm/hyp/entry.S | 19 - + arch/arm64/kvm/hyp/hyp-entry.S | 15 + + arch/arm64/kvm/hyp/switch.c | 11 +- + arch/arm64/kvm/reset.c | 38 +- + arch/arm64/kvm/sys_regs.c | 4 +- + arch/mips/include/asm/kvm_host.h | 315 +-- + .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 2 +- + arch/mips/include/asm/mipsregs.h | 21 +- + arch/mips/include/asm/setup.h | 1 + + arch/mips/include/asm/uasm.h | 7 + + arch/mips/include/uapi/asm/inst.h | 114 +- + arch/mips/kernel/asm-offsets.c | 70 - + arch/mips/kernel/branch.c | 8 +- + arch/mips/kernel/traps.c | 23 +- + arch/mips/kvm/Kconfig | 1 + + arch/mips/kvm/Makefile | 3 +- + arch/mips/kvm/commpage.c | 2 +- + arch/mips/kvm/dyntrans.c | 161 +- + arch/mips/kvm/emulate.c | 478 ++-- + arch/mips/kvm/entry.c | 676 ++++++ + arch/mips/kvm/fpu.S | 7 +- + arch/mips/kvm/interrupt.c | 12 +- + arch/mips/kvm/interrupt.h | 14 +- + arch/mips/kvm/locore.S | 605 ----- + arch/mips/kvm/mips.c | 355 ++- + arch/mips/kvm/mmu.c | 370 +++ + arch/mips/kvm/stats.c | 21 - + arch/mips/kvm/tlb.c | 496 +--- + arch/mips/kvm/trace.h | 236 +- + arch/mips/kvm/trap_emul.c | 178 +- + arch/mips/math-emu/cp1emu.c | 8 +- + arch/mips/mm/c-r4k.c | 2 +- + arch/mips/mm/uasm-micromips.c | 13 +- + arch/mips/mm/uasm-mips.c | 11 + + arch/mips/mm/uasm.c | 24 +- + arch/powerpc/include/asm/hmi.h | 45 + + arch/powerpc/include/asm/paca.h | 6 + + arch/powerpc/kernel/Makefile | 2 +- + arch/powerpc/kernel/exceptions-64s.S | 4 +- + arch/powerpc/kernel/hmi.c | 56 + + arch/powerpc/kernel/idle_book3s.S | 4 +- + arch/powerpc/kernel/traps.c | 5 + + arch/powerpc/kvm/book3s_hv.c | 41 +- + arch/powerpc/kvm/book3s_hv_ras.c | 176 ++ + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 65 +- + arch/powerpc/kvm/book3s_pr.c | 16 +- + arch/powerpc/kvm/booke.c | 4 +- + arch/powerpc/kvm/emulate.c | 1 - + arch/powerpc/kvm/mpic.c | 3 +- + arch/powerpc/kvm/powerpc.c | 2 +- + arch/powerpc/platforms/powernv/opal-wrappers.S | 2 - + arch/s390/hypfs/hypfs_diag.c | 377 +-- + arch/s390/include/asm/cpacf.h | 10 + + arch/s390/include/asm/diag.h | 149 ++ + arch/s390/include/asm/gmap.h | 82 +- + arch/s390/include/asm/kvm_host.h | 33 +- + arch/s390/include/asm/mmu.h | 11 +- + arch/s390/include/asm/mmu_context.h | 3 +- + arch/s390/include/asm/page.h | 9 +- + arch/s390/include/asm/pgalloc.h | 2 + + arch/s390/include/asm/pgtable.h | 17 +- + arch/s390/include/asm/processor.h | 2 + + arch/s390/include/asm/sclp.h | 23 +- + arch/s390/include/uapi/asm/kvm.h | 41 + + arch/s390/include/uapi/asm/sie.h | 1 + + arch/s390/kernel/diag.c | 37 + + arch/s390/kvm/Makefile | 2 +- + arch/s390/kvm/diag.c | 5 + + arch/s390/kvm/gaccess.c | 387 +++- + arch/s390/kvm/gaccess.h | 3 + + arch/s390/kvm/guestdbg.c | 19 +- + arch/s390/kvm/intercept.c | 33 +- + arch/s390/kvm/interrupt.c | 34 +- + arch/s390/kvm/kvm-s390.c | 402 +++- + arch/s390/kvm/kvm-s390.h | 22 +- + arch/s390/kvm/priv.c | 226 +- + arch/s390/kvm/sigp.c | 10 +- + arch/s390/kvm/sthyi.c | 471 ++++ + arch/s390/kvm/trace.h | 49 +- + arch/s390/kvm/vsie.c | 1091 +++++++++ + arch/s390/mm/fault.c | 2 + + arch/s390/mm/gmap.c | 1602 ++++++++++++- + arch/s390/mm/pgalloc.c | 39 +- + arch/s390/mm/pgtable.c | 209 +- + arch/x86/include/asm/kvm_host.h | 31 +- + arch/x86/include/asm/svm.h | 1 - + arch/x86/include/asm/virtext.h | 8 +- + arch/x86/kvm/Kconfig | 1 - + arch/x86/kvm/i8254.c | 4 +- + arch/x86/kvm/iommu.c | 2 - + arch/x86/kvm/irq_comm.c | 49 +- + arch/x86/kvm/lapic.c | 539 +++-- + arch/x86/kvm/lapic.h | 19 +- + arch/x86/kvm/mmu.c | 29 +- + arch/x86/kvm/mmu.h | 5 - + arch/x86/kvm/paging_tmpl.h | 10 +- + arch/x86/kvm/pmu_intel.c | 2 +- + arch/x86/kvm/svm.c | 8 +- + arch/x86/kvm/trace.h | 15 + + arch/x86/kvm/vmx.c | 329 ++- + arch/x86/kvm/x86.c | 175 +- + drivers/s390/char/sclp_early.c | 12 +- + drivers/s390/char/sclp_ocf.c | 23 +- + include/kvm/arm_vgic.h | 438 ++-- + include/kvm/vgic/vgic.h | 246 -- + include/linux/context_tracking.h | 38 +- + include/linux/irqchip/arm-gic-v3.h | 213 +- + include/linux/kvm_host.h | 58 +- + include/linux/page_ref.h | 9 + + include/trace/events/kvm.h | 5 +- + include/uapi/linux/kvm.h | 12 +- + mm/gup.c | 1 + + virt/kvm/Kconfig | 3 - + virt/kvm/arm/hyp/vgic-v2-sr.c | 15 +- + virt/kvm/arm/vgic-v2-emul.c | 856 ------- + virt/kvm/arm/vgic-v2.c | 274 --- + virt/kvm/arm/vgic-v3-emul.c | 1074 --------- + virt/kvm/arm/vgic-v3.c | 279 --- + virt/kvm/arm/vgic.c | 2417 -------------------- + virt/kvm/arm/vgic.h | 140 -- + virt/kvm/arm/vgic/vgic-init.c | 9 +- + virt/kvm/arm/vgic/vgic-its.c | 1500 ++++++++++++ + virt/kvm/arm/vgic/vgic-kvm-device.c | 22 +- + virt/kvm/arm/vgic/vgic-mmio-v2.c | 10 + + virt/kvm/arm/vgic/vgic-mmio-v3.c | 247 +- + virt/kvm/arm/vgic/vgic-mmio.c | 64 +- + virt/kvm/arm/vgic/vgic-mmio.h | 31 +- + virt/kvm/arm/vgic/vgic-v2.c | 12 +- + virt/kvm/arm/vgic/vgic-v3.c | 29 +- + virt/kvm/arm/vgic/vgic.c | 119 +- + virt/kvm/arm/vgic/vgic.h | 38 +- + virt/kvm/irqchip.c | 7 +- + virt/kvm/kvm_main.c | 110 +- + 165 files changed, 11410 insertions(+), 9053 deletions(-) + create mode 100644 arch/mips/kvm/entry.c + delete mode 100644 arch/mips/kvm/locore.S + create mode 100644 arch/mips/kvm/mmu.c + create mode 100644 arch/powerpc/include/asm/hmi.h + create mode 100644 arch/powerpc/kernel/hmi.c + create mode 100644 arch/s390/kvm/sthyi.c + create mode 100644 arch/s390/kvm/vsie.c + delete mode 100644 include/kvm/vgic/vgic.h + delete mode 100644 virt/kvm/arm/vgic-v2-emul.c + delete mode 100644 virt/kvm/arm/vgic-v2.c + delete mode 100644 virt/kvm/arm/vgic-v3-emul.c + delete mode 100644 virt/kvm/arm/vgic-v3.c + delete mode 100644 virt/kvm/arm/vgic.c + delete mode 100644 virt/kvm/arm/vgic.h + create mode 100644 virt/kvm/arm/vgic/vgic-its.c +$ git am -3 ../patches/s390-fix-merge-conflict-in-arch-s390-kvm-kvm-s390.c.patch +Applying: s390: fix merge conflict in arch/s390/kvm/kvm-s390.c +$ git reset HEAD^ +Unstaged changes after reset: +M arch/s390/kvm/kvm-s390.c +$ git add -A . +$ git commit -v -a --amend +[master ec695a2b9955] Merge remote-tracking branch 'kvm/linux-next' + Date: Fri Jul 29 13:03:30 2016 +1000 +$ git am -3 ../patches/0001-s390-merge-fix-up-for-__diag204-move.patch +Applying: s390: merge fix up for __diag204 move +$ git reset HEAD^ +Unstaged changes after reset: +M arch/s390/kernel/diag.c +$ git add -A . +$ git commit -v -a --amend +[master cdc1dbc1272c] Merge remote-tracking branch 'kvm/linux-next' + Date: Fri Jul 29 13:03:30 2016 +1000 +Merging kvm-arm/next (3f312db6b65b KVM: arm: vgic-irqfd: Workaround changing kvm_set_routing_entry prototype) +$ git merge kvm-arm/next +Resolved 'Documentation/virtual/kvm/api.txt' using previous resolution. +Resolved 'virt/kvm/irqchip.c' using previous resolution. +Auto-merging virt/kvm/irqchip.c +CONFLICT (content): Merge conflict in virt/kvm/irqchip.c +Auto-merging virt/kvm/arm/vgic/vgic-init.c +Auto-merging include/uapi/linux/kvm.h +Auto-merging include/linux/kvm_host.h +Auto-merging Documentation/virtual/kvm/api.txt +CONFLICT (content): Merge conflict in Documentation/virtual/kvm/api.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 62faeccd8dc2] Merge remote-tracking branch 'kvm-arm/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/virtual/kvm/api.txt | 34 +++++++++-- + arch/arm/kvm/Kconfig | 2 + + arch/arm/kvm/Makefile | 1 + + arch/arm/kvm/irq.h | 19 +++++++ + arch/arm64/kvm/Kconfig | 2 + + arch/arm64/kvm/Makefile | 1 + + arch/arm64/kvm/irq.h | 19 +++++++ + arch/x86/kvm/irq.h | 3 + + include/kvm/arm_vgic.h | 7 +++ + include/linux/kvm_host.h | 12 +++- + include/uapi/linux/kvm.h | 5 +- + virt/kvm/arm/vgic/vgic-init.c | 4 ++ + virt/kvm/arm/vgic/vgic-irqfd.c | 116 ++++++++++++++++++++++++++++++++------ + virt/kvm/arm/vgic/vgic.c | 7 --- + virt/kvm/irqchip.c | 28 +++++---- + 15 files changed, 215 insertions(+), 45 deletions(-) + create mode 100644 arch/arm/kvm/irq.h + create mode 100644 arch/arm64/kvm/irq.h +Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging kvm-ppc-paulus/kvm-ppc-next (93d17397e4e2 KVM: PPC: Book3S HV: Save/restore TM state in H_CEDE) +$ git merge kvm-ppc-paulus/kvm-ppc-next +Auto-merging arch/powerpc/kvm/book3s_hv_rmhandlers.S +Merge made by the 'recursive' strategy. + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 462 +++++++++++++++++--------------- + 1 file changed, 250 insertions(+), 212 deletions(-) +Merging kvms390/next (9acc317b183f KVM: s390: let ptff intercepts result in cc=3) +$ git merge kvms390/next +Already up-to-date. +Merging xen-tip/linux-next (d34c30cc1fa8 xen: add static initialization of steal_clock op to xen_time_ops) +$ git merge xen-tip/linux-next +Already up-to-date. +Merging percpu/for-next (6710e594f71c percpu: fix synchronization between synchronous map extension and chunk destruction) +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next (d945b5e9f0e3 workqueue: Fix setting affinity of unbound worker threads) +$ git merge workqueues/for-next +Already up-to-date. +Merging drivers-x86/for-next (c37636b450ae dell-wmi: Ignore WMI event 0xe00e) +$ git merge drivers-x86/for-next +Merge made by the 'recursive' strategy. + drivers/platform/x86/dell-wmi.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +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 (9c99e5e51988 HSI: omap_ssi: drop pm_runtime_irq_safe) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (5706c01fcfb3 leds: is31fl32xx: define complete i2c_device_id table) +$ git merge leds/for-next +Already up-to-date. +Merging ipmi/for-next (92cad0931b08 ipmi: remove trydefaults parameter and default init) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. +Merging driver-core/driver-core-next (523d939ef98f Linux 4.7) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (0e06f5c0deee Merge branch 'akpm' (patches from Andrew)) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (0bf048abebb6 staging: emxx_udc: allow modular build) +$ git merge usb/usb-next +Removing drivers/usb/serial/ti_usb_3410_5052.h +Merge made by the 'recursive' strategy. + drivers/staging/emxx_udc/Kconfig | 2 +- + drivers/staging/emxx_udc/emxx_udc.c | 36 ++++- + drivers/usb/serial/cp210x.c | 4 +- + drivers/usb/serial/generic.c | 18 ++- + drivers/usb/serial/option.c | 3 + + drivers/usb/serial/ti_usb_3410_5052.c | 271 ++++++++++++++++++++++++++++++---- + drivers/usb/serial/ti_usb_3410_5052.h | 259 -------------------------------- + 7 files changed, 293 insertions(+), 300 deletions(-) + delete mode 100644 drivers/usb/serial/ti_usb_3410_5052.h +Merging usb-gadget/next (15e4292a2d21 usb: renesas_usbhs: protect the CFIFOSEL setting in usbhsg_ep_enable()) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (3161da970d38 USB: serial: use variable for status) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging usb-chipidea-next/ci-for-usb-next (229d43daf8ed usb: chipidea: imx: set over current polarity per dts setting) +$ git merge usb-chipidea-next/ci-for-usb-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/usb/ci-hdrc-usb2.txt | 2 ++ + .../devicetree/bindings/usb/usbmisc-imx.txt | 1 + + drivers/usb/chipidea/ci_hdrc_imx.c | 3 +++ + drivers/usb/chipidea/ci_hdrc_imx.h | 1 + + drivers/usb/chipidea/udc.c | 9 +++------ + drivers/usb/chipidea/usbmisc_imx.c | 22 +++++++++++++++++----- + 6 files changed, 27 insertions(+), 11 deletions(-) +Merging staging/staging-next (0e06f5c0deee Merge branch 'akpm' (patches from Andrew)) +$ git merge staging/staging-next +Already up-to-date. +Merging char-misc/char-misc-next (0e06f5c0deee Merge branch 'akpm' (patches from Andrew)) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging extcon/extcon-next (c2692f2dad4f extcon: Block the bit masking operation for cable state except for extcon core) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-adc-jack.c | 27 +++++++++++--------- + drivers/extcon/extcon-arizona.c | 13 ++++++---- + drivers/extcon/extcon-gpio.c | 2 +- + drivers/extcon/extcon.c | 45 +++------------------------------- + include/linux/extcon.h | 30 ----------------------- + include/linux/extcon/extcon-adc-jack.h | 4 +-- + 6 files changed, 30 insertions(+), 91 deletions(-) +Merging cgroup/for-next (1cab4a96cab6 Merge branch 'for-4.8' into for-next) +$ git merge cgroup/for-next +Auto-merging kernel/cgroup.c +Merge made by the 'recursive' strategy. + kernel/cgroup.c | 18 ++++++++---------- + 1 file changed, 8 insertions(+), 10 deletions(-) +Merging scsi/for-next (d242e6680e81 fcoe: Use default VLAN for FIP VLAN discovery) +$ git merge scsi/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/scsi/cxlflash/main.c | 10 ++++++++- + drivers/scsi/fcoe/fcoe.c | 49 ++++++++++++++++++++++++++++++++++++++++++- + drivers/scsi/fcoe/fcoe.h | 1 + + drivers/scsi/ipr.c | 9 ++++++++ + drivers/scsi/ipr.h | 1 + + drivers/scsi/lpfc/lpfc_scsi.c | 2 +- + 7 files changed, 70 insertions(+), 3 deletions(-) +Merging target-updates/for-next (291e3e51a34d target: fix spelling mistake: "limitiation" -> "limitation") +$ git merge target-updates/for-next +Auto-merging include/scsi/viosrp.h +Auto-merging drivers/target/target_core_iblock.c +Auto-merging drivers/scsi/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 10 +- + drivers/scsi/Kconfig | 17 + + drivers/scsi/Makefile | 1 + + drivers/scsi/ibmvscsi/ibmvfc.h | 2 +- + drivers/scsi/ibmvscsi/ibmvscsi.h | 2 +- + drivers/scsi/ibmvscsi_tgt/Makefile | 3 + + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 4087 ++++++++++++++++++++++ + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.h | 346 ++ + drivers/scsi/ibmvscsi_tgt/libsrp.c | 427 +++ + drivers/scsi/ibmvscsi_tgt/libsrp.h | 123 + + drivers/target/iscsi/iscsi_target.c | 22 +- + drivers/target/iscsi/iscsi_target_login.c | 5 +- + drivers/target/target_core_device.c | 8 +- + drivers/target/target_core_file.c | 5 +- + drivers/target/target_core_iblock.c | 3 +- + drivers/target/target_core_internal.h | 1 + + drivers/target/target_core_sbc.c | 2 +- + drivers/target/target_core_transport.c | 94 +- + drivers/target/tcm_fc/tfc_sess.c | 2 + + {drivers/scsi/ibmvscsi => include/scsi}/viosrp.h | 13 +- + include/target/target_core_backend.h | 2 +- + include/target/target_core_base.h | 1 + + include/target/target_core_fabric.h | 1 - + 23 files changed, 5110 insertions(+), 67 deletions(-) + create mode 100644 drivers/scsi/ibmvscsi_tgt/Makefile + create mode 100644 drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c + create mode 100644 drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.h + create mode 100644 drivers/scsi/ibmvscsi_tgt/libsrp.c + create mode 100644 drivers/scsi/ibmvscsi_tgt/libsrp.h + rename {drivers/scsi/ibmvscsi => include/scsi}/viosrp.h (92%) +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 (737bee9308c4 libata-scsi: better style in ata_msense_*()) +$ git merge libata/for-next +Already up-to-date. +Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation) +$ git merge binfmt_misc/for-next +Auto-merging fs/open.c +Auto-merging fs/internal.h +Auto-merging fs/binfmt_misc.c +Merge made by the 'recursive' strategy. + Documentation/binfmt_misc.txt | 7 +++++++ + fs/binfmt_misc.c | 41 +++++++++++++++++++++++++++++++++++++++-- + fs/internal.h | 1 + + fs/open.c | 20 ++++++++++++++++++++ + 4 files changed, 67 insertions(+), 2 deletions(-) +Merging pinctrl/for-next (9573e7923007 pinctrl: fix pincontrol definition for marvell) +$ git merge pinctrl/for-next +Auto-merging drivers/pinctrl/pinctrl-xway.c +Auto-merging drivers/pinctrl/nomadik/pinctrl-nomadik.c +Auto-merging drivers/pinctrl/mediatek/pinctrl-mtk-common.c +Auto-merging drivers/pinctrl/intel/pinctrl-baytrail.c +Auto-merging drivers/pinctrl/freescale/pinctrl-imx.c +Auto-merging drivers/pinctrl/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio_oxnas.txt | 47 + + .../bindings/pinctrl/brcm,iproc-gpio.txt | 18 +- + .../bindings/pinctrl/brcm,nsp-pinmux.txt | 79 + + .../devicetree/bindings/pinctrl/oxnas,pinctrl.txt | 57 + + .../bindings/pinctrl/pinctrl-max77620.txt | 127 ++ + .../bindings/pinctrl/qcom,mdm9615-pinctrl.txt | 152 ++ + .../bindings/pinctrl/qcom,msm8660-pinctrl.txt | 2 +- + .../bindings/pinctrl/qcom,msm8974-pinctrl.txt | 5 +- + .../devicetree/bindings/pinctrl/qcom,pmic-mpp.txt | 1 + + .../bindings/pinctrl/renesas,pfc-pinctrl.txt | 2 +- + .../bindings/pinctrl/st,stm32-pinctrl.txt | 1 + + Documentation/pinctrl.txt | 24 +- + drivers/pinctrl/Kconfig | 26 +- + drivers/pinctrl/Makefile | 4 +- + drivers/pinctrl/bcm/Kconfig | 15 + + drivers/pinctrl/bcm/Makefile | 1 + + drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 118 +- + drivers/pinctrl/bcm/pinctrl-ns2-mux.c | 12 +- + drivers/pinctrl/bcm/pinctrl-nsp-gpio.c | 6 +- + drivers/pinctrl/bcm/pinctrl-nsp-mux.c | 642 ++++++++ + drivers/pinctrl/core.c | 25 +- + drivers/pinctrl/core.h | 2 + + drivers/pinctrl/devicetree.c | 7 +- + drivers/pinctrl/freescale/pinctrl-imx.c | 29 +- + drivers/pinctrl/freescale/pinctrl-imx1-core.c | 3 +- + drivers/pinctrl/freescale/pinctrl-imx1.c | 9 +- + drivers/pinctrl/freescale/pinctrl-imx21.c | 9 +- + drivers/pinctrl/freescale/pinctrl-imx23.c | 17 +- + drivers/pinctrl/freescale/pinctrl-imx25.c | 10 - + drivers/pinctrl/freescale/pinctrl-imx27.c | 10 - + drivers/pinctrl/freescale/pinctrl-imx28.c | 17 +- + drivers/pinctrl/freescale/pinctrl-imx35.c | 10 - + drivers/pinctrl/freescale/pinctrl-imx50.c | 9 - + drivers/pinctrl/freescale/pinctrl-imx51.c | 10 - + drivers/pinctrl/freescale/pinctrl-imx53.c | 10 - + drivers/pinctrl/freescale/pinctrl-imx6dl.c | 14 +- + drivers/pinctrl/freescale/pinctrl-imx6q.c | 10 - + drivers/pinctrl/freescale/pinctrl-imx6sl.c | 15 +- + drivers/pinctrl/freescale/pinctrl-imx6sx.c | 14 +- + drivers/pinctrl/freescale/pinctrl-imx6ul.c | 14 +- + drivers/pinctrl/freescale/pinctrl-imx7d.c | 14 +- + drivers/pinctrl/freescale/pinctrl-mxs.c | 12 - + drivers/pinctrl/freescale/pinctrl-mxs.h | 1 - + drivers/pinctrl/freescale/pinctrl-vf610.c | 10 - + drivers/pinctrl/intel/Kconfig | 11 + + drivers/pinctrl/intel/Makefile | 1 + + drivers/pinctrl/intel/pinctrl-baytrail.c | 25 +- + drivers/pinctrl/intel/pinctrl-broxton.c | 43 +- + drivers/pinctrl/intel/pinctrl-cherryview.c | 155 +- + drivers/pinctrl/intel/pinctrl-intel.c | 52 +- + drivers/pinctrl/intel/pinctrl-merrifield.c | 911 +++++++++++ + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 4 +- + drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 163 +- + drivers/pinctrl/mvebu/pinctrl-kirkwood.c | 85 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 96 -- + drivers/pinctrl/pinconf-generic.c | 14 +- + drivers/pinctrl/pinconf.c | 8 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 26 +- + drivers/pinctrl/pinctrl-at91.c | 13 +- + drivers/pinctrl/pinctrl-digicolor.c | 16 +- + drivers/pinctrl/pinctrl-lpc18xx.c | 20 +- + drivers/pinctrl/pinctrl-max77620.c | 673 ++++++++ + drivers/pinctrl/pinctrl-oxnas.c | 846 ++++++++++ + drivers/pinctrl/pinctrl-rockchip.c | 4 +- + drivers/pinctrl/pinctrl-st.c | 2 +- + drivers/pinctrl/pinctrl-u300.c | 2 +- + drivers/pinctrl/pinctrl-xway.c | 72 +- + drivers/pinctrl/pinctrl-zynq.c | 13 +- + drivers/pinctrl/pinmux.c | 16 +- + drivers/pinctrl/qcom/Kconfig | 8 + + drivers/pinctrl/qcom/Makefile | 1 + + drivers/pinctrl/qcom/pinctrl-mdm9615.c | 483 ++++++ + drivers/pinctrl/qcom/pinctrl-msm.c | 6 +- + drivers/pinctrl/qcom/pinctrl-msm8660.c | 114 +- + drivers/pinctrl/qcom/pinctrl-msm8x74.c | 43 +- + drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 1 + + drivers/pinctrl/samsung/pinctrl-exynos5440.c | 1 + + drivers/pinctrl/samsung/pinctrl-samsung.c | 1 + + drivers/pinctrl/sh-pfc/core.c | 10 - + drivers/pinctrl/sh-pfc/core.h | 58 - + drivers/pinctrl/sh-pfc/gpio.c | 13 +- + drivers/pinctrl/sh-pfc/pfc-r8a73a4.c | 1 - + drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 1 - + drivers/pinctrl/sh-pfc/pfc-r8a7778.c | 2 +- + drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 59 +- + drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 1 - + drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 327 +++- + drivers/pinctrl/sh-pfc/pfc-sh7757.c | 1 - + drivers/pinctrl/sh-pfc/pinctrl.c | 46 +- + drivers/pinctrl/sh-pfc/sh_pfc.h | 55 +- + drivers/pinctrl/sirf/pinctrl-atlas7.c | 4 +- + drivers/pinctrl/stm32/Kconfig | 6 + + drivers/pinctrl/stm32/Makefile | 1 + + drivers/pinctrl/stm32/pinctrl-stm32.c | 31 +- + drivers/pinctrl/stm32/pinctrl-stm32f746.c | 1681 ++++++++++++++++++++ + drivers/pinctrl/sunxi/pinctrl-sun8i-a23.c | 6 +- + drivers/pinctrl/sunxi/pinctrl-sun8i-a33.c | 6 +- + drivers/pinctrl/sunxi/pinctrl-sun8i-h3.c | 6 +- + drivers/pinctrl/tegra/pinctrl-tegra.c | 8 +- + drivers/pinctrl/tegra/pinctrl-tegra.h | 6 +- + drivers/pinctrl/tegra/pinctrl-tegra114.c | 4 +- + drivers/pinctrl/tegra/pinctrl-tegra124.c | 4 +- + drivers/pinctrl/tegra/pinctrl-tegra20.c | 6 +- + drivers/pinctrl/tegra/pinctrl-tegra210.c | 4 +- + drivers/pinctrl/tegra/pinctrl-tegra30.c | 4 +- + drivers/pinctrl/uniphier/Kconfig | 20 +- + drivers/pinctrl/uniphier/Makefile | 2 + + drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 298 ++-- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | 952 +++++++++++ + drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 1050 ++++++++++++ + drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c | 494 +++--- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c | 609 +++---- + drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c | 819 +++++----- + drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c | 653 ++++---- + drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c | 603 +++---- + drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c | 455 +++--- + drivers/pinctrl/uniphier/pinctrl-uniphier.h | 59 +- + include/dt-bindings/pinctrl/stm32f746-pinfunc.h | 1324 +++++++++++++++ + 118 files changed, 12540 insertions(+), 2698 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio_oxnas.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,nsp-pinmux.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/oxnas,pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-max77620.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,mdm9615-pinctrl.txt + create mode 100644 drivers/pinctrl/bcm/pinctrl-nsp-mux.c + create mode 100644 drivers/pinctrl/intel/pinctrl-merrifield.c + create mode 100644 drivers/pinctrl/pinctrl-max77620.c + create mode 100644 drivers/pinctrl/pinctrl-oxnas.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-mdm9615.c + create mode 100644 drivers/pinctrl/stm32/pinctrl-stm32f746.c + create mode 100644 drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c + create mode 100644 drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c + create mode 100644 include/dt-bindings/pinctrl/stm32f746-pinfunc.h +Merging vhost/linux-next (139ab4d4e68b tools/virtio: add noring tool) +$ git merge vhost/linux-next +Already up-to-date. +Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias) +$ git merge remoteproc/for-next +Merge made by the 'recursive' strategy. +Merging rpmsg/for-next (e937b335a738 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 137 ++++ + MAINTAINERS | 6 +- + drivers/hwspinlock/qcom_hwspinlock.c | 1 + + drivers/remoteproc/Kconfig | 14 + + drivers/remoteproc/Makefile | 2 + + drivers/remoteproc/qcom_mdt_loader.c | 179 ++++ + drivers/remoteproc/qcom_mdt_loader.h | 13 + + drivers/remoteproc/qcom_q6v5_pil.c | 908 +++++++++++++++++++++ + drivers/remoteproc/remoteproc_core.c | 15 +- + drivers/rpmsg/virtio_rpmsg_bus.c | 2 +- + 10 files changed, 1268 insertions(+), 9 deletions(-) + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt + create mode 100644 drivers/remoteproc/qcom_mdt_loader.c + create mode 100644 drivers/remoteproc/qcom_mdt_loader.h + create mode 100644 drivers/remoteproc/qcom_q6v5_pil.c +Merging gpio/for-next (152b09f20130 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (53de7c26ded7 Merge branch 'for-4.8/regulator' into for-next) +$ git merge pwm/for-next +Resolved 'Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt' using previous resolution. +Removing drivers/pwm/pwm-tipwmss.h +Auto-merging Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 07ad4d38c16b] Merge remote-tracking branch 'pwm/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-pwm | 9 + + .../devicetree/bindings/pwm/brcm,iproc-pwm.txt | 21 ++ + .../devicetree/bindings/pwm/google,cros-ec-pwm.txt | 23 ++ + .../devicetree/bindings/pwm/nvidia,tegra20-pwm.txt | 12 +- + .../devicetree/bindings/pwm/renesas,pwm-rcar.txt | 1 + + .../devicetree/bindings/pwm/st,stmpe-pwm.txt | 18 ++ + .../bindings/regulator/pwm-regulator.txt | 19 ++ + drivers/platform/chrome/cros_ec_proto.c | 17 ++ + drivers/pwm/Kconfig | 26 +- + drivers/pwm/Makefile | 3 + + drivers/pwm/core.c | 27 ++ + drivers/pwm/pwm-atmel.c | 30 +- + drivers/pwm/pwm-bcm-iproc.c | 277 ++++++++++++++++++ + drivers/pwm/pwm-cros-ec.c | 260 +++++++++++++++++ + drivers/pwm/pwm-lpc32xx.c | 7 + + drivers/pwm/pwm-lpss-pci.c | 1 + + drivers/pwm/pwm-lpss.c | 26 +- + drivers/pwm/pwm-rockchip.c | 178 +++++++++--- + drivers/pwm/pwm-stmpe.c | 319 +++++++++++++++++++++ + drivers/pwm/pwm-tegra.c | 69 +++-- + drivers/pwm/pwm-tiecap.c | 37 +-- + drivers/pwm/pwm-tiehrpwm.c | 38 +-- + drivers/pwm/pwm-tipwmss.c | 49 ---- + drivers/pwm/pwm-tipwmss.h | 39 --- + drivers/pwm/sysfs.c | 17 ++ + drivers/regulator/pwm-regulator.c | 162 ++++++++--- + include/linux/mfd/cros_ec.h | 15 + + include/linux/mfd/cros_ec_commands.h | 31 ++ + include/linux/pwm.h | 113 +++++++- + 29 files changed, 1561 insertions(+), 283 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pwm/brcm,iproc-pwm.txt + create mode 100644 Documentation/devicetree/bindings/pwm/google,cros-ec-pwm.txt + create mode 100644 Documentation/devicetree/bindings/pwm/st,stmpe-pwm.txt + create mode 100644 drivers/pwm/pwm-bcm-iproc.c + create mode 100644 drivers/pwm/pwm-cros-ec.c + create mode 100644 drivers/pwm/pwm-stmpe.c + delete mode 100644 drivers/pwm/pwm-tipwmss.h +Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files) +$ git merge dma-buf/for-next +Resolved 'drivers/dma-buf/Kconfig' using previous resolution. +Auto-merging drivers/dma-buf/Kconfig +CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5c43f8bf6d18] Merge remote-tracking branch 'dma-buf/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging userns/for-next (aeaa4a79ff6a fs: Call d_automount with the filesystems creds) +$ git merge userns/for-next +Resolved 'fs/posix_acl.c' using previous resolution. +Resolved 'fs/proc/root.c' using previous resolution. +Auto-merging security/smack/smack_lsm.c +Auto-merging security/selinux/hooks.c +Auto-merging include/linux/quota.h +Auto-merging include/linux/posix_acl.h +Auto-merging include/linux/fs.h +Auto-merging fs/super.c +Auto-merging fs/quota/dquot.c +Auto-merging fs/proc/root.c +CONFLICT (content): Merge conflict in fs/proc/root.c +Auto-merging fs/posix_acl.c +CONFLICT (content): Merge conflict in fs/posix_acl.c +Auto-merging fs/nfsd/nfsctl.c +Auto-merging fs/namespace.c +Auto-merging fs/namei.c +Auto-merging fs/inode.c +Auto-merging fs/block_dev.c +Auto-merging drivers/staging/lustre/lustre/mdc/mdc_request.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c340166a6712] Merge remote-tracking branch 'userns/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/staging/lustre/lustre/mdc/mdc_request.c | 2 +- + fs/9p/acl.c | 2 +- + fs/attr.c | 19 +++++ + fs/block_dev.c | 2 +- + fs/devpts/inode.c | 3 +- + fs/exec.c | 2 +- + fs/inode.c | 7 ++ + fs/kernfs/mount.c | 5 +- + fs/namei.c | 55 +++++++++++--- + fs/namespace.c | 99 ++++++++++++------------- + fs/nfsd/nfsctl.c | 13 +--- + fs/posix_acl.c | 8 +- + fs/proc/inode.c | 8 +- + fs/proc/internal.h | 3 +- + fs/proc/root.c | 61 ++------------- + fs/quota/dquot.c | 8 ++ + fs/quota/quota.c | 14 ++-- + fs/super.c | 69 +++++++++++++++-- + fs/sysfs/mount.c | 5 +- + fs/xattr.c | 7 ++ + include/linux/fs.h | 79 ++++++++++++-------- + include/linux/mount.h | 1 + + include/linux/posix_acl.h | 2 +- + include/linux/quota.h | 10 +++ + include/linux/uidgid.h | 4 +- + include/linux/user_namespace.h | 6 ++ + ipc/mqueue.c | 20 +++-- + ipc/namespace.c | 5 +- + kernel/cred.c | 2 + + kernel/user_namespace.c | 14 ++++ + net/sunrpc/rpc_pipe.c | 8 +- + security/commoncap.c | 10 ++- + security/integrity/evm/evm_crypto.c | 4 +- + security/selinux/hooks.c | 25 ++++++- + security/smack/smack.h | 8 +- + security/smack/smack_lsm.c | 34 ++++++++- + 36 files changed, 411 insertions(+), 213 deletions(-) +$ git am -3 ../patches/0001-proc-fixup-for-prevent-stacking-filesystems-on-top.patch +Applying: proc: fixup for "prevent stacking filesystems on top" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/proc/inode.c +$ git add -A . +$ git commit -v -a --amend +[master 2ce873f90d9d] Merge remote-tracking branch 'userns/for-next' + Date: Fri Jul 29 13:30:11 2016 +1000 +Merging ktest/for-next (2dcd0af568b0 Linux 4.6) +$ git merge ktest/for-next +Already up-to-date. +Merging clk/clk-next (d22527fed2f0 Merge branch 'clk-fixes' into clk-next) +$ git merge clk/clk-next +Auto-merging include/linux/clk.h +Auto-merging arch/arm/boot/dts/sun8i-h3.dtsi +Merge made by the 'recursive' strategy. + .../bindings/clock/fixed-factor-clock.txt | 4 + + .../devicetree/bindings/clock/sunxi-ccu.txt | 24 + + arch/arm/boot/dts/sun8i-h3.dtsi | 312 ++------ + drivers/clk/Kconfig | 6 +- + drivers/clk/Makefile | 21 +- + drivers/clk/at91/clk-generated.c | 2 +- + drivers/clk/bcm/clk-iproc-armpll.c | 11 +- + drivers/clk/bcm/clk-iproc-asiu.c | 27 +- + drivers/clk/bcm/clk-iproc-pll.c | 32 +- + drivers/clk/clk-conf.c | 2 +- + drivers/clk/clk-fixed-factor.c | 11 +- + drivers/clk/clk-fixed-rate.c | 11 + + drivers/clk/clk-highbank.c | 9 +- + drivers/clk/clk-multiplier.c | 20 +- + drivers/clk/clk-nomadik.c | 48 +- + drivers/clk/clk-oxnas.c | 15 +- + drivers/clk/clk-s2mps11.c | 21 +- + drivers/clk/clk-stm32f4.c | 14 +- + drivers/clk/clk-u300.c | 59 +- + drivers/clk/clk-vt8500.c | 99 ++- + drivers/clk/clk.c | 347 +++++---- + drivers/clk/hisilicon/clk-hi3519.c | 116 ++- + drivers/clk/hisilicon/clk-hi6220.c | 4 +- + drivers/clk/hisilicon/clk.c | 89 ++- + drivers/clk/hisilicon/clk.h | 34 +- + drivers/clk/hisilicon/clkdivider-hi6220.c | 2 + + drivers/clk/hisilicon/reset.c | 19 +- + drivers/clk/hisilicon/reset.h | 5 +- + drivers/clk/imx/clk-imx7d.c | 741 +++++++++--------- + drivers/clk/imx/clk-vf610.c | 12 +- + drivers/clk/imx/clk.h | 90 ++- + drivers/clk/meson/gxbb.c | 18 +- + drivers/clk/meson/meson8b-clkc.c | 19 +- + drivers/clk/nxp/clk-lpc32xx.c | 3 +- + drivers/clk/qcom/gcc-msm8660.c | 28 + + drivers/clk/qcom/gcc-msm8996.c | 16 - + drivers/clk/samsung/Kconfig | 9 + + drivers/clk/samsung/Makefile | 2 +- + drivers/clk/samsung/clk-cpu.c | 131 +++- + drivers/clk/samsung/clk-cpu.h | 4 +- + drivers/clk/samsung/clk-exynos-audss.c | 12 +- + drivers/clk/samsung/clk-exynos-clkout.c | 2 + + drivers/clk/samsung/clk-exynos3250.c | 41 +- + drivers/clk/samsung/clk-exynos4.c | 64 +- + drivers/clk/samsung/clk-exynos4415.c | 30 +- + drivers/clk/samsung/clk-exynos5250.c | 27 +- + drivers/clk/samsung/clk-exynos5260.c | 114 +-- + drivers/clk/samsung/clk-exynos5410.c | 58 +- + drivers/clk/samsung/clk-exynos5420.c | 40 +- + drivers/clk/samsung/clk-exynos5433.c | 437 ++++++----- + drivers/clk/samsung/clk-exynos5440.c | 12 +- + drivers/clk/samsung/clk-exynos7.c | 119 +-- + drivers/clk/samsung/clk-pll.c | 122 +-- + drivers/clk/samsung/clk-s3c2410-dclk.c | 5 +- + drivers/clk/samsung/clk-s3c2410.c | 2 - + drivers/clk/samsung/clk-s3c2412.c | 2 - + drivers/clk/samsung/clk-s3c2443.c | 2 - + drivers/clk/samsung/clk-s3c64xx.c | 2 - + drivers/clk/samsung/clk-s5pv210-audss.c | 29 +- + drivers/clk/samsung/clk-s5pv210.c | 2 - + drivers/clk/samsung/clk.c | 14 +- + drivers/clk/samsung/clk.h | 22 +- + drivers/clk/sunxi-ng/Kconfig | 65 ++ + drivers/clk/sunxi-ng/Makefile | 20 + + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 826 +++++++++++++++++++++ + drivers/clk/sunxi-ng/ccu-sun8i-h3.h | 62 ++ + drivers/clk/sunxi-ng/ccu_common.c | 90 +++ + drivers/clk/sunxi-ng/ccu_common.h | 85 +++ + drivers/clk/sunxi-ng/ccu_div.c | 136 ++++ + drivers/clk/sunxi-ng/ccu_div.h | 133 ++++ + drivers/clk/sunxi-ng/ccu_frac.c | 110 +++ + drivers/clk/sunxi-ng/ccu_frac.h | 53 ++ + drivers/clk/sunxi-ng/ccu_gate.c | 82 ++ + drivers/clk/sunxi-ng/ccu_gate.h | 52 ++ + drivers/clk/sunxi-ng/ccu_mp.c | 158 ++++ + drivers/clk/sunxi-ng/ccu_mp.h | 77 ++ + drivers/clk/sunxi-ng/ccu_mult.h | 15 + + drivers/clk/sunxi-ng/ccu_mux.c | 187 +++++ + drivers/clk/sunxi-ng/ccu_mux.h | 91 +++ + drivers/clk/sunxi-ng/ccu_nk.c | 147 ++++ + drivers/clk/sunxi-ng/ccu_nk.h | 71 ++ + drivers/clk/sunxi-ng/ccu_nkm.c | 153 ++++ + drivers/clk/sunxi-ng/ccu_nkm.h | 68 ++ + drivers/clk/sunxi-ng/ccu_nkmp.c | 167 +++++ + drivers/clk/sunxi-ng/ccu_nkmp.h | 71 ++ + drivers/clk/sunxi-ng/ccu_nm.c | 114 +++ + drivers/clk/sunxi-ng/ccu_nm.h | 91 +++ + drivers/clk/sunxi-ng/ccu_phase.c | 126 ++++ + drivers/clk/sunxi-ng/ccu_phase.h | 50 ++ + drivers/clk/sunxi-ng/ccu_reset.c | 55 ++ + drivers/clk/sunxi-ng/ccu_reset.h | 40 + + drivers/clk/sunxi/clk-factors.c | 1 - + drivers/clk/sunxi/clk-sun6i-apb0-gates.c | 9 +- + drivers/clk/sunxi/clk-sun6i-apb0.c | 9 +- + drivers/clk/sunxi/clk-sun6i-ar100.c | 21 +- + drivers/clk/sunxi/clk-sun8i-apb0.c | 9 +- + drivers/clk/sunxi/clk-sun9i-mmc.c | 28 +- + include/dt-bindings/clock/exynos5433.h | 3 +- + include/dt-bindings/clock/lpc32xx-clock.h | 1 + + include/dt-bindings/clock/sun8i-h3-ccu.h | 145 ++++ + include/dt-bindings/reset/sun8i-h3-ccu.h | 103 +++ + include/linux/clk-provider.h | 3 + + include/linux/clk.h | 16 +- + 103 files changed, 5650 insertions(+), 1688 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/sunxi-ccu.txt + create mode 100644 drivers/clk/sunxi-ng/Kconfig + create mode 100644 drivers/clk/sunxi-ng/Makefile + create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-h3.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-h3.h + create mode 100644 drivers/clk/sunxi-ng/ccu_common.c + create mode 100644 drivers/clk/sunxi-ng/ccu_common.h + create mode 100644 drivers/clk/sunxi-ng/ccu_div.c + create mode 100644 drivers/clk/sunxi-ng/ccu_div.h + create mode 100644 drivers/clk/sunxi-ng/ccu_frac.c + create mode 100644 drivers/clk/sunxi-ng/ccu_frac.h + create mode 100644 drivers/clk/sunxi-ng/ccu_gate.c + create mode 100644 drivers/clk/sunxi-ng/ccu_gate.h + create mode 100644 drivers/clk/sunxi-ng/ccu_mp.c + create mode 100644 drivers/clk/sunxi-ng/ccu_mp.h + create mode 100644 drivers/clk/sunxi-ng/ccu_mult.h + create mode 100644 drivers/clk/sunxi-ng/ccu_mux.c + create mode 100644 drivers/clk/sunxi-ng/ccu_mux.h + create mode 100644 drivers/clk/sunxi-ng/ccu_nk.c + create mode 100644 drivers/clk/sunxi-ng/ccu_nk.h + create mode 100644 drivers/clk/sunxi-ng/ccu_nkm.c + create mode 100644 drivers/clk/sunxi-ng/ccu_nkm.h + create mode 100644 drivers/clk/sunxi-ng/ccu_nkmp.c + create mode 100644 drivers/clk/sunxi-ng/ccu_nkmp.h + create mode 100644 drivers/clk/sunxi-ng/ccu_nm.c + create mode 100644 drivers/clk/sunxi-ng/ccu_nm.h + create mode 100644 drivers/clk/sunxi-ng/ccu_phase.c + create mode 100644 drivers/clk/sunxi-ng/ccu_phase.h + create mode 100644 drivers/clk/sunxi-ng/ccu_reset.c + create mode 100644 drivers/clk/sunxi-ng/ccu_reset.h + create mode 100644 include/dt-bindings/clock/sun8i-h3-ccu.h + create mode 100644 include/dt-bindings/reset/sun8i-h3-ccu.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 (d78388dbec25 selftests: media_tests add a new video device test) +$ git merge kselftest/next +Auto-merging tools/testing/selftests/vm/compaction_test.c +Merge made by the 'recursive' strategy. + tools/testing/selftests/lib/printf.sh | 0 + tools/testing/selftests/media_tests/.gitignore | 2 + + tools/testing/selftests/media_tests/Makefile | 4 +- + .../selftests/media_tests/bind_unbind_sample.sh | 12 +++ + .../selftests/media_tests/media_device_open.c | 81 +++++++++++++++++ + .../selftests/media_tests/media_device_test.c | 19 ++-- + .../selftests/media_tests/open_loop_test.sh | 10 +++ + .../selftests/media_tests/regression_test.txt | 43 +++++++++ + .../selftests/media_tests/video_device_test.c | 100 +++++++++++++++++++++ + tools/testing/selftests/vm/compaction_test.c | 8 +- + tools/testing/selftests/vm/on-fault-limit.c | 2 +- + 11 files changed, 268 insertions(+), 13 deletions(-) + mode change 100644 => 100755 tools/testing/selftests/lib/printf.sh + create mode 100755 tools/testing/selftests/media_tests/bind_unbind_sample.sh + create mode 100644 tools/testing/selftests/media_tests/media_device_open.c + create mode 100755 tools/testing/selftests/media_tests/open_loop_test.sh + create mode 100644 tools/testing/selftests/media_tests/regression_test.txt + create mode 100644 tools/testing/selftests/media_tests/video_device_test.c +Merging y2038/y2038 (549eb7b22e24 AFS: Correctly use 64-bit time for UUID) +$ git merge y2038/y2038 +Merge made by the 'recursive' strategy. + fs/afs/main.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) +Merging luto-misc/next (2dcd0af568b0 Linux 4.6) +$ git merge luto-misc/next +Already up-to-date. +Merging borntraeger/linux-next (b562e44f507e Linux 4.5) +$ git merge borntraeger/linux-next +Already up-to-date. +Merging livepatching/for-next (6d9122078097 Merge branch 'for-4.7/core' into for-next) +$ git merge livepatching/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging coresight/next (27ee11458de3 coresight: tmc: Delete an unnecessary check before the function call "kfree") +$ git merge coresight/next +Auto-merging drivers/hwtracing/coresight/coresight-etm4x.c +Auto-merging drivers/hwtracing/coresight/coresight-etm3x.c +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight-etb10.c | 26 +++----- + drivers/hwtracing/coresight/coresight-etm3x.c | 25 ++++---- + drivers/hwtracing/coresight/coresight-etm4x.c | 51 +++++---------- + drivers/hwtracing/coresight/coresight-funnel.c | 20 +++--- + drivers/hwtracing/coresight/coresight-priv.h | 8 ++- + .../coresight/coresight-replicator-qcom.c | 18 ++---- + drivers/hwtracing/coresight/coresight-replicator.c | 20 ++---- + drivers/hwtracing/coresight/coresight-stm.c | 44 +++++++++---- + drivers/hwtracing/coresight/coresight-tmc-etf.c | 4 +- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 12 +++- + drivers/hwtracing/coresight/coresight-tmc.c | 74 ++++++++++------------ + drivers/hwtracing/coresight/coresight-tmc.h | 4 +- + drivers/hwtracing/coresight/coresight-tpiu.c | 18 ++---- + drivers/hwtracing/coresight/coresight.c | 27 ++++---- + drivers/hwtracing/coresight/of_coresight.c | 3 +- + 15 files changed, 168 insertions(+), 186 deletions(-) +Merging rtc/rtc-next (144d2fe0ad37 rtc: asm9260: remove .owner field for driver) +$ git merge rtc/rtc-next +Resolved 'arch/x86/platform/efi/efi_64.c' using previous resolution. +Removing include/linux/ds17287rtc.h +Auto-merging drivers/rtc/rtc-mc146818-lib.c +Removing drivers/char/genrtc.c +Auto-merging drivers/char/Makefile +Auto-merging drivers/char/Kconfig +Auto-merging arch/x86/platform/efi/efi_64.c +CONFLICT (content): Merge conflict in arch/x86/platform/efi/efi_64.c +Auto-merging arch/x86/platform/efi/efi.c +Auto-merging arch/x86/kernel/hpet.c +Removing arch/x86/include/asm/rtc.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/sh/kernel/time.c +Removing arch/sh/include/asm/mc146818rtc.h +Auto-merging arch/powerpc/platforms/Kconfig +Auto-merging arch/powerpc/kernel/time.c +Removing arch/powerpc/include/asm/rtc.h +Auto-merging arch/parisc/kernel/time.c +Removing arch/parisc/include/asm/rtc.h +Removing arch/parisc/include/asm/mc146818rtc.h +Removing arch/m68k/include/asm/rtc.h +Removing arch/ia64/include/asm/mc146818rtc.h +Removing arch/h8300/include/asm/mc146818rtc.h +Removing arch/frv/include/asm/mc146818rtc.h +Removing arch/alpha/include/asm/rtc.h +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 4102f0649330] Merge remote-tracking branch 'rtc/rtc-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 4 + + arch/alpha/include/asm/rtc.h | 1 - + arch/alpha/kernel/core_marvel.c | 1 - + arch/alpha/kernel/rtc.c | 6 +- + arch/arm/mach-ep93xx/ts72xx.c | 2 +- + arch/arm/mach-orion5x/ts78xx-setup.c | 2 +- + arch/arm/mach-pxa/cm-x270.c | 2 +- + arch/arm/mach-pxa/cm-x300.c | 2 +- + arch/arm/mach-pxa/em-x270.c | 2 +- + arch/frv/include/asm/mc146818rtc.h | 16 - + arch/h8300/include/asm/mc146818rtc.h | 9 - + arch/ia64/include/asm/mc146818rtc.h | 10 - + arch/m68k/amiga/config.c | 1 - + arch/m68k/apollo/config.c | 1 - + arch/m68k/bvme6000/config.c | 1 - + arch/m68k/hp300/config.c | 2 +- + arch/m68k/include/asm/rtc.h | 79 --- + arch/m68k/kernel/time.c | 48 +- + arch/m68k/mac/config.c | 3 +- + arch/m68k/mac/misc.c | 1 - + arch/m68k/mvme147/config.c | 1 - + arch/m68k/mvme16x/config.c | 1 - + arch/m68k/q40/config.c | 2 +- + arch/m68k/sun3/config.c | 1 - + arch/m68k/sun3/intersil.c | 2 +- + arch/m68k/sun3x/time.c | 2 +- + arch/mips/sgi-ip22/ip22-reset.c | 2 +- + arch/mips/sni/time.c | 1 - + arch/mn10300/Kconfig | 4 +- + arch/mn10300/include/asm/rtc-regs.h | 4 +- + arch/mn10300/include/asm/rtc.h | 2 - + arch/mn10300/kernel/rtc.c | 104 +--- + arch/mn10300/proc-mn103e010/proc-init.c | 3 + + arch/mn10300/proc-mn2ws0050/proc-init.c | 1 + + arch/parisc/include/asm/mc146818rtc.h | 9 - + arch/parisc/include/asm/rtc.h | 131 ----- + arch/parisc/kernel/time.c | 36 +- + arch/powerpc/include/asm/rtc.h | 78 --- + arch/powerpc/kernel/time.c | 29 +- + arch/powerpc/platforms/Kconfig | 11 + + arch/powerpc/platforms/ps3/time.c | 2 +- + arch/sh/include/asm/mc146818rtc.h | 7 - + arch/sh/include/asm/rtc.h | 11 - + arch/sh/kernel/time.c | 33 +- + arch/sparc/include/asm/io_32.h | 10 - + arch/x86/Kconfig | 1 + + arch/x86/include/asm/mc146818rtc.h | 1 - + arch/x86/include/asm/rtc.h | 1 - + arch/x86/kernel/hpet.c | 3 +- + arch/x86/kernel/nmi.c | 1 + + arch/x86/kernel/rtc.c | 3 +- + arch/x86/platform/efi/efi.c | 1 - + arch/x86/platform/efi/efi_64.c | 1 + + arch/x86/platform/intel-mid/intel_mid_vrtc.c | 1 + + drivers/acpi/acpi_cmos_rtc.c | 2 +- + drivers/base/power/trace.c | 6 +- + drivers/char/Kconfig | 28 +- + drivers/char/Makefile | 1 - + drivers/char/genrtc.c | 539 --------------------- + drivers/rtc/Kconfig | 20 +- + drivers/rtc/Makefile | 2 + + drivers/rtc/interface.c | 32 +- + drivers/rtc/rtc-abx80x.c | 12 +- + drivers/rtc/rtc-asm9260.c | 1 - + drivers/rtc/rtc-at91sam9.c | 1 + + drivers/rtc/rtc-cmos.c | 17 +- + drivers/rtc/rtc-da9052.c | 1 + + drivers/rtc/rtc-da9055.c | 1 + + drivers/rtc/rtc-davinci.c | 2 + + drivers/rtc/rtc-ds1286.c | 2 +- + drivers/rtc/rtc-ds1305.c | 7 - + drivers/rtc/rtc-ds1307.c | 33 +- + drivers/rtc/rtc-ds1343.c | 6 - + drivers/rtc/rtc-ds1685.c | 53 +- + drivers/rtc/rtc-ds2404.c | 2 +- + drivers/rtc/rtc-ds3232.c | 6 - + drivers/rtc/rtc-efi.c | 6 + + drivers/rtc/rtc-generic.c | 36 +- + drivers/rtc/rtc-hym8563.c | 5 +- + drivers/rtc/rtc-isl12057.c | 33 +- + drivers/rtc/rtc-m41t80.c | 34 +- + drivers/rtc/rtc-m48t86.c | 2 +- + drivers/rtc/rtc-max6916.c | 164 +++++++ + .../rtc.h => drivers/rtc/rtc-mc146818-lib.c | 69 +-- + drivers/rtc/rtc-mrst.c | 10 +- + drivers/rtc/rtc-pcf2123.c | 4 +- + drivers/rtc/rtc-pcf85063.c | 59 ++- + drivers/rtc/rtc-pcf8563.c | 5 +- + drivers/rtc/rtc-rc5t583.c | 1 + + drivers/rtc/rtc-rs5c372.c | 6 - + drivers/rtc/rtc-rv8803.c | 9 +- + drivers/rtc/rtc-rx8010.c | 8 +- + drivers/rtc/rtc-rx8025.c | 5 - + drivers/rtc/rtc-s35390a.c | 157 ++++-- + drivers/rtc/rtc-s3c.c | 16 +- + drivers/rtc/rtc-sh.c | 42 +- + drivers/rtc/rtc-tegra.c | 6 - + drivers/rtc/rtc-v3020.c | 2 +- + include/linux/ds17287rtc.h | 66 --- + include/linux/mc146818rtc.h | 5 + + include/linux/{ => platform_data}/rtc-ds2404.h | 0 + .../linux/{m48t86.h => platform_data/rtc-m48t86.h} | 0 + include/linux/{ => platform_data}/rtc-v3020.h | 0 + include/linux/{ => rtc}/ds1286.h | 0 + tools/testing/selftests/timers/rtctest.c | 13 +- + 105 files changed, 717 insertions(+), 1513 deletions(-) + delete mode 100644 arch/alpha/include/asm/rtc.h + delete mode 100644 arch/frv/include/asm/mc146818rtc.h + delete mode 100644 arch/h8300/include/asm/mc146818rtc.h + delete mode 100644 arch/ia64/include/asm/mc146818rtc.h + delete mode 100644 arch/m68k/include/asm/rtc.h + delete mode 100644 arch/parisc/include/asm/mc146818rtc.h + delete mode 100644 arch/parisc/include/asm/rtc.h + delete mode 100644 arch/powerpc/include/asm/rtc.h + delete mode 100644 arch/sh/include/asm/mc146818rtc.h + delete mode 100644 arch/x86/include/asm/rtc.h + delete mode 100644 drivers/char/genrtc.c + create mode 100644 drivers/rtc/rtc-max6916.c + rename include/asm-generic/rtc.h => drivers/rtc/rtc-mc146818-lib.c (76%) + delete mode 100644 include/linux/ds17287rtc.h + rename include/linux/{ => platform_data}/rtc-ds2404.h (100%) + rename include/linux/{m48t86.h => platform_data/rtc-m48t86.h} (100%) + rename include/linux/{ => platform_data}/rtc-v3020.h (100%) + rename include/linux/{ => rtc}/ds1286.h (100%) +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 (0606263f24f3 Merge branch 'for-4.8/libnvdimm' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Resolved 'arch/x86/kvm/vmx.c' using previous resolution. +Resolved 'drivers/nvdimm/pmem.c' using previous resolution. +Auto-merging tools/perf/util/intel-pt-decoder/x86-opcode-map.txt +Auto-merging tools/perf/arch/x86/tests/insn-x86-dat-src.c +Auto-merging tools/perf/arch/x86/tests/insn-x86-dat-64.c +Auto-merging tools/perf/arch/x86/tests/insn-x86-dat-32.c +Auto-merging include/linux/compiler.h +Auto-merging include/linux/blkdev.h +Auto-merging fs/dax.c +Auto-merging drivers/s390/block/dcssblk.c +Auto-merging drivers/nvdimm/pmem.c +CONFLICT (content): Merge conflict in drivers/nvdimm/pmem.c +Auto-merging drivers/nvdimm/bus.c +Auto-merging drivers/nvdimm/blk.c +Auto-merging drivers/block/brd.c +Auto-merging drivers/acpi/nfit/nfit.h +Auto-merging drivers/acpi/nfit/core.c +Auto-merging drivers/acpi/Makefile +Auto-merging drivers/acpi/Kconfig +Auto-merging arch/x86/lib/x86-opcode-map.txt +Auto-merging arch/x86/kvm/vmx.c +CONFLICT (content): Merge conflict in arch/x86/kvm/vmx.c +Auto-merging arch/x86/kvm/cpuid.c +Auto-merging arch/x86/include/asm/cpufeatures.h +Auto-merging arch/powerpc/sysdev/axonram.c +Auto-merging Documentation/filesystems/Locking +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master bd23ba10cc5b] Merge remote-tracking branch 'nvdimm/libnvdimm-for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/Locking | 2 +- + Documentation/nvdimm/btt.txt | 28 +- + arch/powerpc/sysdev/axonram.c | 4 +- + arch/x86/include/asm/cpufeatures.h | 1 - + arch/x86/include/asm/pmem.h | 77 +-- + arch/x86/include/asm/special_insns.h | 46 -- + arch/x86/include/asm/vmx.h | 1 - + arch/x86/include/uapi/asm/vmx.h | 4 +- + arch/x86/kvm/cpuid.c | 2 +- + arch/x86/kvm/cpuid.h | 8 - + arch/x86/kvm/vmx.c | 32 +- + arch/x86/lib/x86-opcode-map.txt | 2 +- + drivers/acpi/Kconfig | 27 +- + drivers/acpi/Makefile | 2 +- + drivers/acpi/nfit/Kconfig | 26 + + drivers/acpi/nfit/Makefile | 3 + + drivers/acpi/{nfit.c => nfit/core.c} | 647 ++++++++++++--------- + drivers/acpi/nfit/mce.c | 89 +++ + drivers/acpi/{ => nfit}/nfit.h | 60 +- + drivers/block/brd.c | 4 +- + drivers/dax/dax.c | 6 +- + drivers/dax/pmem.c | 14 +- + drivers/nvdimm/Kconfig | 2 +- + drivers/nvdimm/blk.c | 11 +- + drivers/nvdimm/btt_devs.c | 3 +- + drivers/nvdimm/bus.c | 212 ++++++- + drivers/nvdimm/claim.c | 7 +- + drivers/nvdimm/core.c | 253 ++++---- + drivers/nvdimm/dimm_devs.c | 5 +- + drivers/nvdimm/e820.c | 1 + + drivers/nvdimm/nd-core.h | 5 +- + drivers/nvdimm/nd.h | 10 +- + drivers/nvdimm/pmem.c | 85 +-- + drivers/nvdimm/pmem.h | 24 + + drivers/nvdimm/region.c | 19 +- + drivers/nvdimm/region_devs.c | 154 ++++- + drivers/s390/block/dcssblk.c | 6 +- + fs/dax.c | 13 +- + include/linux/blkdev.h | 6 +- + include/linux/compiler.h | 2 - + include/linux/libnvdimm.h | 24 +- + include/linux/nd.h | 3 +- + include/linux/pfn_t.h | 5 +- + include/linux/pmem.h | 117 +--- + include/uapi/linux/ndctl.h | 1 + + kernel/memremap.c | 6 - + scripts/checkpatch.pl | 1 - + tools/objtool/arch/x86/insn/x86-opcode-map.txt | 2 +- + tools/perf/arch/x86/tests/insn-x86-dat-32.c | 2 - + tools/perf/arch/x86/tests/insn-x86-dat-64.c | 2 - + tools/perf/arch/x86/tests/insn-x86-dat-src.c | 4 - + .../perf/util/intel-pt-decoder/x86-opcode-map.txt | 2 +- + tools/testing/nvdimm/Kbuild | 10 +- + tools/testing/nvdimm/config_check.c | 1 + + tools/testing/nvdimm/pmem-dax.c | 54 ++ + tools/testing/nvdimm/test/Kbuild | 2 +- + tools/testing/nvdimm/test/iomap.c | 38 +- + tools/testing/nvdimm/test/nfit.c | 199 +++---- + tools/testing/nvdimm/test/nfit_test.h | 2 + + 59 files changed, 1369 insertions(+), 1009 deletions(-) + create mode 100644 drivers/acpi/nfit/Kconfig + create mode 100644 drivers/acpi/nfit/Makefile + rename drivers/acpi/{nfit.c => nfit/core.c} (87%) + create mode 100644 drivers/acpi/nfit/mce.c + rename drivers/acpi/{ => nfit}/nfit.h (82%) + create mode 100644 drivers/nvdimm/pmem.h + create mode 100644 tools/testing/nvdimm/pmem-dax.c +$ git am -3 ../patches/0001-dm-merge-fix-for-pmem-kill-__pmem-address-space.patch +Applying: dm: merge fix for "pmem: kill __pmem address space" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/md/dm-linear.c +M drivers/md/dm-snap.c +M drivers/md/dm-stripe.c +M drivers/md/dm-target.c +M drivers/md/dm.c +M include/linux/device-mapper.h +$ git add -A . +$ git commit -v -a --amend +[master 0aa2e0f9c05a] Merge remote-tracking branch 'nvdimm/libnvdimm-for-next' + Date: Fri Jul 29 13:47:14 2016 +1000 +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 (af431322b900 ipc/msg.c: use freezable blocking call) +$ git merge --no-ff akpm-current/current +Recorded preimage for 'arch/x86/include/asm/thread_info.h' +Resolved 'include/linux/thread_info.h' using previous resolution. +Auto-merging scripts/checkpatch.pl +Auto-merging scripts/Makefile.lib +Auto-merging mm/slub.c +Auto-merging mm/slab.c +Auto-merging mm/page_alloc.c +Auto-merging mm/hugetlb.c +Auto-merging mm/filemap.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/module.c +Auto-merging kernel/memremap.c +Auto-merging kernel/fork.c +Auto-merging ipc/namespace.c +Auto-merging init/main.c +Auto-merging init/Kconfig +Auto-merging include/uapi/linux/nilfs2_ondisk.h +Auto-merging include/uapi/linux/Kbuild +Auto-merging include/linux/thread_info.h +CONFLICT (content): Merge conflict in include/linux/thread_info.h +Auto-merging include/linux/mmzone.h +Auto-merging include/linux/init.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/capability.h +Auto-merging fs/ocfs2/dlm/dlmcommon.h +Auto-merging fs/ocfs2/aops.c +Auto-merging fs/nfs/write.c +Auto-merging fs/nfs/internal.h +Auto-merging fs/fuse/file.c +Auto-merging fs/exec.c +Auto-merging arch/x86/xen/enlighten.c +Auto-merging arch/x86/mm/init.c +Auto-merging arch/x86/include/asm/thread_info.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/thread_info.h +Auto-merging arch/um/Makefile +Auto-merging arch/powerpc/platforms/powermac/setup.c +Auto-merging arch/powerpc/include/asm/thread_info.h +Auto-merging arch/arm/kernel/setup.c +Auto-merging arch/arm/boot/dts/keystone.dtsi +Auto-merging MAINTAINERS +Auto-merging Documentation/kernel-parameters.txt +Auto-merging Documentation/ioctl/ioctl-number.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/x86/include/asm/thread_info.h'. +[master af98e605d4ba] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + .mailmap | 2 + + Documentation/cgroup-v1/memcg_test.txt | 4 +- + Documentation/cgroup-v1/memory.txt | 4 +- + Documentation/filesystems/nilfs2.txt | 3 +- + Documentation/ioctl/ioctl-number.txt | 2 +- + Documentation/kernel-parameters.txt | 7 + + Documentation/rapidio/mport_cdev.txt | 3 +- + Documentation/rapidio/rio_cm.txt | 119 + + Documentation/rapidio/tsi721.txt | 26 + + Documentation/sysctl/kernel.txt | 14 + + Kbuild | 12 +- + MAINTAINERS | 13 +- + arch/alpha/include/asm/thread_info.h | 27 - + arch/alpha/kernel/machvec_impl.h | 2 +- + arch/arc/mm/init.c | 2 +- + arch/arm/boot/dts/keystone.dtsi | 8 + + arch/arm/include/asm/kexec.h | 24 + + arch/arm/include/asm/page.h | 2 + + arch/arm/kernel/machine_kexec.c | 2 +- + arch/arm/kernel/setup.c | 39 +- + arch/arm/mach-integrator/impd1.c | 4 +- + arch/arm/mach-mv78xx0/common.c | 2 +- + arch/arm64/mm/init.c | 2 +- + arch/blackfin/mm/init.c | 2 +- + arch/hexagon/mm/init.c | 2 +- + arch/ia64/include/asm/thread_info.h | 28 - + arch/ia64/kernel/Makefile | 8 +- + arch/ia64/kernel/machine_kexec.c | 2 +- + arch/ia64/kernel/mca.c | 2 +- + arch/microblaze/include/asm/thread_info.h | 27 - + arch/microblaze/mm/init.c | 4 +- + arch/microblaze/mm/pgtable.c | 2 +- + arch/mips/mm/init.c | 2 +- + arch/mips/txx9/generic/pci.c | 2 +- + arch/nios2/mm/init.c | 2 +- + arch/openrisc/mm/ioremap.c | 4 +- + arch/powerpc/include/asm/mman.h | 8 +- + arch/powerpc/include/asm/thread_info.h | 25 - + arch/powerpc/lib/alloc.c | 2 +- + arch/powerpc/mm/pgtable_32.c | 2 +- + arch/powerpc/platforms/powermac/setup.c | 4 +- + arch/powerpc/platforms/ps3/device-init.c | 2 +- + arch/powerpc/sysdev/fsl_rio.c | 21 +- + arch/powerpc/sysdev/msi_bitmap.c | 2 +- + arch/s390/appldata/appldata_mem.c | 2 +- + arch/score/mm/init.c | 2 +- + arch/sh/drivers/pci/pci.c | 4 +- + arch/sh/include/asm/thread_info.h | 26 - + arch/sh/mm/ioremap.c | 2 +- + arch/sparc/include/asm/thread_info_64.h | 24 - + arch/tile/include/asm/thread_info.h | 27 - + arch/tile/mm/pgtable.c | 18 +- + arch/um/Makefile | 2 +- + arch/x86/include/asm/thread_info.h | 24 - + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/x86/mm/init.c | 4 +- + arch/x86/platform/efi/early_printk.c | 4 +- + arch/x86/um/shared/sysdep/kernel-offsets.h | 2 +- + arch/x86/um/user-offsets.c | 4 +- + arch/x86/xen/enlighten.c | 5 +- + block/genhd.c | 2 +- + drivers/acpi/osl.c | 5 +- + drivers/base/firmware_class.c | 183 +- + drivers/base/node.c | 80 +- + drivers/block/drbd/drbd_actlog.c | 1 - + drivers/block/drbd/drbd_int.h | 1 + + drivers/clk/clkdev.c | 4 +- + drivers/memstick/core/ms_block.c | 17 +- + drivers/pci/xen-pcifront.c | 2 +- + drivers/rapidio/Kconfig | 9 + + drivers/rapidio/Makefile | 2 + + drivers/rapidio/devices/rio_mport_cdev.c | 6 +- + drivers/rapidio/devices/tsi721.c | 57 +- + drivers/rapidio/devices/tsi721.h | 2 +- + drivers/rapidio/devices/tsi721_dma.c | 27 +- + drivers/rapidio/rio-scan.c | 74 +- + drivers/rapidio/rio.c | 212 +- + drivers/rapidio/rio.h | 2 +- + drivers/rapidio/rio_cm.c | 2366 ++++++++++++++++++++ + drivers/rapidio/switches/Kconfig | 6 + + drivers/rapidio/switches/Makefile | 1 + + drivers/rapidio/switches/idt_gen2.c | 7 +- + drivers/rapidio/switches/idt_gen3.c | 382 ++++ + drivers/rapidio/switches/tsi57x.c | 26 +- + drivers/staging/android/lowmemorykiller.c | 12 +- + drivers/staging/lustre/lustre/osc/osc_cache.c | 6 +- + drivers/video/logo/logo.c | 4 +- + drivers/w1/masters/omap_hdq.c | 2 - + drivers/w1/slaves/w1_ds2406.c | 14 +- + drivers/w1/slaves/w1_ds2408.c | 14 +- + drivers/w1/slaves/w1_ds2413.c | 14 +- + drivers/w1/slaves/w1_ds2423.c | 14 +- + drivers/w1/slaves/w1_ds2431.c | 14 +- + drivers/w1/slaves/w1_ds2433.c | 14 +- + drivers/w1/slaves/w1_ds2760.c | 43 +- + drivers/w1/slaves/w1_ds2780.c | 39 +- + drivers/w1/slaves/w1_ds2781.c | 40 +- + drivers/w1/slaves/w1_ds28e04.c | 14 +- + drivers/w1/w1_family.h | 12 + + fs/befs/befs.h | 12 - + fs/befs/datastream.c | 6 +- + fs/befs/io.c | 24 - + fs/befs/io.h | 2 - + fs/befs/linuxvfs.c | 40 +- + fs/befs/super.c | 2 +- + fs/binfmt_elf.c | 34 +- + fs/binfmt_em86.c | 3 +- + fs/compat.c | 14 - + fs/exec.c | 9 +- + fs/fs-writeback.c | 4 +- + fs/fuse/file.c | 8 +- + fs/nfs/internal.h | 2 +- + fs/nfs/write.c | 2 +- + fs/nilfs2/alloc.c | 45 +- + fs/nilfs2/bmap.c | 4 +- + fs/nilfs2/bmap.h | 2 +- + fs/nilfs2/btnode.c | 4 +- + fs/nilfs2/btree.c | 61 +- + fs/nilfs2/btree.h | 2 +- + fs/nilfs2/cpfile.c | 23 +- + fs/nilfs2/cpfile.h | 3 +- + fs/nilfs2/dat.c | 19 +- + fs/nilfs2/dat.h | 1 + + fs/nilfs2/dir.c | 60 +- + fs/nilfs2/direct.c | 10 +- + fs/nilfs2/direct.h | 10 - + fs/nilfs2/gcinode.c | 9 +- + fs/nilfs2/ifile.c | 7 +- + fs/nilfs2/ifile.h | 1 - + fs/nilfs2/inode.c | 36 +- + fs/nilfs2/ioctl.c | 48 +- + fs/nilfs2/mdt.c | 6 +- + fs/nilfs2/namei.c | 6 +- + fs/nilfs2/nilfs.h | 48 +- + fs/nilfs2/page.c | 45 +- + fs/nilfs2/recovery.c | 72 +- + fs/nilfs2/segbuf.c | 6 +- + fs/nilfs2/segment.c | 61 +- + fs/nilfs2/segment.h | 1 - + fs/nilfs2/sufile.c | 44 +- + fs/nilfs2/sufile.h | 1 - + fs/nilfs2/super.c | 206 +- + fs/nilfs2/sysfs.c | 74 +- + fs/nilfs2/the_nilfs.c | 134 +- + fs/nilfs2/the_nilfs.h | 11 +- + fs/ocfs2/alloc.c | 37 + + fs/ocfs2/alloc.h | 2 + + fs/ocfs2/aops.c | 37 - + fs/ocfs2/dlm/dlmcommon.h | 2 + + fs/ocfs2/dlm/dlmmaster.c | 53 +- + fs/ocfs2/dlm/dlmrecovery.c | 29 +- + fs/ocfs2/dlm/dlmthread.c | 57 +- + fs/ocfs2/stack_user.c | 11 +- + fs/ocfs2/suballoc.c | 20 +- + fs/proc/base.c | 236 +- + fs/proc/meminfo.c | 22 +- + fs/proc/stat.c | 10 +- + fs/reiserfs/ibalance.c | 3 +- + include/acpi/acpi_io.h | 2 +- + include/linux/backing-dev.h | 2 +- + include/linux/capability.h | 1 + + include/linux/compaction.h | 33 +- + include/linux/compat.h | 1 - + include/linux/cpumask.h | 2 +- + include/linux/crc64_ecma.h | 56 + + include/linux/firmware.h | 8 + + include/linux/fs.h | 1 + + include/linux/gfp.h | 14 +- + include/linux/huge_mm.h | 2 +- + include/linux/init.h | 6 - + include/linux/ipc_namespace.h | 2 - + include/linux/kasan.h | 2 + + include/linux/kbuild.h | 2 +- + include/linux/kdb.h | 2 +- + include/linux/kernel.h | 1 - + include/linux/kexec.h | 48 +- + include/linux/memblock.h | 1 + + include/linux/memcontrol.h | 70 +- + include/linux/memremap.h | 2 +- + include/linux/mm.h | 17 + + include/linux/mm_inline.h | 19 +- + include/linux/mm_types.h | 2 +- + include/linux/mman.h | 2 +- + include/linux/mmzone.h | 170 +- + include/linux/oom.h | 26 +- + include/linux/printk.h | 60 +- + include/linux/radix-tree.h | 2 +- + include/linux/ratelimit.h | 38 +- + include/linux/rio.h | 13 +- + include/linux/rio_ids.h | 2 + + include/linux/rio_regs.h | 167 +- + include/linux/sched.h | 90 + + include/linux/slab_def.h | 3 +- + include/linux/slub_def.h | 14 +- + include/linux/swap.h | 23 +- + include/linux/sysctl.h | 1 + + include/linux/thread_info.h | 41 - + include/linux/topology.h | 2 +- + include/linux/vm_event_item.h | 14 +- + include/linux/vmstat.h | 111 +- + include/linux/writeback.h | 2 +- + include/net/net_namespace.h | 2 +- + include/trace/events/compaction.h | 12 +- + include/trace/events/mmflags.h | 1 + + include/trace/events/vmscan.h | 63 +- + include/trace/events/writeback.h | 10 +- + include/trace/events/zsmalloc.h | 76 + + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/capability.h | 2 - + include/uapi/linux/nilfs2_api.h | 292 +++ + .../nilfs2_fs.h => uapi/linux/nilfs2_ondisk.h} | 328 +-- + include/uapi/linux/rio_cm_cdev.h | 78 + + include/uapi/linux/sysctl.h | 2 - + init/Kconfig | 2 + + init/main.c | 8 +- + ipc/msg.c | 5 +- + ipc/msgutil.c | 2 - + ipc/namespace.c | 2 - + kernel/configs/android-base.config | 152 ++ + kernel/configs/android-recommended.config | 121 + + kernel/cpuset.c | 9 - + kernel/exit.c | 2 +- + kernel/fork.c | 20 +- + kernel/freezer.c | 2 +- + kernel/kexec.c | 3 +- + kernel/kexec_core.c | 69 +- + kernel/ksysfs.c | 6 +- + kernel/memremap.c | 8 - + kernel/module.c | 1 + + kernel/panic.c | 13 +- + kernel/power/snapshot.c | 10 +- + kernel/printk/internal.h | 16 +- + kernel/printk/nmi.c | 13 +- + kernel/printk/printk.c | 202 +- + kernel/relay.c | 34 +- + kernel/sysctl.c | 21 +- + kernel/task_work.c | 10 +- + kernel/watchdog.c | 1 - + lib/Kconfig | 7 + + lib/Kconfig.debug | 11 + + lib/Kconfig.kasan | 4 +- + lib/Makefile | 1 + + lib/crc32.c | 16 +- + lib/crc64_ecma.c | 341 +++ + lib/iommu-helper.c | 3 +- + lib/iov_iter.c | 8 +- + lib/ratelimit.c | 10 +- + lib/stackdepot.c | 1 + + mm/Kconfig | 2 +- + mm/backing-dev.c | 15 +- + mm/compaction.c | 113 +- + mm/filemap.c | 16 +- + mm/huge_memory.c | 56 +- + mm/hugetlb.c | 10 +- + mm/internal.h | 16 +- + mm/kasan/Makefile | 3 +- + mm/kasan/kasan.c | 63 +- + mm/kasan/kasan.h | 3 +- + mm/kasan/report.c | 8 +- + mm/khugepaged.c | 16 +- + mm/kmemleak.c | 4 +- + mm/memblock.c | 61 +- + mm/memcontrol.c | 260 +-- + mm/memory-failure.c | 6 +- + mm/memory_hotplug.c | 45 +- + mm/mempolicy.c | 2 +- + mm/mempool.c | 18 +- + mm/migrate.c | 39 +- + mm/mlock.c | 12 +- + mm/mmap.c | 28 +- + mm/oom_kill.c | 187 +- + mm/page-writeback.c | 128 +- + mm/page_alloc.c | 561 ++--- + mm/page_idle.c | 4 +- + mm/page_io.c | 2 + + mm/page_owner.c | 2 +- + mm/rmap.c | 26 +- + mm/shmem.c | 14 +- + mm/slab.c | 2 +- + mm/slab.h | 2 + + mm/slub.c | 59 +- + mm/sparse-vmemmap.c | 2 +- + mm/sparse.c | 14 +- + mm/swap.c | 76 +- + mm/swap_state.c | 4 +- + mm/util.c | 4 +- + mm/vmscan.c | 1023 +++++---- + mm/vmstat.c | 419 +++- + mm/workingset.c | 62 +- + mm/zsmalloc.c | 101 +- + scripts/Makefile.lib | 2 +- + scripts/checkpatch.pl | 21 +- + scripts/mod/Makefile | 11 +- + tools/perf/builtin-kmem.c | 1 + + 294 files changed, 8683 insertions(+), 4016 deletions(-) + create mode 100644 Documentation/rapidio/rio_cm.txt + create mode 100644 drivers/rapidio/rio_cm.c + create mode 100644 drivers/rapidio/switches/idt_gen3.c + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 include/trace/events/zsmalloc.h + create mode 100644 include/uapi/linux/nilfs2_api.h + rename include/{linux/nilfs2_fs.h => uapi/linux/nilfs2_ondisk.h} (68%) + create mode 100644 include/uapi/linux/rio_cm_cdev.h + create mode 100644 kernel/configs/android-base.config + create mode 100644 kernel/configs/android-recommended.config + create mode 100644 lib/crc64_ecma.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression +Applying: drivers/fpga/Kconfig: fix build failure +Applying: tree-wide: replace config_enabled() with IS_ENABLED() +Applying: include/linux/bitmap.h: cleanup +Applying: powerpc: add explicit #include <asm/asm-compat.h> for jump label +Applying: sparc: support static_key usage in non-module __exit sections +Applying: tile: support static_key usage in non-module __exit sections +Applying: arm: jump label may reference text in __exit +Applying: jump_label: remove bug.h, atomic.h dependencies for HAVE_JUMP_LABEL +Applying: dynamic_debug: add jump label support +Applying: ipc/sem.c: fix complex_count vs. simple op race +Applying: media: mtk-vcodec: remove unused dma_attrs +Applying: dma-mapping: use unsigned long for dma_attrs +Applying: alpha: dma-mapping: use unsigned long for dma_attrs +Applying: arc: dma-mapping: use unsigned long for dma_attrs +Applying: ARM: dma-mapping: use unsigned long for dma_attrs +Applying: arm64: dma-mapping: use unsigned long for dma_attrs +Applying: avr32: dma-mapping: use unsigned long for dma_attrs +Applying: blackfin: dma-mapping: use unsigned long for dma_attrs +Applying: c6x: dma-mapping: use unsigned long for dma_attrs +Applying: cris: dma-mapping: use unsigned long for dma_attrs +Applying: frv: dma-mapping: use unsigned long for dma_attrs +Applying: drm/exynos: dma-mapping: use unsigned long for dma_attrs +Applying: drm/mediatek: dma-mapping: use unsigned long for dma_attrs +Applying: drm/msm: dma-mapping: use unsigned long for dma_attrs +Applying: drm/nouveau: dma-mapping: use unsigned long for dma_attrs +Applying: drm/rockship: dma-mapping: use unsigned long for dma_attrs +Applying: infiniband: dma-mapping: use unsigned long for dma_attrs +Applying: iommu: dma-mapping: use unsigned long for dma_attrs +Applying: media: dma-mapping: use unsigned long for dma_attrs +Applying: xen: dma-mapping: use unsigned long for dma_attrs +Applying: swiotlb: dma-mapping: use unsigned long for dma_attrs +Applying: powerpc: dma-mapping: use unsigned long for dma_attrs +Applying: video: dma-mapping: use unsigned long for dma_attrs +Applying: x86: dma-mapping: use unsigned long for dma_attrs +Applying: iommu: intel: dma-mapping: use unsigned long for dma_attrs +Applying: h8300: dma-mapping: use unsigned long for dma_attrs +Applying: hexagon: dma-mapping: use unsigned long for dma_attrs +Applying: ia64: dma-mapping: use unsigned long for dma_attrs +Applying: m68k: dma-mapping: use unsigned long for dma_attrs +Applying: metag: dma-mapping: use unsigned long for dma_attrs +Applying: microblaze: dma-mapping: use unsigned long for dma_attrs +Applying: mips: dma-mapping: use unsigned long for dma_attrs +Applying: mn10300: dma-mapping: use unsigned long for dma_attrs +Applying: nios2: dma-mapping: use unsigned long for dma_attrs +Applying: openrisc: dma-mapping: use unsigned long for dma_attrs +Applying: parisc: dma-mapping: use unsigned long for dma_attrs +Applying: misc: mic: dma-mapping: use unsigned long for dma_attrs +Applying: s390: dma-mapping: use unsigned long for dma_attrs +Applying: sh: dma-mapping: use unsigned long for dma_attrs +Applying: sparc: dma-mapping: use unsigned long for dma_attrs +Applying: tile: dma-mapping: use unsigned long for dma_attrs +Applying: unicore32: dma-mapping: use unsigned long for dma_attrs +Applying: xtensa: dma-mapping: use unsigned long for dma_attrs +Applying: remoteproc: qcom: use unsigned long for dma_attrs +Applying: dma-mapping: remove dma_get_attr +Applying: dma-mapping: document the DMA attributes next to the declaration +Applying: samples/kprobe: convert the printk to pr_info/pr_err +Applying: samples/jprobe: convert the printk to pr_info/pr_err +Applying: samples/kretprobe: convert the printk to pr_info/pr_err +Applying: samples/kretprobe: fix the wrong type +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 4b031dc1b409...ea2942c55b5e akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (ea2942c55b5e samples/kretprobe: fix the wrong type) +$ git merge --no-ff akpm/master +Removing include/linux/dma-attrs.h +Merge made by the 'recursive' strategy. + Documentation/DMA-API.txt | 33 +++-- + Documentation/DMA-attributes.txt | 2 +- + arch/alpha/include/asm/dma-mapping.h | 2 - + arch/alpha/kernel/pci-noop.c | 2 +- + arch/alpha/kernel/pci_iommu.c | 12 +- + arch/arc/mm/dma.c | 12 +- + arch/arm/common/dmabounce.c | 4 +- + arch/arm/include/asm/dma-mapping.h | 13 +- + arch/arm/include/asm/xen/page-coherent.h | 16 +-- + arch/arm/kernel/vmlinux.lds.S | 2 +- + arch/arm/mm/dma-mapping.c | 129 ++++++++++--------- + arch/arm/xen/mm.c | 8 +- + arch/arm64/mm/dma-mapping.c | 66 +++++----- + arch/avr32/mm/dma-coherent.c | 12 +- + arch/blackfin/kernel/dma-mapping.c | 8 +- + arch/c6x/include/asm/dma-mapping.h | 4 +- + arch/c6x/kernel/dma.c | 9 +- + arch/c6x/mm/dma-coherent.c | 4 +- + arch/cris/arch-v32/drivers/pci/dma.c | 9 +- + arch/frv/mb93090-mb00/pci-dma-nommu.c | 8 +- + arch/frv/mb93090-mb00/pci-dma.c | 9 +- + arch/h8300/kernel/dma.c | 8 +- + arch/hexagon/include/asm/dma-mapping.h | 1 - + arch/hexagon/kernel/dma.c | 8 +- + arch/ia64/hp/common/sba_iommu.c | 22 ++-- + arch/ia64/include/asm/machvec.h | 1 - + arch/ia64/kernel/pci-swiotlb.c | 4 +- + arch/ia64/sn/pci/pci_dma.c | 22 ++-- + arch/m68k/kernel/dma.c | 12 +- + arch/metag/kernel/dma.c | 16 +-- + arch/microblaze/include/asm/dma-mapping.h | 1 - + arch/microblaze/kernel/dma.c | 12 +- + arch/mips/cavium-octeon/dma-octeon.c | 8 +- + arch/mips/include/asm/mips-cm.h | 2 +- + arch/mips/include/asm/pgtable.h | 16 +-- + arch/mips/include/asm/seccomp.h | 4 +- + arch/mips/include/asm/signal.h | 4 +- + arch/mips/include/asm/syscall.h | 2 +- + arch/mips/include/asm/uaccess.h | 2 +- + arch/mips/jz4740/setup.c | 2 +- + arch/mips/kernel/cpu-bugs64.c | 6 +- + arch/mips/kernel/elf.c | 4 +- + arch/mips/kernel/mips-cm.c | 2 +- + arch/mips/kernel/mips-r2-to-r6-emul.c | 34 ++--- + arch/mips/kernel/pm-cps.c | 4 +- + arch/mips/kernel/signal.c | 10 +- + arch/mips/kernel/smp-cps.c | 4 +- + arch/mips/kernel/unaligned.c | 10 +- + arch/mips/loongson64/common/dma-swiotlb.c | 10 +- + arch/mips/math-emu/cp1emu.c | 6 +- + arch/mips/mm/dma-default.c | 20 +-- + arch/mips/mm/tlbex.c | 10 +- + arch/mips/mti-malta/malta-dtshim.c | 4 +- + arch/mips/mti-malta/malta-memory.c | 2 +- + arch/mips/mti-malta/malta-setup.c | 2 +- + arch/mips/net/bpf_jit.c | 4 +- + arch/mips/netlogic/common/nlm-dma.c | 4 +- + arch/mn10300/mm/dma-alloc.c | 8 +- + arch/nios2/mm/dma-mapping.c | 12 +- + arch/openrisc/kernel/dma.c | 21 ++-- + arch/parisc/kernel/pci-dma.c | 18 +-- + arch/powerpc/include/asm/dma-mapping.h | 7 +- + arch/powerpc/include/asm/iommu.h | 10 +- + arch/powerpc/include/asm/jump_label.h | 1 + + arch/powerpc/kernel/dma-iommu.c | 12 +- + arch/powerpc/kernel/dma.c | 18 +-- + arch/powerpc/kernel/ibmebus.c | 12 +- + arch/powerpc/kernel/iommu.c | 12 +- + arch/powerpc/kernel/vio.c | 12 +- + arch/powerpc/platforms/cell/iommu.c | 28 ++--- + arch/powerpc/platforms/pasemi/iommu.c | 2 +- + arch/powerpc/platforms/powernv/npu-dma.c | 8 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 4 +- + arch/powerpc/platforms/powernv/pci.c | 2 +- + arch/powerpc/platforms/powernv/pci.h | 2 +- + arch/powerpc/platforms/ps3/system-bus.c | 18 +-- + arch/powerpc/platforms/pseries/iommu.c | 6 +- + arch/powerpc/sysdev/dart_iommu.c | 2 +- + arch/s390/include/asm/dma-mapping.h | 1 - + arch/s390/pci/pci_dma.c | 23 ++-- + arch/sh/include/asm/dma-mapping.h | 4 +- + arch/sh/kernel/dma-nommu.c | 4 +- + arch/sh/mm/consistent.c | 4 +- + arch/sparc/kernel/iommu.c | 12 +- + arch/sparc/kernel/ioport.c | 24 ++-- + arch/sparc/kernel/pci_sun4v.c | 12 +- + arch/sparc/kernel/vmlinux.lds.S | 7 ++ + arch/tile/kernel/pci-dma.c | 28 ++--- + arch/tile/kernel/vmlinux.lds.S | 12 ++ + arch/unicore32/mm/dma-swiotlb.c | 4 +- + arch/x86/include/asm/dma-mapping.h | 5 +- + arch/x86/include/asm/elf.h | 4 +- + arch/x86/include/asm/fpu/internal.h | 16 +-- + arch/x86/include/asm/mmu_context.h | 2 +- + arch/x86/include/asm/swiotlb.h | 4 +- + arch/x86/include/asm/xen/page-coherent.h | 9 +- + arch/x86/kernel/amd_gart_64.c | 20 +-- + arch/x86/kernel/apic/apic.c | 2 +- + arch/x86/kernel/apic/vector.c | 2 +- + arch/x86/kernel/fpu/signal.c | 12 +- + arch/x86/kernel/pci-calgary_64.c | 14 +-- + arch/x86/kernel/pci-dma.c | 4 +- + arch/x86/kernel/pci-nommu.c | 4 +- + arch/x86/kernel/pci-swiotlb.c | 4 +- + arch/x86/kernel/signal.c | 14 +-- + arch/x86/pci/sta2x11-fixup.c | 2 +- + arch/x86/pci/vmd.c | 16 +-- + arch/xtensa/kernel/pci-dma.c | 12 +- + drivers/firmware/broadcom/bcm47xx_sprom.c | 2 +- + drivers/fpga/Kconfig | 1 + + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_g2d.c | 12 +- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 20 +-- + drivers/gpu/drm/exynos/exynos_drm_gem.h | 2 +- + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 13 +- + drivers/gpu/drm/mediatek/mtk_drm_gem.h | 2 +- + drivers/gpu/drm/msm/msm_drv.c | 13 +- + .../gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c | 13 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 17 ++- + drivers/gpu/drm/rockchip/rockchip_drm_gem.h | 2 +- + drivers/infiniband/core/umem.c | 7 +- + drivers/iommu/amd_iommu.c | 12 +- + drivers/iommu/dma-iommu.c | 8 +- + drivers/iommu/intel-iommu.c | 12 +- + drivers/irqchip/irq-mips-gic.c | 2 +- + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 4 - + drivers/media/platform/sti/bdisp/bdisp-hw.c | 26 ++-- + drivers/media/v4l2-core/videobuf2-dma-contig.c | 28 ++--- + drivers/media/v4l2-core/videobuf2-dma-sg.c | 21 +--- + drivers/media/v4l2-core/videobuf2-vmalloc.c | 2 +- + drivers/misc/mic/host/mic_boot.c | 20 +-- + drivers/mtd/bcm47xxpart.c | 2 +- + drivers/net/wireless/ath/ath10k/debug.c | 12 +- + drivers/net/wireless/ath/ath10k/mac.c | 10 +- + drivers/net/wireless/ath/ath10k/wmi.c | 2 +- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 2 +- + drivers/net/wireless/ath/ath9k/common-spectral.c | 6 +- + drivers/net/wireless/ath/ath9k/init.c | 2 +- + drivers/net/wireless/ath/ath9k/main.c | 12 +- + drivers/net/wireless/ath/ath9k/recv.c | 2 +- + drivers/net/wireless/ath/dfs_pattern_detector.c | 2 +- + drivers/net/wireless/ath/regd.c | 4 +- + drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 3 +- + drivers/parisc/ccio-dma.c | 16 +-- + drivers/parisc/sba_iommu.c | 16 +-- + drivers/pci/ecam.c | 2 +- + drivers/remoteproc/qcom_q6v5_pil.c | 7 +- + drivers/tty/serial/ar933x_uart.c | 4 +- + drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 12 +- + drivers/video/fbdev/omap2/omapfb/omapfb.h | 3 +- + drivers/xen/swiotlb-xen.c | 14 +-- + include/linux/bitmap.h | 7 +- + include/linux/dma-attrs.h | 71 ----------- + include/linux/dma-iommu.h | 6 +- + include/linux/dma-mapping.h | 128 ++++++++++++------- + include/linux/dynamic_debug.h | 60 ++++++++- + include/linux/fence.h | 2 +- + include/linux/jump_label.h | 46 +++---- + include/linux/sem.h | 1 + + include/linux/swiotlb.h | 10 +- + include/linux/ww_mutex.h | 4 +- + include/media/videobuf2-core.h | 6 +- + include/media/videobuf2-dma-contig.h | 2 - + include/rdma/ib_verbs.h | 17 +-- + include/xen/swiotlb-xen.h | 12 +- + ipc/sem.c | 138 +++++++++++++-------- + kernel/jump_label.c | 53 ++++++++ + kernel/ptrace.c | 4 +- + kernel/seccomp.c | 6 +- + lib/dma-noop.c | 9 +- + lib/dynamic_debug.c | 7 ++ + lib/swiotlb.c | 13 +- + net/wireless/chan.c | 2 +- + samples/kprobes/jprobe_example.c | 6 +- + samples/kprobes/kprobe_example.c | 29 ++--- + samples/kprobes/kretprobe_example.c | 14 +-- + 176 files changed, 1108 insertions(+), 1062 deletions(-) + delete mode 100644 include/linux/dma-attrs.h diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..6779ea062b4d --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,4 @@ +Importing jdelvare-hwmon based on 08d27eb2066622cd659b91d877d0406ebd651225 +Unchanged quilt series jdelvare-hwmon +Importing dmi based on 08d27eb2066622cd659b91d877d0406ebd651225 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..d65fcdd20655 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20160729 |