diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-01-09 15:32:36 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-01-09 15:32:36 +1100 |
| commit | c84d0bbe09ea83f9c502ed08f585204e3d241344 (patch) | |
| tree | ec87c1d7f4c6171719602e5f6a88513ea24ec1d5 | |
| parent | 74baf34fdd9fff944130231dbd26cabbbc0ca318 (diff) | |
Add linux-next specific files for 20170109next-20170109
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 251 | ||||
| -rw-r--r-- | Next/Trees | 253 | ||||
| -rw-r--r-- | Next/merge.log | 4483 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 4992 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..514807dccef0 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,251 @@ +Name SHA1 +---- ---- +origin 83280e90ef001f77a64e2ce59c25ab66e47ab1f0 +fixes 30066ce675d3af350bc5a53858991c0b518dda00 +kbuild-current c7858bf16c0b2cc62f475f31e6df28c3a68da1d6 +arc-current e51d5d02f688c45b6f644f472f0c80fdfa73f0cb +arm-current 8478132a8784605fe07ede555f7277d989368d73 +m68k-current ad595b77c4a8553516a5d76c9ecf68a0ff13960e +metag-fixes 35d04077ad96ed33ceea2501f5a4f1eacda77218 +powerpc-fixes 69973b830859bc6529a7a0468ba0d80ee5117826 +sparc 4bbc84ffd137fe43d68aa633d317b0a96de8a828 +fscrypt-current 42d97eb0ade31e1bc537d086842f5d6e766d9d51 +net 9d5ecb09d525469abd1a10c096cb5a17206523f2 +ipsec 4e5da369df64628358e25ffedcf80ac43af3793d +netfilter d896b3120b3391a2f95b2b8ec636e3f594d7f9c4 +ipvs 045169816b31b10faed984b01c390db1b32ee4c1 +wireless-drivers 60f59ce0278557f7896d5158ae6d12a4855a72cc +mac80211 753aacfd2e95df6a0caf23c03dc309020765bea9 +sound-current e4f34cf6d59160818dcdcf41f4116cc88093ece3 +pci-current 4931a6781f83f2f43a6b9ceca2dc7c140aca06f1 +driver-core.current 0c744ea4f77d72b3dcebb7a8f2684633ec79be88 +tty.current 0c744ea4f77d72b3dcebb7a8f2684633ec79be88 +usb.current 0a8fd1346254974c3a852338508e4a4cddbb35f1 +usb-gadget-fixes 43aef5c2ca90535b3227e97e71604291875444ed +usb-serial-fixes ef079936d3cd09e63612834fe2698eeada0d8e3f +usb-chipidea-fixes c7fbb09b2ea13e283b9b0fd18a778f918ceb17b9 +phy 7ce7d89f48834cefece7804d38fc5d85382edf77 +staging.current 01d0f715869161dc70e2bf66fcdf6533a6a782cd +char-misc.current 421463b80b40e919dc57483f967ebd41674a81ff +input-current 1c3415a06b1016a596bfe59e0cfee56c773aa958 +crypto-current 07825f0acd85dd8b7481d5ef0eb024b05364d892 +ide b2ae75052a8c1611b2030fa49ba1c6b6439fa04f +vfio-fixes c6ef7fd40eddad38a8825cbd6bb2ce8bdbba88f5 +kselftest-fixes 7738789fba09108a28a5fb4739595d9a0a2f85fe +backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f +ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600 +mfd-fixes 1a41741fd60b0a2d1102c3d1ff9d58cb324a8d29 +drm-intel-fixes 2471eb5fb6e1433e28426ece235e3730348019ec +drm-misc-fixes aebe55c2d4b998741c0847ace1b4af47d73c763b +kbuild fde42bfcd232fb1a46d844dbf486cb67cb910004 +asm-generic de4be6b87b6b8816b61c9ba798d21ae8075d955c +arc e5517c2a5a49ed5e99047008629f1cd60246ea0e +arm 49b05da8054638caf79257e75b850b05b7abeb50 +arm-perf 0c744ea4f77d72b3dcebb7a8f2684633ec79be88 +arm-soc 1b9ec81258827001c869f003e0b8dd2ddc104717 +amlogic b21a5fc2bb8a4c38a235fa0187bbb72fd56ef3d3 +at91 0f59c948faed3715331c2648b46d6d0033d86f5c +bcm2835 ec09fdf764ee7b164d97f0f492f26dff663d44a8 +berlin 5153351425c92f3e89358c8eb62ca8d901437581 +cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4 +imx-mxs 814ff7844e57b27a1e52e8aa01265ade15a1437f +keystone 45f49b8d26ee8b1fc864534c0e47d0c3fc639d3b +mvebu cc519d4df95e72ca0179eee8b59af82ba630476e +omap 5cf0d6f02b6649899ff5876f304b641a7d850c27 +omap-pending c20c8f750d9f8f8617f07ee2352d3ff560e66bc2 +qcom bbf9c90768f9cd30ce485ee43b1989397dfcd7c4 +renesas 0a704567b6581b2f60a105b9fa75e887fb8c3516 +rockchip a495d1894ed720579063abd1717d5db1943f5960 +rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590 +samsung 1001354ca34179f3db924eb66672442a173147dc +samsung-krzk d1f4cc403526646d3aac53476c76da31b458c8f1 +tegra e8d16d40e269e187000fd543c3b4ca651cbcf967 +arm64 75037120e62b58c536999eb23d70cfcb6d6c0bcc +clk cac53644aa06c37fe332cac4990445407a9537ca +blackfin 391e74a51ea2ce54f4d4a213a207a6bfb73e0b33 +c6x ca3060d39ae7a0964f8c123a4833029981e86476 +cris 8f50f2a1b46a11a9a9fb46c5d8325dfc88281a76 +h8300 58c57526711f7c87046b7c5a650535acbab2d3fb +hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a +ia64 fbb0e4da96f4503e65bc4fb627cf4e1d7c8c64e6 +m68k ad595b77c4a8553516a5d76c9ecf68a0ff13960e +m68knommu 7ce7d89f48834cefece7804d38fc5d85382edf77 +metag f5d163aad31e4ec30f7258e655503824a2b03d45 +microblaze 3400606d8ffd64ea7ffb5969f7c96daebeff36f3 +mips 95eb33ae0ea2e44cb78509524110308194768003 +nios2 744606c76c4a3a73eb34d21f265013426426c4b5 +openrisc 7c7808ce107d63e158dbbc3af085980985a0c3c4 +parisc-hd 69973b830859bc6529a7a0468ba0d80ee5117826 +powerpc c6f6634721c871bfab4235e1cbcad208d3063798 +fsl baae856ebdeeaefbadd4a02cdb54b7c2277ff4dd +mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0 +s390 a664736c49588b4a2e70d0a0d7cc2d04ad736404 +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +sh e61c10e468a42512f5fad74c00b62af5cc19f65f +tile 14e73e78ee982710292248536aa84cba41e974f4 +uml f88f0bdfc32f3d1e2fd03ec8a7f7b456df4db725 +unicore32 bc27113620ca6b67320b8a57e70d801dc94221d5 +xtensa 30b507051dd1f79bbedce79cb37dc0ef31f5fb6c +fscrypt 58ae74683ae2c07cd717a91799edb50231061938 +befs f7b75aaed5ef07cb8d70d964291877bf02181360 +btrfs 8b8b08cbfb9021af4b54b4175fc4c51d655aac8c +btrfs-kdave 1041772e5c038762ef081a259b7961ebd34a0422 +ceph 45ee2c1d66185e5bd27702c60cce3c43fa3370d2 +cifs 7c0f6ba682b9c7632072ffbedf8d328c8f3c42ba +configfs e16769d4bca67218531505ad1a8365d227fedcf9 +ecryptfs be280b25c3288824ed4c201b452c3e87a7074d7c +ext3 ad4d05329df5e9825cac3132e12453a6c12915b8 +ext4 a551d7c8deefb6d9fb45a1de03a617dd064e0419 +f2fs 93ceca2f8e001704fc6a2920c0850106ce8d062c +freevxfs bf1bb4b460c8dc3a33793bff21464a9d816697ad +fscache d52bd54db8be8999df6df5a776f38c4f8b5e9cea +fuse c01638f5d919728f565bf8b5e0a6a159642df0d9 +gfs2 23754c081d1b54f5eab2530541679289805cf6d0 +jfs 362ad5d58e9ae54d15abbe4822e626be907308fe +nfs 8ac2b42238f549241a4755de40fd161fba3de438 +nfsd 3946d512e9e39fceab92b04e0f632535696b5fe4 +orangefs 04102c76a779f1c4cec4f0fb51cacc360117b522 +overlayfs c3c8699664800a68600f1988302173067eaeaffa +v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc +ubifs ba75d570b60c05cda21c0b43c5fbdc4e344f892d +xfs 7e910b61a0429e991834365f788a4ad3d181c590 +file-locks 07d9a380680d1c0eb51ef87ff2eab5c994949e69 +vfs 59479ae85e43a364d3380f82b1ddd8d04d13bd31 +vfs-jk 030b533c4fd4d2ec3402363323de4bb2983c9cee +vfs-miklos b12826c5188e1a964a64eedd37a537dc202d6bb8 +pci 7ce7d89f48834cefece7804d38fc5d85382edf77 +pstore 0c744ea4f77d72b3dcebb7a8f2684633ec79be88 +hid d7f6872e5ef652b3e74bbde3f8076a89ff18c281 +i2c 649ac63a9ae5e08b7123f2fa98c2bf42f033bdb9 +jdelvare-hwmon 08d27eb2066622cd659b91d877d0406ebd651225 +dmi 0c744ea4f77d72b3dcebb7a8f2684633ec79be88 +hwmon-staging 53e678d75e7c22b251c6981ff8364b5c42c5eac4 +jc_docs df31175bb4d372b99410034a8ac23ae5526f49d2 +v4l-dvb 5dd2470bfddb0c27ee24bd9cc7340b88e67029c5 +fbdev 2f7590b2677b3815d584971ff478c9a75bc66026 +pm 919c53ad18856a93ff91c35b48271394a8f49f7d +idle 306899f94804aece6d8fa8b4223ede3b48dbb59c +thermal cad8f6c4f66094cd0b04817a76334b878a714ce5 +thermal-soc 18591add41ec9558ce0e32ef88626c18cc70c686 +ieee1394 e9300a4b7bbae83af1f7703938c94cf6dc6d308f +dlm aa9f1012858bc7f44368f1e4453c989d873b0860 +swiotlb 7453c549f5f6485c0d79cad7844870dcc7d1b34d +net-next 5944701df90d9577658e2354cc27c4ceaeca30fe +ipsec-next b3b73b8e6df685ba61476b256f98eff1d650c199 +netfilter-next 4cc4b72c136a45aeccd86f66b0859b148b47d881 +ipvs-next 8d8e20e2d7bba8c50e64e0eca1cb83956f468e49 +wireless-drivers-next 0a0a8d6b0e88d947d7ab3198b325e31f677bebc2 +bluetooth c1878f7a89efbbe1ac0082d09b2928782a6ceba1 +mac80211-next e691ac2f75b69bee743f0370d79454ba4429b175 +rdma 6f94ba20799b98c8badf047b184fb4cd7bc45e44 +rdma-leon 402c09a341c2e908b3fdd1f04d974ea23e9d262c +rdma-leon-test a909d3e636995ba7c349e2ca5dbb528154d4ac30 +mtd 5bdee5496978c6738dd90869b54c0f30c0344ccf +l2-mtd 5bdee5496978c6738dd90869b54c0f30c0344ccf +nand 9018bf842d4ed09cf5745693f6b78861d7ebe239 +crypto c821f6ab2e47946f35ee2f30781c5185e5d07f65 +drm 2cf026ae85c42f253feb9f420d1b4bc99bd5503d +drm-panel 327bc443416d5aeb37e27704b2d91d2f86b8c621 +drm-intel b42a13d9181e1dee58dcbf2f7c8d5625a49cb6f5 +drm-tegra 585ee0f27ef7b8db46807b960388b7e58b60766d +drm-misc 9f547425fd9fbcb42b177ec7eec46bd4d7d4ae45 +drm-exynos 7d1e042314619115153a0f6f06e4552c09a50e13 +drm-msm 2401a008461481387741bacf7318d13af2c2055f +hdlcd 747e5a5ff2a2ae84715c33d6679ac3c5220a3aec +mali-dp 8e3eb71c80ad05e0fef99dcd6cf4f645390ca680 +sunxi 575e2de15c0dab19f2b87d943f5d717deb7c18da +kspp 3545d3c27c43fce71e54e1f0a207b56d56860af3 +kconfig 5bcba792bb304e8341217d759ec486969a3b4258 +regmap a5cb009162e6ec9e7fb805171a3444880c0b8c94 +sound 921282360b9c9bf34c75cd18bb90f298c4f4ebc8 +sound-asoc e1c203b78560275ebb954922f8832892ea51e95d +modules ea6351698b6c4c51023c49bc7ba4947d399fc3f8 +input aa142ed77099e9a614980022b3f94efc67417775 +block cdb98c2698b4af287925abcba4d77d92af82a0c3 +lightnvm a5f78b7f7dd1f587905808ab19d2dc1c265dffd4 +device-mapper ef548c551e72dbbdcc6d9ed7c7b3b01083fea8e2 +pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8 +mmc 9bd22fc27d9243837031dc75922688b769c904c0 +kgdb 7a6653fca50077f342bcdc39222d78928e3f0feb +md 705cb50bce73805fa049cd0918b06f54b8f3ec28 +mfd 6f96d7eab40f17d1a96b96c5d34329b4438fcc56 +backlight 0c9501f823a40a061f755d3789c4705c9fe85f14 +battery af5179a405c0df36413ea6bb838cf45abc1a6189 +omap_dss2 c456a2f30de53e77a2eb8eeb4202d742516aa76b +regulator d00b74613fb18dfd0a5aa99270ee2e72d5c808d7 +security 50523a29d900d5a403e0352d3d7aeda6a33df25c +integrity b4bfec7f4a86424b114f94f41c4e1841ec102df3 +keys ed51e44e914c634bfd8435037474ebb0b47db956 +selinux 36872bf3f5e38628c3cbad8b3026933844881152 +tpmdd 1548c540d863967fe617af76fec4df119e5f5cfb +watchdog 7ce7d89f48834cefece7804d38fc5d85382edf77 +iommu fce794089d6007b38651aceb75aa484c8577db29 +dwmw2-iommu 910170442944e1f8674fd5ddbeeb8ccd1877ea98 +vfio 2b8bb1d771f736b8b34bf160115aee1b12d29f83 +trivial 74dcba3589fc184c7118905eda22b3a4aaef95ff +audit 89670affa2a62c4868a2dd8a4195a1a2ec58cb27 +devicetree 63c343d384d169968d11bf99af66ed0ba727aaa4 +mailbox db4d22c07e3e652eeec82abcc1399e6305edd838 +spi e3cd632d6f1592da7face77a767583f7e1ccfc74 +tip 532fdcc19d3dfbdbb22e0911ba2a76a21530b932 +clockevents f947ee147e0895d5c0ef18e81ca7a4e4219739e3 +edac 9cae24b7b113cf6da0ccb3aa0d862daec9f3d9e7 +edac-amd eca90a3b3226fcecb4b3bbf4b0b6ff72422674bc +irqchip 88e20c74ee020f9e0c99dfce0dd9aa61c3f0cca0 +ftrace 3dbb16b87b57bb1088044ad2a0432e4769075002 +rcu 7acd02c9e62fb21e7466e7a99fc21bf6ed6cc3cf +kvm 0c744ea4f77d72b3dcebb7a8f2684633ec79be88 +kvm-arm 21cbe3cc8a48ff17059912e019fbde28ed54745a +kvm-mips 07d9a380680d1c0eb51ef87ff2eab5c994949e69 +kvm-ppc e34af7849014f1d80899b811cf9021588cb8dd88 +kvms390 252747dd7c67e71527e2cf9ba63d4ed58b6dc580 +xen-tip 0b47a6bd1150f4846b1d61925a4cc5a96593a541 +percpu 3ca45a46f8af8c4a92dd8a08eac57787242d5021 +workqueues 8bc4a04455969c36bf54a942ad9d28d80969ed51 +drivers-x86 8149a5258a30d1d49ed8121ab5bb2c6dbdb538aa +chrome-platform 31b764171cb545cc1f750c573eef713329936660 +hsi 7ac5d7b1a1254ceb4be19ba93ef7a6ee4e7ac382 +leds 4e552c8cb5bc9137e67e035bab8df6dddbca7384 +ipmi c5afee1b0dfc0652dea72404ffd55fd15b61b61e +driver-core 0c744ea4f77d72b3dcebb7a8f2684633ec79be88 +tty 0c744ea4f77d72b3dcebb7a8f2684633ec79be88 +usb 0c744ea4f77d72b3dcebb7a8f2684633ec79be88 +usb-gadget d5c024f3761dbd512329d3b7234a07dcf7580f0a +usb-serial 0c744ea4f77d72b3dcebb7a8f2684633ec79be88 +usb-chipidea-next 223e92311583d8d4d91b03d27f40e5b77cb81db0 +phy-next 7ce7d89f48834cefece7804d38fc5d85382edf77 +staging 9b9cefd00faa9e533059ec92ea3b1b4a00f3596d +char-misc 0c744ea4f77d72b3dcebb7a8f2684633ec79be88 +extcon 67b9b6e1346da3c5b58f34bd1424bf9464c3d40b +slave-dma 69ec10a5c97cce0bc968620f44f24880a6c91151 +cgroup 7b4632f048415263669676dda20fd5d811c3d3e4 +scsi cadb3908506662c5f32f1a58f1ecd3457e39b950 +scsi-mkp 352e5fd105982a9ea47d00c7256d6a2b7bb44d89 +target-updates 291e3e51a34d2f546608bfd31f185151621135b7 +target-merge 2994a75183173defc21f0d26ce23b63232211b88 +target-bva aff5e62bac847e8f7640c1101eac8e63d8a322b5 +libata 631c6e9846b44ff72cd1d2ea902fa8922e3a5e47 +binfmt_misc 4af75df6a410ce76d9f60f27b07e5645ecc2c5ed +vhost 6bdf1e0efb04a1716373646cb6f35b73addca492 +rpmsg a9cff670138e4b05daf70d5ce33c4b78431416e6 +gpio 4fe4d09cfd117657fbb53091ceb26586ee9222e1 +pinctrl 9eb63a89ffd1b679e7424e0730b75dbf249e7941 +dma-mapping 1001354ca34179f3db924eb66672442a173147dc +pwm 0caf7752a2d062616d1eaf789e1a6337ac428136 +dma-buf 194cad44c4e1553fd8fcfbc940d27e756324ec3a +userns cd293bfacd57928627ef7da6194e0cbe24db3291 +ktest 2dcd0af568b0cf583645c8a317dd12e344b1c72a +random 59b8d4f1f5d26e4ca92172ff6dcd1492cdb39613 +aio b562e44f507e863c6792946e4e1b1449fbbac85d +kselftest a8ba798bc8ec663cf02e80b0dd770324de9bafd9 +y2038 549eb7b22e245064dcdc17380538718492f4ca9c +luto-misc 2dcd0af568b0cf583645c8a317dd12e344b1c72a +borntraeger e76d21c40bd6c67fd4e2c1540d77e113df962b4d +livepatching b766922e65356df38a57b09afab6c3d7bf7e024d +coresight 9d8067efa456045a03e6836e4393b2b631064346 +rtc 7ce7d89f48834cefece7804d38fc5d85382edf77 +hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828 +nvdimm 1db175428ee374489448361213e9c3b749d14900 +dax-misc 4d9a2c8746671efbb0c27d3ae28c7474597a7aad +akpm-current a63a9bb7abd2f92a3c674199d1532b9868608ff2 +akpm fb584a47cd628b8f7471f109c3736902b76621d8 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..00fa4660b172 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,253 @@ +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 +fscrypt-current git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt.git#for-stable +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 +fscrypt git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt.git#master +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/fs/xfs/xfs-linux.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 +fbdev git git://github.com/bzolnier/linux.git#fbdev-for-next +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..37b8d46f5d3b --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4483 @@ +$ date -R +Mon, 09 Jan 2017 09:06:23 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at c433eb70f37d Merge tag 'pinctrl-v4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl +Merging origin/master (83280e90ef00 Merge tag 'usb-4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb) +$ git merge origin/master +Updating c433eb70f37d..83280e90ef00 +Fast-forward + Documentation/admin-guide/kernel-parameters.txt | 13 +- + Documentation/driver-api/infrastructure.rst | 15 -- + Documentation/vfio-mediated-device.txt | 27 +-- + MAINTAINERS | 3 + + arch/arm64/include/asm/current.h | 10 +- + arch/arm64/mm/dma-mapping.c | 3 +- + arch/arm64/mm/fault.c | 8 +- + arch/arm64/mm/init.c | 3 +- + arch/mips/kvm/entry.c | 5 +- + arch/mips/kvm/mips.c | 4 +- + arch/x86/kernel/pci-swiotlb.c | 6 +- + arch/x86/kvm/vmx.c | 14 +- + arch/x86/kvm/x86.c | 9 +- + arch/x86/xen/pci-swiotlb-xen.c | 2 +- + drivers/acpi/acpi_watchdog.c | 2 +- + drivers/acpi/glue.c | 11 +- + drivers/acpi/internal.h | 1 + + drivers/acpi/scan.c | 1 + + drivers/acpi/sysfs.c | 56 +++++ + drivers/base/power/domain.c | 1 + + drivers/clk/clk-stm32f4.c | 4 +- + drivers/clk/renesas/clk-mstp.c | 27 ++- + drivers/cpufreq/cpufreq-dt-platdev.c | 2 + + drivers/cpufreq/intel_pstate.c | 53 +++-- + drivers/devfreq/devfreq.c | 15 +- + drivers/devfreq/exynos-bus.c | 2 +- + drivers/gpu/drm/i915/gvt/cfg_space.c | 4 +- + drivers/gpu/drm/i915/gvt/gtt.c | 55 +++++ + drivers/gpu/drm/i915/gvt/gtt.h | 4 + + drivers/gpu/drm/i915/gvt/gvt.h | 1 + + drivers/gpu/drm/i915/gvt/kvmgt.c | 64 ++++-- + drivers/gpu/drm/i915/gvt/opregion.c | 2 +- + drivers/gpu/drm/i915/i915_gem.c | 33 +-- + drivers/gpu/drm/i915/i915_gem_request.h | 19 ++ + drivers/gpu/drm/i915/intel_display.c | 32 +-- + drivers/gpu/drm/i915/intel_dp.c | 41 +++- + drivers/gpu/drm/i915/intel_overlay.c | 9 +- + drivers/hwmon/lm90.c | 2 +- + drivers/iio/accel/st_accel_core.c | 12 +- + drivers/iio/adc/Kconfig | 2 +- + drivers/iio/common/st_sensors/st_sensors_buffer.c | 4 +- + drivers/iio/common/st_sensors/st_sensors_core.c | 13 +- + drivers/iio/counter/104-quad-8.c | 13 +- + drivers/iio/imu/bmi160/bmi160_core.c | 25 +-- + drivers/iio/light/max44000.c | 2 +- + drivers/iommu/amd_iommu.c | 2 +- + drivers/iommu/dmar.c | 6 +- + drivers/iommu/intel-iommu.c | 42 +++- + drivers/misc/mei/bus.c | 2 +- + drivers/misc/mei/client.c | 20 +- + drivers/nvmem/core.c | 4 +- + drivers/nvmem/imx-ocotp.c | 2 +- + drivers/nvmem/qfprom.c | 14 +- + drivers/platform/x86/Kconfig | 2 +- + drivers/platform/x86/fujitsu-laptop.c | 42 ++-- + drivers/staging/octeon/ethernet.c | 2 + + drivers/usb/core/config.c | 10 + + drivers/usb/core/hub.c | 59 +++-- + drivers/usb/dwc2/gadget.c | 2 +- + drivers/usb/dwc2/params.c | 30 +-- + drivers/usb/dwc3/core.h | 10 +- + drivers/usb/dwc3/dwc3-omap.c | 6 +- + drivers/usb/dwc3/dwc3-pci.c | 17 +- + drivers/usb/dwc3/ep0.c | 46 ++-- + drivers/usb/dwc3/gadget.c | 24 ++- + drivers/usb/gadget/composite.c | 12 +- + drivers/usb/gadget/function/f_fs.c | 14 +- + drivers/usb/gadget/function/f_hid.c | 2 +- + drivers/usb/gadget/legacy/inode.c | 18 +- + drivers/usb/gadget/udc/core.c | 6 +- + drivers/usb/gadget/udc/dummy_hcd.c | 6 +- + drivers/usb/host/ohci-at91.c | 24 +-- + drivers/usb/host/xhci-mem.c | 46 +++- + drivers/usb/host/xhci-mtk.c | 4 +- + drivers/usb/host/xhci-pci.c | 3 +- + drivers/usb/host/xhci-ring.c | 251 +++++++++++++--------- + drivers/usb/host/xhci.c | 4 +- + drivers/usb/host/xhci.h | 5 +- + drivers/usb/musb/blackfin.c | 1 + + drivers/usb/musb/musb_core.c | 2 + + drivers/usb/musb/musb_core.h | 7 + + drivers/usb/musb/musb_dsps.c | 12 ++ + drivers/usb/musb/musb_host.c | 10 +- + drivers/usb/musb/musbhsdma.h | 2 +- + drivers/usb/serial/cyberjack.c | 10 + + drivers/usb/serial/f81534.c | 8 +- + drivers/usb/serial/garmin_gps.c | 1 + + drivers/usb/serial/io_edgeport.c | 5 + + drivers/usb/serial/io_ti.c | 22 +- + drivers/usb/serial/iuu_phoenix.c | 11 + + drivers/usb/serial/keyspan_pda.c | 14 ++ + drivers/usb/serial/kobil_sct.c | 12 ++ + drivers/usb/serial/mos7720.c | 56 ++--- + drivers/usb/serial/mos7840.c | 24 ++- + drivers/usb/serial/omninet.c | 13 ++ + drivers/usb/serial/oti6858.c | 16 ++ + drivers/usb/serial/pl2303.c | 8 + + drivers/usb/serial/quatech2.c | 4 - + drivers/usb/serial/spcp8x5.c | 14 ++ + drivers/usb/serial/ti_usb_3410_5052.c | 7 + + drivers/usb/storage/unusual_devs.h | 7 + + drivers/vfio/mdev/mdev_core.c | 100 +++++++-- + drivers/vfio/mdev/mdev_private.h | 29 ++- + drivers/vfio/mdev/mdev_sysfs.c | 8 +- + drivers/vfio/mdev/vfio_mdev.c | 12 +- + drivers/vfio/pci/vfio_pci.c | 4 + + drivers/vfio/pci/vfio_pci_rdwr.c | 5 +- + drivers/vfio/vfio_iommu_type1.c | 98 +++++---- + drivers/xen/swiotlb-xen.c | 8 +- + fs/notify/mark.c | 12 -- + include/asm-generic/asm-prototypes.h | 6 + + include/linux/fsnotify_backend.h | 2 - + include/linux/iio/common/st_sensors.h | 12 ++ + include/linux/mdev.h | 56 ++--- + include/linux/radix-tree.h | 4 +- + include/linux/swiotlb.h | 11 +- + include/trace/events/swiotlb.h | 17 +- + include/uapi/linux/usb/functionfs.h | 1 + + kernel/audit_tree.c | 18 +- + lib/radix-tree.c | 11 +- + lib/swiotlb.c | 52 ++++- + mm/memory.c | 47 ++-- + mm/workingset.c | 3 +- + samples/Kconfig | 7 + + samples/Makefile | 3 +- + samples/vfio-mdev/Makefile | 14 +- + samples/vfio-mdev/mtty.c | 32 +-- + sound/firewire/fireworks/fireworks_stream.c | 2 +- + sound/firewire/tascam/tascam-stream.c | 2 +- + sound/pci/hda/patch_realtek.c | 2 + + sound/usb/endpoint.c | 20 +- + sound/usb/endpoint.h | 2 +- + sound/usb/pcm.c | 10 +- + 133 files changed, 1467 insertions(+), 780 deletions(-) +Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (c7858bf16c0b asm-prototypes: Clear any CPP defines before declaring the functions) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (e51d5d02f688 ARCv2: IRQ: Call entry/exit functions for chained handlers in MCIP) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/kernel/intc-arcv2.c | 6 +++--- + arch/arc/kernel/intc-compact.c | 4 ++-- + arch/arc/kernel/mcip.c | 4 ++++ + arch/arc/mm/cache.c | 6 +++++- + 4 files changed, 14 insertions(+), 6 deletions(-) +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 (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list()) +$ 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 (4bbc84ffd137 sparc: use symbolic names for tsb indexing) +$ git merge sparc/master +Merge made by the 'recursive' strategy. + arch/sparc/include/asm/mmu_context_64.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files) +$ git merge fscrypt-current/for-stable +Already up-to-date. +Merging net/master (9d5ecb09d525 bpf: change back to orig prog on too many passes) +$ git merge net/master +Merge made by the 'recursive' strategy. + arch/x86/net/bpf_jit_comp.c | 2 ++ + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 2 +- + drivers/net/ethernet/broadcom/tg3.c | 3 +++ + drivers/net/ethernet/emulex/benet/be_main.c | 12 ++++------ + drivers/net/ethernet/realtek/r8169.c | 2 +- + drivers/net/ethernet/renesas/sh_eth.c | 5 +++-- + drivers/net/phy/dp83867.c | 10 +++++++++ + net/bridge/br_netfilter_hooks.c | 2 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 34 +++++++++++++++++++---------- + net/ipv6/ip6_vti.c | 2 +- + net/netfilter/nf_tables_api.c | 2 +- + net/netfilter/nft_payload.c | 27 ++++++++++++++++------- + net/netfilter/nft_queue.c | 2 +- + net/netfilter/nft_quota.c | 26 ++++++++++++---------- + net/netlabel/netlabel_kapi.c | 5 +---- + net/wireless/nl80211.c | 16 ++++++-------- + 16 files changed, 92 insertions(+), 60 deletions(-) +Merging ipsec/master (4e5da369df64 Documentation/networking: fix typo in mpls-sysctl) +$ git merge ipsec/master +Already up-to-date. +Merging netfilter/master (d896b3120b33 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf) +$ 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 (60f59ce02785 rtlwifi: rtl_usb: Fix missing entry in USB driver's private data) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/intersil/orinoco/mic.c | 44 +++++++++++++++---------- + drivers/net/wireless/intersil/orinoco/mic.h | 3 +- + drivers/net/wireless/intersil/orinoco/orinoco.h | 4 +-- + drivers/net/wireless/realtek/rtlwifi/usb.c | 1 + + 4 files changed, 31 insertions(+), 21 deletions(-) +Merging mac80211/master (753aacfd2e95 nl80211: fix sched scan netlink socket owner destruction) +$ git merge mac80211/master +Already up-to-date. +Merging sound-current/for-linus (e4f34cf6d591 Revert "ALSA: firewire-lib: change structure member with proper type") +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus (4931a6781f83 x86/PCI: Ignore _CRS on Supermicro X8DTH-i/6/iF/6F) +$ git merge pci-current/for-linus +Merge made by the 'recursive' strategy. + arch/x86/pci/acpi.c | 10 ++++++++++ + drivers/pci/pcie/portdrv_core.c | 3 --- + drivers/pci/pcie/portdrv_pci.c | 43 ----------------------------------------- + 3 files changed, 10 insertions(+), 46 deletions(-) +Merging driver-core.current/driver-core-linus (0c744ea4f77d Linux 4.10-rc2) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (0c744ea4f77d Linux 4.10-rc2) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (0a8fd1346254 USB: fix problems with duplicate endpoint addresses) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (43aef5c2ca90 usb: gadget: Fix copy/pasted error message) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (ef079936d3cd USB: serial: ti_usb_3410_5052: fix NULL-deref at open) +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +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 (7ce7d89f4883 Linux 4.10-rc1) +$ git merge phy/fixes +Already up-to-date. +Merging staging.current/staging-linus (01d0f7158691 MAINTAINERS: add greybus subsystem mailing list) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (421463b80b40 hyper-v: Add myself as additional MAINTAINER) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (1c3415a06b10 Input: elants_i2c - avoid divide by 0 errors on bad touchscreen data) +$ git merge input-current/for-linus +Auto-merging drivers/input/serio/i8042-x86ia64io.h +Merge made by the 'recursive' strategy. + drivers/input/joydev.c | 1 - + drivers/input/joystick/xpad.c | 6 ++++++ + drivers/input/misc/adxl34x-i2c.c | 4 +--- + drivers/input/mouse/alps.h | 2 +- + drivers/input/mouse/synaptics_i2c.c | 4 ++-- + drivers/input/rmi4/Kconfig | 3 ++- + drivers/input/serio/i8042-x86ia64io.h | 6 ++++++ + drivers/input/touchscreen/elants_i2c.c | 4 ++-- + 8 files changed, 20 insertions(+), 10 deletions(-) +Merging crypto-current/master (07825f0acd85 crypto: aesni - Fix failure when built-in with modular pcbc) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + arch/x86/crypto/aesni-intel_glue.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging ide/master (b2ae75052a8c ide: Fix interface autodetection in legacy IDE driver (trial #2)) +$ git merge ide/master +Merge made by the 'recursive' strategy. + drivers/ide/ide-generic.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging vfio-fixes/for-linus (c6ef7fd40edd vfio-mdev: fix non-standard ioctl return val causing i386 build fail) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (7738789fba09 selftests: x86/pkeys: fix spelling mistake: "itertation" -> "iteration") +$ git merge kselftest-fixes/fixes +Merge made by the 'recursive' strategy. + tools/testing/selftests/Makefile | 2 +- + tools/testing/selftests/bpf/test_kmod.sh | 2 +- + tools/testing/selftests/net/run_netsocktests | 2 +- + tools/testing/selftests/x86/protection_keys.c | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) +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 (2471eb5fb6e1 drm/i915: Prevent timeline updates whilst performing reset) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up-to-date. +Merging drm-misc-fixes/for-linux-next-fixes (aebe55c2d4b9 drm: Clean up planes in atomic commit helper failure path) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_atomic_helper.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging kbuild/for-next (fde42bfcd232 genksyms: Regenerate parser) +$ git merge kbuild/for-next +Merge made by the 'recursive' strategy. + scripts/genksyms/parse.tab.c_shipped | 474 +++++++++++++++++------------------ + scripts/genksyms/parse.y | 2 - + 2 files changed, 234 insertions(+), 242 deletions(-) +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 30a386a98e06] 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 (0c744ea4f77d Linux 4.10-rc2) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (1b9ec8125882 Merge tag 'davinci-fixes-for-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into fixes) +$ 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 (814ff7844e57 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/imx1-ads.dts | 1 - + arch/arm/boot/dts/imx1.dtsi | 3 +- + arch/arm/boot/dts/imx23.dtsi | 5 +- + arch/arm/boot/dts/imx25.dtsi | 5 +- + arch/arm/boot/dts/imx27-apf27dev.dts | 2 - + .../boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts | 1 - + arch/arm/boot/dts/imx27-pdk.dts | 1 - + arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi | 1 - + arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 1 - + arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi | 1 - + arch/arm/boot/dts/imx27.dtsi | 1 + + arch/arm/boot/dts/imx28.dtsi | 7 +- + arch/arm/boot/dts/imx31.dtsi | 5 +- + arch/arm/boot/dts/imx35.dtsi | 5 +- + arch/arm/boot/dts/imx50-evk.dts | 1 - + arch/arm/boot/dts/imx51-apf51dev.dts | 2 - + arch/arm/boot/dts/imx51-babbage.dts | 1 - + arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi | 1 - + .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 1 - + arch/arm/boot/dts/imx53-smd.dts | 1 - + arch/arm/boot/dts/imx53-tqma53.dtsi | 2 - + arch/arm/boot/dts/imx53-tx53.dtsi | 1 - + arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi | 1 - + arch/arm/boot/dts/imx6dl-aristainetos_4.dts | 1 - + arch/arm/boot/dts/imx6dl-icore-rqs.dts | 51 +++++++ + arch/arm/boot/dts/imx6q-ba16.dtsi | 1 - + arch/arm/boot/dts/imx6q-bx50v3.dtsi | 1 - + arch/arm/boot/dts/imx6q-cm-fx6.dts | 22 ++- + arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 1 - + arch/arm/boot/dts/imx6q-evi.dts | 3 - + arch/arm/boot/dts/imx6q-gw5400-a.dts | 1 - + arch/arm/boot/dts/imx6q-icore-rqs.dts | 2 +- + arch/arm/boot/dts/imx6q-marsboard.dts | 1 - + arch/arm/boot/dts/imx6q-novena.dts | 1 - + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-apf6dev.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-aristainetos.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi | 3 - + arch/arm/boot/dts/imx6qdl-colibri.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 132 ++++++++++++---- + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 166 +++++++++++++++------ + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 163 ++++++++++++++------ + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 16 ++ + arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 132 ++++++++++++---- + arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 130 ++++++++++++---- + arch/arm/boot/dts/imx6qdl-gw553x.dtsi | 98 ++++++++++-- + arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 3 - + arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 5 - + arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 3 - + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 3 - + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-rex.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 3 - + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-ts4900.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-tx6.dtsi | 1 - + arch/arm/boot/dts/imx6sl-evk.dts | 1 - + arch/arm/boot/dts/imx6sx-nitrogen6sx.dts | 1 - + arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 1 + + arch/arm/boot/dts/imx6ul-isiot.dts | 119 +++++++++++++++ + arch/arm/boot/dts/imx6ul-tx6ul.dtsi | 1 - + arch/arm/boot/dts/imx6ul.dtsi | 1 - + arch/arm/boot/dts/imx7d-sdb.dts | 1 - + arch/arm/boot/dts/imx7s.dtsi | 1 - + arch/arm/configs/imx_v6_v7_defconfig | 4 +- + arch/arm/mach-imx/devices/platform-flexcan.c | 9 -- + .../mach-imx/devices/platform-sdhci-esdhc-imx.c | 10 -- + arch/arm/mach-imx/mach-mx27_3ds.c | 107 ------------- + arch/arm/mach-imx/mach-mx31_3ds.c | 160 -------------------- + arch/arm/mach-imx/mach-mx35_3ds.c | 103 ------------- + arch/arm/mach-imx/mach-pcm037.c | 115 -------------- + arch/arm/mach-imx/mx31moboard-marxbot.c | 92 ------------ + arch/arm/mach-imx/mx31moboard-smartbot.c | 74 --------- + arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts | 1 - + 77 files changed, 863 insertions(+), 946 deletions(-) + create mode 100644 arch/arm/boot/dts/imx6dl-icore-rqs.dts + create mode 100644 arch/arm/boot/dts/imx6ul-isiot.dts +Merging keystone/next (45f49b8d26ee Merge branch 'for_4.11/keystone_config' into next) +$ git merge keystone/next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/keystone-k2e.dtsi | 12 ++++++++++++ + arch/arm/boot/dts/keystone-k2g.dtsi | 14 +++++++++++++- + arch/arm/boot/dts/keystone-k2hk.dtsi | 12 ++++++++++++ + arch/arm/boot/dts/keystone-k2l.dtsi | 16 ++++++++++++++-- + arch/arm/boot/dts/keystone.dtsi | 4 ++-- + arch/arm/configs/keystone_defconfig | 1 + + drivers/soc/ti/knav_dma.c | 4 ++-- + drivers/soc/ti/knav_qmss_acc.c | 15 +++------------ + drivers/soc/ti/knav_qmss_queue.c | 25 ++++++++----------------- + 9 files changed, 67 insertions(+), 36 deletions(-) +Merging mvebu/for-next (cc519d4df95e Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/armada-370-db.dts | 10 +- + arch/arm/boot/dts/armada-370-dlink-dns327l.dts | 10 +- + arch/arm/boot/dts/armada-370-mirabox.dts | 10 +- + arch/arm/boot/dts/armada-370-netgear-rn102.dts | 10 +- + arch/arm/boot/dts/armada-370-netgear-rn104.dts | 10 +- + arch/arm/boot/dts/armada-370-rd.dts | 10 +- + arch/arm/boot/dts/armada-370-synology-ds213j.dts | 10 +- + arch/arm/boot/dts/armada-370-xp.dtsi | 10 +- + arch/arm/boot/dts/armada-370.dtsi | 10 +- + arch/arm/boot/dts/armada-375-db.dts | 10 +- + arch/arm/boot/dts/armada-375.dtsi | 10 +- + arch/arm/boot/dts/armada-380.dtsi | 10 +- + arch/arm/boot/dts/armada-385-turris-omnia.dts | 58 +++- + arch/arm/boot/dts/armada-385.dtsi | 10 +- + arch/arm/boot/dts/armada-388-clearfog-base.dts | 109 ++++++ + arch/arm/boot/dts/armada-388-clearfog-pro.dts | 55 +++ + arch/arm/boot/dts/armada-388-clearfog.dts | 374 ++++----------------- + arch/arm/boot/dts/armada-388-clearfog.dtsi | 307 +++++++++++++++++ + arch/arm/boot/dts/armada-388-db.dts | 10 +- + arch/arm/boot/dts/armada-388-rd.dts | 10 +- + .../arm/boot/dts/armada-38x-solidrun-microsom.dtsi | 130 ++++--- + arch/arm/boot/dts/armada-38x.dtsi | 10 +- + arch/arm/boot/dts/armada-390-db.dts | 10 +- + arch/arm/boot/dts/armada-390.dtsi | 10 +- + arch/arm/boot/dts/armada-395.dtsi | 10 +- + arch/arm/boot/dts/armada-398-db.dts | 10 +- + arch/arm/boot/dts/armada-398.dtsi | 10 +- + arch/arm/boot/dts/armada-39x.dtsi | 10 +- + arch/arm/boot/dts/armada-xp-axpwifiap.dts | 10 +- + arch/arm/boot/dts/armada-xp-db.dts | 10 +- + arch/arm/boot/dts/armada-xp-gp.dts | 10 +- + arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 10 +- + arch/arm/boot/dts/armada-xp-matrix.dts | 10 +- + arch/arm/boot/dts/armada-xp-mv78230.dtsi | 10 +- + arch/arm/boot/dts/armada-xp-mv78260.dtsi | 10 +- + arch/arm/boot/dts/armada-xp-mv78460.dtsi | 10 +- + arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 10 +- + arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 10 +- + arch/arm/boot/dts/armada-xp-synology-ds414.dts | 10 +- + arch/arm/boot/dts/armada-xp.dtsi | 10 +- + arch/arm/boot/dts/dove-cm-a510.dtsi | 10 +- + arch/arm/boot/dts/dove-sbc-a510.dts | 10 +- + arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi | 10 +- + .../boot/dts/kirkwood-linkstation-duo-6281.dtsi | 10 +- + arch/arm/boot/dts/kirkwood-linkstation-lsqvl.dts | 10 +- + arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts | 10 +- + arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts | 10 +- + arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts | 10 +- + arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts | 10 +- + arch/arm/boot/dts/kirkwood-linkstation.dtsi | 10 +- + arch/arm/boot/dts/mvebu-linkstation-fan.dtsi | 10 +- + .../boot/dts/mvebu-linkstation-gpio-simple.dtsi | 10 +- + arch/arm/boot/dts/orion5x-kuroboxpro.dts | 10 +- + arch/arm/boot/dts/orion5x-linkstation-lsgl.dts | 10 +- + arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts | 10 +- + arch/arm/boot/dts/orion5x-linkstation.dtsi | 10 +- + arch/arm/boot/dts/orion5x-lschl.dts | 10 +- + arch/arm/boot/dts/orion5x-lswsgl.dts | 10 +- + arch/arm64/boot/dts/marvell/armada-371x.dtsi | 10 +- + arch/arm64/boot/dts/marvell/armada-3720-db.dts | 44 ++- + .../boot/dts/marvell/armada-3720-espressobin.dts | 76 ++++- + arch/arm64/boot/dts/marvell/armada-372x.dtsi | 10 +- + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 39 ++- + arch/arm64/configs/defconfig | 1 + + 65 files changed, 1088 insertions(+), 647 deletions(-) + create mode 100644 arch/arm/boot/dts/armada-388-clearfog-base.dts + create mode 100644 arch/arm/boot/dts/armada-388-clearfog-pro.dts + create mode 100644 arch/arm/boot/dts/armada-388-clearfog.dtsi +Merging omap/for-next (5cf0d6f02b66 Merge branch 'omap-for-v4.11/omap1' into for-next) +$ git merge omap/for-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 19 +- + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/am335x-boneblack-common.dtsi | 163 ++++++++++++++ + arch/arm/boot/dts/am335x-boneblack-wireless.dts | 109 +++++++++ + arch/arm/boot/dts/am335x-boneblack.dts | 155 +------------ + arch/arm/boot/dts/am335x-bonegreen-common.dtsi | 44 ++++ + arch/arm/boot/dts/am335x-bonegreen-wireless.dts | 126 +++++++++++ + arch/arm/boot/dts/am335x-bonegreen.dts | 38 +--- + arch/arm/boot/dts/am335x-chilisom.dtsi | 8 + + arch/arm/boot/dts/am335x-icev2.dts | 1 - + arch/arm/boot/dts/am335x-nano.dts | 31 ++- + arch/arm/boot/dts/am335x-phycore-som.dtsi | 14 +- + arch/arm/boot/dts/am335x-wega.dtsi | 9 +- + arch/arm/boot/dts/am33xx.dtsi | 3 +- + arch/arm/boot/dts/dm814x.dtsi | 9 +- + arch/arm/boot/dts/dm816x.dtsi | 6 +- + arch/arm/boot/dts/dra7-evm.dts | 282 +++--------------------- + arch/arm/boot/dts/dra72-evm-common.dtsi | 7 +- + arch/arm/boot/dts/omap3-beagle-xm.dts | 16 ++ + arch/arm/boot/dts/omap3-n900.dts | 3 +- + arch/arm/boot/dts/omap4-panda-common.dtsi | 16 ++ + arch/arm/boot/dts/omap5-igep0050.dts | 21 ++ + arch/arm/boot/dts/omap5-uevm.dts | 21 ++ + arch/arm/configs/omap2plus_defconfig | 4 +- + arch/arm/mach-omap1/dma.c | 16 +- + arch/arm/mach-omap1/include/mach/usb.h | 2 - + arch/arm/mach-omap1/usb.c | 51 ++--- + arch/arm/mach-omap2/display.c | 258 +--------------------- + arch/arm/mach-omap2/display.h | 7 - + arch/arm/mach-omap2/pdata-quirks.c | 3 +- + drivers/soc/ti/wkup_m3_ipc.c | 2 - + include/dt-bindings/pinctrl/omap.h | 4 +- + 32 files changed, 678 insertions(+), 772 deletions(-) + create mode 100644 arch/arm/boot/dts/am335x-boneblack-common.dtsi + create mode 100644 arch/arm/boot/dts/am335x-boneblack-wireless.dts + create mode 100644 arch/arm/boot/dts/am335x-bonegreen-common.dtsi + create mode 100644 arch/arm/boot/dts/am335x-bonegreen-wireless.dts +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 (0a704567b658 Merge branches 'fixes-for-v4.10', 'arm64-dt-for-v4.11', 'defconfig-for-v4.11', 'dt-for-v4.11' and 'soc-for-v4.11' into next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/shmobile.txt | 2 +- + arch/arm/boot/dts/r8a73a4.dtsi | 4 +- + arch/arm/boot/dts/r8a7743.dtsi | 13 +- + arch/arm/boot/dts/r8a7745.dtsi | 13 +- + arch/arm/boot/dts/r8a7778.dtsi | 10 +- + arch/arm/boot/dts/r8a7779.dtsi | 8 +- + arch/arm/boot/dts/r8a7790.dtsi | 35 ++-- + arch/arm/boot/dts/r8a7791.dtsi | 33 ++-- + arch/arm/boot/dts/r8a7792.dtsi | 24 ++- + arch/arm/boot/dts/r8a7793-gose.dts | 21 +++ + arch/arm/boot/dts/r8a7793.dtsi | 21 ++- + arch/arm/boot/dts/r8a7794.dtsi | 21 ++- + arch/arm/boot/dts/sh73a0.dtsi | 2 +- + arch/arm/configs/multi_v7_defconfig | 2 + + arch/arm/configs/shmobile_defconfig | 6 + + arch/arm/mach-shmobile/platsmp-apmu.c | 41 +++-- + arch/arm/mach-shmobile/rcar-gen2.h | 2 - + arch/arm/mach-shmobile/setup-rcar-gen2.c | 18 -- + arch/arm/mach-shmobile/smp-r8a7791.c | 14 +- + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 2 + + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 56 +++++-- + arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 37 +++++ + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 183 ++++++++++++++++++++- + 23 files changed, 426 insertions(+), 142 deletions(-) +Merging rockchip/for-next (a495d1894ed7 Merge branch 'v4.11-clk/next' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + .../bindings/clock/rockchip,rk3328-cru.txt | 57 ++ + .../devicetree/bindings/soc/rockchip/grf.txt | 4 + + .../bindings/soc/rockchip/power_domain.txt | 3 + + arch/arm/boot/dts/rk3036-evb.dts | 2 +- + arch/arm/boot/dts/rk3036-kylin.dts | 12 +- + arch/arm/boot/dts/rk3066a-bqcurie2.dts | 8 +- + arch/arm/boot/dts/rk3066a-marsboard.dts | 6 +- + arch/arm/boot/dts/rk3066a-mk808.dts | 10 +- + arch/arm/boot/dts/rk3066a-rayeager.dts | 18 +- + arch/arm/boot/dts/rk3188-px3-evb.dts | 10 +- + arch/arm/boot/dts/rk3188-radxarock.dts | 20 +- + arch/arm/boot/dts/rk3229-evb.dts | 2 +- + arch/arm/boot/dts/rk3288-evb-act8846.dts | 6 +- + arch/arm/boot/dts/rk3288-evb-rk808.dts | 2 +- + arch/arm/boot/dts/rk3288-evb.dtsi | 14 +- + arch/arm/boot/dts/rk3288-fennec.dts | 6 +- + arch/arm/boot/dts/rk3288-firefly-beta.dts | 2 +- + arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 2 +- + arch/arm/boot/dts/rk3288-firefly-reload.dts | 26 +- + arch/arm/boot/dts/rk3288-firefly.dts | 2 +- + arch/arm/boot/dts/rk3288-firefly.dtsi | 18 +- + arch/arm/boot/dts/rk3288-miqi.dts | 8 +- + arch/arm/boot/dts/rk3288-popmetal.dts | 8 +- + arch/arm/boot/dts/rk3288-r89.dts | 14 +- + arch/arm/boot/dts/rk3288-rock2-som.dtsi | 4 +- + arch/arm/boot/dts/rk3288-rock2-square.dts | 14 +- + arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi | 8 +- + arch/arm/boot/dts/rk3288-veyron-brain.dts | 8 +- + arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 14 +- + arch/arm/boot/dts/rk3288-veyron-jaq.dts | 14 +- + arch/arm/boot/dts/rk3288-veyron-jerry.dts | 12 +- + arch/arm/boot/dts/rk3288-veyron-mickey.dts | 6 +- + arch/arm/boot/dts/rk3288-veyron-minnie.dts | 18 +- + arch/arm/boot/dts/rk3288-veyron-pinky.dts | 4 +- + arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi | 2 +- + arch/arm/boot/dts/rk3288-veyron-speedy.dts | 10 +- + arch/arm/boot/dts/rk3288-veyron.dtsi | 10 +- + arch/arm/boot/dts/rk3288.dtsi | 84 ++ + arch/arm/mach-rockchip/rockchip.c | 12 - + arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi | 10 +- + arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts | 10 +- + .../boot/dts/rockchip/rk3368-orion-r68-meta.dts | 14 +- + arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts | 10 +- + arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 16 +- + arch/arm64/boot/dts/rockchip/rk3399-evb.dts | 8 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 38 +- + drivers/clk/rockchip/Makefile | 2 + + drivers/clk/rockchip/clk-muxgrf.c | 102 +++ + drivers/clk/rockchip/clk-pll.c | 16 +- + drivers/clk/rockchip/clk-rk3288.c | 11 +- + drivers/clk/rockchip/clk-rk3328.c | 895 +++++++++++++++++++++ + drivers/clk/rockchip/clk.c | 8 +- + drivers/clk/rockchip/clk.h | 40 + + drivers/soc/rockchip/Kconfig | 10 + + drivers/soc/rockchip/Makefile | 1 + + drivers/soc/rockchip/grf.c | 134 +++ + drivers/soc/rockchip/pm_domains.c | 63 +- + include/dt-bindings/clock/rk3328-cru.h | 400 +++++++++ + include/dt-bindings/power/rk3328-power.h | 18 + + 59 files changed, 2055 insertions(+), 231 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3328-cru.txt + create mode 100644 drivers/clk/rockchip/clk-muxgrf.c + create mode 100644 drivers/clk/rockchip/clk-rk3328.c + create mode 100644 drivers/soc/rockchip/grf.c + create mode 100644 include/dt-bindings/clock/rk3328-cru.h + create mode 100644 include/dt-bindings/power/rk3328-power.h +Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) +$ git merge rpi/for-rpi-next +Already up-to-date. +Merging samsung/for-next (1001354ca341 Linux 4.9-rc1) +$ git merge samsung/for-next +Already up-to-date. +Merging samsung-krzk/for-next (d1f4cc403526 Merge branch 'next/dt64' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + arch/arm/boot/dts/exynos4.dtsi | 6 +- + arch/arm/boot/dts/exynos4412-itop-elite.dts | 25 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 28 +- + arch/arm/boot/dts/exynos4412-odroidu3.dts | 5 +- + arch/arm/boot/dts/exynos4412-odroidx.dts | 13 + + arch/arm/boot/dts/exynos4412-odroidx2.dts | 25 +- + arch/arm/boot/dts/exynos4412-prime.dtsi | 41 + + arch/arm/boot/dts/exynos4412.dtsi | 2 +- + arch/arm/boot/dts/exynos5250.dtsi | 8 + + arch/arm/boot/dts/exynos5410.dtsi | 8 + + arch/arm/boot/dts/exynos5420.dtsi | 8 + + arch/arm/configs/exynos_defconfig | 1 + + arch/arm/configs/s3c2410_defconfig | 6 +- + arch/arm/configs/s5pv210_defconfig | 4 - + arch/arm/mach-exynos/exynos.c | 4 +- + arch/arm/mach-exynos/mcpm-exynos.c | 2 +- + arch/arm/mach-exynos/suspend.c | 10 +- + arch/arm/mach-s3c24xx/bast-irq.c | 4 +- + arch/arm/mach-s3c24xx/iotiming-s3c2410.c | 2 +- + arch/arm/mach-s3c24xx/pm-s3c2412.c | 2 +- + arch/arm/mach-s3c64xx/common.c | 3 +- + arch/arm/mach-s3c64xx/dev-audio.c | 19 - + arch/arm/mach-s3c64xx/pm.c | 2 +- + arch/arm/plat-samsung/devs.c | 19 - + arch/arm/plat-samsung/include/plat/wakeup-mask.h | 2 +- + arch/arm/plat-samsung/wakeup-mask.c | 2 +- + arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi | 197 ++++ + arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi | 373 ++++--- + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 1118 ++++++++++++++++++++ + arch/arm64/boot/dts/exynos/exynos5433-tm2.dts | 1036 +----------------- + arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts | 12 +- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 25 + + drivers/clk/samsung/clk-exynos4.c | 4 + + include/dt-bindings/pinctrl/samsung.h | 14 + + 35 files changed, 1680 insertions(+), 1351 deletions(-) + create mode 100644 arch/arm/boot/dts/exynos4412-prime.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi +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 (cac53644aa06 clk: qcom: Add GCC_MSS_RESET support) +$ git merge clk/clk-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/qcom,rpmcc.txt | 1 + + .../devicetree/bindings/clock/st,stm32-rcc.txt | 17 + + .../devicetree/bindings/clock/zx296718-clk.txt | 3 + + drivers/clk/axs10x/i2s_pll_clock.c | 1 + + drivers/clk/clk-stm32f4.c | 595 ++++++++++++++++++++- + drivers/clk/clk-wm831x.c | 3 +- + drivers/clk/imx/clk-pllv3.c | 99 ++++ + drivers/clk/imx/clk-vf610.c | 4 +- + drivers/clk/imx/clk.h | 1 + + drivers/clk/qcom/clk-smd-rpm.c | 71 +++ + drivers/clk/qcom/gcc-ipq4019.c | 479 ++++++++++++++++- + drivers/clk/qcom/gcc-msm8996.c | 1 + + drivers/clk/zte/clk-zx296718.c | 154 +++++- + drivers/clk/zte/clk.c | 127 +++++ + drivers/clk/zte/clk.h | 21 + + include/dt-bindings/clock/qcom,gcc-ipq4019.h | 11 + + include/dt-bindings/clock/qcom,gcc-msm8996.h | 1 + + include/dt-bindings/clock/qcom,rpmcc.h | 40 +- + include/dt-bindings/clock/stm32fx-clock.h | 39 ++ + 19 files changed, 1621 insertions(+), 47 deletions(-) + create mode 100644 include/dt-bindings/clock/stm32fx-clock.h +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 ecb3be844b0e] 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 (7ce7d89f4883 Linux 4.10-rc1) +$ 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 (3400606d8ffd microblaze: Add new fpga families) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (95eb33ae0ea2 MIPS: Fix printk continuations in cpu-bugs64.c) +$ git merge mips/mips-for-linux-next +Removing arch/mips/kernel/mips_ksyms.c +Removing arch/mips/include/asm/unaligned.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/mips/img/pistachio-marduk.txt | 10 + + MAINTAINERS | 8 +- + arch/mips/Kconfig | 40 +- + arch/mips/Makefile | 16 +- + arch/mips/Makefile.postlink | 35 + + arch/mips/ath79/clock.c | 2 +- + arch/mips/boot/compressed/Makefile | 10 +- + arch/mips/boot/dts/img/Makefile | 9 + + arch/mips/boot/dts/img/pistachio.dtsi | 924 +++++++++++++++++++++ + arch/mips/boot/dts/img/pistachio_marduk.dts | 163 ++++ + arch/mips/boot/dts/xilfpga/nexys4ddr.dts | 63 ++ + .../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/cavium-octeon/octeon-memcpy.S | 5 + + arch/mips/cavium-octeon/setup.c | 23 + + arch/mips/cavium-octeon/smp.c | 21 +- + arch/mips/configs/loongson1b_defconfig | 4 + + arch/mips/configs/loongson1c_defconfig | 4 + + arch/mips/configs/xilfpga_defconfig | 37 +- + arch/mips/configs/xway_defconfig | 21 +- + arch/mips/generic/Makefile | 1 + + arch/mips/generic/init.c | 13 + + arch/mips/generic/kexec.c | 44 + + arch/mips/include/asm/Kbuild | 2 + + arch/mips/include/asm/asm.h | 10 +- + arch/mips/include/asm/bootinfo.h | 13 + + arch/mips/include/asm/elf.h | 9 + + arch/mips/include/asm/highmem.h | 3 - + arch/mips/include/asm/i8259.h | 1 - + arch/mips/include/asm/irq.h | 12 + + .../asm/mach-cavium-octeon/kernel-entry-init.h | 15 +- + arch/mips/include/asm/mach-loongson32/loongson1.h | 9 +- + arch/mips/include/asm/mach-loongson32/platform.h | 9 +- + arch/mips/include/asm/mach-loongson32/regs-rtc.h | 23 + + arch/mips/include/asm/mach-ralink/mt7620.h | 7 +- + arch/mips/include/asm/mips-cm.h | 7 + + 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/include/asm/smp.h | 10 +- + arch/mips/include/asm/stackframe.h | 19 +- + arch/mips/include/asm/switch_to.h | 18 +- + arch/mips/include/asm/thread_info.h | 1 - + arch/mips/include/asm/unaligned.h | 28 - + arch/mips/kernel/Makefile | 4 +- + arch/mips/kernel/asm-offsets.c | 2 +- + arch/mips/kernel/cacheinfo.c | 85 ++ + arch/mips/kernel/cpu-bugs64.c | 24 +- + arch/mips/kernel/crash.c | 2 +- + arch/mips/kernel/entry.S | 18 - + arch/mips/kernel/genex.S | 81 +- + arch/mips/kernel/irq.c | 11 + + arch/mips/kernel/machine_kexec.c | 22 + + arch/mips/kernel/mcount.S | 3 + + arch/mips/kernel/mips-r2-to-r6-emul.c | 12 +- + arch/mips/kernel/mips_ksyms.c | 94 --- + arch/mips/kernel/process.c | 214 +++-- + arch/mips/kernel/prom.c | 7 + + arch/mips/kernel/ptrace.c | 34 +- + arch/mips/kernel/r2300_switch.S | 2 + + arch/mips/kernel/r4k_switch.S | 3 + + arch/mips/kernel/relocate.c | 56 +- + arch/mips/kernel/setup.c | 94 ++- + arch/mips/kernel/smp-bmips.c | 2 +- + arch/mips/kernel/smp-cps.c | 7 +- + arch/mips/kernel/smp.c | 34 +- + arch/mips/kernel/traps.c | 65 +- + arch/mips/kernel/uprobes.c | 2 +- + arch/mips/kernel/vmlinux.lds.S | 2 +- + arch/mips/lib/csum_partial.S | 6 + + arch/mips/lib/memcpy.S | 9 + + arch/mips/lib/memset.S | 5 + + arch/mips/lib/strlen_user.S | 2 + + arch/mips/lib/strncpy_user.S | 5 + + arch/mips/lib/strnlen_user.S | 3 + + arch/mips/loongson32/common/platform.c | 45 +- + arch/mips/loongson32/ls1b/board.c | 7 +- + arch/mips/loongson32/ls1c/board.c | 7 +- + arch/mips/loongson64/loongson-3/smp.c | 1 - + arch/mips/mm/c-r4k.c | 6 +- + arch/mips/mm/init.c | 2 + + arch/mips/mm/mmap.c | 10 +- + arch/mips/mm/page-funcs.S | 3 + + arch/mips/mm/page.c | 2 + + arch/mips/mm/sc-ip22.c | 54 +- + arch/mips/mm/sc-mips.c | 1 + + arch/mips/mm/tlbex.c | 6 +- + arch/mips/netlogic/common/irq.c | 4 +- + arch/mips/netlogic/common/smpboot.S | 4 +- + arch/mips/pci/pci-tx4927.c | 22 +- + arch/mips/pci/pci-tx4938.c | 30 +- + arch/mips/pci/pci-tx4939.c | 10 +- + arch/mips/ralink/Kconfig | 1 + + arch/mips/ralink/clk.c | 6 + + arch/mips/ralink/mt7620.c | 31 +- + arch/mips/ralink/mt7621.c | 2 +- + arch/mips/ralink/of.c | 12 +- + arch/mips/ralink/prom.c | 9 +- + arch/mips/ralink/rt288x.c | 1 + + arch/mips/ralink/rt305x.c | 2 + + arch/mips/ralink/rt3883.c | 4 +- + 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 +- + arch/mips/xilfpga/intc.c | 7 +- + drivers/of/base.c | 2 +- + drivers/of/fdt.c | 9 +- + 119 files changed, 2437 insertions(+), 645 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mips/img/pistachio-marduk.txt + create mode 100644 arch/mips/Makefile.postlink + create mode 100644 arch/mips/boot/dts/img/Makefile + create mode 100644 arch/mips/boot/dts/img/pistachio.dtsi + create mode 100644 arch/mips/boot/dts/img/pistachio_marduk.dts + create mode 100644 arch/mips/generic/kexec.c + create mode 100644 arch/mips/include/asm/mach-loongson32/regs-rtc.h + delete mode 100644 arch/mips/include/asm/unaligned.h + create mode 100644 arch/mips/kernel/cacheinfo.c + delete mode 100644 arch/mips/kernel/mips_ksyms.c +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 (69973b830859 Linux 4.9) +$ git merge parisc-hd/for-next +Already up-to-date. +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 (a664736c4958 s390/topology: make "topology=off" parameter work) +$ git merge s390/features +Auto-merging drivers/s390/crypto/zcrypt_api.c +Auto-merging drivers/s390/char/zcore.c +Auto-merging arch/s390/kernel/time.c +Merge made by the 'recursive' strategy. + arch/s390/include/asm/cpu_mf.h | 5 +- + arch/s390/include/asm/pci_clp.h | 2 +- + arch/s390/include/asm/uaccess.h | 4 +- + arch/s390/kernel/early.c | 12 ++ + arch/s390/kernel/ipl.c | 3 +- + arch/s390/kernel/os_info.c | 6 +- + arch/s390/kernel/perf_cpum_cf_events.c | 2 +- + arch/s390/kernel/processor.c | 2 +- + arch/s390/kernel/setup.c | 2 + + arch/s390/kernel/time.c | 2 +- + arch/s390/kernel/topology.c | 19 +-- + arch/s390/kvm/priv.c | 2 +- + arch/s390/kvm/vsie.c | 2 +- + arch/s390/lib/mem.S | 28 ++--- + arch/s390/mm/extmem.c | 2 +- + arch/s390/mm/mem_detect.c | 6 +- + arch/s390/pci/pci.c | 8 +- + drivers/s390/char/con3270.c | 2 +- + drivers/s390/char/raw3270.c | 2 +- + drivers/s390/char/zcore.c | 3 +- + drivers/s390/cio/chp.c | 13 +- + drivers/s390/cio/chp.h | 2 +- + drivers/s390/cio/chsc.c | 48 +++++++- + drivers/s390/cio/chsc.h | 2 + + drivers/s390/cio/css.c | 209 +++++++++++++++++---------------- + drivers/s390/cio/css.h | 11 +- + drivers/s390/crypto/ap_asm.h | 10 +- + drivers/s390/crypto/ap_card.c | 2 +- + drivers/s390/crypto/ap_queue.c | 2 +- + drivers/s390/crypto/zcrypt_api.c | 4 +- + drivers/s390/virtio/virtio_ccw.c | 2 +- + 31 files changed, 245 insertions(+), 174 deletions(-) +Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) +$ git merge sparc-next/master +Already up-to-date. +Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board) +$ git merge sh/for-next +Already up-to-date. +Merging tile/master (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 +Already up-to-date. +Merging fscrypt/master (58ae74683ae2 fscrypt: factor out bio specific functions) +$ git merge fscrypt/master +Merge made by the 'recursive' strategy. + fs/crypto/Kconfig | 1 - + fs/crypto/Makefile | 1 + + fs/crypto/bio.c | 145 ++++++++++++++++++++++++++++++++++++++++ + fs/crypto/crypto.c | 157 +++++--------------------------------------- + fs/crypto/fname.c | 4 +- + fs/crypto/fscrypt_private.h | 16 ++++- + fs/crypto/policy.c | 73 ++++++++------------ + fs/ext4/ialloc.c | 2 +- + fs/ext4/namei.c | 4 +- + fs/f2fs/dir.c | 5 +- + fs/f2fs/namei.c | 4 +- + include/linux/fscrypto.h | 11 ++-- + 12 files changed, 223 insertions(+), 200 deletions(-) + create mode 100644 fs/crypto/bio.c +Merging befs/for-next (f7b75aaed5ef befs: add NFS export support) +$ git merge befs/for-next +Merge made by the 'recursive' strategy. +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 (1041772e5c03 Merge branch 'for-next-next-4.10-20170106' into for-next-20170106) +$ git merge btrfs-kdave/for-next +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/ctree.h +Merge made by the 'recursive' strategy. + fs/btrfs/async-thread.c | 15 +- + fs/btrfs/ctree.c | 8 +- + fs/btrfs/ctree.h | 36 ++++- + fs/btrfs/delayed-inode.c | 4 +- + fs/btrfs/delayed-ref.c | 6 +- + fs/btrfs/delayed-ref.h | 3 +- + fs/btrfs/export.c | 3 - + fs/btrfs/extent-tree.c | 67 ++++++--- + fs/btrfs/extent_io.c | 61 +++++++- + fs/btrfs/extent_io.h | 5 + + fs/btrfs/file-item.c | 4 +- + fs/btrfs/file.c | 26 ++-- + fs/btrfs/free-space-cache.c | 6 +- + fs/btrfs/inode-map.c | 6 +- + fs/btrfs/inode.c | 329 +++++++++++++++++++++++++++++++++---------- + fs/btrfs/ioctl.c | 21 ++- + fs/btrfs/ordered-data.c | 42 +++--- + fs/btrfs/qgroup.c | 31 +++- + fs/btrfs/relocation.c | 14 +- + fs/btrfs/super.c | 2 +- + fs/btrfs/tests/inode-tests.c | 15 +- + fs/btrfs/transaction.c | 10 +- + fs/btrfs/tree-log.c | 13 +- + fs/btrfs/tree-log.h | 4 +- + fs/btrfs/uuid-tree.c | 4 +- + include/trace/events/btrfs.h | 146 ++++++++++--------- + 26 files changed, 622 insertions(+), 259 deletions(-) +Merging ceph/master (45ee2c1d6618 libceph: remove now unused finish_request() wrapper) +$ git merge ceph/master +Already up-to-date. +Merging cifs/for-next (7c0f6ba682b9 Replace <asm/uaccess.h> with <linux/uaccess.h> globally) +$ git merge cifs/for-next +Already up-to-date. +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 (ad4d05329df5 udf: Make stat on symlink report symlink length as st_size) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/udf/inode.c | 4 +--- + fs/udf/namei.c | 2 +- + fs/udf/super.c | 9 ++++++--- + fs/udf/symlink.c | 30 ++++++++++++++++++++++++++++++ + fs/udf/udfdecl.h | 2 +- + 5 files changed, 39 insertions(+), 8 deletions(-) +Merging ext4/dev (a551d7c8deef Merge branch 'fscrypt' into dev) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (93ceca2f8e00 f2fs: fix wrong tracepoints for op and op_flags) +$ git merge f2fs/dev +Auto-merging fs/f2fs/namei.c +Merge made by the 'recursive' strategy. + fs/f2fs/data.c | 7 ++++++- + fs/f2fs/extent_cache.c | 22 +++++++++------------- + fs/f2fs/namei.c | 6 +++--- + fs/f2fs/node.c | 27 ++++++++++++++++++++------- + fs/f2fs/recovery.c | 4 ---- + fs/f2fs/segment.c | 13 +++++++++---- + include/trace/events/f2fs.h | 41 +++++++++++++++++++++++++---------------- + 7 files changed, 72 insertions(+), 48 deletions(-) +Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information) +$ git merge freevxfs/for-next +Already up-to-date. +Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew)) +$ git merge fscache/fscache +Already up-to-date. +Merging fuse/for-next (c01638f5d919 fuse: fix clearing suid, sgid for chown()) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/for-next (23754c081d1b GFS2: Limit number of transaction blocks requested for truncates) +$ git merge gfs2/for-next +Auto-merging fs/gfs2/glock.c +Auto-merging fs/gfs2/bmap.c +Merge made by the 'recursive' strategy. + fs/gfs2/bmap.c | 29 ++++++++++++++++++++++++++--- + fs/gfs2/glock.c | 12 +++++++----- + fs/gfs2/incore.h | 2 ++ + fs/gfs2/super.c | 2 ++ + 4 files changed, 37 insertions(+), 8 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 (8ac2b42238f5 NFSv4: Retry the DELEGRETURN if the embedded GETATTR is rejected with EACCES) +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next (3946d512e9e3 sunrpc: don't call sleeping functions from the notifier block callbacks) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/lockd/svc.c | 2 ++ + fs/nfsd/nfs3proc.c | 8 +++---- + fs/nfsd/nfs4proc.c | 2 +- + fs/nfsd/nfs4xdr.c | 2 +- + fs/nfsd/nfsctl.c | 10 ++++++--- + fs/nfsd/nfsproc.c | 8 ++----- + fs/nfsd/nfssvc.c | 2 ++ + fs/nfsd/vfs.c | 45 ++++++++++++--------------------------- + fs/nfsd/vfs.h | 6 +++--- + include/linux/sunrpc/cache.h | 1 + + include/linux/sunrpc/svc_xprt.h | 1 + + net/sunrpc/auth_gss/svcauth_gss.c | 4 ++-- + net/sunrpc/cache.c | 12 +++++++++++ + net/sunrpc/svc_xprt.c | 10 ++++++--- + 14 files changed, 58 insertions(+), 55 deletions(-) +Merging orangefs/for-next (04102c76a779 orangefs: Axe some dead code) +$ git merge orangefs/for-next +Already up-to-date. +Merging overlayfs/overlayfs-next (c3c869966480 ovl: fix reStructuredText syntax errors in documentation) +$ git merge overlayfs/overlayfs-next +Already up-to-date. +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 (7e910b61a042 xfs: don't rely on ->total in xfs_alloc_space_available) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/xfs/libxfs/xfs_alloc.c | 115 ++++++++++------------------------------- + fs/xfs/libxfs/xfs_alloc.h | 2 +- + fs/xfs/libxfs/xfs_bmap.c | 5 +- + fs/xfs/libxfs/xfs_bmap_btree.c | 14 ----- + 4 files changed, 30 insertions(+), 106 deletions(-) +Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2) +$ git merge file-locks/linux-next +Already up-to-date. +Merging vfs/for-next (59479ae85e43 Merge branches 'work.sendmsg' and 'work.splice-net' into for-next) +$ git merge vfs/for-next +Auto-merging net/socket.c +Auto-merging include/net/tcp.h +Merge made by the 'recursive' strategy. + drivers/block/drbd/drbd_main.c | 11 ++- + drivers/block/nbd.c | 76 +++++++++------------ + drivers/target/iscsi/iscsi_target_util.c | 64 +++++++---------- + drivers/usb/usbip/usbip_common.c | 32 +++------ + fs/afs/rxrpc.c | 15 ++-- + fs/ncpfs/sock.c | 111 +++++++++++------------------- + 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/ceph/messenger.c | 44 ++++++++---- + net/core/skbuff.c | 4 +- + net/ipv4/tcp.c | 7 +- + net/kcm/kcmsock.c | 5 +- + net/rds/page.c | 29 -------- + net/rds/rds.h | 7 -- + net/socket.c | 4 +- + net/unix/af_unix.c | 113 +++---------------------------- + 22 files changed, 186 insertions(+), 373 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 3ff35ed35938] 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 (7ce7d89f4883 Linux 4.10-rc1) +$ git merge pci/next +Already up-to-date. +Merging pstore/for-next/pstore (0c744ea4f77d Linux 4.10-rc2) +$ git merge pstore/for-next/pstore +Already up-to-date. +Merging hid/for-next (d7f6872e5ef6 Merge branch 'for-4.10/upstream-fixes' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/hid-over-i2c.txt | 5 +++ + drivers/hid/hid-core.c | 6 +-- + drivers/hid/hid-cypress.c | 3 ++ + drivers/hid/hid-ids.h | 4 +- + drivers/hid/hid-microsoft.c | 2 - + drivers/hid/i2c-hid/i2c-hid.c | 45 ++++++++++++++++++++-- + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 4 +- + drivers/hid/intel-ish-hid/ishtp-hid.c | 2 +- + drivers/hid/intel-ish-hid/ishtp/hbm.c | 1 - + drivers/hid/intel-ish-hid/ishtp/init.c | 1 - + drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h | 3 +- + drivers/hid/usbhid/hid-core.c | 3 +- + drivers/hid/usbhid/hid-quirks.c | 1 - + drivers/hid/usbhid/usbkbd.c | 3 +- + drivers/hid/usbhid/usbmouse.c | 3 +- + drivers/hid/wacom.h | 1 - + drivers/hid/wacom_sys.c | 2 +- + include/linux/i2c/i2c-hid.h | 6 +++ + 18 files changed, 70 insertions(+), 25 deletions(-) +Merging i2c/i2c/for-next (649ac63a9ae5 i2c: mux: mlxcpld: fix i2c mux selection caching) +$ git merge i2c/i2c/for-next +Already up-to-date. +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 (0c744ea4f77d Linux 4.10-rc2) +$ git merge dmi/master +Already up-to-date. +Merging hwmon-staging/hwmon-next (53e678d75e7c hwmon: (sht21) Add Electronic Identification Code retrieval) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + Documentation/hwmon/sht21 | 5 +- + drivers/hwmon/adm1021.c | 14 +- + drivers/hwmon/adm1025.c | 16 +- + drivers/hwmon/adm1026.c | 128 ++++++++------- + drivers/hwmon/adm1031.c | 15 +- + drivers/hwmon/adm9240.c | 28 ++-- + drivers/hwmon/adt7411.c | 361 ++++++++++++++++++++++++++++++++++++----- + drivers/hwmon/adt7470.c | 48 +++--- + drivers/hwmon/adt7475.c | 28 ++-- + drivers/hwmon/adt7x10.c | 7 +- + drivers/hwmon/asb100.c | 36 ++-- + drivers/hwmon/atxp1.c | 35 ++-- + drivers/hwmon/dme1737.c | 18 +- + drivers/hwmon/ds1621.c | 16 +- + drivers/hwmon/emc2103.c | 36 ++-- + drivers/hwmon/f71805f.c | 16 +- + drivers/hwmon/f71882fg.c | 6 +- + drivers/hwmon/fam15h_power.c | 34 ++-- + drivers/hwmon/fschmd.c | 6 +- + drivers/hwmon/g760a.c | 22 +-- + drivers/hwmon/g762.c | 86 +++++----- + drivers/hwmon/gl520sm.c | 48 +++--- + drivers/hwmon/gpio-fan.c | 54 +++--- + drivers/hwmon/hwmon.c | 4 +- + drivers/hwmon/i5500_temp.c | 6 +- + drivers/hwmon/i5k_amb.c | 4 +- + drivers/hwmon/it87.c | 20 +-- + drivers/hwmon/jz4740-hwmon.c | 6 +- + drivers/hwmon/k10temp.c | 12 +- + drivers/hwmon/k8temp.c | 4 +- + drivers/hwmon/lm63.c | 48 +++--- + drivers/hwmon/lm70.c | 6 +- + drivers/hwmon/lm78.c | 38 ++--- + drivers/hwmon/lm80.c | 4 +- + drivers/hwmon/lm83.c | 4 +- + drivers/hwmon/lm85.c | 22 +-- + drivers/hwmon/lm87.c | 43 ++--- + drivers/hwmon/lm90.c | 8 +- + drivers/hwmon/lm92.c | 10 +- + drivers/hwmon/lm93.c | 39 ++--- + drivers/hwmon/lm95234.c | 12 +- + drivers/hwmon/max1111.c | 4 +- + drivers/hwmon/max1619.c | 4 +- + drivers/hwmon/max197.c | 6 +- + drivers/hwmon/max6650.c | 44 ++--- + drivers/hwmon/mc13783-adc.c | 6 +- + drivers/hwmon/mcp3021.c | 6 +- + drivers/hwmon/nct6683.c | 17 +- + drivers/hwmon/nct6775.c | 4 +- + drivers/hwmon/nsa320-hwmon.c | 12 +- + drivers/hwmon/pc87360.c | 26 +-- + drivers/hwmon/pc87427.c | 4 +- + drivers/hwmon/pcf8591.c | 24 ++- + drivers/hwmon/sch5627.c | 4 +- + drivers/hwmon/sch56xx-common.c | 1 - + drivers/hwmon/sht15.c | 4 +- + drivers/hwmon/sht21.c | 92 ++++++++++- + drivers/hwmon/sis5595.c | 36 ++-- + drivers/hwmon/smsc47m1.c | 10 +- + drivers/hwmon/smsc47m192.c | 14 +- + drivers/hwmon/tmp401.c | 11 +- + drivers/hwmon/via-cputemp.c | 6 +- + drivers/hwmon/via686a.c | 8 +- + drivers/hwmon/vt8231.c | 59 +++---- + drivers/hwmon/w83627ehf.c | 8 +- + drivers/hwmon/w83627hf.c | 53 +++--- + drivers/hwmon/w83781d.c | 34 ++-- + drivers/hwmon/w83791d.c | 23 ++- + drivers/hwmon/w83792d.c | 15 +- + drivers/hwmon/w83793.c | 6 +- + 70 files changed, 1118 insertions(+), 776 deletions(-) +Merging jc_docs/docs-next (df31175bb4d3 kernel-doc: make highlights more homogenous for the various backends) +$ git merge jc_docs/docs-next +Removing Documentation/DocBook/iio.tmpl +Merge made by the 'recursive' strategy. + Documentation/DocBook/Makefile | 2 +- + Documentation/DocBook/iio.tmpl | 697 --------------------- + Documentation/cpu-freq/user-guide.txt | 4 +- + Documentation/driver-api/iio/buffers.rst | 125 ++++ + Documentation/driver-api/iio/core.rst | 182 ++++++ + Documentation/driver-api/iio/index.rst | 17 + + Documentation/driver-api/iio/intro.rst | 33 + + Documentation/driver-api/iio/triggered-buffers.rst | 69 ++ + Documentation/driver-api/iio/triggers.rst | 80 +++ + Documentation/driver-api/index.rst | 1 + + Documentation/hwmon/ds1621 | 8 +- + Documentation/pps/pps.txt | 18 +- + Documentation/thermal/nouveau_thermal | 2 +- + scripts/kernel-doc | 99 ++- + 14 files changed, 601 insertions(+), 736 deletions(-) + delete mode 100644 Documentation/DocBook/iio.tmpl + create mode 100644 Documentation/driver-api/iio/buffers.rst + create mode 100644 Documentation/driver-api/iio/core.rst + create mode 100644 Documentation/driver-api/iio/index.rst + create mode 100644 Documentation/driver-api/iio/intro.rst + create mode 100644 Documentation/driver-api/iio/triggered-buffers.rst + create mode 100644 Documentation/driver-api/iio/triggers.rst +Merging v4l-dvb/master (5dd2470bfddb Merge branch 'v4l_for_linus' into to_next) +$ git merge v4l-dvb/master +Merge made by the 'recursive' strategy. + drivers/media/cec/cec-adap.c | 103 ++++++++++++------------ + drivers/media/dvb-core/dvb_net.c | 15 ++-- + drivers/media/i2c/Kconfig | 1 + + drivers/media/i2c/smiapp/smiapp-core.c | 33 +++----- + drivers/media/i2c/tvp5150.c | 56 ++++++++----- + drivers/media/i2c/tvp5150_reg.h | 9 +++ + drivers/media/pci/cobalt/cobalt-driver.c | 8 +- + drivers/media/pci/cobalt/cobalt-driver.h | 2 - + drivers/media/usb/dvb-usb/pctv452e.c | 133 +++++++++++++++++-------------- + include/uapi/linux/cec-funcs.h | 10 ++- + 10 files changed, 195 insertions(+), 175 deletions(-) +Merging fbdev/fbdev-for-next (2f7590b2677b Merge tag 'fbdev-v4.10-rc2' of git://github.com/bzolnier/linux into fbdev-for-next) +$ git merge fbdev/fbdev-for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging pm/linux-next (919c53ad1885 Merge branch 'acpi-tables' 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 (cad8f6c4f660 Merge branches 'ida-conversion' and 'thermal-core' into next) +$ git merge thermal/next +Merge made by the 'recursive' strategy. + drivers/thermal/clock_cooling.c | 50 ++++------------------- + drivers/thermal/cpu_cooling.c | 63 +++++------------------------ + drivers/thermal/devfreq_cooling.c | 53 +++++------------------- + drivers/thermal/thermal_core.c | 85 ++++++++++++++------------------------- + drivers/thermal/thermal_hwmon.c | 20 ++------- + include/linux/thermal.h | 4 +- + 6 files changed, 64 insertions(+), 211 deletions(-) +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 (7453c549f5f6 swiotlb: Export swiotlb_max_segment to users) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging net-next/master (5944701df90d net: remove useless memset's in drivers get_stats64) +$ git merge net-next/master +Auto-merging net/socket.c +Removing net/sctp/ssnmap.c +Auto-merging net/rds/rds.h +Auto-merging net/ipv4/tcp.c +Auto-merging include/net/tcp.h +Auto-merging drivers/net/wireless/realtek/rtlwifi/usb.c +Auto-merging drivers/net/ethernet/renesas/sh_eth.c +Auto-merging drivers/net/ethernet/realtek/r8169.c +Auto-merging drivers/net/ethernet/emulex/benet/be_main.c +Auto-merging drivers/net/ethernet/broadcom/tg3.c +Auto-merging drivers/net/ethernet/amd/xgbe/xgbe-drv.c +Auto-merging arch/arm/boot/dts/dra7.dtsi +Auto-merging arch/arm/boot/dts/dm814x.dtsi +Auto-merging arch/arm/boot/dts/am4372.dtsi +Auto-merging arch/arm/boot/dts/am33xx.dtsi +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/net/cpsw.txt | 3 - + Documentation/devicetree/bindings/net/stmmac.txt | 1 - + Documentation/networking/packet_mmap.txt | 9 +- + Documentation/sysctl/net.txt | 21 + + MAINTAINERS | 6 + + arch/arm/boot/dts/am33xx.dtsi | 1 - + arch/arm/boot/dts/am4372.dtsi | 1 - + arch/arm/boot/dts/dm814x.dtsi | 1 - + arch/arm/boot/dts/dra7.dtsi | 1 - + drivers/atm/eni.c | 2 +- + drivers/atm/midway.h | 2 +- + drivers/infiniband/hw/mlx5/main.c | 50 +- + drivers/infiniband/hw/mlx5/mem.c | 32 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 89 +- + drivers/infiniband/hw/mlx5/mr.c | 518 ++-- + drivers/infiniband/hw/mlx5/odp.c | 424 ++-- + drivers/infiniband/hw/mlx5/qp.c | 154 +- + drivers/net/bonding/bond_main.c | 10 +- + drivers/net/dsa/b53/b53_common.c | 2 +- + drivers/net/dsa/b53/b53_priv.h | 24 +- + drivers/net/dsa/mv88e6xxx/chip.c | 9 +- + drivers/net/dsa/mv88e6xxx/mv88e6xxx.h | 1 + + drivers/net/dummy.c | 5 +- + drivers/net/ethernet/3com/typhoon.c | 25 +- + drivers/net/ethernet/alacritech/slicoss.c | 6 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 10 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 6 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 5 +- + drivers/net/ethernet/atheros/alx/main.c | 6 +- + drivers/net/ethernet/broadcom/b44.c | 5 +- + drivers/net/ethernet/broadcom/bnx2.c | 5 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 393 ++- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 108 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 73 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 34 + + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 15 +- + drivers/net/ethernet/broadcom/tg3.c | 8 +- + drivers/net/ethernet/brocade/bna/bnad.c | 6 +- + drivers/net/ethernet/calxeda/xgmac.c | 5 +- + drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 14 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 12 +- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 2 +- + .../net/ethernet/cavium/liquidio/octeon_config.h | 10 +- + .../net/ethernet/cavium/liquidio/octeon_console.c | 10 + + .../net/ethernet/cavium/liquidio/octeon_device.h | 6 + + drivers/net/ethernet/cavium/liquidio/octeon_iq.h | 2 +- + .../net/ethernet/cavium/liquidio/octeon_mem_ops.c | 21 +- + drivers/net/ethernet/cavium/liquidio/octeon_nic.c | 4 +- + .../net/ethernet/cavium/liquidio/request_manager.c | 49 +- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 5 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 13 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 30 +- + drivers/net/ethernet/chelsio/cxgb4/sge.c | 16 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 96 +- + drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 15 + + drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 4 + + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 21 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 8 +- + drivers/net/ethernet/dec/tulip/de2104x.c | 91 +- + drivers/net/ethernet/dec/tulip/uli526x.c | 41 +- + drivers/net/ethernet/dec/tulip/winbond-840.c | 14 +- + drivers/net/ethernet/dlink/dl2k.c | 71 +- + drivers/net/ethernet/dlink/sundance.c | 14 +- + drivers/net/ethernet/ec_bhf.c | 4 +- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 73 +- + drivers/net/ethernet/emulex/benet/be_main.c | 5 +- + drivers/net/ethernet/ethoc.c | 7 - + drivers/net/ethernet/faraday/ftmac100.c | 14 +- + drivers/net/ethernet/fealnx.c | 14 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 6 +- + drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 18 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 6 +- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 5 +- + drivers/net/ethernet/intel/e1000e/e1000.h | 4 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 8 +- + drivers/net/ethernet/intel/fm10k/fm10k.h | 4 +- + drivers/net/ethernet/intel/fm10k/fm10k_common.c | 6 +- + drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 21 +- + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 12 +- + drivers/net/ethernet/intel/fm10k/fm10k_mbx.c | 10 +- + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 6 +- + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 6 +- + drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 4 - + drivers/net/ethernet/intel/i40e/i40e.h | 5 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 18 +- + drivers/net/ethernet/intel/igb/e1000_82575.c | 11 + + drivers/net/ethernet/intel/igb/e1000_i210.c | 4 +- + drivers/net/ethernet/intel/igb/e1000_mac.c | 15 +- + drivers/net/ethernet/intel/igb/e1000_phy.c | 4 + + drivers/net/ethernet/intel/igb/e1000_regs.h | 2 +- + drivers/net/ethernet/intel/igb/igb_main.c | 40 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 5 + + drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 2 - + drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 2 - + drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 113 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_common.h | 6 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 153 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 8 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 99 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h | 1 + + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 66 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 4 - + drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 12 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 50 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 90 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 10 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 594 ++++- + drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 1 + + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 72 +- + drivers/net/ethernet/intel/ixgbevf/mbx.h | 1 + + drivers/net/ethernet/intel/ixgbevf/vf.c | 24 +- + drivers/net/ethernet/marvell/mvneta.c | 4 +- + drivers/net/ethernet/marvell/mvpp2.c | 4 +- + drivers/net/ethernet/marvell/sky2.c | 6 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 6 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/dev.c | 33 + + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 290 ++- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 41 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 2 + + drivers/net/ethernet/mellanox/mlx5/core/qp.c | 114 - + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 4 +- + drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 3 +- + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 9 +- + drivers/net/ethernet/neterion/vxge/vxge-main.c | 4 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 6 +- + drivers/net/ethernet/nvidia/forcedeth.c | 4 +- + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 10 +- + drivers/net/ethernet/qlogic/qed/qed.h | 34 +- + drivers/net/ethernet/qlogic/qed/qed_cxt.c | 32 +- + drivers/net/ethernet/qlogic/qed/qed_cxt.h | 34 +- + drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 32 +- + drivers/net/ethernet/qlogic/qed/qed_dcbx.h | 32 +- + drivers/net/ethernet/qlogic/qed/qed_dev.c | 32 +- + drivers/net/ethernet/qlogic/qed/qed_dev_api.h | 34 +- + drivers/net/ethernet/qlogic/qed/qed_hsi.h | 32 +- + drivers/net/ethernet/qlogic/qed/qed_hw.c | 32 +- + drivers/net/ethernet/qlogic/qed/qed_hw.h | 32 +- + .../net/ethernet/qlogic/qed/qed_init_fw_funcs.c | 32 +- + drivers/net/ethernet/qlogic/qed/qed_init_ops.c | 32 +- + drivers/net/ethernet/qlogic/qed/qed_init_ops.h | 34 +- + drivers/net/ethernet/qlogic/qed/qed_int.c | 32 +- + drivers/net/ethernet/qlogic/qed/qed_int.h | 34 +- + drivers/net/ethernet/qlogic/qed/qed_iscsi.c | 32 +- + drivers/net/ethernet/qlogic/qed/qed_iscsi.h | 32 +- + drivers/net/ethernet/qlogic/qed/qed_l2.c | 303 ++- + drivers/net/ethernet/qlogic/qed/qed_l2.h | 60 +- + drivers/net/ethernet/qlogic/qed/qed_ll2.c | 31 +- + drivers/net/ethernet/qlogic/qed/qed_ll2.h | 31 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 43 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 36 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 34 +- + drivers/net/ethernet/qlogic/qed/qed_ooo.c | 32 +- + drivers/net/ethernet/qlogic/qed/qed_ooo.h | 32 +- + drivers/net/ethernet/qlogic/qed/qed_reg_addr.h | 32 +- + drivers/net/ethernet/qlogic/qed/qed_roce.c | 2 +- + drivers/net/ethernet/qlogic/qed/qed_roce.h | 2 +- + drivers/net/ethernet/qlogic/qed/qed_selftest.c | 32 + + drivers/net/ethernet/qlogic/qed/qed_sp.h | 34 +- + drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 32 +- + drivers/net/ethernet/qlogic/qed/qed_spq.c | 32 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 242 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.h | 41 +- + drivers/net/ethernet/qlogic/qed/qed_vf.c | 44 +- + drivers/net/ethernet/qlogic/qed/qed_vf.h | 32 +- + drivers/net/ethernet/qlogic/qede/Makefile | 2 +- + drivers/net/ethernet/qlogic/qede/qede.h | 83 +- + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 114 +- + drivers/net/ethernet/qlogic/qede/qede_filter.c | 759 ++++++ + drivers/net/ethernet/qlogic/qede/qede_fp.c | 1691 +++++++++++++ + drivers/net/ethernet/qlogic/qede/qede_main.c | 2622 ++------------------ + drivers/net/ethernet/qlogic/qede/qede_roce.c | 2 +- + drivers/net/ethernet/qualcomm/emac/emac.c | 6 +- + drivers/net/ethernet/realtek/8139too.c | 9 +- + drivers/net/ethernet/realtek/r8169.c | 4 +- + drivers/net/ethernet/renesas/sh_eth.c | 103 +- + drivers/net/ethernet/renesas/sh_eth.h | 2 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 8 +- + drivers/net/ethernet/sfc/efx.c | 7 +- + drivers/net/ethernet/sfc/falcon/efx.c | 9 +- + drivers/net/ethernet/sfc/falcon/ethtool.c | 29 +- + drivers/net/ethernet/sfc/falcon/mdio_10g.c | 44 +- + drivers/net/ethernet/sfc/falcon/mdio_10g.h | 3 +- + drivers/net/ethernet/sfc/falcon/net_driver.h | 12 +- + drivers/net/ethernet/sfc/falcon/qt202x_phy.c | 9 +- + drivers/net/ethernet/sfc/falcon/tenxpress.c | 22 +- + drivers/net/ethernet/sfc/falcon/txc43128_phy.c | 9 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 5 + + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 20 + + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 71 + + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 5 + + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 26 + + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 1 - + drivers/net/ethernet/sun/niu.c | 6 +- + drivers/net/ethernet/synopsys/dwc_eth_qos.c | 4 +- + drivers/net/ethernet/ti/cpsw.c | 98 +- + drivers/net/ethernet/ti/cpsw_ale.c | 180 +- + drivers/net/ethernet/ti/cpsw_ale.h | 17 +- + drivers/net/ethernet/ti/davinci_cpdma.c | 161 +- + drivers/net/ethernet/ti/davinci_cpdma.h | 5 + + drivers/net/ethernet/ti/netcp.h | 21 + + drivers/net/ethernet/ti/netcp_core.c | 102 +- + drivers/net/ethernet/ti/netcp_ethss.c | 23 +- + drivers/net/ethernet/tile/tilepro.c | 4 +- + drivers/net/ethernet/via/via-rhine.c | 8 +- + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 18 +- + drivers/net/fddi/skfp/cfm.c | 22 +- + drivers/net/fddi/skfp/drvfbi.c | 4 +- + drivers/net/fddi/skfp/ecm.c | 34 +- + drivers/net/fddi/skfp/ess.c | 66 +- + drivers/net/fddi/skfp/fplustm.c | 24 +- + drivers/net/fddi/skfp/h/cmtdef.h | 67 +- + drivers/net/fddi/skfp/h/hwmtm.h | 24 +- + drivers/net/fddi/skfp/hwmtm.c | 178 +- + drivers/net/fddi/skfp/pcmplc.c | 83 +- + drivers/net/fddi/skfp/pmf.c | 4 +- + drivers/net/fddi/skfp/rmt.c | 40 +- + drivers/net/fddi/skfp/smt.c | 109 +- + drivers/net/fddi/skfp/srf.c | 14 +- + drivers/net/fjes/fjes_main.c | 7 +- + drivers/net/hyperv/netvsc_drv.c | 6 +- + drivers/net/ifb.c | 6 +- + drivers/net/ipvlan/ipvlan.h | 1 + + drivers/net/ipvlan/ipvlan_core.c | 3 - + drivers/net/ipvlan/ipvlan_main.c | 90 +- + drivers/net/loopback.c | 5 +- + drivers/net/macsec.c | 8 +- + drivers/net/macvlan.c | 5 +- + drivers/net/mdio.c | 178 ++ + drivers/net/nlmon.c | 4 +- + drivers/net/ppp/ppp_generic.c | 4 +- + drivers/net/slip/slip.c | 3 +- + drivers/net/team/team.c | 3 +- + drivers/net/tun.c | 3 +- + drivers/net/veth.c | 6 +- + drivers/net/virtio_net.c | 9 +- + drivers/net/vmxnet3/vmxnet3_ethtool.c | 4 +- + drivers/net/vmxnet3/vmxnet3_int.h | 4 +- + drivers/net/vrf.c | 5 +- + drivers/net/wireless/admtek/adm8211.c | 27 +- + drivers/net/wireless/ath/ath10k/core.c | 11 +- + drivers/net/wireless/ath/ath10k/core.h | 2 +- + drivers/net/wireless/ath/ath10k/debug.c | 43 +- + drivers/net/wireless/ath/ath10k/debug.h | 8 + + drivers/net/wireless/ath/ath10k/htt_tx.c | 2 + + drivers/net/wireless/ath/ath10k/hw.h | 2 +- + drivers/net/wireless/ath/ath10k/mac.c | 73 +- + drivers/net/wireless/ath/ath10k/pci.c | 4 +- + drivers/net/wireless/ath/ath10k/wmi-tlv.c | 12 +- + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9002_hw.c | 6 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 21 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 4 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 36 +- + drivers/net/wireless/ath/ath9k/channel.c | 14 +- + drivers/net/wireless/ath/ath9k/debug.c | 3 + + drivers/net/wireless/ath/ath9k/debug.h | 13 + + drivers/net/wireless/ath/ath9k/debug_sta.c | 54 + + drivers/net/wireless/ath/ath9k/eeprom.c | 42 +- + drivers/net/wireless/ath/ath9k/eeprom.h | 85 +- + drivers/net/wireless/ath/ath9k/eeprom_4k.c | 137 +- + drivers/net/wireless/ath/ath9k/eeprom_9287.c | 129 +- + drivers/net/wireless/ath/ath9k/eeprom_def.c | 163 +- + drivers/net/wireless/ath/ath9k/init.c | 2 + + drivers/net/wireless/ath/ath9k/main.c | 6 +- + drivers/net/wireless/ath/ath9k/recv.c | 65 + + drivers/net/wireless/ath/ath9k/xmit.c | 192 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 4 +- + drivers/net/wireless/intel/iwlegacy/3945-mac.c | 20 +- + drivers/net/wireless/marvell/libertas/cfg.c | 2 +- + drivers/net/wireless/marvell/mwifiex/fw.h | 19 +- + drivers/net/wireless/marvell/mwifiex/init.c | 3 +- + drivers/net/wireless/marvell/mwifiex/main.h | 2 +- + drivers/net/wireless/marvell/mwifiex/sdio.c | 6 + + drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 8 +- + drivers/net/wireless/ralink/rt2x00/rt2800.h | 2 + + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 79 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.h | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2x00.h | 6 +- + drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 7 +- + drivers/net/wireless/ralink/rt2x00/rt2x00lib.h | 31 +- + drivers/net/wireless/ralink/rt2x00/rt2x00link.c | 132 +- + drivers/net/wireless/ralink/rt2x00/rt2x00mac.c | 8 +- + drivers/net/wireless/ralink/rt2x00/rt2x00queue.c | 12 +- + drivers/net/wireless/realtek/rtlwifi/base.c | 15 +- + drivers/net/wireless/realtek/rtlwifi/cam.c | 14 +- + drivers/net/wireless/realtek/rtlwifi/core.c | 31 +- + drivers/net/wireless/realtek/rtlwifi/debug.h | 16 +- + drivers/net/wireless/realtek/rtlwifi/efuse.c | 3 +- + drivers/net/wireless/realtek/rtlwifi/pci.c | 48 +- + drivers/net/wireless/realtek/rtlwifi/ps.c | 3 +- + drivers/net/wireless/realtek/rtlwifi/rc.c | 3 +- + drivers/net/wireless/realtek/rtlwifi/regd.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/fw.c | 44 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/hw.c | 33 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/phy.c | 35 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/rf.c | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/sw.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/trx.c | 8 +- + .../wireless/realtek/rtlwifi/rtl8192c/fw_common.c | 46 +- + .../wireless/realtek/rtlwifi/rtl8192c/phy_common.c | 28 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/hw.c | 39 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/led.c | 7 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/phy.c | 15 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/rf.c | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/sw.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/trx.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/hw.c | 35 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/led.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/mac.c | 12 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/phy.c | 15 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/rf.c | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/sw.c | 5 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/trx.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/fw.c | 34 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/hw.c | 35 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/led.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 45 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/rf.c | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/sw.c | 10 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.c | 40 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.c | 15 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/phy.c | 39 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/rf.c | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/sw.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.c | 15 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/fw.c | 46 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/hw.c | 43 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/led.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/phy.c | 45 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/rf.c | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/sw.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/trx.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/fw.c | 15 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/hw.c | 21 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/led.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/phy.c | 31 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/rf.c | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/sw.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/trx.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/fw.c | 15 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 18 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/led.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/phy.c | 33 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/rf.c | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/sw.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/trx.c | 14 +- + .../realtek/rtlwifi/rtl8723com/fw_common.c | 26 +- + .../realtek/rtlwifi/rtl8723com/phy_common.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/dm.c | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/fw.c | 28 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 33 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 54 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/rf.c | 5 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/sw.c | 14 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/trx.c | 20 +- + drivers/net/wireless/realtek/rtlwifi/usb.c | 48 +- + drivers/net/wireless/ti/wlcore/debugfs.c | 2 +- + drivers/net/xen-netfront.c | 6 +- + drivers/staging/netlogic/xlr_net.c | 10 +- + fs/afs/file.c | 168 +- + fs/afs/fsclient.c | 117 +- + fs/afs/internal.h | 21 +- + fs/afs/vnode.c | 6 +- + fs/afs/volume.c | 1 + + fs/afs/write.c | 19 +- + include/linux/etherdevice.h | 60 + + include/linux/mdio.h | 21 + + include/linux/mlx5/device.h | 6 +- + include/linux/mlx5/driver.h | 105 +- + include/linux/mlx5/mlx5_ifc.h | 31 +- + include/linux/mlx5/qp.h | 76 +- + include/linux/mroute.h | 2 +- + include/linux/netdevice.h | 12 +- + include/linux/qed/common_hsi.h | 33 +- + include/linux/qed/eth_common.h | 32 +- + include/linux/qed/iscsi_common.h | 32 +- + include/linux/qed/qed_chain.h | 34 +- + include/linux/qed/qed_eth_if.h | 34 +- + include/linux/qed/qed_if.h | 35 +- + include/linux/qed/qed_iov_if.h | 34 +- + include/linux/qed/qed_iscsi_if.h | 32 +- + include/linux/qed/qed_ll2_if.h | 31 +- + include/linux/qed/qed_roce_if.h | 2 +- + include/linux/qed/qede_roce.h | 2 +- + include/linux/qed/rdma_common.h | 32 +- + include/linux/qed/roce_common.h | 32 +- + include/linux/qed/storage_common.h | 32 +- + include/linux/qed/tcp_common.h | 32 +- + include/linux/soc/ti/knav_dma.h | 2 + + include/linux/socket.h | 6 +- + include/linux/stmmac.h | 1 - + include/net/inet_timewait_sock.h | 13 +- + include/net/ip_fib.h | 1 - + include/net/ip_tunnels.h | 4 +- + include/net/netns/ipv4.h | 12 + + include/net/request_sock.h | 4 +- + include/net/sctp/sctp.h | 1 - + include/net/sctp/structs.h | 83 +- + include/net/tcp.h | 1 - + include/trace/events/rxrpc.h | 518 +++- + include/uapi/linux/rds.h | 33 + + include/uapi/linux/rtnetlink.h | 1 + + net/8021q/vlan_dev.c | 5 +- + net/bridge/br_device.c | 6 +- + net/compat.c | 17 +- + net/core/dev.c | 8 +- + net/core/request_sock.c | 2 - + net/core/scm.c | 2 +- + net/core/sysctl_net_core.c | 31 +- + net/dsa/Makefile | 1 + + net/dsa/dsa.c | 176 +- + net/dsa/dsa2.c | 8 +- + net/dsa/dsa_priv.h | 10 +- + net/dsa/hwmon.c | 147 ++ + net/dsa/slave.c | 13 +- + net/ipv4/af_inet.c | 2 - + net/ipv4/fib_semantics.c | 2 +- + net/ipv4/inet_timewait_sock.c | 3 +- + net/ipv4/ip_sockglue.c | 9 +- + net/ipv4/ip_tunnel_core.c | 6 +- + net/ipv4/ipmr.c | 11 +- + net/ipv4/proc.c | 2 +- + net/ipv4/route.c | 23 +- + net/ipv4/sysctl_net_ipv4.c | 42 +- + net/ipv4/tcp.c | 23 +- + net/ipv4/tcp_input.c | 6 +- + net/ipv4/tcp_ipv4.c | 17 +- + net/ipv4/tcp_minisocks.c | 14 +- + net/ipv4/udp.c | 29 +- + net/ipv6/addrconf.c | 7 + + net/ipv6/ip6mr.c | 4 +- + net/ipv6/ipv6_sockglue.c | 16 +- + net/ipv6/ping.c | 7 - + net/ipv6/tcp_ipv6.c | 7 +- + net/l2tp/l2tp_eth.c | 6 +- + net/l2tp/l2tp_ip.c | 29 +- + net/l2tp/l2tp_ip6.c | 30 +- + net/mac80211/iface.c | 4 +- + net/openvswitch/vport-internal_dev.c | 4 +- + net/packet/af_packet.c | 42 +- + net/rds/af_rds.c | 31 + + net/rds/bind.c | 4 +- + net/rds/connection.c | 10 +- + net/rds/ib.c | 11 + + net/rds/ib.h | 22 +- + net/rds/ib_cm.c | 89 +- + net/rds/ib_frmr.c | 16 +- + net/rds/ib_recv.c | 14 +- + net/rds/ib_send.c | 29 +- + net/rds/ib_stats.c | 2 + + net/rds/rdma.c | 22 +- + net/rds/rdma_transport.c | 11 +- + net/rds/rds.h | 17 + + net/rds/recv.c | 36 +- + net/rds/send.c | 50 +- + net/rds/tcp_listen.c | 1 + + net/rds/tcp_recv.c | 5 + + net/rxrpc/ar-internal.h | 194 -- + net/rxrpc/call_object.c | 18 - + net/rxrpc/conn_client.c | 8 - + net/rxrpc/conn_object.c | 1 + + net/rxrpc/input.c | 16 +- + net/rxrpc/misc.c | 151 -- + net/rxrpc/proc.c | 9 +- + net/rxrpc/sendmsg.c | 2 +- + net/sched/cls_matchall.c | 22 +- + net/sched/sch_generic.c | 2 +- + net/sched/sch_teql.c | 5 +- + net/sctp/Makefile | 2 +- + net/sctp/associola.c | 13 +- + net/sctp/chunk.c | 107 +- + net/sctp/input.c | 17 +- + net/sctp/ipv6.c | 16 +- + net/sctp/objcnt.c | 2 - + net/sctp/output.c | 14 +- + net/sctp/protocol.c | 18 +- + net/sctp/sm_make_chunk.c | 10 +- + net/sctp/sm_statefuns.c | 125 +- + net/sctp/ssnmap.c | 125 - + net/sctp/stream.c | 85 + + net/sctp/ulpqueue.c | 36 +- + net/socket.c | 2 + + net/tipc/bcast.c | 6 +- + net/tipc/link.c | 75 +- + net/tipc/msg.h | 2 - + net/tipc/name_table.c | 100 +- + net/tipc/name_table.h | 21 +- + net/tipc/node.c | 15 +- + net/tipc/socket.c | 449 ++-- + tools/testing/selftests/net/psock_tpacket.c | 97 +- + 494 files changed, 12847 insertions(+), 8556 deletions(-) + create mode 100644 drivers/net/ethernet/qlogic/qede/qede_filter.c + create mode 100644 drivers/net/ethernet/qlogic/qede/qede_fp.c + create mode 100644 net/dsa/hwmon.c + delete mode 100644 net/sctp/ssnmap.c + create mode 100644 net/sctp/stream.c +Merging ipsec-next/master (b3b73b8e6df6 xfrm: state: do not acquire lock in get_mtu helpers) +$ git merge ipsec-next/master +Merge made by the 'recursive' strategy. + net/xfrm/xfrm_policy.c | 2 +- + net/xfrm/xfrm_state.c | 15 ++++++--------- + 2 files changed, 7 insertions(+), 10 deletions(-) +Merging netfilter-next/master (4cc4b72c136a netfilter: xt_connlimit: use rb_entry()) +$ git merge netfilter-next/master +Removing net/netfilter/nf_nat_proto_udplite.c +Removing net/netfilter/nf_conntrack_proto_udplite.c +Merge made by the 'recursive' strategy. + include/net/netfilter/ipv4/nf_conntrack_ipv4.h | 1 + + include/net/netfilter/ipv6/nf_conntrack_ipv6.h | 1 + + include/net/netns/conntrack.h | 16 -- + include/uapi/linux/netfilter/nf_tables.h | 5 + + net/netfilter/Kconfig | 2 +- + net/netfilter/Makefile | 2 - + net/netfilter/nf_conntrack_proto_sctp.c | 32 +++ + net/netfilter/nf_conntrack_proto_udp.c | 123 ++++++++++ + net/netfilter/nf_conntrack_proto_udplite.c | 324 ------------------------- + net/netfilter/nf_nat_proto_udp.c | 78 +++++- + net/netfilter/nf_nat_proto_udplite.c | 73 ------ + net/netfilter/nft_ct.c | 22 +- + net/netfilter/xt_connlimit.c | 4 +- + 13 files changed, 252 insertions(+), 431 deletions(-) + delete mode 100644 net/netfilter/nf_conntrack_proto_udplite.c + delete mode 100644 net/netfilter/nf_nat_proto_udplite.c +Merging ipvs-next/master (8d8e20e2d7bb ipvs: Decrement ttl) +$ git merge ipvs-next/master +Already up-to-date. +Merging wireless-drivers-next/master (0a0a8d6b0e88 net: fealnx: use new api ethtool_{get|set}_link_ksettings) +$ git merge wireless-drivers-next/master +Already up-to-date. +Merging bluetooth/master (c1878f7a89ef tools: psock_tpacket: block Rx until socket filter has been added and socket has been bound to loopback.) +$ git merge bluetooth/master +Already up-to-date. +Merging mac80211-next/master (e691ac2f75b6 cfg80211: support ieee80211-freq-limit DT property) +$ git merge mac80211-next/master +Auto-merging net/wireless/nl80211.c +Auto-merging net/wireless/Makefile +Auto-merging net/mac80211/tx.c +Auto-merging net/mac80211/sta_info.c +Auto-merging net/mac80211/rx.c +Auto-merging net/mac80211/ieee80211_i.h +Auto-merging Documentation/driver-api/80211/cfg80211.rst +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/wireless/ieee80211.txt | 24 ++++ + Documentation/driver-api/80211/cfg80211.rst | 3 + + Documentation/networking/regulatory.txt | 8 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 3 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 +- + include/linux/ieee80211.h | 2 + + include/net/cfg80211.h | 45 ++++--- + include/net/mac80211.h | 1 - + 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 | 7 +- + 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 | 30 ++--- + net/wireless/Makefile | 1 + + net/wireless/core.h | 3 + + net/wireless/nl80211.c | 42 ++----- + net/wireless/nl80211.h | 6 +- + net/wireless/of.c | 138 +++++++++++++++++++++ + net/wireless/reg.c | 27 ++-- + net/wireless/scan.c | 9 +- + net/wireless/sysfs.c | 6 +- + net/wireless/util.c | 28 +++-- + 41 files changed, 555 insertions(+), 287 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/wireless/ieee80211.txt + create mode 100644 net/wireless/of.c +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 (402c09a341c2 Merge branch 'topic/cma-misc-for-4.11' into rdma-next) +$ git merge rdma-leon/rdma-next +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging include/linux/mlx5/driver.h +Auto-merging include/linux/mlx5/device.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c +Auto-merging drivers/infiniband/hw/mlx4/main.c +Merge made by the 'recursive' strategy. + drivers/infiniband/core/cm.c | 2 + + drivers/infiniband/core/cma.c | 92 +++- + drivers/infiniband/core/umem.c | 3 - + drivers/infiniband/core/umem_odp.c | 92 +++- + drivers/infiniband/core/umem_rbtree.c | 21 +- + drivers/infiniband/core/uverbs.h | 1 + + drivers/infiniband/core/uverbs_cmd.c | 53 +- + drivers/infiniband/hw/cxgb3/iwch_provider.c | 7 +- + drivers/infiniband/hw/cxgb4/provider.c | 8 +- + drivers/infiniband/hw/hfi1/verbs.c | 1 + + drivers/infiniband/hw/hns/hns_roce_main.c | 7 +- + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 8 +- + drivers/infiniband/hw/mlx4/alias_GUID.c | 1 + + drivers/infiniband/hw/mlx4/main.c | 23 +- + drivers/infiniband/hw/mlx4/sysfs.c | 1 + + drivers/infiniband/hw/mlx5/cq.c | 10 +- + drivers/infiniband/hw/mlx5/mad.c | 14 +- + drivers/infiniband/hw/mlx5/main.c | 561 +++++++++++++++------ + drivers/infiniband/hw/mlx5/mlx5_ib.h | 78 ++- + drivers/infiniband/hw/mlx5/mr.c | 128 +++-- + drivers/infiniband/hw/mlx5/odp.c | 499 ++++++++++++++++-- + drivers/infiniband/hw/mlx5/qp.c | 374 +++++++------- + drivers/infiniband/hw/mlx5/srq.c | 11 +- + drivers/infiniband/hw/mthca/mthca_provider.c | 9 +- + drivers/infiniband/hw/nes/nes_verbs.c | 5 +- + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 9 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 1 + + drivers/infiniband/hw/qedr/verbs.c | 9 +- + drivers/infiniband/hw/qib/qib_verbs.c | 1 + + drivers/infiniband/hw/usnic/usnic_ib_main.c | 4 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 2 +- + drivers/infiniband/sw/rdmavt/vt.c | 7 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 6 +- + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 30 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 34 +- + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 6 +- + drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 10 +- + drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/cq.c | 2 + + drivers/net/ethernet/mellanox/mlx5/core/en.h | 11 +- + .../net/ethernet/mellanox/mlx5/core/en_common.c | 12 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 21 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 14 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 12 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 26 +- + drivers/net/ethernet/mellanox/mlx5/core/mr.c | 16 + + drivers/net/ethernet/mellanox/mlx5/core/uar.c | 351 ++++++++----- + include/linux/mlx5/cq.h | 5 +- + include/linux/mlx5/device.h | 23 +- + include/linux/mlx5/doorbell.h | 32 +- + include/linux/mlx5/driver.h | 88 ++-- + include/linux/mlx5/mlx5_ifc.h | 9 +- + include/rdma/ib_umem_odp.h | 21 +- + include/rdma/ib_verbs.h | 57 ++- + include/uapi/rdma/ib_user_verbs.h | 19 +- + include/uapi/rdma/mlx5-abi.h | 19 +- + 56 files changed, 2061 insertions(+), 807 deletions(-) +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 (5bdee5496978 Merge tag 'nand/fixes-for-4.10-rc3' of github.com:linux-nand/linux) +$ git merge mtd/master +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mtd/tango-nand.txt | 6 +++--- + drivers/mtd/nand/Kconfig | 3 ++- + drivers/mtd/nand/lpc32xx_mlc.c | 2 +- + drivers/mtd/nand/tango_nand.c | 4 +++- + drivers/mtd/nand/xway_nand.c | 5 +---- + 5 files changed, 10 insertions(+), 10 deletions(-) +Merging l2-mtd/master (5bdee5496978 Merge tag 'nand/fixes-for-4.10-rc3' of github.com:linux-nand/linux) +$ git merge l2-mtd/master +Already up-to-date. +Merging nand/nand/next (9018bf842d4e mtd: nand: fsmc: remove stale non-DT probe path) +$ git merge nand/nand/next +Removing include/linux/mtd/fsmc.h +Auto-merging drivers/mtd/nand/Kconfig +Merge made by the 'recursive' strategy. + drivers/mtd/nand/Kconfig | 1 + + drivers/mtd/nand/fsmc_nand.c | 153 ++++++++++++++++++++++++++++++++++------ + drivers/mtd/nand/lpc32xx_slc.c | 9 +-- + include/linux/mtd/fsmc.h | 156 ----------------------------------------- + include/linux/mtd/nand.h | 3 +- + 5 files changed, 137 insertions(+), 185 deletions(-) + delete mode 100644 include/linux/mtd/fsmc.h +Merging crypto/master (c821f6ab2e47 crypto: skcipher - introduce walksize attribute for SIMD algos) +$ git merge crypto/master +Auto-merging arch/x86/crypto/aesni-intel_glue.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/crypto/mediatek-crypto.txt | 27 + + arch/x86/crypto/aesni-intel_glue.c | 12 +- + arch/x86/crypto/chacha20_glue.c | 69 +- + crypto/algif_hash.c | 2 +- + crypto/chacha20_generic.c | 73 +- + crypto/skcipher.c | 20 +- + drivers/char/hw_random/core.c | 64 +- + drivers/crypto/Kconfig | 17 + + drivers/crypto/Makefile | 15 +- + drivers/crypto/bfin_crc.c | 6 +- + drivers/crypto/bfin_crc.h | 1 - + drivers/crypto/mediatek/Makefile | 2 + + drivers/crypto/mediatek/mtk-aes.c | 765 +++++++++++ + drivers/crypto/mediatek/mtk-platform.c | 604 ++++++++ + drivers/crypto/mediatek/mtk-platform.h | 238 ++++ + drivers/crypto/mediatek/mtk-regs.h | 194 +++ + drivers/crypto/mediatek/mtk-sha.c | 1437 ++++++++++++++++++++ + drivers/crypto/qat/qat_c3xxx/adf_drv.c | 2 +- + drivers/crypto/qat/qat_c3xxxvf/adf_drv.c | 2 +- + drivers/crypto/qat/qat_c62x/adf_drv.c | 4 +- + drivers/crypto/qat/qat_c62xvf/adf_drv.c | 2 +- + drivers/crypto/qat/qat_common/adf_accel_devices.h | 1 + + drivers/crypto/qat/qat_common/adf_cfg_common.h | 1 + + drivers/crypto/qat/qat_common/adf_common_drv.h | 4 +- + drivers/crypto/qat/qat_common/adf_dev_mgr.c | 2 +- + drivers/crypto/qat/qat_common/adf_init.c | 28 +- + drivers/crypto/qat/qat_common/adf_sriov.c | 4 +- + drivers/crypto/qat/qat_common/adf_vf_isr.c | 4 +- + drivers/crypto/qat/qat_common/qat_hal.c | 4 +- + drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 2 +- + drivers/crypto/qat/qat_dh895xccvf/adf_drv.c | 2 +- + drivers/crypto/virtio/Kconfig | 1 + + drivers/crypto/virtio/virtio_crypto_algs.c | 52 +- + drivers/crypto/virtio/virtio_crypto_common.h | 16 + + drivers/crypto/virtio/virtio_crypto_core.c | 74 +- + include/crypto/chacha20.h | 6 +- + include/crypto/internal/skcipher.h | 2 +- + include/crypto/skcipher.h | 34 + + include/linux/miscdevice.h | 1 + + 39 files changed, 3589 insertions(+), 205 deletions(-) + create mode 100644 Documentation/devicetree/bindings/crypto/mediatek-crypto.txt + create mode 100644 drivers/crypto/mediatek/Makefile + create mode 100644 drivers/crypto/mediatek/mtk-aes.c + create mode 100644 drivers/crypto/mediatek/mtk-platform.c + create mode 100644 drivers/crypto/mediatek/mtk-platform.h + create mode 100644 drivers/crypto/mediatek/mtk-regs.h + create mode 100644 drivers/crypto/mediatek/mtk-sha.c +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 (327bc443416d drm/panel: Constify device node argument to of_drm_find_panel()) +$ git merge drm-panel/drm/panel/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_panel.c | 2 +- + include/drm/drm_panel.h | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging drm-intel/for-linux-next (b42a13d9181e drm/i915: Drain freed objects for mmap space exhaustion) +$ git merge drm-intel/for-linux-next +Resolved 'drivers/gpu/drm/i915/i915_gem.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_overlay.c' using previous resolution. +Auto-merging drivers/gpu/drm/i915/intel_uc.h +Auto-merging drivers/gpu/drm/i915/intel_overlay.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_overlay.c +Auto-merging drivers/gpu/drm/i915/intel_dp.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/i915_gem_request.h +Auto-merging drivers/gpu/drm/i915/i915_gem.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/drm_atomic_helper.c +Auto-merging MAINTAINERS +Removing Documentation/dma-buf-sharing.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 101d7a10a949] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + .../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 + + Documentation/gpu/i915.rst | 103 + + MAINTAINERS | 2 +- + drivers/char/agp/intel-gtt.c | 6 +- + drivers/dma-buf/dma-buf.c | 208 +- + drivers/dma-buf/sync_file.c | 15 +- + drivers/gpu/drm/Kconfig | 19 + + drivers/gpu/drm/Makefile | 2 + + 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 | 115 +- + 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 | 28 +- + 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 | 571 +++-- + drivers/gpu/drm/drm_mode_config.c | 145 +- + drivers/gpu/drm/drm_mode_object.c | 3 +- + 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/etnaviv/etnaviv_mmu.c | 9 +- + 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/Kconfig.debug | 15 + + drivers/gpu/drm/i915/Makefile | 9 +- + drivers/gpu/drm/i915/gvt/aperture_gm.c | 7 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 5 +- + drivers/gpu/drm/i915/gvt/handlers.c | 2 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 10 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 174 +- + drivers/gpu/drm/i915/i915_debugfs.c | 1047 +--------- + drivers/gpu/drm/i915/i915_drv.c | 146 +- + drivers/gpu/drm/i915/i915_drv.h | 880 +++++--- + drivers/gpu/drm/i915/i915_gem.c | 266 +-- + drivers/gpu/drm/i915/i915_gem.h | 4 +- + drivers/gpu/drm/i915/i915_gem_context.c | 244 +-- + drivers/gpu/drm/i915/i915_gem_context.h | 277 +++ + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 2 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 165 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 10 +- + drivers/gpu/drm/i915/i915_gem_fence_reg.c | 36 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 193 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 21 +- + drivers/gpu/drm/i915/i915_gem_internal.c | 4 +- + drivers/gpu/drm/i915/i915_gem_request.c | 75 +- + drivers/gpu/drm/i915/i915_gem_request.h | 11 - + drivers/gpu/drm/i915/i915_gem_stolen.c | 119 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 2 +- + drivers/gpu/drm/i915/i915_gem_timeline.c | 16 +- + drivers/gpu/drm/i915/i915_gem_timeline.h | 2 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 2 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 115 +- + drivers/gpu/drm/i915/i915_guc_reg.h | 7 +- + drivers/gpu/drm/i915/i915_guc_submission.c | 368 ++-- + drivers/gpu/drm/i915/i915_irq.c | 14 +- + drivers/gpu/drm/i915/i915_oa_hsw.c | 752 +++++++ + drivers/gpu/drm/i915/i915_oa_hsw.h | 38 + + drivers/gpu/drm/i915/i915_params.c | 6 +- + drivers/gpu/drm/i915/i915_params.h | 2 +- + drivers/gpu/drm/i915/i915_pci.c | 183 +- + drivers/gpu/drm/i915/i915_perf.c | 2096 +++++++++++++++++++ + drivers/gpu/drm/i915/i915_reg.h | 462 ++++- + drivers/gpu/drm/i915/i915_suspend.c | 16 +- + drivers/gpu/drm/i915/i915_sw_fence.c | 140 +- + drivers/gpu/drm/i915/i915_sw_fence.h | 6 + + drivers/gpu/drm/i915/i915_sysfs.c | 4 +- + drivers/gpu/drm/i915/i915_trace.h | 34 +- + drivers/gpu/drm/i915/i915_utils.h | 64 + + drivers/gpu/drm/i915/i915_vma.c | 52 +- + drivers/gpu/drm/i915/i915_vma.h | 18 +- + drivers/gpu/drm/i915/intel_atomic.c | 31 - + drivers/gpu/drm/i915/intel_atomic_plane.c | 51 +- + drivers/gpu/drm/i915/intel_audio.c | 39 +- + drivers/gpu/drm/i915/intel_bios.c | 27 +- + drivers/gpu/drm/i915/intel_breadcrumbs.c | 10 +- + drivers/gpu/drm/i915/intel_crt.c | 7 +- + drivers/gpu/drm/i915/intel_csr.c | 4 +- + drivers/gpu/drm/i915/intel_ddi.c | 70 +- + drivers/gpu/drm/i915/intel_device_info.c | 53 +- + drivers/gpu/drm/i915/intel_display.c | 744 ++++--- + drivers/gpu/drm/i915/intel_dp.c | 314 ++- + drivers/gpu/drm/i915/intel_dp_mst.c | 28 +- + drivers/gpu/drm/i915/intel_dpio_phy.c | 130 +- + drivers/gpu/drm/i915/intel_dpll_mgr.c | 351 +++- + drivers/gpu/drm/i915/intel_dpll_mgr.h | 178 +- + drivers/gpu/drm/i915/intel_drv.h | 103 +- + drivers/gpu/drm/i915/intel_dsi.c | 46 +- + drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 38 +- + drivers/gpu/drm/i915/intel_dsi_pll.c | 18 +- + drivers/gpu/drm/i915/intel_dvo.c | 9 +- + drivers/gpu/drm/i915/intel_engine_cs.c | 28 +- + drivers/gpu/drm/i915/intel_fbc.c | 18 +- + drivers/gpu/drm/i915/intel_fbdev.c | 14 +- + drivers/gpu/drm/i915/intel_guc_fwif.h | 55 +- + drivers/gpu/drm/i915/intel_guc_loader.c | 49 +- + drivers/gpu/drm/i915/intel_hangcheck.c | 256 ++- + drivers/gpu/drm/i915/intel_hdmi.c | 184 +- + drivers/gpu/drm/i915/intel_i2c.c | 22 +- + drivers/gpu/drm/i915/intel_lrc.c | 216 +- + drivers/gpu/drm/i915/intel_lrc.h | 9 +- + drivers/gpu/drm/i915/intel_lspcon.c | 94 +- + drivers/gpu/drm/i915/intel_lvds.c | 8 +- + drivers/gpu/drm/i915/intel_mocs.c | 7 +- + drivers/gpu/drm/i915/intel_mocs.h | 2 +- + drivers/gpu/drm/i915/intel_overlay.c | 286 +-- + drivers/gpu/drm/i915/intel_panel.c | 32 +- + drivers/gpu/drm/i915/intel_pipe_crc.c | 939 +++++++++ + drivers/gpu/drm/i915/intel_pm.c | 843 ++++---- + drivers/gpu/drm/i915/intel_psr.c | 6 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 85 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 66 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 163 +- + drivers/gpu/drm/i915/intel_sdvo.c | 21 +- + drivers/gpu/drm/i915/intel_sprite.c | 131 +- + drivers/gpu/drm/i915/intel_tv.c | 4 +- + drivers/gpu/drm/i915/intel_uc.c | 142 ++ + drivers/gpu/drm/i915/{intel_guc.h => intel_uc.h} | 41 +- + drivers/gpu/drm/i915/intel_uncore.c | 14 +- + drivers/gpu/drm/i915/intel_vbt_defs.h | 12 +- + 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/lib/drm_random.c | 41 + + drivers/gpu/drm/lib/drm_random.h | 25 + + 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.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_connector.h | 1 + + drivers/gpu/drm/nouveau/nouveau_display.c | 10 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 6 +- + 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/selftests/Makefile | 1 + + drivers/gpu/drm/selftests/drm_mm_selftests.h | 23 + + drivers/gpu/drm/selftests/drm_selftest.c | 109 + + drivers/gpu/drm/selftests/drm_selftest.h | 41 + + drivers/gpu/drm/selftests/test-drm_mm.c | 2172 ++++++++++++++++++++ + 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/drmP.h | 13 + + include/drm/drm_atomic.h | 8 +- + include/drm/drm_atomic_helper.h | 3 - + include/drm/drm_auth.h | 17 +- + include/drm/drm_bridge.h | 4 +- + include/drm/drm_connector.h | 79 +- + include/drm/drm_crtc.h | 8 - + include/drm/drm_encoder.h | 7 +- + include/drm/drm_encoder_slave.h | 1 + + include/drm/drm_framebuffer.h | 27 +- + include/drm/drm_mm.h | 300 ++- + 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/drm/i915_pciids.h | 21 +- + include/drm/intel-gtt.h | 6 +- + include/linux/dma-buf.h | 224 +- + include/linux/kref.h | 2 +- + include/linux/prime_numbers.h | 37 + + include/linux/reservation.h | 34 + + include/uapi/drm/drm_fourcc.h | 11 + + include/uapi/drm/i915_drm.h | 135 ++ + lib/Kconfig | 7 + + lib/Makefile | 2 + + lib/prime_numbers.c | 314 +++ + tools/testing/selftests/drivers/gpu/drm_mm.sh | 15 + + tools/testing/selftests/lib/prime_numbers.sh | 15 + + 314 files changed, 15067 insertions(+), 6167 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/ti,ths8135.txt + delete mode 100644 Documentation/dma-buf-sharing.txt + create mode 100644 drivers/gpu/drm/i915/i915_gem_context.h + create mode 100644 drivers/gpu/drm/i915/i915_oa_hsw.c + create mode 100644 drivers/gpu/drm/i915/i915_oa_hsw.h + create mode 100644 drivers/gpu/drm/i915/i915_perf.c + create mode 100644 drivers/gpu/drm/i915/i915_utils.h + create mode 100644 drivers/gpu/drm/i915/intel_pipe_crc.c + create mode 100644 drivers/gpu/drm/i915/intel_uc.c + rename drivers/gpu/drm/i915/{intel_guc.h => intel_uc.h} (85%) + create mode 100644 drivers/gpu/drm/lib/drm_random.c + create mode 100644 drivers/gpu/drm/lib/drm_random.h + create mode 100644 drivers/gpu/drm/selftests/Makefile + create mode 100644 drivers/gpu/drm/selftests/drm_mm_selftests.h + create mode 100644 drivers/gpu/drm/selftests/drm_selftest.c + create mode 100644 drivers/gpu/drm/selftests/drm_selftest.h + create mode 100644 drivers/gpu/drm/selftests/test-drm_mm.c + create mode 100644 include/linux/prime_numbers.h + create mode 100644 lib/prime_numbers.c + create mode 100755 tools/testing/selftests/drivers/gpu/drm_mm.sh + create mode 100755 tools/testing/selftests/lib/prime_numbers.sh +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 (9f547425fd9f drm: crc: Call wake_up_interruptible() each time there is a new CRC entry) +$ git merge drm-misc/for-linux-next +Auto-merging include/drm/drmP.h +Auto-merging drivers/gpu/drm/drm_atomic_helper.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Merge made by the 'recursive' strategy. + Documentation/gpu/drm-mm.rst | 40 ++++++--- + Documentation/gpu/drm-uapi.rst | 25 +++--- + Documentation/gpu/introduction.rst | 15 ++-- + drivers/dma-buf/dma-buf.c | 9 +- + drivers/gpu/drm/Kconfig | 9 +- + drivers/gpu/drm/Makefile | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 3 +- + drivers/gpu/drm/armada/Makefile | 2 + + drivers/gpu/drm/armada/armada_debugfs.c | 6 +- + drivers/gpu/drm/armada/armada_drv.c | 6 -- + drivers/gpu/drm/drm_atomic.c | 27 ++---- + drivers/gpu/drm/drm_atomic_helper.c | 24 ++++-- + drivers/gpu/drm/drm_auth.c | 8 +- + drivers/gpu/drm/drm_bridge.c | 29 +++---- + drivers/gpu/drm/drm_color_mgmt.c | 4 +- + drivers/gpu/drm/drm_connector.c | 2 +- + drivers/gpu/drm/drm_crtc.c | 20 +++++ + drivers/gpu/drm/drm_crtc_helper.c | 14 +-- + drivers/gpu/drm/drm_debugfs_crc.c | 34 ++++++-- + drivers/gpu/drm/drm_drv.c | 20 +++-- + drivers/gpu/drm/drm_dumb_buffers.c | 2 +- + drivers/gpu/drm/drm_edid.c | 6 +- + drivers/gpu/drm/drm_encoder.c | 4 +- + drivers/gpu/drm/drm_fb_cma_helper.c | 86 ++++++++----------- + drivers/gpu/drm/drm_fops.c | 2 +- + drivers/gpu/drm/drm_framebuffer.c | 6 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 93 +++++++++++++++++--- + drivers/gpu/drm/drm_global.c | 23 +++++ + drivers/gpu/drm/drm_ioctl.c | 11 ++- + drivers/gpu/drm/drm_irq.c | 2 +- + drivers/gpu/drm/drm_legacy.h | 7 ++ + drivers/gpu/drm/drm_mm.c | 108 ++++++++---------------- + drivers/gpu/drm/drm_pci.c | 4 - + drivers/gpu/drm/drm_plane.c | 2 +- + drivers/gpu/drm/drm_plane_helper.c | 2 +- + drivers/gpu/drm/drm_platform.c | 4 - + drivers/gpu/drm/drm_print.c | 6 ++ + drivers/gpu/drm/drm_probe_helper.c | 2 +- + drivers/gpu/drm/drm_property.c | 2 +- + drivers/gpu/drm/drm_rect.c | 6 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 10 ++- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 4 - + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 4 - + drivers/gpu/drm/imx/imx-tve.c | 11 +-- + drivers/gpu/drm/mgag200/mgag200_main.c | 2 + + drivers/gpu/drm/msm/msm_debugfs.c | 6 +- + drivers/gpu/drm/nouveau/Kconfig | 1 + + drivers/gpu/drm/omapdrm/omap_debugfs.c | 6 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 6 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 6 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 17 +--- + drivers/gpu/drm/selftests/test-drm_mm.c | 12 ++- + drivers/gpu/drm/tegra/drm.c | 9 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 4 +- + drivers/gpu/drm/ttm/ttm_bo_manager.c | 3 +- + drivers/gpu/drm/virtio/virtgpu_drm_bus.c | 4 - + drivers/gpu/drm/zte/zx_vou.c | 15 +--- + drivers/video/fbdev/Kconfig | 8 ++ + drivers/video/fbdev/core/fbmem.c | 18 +++- + include/drm/drmP.h | 1 + + include/drm/drm_atomic.h | 23 ++++- + include/drm/drm_auth.h | 2 +- + include/drm/drm_bridge.h | 42 +++++---- + include/drm/drm_connector.h | 16 ++-- + include/drm/drm_crtc.h | 23 ++--- + include/drm/drm_drv.h | 35 ++++++++ + include/drm/drm_fb_cma_helper.h | 5 +- + include/drm/drm_fb_helper.h | 2 +- + include/drm/drm_framebuffer.h | 6 +- + include/drm/drm_gem_cma_helper.h | 17 ++++ + include/drm/drm_irq.h | 4 +- + include/drm/drm_mm.h | 93 ++++++++++++++------ + include/drm/drm_mode_config.h | 10 +-- + include/drm/drm_modeset_helper_vtables.h | 2 +- + include/drm/drm_plane.h | 4 +- + include/drm/drm_print.h | 24 +++++- + include/drm/drm_simple_kms_helper.h | 8 +- + include/linux/dma-buf.h | 10 +-- + 81 files changed, 689 insertions(+), 473 deletions(-) +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 (575e2de15c0d Merge branches 'sunxi/clk-for-4.11', 'sunxi/core-for-4.11', 'sunxi/defconfig-for-4.11', 'sunxi/drm-for-4.11', 'sunxi/dt-for-4.11', 'sunxi/dt64-for-4.11' and 'sunxi/fixes-for-4.10' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging drivers/gpu/drm/sun4i/sun4i_backend.c +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/arm/sunxi/README | 4 + + Documentation/devicetree/bindings/arm/sunxi.txt | 1 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/boot/dts/Makefile | 3 + + arch/arm/boot/dts/sun4i-a10-a1000.dts | 43 +++- + 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-licheepi-one.dts | 224 ++++++++++++++++ + 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 | 84 +++--- + 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 | 46 +++- + arch/arm/boot/dts/sun6i-a31-i7.dts | 25 +- + 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 | 121 ++++----- + 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 | 41 ++- + 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 | 70 +++-- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 27 +- + .../boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts | 8 +- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 123 ++++----- + 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 | 283 ++++++++------------- + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 104 ++++---- + 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 | 41 ++- + arch/arm/boot/dts/sun8i-a83t.dtsi | 22 +- + arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 160 ++++++++++++ + 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 | 30 +-- + 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 +- + arch/arm/configs/sunxi_defconfig | 1 + + arch/arm/mach-sunxi/sunxi.c | 1 + + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 23 +- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 59 +++++ + drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 4 +- + drivers/clk/sunxi-ng/ccu-sun8i-a33.c | 12 +- + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 10 + + drivers/gpu/drm/sun4i/sun4i_backend.c | 2 +- + 113 files changed, 1813 insertions(+), 1840 deletions(-) + create mode 100644 arch/arm/boot/dts/sun5i-a13-licheepi-one.dts + create mode 100644 arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts +Merging kspp/for-next/kspp (3545d3c27c43 gcc-plugins: update gcc-common.h for gcc-7) +$ git merge kspp/for-next/kspp +Merge made by the 'recursive' strategy. +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 (a5cb009162e6 Merge tag 'regmap-v4.10' into regmap-linus) +$ git merge regmap/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging sound/for-next (921282360b9c ALSA: firewire-tascam: enclose identifiers referred by single function) +$ git merge sound/for-next +Auto-merging sound/pci/hda/patch_realtek.c +Merge made by the 'recursive' strategy. + sound/drivers/vx/vx_pcm.c | 8 +++-- + sound/firewire/Kconfig | 1 + + sound/firewire/bebob/bebob_hwdep.c | 17 +++++----- + sound/firewire/bebob/bebob_midi.c | 26 +++++++-------- + sound/firewire/bebob/bebob_pcm.c | 51 ++++++++++++++--------------- + sound/firewire/dice/dice-interface.h | 1 + + sound/firewire/dice/dice-midi.c | 22 ++++++------- + sound/firewire/dice/dice-stream.c | 12 ++++++- + sound/firewire/digi00x/digi00x-hwdep.c | 17 +++++----- + sound/firewire/digi00x/digi00x-midi.c | 52 ++++++++++++++---------------- + sound/firewire/digi00x/digi00x-pcm.c | 52 ++++++++++++++---------------- + sound/firewire/fireworks/fireworks_hwdep.c | 19 ++++++----- + sound/firewire/fireworks/fireworks_midi.c | 26 +++++++-------- + sound/firewire/fireworks/fireworks_pcm.c | 52 ++++++++++++++---------------- + sound/firewire/oxfw/oxfw-midi.c | 26 +++++++-------- + sound/firewire/oxfw/oxfw.c | 1 + + sound/firewire/tascam/tascam-hwdep.c | 17 +++++----- + sound/firewire/tascam/tascam-midi.c | 26 +++++++-------- + sound/firewire/tascam/tascam-pcm.c | 52 ++++++++++++++---------------- + sound/pci/cs5535audio/cs5535audio_pm.c | 4 +-- + sound/pci/hda/hda_intel.c | 13 ++++++++ + sound/pci/hda/patch_realtek.c | 20 +++++++++++- + sound/pci/mixart/mixart.h | 2 +- + sound/pci/vx222/vx222_ops.c | 12 +++---- + sound/pcmcia/vx/vxp_ops.c | 12 +++---- + sound/synth/emux/emux_seq.c | 14 ++++---- + sound/usb/quirks.c | 15 +++++++++ + 27 files changed, 303 insertions(+), 267 deletions(-) +Merging sound-asoc/for-next (e1c203b78560 Merge remote-tracking branches 'asoc/fix/tlv320aic3x' 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 ++-- + include/sound/soc.h | 3 ++ + sound/soc/codecs/nau8825.c | 9 +++-- + sound/soc/codecs/nau8825.h | 7 ++-- + sound/soc/codecs/tlv320aic3x.c | 13 ++++++ + sound/soc/codecs/wm_adsp.c | 25 +++++++++++- + sound/soc/dwc/designware_i2s.c | 25 ++++++------ + sound/soc/fsl/fsl_ssi.c | 74 +++++++++++++++++++++++++---------- + sound/soc/intel/boards/bytcr_rt5640.c | 16 ++++++-- + sound/soc/intel/skylake/skl-pcm.c | 3 ++ + sound/soc/sh/rcar/core.c | 4 +- + sound/soc/soc-core.c | 10 ++--- + sound/soc/soc-topology.c | 3 +- + 13 files changed, 140 insertions(+), 60 deletions(-) +Merging modules/modules-next (ea6351698b6c taint/module: Fix problems when out-of-kernel driver defines true or false) +$ git merge modules/modules-next +Merge made by the 'recursive' strategy. + include/linux/kernel.h | 4 ++-- + include/linux/module.h | 2 -- + kernel/module.c | 2 +- + kernel/panic.c | 2 +- + 4 files changed, 4 insertions(+), 6 deletions(-) +Merging input/next (aa142ed77099 Input: intel-mid-touch - remove driver) +$ git merge input/next +Removing drivers/input/touchscreen/intel-mid-touch.c +Auto-merging drivers/input/serio/i8042-x86ia64io.h +Auto-merging drivers/input/joystick/xpad.c +Merge made by the 'recursive' strategy. + drivers/input/joystick/xpad.c | 112 +++-- + drivers/input/misc/bma150.c | 4 +- + drivers/input/serio/i8042-x86ia64io.h | 8 + + drivers/input/touchscreen/Kconfig | 12 - + drivers/input/touchscreen/Makefile | 1 - + drivers/input/touchscreen/edt-ft5x06.c | 4 +- + drivers/input/touchscreen/intel-mid-touch.c | 654 ---------------------------- + 7 files changed, 64 insertions(+), 731 deletions(-) + delete mode 100644 drivers/input/touchscreen/intel-mid-touch.c +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 (9bd22fc27d92 mmc: block: Replace "goto retry" by a proper do / while loop) +$ git merge mmc/next +Merge made by the 'recursive' strategy. + drivers/mmc/core/block.c | 31 +++++++++--------- + drivers/mmc/core/mmc.c | 12 +++++++ + drivers/mmc/host/sh_mobile_sdhi.c | 66 +++++++++++++++------------------------ + drivers/mmc/host/tmio_mmc_pio.c | 7 +++-- + include/linux/mmc/card.h | 3 ++ + include/linux/mmc/mmc.h | 3 ++ + 6 files changed, 62 insertions(+), 60 deletions(-) +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 (705cb50bce73 raid5: only dispatch IO from raid5d for harddisk raid) +$ 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 | 10 ++ + drivers/md/multipath.c | 4 + + drivers/md/raid0.c | 14 ++- + drivers/md/raid1.c | 275 +++++++++++++++++++++++++---------------------- + drivers/md/raid10.c | 245 +++++++++++++++++++++++------------------ + drivers/md/raid5-cache.c | 36 +++---- + drivers/md/raid5.c | 60 ++++++++++- + drivers/md/raid5.h | 4 + + 10 files changed, 430 insertions(+), 262 deletions(-) +Merging mfd/for-mfd-next (6f96d7eab40f mfd: axp20x: Fix AXP806 access errors on cold boot) +$ git merge mfd/for-mfd-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mfd/aspeed-gfx.txt | 17 + + .../devicetree/bindings/mfd/aspeed-lpc.txt | 137 ++++ + Documentation/devicetree/bindings/mfd/mfd.txt | 12 +- + Documentation/mtd/intel-spi.txt | 88 +++ + drivers/mfd/Kconfig | 1 + + drivers/mfd/arizona-irq.c | 86 ++- + drivers/mfd/arizona.h | 2 - + drivers/mfd/axp20x.c | 78 ++- + drivers/mfd/cros_ec.c | 51 ++ + drivers/mfd/lpc_ich.c | 131 ++++ + drivers/mfd/sun6i-prcm.c | 13 + + drivers/mtd/spi-nor/Kconfig | 20 + + drivers/mtd/spi-nor/Makefile | 2 + + drivers/mtd/spi-nor/intel-spi-platform.c | 57 ++ + drivers/mtd/spi-nor/intel-spi.c | 777 +++++++++++++++++++++ + drivers/mtd/spi-nor/intel-spi.h | 24 + + drivers/platform/chrome/cros_ec_proto.c | 5 + + drivers/power/supply/axp288_charger.c | 132 ++-- + drivers/power/supply/axp288_fuel_gauge.c | 405 +---------- + include/linux/mfd/abx500.h | 2 +- + include/linux/mfd/abx500/ab8500-bm.h | 4 +- + include/linux/mfd/axp20x.h | 49 +- + include/linux/mfd/cros_ec.h | 2 + + include/linux/mfd/cros_ec_commands.h | 14 + + include/linux/mfd/lpc_ich.h | 3 + + include/linux/platform_data/intel-spi.h | 31 + + 26 files changed, 1621 insertions(+), 522 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/aspeed-gfx.txt + create mode 100644 Documentation/devicetree/bindings/mfd/aspeed-lpc.txt + create mode 100644 Documentation/mtd/intel-spi.txt + create mode 100644 drivers/mtd/spi-nor/intel-spi-platform.c + create mode 100644 drivers/mtd/spi-nor/intel-spi.c + create mode 100644 drivers/mtd/spi-nor/intel-spi.h + create mode 100644 include/linux/platform_data/intel-spi.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 (af5179a405c0 power: supply: remove Intel Moorestown battery support) +$ git merge battery/for-next +Removing drivers/power/supply/intel_mid_battery.c +Merge made by the 'recursive' strategy. + .../bindings/power/supply/axp20x_usb_power.txt | 5 + + .../bindings/power/supply/sbs_sbs-charger.txt | 23 + + .../bindings/power/supply/ti,bq24735.txt | 8 +- + drivers/power/supply/Kconfig | 13 +- + drivers/power/supply/Makefile | 2 +- + drivers/power/supply/ab8500_btemp.c | 6 +- + drivers/power/supply/axp20x_usb_power.c | 116 ++- + drivers/power/supply/axp288_charger.c | 277 +++---- + drivers/power/supply/axp288_fuel_gauge.c | 134 ++-- + drivers/power/supply/bq24190_charger.c | 2 +- + drivers/power/supply/bq24735-charger.c | 108 ++- + drivers/power/supply/gpio-charger.c | 84 ++- + drivers/power/supply/intel_mid_battery.c | 795 --------------------- + drivers/power/supply/max8997_charger.c | 15 +- + drivers/power/supply/qcom_smbb.c | 2 +- + drivers/power/supply/sbs-charger.c | 274 +++++++ + drivers/power/supply/tps65217_charger.c | 99 +-- + drivers/power/supply/wm97xx_battery.c | 5 - + 18 files changed, 764 insertions(+), 1204 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/supply/sbs_sbs-charger.txt + delete mode 100644 drivers/power/supply/intel_mid_battery.c + create mode 100644 drivers/power/supply/sbs-charger.c +Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (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 (36872bf3f5e3 selinux: default to security isid in sel_make_bools() if no sid is found) +$ git merge selinux/next +Auto-merging security/smack/smack_lsm.c +Auto-merging security/selinux/include/classmap.h +Auto-merging security/selinux/hooks.c +Auto-merging fs/proc/base.c +Merge made by the 'recursive' strategy. + fs/proc/base.c | 13 +- + include/linux/lsm_hooks.h | 3 +- + include/linux/security.h | 4 +- + security/apparmor/lsm.c | 7 +- + security/security.c | 4 +- + security/selinux/hooks.c | 380 ++++++++++++++++++------------------ + security/selinux/include/classmap.h | 68 +++++++ + security/selinux/include/objsec.h | 10 + + security/selinux/include/security.h | 3 +- + security/selinux/selinuxfs.c | 98 ++++++---- + security/selinux/ss/services.c | 3 + + security/smack/smack_lsm.c | 11 +- + 12 files changed, 351 insertions(+), 253 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 (7ce7d89f4883 Linux 4.10-rc1) +$ git merge watchdog/master +Already up-to-date. +Merging iommu/next (fce794089d60 Merge branches 'iommu/fixes' and 'core' into next) +$ git merge iommu/next +Merge made by the 'recursive' strategy. + drivers/iommu/iova.c | 23 +++++++++++------------ + 1 file changed, 11 insertions(+), 12 deletions(-) +Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (2b8bb1d771f7 vfio iommu type1: Fix size argument to vfio_find_dma() in pin_pages/unpin_pages) +$ git merge vfio/next +Already up-to-date. +Merging trivial/for-next (74dcba3589fc NTB: correct ntb_spad_count comment typo) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/next (89670affa2a6 audit: Make AUDIT_ANOM_ABEND event normalized) +$ git merge audit/next +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 (63c343d384d1 dt-bindings: qman: Remove pool channel node) +$ git merge devicetree/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/mvebu-gated-clock.txt | 2 +- + .../devicetree/bindings/display/panel/panel-dpi.txt | 2 +- + Documentation/devicetree/bindings/iommu/arm,smmu.txt | 10 +++++----- + .../devicetree/bindings/mfd/omap-usb-host.txt | 4 ++-- + Documentation/devicetree/bindings/pci/pci-iommu.txt | 6 +++--- + .../devicetree/bindings/soc/fsl/qman-portals.txt | 20 -------------------- + Documentation/devicetree/bindings/usb/ehci-omap.txt | 1 - + 7 files changed, 12 insertions(+), 33 deletions(-) +Merging mailbox/mailbox-for-next (db4d22c07e3e mailbox: mailbox-test: allow reserved areas in SRAM) +$ git merge mailbox/mailbox-for-next +Already up-to-date. +Merging spi/for-next (e3cd632d6f15 Merge remote-tracking branches 'spi/fix/armada', 'spi/fix/dw', 'spi/fix/fsl-dspi', 'spi/fix/pxa2xx' 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-dw-mid.c | 4 ++-- + drivers/spi/spi-dw.c | 5 ++++- + drivers/spi/spi-pxa2xx.c | 1 + + drivers/spi/spi-sh-msiof.c | 4 +++- + 7 files changed, 30 insertions(+), 15 deletions(-) +Merging tip/auto-latest (532fdcc19d3d Merge branch 'x86/boot') +$ git merge tip/auto-latest +Removing arch/x86/platform/intel-mid/device_libs/platform_pmic_gpio.c +Auto-merging arch/x86/platform/intel-mid/device_libs/platform_mrfld_spidev.c +Removing arch/x86/platform/intel-mid/device_libs/platform_ipc.h +Removing arch/x86/platform/intel-mid/device_libs/platform_ipc.c +Merge made by the 'recursive' strategy. + Documentation/x86/intel_rdt_ui.txt | 114 ++++++++++++ + arch/x86/events/amd/ibs.c | 2 +- + arch/x86/events/intel/cstate.c | 2 + + arch/x86/events/intel/rapl.c | 1 + + arch/x86/events/intel/uncore.c | 1 + + arch/x86/include/asm/e820.h | 2 - + arch/x86/include/asm/intel-family.h | 2 +- + arch/x86/include/asm/intel-mid.h | 4 +- + arch/x86/include/asm/pgtable_32.h | 32 ++++ + arch/x86/kernel/apic/apic.c | 14 +- + arch/x86/kernel/apic/vector.c | 2 +- + arch/x86/kernel/cpu/amd.c | 9 +- + arch/x86/kernel/cpu/common.c | 2 +- + arch/x86/kernel/cpu/mcheck/mce_amd.c | 4 +- + arch/x86/kernel/cpu/mcheck/therm_throt.c | 6 +- + arch/x86/kernel/cpu/mcheck/threshold.c | 4 +- + arch/x86/kernel/e820.c | 16 +- + arch/x86/kernel/head32.c | 62 +++++++ + arch/x86/kernel/head_32.S | 121 +------------ + arch/x86/kernel/irq.c | 4 +- + arch/x86/kernel/irq_work.c | 5 +- + arch/x86/kernel/smp.c | 15 +- + arch/x86/platform/intel-mid/device_libs/Makefile | 4 +- + .../intel-mid/device_libs/platform_gpio_keys.c | 3 + + .../platform/intel-mid/device_libs/platform_ipc.c | 68 ------- + .../platform/intel-mid/device_libs/platform_ipc.h | 18 -- + .../{platform_spidev.c => platform_mrfld_spidev.c} | 4 + + .../intel-mid/device_libs/platform_msic_audio.c | 3 +- + .../intel-mid/device_libs/platform_msic_battery.c | 3 +- + .../intel-mid/device_libs/platform_msic_gpio.c | 3 +- + .../intel-mid/device_libs/platform_msic_ocd.c | 3 +- + .../device_libs/platform_msic_power_btn.c | 3 +- + .../intel-mid/device_libs/platform_msic_thermal.c | 3 +- + .../intel-mid/device_libs/platform_pmic_gpio.c | 54 ------ + arch/x86/platform/intel-mid/sfi.c | 55 +++--- + drivers/firmware/efi/libstub/efistub.h | 8 - + drivers/firmware/efi/libstub/fdt.c | 87 +++++---- + samples/bpf/sock_example.h | 2 +- + samples/bpf/trace_output_user.c | 1 - + tools/lib/subcmd/parse-options.c | 3 + + tools/lib/subcmd/parse-options.h | 5 + + tools/lib/traceevent/plugin_sched_switch.c | 4 +- + tools/perf/Documentation/perf-record.txt | 4 + + tools/perf/Makefile.perf | 4 +- + tools/perf/builtin-record.c | 4 +- + tools/perf/builtin-sched.c | 17 +- + tools/perf/util/probe-event.c | 105 +++++++---- + tools/perf/util/symbol-elf.c | 6 + + tools/testing/selftests/x86/Makefile | 2 +- + tools/testing/selftests/x86/sysret_rip.c | 195 +++++++++++++++++++++ + 50 files changed, 666 insertions(+), 429 deletions(-) + delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_ipc.c + delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_ipc.h + rename arch/x86/platform/intel-mid/device_libs/{platform_spidev.c => platform_mrfld_spidev.c} (91%) + delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_pmic_gpio.c + create mode 100644 tools/testing/selftests/x86/sysret_rip.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 +Resolved 'Documentation/00-INDEX' using previous resolution. +Resolved 'drivers/edac/edac_device.c' using previous resolution. +Resolved 'drivers/edac/edac_pci.c' using previous resolution. +Auto-merging drivers/edac/edac_pci.c +CONFLICT (content): Merge conflict in drivers/edac/edac_pci.c +Auto-merging drivers/edac/edac_device.c +CONFLICT (content): Merge conflict in drivers/edac/edac_device.c +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 +[master 756962511c72] Merge remote-tracking branch 'edac/linux_next' +$ git diff -M --stat --summary HEAD^.. +Merging edac-amd/for-next (eca90a3b3226 EDAC: Fix typos in enum mem_type comments) +$ git merge edac-amd/for-next +Merge made by the 'recursive' strategy. + drivers/edac/edac_mc_sysfs.c | 2 +- + include/linux/edac.h | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging irqchip/irqchip/for-next (88e20c74ee02 irqchip/mxs: Enable SKIP_SET_WAKE and MASK_ON_SUSPEND) +$ git merge irqchip/irqchip/for-next +Merge made by the 'recursive' strategy. + drivers/irqchip/irq-keystone.c | 28 +++++++++++++++++++--------- + drivers/irqchip/irq-mxs.c | 4 ++++ + 2 files changed, 23 insertions(+), 9 deletions(-) +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 (7acd02c9e62f squash! rcu: Check cond_resched_rcu_qs() state less often to reduce GP overhead) +$ git merge rcu/rcu/next +Merge made by the 'recursive' strategy. + .../Design/Data-Structures/Data-Structures.html | 5 +- + .../Design/Expedited-Grace-Periods/ExpRCUFlow.svg | 830 +++++++++++++++++++++ + .../Expedited-Grace-Periods/ExpSchedFlow.svg | 826 ++++++++++++++++++++ + .../Expedited-Grace-Periods.html | 626 ++++++++++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel0.svg | 275 +++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel1.svg | 275 +++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel2.svg | 287 +++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel3.svg | 323 ++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel4.svg | 323 ++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel5.svg | 335 +++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel6.svg | 335 +++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel7.svg | 347 +++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel8.svg | 311 ++++++++ + .../RCU/Design/Requirements/Requirements.html | 12 +- + Documentation/memory-barriers.txt | 70 +- + include/linux/llist.h | 37 +- + include/linux/rcupdate.h | 20 + + include/linux/rcutiny.h | 21 + + include/linux/rcutree.h | 2 + + include/linux/sched.h | 3 +- + include/linux/srcu.h | 4 +- + include/trace/events/rcu.h | 10 +- + init/Kconfig | 14 - + kernel/locking/lockdep.c | 12 +- + kernel/locking/locktorture.c | 6 + + kernel/membarrier.c | 4 + + kernel/rcu/rcutorture.c | 18 +- + kernel/rcu/srcu.c | 122 ++- + kernel/rcu/tiny.c | 2 - + kernel/rcu/tree.c | 333 ++++++--- + kernel/rcu/tree.h | 15 +- + kernel/rcu/tree_exp.h | 28 +- + kernel/rcu/tree_plugin.h | 18 +- + kernel/rcu/tree_trace.c | 2 +- + kernel/rcu/update.c | 6 +- + kernel/sched/core.c | 1 + + lib/Kconfig.debug | 1 + + .../selftests/rcutorture/configs/rcu/CFcommon | 3 - + .../selftests/rcutorture/configs/rcu/TINY01 | 1 + + .../selftests/rcutorture/configs/rcu/TINY02 | 3 +- + .../selftests/rcutorture/configs/rcu/TREE01 | 3 + + .../selftests/rcutorture/configs/rcu/TREE02 | 4 + + .../selftests/rcutorture/configs/rcu/TREE03 | 3 + + .../selftests/rcutorture/configs/rcu/TREE04 | 4 + + .../selftests/rcutorture/configs/rcu/TREE05 | 3 + + .../selftests/rcutorture/configs/rcu/TREE06 | 3 + + .../selftests/rcutorture/configs/rcu/TREE07 | 3 + + .../selftests/rcutorture/configs/rcu/TREE08 | 4 +- + .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 33 +- + .../rcutorture/formal/srcu-cbmc/.gitignore | 1 + + .../selftests/rcutorture/formal/srcu-cbmc/Makefile | 16 + + .../formal/srcu-cbmc/empty_includes/linux/delay.h | 0 + .../formal/srcu-cbmc/empty_includes/linux/export.h | 0 + .../formal/srcu-cbmc/empty_includes/linux/mutex.h | 0 + .../formal/srcu-cbmc/empty_includes/linux/percpu.h | 0 + .../srcu-cbmc/empty_includes/linux/preempt.h | 0 + .../srcu-cbmc/empty_includes/linux/rcupdate.h | 0 + .../formal/srcu-cbmc/empty_includes/linux/sched.h | 0 + .../formal/srcu-cbmc/empty_includes/linux/smp.h | 0 + .../srcu-cbmc/empty_includes/linux/workqueue.h | 0 + .../srcu-cbmc/empty_includes/uapi/linux/types.h | 0 + .../formal/srcu-cbmc/include/linux/.gitignore | 1 + + .../formal/srcu-cbmc/include/linux/kconfig.h | 1 + + .../formal/srcu-cbmc/include/linux/types.h | 155 ++++ + .../rcutorture/formal/srcu-cbmc/modify_srcu.awk | 375 ++++++++++ + .../rcutorture/formal/srcu-cbmc/src/assume.h | 16 + + .../rcutorture/formal/srcu-cbmc/src/barriers.h | 41 + + .../rcutorture/formal/srcu-cbmc/src/bug_on.h | 13 + + .../formal/srcu-cbmc/src/combined_source.c | 13 + + .../rcutorture/formal/srcu-cbmc/src/config.h | 27 + + .../rcutorture/formal/srcu-cbmc/src/include_srcu.c | 31 + + .../rcutorture/formal/srcu-cbmc/src/int_typedefs.h | 33 + + .../rcutorture/formal/srcu-cbmc/src/locks.h | 220 ++++++ + .../rcutorture/formal/srcu-cbmc/src/misc.c | 11 + + .../rcutorture/formal/srcu-cbmc/src/misc.h | 58 ++ + .../rcutorture/formal/srcu-cbmc/src/percpu.h | 92 +++ + .../rcutorture/formal/srcu-cbmc/src/preempt.c | 78 ++ + .../rcutorture/formal/srcu-cbmc/src/preempt.h | 58 ++ + .../formal/srcu-cbmc/src/simple_sync_srcu.c | 50 ++ + .../rcutorture/formal/srcu-cbmc/src/workqueues.h | 102 +++ + .../srcu-cbmc/tests/store_buffering/.gitignore | 1 + + .../srcu-cbmc/tests/store_buffering/Makefile | 11 + + .../tests/store_buffering/assert_end.fail | 1 + + .../srcu-cbmc/tests/store_buffering/force.fail | 1 + + .../srcu-cbmc/tests/store_buffering/force2.fail | 1 + + .../srcu-cbmc/tests/store_buffering/force3.fail | 1 + + .../srcu-cbmc/tests/store_buffering/main.pass | 0 + .../formal/srcu-cbmc/tests/store_buffering/test.c | 72 ++ + .../formal/srcu-cbmc/tests/test_script.sh | 102 +++ + 89 files changed, 7224 insertions(+), 284 deletions(-) + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/ExpRCUFlow.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/ExpSchedFlow.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel0.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel1.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel2.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel3.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel4.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel5.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel6.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel7.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel8.svg + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/.gitignore + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/Makefile + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/delay.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/export.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/mutex.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/percpu.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/preempt.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/rcupdate.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/sched.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/smp.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/workqueue.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/uapi/linux/types.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/.gitignore + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/kconfig.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/types.h + create mode 100755 tools/testing/selftests/rcutorture/formal/srcu-cbmc/modify_srcu.awk + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/assume.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/barriers.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/bug_on.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/combined_source.c + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/config.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/include_srcu.c + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/int_typedefs.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/locks.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/misc.c + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/misc.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/percpu.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/preempt.c + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/preempt.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/simple_sync_srcu.c + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/workqueues.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/.gitignore + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/Makefile + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/assert_end.fail + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/force.fail + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/force2.fail + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/force3.fail + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/main.pass + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/test.c + create mode 100755 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/test_script.sh +Merging kvm/linux-next (0c744ea4f77d Linux 4.10-rc2) +$ git merge kvm/linux-next +Already up-to-date. +Merging kvm-arm/next (21cbe3cc8a48 arm64: KVM: pmu: Reset PMSELR_EL0.SEL to a sane value before entering the guest) +$ git merge kvm-arm/next +Already up-to-date. +Merging kvm-mips/next (07d9a380680d Linux 4.9-rc2) +$ git merge kvm-mips/next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (e34af7849014 KVM: PPC: Book3S: Move prototypes for KVM functions into kvm_ppc.h) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (252747dd7c67 KVM: s390: Get rid of ar_t) +$ git merge kvms390/next +Auto-merging arch/s390/kvm/vsie.c +Auto-merging arch/s390/kvm/priv.c +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 (0b47a6bd1150 Xen: ARM: Zero reserved fields of xatp before making hypervisor call) +$ 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 (8149a5258a30 platform/x86: intel_pmc_ipc: Remove unused iTCO_version variable) +$ git merge drivers-x86/for-next +Auto-merging drivers/platform/x86/fujitsu-laptop.c +Merge made by the 'recursive' strategy. + drivers/platform/x86/acer-wmi.c | 22 +++++++-- + drivers/platform/x86/fujitsu-laptop.c | 1 + + drivers/platform/x86/hp_accel.c | 1 + + drivers/platform/x86/intel_mid_thermal.c | 2 +- + drivers/platform/x86/intel_pmc_ipc.c | 2 - + drivers/platform/x86/mlx-platform.c | 84 +++++++++++++++++++------------- + 6 files changed, 71 insertions(+), 41 deletions(-) +Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch") +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. +Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (4e552c8cb5bc leds: add LED_ON brightness as boolean value) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/leds/common.txt | 28 +++++++++++++++-------- + include/linux/leds.h | 1 + + 2 files changed, 19 insertions(+), 10 deletions(-) +Merging ipmi/for-next (c5afee1b0dfc acpi:ipmi: Make IPMI user handler const) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + Documentation/IPMI.txt | 2 +- + drivers/acpi/acpi_ipmi.c | 2 +- + drivers/char/ipmi/ipmi_devintf.c | 2 +- + drivers/char/ipmi/ipmi_msghandler.c | 4 ++-- + drivers/char/ipmi/ipmi_watchdog.c | 2 +- + include/linux/ipmi.h | 2 +- + 6 files changed, 7 insertions(+), 7 deletions(-) +Merging driver-core/driver-core-next (0c744ea4f77d Linux 4.10-rc2) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (0c744ea4f77d Linux 4.10-rc2) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (0c744ea4f77d Linux 4.10-rc2) +$ 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 (0c744ea4f77d Linux 4.10-rc2) +$ 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 (7ce7d89f4883 Linux 4.10-rc1) +$ git merge phy-next/next +Already up-to-date. +Merging staging/staging-next (9b9cefd00faa staging: gdm724x: cleanup long lines to conform to kernel coding style) +$ git merge staging/staging-next +Removing drivers/staging/i4l/pcbit/pcbit.h +Removing drivers/staging/i4l/pcbit/module.c +Removing drivers/staging/i4l/pcbit/layer2.h +Removing drivers/staging/i4l/pcbit/layer2.c +Removing drivers/staging/i4l/pcbit/edss1.h +Removing drivers/staging/i4l/pcbit/edss1.c +Removing drivers/staging/i4l/pcbit/drv.c +Removing drivers/staging/i4l/pcbit/capi.h +Removing drivers/staging/i4l/pcbit/capi.c +Removing drivers/staging/i4l/pcbit/callbacks.h +Removing drivers/staging/i4l/pcbit/callbacks.c +Removing drivers/staging/i4l/pcbit/Makefile +Removing drivers/staging/i4l/pcbit/Kconfig +Removing drivers/staging/i4l/icn/icn.h +Removing drivers/staging/i4l/icn/icn.c +Removing drivers/staging/i4l/icn/Makefile +Removing drivers/staging/i4l/icn/Kconfig +Removing drivers/staging/i4l/act2000/module.c +Removing drivers/staging/i4l/act2000/capi.h +Removing drivers/staging/i4l/act2000/capi.c +Removing drivers/staging/i4l/act2000/act2000_isa.h +Removing drivers/staging/i4l/act2000/act2000_isa.c +Removing drivers/staging/i4l/act2000/act2000.h +Removing drivers/staging/i4l/act2000/Makefile +Removing drivers/staging/i4l/act2000/Kconfig +Removing drivers/staging/i4l/TODO +Removing drivers/staging/i4l/Makefile +Removing drivers/staging/i4l/Kconfig +Removing drivers/staging/i4l/Documentation/README.sc +Removing drivers/staging/i4l/Documentation/README.pcbit +Removing drivers/staging/i4l/Documentation/README.icn +Removing drivers/staging/i4l/Documentation/README.act2000 +Removing drivers/staging/greybus/timesync_platform.c +Removing drivers/staging/greybus/timesync.h +Removing drivers/staging/greybus/timesync.c +Merge made by the 'recursive' strategy. + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/android/ion/ion_cma_heap.c | 6 +- + drivers/staging/comedi/comedi_compat32.h | 3 +- + drivers/staging/comedi/comedi_fops.c | 6 +- + drivers/staging/comedi/comedi_internal.h | 9 +- + drivers/staging/comedi/comedi_pci.h | 18 +- + drivers/staging/comedi/comedi_pcmcia.c | 3 +- + drivers/staging/comedi/comedi_pcmcia.h | 22 +- + drivers/staging/comedi/comedi_usb.h | 16 +- + drivers/staging/comedi/comedidev.h | 55 +- + drivers/staging/comedi/drivers/addi_watchdog.h | 2 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 140 +- + drivers/staging/comedi/drivers/comedi_8254.h | 30 +- + drivers/staging/comedi/drivers/comedi_isadma.h | 10 +- + drivers/staging/comedi/drivers/mite.h | 37 +- + drivers/staging/comedi/drivers/ni_670x.c | 2 +- + drivers/staging/comedi/drivers/ni_at_ao.c | 62 +- + drivers/staging/comedi/drivers/ni_labpc.h | 4 +- + drivers/staging/comedi/drivers/ni_tio.h | 42 +- + drivers/staging/comedi/drivers/ni_tio_internal.h | 14 +- + drivers/staging/comedi/proc.c | 6 +- + drivers/staging/dgnc/TODO | 3 +- + drivers/staging/emxx_udc/emxx_udc.c | 30 +- + drivers/staging/fbtft/fb_agm1264k-fl.c | 18 +- + drivers/staging/gdm724x/gdm_endian.c | 24 +- + drivers/staging/gdm724x/gdm_endian.h | 15 +- + drivers/staging/gdm724x/gdm_lte.c | 27 +- + drivers/staging/gdm724x/hci_packet.h | 46 +- + drivers/staging/greybus/Makefile | 4 +- + drivers/staging/greybus/arche-apb-ctrl.c | 4 +- + drivers/staging/greybus/arche_platform.h | 2 - + drivers/staging/greybus/audio_topology.c | 2 +- + drivers/staging/greybus/connection.c | 6 + + drivers/staging/greybus/control.c | 50 - + drivers/staging/greybus/control.h | 7 - + drivers/staging/greybus/core.c | 11 - + drivers/staging/greybus/es2.c | 132 -- + drivers/staging/greybus/greybus.h | 1 - + drivers/staging/greybus/greybus_protocols.h | 47 - + drivers/staging/greybus/greybus_trace.h | 28 - + drivers/staging/greybus/hd.h | 7 - + drivers/staging/greybus/interface.c | 56 +- + drivers/staging/greybus/interface.h | 5 - + drivers/staging/greybus/log.c | 6 +- + drivers/staging/greybus/loopback.c | 11 + + drivers/staging/greybus/svc.c | 87 - + drivers/staging/greybus/svc.h | 7 - + drivers/staging/greybus/svc_watchdog.c | 4 +- + drivers/staging/greybus/timesync.c | 1357 ---------------- + drivers/staging/greybus/timesync.h | 45 - + drivers/staging/greybus/timesync_platform.c | 82 - + drivers/staging/i4l/Documentation/README.act2000 | 104 -- + drivers/staging/i4l/Documentation/README.icn | 148 -- + drivers/staging/i4l/Documentation/README.pcbit | 40 - + drivers/staging/i4l/Documentation/README.sc | 281 ---- + drivers/staging/i4l/Kconfig | 13 - + drivers/staging/i4l/Makefile | 5 - + drivers/staging/i4l/TODO | 3 - + drivers/staging/i4l/act2000/Kconfig | 9 - + drivers/staging/i4l/act2000/Makefile | 9 - + drivers/staging/i4l/act2000/act2000.h | 202 --- + drivers/staging/i4l/act2000/act2000_isa.c | 444 ----- + drivers/staging/i4l/act2000/act2000_isa.h | 136 -- + drivers/staging/i4l/act2000/capi.c | 1187 -------------- + drivers/staging/i4l/act2000/capi.h | 357 ---- + drivers/staging/i4l/act2000/module.c | 816 ---------- + drivers/staging/i4l/icn/Kconfig | 12 - + drivers/staging/i4l/icn/Makefile | 5 - + drivers/staging/i4l/icn/icn.c | 1696 -------------------- + drivers/staging/i4l/icn/icn.h | 252 --- + drivers/staging/i4l/pcbit/Kconfig | 10 - + drivers/staging/i4l/pcbit/Makefile | 9 - + drivers/staging/i4l/pcbit/callbacks.c | 345 ---- + drivers/staging/i4l/pcbit/callbacks.h | 44 - + drivers/staging/i4l/pcbit/capi.c | 646 -------- + drivers/staging/i4l/pcbit/capi.h | 81 - + drivers/staging/i4l/pcbit/drv.c | 1070 ------------ + drivers/staging/i4l/pcbit/edss1.c | 310 ---- + drivers/staging/i4l/pcbit/edss1.h | 99 -- + drivers/staging/i4l/pcbit/layer2.c | 710 -------- + drivers/staging/i4l/pcbit/layer2.h | 281 ---- + drivers/staging/i4l/pcbit/module.c | 125 -- + drivers/staging/i4l/pcbit/pcbit.h | 177 -- + drivers/staging/iio/addac/adt7316-i2c.c | 2 +- + drivers/staging/ks7010/ks7010_sdio.h | 4 +- + drivers/staging/lustre/lnet/selftest/brw_test.c | 2 +- + drivers/staging/lustre/lustre/include/lu_object.h | 3 + + .../lustre/lustre/include/lustre/lustre_idl.h | 46 - + .../staging/lustre/lustre/include/lustre_obdo.h | 54 + + drivers/staging/lustre/lustre/include/obd.h | 5 +- + drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 2 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 5 +- + drivers/staging/lustre/lustre/llite/file.c | 2 +- + drivers/staging/lustre/lustre/llite/lproc_llite.c | 27 +- + drivers/staging/lustre/lustre/llite/vvp_internal.h | 2 - + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 58 +- + drivers/staging/lustre/lustre/lov/lov_pack.c | 3 +- + drivers/staging/lustre/lustre/obdclass/cl_io.c | 4 +- + drivers/staging/lustre/lustre/obdclass/cl_object.c | 3 +- + drivers/staging/lustre/lustre/obdclass/obdo.c | 54 + + drivers/staging/lustre/lustre/osc/osc_cache.c | 30 +- + .../staging/lustre/lustre/osc/osc_cl_internal.h | 11 +- + drivers/staging/lustre/lustre/osc/osc_internal.h | 4 + + drivers/staging/lustre/lustre/osc/osc_io.c | 62 +- + drivers/staging/lustre/lustre/osc/osc_object.c | 19 + + drivers/staging/lustre/lustre/osc/osc_request.c | 45 +- + drivers/staging/lustre/lustre/ptlrpc/nrs.c | 3 - + .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 3 + + drivers/staging/most/hdm-usb/hdm_usb.c | 2 +- + drivers/staging/nvec/nvec_power.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_ap.c | 144 +- + drivers/staging/rtl8188eu/core/rtw_cmd.c | 3 - + drivers/staging/rtl8188eu/core/rtw_efuse.c | 4 + + drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 5 +- + drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 5 - + drivers/staging/rtl8188eu/core/rtw_led.c | 1 + + drivers/staging/rtl8188eu/core/rtw_mlme.c | 3 + + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 29 +- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 1 + + drivers/staging/rtl8188eu/core/rtw_recv.c | 126 +- + drivers/staging/rtl8188eu/core/rtw_security.c | 18 + + drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 1 + + drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 3 + + drivers/staging/rtl8188eu/core/rtw_xmit.c | 5 +- + drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 2 +- + drivers/staging/rtl8188eu/include/drv_types.h | 1 - + drivers/staging/rtl8188eu/include/osdep_service.h | 7 - + drivers/staging/rtl8188eu/include/rtw_debug.h | 2 +- + drivers/staging/rtl8188eu/include/rtw_mlme.h | 8 - + drivers/staging/rtl8188eu/include/rtw_recv.h | 2 - + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 15 +- + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 2 - + drivers/staging/rtl8188eu/os_dep/osdep_service.c | 14 +- + drivers/staging/rtl8188eu/os_dep/rtw_android.c | 1 + + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 1 + + drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 19 +- + drivers/staging/rtl8712/hal_init.c | 12 +- + drivers/staging/rtl8712/ieee80211.c | 18 +- + drivers/staging/rtl8712/mlme_linux.c | 6 +- + drivers/staging/rtl8712/rtl8712_cmd.c | 7 +- + drivers/staging/rtl8712/rtl8712_event.h | 2 +- + drivers/staging/rtl8712/rtl8712_recv.c | 10 +- + drivers/staging/rtl8712/rtl8712_recv.h | 28 +- + drivers/staging/rtl8712/rtl8712_xmit.h | 16 +- + drivers/staging/rtl8712/rtl871x_cmd.h | 6 +- + drivers/staging/rtl8712/rtl871x_event.h | 2 +- + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 2 +- + drivers/staging/rtl8712/rtl871x_mlme.c | 15 +- + drivers/staging/rtl8712/rtl871x_recv.c | 2 +- + drivers/staging/rtl8712/rtl871x_security.c | 16 +- + drivers/staging/rtl8712/usb_ops.c | 18 +- + drivers/staging/rtl8712/usb_ops_linux.c | 5 +- + drivers/staging/rtl8712/wifi.h | 4 +- + drivers/staging/rtl8712/wlan_bssdef.h | 2 +- + drivers/staging/skein/skein_base.c | 16 +- + drivers/staging/unisys/visorbus/controlvmchannel.h | 87 +- + drivers/staging/unisys/visorbus/visorbus_main.c | 32 +- + drivers/staging/unisys/visorbus/visorchipset.c | 164 +- + drivers/staging/unisys/visorhba/visorhba_main.c | 4 - + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 20 +- + .../vc04_services/interface/vchiq_arm/vchiq_util.c | 9 +- + drivers/staging/vt6656/int.c | 2 +- + drivers/staging/vt6656/wcmd.h | 4 +- + drivers/staging/wilc1000/linux_wlan.c | 2 +- + drivers/staging/xgifb/vb_init.c | 3 +- + 166 files changed, 1077 insertions(+), 12556 deletions(-) + delete mode 100644 drivers/staging/greybus/timesync.c + delete mode 100644 drivers/staging/greybus/timesync.h + delete mode 100644 drivers/staging/greybus/timesync_platform.c + delete mode 100644 drivers/staging/i4l/Documentation/README.act2000 + delete mode 100644 drivers/staging/i4l/Documentation/README.icn + delete mode 100644 drivers/staging/i4l/Documentation/README.pcbit + delete mode 100644 drivers/staging/i4l/Documentation/README.sc + delete mode 100644 drivers/staging/i4l/Kconfig + delete mode 100644 drivers/staging/i4l/Makefile + delete mode 100644 drivers/staging/i4l/TODO + delete mode 100644 drivers/staging/i4l/act2000/Kconfig + delete mode 100644 drivers/staging/i4l/act2000/Makefile + delete mode 100644 drivers/staging/i4l/act2000/act2000.h + delete mode 100644 drivers/staging/i4l/act2000/act2000_isa.c + delete mode 100644 drivers/staging/i4l/act2000/act2000_isa.h + delete mode 100644 drivers/staging/i4l/act2000/capi.c + delete mode 100644 drivers/staging/i4l/act2000/capi.h + delete mode 100644 drivers/staging/i4l/act2000/module.c + delete mode 100644 drivers/staging/i4l/icn/Kconfig + delete mode 100644 drivers/staging/i4l/icn/Makefile + delete mode 100644 drivers/staging/i4l/icn/icn.c + delete mode 100644 drivers/staging/i4l/icn/icn.h + delete mode 100644 drivers/staging/i4l/pcbit/Kconfig + delete mode 100644 drivers/staging/i4l/pcbit/Makefile + delete mode 100644 drivers/staging/i4l/pcbit/callbacks.c + delete mode 100644 drivers/staging/i4l/pcbit/callbacks.h + delete mode 100644 drivers/staging/i4l/pcbit/capi.c + delete mode 100644 drivers/staging/i4l/pcbit/capi.h + delete mode 100644 drivers/staging/i4l/pcbit/drv.c + delete mode 100644 drivers/staging/i4l/pcbit/edss1.c + delete mode 100644 drivers/staging/i4l/pcbit/edss1.h + delete mode 100644 drivers/staging/i4l/pcbit/layer2.c + delete mode 100644 drivers/staging/i4l/pcbit/layer2.h + delete mode 100644 drivers/staging/i4l/pcbit/module.c + delete mode 100644 drivers/staging/i4l/pcbit/pcbit.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_obdo.h +Merging char-misc/char-misc-next (0c744ea4f77d Linux 4.10-rc2) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging extcon/extcon-next (67b9b6e1346d extcon: Add documentation for EXTCON_CHG_USB_SLOW/FAST) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + Documentation/extcon/intel-int3496.txt | 22 ++++ + drivers/extcon/Kconfig | 10 ++ + drivers/extcon/Makefile | 1 + + drivers/extcon/devres.c | 2 +- + drivers/extcon/extcon-adc-jack.c | 2 +- + drivers/extcon/extcon-arizona.c | 20 ++-- + drivers/extcon/extcon-axp288.c | 110 ++++++++------------ + drivers/extcon/extcon-intel-int3496.c | 179 +++++++++++++++++++++++++++++++++ + 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-usb-gpio.c | 7 ++ + drivers/extcon/extcon.c | 38 ++----- + drivers/extcon/extcon.h | 62 ++++++++++++ + include/linux/extcon.h | 70 +++---------- + include/linux/extcon/extcon-adc-jack.h | 2 +- + 19 files changed, 400 insertions(+), 184 deletions(-) + create mode 100644 Documentation/extcon/intel-int3496.txt + create mode 100644 drivers/extcon/extcon-intel-int3496.c + create mode 100644 drivers/extcon/extcon.h +Merging slave-dma/next (69ec10a5c97c Merge branch 'topic/stm32-dma' into next) +$ git merge slave-dma/next +Auto-merging drivers/dma/zx_dma.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-platform-hidma | 2 +- + .../ABI/testing/sysfs-platform-hidma-mgmt | 20 ++--- + .../devicetree/bindings/dma/stm32-dma.txt | 5 +- + MAINTAINERS | 17 +++-- + drivers/dma/Kconfig | 6 +- + drivers/dma/Makefile | 2 +- + drivers/dma/dmaengine.c | 21 +++--- + drivers/dma/dw/Kconfig | 2 +- + drivers/dma/ioat/hw.h | 2 + + drivers/dma/ioat/init.c | 11 ++- + drivers/dma/ipu/ipu_irq.c | 2 +- + drivers/dma/omap-dma.c | 30 +++++--- + drivers/dma/pl330.c | 11 +++ + drivers/dma/stm32-dma.c | 86 +++++++++++++--------- + drivers/dma/ti-dma-crossbar.c | 2 + + drivers/dma/{zx296702_dma.c => zx_dma.c} | 4 +- + 16 files changed, 138 insertions(+), 85 deletions(-) + rename drivers/dma/{zx296702_dma.c => zx_dma.c} (99%) +Merging cgroup/for-next (7b4632f04841 cgroup: fix a comment typo) +$ git merge cgroup/for-next +Auto-merging kernel/cgroup/cgroup.c +Merge made by the 'recursive' strategy. + fs/kernfs/dir.c | 2 +- + fs/kernfs/file.c | 53 +- + fs/kernfs/kernfs-internal.h | 2 +- + include/linux/cgroup-defs.h | 57 +- + include/linux/cgroup.h | 2 +- + include/linux/kernfs.h | 12 +- + kernel/Makefile | 5 +- + kernel/cgroup/Makefile | 5 + + kernel/cgroup/cgroup-internal.h | 157 ++ + kernel/cgroup/cgroup-v1.c | 1395 ++++++++++++++++++ + kernel/{ => cgroup}/cgroup.c | 1968 +++---------------------- + kernel/{ => cgroup}/cpuset.c | 0 + kernel/{cgroup_freezer.c => cgroup/freezer.c} | 0 + kernel/cgroup/namespace.c | 155 ++ + kernel/{cgroup_pids.c => cgroup/pids.c} | 0 + 15 files changed, 2006 insertions(+), 1807 deletions(-) + create mode 100644 kernel/cgroup/Makefile + create mode 100644 kernel/cgroup/cgroup-internal.h + create mode 100644 kernel/cgroup/cgroup-v1.c + rename kernel/{ => cgroup}/cgroup.c (74%) + rename kernel/{ => cgroup}/cpuset.c (100%) + rename kernel/{cgroup_freezer.c => cgroup/freezer.c} (100%) + create mode 100644 kernel/cgroup/namespace.c + rename kernel/{cgroup_pids.c => cgroup/pids.c} (100%) +Merging scsi/for-next (cadb39085066 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Merge made by the 'recursive' strategy. + drivers/block/cciss.h | 30 ++--- + drivers/message/fusion/mptlan.h | 1 - + drivers/scsi/dpt_i2o.c | 8 +- + drivers/scsi/hpsa.h | 40 +++--- + drivers/scsi/lpfc/lpfc.h | 5 - + drivers/scsi/lpfc/lpfc_attr.c | 266 +++++---------------------------------- + drivers/scsi/lpfc/lpfc_crtn.h | 7 +- + drivers/scsi/lpfc/lpfc_els.c | 6 + + drivers/scsi/lpfc/lpfc_hw.h | 6 + + drivers/scsi/lpfc/lpfc_init.c | 16 +-- + drivers/scsi/lpfc/lpfc_scsi.c | 18 ++- + drivers/scsi/lpfc/lpfc_sli.c | 13 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/lpfc/lpfc_vport.c | 8 ++ + drivers/scsi/qedi/Kconfig | 2 +- + drivers/scsi/scsi_lib.c | 2 +- + drivers/scsi/storvsc_drv.c | 148 ++++++++++++++++++++-- + 17 files changed, 260 insertions(+), 318 deletions(-) +Merging scsi-mkp/for-next (352e5fd10598 scsi: lpfc: Reinstate lpfc_soft_wwn parameter) +$ git merge scsi-mkp/for-next +Recorded preimage for 'drivers/scsi/lpfc/lpfc_attr.c' +Auto-merging drivers/scsi/lpfc/lpfc_attr.c +CONFLICT (content): Merge conflict in drivers/scsi/lpfc/lpfc_attr.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/scsi/lpfc/lpfc_attr.c'. +[master 08b6816d5b37] Merge remote-tracking branch 'scsi-mkp/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/scsi/be2iscsi/be.h | 3 - + drivers/scsi/be2iscsi/be_cmds.c | 41 +- + drivers/scsi/be2iscsi/be_cmds.h | 17 +- + drivers/scsi/be2iscsi/be_iscsi.c | 165 +++---- + drivers/scsi/be2iscsi/be_main.c | 344 +++++++-------- + drivers/scsi/be2iscsi/be_main.h | 44 +- + drivers/scsi/be2iscsi/be_mgmt.c | 117 ++--- + drivers/scsi/be2iscsi/be_mgmt.h | 98 +--- + drivers/scsi/hisi_sas/hisi_sas.h | 1 + + drivers/scsi/hisi_sas/hisi_sas_main.c | 3 + + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 2 + + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 26 +- + drivers/scsi/lpfc/lpfc_attr.c | 223 ++++++++++ + drivers/scsi/qedi/qedi_dbg.c | 9 +- + drivers/scsi/qla4xxx/ql4_os.c | 6 +- + drivers/scsi/ufs/ufs-qcom.c | 1 + + drivers/scsi/ufs/ufshcd.c | 785 ++++++++++++++++++++++++++++++--- + drivers/scsi/ufs/ufshcd.h | 70 ++- + drivers/scsi/ufs/ufshci.h | 3 + + include/trace/events/ufs.h | 263 +++++++++++ + 20 files changed, 1688 insertions(+), 533 deletions(-) + create mode 100644 include/trace/events/ufs.h +$ git am -3 ../patches/0001-merge-fix-up-for-scsi-mkp-merge.patch +Applying: merge fix up for scsi-mkp merge +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/scsi/lpfc/lpfc.h +M drivers/scsi/lpfc/lpfc_init.c +$ git add -A . +$ git commit -v -a --amend +[master 906e572e4d63] Merge remote-tracking branch 'scsi-mkp/for-next' + Date: Mon Jan 9 12:23:24 2017 +1100 +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 (aff5e62bac84 qla2xxx: Disable out-of-order processing by default in firmware) +$ git merge target-bva/for-next +Merge made by the 'recursive' strategy. + drivers/scsi/qla2xxx/qla_def.h | 4 +- + drivers/scsi/qla2xxx/qla_init.c | 4 +- + drivers/scsi/qla2xxx/qla_isr.c | 4 + + drivers/scsi/qla2xxx/qla_mbx.c | 27 ++++-- + drivers/scsi/qla2xxx/qla_os.c | 16 +++- + drivers/scsi/qla2xxx/qla_target.c | 56 ++++++++---- + drivers/scsi/qla2xxx/qla_target.h | 22 ++++- + drivers/scsi/qla2xxx/qla_tmpl.c | 24 +++++ + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 4 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.h | 1 - + drivers/target/target_core_transport.c | 24 +++++ + drivers/target/target_core_xcopy.c | 157 ++++++++++++++++++++++----------- + drivers/target/target_core_xcopy.h | 7 ++ + include/target/target_core_base.h | 4 + + 14 files changed, 266 insertions(+), 88 deletions(-) +Merging libata/for-next (631c6e9846b4 Merge branch 'for-4.10-fixes' into for-next) +$ git merge libata/for-next +Merge made by the 'recursive' strategy. + drivers/ata/Kconfig | 7 ++ + drivers/ata/ahci_imx.c | 195 ++++++++++++++++++++++++++++++++++++++++++++++ + drivers/ata/ahci_xgene.c | 6 +- + drivers/ata/libata-core.c | 67 +++++++++------- + drivers/ata/libata.h | 1 - + drivers/ata/sata_mv.c | 5 +- + 6 files changed, 249 insertions(+), 32 deletions(-) +Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation) +$ git merge binfmt_misc/for-next +Already up-to-date. +Merging vhost/linux-next (6bdf1e0efb04 Makefile: drop -D__CHECK_ENDIAN__ from cflags) +$ git merge vhost/linux-next +Already up-to-date. +Merging rpmsg/for-next (a9cff670138e Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 4 +- + drivers/remoteproc/Kconfig | 7 +- + drivers/remoteproc/da8xx_remoteproc.c | 2 +- + drivers/remoteproc/omap_remoteproc.c | 2 +- + drivers/remoteproc/qcom_q6v5_pil.c | 383 ++++++++++++++++----- + drivers/remoteproc/remoteproc_core.c | 29 +- + drivers/remoteproc/st_remoteproc.c | 2 +- + drivers/remoteproc/st_slim_rproc.c | 2 +- + drivers/remoteproc/wkup_m3_rproc.c | 2 +- + drivers/rpmsg/rpmsg_core.c | 4 +- + include/linux/remoteproc.h | 4 +- + 11 files changed, 328 insertions(+), 113 deletions(-) +Merging gpio/for-next (4fe4d09cfd11 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/gpio/gpio.txt | 8 +++---- + drivers/gpio/devres.c | 2 +- + drivers/gpio/gpio-mm-lantiq.c | 2 +- + drivers/gpio/gpio-mockup.c | 23 +++++++++--------- + drivers/gpio/gpio-mxs.c | 2 +- + drivers/gpio/gpio-rcar.c | 21 +++++++++++++---- + drivers/gpio/gpio-stp-xway.c | 2 +- + drivers/gpio/gpiolib-of.c | 31 ++++++++++++++++--------- + drivers/gpio/gpiolib.c | 2 +- + 9 files changed, 58 insertions(+), 35 deletions(-) +Merging pinctrl/for-next (9eb63a89ffd1 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/marvell,kirkwood-pinctrl.txt | 20 +- + .../devicetree/bindings/pinctrl/pinctrl-aspeed.txt | 131 +- + drivers/pinctrl/Kconfig | 11 +- + drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c | 1115 +++++++++++++- + drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 1524 +++++++++++++++++++- + drivers/pinctrl/aspeed/pinctrl-aspeed.c | 165 ++- + drivers/pinctrl/aspeed/pinctrl-aspeed.h | 33 +- + drivers/pinctrl/core.c | 286 +++- + drivers/pinctrl/core.h | 57 + + drivers/pinctrl/devicetree.c | 28 +- + drivers/pinctrl/devicetree.h | 12 +- + drivers/pinctrl/freescale/pinctrl-imx.c | 198 ++- + drivers/pinctrl/freescale/pinctrl-imx.h | 5 +- + drivers/pinctrl/mediatek/pinctrl-mt7623.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-mtk-mt7623.h | 2 +- + drivers/pinctrl/pinctrl-amd.c | 25 +- + drivers/pinctrl/pinctrl-amd.h | 8 +- + drivers/pinctrl/pinctrl-falcon.c | 2 +- + drivers/pinctrl/pinctrl-lantiq.c | 2 +- + drivers/pinctrl/pinctrl-lantiq.h | 2 +- + drivers/pinctrl/pinctrl-single.c | 292 +--- + drivers/pinctrl/pinctrl-xway.c | 2 +- + drivers/pinctrl/pinmux.c | 216 ++- + drivers/pinctrl/pinmux.h | 56 + + drivers/pinctrl/sirf/pinctrl-atlas7.c | 13 +- + drivers/pinctrl/stm32/pinctrl-stm32.c | 1 + + 26 files changed, 3666 insertions(+), 542 deletions(-) +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 (0caf7752a2d0 Merge branch 'for-4.11/core' into for-next) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + drivers/leds/leds-pwm.c | 16 +++------------- + drivers/pwm/core.c | 12 ------------ + drivers/pwm/pwm-atmel-hlcdc.c | 1 - + drivers/pwm/pwm-atmel.c | 1 - + drivers/pwm/pwm-bcm-kona.c | 1 - + drivers/pwm/pwm-berlin.c | 1 - + drivers/pwm/pwm-brcmstb.c | 1 - + drivers/pwm/pwm-fsl-ftm.c | 1 - + drivers/pwm/pwm-imx.c | 1 - + drivers/pwm/pwm-lp3943.c | 1 - + drivers/pwm/pwm-mxs.c | 2 +- + drivers/pwm/pwm-pca9685.c | 1 - + drivers/pwm/pwm-sti.c | 1 - + drivers/pwm/pwm-sun4i.c | 1 - + drivers/pwm/pwm-twl-led.c | 1 - + drivers/pwm/pwm-twl.c | 1 - + drivers/staging/greybus/pwm.c | 1 - + include/linux/pwm.h | 10 ---------- + 18 files changed, 4 insertions(+), 50 deletions(-) +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 8d6942c37f79] 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 (cd293bfacd57 sysctl: Drop reference added by grab_header in proc_sys_readdir) +$ git merge userns/for-next +Merge made by the 'recursive' strategy. + fs/dcache.c | 7 +- + fs/libfs.c | 3 +- + fs/mount.h | 1 - + fs/namespace.c | 174 +++++++++++++++++++++++++++++-------------------- + fs/pnode.c | 27 ++++++-- + fs/pnode.h | 2 + + fs/proc/proc_sysctl.c | 3 +- + kernel/pid_namespace.c | 10 +-- + 8 files changed, 142 insertions(+), 85 deletions(-) +Merging ktest/for-next (2dcd0af568b0 Linux 4.6) +$ git merge ktest/for-next +Already up-to-date. +Merging random/dev (59b8d4f1f5d2 random: use for_each_online_node() to iterate over NUMA nodes) +$ git merge random/dev +Already up-to-date. +Merging aio/master (b562e44f507e Linux 4.5) +$ git merge aio/master +Already up-to-date. +Merging kselftest/next (a8ba798bc8ec selftests: enable O and KBUILD_OUTPUT) +$ git merge kselftest/next +Auto-merging tools/testing/selftests/x86/Makefile +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'recursive' strategy. + Documentation/kselftest.txt | 12 +++++++ + tools/testing/selftests/Makefile | 36 ++++++++++++++----- + tools/testing/selftests/bpf/Makefile | 10 ++---- + tools/testing/selftests/breakpoints/Makefile | 10 ++---- + tools/testing/selftests/capabilities/Makefile | 11 ++---- + tools/testing/selftests/efivarfs/Makefile | 8 +---- + tools/testing/selftests/exec/Makefile | 32 ++++++++--------- + tools/testing/selftests/ftrace/Makefile | 6 ++-- + tools/testing/selftests/futex/Makefile | 21 ++++++++--- + tools/testing/selftests/futex/functional/Makefile | 12 ++----- + tools/testing/selftests/ipc/Makefile | 7 +--- + tools/testing/selftests/kcmp/Makefile | 6 ++-- + tools/testing/selftests/lib.mk | 36 +++++++++++++++---- + tools/testing/selftests/membarrier/Makefile | 6 +--- + tools/testing/selftests/memfd/Makefile | 15 ++------ + tools/testing/selftests/mount/Makefile | 7 +--- + tools/testing/selftests/mqueue/Makefile | 6 +--- + tools/testing/selftests/net/Makefile | 15 +++----- + tools/testing/selftests/nsfs/Makefile | 9 +---- + tools/testing/selftests/powerpc/Makefile | 15 ++++---- + tools/testing/selftests/powerpc/alignment/Makefile | 9 ++--- + .../testing/selftests/powerpc/benchmarks/Makefile | 15 +++----- + .../selftests/powerpc/context_switch/Makefile | 9 ++--- + tools/testing/selftests/powerpc/copyloops/Makefile | 19 ++++------ + tools/testing/selftests/powerpc/dscr/Makefile | 13 +++---- + tools/testing/selftests/powerpc/math/Makefile | 25 ++++++------- + tools/testing/selftests/powerpc/mm/Makefile | 18 ++++------ + tools/testing/selftests/powerpc/pmu/Makefile | 26 +++++++------- + tools/testing/selftests/powerpc/pmu/ebb/Makefile | 15 +++----- + .../testing/selftests/powerpc/primitives/Makefile | 9 ++--- + .../testing/selftests/powerpc/stringloops/Makefile | 9 ++--- + .../selftests/powerpc/switch_endian/Makefile | 17 ++++----- + tools/testing/selftests/powerpc/syscalls/Makefile | 9 ++--- + tools/testing/selftests/powerpc/tm/Makefile | 17 ++++----- + tools/testing/selftests/powerpc/vphn/Makefile | 10 ++---- + tools/testing/selftests/pstore/Makefile | 4 +-- + tools/testing/selftests/ptrace/Makefile | 8 +---- + tools/testing/selftests/seccomp/Makefile | 6 +--- + tools/testing/selftests/sigaltstack/Makefile | 5 +-- + tools/testing/selftests/size/Makefile | 10 ++---- + tools/testing/selftests/timers/Makefile | 10 ++---- + tools/testing/selftests/vm/Makefile | 41 +++++++++------------- + tools/testing/selftests/x86/Makefile | 17 +++++---- + tools/testing/selftests/zram/Makefile | 3 +- + 44 files changed, 247 insertions(+), 357 deletions(-) +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 dfca7b816cf6] 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 (b766922e6535 powerpc/livepatch: Remove klp_write_module_reloc() stub) +$ git merge livepatching/for-next +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/livepatch.h | 7 ------- + 1 file changed, 7 deletions(-) +Merging coresight/next (9d8067efa456 coresight: etm4x: Fix timestamp configuration when working from perf) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight-etm-perf.c | 1 + + drivers/hwtracing/coresight/coresight-etm4x.c | 10 +++++++--- + drivers/hwtracing/coresight/coresight-etm4x.h | 1 + + 3 files changed, 9 insertions(+), 3 deletions(-) +Merging rtc/rtc-next (7ce7d89f4883 Linux 4.10-rc1) +$ git merge rtc/rtc-next +Already up-to-date. +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 (1db175428ee3 ext4: Simplify DAX fault path) +$ git merge nvdimm/libnvdimm-for-next +Already up-to-date. +Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection) +$ git merge dax-misc/dax-misc +Already up-to-date. +Merging akpm-current/current (a63a9bb7abd2 ipc/sem: add hysteresis) +$ git merge --no-ff akpm-current/current +Auto-merging mm/shmem.c +Auto-merging mm/internal.h +Auto-merging lib/Makefile +Auto-merging lib/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/include/asm/page.h | 2 + + 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/nmi.h | 1 + + include/linux/sem.h | 2 +- + ipc/sem.c | 109 +++++++----- + kernel/watchdog.c | 9 + + kernel/watchdog_hld.c | 3 + + lib/Kconfig | 7 + + lib/Makefile | 1 + + lib/crc64_ecma.c | 341 +++++++++++++++++++++++++++++++++++++ + mm/internal.h | 4 +- + mm/khugepaged.c | 21 +-- + mm/page_alloc.c | 70 ++++---- + mm/page_isolation.c | 10 +- + mm/page_owner.c | 4 +- + mm/shmem.c | 5 +- + mm/z3fold.c | 337 ++++++++++++++++++++++++------------ + scripts/gdb/linux/constants.py.in | 7 + + scripts/gdb/linux/proc.py | 73 ++++++++ + scripts/spelling.txt | 37 ++++ + 27 files changed, 952 insertions(+), 237 deletions(-) + 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: fs: add i_blocksize() +Applying: Reimplement IDR and IDA using the radix tree +Using index info to reconstruct a base tree... +M include/linux/radix-tree.h +M lib/radix-tree.c +error: Failed to merge in the changes. +Falling back to patching base and 3-way merge... +Auto-merging lib/radix-tree.c +Auto-merging include/linux/radix-tree.h +CONFLICT (content): Merge conflict in include/linux/radix-tree.h +Patch failed at 0002 Reimplement IDR and IDA using the radix tree +The copy of the patch that failed is found in: .git/rebase-apply/patch + +When you have resolved this problem, run "git rebase --continue". +If you prefer to skip this patch, run "git rebase --skip" instead. +To check out the original branch and stop rebasing, run "git rebase --abort". + +Applying: idr: support storing NULL in the IDR +Applying: reimplement-idr-and-ida-using-the-radix-tree-support-storing-null-in-the-idr-checkpatch-fixes +Applying: scripts/spelling.txt: add "swith" pattern and fix typo instances +Applying: scripts/spelling.txt: add "swithc" pattern and fix typo instances +Applying: scripts/spelling.txt: add "an user" pattern and fix typo instances +Applying: scripts/spelling.txt: add "an union" pattern and fix typo instances +Applying: scripts/spelling.txt: add "an one" pattern and fix typo instances +Applying: scripts/spelling.txt: add "partiton" pattern and fix typo instances +Applying: scripts/spelling.txt: add "aligment" pattern and fix typo instances +Applying: scripts/spelling.txt: add "algined" pattern and fix typo instances +Applying: scripts/spelling.txt: add "efective" pattern and fix typo instances +Applying: scripts/spelling.txt: add "varible" pattern and fix typo instances +Applying: scripts/spelling.txt: add "embeded" pattern and fix typo instances +Applying: scripts/spelling.txt: add "againt" pattern and fix typo instances +Applying: scripts/spelling.txt: add "neded" pattern and fix typo instances +Applying: scripts/spelling.txt: add "unneded" pattern and fix typo instances +Applying: scripts/spelling.txt: add "intialization" pattern and fix typo instances +Applying: scripts/spelling.txt: add "initialiazation" pattern and fix typo instances +Applying: scripts/spelling.txt: add "intialise(d)" pattern and fix typo instances +Applying: scripts/spelling.txt: add "comsume(r)" pattern and fix typo instances +Applying: scripts/spelling.txt: add "disble(d)" pattern and fix typo instances +Applying: scripts/spelling.txt: add "overide" pattern and fix typo instances +Applying: scripts/spelling.txt: add "overrided" pattern and fix typo instances +Applying: scripts/spelling.txt: add "configuartion" pattern and fix typo instances +Applying: scripts/spelling.txt: add "applys" pattern and fix typo instances +Applying: scripts/spelling.txt: add "explictely" pattern and fix typo instances +Applying: scripts/spelling.txt: add "omited" pattern and fix typo instances +Applying: scripts/spelling.txt: add "disassocation" pattern and fix typo instances +Applying: scripts/spelling.txt: add "deintialize(d)" pattern and fix typo instances +Applying: scripts/spelling.txt: add "overwritting" pattern and fix typo instances +Applying: scripts/spelling.txt: add "overwriten" pattern and fix typo instances +Applying: scripts/spelling.txt: add "therfore" pattern and fix typo instances +Applying: scripts/spelling.txt: add "followings" pattern and fix typo instances +Using index info to reconstruct a base tree... +M Documentation/devicetree/bindings/soc/rockchip/grf.txt +Falling back to patching base and 3-way merge... +Auto-merging Documentation/devicetree/bindings/soc/rockchip/grf.txt +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/soc/rockchip/grf.txt +error: Failed to merge in the changes. +Patch failed at 0035 scripts/spelling.txt: add "followings" pattern and fix typo instances +The copy of the patch that failed is found in: .git/rebase-apply/patch + +When you have resolved this problem, run "git rebase --continue". +If you prefer to skip this patch, run "git rebase --skip" instead. +To check out the original branch and stop rebasing, run "git rebase --abort". + +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + a41e0602c4ff...fb584a47cd62 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (fb584a47cd62 scripts/spelling.txt: add "followings" pattern and fix typo instances) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + Documentation/DocBook/libata.tmpl | 2 +- + Documentation/acpi/method-customizing.txt | 2 +- + Documentation/acpi/method-tracing.txt | 2 +- + Documentation/admin-guide/ras.rst | 2 +- + Documentation/blockdev/mflash.txt | 2 +- + Documentation/dev-tools/kcov.rst | 2 +- + Documentation/device-mapper/dm-raid.txt | 2 +- + Documentation/devicetree/bindings/mfd/qcom-rpm.txt | 2 +- + .../bindings/net/marvell-armada-370-neta.txt | 2 +- + Documentation/devicetree/bindings/opp/opp.txt | 2 +- + .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 2 +- + .../devicetree/bindings/power/pd-samsung.txt | 2 +- + .../bindings/regulator/ti-abb-regulator.txt | 2 +- + .../devicetree/bindings/soc/rockchip/grf.txt | 4 +- + .../devicetree/bindings/sound/rockchip-i2s.txt | 4 +- + .../devicetree/bindings/sound/sun4i-codec.txt | 2 +- + .../devicetree/bindings/sound/sun4i-i2s.txt | 4 +- + Documentation/filesystems/quota.txt | 2 +- + Documentation/kselftest.txt | 4 +- + Documentation/media/dvb-drivers/ci.rst | 2 +- + .../media/uapi/dvb/dvb-frontend-parameters.rst | 4 +- + Documentation/memory-hotplug.txt | 4 +- + Documentation/networking/cdc_mbim.txt | 4 +- + Documentation/scsi/ChangeLog.megaraid_sas | 2 +- + Documentation/sound/hd-audio/notes.rst | 2 +- + Documentation/vm/userfaultfd.txt | 2 +- + arch/Kconfig | 2 +- + arch/arc/kernel/unwind.c | 4 +- + arch/arm/boot/compressed/head.S | 2 +- + arch/arm/include/asm/mach/flash.h | 2 +- + arch/arm/mach-omap2/omap_twl.c | 2 +- + arch/arm/mm/cache-v7.S | 2 +- + arch/arm/mm/cache-v7m.S | 2 +- + arch/arm64/lib/copy_template.S | 2 +- + arch/cris/arch-v32/drivers/cryptocop.c | 2 +- + arch/ia64/sn/kernel/sn2/sn_hwperf.c | 2 +- + arch/m68k/ifpsp060/src/isp.S | 2 +- + arch/openrisc/kernel/entry.S | 6 +- + arch/openrisc/kernel/head.S | 6 +- + arch/openrisc/kernel/vmlinux.lds.S | 4 +- + arch/powerpc/boot/dts/fsl/mpc8569mds.dts | 2 +- + arch/powerpc/include/asm/book3s/64/mmu.h | 2 +- + arch/powerpc/include/asm/fsl_hcalls.h | 2 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 2 +- + arch/powerpc/platforms/pseries/iommu.c | 2 +- + arch/powerpc/xmon/ppc-opc.c | 2 +- + arch/s390/kernel/vtime.c | 2 +- + arch/sh/kernel/irq.c | 2 +- + arch/sparc/include/asm/switch_to_32.h | 2 +- + arch/sparc/kernel/visemul.c | 2 +- + arch/x86/include/asm/desc_defs.h | 2 +- + arch/x86/kernel/ftrace.c | 2 +- + arch/x86/kvm/mmu.c | 2 +- + block/blk-throttle.c | 2 +- + certs/blacklist.c | 2 +- + drivers/acpi/acpica/acmacros.h | 2 +- + drivers/acpi/acpica/dbconvert.c | 2 +- + drivers/acpi/acpica/nspredef.c | 2 +- + drivers/acpi/acpica/nsxfeval.c | 4 +- + drivers/acpi/resource.c | 2 +- + drivers/acpi/spcr.c | 2 +- + drivers/ata/libata-eh.c | 2 +- + drivers/atm/iphase.c | 2 +- + drivers/atm/iphase.h | 2 +- + drivers/block/loop.c | 2 +- + drivers/block/paride/pcd.c | 2 +- + drivers/block/paride/pd.c | 2 +- + drivers/block/paride/pf.c | 2 +- + drivers/block/paride/pg.c | 2 +- + drivers/block/paride/pt.c | 2 +- + drivers/char/pcmcia/cm4000_cs.c | 2 +- + drivers/char/sonypi.c | 2 +- + drivers/crypto/caam/ctrl.c | 2 +- + drivers/crypto/ux500/cryp/cryp.c | 2 +- + drivers/devfreq/devfreq.c | 2 +- + drivers/extcon/extcon-rt8973a.c | 2 +- + drivers/firewire/core-device.c | 4 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 2 +- + drivers/gpu/drm/amd/include/atombios.h | 8 +- + .../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 2 +- + drivers/gpu/drm/drm_probe_helper.c | 4 +- + drivers/gpu/drm/i915/i915_gem_render_state.c | 2 +- + drivers/gpu/drm/radeon/atombios.h | 6 +- + drivers/hid/hid-kye.c | 2 +- + drivers/hv/channel.c | 2 +- + drivers/hwmon/g762.c | 2 +- + drivers/infiniband/hw/qib/qib_iba6120.c | 2 +- + drivers/infiniband/hw/qib/qib_iba7220.c | 2 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 2 +- + drivers/infiniband/sw/rdmavt/mad.c | 6 +- + drivers/isdn/hardware/eicon/debug.c | 2 +- + drivers/isdn/hardware/mISDN/mISDNipac.c | 2 +- + drivers/isdn/hisax/st5481_b.c | 2 +- + drivers/isdn/mISDN/dsp_core.c | 2 +- + drivers/media/dvb-core/dvb_ringbuffer.h | 4 +- + drivers/media/dvb-frontends/drx39xyj/drx_driver.h | 12 +- + drivers/media/dvb-frontends/drx39xyj/drxj.c | 16 +- + drivers/media/dvb-frontends/drx39xyj/drxj.h | 4 +- + drivers/media/dvb-frontends/drxk_hard.c | 2 +- + drivers/media/i2c/adv7183_regs.h | 2 +- + drivers/media/platform/exynos4-is/fimc-core.h | 2 +- + drivers/media/usb/gspca/t613.c | 6 +- + drivers/media/usb/tm6000/tm6000-input.c | 2 +- + drivers/media/v4l2-core/tuner-core.c | 4 +- + drivers/misc/vmw_vmci/vmci_queue_pair.c | 2 +- + drivers/mmc/host/mmci_qcom_dml.c | 2 +- + drivers/mtd/spi-nor/spi-nor.c | 2 +- + drivers/net/can/flexcan.c | 2 +- + drivers/net/ethernet/adi/bfin_mac.c | 2 +- + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 4 +- + drivers/net/ethernet/intel/igb/e1000_phy.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 2 +- + drivers/net/ethernet/micrel/ksz884x.c | 8 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 2 +- + drivers/net/ethernet/qlogic/qlge/qlge.h | 4 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 8 +- + drivers/net/ethernet/sfc/mcdi_pcol.h | 2 +- + drivers/net/ethernet/sis/sis900.c | 2 +- + drivers/net/usb/kalmia.c | 2 +- + drivers/net/wimax/i2400m/usb-fw.c | 2 +- + drivers/net/wireless/ath/ath9k/ani.c | 4 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 6 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 4 +- + drivers/net/wireless/marvell/mwifiex/wmm.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/fw.c | 4 +- + drivers/net/wireless/rsi/rsi_91x_usb.c | 2 +- + drivers/net/wireless/ti/wl18xx/main.c | 2 +- + drivers/net/wireless/ti/wlcore/init.c | 2 +- + drivers/nfc/pn533/pn533.c | 2 +- + drivers/nvme/host/rdma.c | 2 +- + drivers/parport/parport_pc.c | 2 +- + drivers/pci/quirks.c | 2 +- + drivers/pinctrl/bcm/Kconfig | 2 +- + drivers/power/avs/smartreflex.c | 6 +- + drivers/scsi/aacraid/linit.c | 2 +- + drivers/scsi/aic7xxx/aic79xx_core.c | 2 +- + drivers/scsi/bfa/bfi_ms.h | 2 +- + drivers/scsi/fcoe/fcoe_ctlr.c | 2 +- + drivers/scsi/ipr.c | 2 +- + drivers/scsi/lpfc/lpfc_attr.c | 2 +- + drivers/scsi/lpfc/lpfc_sli.c | 18 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 2 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.h | 2 +- + drivers/scsi/osd/osd_initiator.c | 2 +- + drivers/scsi/scsi_transport_sas.c | 2 +- + drivers/scsi/storvsc_drv.c | 2 +- + drivers/staging/gs_fpgaboot/gs_fpgaboot.h | 2 +- + .../lustre/lustre/include/lustre/lustre_idl.h | 2 +- + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 4 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 2 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 4 +- + drivers/staging/wilc1000/linux_wlan.c | 2 +- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 2 +- + drivers/tty/serial/ioc4_serial.c | 2 +- + drivers/usb/core/devio.c | 2 +- + drivers/usb/gadget/legacy/inode.c | 3 +- + drivers/usb/gadget/udc/fsl_udc_core.c | 4 +- + drivers/usb/gadget/udc/renesas_usb3.c | 4 +- + drivers/usb/host/xhci.c | 4 +- + drivers/usb/usbip/usbip_common.c | 2 +- + drivers/video/fbdev/aty/radeon_monitor.c | 2 +- + drivers/video/fbdev/intelfb/intelfbdrv.c | 2 +- + drivers/watchdog/bcm2835_wdt.c | 6 +- + fs/block_dev.c | 2 +- + fs/btrfs/file.c | 2 +- + fs/buffer.c | 12 +- + fs/ceph/addr.c | 2 +- + fs/direct-io.c | 2 +- + fs/ecryptfs/kthread.c | 2 +- + fs/ext4/extents_status.c | 2 +- + fs/ext4/inode.c | 6 +- + fs/ext4/mballoc.c | 2 +- + fs/ext4/move_extent.c | 2 +- + fs/inode.c | 2 +- + fs/iomap.c | 10 +- + fs/jfs/super.c | 4 +- + fs/mpage.c | 2 +- + fs/nfsd/blocklayout.c | 6 +- + fs/nilfs2/btnode.c | 2 +- + fs/nilfs2/inode.c | 4 +- + fs/nilfs2/mdt.c | 4 +- + fs/nilfs2/segment.c | 2 +- + fs/ocfs2/aops.c | 2 +- + fs/ocfs2/dlm/dlmmaster.c | 2 +- + fs/ocfs2/file.c | 2 +- + fs/orangefs/orangefs-utils.c | 4 +- + fs/reiserfs/file.c | 2 +- + fs/reiserfs/inode.c | 2 +- + fs/stat.c | 2 +- + fs/udf/inode.c | 2 +- + fs/userfaultfd.c | 6 +- + fs/xfs/xfs_aops.c | 16 +- + fs/xfs/xfs_file.c | 4 +- + fs/xfs/xfs_log_recover.c | 2 +- + include/dt-bindings/sound/cs42l42.h | 2 +- + include/linux/dcache.h | 4 +- + include/linux/fs.h | 5 + + include/linux/idr.h | 138 ++- + include/linux/kconfig.h | 2 +- + include/linux/mtd/qinfo.h | 2 +- + include/linux/radix-tree.h | 53 +- + include/linux/regulator/machine.h | 2 +- + include/linux/spi/flash.h | 2 +- + include/media/v4l2-ctrls.h | 4 +- + include/net/cfg80211.h | 2 +- + include/net/irda/timer.h | 2 +- + include/net/mac80211.h | 2 +- + include/xen/interface/grant_table.h | 2 +- + init/main.c | 3 +- + kernel/cgroup/cgroup.c | 2 +- + kernel/events/core.c | 2 +- + kernel/irq/manage.c | 2 +- + kernel/torture.c | 2 +- + kernel/trace/trace_stack.c | 2 +- + lib/idr.c | 1145 ++++---------------- + lib/radix-tree.c | 347 ++++-- + mm/page-writeback.c | 2 +- + mm/page_alloc.c | 2 +- + mm/percpu.c | 2 +- + net/bluetooth/hci_sock.c | 6 +- + net/mac80211/mesh.c | 2 +- + net/netfilter/nfnetlink_cthelper.c | 2 +- + net/netfilter/x_tables.c | 2 +- + net/sctp/transport.c | 4 +- + scripts/recordmcount.pl | 2 +- + scripts/spelling.txt | 44 + + sound/pci/ac97/ac97_patch.c | 2 +- + sound/pci/cs46xx/cs46xx_dsp_task_types.h | 2 +- + sound/pci/hda/patch_ca0132.c | 2 +- + sound/pci/ice1712/wm8766.c | 2 +- + sound/pci/ice1712/wm8776.c | 2 +- + sound/ppc/snd_ps3.c | 2 +- + sound/soc/amd/acp-pcm-dma.c | 4 +- + sound/soc/codecs/wm_hubs.c | 2 +- + sound/soc/fsl/fsl_asrc.c | 2 +- + sound/soc/qcom/lpass.h | 2 +- + sound/soc/soc-topology.c | 4 +- + tools/include/linux/spinlock.h | 4 + + tools/lguest/lguest.c | 2 +- + tools/lib/bpf/Makefile | 2 +- + tools/lib/bpf/bpf.c | 2 +- + tools/lib/traceevent/Makefile | 2 +- + tools/lib/traceevent/event-parse.h | 2 +- + tools/perf/Documentation/tips.txt | 2 +- + tools/perf/util/dso.c | 2 +- + tools/perf/util/probe-finder.c | 4 +- + tools/perf/util/sort.h | 2 +- + tools/testing/radix-tree/.gitignore | 1 + + tools/testing/radix-tree/Makefile | 10 +- + tools/testing/radix-tree/idr-test.c | 242 +++++ + tools/testing/radix-tree/linux/export.h | 1 + + tools/testing/radix-tree/linux/gfp.h | 8 +- + tools/testing/radix-tree/linux/idr.h | 1 + + tools/testing/radix-tree/linux/kernel.h | 2 + + tools/testing/radix-tree/main.c | 6 + + tools/testing/radix-tree/test.h | 2 + + 259 files changed, 1264 insertions(+), 1445 deletions(-) + create mode 100644 tools/include/linux/spinlock.h + create mode 100644 tools/testing/radix-tree/idr-test.c + create mode 100644 tools/testing/radix-tree/linux/idr.h +$ git am -3 ../patches/0001-mm-merge-fixup-for-fix-use-after-free-in-shadow-node.patch +Applying: mm: merge fixup for "fix use-after-free in shadow node shrinker" +$ git reset HEAD^ +Unstaged changes after reset: +M lib/radix-tree.c +$ git add -A . +$ git commit -v -a --amend +[master 74baf34fdd9f] Merge branch 'akpm/master' + Date: Mon Jan 9 13:58:16 2017 +1100 diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..339069419c85 --- /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.10-rc2 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..fc8abb1f35cd --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20170109 |