From 44f9151a72af77d63d463512ce8c2bda9f2807a7 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Mon, 19 Dec 2016 13:35:44 +1100 Subject: Add linux-next specific files for 20161219 Signed-off-by: Stephen Rothwell --- Next/SHA1s | 248 +++ Next/Trees | 250 +++ Next/merge.log | 4833 +++++++++++++++++++++++++++++++++++++++++++++++++ Next/quilt-import.log | 4 + localversion-next | 1 + 5 files changed, 5336 insertions(+) create mode 100644 Next/SHA1s create mode 100644 Next/Trees create mode 100644 Next/merge.log create mode 100644 Next/quilt-import.log create mode 100644 localversion-next diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..cc74451b80b9 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,248 @@ +Name SHA1 +---- ---- +origin f7dd3b1734ea335fea01f103d48b3de26ea0d335 +fixes 30066ce675d3af350bc5a53858991c0b518dda00 +kbuild-current 152b695d74376bfe55cd2a6265ccc75b0d39dd19 +arc-current 7badf6fefca8278e749e82411fdb98b123cca50e +arm-current 8478132a8784605fe07ede555f7277d989368d73 +m68k-current 7e251bb21ae08ca2e4fb28cc0981fac2685a8efa +metag-fixes 35d04077ad96ed33ceea2501f5a4f1eacda77218 +powerpc-fixes 69973b830859bc6529a7a0468ba0d80ee5117826 +sparc 8fa3b6f9392bf6d90cb7b908e07bd90166639f0a +net 52f40e9d657cc126b766304a5dd58ad73b02ff46 +ipsec bc3913a5378cd0ddefd1dfec6917cc12eb23a946 +netfilter a220871be66f99d8957c693cf22ec67ecbd9c23a +ipvs 045169816b31b10faed984b01c390db1b32ee4c1 +wireless-drivers fcd2042e8d36cf644bd2d69c26378d17158b17df +mac80211 a17d93ff3a950fefaea40e4a4bf3669b9137c533 +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 f26e8817b235d8764363bffcc9cbfc61867371f2 +crypto-current 8759fec4af222f338d08f8f1a7ad6a77ca6cb301 +ide 797cee982eef9195736afc5e7f3b8f613c41d19a +vfio-fixes 05692d7005a364add85c6e25a6c4447ce08f913a +kselftest-fixes 1001354ca34179f3db924eb66672442a173147dc +backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f +ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600 +mfd-fixes 1a41741fd60b0a2d1102c3d1ff9d58cb324a8d29 +drm-intel-fixes 69973b830859bc6529a7a0468ba0d80ee5117826 +drm-misc-fixes 298360af3dab45659810fdc51aba0c9f4097e4f6 +kbuild a6d1da25b333a87874ce84517fef595871f79473 +asm-generic de4be6b87b6b8816b61c9ba798d21ae8075d955c +arc e5517c2a5a49ed5e99047008629f1cd60246ea0e +arm 49b05da8054638caf79257e75b850b05b7abeb50 +arm-perf f43365ee17f8d22b1f887d2b26faa0837ca85138 +arm-soc 991688bfc63550b8c7ab9fb1de2feb44e3071d29 +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 ad1ccae78b7d7508b39f742631e210407033e8e6 +nios2 744606c76c4a3a73eb34d21f265013426426c4b5 +openrisc 7c7808ce107d63e158dbbc3af085980985a0c3c4 +parisc-hd 82cbd568bc5aa4c70f2a694f169d39ddef3b1aba +powerpc c6f6634721c871bfab4235e1cbcad208d3063798 +fsl baae856ebdeeaefbadd4a02cdb54b7c2277ff4dd +mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0 +s390 0b7589ecca2b6f962cf3314a3a5a675deeefb624 +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +sh e61c10e468a42512f5fad74c00b62af5cc19f65f +tile 14e73e78ee982710292248536aa84cba41e974f4 +uml f88f0bdfc32f3d1e2fd03ec8a7f7b456df4db725 +unicore32 bc27113620ca6b67320b8a57e70d801dc94221d5 +xtensa 30b507051dd1f79bbedce79cb37dc0ef31f5fb6c +befs f7b75aaed5ef07cb8d70d964291877bf02181360 +btrfs 8b8b08cbfb9021af4b54b4175fc4c51d655aac8c +btrfs-kdave 2939e1a86f758b55cdba73e29397dd3d94df13bc +ceph 45ee2c1d66185e5bd27702c60cce3c43fa3370d2 +cifs 374402a2a1dfbbee8ab1a5a32ec4887bf8c15d52 +configfs e16769d4bca67218531505ad1a8365d227fedcf9 +ecryptfs be280b25c3288824ed4c201b452c3e87a7074d7c +ext3 5716863e0f8251d3360d4cbfc0e44e08007075df +ext4 a551d7c8deefb6d9fb45a1de03a617dd064e0419 +f2fs 852d21ae1fcdf0e4de6b5bfa730d29cb013c7ff3 +freevxfs bf1bb4b460c8dc3a33793bff21464a9d816697ad +fscache d52bd54db8be8999df6df5a776f38c4f8b5e9cea +fuse c01638f5d919728f565bf8b5e0a6a159642df0d9 +gfs2 14d37564fa3dc4e5d4c6828afcd26ac14e6796c5 +jfs 362ad5d58e9ae54d15abbe4822e626be907308fe +nfs 28a2638d893c6c046a0b5e3a0c33d048b2ce7a94 +nfsd 47057abde515155a4fee53038e7772d6b387e0aa +orangefs 04102c76a779f1c4cec4f0fb51cacc360117b522 +overlayfs 8a23e9b5e08bb10905174a4da80a7f5f2ca0909d +v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc +ubifs ba75d570b60c05cda21c0b43c5fbdc4e344f892d +xfs 9807b773dad4555665931d57065d7f8adab58e0f +file-locks 07d9a380680d1c0eb51ef87ff2eab5c994949e69 +vfs bb6b5000084e3e6d9558078d1dce647a697ddec7 +vfs-jk 030b533c4fd4d2ec3402363323de4bb2983c9cee +vfs-miklos b12826c5188e1a964a64eedd37a537dc202d6bb8 +pci b08d2e61a6f9ebf5210a047868362a5a4ff37144 +pstore fc46d4e453f50d2b376267f180cae250b54f9fb4 +hid 43768c4daf54110d91a871d13e70c5876da954d0 +i2c 649ac63a9ae5e08b7123f2fa98c2bf42f033bdb9 +jdelvare-hwmon 08d27eb2066622cd659b91d877d0406ebd651225 +dmi 27ec191a79ca7e6c07799b84f76d195efa931c28 +hwmon-staging 4fccd4a1e8944033bcd7693ea4e8fb478cd2059a +jc_docs 217e2bfab22e740227df09f22165e834cddd8a3b +v4l-dvb 65390ea01ce678379da32b01f39fcfac4903f256 +pm fa8a9265bb7e86eb6a143e278e382b6d1acf3705 +idle 306899f94804aece6d8fa8b4223ede3b48dbb59c +thermal 0faf7dd5a947006978b549dfe29a01b710becf4a +thermal-soc 18591add41ec9558ce0e32ef88626c18cc70c686 +ieee1394 e9300a4b7bbae83af1f7703938c94cf6dc6d308f +dlm aa9f1012858bc7f44368f1e4453c989d873b0860 +swiotlb d29fa0cb7602fa3e96c9eee05e14d14d3e823c89 +net-next 52f40e9d657cc126b766304a5dd58ad73b02ff46 +ipsec-next d4aea20d889e05575bb331a3dadf176176f7d631 +netfilter-next 8fa3b6f9392bf6d90cb7b908e07bd90166639f0a +ipvs-next 8d8e20e2d7bba8c50e64e0eca1cb83956f468e49 +wireless-drivers-next d15697de60db5570532fdedb8e13b2251d65b8e3 +bluetooth 107bc0aa95ca572df42da43c30a2079266e992e4 +mac80211-next e77a8be9a0a7f2c10151967e3c72c5afcbd41117 +rdma 6f94ba20799b98c8badf047b184fb4cd7bc45e44 +rdma-leon 52f40e9d657cc126b766304a5dd58ad73b02ff46 +rdma-leon-test a909d3e636995ba7c349e2ca5dbb528154d4ac30 +mtd 445caaa20c4d6da74f426464f90513b81157ad77 +l2-mtd 445caaa20c4d6da74f426464f90513b81157ad77 +nand 8fcfba072420518fda4b2fe00a3f3c9c3e2774e2 +crypto 04b46fbdea5e31ffd745a34fa61269a69ba9f47a +drm 2cf026ae85c42f253feb9f420d1b4bc99bd5503d +drm-panel 8c31f6034b24601721daeb012793641fac079e2e +drm-intel 7a9e10253e9e52451bbe80ddb2874368dbd240a3 +drm-tegra 585ee0f27ef7b8db46807b960388b7e58b60766d +drm-misc 2fa70bb9b5642211c521910d23e8b6c8d425fb89 +drm-exynos 7d1e042314619115153a0f6f06e4552c09a50e13 +drm-msm 2401a008461481387741bacf7318d13af2c2055f +hdlcd 747e5a5ff2a2ae84715c33d6679ac3c5220a3aec +mali-dp 8e3eb71c80ad05e0fef99dcd6cf4f645390ca680 +sunxi 63e8e44adfdc98e6a606697b2dc76a09fc5a2555 +kspp 3545d3c27c43fce71e54e1f0a207b56d56860af3 +kconfig 5bcba792bb304e8341217d759ec486969a3b4258 +regmap 5c55e10a193497ddf73623adb1e09dd4451c7341 +sound 995c6a7fd9b9212abdf01160f6ce3193176be503 +sound-asoc 0d6534e2ab69d435c03e73f2d3fdba047dbdc0ea +modules 4d217a5adccf5e806790c37c61cc374a08bd7381 +input 1a9027770f3d93b78f7031af79597f9659db5d70 +block cdb98c2698b4af287925abcba4d77d92af82a0c3 +lightnvm a5f78b7f7dd1f587905808ab19d2dc1c265dffd4 +device-mapper ef548c551e72dbbdcc6d9ed7c7b3b01083fea8e2 +pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8 +mmc 5cc60aeedf315a7513f92e98314e86d515b986d1 +kgdb 7a6653fca50077f342bcdc39222d78928e3f0feb +md 3ea77e712089df5a3c78c846a4690258c72a234c +mfd 93559191e71bc0f862638b0a9644d4592452a5db +backlight 0c9501f823a40a061f755d3789c4705c9fe85f14 +battery 6480af4915d6ffb66afc39eee4e9e66cbf59b938 +omap_dss2 c456a2f30de53e77a2eb8eeb4202d742516aa76b +regulator d00b74613fb18dfd0a5aa99270ee2e72d5c808d7 +security 50523a29d900d5a403e0352d3d7aeda6a33df25c +integrity b4bfec7f4a86424b114f94f41c4e1841ec102df3 +keys ed51e44e914c634bfd8435037474ebb0b47db956 +selinux 3011b2cd0ca0b6998f469ee28006fed19fa62857 +tpmdd 1548c540d863967fe617af76fec4df119e5f5cfb +watchdog 39487f6688a557ebfc69816d7e02f210bf8fb2a3 +iommu 1465f481460cbfc60dc119873099d89a58f9be4f +dwmw2-iommu 910170442944e1f8674fd5ddbeeb8ccd1877ea98 +vfio 2b8bb1d771f736b8b34bf160115aee1b12d29f83 +trivial 74dcba3589fc184c7118905eda22b3a4aaef95ff +audit 89670affa2a62c4868a2dd8a4195a1a2ec58cb27 +devicetree 61eb3a04f9789c5e4f7498a2f171b82a567cea6b +mailbox 16ae16c6e5616c084168740990fc508bda6655d4 +spi 8082041bca7a14de601cd6a2637e26ceb14c80d6 +tip 55e874f7b6aba6c69a1228ee6772b8427a5a4c8d +clockevents f947ee147e0895d5c0ef18e81ca7a4e4219739e3 +edac 9cae24b7b113cf6da0ccb3aa0d862daec9f3d9e7 +edac-amd 0de2788447b67891a31a156c0206fd159e4a8981 +irqchip 0ccb54a7dba0d73101e52b1631d1071119875205 +ftrace 3dbb16b87b57bb1088044ad2a0432e4769075002 +rcu 6190aaafd06cd3db77f1d7343bd097f6bd526727 +kvm 36da91bdf568e804aac3ef02a5e3d867585f08fb +kvm-arm 21cbe3cc8a48ff17059912e019fbde28ed54745a +kvm-mips 07d9a380680d1c0eb51ef87ff2eab5c994949e69 +kvm-ppc e34af7849014f1d80899b811cf9021588cb8dd88 +kvms390 252747dd7c67e71527e2cf9ba63d4ed58b6dc580 +xen-tip 709613ad2b3c9eaeb2a3e24284b7c8feffc17326 +percpu 3ca45a46f8af8c4a92dd8a08eac57787242d5021 +workqueues 8bc4a04455969c36bf54a942ad9d28d80969ed51 +drivers-x86 83da6b59919a71a1a97ce9863aa0267eaf6d496c +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 b4153e05a6992ba3a3dabc13b9eaa40ef38dbf2e +scsi-mkp d2a145252c52792bc59e4767b486b26c430af4bb +target-updates 291e3e51a34d2f546608bfd31f185151621135b7 +target-merge 2994a75183173defc21f0d26ce23b63232211b88 +target-bva 83337e544323a8bd7492994d64af339175ac7107 +libata 7ddf6a387c68729898fc85050ffc74510add72fe +binfmt_misc 4af75df6a410ce76d9f60f27b07e5645ecc2c5ed +vhost 6bdf1e0efb04a1716373646cb6f35b73addca492 +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 d3e5925902dc0f639efc3641e07fca2bd7af5441 +hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828 +nvdimm c44ef859ceff45db1c72f9ccbfae96843c4b1501 +dax-misc 4d9a2c8746671efbb0c27d3ae28c7474597a7aad +akpm-current ecbc9b1e1d8c5b5dbfd70a9a2c42e576cda7a302 +akpm 484bc41fc6bf780224137afcbc0f31bd14288af9 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..a1c51e7a3267 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,250 @@ +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 +target-bva git git://git.kernel.org/pub/scm/linux/kernel/git/bvanassche/linux.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#for-next +binfmt_misc git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/binfmt_misc.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://github.com/andersson/remoteproc.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +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..4b4c1dc9d25c --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4833 @@ +$ date -R +Mon, 19 Dec 2016 09:24:22 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 09dee2a608a4 Merge tag 'linux-kselftest-4.10-rc1-update' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest +Merging origin/master (f7dd3b1734ea Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge origin/master +Updating 09dee2a608a4..f7dd3b1734ea +Fast-forward + Documentation/00-INDEX | 2 - + Documentation/DocBook/Makefile | 2 +- + Documentation/DocBook/crypto-API.tmpl | 2092 -------------- + Documentation/admin-guide/index.rst | 1 + + Documentation/admin-guide/ras.rst | 1190 ++++++++ + Documentation/arm/stm32/overview.txt | 3 +- + Documentation/arm/stm32/stm32f746-overview.txt | 34 + + 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/dev-tools/sparse.rst | 14 +- + .../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 | 3 + + .../devicetree/bindings/input/da9062-onkey.txt | 45 +- + .../bindings/input/touchscreen/imx6ul_tsc.txt | 3 + + .../bindings/input/touchscreen/silead_gsl1680.txt | 2 + + .../bindings/input/touchscreen/touchscreen.txt | 3 + + .../bindings/mailbox/brcm,bcm2835-mbox.txt | 2 +- + .../bindings/mailbox/nvidia,tegra186-hsp.txt | 52 + + .../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,fcp.txt | 8 +- + .../devicetree/bindings/media/renesas,fdp1.txt | 37 + + .../devicetree/bindings/media/s5p-mfc.txt | 1 + + .../memory-controllers/ti-da8xx-ddrctl.txt | 20 + + .../devicetree/bindings/mmc/rockchip-dw-mshc.txt | 1 + + .../devicetree/bindings/mtd/oxnas-nand.txt | 41 + + .../devicetree/bindings/mtd/samsung-s3c2410.txt | 56 + + .../devicetree/bindings/mtd/tango-nand.txt | 38 + + .../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 + + Documentation/driver-api/edac.rst | 178 ++ + Documentation/driver-api/index.rst | 1 + + Documentation/edac.txt | 812 ------ + Documentation/filesystems/00-INDEX | 2 - + Documentation/filesystems/Locking | 2 +- + Documentation/filesystems/logfs.txt | 241 -- + Documentation/filesystems/overlayfs.txt | 26 +- + Documentation/filesystems/porting | 4 + + Documentation/filesystems/vfs.txt | 11 +- + Documentation/index.rst | 1 + + Documentation/media/Makefile | 2 +- + Documentation/media/kapi/cec-core.rst | 38 +- + 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 + + .../uapi/v4l/subdev-image-processing-crop.svg | 299 +- + .../uapi/v4l/subdev-image-processing-full.svg | 779 +++-- + ...ubdev-image-processing-scaling-multi-source.svg | 566 ++-- + 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 + + Documentation/translations/zh_CN/sparse.txt | 7 +- + MAINTAINERS | 88 +- + arch/arm/Kconfig | 5 + + arch/arm/Makefile | 6 +- + 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/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-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-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 + + arch/arm/mach-sa1100/generic.c | 2 +- + arch/arm/mach-sa1100/include/mach/SA-1101.h | 925 ------ + arch/arm/mach-sa1100/include/mach/hardware.h | 8 - + 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/mm/Kconfig | 8 +- + arch/arm/mm/pageattr.c | 27 +- + 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/arm/plat-samsung/include/plat/gpio-cfg.h | 2 +- + 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 +- + 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 | 131 + + 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 +- + arch/arm64/include/asm/numa.h | 2 + + arch/arm64/mm/numa.c | 2 +- + arch/ia64/include/asm/numa.h | 2 + + arch/nios2/include/asm/page.h | 15 +- + arch/nios2/kernel/setup.c | 5 + + arch/powerpc/Kconfig | 41 +- + arch/powerpc/Kconfig.debug | 16 + + arch/powerpc/Makefile | 14 +- + arch/powerpc/boot/Makefile | 30 +- + 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/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/fsl-emb-nonhw.config | 6 + + 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/pgalloc.h | 44 +- + arch/powerpc/include/asm/book3s/32/pgtable.h | 43 +- + 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 | 18 +- + 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 | 21 +- + 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-8xx.h | 35 + + arch/powerpc/include/asm/mmu.h | 23 +- + arch/powerpc/include/asm/mmu_context.h | 20 +- + arch/powerpc/include/asm/module.h | 4 - + arch/powerpc/include/asm/nohash/32/pgalloc.h | 44 +- + arch/powerpc/include/asm/nohash/32/pgtable.h | 45 +- + arch/powerpc/include/asm/nohash/32/pte-8xx.h | 1 + + 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 | 19 +- + arch/powerpc/include/asm/nohash/pgtable.h | 4 + + arch/powerpc/include/asm/pgtable.h | 2 + + 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/reg_8xx.h | 2 +- + 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/head_8xx.S | 119 +- + 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 | 5 +- + 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/hugetlbpage.c | 216 +- + arch/powerpc/mm/init-common.c | 107 + + arch/powerpc/mm/init_64.c | 77 - + 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/pgtable_32.c | 37 - + arch/powerpc/mm/tlb-radix.c | 18 + + arch/powerpc/mm/tlb_nohash.c | 21 +- + arch/powerpc/oprofile/cell/spu_task_sync.c | 2 +- + 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/83xx/suspend.c | 6 +- + arch/powerpc/platforms/85xx/Kconfig | 2 + + arch/powerpc/platforms/85xx/corenet_generic.c | 2 +- + arch/powerpc/platforms/85xx/smp.c | 8 +- + arch/powerpc/platforms/8xx/Kconfig | 1 + + arch/powerpc/platforms/Kconfig | 11 - + arch/powerpc/platforms/Kconfig.cputype | 1 + + 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_lbc.c | 2 +- + arch/powerpc/sysdev/fsl_pmc.c | 6 +- + arch/powerpc/sysdev/fsl_rio.c | 8 +- + arch/powerpc/sysdev/fsl_soc.c | 48 +- + arch/powerpc/sysdev/tsi108_pci.c | 6 +- + arch/powerpc/xmon/xmon.c | 6 + + 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 + + arch/tile/include/asm/cache.h | 7 +- + arch/tile/include/asm/sections.h | 3 - + arch/tile/kernel/module.c | 11 +- + arch/tile/kernel/pci.c | 2 +- + arch/tile/kernel/pci_gx.c | 2 +- + arch/tile/kernel/setup.c | 18 +- + arch/tile/kernel/smp.c | 2 +- + arch/tile/kernel/time.c | 4 +- + arch/tile/kernel/unaligned.c | 2 +- + arch/tile/lib/cacheflush.c | 8 +- + arch/tile/mm/extable.c | 2 +- + arch/tile/mm/fault.c | 2 +- + arch/tile/mm/homecache.c | 2 +- + arch/tile/mm/init.c | 10 +- + arch/um/drivers/ubd.h | 5 + + arch/um/drivers/ubd_kern.c | 168 +- + arch/um/drivers/ubd_user.c | 21 +- + arch/x86/include/asm/asm-prototypes.h | 16 + + arch/x86/include/asm/cpufeatures.h | 1 + + arch/x86/include/asm/floppy.h | 20 +- + arch/x86/include/asm/mmu.h | 4 + + arch/x86/include/asm/mpx.h | 4 +- + arch/x86/include/asm/pgtable_64.h | 3 +- + arch/x86/include/asm/tsc.h | 9 + + arch/x86/kernel/Makefile | 2 +- + arch/x86/kernel/acpi/boot.c | 2 +- + arch/x86/kernel/apic/apic.c | 15 - + arch/x86/kernel/cpu/common.c | 24 +- + arch/x86/kernel/crash.c | 37 +- + arch/x86/kernel/head_64.S | 5 +- + arch/x86/kernel/kexec-bzimage64.c | 48 +- + arch/x86/kernel/process.c | 1 + + arch/x86/kernel/smpboot.c | 59 +- + arch/x86/kernel/tsc.c | 42 +- + arch/x86/kernel/tsc_msr.c | 19 + + arch/x86/kernel/tsc_sync.c | 290 +- + arch/x86/mm/fault.c | 2 +- + arch/x86/mm/init_64.c | 24 +- + arch/x86/mm/mpx.c | 10 +- + arch/x86/mm/numa.c | 2 +- + arch/x86/platform/intel-mid/mfld.c | 9 +- + arch/x86/platform/intel-mid/mrfld.c | 8 +- + arch/x86/power/cpu.c | 1 + + arch/x86/xen/smp.c | 6 - + crypto/algif_aead.c | 14 +- + drivers/acpi/numa.c | 2 +- + drivers/block/rbd.c | 2 +- + drivers/bluetooth/Makefile | 2 - + drivers/bluetooth/hci_vhci.c | 2 +- + 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/char/virtio_console.c | 14 +- + drivers/clk/clkdev.c | 8 + + drivers/clk/imx/clk-imx31.c | 52 +- + drivers/clk/pxa/clk-pxa25x.c | 2 +- + drivers/clocksource/pxa_timer.c | 11 +- + drivers/crypto/Kconfig | 2 + + drivers/crypto/Makefile | 1 + + drivers/crypto/virtio/Kconfig | 10 + + drivers/crypto/virtio/Makefile | 5 + + drivers/crypto/virtio/virtio_crypto_algs.c | 540 ++++ + drivers/crypto/virtio/virtio_crypto_common.h | 128 + + drivers/crypto/virtio/virtio_crypto_core.c | 476 ++++ + drivers/crypto/virtio/virtio_crypto_mgr.c | 264 ++ + 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 - + 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/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/gpu/drm/i915/Kconfig | 1 + + drivers/gpu/drm/i915/gvt/Makefile | 2 - + drivers/gpu/drm/i915/gvt/gvt.h | 6 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 975 ++++++- + drivers/gpu/drm/virtio/virtgpu_plane.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 6 +- + 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/rmi4/Kconfig | 42 + + drivers/input/rmi4/Makefile | 4 + + drivers/input/rmi4/rmi_2d_sensor.c | 10 +- + drivers/input/rmi4/rmi_2d_sensor.h | 2 + + drivers/input/rmi4/rmi_bus.c | 12 + + drivers/input/rmi4/rmi_bus.h | 12 + + drivers/input/rmi4/rmi_driver.c | 420 ++- + drivers/input/rmi4/rmi_driver.h | 31 +- + drivers/input/rmi4/rmi_f01.c | 12 +- + drivers/input/rmi4/rmi_f03.c | 250 ++ + drivers/input/rmi4/rmi_f11.c | 98 +- + drivers/input/rmi4/rmi_f12.c | 146 +- + drivers/input/rmi4/rmi_f30.c | 22 +- + drivers/input/rmi4/rmi_f34.c | 516 ++++ + drivers/input/rmi4/rmi_f34.h | 314 +++ + drivers/input/rmi4/rmi_f34v7.c | 1372 +++++++++ + drivers/input/rmi4/rmi_f54.c | 19 +- + drivers/input/rmi4/rmi_f55.c | 131 + + drivers/input/rmi4/rmi_i2c.c | 74 +- + drivers/input/rmi4/rmi_smbus.c | 447 +++ + drivers/input/rmi4/rmi_spi.c | 72 +- + 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 | 83 +- + drivers/input/touchscreen/melfas_mip4.c | 51 +- + drivers/input/touchscreen/raydium_i2c_ts.c | 2 +- + drivers/input/touchscreen/silead.c | 29 + + drivers/isdn/gigaset/bas-gigaset.c | 32 +- + drivers/isdn/gigaset/ser-gigaset.c | 32 +- + drivers/isdn/gigaset/usb-gigaset.c | 32 +- + drivers/isdn/hisax/config.c | 16 +- + drivers/isdn/hisax/hisax.h | 4 +- + drivers/isdn/i4l/isdn_concap.c | 6 +- + drivers/isdn/i4l/isdn_x25iface.c | 16 +- + drivers/macintosh/Kconfig | 1 - + drivers/mailbox/Kconfig | 9 + + drivers/mailbox/Makefile | 2 + + drivers/mailbox/tegra-hsp.c | 479 ++++ + drivers/md/dm-cache-block-types.h | 6 +- + 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 | 13 +- + drivers/{staging => }/media/cec/cec-core.c | 18 +- + 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 | 412 ++- + 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 | 26 +- + drivers/media/dvb-frontends/mn88473.c | 225 +- + 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/adv7511.c | 5 +- + drivers/media/i2c/adv7604.c | 30 +- + drivers/media/i2c/adv7842.c | 6 +- + 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 | 298 +- + 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 | 73 +- + drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 12 +- + drivers/media/platform/s5p-mfc/s5p_mfc_debug.h | 6 + + drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 15 +- + drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 2 +- + 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 | 132 +- + 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-cec.c | 3 +- + drivers/media/platform/vivid/vivid-cec.h | 1 - + drivers/media/platform/vivid/vivid-core.c | 13 +- + 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 | 70 +- + 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 | 29 +- + 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 | 95 +- + drivers/media/usb/em28xx/em28xx-camera.c | 69 +- + drivers/media/usb/em28xx/em28xx-cards.c | 204 +- + drivers/media/usb/em28xx/em28xx-core.c | 206 +- + drivers/media/usb/em28xx/em28xx-dvb.c | 112 +- + drivers/media/usb/em28xx/em28xx-i2c.c | 291 +- + drivers/media/usb/em28xx/em28xx-input.c | 65 +- + drivers/media/usb/em28xx/em28xx-vbi.c | 9 +- + drivers/media/usb/em28xx/em28xx-video.c | 163 +- + drivers/media/usb/em28xx/em28xx.h | 19 +- + 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 | 12 +- + 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 | 19 +- + 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/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/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/misc/sram.c | 42 +- + 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 +- + drivers/net/can/Makefile | 1 - + drivers/net/dsa/mv88e6xxx/chip.c | 6 + + drivers/net/ethernet/3com/3c515.c | 15 +- + drivers/net/ethernet/altera/Makefile | 1 - + drivers/net/ethernet/atheros/alx/Makefile | 1 - + drivers/net/ethernet/brocade/bna/bna_enet.c | 8 +- + drivers/net/ethernet/cadence/Kconfig | 9 + + drivers/net/ethernet/cadence/Makefile | 1 + + drivers/net/ethernet/cadence/macb.c | 31 +- + drivers/net/ethernet/cadence/macb_pci.c | 153 + + drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 64 +- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 65 +- + drivers/net/ethernet/cirrus/ep93xx_eth.c | 14 +- + drivers/net/ethernet/davicom/dm9000.c | 14 +- + drivers/net/ethernet/freescale/Makefile | 2 - + drivers/net/ethernet/freescale/dpaa/Kconfig | 2 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 71 +- + drivers/net/ethernet/hisilicon/hip04_eth.c | 2 +- + drivers/net/ethernet/hisilicon/hisi_femac.c | 2 +- + drivers/net/ethernet/ibm/ibmveth.c | 12 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 2 +- + drivers/net/ethernet/microchip/encx24j600-regmap.c | 17 +- + drivers/net/ethernet/microchip/encx24j600.c | 19 +- + drivers/net/ethernet/qlogic/qed/qed_iscsi.c | 2 +- + drivers/net/ethernet/qualcomm/emac/emac.c | 9 + + drivers/net/ethernet/rdc/r6040.c | 10 +- + drivers/net/ethernet/sfc/ethtool.c | 35 +- + drivers/net/ethernet/sfc/mcdi_port.c | 60 +- + drivers/net/ethernet/sfc/net_driver.h | 12 +- + drivers/net/ethernet/sun/sunhme.h | 2 +- + drivers/net/gtp.c | 8 +- + drivers/net/irda/w83977af_ir.c | 6 +- + drivers/net/macvtap.c | 4 +- + drivers/net/tun.c | 7 +- + drivers/net/virtio_net.c | 369 ++- + drivers/net/vrf.c | 6 +- + drivers/net/wan/lmc/lmc_media.c | 97 +- + drivers/net/wireless/ath/Makefile | 2 - + drivers/net/wireless/ath/wil6210/Makefile | 2 - + .../wireless/broadcom/brcm80211/brcmfmac/Makefile | 2 - + .../wireless/broadcom/brcm80211/brcmsmac/Makefile | 1 - + drivers/net/wireless/intel/iwlegacy/Makefile | 2 - + drivers/net/wireless/intel/iwlwifi/Makefile | 2 +- + drivers/net/wireless/intel/iwlwifi/dvm/Makefile | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/Makefile | 2 +- + drivers/net/wireless/intersil/orinoco/Makefile | 3 - + drivers/net/wireless/mediatek/mt7601u/Makefile | 2 - + drivers/net/wireless/realtek/rtlwifi/Makefile | 2 - + .../wireless/realtek/rtlwifi/btcoexist/Makefile | 2 - + .../wireless/realtek/rtlwifi/rtl8188ee/Makefile | 2 - + .../net/wireless/realtek/rtlwifi/rtl8192c/Makefile | 2 - + .../wireless/realtek/rtlwifi/rtl8192ce/Makefile | 2 - + .../wireless/realtek/rtlwifi/rtl8192cu/Makefile | 2 - + .../wireless/realtek/rtlwifi/rtl8192de/Makefile | 2 - + .../wireless/realtek/rtlwifi/rtl8192ee/Makefile | 2 - + .../wireless/realtek/rtlwifi/rtl8192se/Makefile | 2 - + .../wireless/realtek/rtlwifi/rtl8723ae/Makefile | 2 - + .../wireless/realtek/rtlwifi/rtl8723be/Makefile | 2 - + .../wireless/realtek/rtlwifi/rtl8723com/Makefile | 2 - + .../wireless/realtek/rtlwifi/rtl8821ae/Makefile | 2 - + drivers/net/wireless/ti/wl1251/Makefile | 2 - + drivers/net/wireless/ti/wlcore/Makefile | 2 - + drivers/oprofile/buffer_sync.c | 2 +- + drivers/pci/hotplug/rpadlpar_core.c | 10 +- + 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/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 ++ + 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 +- + 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/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/staging/lustre/lustre/llite/symlink.c | 1 - + 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 | 10 +- + drivers/staging/media/st-cec/Kconfig | 2 +- + drivers/staging/media/st-cec/TODO | 7 + + drivers/staging/media/st-cec/stih-cec.c | 7 +- + drivers/staging/rtl8188eu/Makefile | 2 +- + drivers/staging/rtl8192e/Makefile | 2 - + drivers/staging/rtl8192e/rtl8192e/Makefile | 2 - + drivers/target/target_core_configfs.c | 2 +- + drivers/usb/gadget/function/f_fs.c | 2 +- + drivers/usb/gadget/legacy/inode.c | 2 +- + drivers/vfio/vfio_iommu_spapr_tce.c | 328 ++- + drivers/vhost/scsi.c | 5 +- + drivers/vhost/vhost.c | 43 +- + drivers/vhost/vhost.h | 3 + + drivers/vhost/vringh.c | 5 +- + drivers/vhost/vsock.c | 25 +- + drivers/virtio/virtio_mmio.c | 2 + + drivers/virtio/virtio_pci_common.c | 201 +- + drivers/virtio/virtio_pci_common.h | 1 - + drivers/virtio/virtio_pci_modern.c | 8 +- + drivers/virtio/virtio_ring.c | 6 +- + drivers/watchdog/sa1100_wdt.c | 24 +- + fs/9p/vfs_addr.c | 15 +- + fs/9p/vfs_inode.c | 1 - + fs/9p/vfs_inode_dotl.c | 1 - + fs/Kconfig | 1 - + fs/Makefile | 1 - + fs/affs/symlink.c | 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/symlink.c | 1 - + fs/autofs4/waitq.c | 13 +- + fs/bad_inode.c | 55 +- + 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 | 244 +- + 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 | 1551 +++++----- + fs/btrfs/extent_io.c | 112 +- + fs/btrfs/extent_io.h | 17 +- + fs/btrfs/file-item.c | 207 +- + fs/btrfs/file.c | 250 +- + 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 | 911 +++--- + fs/btrfs/ioctl.c | 617 ++-- + fs/btrfs/lzo.c | 17 +- + fs/btrfs/ordered-data.c | 38 +- + 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 | 299 +- + 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 | 202 +- + fs/btrfs/uuid-tree.c | 23 +- + fs/btrfs/volumes.c | 845 +++--- + fs/btrfs/volumes.h | 70 +- + fs/btrfs/xattr.c | 21 +- + fs/btrfs/zlib.c | 16 +- + fs/ceph/addr.c | 112 +- + fs/ceph/caps.c | 323 ++- + fs/ceph/dir.c | 51 +- + fs/ceph/export.c | 26 +- + fs/ceph/file.c | 131 +- + fs/ceph/inode.c | 23 +- + fs/ceph/mds_client.c | 23 +- + fs/ceph/mdsmap.c | 163 +- + fs/ceph/snap.c | 2 + + fs/ceph/super.c | 12 +- + fs/ceph/super.h | 15 +- + fs/cifs/cifsfs.c | 1 - + fs/coda/cnode.c | 1 - + fs/compat.c | 6 +- + fs/configfs/symlink.c | 1 - + fs/dcache.c | 40 +- + fs/dcookies.c | 4 +- + fs/ecryptfs/inode.c | 30 +- + fs/exofs/inode.c | 68 +- + fs/ext2/symlink.c | 2 - + fs/ext4/super.c | 4 +- + fs/ext4/symlink.c | 3 - + fs/f2fs/namei.c | 2 - + fs/fcntl.c | 2 +- + fs/file_table.c | 2 +- + fs/fuse/dir.c | 1 - + fs/gfs2/aops.c | 4 +- + fs/gfs2/inode.c | 1 - + fs/hostfs/hostfs_kern.c | 1 - + fs/internal.h | 2 +- + fs/ioctl.c | 6 +- + fs/jffs2/symlink.c | 1 - + fs/jfs/symlink.c | 2 - + fs/kernfs/symlink.c | 1 - + fs/libfs.c | 15 +- + 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/minix/inode.c | 1 - + fs/mount.h | 6 + + fs/namei.c | 205 +- + fs/namespace.c | 39 +- + fs/ncpfs/file.c | 2 +- + fs/ncpfs/inode.c | 1 - + 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 | 7 +- + 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/symlink.c | 1 - + fs/nfs/write.c | 3 +- + fs/nfsd/nfs4callback.c | 2 +- + fs/nfsd/nfs4layouts.c | 8 +- + fs/nfsd/nfs4proc.c | 46 +- + fs/nfsd/nfs4xdr.c | 87 +- + fs/nfsd/nfscache.c | 11 +- + fs/nfsd/nfsctl.c | 2 +- + fs/nfsd/nfsd.h | 36 +- + fs/nfsd/nfssvc.c | 4 +- + fs/nfsd/vfs.c | 9 +- + fs/nilfs2/namei.c | 1 - + 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/symlink.c | 1 - + fs/ocfs2/xattr.c | 4 +- + fs/orangefs/devorangefs-req.c | 13 +- + fs/orangefs/file.c | 2 +- + fs/orangefs/orangefs-debugfs.c | 6 +- + fs/orangefs/symlink.c | 1 - + fs/overlayfs/Kconfig | 14 + + fs/overlayfs/Makefile | 2 +- + fs/overlayfs/copy_up.c | 63 +- + fs/overlayfs/dir.c | 375 +-- + fs/overlayfs/inode.c | 79 +- + fs/overlayfs/namei.c | 401 +++ + fs/overlayfs/overlayfs.h | 62 +- + fs/overlayfs/ovl_entry.h | 53 + + fs/overlayfs/super.c | 557 +--- + fs/overlayfs/util.c | 265 ++ + fs/proc/inode.c | 1 - + fs/proc/self.c | 13 - + fs/proc/thread_self.c | 14 - + fs/quota/dquot.c | 2 +- + fs/quota/quota.c | 4 +- + fs/read_write.c | 254 +- + fs/reiserfs/namei.c | 1 - + fs/reiserfs/super.c | 4 +- + fs/squashfs/symlink.c | 1 - + fs/stat.c | 8 +- + fs/statfs.c | 2 +- + fs/sysv/inode.c | 1 - + fs/ubifs/file.c | 1 - + fs/utimes.c | 2 +- + fs/xfs/xfs_file.c | 19 - + fs/xfs/xfs_ioctl.c | 4 +- + fs/xfs/xfs_iops.c | 2 - + fs/xfs/xfs_reflink.c | 219 +- + include/asm-generic/asm-prototypes.h | 7 + + include/asm-generic/vmlinux.lds.h | 68 +- + include/clocksource/pxa.h | 3 +- + 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/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 + + .../drv260x-pdata.h => dt-bindings/mfd/tps65217.h} | 22 +- + 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/audit.h | 2 +- + include/linux/bpf-cgroup.h | 2 +- + include/linux/bpf.h | 13 +- + 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 +- + include/linux/cpuhotplug.h | 3 +- + include/linux/cpumask.h | 5 + + include/linux/crypto.h | 4 +- + include/linux/dcache.h | 4 +- + include/linux/dcookies.h | 4 +- + include/linux/edac.h | 154 +- + include/linux/file.h | 2 +- + include/linux/filter.h | 15 +- + include/linux/fs.h | 28 +- + include/linux/fsnotify.h | 12 +- + include/linux/fsnotify_backend.h | 10 +- + include/linux/gpio_keys.h | 5 +- + include/linux/kexec.h | 36 +- + include/linux/mfd/tps65217.h | 11 +- + include/linux/miscdevice.h | 1 + + include/linux/mm_types.h | 4 - + include/linux/mmzone.h | 2 +- + include/linux/mod_devicetable.h | 3 +- + include/linux/mount.h | 6 +- + include/linux/mtd/nand.h | 30 + + include/linux/nfs4.h | 1 + + include/linux/nfs_fs.h | 11 +- + include/linux/nfs_xdr.h | 27 +- + include/linux/platform_data/macb.h | 6 + + include/linux/platform_data/mtd-nand-s3c2410.h | 7 +- + include/linux/platform_data/usb-davinci.h | 23 - + include/linux/quota.h | 2 +- + include/linux/quotaops.h | 2 +- + include/linux/rmi.h | 60 +- + include/linux/serial_core.h | 4 +- + include/linux/skbuff.h | 6 +- + include/linux/soc/qcom/wcnss_ctrl.h | 13 + + include/linux/soc/ti/ti_sci_protocol.h | 249 ++ + include/linux/sunrpc/svc_rdma.h | 7 +- + include/linux/types.h | 4 +- + include/linux/uio.h | 3 + + include/media/cec.h | 12 +- + 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/net/inet6_connection_sock.h | 3 +- + include/net/inet_connection_sock.h | 6 +- + include/net/netlink.h | 3 +- + include/net/sock.h | 6 +- + include/net/udplite.h | 2 +- + include/scsi/iscsi_proto.h | 2 +- + include/soc/at91/atmel-secumod.h | 19 + + include/soc/fsl/qman.h | 62 +- + 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 +- + include/target/target_core_base.h | 2 +- + include/trace/events/btrfs.h | 67 +- + include/uapi/linux/Kbuild | 3 + + include/{ => uapi}/linux/cec-funcs.h | 76 +- + include/{ => uapi}/linux/cec.h | 94 +- + include/uapi/linux/types.h | 4 - + include/uapi/linux/v4l2-controls.h | 1 + + include/uapi/linux/v4l2-dv-timings.h | 97 +- + include/uapi/linux/vhost.h | 2 - + include/uapi/linux/videodev2.h | 118 +- + include/uapi/linux/virtio_crypto.h | 450 +++ + include/uapi/linux/virtio_ids.h | 1 + + include/uapi/linux/virtio_types.h | 6 +- + init/Kconfig | 3 +- + kernel/audit.c | 4 +- + kernel/audit.h | 2 +- + kernel/audit_fsnotify.c | 10 +- + kernel/audit_tree.c | 2 +- + kernel/audit_watch.c | 12 +- + kernel/bpf/core.c | 43 +- + kernel/bpf/syscall.c | 38 +- + kernel/bpf/verifier.c | 28 +- + kernel/cpu.c | 6 +- + kernel/events/core.c | 2 +- + kernel/irq/affinity.c | 6 +- + kernel/kexec_file.c | 141 +- + kernel/kexec_internal.h | 16 - + kernel/locking/qspinlock_stat.h | 12 +- + kernel/printk/printk.c | 2 +- + kernel/time/tick-broadcast.c | 3 + + lib/iov_iter.c | 98 +- + mm/shmem.c | 2 - + net/atm/common.c | 2 +- + net/atm/lec.c | 6 +- + net/atm/mpoa_caches.c | 43 +- + net/bluetooth/Makefile | 2 - + net/bluetooth/l2cap_core.c | 6 +- + 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 +- + net/core/filter.c | 6 + + net/decnet/dn_dev.c | 2 +- + net/ieee802154/6lowpan/6lowpan_i.h | 2 +- + net/ieee802154/Makefile | 2 - + net/ipv4/inet_connection_sock.c | 16 +- + net/ipv4/ip_output.c | 4 +- + net/ipv4/ping.c | 8 +- + net/ipv6/inet6_connection_sock.c | 7 +- + net/ipv6/route.c | 2 + + net/irda/irnet/irnet.h | 1 - + net/irda/irnet/irnet_ppp.h | 11 +- + net/irda/irproc.c | 1 - + net/mac80211/Makefile | 2 +- + net/mac80211/ieee80211_i.h | 4 +- + net/mac80211/key.c | 3 +- + net/mac80211/rx.c | 2 +- + net/mac80211/sta_info.c | 14 +- + net/mac802154/Makefile | 2 - + net/packet/af_packet.c | 5 +- + net/sched/cls_flower.c | 6 +- + net/sctp/endpointola.c | 5 +- + net/sctp/socket.c | 7 +- + net/sunrpc/auth_gss/auth_gss.c | 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/clnt.c | 2 + + net/sunrpc/stats.c | 10 +- + net/sunrpc/svc.c | 14 +- + net/sunrpc/svcauth.c | 3 +- + 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/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 +- + net/sunrpc/xprtrdma/transport.c | 34 +- + net/sunrpc/xprtrdma/verbs.c | 37 +- + net/sunrpc/xprtrdma/xprt_rdma.h | 31 +- + net/tipc/msg.c | 4 +- + net/unix/af_unix.c | 6 +- + net/vmw_vsock/virtio_transport.c | 2 +- + net/vmw_vsock/virtio_transport_common.c | 17 +- + net/vmw_vsock/vmci_transport_notify.c | 30 +- + net/vmw_vsock/vmci_transport_notify_qstate.c | 30 +- + net/wireless/Makefile | 2 - + net/x25/sysctl_net_x25.c | 2 +- + samples/bpf/Makefile | 4 +- + samples/connector/Makefile | 2 +- + scripts/Makefile.build | 17 +- + scripts/adjust_autoksyms.sh | 1 + + scripts/checkpatch.pl | 4 +- + 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/builddeb | 2 +- + scripts/package/mkspec | 3 +- + scripts/sortextable.c | 2 + + security/keys/keyctl.c | 2 +- + security/smack/smack_lsm.c | 2 +- + tools/build/Makefile | 2 +- + tools/gpio/Makefile | 2 +- + tools/include/linux/types.h | 4 - + 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 +- + tools/testing/selftests/bpf/test_verifier.c | 30 +- + 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 +- + tools/virtio/linux/compiler.h | 2 +- + tools/virtio/linux/uaccess.h | 9 +- + 2500 files changed, 110212 insertions(+), 63665 deletions(-) + delete mode 100644 Documentation/DocBook/crypto-API.tmpl + create mode 100644 Documentation/admin-guide/ras.rst + create mode 100644 Documentation/arm/stm32/stm32f746-overview.txt + 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 + 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/media/mediatek-mdp.txt + create mode 100644 Documentation/devicetree/bindings/media/renesas,fdp1.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/ti-da8xx-ddrctl.txt + 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 Documentation/devicetree/bindings/thermal/brcm,bcm2835-thermal.txt + create mode 100644 Documentation/driver-api/edac.rst + delete mode 100644 Documentation/edac.txt + delete mode 100644 Documentation/filesystems/logfs.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 + 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/include/asm/mach-types.h + delete mode 100644 arch/arm/kernel/calls.S + 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-sa1100/include/mach/SA-1101.h + 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/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 + 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 + 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 + create mode 100644 arch/powerpc/mm/init-common.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 arch/s390/include/asm/trace/zcrypt.h + create mode 100644 arch/x86/include/asm/asm-prototypes.h + create mode 100644 drivers/bus/da8xx-mstpri.c + create mode 100644 drivers/bus/tegra-gmi.c + create mode 100644 drivers/crypto/virtio/Kconfig + create mode 100644 drivers/crypto/virtio/Makefile + create mode 100644 drivers/crypto/virtio/virtio_crypto_algs.c + create mode 100644 drivers/crypto/virtio/virtio_crypto_common.h + create mode 100644 drivers/crypto/virtio/virtio_crypto_core.c + create mode 100644 drivers/crypto/virtio/virtio_crypto_mgr.c + 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 + 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/input/rmi4/rmi_f03.c + create mode 100644 drivers/input/rmi4/rmi_f34.c + create mode 100644 drivers/input/rmi4/rmi_f34.h + create mode 100644 drivers/input/rmi4/rmi_f34v7.c + create mode 100644 drivers/input/rmi4/rmi_f55.c + create mode 100644 drivers/input/rmi4/rmi_smbus.c + create mode 100644 drivers/mailbox/tegra-hsp.c + 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 (98%) + 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%) + create mode 100644 drivers/memory/da8xx-ddrctl.c + create mode 100644 drivers/mtd/nand/oxnas_nand.c + create mode 100644 drivers/mtd/nand/tango_nand.c + create mode 100644 drivers/net/ethernet/cadence/macb_pci.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/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 + 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 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 + 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 + create mode 100644 fs/overlayfs/namei.c + create mode 100644 fs/overlayfs/ovl_entry.h + create mode 100644 fs/overlayfs/util.c + create mode 100644 include/asm-generic/asm-prototypes.h + 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 + rename include/{linux/platform_data/drv260x-pdata.h => dt-bindings/mfd/tps65217.h} (54%) + 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 + rename include/{ => uapi}/linux/cec-funcs.h (98%) + rename include/{ => uapi}/linux/cec.h (93%) + create mode 100644 include/uapi/linux/virtio_crypto.h + create mode 100644 scripts/coccinelle/misc/boolconv.cocci + 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 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 +Already up-to-date. +Merging arc-current/for-curr (7badf6fefca8 ARC: axs10x: really enable ARC PGU) +$ git merge arc-current/for-curr +Already up-to-date. +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 (69973b830859 Linux 4.9) +$ 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 (52f40e9d657c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge net/master +Already up-to-date. +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 (a17d93ff3a95 mac80211: fix legacy and invalid rx-rate report) +$ git merge mac80211/master +Already up-to-date. +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 (f26e8817b235 Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up-to-date. +Merging crypto-current/master (8759fec4af22 crypto: marvell - Copy IVDIG before launching partial DMA ahash requests) +$ git merge crypto-current/master +Auto-merging drivers/crypto/marvell/hash.c +Merge made by the 'recursive' strategy. + drivers/crypto/marvell/cesa.h | 3 ++- + drivers/crypto/marvell/hash.c | 34 +++++++++++++++++++++++++++++++++- + drivers/crypto/marvell/tdma.c | 9 ++++++++- + 3 files changed, 43 insertions(+), 3 deletions(-) +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 (298360af3dab drivers/gpu/drm/ast: Fix infinite loop if read fails) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/ast/ast_main.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) +Merging kbuild/for-next (a6d1da25b333 Merge branch 'kbuild/kbuild' into kbuild/for-next) +$ git merge kbuild/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo) +$ git merge asm-generic/master +Resolved 'include/asm-generic/percpu.h' using previous resolution. +Auto-merging include/asm-generic/percpu.h +CONFLICT (content): Merge conflict in include/asm-generic/percpu.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3ccc3c8d0fe2] 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 +Already up-to-date! +Merge made by the 'recursive' strategy. +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 (991688bfc635 Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) +$ git merge arm-soc/for-next +Already up-to-date. +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 9b50da25ecf1] 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/Makefile +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 8dd8dca62e0b] 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 (ad1ccae78b7d MIPS: IP22: Fix build error due to binutils 2.25 uselessnes.) +$ git merge mips/mips-for-linux-next +Merge made by the 'recursive' strategy. + arch/mips/Makefile | 4 ++ + arch/mips/boot/compressed/Makefile | 8 +++- + .../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/mm/sc-ip22.c | 54 ++++++++++++++-------- + 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 +++--- + 26 files changed, 149 insertions(+), 202 deletions(-) +Merging nios2/for-next (744606c76c4a nios2: add screen_info) +$ git merge nios2/for-next +Already up-to-date. +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 (c6f6634721c8 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next) +$ git merge powerpc/next +Already up-to-date. +Merging fsl/next (baae856ebdee powerpc/fsl/dts: add FMan node for t1042d4rdb) +$ git merge fsl/next +Already up-to-date. +Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc) +$ git merge mpc5xxx/next +Already up-to-date. +Merging s390/features (0b7589ecca2b s390/pci: query fmb length) +$ git merge s390/features +Already up-to-date. +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 (14e73e78ee98 tile: use __ro_after_init instead of tile-specific __write_once) +$ git merge tile/master +Already up-to-date. +Merging uml/linux-next (f88f0bdfc32f um: UBD Improvements) +$ git merge uml/linux-next +Already up-to-date. +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 (30b507051dd1 xtensa: update DMA-related Documentation/features entries) +$ git merge xtensa/xtensa-for-next +Auto-merging arch/xtensa/kernel/pci-dma.c +Merge made by the 'recursive' strategy. + .../features/io/dma-api-debug/arch-support.txt | 2 +- + .../features/io/dma-contiguous/arch-support.txt | 2 +- + arch/xtensa/Kconfig | 1 + + arch/xtensa/boot/dts/kc705.dts | 16 +++ + arch/xtensa/include/asm/Kbuild | 1 + + arch/xtensa/kernel/Makefile | 1 + + arch/xtensa/kernel/pci-dma.c | 21 +++- + arch/xtensa/kernel/s32c1i_selftest.c | 128 +++++++++++++++++++ + arch/xtensa/kernel/setup.c | 137 ++------------------- + arch/xtensa/mm/init.c | 2 + + 10 files changed, 176 insertions(+), 135 deletions(-) + create mode 100644 arch/xtensa/kernel/s32c1i_selftest.c +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 (2939e1a86f75 btrfs: limit async_work allocation and worker func duration) +$ git merge btrfs-kdave/for-next +Already up-to-date. +Merging ceph/master (45ee2c1d6618 libceph: remove now unused finish_request() wrapper) +$ git merge ceph/master +Already up-to-date. +Merging cifs/for-next (374402a2a1df cifs_get_root shouldn't use path with tree name) +$ git merge cifs/for-next +Auto-merging fs/cifs/connect.c +Auto-merging fs/cifs/cifsfs.c +Merge made by the 'recursive' strategy. + fs/cifs/cifsencrypt.c | 14 ++++++--- + fs/cifs/cifsfs.c | 2 +- + fs/cifs/cifsglob.h | 8 +++++ + fs/cifs/cifsproto.h | 6 +++- + fs/cifs/connect.c | 82 +++++++++++++++++++++++++++++++++++++++++------- + fs/cifs/dir.c | 4 +-- + fs/cifs/file.c | 8 ++++- + fs/cifs/ioctl.c | 2 +- + fs/cifs/link.c | 9 ++---- + 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 +++++------------------ + 14 files changed, 177 insertions(+), 90 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/quota.h +Auto-merging include/linux/fs.h +Auto-merging fs/quota/quota.c +Auto-merging fs/quota/dquot.c +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 (852d21ae1fcd docs: add back 'Documentation/Changes' file (as symlink)) +$ 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 (14d37564fa3d GFS2: Fix reference to ERR_PTR in gfs2_glock_iter_next) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/glock.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) +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 (28a2638d893c NFS: Clean up nfs_attribute_timeout()) +$ git merge nfs/linux-next +Auto-merging fs/nfs/inode.c +Auto-merging fs/nfs/file.c +Merge made by the 'recursive' strategy. + fs/nfs/dir.c | 23 +++++++++-------- + fs/nfs/file.c | 12 +-------- + fs/nfs/inode.c | 68 ++++++++++++++++++++++++++++++-------------------- + fs/nfs/internal.h | 1 + + fs/nfs/nfs4proc.c | 17 +++++++++---- + include/linux/nfs_fs.h | 2 -- + 6 files changed, 67 insertions(+), 56 deletions(-) +Merging nfsd/nfsd-next (47057abde515 nfsd: add support for the umask attribute) +$ git merge nfsd/nfsd-next +Already up-to-date. +Merging orangefs/for-next (04102c76a779 orangefs: Axe some dead code) +$ git merge orangefs/for-next +Already up-to-date. +Merging overlayfs/overlayfs-next (8a23e9b5e08b Revert "ovl: Warn on copy up if a process has a R/O fd open to the lower file") +$ git merge overlayfs/overlayfs-next +Resolved 'fs/overlayfs/copy_up.c' using previous resolution. +Recorded preimage for 'fs/overlayfs/dir.c' +Recorded preimage for 'fs/overlayfs/inode.c' +Auto-merging include/linux/fs.h +Auto-merging fs/overlayfs/super.c +Auto-merging fs/overlayfs/overlayfs.h +Auto-merging fs/overlayfs/inode.c +CONFLICT (content): Merge conflict in fs/overlayfs/inode.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/internal.h +Automatic merge failed; fix conflicts and then commit the result. +$ git merge --abort +$ git commit -v -a +On branch master +nothing to commit, working tree clean +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 +Already up-to-date. +Merging xfs/for-next (9807b773dad4 Merge branch 'xfs-4.10-misc-fixes-4' into for-next) +$ git merge xfs/for-next +Already up-to-date. +Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2) +$ git merge file-locks/linux-next +Already up-to-date. +Merging vfs/for-next (bb6b5000084e Merge branch 'work.splice' into for-next) +$ git merge vfs/for-next +Auto-merging net/unix/af_unix.c +Auto-merging net/socket.c +Auto-merging net/ipv4/tcp.c +Auto-merging net/core/skbuff.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/relay.c +Auto-merging include/net/tcp.h +Auto-merging include/linux/skbuff.h +Auto-merging include/linux/fs.h +Auto-merging fs/splice.c +Auto-merging fs/namespace.c +Merge made by the 'recursive' strategy. + fs/namespace.c | 8 +--- + fs/pnode.c | 74 ++++++++++++++++---------------- + fs/splice.c | 22 ++++++---- + include/linux/fs.h | 1 + + include/linux/net.h | 2 +- + include/linux/skbuff.h | 3 +- + include/linux/splice.h | 4 +- + include/net/tcp.h | 2 +- + kernel/relay.c | 1 - + kernel/trace/trace.c | 2 - + net/core/skbuff.c | 4 +- + net/ipv4/tcp.c | 7 ++- + net/kcm/kcmsock.c | 5 ++- + net/socket.c | 4 +- + net/unix/af_unix.c | 113 +++++-------------------------------------------- + 15 files changed, 77 insertions(+), 175 deletions(-) +Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities) +$ git merge vfs-jk/vfs +Already up-to-date. +Merging vfs-miklos/next (b12826c5188e Merge branch 'vfs-ovl' into next) +$ git merge vfs-miklos/next +Resolved 'fs/overlayfs/dir.c' using previous resolution. +Resolved 'fs/read_write.c' using previous resolution. +Auto-merging include/linux/fs.h +Auto-merging fs/read_write.c +CONFLICT (content): Merge conflict in fs/read_write.c +Auto-merging fs/proc/namespaces.c +Auto-merging fs/proc/base.c +Auto-merging fs/overlayfs/dir.c +CONFLICT (content): Merge conflict in fs/overlayfs/dir.c +Auto-merging fs/nsfs.c +Auto-merging fs/namei.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 7e2a4931a5d3] Merge remote-tracking branch 'vfs-miklos/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/Locking | 6 ++-- + Documentation/filesystems/porting | 3 ++ + Documentation/filesystems/vfs.txt | 5 ++- + fs/afs/mntpt.c | 2 +- + fs/bad_inode.c | 8 +---- + fs/namei.c | 65 +++++++++++++++------------------------ + fs/nsfs.c | 17 +++++++--- + fs/overlayfs/dir.c | 3 +- + fs/proc/base.c | 57 ++++++++++++---------------------- + fs/proc/namespaces.c | 13 ++++---- + fs/read_write.c | 17 +++++++--- + include/linux/fs.h | 6 +--- + include/linux/proc_ns.h | 4 +-- + 13 files changed, 89 insertions(+), 117 deletions(-) +Merging pci/next (b08d2e61a6f9 Merge branch 'pci/host-vmd' into next) +$ git merge pci/next +Already up-to-date. +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 (649ac63a9ae5 i2c: mux: mlxcpld: fix i2c mux selection caching) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + drivers/i2c/busses/i2c-designware-platdrv.c | 31 ++++++++++++++++++++++------- + drivers/i2c/busses/i2c-octeon-core.c | 4 +++- + drivers/i2c/busses/i2c-octeon-core.h | 21 ++++++++++++++----- + drivers/i2c/busses/i2c-xgene-slimpro.c | 1 + + drivers/i2c/muxes/i2c-mux-mlxcpld.c | 24 ++++++++++++---------- + drivers/i2c/muxes/i2c-mux-pca954x.c | 5 ++++- + 6 files changed, 61 insertions(+), 25 deletions(-) +Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge jdelvare-hwmon/master +Already up-to-date. +Merging dmi/master (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 (217e2bfab22e docs: sphinx-extensions: make rstFlatTable work with docutils 0.13) +$ git merge jc_docs/docs-next +Merge made by the 'recursive' strategy. + Documentation/sphinx/rstFlatTable.py | 5 +++++ + 1 file changed, 5 insertions(+) +Merging v4l-dvb/master (65390ea01ce6 Merge branch 'patchwork' into v4l_for_linus) +$ git merge v4l-dvb/master +Already up-to-date. +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 +Auto-merging arch/x86/kernel/tsc.c +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 (52f40e9d657c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ 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 (e77a8be9a0a7 nl80211: better describe field in struct nl80211_bss_select_rssi_adjust) +$ git merge mac80211-next/master +Auto-merging net/mac80211/sta_info.c +Auto-merging net/mac80211/rx.c +Auto-merging net/mac80211/ieee80211_i.h +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 +-- + include/uapi/linux/nl80211.h | 5 +- + 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/rc80211_minstrel.c | 21 ++-- + net/mac80211/rc80211_minstrel.h | 33 +++--- + net/mac80211/rc80211_minstrel_debugfs.c | 24 ++--- + net/mac80211/rc80211_minstrel_ht.c | 68 ++++-------- + net/mac80211/rc80211_minstrel_ht.h | 6 +- + net/mac80211/rc80211_minstrel_ht_debugfs.c | 32 +++--- + net/mac80211/rx.c | 4 - + net/mac80211/scan.c | 8 +- + net/mac80211/sta_info.c | 18 ++-- + net/mac80211/status.c | 3 +- + net/mac80211/tx.c | 132 ++++++++++++++++++++++-- + net/mac80211/vht.c | 4 - + net/rfkill/core.c | 103 +++++++++++++++--- + net/wireless/nl80211.c | 42 ++------ + net/wireless/nl80211.h | 6 +- + net/wireless/scan.c | 9 +- + net/wireless/util.c | 5 +- + 31 files changed, 395 insertions(+), 254 deletions(-) +Merging rdma/for-next (6f94ba20799b Merge branch 'vmw_pvrdma' into merge-test) +$ git merge rdma/for-next +Already up-to-date. +Merging rdma-leon/rdma-next (52f40e9d657c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge rdma-leon/rdma-next +Already up-to-date. +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 (445caaa20c4d mtd: Allocate bdi objects dynamically) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (445caaa20c4d mtd: Allocate bdi objects dynamically) +$ git merge l2-mtd/master +Already up-to-date. +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 (2fa70bb9b564 drm/nouveau: use designated initializers) +$ git merge drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/gma500/framebuffer.c +Auto-merging drivers/gpu/drm/ast/ast_main.c +Auto-merging MAINTAINERS +Removing Documentation/dma-buf-sharing.txt +Merge made by the 'recursive' strategy. + .../bindings/display/bridge/ti,ths8135.txt | 46 ++ + .../bindings/display/hisilicon/hisi-ade.txt | 2 +- + Documentation/dma-buf-sharing.txt | 482 --------------------- + Documentation/driver-api/dma-buf.rst | 92 ++++ + MAINTAINERS | 2 +- + drivers/dma-buf/dma-buf.c | 208 ++++++++- + drivers/dma-buf/sync_file.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 1 + + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 6 +- + drivers/gpu/drm/arc/arcpgu_crtc.c | 3 +- + drivers/gpu/drm/arc/arcpgu_hdmi.c | 5 +- + drivers/gpu/drm/arm/hdlcd_crtc.c | 18 +- + drivers/gpu/drm/arm/malidp_planes.c | 10 +- + drivers/gpu/drm/armada/armada_crtc.c | 9 +- + drivers/gpu/drm/armada/armada_fb.c | 2 +- + drivers/gpu/drm/armada/armada_fbdev.c | 5 +- + drivers/gpu/drm/armada/armada_overlay.c | 4 +- + drivers/gpu/drm/ast/ast_drv.h | 1 + + drivers/gpu/drm/ast/ast_fb.c | 4 +- + drivers/gpu/drm/ast/ast_main.c | 2 +- + drivers/gpu/drm/ast/ast_mode.c | 16 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.c | 2 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 4 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 22 +- + drivers/gpu/drm/bochs/bochs.h | 1 + + drivers/gpu/drm/bochs/bochs_fbdev.c | 2 +- + drivers/gpu/drm/bochs/bochs_mm.c | 2 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 9 +- + drivers/gpu/drm/bridge/dumb-vga-dac.c | 1 + + drivers/gpu/drm/bridge/dw-hdmi.c | 3 +- + drivers/gpu/drm/cirrus/cirrus_drv.h | 1 + + drivers/gpu/drm/cirrus/cirrus_fbdev.c | 6 +- + drivers/gpu/drm/cirrus/cirrus_main.c | 2 +- + drivers/gpu/drm/cirrus/cirrus_mode.c | 9 +- + drivers/gpu/drm/drm_atomic.c | 26 +- + drivers/gpu/drm/drm_atomic_helper.c | 41 +- + drivers/gpu/drm/drm_bridge.c | 59 ++- + drivers/gpu/drm/drm_connector.c | 229 +++++++--- + drivers/gpu/drm/drm_crtc.c | 9 +- + drivers/gpu/drm/drm_crtc_helper.c | 53 ++- + drivers/gpu/drm/drm_crtc_internal.h | 9 + + drivers/gpu/drm/drm_debugfs.c | 1 + + drivers/gpu/drm/drm_drv.c | 11 +- + drivers/gpu/drm/drm_edid.c | 1 + + drivers/gpu/drm/drm_encoder.c | 17 +- + drivers/gpu/drm/drm_fb_cma_helper.c | 11 +- + drivers/gpu/drm/drm_fb_helper.c | 22 +- + drivers/gpu/drm/drm_fops.c | 2 +- + drivers/gpu/drm/drm_framebuffer.c | 53 ++- + drivers/gpu/drm/drm_internal.h | 8 +- + drivers/gpu/drm/drm_ioctl.c | 23 +- + drivers/gpu/drm/drm_irq.c | 30 +- + drivers/gpu/drm/drm_mm.c | 31 +- + drivers/gpu/drm/drm_mode_config.c | 145 +++---- + drivers/gpu/drm/drm_modeset_helper.c | 25 +- + drivers/gpu/drm/drm_of.c | 1 + + drivers/gpu/drm/drm_plane.c | 14 +- + drivers/gpu/drm/drm_plane_helper.c | 6 +- + drivers/gpu/drm/drm_probe_helper.c | 18 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 21 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 2 +- + drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 6 +- + drivers/gpu/drm/exynos/exynos7_drm_decon.c | 8 +- + drivers/gpu/drm/exynos/exynos_dp.c | 5 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 6 +- + drivers/gpu/drm/exynos/exynos_drm_fb.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 6 +- + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 4 +- + drivers/gpu/drm/exynos/exynos_mixer.c | 12 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 3 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h | 2 + + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 4 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 5 +- + drivers/gpu/drm/gma500/accel_2d.c | 2 +- + drivers/gpu/drm/gma500/framebuffer.c | 6 +- + drivers/gpu/drm/gma500/gma_display.c | 13 +- + drivers/gpu/drm/gma500/mdfld_intel_display.c | 17 +- + drivers/gpu/drm/gma500/oaktrail_crtc.c | 13 +- + drivers/gpu/drm/gma500/psb_intel_drv.h | 1 + + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 6 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 2 +- + drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 5 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 17 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 8 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 4 +- + drivers/gpu/drm/i915/i915_debugfs.c | 11 +- + drivers/gpu/drm/i915/i915_drv.h | 4 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 8 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 4 +- + drivers/gpu/drm/i915/intel_display.c | 78 ++-- + drivers/gpu/drm/i915/intel_drv.h | 1 + + drivers/gpu/drm/i915/intel_fbc.c | 14 +- + drivers/gpu/drm/i915/intel_fbdev.c | 10 +- + drivers/gpu/drm/i915/intel_overlay.c | 26 +- + drivers/gpu/drm/i915/intel_pm.c | 67 +-- + drivers/gpu/drm/i915/intel_sprite.c | 14 +- + drivers/gpu/drm/imx/imx-ldb.c | 8 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 40 +- + drivers/gpu/drm/imx/parallel-display.c | 6 +- + drivers/gpu/drm/mediatek/mtk_dpi.c | 8 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 3 +- + drivers/gpu/drm/mediatek/mtk_drm_fb.c | 2 +- + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 4 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 24 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 11 +- + drivers/gpu/drm/meson/meson_plane.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 1 + + drivers/gpu/drm/mgag200/mgag200_fb.c | 4 +- + drivers/gpu/drm/mgag200/mgag200_main.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 23 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 17 +- + drivers/gpu/drm/msm/edp/edp_bridge.c | 2 +- + drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 2 +- + drivers/gpu/drm/msm/msm_fb.c | 12 +- + drivers/gpu/drm/msm/msm_fbdev.c | 2 +- + drivers/gpu/drm/mxsfb/mxsfb_crtc.c | 2 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 4 +- + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 17 +- + drivers/gpu/drm/nouveau/dispnv04/dfp.c | 3 +- + drivers/gpu/drm/nouveau/dispnv04/overlay.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_connector.h | 1 + + drivers/gpu/drm/nouveau/nouveau_display.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 3 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 28 +- + drivers/gpu/drm/nouveau/nv50_display.c | 14 +- + drivers/gpu/drm/omapdrm/omap_fb.c | 12 +- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 2 +- + drivers/gpu/drm/qxl/qxl_display.c | 2 +- + drivers/gpu/drm/qxl/qxl_draw.c | 2 +- + drivers/gpu/drm/qxl/qxl_drv.h | 1 + + drivers/gpu/drm/qxl/qxl_fb.c | 5 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 19 +- + drivers/gpu/drm/radeon/r100.c | 10 +- + drivers/gpu/drm/radeon/radeon_display.c | 8 +- + drivers/gpu/drm/radeon/radeon_fb.c | 4 +- + drivers/gpu/drm/radeon/radeon_irq_kms.c | 12 +- + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 16 +- + drivers/gpu/drm/radeon/radeon_mode.h | 1 + + drivers/gpu/drm/rcar-du/rcar_du_encoder.h | 1 + + drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c | 5 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 4 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 4 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 5 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 22 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 6 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.h | 1 + + drivers/gpu/drm/shmobile/shmob_drm_plane.c | 4 +- + drivers/gpu/drm/sti/sti_dvo.c | 3 +- + drivers/gpu/drm/sti/sti_gdp.c | 10 +- + drivers/gpu/drm/sti/sti_hda.c | 3 +- + drivers/gpu/drm/sti/sti_hdmi.c | 3 +- + drivers/gpu/drm/sti/sti_hqvdp.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 5 +- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 13 +- + drivers/gpu/drm/tegra/dc.c | 8 +- + drivers/gpu/drm/tegra/drm.c | 5 +- + drivers/gpu/drm/tegra/drm.h | 1 + + drivers/gpu/drm/tegra/fb.c | 6 +- + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 4 +- + drivers/gpu/drm/tilcdc/tilcdc_external.c | 4 +- + drivers/gpu/drm/tilcdc/tilcdc_plane.c | 4 +- + drivers/gpu/drm/ttm/ttm_bo_manager.c | 10 +- + drivers/gpu/drm/udl/udl_fb.c | 6 +- + drivers/gpu/drm/vc4/vc4_drv.h | 2 + + drivers/gpu/drm/vc4/vc4_plane.c | 8 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 3 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 1 + + drivers/gpu/drm/virtio/virtgpu_fb.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_ttm.c | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 11 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 5 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 2 +- + drivers/gpu/drm/zte/zx_plane.c | 4 +- + include/drm/drm_atomic.h | 6 - + include/drm/drm_auth.h | 17 +- + include/drm/drm_bridge.h | 4 +- + include/drm/drm_connector.h | 79 +++- + include/drm/drm_crtc.h | 3 - + include/drm/drm_encoder.h | 7 +- + include/drm/drm_encoder_slave.h | 1 + + include/drm/drm_framebuffer.h | 27 +- + include/drm/drm_mm.h | 46 +- + include/drm/drm_mode_config.h | 12 +- + include/drm/drm_modeset_helper.h | 3 +- + include/drm/drm_modeset_helper_vtables.h | 1 + + include/drm/drm_simple_kms_helper.h | 2 - + include/linux/dma-buf.h | 224 ++++++++-- + include/linux/kref.h | 2 +- + include/linux/reservation.h | 34 ++ + include/uapi/drm/drm_fourcc.h | 11 + + 204 files changed, 1817 insertions(+), 1518 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/ti,ths8135.txt + delete mode 100644 Documentation/dma-buf-sharing.txt +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 +Auto-merging drivers/gpu/drm/arm/malidp_planes.c +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 3b5777029894] 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 (3545d3c27c43 gcc-plugins: update gcc-common.h for gcc-7) +$ git merge kspp/for-next/kspp +Auto-merging scripts/gcc-plugins/latent_entropy_plugin.c +Auto-merging scripts/gcc-plugins/gcc-common.h +Merge made by the 'recursive' strategy. + scripts/gcc-plugins/gcc-common.h | 85 +++++++++++++++++++++++++++++ + scripts/gcc-plugins/latent_entropy_plugin.c | 4 +- + 2 files changed, 87 insertions(+), 2 deletions(-) +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 (0d6534e2ab69 Merge remote-tracking branches 'asoc/fix/dwc', 'asoc/fix/hdmi-codec' and 'asoc/fix/topology' into asoc-linus) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + include/sound/hdmi-codec.h | 8 ++++---- + sound/soc/dwc/designware_i2s.c | 25 +++++++++++-------------- + sound/soc/sh/rcar/core.c | 4 +--- + sound/soc/soc-topology.c | 3 +-- + 4 files changed, 17 insertions(+), 23 deletions(-) +Merging modules/modules-next (4d217a5adccf module: fix DEBUG_SET_MODULE_RONX typo) +$ git merge modules/modules-next +Already up-to-date. +Merging input/next (1a9027770f3d Input: i8042 - force synchronous probing of PNP drivers) +$ git merge input/next +Auto-merging drivers/input/serio/i8042-x86ia64io.h +Merge made by the 'recursive' strategy. + drivers/input/serio/i8042-x86ia64io.h | 8 ++++++++ + 1 file changed, 8 insertions(+) +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 +Merge made by the 'recursive' strategy. +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 (5cc60aeedf31 Merge tag 'xfs-for-linus-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs) +$ 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 (3ea77e712089 md/r5cache: assign conf->log before r5l_load_log()) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + drivers/md/linear.c | 2 + + drivers/md/md.c | 42 ++++++++ + drivers/md/md.h | 2 + + drivers/md/multipath.c | 4 + + drivers/md/raid0.c | 2 + + drivers/md/raid1.c | 267 ++++++++++++++++++++++++----------------------- + drivers/md/raid10.c | 245 ++++++++++++++++++++++++------------------- + drivers/md/raid5-cache.c | 34 +++--- + 8 files changed, 346 insertions(+), 252 deletions(-) +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 174b456e2479] 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 +Already up-to-date. +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 (3011b2cd0ca0 selinux: clean up cred usage and simplify) +$ git merge selinux/next +Auto-merging security/selinux/hooks.c +Merge made by the 'recursive' strategy. + security/selinux/hooks.c | 379 +++++++++++++++++++----------------- + security/selinux/include/classmap.h | 68 +++++++ + security/selinux/include/objsec.h | 10 + + security/selinux/include/security.h | 3 +- + security/selinux/selinuxfs.c | 75 +++---- + security/selinux/ss/services.c | 3 + + 6 files changed, 322 insertions(+), 216 deletions(-) +Merging tpmdd/next (1548c540d863 tpm/vtpm: fix kdoc warnings) +$ git merge tpmdd/next +Auto-merging drivers/char/tpm/tpm-chip.c +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 +Already up-to-date. +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 +Auto-merging kernel/auditsc.c +Auto-merging kernel/audit.c +Merge made by the 'recursive' strategy. + kernel/audit.c | 4 +++- + kernel/auditsc.c | 2 +- + 2 files changed, 4 insertions(+), 2 deletions(-) +Merging devicetree/for-next (61eb3a04f978 dt: pwm: bcm2835: fix typo in clocks property name) +$ git merge devicetree/for-next +Already up-to-date. +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 (8082041bca7a 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 | 11 ++++++----- + drivers/spi/spi-sh-msiof.c | 4 +++- + 4 files changed, 23 insertions(+), 12 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/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 | 4 + + arch/x86/include/asm/intel_rdt.h | 224 ++++ + arch/x86/include/asm/intel_rdt_common.h | 27 + + arch/x86/kernel/cpu/Makefile | 2 + + 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/process_32.c | 4 + + arch/x86/kernel/process_64.c | 4 + + drivers/base/cacheinfo.c | 5 + + include/linux/cacheinfo.h | 3 + + include/linux/sched.h | 3 + + include/uapi/linux/magic.h | 1 + + 20 files changed, 2320 insertions(+), 25 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 (9cae24b7b113 Merge commit 'daf34710a9e8849e04867d206692dc42d6d22263' into next) +$ git merge edac/linux_next +Recorded preimage for 'Documentation/00-INDEX' +Auto-merging Documentation/00-INDEX +CONFLICT (content): Merge conflict in Documentation/00-INDEX +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'Documentation/00-INDEX'. +[master 7b4bc57abb42] Merge remote-tracking branch 'edac/linux_next' +$ git diff -M --stat --summary HEAD^.. +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 +Already up-to-date. +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 (b94c3698b4b0 Revert "x86/kvm: Support the vCPU preemption check") +$ git merge kvm/linux-next +Merge made by the 'recursive' strategy. + Documentation/virtual/kvm/locking.txt | 8 ++++++-- + arch/x86/include/asm/kvm_host.h | 1 + + arch/x86/include/uapi/asm/kvm_para.h | 4 +--- + arch/x86/kvm/cpuid.c | 9 +++++---- + arch/x86/kvm/hyperv.c | 24 +++++++++++++++--------- + arch/x86/kvm/vmx.c | 2 +- + arch/x86/kvm/x86.c | 17 +---------------- + 7 files changed, 30 insertions(+), 35 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at d630f4ccf419 Merge remote-tracking branch 'irqchip/irqchip/for-next' +Merging next-20161216 version of kvm +$ git merge -m next-20161216/kvm 36da91bdf568e804aac3ef02a5e3d867585f08fb +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 (252747dd7c67 KVM: s390: Get rid of ar_t) +$ git merge kvms390/next +Merge made by the 'recursive' strategy. + arch/s390/kvm/gaccess.c | 26 ++++++++++++++++---------- + arch/s390/kvm/gaccess.h | 10 +++++----- + arch/s390/kvm/kvm-s390.c | 4 +++- + arch/s390/kvm/kvm-s390.h | 10 ++++------ + arch/s390/kvm/priv.c | 30 +++++++++++++++--------------- + arch/s390/kvm/vsie.c | 3 +++ + arch/s390/tools/gen_facilities.c | 2 ++ + 7 files changed, 48 insertions(+), 37 deletions(-) +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 (83da6b59919a platform/x86: surface3-wmi: Balance locking on error path) +$ git merge drivers-x86/for-next +Auto-merging drivers/platform/x86/mlx-platform.c +Auto-merging drivers/platform/x86/ideapad-laptop.c +Auto-merging drivers/mfd/intel_soc_pmic_bxtwc.c +Removing arch/x86/platform/mellanox/Makefile +Auto-merging arch/x86/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + arch/x86/Kconfig | 12 - + arch/x86/platform/Makefile | 1 - + arch/x86/platform/mellanox/Makefile | 1 - + drivers/mfd/intel_soc_pmic_bxtwc.c | 38 +++ + drivers/platform/x86/Kconfig | 40 ++- + drivers/platform/x86/Makefile | 4 + + drivers/platform/x86/ideapad-laptop.c | 7 + + drivers/platform/x86/intel_bxtwc_tmu.c | 162 +++++++++++ + .../platform/x86}/mlx-platform.c | 101 ++++++- + drivers/platform/x86/surface3-wmi.c | 297 +++++++++++++++++++++ + drivers/platform/x86/surface3_button.c | 250 +++++++++++++++++ + include/linux/mfd/intel_soc_pmic.h | 1 + + 13 files changed, 897 insertions(+), 19 deletions(-) + delete mode 100644 arch/x86/platform/mellanox/Makefile + create mode 100644 drivers/platform/x86/intel_bxtwc_tmu.c + rename {arch/x86/platform/mellanox => drivers/platform/x86}/mlx-platform.c (73%) + create mode 100644 drivers/platform/x86/surface3-wmi.c + create mode 100644 drivers/platform/x86/surface3_button.c +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 +Already up-to-date. +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 +Already up-to-date! +Merge made by the 'recursive' strategy. +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 (b4153e05a699 Merge branch 'fixes' into for-next) +$ git merge scsi/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/scsi/g_NCR5380.txt | 46 +- + 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/NCR5380.c | 77 +- + drivers/scsi/NCR5380.h | 11 - + drivers/scsi/aacraid/linit.c | 2 - + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 320 +++- + drivers/scsi/cxgbi/libcxgbi.c | 40 +- + drivers/scsi/cxgbi/libcxgbi.h | 2 + + drivers/scsi/g_NCR5380.c | 153 +- + drivers/scsi/g_NCR5380.h | 2 + + drivers/scsi/hpsa.c | 37 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 7 +- + drivers/scsi/ibmvscsi/ibmvscsi.h | 1 + + 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 - + 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 + + 64 files changed, 9670 insertions(+), 695 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 scsi-mkp/for-next (d2a145252c52 scsi: avoid a permanent stop of the scsi device's request queue) +$ git merge scsi-mkp/for-next +Already up-to-date. +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 target-bva/for-next (83337e544323 iscsi-target: Return error if unable to add network portal) +$ git merge target-bva/for-next +Recorded preimage for 'drivers/target/target_core_configfs.c' +Auto-merging include/target/target_core_base.h +Auto-merging include/linux/configfs.h +Auto-merging drivers/target/target_core_user.c +Auto-merging drivers/target/target_core_configfs.c +CONFLICT (content): Merge conflict in drivers/target/target_core_configfs.c +Auto-merging drivers/scsi/qla2xxx/qla_isr.c +Auto-merging drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.h +Auto-merging drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/target/target_core_configfs.c'. +[master 11aab2611342] Merge remote-tracking branch 'target-bva/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 1 + + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.h | 1 + + drivers/scsi/qla2xxx/qla_isr.c | 1 + + drivers/target/iscsi/cxgbit/cxgbit_target.c | 1 + + drivers/target/iscsi/iscsi_target.c | 2 ++ + drivers/target/iscsi/iscsi_target.h | 12 ++++++++++++ + drivers/target/iscsi/iscsi_target_auth.c | 2 +- + drivers/target/iscsi/iscsi_target_auth.h | 5 +++++ + drivers/target/iscsi/iscsi_target_configfs.c | 7 +++++-- + drivers/target/iscsi/iscsi_target_datain_values.c | 2 +- + drivers/target/iscsi/iscsi_target_datain_values.h | 3 +++ + drivers/target/iscsi/iscsi_target_device.h | 3 +++ + drivers/target/iscsi/iscsi_target_erl0.h | 6 ++++++ + drivers/target/iscsi/iscsi_target_erl1.c | 1 + + drivers/target/iscsi/iscsi_target_erl1.h | 10 ++++++++++ + drivers/target/iscsi/iscsi_target_erl2.c | 1 + + drivers/target/iscsi/iscsi_target_erl2.h | 7 +++++++ + drivers/target/iscsi/iscsi_target_login.c | 2 ++ + drivers/target/iscsi/iscsi_target_login.h | 7 +++++++ + drivers/target/iscsi/iscsi_target_nego.c | 2 ++ + drivers/target/iscsi/iscsi_target_nego.h | 4 ++++ + drivers/target/iscsi/iscsi_target_nodeattrib.h | 5 +++++ + drivers/target/iscsi/iscsi_target_parameters.c | 2 +- + drivers/target/iscsi/iscsi_target_parameters.h | 6 ++++++ + drivers/target/iscsi/iscsi_target_seq_pdu_list.h | 5 +++++ + drivers/target/iscsi/iscsi_target_tmr.h | 6 ++++++ + drivers/target/iscsi/iscsi_target_tpg.c | 3 +-- + drivers/target/iscsi/iscsi_target_tpg.h | 9 +++++++++ + drivers/target/iscsi/iscsi_target_transport.c | 1 + + drivers/target/iscsi/iscsi_target_util.c | 1 + + drivers/target/iscsi/iscsi_target_util.h | 8 ++++++++ + drivers/target/loopback/tcm_loop.h | 4 ++++ + drivers/target/sbp/sbp_target.c | 3 ++- + drivers/target/target_core_alua.c | 3 +++ + drivers/target/target_core_alua.h | 2 ++ + drivers/target/target_core_configfs.c | 4 ++-- + drivers/target/target_core_device.c | 1 + + drivers/target/target_core_file.c | 1 + + drivers/target/target_core_file.h | 2 ++ + drivers/target/target_core_iblock.h | 3 +++ + drivers/target/target_core_internal.h | 5 +++++ + drivers/target/target_core_pr.c | 5 +++-- + drivers/target/target_core_pr.h | 4 ++++ + drivers/target/target_core_pscsi.h | 7 ++++--- + drivers/target/target_core_rd.c | 2 ++ + drivers/target/target_core_rd.h | 4 ++++ + drivers/target/target_core_sbc.c | 1 + + drivers/target/target_core_ua.h | 2 ++ + drivers/target/target_core_user.c | 5 ++--- + drivers/target/target_core_xcopy.c | 1 + + drivers/target/target_core_xcopy.h | 2 ++ + drivers/target/tcm_fc/tcm_fc.h | 3 +++ + drivers/usb/gadget/function/f_tcm.c | 2 +- + include/linux/configfs.h | 13 +++++-------- + include/target/iscsi/iscsi_target_core.h | 14 ++++++++------ + include/target/iscsi/iscsi_target_stat.h | 4 ++++ + include/target/iscsi/iscsi_transport.h | 6 +++--- + include/target/target_core_backend.h | 6 ++++++ + include/target/target_core_base.h | 12 ++++-------- + include/target/target_core_fabric.h | 4 ++++ + 60 files changed, 207 insertions(+), 44 deletions(-) +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 (6bdf1e0efb04 Makefile: drop -D__CHECK_ENDIAN__ from cflags) +$ 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 +Already up-to-date! +Merge made by the 'recursive' strategy. +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 47fc5c475b2f] 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 +Already up-to-date. +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 +Already up-to-date. +Merging y2038/y2038 (549eb7b22e24 AFS: Correctly use 64-bit time for UUID) +$ git merge y2038/y2038 +Resolved 'fs/afs/main.c' using previous resolution. +Auto-merging fs/afs/main.c +CONFLICT (content): Merge conflict in fs/afs/main.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 14d676a9ba35] 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 (d3e5925902dc 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 (c44ef859ceff Merge branch 'for-4.10/libnvdimm' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Auto-merging drivers/dax/dax.c +Merge made by the 'recursive' strategy. + drivers/dax/dax.c | 94 ++++++++++++++++++++++++++++++++++++++++ + drivers/dax/pmem.c | 3 +- + drivers/nvdimm/claim.c | 46 ++++++++++++++------ + 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 | 8 ++-- + drivers/nvdimm/nd.h | 12 ++++- + drivers/nvdimm/pfn_devs.c | 2 +- + drivers/nvdimm/pmem.c | 21 +++++---- + drivers/nvdimm/region_devs.c | 2 +- + tools/testing/nvdimm/test/nfit.c | 30 ++++++++++--- + 14 files changed, 190 insertions(+), 80 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 (ecbc9b1e1d8c ipc/sem: add hysteresis) +$ git merge --no-ff akpm-current/current +Auto-merging include/linux/kexec.h +Merge made by the 'recursive' strategy. + 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/x86/kernel/machine_kexec_64.c | 1 + + block/genhd.c | 2 +- + fs/ocfs2/dlm/dlmmaster.c | 66 +++++-- + fs/ocfs2/dlmglue.c | 10 ++ + fs/ocfs2/stackglue.c | 6 + + fs/ocfs2/stackglue.h | 3 + + include/linux/crc64_ecma.h | 56 ++++++ + include/linux/kexec.h | 2 + + include/linux/sem.h | 2 +- + ipc/sem.c | 109 +++++++----- + kernel/kcov.c | 8 +- + lib/Kconfig | 7 + + lib/Makefile | 1 + + lib/crc64_ecma.c | 341 ++++++++++++++++++++++++++++++++++++ + mm/page_owner.c | 4 +- + mm/z3fold.c | 337 ++++++++++++++++++++++++----------- + 20 files changed, 807 insertions(+), 181 deletions(-) + create mode 100644 arch/arm64/include/asm/setup.h + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 lib/crc64_ecma.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: 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 +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 9fc5ed29fdc4...484bc41fc6bf akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (484bc41fc6bf ima: platform-independent hash value) +$ git merge --no-ff akpm/master +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/ima.h | 12 + + kernel/kexec_file.c | 4 + + 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 +- + 22 files changed, 906 insertions(+), 38 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 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..f9bf3b9f726c --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20161219 -- cgit v1.2.3