diff options
| -rw-r--r-- | Next/SHA1s | 268 | ||||
| -rw-r--r-- | Next/Trees | 270 | ||||
| -rw-r--r-- | Next/merge.log | 2263 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 2806 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..1ec363e9dd46 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,268 @@ +Name SHA1 +---- ---- +origin 87b2c3fc63175bb32c96d4ec58152d4fdd5a4ae1 +fixes b4b8cbf679c4866a523a35d1454884a31bd5d8dc +kbuild-current ad8181060788c80c0ad75b583f24c22fa962a7a6 +arc-current 11352460b8dc8f29d929fb1e718c270f34bf609c +arm-current 9e25ebfe56ece7541cd10a20d715cbdd148a2e06 +m68k-current 204a2be30a7a8a8d12642f23f3fbdc8b9923b500 +metag-fixes b884a190afcecdbef34ca508ea5ee88bb7c77861 +powerpc-fixes 01e6a61aceb82e13bec29502a8eb70d9574f97ad +sparc 2ad67141f1e47dc063b202993835361a06239aaa +fscrypt-current 42d97eb0ade31e1bc537d086842f5d6e766d9d51 +net 533da29b584de5ae0e9dafafbe52809f59cb5300 +ipsec e6194923237f3952b955c343b65b211f36bce01c +netfilter c644bd79c0a782045f58d3dffebaf3d3154e32bf +ipvs 3c5ab3f395d66a9e4e937fcfdf6ebc63894f028b +wireless-drivers 35abcd4f9f303ac4f10f99b3f7e993e5f2e6fa37 +mac80211 d7f13f7450369281a5d0ea463cc69890a15923ae +sound-current 74ec118152ea494a25ebb677cbc83a75c982ac5f +pci-current 34d5ac2af644a10958e144b7bb937d289dfd158d +driver-core.current 5771a8c08880cdca3bfb4a3fc6d309d6bba20877 +tty.current 5771a8c08880cdca3bfb4a3fc6d309d6bba20877 +usb.current 5771a8c08880cdca3bfb4a3fc6d309d6bba20877 +usb-gadget-fixes f50b878fed33e360d01dcdc31a8eeb1815d033d5 +usb-serial-fixes 996fab55d864ed604158f71724ff52db1c2454a3 +usb-chipidea-fixes cbb22ebcfb9920380ed69854a7095d497798063d +phy 9605bc46433d54f89b12d443a3d9aabf8070824b +staging.current 677e6a1ab4edcf4b5c48ab68acf9d7f01555a8fb +char-misc.current 5771a8c08880cdca3bfb4a3fc6d309d6bba20877 +input-current dda5202b001cb59b16a1d20d063edd71e12905b3 +crypto-current b8fc3397c9e88dc7889b56395d04c1f3d65d186f +ide acfead32f3f938e456d7d5e1a82c743d30b8b886 +vfio-fixes 39da7c509acff13fc8cb12ec1bb20337c988ed36 +kselftest-fixes 2ea659a9ef488125eb46da6eb571de5eae5c43f6 +backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f +ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600 +nand-fixes d4ed3b9015b5eebc90d629579d9e7944607cbae5 +spi-nor-fixes 2ea659a9ef488125eb46da6eb571de5eae5c43f6 +mfd-fixes 9e69672e90ccff10dab6f0c9545226a886e5973c +v4l-dvb-fixes 2a2599c663684a1142dae0bff7737e125891ae6d +reset-fixes 4497a224f759cd8350e07382307b55f870ef0df2 +drm-intel-fixes 611cdf3695a307fdca3ff3779a1e6cca935e2d31 +drm-misc-fixes 76250f2b743b72cb685cc51ac0cdabb32957180b +kbuild 5771a8c08880cdca3bfb4a3fc6d309d6bba20877 +uuid b86a496a42064e2a864bae31306e0c78eced2a3b +dma-mapping 1655cf8829d82d367d8fdb5cb58e5885d7d2a391 +asm-generic a351e9b9fc24e982ec2f0e76379a49826036da12 +arc 6f8119230ed026cee037dad784e7f8968ebfb052 +arm fc256ee00f0c5d8d2c282416b02db1da703ec015 +arm-perf c0f7f7acdecdd7cf9a19c0af5c3dc649e1b934f7 +arm-soc ebc5ff9e87f69d9f1b9a83561658a1fda2bdd804 +actions 8ba75fbb148a798c3220ce61fdf5d05518158847 +alpine a1144b2b1ec47f50951a83eb2bd847c74415b567 +amlogic f99503e956ae20c4dbc8b47841a460b970019977 +aspeed 4944e5dbb215cb99491bc5cd519045ae84536d2c +at91 19964541c23156cc8f814a2137df6b833ccdbf12 +bcm2835 652fb0c6435cb16aa92ab216622ace0aead51ec8 +berlin 5153351425c92f3e89358c8eb62ca8d901437581 +cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4 +imx-mxs 07869024311352aebf8543496d5af30b2edc06a5 +keystone b45371147f9dc1b77b7cd96d8fb276ddd40d8f56 +mvebu 8b6439a845a90af565711687725de1ef816c2801 +omap 05f2a5417cf1e820d9bc80ca7f03f959989edb0f +omap-pending c20c8f750d9f8f8617f07ee2352d3ff560e66bc2 +reset dfeac250c42974c078093256c67bb9794c10488f +qcom 6a3282b03fe6420038c7ba1e1984b494614c130d +realtek 007e6304223c86173ff1a754736c774f2c771f57 +renesas c2432fc935fdef71afed43541eac8a6100cc7297 +rockchip 9f7ba3e12ff46f4846386319f06c189b0dc821db +rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590 +samsung 2ea659a9ef488125eb46da6eb571de5eae5c43f6 +samsung-krzk ad0e0348e29a4286c5002e12e34df533f9c3950e +sunxi efb85d294c2ab7b35d7f3d9d1160664c56978de9 +tegra 07bb9460b188dd86fd648ae62d39eebfb32fac4b +arm64 425e1ed73e6574e4fe186ec82fd37213cbd47df0 +clk 3cf50f6b13a2b2325532bc389107e6a2dcc99314 +c6x 91ebcd1b97aea87172e8ae8871f1f328b9fa9c05 +cris 8f50f2a1b46a11a9a9fb46c5d8325dfc88281a76 +h8300 58c57526711f7c87046b7c5a650535acbab2d3fb +hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a +ia64 fbb0e4da96f4503e65bc4fb627cf4e1d7c8c64e6 +m68k 204a2be30a7a8a8d12642f23f3fbdc8b9923b500 +m68knommu 354b6382847d1d95b576d0c851df7a5743b8a2c2 +metag e3cd7f013bac3105d44b8bd5a90359989d45b5a5 +microblaze 14ef905bb2eecb02f7ce31b8fbedd4a75ddf0f57 +mips d40e0d4fb5613099a58c95a9403f51b03e40e861 +nios2 e118c3fec9c0d8d2a96462c4c035305dc952e402 +openrisc 9d15eb228b10fbe9c7ca2cfb257ddf8be826c428 +parisc-hd 6f7da290413ba713f0cdd9ff1a2a9bb129ef4f6c +powerpc 1e0fc9d1eb2b0241a03e0a02bcdb9b5b641b9d35 +fsl 61baf15555129f69720334f232b153890895ef71 +mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0 +s390 5414d4af8a7c3ada7101d4634d13b002db799a4d +sparc-next 3b06b1a7448ee4e8e51dae3938774735404e51fb +sh 6e2fbfdd585f46128ce8879738bca09719a65138 +tile 0af0bc38175d9859753a08f07af3aa767601265b +uml 61e8d462457f202bf0c6393133425ad387825e22 +unicore32 bc27113620ca6b67320b8a57e70d801dc94221d5 +xtensa bdf3b55fde37836dc5d024bfcbdbc2d18622ae6e +fscrypt c250b7dd8e73b5f7d88d231fbaac92e3360a7234 +befs 5771a8c08880cdca3bfb4a3fc6d309d6bba20877 +btrfs 8b8b08cbfb9021af4b54b4175fc4c51d655aac8c +btrfs-kdave e6f162c291c3506cb4a4dd1abbc6d3c60d074e5b +ceph 3f51f6c3baa1da3a63912f177f0f70e8e3fc121b +cifs 235b84fc862ae2637dc0dabada18d97f1bfc18e1 +configfs 19e72d3abb63cb16d021a4066ce1a18880509e99 +ecryptfs be280b25c3288824ed4c201b452c3e87a7074d7c +ext3 4d9bcaddacf23861c5ee088b0c03e7034c3d59d6 +ext4 ff95015648df445999c8483270905f7d3dec51e1 +f2fs 5771a8c08880cdca3bfb4a3fc6d309d6bba20877 +freevxfs bf1bb4b460c8dc3a33793bff21464a9d816697ad +fscache d52bd54db8be8999df6df5a776f38c4f8b5e9cea +fuse 68227c03cba84a24faf8a7277d2b1a03c8959c2c +jfs 6fa92ce0a8880ced3f26e5f2171354df302295e2 +nfs 6f7da290413ba713f0cdd9ff1a2a9bb129ef4f6c +nfsd b20dae70bfa5014fdf201d0a8589271b888e4927 +orangefs 2f713b5c7d2a90baba6c88174c81fb9a96bfde21 +overlayfs 3329e0599fd2a2254c1d8d77d1bb1bf1650682b9 +v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc +ubifs a6664433d383eeb71cbdeb9aea2c66eeea76e742 +xfs cd87d867920155911d0d2e6485b769d853547750 +file-locks 9d5b86ac13c573795525ecac6ed2db39ab23e2a8 +vfs 66bf9796772633c8b0650e858da94467ec43dc18 +vfs-jk 030b533c4fd4d2ec3402363323de4bb2983c9cee +vfs-miklos 0eb8af4916a540c362a2950e5ab54eca32eb7d58 +printk f4e981cba2dec675d40ac4f270b7e8ac164c9004 +pci af3c8d98508d37541d4bf57f13a984a7f73a328c +pstore 0752e4028c003fba1e2b44c4b3cf6a4482e931b6 +hid 4cf56a89c696e66d10612b43b7e95852611e76c2 +i2c 4ca6df134847a6349620b485a3e63f00fb3bfad8 +jdelvare-hwmon 08d27eb2066622cd659b91d877d0406ebd651225 +dmi 8efa050f19fe8adbd73b6baa454be6d27eeefeac +hwmon-staging e7adb541f7c503a4bce936d1e7ab04e573e0480b +jc_docs 5771a8c08880cdca3bfb4a3fc6d309d6bba20877 +v4l-dvb 2748e76ddb2967c4030171342ebdd3faa6a5e8e8 +v4l-dvb-next d9c4615854ec5b9717784ad7a3672764c9442ed5 +fbdev 4c99ceda0d067c06f228a27b6870f548d3218cc6 +pm 7d71a49525ed28ac4b44f5fdbe6c57b18915c91d +idle 306899f94804aece6d8fa8b4223ede3b48dbb59c +thermal 5d72ed35678a351a1aed4b454c25d583f8bccb28 +thermal-soc aa647852c32a1890a4b1bc327b9d748b82bc1484 +ieee1394 72f3c27aa6460196ec0261bb780fbba036eef6de +dlm e94d6f64e7baa36972548e5527e70f522f6ea6c8 +swiotlb 69369f52d28a34c84acb6f2a8a585e743441566a +net-next ce3dbe29749e3a3ef25540b394a68215e3113462 +ipsec-next 8bafd73093f2f431f5a363f8057abc0ccc118853 +netfilter-next 04ba724b659c6808b0ca31528121bdb2f2807e00 +nfc-next bd751808f9ff5e1822c627f6c4283009e66b2e53 +ipvs-next fb90e8dedb465bd06512f718b139ed8680d26dbe +wireless-drivers-next 17d9aa66b08de445645bd0688fc1635bed77a57b +bluetooth f33f640415eb0579fefabea4ac07f852fb1fefd4 +mac80211-next 3dc02251f43fb5ec7fa576138005edbfe35ed1ca +rdma c9d68a4e843751f0e1a080fd37fe0856457b7d48 +gfs2 da029c11e6b12f321f36dac8771e833b65cec962 +mtd 7d84120b5ba61912a5333f5fe2c4e8f35ef9514f +l2-mtd 7d84120b5ba61912a5333f5fe2c4e8f35ef9514f +nand 81667e9c8ad827365f2d1e8b924caf062a19c593 +spi-nor 1a18915b497185e1659878e7eae0e68411ae769b +crypto bcf741cb779283081db47853264cc94854e7ad83 +drm 6419ec78c6726aa54ff103aceffbf19d546d3d1b +drm-panel e4bac408b08437d190785ab1250cc676304ed171 +drm-intel eafbc20701243d21989c9c9aff5e5d9488e1890a +drm-tegra 43240bbd871e2c8f89584d369278a3d18680d9ea +drm-misc 1ed134e6526b1b513a14fba938f6d96aa1c7f3dd +drm-exynos 7d1e042314619115153a0f6f06e4552c09a50e13 +drm-msm 4a630fadbb29d9efaedb525f1a8f7449ad107641 +hdlcd fee4964f0a6cd2ce6368d2c69e9ec8e6f44fb0ec +mali-dp e40eda3dda1ef36ddef7e02c1b280a9ae91a561b +sunxi-drm 110d33dd428ea49b9482bcb780fb096dfb4dcd3e +imx-drm 994fc62e1d04a4647f19b4754d9cd5cb1b526735 +etnaviv 8cc47b3ea0822175deb8bf436e4c59a7f128ac30 +kconfig 5bcba792bb304e8341217d759ec486969a3b4258 +regmap 9af2b88755dcf349c5bff9ffa26d6b4916e87d34 +sound 74ec118152ea494a25ebb677cbc83a75c982ac5f +sound-asoc 2e7c639bf49104a90c439804fd45781cac319e29 +modules 96b5b19459b3c2aed2872bac42cbe19edfae710f +input 4323418d62fefe48ee5019f2c744c918be06ec69 +block 3b06b1a7448ee4e8e51dae3938774735404e51fb +lightnvm 1c6286f26301ad154a1c10fb6e68925493dd28ba +device-mapper 4d49f1b4a1fcab16b6dd1c79ef14f2b6531d50a6 +pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8 +mmc 9c284c41c0886f09e75c323a16278b6d353b0b4a +kgdb 7a6653fca50077f342bcdc39222d78928e3f0feb +md 6409e84ec58fc4c0085d8921f8e01815dc871971 +mfd d1f99b97478e248353588da0de07be5a265601cf +backlight 056d6ff470a8e782648fd020940c04d0d4a0d761 +battery 7bb5a650f3471e4052e1692b29b0f3d3ca099c47 +omap_dss2 c456a2f30de53e77a2eb8eeb4202d742516aa76b +regulator e2b2add63783fdafcb4e07e673e6d3b1686195ea +security c4758fa59285fe4dbfeab4364a6957936d040fbf +integrity fc26bd50539b6f52aa75ffbaec7b083825ec5451 +keys 8ab2a6905b28a3a54cf833675ef555ab70cc9108 +selinux 12f6dc2696a56778db380420597529098d9f7dd3 +tpmdd e7d872bf1bc553dee3a87e57f5276081153861be +watchdog c013b65ad8a1e132f733404809afc72f7d00e768 +iommu 6a7086431fa18df7d03b1ed0126426c79b38dc8c +dwmw2-iommu 910170442944e1f8674fd5ddbeeb8ccd1877ea98 +vfio 7f56c30bd0a232822aca38d288da475613bdff9b +trivial 6fbc8798d9461c0ff22fab9fbaddde13de815941 +audit 15318a9f801558fb300347db6f96fb7c90ec915f +devicetree 580c4549578db566e0d001c436c6cba22b8d2e6b +mailbox 25bfee16d5a3158086273cc51110c7470144c842 +spi a40be456ef3c717da897c02e32ea0494e6cde388 +tip ef2070b705dba599a143d7e313074ac7947563cb +clockevents 2287d8664fe7345ead891017eccd879fc605305e +edac 345fb0a9a6340ba0b3b714d62f877fde88c8a755 +edac-amd 164c29244d4beb9a105102c42821f4925e4a0c7a +irqchip c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201 +ftrace 2e028c4fe12907f226b8221815f16c2486ad3aa7 +rcu 6d48152eafde1f0d0a4a9e0584fa7d9ff4fbfdac +kvm d3457c877b14aaee8c52923eedf05a3b78af0476 +kvm-arm d38338e396ee0571b3502962fd2fbaec4d2d9a8f +kvm-mips dc44abd6aad22411f7f9890e39fd4753dabf0d03 +kvm-ppc 8b24e69fc47e43679bb29ddb481aa0e8dce2a3c5 +kvms390 d52cd2076eb2ace9fe95dbf795f6d93587453914 +xen-tip 18f7dd89a7c6dedf38d7846702ba31f2c50ddc41 +percpu e3efe3db932b55ed34ba32862f568abae32046d0 +workqueues bacb71fc9187f288e98c3132e87f36c0362318df +drivers-x86 5771a8c08880cdca3bfb4a3fc6d309d6bba20877 +chrome-platform 3c778a7fcfaa4bb51aefb4f2c7364a5e2c4d0b66 +hsi 67ddd75771b6b860bc0cebb3b7fd4cbebeda9cd4 +leds c68729119f4d2993bec3c9cb999ad76de5aeddba +ipmi 4495ec6d770e1bca7a04e93ac453ab6720c56c5d +driver-core 5771a8c08880cdca3bfb4a3fc6d309d6bba20877 +usb 5771a8c08880cdca3bfb4a3fc6d309d6bba20877 +usb-gadget 0591bc2360152f851e29246884805bb77a2c3b9d +usb-serial c22ac6d29f18d3210c545f77e4f95b856ab5f983 +usb-chipidea-next c4a0bbbdb7f6e3c37fa6deb3ef28c5ed99da6175 +phy-next af850e14a7ae493e85090723eb9cf85dafb8b243 +tty 5771a8c08880cdca3bfb4a3fc6d309d6bba20877 +char-misc 5771a8c08880cdca3bfb4a3fc6d309d6bba20877 +extcon ff890bc00830830799a72ed7481836f0dd9c3be9 +staging 07119e257309a41e5ec4a896fd8c8e588388269e +mux a351e9b9fc24e982ec2f0e76379a49826036da12 +slave-dma f6a28cf9aff957761b3415cba53714378d2053f0 +cgroup 610467270fb368584b74567edd21c8cc5104490f +scsi 6f37e2102778d3437a416684680cc5ce295f2042 +scsi-mkp 6f37e2102778d3437a416684680cc5ce295f2042 +target-updates 138d351eefb727ab9e41a3dc5f112ceb4f6e59f2 +target-merge 2994a75183173defc21f0d26ce23b63232211b88 +target-bva 2ea659a9ef488125eb46da6eb571de5eae5c43f6 +libata 6ac1d1532c888b030acb3b4ac82425448cb15198 +binfmt_misc 4af75df6a410ce76d9f60f27b07e5645ecc2c5ed +vhost e41b1355508debe45fda33ef8c03ff3ba5d206b9 +rpmsg 9ef2b6cc595a01c6c0ec53c44f1679ca3a977c55 +gpio 8d2c6297aec930cc825ebaad712e691f0a5f54eb +pinctrl ece5946c2eedfe8268beca2b00728b53627eca1f +pinctrl-samsung 5771a8c08880cdca3bfb4a3fc6d309d6bba20877 +pwm 5ec8c48a6235175f7ff59ed1acbe91d4d0398026 +dma-buf 194cad44c4e1553fd8fcfbc940d27e756324ec3a +userns 2fd1d2c4ceb2248a727696962cf3370dc9f5a0a4 +ktest f7c6401ff84ab8ffffc281a29aa0a787f7eb346e +random 72e5c740f6335e27253b8ff64d23d00337091535 +aio 4c1d69950da453318c938f8c480388e235c92bb9 +kselftest e67f85fb96ca80e5a60ea69c536affed0affc77d +y2038 69973b830859bc6529a7a0468ba0d80ee5117826 +luto-misc 2dcd0af568b0cf583645c8a317dd12e344b1c72a +borntraeger e76d21c40bd6c67fd4e2c1540d77e113df962b4d +livepatching 26d8d1e9bb4878285f8ce852783cbd2f6bb95c1f +coresight c36e434188c51ec3c0909346ed582254af90cb06 +rtc 40bf6a35483ee25271ce2a90d8976cf1409a033a +hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828 +nvdimm 9d92573fff3ec70785ef1815cc80573f70e7a921 +dax-misc 4d9a2c8746671efbb0c27d3ae28c7474597a7aad +idr f0f3f2d0a3e0f7c48163fd8b45f5909d46e7f371 +kspp cb00e6b58abbb1b41f3e41890cee7550ac8c1853 +akpm-current 7f004d4884d4b78c6ac68cc6cd6a105f21ed047b +akpm 369b7d2e2d1e0c850542db0b0db0ffbd6aa7a5ba diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..a4f686ec48c0 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,270 @@ +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/masahiroy/linux-kbuild.git#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 +nand-fixes git git://git.infradead.org/linux-mtd.git#nand/fixes +spi-nor-fixes git git://git.infradead.org/linux-mtd.git#spi-nor/fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/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/masahiroy/linux-kbuild.git#for-next +uuid git git://git.infradead.org/users/hch/uuid.git#for-next +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.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 +actions git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions.git#for-next +alpine git git://git.kernel.org/pub/scm/linux/kernel/git/atenart/linux.git#alpine/for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git#for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.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 +reset git https://git.pengutronix.de/git/pza/linux#reset/next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git#for-next +realtek git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek.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 +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/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 +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://git.kernel.org/pub/scm/linux/kernel/git/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 +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.kernel.org/pub/scm/linux/kernel/git/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 +printk git git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +jdelvare-hwmon quilt http://jdelvare.nerim.net/devel/linux/jdelvare-hwmon/ +dmi quilt http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next 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 +nfc-next git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-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 +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-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://git.infradead.org/l2-mtd.git#nand/next +spi-nor git git://git.infradead.org/l2-mtd.git#spi-nor/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-drm git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi-drm/for-next +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +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/bleung/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://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-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 +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-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 +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +mux git https://gitlab.com/peda-linux/mux.git#for-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 +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-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 +idr git git://git.infradead.org/users/willy/linux-dax.git#idr-4.11 +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +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..7e69d44dc073 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2263 @@ +$ date -R +Mon, 17 Jul 2017 09:14:52 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at b86faee6d111 Merge tag 'nfs-for-4.13-1' of git://git.linux-nfs.org/projects/anna/linux-nfs +Merging origin/master (87b2c3fc6317 h8300: Add missing closing parenthesis in flat_get_addr_from_rp()) +$ git merge origin/master +Updating b86faee6d111..87b2c3fc6317 +Fast-forward + Documentation/DMA-API-HOWTO.txt | 153 +- + Documentation/DMA-API.txt | 580 +++-- + Documentation/DMA-ISA-LPC.txt | 71 +- + Documentation/DMA-attributes.txt | 15 +- + Documentation/IPMI.txt | 76 +- + Documentation/IRQ-affinity.txt | 75 +- + Documentation/IRQ-domain.txt | 69 +- + Documentation/IRQ.txt | 2 + + Documentation/Intel-IOMMU.txt | 37 +- + Documentation/SAK.txt | 65 +- + Documentation/SM501.txt | 9 +- + Documentation/bcache.txt | 190 +- + Documentation/bt8xxgpio.txt | 19 +- + Documentation/btmrvl.txt | 65 +- + Documentation/bus-virt-phys-mapping.txt | 64 +- + Documentation/cachetlb.txt | 92 +- + Documentation/cgroup-v2.txt | 460 ++-- + Documentation/circular-buffers.txt | 51 +- + Documentation/clk.txt | 189 +- + Documentation/cpu-load.txt | 131 +- + Documentation/cputopology.txt | 37 +- + Documentation/crc32.txt | 75 +- + Documentation/crypto/asymmetric-keys.txt | 65 +- + Documentation/dcdbas.txt | 24 +- + Documentation/debugging-via-ohci1394.txt | 21 +- + Documentation/dell_rbu.txt | 81 +- + .../devicetree/bindings/clock/img,boston-clock.txt | 31 + + Documentation/digsig.txt | 131 +- + Documentation/efi-stub.txt | 25 +- + Documentation/eisa.txt | 273 +- + Documentation/fault-injection/fault-injection.txt | 21 +- + Documentation/filesystems/vfs.txt | 6 - + Documentation/flexible-arrays.txt | 25 +- + Documentation/futex-requeue-pi.txt | 93 +- + Documentation/gcc-plugins.txt | 58 +- + Documentation/highuid.txt | 47 +- + Documentation/hw_random.txt | 159 +- + Documentation/hwspinlock.txt | 527 ++-- + Documentation/intel_txt.txt | 63 +- + Documentation/io-mapping.txt | 67 +- + Documentation/io_ordering.txt | 62 +- + Documentation/iostats.txt | 76 +- + Documentation/irqflags-tracing.txt | 10 +- + Documentation/isa.txt | 53 +- + Documentation/isapnp.txt | 1 + + Documentation/kernel-per-CPU-kthreads.txt | 156 +- + Documentation/kobject.txt | 69 +- + Documentation/kprobes.txt | 475 ++-- + Documentation/kref.txt | 295 ++- + Documentation/ldm.txt | 56 +- + Documentation/lockup-watchdogs.txt | 3 +- + Documentation/lzo.txt | 27 +- + Documentation/mailbox.txt | 185 +- + Documentation/memory-hotplug.txt | 355 +-- + Documentation/men-chameleon-bus.txt | 330 +-- + Documentation/nommu-mmap.txt | 68 +- + Documentation/ntb.txt | 157 +- + Documentation/numastat.txt | 5 +- + Documentation/padata.txt | 27 +- + Documentation/parport-lowlevel.txt | 1321 ++++++---- + Documentation/percpu-rw-semaphore.txt | 3 +- + Documentation/phy.txt | 106 +- + Documentation/pi-futex.txt | 15 +- + Documentation/pnp.txt | 343 +-- + Documentation/preempt-locking.txt | 40 +- + Documentation/printk-formats.txt | 384 +-- + Documentation/rbtree.txt | 88 +- + Documentation/remoteproc.txt | 328 ++- + Documentation/rfkill.txt | 43 +- + Documentation/robust-futex-ABI.txt | 14 +- + Documentation/robust-futexes.txt | 12 +- + Documentation/rpmsg.txt | 348 +-- + Documentation/security/keys/core.rst | 6 + + Documentation/sgi-ioc4.txt | 4 + + Documentation/siphash.txt | 164 +- + Documentation/smsc_ece1099.txt | 4 + + Documentation/static-keys.txt | 207 +- + Documentation/svga.txt | 146 +- + Documentation/tee.txt | 53 +- + Documentation/this_cpu_ops.txt | 49 +- + Documentation/unaligned-memory-access.txt | 57 +- + Documentation/vfio-mediated-device.txt | 266 +- + Documentation/vfio.txt | 281 +- + Documentation/virtual/kvm/api.txt | 18 + + Documentation/virtual/kvm/msr.txt | 5 +- + Documentation/xillybus.txt | 29 +- + Documentation/xz.txt | 200 +- + Documentation/zorro.txt | 59 +- + MAINTAINERS | 35 +- + Makefile | 4 +- + arch/arm/include/asm/flat.h | 25 +- + arch/arm/include/asm/uaccess.h | 7 - + arch/arm/kernel/bios32.c | 2 +- + arch/arm64/include/asm/uaccess.h | 4 - + arch/blackfin/include/asm/flat.h | 28 +- + arch/blackfin/kernel/flat.c | 13 +- + arch/c6x/include/asm/flat.h | 15 +- + arch/h8300/include/asm/flat.h | 24 +- + arch/ia64/include/asm/uaccess.h | 36 - + arch/m32r/include/asm/flat.h | 19 +- + arch/m68k/include/asm/flat.h | 26 +- + arch/m68k/include/asm/uaccess.h | 7 - + arch/microblaze/include/asm/flat.h | 34 +- + arch/mips/Kconfig | 114 +- + arch/mips/Makefile | 2 +- + arch/mips/boot/dts/img/Makefile | 5 +- + arch/mips/boot/dts/img/boston.dts | 224 ++ + arch/mips/boot/dts/mti/sead3.dts | 24 +- + arch/mips/configs/ar7_defconfig | 6 - + arch/mips/configs/ath79_defconfig | 2 - + arch/mips/configs/bcm63xx_defconfig | 7 - + arch/mips/configs/bigsur_defconfig | 4 - + arch/mips/configs/bmips_be_defconfig | 1 - + arch/mips/configs/capcella_defconfig | 4 - + arch/mips/configs/cavium_octeon_defconfig | 1 - + arch/mips/configs/ci20_defconfig | 1 - + arch/mips/configs/cobalt_defconfig | 8 - + arch/mips/configs/decstation_defconfig | 1 - + arch/mips/configs/e55_defconfig | 2 - + arch/mips/configs/fuloong2e_defconfig | 11 - + arch/mips/configs/generic/board-boston.config | 48 + + arch/mips/configs/gpr_defconfig | 8 - + arch/mips/configs/ip22_defconfig | 11 - + arch/mips/configs/ip27_defconfig | 5 - + arch/mips/configs/ip28_defconfig | 5 - + arch/mips/configs/ip32_defconfig | 8 - + arch/mips/configs/jazz_defconfig | 6 - + arch/mips/configs/jmr3927_defconfig | 7 - + arch/mips/configs/lasat_defconfig | 5 - + arch/mips/configs/lemote2f_defconfig | 12 - + arch/mips/configs/loongson3_defconfig | 3 - + arch/mips/configs/malta_kvm_defconfig | 1 - + arch/mips/configs/malta_kvm_guest_defconfig | 1 - + arch/mips/configs/malta_qemu_32r6_defconfig | 1 - + arch/mips/configs/maltaaprp_defconfig | 2 - + arch/mips/configs/maltasmvp_defconfig | 1 - + arch/mips/configs/maltasmvp_eva_defconfig | 2 - + arch/mips/configs/maltaup_defconfig | 2 - + arch/mips/configs/markeins_defconfig | 4 - + arch/mips/configs/mips_paravirt_defconfig | 1 - + arch/mips/configs/mpc30x_defconfig | 5 - + arch/mips/configs/msp71xx_defconfig | 2 - + arch/mips/configs/mtx1_defconfig | 11 - + arch/mips/configs/nlm_xlp_defconfig | 5 - + arch/mips/configs/nlm_xlr_defconfig | 9 - + arch/mips/configs/pnx8335_stb225_defconfig | 7 - + arch/mips/configs/qi_lb60_defconfig | 3 - + arch/mips/configs/rb532_defconfig | 6 - + arch/mips/configs/rbtx49xx_defconfig | 7 - + arch/mips/configs/rm200_defconfig | 8 - + arch/mips/configs/rt305x_defconfig | 2 - + arch/mips/configs/sb1250_swarm_defconfig | 1 - + arch/mips/configs/tb0219_defconfig | 6 - + arch/mips/configs/tb0226_defconfig | 7 - + arch/mips/configs/tb0287_defconfig | 5 - + arch/mips/configs/workpad_defconfig | 4 - + arch/mips/generic/Kconfig | 20 + + arch/mips/generic/Makefile | 1 + + arch/mips/generic/board-sead3.c | 234 +- + arch/mips/generic/init.c | 27 + + arch/mips/generic/vmlinux.its.S | 25 + + arch/mips/generic/yamon-dt.c | 240 ++ + arch/mips/include/asm/Kbuild | 2 + + arch/mips/include/asm/branch.h | 5 +- + arch/mips/include/asm/cmpxchg.h | 280 +- + arch/mips/include/asm/cpu-features.h | 44 + + arch/mips/include/asm/cpu-type.h | 1 + + arch/mips/include/asm/cpu.h | 9 +- + arch/mips/include/asm/irq.h | 2 +- + .../include/asm/mach-ath25/cpu-feature-overrides.h | 1 + + .../asm/mach-au1x00/cpu-feature-overrides.h | 1 + + .../asm/mach-bcm63xx/cpu-feature-overrides.h | 1 + + .../asm/mach-cobalt/cpu-feature-overrides.h | 1 + + .../include/asm/mach-dec/cpu-feature-overrides.h | 1 + + arch/mips/include/asm/mach-generic/mc146818rtc.h | 2 +- + .../include/asm/mach-ip22/cpu-feature-overrides.h | 1 + + .../include/asm/mach-ip27/cpu-feature-overrides.h | 1 + + .../include/asm/mach-ip28/cpu-feature-overrides.h | 1 + + .../include/asm/mach-ip32/cpu-feature-overrides.h | 1 + + .../asm/mach-jz4740/cpu-feature-overrides.h | 1 + + arch/mips/include/asm/mach-loongson64/boot_param.h | 22 +- + .../asm/mach-loongson64/cpu-feature-overrides.h | 1 + + .../asm/mach-netlogic/cpu-feature-overrides.h | 1 + + .../asm/mach-rc32434/cpu-feature-overrides.h | 1 + + .../include/asm/mach-rm/cpu-feature-overrides.h | 1 + + .../asm/mach-sibyte/cpu-feature-overrides.h | 1 + + .../asm/mach-tx49xx/cpu-feature-overrides.h | 1 + + arch/mips/include/asm/machine.h | 31 + + arch/mips/include/asm/mipsregs.h | 1 + + arch/mips/include/asm/module.h | 8 +- + arch/mips/include/asm/spinlock.h | 426 +-- + arch/mips/include/asm/spinlock_types.h | 34 +- + arch/mips/include/asm/syscall.h | 2 +- + arch/mips/include/asm/uaccess.h | 277 -- + arch/mips/include/asm/uasm.h | 30 + + arch/mips/include/asm/vdso.h | 4 +- + arch/mips/include/asm/yamon-dt.h | 64 + + arch/mips/include/uapi/asm/inst.h | 20 +- + arch/mips/kernel/Makefile | 3 +- + arch/mips/kernel/branch.c | 73 +- + arch/mips/kernel/cmpxchg.c | 109 + + arch/mips/kernel/cps-vec.S | 7 +- + arch/mips/kernel/cpu-probe.c | 24 + + arch/mips/kernel/mips-cm.c | 40 +- + arch/mips/kernel/module-rela.c | 202 -- + arch/mips/kernel/module.c | 221 +- + arch/mips/kernel/perf_event_mipsxx.c | 14 +- + arch/mips/kernel/proc.c | 3 +- + arch/mips/kernel/ptrace.c | 31 +- + arch/mips/kernel/scall32-o32.S | 2 +- + arch/mips/kernel/scall64-64.S | 2 +- + arch/mips/kernel/scall64-n32.S | 2 +- + arch/mips/kernel/scall64-o32.S | 2 +- + arch/mips/kernel/setup.c | 40 + + arch/mips/kernel/smp-cps.c | 35 +- + arch/mips/kernel/smp.c | 3 + + arch/mips/kernel/syscall.c | 19 +- + arch/mips/kernel/unaligned.c | 213 +- + arch/mips/lib/memcpy.S | 3 + + arch/mips/loongson64/common/env.c | 12 +- + arch/mips/loongson64/common/init.c | 13 + + arch/mips/loongson64/loongson-3/irq.c | 58 +- + arch/mips/loongson64/loongson-3/smp.c | 23 +- + arch/mips/math-emu/cp1emu.c | 43 +- + arch/mips/mm/c-r4k.c | 2 + + arch/mips/mm/tlbex.c | 41 +- + arch/mips/mm/uasm-micromips.c | 188 +- + arch/mips/mm/uasm-mips.c | 238 +- + arch/mips/mm/uasm.c | 61 +- + arch/mips/net/Makefile | 3 +- + arch/mips/vdso/gettimeofday.c | 59 +- + arch/parisc/include/asm/uaccess.h | 1 - + arch/powerpc/include/asm/atomic.h | 4 +- + arch/powerpc/include/asm/opal-api.h | 9 + + arch/powerpc/include/asm/reg.h | 2 +- + arch/powerpc/include/asm/uaccess.h | 3 - + arch/powerpc/kernel/cpu_setup_power.S | 13 +- + arch/powerpc/kernel/dt_cpu_ftrs.c | 16 +- + arch/powerpc/kernel/mce_power.c | 56 +- + arch/powerpc/kernel/misc_64.S | 12 + + arch/powerpc/lib/sstep.c | 19 +- + arch/powerpc/mm/mmu_context_book3s64.c | 20 +- + arch/powerpc/perf/isa207-common.c | 6 +- + arch/powerpc/perf/power9-events-list.h | 4 + + arch/powerpc/perf/power9-pmu.c | 2 + + arch/powerpc/platforms/cell/spufs/inode.c | 22 +- + arch/powerpc/platforms/powernv/opal.c | 19 +- + arch/powerpc/platforms/powernv/setup.c | 11 +- + arch/s390/include/asm/uaccess.h | 3 - + arch/sh/include/asm/flat.h | 15 +- + arch/sparc/include/asm/uaccess_64.h | 1 - + arch/tile/include/asm/uaccess.h | 1 - + arch/tile/include/uapi/arch/abi.h | 49 +- + arch/tile/include/uapi/arch/intreg.h | 70 + + arch/tile/mm/init.c | 30 - + arch/um/Makefile | 4 + + arch/um/drivers/stdio_console.c | 3 + + arch/um/include/asm/common.lds.S | 2 +- + arch/um/include/asm/io.h | 17 + + arch/um/include/shared/os.h | 4 + + arch/um/include/shared/skas/stub-data.h | 2 - + arch/um/kernel/physmem.c | 10 +- + arch/um/kernel/trap.c | 10 + + arch/um/kernel/um_arch.c | 16 +- + arch/um/kernel/umid.c | 4 +- + arch/um/os-Linux/execvp.c | 2 +- + arch/um/os-Linux/main.c | 9 +- + arch/um/os-Linux/mem.c | 28 +- + arch/um/os-Linux/skas/process.c | 41 +- + arch/um/os-Linux/start_up.c | 28 +- + arch/um/os-Linux/umid.c | 19 +- + arch/um/os-Linux/util.c | 34 + + arch/x86/crypto/sha1_ssse3_glue.c | 2 +- + arch/x86/include/asm/cpufeatures.h | 1 + + arch/x86/include/asm/kvm_emulate.h | 1 + + arch/x86/include/asm/kvm_host.h | 11 +- + arch/x86/include/asm/svm.h | 5 +- + arch/x86/include/asm/uaccess.h | 3 - + arch/x86/include/uapi/asm/kvm_para.h | 1 + + arch/x86/kernel/kvm.c | 7 +- + arch/x86/kvm/hyperv.c | 67 +- + arch/x86/kvm/hyperv.h | 3 +- + arch/x86/kvm/i8254.c | 2 + + arch/x86/kvm/mmu.c | 35 +- + arch/x86/kvm/mmu.h | 3 + + arch/x86/kvm/svm.c | 151 +- + arch/x86/kvm/vmx.c | 162 +- + arch/x86/kvm/x86.c | 43 +- + arch/x86/um/os-Linux/registers.c | 12 +- + arch/x86/um/setjmp_32.S | 16 +- + arch/x86/um/setjmp_64.S | 16 +- + arch/x86/um/user-offsets.c | 6 +- + arch/xtensa/include/asm/Kbuild | 1 + + arch/xtensa/include/asm/fb.h | 12 - + arch/xtensa/include/asm/flat.h | 15 +- + certs/Makefile | 6 +- + crypto/af_alg.c | 2 +- + drivers/acpi/ec.c | 21 +- + drivers/acpi/irq.c | 4 +- + drivers/acpi/x86/utils.c | 41 +- + drivers/base/power/sysfs.c | 2 + + drivers/base/property.c | 6 +- + drivers/char/random.c | 96 +- + drivers/clk/Kconfig | 1 + + drivers/clk/Makefile | 1 + + drivers/clk/imgtec/Kconfig | 9 + + drivers/clk/imgtec/Makefile | 1 + + drivers/clk/imgtec/clk-boston.c | 103 + + drivers/cpufreq/arm_big_little.c | 2 +- + drivers/cpufreq/cpufreq-dt.c | 2 +- + drivers/cpufreq/cpufreq_stats.c | 13 +- + drivers/cpufreq/dbx500-cpufreq.c | 2 +- + drivers/cpufreq/intel_pstate.c | 2 +- + drivers/cpufreq/mt8173-cpufreq.c | 4 +- + drivers/cpufreq/qoriq-cpufreq.c | 3 +- + drivers/crypto/atmel-sha.c | 4 +- + drivers/crypto/caam/caamalg.c | 20 +- + drivers/crypto/caam/caamhash.c | 2 +- + drivers/crypto/caam/key_gen.c | 2 +- + drivers/crypto/cavium/cpt/cptvf_algs.c | 8 +- + drivers/crypto/chelsio/chcr_algo.c | 23 +- + drivers/crypto/chelsio/chcr_crypto.h | 1 + + drivers/devfreq/governor_userspace.c | 2 +- + drivers/devfreq/rk3399_dmc.c | 5 +- + drivers/devfreq/tegra-devfreq.c | 6 +- + drivers/gpu/drm/drm_dp_aux_dev.c | 109 +- + drivers/input/keyboard/gpio_keys.c | 17 +- + drivers/input/misc/xen-kbdfront.c | 219 +- + drivers/input/serio/i8042.c | 12 +- + drivers/mmc/core/block.c | 6 +- + drivers/mmc/host/sdhci-acpi.c | 70 +- + drivers/mmc/host/tmio_mmc_core.c | 19 +- + drivers/net/ntb_netdev.c | 2 + + drivers/ntb/hw/Kconfig | 1 + + drivers/ntb/hw/Makefile | 1 + + drivers/ntb/hw/amd/ntb_hw_amd.c | 139 +- + drivers/ntb/hw/amd/ntb_hw_amd.h | 3 - + drivers/ntb/hw/idt/Kconfig | 31 + + drivers/ntb/hw/idt/Makefile | 1 + + drivers/ntb/hw/idt/ntb_hw_idt.c | 2712 ++++++++++++++++++++ + drivers/ntb/hw/idt/ntb_hw_idt.h | 1149 +++++++++ + drivers/ntb/hw/intel/ntb_hw_intel.c | 298 ++- + drivers/ntb/hw/intel/ntb_hw_intel.h | 3 - + drivers/ntb/ntb.c | 69 + + drivers/ntb/ntb_transport.c | 42 +- + drivers/ntb/test/ntb_perf.c | 109 +- + drivers/ntb/test/ntb_pingpong.c | 14 +- + drivers/ntb/test/ntb_tool.c | 69 +- + drivers/pci/host/pcie-rockchip.c | 2 +- + drivers/pci/pci-driver.c | 2 + + drivers/pci/pci.c | 16 +- + drivers/pci/pci.h | 1 + + drivers/pci/pcie/pme.c | 35 +- + drivers/platform/mips/cpu_hwmon.c | 136 +- + drivers/target/iscsi/iscsi_target_auth.c | 14 +- + drivers/target/iscsi/iscsi_target_login.c | 22 +- + drivers/thermal/broadcom/bcm2835_thermal.c | 1 - + drivers/thermal/cpu_cooling.c | 609 ++--- + drivers/thermal/fair_share.c | 1 + + drivers/thermal/hisi_thermal.c | 5 +- + drivers/thermal/imx_thermal.c | 27 +- + drivers/thermal/int340x_thermal/acpi_thermal_rel.c | 6 +- + drivers/thermal/int340x_thermal/int3403_thermal.c | 12 +- + drivers/thermal/step_wise.c | 3 +- + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 22 +- + drivers/thermal/user_space.c | 3 +- + fs/9p/v9fs.c | 61 + + fs/9p/v9fs.h | 3 + + fs/9p/vfs_super.c | 6 +- + fs/affs/super.c | 42 +- + fs/afs/super.c | 45 +- + fs/befs/btree.c | 15 +- + fs/befs/linuxvfs.c | 24 +- + fs/binfmt_flat.c | 41 +- + fs/btrfs/compression.c | 1 + + fs/btrfs/disk-io.c | 1 + + fs/btrfs/extent_io.c | 19 +- + fs/btrfs/extent_io.h | 4 +- + fs/btrfs/inode.c | 6 +- + fs/btrfs/raid56.c | 26 +- + fs/btrfs/send.c | 88 +- + fs/btrfs/super.c | 1 - + fs/cifs/cifsfs.c | 2 +- + fs/dcache.c | 8 +- + fs/debugfs/inode.c | 2 - + fs/efivarfs/super.c | 1 - + fs/filesystems.c | 3 +- + fs/gfs2/dir.c | 3 +- + fs/hugetlbfs/inode.c | 70 +- + fs/iomap.c | 8 +- + fs/isofs/inode.c | 51 +- + fs/isofs/isofs.h | 3 + + fs/namei.c | 3 +- + fs/namespace.c | 63 +- + fs/nsfs.c | 3 +- + fs/omfs/inode.c | 33 +- + fs/orangefs/super.c | 15 +- + fs/pipe.c | 3 +- + fs/proc/base.c | 41 +- + fs/pstore/inode.c | 14 +- + fs/pstore/internal.h | 3 + + fs/pstore/platform.c | 2 +- + fs/ramfs/inode.c | 32 +- + fs/reiserfs/super.c | 4 - + fs/super.c | 5 +- + fs/tracefs/inode.c | 2 - + fs/ubifs/crypto.c | 7 +- + fs/ubifs/dir.c | 32 +- + fs/ubifs/file.c | 27 +- + fs/ubifs/journal.c | 36 +- + fs/ubifs/key.h | 1 + + fs/ubifs/super.c | 11 +- + fs/ubifs/tnc.c | 140 +- + fs/ubifs/tnc_commit.c | 4 + + fs/ubifs/ubifs.h | 6 +- + fs/ubifs/xattr.c | 39 +- + fs/xfs/libxfs/xfs_attr.c | 4 +- + fs/xfs/libxfs/xfs_quota_defs.h | 2 - + fs/xfs/xfs_attr_list.c | 2 + + fs/xfs/xfs_dquot.c | 14 +- + fs/xfs/xfs_symlink.c | 2 + + include/asm-generic/uaccess-unaligned.h | 26 - + include/dt-bindings/clock/boston-clock.h | 14 + + include/linux/clk.h | 22 + + include/linux/cpu_cooling.h | 32 +- + include/linux/cpufreq.h | 14 + + include/linux/dcache.h | 5 + + include/linux/flat.h | 2 +- + include/linux/fs.h | 11 +- + include/linux/fwnode.h | 4 + + include/linux/hugetlb.h | 3 + + include/linux/kvm_host.h | 17 +- + include/linux/net.h | 2 + + include/linux/ntb.h | 721 +++++- + include/linux/once.h | 2 + + include/linux/random.h | 26 + + include/linux/sched.h | 2 +- + include/linux/string.h | 24 +- + include/net/9p/client.h | 13 + + include/net/9p/transport.h | 1 + + include/uapi/linux/kvm.h | 4 +- + kernel/bpf/inode.c | 16 +- + kernel/kmod.c | 16 +- + kernel/sched/cpufreq_schedutil.c | 5 + + kernel/watchdog.c | 2 +- + lib/Kconfig.debug | 55 + + lib/Makefile | 1 + + lib/atomic64_test.c | 7 + + lib/fault-inject.c | 7 +- + lib/rhashtable.c | 2 +- + lib/test_kmod.c | 1246 +++++++++ + mm/mmap.c | 2 +- + mm/util.c | 24 + + net/9p/client.c | 25 + + net/9p/trans_fd.c | 31 +- + net/9p/trans_rdma.c | 31 +- + net/ceph/ceph_common.c | 6 +- + net/compat.c | 49 +- + net/core/neighbour.c | 3 +- + net/ipv4/route.c | 3 +- + net/socket.c | 31 +- + security/keys/compat_dh.c | 2 + + security/keys/dh.c | 5 + + sound/core/pcm_native.c | 8 +- + sound/drivers/opl4/opl4_lib.c | 2 +- + sound/isa/msnd/msnd_midi.c | 30 +- + sound/isa/msnd/msnd_pinnacle.c | 23 +- + sound/pci/hda/patch_hdmi.c | 5 +- + sound/pci/hda/patch_realtek.c | 16 + + tools/testing/selftests/kmod/Makefile | 11 + + tools/testing/selftests/kmod/config | 7 + + tools/testing/selftests/kmod/kmod.sh | 615 +++++ + tools/testing/selftests/ntb/ntb_test.sh | 11 +- + virt/kvm/eventfd.c | 8 +- + virt/kvm/irqchip.c | 2 +- + virt/kvm/kvm_main.c | 131 +- + 476 files changed, 18909 insertions(+), 8938 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/img,boston-clock.txt + create mode 100644 arch/mips/boot/dts/img/boston.dts + create mode 100644 arch/mips/configs/generic/board-boston.config + create mode 100644 arch/mips/generic/yamon-dt.c + create mode 100644 arch/mips/include/asm/yamon-dt.h + create mode 100644 arch/mips/kernel/cmpxchg.c + delete mode 100644 arch/mips/kernel/module-rela.c + create mode 100644 arch/tile/include/uapi/arch/intreg.h + create mode 100644 arch/um/include/asm/io.h + delete mode 100644 arch/xtensa/include/asm/fb.h + create mode 100644 drivers/clk/imgtec/Kconfig + create mode 100644 drivers/clk/imgtec/Makefile + create mode 100644 drivers/clk/imgtec/clk-boston.c + create mode 100644 drivers/ntb/hw/idt/Kconfig + create mode 100644 drivers/ntb/hw/idt/Makefile + create mode 100644 drivers/ntb/hw/idt/ntb_hw_idt.c + create mode 100644 drivers/ntb/hw/idt/ntb_hw_idt.h + delete mode 100644 include/asm-generic/uaccess-unaligned.h + create mode 100644 include/dt-bindings/clock/boston-clock.h + create mode 100644 lib/test_kmod.c + create mode 100644 tools/testing/selftests/kmod/Makefile + create mode 100644 tools/testing/selftests/kmod/config + create mode 100644 tools/testing/selftests/kmod/kmod.sh +Merging fixes/master (b4b8cbf679c4 Cavium CNN55XX: fix broken default Kconfig entry) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/fixes (ad8181060788 kconfig: fix sparse warnings in nconfig) +$ git merge kbuild-current/fixes +Already up-to-date. +Merging arc-current/for-curr (11352460b8dc ARC: [plat-axs10x]: prepare dts files for enabling PAE40 on axs103) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/boot/dts/axc001.dtsi | 20 +++++++++----------- + arch/arc/boot/dts/axc003.dtsi | 21 ++++++++++----------- + arch/arc/boot/dts/axc003_idu.dtsi | 21 ++++++++++----------- + arch/arc/boot/dts/axs10x_mb.dtsi | 2 +- + arch/arc/configs/nps_defconfig | 1 - + arch/arc/configs/tb10x_defconfig | 1 - + arch/arc/mm/cache.c | 3 +++ + 7 files changed, 33 insertions(+), 36 deletions(-) +Merging arm-current/fixes (9e25ebfe56ec ARM: 8685/1: ensure memblock-limit is pmd-aligned) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (204a2be30a7a m68k: Remove ptrace_signal_deliver) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging powerpc-fixes/fixes (01e6a61aceb8 powerpc/64: Fix atomic64_inc_not_zero() to return an int) +$ git merge powerpc-fixes/fixes +Already up-to-date. +Merging sparc/master (2ad67141f1e4 SPARC64: Fix sun4v DMA panic) +$ git merge sparc/master +Merge made by the 'recursive' strategy. + arch/sparc/kernel/pci_sun4v.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 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 (533da29b584d Merge branch 'bcmgenet-Fragmented-SKB-corrections') +$ git merge net/master +Removing Documentation/devicetree/bindings/net/brcm,bgmac-nsp.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/brcm,amac.txt | 1 + + .../devicetree/bindings/net/brcm,bgmac-nsp.txt | 24 -- + drivers/isdn/divert/isdn_divert.c | 25 +- + drivers/isdn/hardware/avm/c4.c | 2 +- + drivers/isdn/hardware/eicon/divasmain.c | 2 +- + drivers/isdn/hardware/mISDN/avmfritz.c | 2 +- + drivers/isdn/hardware/mISDN/hfcmulti.c | 2 +- + drivers/isdn/hardware/mISDN/hfcpci.c | 2 +- + drivers/isdn/hardware/mISDN/netjet.c | 2 +- + drivers/isdn/hardware/mISDN/w6692.c | 2 +- + drivers/isdn/hisax/config.c | 2 +- + drivers/isdn/hisax/hfc4s8s_l1.c | 2 +- + drivers/isdn/hisax/hisax_fcpcipnp.c | 2 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 22 +- + drivers/net/ethernet/broadcom/bgmac-platform.c | 21 +- + drivers/net/ethernet/broadcom/bgmac.c | 70 +++-- + drivers/net/ethernet/broadcom/bgmac.h | 1 + + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 7 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 299 +++++++++++---------- + drivers/net/ethernet/broadcom/genet/bcmgenet.h | 2 + + drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 2 +- + drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ptp.c | 3 +- + drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h | 2 + + drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 3 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 58 +++- + drivers/net/ethernet/mellanox/mlx4/alloc.c | 8 +- + drivers/net/ethernet/qualcomm/emac/emac.c | 10 +- + drivers/net/ethernet/sgi/ioc3-eth.c | 14 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 +- + drivers/net/ethernet/sun/niu.c | 4 +- + drivers/net/phy/mdio-mux.c | 4 +- + drivers/net/usb/cdc_ncm.c | 28 ++ + drivers/net/usb/huawei_cdc_ncm.c | 6 + + drivers/net/usb/smsc95xx.c | 1 + + drivers/net/vmxnet3/vmxnet3_int.h | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 2 +- + include/linux/usb/cdc_ncm.h | 1 + + include/net/netlink.h | 4 +- + include/net/sctp/sctp.h | 4 + + net/bridge/br_device.c | 3 +- + net/bridge/br_input.c | 3 +- + net/core/fib_rules.c | 3 +- + net/core/filter.c | 2 +- + net/core/netpoll.c | 2 +- + net/dccp/input.c | 2 +- + net/ipv4/ip_output.c | 8 +- + net/ipv4/tcp_bbr.c | 49 +++- + net/openvswitch/conntrack.c | 51 ++-- + net/packet/af_packet.c | 6 +- + net/sched/act_api.c | 4 +- + net/sctp/sm_make_chunk.c | 4 +- + 52 files changed, 467 insertions(+), 322 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/net/brcm,bgmac-nsp.txt +Merging ipsec/master (e6194923237f esp: Fix memleaks on error paths.) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/ipv4/esp4.c | 13 ++++++++----- + net/ipv6/esp6.c | 9 +++++---- + 2 files changed, 13 insertions(+), 9 deletions(-) +Merging netfilter/master (c644bd79c0a7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf) +$ git merge netfilter/master +Already up-to-date. +Merging ipvs/master (3c5ab3f395d6 ipvs: SNAT packet replies only for NATed connections) +$ git merge ipvs/master +Already up-to-date. +Merging wireless-drivers/master (35abcd4f9f30 brcmfmac: fix uninitialized warning in brcmf_usb_probe_phase2()) +$ git merge wireless-drivers/master +Already up-to-date. +Merging mac80211/master (d7f13f745036 cfg80211: Validate frequencies nested in NL80211_ATTR_SCAN_FREQUENCIES) +$ git merge mac80211/master +Already up-to-date. +Merging sound-current/for-linus (74ec118152ea ALSA: hda - Add missing NVIDIA GPU codec IDs to patch table) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/hda/patch_hdmi.c | 27 +++++++++++++++++++++++++++ + 1 file changed, 27 insertions(+) +Merging pci-current/for-linus (34d5ac2af644 PCI: rockchip: Check for pci_scan_root_bus_bridge() failure correctly) +$ git merge pci-current/for-linus +Already up-to-date. +Merging driver-core.current/driver-core-linus (5771a8c08880 Linux v4.13-rc1) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (5771a8c08880 Linux v4.13-rc1) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (5771a8c08880 Linux v4.13-rc1) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (f50b878fed33 USB: gadget: fix GPF in gadgetfs) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (996fab55d864 USB: serial: qcserial: new Sierra Wireless EM7305 device ID) +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +Merging usb-chipidea-fixes/ci-for-usb-stable (cbb22ebcfb99 usb: chipidea: core: check before accessing ci_role in ci_role_show) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Already up-to-date. +Merging phy/fixes (9605bc46433d phy: qualcomm: phy-qcom-qmp: fix application of sizeof to pointer) +$ git merge phy/fixes +Already up-to-date. +Merging staging.current/staging-linus (677e6a1ab4ed staging: sm750fb: fixed a assignment typo) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/staging/comedi/drivers/ni_mio_common.c | 3 +-- + drivers/staging/rtl8188eu/core/rtw_cmd.c | 2 +- + drivers/staging/sm750fb/ddk750_chip.c | 2 +- + drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 10 ++++------ + 4 files changed, 7 insertions(+), 10 deletions(-) +Merging char-misc.current/char-misc-linus (5771a8c08880 Linux v4.13-rc1) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (dda5202b001c Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up-to-date. +Merging crypto-current/master (b8fc3397c9e8 crypto: cavium - make several functions static) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (acfead32f3f9 ide: don't call memcpy with the same source and destination) +$ git merge ide/master +Already up-to-date. +Merging vfio-fixes/for-linus (39da7c509acf Linux 4.11-rc6) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (2ea659a9ef48 Linux 4.12-rc1) +$ git merge kselftest-fixes/fixes +Already up-to-date. +Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) +$ git merge backlight-fixes/for-backlight-fixes +Already up-to-date. +Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct) +$ git merge ftrace-fixes/for-next-urgent +Already up-to-date. +Merging nand-fixes/nand/fixes (d4ed3b9015b5 mtd: nand: make nand_ooblayout_lp_hamming_ops static) +$ git merge nand-fixes/nand/fixes +Already up-to-date. +Merging spi-nor-fixes/spi-nor/fixes (2ea659a9ef48 Linux 4.12-rc1) +$ git merge spi-nor-fixes/spi-nor/fixes +Already up-to-date. +Merging mfd-fixes/for-mfd-fixes (9e69672e90cc dt-bindings: mfd: Update STM32 timers clock names) +$ git merge mfd-fixes/for-mfd-fixes +Already up-to-date. +Merging v4l-dvb-fixes/fixes (2a2599c66368 [media] media: entity: Catch unbalanced media_pipeline_stop calls) +$ git merge v4l-dvb-fixes/fixes +Already up-to-date. +Merging reset-fixes/reset/fixes (4497a224f759 reset: hi6220: Set module license so that it can be loaded) +$ git merge reset-fixes/reset/fixes +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (611cdf3695a3 drm/i915: Disable EXEC_OBJECT_ASYNC when doing relocations) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up-to-date. +Merging drm-misc-fixes/for-linux-next-fixes (76250f2b743b dma-buf/fence: Avoid use of uninitialised timestamp) +$ git merge drm-misc-fixes/for-linux-next-fixes +Auto-merging drivers/dma-buf/sync_file.c +Auto-merging drivers/dma-buf/sync_debug.c +Auto-merging drivers/dma-buf/dma-fence.c +Merge made by the 'recursive' strategy. + drivers/dma-buf/dma-fence.c | 17 ++++++----------- + drivers/dma-buf/sync_debug.c | 2 +- + drivers/dma-buf/sync_file.c | 8 +++++++- + include/linux/dma-fence.h | 2 ++ + 4 files changed, 16 insertions(+), 13 deletions(-) +Merging kbuild/for-next (5771a8c08880 Linux v4.13-rc1) +$ git merge kbuild/for-next +Already up-to-date. +Merging uuid/for-next (b86a496a4206 ACPI: hns_dsaf_acpi_dsm_guid can be static) +$ git merge uuid/for-next +Already up-to-date. +Merging dma-mapping/for-next (1655cf8829d8 ARM: dma-mapping: Remove traces of NOMMU code) +$ git merge dma-mapping/for-next +Already up-to-date. +Merging asm-generic/master (a351e9b9fc24 Linux 4.11) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (6f8119230ed0 ARC: set boot print log level to PR_INFO) +$ git merge arc/for-next +Auto-merging arch/arc/mm/cache.c +Auto-merging arch/arc/kernel/setup.c +Merge made by the 'recursive' strategy. + arch/arc/include/asm/irqflags-arcv2.h | 3 --- + arch/arc/include/asm/irqflags-compact.h | 2 -- + arch/arc/include/asm/spinlock.h | 12 ++++++++++++ + arch/arc/kernel/entry-compact.S | 22 +++++++++++----------- + arch/arc/kernel/process.c | 29 +++++++++++++++++++++++++++-- + arch/arc/kernel/setup.c | 6 +++--- + arch/arc/kernel/traps.c | 2 +- + arch/arc/mm/cache.c | 2 +- + arch/arc/mm/fault.c | 2 +- + arch/arc/mm/tlb.c | 2 +- + arch/arc/mm/tlbex.S | 9 +++++++++ + arch/arc/plat-eznps/Kconfig | 15 +++++++++++++-- + arch/arc/plat-eznps/include/plat/ctop.h | 1 + + arch/arc/plat-eznps/mtm.c | 11 +++++++++-- + 14 files changed, 89 insertions(+), 29 deletions(-) +Merging arm/for-next (fc256ee00f0c Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging arm-perf/for-next/perf (c0f7f7acdecd perf: xgene: Add support for SoC PMU version 3) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (ebc5ff9e87f6 Merge branch 'next/dt64' into for-next) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 251 +++++++++++++++++++++++++++++++++ + 1 file changed, 251 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging actions/for-next (8ba75fbb148a Merge branch 'v4.13/arm+sps' into next) +$ git merge actions/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging alpine/alpine/for-next (a1144b2b1ec4 ARM: dts: alpine: add valid clock-frequency values) +$ git merge alpine/alpine/for-next +Merge made by the 'recursive' strategy. +Merging amlogic/for-next (f99503e956ae Merge branch 'v4.13/defconfig' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging aspeed/for-next (4944e5dbb215 Merge branches 'dt-for-v4.12' and 'defconfig-for-v4.12' into for-next) +$ git merge aspeed/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging at91/at91-next (19964541c231 Merge tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) +$ git merge at91/at91-next +Already up-to-date. +Merging bcm2835/for-next (652fb0c6435c Merge branch anholt/bcm2835-defconfig-next into for-next) +$ git merge bcm2835/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +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 (078690243113 Merge branch 'zte/dt64' into for-next) +$ git merge imx-mxs/for-next +Removing arch/arm/boot/dts/imx6ul-isiot-common.dtsi +Auto-merging arch/arm/boot/dts/imx6ul-geam.dts +Removing arch/arm/boot/dts/imx6ul-geam-kit.dts +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 2 +- + arch/arm/boot/dts/imx6dl-gw52xx.dts | 58 +++++++ + arch/arm/boot/dts/imx6dl-gw53xx.dts | 58 +++++++ + arch/arm/boot/dts/imx6dl-gw54xx.dts | 58 +++++++ + arch/arm/boot/dts/imx6q-b850v3.dts | 2 +- + arch/arm/boot/dts/imx6q-gw52xx.dts | 58 +++++++ + arch/arm/boot/dts/imx6q-gw53xx.dts | 58 +++++++ + arch/arm/boot/dts/imx6q-gw54xx.dts | 58 +++++++ + arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 54 ++++++ + arch/arm/boot/dts/imx6qdl-gw553x.dtsi | 54 ++++++ + arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi | 1 - + arch/arm/boot/dts/imx6qdl.dtsi | 1 + + arch/arm/boot/dts/imx6sl.dtsi | 1 + + arch/arm/boot/dts/imx6sx.dtsi | 1 + + arch/arm/boot/dts/imx6ul-14x14-evk.dts | 39 ++--- + arch/arm/boot/dts/imx6ul-geam-kit.dts | 101 ------------ + .../boot/dts/{imx6ul-geam.dtsi => imx6ul-geam.dts} | 74 +++++++++ + arch/arm/boot/dts/imx6ul-isiot-common.dtsi | 141 ---------------- + arch/arm/boot/dts/imx6ul-isiot-emmc.dts | 1 - + arch/arm/boot/dts/imx6ul-isiot-nand.dts | 1 - + arch/arm/boot/dts/imx6ul-isiot.dtsi | 183 +++++++++++++++++++++ + arch/arm/boot/dts/imx6ul.dtsi | 1 + + arch/arm/boot/dts/imx7d-sdb.dts | 21 +-- + arch/arm/boot/dts/imx7s.dtsi | 1 + + arch/arm/boot/dts/zx296702-ad1.dts | 2 - + arch/arm/configs/imx_v6_v7_defconfig | 4 +- + arch/arm64/boot/dts/zte/zx296718.dtsi | 2 - + 27 files changed, 749 insertions(+), 286 deletions(-) + delete mode 100644 arch/arm/boot/dts/imx6ul-geam-kit.dts + rename arch/arm/boot/dts/{imx6ul-geam.dtsi => imx6ul-geam.dts} (87%) + delete mode 100644 arch/arm/boot/dts/imx6ul-isiot-common.dtsi +Merging keystone/next (b45371147f9d Merge branch 'for_4.13/keystone_dts' into next) +$ git merge keystone/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (8b6439a845a9 ARM: dts: armada-38x: Fix irq type for pca955) +$ git merge mvebu/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/armada-388-gp.dts | 4 ++-- + arch/arm/mach-mvebu/platsmp.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging omap/for-next (05f2a5417cf1 Merge branch 'omap-for-v4.13/mmc-regulator' into for-next) +$ git merge omap/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts | 2 +- + arch/arm/boot/dts/dm8168-evm.dts | 34 ++++++++++++++++- + arch/arm/boot/dts/dm816x.dtsi | 2 +- + arch/arm/boot/dts/dra7-evm.dts | 10 ++++- + arch/arm/boot/dts/dra7.dtsi | 5 +++ + arch/arm/boot/dts/dra71-evm.dts | 18 ++++++++- + arch/arm/boot/dts/dra72-evm-common.dtsi | 2 - + arch/arm/boot/dts/dra72-evm-revc.dts | 18 +++++++++ + arch/arm/boot/dts/dra72-evm.dts | 18 +++++++++ + arch/arm/mach-omap2/pdata-quirks.c | 31 +++++++++++++++ + arch/arm/mach-omap2/pm34xx.c | 1 - + arch/arm/mach-omap2/prm3xxx.c | 7 +--- + arch/arm/mach-omap2/prm44xx.c | 55 +++++++++++++++++++++++++++ + include/linux/platform_data/hsmmc-omap.h | 3 ++ + 14 files changed, 191 insertions(+), 15 deletions(-) +Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence) +$ git merge omap-pending/for-next +Already up-to-date. +Merging reset/reset/next (dfeac250c429 reset: zx2967: constify zx2967_reset_ops.) +$ git merge reset/reset/next +Merge made by the 'recursive' strategy. + drivers/reset/reset-zx2967.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging qcom/for-next (6a3282b03fe6 Merge tag 'qcom-defconfig-for-4.13-2' into all-for-4.13-revised) +$ git merge qcom/for-next +Merge made by the 'recursive' strategy. +Merging realtek/for-next (007e6304223c Merge branch 'v4.13/dt64' into next) +$ git merge realtek/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging renesas/next (c2432fc935fd Merge branch 'fixes-for-v4.13' into next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 2 +- + arch/arm64/boot/dts/renesas/ulcb.dtsi | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging rockchip/for-next (9f7ba3e12ff4 Merge branch 'v4.14-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/rk3036-kylin.dts | 2 - + arch/arm/boot/dts/rk3036.dtsi | 3 +- + arch/arm/boot/dts/rk3066a-bqcurie2.dts | 2 - + arch/arm/boot/dts/rk3066a-mk808.dts | 2 - + arch/arm/boot/dts/rk3066a-rayeager.dts | 3 - + arch/arm/boot/dts/rk3188-px3-evb.dts | 2 - + arch/arm/boot/dts/rk3188-radxarock.dts | 1 - + arch/arm/boot/dts/rk3229-evb.dts | 129 ++++++++++++++++++++- + arch/arm/boot/dts/rk3229.dtsi | 89 ++++++++++++++ + arch/arm/boot/dts/rk322x.dtsi | 96 ++++++++++++++- + arch/arm/boot/dts/rk3288-evb.dtsi | 49 +++++++- + arch/arm/boot/dts/rk3288-fennec.dts | 6 +- + arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 1 - + arch/arm/boot/dts/rk3288-firefly-reload.dts | 2 - + arch/arm/boot/dts/rk3288-firefly.dtsi | 3 - + arch/arm/boot/dts/rk3288-miqi.dts | 2 - + arch/arm/boot/dts/rk3288-phycore-rdk.dts | 1 - + arch/arm/boot/dts/rk3288-phycore-som.dtsi | 1 - + arch/arm/boot/dts/rk3288-popmetal.dts | 2 - + arch/arm/boot/dts/rk3288-r89.dts | 1 - + arch/arm/boot/dts/rk3288-rock2-som.dtsi | 1 - + arch/arm/boot/dts/rk3288-rock2-square.dts | 2 - + arch/arm/boot/dts/rk3288-tinker.dts | 6 +- + arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi | 1 - + arch/arm/boot/dts/rk3288-veyron.dtsi | 2 - + arch/arm/boot/dts/rv1108.dtsi | 6 +- + arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 24 ++++ + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 76 ++++++++++++ + arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi | 1 - + arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts | 1 - + .../boot/dts/rockchip/rk3368-orion-r68-meta.dts | 2 - + arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts | 2 - + arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 2 - + arch/arm64/boot/dts/rockchip/rk3399-evb.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts | 44 +++++++ + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 114 ++++++++++++------ + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 19 ++- + drivers/soc/rockchip/grf.c | 14 +++ + 38 files changed, 626 insertions(+), 90 deletions(-) + create mode 100644 arch/arm/boot/dts/rk3229.dtsi +Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) +$ git merge rpi/for-rpi-next +Already up-to-date. +Merging samsung/for-next (2ea659a9ef48 Linux 4.12-rc1) +$ git merge samsung/for-next +Already up-to-date. +Merging samsung-krzk/for-next (ad0e0348e29a ARM: dts: exynos: Add clocks to audss block to fix silent hang on Exynos4412) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos4.dtsi | 3 +++ + 1 file changed, 3 insertions(+) +Merging sunxi/sunxi/for-next (efb85d294c2a Merge branches 'sunxi/h3-for-4.13', 'sunxi/dt-for-4.13' and 'sunxi/dt64-for-4.13' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging tegra/for-next (07bb9460b188 Merge branch for-4.13/arm64/dt into for-next) +$ git merge tegra/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (425e1ed73e65 arm64: fix endianness annotation for 'struct jit_ctx' and friends) +$ git merge arm64/for-next/core +Already up-to-date. +Merging clk/clk-next (3cf50f6b13a2 Merge branch 'binding-doc-cp110-ap806' of git://git.infradead.org/linux-mvebu into clk-next) +$ git merge clk/clk-next +Already up-to-date. +Merging c6x/for-linux-next (91ebcd1b97ae MAINTAINERS: update email address for C6x maintainer) +$ 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 (204a2be30a7a m68k: Remove ptrace_signal_deliver) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (354b6382847d m68k: defconfig: Cleanup from old Kconfig options) +$ git merge m68knommu/for-next +Already up-to-date. +Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment) +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (14ef905bb2ee microblaze: Fix MSR flags when returning from exception) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (d40e0d4fb561 locking/qspinlock: Include linux/prefetch.h) +$ git merge mips/mips-for-linux-next +Already up-to-date. +Merging nios2/for-next (e118c3fec9c0 nios2: remove custom early console implementation) +$ git merge nios2/for-next +Already up-to-date. +Merging openrisc/for-next (9d15eb228b10 openrisc: defconfig: Cleanup from old Kconfig options) +$ git merge openrisc/for-next +Merge made by the 'recursive' strategy. +Merging parisc-hd/for-next (6f7da290413b Linux 4.12) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (1e0fc9d1eb2b powerpc/Kconfig: Enable STRICT_KERNEL_RWX for some configs) +$ git merge powerpc/next +Already up-to-date. +Merging fsl/next (61baf1555512 powerpc/64e: Don't place the stack beyond TASK_SIZE) +$ 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 (5414d4af8a7c s390/time: add support for the TOD clock epoch extension) +$ git merge s390/features +Auto-merging arch/s390/kernel/setup.c +Merge made by the 'recursive' strategy. + arch/s390/include/asm/elf.h | 2 +- + arch/s390/include/asm/ipl.h | 2 +- + arch/s390/include/asm/lowcore.h | 48 ++++----- + arch/s390/include/asm/mmu_context.h | 6 +- + arch/s390/include/asm/page-states.h | 1 + + arch/s390/include/asm/page.h | 13 ++- + arch/s390/include/asm/pgalloc.h | 18 ++-- + arch/s390/include/asm/pgtable.h | 195 +++++++++++++++++++++-------------- + arch/s390/include/asm/qdio.h | 2 +- + arch/s390/include/asm/setup.h | 11 +- + arch/s390/include/asm/timex.h | 38 ++++++- + arch/s390/include/asm/tlb.h | 6 +- + arch/s390/include/asm/tlbflush.h | 7 +- + arch/s390/kernel/asm-offsets.c | 1 + + arch/s390/kernel/debug.c | 9 +- + arch/s390/kernel/dumpstack.c | 2 +- + arch/s390/kernel/early.c | 15 ++- + arch/s390/kernel/head.S | 3 +- + arch/s390/kernel/head64.S | 4 +- + arch/s390/kernel/irq.c | 3 +- + arch/s390/kernel/perf_cpum_sf.c | 2 +- + arch/s390/kernel/relocate_kernel.S | 5 +- + arch/s390/kernel/setup.c | 10 +- + arch/s390/kernel/suspend.c | 24 ++++- + arch/s390/kernel/time.c | 65 ++++++++---- + arch/s390/kernel/vdso.c | 2 + + arch/s390/kernel/vdso32/vdso32.lds.S | 4 +- + arch/s390/kernel/vdso64/vdso64.lds.S | 4 +- + arch/s390/kvm/diag.c | 8 +- + arch/s390/kvm/gaccess.c | 35 +++---- + arch/s390/kvm/priv.c | 8 +- + arch/s390/kvm/vsie.c | 2 +- + arch/s390/lib/delay.c | 2 +- + arch/s390/mm/fault.c | 10 +- + arch/s390/mm/gmap.c | 124 +++++++++++----------- + arch/s390/mm/init.c | 7 +- + arch/s390/mm/page-states.c | 192 +++++++++++++++++++++++++++++++--- + arch/s390/mm/pageattr.c | 5 +- + arch/s390/mm/pgalloc.c | 12 ++- + arch/s390/mm/pgtable.c | 160 +++++++++++++++++++++------- + arch/s390/mm/vmem.c | 47 +++------ + drivers/s390/char/sclp_cmd.c | 1 + + drivers/s390/char/sclp_early.c | 6 +- + drivers/s390/cio/chp.c | 1 + + 44 files changed, 755 insertions(+), 367 deletions(-) +Merging sparc-next/master (3b06b1a7448e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) +$ git merge sparc-next/master +Already up-to-date. +Merging sh/for-next (6e2fbfdd585f sh: fix futex FUTEX_OP_SET op on userspace addresses) +$ git merge sh/for-next +Merge made by the 'recursive' strategy. + arch/sh/include/asm/futex.h | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) +Merging tile/master (0af0bc38175d mm, tile: drop arch_{add,remove}_memory) +$ git merge tile/master +Already up-to-date. +Merging uml/linux-next (61e8d462457f um: Correctly check for PTRACE_GETRESET/SETREGSET) +$ git merge uml/linux-next +Already up-to-date. +Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface) +$ git merge unicore32/unicore32 +Resolved 'arch/unicore32/include/asm/Kbuild' using previous resolution. +Auto-merging arch/unicore32/include/asm/Kbuild +CONFLICT (content): Merge conflict in arch/unicore32/include/asm/Kbuild +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a4ab46dc270c] Merge remote-tracking branch 'unicore32/unicore32' +$ git diff -M --stat --summary HEAD^.. + arch/unicore32/Kconfig | 14 + + arch/unicore32/include/asm/Kbuild | 1 - + 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(+), 1 deletion(-) + 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 (bdf3b55fde37 Merge branch 'xtensa-fixes' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging fscrypt/master (c250b7dd8e73 fscrypt: make ->dummy_context() return bool) +$ git merge fscrypt/master +Already up-to-date. +Merging befs/for-next (5771a8c08880 Linux v4.13-rc1) +$ git merge befs/for-next +Already up-to-date. +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 (e6f162c291c3 Merge branch 'for-next-current-v4.13-20170714' into for-next-20170714) +$ git merge btrfs-kdave/for-next +Merge made by the 'recursive' strategy. +Merging ceph/master (3f51f6c3baa1 libceph: use alloc_pg_mapping() in __decode_pg_upmap_items()) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + include/linux/ceph/ceph_features.h | 8 ++++---- + net/ceph/osdmap.c | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) +Merging cifs/for-next (235b84fc862a Merge branch 'i2c/for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge cifs/for-next +Already up-to-date. +Merging configfs/for-next (19e72d3abb63 configfs: Introduce config_item_get_unless_zero()) +$ 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 (4d9bcaddacf2 ext2: Fix memory leak when truncate races ext2_get_blocks) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (ff95015648df ext4: fix spelling mistake: "prellocated" -> "preallocated") +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (5771a8c08880 Linux v4.13-rc1) +$ git merge f2fs/dev +Already up-to-date. +Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information) +$ git merge freevxfs/for-next +Already up-to-date. +Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew)) +$ git merge fscache/fscache +Already up-to-date. +Merging fuse/for-next (68227c03cba8 fuse: initialize the flock flag in fuse_file on allocation) +$ git merge fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/file.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging jfs/jfs-next (6fa92ce0a888 jfs: preserve i_mode if __jfs_set_acl() fails) +$ git merge jfs/jfs-next +Auto-merging fs/jfs/super.c +Merge made by the 'recursive' strategy. + fs/jfs/acl.c | 15 +++++++++++---- + fs/jfs/resize.c | 4 ++-- + fs/jfs/super.c | 4 ++-- + 3 files changed, 15 insertions(+), 8 deletions(-) +Merging nfs/linux-next (6f7da290413b Linux 4.12) +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next (b20dae70bfa5 svcrdma: fix an incorrect check on -E2BIG and -EINVAL) +$ git merge nfsd/nfsd-next +Already up-to-date. +Merging orangefs/for-next (2f713b5c7d2a orangefs: count directory pieces correctly) +$ git merge orangefs/for-next +Already up-to-date. +Merging overlayfs/overlayfs-next (3329e0599fd2 ovl: verify origin of merge dir lower) +$ git merge overlayfs/overlayfs-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/overlayfs.txt | 16 ++++++++++++++++ + fs/overlayfs/dir.c | 22 ++++++++++++++++++---- + fs/overlayfs/namei.c | 10 ++++++++++ + fs/overlayfs/overlayfs.h | 3 ++- + fs/overlayfs/super.c | 5 +---- + 5 files changed, 47 insertions(+), 9 deletions(-) +Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (a6664433d383 ubifs: Set double hash cookie also for RENAME_EXCHANGE) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (cd87d8679201 xfs: don't crash on unexpected holes in dir/attr btrees) +$ git merge xfs/for-next +Already up-to-date. +Merging file-locks/linux-next (9d5b86ac13c5 fs/locks: Remove fl_nspid and use fs-specific l_pid for remote locks) +$ git merge file-locks/linux-next +Auto-merging fs/fuse/file.c +Merge made by the 'recursive' strategy. + drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 2 +- + fs/9p/vfs_file.c | 2 +- + fs/ceph/locks.c | 2 +- + fs/cifs/cifssmb.c | 2 +- + fs/dlm/plock.c | 2 +- + fs/fuse/file.c | 6 +- + fs/locks.c | 108 ++++++++++++++---------- + include/linux/fs.h | 1 - + 8 files changed, 71 insertions(+), 54 deletions(-) +Merging vfs/for-next (66bf97967726 annotate RWF_... flags) +$ git merge vfs/for-next +Auto-merging include/uapi/linux/fs.h +Auto-merging include/linux/fs.h +Auto-merging fs/read_write.c +Merge made by the 'recursive' strategy. + arch/s390/include/asm/compat.h | 5 +++-- + fs/nfsd/vfs.c | 2 +- + fs/read_write.c | 50 +++++++++++++++++++++--------------------- + include/linux/compat.h | 18 ++++++++++++--- + include/linux/fs.h | 12 +++++----- + include/linux/syscalls.h | 13 ++++++----- + include/uapi/linux/aio_abi.h | 21 +++++++++--------- + include/uapi/linux/fs.h | 28 ++++++++++++++++------- + 8 files changed, 89 insertions(+), 60 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 (0eb8af4916a5 vfs: use helper for calling f_op->fsync()) +$ git merge vfs-miklos/next +Already up-to-date. +Merging printk/for-next (f4e981cba2de printk: add __printf attributes to internal functions) +$ git merge printk/for-next +Already up-to-date. +Merging pci/next (af3c8d98508d Merge tag 'drm-for-v4.13' of git://people.freedesktop.org/~airlied/linux) +$ git merge pci/next +Already up-to-date. +Merging pstore/for-next/pstore (0752e4028c00 powerpc/nvram: use memdup_user) +$ git merge pstore/for-next/pstore +Already up-to-date. +Merging hid/for-next (4cf56a89c696 HID: multitouch: do not blindly set EV_KEY or EV_ABS bits) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/hid-multitouch.c | 16 ++++------------ + 1 file changed, 4 insertions(+), 12 deletions(-) +Merging i2c/i2c/for-next (4ca6df134847 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace) +$ 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 (8efa050f19fe firmware: dmi_scan: Check DMI structure length) +$ git merge dmi/master +Merge made by the 'recursive' strategy. +Merging hwmon-staging/hwmon-next (e7adb541f7c5 hwmon: (jc42) Add support for GT30TS00, GT34TS02, and CAT34TS04) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + drivers/hwmon/adc128d818.c | 2 +- + drivers/hwmon/adt7475.c | 16 ++++++++-------- + drivers/hwmon/hwmon.c | 2 +- + drivers/hwmon/jc42.c | 15 +++++++++++++++ + drivers/hwmon/nct7802.c | 10 +++++----- + 5 files changed, 30 insertions(+), 15 deletions(-) +Merging jc_docs/docs-next (5771a8c08880 Linux v4.13-rc1) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging v4l-dvb/master (2748e76ddb29 media: staging: cxd2099: Activate cxd2099 buffer mode) +$ git merge v4l-dvb/master +Merge made by the 'recursive' strategy. + Documentation/media/kapi/dtv-core.rst | 443 +++++++++++++++++++++- + Documentation/media/uapi/v4l/vidioc-g-fmt.rst | 6 + + Documentation/media/v4l-drivers/imx.rst | 7 +- + Documentation/media/v4l-drivers/index.rst | 1 + + drivers/media/dvb-core/dvb_ca_en50221.c | 143 ++++--- + drivers/media/dvb-core/dvb_ca_en50221.h | 7 + + drivers/media/dvb-frontends/cxd2841er.c | 5 +- + drivers/media/dvb-frontends/drx39xyj/drx_driver.h | 15 +- + drivers/media/dvb-frontends/lnbh25.c | 6 +- + drivers/media/dvb-frontends/stv0367.c | 210 ++++++++-- + drivers/media/i2c/et8ek8/et8ek8_driver.c | 1 - + drivers/media/i2c/tvp5150.c | 25 +- + drivers/media/pci/ddbridge/ddbridge-core.c | 102 +++-- + drivers/media/pci/ngene/ngene-core.c | 32 +- + drivers/media/pci/ngene/ngene-i2c.c | 6 +- + drivers/media/pci/ngene/ngene.h | 6 +- + drivers/media/pci/tw5864/tw5864-video.c | 1 + + drivers/media/platform/coda/coda-bit.c | 8 +- + drivers/media/platform/coda/coda-common.c | 4 +- + drivers/media/platform/coda/coda.h | 2 +- + drivers/media/platform/omap/omap_vout_vrfb.c | 133 ++++--- + drivers/media/platform/omap/omap_voutdef.h | 6 +- + drivers/media/platform/qcom/venus/core.c | 2 +- + drivers/media/platform/sti/bdisp/bdisp-debug.c | 14 +- + drivers/media/radio/radio-wl1273.c | 15 +- + drivers/media/tuners/fc0011.c | 1 + + drivers/media/tuners/mxl5005s.c | 2 - + drivers/media/usb/au0828/au0828-input.c | 2 +- + drivers/media/usb/dvb-usb-v2/lmedm04.c | 10 +- + drivers/media/usb/dvb-usb/dib0700_core.c | 38 +- + drivers/media/usb/em28xx/em28xx-cards.c | 18 + + drivers/media/usb/em28xx/em28xx-dvb.c | 1 + + drivers/media/usb/em28xx/em28xx-i2c.c | 2 - + drivers/media/usb/em28xx/em28xx-input.c | 2 +- + drivers/media/usb/em28xx/em28xx.h | 1 + + drivers/media/usb/rainshadow-cec/rainshadow-cec.c | 18 +- + drivers/media/usb/stkwebcam/stk-sensor.c | 32 +- + drivers/media/usb/stkwebcam/stk-webcam.c | 70 ++-- + drivers/media/usb/stkwebcam/stk-webcam.h | 6 - + drivers/media/v4l2-core/tuner-core.c | 2 - + drivers/staging/media/cxd2099/cxd2099.c | 165 +++++--- + drivers/staging/media/cxd2099/cxd2099.h | 6 +- + 42 files changed, 1167 insertions(+), 409 deletions(-) +Merging v4l-dvb-next/master (d9c4615854ec [media] dvb uapi docs: enums are passed by value, not reference) +$ git merge v4l-dvb-next/master +Resolved 'Documentation/media/uapi/dvb/fe-diseqc-send-burst.rst' using previous resolution. +Resolved 'Documentation/media/uapi/dvb/fe-set-tone.rst' using previous resolution. +Resolved 'Documentation/media/uapi/dvb/fe-set-voltage.rst' using previous resolution. +Auto-merging Documentation/media/uapi/dvb/fe-set-voltage.rst +CONFLICT (content): Merge conflict in Documentation/media/uapi/dvb/fe-set-voltage.rst +Auto-merging Documentation/media/uapi/dvb/fe-set-tone.rst +CONFLICT (content): Merge conflict in Documentation/media/uapi/dvb/fe-set-tone.rst +Auto-merging Documentation/media/uapi/dvb/fe-diseqc-send-burst.rst +CONFLICT (content): Merge conflict in Documentation/media/uapi/dvb/fe-diseqc-send-burst.rst +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master af74f1938c6e] Merge remote-tracking branch 'v4l-dvb-next/master' +$ git diff -M --stat --summary HEAD^.. +Merging fbdev/fbdev-for-next (4c99ceda0d06 fbdev: make get_fb_unmapped_area depends of !MMU) +$ git merge fbdev/fbdev-for-next +Already up-to-date. +Merging pm/linux-next (7d71a49525ed Merge branches 'acpi-video' and 'acpi-x86' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + arch/x86/kernel/acpi/boot.c | 9 ++++++--- + drivers/acpi/video_detect.c | 14 ++++++++++++++ + drivers/base/power/opp/of.c | 8 ++++++-- + drivers/cpufreq/cpufreq-dt-platdev.c | 1 + + drivers/cpufreq/intel_pstate.c | 21 +++++++++++++++++++-- + drivers/cpufreq/speedstep-ich.c | 2 +- + include/linux/acpi.h | 4 ++-- + 7 files changed, 49 insertions(+), 10 deletions(-) +Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc()) +$ git merge idle/next +Merge made by the 'recursive' strategy. +Merging thermal/next (5d72ed35678a Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next) +$ git merge thermal/next +Already up-to-date. +Merging thermal-soc/next (aa647852c32a Merge branch 'work-linus' into work-next) +$ git merge thermal-soc/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one) +$ git merge ieee1394/for-next +Auto-merging drivers/firewire/net.c +Merge made by the 'recursive' strategy. + drivers/firewire/net.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) +Merging dlm/next (e94d6f64e7ba dlm: print log message when cluster name is not set) +$ git merge dlm/next +Merge made by the 'recursive' strategy. + fs/dlm/debug_fs.c | 25 ++++++++++++------------- + fs/dlm/lock.c | 8 +++----- + fs/dlm/lockspace.c | 7 ++++++- + fs/dlm/member.c | 15 ++++++--------- + fs/dlm/user.c | 2 ++ + 5 files changed, 29 insertions(+), 28 deletions(-) +Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging net-next/master (ce3dbe29749e Merge branch 'atm-constify-atm-pci_device_id') +$ git merge net-next/master +Merge made by the 'recursive' strategy. + drivers/atm/ambassador.c | 2 +- + drivers/atm/eni.c | 2 +- + drivers/atm/firestream.c | 2 +- + drivers/atm/fore200e.c | 2 +- + drivers/atm/he.c | 2 +- + drivers/atm/horizon.c | 2 +- + drivers/atm/idt77252.c | 2 +- + drivers/atm/iphase.c | 2 +- + drivers/atm/lanai.c | 2 +- + drivers/atm/nicstar.c | 2 +- + drivers/atm/solos-pci.c | 2 +- + drivers/atm/zatm.c | 2 +- + drivers/net/ethernet/sun/ldmvsw.c | 2 +- + drivers/net/ethernet/sun/sunvnet.c | 2 +- + drivers/net/ethernet/sun/sunvnet_common.c | 90 +++++++++++++++++++++++++++---- + include/net/ip6_route.h | 2 +- + tools/hv/bondvf.sh | 27 +++++++++- + 17 files changed, 119 insertions(+), 28 deletions(-) +Merging ipsec-next/master (8bafd73093f2 xfrm: add UDP encapsulation port in migrate message) +$ git merge ipsec-next/master +Already up-to-date. +Merging netfilter-next/master (04ba724b659c netfilter: nfnetlink: extended ACK reporting) +$ git merge netfilter-next/master +Already up-to-date. +Merging nfc-next/master (bd751808f9ff NFC: trf7970a: Correct register settings for 27MHz clock) +$ git merge nfc-next/master +Already up-to-date. +Merging ipvs-next/master (fb90e8dedb46 ipvs: change comparison on sync_refresh_period) +$ git merge ipvs-next/master +Already up-to-date. +Merging wireless-drivers-next/master (17d9aa66b08d Merge tag 'iwlwifi-next-for-kalle-2017-06-30' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next) +$ git merge wireless-drivers-next/master +Already up-to-date. +Merging bluetooth/master (f33f640415eb Bluetooth: hci_ll: Use new hci_uart_unregister_device() function) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/btqca.c | 2 +- + drivers/bluetooth/btusb.c | 9 ++++++++- + drivers/bluetooth/hci_bcm.c | 30 ++++++++++++++++-------------- + drivers/bluetooth/hci_ll.c | 8 +------- + drivers/bluetooth/hci_nokia.c | 10 +--------- + drivers/bluetooth/hci_serdev.c | 13 +++++++++++++ + drivers/bluetooth/hci_uart.h | 1 + + 7 files changed, 41 insertions(+), 32 deletions(-) +Merging mac80211-next/master (3dc02251f43f Merge branch 'skb-accessor-cleanups') +$ git merge mac80211-next/master +Already up-to-date. +Merging rdma/for-next (c9d68a4e8437 RDMA/bnxt_re: Fix the value reported for local ack delay) +$ git merge rdma/for-next +Resolved 'drivers/infiniband/core/uverbs_cmd.c' using previous resolution. +Resolved 'drivers/infiniband/core/verbs.c' using previous resolution. +Auto-merging include/rdma/ib_verbs.h +Auto-merging drivers/net/ethernet/mellanox/mlx4/mlx4.h +Auto-merging drivers/net/ethernet/mellanox/mlx4/en_tx.c +Auto-merging drivers/net/ethernet/mellanox/mlx4/en_rx.c +Auto-merging drivers/net/ethernet/mellanox/mlx4/alloc.c +Auto-merging drivers/infiniband/ulp/ipoib/ipoib_main.c +Auto-merging drivers/infiniband/core/verbs.c +CONFLICT (content): Merge conflict in drivers/infiniband/core/verbs.c +Auto-merging drivers/infiniband/core/uverbs_cmd.c +CONFLICT (content): Merge conflict in drivers/infiniband/core/uverbs_cmd.c +Auto-merging drivers/infiniband/core/addr.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c34a53c9300c] Merge remote-tracking branch 'rdma/for-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 8 + + drivers/infiniband/core/addr.c | 46 +- + drivers/infiniband/core/cma.c | 41 +- + drivers/infiniband/core/roce_gid_mgmt.c | 11 +- + drivers/infiniband/core/uverbs_cmd.c | 23 +- + drivers/infiniband/core/verbs.c | 51 ++- + drivers/infiniband/hw/bnxt_re/bnxt_re.h | 9 + + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 137 ++++-- + drivers/infiniband/hw/bnxt_re/ib_verbs.h | 3 +- + drivers/infiniband/hw/bnxt_re/main.c | 57 ++- + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 494 +++++++++++++++++---- + drivers/infiniband/hw/bnxt_re/qplib_fp.h | 26 +- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 26 +- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.h | 10 +- + drivers/infiniband/hw/bnxt_re/qplib_res.c | 10 + + drivers/infiniband/hw/bnxt_re/qplib_res.h | 2 + + drivers/infiniband/hw/bnxt_re/qplib_sp.c | 93 +++- + drivers/infiniband/hw/bnxt_re/qplib_sp.h | 5 + + drivers/infiniband/hw/bnxt_re/roce_hsi.h | 4 +- + drivers/infiniband/hw/hfi1/Makefile | 2 +- + drivers/infiniband/hw/hfi1/affinity.c | 18 +- + drivers/infiniband/hw/hfi1/affinity.h | 14 +- + drivers/infiniband/hw/hfi1/chip.c | 310 +++++++------ + drivers/infiniband/hw/hfi1/chip.h | 4 +- + drivers/infiniband/hw/hfi1/common.h | 1 + + drivers/infiniband/hw/hfi1/driver.c | 169 ++++--- + drivers/infiniband/hw/hfi1/eprom.c | 11 +- + drivers/infiniband/hw/hfi1/exp_rcv.c | 114 +++++ + drivers/infiniband/hw/hfi1/exp_rcv.h | 187 ++++++++ + drivers/infiniband/hw/hfi1/file_ops.c | 43 +- + drivers/infiniband/hw/hfi1/hfi.h | 103 ++--- + drivers/infiniband/hw/hfi1/init.c | 62 ++- + drivers/infiniband/hw/hfi1/mad.c | 323 ++++++++------ + drivers/infiniband/hw/hfi1/mad.h | 2 +- + drivers/infiniband/hw/hfi1/mmu_rb.c | 14 +- + drivers/infiniband/hw/hfi1/mmu_rb.h | 5 +- + drivers/infiniband/hw/hfi1/pcie.c | 80 +--- + drivers/infiniband/hw/hfi1/platform.c | 30 +- + drivers/infiniband/hw/hfi1/qp.c | 13 +- + drivers/infiniband/hw/hfi1/qp.h | 3 +- + drivers/infiniband/hw/hfi1/rc.c | 42 +- + drivers/infiniband/hw/hfi1/ruc.c | 91 ++-- + drivers/infiniband/hw/hfi1/sdma.c | 6 +- + drivers/infiniband/hw/hfi1/trace.c | 58 ++- + drivers/infiniband/hw/hfi1/trace_ibhdrs.h | 322 +++++++++----- + drivers/infiniband/hw/hfi1/trace_misc.h | 20 + + drivers/infiniband/hw/hfi1/trace_rx.h | 90 ++-- + drivers/infiniband/hw/hfi1/uc.c | 18 +- + drivers/infiniband/hw/hfi1/ud.c | 64 +-- + drivers/infiniband/hw/hfi1/user_exp_rcv.c | 121 ----- + drivers/infiniband/hw/hfi1/user_exp_rcv.h | 23 +- + drivers/infiniband/hw/hfi1/user_sdma.c | 207 ++++----- + drivers/infiniband/hw/hfi1/verbs.c | 106 ++--- + drivers/infiniband/hw/hfi1/verbs.h | 10 +- + drivers/infiniband/hw/hfi1/vnic_main.c | 11 +- + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 86 ++-- + drivers/infiniband/hw/hns/hns_roce_main.c | 3 - + drivers/infiniband/hw/mlx4/cq.c | 6 +- + drivers/infiniband/hw/mlx4/main.c | 2 +- + drivers/infiniband/hw/mlx4/mcg.c | 2 +- + drivers/infiniband/hw/mlx4/mlx4_ib.h | 1 - + drivers/infiniband/hw/mlx4/qp.c | 40 +- + drivers/infiniband/hw/mlx4/srq.c | 8 +- + drivers/infiniband/hw/mlx5/mr.c | 36 +- + drivers/infiniband/hw/nes/nes_hw.c | 4 +- + drivers/infiniband/hw/qib/qib.h | 8 +- + drivers/infiniband/hw/qib/qib_iba6120.c | 6 +- + drivers/infiniband/hw/qib/qib_iba7220.c | 7 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 48 +- + drivers/infiniband/hw/qib/qib_mad.c | 13 +- + drivers/infiniband/hw/qib/qib_pcie.c | 149 +++---- + drivers/infiniband/hw/qib/qib_qp.c | 15 +- + drivers/infiniband/hw/qib/qib_ruc.c | 22 +- + drivers/infiniband/hw/qib/qib_ud.c | 43 +- + drivers/infiniband/hw/qib/qib_verbs.h | 8 +- + drivers/infiniband/sw/rdmavt/mr.c | 51 ++- + drivers/infiniband/sw/rdmavt/qp.c | 108 ++--- + drivers/infiniband/sw/rdmavt/trace_mr.h | 62 +++ + drivers/infiniband/sw/rdmavt/trace_tx.h | 11 +- + drivers/infiniband/sw/rdmavt/vt.c | 9 +- + drivers/infiniband/sw/rxe/rxe_net.c | 3 + + drivers/infiniband/sw/rxe/rxe_verbs.c | 2 + + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 20 +- + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 2 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 31 +- + drivers/infiniband/ulp/iser/iscsi_iser.c | 11 + + drivers/infiniband/ulp/iser/iser_verbs.c | 10 +- + drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c | 27 +- + drivers/net/ethernet/mellanox/mlx4/alloc.c | 29 +- + drivers/net/ethernet/mellanox/mlx4/cq.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 7 +- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/icm.c | 7 +- + drivers/net/ethernet/mellanox/mlx4/icm.h | 3 +- + drivers/net/ethernet/mellanox/mlx4/mlx4.h | 4 +- + drivers/net/ethernet/mellanox/mlx4/mr.c | 17 +- + drivers/net/ethernet/mellanox/mlx4/qp.c | 20 +- + .../net/ethernet/mellanox/mlx4/resource_tracker.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/srq.c | 4 +- + include/linux/mlx4/device.h | 10 +- + include/rdma/ib_hdrs.h | 84 ++++ + include/rdma/ib_verbs.h | 23 +- + include/rdma/rdma_vt.h | 9 +- + include/rdma/rdmavt_qp.h | 2 +- + 104 files changed, 3027 insertions(+), 1809 deletions(-) + create mode 100644 drivers/infiniband/hw/hfi1/exp_rcv.c + create mode 100644 drivers/infiniband/hw/hfi1/exp_rcv.h +Merging gfs2/for-next (da029c11e6b1 exec: Limit arg stack to at most 75% of _STK_LIM) +$ git merge gfs2/for-next +Already up-to-date. +Merging mtd/master (7d84120b5ba6 Documentation: ABI: mtd: describe "offset" more precisely) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (7d84120b5ba6 Documentation: ABI: mtd: describe "offset" more precisely) +$ git merge l2-mtd/master +Already up-to-date. +Merging nand/nand/next (81667e9c8ad8 mtd: nand: mtk: release lock on error path) +$ git merge nand/nand/next +Already up-to-date. +Merging spi-nor/spi-nor/next (1a18915b4971 mtd: spi-nor: parse Serial Flash Discoverable Parameters (SFDP) tables) +$ git merge spi-nor/spi-nor/next +Merge made by the 'recursive' strategy. + drivers/mtd/spi-nor/spi-nor.c | 775 +++++++++++++++++++++++++++++++++++++++++- + include/linux/mtd/spi-nor.h | 6 + + 2 files changed, 768 insertions(+), 13 deletions(-) +Merging crypto/master (bcf741cb7792 crypto: testmgr - Reenable sha1/aes in FIPS mode) +$ git merge crypto/master +Already up-to-date. +Merging drm/drm-next (6419ec78c672 Merge branch 'drm-next-4.13' of git://people.freedesktop.org/~agd5f/linux into drm-next) +$ git merge drm/drm-next +Already up-to-date. +Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD) +$ git merge drm-panel/drm/panel/for-next +Already up-to-date. +Merging drm-intel/for-linux-next (eafbc2070124 Merge tag 'gvt-fixes-2017-07-11' of https://github.com/01org/gvt-linux into drm-intel-next-fixes) +$ git merge drm-intel/for-linux-next +Already up-to-date. +Merging drm-tegra/drm/tegra/for-next (43240bbd871e gpu: host1x: At first try a non-blocking allocation for the gather copy) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging drm-misc/for-linux-next (1ed134e6526b drm/vc4: Fix VBLANK handling in crtc->enable() path) +$ git merge drm-misc/for-linux-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/vc4/vc4_crtc.c | 66 +++++++++++++++++++++++++++--------------- + 1 file changed, 43 insertions(+), 23 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 (4a630fadbb29 drm/msm: Fix potential buffer overflow issue) +$ git merge drm-msm/msm-next +Already up-to-date. +Merging hdlcd/for-upstream/hdlcd (fee4964f0a6c drm/arm: hdlcd: remove unused variables) +$ git merge hdlcd/for-upstream/hdlcd +Already up-to-date. +Merging mali-dp/for-upstream/mali-dp (e40eda3dda1e drm/arm: mali-dp: Use CMA helper for plane buffer address calculation) +$ git merge mali-dp/for-upstream/mali-dp +Already up-to-date. +Merging sunxi-drm/sunxi-drm/for-next (110d33dd428e drm/sun4i: Add compatible for the A10s pipeline) +$ git merge sunxi-drm/sunxi-drm/for-next +Already up-to-date. +Merging imx-drm/imx-drm/next (994fc62e1d04 drm/imx: lock scanout transfers for consecutive bursts) +$ git merge imx-drm/imx-drm/next +Auto-merging drivers/gpu/drm/imx/ipuv3-plane.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/ipuv3-plane.c | 53 +++++++++++++++++++++++++++++++-------- + 1 file changed, 42 insertions(+), 11 deletions(-) +Merging etnaviv/etnaviv/next (8cc47b3ea082 drm/etnaviv: populate GEM objects on cpu_prep) +$ git merge etnaviv/etnaviv/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 25 +++++++++++++------------ + 1 file changed, 13 insertions(+), 12 deletions(-) +Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate") +$ git merge kconfig/for-next +Already up-to-date. +Merging regmap/for-next (9af2b88755dc Merge remote-tracking branch 'regmap/topic/namespace' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + include/linux/regmap.h | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) +Merging sound/for-next (74ec118152ea ALSA: hda - Add missing NVIDIA GPU codec IDs to patch table) +$ git merge sound/for-next +Already up-to-date. +Merging sound-asoc/for-next (2e7c639bf491 Merge remote-tracking branches 'asoc/topic/spear' and 'asoc/topic/twl6040' into asoc-next) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/rt5663.txt | 5 + + include/sound/rt5663.h | 20 ++ + sound/soc/codecs/hdmi-codec.c | 33 +-- + sound/soc/codecs/rt5514.c | 49 ++--- + sound/soc/codecs/rt5663.c | 232 ++++++++++++++++----- + sound/soc/codecs/rt5663.h | 2 + + sound/soc/codecs/twl6040.c | 4 +- + sound/soc/fsl/imx-ssi.c | 4 + + sound/soc/intel/skylake/skl-messages.c | 8 + + sound/soc/kirkwood/kirkwood-i2s.c | 6 +- + sound/soc/pxa/Kconfig | 1 + + sound/soc/samsung/i2s.c | 20 +- + sound/soc/spear/spdif_in.c | 6 +- + 13 files changed, 278 insertions(+), 112 deletions(-) + create mode 100644 include/sound/rt5663.h +Merging modules/modules-next (96b5b19459b3 module: make the modinfo name const) +$ git merge modules/modules-next +Already up-to-date. +Merging input/next (4323418d62fe Input: sur40 - skip all blobs that are not touches) +$ git merge input/next +Auto-merging drivers/input/mouse/elantech.c +Merge made by the 'recursive' strategy. + drivers/input/input.c | 6 ++-- + drivers/input/keyboard/gpio_keys.c | 2 +- + drivers/input/misc/ims-pcu.c | 4 +-- + drivers/input/misc/yealink.c | 2 +- + drivers/input/mouse/elantech.c | 2 +- + drivers/input/mouse/psmouse-base.c | 2 +- + drivers/input/rmi4/rmi_f01.c | 2 +- + drivers/input/rmi4/rmi_f34.c | 2 +- + drivers/input/serio/serio.c | 4 +-- + drivers/input/tablet/aiptek.c | 2 +- + drivers/input/touchscreen/ads7846.c | 4 +-- + drivers/input/touchscreen/elants_i2c.c | 2 +- + drivers/input/touchscreen/raydium_i2c_ts.c | 2 +- + drivers/input/touchscreen/sur40.c | 46 +++++++++++++++++++----------- + 14 files changed, 48 insertions(+), 34 deletions(-) +Merging block/for-next (3b06b1a7448e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) +$ git merge block/for-next +Already up-to-date. +Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c) +$ git merge lightnvm/for-next +Already up-to-date. +Merging device-mapper/for-next (4d49f1b4a1fc dm raid: stop using BUG() in __rdev_sectors()) +$ 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 (9c284c41c088 mmc: tmio-mmc: fix bad pointer math) +$ git merge mmc/next +Already up-to-date. +Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value) +$ git merge kgdb/kgdb-next +Auto-merging kernel/debug/kdb/kdb_io.c +Merge made by the 'recursive' strategy. + kernel/debug/kdb/kdb_io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging md/for-next (6409e84ec58f raid5-ppl: use BIOSET_NEED_BVECS when creating bioset) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + drivers/md/bitmap.c | 3 ++- + drivers/md/md.h | 4 +++- + drivers/md/raid5-ppl.c | 2 +- + drivers/md/raid5.c | 4 +--- + 4 files changed, 7 insertions(+), 6 deletions(-) +Merging mfd/for-mfd-next (d1f99b97478e mfd: madera: Add register definitions for Cirrus Logic Madera codecs) +$ git merge mfd/for-mfd-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 10 + + include/linux/mfd/madera/registers.h | 8832 ++++++++++++++++++++++++++++++++++ + 2 files changed, 8842 insertions(+) + create mode 100644 include/linux/mfd/madera/registers.h +Merging backlight/for-backlight-next (056d6ff470a8 video: adp8870: move header file out of I2C realm) +$ git merge backlight/for-backlight-next +Already up-to-date. +Merging battery/for-next (7bb5a650f347 power: supply: twl4030-charger: add deferred probing for phy and iio) +$ git merge battery/for-next +Already up-to-date. +Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (e2b2add63783 Merge remote-tracking branches 'regulator/topic/cpcap' and 'regulator/topic/qcom' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + drivers/regulator/axp20x-regulator.c | 6 ++++++ + drivers/regulator/cpcap-regulator.c | 21 ++++++++++++++++++--- + drivers/regulator/qcom_rpm-regulator.c | 5 +++++ + drivers/regulator/qcom_smd-regulator.c | 5 +++++ + 4 files changed, 34 insertions(+), 3 deletions(-) +Merging security/next (c4758fa59285 apparmor: put back designators in struct initialisers) +$ git merge security/next +Already up-to-date. +Merging integrity/next (fc26bd50539b IMA: update IMA policy documentation to include pcr= option) +$ git merge integrity/next +Already up-to-date. +Merging keys/keys-next (8ab2a6905b28 KEYS: Add documentation for asymmetric keyring restrictions) +$ git merge keys/keys-next +Merge made by the 'recursive' strategy. +Merging selinux/next (12f6dc2696a5 selinux: Assign proper class to PF_UNIX/SOCK_RAW sockets) +$ git merge selinux/next +Auto-merging security/selinux/hooks.c +Merge made by the 'recursive' strategy. + security/selinux/hooks.c | 1 + + 1 file changed, 1 insertion(+) +Merging tpmdd/next (e7d872bf1bc5 Documentation: tpm: add powered-while-suspended binding documentation) +$ git merge tpmdd/next +Auto-merging drivers/char/tpm/tpm_crb.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt | 6 ++++++ + drivers/char/tpm/tpm_crb.c | 2 +- + 2 files changed, 7 insertions(+), 1 deletion(-) +Merging watchdog/master (c013b65ad8a1 watchdog: introduce watchdog_worker_should_ping helper) +$ git merge watchdog/master +Already up-to-date. +Merging iommu/next (6a7086431fa1 Merge branches 'iommu/fixes', 'arm/rockchip', 'arm/renesas', 'arm/smmu', 'arm/core', 'x86/vt-d', 'x86/amd', 's390' and 'core' into next) +$ git merge iommu/next +Already up-to-date. +Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (7f56c30bd0a2 vfio: Remove unnecessary uses of vfio_container.group_lock) +$ git merge vfio/next +Already up-to-date. +Merging trivial/for-next (6fbc8798d946 tty: fix comment for __tty_alloc_driver()) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/next (15318a9f8015 audit: Reduce overhead using a coarse clock) +$ git merge audit/next +Auto-merging kernel/auditsc.c +Auto-merging kernel/audit.c +Merge made by the 'recursive' strategy. + kernel/audit.c | 2 +- + kernel/auditsc.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging devicetree/for-next (580c4549578d staging: iio: tsl2x7x: add device tree documentation) +$ git merge devicetree/for-next +Auto-merging Documentation/devicetree/bindings/trivial-devices.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/clock/silabs,si5351.txt | 6 +++++- + Documentation/devicetree/bindings/nvmem/mtk-efuse.txt | 5 ++++- + Documentation/devicetree/bindings/trivial-devices.txt | 10 ++++++++++ + 3 files changed, 19 insertions(+), 2 deletions(-) +Merging mailbox/mailbox-for-next (25bfee16d5a3 mailbox: Introduce Qualcomm APCS IPC driver) +$ git merge mailbox/mailbox-for-next +Already up-to-date. +Merging spi/for-next (a40be456ef3c Merge remote-tracking branches 'spi/topic/at79', 'spi/topic/bcm63xx-hspi' and 'spi/topic/imx' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/fsl-imx-cspi.txt | 1 + + drivers/spi/spi-ath79.c | 13 +++--- + drivers/spi/spi-bcm63xx-hsspi.c | 6 +-- + drivers/spi/spi-imx.c | 47 ++++++++++++++++++---- + 4 files changed, 49 insertions(+), 18 deletions(-) +Merging tip/auto-latest (ef2070b705db Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Auto-merging include/linux/syscalls.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 2 + + MAINTAINERS | 6 +- + arch/arm/include/asm/thread_info.h | 15 +- + arch/arm/include/asm/uaccess.h | 2 + + arch/arm/kernel/entry-common.S | 9 +- + arch/arm/kernel/signal.c | 5 + + arch/arm64/include/asm/thread_info.h | 4 +- + arch/arm64/include/asm/uaccess.h | 3 + + arch/arm64/kernel/signal.c | 5 + + arch/ia64/include/asm/acpi.h | 2 - + arch/x86/entry/common.c | 3 + + arch/x86/include/asm/acpi.h | 2 - + arch/x86/include/asm/disabled-features.h | 4 +- + arch/x86/include/asm/mmu.h | 25 ++- + arch/x86/include/asm/mmu_context.h | 12 +- + arch/x86/include/asm/thread_info.h | 5 +- + arch/x86/include/asm/tlbflush.h | 73 +++++- + arch/x86/include/asm/uaccess.h | 7 +- + arch/x86/kernel/cpu/amd.c | 1 + + arch/x86/kernel/cpu/bugs.c | 8 + + arch/x86/kernel/cpu/common.c | 40 ++++ + arch/x86/mm/init.c | 1 - + arch/x86/mm/tlb.c | 281 +++++++++++++++++------- + arch/x86/platform/uv/tlb_uv.c | 6 +- + arch/x86/xen/enlighten_pv.c | 6 + + arch/x86/xen/mmu_pv.c | 5 +- + drivers/acpi/processor_idle.c | 2 - + drivers/idle/intel_idle.c | 9 +- + include/linux/syscalls.h | 16 ++ + kernel/cpu.c | 3 +- + kernel/events/core.c | 21 -- + kernel/irq/manage.c | 63 +++++- + kernel/locking/rtmutex.c | 1 - + kernel/sched/cputime.c | 6 +- + kernel/sched/deadline.c | 14 +- + tools/perf/ui/browser.c | 2 +- + tools/perf/util/evsel.c | 8 +- + tools/perf/util/machine.c | 2 +- + 38 files changed, 506 insertions(+), 173 deletions(-) +Merging clockevents/clockevents/next (2287d8664fe7 timers: Make the cpu base lock raw) +$ git merge clockevents/clockevents/next +Already up-to-date. +Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (164c29244d4b EDAC, pnd2: Fix Apollo Lake DIMM detection) +$ git merge edac-amd/for-next +Already up-to-date. +Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1) +$ git merge irqchip/irqchip/for-next +Already up-to-date. +Merging ftrace/for-next (2e028c4fe129 ftrace: Fix uninitialized variable in match_records()) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (6d48152eafde rcu: Remove RCU CPU stall warnings from Tiny RCU) +$ git merge rcu/rcu/next +Already up-to-date. +Merging kvm/linux-next (d3457c877b14 kvm: x86: hyperv: make VP_INDEX managed by userspace) +$ git merge kvm/linux-next +Already up-to-date. +Merging kvm-arm/next (d38338e396ee arm64: Remove a redundancy in sysreg.h) +$ git merge kvm-arm/next +Already up-to-date. +Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E) +$ git merge kvm-mips/next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (8b24e69fc47e KVM: PPC: Book3S HV: Close race with testing for signals on guest entry) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (d52cd2076eb2 KVM: s390: Inject machine check into the nested guest) +$ git merge kvms390/next +Already up-to-date. +Merging xen-tip/linux-next (18f7dd89a7c6 xen: introduce a Kconfig option to enable the pvcalls backend) +$ git merge xen-tip/linux-next +Merge made by the 'recursive' strategy. + drivers/xen/Kconfig | 12 + + drivers/xen/Makefile | 1 + + drivers/xen/pvcalls-back.c | 1236 ++++++++++++++++++++++++++++++++++++ + include/xen/interface/io/pvcalls.h | 121 ++++ + include/xen/interface/io/ring.h | 2 + + 5 files changed, 1372 insertions(+) + create mode 100644 drivers/xen/pvcalls-back.c + create mode 100644 include/xen/interface/io/pvcalls.h +Merging percpu/for-next (e3efe3db932b percpu: fix static checker warnings in pcpu_destroy_chunk) +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next (bacb71fc9187 Merge branch 'for-4.12' into for-next) +$ git merge workqueues/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging drivers-x86/for-next (5771a8c08880 Linux v4.13-rc1) +$ git merge drivers-x86/for-next +Already up-to-date. +Merging chrome-platform/for-next (3c778a7fcfaa platform/chrome : Add myself as Maintainer) +$ git merge chrome-platform/for-next +Already up-to-date. +Merging hsi/for-next (67ddd75771b6 HSI: core: Use kcalloc() in two functions) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (c68729119f4d leds: tlc591xx: add missing of_node_put) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + drivers/leds/leds-tlc591xx.c | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) +Merging ipmi/for-next (4495ec6d770e ipmi:ssif: Add missing unlock in error branch) +$ git merge ipmi/for-next +Already up-to-date. +Merging driver-core/driver-core-next (5771a8c08880 Linux v4.13-rc1) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging usb/usb-next (5771a8c08880 Linux v4.13-rc1) +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (0591bc236015 usb: gadget: add f_uac1 variant based on a new u_audio api) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (c22ac6d29f18 USB: serial: propagate late probe errors) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging usb-chipidea-next/ci-for-usb-next (c4a0bbbdb7f6 usb: chipidea: properly handle host or gadget initialization failure) +$ git merge usb-chipidea-next/ci-for-usb-next +Already up-to-date. +Merging phy-next/next (af850e14a7ae phy: bcm-ns-usb3: add MDIO driver using proper bus layer) +$ git merge phy-next/next +Already up-to-date. +Merging tty/tty-next (5771a8c08880 Linux v4.13-rc1) +$ git merge tty/tty-next +Already up-to-date. +Merging char-misc/char-misc-next (5771a8c08880 Linux v4.13-rc1) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging extcon/extcon-next (ff890bc00830 extcon: int3496: Constify acpi_device_id) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-intel-int3496.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging staging/staging-next (07119e257309 Staging: Lustre Fix block statement style issue) +$ git merge staging/staging-next +Removing drivers/staging/ccree/ssi_fips_local.h +Removing drivers/staging/ccree/ssi_fips_local.c +Removing drivers/staging/ccree/ssi_fips_ll.c +Removing drivers/staging/ccree/ssi_fips_ext.c +Removing drivers/staging/ccree/ssi_fips_data.h +Merge made by the 'recursive' strategy. + drivers/staging/android/ion/ion.h | 12 +- + drivers/staging/android/ion/ion_cma_heap.c | 5 +- + drivers/staging/android/ion/ion_system_heap.c | 2 - + drivers/staging/ccree/Kconfig | 9 - + drivers/staging/ccree/Makefile | 2 +- + drivers/staging/ccree/cc_hw_queue_defs.h | 3 +- + drivers/staging/ccree/ssi_aead.c | 193 +-- + drivers/staging/ccree/ssi_aead.h | 12 +- + drivers/staging/ccree/ssi_buffer_mgr.c | 433 ++--- + drivers/staging/ccree/ssi_cipher.c | 125 +- + drivers/staging/ccree/ssi_driver.c | 57 +- + drivers/staging/ccree/ssi_driver.h | 1 - + drivers/staging/ccree/ssi_fips.c | 119 +- + drivers/staging/ccree/ssi_fips.h | 58 +- + drivers/staging/ccree/ssi_fips_data.h | 306 ---- + drivers/staging/ccree/ssi_fips_ext.c | 92 -- + drivers/staging/ccree/ssi_fips_ll.c | 1649 -------------------- + drivers/staging/ccree/ssi_fips_local.c | 357 ----- + drivers/staging/ccree/ssi_fips_local.h | 67 - + drivers/staging/ccree/ssi_hash.c | 150 +- + drivers/staging/ccree/ssi_ivgen.c | 5 +- + drivers/staging/ccree/ssi_request_mgr.c | 48 +- + drivers/staging/ccree/ssi_sram_mgr.c | 6 +- + drivers/staging/ccree/ssi_sysfs.c | 80 +- + drivers/staging/comedi/comedi_buf.c | 2 +- + drivers/staging/fbtft/fb_st7789v.c | 2 +- + drivers/staging/fsl-dpaa2/ethernet/dpaa2-ethtool.c | 2 - + drivers/staging/greybus/arche-platform.c | 11 +- + drivers/staging/greybus/tools/loopback_test.c | 13 +- + drivers/staging/ks7010/ks_wlan_net.c | 2 +- + .../staging/lustre/include/linux/lnet/lib-lnet.h | 3 +- + .../staging/lustre/include/linux/lnet/lib-types.h | 46 +- + drivers/staging/lustre/include/linux/lnet/lnetst.h | 129 +- + .../staging/lustre/include/linux/lnet/socklnd.h | 3 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 11 - + .../lustre/lnet/klnds/socklnd/socklnd_lib.c | 20 +- + drivers/staging/lustre/lnet/selftest/conrpc.c | 5 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 78 +- + drivers/staging/rtl8192u/r8192U_hw.h | 11 +- + drivers/staging/rtl8712/mlme_linux.c | 4 +- + drivers/staging/rtl8712/rtl8712_cmd.c | 2 +- + drivers/staging/rtl8712/rtl8712_efuse.c | 2 +- + drivers/staging/rtl8712/rtl8712_xmit.c | 8 +- + drivers/staging/rtl8723bs/core/rtw_btcoex.c | 2 +- + drivers/staging/typec/tcpm.c | 3 +- + drivers/staging/unisys/include/channel.h | 291 ++-- + drivers/staging/unisys/include/iochannel.h | 505 +++--- + drivers/staging/unisys/include/visorbus.h | 2 +- + drivers/staging/unisys/visorbus/controlvmchannel.h | 689 ++++---- + drivers/staging/unisys/visorbus/vbuschannel.h | 91 +- + drivers/staging/unisys/visorbus/visorbus_main.c | 102 +- + drivers/staging/unisys/visorbus/visorchannel.c | 28 +- + drivers/staging/unisys/visorbus/visorchipset.c | 18 +- + drivers/staging/unisys/visorbus/vmcallinterface.h | 56 +- + drivers/staging/unisys/visorhba/visorhba_main.c | 358 +++-- + .../staging/unisys/visorinput/ultrainputreport.h | 65 +- + drivers/staging/unisys/visorinput/visorinput.c | 20 +- + drivers/staging/unisys/visornic/visornic_main.c | 98 +- + drivers/staging/vt6656/device.h | 2 +- + drivers/staging/vt6656/firmware.c | 2 +- + drivers/staging/vt6656/key.h | 2 +- + drivers/staging/vt6656/main_usb.c | 5 +- + drivers/staging/vt6656/power.c | 6 +- + drivers/staging/vt6656/rf.c | 6 +- + drivers/staging/vt6656/usbpipe.c | 4 +- + drivers/staging/wilc1000/host_interface.c | 4 +- + drivers/staging/wilc1000/linux_wlan.c | 3 +- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 65 +- + drivers/staging/wilc1000/wilc_wfi_netdevice.h | 4 +- + 69 files changed, 2241 insertions(+), 4335 deletions(-) + delete mode 100644 drivers/staging/ccree/ssi_fips_data.h + delete mode 100644 drivers/staging/ccree/ssi_fips_ext.c + delete mode 100644 drivers/staging/ccree/ssi_fips_ll.c + delete mode 100644 drivers/staging/ccree/ssi_fips_local.c + delete mode 100644 drivers/staging/ccree/ssi_fips_local.h +Merging mux/for-next (a351e9b9fc24 Linux 4.11) +$ git merge mux/for-next +Already up-to-date. +Merging slave-dma/next (f6a28cf9aff9 Merge branch 'fixes' into next) +$ git merge slave-dma/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging cgroup/for-next (610467270fb3 cgroup: don't call migration methods if there are no tasks to migrate) +$ git merge cgroup/for-next +Merge made by the 'recursive' strategy. + kernel/cgroup/cgroup-internal.h | 3 +++ + kernel/cgroup/cgroup.c | 58 ++++++++++++++++++++++------------------- + 2 files changed, 34 insertions(+), 27 deletions(-) +Merging scsi/for-next (6f37e2102778 scsi: libfc: pass an error pointer to fc_disc_error()) +$ git merge scsi/for-next +Auto-merging drivers/scsi/qla2xxx/qla_target.c +Merge made by the 'recursive' strategy. + drivers/scsi/cxlflash/main.c | 11 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 10 +- + drivers/scsi/isci/request.c | 14 +- + drivers/scsi/libfc/fc_disc.c | 2 +- + drivers/scsi/qedf/qedf_main.c | 2 +- + drivers/scsi/qedi/qedi.h | 17 ++ + drivers/scsi/qedi/qedi_fw.c | 2 +- + drivers/scsi/qedi/qedi_main.c | 419 +++++++++++++++++++++++++++++++++ + drivers/scsi/qedi/qedi_nvm_iscsi_cfg.h | 210 +++++++++++++++++ + drivers/scsi/qla2xxx/qla_target.c | 2 +- + drivers/scsi/sg.c | 5 +- + drivers/scsi/virtio_scsi.c | 1 + + 12 files changed, 674 insertions(+), 21 deletions(-) + create mode 100644 drivers/scsi/qedi/qedi_nvm_iscsi_cfg.h +Merging scsi-mkp/for-next (6f37e2102778 scsi: libfc: pass an error pointer to fc_disc_error()) +$ git merge scsi-mkp/for-next +Already up-to-date. +Merging target-updates/for-next (138d351eefb7 iscsi-target: Add login_keys_workaround attribute for non RFC initiators) +$ 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 (2ea659a9ef48 Linux 4.12-rc1) +$ git merge target-bva/for-next +Already up-to-date. +Merging libata/for-next (6ac1d1532c88 ata: sata_rcar: add gen[23] fallback compatibility strings) +$ git merge libata/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/ata/sata_rcar.txt | 14 +++++++++++--- + drivers/ata/Kconfig | 4 ++-- + drivers/ata/libata-core.c | 6 +++--- + drivers/ata/libata-eh.c | 3 +-- + drivers/ata/sata_rcar.c | 8 ++++++++ + include/linux/libata.h | 2 +- + 6 files changed, 26 insertions(+), 11 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 (e41b1355508d virtio_balloon: disable VIOMMU support) +$ git merge vhost/linux-next +Already up-to-date. +Merging rpmsg/for-next (9ef2b6cc595a Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging gpio/for-next (8d2c6297aec9 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Resolved 'drivers/gpio/gpio-mvebu.c' using previous resolution. +Auto-merging drivers/gpio/gpio-mvebu.c +CONFLICT (content): Merge conflict in drivers/gpio/gpio-mvebu.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master eca91a28fcfb] Merge remote-tracking branch 'gpio/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging pinctrl/for-next (ece5946c2eed Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. +Merging pinctrl-samsung/for-next (5771a8c08880 Linux v4.13-rc1) +$ git merge pinctrl-samsung/for-next +Already up-to-date. +Merging pwm/for-next (5ec8c48a6235 Merge branch 'for-4.13/drivers' into for-next) +$ git merge pwm/for-next +Already up-to-date. +Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files) +$ git merge dma-buf/for-next +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 c081dc7ebe73] 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 (2fd1d2c4ceb2 proc: Fix proc_sys_prune_dcache to hold a sb reference) +$ git merge userns/for-next +Already up-to-date. +Merging ktest/for-next (f7c6401ff84a ktest: Make sure wait_for_input does honor the timeout) +$ git merge ktest/for-next +Already up-to-date. +Merging random/dev (72e5c740f633 random: reorder READ_ONCE() in get_random_uXX) +$ git merge random/dev +Already up-to-date. +Merging aio/master (4c1d69950da4 fs: aio: fix the increment of aio-nr and counting against aio-max-nr) +$ git merge aio/master +Auto-merging fs/aio.c +Merge made by the 'recursive' strategy. + fs/aio.c | 19 ++++++++++++------- + 1 file changed, 12 insertions(+), 7 deletions(-) +Merging kselftest/next (e67f85fb96ca selftests: membarrier: use ksft_* var arg msg api) +$ git merge kselftest/next +Already up-to-date. +Merging y2038/y2038 (69973b830859 Linux 4.9) +$ git merge y2038/y2038 +Already up-to-date. +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 (26d8d1e9bb48 Merge branch 'for-4.12/upstream-fixes' into for-next) +$ git merge livepatching/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging coresight/next (c36e434188c5 coresight: etm4x: Adds trace return stack option programming for ETMv4.) +$ git merge coresight/next +Auto-merging drivers/hwtracing/coresight/coresight.c +Auto-merging drivers/hwtracing/coresight/coresight-tmc-etf.c +Auto-merging drivers/hwtracing/coresight/coresight-etm4x.c +Auto-merging drivers/hwtracing/coresight/coresight-etm3x.c +Auto-merging drivers/hwtracing/coresight/coresight-etm-perf.c +Auto-merging drivers/hwtracing/coresight/coresight-etb10.c +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight-etb10.c | 46 ++++++++++++++++-------- + drivers/hwtracing/coresight/coresight-etm-perf.c | 4 ++- + drivers/hwtracing/coresight/coresight-etm.h | 1 + + drivers/hwtracing/coresight/coresight-etm3x.c | 20 +++++++++-- + drivers/hwtracing/coresight/coresight-etm4x.c | 4 +++ + drivers/hwtracing/coresight/coresight-priv.h | 2 ++ + drivers/hwtracing/coresight/coresight-tmc-etf.c | 34 ++++++++++++++++-- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 12 +++++++ + drivers/hwtracing/coresight/coresight.c | 8 +++++ + include/linux/coresight-pmu.h | 1 + + tools/include/linux/coresight-pmu.h | 1 + + 11 files changed, 112 insertions(+), 21 deletions(-) +Merging rtc/rtc-next (40bf6a35483e rtc: Remove wrong deprecation comment) +$ 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 (9d92573fff3e Merge branch 'for-4.13/dax' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Already up-to-date. +Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection) +$ git merge dax-misc/dax-misc +Already up-to-date. +Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too) +$ git merge idr/idr-4.11 +Already up-to-date. +Merging kspp/for-next/kspp (cb00e6b58abb Merge branch 'for-next/gcc-plugin/randstruct' into for-next/kspp) +$ git merge kspp/for-next/kspp +Resolved 'include/linux/fs.h' using previous resolution. +Resolved 'include/linux/ipc.h' using previous resolution. +Resolved 'include/linux/sem.h' using previous resolution. +Auto-merging security/keys/internal.h +Auto-merging kernel/futex.c +Auto-merging include/net/sock.h +Auto-merging include/net/net_namespace.h +Auto-merging include/net/neighbour.h +Auto-merging include/net/af_unix.h +Auto-merging include/linux/tty.h +Auto-merging include/linux/sysctl.h +Auto-merging include/linux/sem.h +CONFLICT (content): Merge conflict in include/linux/sem.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/module.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/kobject.h +Auto-merging include/linux/ipc.h +CONFLICT (content): Merge conflict in include/linux/ipc.h +Auto-merging include/linux/fs.h +CONFLICT (content): Merge conflict in include/linux/fs.h +Auto-merging include/linux/dcache.h +Auto-merging include/linux/cred.h +Auto-merging include/linux/compiler.h +Auto-merging include/linux/compiler-gcc.h +Auto-merging fs/proc/internal.h +Auto-merging fs/namei.c +Auto-merging fs/mount.h +Auto-merging arch/x86/include/asm/processor.h +Auto-merging arch/x86/include/asm/paravirt_types.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5431b2627253] Merge remote-tracking branch 'kspp/for-next/kspp' +$ git diff -M --stat --summary HEAD^.. + arch/arm/include/asm/cacheflush.h | 2 +- + arch/x86/include/asm/paravirt_types.h | 16 ++++++++-------- + arch/x86/include/asm/processor.h | 2 +- + fs/mount.h | 4 ++-- + fs/namei.c | 2 +- + fs/proc/internal.h | 6 +++--- + include/linux/binfmts.h | 4 ++-- + include/linux/cdev.h | 2 +- + include/linux/compiler-gcc.h | 13 ++++++++++++- + include/linux/compiler.h | 5 +++++ + include/linux/cred.h | 4 ++-- + include/linux/dcache.h | 2 +- + include/linux/fs.h | 17 +++++++++-------- + include/linux/fs_struct.h | 2 +- + include/linux/ipc.h | 2 +- + include/linux/ipc_namespace.h | 2 +- + include/linux/key-type.h | 4 ++-- + include/linux/kmod.h | 2 +- + include/linux/kobject.h | 2 +- + include/linux/lsm_hooks.h | 4 ++-- + include/linux/mm_types.h | 4 ++-- + include/linux/module.h | 4 ++-- + include/linux/mount.h | 2 +- + include/linux/msg.h | 2 +- + include/linux/path.h | 2 +- + include/linux/pid_namespace.h | 2 +- + include/linux/proc_ns.h | 2 +- + include/linux/sched.h | 16 +++++++++++++++- + include/linux/sched/signal.h | 2 +- + include/linux/sem.h | 2 +- + include/linux/shm.h | 2 +- + include/linux/sysctl.h | 2 +- + include/linux/tty.h | 2 +- + include/linux/tty_driver.h | 4 ++-- + include/linux/user_namespace.h | 2 +- + include/linux/utsname.h | 2 +- + include/net/af_unix.h | 2 +- + include/net/neighbour.h | 2 +- + include/net/net_namespace.h | 2 +- + include/net/sock.h | 2 +- + kernel/futex.c | 4 ++-- + security/keys/internal.h | 2 +- + 42 files changed, 97 insertions(+), 66 deletions(-) +Merging akpm-current/current (7f004d4884d4 kernel-reboot-add-devm_register_reboot_notifier-fix) +$ git merge --no-ff akpm-current/current +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/dlm/dlmrecovery.c | 40 ++--- + fs/ocfs2/dlmglue.c | 2 +- + fs/ocfs2/filecheck.c | 357 ++++++++++++++----------------------- + fs/ocfs2/filecheck.h | 29 ++- + fs/ocfs2/ocfs2.h | 8 + + fs/ocfs2/stackglue.c | 6 - + fs/ocfs2/stackglue.h | 3 - + fs/ocfs2/super.c | 35 +++- + fs/seq_file.c | 10 -- + include/linux/crash_core.h | 2 + + include/linux/reboot.h | 4 + + include/uapi/linux/sysctl.h | 4 + + kernel/reboot.c | 27 +++ + mm/memory_hotplug.c | 4 + + mm/page_alloc.c | 19 +- + mm/page_owner.c | 4 +- + mm/slub.c | 4 +- + mm/vmscan.c | 17 +- + 22 files changed, 339 insertions(+), 307 deletions(-) +$ 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: sparc64: NG4 memset 32 bits overflow +Applying: lib/crc-ccitt: add CCITT-FALSE CRC16 variant +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + e593a9ad48d8...369b7d2e2d1e akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (369b7d2e2d1e lib/crc-ccitt: add CCITT-FALSE CRC16 variant) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + arch/sparc/lib/NG4memset.S | 26 ++++++++++----------- + include/linux/crc-ccitt.h | 7 ++++++ + lib/crc-ccitt.c | 58 +++++++++++++++++++++++++++++++++++++++++++++- + 3 files changed, 77 insertions(+), 14 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..9bccb9211748 --- /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.12-rc4 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..45e04c1e3537 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20170717 |