diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-12-15 14:17:36 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-12-15 14:17:36 +1100 |
| commit | df5462d601bec886f6c56b2a4f4e54d92761c2d5 (patch) | |
| tree | b595eeed2e0365e6352bd8852f0f6597a8c714e4 | |
| parent | 94626c6d6ac6cb17c599041d8695612c63c0c490 (diff) | |
| download | linux-next-df5462d601bec886f6c56b2a4f4e54d92761c2d5.tar.gz | |
Add linux-next specific files for 20161215next-20161215
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 247 | ||||
| -rw-r--r-- | Next/Trees | 249 | ||||
| -rw-r--r-- | Next/merge.log | 6930 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 7431 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..288afadd1506 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,247 @@ +Name SHA1 +---- ---- +origin d05c5f7ba164aed3db02fb188c26d0dd94f5455b +fixes 30066ce675d3af350bc5a53858991c0b518dda00 +kbuild-current 152b695d74376bfe55cd2a6265ccc75b0d39dd19 +arc-current 7badf6fefca8278e749e82411fdb98b123cca50e +arm-current 8478132a8784605fe07ede555f7277d989368d73 +m68k-current 7e251bb21ae08ca2e4fb28cc0981fac2685a8efa +metag-fixes 35d04077ad96ed33ceea2501f5a4f1eacda77218 +powerpc-fixes dadc4a1bb9f0095343ed9dd4f1d9f3825d7b3e45 +sparc 8fa3b6f9392bf6d90cb7b908e07bd90166639f0a +net 3e1ed981b7a903ba81199d4d25b80c6bba705160 +ipsec bc3913a5378cd0ddefd1dfec6917cc12eb23a946 +netfilter a220871be66f99d8957c693cf22ec67ecbd9c23a +ipvs 045169816b31b10faed984b01c390db1b32ee4c1 +wireless-drivers fcd2042e8d36cf644bd2d69c26378d17158b17df +mac80211 d8da0b5d64d58f7775a94bcf12dda50f13a76f22 +sound-current 995c6a7fd9b9212abdf01160f6ce3193176be503 +pci-current e42010d8207f9d15a605ceb8e321bcd9648071b0 +driver-core.current cdb98c2698b4af287925abcba4d77d92af82a0c3 +tty.current cdb98c2698b4af287925abcba4d77d92af82a0c3 +usb.current cdb98c2698b4af287925abcba4d77d92af82a0c3 +usb-gadget-fixes 05e78c6933d613a7da0d0473f4c19c865af04c2c +usb-serial-fixes 46490c347df406b3368680dd911620e52dc7bfa4 +usb-chipidea-fixes c7fbb09b2ea13e283b9b0fd18a778f918ceb17b9 +phy 4320f9d4c1831fd4d244a9de8f81bc27ea67699c +staging.current cdb98c2698b4af287925abcba4d77d92af82a0c3 +char-misc.current cdb98c2698b4af287925abcba4d77d92af82a0c3 +input-current 2425f1808123bf69a8f66d4ec90e0d0e302c2613 +crypto-current 18e615ad87bce9125ef3990377a4a946ec0f21f3 +ide 797cee982eef9195736afc5e7f3b8f613c41d19a +vfio-fixes 05692d7005a364add85c6e25a6c4447ce08f913a +kselftest-fixes 1001354ca34179f3db924eb66672442a173147dc +backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f +ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600 +mfd-fixes 1a41741fd60b0a2d1102c3d1ff9d58cb324a8d29 +drm-intel-fixes 69973b830859bc6529a7a0468ba0d80ee5117826 +drm-misc-fixes e94bd1736f1f60e916a85a80c0b0ebeaae36cce5 +kbuild a6d1da25b333a87874ce84517fef595871f79473 +asm-generic de4be6b87b6b8816b61c9ba798d21ae8075d955c +arc e5517c2a5a49ed5e99047008629f1cd60246ea0e +arm 49b05da8054638caf79257e75b850b05b7abeb50 +arm-perf f43365ee17f8d22b1f887d2b26faa0837ca85138 +arm-soc b15ec88e89d144d35084646998eb5fcdf5f43b8a +amlogic b21a5fc2bb8a4c38a235fa0187bbb72fd56ef3d3 +at91 0f59c948faed3715331c2648b46d6d0033d86f5c +bcm2835 ec09fdf764ee7b164d97f0f492f26dff663d44a8 +berlin 5153351425c92f3e89358c8eb62ca8d901437581 +cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4 +imx-mxs 242a001e48b78f190d18242132cab73527ca06a4 +keystone fb2a68db621a3710307363809b3d5929beed372f +mvebu 5cfcfe81e33b791e06370d1a0a4faa851038c407 +omap 4aecea63ed8126548bc019fabb3a1f0e3e4dd0cd +omap-pending c20c8f750d9f8f8617f07ee2352d3ff560e66bc2 +qcom bbf9c90768f9cd30ce485ee43b1989397dfcd7c4 +renesas 411253aa4a68e74f58a06198f5d426c343d6125c +rockchip 7e02e53c6ecf75e45af92e2bc765ec5c37a86fd0 +rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590 +samsung 1001354ca34179f3db924eb66672442a173147dc +samsung-krzk 4ed7dc2785f8574f889b510d1b3015f4810da9a9 +tegra e8d16d40e269e187000fd543c3b4ca651cbcf967 +arm64 75037120e62b58c536999eb23d70cfcb6d6c0bcc +clk 2aab7a2055a1705c9e30920d95a596226999eb21 +blackfin 391e74a51ea2ce54f4d4a213a207a6bfb73e0b33 +c6x ca3060d39ae7a0964f8c123a4833029981e86476 +cris 8f50f2a1b46a11a9a9fb46c5d8325dfc88281a76 +h8300 58c57526711f7c87046b7c5a650535acbab2d3fb +hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a +ia64 fbb0e4da96f4503e65bc4fb627cf4e1d7c8c64e6 +m68k ad595b77c4a8553516a5d76c9ecf68a0ff13960e +m68knommu 07c65a665b8d88f871d8083644ba3f41e68f048f +metag f5d163aad31e4ec30f7258e655503824a2b03d45 +microblaze 52e9e6e05617264e6e609a8699098380d6b7a6aa +mips 57b47febc1936a74ccd5354f10b945f3aa010e4e +nios2 744606c76c4a3a73eb34d21f265013426426c4b5 +openrisc 7c7808ce107d63e158dbbc3af085980985a0c3c4 +parisc-hd 82cbd568bc5aa4c70f2a694f169d39ddef3b1aba +powerpc ff45000fcb56b5b0f1a14a865d3541746d838a0a +fsl baae856ebdeeaefbadd4a02cdb54b7c2277ff4dd +mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0 +s390 0b7589ecca2b6f962cf3314a3a5a675deeefb624 +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +sh e61c10e468a42512f5fad74c00b62af5cc19f65f +tile bf55d575234bcb6eb20d4eb8b21270a1e36eec85 +uml f88f0bdfc32f3d1e2fd03ec8a7f7b456df4db725 +unicore32 bc27113620ca6b67320b8a57e70d801dc94221d5 +xtensa 03eae3aca94c1e598be3ff40af492e1ca299577b +befs f7b75aaed5ef07cb8d70d964291877bf02181360 +btrfs 8b8b08cbfb9021af4b54b4175fc4c51d655aac8c +btrfs-kdave 210fce51c3fea535402c3324e2a28ec9e09237f2 +ceph 45ee2c1d66185e5bd27702c60cce3c43fa3370d2 +cifs 06deeec77a5a689cc94b21a8a91a76e42176685d +configfs e16769d4bca67218531505ad1a8365d227fedcf9 +ecryptfs be280b25c3288824ed4c201b452c3e87a7074d7c +ext3 5716863e0f8251d3360d4cbfc0e44e08007075df +ext4 a551d7c8deefb6d9fb45a1de03a617dd064e0419 +f2fs 5084fdf081739b7455c7aeecda6d7b83ec59c85f +freevxfs bf1bb4b460c8dc3a33793bff21464a9d816697ad +fscache d52bd54db8be8999df6df5a776f38c4f8b5e9cea +fuse c01638f5d919728f565bf8b5e0a6a159642df0d9 +gfs2 a3443cda5588985a2724d6d0f4a5f04e625be6eb +jfs 362ad5d58e9ae54d15abbe4822e626be907308fe +nfs 2549f307b5997bf5dd91071428e8090d9faa8b1b +nfsd 3eb15f2828464791f68b341ce87183012c509fc6 +orangefs 04102c76a779f1c4cec4f0fb51cacc360117b522 +overlayfs 1fb52aea5039b884b912c0075823557525cc53d2 +v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc +ubifs ba75d570b60c05cda21c0b43c5fbdc4e344f892d +xfs 9807b773dad4555665931d57065d7f8adab58e0f +file-locks 07d9a380680d1c0eb51ef87ff2eab5c994949e69 +vfs 225c4443ef3b44ccccb511d6f71cdb3ab32d4ec7 +vfs-jk 030b533c4fd4d2ec3402363323de4bb2983c9cee +vfs-miklos a2c55f286b95b308e0258d08a6550aefd766d97f +pci b08d2e61a6f9ebf5210a047868362a5a4ff37144 +pstore fc46d4e453f50d2b376267f180cae250b54f9fb4 +hid 43768c4daf54110d91a871d13e70c5876da954d0 +i2c 8641b29652afaa145976fcfb98160001caf89204 +jdelvare-hwmon 08d27eb2066622cd659b91d877d0406ebd651225 +dmi 27ec191a79ca7e6c07799b84f76d195efa931c28 +hwmon-staging 4fccd4a1e8944033bcd7693ea4e8fb478cd2059a +jc_docs 63d0977c0e853bdb161554ae324f8bb15ecff79c +v4l-dvb bf0396ea4727cfb8c04821188be1298802195397 +pm fa8a9265bb7e86eb6a143e278e382b6d1acf3705 +idle 306899f94804aece6d8fa8b4223ede3b48dbb59c +thermal 0faf7dd5a947006978b549dfe29a01b710becf4a +thermal-soc 18591add41ec9558ce0e32ef88626c18cc70c686 +ieee1394 e9300a4b7bbae83af1f7703938c94cf6dc6d308f +dlm aa9f1012858bc7f44368f1e4453c989d873b0860 +swiotlb d29fa0cb7602fa3e96c9eee05e14d14d3e823c89 +net-next 8fa3b6f9392bf6d90cb7b908e07bd90166639f0a +ipsec-next d4aea20d889e05575bb331a3dadf176176f7d631 +netfilter-next 8fa3b6f9392bf6d90cb7b908e07bd90166639f0a +ipvs-next 8d8e20e2d7bba8c50e64e0eca1cb83956f468e49 +wireless-drivers-next d15697de60db5570532fdedb8e13b2251d65b8e3 +bluetooth 107bc0aa95ca572df42da43c30a2079266e992e4 +mac80211-next 445cd452fe5187e676eef02c917c9e5f837c749e +rdma 6f94ba20799b98c8badf047b184fb4cd7bc45e44 +rdma-leon 92363f1cfe75573f30e6caa57d0304e208cf0504 +rdma-leon-test a909d3e636995ba7c349e2ca5dbb528154d4ac30 +mtd 0e2ce9d3fcba5f92dd6c2b27d82690e49d0c0854 +l2-mtd 445caaa20c4d6da74f426464f90513b81157ad77 +nand 8fcfba072420518fda4b2fe00a3f3c9c3e2774e2 +crypto 04b46fbdea5e31ffd745a34fa61269a69ba9f47a +drm 2cf026ae85c42f253feb9f420d1b4bc99bd5503d +drm-panel 8c31f6034b24601721daeb012793641fac079e2e +drm-intel 7a9e10253e9e52451bbe80ddb2874368dbd240a3 +drm-tegra 585ee0f27ef7b8db46807b960388b7e58b60766d +drm-misc 6449b088dd51dd5aa6b38455888bbf538d21f2fc +drm-exynos 7d1e042314619115153a0f6f06e4552c09a50e13 +drm-msm 2401a008461481387741bacf7318d13af2c2055f +hdlcd 747e5a5ff2a2ae84715c33d6679ac3c5220a3aec +mali-dp 8e3eb71c80ad05e0fef99dcd6cf4f645390ca680 +sunxi 63e8e44adfdc98e6a606697b2dc76a09fc5a2555 +kspp 68fdc678df4646d5b81efd1684575be2db6c005b +kconfig 5bcba792bb304e8341217d759ec486969a3b4258 +regmap 5c55e10a193497ddf73623adb1e09dd4451c7341 +sound 995c6a7fd9b9212abdf01160f6ce3193176be503 +sound-asoc 9b35952cdd6364bebf41da150dadd5e1c2c865d2 +modules 4d217a5adccf5e806790c37c61cc374a08bd7381 +input 34888602eb99df174e76eafeb613ad857f534ebb +block cdb98c2698b4af287925abcba4d77d92af82a0c3 +lightnvm a5f78b7f7dd1f587905808ab19d2dc1c265dffd4 +device-mapper ef548c551e72dbbdcc6d9ed7c7b3b01083fea8e2 +pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8 +mmc f397c8d80a5e413984bd9ccdf4161c7156b365ce +kgdb 7a6653fca50077f342bcdc39222d78928e3f0feb +md d05c5f7ba164aed3db02fb188c26d0dd94f5455b +mfd 93559191e71bc0f862638b0a9644d4592452a5db +backlight 0c9501f823a40a061f755d3789c4705c9fe85f14 +battery 6480af4915d6ffb66afc39eee4e9e66cbf59b938 +omap_dss2 c456a2f30de53e77a2eb8eeb4202d742516aa76b +regulator d00b74613fb18dfd0a5aa99270ee2e72d5c808d7 +security 50523a29d900d5a403e0352d3d7aeda6a33df25c +integrity b4bfec7f4a86424b114f94f41c4e1841ec102df3 +keys ed51e44e914c634bfd8435037474ebb0b47db956 +selinux 4a49d45dd58994f4fc9b40c502252403caadee88 +tpmdd 1548c540d863967fe617af76fec4df119e5f5cfb +watchdog 39487f6688a557ebfc69816d7e02f210bf8fb2a3 +iommu 1465f481460cbfc60dc119873099d89a58f9be4f +dwmw2-iommu 910170442944e1f8674fd5ddbeeb8ccd1877ea98 +vfio 2b8bb1d771f736b8b34bf160115aee1b12d29f83 +trivial 74dcba3589fc184c7118905eda22b3a4aaef95ff +audit 89670affa2a62c4868a2dd8a4195a1a2ec58cb27 +devicetree 61eb3a04f9789c5e4f7498a2f171b82a567cea6b +mailbox 16ae16c6e5616c084168740990fc508bda6655d4 +spi d8af82e060ceb2324ee275025ad2687eafdff1b9 +tip 55e874f7b6aba6c69a1228ee6772b8427a5a4c8d +clockevents f947ee147e0895d5c0ef18e81ca7a4e4219739e3 +edac a2e4c787f75b4558ed900f51c025aada15cc827c +edac-amd 0de2788447b67891a31a156c0206fd159e4a8981 +irqchip 0ccb54a7dba0d73101e52b1631d1071119875205 +ftrace 3dbb16b87b57bb1088044ad2a0432e4769075002 +rcu 6190aaafd06cd3db77f1d7343bd097f6bd526727 +kvm 36da91bdf568e804aac3ef02a5e3d867585f08fb +kvm-arm 21cbe3cc8a48ff17059912e019fbde28ed54745a +kvm-mips 07d9a380680d1c0eb51ef87ff2eab5c994949e69 +kvm-ppc e34af7849014f1d80899b811cf9021588cb8dd88 +kvms390 e1788bb995befed5831c99cee6527dfb080a46c0 +xen-tip 709613ad2b3c9eaeb2a3e24284b7c8feffc17326 +percpu 3ca45a46f8af8c4a92dd8a08eac57787242d5021 +workqueues 8bc4a04455969c36bf54a942ad9d28d80969ed51 +drivers-x86 1d161d4cd719ac498545c94805803af8af9b642f +chrome-platform 31b764171cb545cc1f750c573eef713329936660 +hsi 7ac5d7b1a1254ceb4be19ba93ef7a6ee4e7ac382 +leds 44b3e31d540e917a4d2292b902ade63fa1748d9a +ipmi 070cbd1d42aa0e359c9957cd73c2a529dec62047 +driver-core cdb98c2698b4af287925abcba4d77d92af82a0c3 +tty cdb98c2698b4af287925abcba4d77d92af82a0c3 +usb cdb98c2698b4af287925abcba4d77d92af82a0c3 +usb-gadget d5c024f3761dbd512329d3b7234a07dcf7580f0a +usb-serial 3c3dd1e058cb01e835dcade4b54a6f13ffaeaf7c +usb-chipidea-next 223e92311583d8d4d91b03d27f40e5b77cb81db0 +phy-next 5e253dfbdbea97ab3f462cdd75a6d1cae2292901 +staging cdb98c2698b4af287925abcba4d77d92af82a0c3 +char-misc cdb98c2698b4af287925abcba4d77d92af82a0c3 +extcon 669ae5dabe7af6638e7f16b461e6d4a2288534c1 +slave-dma e66937868db09f8a966913b1473ea9dc2f5344aa +cgroup 89bb3eed858ec2ea36ceae822bbf81f1ef24e80d +scsi 02cf5abb4d9e4cae16344a1c81c8ba806dd4a62a +scsi-mkp d2a145252c52792bc59e4767b486b26c430af4bb +target-updates 291e3e51a34d2f546608bfd31f185151621135b7 +target-merge 2994a75183173defc21f0d26ce23b63232211b88 +libata 7ddf6a387c68729898fc85050ffc74510add72fe +binfmt_misc 4af75df6a410ce76d9f60f27b07e5645ecc2c5ed +vhost 75bfa81bf0897ba87f1e1b9b576a07536029b86a +rpmsg d85a9aa0a775c206aab792fd30f9a62eb86fce44 +gpio acf1fcf77247efa01d7213f53082451f6c9c8f3b +pinctrl f821444508743a3e56320d0cb2b8c4603637660c +dma-mapping 1001354ca34179f3db924eb66672442a173147dc +pwm fdd3ff4db177435fccf3393d4750b777c070c768 +dma-buf 194cad44c4e1553fd8fcfbc940d27e756324ec3a +userns 19339c251607a3defc7f089511ce8561936fee45 +ktest 2dcd0af568b0cf583645c8a317dd12e344b1c72a +random 59b8d4f1f5d26e4ca92172ff6dcd1492cdb39613 +aio b562e44f507e863c6792946e4e1b1449fbbac85d +kselftest 22f6592b23ef8a0c09283bcb13087340721e1154 +y2038 549eb7b22e245064dcdc17380538718492f4ca9c +luto-misc 2dcd0af568b0cf583645c8a317dd12e344b1c72a +borntraeger e76d21c40bd6c67fd4e2c1540d77e113df962b4d +livepatching 59024954a1e7e26b62680e1f2b5725249a6c09f7 +coresight e615a9a8e4816ac94c797b48db0815e54e925365 +rtc 05d226088a6b84e2a18262899d3ff6dcf2495422 +hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828 +nvdimm abca2d5b305bc15956485117197f11377bbbe105 +dax-misc 4d9a2c8746671efbb0c27d3ae28c7474597a7aad +akpm-current 9c76b50c70a16d1c780937d9ae3a8e5aa35834e9 +akpm d60c3e64ea7d0eb3187db2d8fce49f74de62fdd3 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..dd3f8a59c6e4 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,249 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#rc-fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +metag-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#fixes +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master +mac80211 git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +usb-chipidea-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-stable +phy git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git#fixes +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master +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 +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git#at91-next +bcm2835 git git://github.com/anholt/linux.git#for-next +berlin git git://git.infradead.org/users/hesselba/linux-berlin.git#berlin/for-next +cortex-m git git://git.pengutronix.de/git/ukl/linux.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mvebu git git://git.infradead.org/linux-mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +omap-pending git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +rpi git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-rpi-next +samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +blackfin git http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux.git#for-linus +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +cris git git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git#for-next +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next +hexagon git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git#linux-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +metag git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git#mips-for-linux-next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +mpc5xxx git git://git.denx.de/linux-denx-agust.git#next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +sh git git://git.libc.org/linux-sh#for-next +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +unicore32 git git://github.com/gxt/linux.git#unicore32 +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +befs git git://github.com/luisbg/linux-befs.git#for-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next +btrfs-kdave git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +freevxfs git git://git.infradead.org/users/hch/freevxfs.git#for-next +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git#for-next +file-locks git git://git.samba.org/jlayton/linux.git#linux-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +vfs-jk git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#vfs +vfs-miklos git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +jdelvare-hwmon quilt http://jdelvare.nerim.net/devel/linux/jdelvare-hwmon/ +dmi quilt http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next +thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git#for-next +rdma-leon git git://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma.git#rdma-next +rdma-leon-test git git://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma.git#testing/rdma-next +mtd git git://git.infradead.org/mtd-2.6.git#master +l2-mtd git git://git.infradead.org/l2-mtd.git#master +nand git git://github.com/linux-nand/linux.git#nand/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://people.freedesktop.org/~airlied/linux.git#drm-next +drm-panel git git://anongit.freedesktop.org/tegra/linux.git#drm/panel/for-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +drm-exynos git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#exynos-drm/for-next +drm-msm git git://people.freedesktop.org/~robclark/linux#msm-next +hdlcd git git://linux-arm.org/linux-ld#for-upstream/hdlcd +mali-dp git git://linux-arm.org/linux-ld#for-upstream/mali-dp +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi/for-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +lightnvm git git://github.com/OpenChannelSSD/linux.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git#master +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next +md git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +omap_dss2 git git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +selinux git git://git.infradead.org/users/pcmoore/selinux#next +tpmdd git git://git.infradead.org/users/jjs/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +vfio git git://github.com/awilliam/linux-vfio.git#next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.infradead.org/users/pcmoore/audit#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#clockevents/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +irqchip git git://git.infradead.org/users/jcooper/linux.git#irqchip/for-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvm-mips git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/kvm-mips.git#next +kvm-ppc git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#kvm-ppc-next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git#for-next +ipmi git git://git.code.sf.net/p/openipmi/linux-ipmi#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-next +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next +target-merge git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next-merge +libata git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#for-next +binfmt_misc git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/binfmt_misc.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://github.com/andersson/remoteproc.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +dma-mapping git git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git#dma-mapping-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +dma-buf git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +aio git git://git.kvack.org/~bcrl/aio-next.git#master +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +y2038 git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038 +luto-misc git git://git.kernel.org/pub/scm/linux/kernel/git/luto/linux.git#next +borntraeger git git://git.kernel.org/pub/scm/linux/kernel/git/borntraeger/linux.git#linux-next +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching#for-next +coresight git git://git.linaro.org/kernel/coresight.git#next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +hwspinlock git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git#for-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +dax-misc git git://git.kernel.org/cgit/linux/kernel/git/nvdimm/nvdimm.git#dax-misc +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..b9c4f242b79c --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,6930 @@ +$ date -R +Thu, 15 Dec 2016 09:11:45 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at b92e09bb5bf4 Merge branch 'for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata +Merging origin/master (d05c5f7ba164 vfs,mm: fix return value of read() at s_maxbytes) +$ git merge origin/master +Updating b92e09bb5bf4..d05c5f7ba164 +Fast-forward + Documentation/ABI/testing/sysfs-platform-sst-atom | 17 + + Documentation/device-mapper/delay.txt | 4 +- + Documentation/device-mapper/dm-crypt.txt | 27 +- + Documentation/device-mapper/dm-raid.txt | 4 + + Documentation/device-mapper/linear.txt | 8 +- + Documentation/device-mapper/striped.txt | 4 +- + Documentation/device-mapper/switch.txt | 2 +- + .../devicetree/bindings/arm/cpu-capacity.txt | 236 + + Documentation/devicetree/bindings/arm/cpus.txt | 10 + + .../devicetree/bindings/hwmon/mcp3021.txt | 21 + + Documentation/devicetree/bindings/hwmon/tmp108.txt | 14 + + .../devicetree/bindings/i2c/trivial-devices.txt | 2 + + .../devicetree/bindings/scsi/hisilicon-sas.txt | 1 + + .../bindings/sound/axentia,tse850-pcm5142.txt | 88 + + .../devicetree/bindings/sound/cs35l34.txt | 64 + + .../devicetree/bindings/sound/cs42l42.txt | 110 + + .../devicetree/bindings/sound/davinci-mcbsp.txt | 2 +- + .../devicetree/bindings/sound/qcom,apq8016-sbc.txt | 5 +- + .../bindings/sound/qcom,msm8916-wcd-analog.txt | 85 + + .../bindings/sound/qcom,msm8916-wcd-digital.txt | 20 + + Documentation/devicetree/bindings/sound/rt5514.txt | 3 + + Documentation/devicetree/bindings/sound/rt5663.txt | 6 +- + Documentation/devicetree/bindings/sound/rt5665.txt | 68 + + .../bindings/sound/samsung,tm2-audio.txt | 38 + + .../devicetree/bindings/sound/sun4i-codec.txt | 65 +- + .../bindings/sound/sun8i-codec-analog.txt | 16 + + .../devicetree/bindings/sound/tlv320aic31xx.txt | 1 + + Documentation/devicetree/bindings/sound/wm8580.txt | 4 +- + Documentation/devicetree/bindings/spi/sh-msiof.txt | 1 + + .../devicetree/bindings/spi/spi-armada-3700.txt | 25 + + .../devicetree/bindings/spi/spi-fsl-lpspi.txt | 19 + + .../devicetree/bindings/spi/spi-sun6i.txt | 25 +- + Documentation/devicetree/bindings/ufs/ufs-qcom.txt | 7 +- + Documentation/dontdiff | 1 - + Documentation/filesystems/configfs/configfs.txt | 2 +- + Documentation/filesystems/dax.txt | 22 +- + Documentation/filesystems/ext4.txt | 13 +- + Documentation/hwmon/hwmon-kernel-api.txt | 58 +- + Documentation/hwmon/tc654 | 31 + + Documentation/hwmon/tmp108 | 36 + + Documentation/livepatch/livepatch.txt | 2 +- + Documentation/virtual/kvm/00-INDEX | 2 + + Documentation/virtual/kvm/api.txt | 5 +- + Documentation/virtual/kvm/halt-polling.txt | 127 + + MAINTAINERS | 49 +- + arch/arm/include/asm/xen/hypercall.h | 88 +- + arch/arm/include/asm/xen/hypervisor.h | 40 +- + arch/arm/include/asm/xen/interface.h | 86 +- + arch/arm/include/asm/xen/page-coherent.h | 99 +- + arch/arm/include/asm/xen/page.h | 123 +- + arch/arm/include/uapi/asm/kvm.h | 2 + + arch/arm/kvm/Kconfig | 1 + + arch/arm/kvm/Makefile | 1 + + arch/arm/kvm/arm.c | 6 + + arch/arm/xen/enlighten.c | 3 +- + arch/arm/xen/mm.c | 1 - + arch/arm64/Kconfig | 12 + + arch/arm64/Kconfig.debug | 35 +- + arch/arm64/Makefile | 10 +- + arch/arm64/configs/defconfig | 1 + + arch/arm64/include/asm/Kbuild | 1 - + arch/arm64/include/asm/assembler.h | 48 +- + arch/arm64/include/asm/cacheflush.h | 7 +- + arch/arm64/include/asm/cpucaps.h | 3 +- + arch/arm64/include/asm/cpufeature.h | 30 +- + arch/arm64/include/asm/current.h | 22 + + arch/arm64/include/asm/debug-monitors.h | 3 + + arch/arm64/include/asm/efi.h | 26 +- + arch/arm64/include/asm/elf.h | 12 +- + arch/arm64/include/asm/futex.h | 17 +- + arch/arm64/include/asm/hw_breakpoint.h | 6 +- + arch/arm64/include/asm/kernel-pgtable.h | 7 + + arch/arm64/include/asm/mmu.h | 3 +- + arch/arm64/include/asm/mmu_context.h | 53 +- + arch/arm64/include/asm/neon.h | 3 +- + arch/arm64/include/asm/opcodes.h | 5 - + arch/arm64/include/asm/percpu.h | 18 +- + arch/arm64/include/asm/perf_event.h | 2 + + arch/arm64/include/asm/probes.h | 21 +- + arch/arm64/include/asm/ptdump.h | 22 +- + arch/arm64/include/asm/ptrace.h | 8 + + arch/arm64/include/asm/smp.h | 14 +- + arch/arm64/include/asm/stack_pointer.h | 9 + + arch/arm64/include/asm/suspend.h | 2 +- + arch/arm64/include/asm/sysreg.h | 45 +- + arch/arm64/include/asm/thread_info.h | 40 +- + arch/arm64/include/asm/uaccess.h | 175 +- + arch/arm64/include/asm/uprobes.h | 36 + + arch/arm64/include/asm/xen/hypercall.h | 2 +- + arch/arm64/include/asm/xen/hypervisor.h | 2 +- + arch/arm64/include/asm/xen/interface.h | 2 +- + arch/arm64/include/asm/xen/page-coherent.h | 2 +- + arch/arm64/include/asm/xen/page.h | 2 +- + arch/arm64/kernel/armv8_deprecated.c | 16 +- + arch/arm64/kernel/asm-offsets.c | 13 +- + arch/arm64/kernel/cpufeature.c | 18 +- + arch/arm64/kernel/debug-monitors.c | 40 +- + arch/arm64/kernel/efi.c | 8 +- + arch/arm64/kernel/entry.S | 110 +- + arch/arm64/kernel/fpsimd.c | 14 + + arch/arm64/kernel/head.S | 30 +- + arch/arm64/kernel/hibernate.c | 4 +- + arch/arm64/kernel/hw_breakpoint.c | 153 +- + arch/arm64/kernel/insn.c | 1 - + arch/arm64/kernel/kgdb.c | 3 + + arch/arm64/kernel/probes/Makefile | 2 + + arch/arm64/kernel/probes/decode-insn.c | 33 +- + arch/arm64/kernel/probes/decode-insn.h | 8 +- + arch/arm64/kernel/probes/kprobes.c | 36 +- + arch/arm64/kernel/probes/simulate-insn.c | 16 +- + arch/arm64/kernel/probes/uprobes.c | 216 + + arch/arm64/kernel/process.c | 38 +- + arch/arm64/kernel/ptrace.c | 7 +- + arch/arm64/kernel/return_address.c | 1 + + arch/arm64/kernel/setup.c | 9 + + arch/arm64/kernel/signal.c | 3 + + arch/arm64/kernel/sleep.S | 3 - + arch/arm64/kernel/smp.c | 14 +- + arch/arm64/kernel/stacktrace.c | 7 +- + arch/arm64/kernel/suspend.c | 6 - + arch/arm64/kernel/topology.c | 223 +- + arch/arm64/kernel/traps.c | 28 +- + arch/arm64/kernel/vmlinux.lds.S | 5 + + arch/arm64/kvm/Kconfig | 4 - + arch/arm64/kvm/handle_exit.c | 11 + + arch/arm64/kvm/hyp/hyp-entry.S | 9 +- + arch/arm64/kvm/hyp/switch.c | 13 +- + arch/arm64/kvm/reset.c | 6 - + arch/arm64/lib/clear_user.S | 11 +- + arch/arm64/lib/copy_from_user.S | 11 +- + arch/arm64/lib/copy_in_user.S | 11 +- + arch/arm64/lib/copy_to_user.S | 11 +- + arch/arm64/mm/Makefile | 3 +- + arch/arm64/mm/cache.S | 6 +- + arch/arm64/mm/context.c | 7 +- + arch/arm64/mm/dma-mapping.c | 5 - + arch/arm64/mm/dump.c | 106 +- + arch/arm64/mm/fault.c | 22 +- + arch/arm64/mm/flush.c | 9 +- + arch/arm64/mm/hugetlbpage.c | 22 +- + arch/arm64/mm/mmu.c | 137 +- + arch/arm64/mm/proc.S | 12 +- + arch/arm64/mm/ptdump_debugfs.c | 31 + + arch/arm64/xen/hypercall.S | 15 + + arch/mips/kernel/asm-offsets.c | 2 +- + arch/powerpc/include/asm/book3s/64/mmu-hash.h | 47 +- + arch/powerpc/include/asm/kvm_asm.h | 1 + + arch/powerpc/include/asm/kvm_host.h | 27 +- + arch/powerpc/include/asm/kvm_ppc.h | 49 +- + arch/powerpc/include/asm/mmu.h | 5 + + arch/powerpc/include/asm/opal.h | 3 + + arch/powerpc/include/asm/reg.h | 14 + + arch/powerpc/include/uapi/asm/kvm.h | 5 + + arch/powerpc/kernel/asm-offsets.c | 4 + + arch/powerpc/kernel/cpu_setup_power.S | 2 +- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 63 +- + arch/powerpc/kvm/book3s_64_vio_hv.c | 1 - + arch/powerpc/kvm/book3s_hv.c | 254 +- + arch/powerpc/kvm/book3s_hv_builtin.c | 72 +- + arch/powerpc/kvm/book3s_hv_ras.c | 1 + + arch/powerpc/kvm/book3s_hv_rm_mmu.c | 223 +- + arch/powerpc/kvm/book3s_hv_rm_xics.c | 23 +- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 140 +- + arch/powerpc/kvm/powerpc.c | 16 +- + arch/powerpc/kvm/trace_hv.h | 2 +- + arch/powerpc/mm/hash_native_64.c | 30 +- + arch/powerpc/mm/hash_utils_64.c | 28 +- + arch/powerpc/mm/pgtable-radix.c | 18 +- + arch/powerpc/mm/pgtable_64.c | 34 + + arch/powerpc/platforms/powernv/opal-wrappers.S | 3 + + arch/powerpc/platforms/powernv/opal.c | 2 + + arch/powerpc/platforms/ps3/htab.c | 2 +- + arch/powerpc/platforms/pseries/lpar.c | 2 +- + arch/s390/Kconfig | 2 + + arch/s390/boot/compressed/Makefile | 2 +- + arch/s390/boot/compressed/head.S | 2 +- + arch/s390/configs/default_defconfig | 6 +- + arch/s390/configs/gcov_defconfig | 4 +- + arch/s390/configs/performance_defconfig | 4 +- + arch/s390/crypto/prng.c | 6 +- + arch/s390/hypfs/inode.c | 24 +- + arch/s390/include/asm/Kbuild | 4 +- + arch/s390/include/asm/asm-offsets.h | 1 - + arch/s390/include/asm/atomic.h | 207 +- + arch/s390/include/asm/atomic_ops.h | 130 + + arch/s390/include/asm/bitops.h | 62 +- + arch/s390/include/asm/cpu_mf.h | 3 +- + arch/s390/include/asm/elf.h | 6 +- + arch/s390/include/asm/facilities_src.h | 82 - + arch/s390/include/asm/ipl.h | 2 +- + arch/s390/include/asm/lowcore.h | 5 +- + arch/s390/include/asm/pci_clp.h | 5 +- + arch/s390/include/asm/pgalloc.h | 22 +- + arch/s390/include/asm/preempt.h | 137 + + arch/s390/include/asm/processor.h | 6 + + arch/s390/include/asm/sclp.h | 10 +- + arch/s390/include/asm/scsw.h | 6 +- + arch/s390/include/asm/smp.h | 8 + + arch/s390/include/asm/string.h | 3 +- + arch/s390/include/asm/sysinfo.h | 7 +- + arch/s390/include/asm/thread_info.h | 24 +- + arch/s390/include/asm/timex.h | 41 +- + arch/s390/include/asm/topology.h | 28 +- + arch/s390/include/asm/uaccess.h | 6 +- + arch/s390/include/asm/vdso.h | 2 + + arch/s390/include/uapi/asm/Kbuild | 5 +- + arch/s390/kernel/Makefile | 65 +- + arch/s390/kernel/asm-offsets.c | 17 +- + arch/s390/kernel/compat_signal.c | 4 +- + arch/s390/kernel/early.c | 50 +- + arch/s390/kernel/entry.S | 51 +- + arch/s390/kernel/head.S | 2 +- + arch/s390/kernel/head64.S | 7 +- + arch/s390/kernel/ipl.c | 7 +- + arch/s390/kernel/irq.c | 2 +- + arch/s390/kernel/lgr.c | 5 +- + arch/s390/kernel/perf_cpum_sf.c | 53 +- + arch/s390/kernel/process.c | 6 +- + arch/s390/kernel/ptrace.c | 14 +- + arch/s390/kernel/setup.c | 22 +- + arch/s390/kernel/signal.c | 14 +- + arch/s390/kernel/smp.c | 32 +- + arch/s390/kernel/swsusp.S | 2 +- + arch/s390/kernel/sysinfo.c | 33 +- + arch/s390/kernel/time.c | 191 +- + arch/s390/kernel/topology.c | 53 +- + arch/s390/kernel/vdso32/clock_gettime.S | 23 +- + arch/s390/kernel/vdso32/gettimeofday.S | 23 +- + arch/s390/kernel/vdso64/clock_gettime.S | 11 +- + arch/s390/kernel/vdso64/gettimeofday.S | 11 +- + arch/s390/kernel/vtime.c | 26 +- + arch/s390/kvm/interrupt.c | 2 +- + arch/s390/kvm/kvm-s390.c | 57 +- + arch/s390/lib/mem.S | 39 + + arch/s390/mm/fault.c | 1 + + arch/s390/mm/vmem.c | 9 +- + arch/s390/numa/mode_emu.c | 38 +- + arch/s390/numa/toptree.c | 16 +- + arch/s390/pci/pci.c | 8 + + arch/s390/pci/pci_clp.c | 3 + + arch/s390/pci/pci_debug.c | 2 +- + arch/s390/pci/pci_dma.c | 36 +- + arch/s390/tools/Makefile | 2 - + arch/s390/tools/gen_facilities.c | 76 +- + arch/sh/kernel/cpu/Makefile | 2 +- + arch/sh/kernel/cpu/irq/Makefile | 2 +- + arch/x86/boot/compressed/Makefile | 2 +- + arch/x86/include/asm/e820.h | 12 +- + arch/x86/include/asm/kvm_host.h | 18 +- + arch/x86/include/asm/vmx.h | 37 +- + arch/x86/include/uapi/asm/vmx.h | 5 + + arch/x86/kvm/cpuid.c | 26 +- + arch/x86/kvm/emulate.c | 200 +- + arch/x86/kvm/hyperv.c | 2 +- + arch/x86/kvm/i8254.c | 15 +- + arch/x86/kvm/i8254.h | 3 +- + arch/x86/kvm/lapic.c | 212 +- + arch/x86/kvm/lapic.h | 2 + + arch/x86/kvm/mmu.c | 32 +- + arch/x86/kvm/svm.c | 21 +- + arch/x86/kvm/vmx.c | 1092 +++-- + arch/x86/kvm/x86.c | 92 +- + arch/x86/pci/xen.c | 4 +- + arch/x86/xen/pci-swiotlb-xen.c | 1 - + arch/x86/xen/setup.c | 6 +- + block/blk-mq-cpumap.c | 1 + + block/blk-mq.h | 1 - + block/bsg-lib.c | 23 +- + drivers/acpi/Kconfig | 2 +- + drivers/acpi/cppc_acpi.c | 12 +- + drivers/ata/libata-core.c | 13 +- + drivers/ata/libata-scsi.c | 38 +- + drivers/block/cciss_scsi.c | 72 +- + drivers/block/xen-blkback/xenbus.c | 36 +- + drivers/block/xen-blkfront.c | 81 +- + drivers/char/tpm/xen-tpmfront.c | 8 +- + drivers/extcon/extcon-arizona.c | 8 +- + drivers/firmware/efi/arm-runtime.c | 4 +- + drivers/firmware/efi/libstub/Makefile | 2 +- + drivers/hid/Kconfig | 19 +- + drivers/hid/Makefile | 2 + + drivers/hid/hid-asus.c | 299 +- + drivers/hid/hid-core.c | 14 +- + drivers/hid/hid-cp2112.c | 205 +- + drivers/hid/hid-ids.h | 19 +- + drivers/hid/hid-input.c | 96 +- + drivers/hid/hid-mf.c | 166 + + drivers/hid/hid-microsoft.c | 6 +- + drivers/hid/hid-multitouch.c | 88 +- + drivers/hid/hid-sensor-hub.c | 6 + + drivers/hid/hid-sony.c | 445 +- + drivers/hid/hid-udraw-ps3.c | 474 ++ + drivers/hid/i2c-hid/i2c-hid.c | 146 +- + drivers/hid/intel-ish-hid/ipc/ipc.c | 67 +- + drivers/hid/intel-ish-hid/ipc/utils.h | 64 - + drivers/hid/intel-ish-hid/ishtp/bus.c | 9 +- + drivers/hid/intel-ish-hid/ishtp/hbm.c | 6 +- + drivers/hid/usbhid/hid-core.c | 6 +- + drivers/hid/usbhid/hid-quirks.c | 5 +- + drivers/hid/wacom.h | 2 +- + drivers/hid/wacom_sys.c | 92 +- + drivers/hid/wacom_wac.c | 601 ++- + drivers/hid/wacom_wac.h | 76 +- + drivers/hwmon/Kconfig | 26 +- + drivers/hwmon/Makefile | 2 + + drivers/hwmon/adm1025.c | 2 +- + drivers/hwmon/adm1026.c | 26 +- + drivers/hwmon/adm9240.c | 9 +- + drivers/hwmon/adt7411.c | 301 +- + drivers/hwmon/adt7462.c | 12 +- + drivers/hwmon/adt7470.c | 6 +- + drivers/hwmon/amc6821.c | 4 +- + drivers/hwmon/coretemp.c | 321 +- + drivers/hwmon/ds620.c | 2 +- + drivers/hwmon/emc2103.c | 4 +- + drivers/hwmon/emc6w201.c | 8 +- + drivers/hwmon/g762.c | 11 +- + drivers/hwmon/hwmon.c | 79 +- + drivers/hwmon/lm85.c | 3 +- + drivers/hwmon/lm87.c | 136 +- + drivers/hwmon/mcp3021.c | 50 +- + drivers/hwmon/nct7802.c | 8 +- + drivers/hwmon/pmbus/adm1275.c | 20 +- + drivers/hwmon/scpi-hwmon.c | 1 + + drivers/hwmon/smsc47m192.c | 5 +- + drivers/hwmon/tc654.c | 514 +++ + drivers/hwmon/tmp108.c | 469 ++ + drivers/hwmon/via-cputemp.c | 77 +- + drivers/input/misc/arizona-haptics.c | 13 +- + drivers/input/misc/xen-kbdfront.c | 13 +- + drivers/input/touchscreen/wm97xx-core.c | 2 +- + drivers/irqchip/irq-gic-v3.c | 13 +- + drivers/isdn/hisax/q931.c | 2 +- + drivers/md/Kconfig | 10 +- + drivers/md/bitmap.c | 166 +- + drivers/md/dm-bufio.c | 28 +- + drivers/md/dm-cache-metadata.c | 3 +- + drivers/md/dm-cache-policy-smq.c | 2 +- + drivers/md/dm-cache-target.c | 3 +- + drivers/md/dm-crypt.c | 214 +- + drivers/md/dm-flakey.c | 53 +- + drivers/md/dm-io.c | 34 +- + drivers/md/dm-ioctl.c | 2 +- + drivers/md/dm-mpath.c | 42 +- + drivers/md/dm-raid.c | 86 +- + drivers/md/dm-rq.c | 18 +- + drivers/md/dm-table.c | 43 +- + drivers/md/dm-verity-target.c | 2 +- + drivers/md/dm.c | 4 +- + drivers/md/linear.c | 31 +- + drivers/md/md.c | 701 +-- + drivers/md/md.h | 108 +- + drivers/md/multipath.c | 92 +- + drivers/md/persistent-data/dm-array.c | 2 - + drivers/md/persistent-data/dm-block-manager.c | 19 +- + drivers/md/persistent-data/dm-space-map-common.c | 4 +- + drivers/md/persistent-data/dm-space-map-metadata.c | 14 +- + drivers/md/raid0.c | 107 +- + drivers/md/raid1.c | 247 +- + drivers/md/raid1.h | 19 +- + drivers/md/raid10.c | 295 +- + drivers/md/raid10.h | 2 + + drivers/md/raid5-cache.c | 1885 +++++++- + drivers/md/raid5.c | 623 ++- + drivers/md/raid5.h | 172 +- + drivers/media/usb/dvb-usb-v2/af9015.c | 2 +- + drivers/message/fusion/mptbase.c | 28 +- + drivers/message/fusion/mptscsih.c | 11 +- + drivers/mfd/max77620.c | 2 +- + drivers/misc/ibmasm/module.c | 2 +- + drivers/mmc/Kconfig | 2 - + drivers/mmc/Makefile | 1 - + drivers/mmc/card/Kconfig | 70 - + drivers/mmc/card/Makefile | 10 - + drivers/mmc/core/Kconfig | 66 + + drivers/mmc/core/Makefile | 4 + + drivers/mmc/{card => core}/block.c | 0 + drivers/mmc/{card => core}/block.h | 0 + drivers/mmc/{card => core}/mmc_test.c | 2 - + drivers/mmc/{card => core}/queue.c | 2 - + drivers/mmc/{card => core}/queue.h | 0 + drivers/mmc/{card => core}/sdio_uart.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 2 +- + drivers/net/ethernet/qlogic/qed/qed_int.c | 4 +- + drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 2 +- + drivers/net/wireless/ath/ath10k/pci.c | 2 +- + drivers/net/wireless/ath/wil6210/txrx.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/fw.c | 2 +- + drivers/net/xen-netback/xenbus.c | 52 +- + drivers/net/xen-netfront.c | 67 +- + drivers/nvme/host/core.c | 21 - + drivers/nvme/target/configfs.c | 10 +- + drivers/pci/hotplug/s390_pci_hpc.c | 7 +- + drivers/pci/xen-pcifront.c | 6 +- + drivers/phy/phy-qcom-ufs-i.h | 7 +- + drivers/phy/phy-qcom-ufs-qmp-14nm.c | 72 +- + drivers/phy/phy-qcom-ufs-qmp-20nm.c | 65 +- + drivers/phy/phy-qcom-ufs.c | 273 +- + drivers/power/reset/Kconfig | 10 + + drivers/power/reset/Makefile | 1 + + drivers/power/reset/at91-poweroff.c | 1 + + drivers/power/reset/at91-reset.c | 2 + + drivers/power/reset/piix4-poweroff.c | 113 + + drivers/power/reset/syscon-reboot-mode.c | 1 + + drivers/power/reset/zx-reboot.c | 1 + + drivers/power/supply/ab8500_fg.c | 8 +- + drivers/power/supply/axp288_fuel_gauge.c | 1 + + drivers/power/supply/bq24190_charger.c | 2 +- + drivers/power/supply/bq27xxx_battery.c | 44 +- + drivers/power/supply/bq27xxx_battery_i2c.c | 4 +- + drivers/power/supply/ipaq_micro_battery.c | 2 +- + drivers/power/supply/lp8788-charger.c | 3 - + drivers/power/supply/max17040_battery.c | 52 +- + drivers/power/supply/max8997_charger.c | 1 + + drivers/power/supply/power_supply_core.c | 4 +- + drivers/power/supply/wm8350_power.c | 2 +- + drivers/power/supply/wm97xx_battery.c | 25 +- + drivers/regulator/rk808-regulator.c | 9 +- + drivers/s390/block/dasd.c | 301 +- + drivers/s390/block/dasd_3990_erp.c | 52 +- + drivers/s390/block/dasd_devmap.c | 326 +- + drivers/s390/block/dasd_eckd.c | 323 +- + drivers/s390/block/dasd_eckd.h | 5 +- + drivers/s390/block/dasd_eer.c | 29 +- + drivers/s390/block/dasd_erp.c | 2 +- + drivers/s390/block/dasd_fba.c | 2 +- + drivers/s390/block/dasd_int.h | 449 +- + drivers/s390/char/con3215.c | 12 +- + drivers/s390/char/sclp.h | 23 + + drivers/s390/char/sclp_cmd.c | 25 +- + drivers/s390/char/sclp_early.c | 31 + + drivers/s390/char/sclp_quiesce.c | 4 +- + drivers/s390/char/sclp_tty.c | 3 +- + drivers/s390/char/vmlogrdr.c | 2 +- + drivers/s390/char/zcore.c | 22 +- + drivers/s390/cio/cmf.c | 10 +- + drivers/s390/cio/css.c | 6 +- + drivers/s390/cio/device.c | 6 +- + drivers/s390/cio/device.h | 1 - + drivers/s390/cio/device_fsm.c | 6 - + drivers/s390/cio/device_ops.c | 5 +- + drivers/s390/crypto/ap_bus.c | 12 +- + drivers/s390/scsi/zfcp_ext.h | 4 +- + drivers/s390/scsi/zfcp_fc.c | 36 +- + drivers/s390/virtio/virtio_ccw.c | 25 +- + drivers/scsi/Kconfig | 35 +- + drivers/scsi/Makefile | 1 - + drivers/scsi/NCR5380.c | 137 +- + drivers/scsi/NCR5380.h | 87 +- + drivers/scsi/aacraid/aacraid.h | 1 - + drivers/scsi/aacraid/comminit.c | 10 +- + drivers/scsi/aacraid/commsup.c | 25 +- + drivers/scsi/aacraid/linit.c | 20 +- + drivers/scsi/advansys.c | 3 + + drivers/scsi/aic7xxx/aicasm/aicasm.c | 2 +- + drivers/scsi/aic94xx/aic94xx_hwi.c | 5 +- + drivers/scsi/arcmsr/arcmsr.h | 5 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 82 +- + drivers/scsi/arm/cumana_1.c | 98 +- + drivers/scsi/arm/oak.c | 34 +- + drivers/scsi/atari_scsi.c | 77 +- + drivers/scsi/be2iscsi/be_main.c | 8 +- + drivers/scsi/bfa/bfa_ioc.h | 30 +- + drivers/scsi/bfa/bfad_bsg.c | 62 +- + drivers/scsi/bfa/bfad_im.h | 4 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 1 - + drivers/scsi/bnx2fc/bnx2fc_tgt.c | 3 +- + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 2 +- + drivers/scsi/cxlflash/common.h | 39 +- + drivers/scsi/cxlflash/lunmgt.c | 6 + + drivers/scsi/cxlflash/main.c | 410 +- + drivers/scsi/cxlflash/sislite.h | 2 +- + drivers/scsi/device_handler/scsi_dh_alua.c | 16 +- + drivers/scsi/dmx3191d.c | 33 +- + drivers/scsi/dpt_i2o.c | 7 +- + drivers/scsi/fcoe/fcoe.c | 25 +- + drivers/scsi/fcoe/fcoe_ctlr.c | 157 +- + drivers/scsi/fcoe/fcoe_sysfs.c | 83 +- + drivers/scsi/fnic/fnic_scsi.c | 30 +- + drivers/scsi/fnic/fnic_trace.c | 4 +- + drivers/scsi/fnic/fnic_trace.h | 2 +- + drivers/scsi/fnic/vnic_dev.c | 10 +- + drivers/scsi/g_NCR5380.c | 296 +- + drivers/scsi/g_NCR5380.h | 32 +- + drivers/scsi/g_NCR5380_mmio.c | 10 - + drivers/scsi/hisi_sas/hisi_sas.h | 11 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 67 +- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 79 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 556 ++- + drivers/scsi/hpsa.c | 252 +- + drivers/scsi/hpsa.h | 6 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 40 +- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 1096 ++--- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.h | 5 +- + drivers/scsi/ipr.c | 174 +- + drivers/scsi/ipr.h | 7 +- + drivers/scsi/ips.c | 13 +- + drivers/scsi/isci/host.h | 1 - + drivers/scsi/isci/init.c | 23 +- + drivers/scsi/isci/probe_roms.c | 1 + + drivers/scsi/isci/remote_node_context.c | 7 +- + drivers/scsi/isci/request.c | 2 +- + drivers/scsi/libfc/fc_disc.c | 61 +- + drivers/scsi/libfc/fc_elsct.c | 2 +- + drivers/scsi/libfc/fc_exch.c | 256 +- + drivers/scsi/libfc/fc_fcp.c | 235 +- + drivers/scsi/libfc/fc_libfc.c | 2 +- + drivers/scsi/libfc/fc_lport.c | 126 +- + drivers/scsi/libfc/fc_rport.c | 561 ++- + drivers/scsi/lpfc/lpfc.h | 6 + + drivers/scsi/lpfc/lpfc_attr.c | 160 +- + drivers/scsi/lpfc/lpfc_bsg.c | 422 +- + drivers/scsi/lpfc/lpfc_bsg.h | 10 + + drivers/scsi/lpfc/lpfc_crtn.h | 6 +- + drivers/scsi/lpfc/lpfc_els.c | 2 +- + drivers/scsi/lpfc/lpfc_hw4.h | 18 +- + drivers/scsi/lpfc/lpfc_init.c | 116 +- + drivers/scsi/lpfc/lpfc_scsi.c | 56 +- + drivers/scsi/lpfc/lpfc_sli.c | 41 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/mac_scsi.c | 83 +- + drivers/scsi/megaraid/megaraid_sas.h | 8 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 136 +- + drivers/scsi/megaraid/megaraid_sas_fp.c | 6 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 23 +- + drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 7 + + drivers/scsi/mpt3sas/mpt3sas_base.c | 186 +- + drivers/scsi/mpt3sas/mpt3sas_base.h | 39 +- + drivers/scsi/mpt3sas/mpt3sas_config.c | 2 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 69 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.h | 1 + + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 129 +- + drivers/scsi/mpt3sas/mpt3sas_transport.c | 8 +- + drivers/scsi/mvsas/mv_94xx.c | 2 +- + drivers/scsi/pmcraid.c | 10 +- + drivers/scsi/qla2xxx/qla_bsg.c | 449 +- + drivers/scsi/qla2xxx/qla_def.h | 2 +- + drivers/scsi/qla2xxx/qla_gbl.h | 4 +- + drivers/scsi/qla2xxx/qla_iocb.c | 13 +- + drivers/scsi/qla2xxx/qla_isr.c | 52 +- + drivers/scsi/qla2xxx/qla_mr.c | 15 +- + drivers/scsi/qla4xxx/ql4_def.h | 18 +- + drivers/scsi/qla4xxx/ql4_glbl.h | 1 - + drivers/scsi/qla4xxx/ql4_isr.c | 27 +- + drivers/scsi/qla4xxx/ql4_mbx.c | 5 +- + drivers/scsi/qla4xxx/ql4_nx.c | 97 +- + drivers/scsi/qla4xxx/ql4_os.c | 15 +- + drivers/scsi/scsi_devinfo.c | 2 - + drivers/scsi/scsi_lib.c | 51 +- + drivers/scsi/scsi_transport_fc.c | 455 +- + drivers/scsi/scsi_transport_srp.c | 52 +- + drivers/scsi/sd.c | 4 +- + drivers/scsi/smartpqi/smartpqi.h | 2 - + drivers/scsi/smartpqi/smartpqi_init.c | 102 +- + drivers/scsi/storvsc_drv.c | 4 +- + drivers/scsi/sun3_scsi.c | 80 +- + drivers/scsi/ufs/ufs-qcom.c | 39 +- + drivers/scsi/ufs/ufs.h | 5 +- + drivers/scsi/ufs/ufs_quirks.h | 9 + + drivers/scsi/ufs/ufshcd-pci.c | 2 + + drivers/scsi/ufs/ufshcd-pltfrm.c | 5 +- + drivers/scsi/ufs/ufshcd.c | 482 +- + drivers/scsi/ufs/ufshcd.h | 46 +- + drivers/scsi/ufs/ufshci.h | 3 + + drivers/scsi/ufs/unipro.h | 4 + + drivers/scsi/xen-scsifront.c | 193 +- + drivers/spi/Kconfig | 19 +- + drivers/spi/Makefile | 2 + + drivers/spi/spi-armada-3700.c | 923 ++++ + drivers/spi/spi-ath79.c | 1 + + drivers/spi/spi-atmel.c | 324 +- + drivers/spi/spi-axi-spi-engine.c | 1 + + drivers/spi/spi-dw.c | 1 + + drivers/spi/spi-fsl-dspi.c | 306 +- + drivers/spi/spi-fsl-espi.c | 728 +-- + drivers/spi/spi-fsl-lib.h | 4 - + drivers/spi/spi-fsl-lpspi.c | 525 +++ + drivers/spi/spi-imx.c | 35 +- + drivers/spi/spi-jcore.c | 1 + + drivers/spi/spi-omap2-mcspi.c | 11 +- + drivers/spi/spi-orion.c | 83 +- + drivers/spi/spi-pxa2xx.h | 1 - + drivers/spi/spi-rspi.c | 52 +- + drivers/spi/spi-sh-msiof.c | 1 + + drivers/spi/spi-sun4i.c | 75 +- + drivers/spi/spi-sun6i.c | 18 +- + drivers/spi/spi-ti-qspi.c | 1 + + drivers/spi/spi-topcliff-pch.c | 13 +- + drivers/spi/spi-xlp.c | 1 + + drivers/spi/spi.c | 26 +- + drivers/spi/spidev.c | 1 + + drivers/target/target_core_fabric_configfs.c | 7 +- + drivers/target/tcm_fc/tfc_cmd.c | 20 +- + drivers/target/tcm_fc/tfc_io.c | 4 +- + drivers/usb/dwc3/gadget.c | 2 +- + drivers/usb/gadget/configfs.c | 8 +- + drivers/usb/gadget/function/uvc_configfs.c | 25 +- + drivers/video/fbdev/xen-fbfront.c | 13 +- + drivers/xen/balloon.c | 6 +- + drivers/xen/events/events_base.c | 2 +- + drivers/xen/gntalloc.c | 9 +- + drivers/xen/gntdev.c | 2 +- + drivers/xen/platform-pci.c | 6 +- + drivers/xen/swiotlb-xen.c | 27 +- + drivers/xen/xen-pciback/xenbus.c | 8 +- + drivers/xen/xenbus/xenbus_dev_frontend.c | 2 + + drivers/xen/xenbus/xenbus_probe.c | 4 +- + drivers/xen/xenbus/xenbus_probe_backend.c | 8 +- + drivers/xen/xenbus/xenbus_xs.c | 22 +- + fs/Kconfig | 1 - + fs/crypto/Kconfig | 2 - + fs/crypto/crypto.c | 123 +- + fs/crypto/fname.c | 8 +- + fs/crypto/fscrypt_private.h | 93 + + fs/crypto/keyinfo.c | 8 +- + fs/crypto/policy.c | 36 +- + fs/dax.c | 1132 ++--- + fs/dlm/ast.c | 2 +- + fs/dlm/config.c | 2 +- + fs/dlm/debug_fs.c | 2 +- + fs/dlm/dlm_internal.h | 1 - + fs/dlm/lockspace.c | 2 + + fs/dlm/lowcomms.c | 28 +- + fs/dlm/main.c | 2 + + fs/dlm/netlink.c | 2 +- + fs/dlm/user.c | 1 - + fs/ext2/file.c | 35 +- + fs/ext2/inode.c | 11 +- + fs/ext4/Kconfig | 1 + + fs/ext4/acl.c | 2 +- + fs/ext4/ext4.h | 31 +- + fs/ext4/ext4_jbd2.h | 14 +- + fs/ext4/extents.c | 27 +- + fs/ext4/file.c | 184 +- + fs/ext4/ialloc.c | 5 +- + fs/ext4/inline.c | 18 +- + fs/ext4/inode.c | 349 +- + fs/ext4/ioctl.c | 82 +- + fs/ext4/mballoc.c | 4 +- + fs/ext4/namei.c | 24 +- + fs/ext4/page-io.c | 3 +- + fs/ext4/super.c | 152 +- + fs/ext4/xattr.c | 45 +- + fs/f2fs/acl.c | 2 +- + fs/f2fs/checkpoint.c | 34 +- + fs/f2fs/data.c | 196 +- + fs/f2fs/debug.c | 29 +- + fs/f2fs/dir.c | 30 +- + fs/f2fs/extent_cache.c | 2 +- + fs/f2fs/f2fs.h | 201 +- + fs/f2fs/file.c | 86 +- + fs/f2fs/gc.c | 29 +- + fs/f2fs/inline.c | 14 +- + fs/f2fs/inode.c | 47 +- + fs/f2fs/namei.c | 6 +- + fs/f2fs/node.c | 226 +- + fs/f2fs/node.h | 13 +- + fs/f2fs/recovery.c | 46 +- + fs/f2fs/segment.c | 236 +- + fs/f2fs/segment.h | 28 +- + fs/f2fs/shrinker.c | 10 +- + fs/f2fs/super.c | 281 +- + fs/f2fs/xattr.c | 4 +- + fs/iomap.c | 5 +- + fs/jfs/ioctl.c | 2 +- + fs/mbcache.c | 41 +- + fs/proc/generic.c | 1 + + fs/proc/internal.h | 1 - + fs/xfs/xfs_aops.c | 26 +- + fs/xfs/xfs_aops.h | 3 - + fs/xfs/xfs_file.c | 10 +- + include/dt-bindings/sound/cs42l42.h | 73 + + include/linux/blk-mq.h | 1 + + include/linux/bsg-lib.h | 4 + + include/linux/configfs.h | 2 +- + include/linux/dax.h | 60 +- + include/linux/f2fs_fs.h | 10 +- + include/linux/fscrypto.h | 134 +- + include/linux/hid.h | 5 + + include/linux/hwmon.h | 31 +- + include/linux/iomap.h | 1 + + include/linux/irqchip/arm-gic-v3.h | 8 +- + include/linux/kvm_host.h | 10 + + include/linux/ntb.h | 2 +- + include/linux/phy/phy-qcom-ufs.h | 18 - + include/linux/power/bq27xxx_battery.h | 3 +- + include/linux/proc_fs.h | 2 + + include/linux/restart_block.h | 51 + + include/linux/spi/spi.h | 1 + + include/linux/swiotlb.h | 14 +- + include/linux/thread_info.h | 45 +- + include/scsi/libfc.h | 206 +- + include/scsi/scsi_host.h | 8 + + include/scsi/scsi_transport_fc.h | 62 +- + include/sound/compress_driver.h | 1 + + include/sound/core.h | 20 +- + include/sound/cs35l34.h | 35 + + include/sound/dmaengine_pcm.h | 6 - + include/sound/emu10k1.h | 3 +- + include/sound/rt5514.h | 20 + + include/sound/rt5665.h | 47 + + include/sound/simple_card_utils.h | 8 +- + include/sound/soc-dai.h | 43 +- + include/sound/soc-dapm.h | 14 + + include/sound/soc-topology.h | 2 +- + include/sound/soc.h | 87 +- + include/trace/events/f2fs.h | 21 + + include/uapi/linux/dm-log-userspace.h | 53 +- + include/uapi/linux/fs.h | 14 + + include/uapi/linux/hw_breakpoint.h | 4 + + include/uapi/linux/kvm.h | 5 +- + include/uapi/linux/raid/md_p.h | 7 +- + include/uapi/sound/asoc.h | 90 +- + include/uapi/sound/snd_sst_tokens.h | 8 +- + include/xen/arm/hypercall.h | 87 + + include/xen/arm/hypervisor.h | 39 + + include/xen/arm/interface.h | 85 + + include/xen/arm/page-coherent.h | 98 + + include/xen/arm/page.h | 122 + + include/xen/swiotlb-xen.h | 3 - + include/xen/xenbus.h | 4 + + kernel/Makefile | 2 - + lib/raid6/avx2.c | 232 +- + lib/swiotlb.c | 81 +- + mm/filemap.c | 7 +- + scripts/gcc-plugins/latent_entropy_plugin.c | 2 +- + scripts/gcc-plugins/sancov_plugin.c | 2 +- + sound/core/oss/pcm_oss.c | 2 +- + sound/core/rawmidi.c | 4 +- + sound/drivers/opl3/opl3_lib.c | 2 +- + sound/firewire/bebob/bebob.c | 4 +- + sound/pci/ac97/ac97_codec.c | 2 +- + sound/pci/als4000.c | 2 +- + sound/pci/au88x0/au88x0_game.c | 2 +- + sound/pci/azt3328.c | 2 +- + sound/pci/cmipci.c | 2 +- + sound/pci/cs4281.c | 2 +- + sound/pci/cs46xx/cs46xx_lib.c | 2 +- + sound/pci/cs46xx/dsp_spos.c | 3 +- + sound/pci/echoaudio/layla24_dsp.c | 2 +- + sound/pci/emu10k1/emu10k1.c | 11 +- + sound/pci/emu10k1/emu10k1_main.c | 228 +- + sound/pci/ens1370.c | 2 +- + sound/pci/es1938.c | 2 +- + sound/pci/es1968.c | 2 +- + sound/pci/hda/hda_auto_parser.c | 4 +- + sound/pci/hda/patch_ca0132.c | 1 + + sound/pci/hda/patch_conexant.c | 17 + + sound/pci/hda/patch_realtek.c | 46 +- + sound/pci/riptide/riptide.c | 2 +- + sound/pci/sonicvibes.c | 2 +- + sound/pci/trident/trident_main.c | 2 +- + sound/pci/via82xx.c | 2 +- + sound/pci/ymfpci/ymfpci.h | 2 +- + sound/soc/atmel/Kconfig | 10 + + sound/soc/atmel/Makefile | 2 + + sound/soc/atmel/atmel_ssc_dai.c | 83 +- + sound/soc/atmel/atmel_ssc_dai.h | 1 + + sound/soc/atmel/atmel_wm8904.c | 2 +- + sound/soc/atmel/tse850-pcm5142.c | 472 ++ + sound/soc/bcm/Kconfig | 1 + + sound/soc/codecs/Kconfig | 31 +- + sound/soc/codecs/Makefile | 11 +- + sound/soc/codecs/ab8500-codec.c | 2 - + sound/soc/codecs/adau17x1.c | 2 +- + sound/soc/codecs/ak4641.c | 22 +- + sound/soc/codecs/ak4641.h | 47 - + sound/soc/codecs/arizona.c | 153 +- + sound/soc/codecs/arizona.h | 109 +- + sound/soc/codecs/cs35l34.c | 1251 +++++ + sound/soc/codecs/cs35l34.h | 269 ++ + sound/soc/codecs/cs42l42.c | 1986 ++++++++ + sound/soc/codecs/cs42l42.h | 776 ++++ + sound/soc/codecs/cs42l56.c | 18 +- + sound/soc/codecs/cs42l73.c | 4 - + sound/soc/codecs/cs42xx8.c | 10 - + sound/soc/codecs/cs47l24.c | 55 +- + sound/soc/codecs/da7219-aad.c | 18 +- + sound/soc/codecs/da7219.c | 139 +- + sound/soc/codecs/da7219.h | 5 + + sound/soc/codecs/es8328.h | 37 - + sound/soc/codecs/msm8916-wcd-analog.c | 890 ++++ + sound/soc/codecs/msm8916-wcd-digital.c | 923 ++++ + sound/soc/codecs/nau8825.c | 142 +- + sound/soc/codecs/nau8825.h | 16 + + sound/soc/codecs/rl6231.c | 1 + + sound/soc/codecs/rl6347a.c | 2 +- + sound/soc/codecs/rt298.c | 24 +- + sound/soc/codecs/rt5514-spi.c | 1 - + sound/soc/codecs/rt5514.c | 17 + + sound/soc/codecs/rt5514.h | 2 + + sound/soc/codecs/rt5616.c | 3 +- + sound/soc/codecs/rt5640.c | 5 + + sound/soc/codecs/rt5640.h | 6 + + sound/soc/codecs/rt5660.c | 4 + + sound/soc/codecs/rt5660.h | 3 + + sound/soc/codecs/rt5663.c | 1137 ++--- + sound/soc/codecs/rt5663.h | 1162 ++--- + sound/soc/codecs/rt5665.c | 4874 ++++++++++++++++++++ + sound/soc/codecs/rt5665.h | 1990 ++++++++ + sound/soc/codecs/rt5670.c | 16 +- + sound/soc/codecs/rt5670.h | 1 + + sound/soc/codecs/rt5677-spi.c | 1 - + sound/soc/codecs/stac9766.c | 162 +- + sound/soc/codecs/stac9766.h | 17 - + sound/soc/codecs/sti-sas.c | 179 +- + sound/soc/codecs/tlv320aic31xx.c | 3 + + sound/soc/codecs/tlv320aic31xx.h | 1 + + sound/soc/codecs/tlv320aic3x.c | 2 +- + sound/soc/codecs/uda1380.c | 77 +- + sound/soc/codecs/uda1380.h | 4 - + sound/soc/codecs/wm2200.c | 4 +- + sound/soc/codecs/wm5102.c | 59 +- + sound/soc/codecs/wm5110.c | 61 +- + sound/soc/codecs/wm8523.c | 24 +- + sound/soc/codecs/wm8580.c | 123 +- + sound/soc/codecs/wm8753.h | 3 - + sound/soc/codecs/wm8978.h | 2 +- + sound/soc/codecs/wm8997.c | 39 +- + sound/soc/codecs/wm8998.c | 38 +- + sound/soc/codecs/wm9081.c | 2 - + sound/soc/codecs/wm9705.c | 138 +- + sound/soc/codecs/wm9705.h | 11 - + sound/soc/codecs/wm9712.c | 177 +- + sound/soc/codecs/wm9712.h | 11 - + sound/soc/codecs/wm9713.c | 2 +- + sound/soc/codecs/wm9713.h | 4 - + sound/soc/codecs/wm_adsp.c | 354 +- + sound/soc/codecs/wm_adsp.h | 27 +- + sound/soc/codecs/wmfw.h | 4 + + sound/soc/fsl/Kconfig | 1 + + sound/soc/fsl/efika-audio-fabric.c | 1 - + sound/soc/fsl/fsl-asoc-card.c | 2 +- + sound/soc/fsl/imx-wm8962.c | 2 +- + sound/soc/generic/simple-card-utils.c | 5 +- + sound/soc/generic/simple-card.c | 2 +- + sound/soc/generic/simple-scu-card.c | 115 +- + sound/soc/intel/atom/sst-atom-controls.c | 2 +- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 6 + + sound/soc/intel/atom/sst/sst.c | 39 + + sound/soc/intel/atom/sst/sst.h | 1 + + sound/soc/intel/atom/sst/sst_acpi.c | 2 + + sound/soc/intel/atom/sst/sst_ipc.c | 11 + + sound/soc/intel/atom/sst/sst_stream.c | 4 +- + sound/soc/intel/baytrail/sst-baytrail-ipc.c | 3 +- + sound/soc/intel/boards/bdw-rt5677.c | 2 +- + sound/soc/intel/boards/broadwell.c | 18 +- + sound/soc/intel/boards/bxt_da7219_max98357a.c | 26 +- + sound/soc/intel/boards/bxt_rt298.c | 4 +- + sound/soc/intel/boards/bytcr_rt5640.c | 68 +- + sound/soc/intel/boards/bytcr_rt5651.c | 4 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 4 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 10 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 46 +- + sound/soc/intel/boards/haswell.c | 2 +- + sound/soc/intel/boards/mfld_machine.c | 4 +- + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 6 +- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 6 +- + sound/soc/intel/boards/skl_rt286.c | 4 +- + sound/soc/intel/common/sst-acpi.h | 17 +- + sound/soc/intel/common/sst-ipc.c | 85 +- + sound/soc/intel/common/sst-ipc.h | 8 +- + sound/soc/intel/common/sst-match-acpi.c | 57 + + sound/soc/intel/haswell/sst-haswell-ipc.c | 3 +- + sound/soc/intel/skylake/bxt-sst.c | 145 + + sound/soc/intel/skylake/skl-messages.c | 39 +- + sound/soc/intel/skylake/skl-pcm.c | 28 +- + sound/soc/intel/skylake/skl-sst-cldma.c | 1 - + sound/soc/intel/skylake/skl-sst-dsp.h | 12 + + sound/soc/intel/skylake/skl-sst-ipc.c | 71 +- + sound/soc/intel/skylake/skl-sst-ipc.h | 37 +- + sound/soc/intel/skylake/skl-sst-utils.c | 2 +- + sound/soc/intel/skylake/skl-topology.c | 47 + + sound/soc/intel/skylake/skl-topology.h | 28 +- + sound/soc/intel/skylake/skl.c | 59 +- + sound/soc/intel/skylake/skl.h | 6 + + sound/soc/kirkwood/armada-370-db.c | 2 +- + sound/soc/mxs/mxs-saif.c | 13 +- + sound/soc/mxs/mxs-sgtl5000.c | 2 +- + sound/soc/pxa/corgi.c | 6 +- + sound/soc/pxa/e740_wm9705.c | 1 - + sound/soc/pxa/e750_wm9705.c | 1 - + sound/soc/pxa/e800_wm9712.c | 1 - + sound/soc/pxa/em-x270.c | 1 - + sound/soc/pxa/hx4700.c | 2 - + sound/soc/pxa/magician.c | 2 +- + sound/soc/pxa/mioa701_wm9713.c | 2 +- + sound/soc/pxa/palm27x.c | 1 - + sound/soc/pxa/poodle.c | 4 +- + sound/soc/pxa/pxa-ssp.h | 6 - + sound/soc/pxa/pxa2xx-i2s.h | 3 - + sound/soc/pxa/spitz.c | 6 +- + sound/soc/pxa/tosa.c | 7 +- + sound/soc/qcom/apq8016_sbc.c | 11 +- + sound/soc/qcom/lpass-platform.c | 49 +- + sound/soc/qcom/storm.c | 2 +- + sound/soc/rockchip/rk3399_gru_sound.c | 8 +- + sound/soc/rockchip/rockchip_max98090.c | 2 +- + sound/soc/rockchip/rockchip_rt5645.c | 2 +- + sound/soc/samsung/Kconfig | 58 +- + sound/soc/samsung/Makefile | 9 +- + sound/soc/samsung/ac97.c | 437 -- + sound/soc/samsung/dmaengine.c | 8 +- + sound/soc/samsung/i2s.c | 8 +- + sound/soc/samsung/ln2440sbc_alc650.c | 72 - + sound/soc/samsung/pcm.c | 60 +- + sound/soc/samsung/regs-ac97.h | 66 - + sound/soc/samsung/s3c2412-i2s.c | 2 - + sound/soc/samsung/s3c24xx-i2s.c | 51 +- + sound/soc/samsung/s3c24xx_uda134x.c | 79 +- + sound/soc/samsung/smdk2443_wm9710.c | 68 - + sound/soc/samsung/smdk_wm8580.c | 30 +- + sound/soc/samsung/smdk_wm8580pcm.c | 175 - + sound/soc/samsung/smdk_wm9713.c | 108 - + sound/soc/samsung/tm2_wm5110.c | 552 +++ + sound/soc/sh/Kconfig | 3 +- + sound/soc/sh/rcar/adg.c | 61 +- + sound/soc/sh/rcar/core.c | 175 +- + sound/soc/sh/rcar/dma.c | 295 +- + sound/soc/sh/rcar/dvc.c | 2 - + sound/soc/sh/rcar/gen.c | 12 +- + sound/soc/sh/rcar/rsnd.h | 156 +- + sound/soc/sh/rcar/src.c | 13 +- + sound/soc/sh/rcar/ssi.c | 28 +- + sound/soc/sh/rcar/ssiu.c | 20 + + sound/soc/soc-compress.c | 98 +- + sound/soc/soc-core.c | 181 +- + sound/soc/soc-dapm.c | 154 +- + sound/soc/soc-generic-dmaengine-pcm.c | 13 +- + sound/soc/soc-pcm.c | 2 +- + sound/soc/soc-topology.c | 751 ++- + sound/soc/soc-utils.c | 199 + + sound/soc/sti/sti_uniperif.c | 43 +- + sound/soc/sti/uniperif.h | 2 + + sound/soc/sti/uniperif_player.c | 91 +- + sound/soc/sti/uniperif_reader.c | 41 +- + sound/soc/sunxi/Kconfig | 8 + + sound/soc/sunxi/Makefile | 1 + + sound/soc/sunxi/sun4i-codec.c | 867 +++- + sound/soc/sunxi/sun4i-i2s.c | 105 +- + sound/soc/sunxi/sun8i-codec-analog.c | 665 +++ + sound/soc/tegra/tegra_alc5632.c | 2 +- + sound/soc/tegra/tegra_max98090.c | 2 +- + sound/soc/tegra/tegra_rt5640.c | 2 +- + sound/soc/tegra/tegra_rt5677.c | 2 +- + sound/soc/tegra/tegra_sgtl5000.c | 2 +- + sound/soc/tegra/tegra_wm8753.c | 2 +- + sound/soc/tegra/tegra_wm8903.c | 2 +- + sound/soc/tegra/trimslice.c | 2 +- + sound/soc/zte/Kconfig | 16 +- + sound/soc/zte/Makefile | 4 +- + sound/soc/zte/{zx296702-i2s.c => zx-i2s.c} | 0 + sound/soc/zte/{zx296702-spdif.c => zx-spdif.c} | 2 +- + sound/usb/card.c | 1 - + sound/usb/endpoint.c | 32 +- + sound/usb/hiface/pcm.c | 2 + + sound/usb/line6/driver.h | 9 +- + sound/usb/line6/podhd.c | 26 + + sound/usb/mixer.c | 3 +- + sound/usb/pcm.c | 31 +- + sound/usb/quirks.c | 38 + + tools/include/uapi/linux/hw_breakpoint.h | 4 + + tools/power/acpi/tools/ec/ec_access.c | 2 +- + tools/spi/spidev_test.c | 2 +- + tools/testing/selftests/breakpoints/Makefile | 5 +- + .../selftests/breakpoints/breakpoint_test_arm64.c | 236 + + virt/kvm/arm/arch_timer.c | 17 +- + virt/kvm/arm/vgic/vgic-its.c | 11 +- + virt/kvm/arm/vgic/vgic-kvm-device.c | 2 - + virt/kvm/arm/vgic/vgic-mmio-v2.c | 3 +- + virt/kvm/arm/vgic/vgic-mmio-v3.c | 2 - + virt/kvm/arm/vgic/vgic.h | 26 - + virt/kvm/kvm_main.c | 87 +- + 973 files changed, 48844 insertions(+), 17891 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-platform-sst-atom + create mode 100644 Documentation/devicetree/bindings/arm/cpu-capacity.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/mcp3021.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/tmp108.txt + create mode 100644 Documentation/devicetree/bindings/sound/axentia,tse850-pcm5142.txt + create mode 100644 Documentation/devicetree/bindings/sound/cs35l34.txt + create mode 100644 Documentation/devicetree/bindings/sound/cs42l42.txt + create mode 100644 Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-analog.txt + create mode 100644 Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-digital.txt + create mode 100755 Documentation/devicetree/bindings/sound/rt5665.txt + create mode 100644 Documentation/devicetree/bindings/sound/samsung,tm2-audio.txt + create mode 100644 Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt + create mode 100644 Documentation/devicetree/bindings/spi/spi-armada-3700.txt + create mode 100644 Documentation/devicetree/bindings/spi/spi-fsl-lpspi.txt + create mode 100644 Documentation/hwmon/tc654 + create mode 100644 Documentation/hwmon/tmp108 + create mode 100644 Documentation/virtual/kvm/halt-polling.txt + create mode 100644 arch/arm64/include/asm/current.h + delete mode 100644 arch/arm64/include/asm/opcodes.h + create mode 100644 arch/arm64/include/asm/stack_pointer.h + create mode 100644 arch/arm64/include/asm/uprobes.h + create mode 100644 arch/arm64/kernel/probes/uprobes.c + create mode 100644 arch/arm64/mm/ptdump_debugfs.c + delete mode 100644 arch/s390/include/asm/asm-offsets.h + create mode 100644 arch/s390/include/asm/atomic_ops.h + delete mode 100644 arch/s390/include/asm/facilities_src.h + create mode 100644 arch/s390/include/asm/preempt.h + create mode 100644 drivers/hid/hid-mf.c + create mode 100644 drivers/hid/hid-udraw-ps3.c + delete mode 100644 drivers/hid/intel-ish-hid/ipc/utils.h + create mode 100644 drivers/hwmon/tc654.c + create mode 100644 drivers/hwmon/tmp108.c + delete mode 100644 drivers/mmc/card/Kconfig + delete mode 100644 drivers/mmc/card/Makefile + rename drivers/mmc/{card => core}/block.c (100%) + rename drivers/mmc/{card => core}/block.h (100%) + rename drivers/mmc/{card => core}/mmc_test.c (99%) + rename drivers/mmc/{card => core}/queue.c (99%) + rename drivers/mmc/{card => core}/queue.h (100%) + rename drivers/mmc/{card => core}/sdio_uart.c (99%) + create mode 100644 drivers/power/reset/piix4-poweroff.c + delete mode 100644 drivers/scsi/g_NCR5380_mmio.c + create mode 100644 drivers/spi/spi-armada-3700.c + create mode 100644 drivers/spi/spi-fsl-lpspi.c + create mode 100644 fs/crypto/fscrypt_private.h + create mode 100644 include/dt-bindings/sound/cs42l42.h + create mode 100644 include/linux/restart_block.h + create mode 100644 include/sound/cs35l34.h + create mode 100644 include/sound/rt5514.h + create mode 100755 include/sound/rt5665.h + create mode 100644 include/xen/arm/hypercall.h + create mode 100644 include/xen/arm/hypervisor.h + create mode 100644 include/xen/arm/interface.h + create mode 100644 include/xen/arm/page-coherent.h + create mode 100644 include/xen/arm/page.h + create mode 100644 sound/soc/atmel/tse850-pcm5142.c + delete mode 100644 sound/soc/codecs/ak4641.h + create mode 100644 sound/soc/codecs/cs35l34.c + create mode 100644 sound/soc/codecs/cs35l34.h + create mode 100644 sound/soc/codecs/cs42l42.c + create mode 100644 sound/soc/codecs/cs42l42.h + create mode 100644 sound/soc/codecs/msm8916-wcd-analog.c + create mode 100644 sound/soc/codecs/msm8916-wcd-digital.c + create mode 100644 sound/soc/codecs/rt5665.c + create mode 100644 sound/soc/codecs/rt5665.h + delete mode 100644 sound/soc/codecs/stac9766.h + delete mode 100644 sound/soc/codecs/wm9705.h + delete mode 100644 sound/soc/codecs/wm9712.h + delete mode 100644 sound/soc/samsung/ac97.c + delete mode 100644 sound/soc/samsung/ln2440sbc_alc650.c + delete mode 100644 sound/soc/samsung/regs-ac97.h + delete mode 100644 sound/soc/samsung/smdk2443_wm9710.c + delete mode 100644 sound/soc/samsung/smdk_wm8580pcm.c + delete mode 100644 sound/soc/samsung/smdk_wm9713.c + create mode 100644 sound/soc/samsung/tm2_wm5110.c + create mode 100644 sound/soc/sunxi/sun8i-codec-analog.c + rename sound/soc/zte/{zx296702-i2s.c => zx-i2s.c} (100%) + rename sound/soc/zte/{zx296702-spdif.c => zx-spdif.c} (99%) + create mode 100644 tools/testing/selftests/breakpoints/breakpoint_test_arm64.c +Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (152b695d7437 builddeb: fix cross-building to arm64 producing host-arch debs) +$ git merge kbuild-current/rc-fixes +Merge made by the 'recursive' strategy. + scripts/package/builddeb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging arc-current/for-curr (7badf6fefca8 ARC: axs10x: really enable ARC PGU) +$ git merge arc-current/for-curr +Auto-merging include/soc/arc/mcip.h +Auto-merging drivers/clocksource/arc_timer.c +Auto-merging arch/arc/configs/haps_hs_smp_defconfig +Auto-merging arch/arc/configs/haps_hs_defconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/timer/ezchip,nps400-timer1.txt +Merge made by the 'recursive' strategy. + .../bindings/timer/ezchip,nps400-timer0.txt | 17 ++ + ...p,nps400-timer.txt => ezchip,nps400-timer1.txt} | 6 +- + MAINTAINERS | 1 + + arch/arc/Kconfig | 13 +- + arch/arc/boot/dts/axs101.dts | 2 +- + arch/arc/boot/dts/axs103_idu.dts | 2 +- + arch/arc/boot/dts/{zebu_hs.dts => haps_hs.dts} | 0 + .../boot/dts/{zebu_hs_idu.dts => haps_hs_idu.dts} | 0 + arch/arc/configs/axs101_defconfig | 4 +- + arch/arc/configs/axs103_smp_defconfig | 4 +- + .../{zebu_hs_defconfig => haps_hs_defconfig} | 2 +- + ...zebu_hs_smp_defconfig => haps_hs_smp_defconfig} | 2 +- + arch/arc/configs/nsimosci_hs_smp_defconfig | 2 +- + arch/arc/configs/vdk_hs38_smp_defconfig | 2 +- + arch/arc/include/asm/arcregs.h | 94 +-------- + arch/arc/kernel/Makefile | 2 +- + arch/arc/kernel/mcip.c | 2 +- + arch/arc/kernel/setup.c | 17 +- + arch/arc/plat-axs10x/axs10x.c | 2 +- + arch/arc/plat-eznps/include/plat/ctop.h | 2 - + drivers/clocksource/Kconfig | 20 ++ + drivers/clocksource/Makefile | 1 + + .../time.c => drivers/clocksource/arc_timer.c | 110 +++------- + drivers/clocksource/timer-nps.c | 224 +++++++++++++++++++-- + include/soc/arc/aux.h | 63 ++++++ + {arch/arc/include/asm => include/soc/arc}/mcip.h | 10 +- + include/soc/arc/timers.h | 38 ++++ + include/soc/nps/mtm.h | 59 ++++++ + 28 files changed, 474 insertions(+), 227 deletions(-) + create mode 100644 Documentation/devicetree/bindings/timer/ezchip,nps400-timer0.txt + rename Documentation/devicetree/bindings/timer/{ezchip,nps400-timer.txt => ezchip,nps400-timer1.txt} (52%) + rename arch/arc/boot/dts/{zebu_hs.dts => haps_hs.dts} (100%) + rename arch/arc/boot/dts/{zebu_hs_idu.dts => haps_hs_idu.dts} (100%) + rename arch/arc/configs/{zebu_hs_defconfig => haps_hs_defconfig} (98%) + rename arch/arc/configs/{zebu_hs_smp_defconfig => haps_hs_smp_defconfig} (98%) + rename arch/arc/kernel/time.c => drivers/clocksource/arc_timer.c (73%) + create mode 100644 include/soc/arc/aux.h + rename {arch/arc/include/asm => include/soc/arc}/mcip.h (95%) + create mode 100644 include/soc/arc/timers.h + create mode 100644 include/soc/nps/mtm.h +Merging arm-current/fixes (8478132a8784 Revert "arm: move exports to definitions") +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (7e251bb21ae0 m68k: Fix ndelay() macro) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging powerpc-fixes/fixes (dadc4a1bb9f0 powerpc/64: Fix placement of .text to be immediately following .head.text) +$ git merge powerpc-fixes/fixes +Already up-to-date. +Merging sparc/master (8fa3b6f9392b Merge tag 'cris-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris) +$ git merge sparc/master +Already up-to-date. +Merging net/master (3e1ed981b7a9 netlink: revert broken, broken "2-clause nla_ok()") +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/virtio_net.c | 4 +++- + include/net/netlink.h | 3 ++- + 2 files changed, 5 insertions(+), 2 deletions(-) +Merging ipsec/master (bc3913a5378c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) +$ git merge ipsec/master +Already up-to-date. +Merging netfilter/master (a220871be66f virtio-net: correctly enable multiqueue) +$ git merge netfilter/master +Already up-to-date. +Merging ipvs/master (045169816b31 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge ipvs/master +Already up-to-date. +Merging wireless-drivers/master (fcd2042e8d36 mwifiex: printk() overflow with 32-byte SSIDs) +$ git merge wireless-drivers/master +Already up-to-date. +Merging mac80211/master (d8da0b5d64d5 mac80211: Ensure enough headroom when forwarding mesh pkt) +$ git merge mac80211/master +Merge made by the 'recursive' strategy. + net/mac80211/key.c | 3 ++- + net/mac80211/rx.c | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) +Merging sound-current/for-linus (995c6a7fd9b9 ALSA: hiface: Fix M2Tech hiFace driver sampling rate change) +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus (e42010d8207f PCI: Set Read Completion Boundary to 128 iff Root Port supports it (_HPX)) +$ git merge pci-current/for-linus +Already up-to-date. +Merging driver-core.current/driver-core-linus (cdb98c2698b4 Revert "nvme: add support for the Write Zeroes command") +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (cdb98c2698b4 Revert "nvme: add support for the Write Zeroes command") +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (cdb98c2698b4 Revert "nvme: add support for the Write Zeroes command") +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (05e78c6933d6 usb: gadget: f_fs: fix wrong parenthesis in ffs_func_req_match()) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (46490c347df4 USB: serial: option: add dlink dwm-158) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. +Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Merge made by the 'recursive' strategy. +Merging phy/fixes (4320f9d4c183 phy: sun4i: check PMU presence when poking unknown bit of pmu) +$ git merge phy/fixes +Already up-to-date. +Merging staging.current/staging-linus (cdb98c2698b4 Revert "nvme: add support for the Write Zeroes command") +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (cdb98c2698b4 Revert "nvme: add support for the Write Zeroes command") +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (2425f1808123 Input: change KEY_DATA from 0x275 to 0x277) +$ git merge input-current/for-linus +Already up-to-date. +Merging crypto-current/master (18e615ad87bc crypto: skcipher - fix crash in virtual walk) +$ git merge crypto-current/master +Auto-merging scripts/sign-file.c +Auto-merging drivers/crypto/marvell/hash.c +Auto-merging drivers/crypto/chelsio/chcr_core.c +Auto-merging drivers/crypto/chelsio/chcr_algo.c +Auto-merging drivers/crypto/caam/ctrl.c +Auto-merging crypto/algif_skcipher.c +Auto-merging crypto/algif_aead.c +Auto-merging arch/x86/crypto/aesni-intel_glue.c +Auto-merging arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi +Auto-merging arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/crypto/api-intro.txt | 5 +- + .../devicetree/bindings/crypto/fsl-sec4.txt | 20 + + Documentation/devicetree/bindings/rng/omap_rng.txt | 14 +- + .../devicetree/bindings/vendor-prefixes.txt | 1 + + MAINTAINERS | 9 + + arch/arm/crypto/Kconfig | 18 +- + arch/arm/crypto/Makefile | 4 + + arch/arm/crypto/aes-ce-glue.c | 395 ++-- + arch/arm/crypto/aesbs-glue.c | 380 ++-- + arch/arm/crypto/crc32-ce-core.S | 306 +++ + arch/arm/crypto/crc32-ce-glue.c | 242 +++ + arch/arm/crypto/crct10dif-ce-core.S | 427 ++++ + arch/arm/crypto/crct10dif-ce-glue.c | 101 + + .../boot/dts/marvell/armada-cp110-master.dtsi | 8 + + .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 8 + + arch/arm64/crypto/.gitignore | 2 + + arch/arm64/crypto/Kconfig | 23 +- + arch/arm64/crypto/Makefile | 23 + + arch/arm64/crypto/aes-ce-ccm-core.S | 53 +- + arch/arm64/crypto/aes-ce-ccm-glue.c | 50 +- + arch/arm64/crypto/aes-ce-cipher.c | 25 +- + arch/arm64/crypto/aes-ce.S | 1 + + arch/arm64/crypto/aes-glue.c | 381 ++-- + arch/arm64/crypto/aes-modes.S | 3 +- + arch/arm64/crypto/aes-neon.S | 25 +- + arch/arm64/crypto/crc32-ce-core.S | 266 +++ + arch/arm64/crypto/crc32-ce-glue.c | 212 ++ + arch/arm64/crypto/crct10dif-ce-core.S | 392 ++++ + arch/arm64/crypto/crct10dif-ce-glue.c | 95 + + arch/arm64/crypto/ghash-ce-core.S | 6 +- + arch/arm64/crypto/sha1-ce-core.S | 4 +- + arch/arm64/crypto/sha2-ce-core.S | 4 +- + arch/arm64/crypto/sha256-core.S_shipped | 2061 ++++++++++++++++++++ + arch/arm64/crypto/sha256-glue.c | 185 ++ + arch/arm64/crypto/sha512-armv8.pl | 778 ++++++++ + arch/arm64/crypto/sha512-core.S_shipped | 1085 +++++++++++ + arch/arm64/crypto/sha512-glue.c | 94 + + arch/powerpc/crypto/Makefile | 2 +- + arch/x86/crypto/aesni-intel_glue.c | 705 +++---- + arch/x86/crypto/fpu.c | 207 +- + arch/x86/crypto/glue_helper.c | 74 +- + arch/x86/crypto/sha1-mb/sha1_mb.c | 2 +- + arch/x86/crypto/sha1-mb/sha1_mb_ctx.h | 2 +- + arch/x86/crypto/sha256-mb/sha256_mb.c | 2 +- + arch/x86/crypto/sha256-mb/sha256_mb_ctx.h | 2 +- + arch/x86/crypto/sha512-mb/sha512_mb.c | 2 +- + arch/x86/crypto/sha512-mb/sha512_mb_ctx.h | 2 +- + arch/x86/include/asm/crypto/glue_helper.h | 39 +- + crypto/842.c | 81 +- + crypto/Kconfig | 32 +- + crypto/Makefile | 6 + + crypto/acompress.c | 169 ++ + crypto/algboss.c | 8 +- + crypto/algif_aead.c | 5 +- + crypto/algif_skcipher.c | 4 +- + crypto/api.c | 22 +- + crypto/asymmetric_keys/public_key.c | 1 + + crypto/authenc.c | 8 +- + crypto/authencesn.c | 8 +- + crypto/cbc.c | 269 +-- + crypto/ccm.c | 8 +- + crypto/chacha20poly1305.c | 8 +- + crypto/cipher.c | 4 - + crypto/cmac.c | 14 +- + crypto/compress.c | 4 - + crypto/cryptd.c | 286 ++- + crypto/crypto_engine.c | 26 +- + crypto/crypto_user.c | 19 + + crypto/ctr.c | 8 +- + crypto/cts.c | 8 +- + crypto/deflate.c | 111 +- + crypto/dh.c | 2 +- + crypto/drbg.c | 1 + + crypto/gcm.c | 10 +- + crypto/gf128mul.c | 59 +- + crypto/internal.h | 3 - + crypto/jitterentropy-kcapi.c | 1 - + crypto/lrw.c | 507 +++-- + crypto/lz4.c | 91 +- + crypto/lz4hc.c | 92 +- + crypto/lzo.c | 97 +- + crypto/pcbc.c | 201 +- + crypto/poly1305_generic.c | 34 +- + crypto/scompress.c | 356 ++++ + crypto/simd.c | 226 +++ + crypto/skcipher.c | 542 +++++ + crypto/testmgr.c | 318 +-- + crypto/testmgr.h | 70 +- + crypto/xts.c | 547 ++++-- + drivers/char/hw_random/Kconfig | 2 +- + drivers/char/hw_random/atmel-rng.c | 26 +- + drivers/char/hw_random/core.c | 3 + + drivers/char/hw_random/meson-rng.c | 2 +- + drivers/char/hw_random/msm-rng.c | 4 - + drivers/char/hw_random/omap-rng.c | 162 +- + drivers/char/hw_random/pic32-rng.c | 3 - + drivers/char/hw_random/pseries-rng.c | 5 +- + drivers/crypto/amcc/crypto4xx_core.c | 3 +- + drivers/crypto/atmel-aes-regs.h | 4 + + drivers/crypto/atmel-aes.c | 189 +- + drivers/crypto/caam/Kconfig | 11 +- + drivers/crypto/caam/Makefile | 1 + + drivers/crypto/caam/caamalg.c | 1505 +++----------- + drivers/crypto/caam/caamalg_desc.c | 1306 +++++++++++++ + drivers/crypto/caam/caamalg_desc.h | 97 + + drivers/crypto/caam/caamhash.c | 227 +-- + drivers/crypto/caam/caampkc.c | 4 +- + drivers/crypto/caam/caamrng.c | 10 +- + drivers/crypto/caam/ctrl.c | 75 +- + drivers/crypto/caam/desc.h | 22 +- + drivers/crypto/caam/desc_constr.h | 133 +- + drivers/crypto/caam/error.c | 5 +- + drivers/crypto/caam/intern.h | 1 + + drivers/crypto/caam/jr.c | 27 +- + drivers/crypto/caam/key_gen.c | 62 +- + drivers/crypto/caam/key_gen.h | 6 +- + drivers/crypto/caam/sg_sw_sec4.h | 6 +- + drivers/crypto/ccp/ccp-dev-v3.c | 4 - + drivers/crypto/ccp/ccp-dev-v5.c | 30 +- + drivers/crypto/ccp/ccp-dev.c | 6 +- + drivers/crypto/ccp/ccp-dev.h | 45 +- + drivers/crypto/chelsio/Kconfig | 1 + + drivers/crypto/chelsio/chcr_algo.c | 2001 ++++++++++++++++--- + drivers/crypto/chelsio/chcr_algo.h | 103 +- + drivers/crypto/chelsio/chcr_core.c | 8 +- + drivers/crypto/chelsio/chcr_core.h | 18 +- + drivers/crypto/chelsio/chcr_crypto.h | 115 +- + drivers/crypto/marvell/cesa.c | 4 - + drivers/crypto/marvell/cesa.h | 5 +- + drivers/crypto/marvell/cipher.c | 8 +- + drivers/crypto/marvell/hash.c | 65 +- + drivers/crypto/marvell/tdma.c | 33 +- + drivers/crypto/mv_cesa.c | 4 +- + drivers/crypto/nx/nx.c | 1 - + drivers/crypto/sahara.c | 2 +- + drivers/crypto/talitos.c | 2 +- + drivers/crypto/vmx/Makefile | 12 +- + include/crypto/acompress.h | 269 +++ + include/crypto/cbc.h | 146 ++ + include/crypto/cryptd.h | 13 +- + include/crypto/engine.h | 6 +- + include/crypto/gf128mul.h | 15 +- + include/crypto/internal/acompress.h | 81 + + include/crypto/internal/scompress.h | 136 ++ + include/crypto/internal/simd.h | 17 + + include/crypto/internal/skcipher.h | 65 +- + include/crypto/xts.h | 26 +- + include/linux/ccp.h | 6 +- + include/linux/crypto.h | 5 +- + include/linux/hw_random.h | 3 +- + include/uapi/linux/cryptouser.h | 5 + + kernel/padata.c | 4 - + scripts/sign-file.c | 2 +- + 153 files changed, 15715 insertions(+), 4463 deletions(-) + create mode 100644 arch/arm/crypto/crc32-ce-core.S + create mode 100644 arch/arm/crypto/crc32-ce-glue.c + create mode 100644 arch/arm/crypto/crct10dif-ce-core.S + create mode 100644 arch/arm/crypto/crct10dif-ce-glue.c + create mode 100644 arch/arm64/crypto/.gitignore + create mode 100644 arch/arm64/crypto/crc32-ce-core.S + create mode 100644 arch/arm64/crypto/crc32-ce-glue.c + create mode 100644 arch/arm64/crypto/crct10dif-ce-core.S + create mode 100644 arch/arm64/crypto/crct10dif-ce-glue.c + create mode 100644 arch/arm64/crypto/sha256-core.S_shipped + create mode 100644 arch/arm64/crypto/sha256-glue.c + create mode 100644 arch/arm64/crypto/sha512-armv8.pl + create mode 100644 arch/arm64/crypto/sha512-core.S_shipped + create mode 100644 arch/arm64/crypto/sha512-glue.c + create mode 100644 crypto/acompress.c + create mode 100644 crypto/scompress.c + create mode 100644 crypto/simd.c + create mode 100644 drivers/crypto/caam/caamalg_desc.c + create mode 100644 drivers/crypto/caam/caamalg_desc.h + create mode 100644 include/crypto/acompress.h + create mode 100644 include/crypto/cbc.h + create mode 100644 include/crypto/internal/acompress.h + create mode 100644 include/crypto/internal/scompress.h + create mode 100644 include/crypto/internal/simd.h +Merging ide/master (797cee982eef Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit) +$ git merge ide/master +Already up-to-date. +Merging vfio-fixes/for-linus (05692d7005a3 vfio/pci: Fix integer overflows, bitmask check) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (1001354ca341 Linux 4.9-rc1) +$ git merge kselftest-fixes/fixes +Already up-to-date. +Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) +$ git merge backlight-fixes/for-backlight-fixes +Already up-to-date. +Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct) +$ git merge ftrace-fixes/for-next-urgent +Already up-to-date. +Merging mfd-fixes/for-mfd-fixes (1a41741fd60b mfd: wm8994-core: Don't use managed regulator bulk get API) +$ git merge mfd-fixes/for-mfd-fixes +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (69973b830859 Linux 4.9) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up-to-date. +Merging drm-misc-fixes/for-linux-next-fixes (e94bd1736f1f drm: Don't call drm_for_each_crtc with a non-KMS driver) +$ git merge drm-misc-fixes/for-linux-next-fixes +Already up-to-date. +Merging kbuild/for-next (a6d1da25b333 Merge branch 'kbuild/kbuild' into kbuild/for-next) +$ git merge kbuild/for-next +Auto-merging tools/perf/tests/make +Auto-merging tools/perf/Makefile.perf +Auto-merging tools/lib/traceevent/Makefile +Auto-merging samples/bpf/Makefile +Auto-merging include/asm-generic/vmlinux.lds.h +Merge made by the 'recursive' strategy. + arch/x86/include/asm/asm-prototypes.h | 16 + + include/asm-generic/asm-prototypes.h | 7 + + include/asm-generic/vmlinux.lds.h | 68 +-- + samples/bpf/Makefile | 4 +- + samples/connector/Makefile | 2 +- + scripts/Makefile.build | 17 +- + scripts/adjust_autoksyms.sh | 1 + + scripts/coccinelle/misc/boolconv.cocci | 90 ++++ + scripts/coccinelle/misc/irqf_oneshot.cocci | 52 ++- + scripts/genksyms/keywords.gperf | 1 + + scripts/genksyms/keywords.hash.c_shipped | 59 +-- + scripts/genksyms/parse.tab.c_shipped | 676 +++++++++++++++-------------- + scripts/genksyms/parse.tab.h_shipped | 33 +- + scripts/genksyms/parse.y | 2 + + scripts/kallsyms.c | 1 - + scripts/kconfig/nconf.c | 2 + + scripts/kconfig/nconf.gui.c | 15 +- + scripts/kconfig/qconf.cc | 19 +- + scripts/link-vmlinux.sh | 37 +- + scripts/mod/modpost.c | 6 + + scripts/package/mkspec | 3 +- + tools/build/Makefile | 2 +- + tools/gpio/Makefile | 2 +- + tools/lib/api/Makefile | 2 +- + tools/lib/bpf/Makefile | 2 +- + tools/lib/lockdep/Makefile | 2 +- + tools/lib/subcmd/Makefile | 2 +- + tools/lib/traceevent/Makefile | 2 +- + tools/objtool/Makefile | 4 +- + tools/perf/Makefile.perf | 2 +- + tools/perf/tests/make | 2 +- + tools/power/cpupower/Makefile | 3 - + tools/power/cpupower/debug/kernel/Makefile | 3 +- + 33 files changed, 658 insertions(+), 481 deletions(-) + create mode 100644 arch/x86/include/asm/asm-prototypes.h + create mode 100644 include/asm-generic/asm-prototypes.h + create mode 100644 scripts/coccinelle/misc/boolconv.cocci +Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo) +$ git merge asm-generic/master +Resolved 'include/asm-generic/percpu.h' using previous resolution. +Auto-merging include/asm-generic/percpu.h +CONFLICT (content): Merge conflict in include/asm-generic/percpu.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8226e29a1429] Merge remote-tracking branch 'asm-generic/master' +$ git diff -M --stat --summary HEAD^.. + include/asm-generic/page.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging arc/for-next (e5517c2a5a49 Linux 4.9-rc7) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (49b05da80546 Merge branch 'drm-armada-devel' into for-next) +$ git merge arm/for-next +Removing arch/arm/mach-sa1100/include/mach/SA-1101.h +Removing arch/arm/kernel/calls.S +Removing arch/arm/include/asm/mach-types.h +Merge made by the 'recursive' strategy. + arch/arm/Makefile | 5 +- + arch/arm/include/asm/Kbuild | 3 + + arch/arm/include/asm/delay.h | 27 + + arch/arm/include/asm/mach-types.h | 1 - + arch/arm/include/asm/unistd.h | 26 +- + arch/arm/include/uapi/asm/Kbuild | 3 + + arch/arm/include/uapi/asm/unistd.h | 424 +----------- + arch/arm/kernel/calls.S | 415 ------------ + arch/arm/kernel/entry-common.S | 76 ++- + arch/arm/kernel/topology.c | 220 ++++++- + arch/arm/lib/delay-loop.S | 15 +- + arch/arm/mach-sa1100/include/mach/SA-1101.h | 925 --------------------------- + arch/arm/mach-sa1100/include/mach/hardware.h | 4 - + arch/arm/mm/Kconfig | 8 +- + arch/arm/mm/pageattr.c | 27 +- + arch/arm/tools/Makefile | 68 +- + arch/arm/tools/mach-types | 516 ++------------- + arch/arm/tools/syscall.tbl | 413 ++++++++++++ + arch/arm/tools/syscallhdr.sh | 30 + + arch/arm/tools/syscallnr.sh | 33 + + arch/arm/tools/syscalltbl.sh | 21 + + arch/arm/vfp/vfp.h | 10 +- + arch/arm/vfp/vfpmodule.c | 8 +- + drivers/clk/clkdev.c | 8 + + 24 files changed, 986 insertions(+), 2300 deletions(-) + delete mode 100644 arch/arm/include/asm/mach-types.h + delete mode 100644 arch/arm/kernel/calls.S + delete mode 100644 arch/arm/mach-sa1100/include/mach/SA-1101.h + create mode 100644 arch/arm/tools/syscall.tbl + create mode 100644 arch/arm/tools/syscallhdr.sh + create mode 100644 arch/arm/tools/syscallnr.sh + create mode 100644 arch/arm/tools/syscalltbl.sh +Merging arm-perf/for-next/perf (f43365ee17f8 selftests: arm64: add test for unaligned/inexact watchpoint handling) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (b15ec88e89d1 arm-soc: document merges) +$ git merge arm-soc/for-next +Resolved 'arch/arm/boot/dts/r8a7779.dtsi' using previous resolution. +Resolved 'arch/arm/boot/dts/r8a7790.dtsi' using previous resolution. +Resolved 'arch/arm/boot/dts/r8a7791.dtsi' using previous resolution. +Resolved 'arch/arm/boot/dts/r8a7792.dtsi' using previous resolution. +Resolved 'arch/arm/boot/dts/r8a7793.dtsi' using previous resolution. +Resolved 'arch/arm/boot/dts/r8a7794.dtsi' using previous resolution. +Resolved 'arch/arm/mach-shmobile/setup-rcar-gen2.c' using previous resolution. +Resolved 'arch/arm64/boot/dts/broadcom/ns2.dtsi' using previous resolution. +Resolved 'arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi' using previous resolution. +Resolved 'arch/arm64/boot/dts/renesas/r8a7795.dtsi' using previous resolution. +Resolved 'arch/arm64/boot/dts/renesas/r8a7796.dtsi' using previous resolution. +Resolved 'drivers/soc/renesas/Makefile' using previous resolution. +Removing include/dt-bindings/clock/stih415-clks.h +Auto-merging drivers/soc/renesas/Makefile +CONFLICT (content): Merge conflict in drivers/soc/renesas/Makefile +Removing drivers/reset/sti/reset-stih416.c +Removing drivers/reset/sti/reset-stih415.c +Auto-merging drivers/pinctrl/bcm/pinctrl-bcm2835.c +Auto-merging drivers/clk/pxa/clk-pxa25x.c +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/boot/dts/rockchip/rk3399.dtsi +Auto-merging arch/arm64/boot/dts/rockchip/rk3368.dtsi +Auto-merging arch/arm64/boot/dts/renesas/r8a7796.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/renesas/r8a7796.dtsi +Auto-merging arch/arm64/boot/dts/renesas/r8a7795.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/renesas/r8a7795.dtsi +Auto-merging arch/arm64/boot/dts/mediatek/mt8173.dtsi +Auto-merging arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi +Auto-merging arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi +Auto-merging arch/arm64/boot/dts/marvell/armada-37xx.dtsi +Auto-merging arch/arm64/boot/dts/marvell/armada-3720-db.dts +Auto-merging arch/arm64/boot/dts/hisilicon/hi6220.dtsi +Auto-merging arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/freescale/fsl-ls2080a.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 +Removing arch/arm/plat-omap/i2c.c +Auto-merging arch/arm/mach-shmobile/setup-rcar-gen2.c +CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-rcar-gen2.c +Removing arch/arm/mach-shmobile/setup-r8a7794.c +Removing arch/arm/mach-shmobile/setup-r8a7793.c +Removing arch/arm/mach-shmobile/setup-r8a7792.c +Auto-merging arch/arm/mach-sa1100/include/mach/hardware.h +Removing arch/arm/mach-orion5x/ls-chl-setup.c +Removing arch/arm/mach-omap2/usb-musb.c +Removing arch/arm/mach-omap2/usb-host.c +Removing arch/arm/mach-omap2/twl-common.h +Removing arch/arm/mach-omap2/twl-common.c +Removing arch/arm/mach-omap2/serial.c +Removing arch/arm/mach-omap2/sdram-qimonda-hyb18m512160af-6.h +Removing arch/arm/mach-omap2/sdram-numonyx-m65kxxxxam.h +Removing arch/arm/mach-omap2/sdram-nokia.h +Removing arch/arm/mach-omap2/sdram-nokia.c +Removing arch/arm/mach-omap2/sdram-micron-mt46h32m32lf-6.h +Removing arch/arm/mach-omap2/sdram-hynix-h8mbx00u0mer-0em.h +Removing arch/arm/mach-omap2/mux34xx.h +Removing arch/arm/mach-omap2/mux34xx.c +Removing arch/arm/mach-omap2/mux.h +Removing arch/arm/mach-omap2/mux.c +Removing arch/arm/mach-omap2/gpmc-smsc911x.h +Removing arch/arm/mach-omap2/gpmc-smsc911x.c +Removing arch/arm/mach-omap2/dss-common.h +Removing arch/arm/mach-omap2/dss-common.c +Removing arch/arm/mach-omap2/common-board-devices.c +Removing arch/arm/mach-omap2/board-flash.h +Removing arch/arm/mach-omap2/board-flash.c +Removing arch/arm/mach-lpc32xx/include/mach/irqs.h +Removing arch/arm/mach-lpc32xx/clock.h +Auto-merging arch/arm/configs/qcom_defconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/vf610-zii-dev-rev-b.dts +Removing arch/arm/boot/dts/uniphier-common32.dtsi +Removing arch/arm/boot/dts/stih41x.dtsi +Removing arch/arm/boot/dts/stih41x-b2020x.dtsi +Removing arch/arm/boot/dts/stih41x-b2020.dtsi +Removing arch/arm/boot/dts/stih41x-b2000.dtsi +Removing arch/arm/boot/dts/stih416.dtsi +Removing arch/arm/boot/dts/stih416-pinctrl.dtsi +Removing arch/arm/boot/dts/stih416-clock.dtsi +Removing arch/arm/boot/dts/stih416-b2020e.dts +Removing arch/arm/boot/dts/stih416-b2020.dts +Removing arch/arm/boot/dts/stih416-b2000.dts +Removing arch/arm/boot/dts/stih415.dtsi +Removing arch/arm/boot/dts/stih415-pinctrl.dtsi +Removing arch/arm/boot/dts/stih415-clock.dtsi +Removing arch/arm/boot/dts/stih415-b2020.dts +Removing arch/arm/boot/dts/stih415-b2000.dts +Auto-merging arch/arm/boot/dts/rk3xxx.dtsi +Auto-merging arch/arm/boot/dts/rk3288.dtsi +Auto-merging arch/arm/boot/dts/rk3036.dtsi +Auto-merging arch/arm/boot/dts/r8a7794.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7794.dtsi +Auto-merging arch/arm/boot/dts/r8a7793.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7793.dtsi +Auto-merging arch/arm/boot/dts/r8a7792.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7792.dtsi +Auto-merging arch/arm/boot/dts/r8a7791.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7791.dtsi +Auto-merging arch/arm/boot/dts/r8a7790.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7790.dtsi +Auto-merging arch/arm/boot/dts/r8a7779.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7779.dtsi +Auto-merging arch/arm/boot/dts/r8a7778.dtsi +Auto-merging arch/arm/boot/dts/hisi-x5hd2.dtsi +Removing arch/arm/boot/dts/exynos4415.dtsi +Removing arch/arm/boot/dts/exynos4415-pinctrl.dtsi +Auto-merging arch/arm/boot/dts/dra72-evm-revc.dts +Auto-merging arch/arm/Makefile +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Auto-merging Documentation/devicetree/bindings/i2c/trivial-devices.txt +Auto-merging Documentation/devicetree/bindings/arm/cpus.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b242c0a19eb9] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/arm/stm32/overview.txt | 3 +- + Documentation/arm/stm32/stm32f746-overview.txt | 34 + + .../devicetree/bindings/arm/amlogic,scpi.txt | 20 + + Documentation/devicetree/bindings/arm/amlogic.txt | 19 + + Documentation/devicetree/bindings/arm/arm,scpi.txt | 25 +- + .../devicetree/bindings/arm/atmel-at91.txt | 16 + + .../bindings/arm/bcm/{ns2.txt => brcm,ns2.txt} | 0 + Documentation/devicetree/bindings/arm/cpus.txt | 1 + + Documentation/devicetree/bindings/arm/fsl.txt | 34 +- + .../bindings/arm/hisilicon/hisilicon.txt | 4 + + .../devicetree/bindings/arm/juno,scpi.txt | 26 + + .../devicetree/bindings/arm/keystone/ti,sci.txt | 81 + + .../devicetree/bindings/arm/omap/omap.txt | 9 + + Documentation/devicetree/bindings/arm/oxnas.txt | 5 + + Documentation/devicetree/bindings/arm/qcom.txt | 3 + + Documentation/devicetree/bindings/arm/rockchip.txt | 16 + + .../bindings/arm/samsung/samsung-boards.txt | 5 + + Documentation/devicetree/bindings/arm/shmobile.txt | 36 +- + Documentation/devicetree/bindings/arm/sunxi.txt | 1 + + Documentation/devicetree/bindings/arm/swir.txt | 12 + + .../devicetree/bindings/ata/ahci-fsl-qoriq.txt | 2 +- + Documentation/devicetree/bindings/ata/ahci-st.txt | 15 - + .../devicetree/bindings/bus/nvidia,tegra20-gmi.txt | 132 ++ + .../devicetree/bindings/bus/ti,da850-mstpri.txt | 20 + + .../devicetree/bindings/clock/imx31-clock.txt | 2 +- + .../devicetree/bindings/clock/qoriq-clock.txt | 3 + + .../bindings/firmware/nvidia,tegra186-bpmp.txt | 108 + + .../devicetree/bindings/firmware/qcom,scm.txt | 2 + + .../devicetree/bindings/gpio/mrvl-gpio.txt | 6 +- + .../devicetree/bindings/i2c/trivial-devices.txt | 2 + + .../bindings/mailbox/brcm,bcm2835-mbox.txt | 2 +- + .../bindings/mailbox/nvidia,tegra186-hsp.txt | 52 + + .../devicetree/bindings/media/renesas,fcp.txt | 8 +- + .../memory-controllers/ti-da8xx-ddrctl.txt | 20 + + .../devicetree/bindings/mmc/rockchip-dw-mshc.txt | 1 + + .../devicetree/bindings/pinctrl/pinctrl-single.txt | 3 + + .../bindings/power/renesas,rcar-sysc.txt | 8 +- + .../devicetree/bindings/reset/oxnas,reset.txt | 44 +- + .../devicetree/bindings/reset/st,sti-powerdown.txt | 12 +- + .../devicetree/bindings/reset/st,sti-softreset.txt | 8 +- + .../bindings/serial/nvidia,tegra20-hsuart.txt | 2 +- + .../devicetree/bindings/soc/mediatek/scpsys.txt | 13 +- + Documentation/devicetree/bindings/sram/sram.txt | 2 +- + .../bindings/thermal/brcm,bcm2835-thermal.txt | 17 + + .../devicetree/bindings/thermal/st-thermal.txt | 28 +- + .../devicetree/bindings/usb/atmel-usb.txt | 10 +- + .../devicetree/bindings/vendor-prefixes.txt | 4 + + MAINTAINERS | 19 +- + arch/arm/Kconfig | 5 + + arch/arm/Makefile | 1 + + arch/arm/arm-soc-for-next-contents.txt | 334 ++++ + arch/arm/boot/dts/Makefile | 50 +- + arch/arm/boot/dts/am335x-baltos-ir2110.dts | 10 +- + arch/arm/boot/dts/am335x-baltos-ir3220.dts | 2 +- + arch/arm/boot/dts/am335x-baltos-ir5221.dts | 4 +- + arch/arm/boot/dts/am335x-baltos.dtsi | 9 +- + arch/arm/boot/dts/am335x-bone-common.dtsi | 22 + + arch/arm/boot/dts/am335x-boneblack.dts | 11 + + arch/arm/boot/dts/am335x-evm.dts | 5 + + arch/arm/boot/dts/am335x-evmsk.dts | 5 + + arch/arm/boot/dts/am335x-icev2.dts | 47 +- + arch/arm/boot/dts/am33xx.dtsi | 6 + + arch/arm/boot/dts/am3517.dtsi | 1 + + arch/arm/boot/dts/am4372.dtsi | 3 + + arch/arm/boot/dts/am437x-idk-evm.dts | 101 + + arch/arm/boot/dts/am571x-idk.dts | 81 + + arch/arm/boot/dts/am572x-idk.dts | 4 + + arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 1 + + arch/arm/boot/dts/am57xx-idk-common.dtsi | 75 + + arch/arm/boot/dts/armada-370-db.dts | 63 +- + arch/arm/boot/dts/armada-370-dlink-dns327l.dts | 30 +- + arch/arm/boot/dts/armada-370-mirabox.dts | 57 +- + arch/arm/boot/dts/armada-370-netgear-rn102.dts | 55 +- + arch/arm/boot/dts/armada-370-netgear-rn104.dts | 63 +- + arch/arm/boot/dts/armada-370-rd.dts | 57 +- + arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts | 27 +- + arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi | 45 +- + .../dts/armada-370-seagate-personal-cloud.dtsi | 44 +- + arch/arm/boot/dts/armada-370-synology-ds213j.dts | 18 +- + arch/arm/boot/dts/armada-370-xp.dtsi | 39 +- + arch/arm/boot/dts/armada-370.dtsi | 136 +- + arch/arm/boot/dts/armada-375-db.dts | 271 +-- + arch/arm/boot/dts/armada-375.dtsi | 72 +- + arch/arm/boot/dts/armada-385-turris-omnia.dts | 340 ++++ + arch/arm/boot/dts/armada-38x.dtsi | 2 +- + arch/arm/boot/dts/armada-39x.dtsi | 2 +- + arch/arm/boot/dts/armada-xp-axpwifiap.dts | 68 +- + arch/arm/boot/dts/armada-xp-db.dts | 104 +- + arch/arm/boot/dts/armada-xp-gp.dts | 80 +- + arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 53 +- + arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 52 +- + arch/arm/boot/dts/armada-xp-matrix.dts | 20 +- + arch/arm/boot/dts/armada-xp-mv78230.dtsi | 12 +- + arch/arm/boot/dts/armada-xp-mv78260.dtsi | 20 +- + arch/arm/boot/dts/armada-xp-mv78460.dtsi | 22 +- + arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 74 +- + arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 58 +- + arch/arm/boot/dts/armada-xp-synology-ds414.dts | 75 +- + arch/arm/boot/dts/armada-xp.dtsi | 94 +- + arch/arm/boot/dts/artpec6-devboard.dts | 4 + + arch/arm/boot/dts/artpec6.dtsi | 29 +- + arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi | 4 +- + arch/arm/boot/dts/at91-sama5d4_ma5d4evk.dts | 4 +- + arch/arm/boot/dts/at91rm9200.dtsi | 4 +- + arch/arm/boot/dts/at91sam9260.dtsi | 4 +- + arch/arm/boot/dts/at91sam9260ek.dts | 4 +- + arch/arm/boot/dts/at91sam9261.dtsi | 4 +- + arch/arm/boot/dts/at91sam9263.dtsi | 4 +- + arch/arm/boot/dts/at91sam9g45.dtsi | 4 +- + arch/arm/boot/dts/at91sam9n12.dtsi | 4 +- + arch/arm/boot/dts/at91sam9rl.dtsi | 4 +- + arch/arm/boot/dts/at91sam9x5.dtsi | 4 +- + arch/arm/boot/dts/bcm-cygnus.dtsi | 21 +- + arch/arm/boot/dts/bcm-nsp.dtsi | 41 +- + arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 67 +- + arch/arm/boot/dts/bcm2835-rpi-a.dts | 69 +- + arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 68 +- + arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 68 +- + arch/arm/boot/dts/bcm2835-rpi-b.dts | 69 +- + arch/arm/boot/dts/bcm2835-rpi-zero.dts | 67 +- + arch/arm/boot/dts/bcm2835-rpi.dtsi | 15 +- + arch/arm/boot/dts/bcm2835.dtsi | 6 + + arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 2 +- + arch/arm/boot/dts/bcm2836.dtsi | 6 + + arch/arm/boot/dts/bcm283x.dtsi | 212 +- + arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 64 + + arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts | 2 +- + arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 2 +- + arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 2 +- + arch/arm/boot/dts/bcm4709-netgear-r8000.dts | 6 +- + arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 114 ++ + arch/arm/boot/dts/bcm4709.dtsi | 11 + + arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 3 +- + arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 111 ++ + arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 103 + + arch/arm/boot/dts/bcm47094.dtsi | 17 + + arch/arm/boot/dts/bcm47189-tenda-ac9.dts | 74 + + arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi | 13 + + arch/arm/boot/dts/bcm5301x.dtsi | 7 + + arch/arm/boot/dts/bcm53573.dtsi | 159 ++ + arch/arm/boot/dts/bcm958625k.dts | 34 + + arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 12 +- + .../boot/dts/cloudengines-pogoplug-series-3.dts | 94 + + arch/arm/boot/dts/da850-lcdk.dts | 19 +- + arch/arm/boot/dts/da850.dtsi | 70 + + arch/arm/boot/dts/dm814x.dtsi | 1 + + arch/arm/boot/dts/dm816x.dtsi | 2 + + arch/arm/boot/dts/dra7.dtsi | 1 + + arch/arm/boot/dts/dra71-evm.dts | 230 +++ + arch/arm/boot/dts/dra72-evm-common.dtsi | 348 +--- + arch/arm/boot/dts/dra72-evm-revc.dts | 21 +- + arch/arm/boot/dts/dra72-evm-tps65917.dtsi | 134 ++ + arch/arm/boot/dts/dra72-evm.dts | 14 +- + arch/arm/boot/dts/emev2.dtsi | 3 +- + arch/arm/boot/dts/exynos3250-artik5-eval.dts | 2 +- + arch/arm/boot/dts/exynos3250-artik5.dtsi | 2 +- + arch/arm/boot/dts/exynos3250-monk.dts | 2 +- + arch/arm/boot/dts/exynos3250-pinctrl.dtsi | 20 +- + arch/arm/boot/dts/exynos3250-rinato.dts | 2 +- + arch/arm/boot/dts/exynos3250.dtsi | 97 +- + arch/arm/boot/dts/exynos4.dtsi | 100 +- + arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 20 +- + arch/arm/boot/dts/exynos4210.dtsi | 36 +- + arch/arm/boot/dts/exynos4412-itop-elite.dts | 240 +++ + arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi | 501 +++++ + arch/arm/boot/dts/exynos4412-odroidx.dts | 5 + + arch/arm/boot/dts/exynos4415-pinctrl.dtsi | 575 ------ + arch/arm/boot/dts/exynos4415.dtsi | 650 ------ + arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 20 +- + arch/arm/boot/dts/exynos4x12.dtsi | 50 +- + arch/arm/boot/dts/exynos5.dtsi | 64 +- + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 4 + + arch/arm/boot/dts/exynos5250.dtsi | 80 +- + arch/arm/boot/dts/exynos5260.dtsi | 43 +- + arch/arm/boot/dts/exynos5410-odroidxu.dts | 69 + + arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 9 + + arch/arm/boot/dts/exynos5410.dtsi | 85 +- + arch/arm/boot/dts/exynos5420-peach-pit.dts | 3 + + arch/arm/boot/dts/exynos5420.dtsi | 78 +- + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 12 +- + arch/arm/boot/dts/exynos5440.dtsi | 72 +- + arch/arm/boot/dts/exynos54xx.dtsi | 34 +- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 3 + + arch/arm/boot/dts/hi3620.dtsi | 6 +- + arch/arm/boot/dts/hip01.dtsi | 2 - + arch/arm/boot/dts/hisi-x5hd2.dtsi | 4 +- + arch/arm/boot/dts/imx1.dtsi | 4 +- + arch/arm/boot/dts/imx23.dtsi | 6 +- + arch/arm/boot/dts/imx25.dtsi | 4 +- + arch/arm/boot/dts/imx27.dtsi | 4 +- + arch/arm/boot/dts/imx28-m28.dtsi | 4 +- + arch/arm/boot/dts/imx28-m28evk.dts | 4 +- + arch/arm/boot/dts/imx28.dtsi | 4 +- + arch/arm/boot/dts/imx31.dtsi | 19 +- + arch/arm/boot/dts/imx35.dtsi | 4 +- + arch/arm/boot/dts/imx50.dtsi | 48 +- + arch/arm/boot/dts/imx51.dtsi | 48 +- + arch/arm/boot/dts/imx53-m53.dtsi | 4 +- + arch/arm/boot/dts/imx53-m53evk.dts | 4 +- + arch/arm/boot/dts/imx53.dtsi | 72 +- + arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 253 +++ + arch/arm/boot/dts/imx6dl-icore.dts | 59 + + arch/arm/boot/dts/imx6dl-riotboard.dts | 2 +- + arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts | 2 +- + arch/arm/boot/dts/imx6dl-tx6u-801x.dts | 2 +- + arch/arm/boot/dts/imx6q-apalis-ixora.dts | 22 - + arch/arm/boot/dts/imx6q-b650v3.dts | 6 + + arch/arm/boot/dts/imx6q-cm-fx6.dts | 1 - + arch/arm/boot/dts/imx6q-evi.dts | 3 - + arch/arm/boot/dts/imx6q-icore.dts | 59 + + arch/arm/boot/dts/imx6q-nitrogen6_som2.dts | 53 + + arch/arm/boot/dts/imx6q-novena.dts | 4 + + arch/arm/boot/dts/imx6q-phytec-pbab01.dts | 2 +- + arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts | 2 +- + arch/arm/boot/dts/imx6q-tx6q-1010.dts | 2 +- + arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts | 2 +- + arch/arm/boot/dts/imx6q-tx6q-1020.dts | 2 +- + arch/arm/boot/dts/imx6q-utilite-pro.dts | 53 +- + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 9 + + arch/arm/boot/dts/imx6qdl-apf6dev.dtsi | 14 +- + arch/arm/boot/dts/imx6qdl-colibri.dtsi | 890 +++++++++ + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-icore.dtsi | 265 +++ + arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 32 +- + arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 18 +- + arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 770 ++++++++ + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 12 +- + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 10 +- + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-tx6.dtsi | 32 +- + arch/arm/boot/dts/imx6qdl-wandboard-revb1.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl.dtsi | 14 +- + arch/arm/boot/dts/imx6qp.dtsi | 17 + + arch/arm/boot/dts/imx6sl.dtsi | 7 +- + arch/arm/boot/dts/imx6sx-sdb.dtsi | 16 +- + arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts | 69 + + arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts | 54 + + arch/arm/boot/dts/imx6sx-udoo-neo-full.dts | 69 + + arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 293 +++ + arch/arm/boot/dts/imx6sx.dtsi | 17 +- + arch/arm/boot/dts/imx6ul-14x14-evk.dts | 10 +- + arch/arm/boot/dts/imx6ul-liteboard.dts | 147 ++ + arch/arm/boot/dts/imx6ul-litesom.dtsi | 82 + + arch/arm/boot/dts/imx6ul.dtsi | 4 +- + arch/arm/boot/dts/imx6ull-14x14-evk.dts | 52 + + arch/arm/boot/dts/imx6ull-pinfunc.h | 56 + + arch/arm/boot/dts/imx6ull.dtsi | 43 + + arch/arm/boot/dts/imx7d-pinfunc.h | 12 +- + arch/arm/boot/dts/imx7s.dtsi | 4 +- + arch/arm/boot/dts/integratorap.dts | 35 + + arch/arm/boot/dts/integratorcp.dts | 26 + + arch/arm/boot/dts/keystone-k2g.dtsi | 1 + + arch/arm/boot/dts/keystone-k2l.dtsi | 1 + + arch/arm/boot/dts/kirkwood-topkick.dts | 2 +- + arch/arm/boot/dts/lpc32xx.dtsi | 4 + + arch/arm/boot/dts/ls1021a.dtsi | 84 +- + arch/arm/boot/dts/mps2-an385.dts | 2 +- + arch/arm/boot/dts/mps2-an399.dts | 2 +- + arch/arm/boot/dts/mps2.dtsi | 4 +- + arch/arm/boot/dts/mt2701.dtsi | 50 +- + arch/arm/boot/dts/omap2420.dtsi | 2 + + arch/arm/boot/dts/omap2430.dtsi | 2 + + arch/arm/boot/dts/omap3.dtsi | 2 + + arch/arm/boot/dts/omap34xx.dtsi | 1 + + arch/arm/boot/dts/omap36xx.dtsi | 1 + + arch/arm/boot/dts/omap4-droid4-xt894.dts | 188 ++ + arch/arm/boot/dts/omap4.dtsi | 2 + + arch/arm/boot/dts/omap5-uevm.dts | 92 + + arch/arm/boot/dts/omap5.dtsi | 2 + + arch/arm/boot/dts/orion5x-lschl.dts | 171 ++ + arch/arm/boot/dts/ox820.dtsi | 296 +++ + arch/arm/boot/dts/pxa25x.dtsi | 117 ++ + arch/arm/boot/dts/pxa27x.dtsi | 40 + + arch/arm/boot/dts/pxa2xx.dtsi | 4 +- + arch/arm/boot/dts/pxa3xx.dtsi | 1 + + arch/arm/boot/dts/qcom-apq8060-dragonboard.dts | 119 ++ + arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts | 77 +- + arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 74 + + arch/arm/boot/dts/qcom-apq8064.dtsi | 321 +++ + arch/arm/boot/dts/qcom-apq8084.dtsi | 16 +- + .../boot/dts/qcom-mdm9615-wp8548-mangoh-green.dts | 281 +++ + arch/arm/boot/dts/qcom-mdm9615-wp8548.dtsi | 170 ++ + arch/arm/boot/dts/qcom-mdm9615.dtsi | 557 ++++++ + arch/arm/boot/dts/qcom-msm8660.dtsi | 17 + + .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 29 + + arch/arm/boot/dts/qcom-msm8974.dtsi | 16 +- + arch/arm/boot/dts/r7s72100-rskrza1.dts | 5 + + arch/arm/boot/dts/r7s72100.dtsi | 55 + + arch/arm/boot/dts/r8a73a4.dtsi | 5 + + arch/arm/boot/dts/r8a7740.dtsi | 4 +- + arch/arm/boot/dts/r8a7743-sk-rzg1m.dts | 57 + + arch/arm/boot/dts/r8a7743.dtsi | 476 +++++ + arch/arm/boot/dts/r8a7745-sk-rzg1e.dts | 52 + + arch/arm/boot/dts/r8a7745.dtsi | 476 +++++ + arch/arm/boot/dts/r8a7778.dtsi | 4 +- + arch/arm/boot/dts/r8a7779-marzen.dts | 2 +- + arch/arm/boot/dts/r8a7779.dtsi | 11 +- + arch/arm/boot/dts/r8a7790-lager.dts | 118 +- + arch/arm/boot/dts/r8a7790.dtsi | 11 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 137 +- + arch/arm/boot/dts/r8a7791.dtsi | 14 +- + arch/arm/boot/dts/r8a7792-wheat.dts | 126 ++ + arch/arm/boot/dts/r8a7792.dtsi | 56 +- + arch/arm/boot/dts/r8a7793-gose.dts | 12 +- + arch/arm/boot/dts/r8a7793.dtsi | 38 +- + arch/arm/boot/dts/r8a7794-alt.dts | 62 +- + arch/arm/boot/dts/r8a7794.dtsi | 81 +- + arch/arm/boot/dts/rk1108-evb.dts | 69 + + arch/arm/boot/dts/rk1108.dtsi | 452 +++++ + arch/arm/boot/dts/rk3036-evb.dts | 2 +- + arch/arm/boot/dts/rk3036-kylin.dts | 2 +- + arch/arm/boot/dts/rk3036.dtsi | 10 +- + arch/arm/boot/dts/rk3066a-bqcurie2.dts | 2 +- + arch/arm/boot/dts/rk3066a-marsboard.dts | 2 +- + arch/arm/boot/dts/rk3066a-mk808.dts | 195 ++ + arch/arm/boot/dts/rk3066a-rayeager.dts | 2 +- + arch/arm/boot/dts/rk3066a.dtsi | 31 +- + arch/arm/boot/dts/rk3188-px3-evb.dts | 328 ++++ + arch/arm/boot/dts/rk3188-radxarock.dts | 2 +- + arch/arm/boot/dts/rk3188.dtsi | 2 +- + arch/arm/boot/dts/rk3228-evb.dts | 2 +- + arch/arm/boot/dts/rk3229-evb.dts | 2 +- + arch/arm/boot/dts/rk322x.dtsi | 6 +- + arch/arm/boot/dts/rk3288-evb.dtsi | 2 +- + arch/arm/boot/dts/rk3288-fennec.dts | 2 +- + arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 2 +- + arch/arm/boot/dts/rk3288-firefly.dtsi | 2 +- + arch/arm/boot/dts/rk3288-miqi.dts | 2 +- + arch/arm/boot/dts/rk3288-popmetal.dts | 34 +- + arch/arm/boot/dts/rk3288-r89.dts | 2 +- + arch/arm/boot/dts/rk3288-rock2-som.dtsi | 2 +- + arch/arm/boot/dts/rk3288-veyron.dtsi | 2 +- + arch/arm/boot/dts/rk3288.dtsi | 14 +- + arch/arm/boot/dts/rk3xxx.dtsi | 4 +- + arch/arm/boot/dts/sama5d2.dtsi | 47 +- + arch/arm/boot/dts/sama5d3.dtsi | 4 +- + arch/arm/boot/dts/sama5d4.dtsi | 31 +- + arch/arm/boot/dts/sh73a0.dtsi | 4 +- + arch/arm/boot/dts/socfpga.dtsi | 33 + + arch/arm/boot/dts/socfpga_arria10.dtsi | 32 + + arch/arm/boot/dts/socfpga_arria10_socdk.dtsi | 49 + + arch/arm/boot/dts/socfpga_arria10_socdk_qspi.dts | 49 + + arch/arm/boot/dts/socfpga_arria5_socdk.dts | 33 + + arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts | 2 +- + arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi | 2 +- + arch/arm/boot/dts/socfpga_cyclone5_mcvevk.dts | 4 +- + arch/arm/boot/dts/socfpga_cyclone5_socdk.dts | 35 +- + arch/arm/boot/dts/socfpga_cyclone5_sockit.dts | 23 +- + arch/arm/boot/dts/socfpga_cyclone5_socrates.dts | 19 + + arch/arm/boot/dts/socfpga_cyclone5_sodia.dts | 123 ++ + arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts | 2 +- + arch/arm/boot/dts/stih407-clock.dtsi | 10 + + arch/arm/boot/dts/stih407-family.dtsi | 32 +- + arch/arm/boot/dts/stih407-pinctrl.dtsi | 2 +- + arch/arm/boot/dts/stih407.dtsi | 2 +- + arch/arm/boot/dts/stih410-b2260.dts | 22 +- + arch/arm/boot/dts/stih410-clock.dtsi | 3 +- + arch/arm/boot/dts/stih410.dtsi | 2 +- + arch/arm/boot/dts/stih415-b2000.dts | 15 - + arch/arm/boot/dts/stih415-b2020.dts | 15 - + arch/arm/boot/dts/stih415-clock.dtsi | 533 ----- + arch/arm/boot/dts/stih415-pinctrl.dtsi | 545 ------ + arch/arm/boot/dts/stih415.dtsi | 234 --- + arch/arm/boot/dts/stih416-b2000.dts | 15 - + arch/arm/boot/dts/stih416-b2020.dts | 37 - + arch/arm/boot/dts/stih416-b2020e.dts | 65 - + arch/arm/boot/dts/stih416-clock.dtsi | 756 ------- + arch/arm/boot/dts/stih416-pinctrl.dtsi | 692 ------- + arch/arm/boot/dts/stih416.dtsi | 517 ----- + arch/arm/boot/dts/stih41x-b2000.dtsi | 96 - + arch/arm/boot/dts/stih41x-b2020.dtsi | 82 - + arch/arm/boot/dts/stih41x-b2020x.dtsi | 32 - + arch/arm/boot/dts/stih41x.dtsi | 47 - + arch/arm/boot/dts/stihxxx-b2120.dtsi | 21 +- + arch/arm/boot/dts/stm32429i-eval.dts | 29 +- + arch/arm/boot/dts/stm32746g-eval.dts | 96 + + arch/arm/boot/dts/stm32f429-disco.dts | 13 + + arch/arm/boot/dts/stm32f429.dtsi | 40 +- + arch/arm/boot/dts/stm32f469-disco.dts | 8 + + arch/arm/boot/dts/stm32f746.dtsi | 304 +++ + arch/arm/boot/dts/sun4i-a10.dtsi | 3 +- + arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 4 +- + arch/arm/boot/dts/sun5i-a10s.dtsi | 4 +- + arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 54 + + arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 38 +- + arch/arm/boot/dts/sun5i-gr8-chip-pro.dts | 266 +++ + arch/arm/boot/dts/sun5i-gr8-evb.dts | 33 + + arch/arm/boot/dts/sun5i-gr8.dtsi | 47 +- + arch/arm/boot/dts/sun5i-r8-chip.dts | 69 + + .../boot/dts/sun5i-reference-design-tablet.dtsi | 25 + + arch/arm/boot/dts/sun5i.dtsi | 27 +- + arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 80 + + arch/arm/boot/dts/sun6i-a31.dtsi | 266 ++- + arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 8 + + arch/arm/boot/dts/sun6i-a31s.dtsi | 8 + + arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 62 +- + arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 4 + + arch/arm/boot/dts/sun7i-a20.dtsi | 3 +- + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 6 +- + .../boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts | 7 - + arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 5 + + arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts | 64 + + arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts | 79 +- + arch/arm/boot/dts/sun8i-h3-nanopi.dtsi | 144 ++ + arch/arm/boot/dts/sun8i-h3.dtsi | 52 +- + .../boot/dts/sun8i-reference-design-tablet.dtsi | 7 + + arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 32 + + arch/arm/boot/dts/sun9i-a80-optimus.dts | 30 + + arch/arm/boot/dts/sun9i-a80.dtsi | 14 +- + arch/arm/boot/dts/tegra124-apalis.dtsi | 2 +- + arch/arm/boot/dts/tegra124-nyan.dtsi | 8 +- + arch/arm/boot/dts/tegra20.dtsi | 13 + + arch/arm/boot/dts/tegra30-apalis.dtsi | 49 + + arch/arm/boot/dts/tegra30-colibri.dtsi | 49 + + arch/arm/boot/dts/tegra30.dtsi | 13 + + arch/arm/boot/dts/tps65217.dtsi | 12 + + arch/arm/boot/dts/uniphier-common32.dtsi | 199 -- + arch/arm/boot/dts/uniphier-ld4.dtsi | 358 ++-- + arch/arm/boot/dts/uniphier-pro4.dtsi | 378 ++-- + arch/arm/boot/dts/uniphier-pro5.dtsi | 432 ++-- + arch/arm/boot/dts/uniphier-pxs2.dtsi | 399 ++-- + arch/arm/boot/dts/uniphier-sld3.dtsi | 21 +- + arch/arm/boot/dts/uniphier-sld8.dtsi | 359 ++-- + arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 5 + + arch/arm/boot/dts/vf-colibri.dtsi | 4 + + arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 14 - + arch/arm/boot/dts/vfxxx.dtsi | 18 + + arch/arm/boot/dts/zynq-7000.dtsi | 10 +- + arch/arm/boot/dts/zynq-microzed.dts | 96 + + arch/arm/boot/dts/zynq-parallella.dts | 2 +- + arch/arm/boot/dts/zynq-zc702.dts | 2 +- + arch/arm/boot/dts/zynq-zc706.dts | 2 +- + arch/arm/boot/dts/zynq-zed.dts | 2 +- + arch/arm/boot/dts/zynq-zybo.dts | 2 +- + arch/arm/configs/am200epdkit_defconfig | 5 +- + arch/arm/configs/assabet_defconfig | 1 - + arch/arm/configs/badge4_defconfig | 2 - + arch/arm/configs/bcm2835_defconfig | 2 + + arch/arm/configs/cerfcube_defconfig | 1 - + arch/arm/configs/collie_defconfig | 5 +- + arch/arm/configs/corgi_defconfig | 7 +- + arch/arm/configs/davinci_all_defconfig | 20 +- + arch/arm/configs/dram_0xc0000000.config | 1 + + arch/arm/configs/exynos_defconfig | 1 + + arch/arm/configs/h3600_defconfig | 5 +- + arch/arm/configs/imx_v6_v7_defconfig | 2 + + arch/arm/configs/integrator_defconfig | 1 + + arch/arm/configs/ixp4xx_defconfig | 9 +- + arch/arm/configs/jornada720_defconfig | 5 +- + arch/arm/configs/lart_defconfig | 2 - + arch/arm/configs/mainstone_defconfig | 1 - + arch/arm/configs/multi_v5_defconfig | 1 - + arch/arm/configs/multi_v7_defconfig | 20 +- + arch/arm/configs/netwinder_defconfig | 7 +- + arch/arm/configs/omap1_defconfig | 4 +- + arch/arm/configs/omap2plus_defconfig | 12 +- + arch/arm/configs/qcom_defconfig | 4 +- + arch/arm/configs/s3c2410_defconfig | 10 +- + arch/arm/configs/shannon_defconfig | 1 - + arch/arm/configs/shmobile_defconfig | 1 + + arch/arm/configs/socfpga_defconfig | 15 + + arch/arm/configs/spitz_defconfig | 8 +- + arch/arm/configs/stm32_defconfig | 3 +- + arch/arm/configs/sunxi_defconfig | 1 + + arch/arm/configs/tegra_defconfig | 27 +- + arch/arm/configs/u8500_defconfig | 7 +- + arch/arm/mach-artpec/Kconfig | 1 + + arch/arm/mach-bcm/bcm_5301x.c | 28 + + arch/arm/mach-davinci/Makefile | 4 +- + arch/arm/mach-davinci/board-da830-evm.c | 95 +- + arch/arm/mach-davinci/board-da850-evm.c | 56 +- + arch/arm/mach-davinci/board-mityomapl138.c | 20 +- + arch/arm/mach-davinci/board-omapl138-hawk.c | 68 +- + arch/arm/mach-davinci/common.c | 1 - + arch/arm/mach-davinci/da830.c | 4 +- + arch/arm/mach-davinci/da850.c | 90 +- + arch/arm/mach-davinci/da8xx-dt.c | 26 +- + arch/arm/mach-davinci/devices-da8xx.c | 57 +- + arch/arm/mach-davinci/devices.c | 3 - + arch/arm/mach-davinci/dm355.c | 8 - + arch/arm/mach-davinci/dm365.c | 8 - + arch/arm/mach-davinci/include/mach/da8xx.h | 7 +- + arch/arm/mach-davinci/pm.c | 102 +- + arch/arm/mach-davinci/usb-da8xx.c | 280 ++- + arch/arm/mach-imx/Kconfig | 1 - + arch/arm/mach-imx/common.h | 1 - + arch/arm/mach-imx/imx31-dt.c | 6 - + arch/arm/mach-imx/mach-imx6ul.c | 1 + + arch/arm/mach-imx/mmdc.c | 495 ++++- + arch/arm/mach-integrator/integrator_ap.c | 54 +- + arch/arm/mach-ixp4xx/dsmg600-setup.c | 1 - + arch/arm/mach-lpc32xx/clock.h | 38 - + arch/arm/mach-lpc32xx/common.h | 1 - + arch/arm/mach-lpc32xx/include/mach/irqs.h | 117 -- + arch/arm/mach-lpc32xx/phy3250.c | 1 - + arch/arm/mach-lpc32xx/pm.c | 1 - + arch/arm/mach-mediatek/Makefile | 6 +- + arch/arm/mach-omap1/Kconfig | 26 + + arch/arm/mach-omap1/i2c.c | 83 + + arch/arm/mach-omap2/Makefile | 18 +- + arch/arm/mach-omap2/board-flash.c | 242 --- + arch/arm/mach-omap2/board-flash.h | 56 - + arch/arm/mach-omap2/board-generic.c | 3 +- + arch/arm/mach-omap2/clockdomains7xx_data.c | 2 +- + arch/arm/mach-omap2/common-board-devices.c | 102 - + arch/arm/mach-omap2/common-board-devices.h | 8 - + arch/arm/mach-omap2/common.h | 48 +- + arch/arm/mach-omap2/cpuidle44xx.c | 80 +- + arch/arm/mach-omap2/devices.c | 1 - + arch/arm/mach-omap2/display.c | 5 - + arch/arm/mach-omap2/dss-common.c | 37 - + arch/arm/mach-omap2/dss-common.h | 13 - + arch/arm/mach-omap2/gpmc-smsc911x.c | 100 - + arch/arm/mach-omap2/gpmc-smsc911x.h | 35 - + arch/arm/mach-omap2/hsmmc.c | 88 - + arch/arm/mach-omap2/i2c.c | 97 - + arch/arm/mach-omap2/io.c | 4 +- + arch/arm/mach-omap2/msdi.c | 1 - + arch/arm/mach-omap2/mux.c | 1153 ----------- + arch/arm/mach-omap2/mux.h | 352 ---- + arch/arm/mach-omap2/mux34xx.c | 2061 -------------------- + arch/arm/mach-omap2/mux34xx.h | 402 ---- + arch/arm/mach-omap2/omap-mpuss-lowpower.c | 37 +- + arch/arm/mach-omap2/omap4-sar-layout.h | 2 + + arch/arm/mach-omap2/omap_hwmod.c | 107 +- + .../omap_hwmod_2xxx_3xxx_interconnect_data.c | 149 +- + .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 201 +- + .../mach-omap2/omap_hwmod_2xxx_interconnect_data.c | 4 - + arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 1 - + .../mach-omap2/omap_hwmod_33xx_43xx_common_data.h | 2 + + .../omap_hwmod_33xx_43xx_interconnect_data.c | 8 + + .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 29 + + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 35 - + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 787 +------- + arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 34 + + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 182 +- + arch/arm/mach-omap2/omap_hwmod_common_data.h | 15 - + arch/arm/mach-omap2/pdata-quirks.c | 1 - + arch/arm/mach-omap2/pm-debug.c | 5 +- + arch/arm/mach-omap2/pm.c | 66 +- + arch/arm/mach-omap2/pm44xx.c | 2 +- + arch/arm/mach-omap2/prcm43xx.h | 2 + + arch/arm/mach-omap2/sdram-hynix-h8mbx00u0mer-0em.h | 51 - + arch/arm/mach-omap2/sdram-micron-mt46h32m32lf-6.h | 55 - + arch/arm/mach-omap2/sdram-nokia.c | 299 --- + arch/arm/mach-omap2/sdram-nokia.h | 12 - + arch/arm/mach-omap2/sdram-numonyx-m65kxxxxam.h | 51 - + .../mach-omap2/sdram-qimonda-hyb18m512160af-6.h | 54 - + arch/arm/mach-omap2/serial.c | 332 ---- + arch/arm/mach-omap2/twl-common.c | 564 ------ + arch/arm/mach-omap2/twl-common.h | 66 - + arch/arm/mach-omap2/usb-host.c | 496 ----- + arch/arm/mach-omap2/usb-musb.c | 106 - + arch/arm/mach-omap2/usb-tusb6010.c | 21 - + arch/arm/mach-orion5x/Kconfig | 7 - + arch/arm/mach-orion5x/Makefile | 1 - + arch/arm/mach-orion5x/ls-chl-setup.c | 331 ---- + arch/arm/mach-oxnas/Kconfig | 30 +- + arch/arm/mach-oxnas/Makefile | 2 + + arch/arm/mach-oxnas/headsmp.S | 26 + + arch/arm/mach-oxnas/hotplug.c | 109 ++ + arch/arm/mach-oxnas/platsmp.c | 102 + + arch/arm/mach-pxa/corgi.c | 1 - + arch/arm/mach-pxa/em-x270.c | 89 +- + arch/arm/mach-pxa/ezx.c | 176 +- + arch/arm/mach-pxa/generic.c | 18 +- + arch/arm/mach-pxa/include/mach/hardware.h | 2 - + arch/arm/mach-pxa/mioa701.c | 13 +- + arch/arm/mach-pxa/pxa25x.c | 2 +- + arch/arm/mach-pxa/pxa_cplds_irqs.c | 11 +- + arch/arm/mach-pxa/spitz.c | 1 - + arch/arm/mach-sa1100/generic.c | 2 +- + arch/arm/mach-sa1100/include/mach/hardware.h | 4 - + arch/arm/mach-shmobile/Kconfig | 21 +- + arch/arm/mach-shmobile/Makefile | 3 - + arch/arm/mach-shmobile/setup-r8a7792.c | 35 - + arch/arm/mach-shmobile/setup-r8a7793.c | 33 - + arch/arm/mach-shmobile/setup-r8a7794.c | 33 - + arch/arm/mach-shmobile/setup-rcar-gen2.c | 34 + + arch/arm/mach-socfpga/l2_cache.c | 2 +- + arch/arm/mach-spear/time.c | 2 +- + arch/arm/mach-sti/Kconfig | 2 - + arch/arm/mach-stm32/board-dt.c | 1 + + arch/arm/mach-vexpress/platsmp.c | 34 +- + arch/arm/mach-zx/zx296702-pm-domain.c | 2 +- + arch/arm/mach-zynq/common.c | 2 +- + arch/arm/plat-omap/Kconfig | 26 - + arch/arm/plat-omap/Makefile | 3 - + arch/arm/plat-omap/i2c.c | 116 -- + arch/arm/plat-orion/gpio.c | 6 +- + arch/arm64/Kconfig.platforms | 2 + + arch/arm64/boot/dts/Makefile | 1 + + arch/arm64/boot/dts/allwinner/Makefile | 5 + + .../boot/dts/allwinner/sun50i-a64-pine64-plus.dts | 50 + + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 74 + + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 261 +++ + arch/arm64/boot/dts/amlogic/Makefile | 8 + + .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 190 ++ + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 360 ++++ + .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 231 +++ + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 119 +- + arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 129 +- + .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 106 +- + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 901 ++++----- + .../boot/dts/amlogic/meson-gxl-nexbox-a95x.dts | 205 ++ + .../boot/dts/amlogic/meson-gxl-s905d-p230.dts | 77 + + .../boot/dts/amlogic/meson-gxl-s905d-p231.dts | 58 + + arch/arm64/boot/dts/amlogic/meson-gxl-s905d.dtsi | 48 + + .../boot/dts/amlogic/meson-gxl-s905x-p212.dts | 69 + + arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi | 54 + + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 301 +++ + .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 169 ++ + .../arm64/boot/dts/amlogic/meson-gxm-s912-q200.dts | 77 + + .../arm64/boot/dts/amlogic/meson-gxm-s912-q201.dts | 58 + + arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 114 ++ + arch/arm64/boot/dts/arm/juno-base.dtsi | 80 + + arch/arm64/boot/dts/arm/juno-r1.dts | 6 + + arch/arm64/boot/dts/arm/juno-r2.dts | 6 + + arch/arm64/boot/dts/arm/juno.dts | 6 + + arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts | 8 +- + arch/arm64/boot/dts/broadcom/bcm2837.dtsi | 8 +- + .../boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi | 1 + + arch/arm64/boot/dts/broadcom/ns2-svk.dts | 38 + + arch/arm64/boot/dts/broadcom/ns2.dtsi | 62 +- + arch/arm64/boot/dts/exynos/Makefile | 5 +- + arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi | 804 ++++++++ + arch/arm64/boot/dts/exynos/exynos5433-tm2.dts | 1049 ++++++++++ + arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts | 41 + + .../dts/exynos/exynos5433-tmu-g3d-sensor-conf.dtsi | 23 + + .../dts/exynos/exynos5433-tmu-sensor-conf.dtsi | 22 + + arch/arm64/boot/dts/exynos/exynos5433-tmu.dtsi | 296 +++ + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 1462 ++++++++++++++ + arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi | 20 +- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 87 +- + arch/arm64/boot/dts/freescale/Makefile | 2 + + arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 78 + + arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts | 212 ++ + arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 150 ++ + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 515 +++++ + arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls2080a-simu.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 116 +- + arch/arm64/boot/dts/hisilicon/Makefile | 1 + + arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 3 + + arch/arm64/boot/dts/hisilicon/hip06-d03.dts | 8 - + arch/arm64/boot/dts/hisilicon/hip06.dtsi | 23 +- + arch/arm64/boot/dts/hisilicon/hip07-d05.dts | 66 + + arch/arm64/boot/dts/hisilicon/hip07.dtsi | 1059 ++++++++++ + arch/arm64/boot/dts/marvell/Makefile | 1 + + arch/arm64/boot/dts/marvell/armada-3720-db.dts | 2 +- + .../boot/dts/marvell/armada-3720-espressobin.dts | 82 + + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 2 +- + arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 2 +- + .../boot/dts/marvell/armada-cp110-master.dtsi | 2 +- + .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 2 +- + arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts | 2 +- + arch/arm64/boot/dts/marvell/berlin4ct-stb.dts | 2 +- + arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 3 + + arch/arm64/boot/dts/nvidia/Makefile | 1 + + arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 8 + + arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 64 + + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 398 ++++ + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 18 + + arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 3 +- + arch/arm64/boot/dts/qcom/Makefile | 7 +- + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 73 +- + .../boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi | 15 + + arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 2 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 73 +- + .../boot/dts/qcom/msm8992-bullhead-rev-101.dts | 41 + + arch/arm64/boot/dts/qcom/msm8992-pins.dtsi | 38 + + arch/arm64/boot/dts/qcom/msm8992.dtsi | 184 ++ + .../arm64/boot/dts/qcom/msm8994-angler-rev-101.dts | 40 + + arch/arm64/boot/dts/qcom/msm8994-pins.dtsi | 38 + + arch/arm64/boot/dts/qcom/msm8994.dtsi | 216 ++ + arch/arm64/boot/dts/qcom/msm8996.dtsi | 91 +- + arch/arm64/boot/dts/qcom/pm8916.dtsi | 45 +- + arch/arm64/boot/dts/qcom/pm8994.dtsi | 1 + + arch/arm64/boot/dts/renesas/Makefile | 2 +- + arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts | 53 +- + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 85 +- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 29 +- + arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts | 189 ++ + arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 160 ++ + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 255 +++ + arch/arm64/boot/dts/rockchip/Makefile | 1 + + .../boot/dts/rockchip/rk3368-orion-r68-meta.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts | 314 +++ + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 18 +- + arch/arm64/boot/dts/rockchip/rk3399-evb.dts | 40 + + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 55 +- + arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 59 +- + arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 111 +- + arch/arm64/boot/dts/zte/zx296718.dtsi | 33 +- + arch/arm64/configs/defconfig | 55 +- + drivers/bus/Kconfig | 16 + + drivers/bus/Makefile | 3 + + drivers/bus/arm-cci.c | 10 + + drivers/bus/da8xx-mstpri.c | 267 +++ + drivers/bus/tegra-gmi.c | 284 +++ + drivers/bus/vexpress-config.c | 7 +- + drivers/clk/imx/clk-imx31.c | 52 +- + drivers/clk/pxa/clk-pxa25x.c | 2 +- + drivers/clocksource/pxa_timer.c | 11 +- + drivers/firmware/Kconfig | 27 + + drivers/firmware/Makefile | 3 + + drivers/firmware/arm_scpi.c | 276 ++- + drivers/firmware/psci.c | 2 +- + drivers/firmware/psci_checker.c | 490 +++++ + drivers/firmware/qcom_scm.c | 53 +- + drivers/firmware/tegra/Kconfig | 25 + + drivers/firmware/tegra/Makefile | 2 + + drivers/firmware/tegra/bpmp.c | 868 +++++++++ + drivers/firmware/tegra/ivc.c | 695 +++++++ + drivers/firmware/ti_sci.c | 1991 +++++++++++++++++++ + drivers/firmware/ti_sci.h | 492 +++++ + drivers/mailbox/Kconfig | 9 + + drivers/mailbox/Makefile | 2 + + drivers/mailbox/tegra-hsp.c | 479 +++++ + drivers/memory/Kconfig | 8 + + drivers/memory/Makefile | 1 + + drivers/memory/atmel-ebi.c | 2 +- + drivers/memory/atmel-sdramc.c | 6 +- + drivers/memory/da8xx-ddrctl.c | 173 ++ + drivers/misc/sram.c | 42 +- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 6 - + drivers/reset/Kconfig | 1 + + drivers/reset/Makefile | 1 + + drivers/reset/core.c | 43 +- + drivers/reset/reset-berlin.c | 12 +- + drivers/reset/reset-lpc18xx.c | 32 +- + drivers/reset/reset-oxnas.c | 1 + + drivers/reset/reset-socfpga.c | 10 +- + drivers/reset/reset-sunxi.c | 9 +- + drivers/reset/reset-zynq.c | 10 +- + drivers/reset/sti/Kconfig | 8 - + drivers/reset/sti/Makefile | 2 - + drivers/reset/sti/reset-stih415.c | 112 -- + drivers/reset/sti/reset-stih416.c | 143 -- + drivers/reset/tegra/Kconfig | 2 + + drivers/reset/tegra/Makefile | 1 + + drivers/reset/tegra/reset-bpmp.c | 71 + + drivers/soc/mediatek/Kconfig | 2 +- + drivers/soc/mediatek/mtk-scpsys.c | 465 +++-- + drivers/soc/renesas/Makefile | 4 + + drivers/soc/renesas/r8a7743-sysc.c | 32 + + drivers/soc/renesas/r8a7745-sysc.c | 32 + + drivers/soc/renesas/rcar-sysc.c | 6 + + drivers/soc/renesas/rcar-sysc.h | 2 + + drivers/soc/renesas/renesas-soc.c | 257 +++ + drivers/soc/rockchip/pm_domains.c | 81 +- + drivers/soc/tegra/Kconfig | 14 + + drivers/soc/tegra/pmc.c | 398 +++- + drivers/soc/ti/knav_qmss_queue.c | 2 +- + drivers/watchdog/sa1100_wdt.c | 24 +- + include/clocksource/pxa.h | 3 +- + include/dt-bindings/clock/r7s72100-clock.h | 7 + + include/dt-bindings/clock/r8a7794-clock.h | 3 +- + include/dt-bindings/clock/stih415-clks.h | 16 - + include/dt-bindings/clock/tegra186-clock.h | 940 +++++++++ + include/dt-bindings/mailbox/tegra186-hsp.h | 24 + + include/dt-bindings/mfd/tps65217.h | 26 + + include/dt-bindings/pinctrl/bcm2835.h | 5 + + include/dt-bindings/pinctrl/qcom,pmic-gpio.h | 4 + + include/dt-bindings/pinctrl/qcom,pmic-mpp.h | 6 + + include/dt-bindings/pinctrl/rockchip.h | 33 + + include/dt-bindings/power/mt2701-power.h | 27 + + include/dt-bindings/power/r8a7743-sysc.h | 25 + + include/dt-bindings/power/r8a7745-sysc.h | 25 + + include/dt-bindings/power/tegra186-powergate.h | 39 + + include/dt-bindings/reset/oxsemi,ox810se.h | 53 + + include/dt-bindings/reset/oxsemi,ox820.h | 53 + + include/dt-bindings/reset/tegra186-reset.h | 217 +++ + include/linux/mfd/tps65217.h | 11 +- + include/linux/platform_data/usb-davinci.h | 23 - + include/linux/soc/qcom/wcnss_ctrl.h | 13 + + include/linux/soc/ti/ti_sci_protocol.h | 249 +++ + include/soc/at91/atmel-secumod.h | 19 + + include/soc/tegra/bpmp-abi.h | 1601 +++++++++++++++ + include/soc/tegra/bpmp.h | 141 ++ + include/soc/tegra/ivc.h | 109 ++ + include/soc/tegra/pmc.h | 126 +- + 792 files changed, 44669 insertions(+), 19229 deletions(-) + create mode 100644 Documentation/arm/stm32/stm32f746-overview.txt + create mode 100644 Documentation/devicetree/bindings/arm/amlogic,scpi.txt + rename Documentation/devicetree/bindings/arm/bcm/{ns2.txt => brcm,ns2.txt} (100%) + create mode 100644 Documentation/devicetree/bindings/arm/juno,scpi.txt + create mode 100644 Documentation/devicetree/bindings/arm/keystone/ti,sci.txt + create mode 100644 Documentation/devicetree/bindings/arm/swir.txt + create mode 100644 Documentation/devicetree/bindings/bus/nvidia,tegra20-gmi.txt + create mode 100644 Documentation/devicetree/bindings/bus/ti,da850-mstpri.txt + create mode 100644 Documentation/devicetree/bindings/firmware/nvidia,tegra186-bpmp.txt + create mode 100644 Documentation/devicetree/bindings/mailbox/nvidia,tegra186-hsp.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/ti-da8xx-ddrctl.txt + create mode 100644 Documentation/devicetree/bindings/thermal/brcm,bcm2835-thermal.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/am571x-idk.dts + create mode 100644 arch/arm/boot/dts/armada-385-turris-omnia.dts + create mode 100644 arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts + create mode 100644 arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts + create mode 100644 arch/arm/boot/dts/bcm4709.dtsi + create mode 100644 arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts + create mode 100644 arch/arm/boot/dts/bcm47094-netgear-r8500.dts + create mode 100644 arch/arm/boot/dts/bcm47094.dtsi + create mode 100644 arch/arm/boot/dts/bcm47189-tenda-ac9.dts + create mode 100644 arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi + create mode 100644 arch/arm/boot/dts/bcm53573.dtsi + create mode 100644 arch/arm/boot/dts/cloudengines-pogoplug-series-3.dts + create mode 100644 arch/arm/boot/dts/dra71-evm.dts + create mode 100644 arch/arm/boot/dts/dra72-evm-tps65917.dtsi + create mode 100644 arch/arm/boot/dts/exynos4412-itop-elite.dts + create mode 100644 arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi + delete mode 100644 arch/arm/boot/dts/exynos4415-pinctrl.dtsi + delete mode 100644 arch/arm/boot/dts/exynos4415.dtsi + create mode 100644 arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts + create mode 100644 arch/arm/boot/dts/imx6dl-icore.dts + create mode 100644 arch/arm/boot/dts/imx6q-icore.dts + create mode 100644 arch/arm/boot/dts/imx6q-nitrogen6_som2.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-colibri.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-icore.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi + create mode 100644 arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts + create mode 100644 arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts + create mode 100644 arch/arm/boot/dts/imx6sx-udoo-neo-full.dts + create mode 100644 arch/arm/boot/dts/imx6sx-udoo-neo.dtsi + create mode 100644 arch/arm/boot/dts/imx6ul-liteboard.dts + create mode 100644 arch/arm/boot/dts/imx6ul-litesom.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-14x14-evk.dts + create mode 100644 arch/arm/boot/dts/imx6ull-pinfunc.h + create mode 100644 arch/arm/boot/dts/imx6ull.dtsi + create mode 100644 arch/arm/boot/dts/omap4-droid4-xt894.dts + create mode 100644 arch/arm/boot/dts/orion5x-lschl.dts + create mode 100644 arch/arm/boot/dts/ox820.dtsi + create mode 100644 arch/arm/boot/dts/pxa25x.dtsi + create mode 100644 arch/arm/boot/dts/qcom-mdm9615-wp8548-mangoh-green.dts + create mode 100644 arch/arm/boot/dts/qcom-mdm9615-wp8548.dtsi + create mode 100644 arch/arm/boot/dts/qcom-mdm9615.dtsi + create mode 100644 arch/arm/boot/dts/r8a7743-sk-rzg1m.dts + create mode 100644 arch/arm/boot/dts/r8a7743.dtsi + create mode 100644 arch/arm/boot/dts/r8a7745-sk-rzg1e.dts + create mode 100644 arch/arm/boot/dts/r8a7745.dtsi + create mode 100644 arch/arm/boot/dts/rk1108-evb.dts + create mode 100644 arch/arm/boot/dts/rk1108.dtsi + create mode 100644 arch/arm/boot/dts/rk3066a-mk808.dts + create mode 100644 arch/arm/boot/dts/rk3188-px3-evb.dts + create mode 100644 arch/arm/boot/dts/socfpga_arria10_socdk_qspi.dts + create mode 100644 arch/arm/boot/dts/socfpga_cyclone5_sodia.dts + delete mode 100644 arch/arm/boot/dts/stih415-b2000.dts + delete mode 100644 arch/arm/boot/dts/stih415-b2020.dts + delete mode 100644 arch/arm/boot/dts/stih415-clock.dtsi + delete mode 100644 arch/arm/boot/dts/stih415-pinctrl.dtsi + delete mode 100644 arch/arm/boot/dts/stih415.dtsi + delete mode 100644 arch/arm/boot/dts/stih416-b2000.dts + delete mode 100644 arch/arm/boot/dts/stih416-b2020.dts + delete mode 100644 arch/arm/boot/dts/stih416-b2020e.dts + delete mode 100644 arch/arm/boot/dts/stih416-clock.dtsi + delete mode 100644 arch/arm/boot/dts/stih416-pinctrl.dtsi + delete mode 100644 arch/arm/boot/dts/stih416.dtsi + delete mode 100644 arch/arm/boot/dts/stih41x-b2000.dtsi + delete mode 100644 arch/arm/boot/dts/stih41x-b2020.dtsi + delete mode 100644 arch/arm/boot/dts/stih41x-b2020x.dtsi + delete mode 100644 arch/arm/boot/dts/stih41x.dtsi + create mode 100644 arch/arm/boot/dts/stm32746g-eval.dts + create mode 100644 arch/arm/boot/dts/stm32f746.dtsi + create mode 100644 arch/arm/boot/dts/sun5i-gr8-chip-pro.dts + create mode 100644 arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts + create mode 100644 arch/arm/boot/dts/sun8i-h3-nanopi.dtsi + delete mode 100644 arch/arm/boot/dts/uniphier-common32.dtsi + create mode 100644 arch/arm/boot/dts/zynq-microzed.dts + create mode 100644 arch/arm/configs/dram_0xc0000000.config + delete mode 100644 arch/arm/mach-lpc32xx/clock.h + delete mode 100644 arch/arm/mach-lpc32xx/include/mach/irqs.h + delete mode 100644 arch/arm/mach-omap2/board-flash.c + delete mode 100644 arch/arm/mach-omap2/board-flash.h + delete mode 100644 arch/arm/mach-omap2/common-board-devices.c + delete mode 100644 arch/arm/mach-omap2/dss-common.c + delete mode 100644 arch/arm/mach-omap2/dss-common.h + delete mode 100644 arch/arm/mach-omap2/gpmc-smsc911x.c + delete mode 100644 arch/arm/mach-omap2/gpmc-smsc911x.h + delete mode 100644 arch/arm/mach-omap2/mux.c + delete mode 100644 arch/arm/mach-omap2/mux.h + delete mode 100644 arch/arm/mach-omap2/mux34xx.c + delete mode 100644 arch/arm/mach-omap2/mux34xx.h + delete mode 100644 arch/arm/mach-omap2/sdram-hynix-h8mbx00u0mer-0em.h + delete mode 100644 arch/arm/mach-omap2/sdram-micron-mt46h32m32lf-6.h + delete mode 100644 arch/arm/mach-omap2/sdram-nokia.c + delete mode 100644 arch/arm/mach-omap2/sdram-nokia.h + delete mode 100644 arch/arm/mach-omap2/sdram-numonyx-m65kxxxxam.h + delete mode 100644 arch/arm/mach-omap2/sdram-qimonda-hyb18m512160af-6.h + delete mode 100644 arch/arm/mach-omap2/serial.c + delete mode 100644 arch/arm/mach-omap2/twl-common.c + delete mode 100644 arch/arm/mach-omap2/twl-common.h + delete mode 100644 arch/arm/mach-omap2/usb-host.c + delete mode 100644 arch/arm/mach-omap2/usb-musb.c + delete mode 100644 arch/arm/mach-orion5x/ls-chl-setup.c + create mode 100644 arch/arm/mach-oxnas/Makefile + create mode 100644 arch/arm/mach-oxnas/headsmp.S + create mode 100644 arch/arm/mach-oxnas/hotplug.c + create mode 100644 arch/arm/mach-oxnas/platsmp.c + delete mode 100644 arch/arm/mach-shmobile/setup-r8a7792.c + delete mode 100644 arch/arm/mach-shmobile/setup-r8a7793.c + delete mode 100644 arch/arm/mach-shmobile/setup-r8a7794.c + delete mode 100644 arch/arm/plat-omap/i2c.c + create mode 100644 arch/arm64/boot/dts/allwinner/Makefile + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gx.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-nexbox-a95x.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905d.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-s912-q200.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-s912-q201.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm.dtsi + create mode 120000 arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tm2.dts + create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts + create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tmu-g3d-sensor-conf.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tmu-sensor-conf.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tmu.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos5433.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi + create mode 100644 arch/arm64/boot/dts/hisilicon/hip07-d05.dts + create mode 100644 arch/arm64/boot/dts/hisilicon/hip07.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra186.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8992-pins.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8992.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8994-pins.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8994.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts + create mode 100644 drivers/bus/da8xx-mstpri.c + create mode 100644 drivers/bus/tegra-gmi.c + create mode 100644 drivers/firmware/psci_checker.c + create mode 100644 drivers/firmware/tegra/Kconfig + create mode 100644 drivers/firmware/tegra/Makefile + create mode 100644 drivers/firmware/tegra/bpmp.c + create mode 100644 drivers/firmware/tegra/ivc.c + create mode 100644 drivers/firmware/ti_sci.c + create mode 100644 drivers/firmware/ti_sci.h + create mode 100644 drivers/mailbox/tegra-hsp.c + create mode 100644 drivers/memory/da8xx-ddrctl.c + delete mode 100644 drivers/reset/sti/reset-stih415.c + delete mode 100644 drivers/reset/sti/reset-stih416.c + create mode 100644 drivers/reset/tegra/Kconfig + create mode 100644 drivers/reset/tegra/Makefile + create mode 100644 drivers/reset/tegra/reset-bpmp.c + create mode 100644 drivers/soc/renesas/r8a7743-sysc.c + create mode 100644 drivers/soc/renesas/r8a7745-sysc.c + create mode 100644 drivers/soc/renesas/renesas-soc.c + delete mode 100644 include/dt-bindings/clock/stih415-clks.h + create mode 100644 include/dt-bindings/clock/tegra186-clock.h + create mode 100644 include/dt-bindings/mailbox/tegra186-hsp.h + create mode 100644 include/dt-bindings/mfd/tps65217.h + create mode 100644 include/dt-bindings/power/mt2701-power.h + create mode 100644 include/dt-bindings/power/r8a7743-sysc.h + create mode 100644 include/dt-bindings/power/r8a7745-sysc.h + create mode 100644 include/dt-bindings/power/tegra186-powergate.h + create mode 100644 include/dt-bindings/reset/oxsemi,ox810se.h + create mode 100644 include/dt-bindings/reset/oxsemi,ox820.h + create mode 100644 include/dt-bindings/reset/tegra186-reset.h + create mode 100644 include/linux/soc/ti/ti_sci_protocol.h + create mode 100644 include/soc/at91/atmel-secumod.h + create mode 100644 include/soc/tegra/bpmp-abi.h + create mode 100644 include/soc/tegra/bpmp.h + create mode 100644 include/soc/tegra/ivc.h +Merging amlogic/for-next (b21a5fc2bb8a Merge branch 'v4.10/defconfig' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +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 (ec09fdf764ee Merge branch anholt/bcm2835-defconfig-64-next into for-next) +$ git merge bcm2835/for-next +Auto-merging drivers/thermal/Makefile +Auto-merging drivers/thermal/Kconfig +Merge made by the 'recursive' strategy. + drivers/thermal/Kconfig | 8 + + drivers/thermal/Makefile | 1 + + drivers/thermal/bcm2835_thermal.c | 340 ++++++++++++++++++++++++++++++++++++++ + 3 files changed, 349 insertions(+) + create mode 100644 drivers/thermal/bcm2835_thermal.c +Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next) +$ git merge berlin/berlin/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings) +$ git merge cortex-m/for-next +Already up-to-date. +Merging imx-mxs/for-next (242a001e48b7 Merge branch 'zte/dt64' into for-next) +$ git merge imx-mxs/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging keystone/next (fb2a68db621a Merge branch 'for_4.9/keystone_dts' into next) +$ git merge keystone/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (5cfcfe81e33b Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Merge made by the 'recursive' strategy. + drivers/bus/mvebu-mbus.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging omap/for-next (4aecea63ed81 Merge branch 'omap-for-v4.10/dt' into for-next) +$ git merge omap/for-next +Removing arch/arm/mach-omap2/gpio.c +Merge made by the 'recursive' strategy. + arch/arm/mach-omap2/Makefile | 2 +- + arch/arm/mach-omap2/gpio.c | 160 --------------------------- + arch/arm/mach-omap2/omap_hwmod_common_data.h | 4 - + 3 files changed, 1 insertion(+), 165 deletions(-) + delete mode 100644 arch/arm/mach-omap2/gpio.c +Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence) +$ git merge omap-pending/for-next +Already up-to-date. +Merging qcom/for-next (bbf9c90768f9 Merge tag 'qcom-dts-for-4.10-2' into all-for-4.10-part2) +$ git merge qcom/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging renesas/next (411253aa4a68 Merge branch 'fixes-for-v4.10' into next) +$ git merge renesas/next +Resolved 'drivers/soc/renesas/Makefile' using previous resolution. +Auto-merging drivers/soc/renesas/Makefile +CONFLICT (content): Merge conflict in drivers/soc/renesas/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c0cc38d6c8ff] Merge remote-tracking branch 'renesas/next' +$ git diff -M --stat --summary HEAD^.. + arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging rockchip/for-next (7e02e53c6ecf Merge branch 'v4.10-clk/next' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + arch/arm/Kconfig.debug | 30 ++++++++++++++++++++++++++++++ + arch/arm/mach-rockchip/rockchip.c | 1 + + 2 files changed, 31 insertions(+) +Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) +$ git merge rpi/for-rpi-next +Already up-to-date. +Merging samsung/for-next (1001354ca341 Linux 4.9-rc1) +$ git merge samsung/for-next +Already up-to-date. +Merging samsung-krzk/for-next (4ed7dc2785f8 Merge branch 'next/dt64' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 3 +- + arch/arm/mach-exynos/platsmp.c | 31 ----------------- + arch/arm/mach-s3c24xx/common.c | 76 ++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 77 insertions(+), 33 deletions(-) +Merging tegra/for-next (e8d16d40e269 Merge branch for-4.10/i2c into for-next) +$ git merge tegra/for-next +Auto-merging drivers/i2c/busses/Kconfig +Merge made by the 'recursive' strategy. + .../bindings/i2c/nvidia,tegra186-bpmp-i2c.txt | 42 ++ + drivers/clk/tegra/Kconfig | 4 + + drivers/clk/tegra/Makefile | 1 + + drivers/clk/tegra/clk-bpmp.c | 620 +++++++++++++++++++++ + drivers/clk/tegra/clk-tegra20.c | 1 + + drivers/clk/tegra/clk-tegra30.c | 1 + + drivers/i2c/busses/Kconfig | 11 + + drivers/i2c/busses/Makefile | 1 + + drivers/i2c/busses/i2c-tegra-bpmp.c | 365 ++++++++++++ + 9 files changed, 1046 insertions(+) + create mode 100644 Documentation/devicetree/bindings/i2c/nvidia,tegra186-bpmp-i2c.txt + create mode 100644 drivers/clk/tegra/clk-bpmp.c + create mode 100644 drivers/i2c/busses/i2c-tegra-bpmp.c +Merging arm64/for-next/core (75037120e62b arm64: Disable PAN on uaccess_enable()) +$ git merge arm64/for-next/core +Already up-to-date. +Merging clk/clk-next (2aab7a2055a1 clk: bcm: Fix 'maybe-uninitialized' warning in bcm2835_clock_choose_div_and_prate()) +$ git merge clk/clk-next +Already up-to-date. +Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe) +$ git merge blackfin/for-linus +Resolved 'arch/blackfin/mach-common/pm.c' using previous resolution. +Auto-merging arch/blackfin/mach-common/pm.c +CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c178b6ed7bb4] Merge remote-tracking branch 'blackfin/for-linus' +$ git diff -M --stat --summary HEAD^.. +Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE)) +$ git merge cris/for-next +Already up-to-date. +Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h) +$ git merge h8300/h8300-next +Merge made by the 'recursive' strategy. +Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error") +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list()) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (07c65a665b8d m68knommu: AMCORE board, add iMX i2c support) +$ git merge m68knommu/for-next +Already up-to-date. +Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1) +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (57b47febc193 Merge branch '4.9-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Merge made by the 'recursive' strategy. + arch/mips/Makefile | 4 ++ + arch/mips/boot/compressed/Makefile | 4 ++ + .../cavium-octeon/executive/cvmx-helper-rgmii.c | 3 +- + .../cavium-octeon/executive/cvmx-helper-sgmii.c | 3 +- + .../mips/cavium-octeon/executive/cvmx-helper-spi.c | 3 +- + .../cavium-octeon/executive/cvmx-helper-xaui.c | 3 +- + arch/mips/cavium-octeon/executive/cvmx-helper.c | 47 +--------------------- + arch/mips/include/asm/octeon/cvmx-helper-rgmii.h | 3 +- + arch/mips/include/asm/octeon/cvmx-helper-sgmii.h | 3 +- + arch/mips/include/asm/octeon/cvmx-helper-spi.h | 3 +- + arch/mips/include/asm/octeon/cvmx-helper-xaui.h | 3 +- + arch/mips/include/asm/octeon/cvmx-helper.h | 14 +------ + arch/mips/pci/pci-tx4927.c | 22 +++++----- + arch/mips/pci/pci-tx4938.c | 30 +++++++------- + arch/mips/pci/pci-tx4939.c | 10 ++--- + arch/mips/txx9/generic/7segled.c | 4 +- + arch/mips/txx9/generic/pci.c | 28 ++++++------- + arch/mips/txx9/generic/setup_tx3927.c | 6 +-- + arch/mips/txx9/generic/setup_tx4927.c | 20 +++++---- + arch/mips/txx9/generic/setup_tx4938.c | 28 ++++++------- + arch/mips/txx9/generic/setup_tx4939.c | 8 ++-- + arch/mips/txx9/generic/smsc_fdc37m81x.c | 17 ++++---- + arch/mips/txx9/jmr3927/prom.c | 2 +- + arch/mips/txx9/jmr3927/setup.c | 11 +++-- + arch/mips/txx9/rbtx4938/setup.c | 14 +++---- + 25 files changed, 113 insertions(+), 180 deletions(-) +Merging nios2/for-next (744606c76c4a nios2: add screen_info) +$ git merge nios2/for-next +Merge made by the 'recursive' strategy. + arch/nios2/include/asm/page.h | 15 +++++++++++---- + arch/nios2/kernel/setup.c | 5 +++++ + 2 files changed, 16 insertions(+), 4 deletions(-) +Merging openrisc/for-next (7c7808ce107d openrisc: prevent VGA console, fix builds) +$ git merge openrisc/for-next +Already up-to-date. +Merging parisc-hd/for-next (82cbd568bc5a parisc: perf: return -EFAULT on error) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/Kconfig | 1 + + arch/parisc/include/asm/elf.h | 7 ++++--- + arch/parisc/include/asm/pdcpat.h | 2 +- + arch/parisc/kernel/entry.S | 12 +++--------- + arch/parisc/kernel/firmware.c | 2 +- + arch/parisc/kernel/inventory.c | 8 ++++---- + arch/parisc/kernel/perf.c | 5 ++--- + arch/parisc/kernel/process.c | 6 +----- + arch/parisc/kernel/processor.c | 24 +++++++++++++----------- + arch/parisc/kernel/sys_parisc.c | 18 ++++++++---------- + 10 files changed, 38 insertions(+), 47 deletions(-) +Merging powerpc/next (ff45000fcb56 powerpc/boot: Request no dynamic linker for boot wrapper) +$ git merge powerpc/next +Resolved 'arch/powerpc/include/asm/asm-prototypes.h' using previous resolution. +Removing tools/testing/selftests/powerpc/reg.h +Removing tools/testing/selftests/powerpc/pmu/ebb/ebb_lmr_regs.c +Removing tools/testing/selftests/powerpc/pmu/ebb/ebb_lmr.h +Removing tools/testing/selftests/powerpc/pmu/ebb/ebb_lmr.c +Auto-merging tools/testing/selftests/powerpc/include/basic_asm.h +Auto-merging arch/powerpc/platforms/pseries/vio.c +Auto-merging arch/powerpc/platforms/pseries/ibmebus.c +Auto-merging arch/powerpc/platforms/44x/Kconfig +Auto-merging arch/powerpc/platforms/40x/Kconfig +Auto-merging arch/powerpc/mm/tlb-radix.c +Auto-merging arch/powerpc/mm/pgtable-radix.c +Auto-merging arch/powerpc/kernel/setup_64.c +Auto-merging arch/powerpc/kernel/process.c +Auto-merging arch/powerpc/kernel/exceptions-64s.S +Auto-merging arch/powerpc/kernel/eeh_driver.c +Auto-merging arch/powerpc/kernel/cpu_setup_power.S +Auto-merging arch/powerpc/kernel/asm-offsets.c +Auto-merging arch/powerpc/include/asm/processor.h +Auto-merging arch/powerpc/include/asm/book3s/64/pgtable.h +Auto-merging arch/powerpc/include/asm/book3s/64/hugetlb.h +Auto-merging arch/powerpc/include/asm/asm-prototypes.h +CONFLICT (content): Merge conflict in arch/powerpc/include/asm/asm-prototypes.h +Auto-merging arch/powerpc/boot/Makefile +Auto-merging arch/powerpc/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c2df860579c2] Merge remote-tracking branch 'powerpc/next' +$ git diff -M --stat --summary HEAD^.. + arch/powerpc/Kconfig | 41 +- + arch/powerpc/Kconfig.debug | 16 + + arch/powerpc/Makefile | 14 +- + arch/powerpc/boot/Makefile | 30 +- + arch/powerpc/boot/ps3-head.S | 5 - + arch/powerpc/boot/ps3.c | 8 +- + arch/powerpc/boot/wrapper | 24 +- + arch/powerpc/configs/amigaone_defconfig | 10 +- + arch/powerpc/configs/cell_defconfig | 7 +- + arch/powerpc/configs/chrp32_defconfig | 10 +- + arch/powerpc/configs/g5_defconfig | 5 +- + arch/powerpc/configs/maple_defconfig | 9 +- + arch/powerpc/configs/pasemi_defconfig | 3 - + arch/powerpc/configs/pmac32_defconfig | 15 +- + arch/powerpc/configs/powernv_defconfig | 9 +- + arch/powerpc/configs/ppc64_defconfig | 14 +- + arch/powerpc/configs/ppc64e_defconfig | 6 +- + arch/powerpc/configs/ppc6xx_defconfig | 10 +- + arch/powerpc/configs/pseries_defconfig | 16 +- + arch/powerpc/configs/storcenter_defconfig | 5 +- + arch/powerpc/include/asm/asm-prototypes.h | 1 - + arch/powerpc/include/asm/book3s/32/pgtable.h | 3 +- + arch/powerpc/include/asm/book3s/64/hash-4k.h | 3 - + arch/powerpc/include/asm/book3s/64/hash-64k.h | 3 - + .../asm/book3s/64/{hugetlb-radix.h => hugetlb.h} | 28 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 15 +- + arch/powerpc/include/asm/book3s/64/radix.h | 28 +- + .../powerpc/include/asm/book3s/64/tlbflush-radix.h | 2 + + arch/powerpc/include/asm/cache.h | 3 + + arch/powerpc/include/asm/cmpxchg.h | 107 +++- + arch/powerpc/include/asm/debug.h | 2 +- + arch/powerpc/include/asm/futex.h | 14 +- + arch/powerpc/include/asm/head-64.h | 8 +- + arch/powerpc/include/asm/hugetlb.h | 2 +- + arch/powerpc/include/asm/hvcall.h | 30 +- + arch/powerpc/include/asm/io.h | 19 +- + arch/powerpc/include/asm/kexec.h | 16 +- + arch/powerpc/include/asm/kprobes.h | 7 + + arch/powerpc/include/asm/machdep.h | 4 +- + arch/powerpc/include/asm/mmu_context.h | 20 +- + arch/powerpc/include/asm/module.h | 4 - + arch/powerpc/include/asm/nohash/32/pgtable.h | 3 +- + arch/powerpc/include/asm/nohash/64/pgtable-4k.h | 3 - + arch/powerpc/include/asm/nohash/64/pgtable-64k.h | 3 - + arch/powerpc/include/asm/nohash/64/pgtable.h | 17 +- + arch/powerpc/include/asm/plpar_wrappers.h | 37 +- + arch/powerpc/include/asm/ppc-pci.h | 2 +- + arch/powerpc/include/asm/ppc_asm.h | 20 +- + arch/powerpc/include/asm/processor.h | 2 - + arch/powerpc/include/asm/prom.h | 6 - + arch/powerpc/include/asm/reg.h | 5 - + arch/powerpc/include/asm/smp.h | 2 +- + arch/powerpc/include/asm/stackprotector.h | 40 ++ + arch/powerpc/include/asm/systbl.h | 1 + + arch/powerpc/include/asm/uaccess.h | 52 +- + arch/powerpc/include/asm/unistd.h | 2 +- + arch/powerpc/include/asm/word-at-a-time.h | 6 +- + arch/powerpc/include/uapi/asm/unistd.h | 1 + + arch/powerpc/kernel/Makefile | 11 +- + arch/powerpc/kernel/asm-offsets.c | 3 + + arch/powerpc/kernel/cpu_setup_power.S | 2 + + arch/powerpc/kernel/eeh.c | 84 ++- + arch/powerpc/kernel/eeh_driver.c | 12 +- + arch/powerpc/kernel/eeh_event.c | 4 +- + arch/powerpc/kernel/eeh_pe.c | 4 +- + arch/powerpc/kernel/entry_32.S | 6 +- + arch/powerpc/kernel/exceptions-64e.S | 6 +- + arch/powerpc/kernel/exceptions-64s.S | 2 +- + arch/powerpc/kernel/ftrace.c | 12 +- + arch/powerpc/kernel/head_64.S | 19 +- + arch/powerpc/kernel/kexec_elf_64.c | 663 +++++++++++++++++++ + arch/powerpc/kernel/kprobes.c | 31 +- + arch/powerpc/kernel/machine_kexec_64.c | 2 +- + arch/powerpc/kernel/machine_kexec_file_64.c | 338 ++++++++++ + arch/powerpc/kernel/mce.c | 3 - + arch/powerpc/kernel/misc_32.S | 2 +- + arch/powerpc/kernel/misc_64.S | 6 +- + arch/powerpc/kernel/module_64.c | 5 + + arch/powerpc/kernel/of_platform.c | 7 +- + arch/powerpc/kernel/process.c | 24 +- + arch/powerpc/kernel/prom.c | 23 +- + arch/powerpc/kernel/prom_init.c | 295 ++++++--- + arch/powerpc/kernel/setup-common.c | 2 +- + arch/powerpc/kernel/setup_64.c | 4 +- + arch/powerpc/kernel/smp.c | 6 +- + arch/powerpc/kernel/traps.c | 48 +- + arch/powerpc/lib/checksum_32.S | 47 +- + arch/powerpc/lib/checksum_64.S | 20 +- + arch/powerpc/lib/copy_32.S | 55 +- + arch/powerpc/lib/copyuser_64.S | 271 ++++---- + arch/powerpc/lib/copyuser_power7.S | 20 +- + arch/powerpc/lib/ldstfp.S | 24 +- + arch/powerpc/lib/sstep.c | 16 +- + arch/powerpc/lib/string.S | 11 +- + arch/powerpc/lib/string_64.S | 16 +- + arch/powerpc/mm/Makefile | 2 + + arch/powerpc/mm/copro_fault.c | 3 + + arch/powerpc/mm/dump_hashpagetable.c | 551 ++++++++++++++++ + arch/powerpc/mm/dump_linuxpagetables.c | 442 +++++++++++++ + arch/powerpc/mm/fault.c | 17 +- + arch/powerpc/mm/hash_native_64.c | 10 +- + arch/powerpc/mm/mmu_context_book3s64.c | 6 +- + arch/powerpc/mm/mmu_context_iommu.c | 60 +- + arch/powerpc/mm/pgtable-book3s64.c | 3 +- + arch/powerpc/mm/pgtable-radix.c | 40 +- + arch/powerpc/mm/pgtable.c | 2 +- + arch/powerpc/mm/tlb-radix.c | 18 + + arch/powerpc/perf/isa207-common.c | 91 ++- + arch/powerpc/perf/isa207-common.h | 30 +- + arch/powerpc/perf/power8-pmu.c | 39 +- + arch/powerpc/perf/power9-pmu.c | 114 +++- + arch/powerpc/platforms/40x/Kconfig | 12 +- + arch/powerpc/platforms/44x/Kconfig | 56 +- + arch/powerpc/platforms/85xx/corenet_generic.c | 2 +- + arch/powerpc/platforms/85xx/smp.c | 8 +- + arch/powerpc/platforms/Kconfig | 11 - + arch/powerpc/platforms/cell/Kconfig | 9 +- + arch/powerpc/platforms/cell/spu_base.c | 2 +- + arch/powerpc/platforms/embedded6xx/holly.c | 2 +- + arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 2 +- + arch/powerpc/platforms/powermac/low_i2c.c | 4 + + arch/powerpc/platforms/powernv/eeh-powernv.c | 4 +- + arch/powerpc/platforms/powernv/npu-dma.c | 2 +- + arch/powerpc/platforms/powernv/opal.c | 24 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 40 +- + arch/powerpc/platforms/powernv/pci.c | 6 +- + arch/powerpc/platforms/powernv/setup.c | 6 +- + arch/powerpc/platforms/ps3/setup.c | 4 +- + arch/powerpc/platforms/pseries/Kconfig | 11 + + arch/powerpc/platforms/pseries/Makefile | 4 +- + arch/powerpc/platforms/pseries/cmm.c | 34 + + arch/powerpc/platforms/pseries/dlpar.c | 142 ++-- + arch/powerpc/platforms/pseries/eeh_pseries.c | 8 +- + arch/powerpc/platforms/pseries/hotplug-memory.c | 7 +- + .../{kernel => platforms/pseries}/ibmebus.c | 314 +-------- + arch/powerpc/platforms/pseries/lpar.c | 24 +- + arch/powerpc/platforms/pseries/lparcfg.c | 1 + + arch/powerpc/platforms/pseries/pseries.h | 19 + + arch/powerpc/platforms/pseries/setup.c | 4 +- + arch/powerpc/{kernel => platforms/pseries}/vio.c | 3 + + arch/powerpc/purgatory/.gitignore | 2 + + arch/powerpc/purgatory/Makefile | 15 + + arch/powerpc/purgatory/trampoline.S | 128 ++++ + arch/powerpc/sysdev/fsl_rio.c | 8 +- + arch/powerpc/sysdev/tsi108_pci.c | 6 +- + arch/powerpc/xmon/xmon.c | 6 + + arch/x86/kernel/crash.c | 37 +- + arch/x86/kernel/kexec-bzimage64.c | 48 +- + drivers/macintosh/Kconfig | 1 - + drivers/misc/cxl/api.c | 147 ++++- + drivers/misc/cxl/context.c | 17 +- + drivers/misc/cxl/cxl.h | 6 +- + drivers/misc/cxl/debugfs.c | 6 +- + drivers/misc/cxl/file.c | 5 +- + drivers/misc/cxl/guest.c | 2 +- + drivers/misc/cxl/irq.c | 2 +- + drivers/misc/cxl/native.c | 20 +- + drivers/misc/cxl/pci.c | 2 +- + drivers/misc/cxl/phb.c | 2 +- + drivers/pci/hotplug/rpadlpar_core.c | 10 +- + drivers/vfio/vfio_iommu_spapr_tce.c | 328 ++++++---- + include/linux/kexec.h | 36 +- + kernel/kexec_file.c | 141 ++-- + kernel/kexec_internal.h | 16 - + scripts/sortextable.c | 2 + + tools/testing/selftests/powerpc/Makefile | 5 +- + .../selftests/powerpc/benchmarks/.gitignore | 3 +- + .../testing/selftests/powerpc/benchmarks/Makefile | 2 +- + .../selftests/powerpc/benchmarks/context_switch.c | 2 +- + .../selftests/powerpc/benchmarks/null_syscall.c | 157 +++++ + .../selftests/powerpc/copyloops/asm/ppc_asm.h | 2 + + .../testing/selftests/powerpc/copyloops/validate.c | 2 +- + tools/testing/selftests/powerpc/dscr/dscr.h | 10 +- + .../selftests/powerpc/{ => include}/basic_asm.h | 37 +- + .../selftests/powerpc/{ => include}/fpu_asm.h | 0 + .../selftests/powerpc/{ => include}/gpr_asm.h | 0 + .../selftests/powerpc/{ => include}/instructions.h | 0 + tools/testing/selftests/powerpc/include/reg.h | 145 +++++ + .../selftests/powerpc/{ => include}/subunit.h | 0 + .../selftests/powerpc/{ => include}/utils.h | 0 + .../selftests/powerpc/{ => include}/vmx_asm.h | 0 + .../selftests/powerpc/{ => include}/vsx_asm.h | 0 + tools/testing/selftests/powerpc/lib/reg.S | 397 ++++++++++++ + tools/testing/selftests/powerpc/math/fpu_asm.S | 4 +- + tools/testing/selftests/powerpc/math/vmx_asm.S | 4 +- + tools/testing/selftests/powerpc/math/vsx_asm.S | 4 +- + 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 -- + tools/testing/selftests/powerpc/pmu/lib.c | 6 +- + .../selftests/powerpc/primitives/asm/firmware.h | 0 + .../selftests/powerpc/primitives/asm/ppc_asm.h | 1 + + .../selftests/powerpc/primitives/asm/processor.h | 0 + .../selftests/powerpc/primitives/linux/stringify.h | 0 + .../powerpc/primitives/load_unaligned_zeropad.c | 21 +- + tools/testing/selftests/powerpc/ptrace/.gitignore | 10 + + tools/testing/selftests/powerpc/ptrace/Makefile | 14 + + .../testing/selftests/powerpc/ptrace/ptrace-gpr.c | 123 ++++ + .../testing/selftests/powerpc/ptrace/ptrace-gpr.h | 74 +++ + .../testing/selftests/powerpc/ptrace/ptrace-tar.c | 135 ++++ + .../testing/selftests/powerpc/ptrace/ptrace-tar.h | 50 ++ + .../selftests/powerpc/ptrace/ptrace-tm-gpr.c | 158 +++++ + .../selftests/powerpc/ptrace/ptrace-tm-spd-gpr.c | 169 +++++ + .../selftests/powerpc/ptrace/ptrace-tm-spd-tar.c | 174 +++++ + .../selftests/powerpc/ptrace/ptrace-tm-spd-vsx.c | 185 ++++++ + .../selftests/powerpc/ptrace/ptrace-tm-spr.c | 168 +++++ + .../selftests/powerpc/ptrace/ptrace-tm-tar.c | 160 +++++ + .../selftests/powerpc/ptrace/ptrace-tm-vsx.c | 168 +++++ + .../testing/selftests/powerpc/ptrace/ptrace-vsx.c | 117 ++++ + .../testing/selftests/powerpc/ptrace/ptrace-vsx.h | 127 ++++ + tools/testing/selftests/powerpc/ptrace/ptrace.h | 711 +++++++++++++++++++++ + tools/testing/selftests/powerpc/reg.h | 60 -- + tools/testing/selftests/powerpc/signal/signal.S | 2 +- + .../testing/selftests/powerpc/stringloops/memcmp.c | 2 +- + tools/testing/selftests/powerpc/tm/tm-signal.S | 10 +- + tools/testing/selftests/powerpc/tm/tm.h | 2 +- + 218 files changed, 7658 insertions(+), 2054 deletions(-) + rename arch/powerpc/include/asm/book3s/64/{hugetlb-radix.h => hugetlb.h} (52%) + create mode 100644 arch/powerpc/include/asm/stackprotector.h + create mode 100644 arch/powerpc/kernel/kexec_elf_64.c + create mode 100644 arch/powerpc/kernel/machine_kexec_file_64.c + create mode 100644 arch/powerpc/mm/dump_hashpagetable.c + create mode 100644 arch/powerpc/mm/dump_linuxpagetables.c + rename arch/powerpc/{kernel => platforms/pseries}/ibmebus.c (65%) + rename arch/powerpc/{kernel => platforms/pseries}/vio.c (99%) + create mode 100644 arch/powerpc/purgatory/.gitignore + create mode 100644 arch/powerpc/purgatory/Makefile + create mode 100644 arch/powerpc/purgatory/trampoline.S + create mode 100644 tools/testing/selftests/powerpc/benchmarks/null_syscall.c + rename tools/testing/selftests/powerpc/{ => include}/basic_asm.h (66%) + rename tools/testing/selftests/powerpc/{ => include}/fpu_asm.h (100%) + rename tools/testing/selftests/powerpc/{ => include}/gpr_asm.h (100%) + rename tools/testing/selftests/powerpc/{ => include}/instructions.h (100%) + create mode 100644 tools/testing/selftests/powerpc/include/reg.h + rename tools/testing/selftests/powerpc/{ => include}/subunit.h (100%) + rename tools/testing/selftests/powerpc/{ => include}/utils.h (100%) + rename tools/testing/selftests/powerpc/{ => include}/vmx_asm.h (100%) + rename tools/testing/selftests/powerpc/{ => include}/vsx_asm.h (100%) + create mode 100644 tools/testing/selftests/powerpc/lib/reg.S + delete mode 100644 tools/testing/selftests/powerpc/pmu/ebb/ebb_lmr.c + delete mode 100644 tools/testing/selftests/powerpc/pmu/ebb/ebb_lmr.h + delete mode 100644 tools/testing/selftests/powerpc/pmu/ebb/ebb_lmr_regs.c + create mode 100644 tools/testing/selftests/powerpc/primitives/asm/firmware.h + create mode 120000 tools/testing/selftests/powerpc/primitives/asm/ppc_asm.h + create mode 100644 tools/testing/selftests/powerpc/primitives/asm/processor.h + create mode 100644 tools/testing/selftests/powerpc/primitives/linux/stringify.h + create mode 100644 tools/testing/selftests/powerpc/ptrace/.gitignore + create mode 100644 tools/testing/selftests/powerpc/ptrace/Makefile + create mode 100644 tools/testing/selftests/powerpc/ptrace/ptrace-gpr.c + create mode 100644 tools/testing/selftests/powerpc/ptrace/ptrace-gpr.h + create mode 100644 tools/testing/selftests/powerpc/ptrace/ptrace-tar.c + create mode 100644 tools/testing/selftests/powerpc/ptrace/ptrace-tar.h + create mode 100644 tools/testing/selftests/powerpc/ptrace/ptrace-tm-gpr.c + create mode 100644 tools/testing/selftests/powerpc/ptrace/ptrace-tm-spd-gpr.c + create mode 100644 tools/testing/selftests/powerpc/ptrace/ptrace-tm-spd-tar.c + create mode 100644 tools/testing/selftests/powerpc/ptrace/ptrace-tm-spd-vsx.c + create mode 100644 tools/testing/selftests/powerpc/ptrace/ptrace-tm-spr.c + create mode 100644 tools/testing/selftests/powerpc/ptrace/ptrace-tm-tar.c + create mode 100644 tools/testing/selftests/powerpc/ptrace/ptrace-tm-vsx.c + create mode 100644 tools/testing/selftests/powerpc/ptrace/ptrace-vsx.c + create mode 100644 tools/testing/selftests/powerpc/ptrace/ptrace-vsx.h + create mode 100644 tools/testing/selftests/powerpc/ptrace/ptrace.h + delete mode 100644 tools/testing/selftests/powerpc/reg.h +Merging fsl/next (baae856ebdee powerpc/fsl/dts: add FMan node for t1042d4rdb) +$ git merge fsl/next +Auto-merging drivers/soc/fsl/qbman/qman_portal.c +Auto-merging drivers/soc/fsl/qbman/bman_portal.c +Auto-merging arch/powerpc/mm/Makefile +Auto-merging arch/powerpc/include/asm/nohash/64/pgtable.h +Auto-merging arch/powerpc/include/asm/nohash/32/pgtable.h +Auto-merging arch/powerpc/include/asm/mmu.h +Auto-merging arch/powerpc/include/asm/hugetlb.h +Auto-merging arch/powerpc/include/asm/book3s/64/pgtable.h +Auto-merging arch/powerpc/include/asm/book3s/32/pgtable.h +Auto-merging Documentation/devicetree/bindings/i2c/trivial-devices.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/trivial-devices.txt | 1 + + arch/powerpc/boot/dts/fsl/t1023rdb.dts | 29 +++ + arch/powerpc/boot/dts/fsl/t1023si-post.dtsi | 103 +++++++++ + arch/powerpc/boot/dts/fsl/t1024qds.dts | 29 +++ + arch/powerpc/boot/dts/fsl/t1024rdb.dts | 33 +++ + arch/powerpc/boot/dts/fsl/t1042d4rdb.dts | 52 +++++ + arch/powerpc/boot/dts/fsl/t4240rdb.dts | 4 + + arch/powerpc/configs/fsl-emb-nonhw.config | 6 + + arch/powerpc/include/asm/book3s/32/pgalloc.h | 44 +++- + arch/powerpc/include/asm/book3s/32/pgtable.h | 40 ++-- + arch/powerpc/include/asm/book3s/64/pgtable.h | 3 - + arch/powerpc/include/asm/hugetlb.h | 19 +- + arch/powerpc/include/asm/mmu-8xx.h | 35 ++++ + arch/powerpc/include/asm/mmu.h | 23 +- + arch/powerpc/include/asm/nohash/32/pgalloc.h | 44 +++- + arch/powerpc/include/asm/nohash/32/pgtable.h | 42 ++-- + arch/powerpc/include/asm/nohash/32/pte-8xx.h | 1 + + arch/powerpc/include/asm/nohash/64/pgtable.h | 2 - + arch/powerpc/include/asm/nohash/pgtable.h | 4 + + arch/powerpc/include/asm/pgtable.h | 2 + + arch/powerpc/include/asm/reg_8xx.h | 2 +- + arch/powerpc/kernel/head_8xx.S | 119 ++++++++++- + arch/powerpc/mm/Makefile | 3 +- + arch/powerpc/mm/hugetlbpage.c | 216 +++++++++---------- + arch/powerpc/mm/init-common.c | 107 ++++++++++ + arch/powerpc/mm/init_64.c | 77 ------- + arch/powerpc/mm/pgtable_32.c | 37 ---- + arch/powerpc/mm/tlb_nohash.c | 21 +- + arch/powerpc/platforms/83xx/suspend.c | 6 +- + arch/powerpc/platforms/85xx/Kconfig | 2 + + arch/powerpc/platforms/8xx/Kconfig | 1 + + arch/powerpc/platforms/Kconfig.cputype | 1 + + arch/powerpc/sysdev/fsl_lbc.c | 2 +- + arch/powerpc/sysdev/fsl_pmc.c | 6 +- + arch/powerpc/sysdev/fsl_soc.c | 48 ++--- + drivers/soc/fsl/qbman/bman.c | 8 +- + drivers/soc/fsl/qbman/bman_ccsr.c | 3 +- + drivers/soc/fsl/qbman/bman_portal.c | 17 +- + drivers/soc/fsl/qbman/dpaa_sys.h | 1 + + drivers/soc/fsl/qbman/qman.c | 233 ++++++++++----------- + drivers/soc/fsl/qbman/qman_ccsr.c | 3 + + drivers/soc/fsl/qbman/qman_portal.c | 41 +++- + drivers/soc/fsl/qbman/qman_priv.h | 17 +- + drivers/soc/fsl/qbman/qman_test_api.c | 27 +-- + drivers/soc/fsl/qbman/qman_test_stash.c | 38 ++-- + drivers/soc/fsl/qe/qe.c | 6 +- + include/soc/fsl/qman.h | 62 +++--- + 47 files changed, 1040 insertions(+), 580 deletions(-) + create mode 100644 arch/powerpc/mm/init-common.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 (0b7589ecca2b s390/pci: query fmb length) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/include/asm/cpu_mf.h | 10 +- + arch/s390/include/asm/pci.h | 1 + + arch/s390/include/asm/pci_clp.h | 3 +- + arch/s390/include/asm/string.h | 8 +- + arch/s390/include/asm/trace/zcrypt.h | 122 +++ + arch/s390/include/uapi/asm/zcrypt.h | 37 + + arch/s390/kernel/early.c | 2 +- + arch/s390/kernel/nmi.c | 19 +- + arch/s390/kernel/setup.c | 4 +- + arch/s390/lib/string.c | 12 +- + arch/s390/mm/extmem.c | 2 +- + arch/s390/pci/pci.c | 2 +- + arch/s390/pci/pci_clp.c | 1 + + drivers/s390/block/dasd_3990_erp.c | 6 +- + drivers/s390/crypto/Makefile | 13 +- + drivers/s390/crypto/ap_asm.h | 191 +++++ + drivers/s390/crypto/ap_bus.c | 1331 +++++++++----------------------- + drivers/s390/crypto/ap_bus.h | 98 ++- + drivers/s390/crypto/ap_card.c | 170 ++++ + drivers/s390/crypto/ap_debug.h | 28 + + drivers/s390/crypto/ap_queue.c | 701 +++++++++++++++++ + drivers/s390/crypto/zcrypt_api.c | 1137 +++++++++++++-------------- + drivers/s390/crypto/zcrypt_api.h | 99 ++- + drivers/s390/crypto/zcrypt_card.c | 187 +++++ + drivers/s390/crypto/zcrypt_cex2a.c | 214 +++-- + drivers/s390/crypto/zcrypt_cex4.c | 319 +++++--- + drivers/s390/crypto/zcrypt_debug.h | 50 +- + drivers/s390/crypto/zcrypt_error.h | 105 +-- + drivers/s390/crypto/zcrypt_msgtype50.c | 135 ++-- + drivers/s390/crypto/zcrypt_msgtype50.h | 5 +- + drivers/s390/crypto/zcrypt_msgtype6.c | 660 ++++++++++------ + drivers/s390/crypto/zcrypt_msgtype6.h | 23 +- + drivers/s390/crypto/zcrypt_pcixcc.c | 376 ++++----- + drivers/s390/crypto/zcrypt_queue.c | 226 ++++++ + include/linux/mod_devicetable.h | 3 +- + 35 files changed, 3915 insertions(+), 2385 deletions(-) + create mode 100644 arch/s390/include/asm/trace/zcrypt.h + create mode 100644 drivers/s390/crypto/ap_asm.h + create mode 100644 drivers/s390/crypto/ap_card.c + create mode 100644 drivers/s390/crypto/ap_debug.h + create mode 100644 drivers/s390/crypto/ap_queue.c + create mode 100644 drivers/s390/crypto/zcrypt_card.c + create mode 100644 drivers/s390/crypto/zcrypt_queue.c +Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) +$ git merge sparc-next/master +Already up-to-date. +Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board) +$ git merge sh/for-next +Already up-to-date. +Merging tile/master (bf55d575234b tile: migrate exception table users off module.h and onto extable.h) +$ git merge tile/master +Merge made by the 'recursive' strategy. + arch/tile/kernel/module.c | 11 +++++------ + arch/tile/kernel/pci_gx.c | 2 +- + arch/tile/kernel/unaligned.c | 2 +- + arch/tile/lib/cacheflush.c | 8 +------- + arch/tile/mm/extable.c | 2 +- + arch/tile/mm/fault.c | 2 +- + 6 files changed, 10 insertions(+), 17 deletions(-) +Merging uml/linux-next (f88f0bdfc32f um: UBD Improvements) +$ git merge uml/linux-next +Merge made by the 'recursive' strategy. + arch/um/drivers/ubd.h | 5 ++ + arch/um/drivers/ubd_kern.c | 168 ++++++++++++++++++++++++++++++++++++++------- + arch/um/drivers/ubd_user.c | 21 +++++- + 3 files changed, 167 insertions(+), 27 deletions(-) +Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface) +$ git merge unicore32/unicore32 +Merge made by the 'recursive' strategy. + arch/unicore32/Kconfig | 14 + + arch/unicore32/include/asm/Kbuild | 3 - + arch/unicore32/include/asm/signal.h | 21 + + arch/unicore32/include/asm/syscalls.h | 25 + + arch/unicore32/include/uapi/asm/sigcontext.h | 14 + + arch/unicore32/include/uapi/asm/stat-oldabi.h | 71 +++ + arch/unicore32/include/uapi/asm/stat.h | 19 + + arch/unicore32/include/uapi/asm/unistd-oldabi.h | 770 ++++++++++++++++++++++++ + arch/unicore32/include/uapi/asm/unistd.h | 8 + + arch/unicore32/kernel/entry.S | 17 + + arch/unicore32/kernel/signal.c | 41 ++ + 11 files changed, 1000 insertions(+), 3 deletions(-) + create mode 100644 arch/unicore32/include/asm/signal.h + create mode 100644 arch/unicore32/include/asm/syscalls.h + create mode 100644 arch/unicore32/include/uapi/asm/stat-oldabi.h + create mode 100644 arch/unicore32/include/uapi/asm/stat.h + create mode 100644 arch/unicore32/include/uapi/asm/unistd-oldabi.h +Merging xtensa/xtensa-for-next (03eae3aca94c xtensa: fix screen_info, clean up unused declarations in setup.c) +$ git merge xtensa/xtensa-for-next +Merge made by the 'recursive' strategy. + arch/xtensa/kernel/setup.c | 22 ++++++++-------------- + 1 file changed, 8 insertions(+), 14 deletions(-) +Merging befs/for-next (f7b75aaed5ef befs: add NFS export support) +$ git merge befs/for-next +Merge made by the 'recursive' strategy. + fs/befs/befs.h | 3 +- + fs/befs/befs_fs_types.h | 12 ++--- + fs/befs/btree.c | 48 ++++++++--------- + fs/befs/btree.h | 8 ++- + fs/befs/datastream.c | 8 ++- + fs/befs/datastream.h | 5 +- + fs/befs/debug.c | 14 ++--- + fs/befs/inode.c | 12 ++--- + fs/befs/inode.h | 5 +- + fs/befs/io.c | 7 ++- + fs/befs/io.h | 1 - + fs/befs/linuxvfs.c | 134 ++++++++++++++++++++++++++++++------------------ + fs/befs/super.h | 4 +- + 13 files changed, 145 insertions(+), 116 deletions(-) +Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults) +$ git merge btrfs/next +Already up-to-date. +Merging btrfs-kdave/for-next (210fce51c3fe fixup! Btrfs: fix btrfs_ordered_update_i_size to update disk_i_size properly) +$ git merge btrfs-kdave/for-next +Recorded preimage for 'fs/btrfs/inode.c' +Auto-merging fs/btrfs/volumes.h +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/scrub.c +Auto-merging fs/btrfs/inode.c +CONFLICT (content): Merge conflict in fs/btrfs/inode.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/disk-io.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/btrfs/inode.c'. +[master e69c3721ac29] Merge remote-tracking branch 'btrfs-kdave/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/async-thread.c | 14 + + fs/btrfs/async-thread.h | 1 + + fs/btrfs/backref.c | 10 +- + fs/btrfs/check-integrity.c | 103 +-- + fs/btrfs/check-integrity.h | 5 +- + fs/btrfs/compression.c | 196 ++-- + fs/btrfs/compression.h | 12 +- + fs/btrfs/ctree.c | 495 +++++----- + fs/btrfs/ctree.h | 241 ++--- + fs/btrfs/delayed-inode.c | 147 ++- + fs/btrfs/delayed-inode.h | 21 +- + fs/btrfs/delayed-ref.c | 20 +- + fs/btrfs/delayed-ref.h | 14 +- + fs/btrfs/dev-replace.c | 68 +- + fs/btrfs/dev-replace.h | 4 +- + fs/btrfs/dir-item.c | 45 +- + fs/btrfs/disk-io.c | 595 ++++++------ + fs/btrfs/disk-io.h | 34 +- + fs/btrfs/export.c | 10 +- + fs/btrfs/extent-tree.c | 1554 ++++++++++++++------------------ + fs/btrfs/extent_io.c | 112 ++- + fs/btrfs/extent_io.h | 17 +- + fs/btrfs/file-item.c | 207 ++--- + fs/btrfs/file.c | 249 ++--- + fs/btrfs/free-space-cache.c | 164 ++-- + fs/btrfs/free-space-cache.h | 12 +- + fs/btrfs/free-space-tree.c | 44 +- + fs/btrfs/inode-item.c | 11 +- + fs/btrfs/inode-map.c | 22 +- + fs/btrfs/inode.c | 955 ++++++++++---------- + fs/btrfs/ioctl.c | 603 +++++++------ + fs/btrfs/lzo.c | 17 +- + fs/btrfs/ordered-data.c | 80 +- + fs/btrfs/ordered-data.h | 4 +- + fs/btrfs/print-tree.c | 19 +- + fs/btrfs/print-tree.h | 4 +- + fs/btrfs/props.c | 5 +- + fs/btrfs/qgroup.c | 330 ++++++- + fs/btrfs/qgroup.h | 64 +- + fs/btrfs/raid56.c | 78 +- + fs/btrfs/raid56.h | 8 +- + fs/btrfs/reada.c | 62 +- + fs/btrfs/relocation.c | 453 +++++----- + fs/btrfs/root-tree.c | 28 +- + fs/btrfs/scrub.c | 181 ++-- + fs/btrfs/send.c | 33 +- + fs/btrfs/super.c | 138 ++- + fs/btrfs/tests/btrfs-tests.c | 13 +- + fs/btrfs/tests/btrfs-tests.h | 4 +- + fs/btrfs/tests/extent-buffer-tests.c | 7 +- + fs/btrfs/tests/extent-io-tests.c | 7 +- + fs/btrfs/tests/free-space-tests.c | 18 +- + fs/btrfs/tests/free-space-tree-tests.c | 9 +- + fs/btrfs/tests/inode-tests.c | 16 +- + fs/btrfs/tests/qgroup-tests.c | 11 +- + fs/btrfs/transaction.c | 615 +++++++------ + fs/btrfs/transaction.h | 29 +- + fs/btrfs/tree-log.c | 215 +++-- + fs/btrfs/uuid-tree.c | 27 +- + fs/btrfs/volumes.c | 845 +++++++++-------- + fs/btrfs/volumes.h | 70 +- + fs/btrfs/xattr.c | 21 +- + fs/btrfs/zlib.c | 16 +- + include/trace/events/btrfs.h | 83 +- + 64 files changed, 4823 insertions(+), 4672 deletions(-) +Merging ceph/master (45ee2c1d6618 libceph: remove now unused finish_request() wrapper) +$ git merge ceph/master +Auto-merging include/linux/ceph/messenger.h +Merge made by the 'recursive' strategy. + drivers/block/rbd.c | 2 +- + fs/ceph/addr.c | 98 +++++++-- + fs/ceph/caps.c | 323 ++++++++++++++++++---------- + fs/ceph/file.c | 127 ++++++----- + fs/ceph/mds_client.c | 23 +- + fs/ceph/mdsmap.c | 163 +++++++++++++- + fs/ceph/snap.c | 2 + + fs/ceph/super.c | 10 + + fs/ceph/super.h | 5 + + include/linux/ceph/auth.h | 5 +- + include/linux/ceph/ceph_fs.h | 3 + + include/linux/ceph/mdsmap.h | 5 + + include/linux/ceph/messenger.h | 2 +- + include/linux/ceph/osd_client.h | 2 +- + net/ceph/auth.c | 4 +- + net/ceph/auth_x.c | 197 ++++++++--------- + net/ceph/auth_x.h | 3 +- + net/ceph/crush/mapper.c | 2 + + net/ceph/crypto.c | 461 ++++++++++------------------------------ + net/ceph/crypto.h | 26 +-- + net/ceph/messenger.c | 19 +- + net/ceph/mon_client.c | 12 +- + net/ceph/osd_client.c | 39 ++-- + 23 files changed, 809 insertions(+), 724 deletions(-) +Merging cifs/for-next (06deeec77a5a cifs: Fix smbencrypt() to stop pointing a scatterlist at the stack) +$ git merge cifs/for-next +Auto-merging fs/cifs/connect.c +Merge made by the 'recursive' strategy. + fs/cifs/cifsglob.h | 6 ++++ + fs/cifs/cifsproto.h | 3 ++ + fs/cifs/connect.c | 72 +++++++++++++++++++++++++++++++++++++------ + fs/cifs/file.c | 8 ++++- + fs/cifs/ioctl.c | 2 +- + fs/cifs/smb2file.c | 2 +- + fs/cifs/smb2pdu.c | 87 +++++++++++++++++++++++++++++++++++----------------- + fs/cifs/smb2pdu.h | 2 ++ + fs/cifs/smb2proto.h | 1 + + fs/cifs/smbencrypt.c | 40 +++++------------------- + 10 files changed, 150 insertions(+), 73 deletions(-) +Merging configfs/for-next (e16769d4bca6 fs: configfs: don't return anything from drop_link) +$ git merge configfs/for-next +Already up-to-date. +Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/main.c +Auto-merging fs/ecryptfs/ecryptfs_kernel.h +Merge made by the 'recursive' strategy. + fs/ecryptfs/crypto.c | 15 --------------- + fs/ecryptfs/ecryptfs_kernel.h | 9 ++++++++- + fs/ecryptfs/keystore.c | 2 +- + fs/ecryptfs/main.c | 2 +- + fs/ecryptfs/miscdev.c | 2 +- + 5 files changed, 11 insertions(+), 19 deletions(-) +Merging ext3/for_next (5716863e0f82 fsnotify: Fix possible use-after-free in inode iteration on umount) +$ git merge ext3/for_next +Auto-merging include/linux/fs.h +Auto-merging fs/ocfs2/super.c +Auto-merging fs/ext2/inode.c +Merge made by the 'recursive' strategy. + fs/ext2/inode.c | 4 ++ + fs/notify/inode_mark.c | 45 ++++------------ + fs/ocfs2/quota_global.c | 10 +++- + fs/ocfs2/quota_local.c | 11 ++-- + fs/ocfs2/super.c | 1 - + fs/quota/dquot.c | 134 +++++++++++++++++------------------------------- + fs/quota/quota.c | 22 +++++--- + fs/super.c | 81 +++++++++++++++++++++-------- + include/linux/fs.h | 2 + + include/linux/quota.h | 1 - + 10 files changed, 151 insertions(+), 160 deletions(-) +Merging ext4/dev (a551d7c8deef Merge branch 'fscrypt' into dev) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (5084fdf08173 Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4) +$ git merge f2fs/dev +Already up-to-date. +Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information) +$ git merge freevxfs/for-next +Already up-to-date. +Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew)) +$ git merge fscache/fscache +Already up-to-date. +Merging fuse/for-next (c01638f5d919 fuse: fix clearing suid, sgid for chown()) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/for-next (a3443cda5588 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security) +$ git merge gfs2/for-next +Already up-to-date. +Merging jfs/jfs-next (362ad5d58e9a fs: jfs: Replace CURRENT_TIME_SEC by current_time()) +$ git merge jfs/jfs-next +Already up-to-date. +Merging nfs/linux-next (2549f307b599 Merge tag 'nfs-rdma-4.10-1' of git://git.linux-nfs.org/projects/anna/nfs-rdma) +$ git merge nfs/linux-next +Auto-merging fs/nfs/inode.c +Merge made by the 'recursive' strategy. + fs/nfs/callback_proc.c | 99 +++++--- + fs/nfs/client.c | 6 +- + fs/nfs/delegation.c | 4 - + fs/nfs/dir.c | 73 +++--- + fs/nfs/direct.c | 12 +- + fs/nfs/file.c | 5 +- + fs/nfs/filelayout/filelayoutdev.c | 3 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 313 +++++++++++++++-------- + fs/nfs/flexfilelayout/flexfilelayout.h | 23 +- + fs/nfs/flexfilelayout/flexfilelayoutdev.c | 151 +++++++---- + fs/nfs/inode.c | 51 ++-- + fs/nfs/internal.h | 9 +- + fs/nfs/nfs3client.c | 5 +- + fs/nfs/nfs42proc.c | 9 +- + fs/nfs/nfs42xdr.c | 5 +- + fs/nfs/nfs4_fs.h | 2 +- + fs/nfs/nfs4client.c | 32 ++- + fs/nfs/nfs4file.c | 2 +- + fs/nfs/nfs4proc.c | 233 +++++++++++------ + fs/nfs/nfs4session.c | 2 +- + fs/nfs/nfs4state.c | 27 +- + fs/nfs/nfs4xdr.c | 96 +++++-- + fs/nfs/objlayout/objlayout.c | 4 +- + fs/nfs/objlayout/objlayout.h | 1 - + fs/nfs/pagelist.c | 3 +- + fs/nfs/pnfs.c | 407 ++++++++++++++++++------------ + fs/nfs/pnfs.h | 77 ++++-- + fs/nfs/pnfs_nfs.c | 28 +- + fs/nfs/super.c | 2 +- + fs/nfs/write.c | 3 +- + include/linux/nfs4.h | 1 + + include/linux/nfs_fs.h | 11 +- + include/linux/nfs_xdr.h | 27 +- + net/sunrpc/auth_gss/auth_gss.c | 7 +- + net/sunrpc/clnt.c | 2 + + net/sunrpc/stats.c | 10 +- + net/sunrpc/xprt.c | 3 +- + net/sunrpc/xprtrdma/backchannel.c | 4 +- + net/sunrpc/xprtrdma/frwr_ops.c | 94 ++++--- + net/sunrpc/xprtrdma/rpc_rdma.c | 36 +-- + net/sunrpc/xprtrdma/transport.c | 34 ++- + net/sunrpc/xprtrdma/verbs.c | 37 +-- + net/sunrpc/xprtrdma/xprt_rdma.h | 31 ++- + 43 files changed, 1258 insertions(+), 726 deletions(-) +Merging nfsd/nfsd-next (3eb15f282846 sunrpc: use DEFINE_SPINLOCK()) +$ git merge nfsd/nfsd-next +Auto-merging net/sunrpc/xprtrdma/svc_rdma_transport.c +Auto-merging fs/nfsd/nfsctl.c +Merge made by the 'recursive' strategy. + fs/nfsd/nfs4callback.c | 2 +- + fs/nfsd/nfs4layouts.c | 8 +- + fs/nfsd/nfs4proc.c | 43 +++-------- + fs/nfsd/nfs4xdr.c | 53 ++++++++----- + fs/nfsd/nfscache.c | 11 ++- + fs/nfsd/nfsctl.c | 2 +- + fs/nfsd/nfsd.h | 27 +++---- + include/linux/sunrpc/svc_rdma.h | 7 +- + net/sunrpc/auth_gss/gss_krb5_crypto.c | 12 +-- + net/sunrpc/auth_gss/gss_krb5_mech.c | 3 +- + net/sunrpc/auth_gss/svcauth_gss.c | 2 +- + net/sunrpc/svc.c | 14 ++-- + net/sunrpc/svcauth.c | 3 +- + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 5 +- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 21 ++++-- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 116 +++++++++-------------------- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 94 ++++++++--------------- + 17 files changed, 172 insertions(+), 251 deletions(-) +Merging orangefs/for-next (04102c76a779 orangefs: Axe some dead code) +$ git merge orangefs/for-next +Merge made by the 'recursive' strategy. + fs/orangefs/orangefs-debugfs.c | 4 +++- + fs/orangefs/orangefs-sysfs.c | 9 --------- + 2 files changed, 3 insertions(+), 10 deletions(-) +Merging overlayfs/overlayfs-next (1fb52aea5039 ovl: fix return value of ovl_fill_super) +$ git merge overlayfs/overlayfs-next +Auto-merging net/unix/af_unix.c +Auto-merging include/linux/fs.h +Merge made by the 'recursive' strategy. + Documentation/filesystems/overlayfs.txt | 23 +- + fs/internal.h | 1 - + fs/ioctl.c | 6 +- + fs/namei.c | 6 +- + fs/nfsd/vfs.c | 3 +- + fs/open.c | 2 +- + fs/overlayfs/Kconfig | 14 + + fs/overlayfs/Makefile | 2 +- + fs/overlayfs/copy_up.c | 95 ++---- + fs/overlayfs/dir.c | 375 ++++++++++++--------- + fs/overlayfs/inode.c | 317 ++++++++++++++---- + fs/overlayfs/namei.c | 401 +++++++++++++++++++++++ + fs/overlayfs/overlayfs.h | 64 ++-- + fs/overlayfs/ovl_entry.h | 53 +++ + fs/overlayfs/super.c | 558 ++++---------------------------- + fs/overlayfs/util.c | 265 +++++++++++++++ + fs/read_write.c | 23 +- + include/linux/fs.h | 14 + + mm/util.c | 22 ++ + net/unix/af_unix.c | 6 +- + 20 files changed, 1403 insertions(+), 847 deletions(-) + create mode 100644 fs/overlayfs/namei.c + create mode 100644 fs/overlayfs/ovl_entry.h + create mode 100644 fs/overlayfs/util.c +Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (ba75d570b60c ubifs: Initialize fstr_real_len) +$ git merge ubifs/linux-next +Merge made by the 'recursive' strategy. + fs/ubifs/Kconfig | 11 ++ + fs/ubifs/Makefile | 1 + + fs/ubifs/crypto.c | 97 ++++++++++ + fs/ubifs/debug.c | 14 +- + fs/ubifs/dir.c | 478 +++++++++++++++++++++++++++++++++++++++++-------- + fs/ubifs/file.c | 108 ++++++++++- + fs/ubifs/gc.c | 4 - + fs/ubifs/io.c | 18 +- + fs/ubifs/ioctl.c | 20 +++ + fs/ubifs/journal.c | 224 +++++++++++++---------- + fs/ubifs/key.h | 21 +-- + fs/ubifs/replay.c | 10 +- + fs/ubifs/sb.c | 59 ++++++ + fs/ubifs/super.c | 17 +- + fs/ubifs/tnc.c | 159 ++++++++++++---- + fs/ubifs/ubifs-media.h | 29 ++- + fs/ubifs/ubifs.h | 115 +++++++++--- + fs/ubifs/xattr.c | 116 +++++++----- + 18 files changed, 1192 insertions(+), 309 deletions(-) + create mode 100644 fs/ubifs/crypto.c +Merging xfs/for-next (9807b773dad4 Merge branch 'xfs-4.10-misc-fixes-4' into for-next) +$ git merge xfs/for-next +Resolved 'include/linux/iomap.h' using previous resolution. +Auto-merging kernel/locking/lockdep.c +Auto-merging include/linux/iomap.h +CONFLICT (content): Merge conflict in include/linux/iomap.h +Auto-merging fs/xfs/xfs_buf.c +Auto-merging fs/xfs/xfs_aops.c +Auto-merging fs/internal.h +Auto-merging fs/direct-io.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8b7d14135849] Merge remote-tracking branch 'xfs/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/xfs.txt | 12 +- + fs/direct-io.c | 2 +- + fs/internal.h | 3 + + fs/iomap.c | 373 +++++++++++++++++++++++++++++++++++++ + fs/xfs/libxfs/xfs_alloc.c | 10 +- + fs/xfs/libxfs/xfs_alloc_btree.c | 6 +- + fs/xfs/libxfs/xfs_attr_leaf.c | 8 +- + fs/xfs/libxfs/xfs_attr_leaf.h | 4 +- + fs/xfs/libxfs/xfs_bmap.c | 336 ++++++++++++++------------------- + fs/xfs/libxfs/xfs_bmap.h | 9 +- + fs/xfs/libxfs/xfs_bmap_btree.c | 3 +- + fs/xfs/libxfs/xfs_btree.c | 20 ++ + fs/xfs/libxfs/xfs_btree.h | 43 +---- + fs/xfs/libxfs/xfs_cksum.h | 26 ++- + fs/xfs/libxfs/xfs_dir2.c | 2 +- + fs/xfs/libxfs/xfs_dir2.h | 5 + + fs/xfs/libxfs/xfs_dir2_data.c | 26 ++- + fs/xfs/libxfs/xfs_dir2_priv.h | 1 - + fs/xfs/libxfs/xfs_ialloc.c | 18 +- + fs/xfs/libxfs/xfs_ialloc_btree.c | 4 +- + fs/xfs/libxfs/xfs_inode_buf.c | 16 +- + fs/xfs/libxfs/xfs_inode_buf.h | 4 +- + fs/xfs/libxfs/xfs_inode_fork.c | 77 ++++++-- + fs/xfs/libxfs/xfs_inode_fork.h | 7 + + fs/xfs/libxfs/xfs_log_format.h | 4 +- + fs/xfs/libxfs/xfs_log_recover.h | 2 +- + fs/xfs/libxfs/xfs_refcount_btree.c | 1 + + fs/xfs/libxfs/xfs_rmap_btree.c | 1 + + fs/xfs/libxfs/xfs_rtbitmap.c | 1 - + fs/xfs/libxfs/xfs_sb.c | 13 +- + fs/xfs/libxfs/xfs_types.h | 4 +- + fs/xfs/xfs_aops.c | 286 ++-------------------------- + fs/xfs/xfs_aops.h | 6 - + fs/xfs/xfs_attr.h | 4 +- + fs/xfs/xfs_attr_list.c | 59 +++--- + fs/xfs/xfs_bmap_util.c | 45 ++--- + fs/xfs/xfs_buf.c | 123 +++++++----- + fs/xfs/xfs_buf.h | 3 +- + fs/xfs/xfs_dir2_readdir.c | 2 - + fs/xfs/xfs_file.c | 264 ++++++++++---------------- + fs/xfs/xfs_icache.c | 40 ++-- + fs/xfs/xfs_icreate_item.c | 2 +- + fs/xfs/xfs_inode.c | 84 ++++----- + fs/xfs/xfs_inode.h | 18 +- + fs/xfs/xfs_inode_item.c | 4 +- + fs/xfs/xfs_ioctl.c | 8 +- + fs/xfs/xfs_iomap.c | 104 +++++++---- + fs/xfs/xfs_iops.c | 14 +- + fs/xfs/xfs_linux.h | 1 + + fs/xfs/xfs_log.c | 41 ++-- + fs/xfs/xfs_log_recover.c | 16 +- + fs/xfs/xfs_mount.c | 7 +- + fs/xfs/xfs_mount.h | 7 +- + fs/xfs/xfs_pnfs.c | 7 +- + fs/xfs/xfs_pnfs.h | 4 +- + fs/xfs/xfs_qm.c | 2 +- + fs/xfs/xfs_reflink.c | 191 ++++++------------- + fs/xfs/xfs_reflink.h | 6 +- + fs/xfs/xfs_stats.c | 10 +- + fs/xfs/xfs_stats.h | 200 ++++++++------------ + fs/xfs/xfs_super.c | 27 ++- + fs/xfs/xfs_symlink.c | 7 +- + fs/xfs/xfs_trace.h | 109 ----------- + fs/xfs/xfs_xattr.c | 23 +-- + include/linux/iomap.h | 11 ++ + include/linux/lockdep.h | 25 ++- + kernel/locking/lockdep.c | 20 +- + 67 files changed, 1357 insertions(+), 1464 deletions(-) +$ git am -3 ../patches/0001-iomap-fix-up-for-blk_poll-and-WRITE_ODIRECT-change.patch +Applying: iomap: fix up for blk_poll and WRITE_ODIRECT change +$ git reset HEAD^ +Unstaged changes after reset: +M fs/iomap.c +$ git add -A . +$ git commit -v -a --amend +[master d7614db39200] Merge remote-tracking branch 'xfs/for-next' + Date: Thu Dec 15 10:42:02 2016 +1100 +Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2) +$ git merge file-locks/linux-next +Already up-to-date. +Merging vfs/for-next (225c4443ef3b Merge branch 'work.autofs' into for-next) +$ git merge vfs/for-next +Resolved 'drivers/staging/lustre/lustre/llite/statahead.c' using previous resolution. +Resolved 'fs/overlayfs/copy_up.c' using previous resolution. +Resolved 'fs/overlayfs/dir.c' using previous resolution. +Resolved 'fs/xfs/xfs_reflink.c' using previous resolution. +Auto-merging net/unix/af_unix.c +Auto-merging net/socket.c +Auto-merging net/packet/af_packet.c +Auto-merging net/ipv4/tcp.c +Auto-merging net/ipv4/ping.c +Auto-merging net/ipv4/ip_output.c +Auto-merging net/core/skbuff.c +Auto-merging lib/iov_iter.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/printk/printk.c +Auto-merging kernel/events/core.c +Auto-merging kernel/audit.c +Auto-merging include/net/udplite.h +Auto-merging include/net/tcp.h +Auto-merging include/net/sock.h +Auto-merging include/linux/uio.h +Auto-merging include/linux/skbuff.h +Auto-merging include/linux/quota.h +Auto-merging include/linux/fs.h +Auto-merging fs/xfs/xfs_reflink.c +CONFLICT (content): Merge conflict in fs/xfs/xfs_reflink.c +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/splice.c +Auto-merging fs/read_write.c +Auto-merging fs/quota/quota.c +Auto-merging fs/quota/dquot.c +Auto-merging fs/overlayfs/dir.c +CONFLICT (content): Merge conflict in fs/overlayfs/dir.c +Auto-merging fs/overlayfs/copy_up.c +CONFLICT (content): Merge conflict in fs/overlayfs/copy_up.c +Auto-merging fs/orangefs/orangefs-debugfs.c +Auto-merging fs/ocfs2/refcounttree.c +Auto-merging fs/ocfs2/aops.c +Auto-merging fs/nfs/file.c +Auto-merging fs/namei.c +Removing fs/logfs/super.c +Removing fs/logfs/segment.c +Removing fs/logfs/readwrite.c +Removing fs/logfs/logfs_abi.h +Removing fs/logfs/logfs.h +Removing fs/logfs/journal.c +Removing fs/logfs/inode.c +Removing fs/logfs/gc.c +Removing fs/logfs/file.c +Removing fs/logfs/dir.c +Removing fs/logfs/dev_mtd.c +CONFLICT (modify/delete): fs/logfs/dev_bdev.c deleted in vfs/for-next and modified in HEAD. Version HEAD of fs/logfs/dev_bdev.c left in tree. +Removing fs/logfs/compr.c +Removing fs/logfs/Makefile +Removing fs/logfs/Kconfig +Auto-merging fs/internal.h +Auto-merging fs/ext4/super.c +Auto-merging fs/ceph/super.h +Auto-merging fs/ceph/super.c +Auto-merging fs/ceph/file.c +Auto-merging fs/ceph/dir.c +Auto-merging fs/ceph/addr.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/ctree.h +Auto-merging fs/Kconfig +Auto-merging fs/9p/vfs_addr.c +Auto-merging drivers/vhost/vhost.c +Auto-merging drivers/usb/gadget/function/f_fs.c +Auto-merging drivers/staging/lustre/lustre/llite/statahead.c +CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/statahead.c +Auto-merging drivers/staging/lustre/lustre/llite/namei.c +Auto-merging drivers/staging/lustre/lustre/llite/llite_nfs.c +Auto-merging drivers/staging/lustre/lustre/llite/llite_internal.h +Auto-merging drivers/staging/greybus/timesync.c +Auto-merging drivers/staging/greybus/es2.c +Auto-merging drivers/staging/greybus/camera.c +Auto-merging drivers/net/tun.c +Auto-merging drivers/net/macvtap.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging MAINTAINERS +Removing Documentation/filesystems/logfs.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f fs/logfs/dev_bdev.c +fs/logfs/dev_bdev.c: needs merge +rm 'fs/logfs/dev_bdev.c' +$ git commit -v -a +[master 79207ed68b39] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/00-INDEX | 2 - + Documentation/filesystems/Locking | 2 +- + Documentation/filesystems/logfs.txt | 241 -- + Documentation/filesystems/vfs.txt | 2 +- + MAINTAINERS | 8 - + arch/powerpc/oprofile/cell/spu_task_sync.c | 2 +- + drivers/bluetooth/hci_vhci.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 +- + drivers/net/macvtap.c | 4 +- + drivers/net/tun.c | 7 +- + drivers/oprofile/buffer_sync.c | 2 +- + drivers/staging/greybus/camera.c | 4 +- + drivers/staging/greybus/es2.c | 6 +- + drivers/staging/greybus/svc.c | 6 +- + drivers/staging/greybus/timesync.c | 2 +- + drivers/staging/lustre/lustre/llite/dcache.c | 33 +- + .../staging/lustre/lustre/llite/llite_internal.h | 17 +- + drivers/staging/lustre/lustre/llite/llite_nfs.c | 22 +- + drivers/staging/lustre/lustre/llite/namei.c | 13 +- + drivers/staging/lustre/lustre/llite/statahead.c | 4 +- + drivers/target/target_core_configfs.c | 2 +- + drivers/usb/gadget/function/f_fs.c | 2 +- + drivers/usb/gadget/legacy/inode.c | 2 +- + drivers/vhost/scsi.c | 3 +- + drivers/vhost/vhost.c | 3 +- + fs/9p/vfs_addr.c | 15 +- + fs/Kconfig | 1 - + fs/Makefile | 1 - + fs/aio.c | 6 +- + fs/autofs4/autofs_i.h | 5 +- + fs/autofs4/dev-ioctl.c | 10 +- + fs/autofs4/expire.c | 25 +- + fs/autofs4/inode.c | 2 +- + fs/autofs4/root.c | 61 +- + fs/autofs4/waitq.c | 13 +- + fs/btrfs/ctree.h | 3 - + fs/btrfs/file.c | 1 - + fs/btrfs/ioctl.c | 14 +- + fs/ceph/addr.c | 14 +- + fs/ceph/dir.c | 51 +- + fs/ceph/export.c | 26 +- + fs/ceph/file.c | 4 - + fs/ceph/inode.c | 22 +- + fs/ceph/super.c | 2 +- + fs/ceph/super.h | 10 +- + fs/compat.c | 6 +- + fs/dcache.c | 40 +- + fs/dcookies.c | 4 +- + fs/exofs/inode.c | 68 +- + fs/ext4/super.c | 4 +- + fs/fcntl.c | 2 +- + fs/file_table.c | 2 +- + fs/gfs2/aops.c | 4 +- + fs/internal.h | 2 +- + fs/libfs.c | 14 +- + fs/logfs/Kconfig | 17 - + fs/logfs/Makefile | 13 - + fs/logfs/compr.c | 95 - + fs/logfs/dev_bdev.c | 290 --- + fs/logfs/dev_mtd.c | 274 --- + fs/logfs/dir.c | 801 ------- + fs/logfs/file.c | 285 --- + fs/logfs/gc.c | 732 ------- + fs/logfs/inode.c | 428 ---- + fs/logfs/journal.c | 894 -------- + fs/logfs/logfs.h | 735 ------- + fs/logfs/logfs_abi.h | 629 ------ + fs/logfs/readwrite.c | 2298 -------------------- + fs/logfs/segment.c | 961 -------- + fs/logfs/super.c | 653 ------ + fs/mount.h | 6 + + fs/namei.c | 164 +- + fs/namespace.c | 51 +- + fs/ncpfs/file.c | 2 +- + fs/nfs/file.c | 2 +- + fs/notify/dnotify/dnotify.c | 2 +- + fs/notify/fanotify/fanotify.c | 8 +- + fs/notify/fanotify/fanotify.h | 2 +- + fs/notify/fsnotify.c | 8 +- + fs/notify/inotify/inotify.h | 2 +- + fs/notify/inotify/inotify_fsnotify.c | 4 +- + fs/ocfs2/alloc.c | 7 +- + fs/ocfs2/aops.c | 31 +- + fs/ocfs2/file.c | 42 +- + fs/ocfs2/file.h | 3 + + fs/ocfs2/inode.h | 6 + + fs/ocfs2/move_extents.c | 10 +- + fs/ocfs2/refcounttree.c | 464 +++- + fs/ocfs2/refcounttree.h | 7 + + fs/ocfs2/xattr.c | 4 +- + fs/orangefs/devorangefs-req.c | 13 +- + fs/orangefs/file.c | 2 +- + fs/orangefs/orangefs-debugfs.c | 6 +- + fs/overlayfs/dir.c | 3 +- + fs/pnode.c | 74 +- + fs/quota/dquot.c | 2 +- + fs/quota/quota.c | 4 +- + fs/read_write.c | 231 +- + fs/reiserfs/super.c | 4 +- + fs/splice.c | 22 +- + fs/statfs.c | 2 +- + fs/utimes.c | 2 +- + fs/xfs/xfs_file.c | 19 - + fs/xfs/xfs_reflink.c | 219 +- + include/linux/audit.h | 2 +- + include/linux/dcache.h | 4 +- + include/linux/dcookies.h | 4 +- + include/linux/file.h | 2 +- + include/linux/fs.h | 13 +- + include/linux/fsnotify.h | 12 +- + include/linux/fsnotify_backend.h | 10 +- + include/linux/mount.h | 6 +- + include/linux/net.h | 2 +- + include/linux/quota.h | 2 +- + include/linux/quotaops.h | 2 +- + include/linux/skbuff.h | 9 +- + include/linux/splice.h | 4 +- + include/linux/uio.h | 3 + + include/net/sock.h | 6 +- + include/net/tcp.h | 2 +- + include/net/udplite.h | 2 +- + kernel/audit.c | 4 +- + kernel/audit.h | 2 +- + kernel/audit_fsnotify.c | 10 +- + kernel/audit_tree.c | 2 +- + kernel/audit_watch.c | 12 +- + kernel/events/core.c | 2 +- + kernel/locking/qspinlock_stat.h | 12 +- + kernel/printk/printk.c | 2 +- + kernel/relay.c | 1 - + kernel/trace/trace.c | 2 - + lib/iov_iter.c | 98 +- + net/atm/common.c | 2 +- + net/bluetooth/l2cap_core.c | 6 +- + net/core/skbuff.c | 4 +- + net/ipv4/ip_output.c | 4 +- + net/ipv4/ping.c | 8 +- + net/ipv4/tcp.c | 7 +- + net/kcm/kcmsock.c | 5 +- + net/packet/af_packet.c | 5 +- + net/socket.c | 4 +- + net/tipc/msg.c | 4 +- + net/unix/af_unix.c | 113 +- + security/keys/keyctl.c | 2 +- + security/smack/smack_lsm.c | 2 +- + 147 files changed, 1369 insertions(+), 10411 deletions(-) + delete mode 100644 Documentation/filesystems/logfs.txt + delete mode 100644 fs/logfs/Kconfig + delete mode 100644 fs/logfs/Makefile + delete mode 100644 fs/logfs/compr.c + delete mode 100644 fs/logfs/dev_bdev.c + delete mode 100644 fs/logfs/dev_mtd.c + delete mode 100644 fs/logfs/dir.c + delete mode 100644 fs/logfs/file.c + delete mode 100644 fs/logfs/gc.c + delete mode 100644 fs/logfs/inode.c + delete mode 100644 fs/logfs/journal.c + delete mode 100644 fs/logfs/logfs.h + delete mode 100644 fs/logfs/logfs_abi.h + delete mode 100644 fs/logfs/readwrite.c + delete mode 100644 fs/logfs/segment.c + delete mode 100644 fs/logfs/super.c +Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities) +$ git merge vfs-jk/vfs +Already up-to-date. +Merging vfs-miklos/next (a2c55f286b95 Merge branch 'vfs-ovl' into next) +$ git merge vfs-miklos/next +Resolved 'fs/read_write.c' using previous resolution. +Resolved 'fs/ubifs/file.c' using previous resolution. +Auto-merging mm/shmem.c +Auto-merging include/linux/fs.h +Auto-merging fs/xfs/xfs_iops.c +Auto-merging fs/xfs/xfs_ioctl.c +Auto-merging fs/ubifs/file.c +CONFLICT (content): Merge conflict in fs/ubifs/file.c +Auto-merging fs/read_write.c +CONFLICT (content): Merge conflict in fs/read_write.c +Auto-merging fs/proc/inode.c +Auto-merging fs/proc/base.c +Auto-merging fs/overlayfs/inode.c +Auto-merging fs/nsfs.c +Auto-merging fs/nfsd/nfs4xdr.c +Auto-merging fs/namei.c +Auto-merging fs/libfs.c +Auto-merging fs/fuse/dir.c +Auto-merging fs/f2fs/namei.c +Auto-merging fs/ceph/inode.c +Auto-merging fs/btrfs/inode.c +Auto-merging Documentation/filesystems/vfs.txt +Auto-merging Documentation/filesystems/Locking +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5fe45a03ba38] Merge remote-tracking branch 'vfs-miklos/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/Locking | 6 +-- + Documentation/filesystems/porting | 7 +++ + Documentation/filesystems/vfs.txt | 14 +++--- + drivers/staging/lustre/lustre/llite/symlink.c | 1 - + fs/9p/vfs_inode.c | 1 - + fs/9p/vfs_inode_dotl.c | 1 - + fs/affs/symlink.c | 1 - + fs/afs/mntpt.c | 2 +- + fs/autofs4/symlink.c | 1 - + fs/bad_inode.c | 63 ++++++++++++++++++++++----- + fs/btrfs/inode.c | 1 - + fs/ceph/inode.c | 1 - + fs/cifs/cifsfs.c | 1 - + fs/coda/cnode.c | 1 - + fs/configfs/symlink.c | 1 - + fs/ecryptfs/inode.c | 30 +++++-------- + fs/ext2/symlink.c | 2 - + fs/ext4/symlink.c | 3 -- + fs/f2fs/namei.c | 2 - + fs/fuse/dir.c | 1 - + fs/gfs2/inode.c | 1 - + fs/hostfs/hostfs_kern.c | 1 - + fs/jffs2/symlink.c | 1 - + fs/jfs/symlink.c | 2 - + fs/kernfs/symlink.c | 1 - + fs/libfs.c | 1 - + fs/minix/inode.c | 1 - + fs/namei.c | 58 ++++++++++++++---------- + fs/ncpfs/inode.c | 1 - + fs/nfs/symlink.c | 1 - + fs/nfsd/nfs4xdr.c | 8 ++-- + fs/nfsd/vfs.c | 6 +-- + fs/nilfs2/namei.c | 1 - + fs/nsfs.c | 17 ++++++-- + fs/ocfs2/symlink.c | 1 - + fs/orangefs/symlink.c | 1 - + fs/overlayfs/inode.c | 1 - + fs/proc/base.c | 57 +++++++++--------------- + fs/proc/inode.c | 1 - + fs/proc/namespaces.c | 13 +++--- + fs/proc/self.c | 13 ------ + fs/proc/thread_self.c | 14 ------ + fs/read_write.c | 17 +++++--- + fs/reiserfs/namei.c | 1 - + fs/squashfs/symlink.c | 1 - + fs/stat.c | 8 ++-- + fs/sysv/inode.c | 1 - + fs/ubifs/file.c | 1 - + fs/xfs/xfs_ioctl.c | 4 +- + fs/xfs/xfs_iops.c | 2 - + include/linux/fs.h | 9 ++-- + include/linux/proc_ns.h | 4 +- + mm/shmem.c | 2 - + 53 files changed, 187 insertions(+), 204 deletions(-) +Merging pci/next (b08d2e61a6f9 Merge branch 'pci/host-vmd' into next) +$ git merge pci/next +Auto-merging include/linux/pci_ids.h +Auto-merging include/linux/pci.h +Auto-merging include/linux/acpi.h +Auto-merging drivers/vfio/pci/vfio_pci_config.c +Auto-merging drivers/pci/probe.c +Auto-merging drivers/pci/pci-mid.c +Auto-merging drivers/pci/msi.c +Auto-merging drivers/net/ethernet/mellanox/mlx4/main.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-pci | 7 + + .../devicetree/bindings/pci/brcm,iproc-pcie.txt | 43 +- + .../devicetree/bindings/pci/layerscape-pci.txt | 1 + + .../bindings/pci/nvidia,tegra20-pcie.txt | 110 +++ + Documentation/devicetree/bindings/pci/pci.txt | 6 + + .../devicetree/bindings/pci/qcom,pcie.txt | 14 +- + Documentation/devicetree/bindings/pci/rcar-pci.txt | 1 + + Documentation/filesystems/sysfs-pci.txt | 2 + + arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 26 + + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 63 ++ + arch/arm64/kernel/pci.c | 67 +- + drivers/acpi/pci_mcfg.c | 190 ++++- + drivers/acpi/resource.c | 57 ++ + drivers/net/ethernet/mellanox/mlx4/main.c | 84 +- + drivers/of/of_pci.c | 21 + + drivers/pci/access.c | 16 +- + drivers/pci/bus.c | 2 +- + drivers/pci/ecam.c | 12 + + drivers/pci/host/Kconfig | 16 +- + drivers/pci/host/Makefile | 19 +- + drivers/pci/host/pci-hyperv.c | 100 ++- + drivers/pci/host/pci-layerscape.c | 20 +- + drivers/pci/host/pci-rcar-gen2.c | 2 +- + drivers/pci/host/pci-tegra.c | 160 ++-- + drivers/pci/host/pci-thunder-ecam.c | 9 +- + drivers/pci/host/pci-thunder-pem.c | 94 +- + drivers/pci/host/pci-xgene.c | 126 ++- + drivers/pci/host/pcie-altera.c | 10 +- + drivers/pci/host/pcie-hisi.c | 107 ++- + drivers/pci/host/pcie-iproc-bcma.c | 1 + + drivers/pci/host/pcie-iproc-msi.c | 1 + + drivers/pci/host/pcie-iproc-platform.c | 28 +- + drivers/pci/host/pcie-iproc.c | 949 ++++++++++++++++++--- + drivers/pci/host/pcie-iproc.h | 45 +- + drivers/pci/host/pcie-qcom.c | 177 +++- + drivers/pci/host/pcie-rcar.c | 5 +- + drivers/pci/host/pcie-rockchip.c | 284 +++--- + drivers/pci/host/pcie-spear13xx.c | 6 +- + drivers/pci/host/vmd.c | 30 +- + drivers/pci/hotplug/acpiphp_glue.c | 31 +- + drivers/pci/hotplug/cpqphp_core.c | 3 +- + drivers/pci/hotplug/pci_hotplug_core.c | 10 +- + drivers/pci/hotplug/pciehp_core.c | 9 +- + drivers/pci/hotplug/pciehp_ctrl.c | 8 +- + drivers/pci/hotplug/pciehp_hpc.c | 21 +- + drivers/pci/iov.c | 70 +- + drivers/pci/msi.c | 3 +- + drivers/pci/pci-acpi.c | 100 +++ + drivers/pci/pci-mid.c | 2 +- + drivers/pci/pci-sysfs.c | 2 + + drivers/pci/pci.c | 138 ++- + drivers/pci/pci.h | 19 +- + drivers/pci/pcie/aer/aerdrv.c | 18 +- + drivers/pci/pcie/aspm.c | 22 +- + drivers/pci/pcie/pme.c | 29 +- + drivers/pci/pcie/portdrv_core.c | 3 - + drivers/pci/pcie/portdrv_pci.c | 13 +- + drivers/pci/probe.c | 245 +++--- + drivers/pci/quirks.c | 182 +++- + drivers/pci/remove.c | 2 +- + drivers/pci/rom.c | 5 + + drivers/pci/setup-res.c | 48 +- + drivers/usb/host/uhci-pci.c | 4 + + drivers/vfio/pci/vfio_pci_config.c | 2 - + include/linux/acpi.h | 7 + + include/linux/of_pci.h | 7 + + include/linux/pci-acpi.h | 4 +- + include/linux/pci-ecam.h | 9 + + include/linux/pci.h | 17 + + include/linux/pci_hotplug.h | 2 + + include/linux/pci_ids.h | 27 +- + include/uapi/linux/pci_regs.h | 8 + + 72 files changed, 3099 insertions(+), 882 deletions(-) +Merging pstore/for-next/pstore (fc46d4e453f5 ramoops: add pdata NULL check to ramoops_probe) +$ git merge pstore/for-next/pstore +Already up-to-date. +Merging hid/for-next (43768c4daf54 Merge branches 'for-4.10/upstream' and 'for-4.10/i2c-hid-nopower' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/hid-over-i2c.txt | 5 +++ + drivers/hid/i2c-hid/i2c-hid.c | 45 ++++++++++++++++++++-- + include/linux/i2c/i2c-hid.h | 6 +++ + 3 files changed, 53 insertions(+), 3 deletions(-) +Merging i2c/i2c/for-next (8641b29652af Merge branch 'i2c/for-4.10' into i2c/for-next) +$ git merge i2c/i2c/for-next +Auto-merging drivers/i2c/busses/Makefile +Auto-merging drivers/i2c/busses/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/i2c-imx-lpi2c.txt | 20 + + Documentation/devicetree/bindings/i2c/i2c-pxa.txt | 1 + + Documentation/devicetree/bindings/i2c/i2c-rcar.txt | 32 +- + .../devicetree/bindings/i2c/i2c-sh_mobile.txt | 17 +- + Documentation/i2c/busses/i2c-mlxcpld | 47 ++ + Documentation/i2c/smbus-protocol | 12 +- + MAINTAINERS | 9 + + drivers/i2c/Kconfig | 1 + + drivers/i2c/busses/Kconfig | 25 +- + drivers/i2c/busses/Makefile | 2 + + drivers/i2c/busses/i2c-axxia.c | 2 +- + drivers/i2c/busses/i2c-bcm-iproc.c | 2 +- + drivers/i2c/busses/i2c-bcm2835.c | 218 ++++--- + drivers/i2c/busses/i2c-designware-core.c | 46 +- + drivers/i2c/busses/i2c-designware-core.h | 8 + + drivers/i2c/busses/i2c-designware-pcidrv.c | 10 +- + drivers/i2c/busses/i2c-designware-platdrv.c | 23 +- + drivers/i2c/busses/i2c-dln2.c | 2 +- + drivers/i2c/busses/i2c-i801.c | 123 ++-- + drivers/i2c/busses/i2c-imx-lpi2c.c | 652 +++++++++++++++++++++ + drivers/i2c/busses/i2c-mlxcpld.c | 504 ++++++++++++++++ + drivers/i2c/busses/i2c-octeon-core.c | 46 +- + drivers/i2c/busses/i2c-pxa-pci.c | 32 +- + drivers/i2c/busses/i2c-pxa.c | 26 +- + drivers/i2c/busses/i2c-qup.c | 122 +++- + drivers/i2c/busses/i2c-rcar.c | 5 +- + drivers/i2c/busses/i2c-sh_mobile.c | 4 +- + drivers/i2c/busses/i2c-uniphier-f.c | 6 +- + drivers/i2c/busses/i2c-uniphier.c | 6 +- + drivers/i2c/busses/i2c-viperboard.c | 2 +- + drivers/i2c/busses/i2c-xlp9xx.c | 1 + + drivers/i2c/i2c-core.c | 197 ++++++- + drivers/i2c/i2c-smbus.c | 102 ---- + drivers/i2c/muxes/Kconfig | 11 + + drivers/i2c/muxes/Makefile | 1 + + drivers/i2c/muxes/i2c-mux-gpio.c | 18 +- + drivers/i2c/muxes/i2c-mux-mlxcpld.c | 220 +++++++ + drivers/i2c/muxes/i2c-mux-pca954x.c | 28 +- + drivers/mfd/88pm860x-core.c | 5 +- + include/linux/i2c-smbus.h | 27 - + include/linux/i2c.h | 26 +- + include/linux/i2c/mlxcpld.h | 52 ++ + 42 files changed, 2264 insertions(+), 429 deletions(-) + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.txt + create mode 100644 Documentation/i2c/busses/i2c-mlxcpld + create mode 100644 drivers/i2c/busses/i2c-imx-lpi2c.c + create mode 100644 drivers/i2c/busses/i2c-mlxcpld.c + create mode 100644 drivers/i2c/muxes/i2c-mux-mlxcpld.c + create mode 100644 include/linux/i2c/mlxcpld.h +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 (27ec191a79ca firmware: dmi_scan: Always show system identification string) +$ git merge dmi/master +Merge made by the 'recursive' strategy. + drivers/firmware/dmi_scan.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging hwmon-staging/hwmon-next (4fccd4a1e894 hwmon: (g762) Fix overflows and crash seen when writing limit attributes) +$ git merge hwmon-staging/hwmon-next +Already up-to-date. +Merging jc_docs/docs-next (63d0977c0e85 lib/Kconfig.debug: correct documentation paths) +$ git merge jc_docs/docs-next +Auto-merging lib/Kconfig.debug +Auto-merging include/linux/crypto.h +Auto-merging crypto/algif_aead.c +Removing Documentation/DocBook/crypto-API.tmpl +Merge made by the 'recursive' strategy. + Documentation/DocBook/Makefile | 2 +- + Documentation/DocBook/crypto-API.tmpl | 2092 --------------------------------- + Documentation/crypto/api-aead.rst | 23 + + Documentation/crypto/api-akcipher.rst | 20 + + Documentation/crypto/api-digest.rst | 35 + + Documentation/crypto/api-kpp.rst | 38 + + Documentation/crypto/api-rng.rst | 14 + + Documentation/crypto/api-samples.rst | 224 ++++ + Documentation/crypto/api-skcipher.rst | 62 + + Documentation/crypto/api.rst | 25 + + Documentation/crypto/architecture.rst | 441 +++++++ + Documentation/crypto/devel-algos.rst | 247 ++++ + Documentation/crypto/index.rst | 24 + + Documentation/crypto/intro.rst | 74 ++ + Documentation/crypto/userspace-if.rst | 387 ++++++ + Documentation/index.rst | 1 + + crypto/algif_aead.c | 14 +- + include/crypto/aead.h | 50 +- + include/crypto/dh.h | 58 + + include/crypto/ecdh.h | 58 + + include/crypto/hash.h | 2 +- + include/crypto/kpp.h | 15 +- + include/crypto/skcipher.h | 4 +- + include/linux/crypto.h | 4 +- + lib/Kconfig.debug | 19 +- + 25 files changed, 1780 insertions(+), 2153 deletions(-) + delete mode 100644 Documentation/DocBook/crypto-API.tmpl + create mode 100644 Documentation/crypto/api-aead.rst + create mode 100644 Documentation/crypto/api-akcipher.rst + create mode 100644 Documentation/crypto/api-digest.rst + create mode 100644 Documentation/crypto/api-kpp.rst + create mode 100644 Documentation/crypto/api-rng.rst + create mode 100644 Documentation/crypto/api-samples.rst + create mode 100644 Documentation/crypto/api-skcipher.rst + create mode 100644 Documentation/crypto/api.rst + create mode 100644 Documentation/crypto/architecture.rst + create mode 100644 Documentation/crypto/devel-algos.rst + create mode 100644 Documentation/crypto/index.rst + create mode 100644 Documentation/crypto/intro.rst + create mode 100644 Documentation/crypto/userspace-if.rst +Merging v4l-dvb/master (bf0396ea4727 Merge branch 'patchwork' into to_next) +$ git merge v4l-dvb/master +Auto-merging include/uapi/linux/cec.h +Auto-merging include/uapi/linux/cec-funcs.h +Auto-merging include/uapi/linux/Kbuild +Auto-merging drivers/staging/media/st-cec/stih-cec.c +Auto-merging drivers/staging/media/s5p-cec/s5p_cec.c +Removing drivers/staging/media/pulse8-cec/TODO +Removing drivers/staging/media/lirc/lirc_serial.c +Auto-merging drivers/staging/media/lirc/lirc_sasem.c +Auto-merging drivers/staging/media/davinci_vpfe/vpfe_video.c +Removing drivers/staging/media/cec/TODO +Removing drivers/staging/media/cec/Kconfig +Auto-merging drivers/staging/media/bcm2048/radio-bcm2048.c +Auto-merging drivers/media/usb/pulse8-cec/pulse8-cec.c +Auto-merging drivers/media/usb/pulse8-cec/Kconfig +Auto-merging drivers/media/dvb-core/dvb_net.c +Removing drivers/media/dvb-core/dvb_filter.c +Auto-merging drivers/media/cec/cec-api.c +Auto-merging drivers/media/cec/cec-adap.c +Auto-merging drivers/media/cec/Makefile +Auto-merging arch/arm64/boot/dts/mediatek/mt8173.dtsi +Auto-merging MAINTAINERS +Auto-merging Documentation/media/uapi/v4l/pixfmt-srggb16.rst +CONFLICT (modify/delete): Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg deleted in HEAD and modified in v4l-dvb/master. Version v4l-dvb/master of Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg left in tree. +CONFLICT (modify/delete): Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg deleted in HEAD and modified in v4l-dvb/master. Version v4l-dvb/master of Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg left in tree. +CONFLICT (modify/delete): Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg deleted in HEAD and modified in v4l-dvb/master. Version v4l-dvb/master of Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg left in tree. +Auto-merging Documentation/media/typical_media_device.svg +Auto-merging Documentation/media/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg +Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg: needs merge +Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg: needs merge +Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg: needs merge +rm 'Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg' +rm 'Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg' +rm 'Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg' +$ git commit -v -a +[master bc24404ad963] Merge remote-tracking branch 'v4l-dvb/master' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/media/exynos5-gsc.txt | 3 +- + .../devicetree/bindings/media/hix5hd2-ir.txt | 6 +- + .../devicetree/bindings/media/i2c/adv7604.txt | 3 +- + .../devicetree/bindings/media/mediatek-mdp.txt | 109 + + .../devicetree/bindings/media/mediatek-vcodec.txt | 57 +- + .../devicetree/bindings/media/renesas,fdp1.txt | 37 + + Documentation/media/Makefile | 2 +- + Documentation/media/kapi/cec-core.rst | 24 +- + Documentation/media/kapi/csi2.rst | 61 + + Documentation/media/kapi/dtv-core.rst | 8 - + Documentation/media/media_kapi.rst | 1 + + Documentation/media/typical_media_device.svg | 2974 +++++++++++++++++++- + .../media/uapi/cec/cec-ioc-adap-g-caps.rst | 156 +- + .../media/uapi/cec/cec-ioc-adap-g-log-addrs.rst | 488 ++-- + Documentation/media/uapi/cec/cec-ioc-dqevent.rst | 182 +- + Documentation/media/uapi/cec/cec-ioc-g-mode.rst | 317 +-- + Documentation/media/uapi/cec/cec-ioc-receive.rst | 418 ++- + Documentation/media/uapi/v4l/control.rst | 88 +- + Documentation/media/uapi/v4l/dev-codec.rst | 2 +- + Documentation/media/uapi/v4l/extended-controls.rst | 6 +- + Documentation/media/uapi/v4l/hsv-formats.rst | 19 + + Documentation/media/uapi/v4l/pixfmt-002.rst | 5 + + Documentation/media/uapi/v4l/pixfmt-003.rst | 5 + + Documentation/media/uapi/v4l/pixfmt-006.rst | 31 +- + Documentation/media/uapi/v4l/pixfmt-013.rst | 5 + + Documentation/media/uapi/v4l/pixfmt-packed-hsv.rst | 157 ++ + Documentation/media/uapi/v4l/pixfmt-reserved.rst | 10 +- + Documentation/media/uapi/v4l/pixfmt-rgb.rst | 2 +- + Documentation/media/uapi/v4l/pixfmt-srggb10p.rst | 2 +- + Documentation/media/uapi/v4l/pixfmt-srggb12.rst | 2 +- + .../v4l/{pixfmt-sbggr16.rst => pixfmt-srggb16.rst} | 25 +- + Documentation/media/uapi/v4l/pixfmt-srggb8.rst | 2 +- + Documentation/media/uapi/v4l/pixfmt.rst | 1 + + Documentation/media/uapi/v4l/v4l2.rst | 9 + + .../media/uapi/v4l/vidioc-g-dv-timings.rst | 11 + + Documentation/media/uapi/v4l/vidioc-g-tuner.rst | 4 +- + .../media/v4l-drivers/au0828-cardlist.rst | 18 +- + Documentation/media/v4l-drivers/bttv-cardlist.rst | 340 +-- + .../media/v4l-drivers/cx23885-cardlist.rst | 122 +- + Documentation/media/v4l-drivers/cx88-cardlist.rst | 188 +- + .../media/v4l-drivers/em28xx-cardlist.rst | 206 +- + Documentation/media/v4l-drivers/gspca-cardlist.rst | 843 +++--- + Documentation/media/v4l-drivers/index.rst | 3 + + Documentation/media/v4l-drivers/ivtv-cardlist.rst | 61 +- + Documentation/media/v4l-drivers/rcar-fdp1.rst | 37 + + .../media/v4l-drivers/saa7134-cardlist.rst | 400 +-- + .../media/v4l-drivers/saa7164-cardlist.rst | 36 +- + .../media/v4l-drivers/tm6000-cardlist.rst | 39 +- + Documentation/media/v4l-drivers/tuner-cardlist.rst | 188 +- + .../media/v4l-drivers/usbvision-cardlist.rst | 142 +- + Documentation/media/videodev2.h.rst.exceptions | 7 + + MAINTAINERS | 43 +- + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 128 + + drivers/media/Kconfig | 18 +- + drivers/media/Makefile | 4 + + drivers/{staging => }/media/cec/Makefile | 2 +- + drivers/{staging => }/media/cec/cec-adap.c | 244 +- + drivers/{staging => }/media/cec/cec-api.c | 11 +- + drivers/{staging => }/media/cec/cec-core.c | 0 + drivers/{staging => }/media/cec/cec-priv.h | 0 + drivers/media/common/b2c2/flexcop-common.h | 1 - + drivers/media/common/b2c2/flexcop-eeprom.c | 3 +- + drivers/media/common/b2c2/flexcop-i2c.c | 14 +- + drivers/media/common/b2c2/flexcop-misc.c | 9 +- + drivers/media/common/b2c2/flexcop.c | 3 +- + drivers/media/common/cx2341x.c | 12 +- + drivers/media/common/saa7146/saa7146_video.c | 4 + + drivers/media/common/siano/smsdvb-main.c | 2 +- + drivers/media/common/tveeprom.c | 77 +- + drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 411 ++- + drivers/media/dvb-core/Kconfig | 17 +- + drivers/media/dvb-core/Makefile | 2 +- + drivers/media/dvb-core/demux.h | 5 +- + drivers/media/dvb-core/dmxdev.c | 28 +- + drivers/media/dvb-core/dvb-usb-ids.h | 2 + + drivers/media/dvb-core/dvb_ca_en50221.c | 60 +- + drivers/media/dvb-core/dvb_demux.c | 115 +- + drivers/media/dvb-core/dvb_demux.h | 2 - + drivers/media/dvb-core/dvb_filter.c | 603 ---- + drivers/media/dvb-core/dvb_frontend.c | 107 +- + drivers/media/dvb-core/dvb_frontend.h | 10 +- + drivers/media/dvb-core/dvb_net.c | 952 ++++--- + drivers/media/dvb-core/dvbdev.c | 44 +- + drivers/media/dvb-core/dvbdev.h | 25 +- + drivers/media/dvb-frontends/Kconfig | 9 +- + drivers/media/dvb-frontends/af9013.c | 4 +- + drivers/media/dvb-frontends/af9033.c | 2 +- + drivers/media/dvb-frontends/as102_fe.c | 2 +- + drivers/media/dvb-frontends/ascot2e.c | 3 +- + drivers/media/dvb-frontends/atbm8830.c | 2 +- + drivers/media/dvb-frontends/au8522_common.c | 4 +- + drivers/media/dvb-frontends/au8522_dig.c | 4 +- + drivers/media/dvb-frontends/bcm3510.c | 4 +- + drivers/media/dvb-frontends/cx22700.c | 4 +- + drivers/media/dvb-frontends/cx24110.c | 8 +- + drivers/media/dvb-frontends/cx24113.c | 7 +- + drivers/media/dvb-frontends/cx24116.c | 12 +- + drivers/media/dvb-frontends/cx24117.c | 8 +- + drivers/media/dvb-frontends/cx24120.c | 7 +- + drivers/media/dvb-frontends/cx24123.c | 8 +- + drivers/media/dvb-frontends/cxd2841er.c | 6 +- + drivers/media/dvb-frontends/dib0070.c | 53 +- + drivers/media/dvb-frontends/dib0090.c | 165 +- + drivers/media/dvb-frontends/dib3000mb.c | 141 +- + drivers/media/dvb-frontends/dib3000mb_priv.h | 16 +- + drivers/media/dvb-frontends/dib3000mc.c | 12 +- + drivers/media/dvb-frontends/dib7000m.c | 77 +- + drivers/media/dvb-frontends/dib7000p.c | 131 +- + drivers/media/dvb-frontends/dib8000.c | 261 +- + drivers/media/dvb-frontends/dib9000.c | 175 +- + drivers/media/dvb-frontends/dibx000_common.c | 46 +- + drivers/media/dvb-frontends/dibx000_common.h | 2 - + drivers/media/dvb-frontends/drx39xyj/drxj.c | 4 +- + drivers/media/dvb-frontends/drxd_hard.c | 2 +- + drivers/media/dvb-frontends/drxk_hard.c | 2 +- + drivers/media/dvb-frontends/ds3000.c | 19 +- + drivers/media/dvb-frontends/dvb-pll.c | 22 +- + drivers/media/dvb-frontends/dvb_dummy_fe.c | 12 +- + drivers/media/dvb-frontends/ec100.c | 4 +- + drivers/media/dvb-frontends/gp8psk-fe.c | 4 +- + drivers/media/dvb-frontends/hd29l2.c | 4 +- + drivers/media/dvb-frontends/helene.c | 3 +- + drivers/media/dvb-frontends/horus3a.c | 3 +- + drivers/media/dvb-frontends/itd1000.c | 3 +- + drivers/media/dvb-frontends/ix2505v.c | 3 +- + drivers/media/dvb-frontends/l64781.c | 4 +- + drivers/media/dvb-frontends/lg2160.c | 4 +- + drivers/media/dvb-frontends/lgdt3305.c | 8 +- + drivers/media/dvb-frontends/lgdt3306a.c | 4 +- + drivers/media/dvb-frontends/lgdt330x.c | 11 +- + drivers/media/dvb-frontends/lgs8gl5.c | 4 +- + drivers/media/dvb-frontends/lgs8gxx.c | 2 +- + drivers/media/dvb-frontends/m88ds3103.c | 4 +- + drivers/media/dvb-frontends/m88rs2000.c | 13 +- + drivers/media/dvb-frontends/mb86a16.c | 2 +- + drivers/media/dvb-frontends/mb86a20s.c | 5 +- + drivers/media/dvb-frontends/mn88472.c | 2 +- + drivers/media/dvb-frontends/mn88473.c | 201 +- + drivers/media/dvb-frontends/mn88473_priv.h | 2 + + drivers/media/dvb-frontends/mt312.c | 9 +- + drivers/media/dvb-frontends/mt352.c | 4 +- + drivers/media/dvb-frontends/nxt200x.c | 15 +- + drivers/media/dvb-frontends/nxt6000.c | 140 +- + drivers/media/dvb-frontends/or51132.c | 10 +- + drivers/media/dvb-frontends/or51211.c | 7 +- + drivers/media/dvb-frontends/rtl2830.c | 2 +- + drivers/media/dvb-frontends/rtl2832.c | 2 +- + drivers/media/dvb-frontends/s5h1409.c | 8 +- + drivers/media/dvb-frontends/s5h1411.c | 8 +- + drivers/media/dvb-frontends/s5h1420.c | 4 +- + drivers/media/dvb-frontends/s5h1432.c | 8 +- + drivers/media/dvb-frontends/s921.c | 8 +- + drivers/media/dvb-frontends/si2165.c | 2 +- + drivers/media/dvb-frontends/si21xx.c | 10 +- + drivers/media/dvb-frontends/sp8870.c | 4 +- + drivers/media/dvb-frontends/sp887x.c | 7 +- + drivers/media/dvb-frontends/stb0899_drv.c | 34 +- + drivers/media/dvb-frontends/stb6000.c | 3 +- + drivers/media/dvb-frontends/stb6100.c | 6 +- + drivers/media/dvb-frontends/stv0288.c | 13 +- + drivers/media/dvb-frontends/stv0297.c | 8 +- + drivers/media/dvb-frontends/stv0299.c | 11 +- + drivers/media/dvb-frontends/stv0367.c | 4 +- + drivers/media/dvb-frontends/stv0900_core.c | 2 +- + drivers/media/dvb-frontends/stv0900_sw.c | 3 +- + drivers/media/dvb-frontends/stv090x.c | 28 +- + drivers/media/dvb-frontends/stv6110.c | 3 +- + drivers/media/dvb-frontends/stv6110x.c | 4 +- + drivers/media/dvb-frontends/tc90522.c | 7 +- + drivers/media/dvb-frontends/tda10021.c | 7 +- + drivers/media/dvb-frontends/tda10023.c | 10 +- + drivers/media/dvb-frontends/tda10048.c | 16 +- + drivers/media/dvb-frontends/tda1004x.c | 4 +- + drivers/media/dvb-frontends/tda10071.c | 4 +- + drivers/media/dvb-frontends/tda10086.c | 2 +- + drivers/media/dvb-frontends/tda18271c2dd.c | 3 +- + drivers/media/dvb-frontends/tda665x.c | 3 +- + drivers/media/dvb-frontends/tda8083.c | 4 +- + drivers/media/dvb-frontends/tda8261.c | 3 +- + drivers/media/dvb-frontends/tda826x.c | 3 +- + drivers/media/dvb-frontends/ts2020.c | 3 +- + drivers/media/dvb-frontends/tua6100.c | 3 +- + drivers/media/dvb-frontends/ves1820.c | 12 +- + drivers/media/dvb-frontends/ves1x93.c | 4 +- + drivers/media/dvb-frontends/zl10036.c | 8 +- + drivers/media/dvb-frontends/zl10039.c | 6 +- + drivers/media/dvb-frontends/zl10353.c | 4 +- + drivers/media/firewire/firedtv-avc.c | 4 +- + drivers/media/firewire/firedtv-rc.c | 5 +- + drivers/media/i2c/Kconfig | 6 +- + drivers/media/i2c/ad5820.c | 5 +- + drivers/media/i2c/adv7604.c | 24 +- + drivers/media/i2c/cx25840/cx25840-core.c | 11 +- + drivers/media/i2c/cx25840/cx25840-ir.c | 7 +- + drivers/media/i2c/msp3400-driver.c | 90 +- + drivers/media/i2c/msp3400-kthreads.c | 115 +- + drivers/media/i2c/smiapp-pll.c | 3 +- + drivers/media/i2c/smiapp/smiapp-core.c | 946 ++++--- + drivers/media/i2c/smiapp/smiapp-regs.c | 4 +- + drivers/media/i2c/smiapp/smiapp.h | 28 +- + drivers/media/i2c/soc_camera/ov772x.c | 3 +- + drivers/media/i2c/soc_camera/ov9740.c | 3 +- + drivers/media/i2c/soc_camera/tw9910.c | 3 +- + drivers/media/i2c/tvaudio.c | 5 +- + drivers/media/i2c/tvp514x.c | 6 +- + drivers/media/i2c/tvp5150.c | 291 +- + drivers/media/media-device.c | 32 +- + drivers/media/media-entity.c | 6 + + drivers/media/pci/b2c2/flexcop-dma.c | 6 +- + drivers/media/pci/b2c2/flexcop-pci.c | 7 +- + drivers/media/pci/bt8xx/btcx-risc.c | 46 +- + drivers/media/pci/bt8xx/bttv-cards.c | 9 +- + drivers/media/pci/bt8xx/bttv-driver.c | 6 +- + drivers/media/pci/bt8xx/bttv-i2c.c | 6 +- + drivers/media/pci/bt8xx/bttv-input.c | 4 +- + drivers/media/pci/bt8xx/dst.c | 278 +- + drivers/media/pci/bt8xx/dvb-bt8xx.c | 25 +- + drivers/media/pci/cobalt/cobalt-v4l2.c | 23 +- + drivers/media/pci/cx18/cx18-alsa-main.c | 8 +- + drivers/media/pci/cx18/cx18-av-core.c | 17 +- + drivers/media/pci/cx18/cx18-av-firmware.c | 3 +- + drivers/media/pci/cx18/cx18-controls.c | 9 +- + drivers/media/pci/cx18/cx18-driver.c | 35 +- + drivers/media/pci/cx18/cx18-dvb.c | 6 +- + drivers/media/pci/cx18/cx18-fileops.c | 6 +- + drivers/media/pci/cx18/cx18-ioctl.c | 6 +- + drivers/media/pci/cx18/cx18-irq.c | 4 +- + drivers/media/pci/cx18/cx18-mailbox.c | 39 +- + drivers/media/pci/cx18/cx18-queue.c | 8 +- + drivers/media/pci/cx18/cx18-streams.c | 7 +- + drivers/media/pci/cx23885/altera-ci.c | 15 +- + drivers/media/pci/cx23885/altera-ci.h | 14 +- + drivers/media/pci/cx23885/cimax2.c | 15 +- + drivers/media/pci/cx23885/cx23885-417.c | 65 +- + drivers/media/pci/cx23885/cx23885-alsa.c | 30 +- + drivers/media/pci/cx23885/cx23885-cards.c | 53 +- + drivers/media/pci/cx23885/cx23885-core.c | 146 +- + drivers/media/pci/cx23885/cx23885-dvb.c | 41 +- + drivers/media/pci/cx23885/cx23885-f300.c | 2 +- + drivers/media/pci/cx23885/cx23885-i2c.c | 27 +- + drivers/media/pci/cx23885/cx23885-input.c | 6 +- + drivers/media/pci/cx23885/cx23885-ir.c | 4 +- + drivers/media/pci/cx23885/cx23885-vbi.c | 7 +- + drivers/media/pci/cx23885/cx23885-video.c | 26 +- + drivers/media/pci/cx23885/cx23885.h | 2 + + drivers/media/pci/cx23885/cx23888-ir.c | 13 +- + drivers/media/pci/cx23885/netup-eeprom.c | 4 +- + drivers/media/pci/cx23885/netup-init.c | 8 +- + drivers/media/pci/cx88/cx88-alsa.c | 304 +- + drivers/media/pci/cx88/cx88-blackbird.c | 292 +- + drivers/media/pci/cx88/cx88-cards.c | 485 ++-- + drivers/media/pci/cx88/cx88-core.c | 420 +-- + drivers/media/pci/cx88/cx88-dsp.c | 136 +- + drivers/media/pci/cx88/cx88-dvb.c | 331 ++- + drivers/media/pci/cx88/cx88-i2c.c | 136 +- + drivers/media/pci/cx88/cx88-input.c | 60 +- + drivers/media/pci/cx88/cx88-mpeg.c | 315 +-- + drivers/media/pci/cx88/cx88-reg.h | 123 +- + drivers/media/pci/cx88/cx88-tvaudio.c | 169 +- + drivers/media/pci/cx88/cx88-vbi.c | 47 +- + drivers/media/pci/cx88/cx88-video.c | 403 +-- + drivers/media/pci/cx88/cx88-vp3054-i2c.c | 60 +- + drivers/media/pci/cx88/cx88-vp3054-i2c.h | 38 +- + drivers/media/pci/cx88/cx88.h | 203 +- + drivers/media/pci/ddbridge/ddbridge-core.c | 6 +- + drivers/media/pci/dm1105/dm1105.c | 3 +- + drivers/media/pci/ivtv/ivtv-alsa-main.c | 12 +- + drivers/media/pci/ivtv/ivtv-driver.c | 37 +- + drivers/media/pci/ivtv/ivtv-firmware.c | 4 +- + drivers/media/pci/ivtv/ivtv-yuv.c | 8 +- + drivers/media/pci/ivtv/ivtvfb.c | 3 +- + drivers/media/pci/meye/meye.c | 17 +- + drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 13 +- + drivers/media/pci/pluto2/pluto2.c | 4 +- + drivers/media/pci/pt1/pt1.c | 7 +- + drivers/media/pci/pt1/va1j5jf8007s.c | 2 +- + drivers/media/pci/pt1/va1j5jf8007t.c | 2 +- + drivers/media/pci/saa7134/saa7134-alsa.c | 3 +- + drivers/media/pci/saa7134/saa7134-cards.c | 8 +- + drivers/media/pci/saa7134/saa7134-core.c | 39 +- + drivers/media/pci/saa7134/saa7134-dvb.c | 32 +- + drivers/media/pci/saa7134/saa7134-i2c.c | 31 + + drivers/media/pci/saa7134/saa7134-input.c | 13 +- + drivers/media/pci/saa7164/saa7164-buffer.c | 3 +- + drivers/media/pci/saa7164/saa7164-bus.c | 4 +- + drivers/media/pci/saa7164/saa7164-cards.c | 4 +- + drivers/media/pci/saa7164/saa7164-cmd.c | 12 +- + drivers/media/pci/saa7164/saa7164-core.c | 66 +- + drivers/media/pci/saa7164/saa7164-dvb.c | 34 +- + drivers/media/pci/saa7164/saa7164-encoder.c | 18 +- + drivers/media/pci/saa7164/saa7164-fw.c | 10 +- + drivers/media/pci/saa7164/saa7164-vbi.c | 14 +- + drivers/media/pci/solo6x10/solo6x10-v4l2.c | 4 +- + drivers/media/pci/solo6x10/solo6x10.h | 3 + + drivers/media/pci/ttpci/Makefile | 2 +- + drivers/media/pci/ttpci/av7110.c | 49 +- + drivers/media/pci/ttpci/av7110.h | 7 +- + drivers/media/pci/ttpci/av7110_hw.c | 12 +- + drivers/media/pci/ttpci/budget-av.c | 3 +- + drivers/media/pci/ttpci/budget-ci.c | 4 +- + drivers/media/pci/ttpci/budget-patch.c | 3 +- + drivers/media/pci/ttpci/budget.c | 3 +- + drivers/media/pci/ttpci/budget.h | 8 +- + drivers/media/pci/ttpci/dvb_filter.c | 114 + + drivers/media/{dvb-core => pci/ttpci}/dvb_filter.h | 0 + drivers/media/pci/ttpci/ttpci-eeprom.c | 3 +- + drivers/media/pci/tw5864/tw5864-reg.h | 8 + + drivers/media/pci/tw5864/tw5864-video.c | 13 +- + drivers/media/pci/tw68/tw68-video.c | 16 +- + drivers/media/pci/zoran/zoran_device.c | 35 +- + drivers/media/pci/zoran/zoran_driver.c | 2 +- + drivers/media/platform/Kconfig | 49 +- + drivers/media/platform/Makefile | 3 + + drivers/media/platform/atmel/atmel-isc.c | 9 +- + drivers/media/platform/blackfin/bfin_capture.c | 6 +- + drivers/media/platform/blackfin/ppi.c | 2 + + drivers/media/platform/coda/coda-common.c | 7 +- + drivers/media/platform/coda/coda-h264.c | 1 + + drivers/media/platform/davinci/dm355_ccdc.c | 4 +- + drivers/media/platform/davinci/dm644x_ccdc.c | 4 +- + drivers/media/platform/davinci/vpbe.c | 82 +- + drivers/media/platform/davinci/vpfe_capture.c | 91 +- + drivers/media/platform/davinci/vpif_capture.c | 37 +- + drivers/media/platform/davinci/vpif_display.c | 39 +- + drivers/media/platform/davinci/vpss.c | 7 +- + drivers/media/platform/exynos-gsc/gsc-core.c | 279 +- + drivers/media/platform/exynos-gsc/gsc-core.h | 11 +- + drivers/media/platform/exynos-gsc/gsc-m2m.c | 38 +- + drivers/media/platform/exynos4-is/fimc-core.c | 14 +- + drivers/media/platform/exynos4-is/media-dev.c | 3 +- + drivers/media/platform/marvell-ccic/mcam-core.c | 26 +- + drivers/media/platform/mtk-mdp/Makefile | 9 + + drivers/media/platform/mtk-mdp/mtk_mdp_comp.c | 159 ++ + drivers/media/platform/mtk-mdp/mtk_mdp_comp.h | 72 + + drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 290 ++ + drivers/media/platform/mtk-mdp/mtk_mdp_core.h | 260 ++ + drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h | 126 + + drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 1286 +++++++++ + drivers/media/platform/mtk-mdp/mtk_mdp_m2m.h | 22 + + drivers/media/platform/mtk-mdp/mtk_mdp_regs.c | 156 + + drivers/media/platform/mtk-mdp/mtk_mdp_regs.h | 31 + + drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c | 145 + + drivers/media/platform/mtk-mdp/mtk_mdp_vpu.h | 41 + + drivers/media/platform/mtk-vcodec/Makefile | 15 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 1451 ++++++++++ + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h | 88 + + .../media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 394 +++ + .../media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 202 ++ + .../media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h | 28 + + drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 62 +- + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 8 +- + .../media/platform/mtk-vcodec/mtk_vcodec_intr.c | 3 +- + .../media/platform/mtk-vcodec/mtk_vcodec_util.c | 33 +- + .../media/platform/mtk-vcodec/mtk_vcodec_util.h | 5 + + .../media/platform/mtk-vcodec/vdec/vdec_h264_if.c | 507 ++++ + .../media/platform/mtk-vcodec/vdec/vdec_vp8_if.c | 634 +++++ + .../media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 967 +++++++ + drivers/media/platform/mtk-vcodec/vdec_drv_base.h | 56 + + drivers/media/platform/mtk-vcodec/vdec_drv_if.c | 122 + + drivers/media/platform/mtk-vcodec/vdec_drv_if.h | 101 + + drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h | 103 + + drivers/media/platform/mtk-vcodec/vdec_vpu_if.c | 170 ++ + drivers/media/platform/mtk-vcodec/vdec_vpu_if.h | 96 + + drivers/media/platform/mtk-vpu/mtk_vpu.c | 21 +- + drivers/media/platform/mtk-vpu/mtk_vpu.h | 48 +- + drivers/media/platform/mx2_emmaprp.c | 10 +- + drivers/media/platform/omap/omap_vout.c | 24 +- + drivers/media/platform/omap/omap_vout_vrfb.c | 5 +- + drivers/media/platform/omap3isp/isp.c | 23 +- + drivers/media/platform/omap3isp/ispccdc.c | 9 +- + drivers/media/platform/omap3isp/ispcsi2.c | 13 +- + drivers/media/platform/omap3isp/ispcsiphy.c | 4 +- + drivers/media/platform/omap3isp/isph3a_aewb.c | 8 +- + drivers/media/platform/omap3isp/isph3a_af.c | 8 +- + drivers/media/platform/omap3isp/isphist.c | 28 +- + drivers/media/platform/omap3isp/ispstat.c | 58 +- + drivers/media/platform/pxa_camera.c | 18 +- + drivers/media/platform/rcar-fcp.c | 1 + + drivers/media/platform/rcar_fdp1.c | 2445 ++++++++++++++++ + drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c | 17 +- + drivers/media/platform/s5p-mfc/regs-mfc-v6.h | 3 +- + drivers/media/platform/s5p-mfc/regs-mfc-v8.h | 2 +- + drivers/media/platform/s5p-mfc/regs-mfc.h | 3 + + drivers/media/platform/s5p-mfc/s5p_mfc.c | 16 +- + drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 2 + + drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 13 +- + drivers/media/platform/s5p-mfc/s5p_mfc_opr.c | 6 +- + drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 7 +- + drivers/media/platform/s5p-mfc/s5p_mfc_pm.c | 17 +- + drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 1 + + .../media/platform/sti/c8sectpfe/c8sectpfe-core.c | 24 +- + drivers/media/platform/sti/hva/hva-hw.c | 8 +- + drivers/media/platform/ti-vpe/Makefile | 10 +- + drivers/media/platform/ti-vpe/cal.c | 14 +- + drivers/media/platform/ti-vpe/csc.c | 18 +- + drivers/media/platform/ti-vpe/csc.h | 2 +- + drivers/media/platform/ti-vpe/sc.c | 28 +- + drivers/media/platform/ti-vpe/sc.h | 11 +- + drivers/media/platform/ti-vpe/vpdma.c | 355 ++- + drivers/media/platform/ti-vpe/vpdma.h | 85 +- + drivers/media/platform/ti-vpe/vpdma_priv.h | 130 +- + drivers/media/platform/ti-vpe/vpe.c | 471 +++- + drivers/media/platform/via-camera.c | 7 +- + drivers/media/platform/vivid/Kconfig | 2 +- + drivers/media/platform/vivid/vivid-core.c | 4 +- + drivers/media/platform/vivid/vivid-core.h | 3 +- + drivers/media/platform/vivid/vivid-ctrls.c | 25 + + drivers/media/platform/vivid/vivid-vid-cap.c | 17 +- + drivers/media/platform/vivid/vivid-vid-common.c | 68 +- + drivers/media/platform/vivid/vivid-vid-out.c | 1 + + drivers/media/platform/vsp1/vsp1_drv.c | 1 + + drivers/media/platform/vsp1/vsp1_pipe.c | 8 + + drivers/media/platform/vsp1/vsp1_rwpf.c | 2 + + drivers/media/platform/vsp1/vsp1_video.c | 5 + + drivers/media/radio/radio-gemtek.c | 8 +- + drivers/media/radio/radio-wl1273.c | 3 +- + drivers/media/radio/si470x/radio-si470x-i2c.c | 7 +- + drivers/media/radio/si470x/radio-si470x-usb.c | 15 +- + drivers/media/radio/si4713/si4713.c | 13 +- + drivers/media/radio/wl128x/fmdrv_common.c | 46 +- + drivers/media/radio/wl128x/fmdrv_rx.c | 8 +- + drivers/media/rc/Kconfig | 17 + + drivers/media/rc/Makefile | 1 + + drivers/media/rc/ati_remote.c | 3 +- + drivers/media/rc/ene_ir.c | 3 +- + drivers/media/rc/fintek-cir.c | 6 +- + drivers/media/rc/imon.c | 61 +- + drivers/media/rc/ir-hix5hd2.c | 25 +- + drivers/media/rc/ir-sanyo-decoder.c | 3 +- + drivers/media/rc/ite-cir.c | 11 +- + drivers/media/rc/lirc_dev.c | 21 +- + drivers/media/rc/mceusb.c | 102 +- + drivers/media/rc/meson-ir.c | 1 + + drivers/media/rc/nuvoton-cir.c | 143 +- + drivers/media/rc/nuvoton-cir.h | 4 +- + drivers/media/rc/rc-ir-raw.c | 17 +- + drivers/media/rc/rc-main.c | 70 +- + drivers/media/rc/redrat3.c | 327 ++- + drivers/media/rc/serial_ir.c | 844 ++++++ + drivers/media/rc/streamzap.c | 11 +- + drivers/media/rc/winbond-cir.c | 13 +- + drivers/media/spi/gs1662.c | 4 +- + drivers/media/tuners/fc0011.c | 11 +- + drivers/media/tuners/fc0012.c | 3 +- + drivers/media/tuners/fc0013.c | 3 +- + drivers/media/tuners/max2165.c | 4 +- + drivers/media/tuners/mc44s803.c | 8 +- + drivers/media/tuners/mt2060.c | 3 +- + drivers/media/tuners/mt2063.c | 4 +- + drivers/media/tuners/mt20xx.c | 25 +- + drivers/media/tuners/mt2131.c | 3 +- + drivers/media/tuners/mt2266.c | 3 +- + drivers/media/tuners/mxl5005s.c | 3 +- + drivers/media/tuners/mxl5007t.c | 4 +- + drivers/media/tuners/qt1010.c | 3 +- + drivers/media/tuners/r820t.c | 4 +- + drivers/media/tuners/tda18218.c | 3 +- + drivers/media/tuners/tda18271-common.c | 4 +- + drivers/media/tuners/tda18271-fe.c | 7 +- + drivers/media/tuners/tda18271-maps.c | 6 +- + drivers/media/tuners/tda827x.c | 3 +- + drivers/media/tuners/tda8290.c | 8 +- + drivers/media/tuners/tda9887.c | 2 +- + drivers/media/tuners/tea5761.c | 10 +- + drivers/media/tuners/tea5767.c | 4 +- + drivers/media/tuners/tuner-simple.c | 49 +- + drivers/media/tuners/tuner-xc2028.c | 120 +- + drivers/media/tuners/xc4000.c | 29 +- + drivers/media/tuners/xc5000.c | 4 +- + drivers/media/usb/Kconfig | 5 + + drivers/media/usb/Makefile | 1 + + drivers/media/usb/au0828/au0828-video.c | 3 +- + drivers/media/usb/b2c2/flexcop-usb.c | 11 +- + drivers/media/usb/cpia2/cpia2_usb.c | 4 +- + drivers/media/usb/cx231xx/cx231xx-core.c | 10 +- + drivers/media/usb/cx231xx/cx231xx-dvb.c | 4 +- + drivers/media/usb/dvb-usb-v2/af9035.c | 2 + + drivers/media/usb/dvb-usb-v2/dvbsky.c | 4 + + drivers/media/usb/dvb-usb-v2/lmedm04.c | 14 +- + drivers/media/usb/dvb-usb-v2/mxl111sf-demod.c | 2 +- + drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.c | 12 +- + drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c | 3 +- + drivers/media/usb/dvb-usb-v2/mxl111sf.c | 10 +- + drivers/media/usb/dvb-usb/af9005-fe.c | 4 +- + drivers/media/usb/dvb-usb/af9005.c | 1 - + drivers/media/usb/dvb-usb/cinergyT2-core.c | 6 +- + drivers/media/usb/dvb-usb/cinergyT2-fe.c | 4 +- + drivers/media/usb/dvb-usb/cxusb.c | 26 + + drivers/media/usb/dvb-usb/cxusb.h | 5 + + drivers/media/usb/dvb-usb/dib0700_core.c | 5 +- + drivers/media/usb/dvb-usb/dib0700_devices.c | 3 +- + drivers/media/usb/dvb-usb/dibusb-common.c | 2 +- + drivers/media/usb/dvb-usb/dibusb-mc-common.c | 1 - + drivers/media/usb/dvb-usb/dtt200u-fe.c | 4 +- + drivers/media/usb/dvb-usb/dvb-usb-dvb.c | 3 +- + drivers/media/usb/dvb-usb/dvb-usb-firmware.c | 6 +- + drivers/media/usb/dvb-usb/dvb-usb.h | 6 +- + drivers/media/usb/dvb-usb/dw2102.c | 12 +- + drivers/media/usb/dvb-usb/friio-fe.c | 4 +- + drivers/media/usb/dvb-usb/friio.c | 4 +- + drivers/media/usb/dvb-usb/gp8psk.c | 3 +- + drivers/media/usb/dvb-usb/m920x.c | 10 +- + drivers/media/usb/dvb-usb/opera1.c | 3 +- + drivers/media/usb/dvb-usb/technisat-usb2.c | 3 +- + drivers/media/usb/dvb-usb/vp702x-fe.c | 4 +- + drivers/media/usb/dvb-usb/vp7045-fe.c | 4 +- + drivers/media/usb/em28xx/Kconfig | 2 +- + drivers/media/usb/em28xx/em28xx-audio.c | 72 +- + drivers/media/usb/em28xx/em28xx-camera.c | 69 +- + drivers/media/usb/em28xx/em28xx-cards.c | 191 +- + drivers/media/usb/em28xx/em28xx-core.c | 177 +- + drivers/media/usb/em28xx/em28xx-dvb.c | 102 +- + drivers/media/usb/em28xx/em28xx-i2c.c | 289 +- + drivers/media/usb/em28xx/em28xx-input.c | 47 +- + drivers/media/usb/em28xx/em28xx-vbi.c | 9 +- + drivers/media/usb/em28xx/em28xx-video.c | 152 +- + drivers/media/usb/em28xx/em28xx.h | 17 - + drivers/media/usb/go7007/Kconfig | 2 +- + drivers/media/usb/gspca/gspca.c | 3 +- + drivers/media/usb/gspca/jl2005bcd.c | 5 +- + drivers/media/usb/gspca/m5602/m5602_core.c | 11 +- + drivers/media/usb/gspca/mr97310a.c | 3 +- + drivers/media/usb/gspca/ov519.c | 3 +- + drivers/media/usb/gspca/pac207.c | 4 +- + drivers/media/usb/gspca/pac7302.c | 3 +- + drivers/media/usb/gspca/sn9c20x.c | 6 +- + drivers/media/usb/gspca/spca506.c | 3 +- + drivers/media/usb/gspca/sq905.c | 3 +- + drivers/media/usb/gspca/sq905c.c | 9 +- + drivers/media/usb/gspca/stv06xx/stv06xx.c | 27 +- + drivers/media/usb/gspca/sunplus.c | 3 +- + drivers/media/usb/gspca/topro.c | 3 +- + drivers/media/usb/gspca/zc3xx.c | 3 +- + drivers/media/usb/hdpvr/hdpvr-core.c | 9 +- + drivers/media/usb/hdpvr/hdpvr-i2c.c | 7 +- + drivers/media/usb/hdpvr/hdpvr-video.c | 26 +- + .../media => media/usb}/pulse8-cec/Kconfig | 2 +- + .../media => media/usb}/pulse8-cec/Makefile | 0 + .../media => media/usb}/pulse8-cec/pulse8-cec.c | 8 + + drivers/media/usb/pvrusb2/pvrusb2-audio.c | 4 +- + drivers/media/usb/pvrusb2/pvrusb2-cs53l32a.c | 4 +- + drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.c | 4 +- + drivers/media/usb/pvrusb2/pvrusb2-debugifc.c | 4 +- + drivers/media/usb/pvrusb2/pvrusb2-eeprom.c | 7 +- + drivers/media/usb/pvrusb2/pvrusb2-encoder.c | 29 +- + drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 181 +- + drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c | 47 +- + drivers/media/usb/pvrusb2/pvrusb2-io.c | 35 +- + drivers/media/usb/pvrusb2/pvrusb2-ioread.c | 36 +- + drivers/media/usb/pvrusb2/pvrusb2-std.c | 3 +- + drivers/media/usb/pvrusb2/pvrusb2-sysfs.c | 1 - + drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 10 +- + drivers/media/usb/pvrusb2/pvrusb2-video-v4l.c | 4 +- + drivers/media/usb/pvrusb2/pvrusb2-wm8775.c | 3 +- + drivers/media/usb/pwc/pwc-if.c | 4 +- + drivers/media/usb/pwc/pwc-v4l.c | 6 +- + drivers/media/usb/siano/smsusb.c | 4 +- + drivers/media/usb/stkwebcam/stk-sensor.c | 10 +- + drivers/media/usb/stkwebcam/stk-webcam.c | 14 +- + drivers/media/usb/stkwebcam/stk-webcam.h | 2 +- + drivers/media/usb/tm6000/tm6000-alsa.c | 4 +- + drivers/media/usb/tm6000/tm6000-core.c | 14 +- + drivers/media/usb/tm6000/tm6000-dvb.c | 16 +- + drivers/media/usb/tm6000/tm6000-i2c.c | 3 +- + drivers/media/usb/tm6000/tm6000-stds.c | 3 +- + drivers/media/usb/tm6000/tm6000-video.c | 18 +- + drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | 3 +- + drivers/media/usb/ttusb-dec/ttusb_dec.c | 92 +- + drivers/media/usb/ttusb-dec/ttusbdecfe.c | 8 +- + drivers/media/usb/usbtv/usbtv-video.c | 105 +- + drivers/media/usb/usbtv/usbtv.h | 3 + + drivers/media/usb/usbvision/usbvision-core.c | 20 +- + drivers/media/usb/usbvision/usbvision-video.c | 4 +- + drivers/media/usb/uvc/uvc_driver.c | 177 +- + drivers/media/usb/uvc/uvc_v4l2.c | 11 +- + drivers/media/usb/uvc/uvcvideo.h | 12 + + drivers/media/usb/zr364xx/zr364xx.c | 6 +- + drivers/media/v4l2-core/Kconfig | 1 + + drivers/media/v4l2-core/tuner-core.c | 121 +- + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 30 +- + drivers/media/v4l2-core/v4l2-ctrls.c | 2 + + drivers/media/v4l2-core/v4l2-dv-timings.c | 59 +- + drivers/media/v4l2-core/v4l2-flash-led-class.c | 16 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 103 +- + drivers/media/v4l2-core/videobuf-core.c | 3 +- + drivers/media/v4l2-core/videobuf2-core.c | 25 +- + drivers/media/v4l2-core/videobuf2-v4l2.c | 10 +- + drivers/media/v4l2-core/videobuf2-vmalloc.c | 3 +- + drivers/staging/media/Kconfig | 4 - + drivers/staging/media/Makefile | 2 - + drivers/staging/media/bcm2048/radio-bcm2048.c | 66 +- + drivers/staging/media/bcm2048/radio-bcm2048.h | 5 - + drivers/staging/media/cec/Kconfig | 12 - + drivers/staging/media/cec/TODO | 32 - + drivers/staging/media/davinci_vpfe/Makefile | 4 +- + drivers/staging/media/davinci_vpfe/dm365_resizer.c | 31 +- + drivers/staging/media/davinci_vpfe/dm365_resizer.h | 2 +- + drivers/staging/media/davinci_vpfe/vpfe_video.c | 4 +- + drivers/staging/media/lirc/Kconfig | 13 - + drivers/staging/media/lirc/Makefile | 1 - + drivers/staging/media/lirc/lirc_imon.c | 11 +- + drivers/staging/media/lirc/lirc_sasem.c | 5 +- + drivers/staging/media/lirc/lirc_serial.c | 1130 -------- + drivers/staging/media/pulse8-cec/TODO | 52 - + drivers/staging/media/s5p-cec/Kconfig | 2 +- + drivers/staging/media/s5p-cec/TODO | 12 +- + drivers/staging/media/s5p-cec/s5p_cec.c | 5 +- + drivers/staging/media/st-cec/Kconfig | 2 +- + drivers/staging/media/st-cec/TODO | 7 + + drivers/staging/media/st-cec/stih-cec.c | 2 +- + include/media/cec.h | 2 +- + include/media/media-device.h | 38 +- + include/media/rc-core.h | 18 + + include/media/v4l2-common.h | 7 + + include/media/v4l2-dv-timings.h | 20 +- + include/media/v4l2-mem2mem.h | 3 + + include/media/v4l2-tpg.h | 24 +- + include/uapi/linux/Kbuild | 2 + + include/{ => uapi}/linux/cec-funcs.h | 76 +- + include/{ => uapi}/linux/cec.h | 94 +- + include/uapi/linux/v4l2-controls.h | 1 + + include/uapi/linux/v4l2-dv-timings.h | 97 +- + include/uapi/linux/videodev2.h | 118 +- + 623 files changed, 26606 insertions(+), 12310 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/mediatek-mdp.txt + create mode 100644 Documentation/devicetree/bindings/media/renesas,fdp1.txt + create mode 100644 Documentation/media/kapi/csi2.rst + create mode 100644 Documentation/media/uapi/v4l/hsv-formats.rst + create mode 100644 Documentation/media/uapi/v4l/pixfmt-packed-hsv.rst + rename Documentation/media/uapi/v4l/{pixfmt-sbggr16.rst => pixfmt-srggb16.rst} (52%) + create mode 100644 Documentation/media/v4l-drivers/rcar-fdp1.rst + rename drivers/{staging => }/media/cec/Makefile (70%) + rename drivers/{staging => }/media/cec/cec-adap.c (84%) + rename drivers/{staging => }/media/cec/cec-api.c (97%) + rename drivers/{staging => }/media/cec/cec-core.c (100%) + rename drivers/{staging => }/media/cec/cec-priv.h (100%) + delete mode 100644 drivers/media/dvb-core/dvb_filter.c + create mode 100644 drivers/media/pci/ttpci/dvb_filter.c + rename drivers/media/{dvb-core => pci/ttpci}/dvb_filter.h (100%) + create mode 100644 drivers/media/platform/mtk-mdp/Makefile + create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_comp.c + create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_comp.h + create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_core.c + create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_core.h + create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h + create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c + create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_m2m.h + create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_regs.c + create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_regs.h + create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c + create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_vpu.h + create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c + create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h + create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c + create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c + create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h + create mode 100644 drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c + create mode 100644 drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c + create mode 100644 drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c + create mode 100644 drivers/media/platform/mtk-vcodec/vdec_drv_base.h + create mode 100644 drivers/media/platform/mtk-vcodec/vdec_drv_if.c + create mode 100644 drivers/media/platform/mtk-vcodec/vdec_drv_if.h + create mode 100644 drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h + create mode 100644 drivers/media/platform/mtk-vcodec/vdec_vpu_if.c + create mode 100644 drivers/media/platform/mtk-vcodec/vdec_vpu_if.h + create mode 100644 drivers/media/platform/rcar_fdp1.c + create mode 100644 drivers/media/rc/serial_ir.c + rename drivers/{staging/media => media/usb}/pulse8-cec/Kconfig (86%) + rename drivers/{staging/media => media/usb}/pulse8-cec/Makefile (100%) + rename drivers/{staging/media => media/usb}/pulse8-cec/pulse8-cec.c (97%) + delete mode 100644 drivers/staging/media/cec/Kconfig + delete mode 100644 drivers/staging/media/cec/TODO + delete mode 100644 drivers/staging/media/lirc/lirc_serial.c + delete mode 100644 drivers/staging/media/pulse8-cec/TODO + create mode 100644 drivers/staging/media/st-cec/TODO + rename include/{ => uapi}/linux/cec-funcs.h (98%) + rename include/{ => uapi}/linux/cec.h (93%) +Merging pm/linux-next (fa8a9265bb7e Merge branch 'acpi-cppc' into linux-next) +$ git merge pm/linux-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc()) +$ git merge idle/next +Merge made by the 'recursive' strategy. + arch/x86/kernel/tsc.c | 1 + + 1 file changed, 1 insertion(+) +Merging thermal/next (0faf7dd5a947 MAINTAINERS: Samsung: Update maintainer for PWM FAN and SAMSUNG THERMAL) +$ git merge thermal/next +Already up-to-date. +Merging thermal-soc/next (18591add41ec thermal: rockchip: handle set_trips without the trip points) +$ git merge thermal-soc/next +Merge made by the 'recursive' strategy. + drivers/thermal/rockchip_thermal.c | 153 ++++++++++++++++++++++++------------- + 1 file changed, 100 insertions(+), 53 deletions(-) +Merging ieee1394/for-next (e9300a4b7bba firewire: net: fix fragmented datagram_size off-by-one) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (aa9f1012858b dlm: don't specify WQ_UNBOUND for the ast callback workqueue) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (d29fa0cb7602 swiotlb: Minor fix-ups for DMA_ATTR_SKIP_CPU_SYNC support) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging net-next/master (8fa3b6f9392b Merge tag 'cris-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris) +$ git merge net-next/master +Already up-to-date. +Merging ipsec-next/master (d4aea20d889e tun: Use netif_receive_skb instead of netif_rx) +$ git merge ipsec-next/master +Already up-to-date. +Merging netfilter-next/master (8fa3b6f9392b Merge tag 'cris-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris) +$ git merge netfilter-next/master +Already up-to-date. +Merging ipvs-next/master (8d8e20e2d7bb ipvs: Decrement ttl) +$ git merge ipvs-next/master +Already up-to-date. +Merging wireless-drivers-next/master (d15697de60db adm80211: add checks for dma mapping errors) +$ git merge wireless-drivers-next/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/admtek/adm8211.c | 24 ++++++++++++++++++++++-- + drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 4 ++-- + 2 files changed, 24 insertions(+), 4 deletions(-) +Merging bluetooth/master (107bc0aa95ca Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next) +$ git merge bluetooth/master +Already up-to-date. +Merging mac80211-next/master (445cd452fe51 mac80211: Use appropriate name for functions and messages) +$ git merge mac80211-next/master +Auto-merging net/mac80211/rx.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath10k/htt_rx.c | 3 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 +- + include/net/cfg80211.h | 17 +--- + net/mac80211/cfg.c | 12 +++ + net/mac80211/chan.c | 4 +- + net/mac80211/debugfs.c | 27 ++++++ + net/mac80211/debugfs_netdev.c | 3 + + net/mac80211/ieee80211_i.h | 6 +- + net/mac80211/mesh.c | 5 +- + net/mac80211/mesh.h | 2 +- + net/mac80211/mesh_plink.c | 14 +-- + net/mac80211/mesh_sync.c | 27 ++---- + net/mac80211/mlme.c | 4 - + net/mac80211/rx.c | 4 - + net/mac80211/scan.c | 8 +- + net/mac80211/sta_info.c | 4 - + net/mac80211/status.c | 3 +- + net/mac80211/tx.c | 124 +++++++++++++++++++++++- + net/mac80211/vht.c | 4 - + net/rfkill/core.c | 101 ++++++++++++++++--- + net/wireless/nl80211.c | 8 +- + net/wireless/util.c | 5 +- + 22 files changed, 284 insertions(+), 103 deletions(-) +Merging rdma/for-next (6f94ba20799b Merge branch 'vmw_pvrdma' into merge-test) +$ git merge rdma/for-next +Resolved 'drivers/infiniband/core/roce_gid_mgmt.c' using previous resolution. +Recorded preimage for 'drivers/infiniband/sw/rxe/rxe_req.c' +Auto-merging include/uapi/rdma/hns-abi.h +Auto-merging include/linux/pci_ids.h +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging drivers/nvme/target/rdma.c +Auto-merging drivers/nvme/host/rdma.c +Auto-merging drivers/infiniband/ulp/ipoib/ipoib_multicast.c +Auto-merging drivers/infiniband/ulp/ipoib/ipoib_main.c +Auto-merging drivers/infiniband/ulp/ipoib/ipoib_ib.c +Auto-merging drivers/infiniband/ulp/ipoib/ipoib_cm.c +Auto-merging drivers/infiniband/sw/rxe/rxe_req.c +CONFLICT (content): Merge conflict in drivers/infiniband/sw/rxe/rxe_req.c +Auto-merging drivers/infiniband/sw/rxe/rxe_net.c +Auto-merging drivers/infiniband/hw/nes/nes_nic.c +Auto-merging drivers/infiniband/hw/nes/nes.c +Auto-merging drivers/infiniband/hw/mlx5/qp.c +Auto-merging drivers/infiniband/hw/mlx5/mr.c +Auto-merging drivers/infiniband/hw/mlx5/mlx5_ib.h +Auto-merging drivers/infiniband/hw/mlx5/main.c +Auto-merging drivers/infiniband/hw/mlx5/cq.c +Auto-merging drivers/infiniband/hw/mlx4/ah.c +Auto-merging drivers/infiniband/hw/hfi1/user_sdma.c +Auto-merging drivers/infiniband/hw/hfi1/sdma.c +Auto-merging drivers/infiniband/hw/hfi1/rc.c +Auto-merging drivers/infiniband/hw/hfi1/pio.c +Auto-merging drivers/infiniband/hw/hfi1/hfi.h +Auto-merging drivers/infiniband/hw/hfi1/driver.c +Auto-merging drivers/infiniband/hw/hfi1/chip.c +Auto-merging drivers/infiniband/hw/hfi1/affinity.h +Auto-merging drivers/infiniband/hw/hfi1/affinity.c +Auto-merging drivers/infiniband/hw/cxgb4/device.c +Auto-merging drivers/infiniband/core/uverbs_main.c +Auto-merging drivers/infiniband/core/umem.c +Auto-merging drivers/infiniband/core/roce_gid_mgmt.c +CONFLICT (content): Merge conflict in drivers/infiniband/core/roce_gid_mgmt.c +Auto-merging drivers/infiniband/core/core_priv.h +Auto-merging drivers/infiniband/core/cma.c +Auto-merging drivers/infiniband/core/cm.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/infiniband/sw/rxe/rxe_req.c'. +[master fcf26135e6fc] Merge remote-tracking branch 'rdma/for-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 13 +- + drivers/infiniband/Kconfig | 1 + + drivers/infiniband/core/agent.c | 1 - + drivers/infiniband/core/cache.c | 16 +- + drivers/infiniband/core/cm.c | 72 +- + drivers/infiniband/core/cma.c | 43 + + drivers/infiniband/core/core_priv.h | 3 - + drivers/infiniband/core/device.c | 5 +- + drivers/infiniband/core/fmr_pool.c | 1 - + drivers/infiniband/core/iwcm.c | 21 + + drivers/infiniband/core/iwpm_msg.c | 1 - + drivers/infiniband/core/iwpm_util.c | 12 +- + drivers/infiniband/core/mad.c | 46 +- + drivers/infiniband/core/multicast.c | 7 +- + drivers/infiniband/core/roce_gid_mgmt.c | 21 +- + drivers/infiniband/core/ucm.c | 5 +- + drivers/infiniband/core/ucma.c | 5 +- + drivers/infiniband/core/umem.c | 2 +- + drivers/infiniband/core/uverbs.h | 1 + + drivers/infiniband/core/uverbs_cmd.c | 229 ++-- + drivers/infiniband/core/uverbs_main.c | 6 +- + drivers/infiniband/core/verbs.c | 108 +- + drivers/infiniband/hw/Makefile | 1 + + drivers/infiniband/hw/cxgb3/cxio_dbg.c | 20 +- + drivers/infiniband/hw/cxgb3/iwch_provider.c | 3 +- + drivers/infiniband/hw/cxgb4/device.c | 8 +- + drivers/infiniband/hw/cxgb4/provider.c | 4 +- + drivers/infiniband/hw/hfi1/affinity.c | 3 +- + drivers/infiniband/hw/hfi1/affinity.h | 9 +- + drivers/infiniband/hw/hfi1/chip.c | 9 +- + drivers/infiniband/hw/hfi1/chip_registers.h | 3 + + drivers/infiniband/hw/hfi1/debugfs.c | 110 ++ + drivers/infiniband/hw/hfi1/driver.c | 3 +- + drivers/infiniband/hw/hfi1/eprom.c | 211 +++- + drivers/infiniband/hw/hfi1/firmware.c | 156 ++- + drivers/infiniband/hw/hfi1/hfi.h | 144 ++- + drivers/infiniband/hw/hfi1/iowait.h | 8 + + drivers/infiniband/hw/hfi1/mad.c | 31 +- + drivers/infiniband/hw/hfi1/mmu_rb.c | 2 +- + drivers/infiniband/hw/hfi1/pio.c | 40 +- + drivers/infiniband/hw/hfi1/pio.h | 38 +- + drivers/infiniband/hw/hfi1/pio_copy.c | 22 +- + drivers/infiniband/hw/hfi1/platform.c | 193 +++- + drivers/infiniband/hw/hfi1/platform.h | 127 +- + drivers/infiniband/hw/hfi1/qp.c | 11 +- + drivers/infiniband/hw/hfi1/rc.c | 60 +- + drivers/infiniband/hw/hfi1/ruc.c | 44 +- + drivers/infiniband/hw/hfi1/sdma.c | 18 +- + drivers/infiniband/hw/hfi1/sdma.h | 12 +- + drivers/infiniband/hw/hfi1/uc.c | 4 +- + drivers/infiniband/hw/hfi1/ud.c | 4 +- + drivers/infiniband/hw/hfi1/user_sdma.c | 60 +- + drivers/infiniband/hw/hfi1/verbs.c | 209 +++- + drivers/infiniband/hw/hfi1/verbs.h | 16 +- + drivers/infiniband/hw/hfi1/verbs_txreq.c | 13 +- + drivers/infiniband/hw/hfi1/verbs_txreq.h | 1 + + drivers/infiniband/hw/hns/hns_roce_ah.c | 3 +- + drivers/infiniband/hw/hns/hns_roce_alloc.c | 11 +- + drivers/infiniband/hw/hns/hns_roce_cmd.c | 8 +- + drivers/infiniband/hw/hns/hns_roce_cmd.h | 12 +- + drivers/infiniband/hw/hns/hns_roce_common.h | 44 +- + drivers/infiniband/hw/hns/hns_roce_cq.c | 46 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 66 +- + drivers/infiniband/hw/hns/hns_roce_eq.c | 6 +- + drivers/infiniband/hw/hns/hns_roce_hem.c | 6 +- + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 1222 +++++++++++++++++--- + drivers/infiniband/hw/hns/hns_roce_hw_v1.h | 74 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 329 ++---- + drivers/infiniband/hw/hns/hns_roce_mr.c | 43 +- + drivers/infiniband/hw/hns/hns_roce_pd.c | 5 +- + drivers/infiniband/hw/hns/hns_roce_qp.c | 4 +- + drivers/infiniband/hw/i40iw/i40iw.h | 37 +- + drivers/infiniband/hw/i40iw/i40iw_cm.c | 377 ++++-- + drivers/infiniband/hw/i40iw/i40iw_cm.h | 11 +- + drivers/infiniband/hw/i40iw/i40iw_ctrl.c | 646 +++++++---- + drivers/infiniband/hw/i40iw/i40iw_d.h | 25 +- + drivers/infiniband/hw/i40iw/i40iw_hw.c | 61 +- + drivers/infiniband/hw/i40iw/i40iw_main.c | 166 ++- + drivers/infiniband/hw/i40iw/i40iw_osdep.h | 8 +- + drivers/infiniband/hw/i40iw/i40iw_p.h | 21 +- + drivers/infiniband/hw/i40iw/i40iw_pble.c | 4 - + drivers/infiniband/hw/i40iw/i40iw_puda.c | 271 +++-- + drivers/infiniband/hw/i40iw/i40iw_puda.h | 20 +- + drivers/infiniband/hw/i40iw/i40iw_type.h | 98 +- + drivers/infiniband/hw/i40iw/i40iw_uk.c | 40 +- + drivers/infiniband/hw/i40iw/i40iw_user.h | 14 +- + drivers/infiniband/hw/i40iw/i40iw_utils.c | 289 ++++- + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 238 +++- + drivers/infiniband/hw/i40iw/i40iw_verbs.h | 2 + + drivers/infiniband/hw/i40iw/i40iw_virtchnl.c | 33 +- + drivers/infiniband/hw/mlx4/ah.c | 10 +- + drivers/infiniband/hw/mlx4/alias_GUID.c | 4 +- + drivers/infiniband/hw/mlx4/cm.c | 4 +- + drivers/infiniband/hw/mlx4/mad.c | 58 +- + drivers/infiniband/hw/mlx4/main.c | 49 +- + drivers/infiniband/hw/mlx4/mcg.c | 5 +- + drivers/infiniband/hw/mlx4/mlx4_ib.h | 3 +- + drivers/infiniband/hw/mlx4/qp.c | 13 +- + drivers/infiniband/hw/mlx5/ah.c | 25 +- + drivers/infiniband/hw/mlx5/cq.c | 34 +- + drivers/infiniband/hw/mlx5/main.c | 268 +++-- + drivers/infiniband/hw/mlx5/mem.c | 7 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 12 +- + drivers/infiniband/hw/mlx5/mr.c | 71 +- + drivers/infiniband/hw/mlx5/qp.c | 131 ++- + drivers/infiniband/hw/mlx5/srq.c | 6 +- + drivers/infiniband/hw/mthca/mthca_av.c | 6 +- + drivers/infiniband/hw/mthca/mthca_provider.c | 4 +- + drivers/infiniband/hw/mthca/mthca_reset.c | 4 - + drivers/infiniband/hw/nes/nes.c | 1 - + drivers/infiniband/hw/nes/nes_cm.c | 4 +- + drivers/infiniband/hw/nes/nes_hw.c | 6 +- + drivers/infiniband/hw/nes/nes_mgt.c | 10 +- + drivers/infiniband/hw/nes/nes_nic.c | 84 +- + drivers/infiniband/hw/nes/nes_verbs.c | 7 +- + drivers/infiniband/hw/ocrdma/ocrdma_ah.c | 3 +- + drivers/infiniband/hw/ocrdma/ocrdma_ah.h | 4 +- + drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 7 +- + drivers/infiniband/hw/ocrdma/ocrdma_stats.c | 4 +- + drivers/infiniband/hw/qedr/verbs.c | 27 +- + drivers/infiniband/hw/qedr/verbs.h | 3 +- + drivers/infiniband/hw/qib/qib_diag.c | 6 +- + drivers/infiniband/hw/qib/qib_driver.c | 3 +- + drivers/infiniband/hw/qib/qib_eeprom.c | 6 +- + drivers/infiniband/hw/qib/qib_file_ops.c | 5 +- + drivers/infiniband/hw/qib/qib_iba6120.c | 8 +- + drivers/infiniband/hw/qib/qib_iba7220.c | 8 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 22 +- + drivers/infiniband/hw/qib/qib_init.c | 47 +- + drivers/infiniband/hw/qib/qib_rc.c | 44 +- + drivers/infiniband/hw/qib/qib_ruc.c | 24 +- + drivers/infiniband/hw/qib/qib_verbs.c | 33 +- + drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c | 22 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 16 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.h | 4 +- + drivers/infiniband/hw/usnic/usnic_vnic.c | 22 +- + drivers/infiniband/hw/vmw_pvrdma/Kconfig | 7 + + drivers/infiniband/hw/vmw_pvrdma/Makefile | 3 + + drivers/infiniband/hw/vmw_pvrdma/pvrdma.h | 474 ++++++++ + drivers/infiniband/hw/vmw_pvrdma/pvrdma_cmd.c | 119 ++ + drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c | 425 +++++++ + drivers/infiniband/hw/vmw_pvrdma/pvrdma_dev_api.h | 586 ++++++++++ + drivers/infiniband/hw/vmw_pvrdma/pvrdma_doorbell.c | 127 ++ + drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 1211 +++++++++++++++++++ + drivers/infiniband/hw/vmw_pvrdma/pvrdma_misc.c | 304 +++++ + drivers/infiniband/hw/vmw_pvrdma/pvrdma_mr.c | 334 ++++++ + drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c | 972 ++++++++++++++++ + drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h | 131 +++ + drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c | 579 ++++++++++ + drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h | 436 +++++++ + drivers/infiniband/sw/rdmavt/cq.c | 64 +- + drivers/infiniband/sw/rdmavt/mcast.c | 5 +- + drivers/infiniband/sw/rdmavt/mr.c | 22 +- + drivers/infiniband/sw/rdmavt/qp.c | 20 +- + drivers/infiniband/sw/rdmavt/trace.h | 141 +-- + drivers/infiniband/sw/rdmavt/trace_mr.h | 112 ++ + drivers/infiniband/sw/rdmavt/trace_qp.h | 96 ++ + drivers/infiniband/sw/rdmavt/trace_rvt.h | 81 ++ + drivers/infiniband/sw/rdmavt/trace_tx.h | 132 +++ + drivers/infiniband/sw/rxe/rxe_comp.c | 9 +- + drivers/infiniband/sw/rxe/rxe_loc.h | 2 - + drivers/infiniband/sw/rxe/rxe_mr.c | 3 + + drivers/infiniband/sw/rxe/rxe_net.c | 8 +- + drivers/infiniband/sw/rxe/rxe_param.h | 2 +- + drivers/infiniband/sw/rxe/rxe_pool.c | 1 - + drivers/infiniband/sw/rxe/rxe_recv.c | 11 +- + drivers/infiniband/sw/rxe/rxe_req.c | 19 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 25 +- + drivers/infiniband/sw/rxe/rxe_srq.c | 2 +- + drivers/infiniband/sw/rxe/rxe_task.c | 19 + + drivers/infiniband/sw/rxe/rxe_task.h | 1 + + drivers/infiniband/sw/rxe/rxe_verbs.c | 21 +- + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 10 +- + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 5 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 5 +- + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 7 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 5 +- + drivers/infiniband/ulp/isert/ib_isert.c | 31 +- + drivers/infiniband/ulp/srp/ib_srp.c | 48 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 22 +- + drivers/net/ethernet/qlogic/qede/qede_roce.c | 4 +- + drivers/net/vmxnet3/vmxnet3_int.h | 3 +- + drivers/nvme/host/rdma.c | 42 +- + drivers/nvme/target/rdma.c | 3 + + include/linux/mlx5/mlx5_ifc.h | 2 +- + include/linux/pci_ids.h | 1 + + include/rdma/ib_cm.h | 6 + + include/rdma/ib_mad.h | 2 +- + include/rdma/ib_verbs.h | 70 +- + include/rdma/iw_cm.h | 6 + + include/rdma/opa_smi.h | 2 - + include/rdma/rdma_cm.h | 25 + + include/rdma/rdma_vt.h | 46 +- + include/rdma/rdmavt_mr.h | 10 +- + include/rdma/rdmavt_qp.h | 77 ++ + include/uapi/rdma/Kbuild | 2 + + include/uapi/rdma/hfi/hfi1_user.h | 2 +- + .../hns_roce_user.h => include/uapi/rdma/hns-abi.h | 9 +- + include/uapi/rdma/ib_user_verbs.h | 38 + + include/uapi/rdma/mlx5-abi.h | 38 +- + include/uapi/rdma/rdma_user_cm.h | 12 +- + include/uapi/rdma/vmw_pvrdma-abi.h | 289 +++++ + net/rds/rdma_transport.c | 5 +- + 203 files changed, 12277 insertions(+), 2654 deletions(-) + create mode 100644 drivers/infiniband/hw/vmw_pvrdma/Kconfig + create mode 100644 drivers/infiniband/hw/vmw_pvrdma/Makefile + create mode 100644 drivers/infiniband/hw/vmw_pvrdma/pvrdma.h + create mode 100644 drivers/infiniband/hw/vmw_pvrdma/pvrdma_cmd.c + create mode 100644 drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c + create mode 100644 drivers/infiniband/hw/vmw_pvrdma/pvrdma_dev_api.h + create mode 100644 drivers/infiniband/hw/vmw_pvrdma/pvrdma_doorbell.c + create mode 100644 drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c + create mode 100644 drivers/infiniband/hw/vmw_pvrdma/pvrdma_misc.c + create mode 100644 drivers/infiniband/hw/vmw_pvrdma/pvrdma_mr.c + create mode 100644 drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c + create mode 100644 drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h + create mode 100644 drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c + create mode 100644 drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h + create mode 100644 drivers/infiniband/sw/rdmavt/trace_mr.h + create mode 100644 drivers/infiniband/sw/rdmavt/trace_qp.h + create mode 100644 drivers/infiniband/sw/rdmavt/trace_rvt.h + create mode 100644 drivers/infiniband/sw/rdmavt/trace_tx.h + rename drivers/infiniband/hw/hns/hns_roce_user.h => include/uapi/rdma/hns-abi.h (94%) + create mode 100644 include/uapi/rdma/vmw_pvrdma-abi.h +Merging rdma-leon/rdma-next (92363f1cfe75 Merge remote-tracking branch 'origin/topic/shared-for-4.10' into rdma-next) +$ git merge rdma-leon/rdma-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging rdma-leon-test/testing/rdma-next (a909d3e63699 Linux 4.9-rc3) +$ git merge rdma-leon-test/testing/rdma-next +Already up-to-date. +Merging mtd/master (0e2ce9d3fcba Merge tag 'nand/fixes-for-4.9-rc3' of github.com:linux-nand/linux) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (445caaa20c4d mtd: Allocate bdi objects dynamically) +$ git merge l2-mtd/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/oxnas-nand.txt | 41 ++ + .../devicetree/bindings/mtd/samsung-s3c2410.txt | 56 ++ + .../devicetree/bindings/mtd/tango-nand.txt | 38 ++ + arch/arm/mach-s3c24xx/common-smdk.c | 1 + + arch/arm/mach-s3c24xx/mach-anubis.c | 1 + + arch/arm/mach-s3c24xx/mach-at2440evb.c | 1 + + arch/arm/mach-s3c24xx/mach-bast.c | 1 + + arch/arm/mach-s3c24xx/mach-gta02.c | 1 + + arch/arm/mach-s3c24xx/mach-jive.c | 1 + + arch/arm/mach-s3c24xx/mach-mini2440.c | 1 + + arch/arm/mach-s3c24xx/mach-osiris.c | 1 + + arch/arm/mach-s3c24xx/mach-qt2410.c | 1 + + arch/arm/mach-s3c24xx/mach-rx1950.c | 1 + + arch/arm/mach-s3c24xx/mach-rx3715.c | 1 + + arch/arm/mach-s3c24xx/mach-vstms.c | 1 + + arch/arm/mach-s3c64xx/mach-hmt.c | 1 + + arch/arm/mach-s3c64xx/mach-mini6410.c | 1 + + arch/arm/mach-s3c64xx/mach-real6410.c | 1 + + drivers/mtd/bcm47xxpart.c | 10 +- + drivers/mtd/devices/bcm47xxsflash.c | 24 +- + drivers/mtd/maps/sc520cdp.c | 8 +- + drivers/mtd/mtdcore.c | 44 +- + drivers/mtd/mtdswap.c | 2 +- + drivers/mtd/nand/Kconfig | 21 +- + drivers/mtd/nand/Makefile | 2 + + drivers/mtd/nand/ams-delta.c | 5 +- + drivers/mtd/nand/atmel_nand.c | 10 +- + drivers/mtd/nand/brcmnand/brcmnand.c | 10 +- + drivers/mtd/nand/cafe_nand.c | 5 +- + drivers/mtd/nand/cmx270_nand.c | 4 +- + drivers/mtd/nand/cs553x_nand.c | 5 +- + drivers/mtd/nand/denali.c | 101 +-- + drivers/mtd/nand/denali.h | 12 - + drivers/mtd/nand/denali_dt.c | 3 +- + drivers/mtd/nand/denali_pci.c | 1 - + drivers/mtd/nand/fsmc_nand.c | 9 +- + drivers/mtd/nand/gpio.c | 5 +- + drivers/mtd/nand/hisi504_nand.c | 4 +- + drivers/mtd/nand/lpc32xx_mlc.c | 10 +- + drivers/mtd/nand/lpc32xx_slc.c | 10 +- + drivers/mtd/nand/mpc5121_nfc.c | 4 +- + drivers/mtd/nand/mtk_nand.c | 4 +- + drivers/mtd/nand/mxc_nand.c | 10 +- + drivers/mtd/nand/nand_base.c | 84 ++- + drivers/mtd/nand/nand_ids.c | 3 + + drivers/mtd/nand/nand_timings.c | 26 +- + drivers/mtd/nand/nandsim.c | 19 +- + drivers/mtd/nand/omap2.c | 10 +- + drivers/mtd/nand/orion_nand.c | 5 +- + drivers/mtd/nand/oxnas_nand.c | 195 ++++++ + drivers/mtd/nand/pasemi_nand.c | 5 +- + drivers/mtd/nand/plat_nand.c | 5 +- + drivers/mtd/nand/pxa3xx_nand.c | 22 +- + drivers/mtd/nand/s3c2410.c | 286 ++++++--- + drivers/mtd/nand/socrates_nand.c | 12 +- + drivers/mtd/nand/sunxi_nand.c | 4 + + drivers/mtd/nand/tango_nand.c | 676 +++++++++++++++++++++ + drivers/mtd/nand/tmio_nand.c | 6 +- + drivers/mtd/nand/vf610_nfc.c | 10 +- + drivers/mtd/spi-nor/cadence-quadspi.c | 6 +- + drivers/mtd/spi-nor/fsl-quadspi.c | 8 +- + drivers/mtd/spi-nor/spi-nor.c | 14 +- + include/linux/mtd/nand.h | 30 + + include/linux/platform_data/mtd-nand-s3c2410.h | 7 +- + 64 files changed, 1555 insertions(+), 351 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/oxnas-nand.txt + create mode 100644 Documentation/devicetree/bindings/mtd/samsung-s3c2410.txt + create mode 100644 Documentation/devicetree/bindings/mtd/tango-nand.txt + create mode 100644 drivers/mtd/nand/oxnas_nand.c + create mode 100644 drivers/mtd/nand/tango_nand.c +Merging nand/nand/next (8fcfba072420 mtd: nand: tango: Use nand_to_mtd() instead of directly accessing chip->mtd) +$ git merge nand/nand/next +Already up-to-date. +Merging crypto/master (04b46fbdea5e crypto: testmgr - fix overlap in chunked tests again) +$ git merge crypto/master +Already up-to-date. +Merging drm/drm-next (2cf026ae85c4 Merge branch 'linux-4.10' of git://github.com/skeggsb/linux into drm-next) +$ git merge drm/drm-next +Already up-to-date. +Merging drm-panel/drm/panel/for-next (8c31f6034b24 drm/panel: simple: Add support for AUO G185HAN01) +$ git merge drm-panel/drm/panel/for-next +Already up-to-date. +Merging drm-intel/for-linux-next (7a9e10253e9e drm/i915: Move priority bumping for flips earlier) +$ git merge drm-intel/for-linux-next +Already up-to-date. +Merging drm-tegra/drm/tegra/for-next (585ee0f27ef7 drm/tegra: Set sgt pointer in BO pin) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging drm-misc/for-linux-next (6449b088dd51 drm: Add fake controlD* symlinks for backwards compat) +$ git merge drm-misc/for-linux-next +Already up-to-date. +Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux) +$ git merge drm-exynos/exynos-drm/for-next +Already up-to-date. +Merging drm-msm/msm-next (2401a0084614 drm/msm: gpu: Add support for the GPMU) +$ git merge drm-msm/msm-next +Already up-to-date. +Merging hdlcd/for-upstream/hdlcd (747e5a5ff2a2 drm: hdlcd: Fix cleanup order) +$ git merge hdlcd/for-upstream/hdlcd +Already up-to-date. +Merging mali-dp/for-upstream/mali-dp (8e3eb71c80ad drm/arm/malidp: Fix possible dereference of NULL) +$ git merge mali-dp/for-upstream/mali-dp +Merge made by the 'recursive' strategy. + drivers/gpu/drm/arm/malidp_planes.c | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) +Merging sunxi/sunxi/for-next (63e8e44adfdc Merge branch 'sunxi/dt-late-for-4.10' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Resolved 'arch/arm/boot/dts/sun8i-h3.dtsi' using previous resolution. +Auto-merging arch/arm/boot/dts/sun8i-h3.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun8i-h3.dtsi +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a39973f33fa2] Merge remote-tracking branch 'sunxi/sunxi/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/boot/dts/sun4i-a10-a1000.dts | 12 +- + arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 2 +- + arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 14 +- + arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 14 +- + arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts | 38 ++- + arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 6 +- + arch/arm/boot/dts/sun4i-a10-hackberry.dts | 12 +- + arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts | 16 +- + arch/arm/boot/dts/sun4i-a10-inet1.dts | 26 +- + arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 14 +- + arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 29 +-- + arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 12 +- + arch/arm/boot/dts/sun4i-a10-marsboard.dts | 13 +- + arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 2 +- + arch/arm/boot/dts/sun4i-a10-mk802.dts | 18 +- + arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 27 +- + arch/arm/boot/dts/sun4i-a10-pcduino.dts | 19 +- + arch/arm/boot/dts/sun4i-a10-pcduino2.dts | 6 +- + arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 32 +-- + arch/arm/boot/dts/sun4i-a10.dtsi | 170 +++++-------- + arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts | 18 +- + arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 29 +-- + arch/arm/boot/dts/sun5i-a10s-mk802.dts | 19 +- + arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 36 ++- + arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 20 +- + arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts | 21 +- + arch/arm/boot/dts/sun5i-a10s.dtsi | 43 ++-- + .../boot/dts/sun5i-a13-empire-electronix-d709.dts | 23 +- + arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 22 +- + arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 40 ++- + arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 36 ++- + arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 11 +- + arch/arm/boot/dts/sun5i-a13.dtsi | 24 +- + arch/arm/boot/dts/sun5i-gr8-chip-pro.dts | 12 +- + arch/arm/boot/dts/sun5i-gr8-evb.dts | 24 +- + arch/arm/boot/dts/sun5i-gr8.dtsi | 122 ++++----- + arch/arm/boot/dts/sun5i-r8-chip.dts | 27 +- + .../boot/dts/sun5i-reference-design-tablet.dtsi | 33 +-- + arch/arm/boot/dts/sun5i.dtsi | 76 +++--- + arch/arm/boot/dts/sun6i-a31-app4-evb1.dts | 6 +- + arch/arm/boot/dts/sun6i-a31-colombus.dts | 22 +- + arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 23 +- + arch/arm/boot/dts/sun6i-a31-i7.dts | 19 +- + arch/arm/boot/dts/sun6i-a31-m9.dts | 19 +- + arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts | 19 +- + arch/arm/boot/dts/sun6i-a31.dtsi | 102 ++++---- + arch/arm/boot/dts/sun6i-a31s-primo81.dts | 20 +- + arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 13 +- + arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 29 +-- + .../dts/sun6i-a31s-yones-toptech-bs1078-v2.dts | 9 +- + .../boot/dts/sun6i-reference-design-tablet.dtsi | 14 +- + arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 27 +- + arch/arm/boot/dts/sun7i-a20-bananapi.dts | 26 +- + arch/arm/boot/dts/sun7i-a20-bananapro.dts | 37 +-- + arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 13 +- + arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 38 +-- + arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 24 +- + arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 26 +- + arch/arm/boot/dts/sun7i-a20-itead-ibox.dts | 7 +- + arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 30 +-- + arch/arm/boot/dts/sun7i-a20-m3.dts | 6 +- + arch/arm/boot/dts/sun7i-a20-mk808c.dts | 12 +- + arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 32 +-- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 27 +- + .../boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts | 6 +- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 33 +-- + arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 28 +-- + arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 45 ++-- + arch/arm/boot/dts/sun7i-a20-orangepi.dts | 38 ++- + arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 25 +- + arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 21 +- + arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 25 +- + arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 13 +- + arch/arm/boot/dts/sun7i-a20.dtsi | 279 ++++++++------------- + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 102 ++++---- + arch/arm/boot/dts/sun8i-a23-evb.dts | 7 +- + .../boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts | 8 +- + .../boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts | 8 +- + arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts | 9 +- + arch/arm/boot/dts/sun8i-a33-olinuxino.dts | 18 +- + arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 11 +- + arch/arm/boot/dts/sun8i-a33.dtsi | 6 +- + arch/arm/boot/dts/sun8i-a83t.dtsi | 22 +- + arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts | 18 +- + arch/arm/boot/dts/sun8i-h3-nanopi.dtsi | 18 +- + arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 26 +- + arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts | 18 +- + arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 18 +- + arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts | 4 +- + arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 18 +- + arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 10 +- + arch/arm/boot/dts/sun8i-h3.dtsi | 107 ++++---- + arch/arm/boot/dts/sun8i-q8-common.dtsi | 9 +- + arch/arm/boot/dts/sun8i-r16-parrot.dts | 36 ++- + .../boot/dts/sun8i-reference-design-tablet.dtsi | 26 +- + arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 23 +- + arch/arm/boot/dts/sun9i-a80-optimus.dts | 41 ++- + arch/arm/boot/dts/sun9i-a80.dtsi | 64 +++-- + arch/arm/boot/dts/sunxi-common-regulators.dtsi | 24 +- + 99 files changed, 1099 insertions(+), 1783 deletions(-) +Merging kspp/for-next/kspp (68fdc678df46 MAINTAINERS: add GCC plugins Makefile) +$ git merge kspp/for-next/kspp +Already up-to-date. +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 (5c55e10a1934 Merge remote-tracking branch 'regmap/topic/lzo' into regmap-next) +$ git merge regmap/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging sound/for-next (995c6a7fd9b9 ALSA: hiface: Fix M2Tech hiFace driver sampling rate change) +$ git merge sound/for-next +Already up-to-date. +Merging sound-asoc/for-next (9b35952cdd63 Merge remote-tracking branch 'asoc/fix/dwc' into asoc-linus) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + sound/soc/dwc/designware_i2s.c | 25 +++++++++++-------------- + 1 file changed, 11 insertions(+), 14 deletions(-) +Merging modules/modules-next (4d217a5adccf module: fix DEBUG_SET_MODULE_RONX typo) +$ git merge modules/modules-next +Auto-merging scripts/mod/modpost.c +Auto-merging kernel/module.c +Auto-merging init/main.c +Auto-merging include/linux/kernel.h +Merge made by the 'recursive' strategy. + include/linux/init.h | 3 +++ + include/linux/kernel.h | 9 +++++++ + include/linux/module.h | 4 +-- + init/main.c | 7 +++-- + kernel/module.c | 69 +++++++++++++++++++++++++++++++------------------- + kernel/panic.c | 53 ++++++++++++++++++-------------------- + scripts/mod/modpost.c | 2 ++ + 7 files changed, 89 insertions(+), 58 deletions(-) +Merging input/next (34888602eb99 Input: drv260x - use generic device properties) +$ git merge input/next +Removing include/linux/platform_data/drv260x-pdata.h +Auto-merging drivers/input/serio/i8042-x86ia64io.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/da9062-onkey.txt | 45 +++-- + .../bindings/input/touchscreen/imx6ul_tsc.txt | 8 + + .../bindings/input/touchscreen/silead_gsl1680.txt | 2 + + drivers/input/joystick/xpad.c | 7 +- + drivers/input/keyboard/gpio_keys.c | 190 ++++++++++++--------- + drivers/input/keyboard/gpio_keys_polled.c | 128 ++++++++------ + drivers/input/keyboard/lpc32xx-keys.c | 2 +- + drivers/input/keyboard/pxa27x_keypad.c | 2 +- + drivers/input/keyboard/tca8418_keypad.c | 21 ++- + drivers/input/misc/Kconfig | 7 +- + drivers/input/misc/bma150.c | 9 +- + drivers/input/misc/da9063_onkey.c | 9 +- + drivers/input/misc/drv260x.c | 119 ++++--------- + drivers/input/misc/drv2665.c | 6 +- + drivers/input/misc/drv2667.c | 4 +- + drivers/input/misc/soc_button_array.c | 8 +- + drivers/input/mouse/alps.c | 56 +++--- + drivers/input/mouse/alps.h | 24 ++- + drivers/input/mouse/elan_i2c_core.c | 17 +- + drivers/input/serio/i8042-x86ia64io.h | 78 +-------- + drivers/input/serio/i8042.c | 2 +- + drivers/input/touchscreen/fsl-imx25-tcq.c | 1 + + drivers/input/touchscreen/imx6ul_tsc.c | 67 +++++--- + drivers/input/touchscreen/melfas_mip4.c | 51 +++++- + drivers/input/touchscreen/raydium_i2c_ts.c | 2 +- + drivers/input/touchscreen/silead.c | 29 ++++ + include/linux/gpio_keys.h | 5 +- + include/linux/platform_data/drv260x-pdata.h | 28 --- + 28 files changed, 489 insertions(+), 438 deletions(-) + delete mode 100644 include/linux/platform_data/drv260x-pdata.h +Merging block/for-next (cdb98c2698b4 Revert "nvme: add support for the Write Zeroes command") +$ git merge block/for-next +Already up-to-date. +Merging lightnvm/for-next (a5f78b7f7dd1 Merge branch 'for-4.10/block' into for-next) +$ git merge lightnvm/for-next +Auto-merging fs/ocfs2/aops.c +Auto-merging fs/ext4/page-io.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/extents.c +Auto-merging fs/ext2/inode.c +Auto-merging fs/direct-io.c +Auto-merging fs/buffer.c +Merge made by the 'recursive' strategy. + fs/buffer.c | 104 +++++++++++++++++++++++++++++++------------- + fs/direct-io.c | 28 +++--------- + fs/ext2/inode.c | 9 ++-- + fs/ext4/extents.c | 13 +----- + fs/ext4/inode.c | 18 +++----- + fs/ext4/page-io.c | 2 +- + fs/mpage.c | 3 +- + fs/ntfs/aops.c | 2 +- + fs/ntfs/file.c | 5 +-- + fs/ocfs2/aops.c | 2 +- + fs/ufs/balloc.c | 3 +- + fs/ufs/inode.c | 3 +- + include/linux/buffer_head.h | 7 ++- + 13 files changed, 104 insertions(+), 95 deletions(-) +Merging device-mapper/for-next (ef548c551e72 dm flakey: introduce "error_writes" feature) +$ git merge device-mapper/for-next +Already up-to-date. +Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) +$ git merge pcmcia/master +Already up-to-date. +Merging mmc/next (f397c8d80a5e mmc: block: Move files to core) +$ git merge mmc/next +Already up-to-date. +Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value) +$ git merge kgdb/kgdb-next +Auto-merging kernel/debug/kdb/kdb_io.c +Merge made by the 'recursive' strategy. + kernel/debug/kdb/kdb_io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging md/for-next (d05c5f7ba164 vfs,mm: fix return value of read() at s_maxbytes) +$ git merge md/for-next +Already up-to-date. +Merging mfd/for-mfd-next (93559191e71b mfd: tps65217: Support an interrupt pin as the system wakeup) +$ git merge mfd/for-mfd-next +Resolved 'drivers/mfd/wm8994-core.c' using previous resolution. +Auto-merging include/linux/mfd/tps65217.h +Auto-merging drivers/mfd/wm8994-core.c +CONFLICT (content): Merge conflict in drivers/mfd/wm8994-core.c +Auto-merging drivers/mfd/intel_soc_pmic_bxtwc.c +Auto-merging drivers/mfd/intel-lpss-pci.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 36ee2be3792d] Merge remote-tracking branch 'mfd/for-mfd-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/mfd/altera-a10sr.txt | 46 + + .../devicetree/bindings/mfd/qcom-pm8xxx.txt | 1 + + Documentation/devicetree/bindings/mfd/rn5t618.txt | 16 +- + .../devicetree/bindings/regulator/tps65218.txt | 87 +- + drivers/gpio/gpio-tps65218.c | 3 +- + drivers/input/misc/tps65218-pwrbutton.c | 8 + + drivers/mfd/Kconfig | 26 +- + drivers/mfd/Makefile | 1 + + drivers/mfd/ab3100-core.c | 39 +- + drivers/mfd/ab8500-core.c | 37 +- + drivers/mfd/ab8500-debugfs.c | 21 +- + drivers/mfd/ab8500-gpadc.c | 19 +- + drivers/mfd/ab8500-sysctrl.c | 9 +- + drivers/mfd/abx500-core.c | 7 +- + drivers/mfd/arizona-core.c | 1 + + drivers/mfd/arizona-irq.c | 8 +- + drivers/mfd/axp20x-i2c.c | 7 +- + drivers/mfd/axp20x.c | 4 +- + drivers/mfd/bcm590xx.c | 2 +- + drivers/mfd/cs47l24-tables.c | 6 + + drivers/mfd/davinci_voicecodec.c | 1 + + drivers/mfd/fsl-imx25-tsadc.c | 1 + + drivers/mfd/hi655x-pmic.c | 1 + + drivers/mfd/intel-lpss-pci.c | 1 + + drivers/mfd/intel_soc_pmic_bxtwc.c | 2 +- + drivers/mfd/lpc_ich.c | 2 + + drivers/mfd/palmas.c | 3 - + drivers/mfd/qcom-pm8xxx.c | 231 +++- + drivers/mfd/rk808.c | 23 +- + drivers/mfd/rn5t618.c | 1 + + drivers/mfd/si476x-i2c.c | 2 +- + drivers/mfd/sun4i-gpadc.c | 181 +++ + drivers/mfd/tc3589x.c | 4 +- + drivers/mfd/tps65217.c | 71 +- + drivers/mfd/tps65218.c | 34 +- + drivers/mfd/tps65912-core.c | 17 + + drivers/mfd/wm5102-tables.c | 1412 ++++++++++---------- + drivers/mfd/wm8994-core.c | 6 +- + drivers/regulator/tps65218-regulator.c | 153 +-- + include/linux/mfd/axp20x.h | 6 + + include/linux/mfd/davinci_voicecodec.h | 4 - + include/linux/mfd/rk808.h | 1 + + include/linux/mfd/rn5t618.h | 9 + + include/linux/mfd/sun4i-gpadc.h | 94 ++ + include/linux/mfd/tps65217.h | 4 +- + include/linux/mfd/tps65218.h | 3 +- + include/linux/mfd/tps65912.h | 16 +- + 47 files changed, 1582 insertions(+), 1049 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/altera-a10sr.txt + create mode 100644 drivers/mfd/sun4i-gpadc.c + create mode 100644 include/linux/mfd/sun4i-gpadc.h +Merging backlight/for-backlight-next (0c9501f823a4 backlight: pwm_bl: Handle gpio that can sleep) +$ git merge backlight/for-backlight-next +Already up-to-date. +Merging battery/for-next (6480af4915d6 power_supply: wm97xx_battery: use power_supply_get_drvdata) +$ git merge battery/for-next +Already up-to-date. +Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (d00b74613fb1 Merge remote-tracking branches 'regulator/topic/tps65086' and 'regulator/topic/twl' into regulator-next) +$ git merge regulator/for-next +Already up-to-date. +Merging security/next (50523a29d900 Yama: allow access for the current ptrace parent) +$ git merge security/next +Auto-merging security/smack/smack_lsm.c +Auto-merging security/selinux/hooks.c +Auto-merging kernel/seccomp.c +Auto-merging fs/proc/namespaces.c +Auto-merging fs/proc/internal.h +Auto-merging fs/proc/base.c +Auto-merging drivers/char/tpm/xen-tpmfront.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/security/tpm/ibmvtpm.txt | 41 ++++ + .../devicetree/bindings/security/tpm/tpm-i2c.txt | 21 ++ + .../bindings/security/tpm/tpm_tis_mmio.txt | 25 +++ + Documentation/security/keys-trusted-encrypted.txt | 2 - + drivers/char/tpm/Kconfig | 2 +- + drivers/char/tpm/Makefile | 14 +- + drivers/char/tpm/tpm-chip.c | 38 +--- + drivers/char/tpm/tpm-interface.c | 110 +++++----- + drivers/char/tpm/tpm-sysfs.c | 7 +- + drivers/char/tpm/tpm.h | 41 ++-- + drivers/char/tpm/tpm2-cmd.c | 2 +- + drivers/char/tpm/tpm_acpi.c | 46 ++--- + drivers/char/tpm/tpm_crb.c | 173 +++++++++++++--- + drivers/char/tpm/tpm_eventlog.c | 230 +++++++++++---------- + drivers/char/tpm/tpm_eventlog.h | 22 +- + drivers/char/tpm/tpm_of.c | 48 ++--- + drivers/char/tpm/tpm_tis.c | 11 + + drivers/char/tpm/tpm_tis_core.c | 64 ++++-- + drivers/char/tpm/tpm_vtpm_proxy.c | 85 +++++--- + drivers/char/tpm/xen-tpmfront.c | 1 - + fs/proc/base.c | 23 +-- + fs/proc/fd.c | 6 +- + fs/proc/internal.h | 2 +- + fs/proc/namespaces.c | 3 +- + include/uapi/linux/vtpm_proxy.h | 23 ++- + kernel/seccomp.c | 7 +- + samples/seccomp/Makefile | 4 +- + samples/seccomp/bpf-helper.c | 38 ++-- + samples/seccomp/dropper.c | 7 +- + security/integrity/digsig.c | 2 +- + security/integrity/evm/evm_main.c | 4 + + security/integrity/ima/ima_appraise.c | 13 +- + security/integrity/ima/ima_fs.c | 2 +- + security/integrity/ima/ima_init.c | 3 +- + security/selinux/hooks.c | 120 ++++++----- + security/selinux/include/classmap.h | 4 + + security/selinux/include/objsec.h | 5 +- + security/selinux/selinuxfs.c | 6 +- + security/smack/smack.h | 1 - + security/smack/smack_access.c | 7 +- + security/smack/smack_lsm.c | 117 +++++------ + security/smack/smackfs.c | 3 - + security/yama/yama_lsm.c | 16 +- + 43 files changed, 832 insertions(+), 567 deletions(-) + create mode 100644 Documentation/devicetree/bindings/security/tpm/ibmvtpm.txt + create mode 100644 Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt + create mode 100644 Documentation/devicetree/bindings/security/tpm/tpm_tis_mmio.txt +Merging integrity/next (b4bfec7f4a86 security/integrity: Harden against malformed xattrs) +$ git merge integrity/next +Already up-to-date. +Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next) +$ git merge keys/keys-next +Auto-merging security/keys/keyctl.c +Auto-merging crypto/asymmetric_keys/x509_cert_parser.c +Auto-merging crypto/asymmetric_keys/public_key.c +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 (4a49d45dd589 selinux: allow context mounts on tmpfs, ramfs, devpts within user namespaces) +$ git merge selinux/next +Auto-merging security/selinux/hooks.c +Merge made by the 'recursive' strategy. + security/selinux/hooks.c | 85 +++++++++++++++++++++++++++++++++++-- + security/selinux/include/classmap.h | 68 +++++++++++++++++++++++++++++ + security/selinux/include/security.h | 3 +- + security/selinux/selinuxfs.c | 2 +- + security/selinux/ss/services.c | 3 ++ + 5 files changed, 156 insertions(+), 5 deletions(-) +Merging tpmdd/next (1548c540d863 tpm/vtpm: fix kdoc warnings) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + drivers/char/tpm/tpm-chip.c | 8 +-- + drivers/char/tpm/tpm-interface.c | 33 ++++++++++-- + drivers/char/tpm/tpm2-cmd.c | 104 ++++++++++++++++++++----------------- + drivers/char/tpm/tpm_ibmvtpm.c | 106 ++++++++++++++++++++------------------ + drivers/char/tpm/tpm_vtpm_proxy.c | 48 ++++++++++++----- + 5 files changed, 179 insertions(+), 120 deletions(-) +Merging watchdog/master (39487f6688a5 watchdog: imx2_wdt: add pretimeout function support) +$ git merge watchdog/master +Already up-to-date. +Merging iommu/next (1465f481460c Merge branches 'arm/mediatek', 'arm/smmu', 'x86/amd', 's390', 'core' and 'arm/exynos' into next) +$ git merge iommu/next +Resolved 'drivers/base/power/main.c' using previous resolution. +Auto-merging include/linux/acpi.h +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging drivers/pci/probe.c +Auto-merging drivers/base/power/main.c +CONFLICT (content): Merge conflict in drivers/base/power/main.c +Auto-merging arch/arm64/mm/dma-mapping.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 449a957b6d32] Merge remote-tracking branch 'iommu/next' +$ git diff -M --stat --summary HEAD^.. + arch/arm64/mm/dma-mapping.c | 2 + + drivers/acpi/arm64/iort.c | 607 ++++++++++++++++++++++++++++++++++++- + drivers/acpi/glue.c | 4 +- + drivers/acpi/scan.c | 33 ++ + drivers/iommu/amd_iommu.c | 2 + + drivers/iommu/amd_iommu_init.c | 4 + + drivers/iommu/amd_iommu_v2.c | 4 +- + drivers/iommu/arm-smmu-v3.c | 104 +++++-- + drivers/iommu/arm-smmu.c | 177 ++++++++--- + drivers/iommu/dma-iommu.c | 24 +- + drivers/iommu/exynos-iommu.c | 293 +++++++++--------- + drivers/iommu/io-pgtable-arm-v7s.c | 5 +- + drivers/iommu/io-pgtable-arm.c | 7 +- + drivers/iommu/iommu.c | 53 ++++ + drivers/iommu/iova.c | 2 +- + drivers/iommu/mtk_iommu.c | 85 ++---- + drivers/iommu/mtk_iommu.h | 11 +- + drivers/iommu/mtk_iommu_v1.c | 105 +++---- + drivers/iommu/of_iommu.c | 39 --- + drivers/iommu/s390-iommu.c | 1 - + drivers/pci/probe.c | 3 +- + include/acpi/acpi_bus.h | 2 + + include/asm-generic/vmlinux.lds.h | 1 + + include/linux/acpi.h | 26 ++ + include/linux/acpi_iort.h | 16 + + include/linux/dma-iommu.h | 4 + + include/linux/fwnode.h | 3 +- + include/linux/iommu.h | 15 + + include/linux/of_iommu.h | 12 +- + 29 files changed, 1238 insertions(+), 406 deletions(-) +Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (2b8bb1d771f7 vfio iommu type1: Fix size argument to vfio_find_dma() in pin_pages/unpin_pages) +$ git merge vfio/next +Already up-to-date. +Merging trivial/for-next (74dcba3589fc NTB: correct ntb_spad_count comment typo) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/next (89670affa2a6 audit: Make AUDIT_ANOM_ABEND event normalized) +$ git merge audit/next +Resolved 'include/uapi/linux/audit.h' using previous resolution. +Resolved 'net/core/net_namespace.c' using previous resolution. +Auto-merging net/core/net_namespace.c +CONFLICT (content): Merge conflict in net/core/net_namespace.c +Auto-merging kernel/auditsc.c +Auto-merging kernel/audit_watch.c +Auto-merging kernel/audit_tree.c +Auto-merging kernel/audit_fsnotify.c +Auto-merging kernel/audit.c +Auto-merging include/uapi/linux/audit.h +CONFLICT (content): Merge conflict in include/uapi/linux/audit.h +Auto-merging fs/proc/base.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 84503b559e93] Merge remote-tracking branch 'audit/next' +$ git diff -M --stat --summary HEAD^.. + fs/proc/base.c | 2 +- + include/uapi/linux/audit.h | 5 +- + kernel/audit.c | 534 +++++++++++++++++++++++++++------------------ + kernel/audit_fsnotify.c | 5 +- + kernel/audit_tree.c | 3 +- + kernel/audit_watch.c | 5 +- + kernel/auditfilter.c | 5 +- + kernel/auditsc.c | 14 +- + 8 files changed, 349 insertions(+), 224 deletions(-) +Merging devicetree/for-next (61eb3a04f978 dt: pwm: bcm2835: fix typo in clocks property name) +$ git merge devicetree/for-next +Resolved 'Documentation/devicetree/bindings/vendor-prefixes.txt' using previous resolution. +Auto-merging drivers/of/base.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 442872badf25] Merge remote-tracking branch 'devicetree/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/arm-boards | 3 +- + .../bindings/fpga/altera-fpga2sdram-bridge.txt | 16 + + .../bindings/fpga/altera-freeze-bridge.txt | 23 ++ + .../bindings/fpga/altera-hps2fpga-bridge.txt | 39 +++ + .../bindings/fpga/altera-socfpga-a10-fpga-mgr.txt | 19 ++ + .../devicetree/bindings/pwm/pwm-bcm2835.txt | 2 +- + .../devicetree/bindings/vendor-prefixes.txt | 11 +- + drivers/of/base.c | 9 +- + drivers/of/of_numa.c | 7 +- + drivers/of/platform.c | 6 +- + drivers/of/resolver.c | 358 +++++++++------------ + 11 files changed, 278 insertions(+), 215 deletions(-) + create mode 100644 Documentation/devicetree/bindings/fpga/altera-fpga2sdram-bridge.txt + create mode 100644 Documentation/devicetree/bindings/fpga/altera-freeze-bridge.txt + create mode 100644 Documentation/devicetree/bindings/fpga/altera-hps2fpga-bridge.txt + create mode 100644 Documentation/devicetree/bindings/fpga/altera-socfpga-a10-fpga-mgr.txt +Merging mailbox/mailbox-for-next (16ae16c6e561 Merge tag 'mmc-v4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc) +$ git merge mailbox/mailbox-for-next +Already up-to-date. +Merging spi/for-next (d8af82e060ce Merge remote-tracking branches 'spi/fix/armada', 'spi/fix/fsl-dspi' and 'spi/fix/sh-msiof' into spi-linus) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/spi/sh-msiof.txt | 19 +++++++++++++------ + drivers/spi/Kconfig | 1 + + drivers/spi/spi-armada-3700.c | 9 +++++---- + drivers/spi/spi-sh-msiof.c | 4 +++- + 4 files changed, 22 insertions(+), 11 deletions(-) +Merging tip/auto-latest (55e874f7b6ab Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Auto-merging include/linux/sched.h +Auto-merging include/linux/cacheinfo.h +Auto-merging drivers/base/cacheinfo.c +Auto-merging arch/x86/kernel/tsc.c +Auto-merging arch/x86/kernel/cpu/intel_cacheinfo.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-devices-system-cpu | 16 + + Documentation/x86/intel_rdt_ui.txt | 214 ++++ + MAINTAINERS | 8 + + arch/x86/Kconfig | 13 + + arch/x86/events/intel/cqm.c | 23 +- + arch/x86/include/asm/cpufeatures.h | 5 + + arch/x86/include/asm/intel_rdt.h | 224 ++++ + arch/x86/include/asm/intel_rdt_common.h | 27 + + arch/x86/include/asm/tsc.h | 9 + + arch/x86/kernel/Makefile | 2 +- + arch/x86/kernel/apic/apic.c | 15 - + arch/x86/kernel/cpu/Makefile | 2 + + arch/x86/kernel/cpu/common.c | 24 +- + arch/x86/kernel/cpu/intel_cacheinfo.c | 20 + + arch/x86/kernel/cpu/intel_rdt.c | 403 +++++++ + arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 1115 ++++++++++++++++++++ + arch/x86/kernel/cpu/intel_rdt_schemata.c | 245 +++++ + arch/x86/kernel/cpu/scattered.c | 11 +- + arch/x86/kernel/head_64.S | 5 +- + arch/x86/kernel/process.c | 1 + + arch/x86/kernel/process_32.c | 4 + + arch/x86/kernel/process_64.c | 4 + + arch/x86/kernel/smpboot.c | 51 +- + arch/x86/kernel/tsc.c | 36 +- + arch/x86/kernel/tsc_msr.c | 19 + + arch/x86/kernel/tsc_sync.c | 255 ++++- + arch/x86/platform/intel-mid/mfld.c | 9 +- + arch/x86/platform/intel-mid/mrfld.c | 8 +- + arch/x86/xen/smp.c | 6 - + drivers/base/cacheinfo.c | 5 + + include/linux/cacheinfo.h | 3 + + include/linux/sched.h | 3 + + include/uapi/linux/magic.h | 1 + + 33 files changed, 2663 insertions(+), 123 deletions(-) + create mode 100644 Documentation/x86/intel_rdt_ui.txt + create mode 100644 arch/x86/include/asm/intel_rdt.h + create mode 100644 arch/x86/include/asm/intel_rdt_common.h + create mode 100644 arch/x86/kernel/cpu/intel_rdt.c + create mode 100644 arch/x86/kernel/cpu/intel_rdt_rdtgroup.c + create mode 100644 arch/x86/kernel/cpu/intel_rdt_schemata.c +Merging clockevents/clockevents/next (f947ee147e08 clocksource/drivers/arm_arch_timer: Map frame with of_io_request_and_map()) +$ git merge clockevents/clockevents/next +Already up-to-date. +Merging edac/linux_next (a2e4c787f75b EDAC: Document HW_EVENT_ERR_DEFERRED type) +$ git merge edac/linux_next +Auto-merging drivers/edac/edac_device.h +Auto-merging MAINTAINERS +Removing Documentation/edac.txt +Auto-merging Documentation/driver-api/index.rst +Auto-merging Documentation/00-INDEX +Merge made by the 'recursive' strategy. + Documentation/00-INDEX | 4 +- + Documentation/admin-guide/index.rst | 1 + + Documentation/admin-guide/ras.rst | 1190 +++++++++++++++++++++++++++ + Documentation/driver-api/edac.rst | 178 ++++ + Documentation/driver-api/index.rst | 1 + + Documentation/edac.txt | 812 ------------------ + MAINTAINERS | 3 +- + drivers/edac/altera_edac.c | 1 - + drivers/edac/amd64_edac.h | 2 +- + drivers/edac/amd76x_edac.c | 2 +- + drivers/edac/amd8111_edac.c | 1 - + drivers/edac/amd8131_edac.c | 1 - + drivers/edac/cell_edac.c | 2 +- + drivers/edac/cpc925_edac.c | 1 - + drivers/edac/e752x_edac.c | 2 +- + drivers/edac/e7xxx_edac.c | 2 +- + drivers/edac/edac_device.c | 79 +- + drivers/edac/{edac_core.h => edac_device.h} | 309 ++----- + drivers/edac/edac_device_sysfs.c | 4 +- + drivers/edac/edac_mc.c | 84 +- + drivers/edac/edac_mc.h | 245 ++++++ + drivers/edac/edac_mc_sysfs.c | 2 +- + drivers/edac/edac_module.c | 2 +- + drivers/edac/edac_module.h | 4 +- + drivers/edac/edac_pci.c | 84 +- + drivers/edac/edac_pci.h | 271 ++++++ + drivers/edac/edac_pci_sysfs.c | 13 +- + drivers/edac/fsl_ddr_edac.c | 1 - + drivers/edac/ghes_edac.c | 2 +- + drivers/edac/highbank_l2_edac.c | 1 - + drivers/edac/highbank_mc_edac.c | 1 - + drivers/edac/i3000_edac.c | 2 +- + drivers/edac/i3200_edac.c | 2 +- + drivers/edac/i5000_edac.c | 2 +- + drivers/edac/i5100_edac.c | 1 - + drivers/edac/i5400_edac.c | 2 +- + drivers/edac/i7300_edac.c | 2 +- + drivers/edac/i7core_edac.c | 2 +- + drivers/edac/i82443bxgx_edac.c | 2 +- + drivers/edac/i82860_edac.c | 2 +- + drivers/edac/i82875p_edac.c | 2 +- + drivers/edac/i82975x_edac.c | 2 +- + drivers/edac/ie31200_edac.c | 2 +- + drivers/edac/layerscape_edac.c | 2 +- + drivers/edac/mpc85xx_edac.c | 1 - + drivers/edac/mv64x60_edac.c | 1 - + drivers/edac/octeon_edac-l2c.c | 1 - + drivers/edac/octeon_edac-lmc.c | 1 - + drivers/edac/octeon_edac-pc.c | 1 - + drivers/edac/octeon_edac-pci.c | 1 - + drivers/edac/pasemi_edac.c | 2 +- + drivers/edac/ppc4xx_edac.c | 2 +- + drivers/edac/r82600_edac.c | 2 +- + drivers/edac/sb_edac.c | 2 +- + drivers/edac/skx_edac.c | 2 +- + drivers/edac/synopsys_edac.c | 2 +- + drivers/edac/tile_edac.c | 2 +- + drivers/edac/x38_edac.c | 2 +- + drivers/edac/xgene_edac.c | 1 - + include/linux/edac.h | 154 +--- + 60 files changed, 2029 insertions(+), 1478 deletions(-) + create mode 100644 Documentation/admin-guide/ras.rst + create mode 100644 Documentation/driver-api/edac.rst + delete mode 100644 Documentation/edac.txt + rename drivers/edac/{edac_core.h => edac_device.h} (52%) + create mode 100644 drivers/edac/edac_mc.h + create mode 100644 drivers/edac/edac_pci.h +Merging edac-amd/for-next (0de2788447b6 EDAC, amd64: Fix improper return value) +$ git merge edac-amd/for-next +Already up-to-date. +Merging irqchip/irqchip/for-next (0ccb54a7dba0 Merge branch 'irqchip/core' into irqchip/for-next) +$ git merge irqchip/irqchip/for-next +Merge made by the 'recursive' strategy. +Merging ftrace/for-next (3dbb16b87b57 selftests: ftrace: Shift down default message verbosity) +$ git merge ftrace/for-next +Auto-merging kernel/trace/trace.c +Auto-merging kernel/trace/ring_buffer.c +Auto-merging kernel/trace/ftrace.c +Auto-merging kernel/sysctl.c +Auto-merging include/linux/ftrace.h +Auto-merging drivers/i2c/i2c-core.c +Auto-merging drivers/hwtracing/stm/core.c +Auto-merging drivers/hwtracing/coresight/coresight-stm.c +Auto-merging arch/x86/entry/entry_32.S +Auto-merging arch/powerpc/platforms/pseries/lpar.c +Auto-merging Documentation/trace/ftrace.txt +Merge made by the 'recursive' strategy. + Documentation/trace/events.txt | 9 +- + Documentation/trace/ftrace.txt | 15 +- + arch/powerpc/include/asm/trace.h | 4 +- + arch/powerpc/platforms/powernv/opal-tracepoints.c | 6 +- + arch/powerpc/platforms/pseries/lpar.c | 6 +- + arch/x86/entry/entry_32.S | 4 +- + arch/x86/include/asm/trace/exceptions.h | 2 +- + arch/x86/include/asm/trace/irq_vectors.h | 2 +- + arch/x86/kernel/tracepoint.c | 3 +- + drivers/hwtracing/coresight/coresight-stm.c | 2 +- + drivers/hwtracing/intel_th/sth.c | 11 +- + drivers/hwtracing/stm/Kconfig | 11 + + drivers/hwtracing/stm/Makefile | 2 + + drivers/hwtracing/stm/core.c | 7 +- + drivers/hwtracing/stm/dummy_stm.c | 2 +- + drivers/hwtracing/stm/ftrace.c | 87 ++++ + drivers/i2c/i2c-core.c | 3 +- + include/linux/ftrace.h | 4 + + include/linux/stm.h | 4 +- + include/linux/trace.h | 28 ++ + include/linux/tracepoint-defs.h | 2 +- + include/linux/tracepoint.h | 2 +- + include/trace/events/i2c.h | 2 +- + kernel/sysctl.c | 2 +- + kernel/trace/Kconfig | 2 + + kernel/trace/ftrace.c | 4 + + kernel/trace/ring_buffer.c | 28 +- + kernel/trace/trace.c | 485 ++++++++++++++++----- + kernel/trace/trace.h | 19 +- + kernel/trace/trace_benchmark.c | 26 +- + kernel/trace/trace_benchmark.h | 2 +- + kernel/trace/trace_branch.c | 2 +- + kernel/trace/trace_entries.h | 15 + + kernel/trace/trace_events.c | 83 ++-- + kernel/trace/trace_events_filter.c | 119 +++-- + kernel/trace/trace_functions_graph.c | 35 +- + kernel/trace/trace_hwlat.c | 2 +- + kernel/trace/trace_irqsoff.c | 12 + + kernel/trace/trace_kprobe.c | 47 +- + kernel/trace/trace_output.c | 30 ++ + kernel/trace/trace_sched_wakeup.c | 13 + + kernel/tracepoint.c | 12 +- + samples/trace_events/trace-events-sample.c | 3 +- + samples/trace_events/trace-events-sample.h | 2 +- + scripts/recordmcount.c | 65 +++ + tools/testing/selftests/ftrace/.gitignore | 1 + + tools/testing/selftests/ftrace/ftracetest | 16 +- + .../ftrace/test.d/ftrace/func-filter-glob.tc | 49 +++ + tools/testing/selftests/ftrace/test.d/functions | 28 ++ + .../ftrace/test.d/kprobe/kprobe_args_type.tc | 37 ++ + .../ftrace/test.d/trigger/trigger-hist-mod.tc | 2 +- + .../ftrace/test.d/trigger/trigger-snapshot.tc | 5 + + 52 files changed, 1064 insertions(+), 300 deletions(-) + create mode 100644 drivers/hwtracing/stm/ftrace.c + create mode 100644 include/linux/trace.h + create mode 100644 tools/testing/selftests/ftrace/.gitignore + create mode 100644 tools/testing/selftests/ftrace/test.d/ftrace/func-filter-glob.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_type.tc +Merging rcu/rcu/next (6190aaafd06c Merge branches 'doc.2016.11.14a', 'fixes.2016.11.14a', 'list.2016.10.31a' and 'torture.2016.11.14a' into HEAD) +$ git merge rcu/rcu/next +Already up-to-date. +Merging kvm/linux-next (36da91bdf568 KVM: x86: Handle the kthread worker using the new API) +$ git merge kvm/linux-next +Already up-to-date. +Merging kvm-arm/next (21cbe3cc8a48 arm64: KVM: pmu: Reset PMSELR_EL0.SEL to a sane value before entering the guest) +$ git merge kvm-arm/next +Already up-to-date. +Merging kvm-mips/next (07d9a380680d Linux 4.9-rc2) +$ git merge kvm-mips/next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (e34af7849014 KVM: PPC: Book3S: Move prototypes for KVM functions into kvm_ppc.h) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (e1788bb995be KVM: s390: handle floating point registers in the run ioctl not in vcpu_put/load) +$ git merge kvms390/next +Already up-to-date. +Merging xen-tip/linux-next (709613ad2b3c xen/balloon: Only mark a page as managed when it is released) +$ git merge xen-tip/linux-next +Already up-to-date. +Merging percpu/for-next (3ca45a46f8af percpu: ensure the requested alignment is power of two) +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next (8bc4a0445596 Merge branch 'for-4.9' into for-4.10) +$ git merge workqueues/for-next +Already up-to-date. +Merging drivers-x86/for-next (1d161d4cd719 platform/x86: dell-laptop: Use brightness_set_blocking for kbd_led_level_set) +$ git merge drivers-x86/for-next +Auto-merging drivers/platform/x86/intel-vbtn.c +Auto-merging drivers/platform/x86/intel-hid.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/laptops/thinkpad-acpi.txt | 1 + + MAINTAINERS | 7 + + drivers/platform/x86/Kconfig | 11 + + drivers/platform/x86/Makefile | 1 + + drivers/platform/x86/acer-wmi.c | 56 +++ + drivers/platform/x86/asus-nb-wmi.c | 23 ++ + drivers/platform/x86/asus-wmi.c | 29 ++ + drivers/platform/x86/asus-wmi.h | 1 + + drivers/platform/x86/dell-laptop.c | 26 +- + drivers/platform/x86/dell-wmi.c | 12 +- + drivers/platform/x86/intel-hid.c | 6 +- + drivers/platform/x86/intel-smartconnect.c | 2 +- + drivers/platform/x86/intel-vbtn.c | 35 +- + drivers/platform/x86/intel_mid_thermal.c | 2 + + drivers/platform/x86/intel_pmc_core.c | 386 ++++++++++++++++++- + drivers/platform/x86/intel_pmc_core.h | 110 +++++- + drivers/platform/x86/mlxcpld-hotplug.c | 515 ++++++++++++++++++++++++++ + drivers/platform/x86/panasonic-laptop.c | 2 +- + drivers/platform/x86/thinkpad_acpi.c | 95 ++++- + include/linux/platform_data/mlxcpld-hotplug.h | 99 +++++ + 20 files changed, 1346 insertions(+), 73 deletions(-) + create mode 100644 drivers/platform/x86/mlxcpld-hotplug.c + create mode 100644 include/linux/platform_data/mlxcpld-hotplug.h +Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch") +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. +Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (44b3e31d540e leds: pca955x: Add ACPI support) +$ git merge leds/for-next +Already up-to-date. +Merging ipmi/for-next (070cbd1d42aa ipmi: create hardware-independent softdep for ipmi_devintf) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + Documentation/IPMI.txt | 57 ++++++----- + drivers/char/ipmi/ipmi_devintf.c | 1 - + drivers/char/ipmi/ipmi_msghandler.c | 10 +- + drivers/char/ipmi/ipmi_si_intf.c | 190 ++++++++++++++++++------------------ + drivers/char/ipmi/ipmi_ssif.c | 37 +++++-- + 5 files changed, 165 insertions(+), 130 deletions(-) +Merging driver-core/driver-core-next (cdb98c2698b4 Revert "nvme: add support for the Write Zeroes command") +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (cdb98c2698b4 Revert "nvme: add support for the Write Zeroes command") +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (cdb98c2698b4 Revert "nvme: add support for the Write Zeroes command") +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (d5c024f3761d usb: gadget: serial: fix possible Oops caused by calling kthread_stop(NULL)) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (3c3dd1e058cb USB: serial: kl5kusb105: abort on open exception path) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging usb-chipidea-next/ci-for-usb-next (223e92311583 usb: chipdata: Replace the extcon API) +$ git merge usb-chipidea-next/ci-for-usb-next +Auto-merging drivers/usb/chipidea/core.c +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/core.c | 30 ++++++------------------------ + 1 file changed, 6 insertions(+), 24 deletions(-) +Merging phy-next/next (5e253dfbdbea phy: rockchip-inno-usb2: select USB_COMMON) +$ git merge phy-next/next +Already up-to-date. +Merging staging/staging-next (cdb98c2698b4 Revert "nvme: add support for the Write Zeroes command") +$ git merge staging/staging-next +Already up-to-date. +Merging char-misc/char-misc-next (cdb98c2698b4 Revert "nvme: add support for the Write Zeroes command") +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging extcon/extcon-next (669ae5dabe7a extcon: palmas: Check the parent instance to prevent the NULL) +$ git merge extcon/extcon-next +Auto-merging drivers/extcon/extcon-arizona.c +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-arizona.c | 20 ++++++++------------ + drivers/extcon/extcon-max14577.c | 6 ++++-- + drivers/extcon/extcon-max77693.c | 12 ++++++++---- + drivers/extcon/extcon-max77843.c | 24 ++++++++++++++++-------- + drivers/extcon/extcon-palmas.c | 5 +++++ + drivers/extcon/extcon-rt8973a.c | 6 ++++-- + drivers/extcon/extcon-sm5502.c | 6 ++++-- + drivers/extcon/extcon.c | 2 +- + include/linux/extcon/extcon-adc-jack.h | 2 +- + 9 files changed, 51 insertions(+), 32 deletions(-) +Merging slave-dma/next (e66937868db0 Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Auto-merging drivers/tty/serial/8250/8250_lpss.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/dma/nbpfaxi.txt | 8 + + .../devicetree/bindings/dma/qcom_hidma_mgmt.txt | 12 +- + .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 1 + + Documentation/devicetree/bindings/dma/snps-dma.txt | 2 + + Documentation/dmaengine/client.txt | 16 +- + Documentation/dmaengine/dmatest.txt | 10 +- + Documentation/dmaengine/provider.txt | 2 +- + Documentation/dmaengine/pxa_dma.txt | 2 +- + arch/arc/boot/dts/abilis_tb10x.dtsi | 1 + + arch/arm/boot/dts/spear13xx.dtsi | 2 + + arch/arm/mach-s3c64xx/pl080.c | 32 ++++ + arch/arm/plat-samsung/devs.c | 24 --- + drivers/dma/Kconfig | 2 +- + drivers/dma/amba-pl08x.c | 11 ++ + drivers/dma/at_hdmac.c | 3 +- + drivers/dma/at_xdmac.c | 5 +- + drivers/dma/dmatest.c | 74 +++++--- + drivers/dma/dw/core.c | 2 +- + drivers/dma/dw/platform.c | 18 +- + drivers/dma/dw/regs.h | 3 +- + drivers/dma/edma.c | 3 + + drivers/dma/fsl_raid.c | 1 + + drivers/dma/hsu/pci.c | 8 +- + drivers/dma/img-mdc-dma.c | 9 +- + drivers/dma/imx-sdma.c | 13 +- + drivers/dma/ioat/dma.c | 17 +- + drivers/dma/ioat/init.c | 21 ++- + drivers/dma/k3dma.c | 3 +- + drivers/dma/mic_x100_dma.c | 2 - + drivers/dma/mv_xor.c | 190 +++++++++++++++++++-- + drivers/dma/mv_xor.h | 1 + + drivers/dma/nbpfaxi.c | 38 ++++- + drivers/dma/omap-dma.c | 187 ++++++++++++++++---- + drivers/dma/pch_dma.c | 5 +- + drivers/dma/pl330.c | 23 ++- + drivers/dma/pxa_dma.c | 28 --- + drivers/dma/qcom/hidma.c | 173 +++++++++++++++++-- + drivers/dma/qcom/hidma.h | 9 +- + drivers/dma/qcom/hidma_dbg.c | 4 +- + drivers/dma/qcom/hidma_ll.c | 176 +++++++++---------- + drivers/dma/qcom/hidma_mgmt.c | 11 +- + drivers/dma/s3c24xx-dma.c | 5 - + drivers/dma/sh/usb-dmac.c | 3 - + drivers/dma/sirf-dma.c | 4 - + drivers/dma/stm32-dma.c | 6 +- + drivers/dma/zx296702_dma.c | 3 +- + drivers/of/irq.c | 1 + + drivers/spi/spi-s3c64xx.c | 21 +-- + drivers/tty/serial/8250/8250_lpss.c | 2 +- + include/linux/amba/pl08x.h | 4 + + include/linux/dmaengine.h | 8 + + include/linux/platform_data/dma-dw.h | 5 +- + include/linux/platform_data/spi-s3c64xx.h | 3 - + 53 files changed, 868 insertions(+), 349 deletions(-) +Merging cgroup/for-next (89bb3eed858e cgroup: cgroup_sk_alloc() is allowed to increase reference on a dead cgroup) +$ git merge cgroup/for-next +Auto-merging kernel/cgroup.c +Merge made by the 'recursive' strategy. + kernel/cgroup.c | 8 ++++++-- + kernel/cpuset.c | 2 -- + 2 files changed, 6 insertions(+), 4 deletions(-) +Merging scsi/for-next (02cf5abb4d9e Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/ufs/ufshcd.c +Merge made by the 'recursive' strategy. + Documentation/scsi/g_NCR5380.txt | 46 ++++++------ + drivers/scsi/NCR5380.c | 77 +------------------- + drivers/scsi/NCR5380.h | 11 --- + drivers/scsi/aacraid/linit.c | 2 - + drivers/scsi/g_NCR5380.c | 153 +++++++++++++++++++++++++++++++++------ + drivers/scsi/g_NCR5380.h | 2 + + drivers/scsi/ibmvscsi/ibmvscsi.c | 7 +- + drivers/scsi/ibmvscsi/ibmvscsi.h | 1 + + drivers/scsi/ufs/ufs-qcom.c | 44 ++++++++++- + drivers/scsi/ufs/ufs-qcom.h | 1 + + drivers/scsi/ufs/ufs_quirks.h | 30 +++----- + drivers/scsi/ufs/ufshcd.c | 55 +++++++++++++- + drivers/scsi/ufs/ufshcd.h | 12 ++- + drivers/scsi/ufs/ufshci.h | 7 ++ + 14 files changed, 283 insertions(+), 165 deletions(-) +Merging scsi-mkp/for-next (d2a145252c52 scsi: avoid a permanent stop of the scsi device's request queue) +$ git merge scsi-mkp/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 8 +- + drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 13 + + drivers/s390/scsi/zfcp_dbf.c | 17 +- + drivers/s390/scsi/zfcp_dbf.h | 41 +- + drivers/s390/scsi/zfcp_erp.c | 61 +- + drivers/s390/scsi/zfcp_ext.h | 4 +- + drivers/s390/scsi/zfcp_fsf.h | 3 +- + drivers/s390/scsi/zfcp_reqlist.h | 30 +- + drivers/s390/scsi/zfcp_scsi.c | 61 +- + drivers/scsi/3w-9xxx.c | 9 +- + drivers/scsi/3w-9xxx.h | 9 +- + drivers/scsi/3w-sas.c | 7 +- + drivers/scsi/3w-sas.h | 7 +- + drivers/scsi/3w-xxxx.c | 7 +- + drivers/scsi/3w-xxxx.h | 5 +- + drivers/scsi/Kconfig | 1 + + drivers/scsi/Makefile | 1 + + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 320 +++- + drivers/scsi/cxgbi/libcxgbi.c | 40 +- + drivers/scsi/cxgbi/libcxgbi.h | 2 + + drivers/scsi/hpsa.c | 37 +- + drivers/scsi/mpt3sas/mpt3sas_base.h | 6 + + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 43 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 34 +- + drivers/scsi/qedi/Kconfig | 10 + + drivers/scsi/qedi/Makefile | 5 + + drivers/scsi/qedi/qedi.h | 364 ++++ + drivers/scsi/qedi/qedi_dbg.c | 143 ++ + drivers/scsi/qedi/qedi_dbg.h | 144 ++ + drivers/scsi/qedi/qedi_debugfs.c | 244 +++ + drivers/scsi/qedi/qedi_fw.c | 2378 +++++++++++++++++++++++++++ + drivers/scsi/qedi/qedi_gbl.h | 73 + + drivers/scsi/qedi/qedi_hsi.h | 52 + + drivers/scsi/qedi/qedi_iscsi.c | 1624 ++++++++++++++++++ + drivers/scsi/qedi/qedi_iscsi.h | 232 +++ + drivers/scsi/qedi/qedi_main.c | 2127 ++++++++++++++++++++++++ + drivers/scsi/qedi/qedi_sysfs.c | 52 + + drivers/scsi/qedi/qedi_version.h | 14 + + drivers/scsi/qla2xxx/qla_attr.c | 36 +- + drivers/scsi/qla2xxx/qla_dbg.c | 4 +- + drivers/scsi/qla2xxx/qla_def.h | 108 +- + drivers/scsi/qla2xxx/qla_gbl.h | 28 +- + drivers/scsi/qla2xxx/qla_init.c | 173 +- + drivers/scsi/qla2xxx/qla_inline.h | 30 + + drivers/scsi/qla2xxx/qla_iocb.c | 407 ++++- + drivers/scsi/qla2xxx/qla_isr.c | 223 ++- + drivers/scsi/qla2xxx/qla_mbx.c | 85 +- + drivers/scsi/qla2xxx/qla_mid.c | 116 +- + drivers/scsi/qla2xxx/qla_os.c | 475 ++++-- + drivers/scsi/scsi_sysfs.c | 4 - + 50 files changed, 9387 insertions(+), 530 deletions(-) + create mode 100644 drivers/scsi/qedi/Kconfig + create mode 100644 drivers/scsi/qedi/Makefile + create mode 100644 drivers/scsi/qedi/qedi.h + create mode 100644 drivers/scsi/qedi/qedi_dbg.c + create mode 100644 drivers/scsi/qedi/qedi_dbg.h + create mode 100644 drivers/scsi/qedi/qedi_debugfs.c + create mode 100644 drivers/scsi/qedi/qedi_fw.c + create mode 100644 drivers/scsi/qedi/qedi_gbl.h + create mode 100644 drivers/scsi/qedi/qedi_hsi.h + create mode 100644 drivers/scsi/qedi/qedi_iscsi.c + create mode 100644 drivers/scsi/qedi/qedi_iscsi.h + create mode 100644 drivers/scsi/qedi/qedi_main.c + create mode 100644 drivers/scsi/qedi/qedi_sysfs.c + create mode 100644 drivers/scsi/qedi/qedi_version.h +Merging target-updates/for-next (291e3e51a34d target: fix spelling mistake: "limitiation" -> "limitation") +$ git merge target-updates/for-next +Already up-to-date. +Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging libata/for-next (7ddf6a387c68 Merge branch 'for-4.10' into for-next) +$ git merge libata/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation) +$ git merge binfmt_misc/for-next +Already up-to-date. +Merging vhost/linux-next (75bfa81bf089 virtio_ring: mark vring_dma_dev inline) +$ git merge vhost/linux-next +Already up-to-date. +Merging rpmsg/for-next (d85a9aa0a775 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging gpio/for-next (acf1fcf77247 Merge branch 'thread-irq-simpler' into devel) +$ git merge gpio/for-next +Already up-to-date. +Merging pinctrl/for-next (f82144450874 pinctrl: sx150x: use new nested IRQ infrastructure) +$ git merge pinctrl/for-next +Already up-to-date. +Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (fdd3ff4db177 Merge branch 'for-4.10/drivers' into for-next) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pwm/pwm-hibvt.txt | 21 ++ + drivers/pwm/Kconfig | 9 + + drivers/pwm/Makefile | 1 + + drivers/pwm/pwm-hibvt.c | 271 +++++++++++++++++++++ + drivers/pwm/pwm-meson.c | 1 - + 5 files changed, 302 insertions(+), 1 deletion(-) + create mode 100644 Documentation/devicetree/bindings/pwm/pwm-hibvt.txt + create mode 100644 drivers/pwm/pwm-hibvt.c +Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files) +$ git merge dma-buf/for-next +Resolved 'drivers/dma-buf/Kconfig' using previous resolution. +Auto-merging drivers/dma-buf/Kconfig +CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d053670ee4a4] Merge remote-tracking branch 'dma-buf/for-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 11 +++++++++++ + 1 file changed, 11 insertions(+) +Merging userns/for-next (19339c251607 Revert "evm: Translate user/group ids relative to s_user_ns when computing HMAC") +$ git merge userns/for-next +Auto-merging mm/nommu.c +Auto-merging mm/memory.c +Auto-merging kernel/fork.c +Auto-merging include/linux/sched.h +Auto-merging fs/exec.c +Merge made by the 'recursive' strategy. + arch/alpha/kernel/ptrace.c | 2 +- + arch/blackfin/kernel/ptrace.c | 4 +-- + arch/cris/arch-v32/kernel/ptrace.c | 2 +- + arch/ia64/kernel/ptrace.c | 2 +- + arch/mips/kernel/ptrace32.c | 4 +-- + arch/powerpc/kernel/ptrace32.c | 4 +-- + fs/exec.c | 21 +++++++++-- + include/linux/capability.h | 2 ++ + include/linux/mm.h | 2 ++ + include/linux/mm_types.h | 1 + + include/linux/ptrace.h | 4 ++- + include/linux/sched.h | 1 + + kernel/capability.c | 36 +++++++++++++++++-- + kernel/fork.c | 9 +++-- + kernel/ptrace.c | 70 ++++++++++++++++++++++++++----------- + mm/init-mm.c | 2 ++ + mm/memory.c | 2 +- + mm/nommu.c | 2 +- + security/integrity/evm/evm_crypto.c | 12 +++++-- + 19 files changed, 139 insertions(+), 43 deletions(-) +Merging ktest/for-next (2dcd0af568b0 Linux 4.6) +$ git merge ktest/for-next +Already up-to-date. +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 (22f6592b23ef selftest/gpio: add gpio test case) +$ git merge kselftest/next +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'recursive' strategy. + tools/testing/selftests/.gitignore | 1 + + tools/testing/selftests/Makefile | 2 + + tools/testing/selftests/drivers/gpu/i915.sh | 14 + + tools/testing/selftests/gpio/Makefile | 23 ++ + tools/testing/selftests/gpio/gpio-mockup-chardev.c | 324 +++++++++++++++++++++ + tools/testing/selftests/gpio/gpio-mockup-sysfs.sh | 134 +++++++++ + tools/testing/selftests/gpio/gpio-mockup.sh | 201 +++++++++++++ + tools/testing/selftests/nsfs/.gitignore | 2 + + tools/testing/selftests/sigaltstack/.gitignore | 1 + + tools/testing/selftests/sync/.gitignore | 1 + + tools/testing/selftests/sync/Makefile | 24 ++ + tools/testing/selftests/sync/sw_sync.h | 46 +++ + tools/testing/selftests/sync/sync.c | 221 ++++++++++++++ + tools/testing/selftests/sync/sync.h | 40 +++ + tools/testing/selftests/sync/sync_alloc.c | 74 +++++ + tools/testing/selftests/sync/sync_fence.c | 132 +++++++++ + tools/testing/selftests/sync/sync_merge.c | 60 ++++ + .../testing/selftests/sync/sync_stress_consumer.c | 185 ++++++++++++ + tools/testing/selftests/sync/sync_stress_merge.c | 115 ++++++++ + .../selftests/sync/sync_stress_parallelism.c | 111 +++++++ + tools/testing/selftests/sync/sync_test.c | 79 +++++ + tools/testing/selftests/sync/sync_wait.c | 91 ++++++ + tools/testing/selftests/sync/synctest.h | 66 +++++ + tools/testing/selftests/timers/.gitignore | 1 + + 24 files changed, 1948 insertions(+) + create mode 100644 tools/testing/selftests/.gitignore + create mode 100755 tools/testing/selftests/drivers/gpu/i915.sh + create mode 100644 tools/testing/selftests/gpio/Makefile + create mode 100644 tools/testing/selftests/gpio/gpio-mockup-chardev.c + create mode 100755 tools/testing/selftests/gpio/gpio-mockup-sysfs.sh + create mode 100755 tools/testing/selftests/gpio/gpio-mockup.sh + create mode 100644 tools/testing/selftests/nsfs/.gitignore + create mode 100644 tools/testing/selftests/sigaltstack/.gitignore + create mode 100644 tools/testing/selftests/sync/.gitignore + create mode 100644 tools/testing/selftests/sync/Makefile + create mode 100644 tools/testing/selftests/sync/sw_sync.h + create mode 100644 tools/testing/selftests/sync/sync.c + create mode 100644 tools/testing/selftests/sync/sync.h + create mode 100644 tools/testing/selftests/sync/sync_alloc.c + create mode 100644 tools/testing/selftests/sync/sync_fence.c + create mode 100644 tools/testing/selftests/sync/sync_merge.c + create mode 100644 tools/testing/selftests/sync/sync_stress_consumer.c + create mode 100644 tools/testing/selftests/sync/sync_stress_merge.c + create mode 100644 tools/testing/selftests/sync/sync_stress_parallelism.c + create mode 100644 tools/testing/selftests/sync/sync_test.c + create mode 100644 tools/testing/selftests/sync/sync_wait.c + create mode 100644 tools/testing/selftests/sync/synctest.h +Merging y2038/y2038 (549eb7b22e24 AFS: Correctly use 64-bit time for UUID) +$ git merge y2038/y2038 +Resolved 'fs/afs/main.c' using previous resolution. +Auto-merging fs/afs/main.c +CONFLICT (content): Merge conflict in fs/afs/main.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 686dd021fb3b] Merge remote-tracking branch 'y2038/y2038' +$ git diff -M --stat --summary HEAD^.. + fs/afs/main.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) +Merging luto-misc/next (2dcd0af568b0 Linux 4.6) +$ git merge luto-misc/next +Already up-to-date. +Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge borntraeger/linux-next +Already up-to-date. +Merging livepatching/for-next (59024954a1e7 Documentation/livepatch: Fix stale link to gmame) +$ git merge livepatching/for-next +Already up-to-date. +Merging coresight/next (e615a9a8e481 coresight: perf: Add a missing call to etm_free_aux) +$ git merge coresight/next +Merge made by the 'recursive' strategy. +Merging rtc/rtc-next (05d226088a6b rtc: mcp795: Fix whitespace and indentation.) +$ git merge rtc/rtc-next +Auto-merging drivers/rtc/rtc-cmos.c +Merge made by the 'recursive' strategy. + .../sysfs-class-rtc-rtc0-device-rtc_calibration | 5 +- + .../devicetree/bindings/rtc/epson,rtc7301.txt | 16 + + .../devicetree/bindings/rtc/ingenic,jz4740-rtc.txt | 37 ++ + Documentation/devicetree/bindings/rtc/twl-rtc.txt | 19 +- + arch/mips/boot/dts/ingenic/jz4740.dtsi | 11 + + arch/mips/boot/dts/ingenic/qi_lb60.dts | 4 + + arch/mips/include/asm/mach-jz4740/platform.h | 1 - + arch/mips/jz4740/board-qi_lb60.c | 1 - + arch/mips/jz4740/platform.c | 21 - + arch/mips/jz4740/reset.c | 63 --- + drivers/rtc/Kconfig | 38 +- + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-cmos.c | 75 +++- + drivers/rtc/rtc-ds1307.c | 52 ++- + drivers/rtc/rtc-ds1374.c | 4 +- + drivers/rtc/rtc-imxdi.c | 2 +- + drivers/rtc/rtc-jz4740.c | 154 ++++++- + drivers/rtc/rtc-lib.c | 4 +- + drivers/rtc/rtc-mcp795.c | 122 +++++- + drivers/rtc/rtc-pcf85063.c | 7 + + drivers/rtc/rtc-r7301.c | 453 +++++++++++++++++++++ + drivers/rtc/rtc-starfire.c | 10 +- + drivers/rtc/rtc-sun4v.c | 10 +- + drivers/rtc/rtc-twl.c | 202 +++++---- + 24 files changed, 1055 insertions(+), 257 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/epson,rtc7301.txt + create mode 100644 Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt + create mode 100644 drivers/rtc/rtc-r7301.c +Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field) +$ git merge hwspinlock/for-next +Already up-to-date. +Merging nvdimm/libnvdimm-for-next (abca2d5b305b Merge branch 'for-4.10/dax' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Merge made by the 'recursive' strategy. + drivers/dax/Kconfig | 1 + + drivers/dax/dax.c | 747 ++++++++++++++++++++++++++++++++++++--- + drivers/dax/pmem.c | 3 +- + drivers/nvdimm/claim.c | 35 +- + drivers/nvdimm/core.c | 29 -- + drivers/nvdimm/dimm.c | 2 + + drivers/nvdimm/dimm_devs.c | 7 + + drivers/nvdimm/e820.c | 12 +- + drivers/nvdimm/label.c | 2 +- + drivers/nvdimm/namespace_devs.c | 6 +- + drivers/nvdimm/nd.h | 12 +- + drivers/nvdimm/pfn_devs.c | 2 +- + drivers/nvdimm/pmem.c | 18 +- + tools/testing/nvdimm/test/nfit.c | 30 +- + 14 files changed, 784 insertions(+), 122 deletions(-) +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 (9c76b50c70a1 ipc/sem: add hysteresis) +$ git merge --no-ff akpm-current/current +Resolved 'lib/Kconfig.debug' using previous resolution. +Removing tools/testing/radix-tree/rcupdate.c +Removing tools/testing/radix-tree/find_next_bit.c +Auto-merging mm/shmem.c +Auto-merging mm/nommu.c +Auto-merging mm/memory.c +Auto-merging mm/filemap.c +Auto-merging lib/Kconfig.debug +CONFLICT (content): Merge conflict in lib/Kconfig.debug +Auto-merging kernel/sysctl.c +Auto-merging kernel/relay.c +Auto-merging kernel/printk/printk.c +Auto-merging kernel/debug/kdb/kdb_io.c +Auto-merging kernel/Makefile +Auto-merging include/linux/mm.h +Auto-merging include/linux/kexec.h +Auto-merging fs/exec.c +Auto-merging fs/btrfs/tests/btrfs-tests.c +Auto-merging fs/btrfs/super.c +Auto-merging drivers/misc/cxl/context.c +Auto-merging drivers/dax/dax.c +Auto-merging drivers/char/tpm/tpm-chip.c +Auto-merging Documentation/filesystems/Locking +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 4ce1cce04153] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/Locking | 2 +- + arch/arc/mm/dma.c | 5 +- + arch/arm/common/dmabounce.c | 16 +- + arch/arm/include/asm/page.h | 2 + + arch/arm64/include/asm/setup.h | 19 + + arch/arm64/include/uapi/asm/setup.h | 4 +- + arch/arm64/kernel/setup.c | 8 +- + arch/avr32/mm/dma-coherent.c | 7 +- + arch/blackfin/kernel/dma-mapping.c | 8 +- + arch/c6x/kernel/dma.c | 14 +- + arch/frv/mb93090-mb00/pci-dma-nommu.c | 14 +- + arch/frv/mb93090-mb00/pci-dma.c | 9 +- + arch/hexagon/kernel/dma.c | 6 +- + arch/m68k/kernel/dma.c | 8 +- + arch/metag/kernel/dma.c | 16 +- + arch/microblaze/kernel/dma.c | 10 +- + arch/mips/loongson64/common/dma-swiotlb.c | 2 +- + arch/mips/mm/dma-default.c | 8 +- + arch/nios2/mm/dma-mapping.c | 26 +- + arch/openrisc/kernel/dma.c | 3 + + arch/parisc/kernel/pci-dma.c | 20 +- + arch/powerpc/kernel/dma.c | 9 +- + arch/powerpc/platforms/cell/spufs/file.c | 8 +- + arch/sh/kernel/dma-nommu.c | 7 +- + arch/sparc/kernel/iommu.c | 4 +- + arch/sparc/kernel/ioport.c | 4 +- + arch/sparc/kernel/nmi.c | 44 +- + arch/tile/kernel/pci-dma.c | 12 +- + arch/x86/entry/vdso/vma.c | 4 +- + arch/x86/kernel/machine_kexec_64.c | 7 +- + arch/xtensa/kernel/pci-dma.c | 7 +- + block/genhd.c | 2 +- + drivers/char/agp/alpha-agp.c | 3 +- + drivers/char/mspec.c | 2 +- + drivers/char/tpm/tpm-chip.c | 4 +- + drivers/dax/dax.c | 3 +- + drivers/gpu/drm/armada/armada_gem.c | 5 +- + drivers/gpu/drm/drm_vm.c | 10 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 9 +- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 6 +- + drivers/gpu/drm/gma500/framebuffer.c | 2 +- + drivers/gpu/drm/gma500/gem.c | 5 +- + drivers/gpu/drm/i915/i915_gem.c | 3 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 2 +- + drivers/gpu/drm/msm/msm_gem.c | 8 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 20 +- + drivers/gpu/drm/tegra/gem.c | 4 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 2 +- + drivers/gpu/drm/udl/udl_gem.c | 5 +- + drivers/gpu/drm/vgem/vgem_drv.c | 2 +- + drivers/infiniband/core/umem_odp.c | 2 +- + drivers/media/v4l2-core/videobuf-dma-sg.c | 5 +- + drivers/misc/cxl/context.c | 5 +- + drivers/misc/sgi-gru/grumain.c | 2 +- + drivers/net/ethernet/intel/igb/igb.h | 7 +- + drivers/net/ethernet/intel/igb/igb_main.c | 77 +- + drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 3 +- + drivers/staging/android/ion/ion.c | 2 +- + drivers/staging/lustre/lustre/llite/vvp_io.c | 6 +- + drivers/usb/gadget/function/f_hid.c | 6 +- + drivers/usb/gadget/function/f_printer.c | 6 +- + drivers/vfio/vfio_iommu_type1.c | 2 +- + drivers/xen/privcmd.c | 2 +- + fs/btrfs/super.c | 12 +- + fs/btrfs/tests/btrfs-tests.c | 1 + + fs/dax.c | 208 +++-- + fs/exec.c | 2 +- + fs/ocfs2/dlm/dlmmaster.c | 66 +- + fs/ocfs2/dlmglue.c | 10 + + fs/ocfs2/stackglue.c | 6 + + fs/ocfs2/stackglue.h | 3 + + fs/userfaultfd.c | 22 +- + include/linux/crc64_ecma.h | 56 ++ + include/linux/dax.h | 7 - + include/linux/dma-mapping.h | 20 +- + include/linux/gfp.h | 2 + + include/linux/huge_mm.h | 10 +- + include/linux/idr.h | 40 +- + include/linux/kdb.h | 2 +- + include/linux/kexec.h | 8 +- + include/linux/mm.h | 46 +- + include/linux/nmi.h | 24 + + include/linux/radix-tree.h | 174 ++-- + include/linux/sem.h | 2 +- + include/linux/signal.h | 17 + + include/linux/userfaultfd_k.h | 4 +- + ipc/msg.c | 5 +- + ipc/sem.c | 621 +++++++------- + ipc/shm.c | 13 +- + kernel/Makefile | 1 + + kernel/debug/debug_core.c | 4 +- + kernel/debug/kdb/kdb_io.c | 37 +- + kernel/debug/kdb/kdb_main.c | 1 - + kernel/debug/kdb/kdb_private.h | 1 - + kernel/events/uprobes.c | 4 +- + kernel/kcov.c | 13 +- + kernel/kexec_core.c | 5 +- + kernel/printk/printk.c | 3 +- + kernel/relay.c | 4 +- + kernel/signal.c | 7 + + kernel/sysctl.c | 8 +- + kernel/sysctl_binary.c | 4 +- + kernel/time/alarmtimer.c | 3 +- + kernel/watchdog.c | 270 +------ + kernel/watchdog_hld.c | 227 ++++++ + lib/Kconfig | 7 + + lib/Kconfig.ubsan | 3 +- + lib/Makefile | 1 + + lib/crc64_ecma.c | 341 ++++++++ + lib/radix-tree.c | 890 +++++++++++++-------- + mm/compaction.c | 17 +- + mm/filemap.c | 14 +- + mm/gup.c | 20 +- + mm/huge_memory.c | 173 ++-- + mm/internal.h | 2 +- + mm/khugepaged.c | 31 +- + mm/memory.c | 859 ++++++++++---------- + mm/nommu.c | 10 +- + mm/page-writeback.c | 28 +- + mm/page_alloc.c | 14 + + mm/page_owner.c | 4 +- + mm/process_vm_access.c | 12 +- + mm/shmem.c | 32 +- + mm/z3fold.c | 337 +++++--- + net/rxrpc/af_rxrpc.c | 11 +- + net/rxrpc/conn_client.c | 4 +- + security/tomoyo/domain.c | 2 +- + tools/include/asm/bug.h | 11 + + tools/include/linux/bitmap.h | 26 + + tools/testing/ktest/ktest.pl | 8 +- + tools/testing/radix-tree/Makefile | 15 +- + tools/testing/radix-tree/benchmark.c | 98 +++ + tools/testing/radix-tree/find_next_bit.c | 57 -- + tools/testing/radix-tree/iteration_check.c | 123 ++- + tools/testing/radix-tree/linux.c | 67 +- + tools/testing/radix-tree/linux/bitops.h | 40 +- + tools/testing/radix-tree/linux/bitops/non-atomic.h | 13 +- + tools/testing/radix-tree/linux/bug.h | 2 +- + tools/testing/radix-tree/linux/gfp.h | 22 +- + tools/testing/radix-tree/linux/kernel.h | 18 + + tools/testing/radix-tree/linux/preempt.h | 6 +- + tools/testing/radix-tree/linux/slab.h | 11 +- + tools/testing/radix-tree/linux/types.h | 2 - + tools/testing/radix-tree/main.c | 77 +- + tools/testing/radix-tree/multiorder.c | 326 +++++++- + tools/testing/radix-tree/rcupdate.c | 86 -- + tools/testing/radix-tree/regression2.c | 3 +- + tools/testing/radix-tree/regression3.c | 8 +- + tools/testing/radix-tree/tag_check.c | 12 +- + tools/testing/radix-tree/test.c | 92 ++- + tools/testing/radix-tree/test.h | 21 +- + usr/Kconfig | 127 +++ + usr/Makefile | 20 +- + virt/kvm/async_pf.c | 10 +- + virt/kvm/kvm_main.c | 5 +- + 155 files changed, 4231 insertions(+), 2395 deletions(-) + create mode 100644 arch/arm64/include/asm/setup.h + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 kernel/watchdog_hld.c + create mode 100644 lib/crc64_ecma.c + create mode 100644 tools/testing/radix-tree/benchmark.c + delete mode 100644 tools/testing/radix-tree/find_next_bit.c + delete mode 100644 tools/testing/radix-tree/rcupdate.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: radix tree test suite: fix compilation +Applying: powerpc: ima: get the kexec buffer passed by the previous kernel +Applying: ima: on soft reboot, restore the measurement list +Applying: ima: permit duplicate measurement list entries +Applying: ima: maintain memory size needed for serializing the measurement list +Applying: powerpc: ima: send the kexec buffer to the next kernel +Applying: ima: on soft reboot, save the measurement list +Applying: ima: store the builtin/custom template definitions in a list +Applying: ima: support restoring multiple template formats +Applying: ima: define a canonical binary_runtime_measurements list format +Applying: ima: platform-independent hash value +Applying: Reimplement IDR and IDA using the radix tree +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 5d42798f8e8b...d60c3e64ea7d akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (d60c3e64ea7d Reimplement IDR and IDA using the radix tree) +$ git merge --no-ff akpm/master +Removing tools/testing/radix-tree/linux/notifier.h +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 4 + + arch/Kconfig | 3 + + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/ima.h | 29 + + arch/powerpc/include/asm/kexec.h | 15 +- + arch/powerpc/kernel/Makefile | 4 + + arch/powerpc/kernel/ima_kexec.c | 223 +++++ + arch/powerpc/kernel/kexec_elf_64.c | 2 +- + arch/powerpc/kernel/machine_kexec_file_64.c | 15 +- + include/linux/idr.h | 138 ++- + include/linux/ima.h | 12 + + include/linux/radix-tree.h | 53 +- + init/main.c | 3 +- + kernel/kexec_file.c | 4 + + lib/idr.c | 1144 ++++------------------- + lib/radix-tree.c | 330 +++++-- + security/integrity/ima/Kconfig | 12 + + security/integrity/ima/Makefile | 1 + + security/integrity/ima/ima.h | 31 + + security/integrity/ima/ima_crypto.c | 6 +- + security/integrity/ima/ima_fs.c | 30 +- + security/integrity/ima/ima_init.c | 2 + + security/integrity/ima/ima_kexec.c | 168 ++++ + security/integrity/ima/ima_main.c | 1 + + security/integrity/ima/ima_queue.c | 77 +- + security/integrity/ima/ima_template.c | 297 +++++- + security/integrity/ima/ima_template_lib.c | 7 +- + tools/include/linux/spinlock.h | 4 + + tools/testing/radix-tree/.gitignore | 1 + + tools/testing/radix-tree/Makefile | 10 +- + tools/testing/radix-tree/idr-test.c | 200 ++++ + tools/testing/radix-tree/linux/cpu.h | 22 +- + tools/testing/radix-tree/linux/export.h | 1 + + tools/testing/radix-tree/linux/gfp.h | 8 +- + tools/testing/radix-tree/linux/idr.h | 1 + + tools/testing/radix-tree/linux/kernel.h | 2 + + tools/testing/radix-tree/linux/notifier.h | 8 - + tools/testing/radix-tree/main.c | 6 + + tools/testing/radix-tree/test.h | 2 + + 39 files changed, 1722 insertions(+), 1155 deletions(-) + create mode 100644 arch/powerpc/include/asm/ima.h + create mode 100644 arch/powerpc/kernel/ima_kexec.c + create mode 100644 security/integrity/ima/ima_kexec.c + create mode 100644 tools/include/linux/spinlock.h + create mode 100644 tools/testing/radix-tree/idr-test.c + create mode 100644 tools/testing/radix-tree/linux/idr.h + delete mode 100644 tools/testing/radix-tree/linux/notifier.h diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..520df41f66ed --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,4 @@ +Importing jdelvare-hwmon based on 08d27eb2066622cd659b91d877d0406ebd651225 +Unchanged quilt series jdelvare-hwmon +Importing dmi based on 4.9-rc8 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..06670cd922de --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20161215 |