From 36bcd6a520755a41b6587486214a13a0a3212119 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Thu, 11 May 2017 13:00:09 +1000 Subject: Add linux-next specific files for 20170511 Signed-off-by: Stephen Rothwell --- Next/SHA1s | 260 +++++ Next/Trees | 262 +++++ Next/merge.log | 2578 +++++++++++++++++++++++++++++++++++++++++++++++++ Next/quilt-import.log | 4 + localversion-next | 1 + 5 files changed, 3105 insertions(+) create mode 100644 Next/SHA1s create mode 100644 Next/Trees create mode 100644 Next/merge.log create mode 100644 Next/quilt-import.log create mode 100644 localversion-next diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..0dc8555d41c0 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,260 @@ +Name SHA1 +---- ---- +origin b5a53b61a2890ec08f404f524c1c42aa86f09be4 +fixes 97da3854c526d3a6ee05c849c96e48d21527606c +kbuild-current 9be3213b14d44f6328281941193d97f3b97e7d4c +arc-current cf4100d1cddcd243f80ac2af2e4c4273919ff225 +arm-current 6d80594936914e798b1b54b3bfe4bd68d8418966 +m68k-current f6ab4d59a5fe205f12287e515a43fc5e6de779b1 +metag-fixes b884a190afcecdbef34ca508ea5ee88bb7c77861 +powerpc-fixes be5c5e843c4afa1c8397cb740b6032bd4142f32d +sparc 3c7f62212018b904ae17f5636ead18a4dca3a88f +fscrypt-current 42d97eb0ade31e1bc537d086842f5d6e766d9d51 +net 56868a460b83c0f93d339256a81064d89aadae8e +ipsec 2c1497bbc8fdee897341ab48ee9c9209b421b8c0 +netfilter f411af6822182f84834c4881b825dd40534e7fe8 +ipvs 3c5ab3f395d66a9e4e937fcfdf6ebc63894f028b +wireless-drivers d77facb88448cdeaaa3adba5b9704a48ac2ac8d6 +mac80211 29cee56c0be46ad01e78af104a06223c65ee0c67 +sound-current 960013762df0a214b57f2fce655422fb52bdfd2c +pci-current b9c1153f7a9cb2d53b845615a0edd510f7fe8341 +driver-core.current af82455f7dbd9dc20244d80d033721b30d22c065 +tty.current 4f7d029b9bf009fbee76bb10c0c4351a1870d2f3 +usb.current a71c9a1c779f2499fb2afc0553e543f18aff6edf +usb-gadget-fixes a351e9b9fc24e982ec2f0e76379a49826036da12 +usb-serial-fixes c02ed2e75ef4c74e41e421acb4ef1494671585e8 +usb-chipidea-fixes c7fbb09b2ea13e283b9b0fd18a778f918ceb17b9 +phy 1a09b6a7c10e22c489a8b212dd6862b1fd9674ad +staging.current 56868a460b83c0f93d339256a81064d89aadae8e +char-misc.current af82455f7dbd9dc20244d80d033721b30d22c065 +input-current 8be193c7b1f44d3f4dcb27107df0831709c2deb1 +crypto-current 929562b144783b9212625305eadcbbd800809643 +ide acfead32f3f938e456d7d5e1a82c743d30b8b886 +vfio-fixes 39da7c509acff13fc8cb12ec1bb20337c988ed36 +kselftest-fixes c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201 +backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f +ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600 +mfd-fixes b2376407f98920c9b0c411948675f58a9640be35 +v4l-dvb-fixes 24a47426066c8ba16a4db1b20a41d63187281195 +drm-intel-fixes a351e9b9fc24e982ec2f0e76379a49826036da12 +drm-misc-fixes 0c45b36f8acc89cb94c8696a27574f01e0e411dc +kbuild 6515cec57e921efb2858e27259312bbf65be33ee +asm-generic de4be6b87b6b8816b61c9ba798d21ae8075d955c +arc d5adbfcd5f7bcc6fa58a41c5c5ada0e5c826ce2c +arm c92a90a5060a84e4a180af6b60aa0fb3a5e46c64 +arm-perf f00fa5f4163b40c3ec8590d9a7bd845c19bf8d16 +arm-soc e3ec06d4bc1e996563762a5f33187e552c297959 +alpine a1144b2b1ec47f50951a83eb2bd847c74415b567 +amlogic 715dcd20604177df66ed4d8aa6332abd58aea7ee +aspeed 4944e5dbb215cb99491bc5cd519045ae84536d2c +at91 ce60fdaa7e9ebcb97655f5c8497d1291d6398233 +bcm2835 7ea6e490ba7f0ded1f1a576733453db2f4576ffa +berlin 5153351425c92f3e89358c8eb62ca8d901437581 +cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4 +imx-mxs 990df04806108758b5ae6f1dff53479a107e7abd +keystone 4495c08e84729385774601b5146d51d9e5849f81 +mvebu 4cfb1f480e35b37280657ca34034b5358fb1ef5e +omap 5a0bbcf7ab0f8e0b3d32253d9c72214d1752b5e3 +omap-pending c20c8f750d9f8f8617f07ee2352d3ff560e66bc2 +qcom 9f514b0f9cf3017bd6d730ee0c5a704e8af36f30 +renesas c8906b237adf94132288b689fce91d54eb819d2a +rockchip b1e842489772ec6c47fd0e3abe52d556097bcc1a +rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590 +samsung 1001354ca34179f3db924eb66672442a173147dc +samsung-krzk 725bbcc7945c2855f348d802ba97e04daa91e052 +sunxi 5675caea945d205c7abbac476300028f949eb5f2 +tegra 29d04525797f3eee9946d40f978672e14e5e46de +arm64 d135b8b5060ea91dd751ff172d179eb4eab1e966 +clk 0119dc6132d2110df8f3545bd0ffe29aa0752d6b +c6x ca3060d39ae7a0964f8c123a4833029981e86476 +cris 8f50f2a1b46a11a9a9fb46c5d8325dfc88281a76 +h8300 58c57526711f7c87046b7c5a650535acbab2d3fb +hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a +ia64 fbb0e4da96f4503e65bc4fb627cf4e1d7c8c64e6 +m68k f6ab4d59a5fe205f12287e515a43fc5e6de779b1 +m68knommu 99a2c395541f487f6636c2a8822625f67ceefbb3 +metag e3cd7f013bac3105d44b8bd5a90359989d45b5a5 +microblaze 3400606d8ffd64ea7ffb5969f7c96daebeff36f3 +mips b153c82756e9efe756cd33ac1ffb6f9c30696f76 +nios2 ac75934606cd7a505cb3b64c98d21adc8bf70156 +openrisc a4d4426635804379d618dd28e29f574a2bc11184 +parisc-hd c8c3735997a3aa184fa81742bb6c4062a26af2f3 +powerpc 5a61ef74f269f2573f48fa53607a8911216c3326 +fsl 61baf15555129f69720334f232b153890895ef71 +mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0 +s390 8e4b8e130264946bac891e029bde062c70d26557 +sparc-next 94836ecf1e7378b64d37624fbb81fe48fbd4c772 +sh e61c10e468a42512f5fad74c00b62af5cc19f65f +tile 0af0bc38175d9859753a08f07af3aa767601265b +uml ce4586063f1af780b1c6b7e344907e6f9c1ba59a +unicore32 bc27113620ca6b67320b8a57e70d801dc94221d5 +xtensa 6fad04b7585d8067202bb1c3387e01f11a4dd5b1 +fscrypt 6f9d696f016f5b42f6c6e8c9f723f8d3380e5903 +befs 0bbabf98dd76229db3a1a2f2903a25c611fd68ae +btrfs 8b8b08cbfb9021af4b54b4175fc4c51d655aac8c +btrfs-kdave 953a8bf6ceddb51cdf23a8425b2c20894cf3cb33 +ceph eeca958dce0a9231d1969f86196653eb50fcc9b3 +cifs de1892b887eeb85ce458a93979c2108e6f329618 +configfs e16769d4bca67218531505ad1a8365d227fedcf9 +ecryptfs be280b25c3288824ed4c201b452c3e87a7074d7c +ext3 07f7e3135e589716e9c9865ca0d276d5c6a58edf +ext4 17f423b5160767a8ec43b0602767e5f4d3ecd083 +f2fs 2d3e4866dea96b0506395b47bfefb234f2088dac +freevxfs bf1bb4b460c8dc3a33793bff21464a9d816697ad +fscache d52bd54db8be8999df6df5a776f38c4f8b5e9cea +fuse 0b6e9ea041e6c932f5b3a86fae2d60cbcfad4dd2 +jfs 684666e51585f3b136a3f505f8173d7580bc52cd +nfs 76b2a303384e1d6299c3a0249f0f0ce2f8f96017 +nfsd b26b78cb726007533d81fdf90a62e915002ef5c8 +orangefs 2f713b5c7d2a90baba6c88174c81fb9a96bfde21 +overlayfs 65f2673832d4647f6d46783d8d745d2b15d090c4 +v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc +ubifs 7bccd12d27b7e358823feb5429731b8ee698b173 +xfs 161f55efba5ddccc690139fae9373cafc3447a97 +file-locks 07d9a380680d1c0eb51ef87ff2eab5c994949e69 +vfs 919bb328b0209612b2ba1d966f4289f01dc9a808 +vfs-jk 030b533c4fd4d2ec3402363323de4bb2983c9cee +vfs-miklos 0eb8af4916a540c362a2950e5ab54eca32eb7d58 +printk cf39bf58afdaabc0b86f141630fb3fd18190294e +pci 3146c8f4de9b0858794a902f273aec13f168596e +pstore 3a7d2fd16c57a1ef47dc2891171514231c9c7c6e +hid edb2a51c6fbb4fedeacb22cd6c0ec50e684549b9 +i2c f49ee0593cde3275ac22ec94c291b5de040d7f0a +jdelvare-hwmon 08d27eb2066622cd659b91d877d0406ebd651225 +dmi b3398adc0da601b344204a1b9140eaf401ce2b69 +hwmon-staging 6eaaea144dc58b66712f8a4c6cbc4a90427e1365 +jc_docs 0fe397f0c65d478eea3798ac361736fd91da7022 +v4l-dvb 3622d3e77ecef090b5111e3c5423313f11711dfa +v4l-dvb-next 6d95b3f24881c0fd0f345eca959a2a803a040930 +fbdev 34bf129a7f068e3108dbb051b4b05674e2a270e7 +pm c2d1a8fd16dc72fcf9d0102f807d7296c8ee4b95 +idle 306899f94804aece6d8fa8b4223ede3b48dbb59c +thermal cb15c81a0c1c1f7829b9809a209ecacc77f5aa63 +thermal-soc 19fd1783c24ea4516253c60972588ee8dfb48d93 +ieee1394 72f3c27aa6460196ec0261bb780fbba036eef6de +dlm c0ae148576778de958a0d5ff9a5ba00044e371a8 +swiotlb 69369f52d28a34c84acb6f2a8a585e743441566a +net-next 89c9fea3c8034cdb2fd745f551cde0b507fd6893 +ipsec-next e892d2d40445a14a19530a2be8c489b87bcd7c19 +netfilter-next 89c9fea3c8034cdb2fd745f551cde0b507fd6893 +ipvs-next fb90e8dedb465bd06512f718b139ed8680d26dbe +wireless-drivers-next 47d272f0f9887343f4e4d31bb22910b141b96654 +bluetooth 2a25b3faef44936bf9b5f70725d2ed7682224e36 +mac80211-next 89c9fea3c8034cdb2fd745f551cde0b507fd6893 +rdma 67cf3623e097706b0ca03bf79bf28d60c39591eb +gfs2 3ef2bc099d1cce09e2844467e2ced98e1a44609d +mtd c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201 +l2-mtd 6a623e07694437ad09f382a13f76cffc32239a7f +nand 9d2ee0a60b8bd9bef2a0082c533736d6a7b39873 +spi-nor b67166569698c1bf6bd28dd7c5d4b1bf953dab64 +crypto 929562b144783b9212625305eadcbbd800809643 +drm 644b4930bf7e2adeffbe842e1097f7933c6a9158 +drm-panel e4bac408b08437d190785ab1250cc676304ed171 +drm-intel 88326ef05b262f681d837ecf65db10a7edb609f1 +drm-tegra b0d36daa0ab54714e05164f6e21d22f974a5eec1 +drm-misc e345da82bd6bdfa8492f80b3ce4370acfd868d95 +drm-exynos 7d1e042314619115153a0f6f06e4552c09a50e13 +drm-msm 98db803f6413e6d4bf1f590ea57e9e7dfe1eb32b +hdlcd 1de3cd4fb49f3463679c49afe0aa9ceb133f3e49 +mali-dp 763656d30b3d220a52e4b2bd1fc174a4cd6c0f43 +sunxi-drm 2da042ac05e91b78e4484b731e8eb335c90385d3 +imx-drm 1465dc794b00f6ce659f93d90dbe7f0fc0280514 +etnaviv d79fd1ccf2cd76adba2121a62bae996bc4beccfe +kspp 62111ab351b894b858dab51d8584b04f1e260935 +kconfig 5bcba792bb304e8341217d759ec486969a3b4258 +regmap bbbed19517040c8940e4fa49d399ccd049b0551b +sound a5c3b32a1146e44f6b38fdfdfffc27842953420c +sound-asoc 20d5c84bef067b7e804a163e2abca16c47125bad +modules 17586188276980ff10d1244a35aeb31ae199705e +input c3f6f8612bdab5959950a58291bd61d1d42d996b +block 0789bd7bdb5bd036fe3df96c19528f46127a0160 +lightnvm 1c6286f26301ad154a1c10fb6e68925493dd28ba +device-mapper 2ba0320c4c4000991632c474de373d3f28cf067f +pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8 +mmc a627f025eb0534052ff451427c16750b3530634c +kgdb 7a6653fca50077f342bcdc39222d78928e3f0feb +md 29efc390b9462582ae95eb9a0b8cd17ab956afc0 +mfd ab6241ae07c3c698543b565e4ea41995a29a3f62 +backlight e739c5bb20bebb74028d9262255dc1e470b60fcf +battery 35f4f99ccbc1ccf3a1f1157a5f2f14d6a7d1848f +omap_dss2 c456a2f30de53e77a2eb8eeb4202d742516aa76b +regulator f123e7b2a6e3443468e5c90b4b0df36bd51d5097 +security 8979b02aaf1d6de8d52cc143aa4da961ed32e5a2 +integrity 3dd0c8d06511c7c61c62305fcf431ca28884d263 +keys e36484b5ac315f477c9c4075a78753fa4c0e0cf1 +selinux cae303df3f379f04ce7efadb2e30de460918b302 +tpmdd da4cee99ca6d9dea2932c0856be6d625b36703d4 +watchdog 00078cff73dbeb54110b0447463e26001d35c562 +iommu 2c0248d68880fc0e783af1048b3367ee5d4412f0 +dwmw2-iommu 910170442944e1f8674fd5ddbeeb8ccd1877ea98 +vfio 7cb671e7a34d73b29df77d0b53492277744e57e7 +trivial 6fbc8798d9461c0ff22fab9fbaddde13de815941 +audit 48d0e023af9799cd7220335baf8e3ba61eeafbeb +devicetree 17a70355ea576843a7ac851f1db26872a50b2850 +mailbox cb710ab1d8a23f68ff8f45aedf3e552bb90e70de +spi 282ec0ea65dab88fda51b5b9b649958ae42f4ac0 +tip 30e2fc1b448b3ca98cfcb336b4abce8a3eef6938 +clockevents 6f9c89000c3f771c47adacaca2df775a25f27205 +edac 345fb0a9a6340ba0b3b714d62f877fde88c8a755 +edac-amd f8d5549df25e3961d6bd2ae36d3e0b08614660d9 +irqchip c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201 +ftrace 4dbbe2d8e95c351157f292ece067f985c30c7b53 +rcu 933dfbd7c437bbbf65caae785dfa105fbfaa8485 +kvm 36c344f3f1ffc0b1b20abd237b7401dc6687ee8f +kvm-arm a2b19e6e2d4bb662a64799541c144fd94f8fb024 +kvm-mips dc44abd6aad22411f7f9890e39fd4753dabf0d03 +kvm-ppc fb7dcf723dd2cb1d5d8f2f49c3023130938848e3 +kvms390 e000b8e0968dd7bfa09c444607ce1e48e57aafd3 +xen-tip d162809f85b4f54ef075517ffa2f3d02e55d5a53 +percpu 1328710b8ec30ac552b51bf804d1fc255a1c7451 +workqueues bacb71fc9187f288e98c3132e87f36c0362318df +drivers-x86 6df97f85611cafc3ba9c093931a5fa3bc7dea897 +chrome-platform 31b764171cb545cc1f750c573eef713329936660 +hsi 3026050179a3a9a6f5c892c414b5e36ecf092081 +leds 28c5fe99016d28f15d1b825df8acb1558a3a63a1 +ipmi 2c1175c2e8e5487233cabde358a19577562ac83e +driver-core af82455f7dbd9dc20244d80d033721b30d22c065 +usb c034a43e72dda58e4a184d71f5502ef356e04453 +usb-gadget 2868b2513aa732a99ea4a0a6bf10dc93c1f3dac2 +usb-serial 31c5d1922b90ddc1da6a6ddecef7cd31f17aa32b +usb-chipidea-next a932a8041ff9941a244619555f1c75ecf299f662 +phy-next 6239879b415eb7cf96d418c8a2090ecd6f310aad +tty 8e1c21f486944bf92f2a981f23ee811a45f5eaff +char-misc af82455f7dbd9dc20244d80d033721b30d22c065 +extcon 70641a0a84e1ae3c6eee3d47ed5a482f85b11e3e +staging 56868a460b83c0f93d339256a81064d89aadae8e +mux a351e9b9fc24e982ec2f0e76379a49826036da12 +slave-dma eb4b66156318a06020afa45ceabf2b7392d49e28 +cgroup 0948307b3a5d96cbf36529b4d0f1129c99eb69d0 +scsi e83d14310c40343789a92a33d1d0f23e15c15fcd +scsi-mkp 2d3e4866dea96b0506395b47bfefb234f2088dac +target-updates 38b2788edbd6275d79e01cc967e307099ca456a9 +target-merge 2994a75183173defc21f0d26ce23b63232211b88 +target-bva 0c4a75c68799abc98743d84f7e23f797b80eaaf0 +libata b4dd60a5ddbcc351514b6375fe6d22df72e67a8a +binfmt_misc 4af75df6a410ce76d9f60f27b07e5645ecc2c5ed +vhost c8b0d7290657996a29f318b948d2397d30e70c36 +rpmsg 5e78de7eee7401362abceb2f2e182274c48c125f +gpio b86c86aa9805b25ee70071d084e618b2c40641b5 +pinctrl 1aa2faf52f76d49669f6613b9521618ab2bc63b2 +pinctrl-samsung c8dd100397f367b64bd78b0bfce620b855fa55aa +dma-mapping 1001354ca34179f3db924eb66672442a173147dc +pwm 97512ceafaacf8cdb96d6a36ae55e8335c0a9e55 +dma-buf 194cad44c4e1553fd8fcfbc940d27e756324ec3a +userns d66bb1607e2d8d384e53f3d93db5c18483c8c4f7 +ktest f7c6401ff84ab8ffffc281a29aa0a787f7eb346e +random db61ffe3a71c697aaa91c42c862a5f7557a0e562 +aio b562e44f507e863c6792946e4e1b1449fbbac85d +kselftest 945f8f5f863321de0dc5c13b3d446d4dbf41531e +y2038 69973b830859bc6529a7a0468ba0d80ee5117826 +luto-misc 2dcd0af568b0cf583645c8a317dd12e344b1c72a +borntraeger e76d21c40bd6c67fd4e2c1540d77e113df962b4d +livepatching 608822c0f7af9499f4ed20e58d8db2b9321a5e0d +coresight 8b3fa19142e84c4fd6a6dc8b348506d5c559a46b +rtc 332e0d13d3c7d1e4394a513585a3d3b15a0030b8 +hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828 +nvdimm 8376efd31d3d7c44bd05be337adde023cc531fa1 +dax-misc 4d9a2c8746671efbb0c27d3ae28c7474597a7aad +idr f0f3f2d0a3e0f7c48163fd8b45f5909d46e7f371 +akpm-current da567ccdcecf4cefb57f0be96ffd49ccdb00ddad +akpm 3237e8295d3f78903e02fb5a6b38c76403e98cb6 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..47035b7c27cc --- /dev/null +++ b/Next/Trees @@ -0,0 +1,262 @@ +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 +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 +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 +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 +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 +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +rpi git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-rpi-next +samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +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://github.com/luisbg/linux-befs.git#for-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next +btrfs-kdave git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +freevxfs git git://git.infradead.org/users/hch/freevxfs.git#for-next +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +file-locks git git://git.samba.org/jlayton/linux.git#linux-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +vfs-jk git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#vfs +vfs-miklos git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#next +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 +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://github.com/spi-nor/linux.git#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 +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +lightnvm git git://github.com/OpenChannelSSD/linux.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git#master +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next +md git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +omap_dss2 git git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +selinux git git://git.infradead.org/users/pcmoore/selinux#next +tpmdd git git://git.infradead.org/users/jjs/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +vfio git git://github.com/awilliam/linux-vfio.git#next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.infradead.org/users/pcmoore/audit#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#clockevents/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +irqchip git git://git.infradead.org/users/jcooper/linux.git#irqchip/for-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvm-mips git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/kvm-mips.git#next +kvm-ppc git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#kvm-ppc-next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git#for-next +ipmi git git://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 +dma-mapping git git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git#dma-mapping-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +dma-buf git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +aio git git://git.kvack.org/~bcrl/aio-next.git#master +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +y2038 git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038 +luto-misc git git://git.kernel.org/pub/scm/linux/kernel/git/luto/linux.git#next +borntraeger git git://git.kernel.org/pub/scm/linux/kernel/git/borntraeger/linux.git#linux-next +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching#for-next +coresight git git://git.linaro.org/kernel/coresight.git#next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +hwspinlock git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git#for-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +dax-misc git git://git.kernel.org/cgit/linux/kernel/git/nvdimm/nvdimm.git#dax-misc +idr git git://git.infradead.org/users/willy/linux-dax.git#idr-4.11 +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..e4dec5d3c46d --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2578 @@ +$ date -R +Thu, 11 May 2017 09:22:51 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 56868a460b83 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide +Merging origin/master (b5a53b61a289 Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux) +$ git merge origin/master +Updating 56868a460b83..b5a53b61a289 +Fast-forward + Documentation/00-INDEX | 2 + + Documentation/RCU/00-INDEX | 2 +- + .../Design/Data-Structures/Data-Structures.html | 233 ++- + .../RCU/Design/Data-Structures/nxtlist.svg | 34 +- + .../Expedited-Grace-Periods.html | 47 +- + .../RCU/Design/Requirements/Requirements.html | 195 +- + Documentation/RCU/rcu_dereference.txt | 9 + + Documentation/RCU/rculist_nulls.txt | 6 +- + Documentation/RCU/stallwarn.txt | 190 +- + Documentation/RCU/whatisRCU.txt | 32 +- + Documentation/admin-guide/kernel-parameters.txt | 14 +- + .../bindings/arm/firmware/linaro,optee-tz.txt | 31 + + .../bindings/arm/mediatek/mediatek,apmixedsys.txt | 1 + + .../bindings/arm/mediatek/mediatek,imgsys.txt | 1 + + .../bindings/arm/mediatek/mediatek,infracfg.txt | 1 + + .../bindings/arm/mediatek/mediatek,mmsys.txt | 1 + + .../bindings/arm/mediatek/mediatek,topckgen.txt | 1 + + .../bindings/arm/mediatek/mediatek,vdecsys.txt | 1 + + .../bindings/arm/mediatek/mediatek,vencsys.txt | 3 +- + .../devicetree/bindings/clock/idt,versaclock5.txt | 16 +- + ...chip,rk1108-cru.txt => rockchip,rv1108-cru.txt} | 12 +- + .../devicetree/bindings/clock/sunxi-ccu.txt | 18 +- + .../devicetree/bindings/power/power_domain.txt | 2 +- + .../devicetree/bindings/vendor-prefixes.txt | 1 + + Documentation/filesystems/nfs/pnfs.txt | 37 - + Documentation/filesystems/overlayfs.txt | 9 +- + Documentation/ioctl/ioctl-number.txt | 1 + + Documentation/memory-barriers.txt | 2 +- + Documentation/tee.txt | 118 ++ + Documentation/virtual/kvm/devices/arm-vgic-its.txt | 121 ++ + Documentation/virtual/kvm/devices/arm-vgic-v3.txt | 6 + + MAINTAINERS | 28 +- + arch/Kconfig | 3 + + arch/arm/boot/dts/rk1108.dtsi | 2 +- + arch/arm/include/uapi/asm/kvm.h | 6 +- + arch/arm/kvm/Makefile | 7 +- + arch/arm/kvm/trace.h | 247 --- + arch/arm/mach-omap2/clkt2xxx_dpllcore.c | 3 +- + arch/arm/mach-omap2/clock.c | 35 +- + arch/arm/mach-omap2/clock.h | 2 + + arch/arm/mach-omap2/cm.h | 5 +- + arch/arm/mach-omap2/cm2xxx.c | 9 +- + arch/arm/mach-omap2/cm3xxx.c | 10 +- + arch/arm/mach-omap2/cm_common.c | 2 +- + arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 7 + + arch/arm64/include/asm/kvm_emulate.h | 6 + + arch/arm64/include/uapi/asm/kvm.h | 6 +- + arch/arm64/kvm/Makefile | 5 +- + arch/arm64/kvm/sys_regs.c | 8 +- + arch/metag/include/asm/uaccess.h | 58 +- + arch/metag/lib/usercopy.c | 236 ++- + arch/metag/mm/mmu-meta1.c | 1 - + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/kvm_book3s_asm.h | 2 + + arch/powerpc/include/asm/kvm_host.h | 28 +- + arch/powerpc/include/asm/kvm_ppc.h | 74 + + arch/powerpc/include/asm/xive.h | 9 +- + arch/powerpc/kernel/asm-offsets.c | 10 + + arch/powerpc/kvm/Kconfig | 5 + + arch/powerpc/kvm/Makefile | 4 +- + arch/powerpc/kvm/book3s.c | 75 +- + arch/powerpc/kvm/book3s_hv.c | 51 +- + arch/powerpc/kvm/book3s_hv_builtin.c | 103 ++ + arch/powerpc/kvm/book3s_hv_rm_xics.c | 10 +- + arch/powerpc/kvm/book3s_hv_rm_xive.c | 47 + + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 62 +- + arch/powerpc/kvm/book3s_rtas.c | 21 +- + arch/powerpc/kvm/book3s_xics.c | 35 +- + arch/powerpc/kvm/book3s_xics.h | 7 + + arch/powerpc/kvm/book3s_xive.c | 1894 ++++++++++++++++++++ + arch/powerpc/kvm/book3s_xive.h | 256 +++ + arch/powerpc/kvm/book3s_xive_template.c | 503 ++++++ + arch/powerpc/kvm/irq.h | 1 + + arch/powerpc/kvm/powerpc.c | 17 +- + arch/powerpc/platforms/powernv/opal.c | 1 + + arch/powerpc/sysdev/xive/common.c | 142 +- + arch/powerpc/sysdev/xive/native.c | 86 +- + arch/x86/include/asm/kvm_host.h | 2 + + arch/x86/kvm/mmu.c | 15 + + arch/x86/kvm/mmu.h | 1 + + arch/x86/kvm/paging_tmpl.h | 4 + + arch/x86/kvm/vmx.c | 105 +- + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/acpi/Makefile | 1 + + drivers/acpi/acpi_apd.c | 12 + + drivers/acpi/acpi_lpss.c | 17 + + drivers/acpi/acpica/Makefile | 2 +- + drivers/acpi/acpica/acconvert.h | 144 ++ + drivers/acpi/acpica/acglobal.h | 53 + + drivers/acpi/acpica/aclocal.h | 106 +- + drivers/acpi/acpica/acmacros.h | 35 + + drivers/acpi/acpica/acopcode.h | 2 + + drivers/acpi/acpica/amlcode.h | 99 +- + drivers/acpi/acpica/dbmethod.c | 1 + + drivers/acpi/acpica/dbxface.c | 5 +- + drivers/acpi/acpica/dscontrol.c | 2 +- + drivers/acpi/acpica/dsmthdat.c | 3 +- + drivers/acpi/acpica/dsobject.c | 15 +- + drivers/acpi/acpica/dsopcode.c | 4 +- + drivers/acpi/acpica/dsutils.c | 8 +- + drivers/acpi/acpica/dswexec.c | 2 +- + drivers/acpi/acpica/dswload2.c | 2 +- + drivers/acpi/acpica/exmisc.c | 16 +- + drivers/acpi/acpica/exnames.c | 4 +- + drivers/acpi/acpica/exoparg1.c | 17 +- + drivers/acpi/acpica/exoparg2.c | 4 +- + drivers/acpi/acpica/exoparg6.c | 16 +- + drivers/acpi/acpica/exresolv.c | 3 +- + drivers/acpi/acpica/exstore.c | 5 +- + drivers/acpi/acpica/exstoren.c | 2 +- + drivers/acpi/acpica/hwvalid.c | 18 +- + drivers/acpi/acpica/nsaccess.c | 2 +- + drivers/acpi/acpica/nsrepair.c | 16 +- + drivers/acpi/acpica/nsrepair2.c | 6 +- + drivers/acpi/acpica/nsutils.c | 29 +- + drivers/acpi/acpica/psargs.c | 29 +- + drivers/acpi/acpica/psloop.c | 34 +- + drivers/acpi/acpica/psobject.c | 38 + + drivers/acpi/acpica/psopcode.c | 15 +- + drivers/acpi/acpica/psopinfo.c | 2 +- + drivers/acpi/acpica/psparse.c | 6 +- + drivers/acpi/acpica/pstree.c | 9 +- + drivers/acpi/acpica/psutils.c | 11 + + drivers/acpi/acpica/utalloc.c | 50 + + drivers/acpi/acpica/utcache.c | 2 +- + drivers/acpi/acpica/utdebug.c | 1 + + drivers/acpi/acpica/utresrc.c | 9 + + drivers/acpi/acpica/utxferror.c | 16 +- + drivers/acpi/battery.c | 2 +- + drivers/acpi/bus.c | 5 + + drivers/acpi/button.c | 5 +- + drivers/acpi/device_pm.c | 3 +- + drivers/acpi/pmic/intel_pmic_xpower.c | 50 +- + drivers/acpi/power.c | 10 + + drivers/acpi/sleep.c | 29 + + drivers/acpi/sleep.h | 1 + + drivers/acpi/x86/utils.c | 90 + + drivers/base/power/main.c | 5 - + drivers/base/power/wakeup.c | 54 +- + drivers/block/rbd.c | 359 ++-- + drivers/block/virtio_blk.c | 3 +- + drivers/char/virtio_console.c | 6 +- + drivers/clk/Kconfig | 8 + + drivers/clk/Makefile | 1 + + drivers/clk/at91/clk-pll.c | 6 +- + drivers/clk/bcm/clk-iproc-pll.c | 2 +- + drivers/clk/bcm/clk-ns2.c | 2 +- + drivers/clk/clk-cs2000-cp.c | 52 +- + drivers/clk/clk-hi655x.c | 126 ++ + drivers/clk/clk-nomadik.c | 12 +- + drivers/clk/clk-si5351.c | 8 +- + drivers/clk/clk-stm32f4.c | 43 +- + drivers/clk/clk-versaclock5.c | 76 +- + drivers/clk/clk.c | 47 +- + drivers/clk/hisilicon/clk-hi3620.c | 16 +- + drivers/clk/hisilicon/clk-hi6220.c | 1 + + drivers/clk/hisilicon/clk.c | 18 +- + drivers/clk/imx/clk-imx6ul.c | 11 +- + drivers/clk/imx/clk-imx7d.c | 11 +- + drivers/clk/mediatek/Kconfig | 32 + + drivers/clk/mediatek/Makefile | 5 + + drivers/clk/mediatek/clk-mt2701-eth.c | 2 + + drivers/clk/mediatek/clk-mt6797-img.c | 76 + + drivers/clk/mediatek/clk-mt6797-mm.c | 136 ++ + drivers/clk/mediatek/clk-mt6797-vdec.c | 93 + + drivers/clk/mediatek/clk-mt6797-venc.c | 78 + + drivers/clk/mediatek/clk-mt6797.c | 714 ++++++++ + drivers/clk/meson/Makefile | 2 +- + drivers/clk/meson/clk-audio-divider.c | 144 ++ + drivers/clk/meson/clk-mpll.c | 154 +- + drivers/clk/meson/clk-pll.c | 53 +- + drivers/clk/meson/clkc.h | 39 +- + drivers/clk/meson/gxbb.c | 649 ++++++- + drivers/clk/meson/gxbb.h | 11 +- + drivers/clk/meson/meson8b.c | 127 +- + drivers/clk/meson/meson8b.h | 20 +- + drivers/clk/mvebu/clk-cpu.c | 4 +- + drivers/clk/mvebu/common.c | 4 +- + drivers/clk/qcom/clk-smd-rpm.c | 2 +- + drivers/clk/qcom/mmcc-msm8996.c | 4 +- + drivers/clk/renesas/r8a7795-cpg-mssr.c | 221 ++- + drivers/clk/renesas/r8a7796-cpg-mssr.c | 18 +- + drivers/clk/renesas/rcar-gen3-cpg.c | 64 +- + drivers/clk/renesas/rcar-gen3-cpg.h | 2 +- + drivers/clk/renesas/renesas-cpg-mssr.c | 50 + + drivers/clk/renesas/renesas-cpg-mssr.h | 22 + + drivers/clk/rockchip/Makefile | 2 +- + drivers/clk/rockchip/clk-pll.c | 3 + + drivers/clk/rockchip/clk-rk3328.c | 9 + + drivers/clk/rockchip/clk-rk3368.c | 27 +- + drivers/clk/rockchip/clk-rk3399.c | 8 +- + .../clk/rockchip/{clk-rk1108.c => clk-rv1108.c} | 414 ++--- + drivers/clk/rockchip/clk.h | 28 +- + drivers/clk/spear/spear6xx_clock.c | 2 +- + drivers/clk/sunxi-ng/Kconfig | 16 +- + drivers/clk/sunxi-ng/Makefile | 1 + + drivers/clk/sunxi-ng/ccu-sun5i.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun8i-a33.c | 18 +- + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 327 +++- + drivers/clk/sunxi-ng/ccu-sun8i-h3.h | 3 +- + drivers/clk/sunxi-ng/ccu-sun8i-r.c | 213 +++ + drivers/clk/sunxi-ng/ccu-sun8i-r.h | 27 + + drivers/clk/sunxi-ng/ccu-sun9i-a80.c | 73 +- + drivers/clk/sunxi-ng/ccu_common.c | 4 +- + drivers/clk/sunxi-ng/ccu_gate.c | 47 + + drivers/clk/sunxi-ng/ccu_mult.c | 2 + + drivers/clk/sunxi-ng/ccu_mult.h | 2 + + drivers/clk/sunxi-ng/ccu_nk.c | 8 +- + drivers/clk/sunxi-ng/ccu_nkm.c | 8 +- + drivers/clk/sunxi-ng/ccu_nkmp.c | 8 +- + drivers/clk/sunxi-ng/ccu_nm.c | 4 +- + drivers/clk/tegra/clk-id.h | 17 + + drivers/clk/tegra/clk-periph-gate.c | 3 + + drivers/clk/tegra/clk-periph.c | 6 +- + drivers/clk/tegra/clk-pll.c | 174 -- + drivers/clk/tegra/clk-super.c | 87 +- + drivers/clk/tegra/clk-tegra-audio.c | 85 +- + drivers/clk/tegra/clk-tegra-periph.c | 41 +- + drivers/clk/tegra/clk-tegra-pmc.c | 6 +- + drivers/clk/tegra/clk-tegra114.c | 1 + + drivers/clk/tegra/clk-tegra124.c | 1 + + drivers/clk/tegra/clk-tegra210.c | 499 +++++- + drivers/clk/tegra/clk-tegra30.c | 1 + + drivers/clk/tegra/clk.c | 16 + + drivers/clk/tegra/clk.h | 15 +- + drivers/clk/ti/apll.c | 50 +- + drivers/clk/ti/autoidle.c | 18 +- + drivers/clk/ti/clk-3xxx.c | 55 +- + drivers/clk/ti/clk-44xx.c | 188 +- + drivers/clk/ti/clk-dra7-atl.c | 11 +- + drivers/clk/ti/clk.c | 157 +- + drivers/clk/ti/clkt_dflt.c | 61 +- + drivers/clk/ti/clkt_dpll.c | 6 +- + drivers/clk/ti/clkt_iclk.c | 29 +- + drivers/clk/ti/clock.h | 41 +- + drivers/clk/ti/clockdomain.c | 38 +- + drivers/clk/ti/composite.c | 18 +- + drivers/clk/ti/divider.c | 128 +- + drivers/clk/ti/dpll.c | 63 +- + drivers/clk/ti/dpll3xxx.c | 38 +- + drivers/clk/ti/dpll44xx.c | 14 +- + drivers/clk/ti/fixed-factor.c | 1 + + drivers/clk/ti/gate.c | 44 +- + drivers/clk/ti/interface.c | 25 +- + drivers/clk/ti/mux.c | 59 +- + drivers/clk/x86/clk-pmc-atom.c | 7 + + drivers/clk/zte/clk-zx296718.c | 32 +- + drivers/clk/zte/clk.c | 12 +- + drivers/clk/zte/clk.h | 6 +- + drivers/cpuidle/cpuidle.c | 3 +- + drivers/crypto/virtio/virtio_crypto_core.c | 3 +- + drivers/gpu/drm/i915/i915_gem.c | 2 +- + drivers/gpu/drm/i915/i915_gem_request.h | 2 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 3 +- + drivers/i2c/busses/i2c-designware-platdrv.c | 2 + + drivers/idle/intel_idle.c | 2 + + drivers/misc/mic/vop/vop_main.c | 9 +- + drivers/net/caif/caif_virtio.c | 3 +- + drivers/net/virtio_net.c | 147 +- + drivers/powercap/intel_rapl.c | 1 + + drivers/remoteproc/remoteproc_virtio.c | 10 +- + drivers/rpmsg/virtio_rpmsg_bus.c | 2 +- + drivers/s390/virtio/kvm_virtio.c | 8 +- + drivers/s390/virtio/virtio_ccw.c | 7 +- + drivers/scsi/virtio_scsi.c | 3 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 2 +- + drivers/tee/Kconfig | 18 + + drivers/tee/Makefile | 5 + + drivers/tee/optee/Kconfig | 7 + + drivers/tee/optee/Makefile | 5 + + drivers/tee/optee/call.c | 444 +++++ + drivers/tee/optee/core.c | 622 +++++++ + drivers/tee/optee/optee_msg.h | 418 +++++ + drivers/tee/optee/optee_private.h | 183 ++ + drivers/tee/optee/optee_smc.h | 450 +++++ + drivers/tee/optee/rpc.c | 396 ++++ + drivers/tee/optee/supp.c | 273 +++ + drivers/tee/tee_core.c | 893 +++++++++ + drivers/tee/tee_private.h | 129 ++ + drivers/tee/tee_shm.c | 358 ++++ + drivers/tee/tee_shm_pool.c | 156 ++ + drivers/virtio/virtio_balloon.c | 3 +- + drivers/virtio/virtio_input.c | 3 +- + drivers/virtio/virtio_mmio.c | 8 +- + drivers/virtio/virtio_pci_common.c | 17 +- + drivers/virtio/virtio_pci_common.h | 4 +- + drivers/virtio/virtio_pci_legacy.c | 4 +- + drivers/virtio/virtio_pci_modern.c | 12 +- + drivers/virtio/virtio_ring.c | 77 +- + fs/btrfs/backref.c | 41 +- + fs/btrfs/btrfs_inode.h | 7 + + fs/btrfs/compression.c | 18 +- + fs/btrfs/ctree.c | 20 +- + fs/btrfs/ctree.h | 34 +- + fs/btrfs/delayed-inode.c | 46 +- + fs/btrfs/delayed-inode.h | 6 +- + fs/btrfs/delayed-ref.c | 8 +- + fs/btrfs/delayed-ref.h | 8 +- + fs/btrfs/dev-replace.c | 9 +- + fs/btrfs/disk-io.c | 13 +- + fs/btrfs/disk-io.h | 4 +- + fs/btrfs/extent-tree.c | 35 +- + fs/btrfs/extent_io.c | 59 +- + fs/btrfs/extent_io.h | 8 +- + fs/btrfs/extent_map.c | 10 +- + fs/btrfs/extent_map.h | 3 +- + fs/btrfs/file.c | 82 +- + fs/btrfs/free-space-cache.c | 2 +- + fs/btrfs/inode.c | 289 ++- + fs/btrfs/ioctl.c | 33 +- + fs/btrfs/ordered-data.c | 20 +- + fs/btrfs/ordered-data.h | 2 +- + fs/btrfs/qgroup.c | 102 +- + fs/btrfs/qgroup.h | 51 +- + fs/btrfs/raid56.c | 38 +- + fs/btrfs/reada.c | 37 +- + fs/btrfs/root-tree.c | 3 +- + fs/btrfs/scrub.c | 331 +++- + fs/btrfs/send.c | 23 +- + fs/btrfs/super.c | 3 +- + fs/btrfs/tests/btrfs-tests.c | 1 - + fs/btrfs/transaction.c | 48 +- + fs/btrfs/transaction.h | 6 +- + fs/btrfs/tree-log.c | 2 +- + fs/btrfs/volumes.c | 854 ++++----- + fs/btrfs/volumes.h | 8 +- + fs/ceph/addr.c | 10 +- + fs/ceph/caps.c | 25 +- + fs/ceph/debugfs.c | 21 +- + fs/ceph/dir.c | 23 +- + fs/ceph/file.c | 68 +- + fs/ceph/inode.c | 17 +- + fs/ceph/mds_client.c | 75 +- + fs/ceph/mds_client.h | 15 +- + fs/ceph/mdsmap.c | 44 +- + fs/ceph/snap.c | 2 +- + fs/ceph/super.c | 7 +- + fs/ceph/super.h | 31 +- + fs/ceph/xattr.c | 3 + + fs/fuse/dev.c | 24 +- + fs/fuse/file.c | 32 +- + fs/fuse/fuse_i.h | 11 +- + fs/fuse/inode.c | 9 +- + fs/jbd2/journal.c | 2 +- + fs/lockd/clntlock.c | 1 + + fs/lockd/clntproc.c | 26 +- + fs/lockd/svc.c | 6 +- + fs/lockd/svclock.c | 18 +- + fs/locks.c | 2 +- + fs/nfs/Kconfig | 5 - + fs/nfs/Makefile | 1 - + fs/nfs/callback.c | 26 +- + fs/nfs/callback_proc.c | 47 +- + fs/nfs/callback_xdr.c | 109 +- + fs/nfs/client.c | 67 +- + fs/nfs/dir.c | 104 +- + fs/nfs/direct.c | 21 +- + fs/nfs/file.c | 30 +- + fs/nfs/filelayout/filelayout.c | 8 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 24 +- + fs/nfs/flexfilelayout/flexfilelayoutdev.c | 10 +- + fs/nfs/inode.c | 5 +- + fs/nfs/internal.h | 5 +- + fs/nfs/namespace.c | 34 +- + fs/nfs/nfs3proc.c | 54 +- + fs/nfs/nfs42proc.c | 24 +- + fs/nfs/nfs42xdr.c | 22 +- + fs/nfs/nfs4client.c | 283 +-- + fs/nfs/nfs4getroot.c | 3 - + fs/nfs/nfs4namespace.c | 7 +- + fs/nfs/nfs4proc.c | 99 +- + fs/nfs/nfs4state.c | 10 +- + fs/nfs/nfs4xdr.c | 94 +- + fs/nfs/objlayout/Kbuild | 5 - + fs/nfs/objlayout/objio_osd.c | 675 ------- + fs/nfs/objlayout/objlayout.c | 706 -------- + fs/nfs/objlayout/objlayout.h | 183 -- + fs/nfs/objlayout/pnfs_osd_xdr_cli.c | 415 ----- + fs/nfs/pagelist.c | 77 +- + fs/nfs/pnfs.c | 62 +- + fs/nfs/pnfs.h | 6 +- + fs/nfs/pnfs_nfs.c | 24 +- + fs/nfs/proc.c | 2 +- + fs/nfs/read.c | 9 +- + fs/nfs/write.c | 121 +- + fs/nfsd/nfs3xdr.c | 23 +- + fs/nfsd/nfs4proc.c | 3 +- + fs/nfsd/nfs4state.c | 25 +- + fs/nfsd/nfs4xdr.c | 19 +- + fs/nfsd/nfsxdr.c | 13 +- + fs/nfsd/vfs.c | 24 +- + fs/open.c | 3 +- + fs/overlayfs/copy_up.c | 82 + + fs/overlayfs/dir.c | 37 +- + fs/overlayfs/inode.c | 103 +- + fs/overlayfs/namei.c | 141 +- + fs/overlayfs/overlayfs.h | 41 + + fs/overlayfs/ovl_entry.h | 2 + + fs/overlayfs/super.c | 40 +- + fs/overlayfs/util.c | 19 +- + fs/signalfd.c | 2 +- + include/acpi/acconfig.h | 1 + + include/acpi/acpi_bus.h | 9 + + include/acpi/acpixf.h | 2 +- + include/acpi/actbl2.h | 10 + + include/dt-bindings/clock/hi6220-clock.h | 5 +- + include/dt-bindings/clock/mt6797-clk.h | 281 +++ + include/dt-bindings/clock/r8a7795-cpg-mssr.h | 7 + + include/dt-bindings/clock/rk3328-cru.h | 1 + + include/dt-bindings/clock/rk3368-cru.h | 19 +- + .../clock/{rk1108-cru.h => rv1108-cru.h} | 6 +- + include/dt-bindings/clock/sun8i-h3-ccu.h | 5 +- + include/dt-bindings/clock/sun8i-r-ccu.h | 59 + + include/dt-bindings/clock/tegra114-car.h | 2 +- + include/dt-bindings/clock/tegra124-car-common.h | 2 +- + include/dt-bindings/clock/tegra210-car.h | 33 +- + include/dt-bindings/clock/tegra30-car.h | 2 +- + include/dt-bindings/reset/mt2701-resets.h | 7 + + include/dt-bindings/reset/sun8i-h3-ccu.h | 5 +- + include/dt-bindings/reset/sun8i-r-ccu.h | 53 + + include/dt-bindings/reset/tegra210-car.h | 13 + + include/kvm/arm_vgic.h | 5 +- + include/linux/ceph/ceph_features.h | 4 + + include/linux/ceph/ceph_fs.h | 14 + + include/linux/ceph/cls_lock_client.h | 5 + + include/linux/ceph/libceph.h | 8 +- + include/linux/ceph/mdsmap.h | 7 +- + include/linux/ceph/osd_client.h | 7 +- + include/linux/ceph/pagelist.h | 6 +- + include/linux/clk/tegra.h | 3 + + include/linux/clk/ti.h | 55 +- + include/linux/dma-fence.h | 4 +- + include/linux/fs.h | 2 + + include/linux/irqchip/arm-gic-v3.h | 14 + + include/linux/kvm_host.h | 16 +- + include/linux/lockd/bind.h | 24 +- + include/linux/lockd/lockd.h | 2 + + include/linux/nfs_fs.h | 17 +- + include/linux/nfs_fs_sb.h | 1 + + include/linux/nfs_page.h | 5 +- + include/linux/nfs_xdr.h | 3 + + include/linux/pm_wakeup.h | 25 +- + include/linux/ptr_ring.h | 63 +- + include/linux/rcu_node_tree.h | 99 + + include/linux/rcu_segcblist.h | 90 + + include/linux/rculist.h | 3 +- + include/linux/rcupdate.h | 17 +- + include/linux/rcutiny.h | 24 +- + include/linux/rcutree.h | 5 +- + include/linux/slab.h | 6 +- + include/linux/srcu.h | 84 +- + include/linux/srcuclassic.h | 115 ++ + include/linux/srcutiny.h | 93 + + include/linux/srcutree.h | 150 ++ + include/linux/sunrpc/rpc_rdma.h | 3 + + include/linux/sunrpc/svc.h | 4 +- + include/linux/sunrpc/svc_rdma.h | 75 +- + include/linux/suspend.h | 7 +- + include/linux/tee_drv.h | 277 +++ + include/linux/types.h | 2 +- + include/linux/virtio.h | 13 + + include/linux/virtio_config.h | 25 +- + include/linux/virtio_ring.h | 3 + + include/net/sock.h | 2 +- + include/trace/events/btrfs.h | 187 +- + include/uapi/linux/btrfs.h | 10 +- + include/uapi/linux/nfsd/cld.h | 14 +- + include/uapi/linux/tee.h | 346 ++++ + init/Kconfig | 43 +- + kernel/fork.c | 4 +- + kernel/locking/lockdep.c | 86 +- + kernel/locking/rtmutex-debug.c | 9 +- + kernel/power/process.c | 2 +- + kernel/power/suspend.c | 29 +- + kernel/rcu/Makefile | 5 +- + kernel/rcu/rcu.h | 153 +- + kernel/rcu/rcu_segcblist.c | 505 ++++++ + kernel/rcu/rcu_segcblist.h | 164 ++ + kernel/rcu/rcutorture.c | 43 +- + kernel/rcu/srcu.c | 12 +- + kernel/rcu/srcutiny.c | 216 +++ + kernel/rcu/srcutree.c | 1155 ++++++++++++ + kernel/rcu/tiny.c | 20 +- + kernel/rcu/tiny_plugin.h | 13 +- + kernel/rcu/tree.c | 710 +++----- + kernel/rcu/tree.h | 163 +- + kernel/rcu/tree_exp.h | 25 +- + kernel/rcu/tree_plugin.h | 64 +- + kernel/rcu/tree_trace.c | 26 +- + kernel/rcu/update.c | 53 +- + kernel/sched/core.c | 2 +- + kernel/signal.c | 2 +- + kernel/trace/trace.c | 5 +- + mm/kasan/kasan.c | 6 +- + mm/kmemcheck.c | 2 +- + mm/mmu_notifier.c | 14 +- + mm/rmap.c | 4 +- + mm/slab.c | 6 +- + mm/slab.h | 4 +- + mm/slab_common.c | 6 +- + mm/slob.c | 6 +- + mm/slub.c | 12 +- + net/ceph/ceph_common.c | 27 +- + net/ceph/cls_lock_client.c | 51 + + net/ceph/debugfs.c | 7 +- + net/ceph/osd_client.c | 139 +- + net/ceph/pagelist.c | 2 +- + net/ceph/snapshot.c | 6 +- + net/dccp/ipv4.c | 2 +- + net/dccp/ipv6.c | 2 +- + net/ipv4/tcp_ipv4.c | 2 +- + net/ipv6/tcp_ipv6.c | 2 +- + net/llc/af_llc.c | 2 +- + net/llc/llc_conn.c | 4 +- + net/llc/llc_sap.c | 2 +- + net/netfilter/nf_conntrack_core.c | 8 +- + net/smc/af_smc.c | 2 +- + net/sunrpc/Kconfig | 1 + + net/sunrpc/clnt.c | 8 - + net/sunrpc/sched.c | 5 - + net/sunrpc/svc.c | 134 +- + net/sunrpc/xdr.c | 2 +- + net/sunrpc/xprt.c | 1 + + net/sunrpc/xprtrdma/Makefile | 2 +- + net/sunrpc/xprtrdma/rpc_rdma.c | 12 +- + net/sunrpc/xprtrdma/svc_rdma.c | 8 +- + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 71 +- + net/sunrpc/xprtrdma/svc_rdma_marshal.c | 89 - + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 79 +- + net/sunrpc/xprtrdma/svc_rdma_rw.c | 512 ++++++ + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 978 +++++----- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 110 +- + net/sunrpc/xprtrdma/transport.c | 57 +- + net/sunrpc/xprtrdma/verbs.c | 323 ++-- + net/sunrpc/xprtrdma/xprt_rdma.h | 22 +- + net/vmw_vsock/virtio_transport.c | 6 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 2 +- + tools/virtio/linux/virtio.h | 1 + + tools/virtio/ringtest/main.c | 15 +- + tools/virtio/ringtest/main.h | 2 + + tools/virtio/ringtest/ptr_ring.c | 3 + + tools/virtio/virtio_test.c | 4 +- + tools/virtio/vringh_test.c | 7 +- + {arch/arm/kvm => virt/kvm/arm}/arm.c | 2 +- + {arch/arm/kvm => virt/kvm/arm}/mmio.c | 0 + {arch/arm/kvm => virt/kvm/arm}/mmu.c | 0 + {arch/arm/kvm => virt/kvm/arm}/perf.c | 0 + {arch/arm/kvm => virt/kvm/arm}/psci.c | 0 + virt/kvm/arm/trace.h | 246 ++- + virt/kvm/arm/vgic/trace.h | 37 + + virt/kvm/arm/vgic/vgic-init.c | 25 +- + virt/kvm/arm/vgic/vgic-its.c | 1234 +++++++++++-- + virt/kvm/arm/vgic/vgic-kvm-device.c | 53 +- + virt/kvm/arm/vgic/vgic-mmio-v3.c | 147 +- + virt/kvm/arm/vgic/vgic-mmio.c | 11 +- + virt/kvm/arm/vgic/vgic-mmio.h | 14 +- + virt/kvm/arm/vgic/vgic-v3.c | 128 +- + virt/kvm/arm/vgic/vgic.c | 2 +- + virt/kvm/arm/vgic/vgic.h | 33 +- + virt/kvm/kvm_main.c | 8 +- + 562 files changed, 26637 insertions(+), 8813 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/firmware/linaro,optee-tz.txt + rename Documentation/devicetree/bindings/clock/{rockchip,rk1108-cru.txt => rockchip,rv1108-cru.txt} (83%) + create mode 100644 Documentation/tee.txt + create mode 100644 arch/powerpc/kvm/book3s_hv_rm_xive.c + create mode 100644 arch/powerpc/kvm/book3s_xive.c + create mode 100644 arch/powerpc/kvm/book3s_xive.h + create mode 100644 arch/powerpc/kvm/book3s_xive_template.c + create mode 100644 drivers/acpi/acpica/acconvert.h + create mode 100644 drivers/acpi/x86/utils.c + create mode 100644 drivers/clk/clk-hi655x.c + create mode 100644 drivers/clk/mediatek/clk-mt6797-img.c + create mode 100644 drivers/clk/mediatek/clk-mt6797-mm.c + create mode 100644 drivers/clk/mediatek/clk-mt6797-vdec.c + create mode 100644 drivers/clk/mediatek/clk-mt6797-venc.c + create mode 100644 drivers/clk/mediatek/clk-mt6797.c + create mode 100644 drivers/clk/meson/clk-audio-divider.c + rename drivers/clk/rockchip/{clk-rk1108.c => clk-rv1108.c} (57%) + create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-r.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-r.h + create mode 100644 drivers/tee/Kconfig + create mode 100644 drivers/tee/Makefile + create mode 100644 drivers/tee/optee/Kconfig + create mode 100644 drivers/tee/optee/Makefile + create mode 100644 drivers/tee/optee/call.c + create mode 100644 drivers/tee/optee/core.c + create mode 100644 drivers/tee/optee/optee_msg.h + create mode 100644 drivers/tee/optee/optee_private.h + create mode 100644 drivers/tee/optee/optee_smc.h + create mode 100644 drivers/tee/optee/rpc.c + create mode 100644 drivers/tee/optee/supp.c + create mode 100644 drivers/tee/tee_core.c + create mode 100644 drivers/tee/tee_private.h + create mode 100644 drivers/tee/tee_shm.c + create mode 100644 drivers/tee/tee_shm_pool.c + delete mode 100644 fs/nfs/objlayout/Kbuild + delete mode 100644 fs/nfs/objlayout/objio_osd.c + delete mode 100644 fs/nfs/objlayout/objlayout.c + delete mode 100644 fs/nfs/objlayout/objlayout.h + delete mode 100644 fs/nfs/objlayout/pnfs_osd_xdr_cli.c + create mode 100644 include/dt-bindings/clock/mt6797-clk.h + rename include/dt-bindings/clock/{rk1108-cru.h => rv1108-cru.h} (97%) + create mode 100644 include/dt-bindings/clock/sun8i-r-ccu.h + create mode 100644 include/dt-bindings/reset/sun8i-r-ccu.h + create mode 100644 include/dt-bindings/reset/tegra210-car.h + create mode 100644 include/linux/rcu_node_tree.h + create mode 100644 include/linux/rcu_segcblist.h + create mode 100644 include/linux/srcuclassic.h + create mode 100644 include/linux/srcutiny.h + create mode 100644 include/linux/srcutree.h + create mode 100644 include/linux/tee_drv.h + create mode 100644 include/uapi/linux/tee.h + create mode 100644 kernel/rcu/rcu_segcblist.c + create mode 100644 kernel/rcu/rcu_segcblist.h + create mode 100644 kernel/rcu/srcutiny.c + create mode 100644 kernel/rcu/srcutree.c + create mode 100644 net/sunrpc/xprtrdma/svc_rdma_rw.c + rename {arch/arm/kvm => virt/kvm/arm}/arm.c (99%) + rename {arch/arm/kvm => virt/kvm/arm}/mmio.c (100%) + rename {arch/arm/kvm => virt/kvm/arm}/mmu.c (100%) + rename {arch/arm/kvm => virt/kvm/arm}/perf.c (100%) + rename {arch/arm/kvm => virt/kvm/arm}/psci.c (100%) + create mode 100644 virt/kvm/arm/vgic/trace.h +Merging fixes/master (97da3854c526 Linux 4.11-rc3) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/fixes (9be3213b14d4 gconfig: remove misleading parentheses around a condition) +$ git merge kbuild-current/fixes +Already up-to-date. +Merging arc-current/for-curr (cf4100d1cddc Revert "ARCv2: Allow enabling PAE40 w/o HIGHMEM") +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (6d8059493691 ARM: 8670/1: V7M: Do not corrupt vector table around v7m_invalidate_l1 call) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (f6ab4d59a5fe nubus: Add MVC and VSC video card definitions) +$ 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 (be5c5e843c4a powerpc/64: Fix HMI exception on LE with CONFIG_RELOCATABLE=y) +$ git merge powerpc-fixes/fixes +Already up-to-date. +Merging sparc/master (3c7f62212018 sparc64: fix fault handling in NGbzero.S and GENbzero.S) +$ git merge sparc/master +Already up-to-date. +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 (56868a460b83 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide) +$ git merge net/master +Already up-to-date. +Merging ipsec/master (2c1497bbc8fd xfrm: Fix NETDEV_DOWN with IPSec offload) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + include/net/xfrm.h | 10 ---------- + net/ipv4/esp4.c | 5 ++++- + net/key/af_key.c | 2 +- + net/xfrm/xfrm_device.c | 2 +- + net/xfrm/xfrm_policy.c | 47 ----------------------------------------------- + 5 files changed, 6 insertions(+), 60 deletions(-) +Merging netfilter/master (f411af682218 Merge branch 'ibmvnic-Updated-reset-handler-andcode-fixes') +$ git merge netfilter/master +Already up-to-date. +Merging ipvs/master (3c5ab3f395d6 ipvs: SNAT packet replies only for NATed connections) +$ git merge ipvs/master +Merge made by the 'recursive' strategy. + net/netfilter/ipvs/ip_vs_core.c | 19 ++++++++++++++----- + 1 file changed, 14 insertions(+), 5 deletions(-) +Merging wireless-drivers/master (d77facb88448 brcmfmac: use local iftype avoiding use-after-free of virtual interface) +$ git merge wireless-drivers/master +Already up-to-date. +Merging mac80211/master (29cee56c0be4 Merge tag 'mac80211-for-davem-2017-05-08' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211) +$ git merge mac80211/master +Already up-to-date. +Merging sound-current/for-linus (960013762df0 ALSA: hda: Fix cpu lockup when stopping the cmd dmas) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/hda/hdac_controller.c | 4 ++++ + sound/pci/hda/patch_conexant.c | 4 +++- + 2 files changed, 7 insertions(+), 1 deletion(-) +Merging pci-current/for-linus (b9c1153f7a9c PCI: hisi: Fix DT binding (hisi-pcie-almost-ecam)) +$ git merge pci-current/for-linus +Already up-to-date. +Merging driver-core.current/driver-core-linus (af82455f7dbd Merge tag 'char-misc-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (4f7d029b9bf0 Linux 4.11-rc7) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (a71c9a1c779f Linux 4.11-rc5) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (a351e9b9fc24 Linux 4.11) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (c02ed2e75ef4 Linux 4.11-rc4) +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Merge made by the 'recursive' strategy. +Merging phy/fixes (1a09b6a7c10e phy: qcom-usb-hs: Add depends on EXTCON) +$ git merge phy/fixes +Already up-to-date. +Merging staging.current/staging-linus (56868a460b83 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (af82455f7dbd Merge tag 'char-misc-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (8be193c7b1f4 Input: add support for PlayStation 1/2 joypads connected via SPI) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/joystick/Kconfig | 21 ++ + drivers/input/joystick/Makefile | 1 + + drivers/input/joystick/psxpad-spi.c | 401 ++++++++++++++++++++++++++++++++++++ + drivers/input/joystick/xpad.c | 27 ++- + 4 files changed, 444 insertions(+), 6 deletions(-) + create mode 100644 drivers/input/joystick/psxpad-spi.c +Merging crypto-current/master (929562b14478 crypto: stm32 - Fix OF module alias information) +$ 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 (c1ae3cfa0e89 Linux 4.11-rc1) +$ git merge kselftest-fixes/fixes +Already up-to-date. +Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) +$ git merge backlight-fixes/for-backlight-fixes +Already up-to-date. +Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct) +$ git merge ftrace-fixes/for-next-urgent +Already up-to-date. +Merging mfd-fixes/for-mfd-fixes (b2376407f989 mfd: cros-ec: Fix host command buffer size) +$ git merge mfd-fixes/for-mfd-fixes +Already up-to-date. +Merging v4l-dvb-fixes/fixes (24a47426066c [media] exynos-gsc: Do not swap cb/cr for semi planar formats) +$ git merge v4l-dvb-fixes/fixes +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (a351e9b9fc24 Linux 4.11) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up-to-date. +Merging drm-misc-fixes/for-linux-next-fixes (0c45b36f8acc drm/udl: Fix unaligned memory access in udl_render_hline) +$ git merge drm-misc-fixes/for-linux-next-fixes +Already up-to-date. +Merging kbuild/for-next (6515cec57e92 Merge branches 'kbuild' and 'misc' into for-next) +$ git merge kbuild/for-next +Removing include/video/Kbuild +Removing include/uapi/xen/Kbuild +Removing include/uapi/video/Kbuild +Removing include/uapi/sound/Kbuild +Removing include/uapi/scsi/fc/Kbuild +Removing include/uapi/scsi/Kbuild +Removing include/uapi/rdma/hfi/Kbuild +Removing include/uapi/rdma/Kbuild +Removing include/uapi/mtd/Kbuild +Removing include/uapi/misc/Kbuild +Removing include/uapi/linux/wimax/Kbuild +Removing include/uapi/linux/usb/Kbuild +Removing include/uapi/linux/tc_ematch/Kbuild +Removing include/uapi/linux/tc_act/Kbuild +Removing include/uapi/linux/sunrpc/Kbuild +Removing include/uapi/linux/spi/Kbuild +Removing include/uapi/linux/raid/Kbuild +Removing include/uapi/linux/nfsd/Kbuild +Removing include/uapi/linux/netfilter_ipv6/Kbuild +Removing include/uapi/linux/netfilter_ipv4/Kbuild +Removing include/uapi/linux/netfilter_bridge/Kbuild +Removing include/uapi/linux/netfilter_arp/Kbuild +Removing include/uapi/linux/netfilter/ipset/Kbuild +Removing include/uapi/linux/netfilter/Kbuild +Removing include/uapi/linux/mmc/Kbuild +Removing include/uapi/linux/isdn/Kbuild +Removing include/uapi/linux/iio/Kbuild +Removing include/uapi/linux/hsi/Kbuild +Removing include/uapi/linux/hdlc/Kbuild +Removing include/uapi/linux/dvb/Kbuild +Removing include/uapi/linux/can/Kbuild +Removing include/uapi/linux/caif/Kbuild +Removing include/uapi/linux/byteorder/Kbuild +Removing include/uapi/linux/android/Kbuild +Removing include/uapi/drm/Kbuild +Removing include/uapi/asm-generic/Kbuild +Removing include/uapi/Kbuild +Removing include/scsi/fc/Kbuild +Removing include/asm-generic/Kbuild.asm +Removing include/Kbuild +Removing arch/tile/include/uapi/arch/Kbuild +Removing arch/tile/include/arch/Kbuild +Auto-merging arch/h8300/include/uapi/asm/bitsperlong.h +Removing arch/cris/include/uapi/arch-v32/arch/Kbuild +Removing arch/cris/include/uapi/arch-v10/arch/Kbuild +Removing arch/cris/include/arch-v32/arch/Kbuild +Removing arch/cris/include/arch-v10/arch/Kbuild +Merge made by the 'recursive' strategy. + .gitignore | 1 + + Documentation/kbuild/makefiles.txt | 74 ++-- + Kbuild | 25 -- + Makefile | 47 ++- + arch/alpha/include/uapi/asm/Kbuild | 41 -- + arch/alpha/lib/Makefile | 11 +- + arch/arc/Makefile | 4 +- + arch/arc/include/uapi/asm/Kbuild | 3 - + arch/arm/Makefile | 8 +- + arch/arm/include/uapi/asm/Kbuild | 17 - + arch/arm64/Makefile | 6 +- + arch/arm64/include/uapi/asm/Kbuild | 18 - + arch/blackfin/include/uapi/asm/Kbuild | 17 - + arch/c6x/include/uapi/asm/Kbuild | 8 - + arch/cris/include/arch-v10/arch/Kbuild | 1 - + arch/cris/include/arch-v32/arch/Kbuild | 1 - + arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - + arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - + arch/cris/include/uapi/asm/Kbuild | 42 -- + arch/frv/include/uapi/asm/Kbuild | 33 -- + arch/frv/kernel/asm-offsets.c | 19 +- + arch/h8300/include/uapi/asm/Kbuild | 28 -- + arch/h8300/include/{ => uapi}/asm/bitsperlong.h | 6 +- + arch/hexagon/include/asm/Kbuild | 3 - + arch/hexagon/include/uapi/asm/Kbuild | 13 - + arch/ia64/include/uapi/asm/Kbuild | 45 --- + arch/ia64/kernel/Makefile | 26 +- + arch/ia64/kernel/Makefile.gate | 2 +- + arch/m32r/include/uapi/asm/Kbuild | 31 -- + arch/m68k/include/uapi/asm/Kbuild | 24 -- + arch/metag/include/uapi/asm/Kbuild | 8 - + arch/microblaze/include/uapi/asm/Kbuild | 32 -- + arch/mips/include/uapi/asm/Kbuild | 37 -- + arch/mn10300/include/uapi/asm/Kbuild | 32 -- + arch/nios2/include/uapi/asm/Kbuild | 4 +- + arch/openrisc/include/asm/Kbuild | 3 - + arch/openrisc/include/uapi/asm/Kbuild | 8 - + arch/parisc/include/uapi/asm/Kbuild | 28 -- + arch/powerpc/include/uapi/asm/Kbuild | 45 --- + arch/s390/include/uapi/asm/Kbuild | 46 --- + arch/score/include/asm/Kbuild | 3 - + arch/score/include/uapi/asm/Kbuild | 32 -- + arch/sh/Makefile | 7 +- + arch/sh/include/uapi/asm/Kbuild | 23 -- + arch/sparc/include/uapi/asm/Kbuild | 48 --- + arch/tile/include/arch/Kbuild | 1 - + arch/tile/include/asm/Kbuild | 3 - + arch/tile/include/uapi/arch/Kbuild | 17 - + arch/tile/include/uapi/asm/Kbuild | 17 - + arch/unicore32/Makefile | 4 +- + arch/unicore32/include/uapi/asm/Kbuild | 6 - + arch/x86/include/uapi/asm/Kbuild | 59 --- + arch/xtensa/include/uapi/asm/Kbuild | 23 -- + include/Kbuild | 2 - + include/asm-generic/Kbuild.asm | 1 - + include/linux/kbuild.h | 6 +- + include/rdma/ib_verbs.h | 3 +- + include/scsi/fc/Kbuild | 0 + include/uapi/Kbuild | 15 - + include/uapi/asm-generic/Kbuild | 36 -- + include/uapi/asm-generic/Kbuild.asm | 76 ++-- + include/uapi/drm/Kbuild | 23 -- + include/uapi/linux/Kbuild | 494 +----------------------- + include/uapi/linux/android/Kbuild | 2 - + include/uapi/linux/bcache.h | 2 +- + include/uapi/linux/btrfs_tree.h | 3 + + include/uapi/linux/byteorder/Kbuild | 3 - + include/uapi/linux/caif/Kbuild | 3 - + include/uapi/linux/can/Kbuild | 6 - + include/uapi/linux/cryptouser.h | 2 + + include/uapi/linux/dvb/Kbuild | 9 - + include/uapi/linux/hdlc/Kbuild | 2 - + include/uapi/linux/hsi/Kbuild | 2 - + include/uapi/linux/iio/Kbuild | 3 - + include/uapi/linux/isdn/Kbuild | 2 - + include/uapi/linux/mmc/Kbuild | 2 - + include/uapi/linux/netfilter/Kbuild | 89 ----- + include/uapi/linux/netfilter/ipset/Kbuild | 5 - + include/uapi/linux/netfilter_arp/Kbuild | 3 - + include/uapi/linux/netfilter_bridge/Kbuild | 18 - + include/uapi/linux/netfilter_ipv4/Kbuild | 10 - + include/uapi/linux/netfilter_ipv6/Kbuild | 13 - + include/uapi/linux/nfsd/Kbuild | 6 - + include/uapi/linux/pr.h | 2 + + include/uapi/linux/qrtr.h | 1 + + include/uapi/linux/raid/Kbuild | 3 - + include/uapi/linux/smc_diag.h | 2 +- + include/uapi/linux/spi/Kbuild | 2 - + include/uapi/linux/sunrpc/Kbuild | 2 - + include/uapi/linux/tc_act/Kbuild | 16 - + include/uapi/linux/tc_ematch/Kbuild | 5 - + include/uapi/linux/usb/Kbuild | 12 - + include/uapi/linux/wimax/Kbuild | 2 - + include/uapi/misc/Kbuild | 2 - + include/uapi/mtd/Kbuild | 6 - + include/uapi/rdma/Kbuild | 20 - + include/uapi/rdma/bnxt_re-abi.h | 2 + + include/uapi/rdma/hfi/Kbuild | 3 - + include/uapi/rdma/ib_user_verbs.h | 2 + + include/uapi/scsi/Kbuild | 6 - + include/uapi/scsi/fc/Kbuild | 5 - + include/uapi/sound/Kbuild | 16 - + include/uapi/video/Kbuild | 4 - + include/uapi/xen/Kbuild | 5 - + include/video/Kbuild | 0 + scripts/Kbuild.include | 6 +- + scripts/Makefile.build | 12 +- + scripts/Makefile.dtbinst | 8 - + scripts/Makefile.extrawarn | 1 - + scripts/Makefile.headersinst | 68 ++-- + scripts/Makefile.lib | 31 ++ + scripts/genksyms/parse.tab.c_shipped | 474 +++++++++++------------ + scripts/genksyms/parse.y | 2 - + scripts/mod/Makefile | 28 +- + scripts/objdiff | 5 +- + scripts/package/builddeb | 16 +- + 116 files changed, 465 insertions(+), 2193 deletions(-) + delete mode 100644 arch/cris/include/arch-v10/arch/Kbuild + delete mode 100644 arch/cris/include/arch-v32/arch/Kbuild + delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild + delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild + rename arch/h8300/include/{ => uapi}/asm/bitsperlong.h (67%) + delete mode 100644 arch/tile/include/arch/Kbuild + delete mode 100644 arch/tile/include/uapi/arch/Kbuild + delete mode 100644 include/Kbuild + delete mode 100644 include/asm-generic/Kbuild.asm + delete mode 100644 include/scsi/fc/Kbuild + delete mode 100644 include/uapi/Kbuild + delete mode 100644 include/uapi/asm-generic/Kbuild + delete mode 100644 include/uapi/drm/Kbuild + delete mode 100644 include/uapi/linux/android/Kbuild + delete mode 100644 include/uapi/linux/byteorder/Kbuild + delete mode 100644 include/uapi/linux/caif/Kbuild + delete mode 100644 include/uapi/linux/can/Kbuild + delete mode 100644 include/uapi/linux/dvb/Kbuild + delete mode 100644 include/uapi/linux/hdlc/Kbuild + delete mode 100644 include/uapi/linux/hsi/Kbuild + delete mode 100644 include/uapi/linux/iio/Kbuild + delete mode 100644 include/uapi/linux/isdn/Kbuild + delete mode 100644 include/uapi/linux/mmc/Kbuild + delete mode 100644 include/uapi/linux/netfilter/Kbuild + delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild + delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild + delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild + delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild + delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild + delete mode 100644 include/uapi/linux/nfsd/Kbuild + delete mode 100644 include/uapi/linux/raid/Kbuild + delete mode 100644 include/uapi/linux/spi/Kbuild + delete mode 100644 include/uapi/linux/sunrpc/Kbuild + delete mode 100644 include/uapi/linux/tc_act/Kbuild + delete mode 100644 include/uapi/linux/tc_ematch/Kbuild + delete mode 100644 include/uapi/linux/usb/Kbuild + delete mode 100644 include/uapi/linux/wimax/Kbuild + delete mode 100644 include/uapi/misc/Kbuild + delete mode 100644 include/uapi/mtd/Kbuild + delete mode 100644 include/uapi/rdma/Kbuild + delete mode 100644 include/uapi/rdma/hfi/Kbuild + delete mode 100644 include/uapi/scsi/Kbuild + delete mode 100644 include/uapi/scsi/fc/Kbuild + delete mode 100644 include/uapi/sound/Kbuild + delete mode 100644 include/uapi/video/Kbuild + delete mode 100644 include/uapi/xen/Kbuild + delete mode 100644 include/video/Kbuild +Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo) +$ git merge asm-generic/master +Resolved 'include/asm-generic/percpu.h' using previous resolution. +Auto-merging include/asm-generic/percpu.h +CONFLICT (content): Merge conflict in include/asm-generic/percpu.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 90d82e651a0d] Merge remote-tracking branch 'asm-generic/master' +$ git diff -M --stat --summary HEAD^.. + include/asm-generic/page.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging arc/for-next (d5adbfcd5f7b Linux 4.10-rc7) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (c92a90a5060a Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Already up-to-date. +Merging arm-perf/for-next/perf (f00fa5f4163b arm64: pmuv3: use arm_pmu ACPI framework) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (e3ec06d4bc1e arm-soc: document merges) +$ git merge arm-soc/for-next +Recorded preimage for 'drivers/tee/tee_shm.c' +Auto-merging drivers/tee/tee_shm.c +CONFLICT (content): Merge conflict in drivers/tee/tee_shm.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/tee/tee_shm.c'. +[master 7f20e5195e31] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/arm-soc-for-next-contents.txt | 15 ++++++ + arch/arm/boot/dts/mt7623.dtsi | 2 + + arch/arm/mach-omap2/common.h | 3 +- + arch/arm/mach-omap2/omap-mpuss-lowpower.c | 10 ++-- + arch/arm/mach-omap2/omap-smp.c | 11 ++-- + arch/arm64/Kconfig.platforms | 5 ++ + arch/arm64/boot/dts/marvell/armada-3720-db.dts | 8 +++ + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 73 ++++++++++++++++++++++++-- + arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 3 ++ + include/linux/soc/renesas/rcar-rst.h | 5 ++ + 10 files changed, 122 insertions(+), 13 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +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 (715dcd206041 Merge branch 'v4.12/drivers' 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 (ce60fdaa7e9e Merge remote-tracking branch 'alex_korg/at91-dt' into at91-next) +$ git merge at91/at91-next +Merge made by the 'recursive' strategy. +Merging bcm2835/for-next (7ea6e490ba7f Merge branch anholt/bcm2835-defconfig-64-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 (990df0480610 Merge branch 'zte/dt64' into for-next) +$ git merge imx-mxs/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging keystone/next (4495c08e8472 Linux 4.11-rc2) +$ git merge keystone/next +Already up-to-date. +Merging mvebu/for-next (4cfb1f480e35 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (5a0bbcf7ab0f Merge branch 'omap-for-v4.12/defconfig' into for-next) +$ git merge omap/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence) +$ git merge omap-pending/for-next +Already up-to-date. +Merging qcom/for-next (9f514b0f9cf3 Merge branch 'drivers-for-4.12' into all-for-4.12) +$ git merge qcom/for-next +Merge made by the 'recursive' strategy. +Merging renesas/next (c8906b237adf Merge branch 'fixes-for-v4.12' into next) +$ git merge renesas/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging rockchip/for-next (b1e842489772 Merge branch 'v4.12-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) +$ git merge rpi/for-rpi-next +Already up-to-date. +Merging samsung/for-next (1001354ca341 Linux 4.9-rc1) +$ git merge samsung/for-next +Already up-to-date. +Merging samsung-krzk/for-next (725bbcc7945c Merge branch 'fixes' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 - + 1 file changed, 1 deletion(-) +Merging sunxi/sunxi/for-next (5675caea945d Merge branches 'sunxi/clk-for-4.12', 'sunxi/dt-for-4.12' and 'sunxi/fixes-for-4.11' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Merge made by the 'recursive' strategy. +Merging tegra/for-next (29d04525797f Merge branch for-4.12/clk into for-next) +$ git merge tegra/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (d135b8b5060e arm64: uaccess: suppress spurious clang warning) +$ git merge arm64/for-next/core +Auto-merging arch/arm64/include/asm/uaccess.h +Merge made by the 'recursive' strategy. + Documentation/arm64/tagged-pointers.txt | 62 +++++++++++++++++++++++++-------- + arch/arm64/include/asm/asm-uaccess.h | 9 +++++ + arch/arm64/include/asm/atomic_lse.h | 4 +-- + arch/arm64/include/asm/barrier.h | 20 ++++++++--- + arch/arm64/include/asm/cmpxchg.h | 2 +- + arch/arm64/include/asm/uaccess.h | 13 +++---- + arch/arm64/kernel/armv8_deprecated.c | 3 +- + arch/arm64/kernel/entry.S | 5 +-- + arch/arm64/kernel/hw_breakpoint.c | 3 ++ + arch/arm64/kernel/traps.c | 4 +-- + 10 files changed, 91 insertions(+), 34 deletions(-) +Merging clk/clk-next (0119dc6132d2 clk: x86: pmc-atom: Checking for IS_ERR() instead of NULL) +$ git merge clk/clk-next +Already up-to-date. +Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE)) +$ git merge cris/for-next +Already up-to-date. +Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h) +$ git merge h8300/h8300-next +Merge made by the 'recursive' strategy. +Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error") +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (f6ab4d59a5fe nubus: Add MVC and VSC video card definitions) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (99a2c395541f m68k/coldfire/pit: set ->min_delta_ticks and ->max_delta_ticks) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. +Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment) +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (3400606d8ffd microblaze: Add new fpga families) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (b153c82756e9 Merge branch '4.11-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Resolved 'arch/mips/Kconfig' using previous resolution. +Auto-merging drivers/irqchip/Kconfig +Auto-merging arch/mips/mm/init.c +Auto-merging arch/mips/kernel/perf_event_mipsxx.c +Auto-merging arch/mips/kernel/mips-r2-to-r6-emul.c +Auto-merging arch/mips/kernel/cpu-probe.c +Removing arch/mips/include/asm/octeon/cvmx-l2d-defs.h +Auto-merging arch/mips/include/asm/cpu-info.h +Auto-merging arch/mips/Kconfig +CONFLICT (content): Merge conflict in arch/mips/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d31e24b6bd01] Merge remote-tracking branch 'mips/mips-for-linux-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 2 +- + arch/mips/Kbuild | 2 + + arch/mips/Kconfig | 24 +- + arch/mips/Kconfig.debug | 2 +- + arch/mips/cavium-octeon/Kconfig | 9 - + arch/mips/cavium-octeon/Platform | 4 - + arch/mips/cavium-octeon/executive/cvmx-l2c.c | 139 +- + arch/mips/cavium-octeon/executive/octeon-model.c | 21 +- + arch/mips/cavium-octeon/octeon-platform.c | 113 +- + arch/mips/cavium-octeon/setup.c | 12 +- + arch/mips/configs/generic_defconfig | 3 + + arch/mips/include/asm/cache.h | 5 - + arch/mips/include/asm/cpu-info.h | 3 +- + arch/mips/include/asm/cpufeature.h | 26 + + arch/mips/include/asm/highmem.h | 5 + + .../include/asm/mach-rm/cpu-feature-overrides.h | 2 - + arch/mips/include/asm/octeon/cvmx-l2c-defs.h | 3193 +----------------- + arch/mips/include/asm/octeon/cvmx-l2c.h | 59 +- + arch/mips/include/asm/octeon/cvmx-l2d-defs.h | 526 --- + arch/mips/include/asm/octeon/cvmx-l2t-defs.h | 286 +- + arch/mips/include/asm/octeon/cvmx-pciercx-defs.h | 3225 ++---------------- + arch/mips/include/asm/octeon/cvmx-sli-defs.h | 3541 +------------------- + arch/mips/include/asm/octeon/cvmx.h | 3 +- + arch/mips/include/asm/pgalloc.h | 26 + + arch/mips/include/asm/pgtable-32.h | 7 +- + arch/mips/include/asm/pgtable-64.h | 88 +- + arch/mips/include/asm/uasm.h | 88 +- + arch/mips/kernel/cpu-probe.c | 7 + + arch/mips/kernel/mips-r2-to-r6-emul.c | 16 +- + arch/mips/kernel/perf_event_mipsxx.c | 6 +- + arch/mips/kernel/process.c | 6 +- + arch/mips/kernel/r4k_switch.S | 6 - + arch/mips/kernel/smp-cps.c | 7 +- + arch/mips/kernel/smp-mt.c | 49 +- + arch/mips/kernel/smp.c | 20 +- + arch/mips/lantiq/irq.c | 52 - + arch/mips/math-emu/cp1emu.c | 10 +- + arch/mips/mm/fault.c | 16 +- + arch/mips/mm/init.c | 3 + + arch/mips/mm/pgtable-32.c | 6 +- + arch/mips/mm/pgtable-64.c | 33 +- + arch/mips/mm/tlbex.c | 22 + + arch/mips/mm/uasm-mips.c | 1 + + arch/mips/mm/uasm.c | 159 +- + arch/mips/mti-malta/malta-int.c | 83 +- + arch/mips/net/bpf_jit.c | 41 +- + arch/mips/net/bpf_jit_asm.S | 23 +- + arch/mips/pci/pcie-octeon.c | 4 +- + arch/mips/sibyte/bcm1480/setup.c | 1 + + arch/mips/sibyte/sb1250/setup.c | 1 + + drivers/cpufreq/loongson2_cpufreq.c | 7 - + drivers/irqchip/Kconfig | 2 + + drivers/irqchip/irq-mips-cpu.c | 146 +- + drivers/net/ethernet/broadcom/sb1250-mac.c | 1 + + 54 files changed, 1228 insertions(+), 10914 deletions(-) + create mode 100644 arch/mips/include/asm/cpufeature.h + delete mode 100644 arch/mips/include/asm/octeon/cvmx-l2d-defs.h +Merging nios2/for-next (ac75934606cd nios2: Add CDX support) +$ git merge nios2/for-next +Removing arch/nios2/include/asm/cmpxchg.h +Auto-merging arch/nios2/include/asm/Kbuild +Merge made by the 'recursive' strategy. + arch/nios2/Kconfig.debug | 1 - + arch/nios2/Makefile | 5 +++++ + arch/nios2/boot/.gitignore | 2 ++ + arch/nios2/boot/dts/10m50_devboard.dts | 3 ++- + arch/nios2/include/asm/Kbuild | 1 + + arch/nios2/include/asm/cacheflush.h | 6 ++++-- + arch/nios2/include/asm/cmpxchg.h | 14 -------------- + arch/nios2/include/asm/cpuinfo.h | 2 ++ + arch/nios2/kernel/.gitignore | 1 + + arch/nios2/kernel/cpuinfo.c | 18 ++++++++++++++++-- + arch/nios2/kernel/early_printk.c | 7 +++++-- + arch/nios2/kernel/irq.c | 2 +- + arch/nios2/kernel/setup.c | 2 ++ + arch/nios2/platform/Kconfig.platform | 26 ++++++++++++++++++++++++++ + 14 files changed, 67 insertions(+), 23 deletions(-) + create mode 100644 arch/nios2/boot/.gitignore + delete mode 100644 arch/nios2/include/asm/cmpxchg.h + create mode 100644 arch/nios2/kernel/.gitignore +Merging openrisc/for-next (a4d442663580 openrisc: head: Init r0 to 0 on start) +$ git merge openrisc/for-next +Already up-to-date. +Merging parisc-hd/for-next (c8c3735997a3 parisc: Enhance detection of synchronous cr16 clocksources) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/include/asm/processor.h | 2 ++ + arch/parisc/include/asm/uaccess.h | 11 ----------- + arch/parisc/kernel/asm-offsets.c | 5 ----- + arch/parisc/kernel/processor.c | 5 ++++- + arch/parisc/kernel/time.c | 24 ++++++++++++++++++++---- + arch/parisc/lib/lusercopy.S | 25 +++++++++---------------- + arch/parisc/mm/fault.c | 9 --------- + 7 files changed, 35 insertions(+), 46 deletions(-) +Merging powerpc/next (5a61ef74f269 powerpc/64s: Support new device tree binding for discovering CPU features) +$ git merge powerpc/next +Auto-merging drivers/soc/fsl/qbman/qman.c +Auto-merging drivers/of/fdt.c +Auto-merging arch/powerpc/kernel/setup_64.c +Auto-merging arch/powerpc/kernel/setup-common.c +Auto-merging arch/powerpc/kernel/exceptions-64s.S +Auto-merging arch/powerpc/Kconfig +Merge made by the 'recursive' strategy. + .../bindings/powerpc/ibm,powerpc-cpu-features.txt | 248 +++++ + .../devicetree/bindings/soc/fsl/cpm_qe/gpio.txt | 21 +- + arch/powerpc/Kconfig | 16 + + arch/powerpc/Makefile.postlink | 2 +- + arch/powerpc/include/asm/book3s/64/hash-64k.h | 6 +- + arch/powerpc/include/asm/cpm1.h | 2 + + arch/powerpc/include/asm/cpu_has_feature.h | 6 +- + arch/powerpc/include/asm/cputable.h | 2 + + arch/powerpc/include/asm/dt_cpu_ftrs.h | 26 + + arch/powerpc/include/asm/processor.h | 5 + + arch/powerpc/include/asm/reg.h | 1 + + arch/powerpc/include/uapi/asm/cputable.h | 7 + + arch/powerpc/kernel/Makefile | 1 + + arch/powerpc/kernel/cputable.c | 37 +- + arch/powerpc/kernel/dt_cpu_ftrs.c | 1031 ++++++++++++++++++++ + arch/powerpc/kernel/exceptions-64e.S | 12 + + arch/powerpc/kernel/exceptions-64s.S | 4 +- + arch/powerpc/kernel/prom.c | 29 +- + arch/powerpc/kernel/setup-common.c | 2 +- + arch/powerpc/kernel/setup_64.c | 10 +- + arch/powerpc/platforms/powernv/eeh-powernv.c | 3 + + arch/powerpc/sysdev/cpm1.c | 25 + + drivers/net/ethernet/freescale/ucc_geth.c | 8 +- + drivers/of/fdt.c | 38 + + drivers/soc/fsl/qbman/qman.c | 5 + + drivers/soc/fsl/qe/qe.c | 25 +- + drivers/soc/fsl/qe/qe_tdm.c | 2 + + include/linux/of_fdt.h | 6 + + include/soc/fsl/qe/immap_qe.h | 19 - + include/soc/fsl/qe/qe.h | 1 + + 30 files changed, 1546 insertions(+), 54 deletions(-) + create mode 100644 Documentation/devicetree/bindings/powerpc/ibm,powerpc-cpu-features.txt + create mode 100644 arch/powerpc/include/asm/dt_cpu_ftrs.h + create mode 100644 arch/powerpc/kernel/dt_cpu_ftrs.c +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 (8e4b8e130264 s390/scm: use multiple queues) +$ git merge s390/features +Removing drivers/s390/block/scm_blk_cluster.c +Auto-merging drivers/s390/block/Kconfig +Auto-merging arch/s390/mm/vmem.c +Auto-merging arch/s390/mm/pageattr.c +Auto-merging arch/s390/kernel/ftrace.c +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 2 +- + arch/s390/crypto/arch_random.c | 1 + + arch/s390/include/asm/debug.h | 3 +- + arch/s390/include/asm/dis.h | 2 + + arch/s390/include/asm/kprobes.h | 20 +-- + arch/s390/include/asm/page.h | 3 + + arch/s390/include/asm/pgalloc.h | 25 +++- + arch/s390/include/asm/pgtable.h | 80 +++++++++-- + arch/s390/include/asm/processor.h | 4 +- + arch/s390/include/asm/sysinfo.h | 2 +- + arch/s390/include/asm/tlb.h | 15 +++ + arch/s390/kernel/debug.c | 8 +- + arch/s390/kernel/entry.S | 21 ++- + arch/s390/kernel/ftrace.c | 4 + + arch/s390/kernel/traps.c | 1 + + arch/s390/kernel/vmlinux.lds.S | 8 +- + arch/s390/lib/probes.c | 1 + + arch/s390/lib/uaccess.c | 4 +- + arch/s390/mm/dump_pagetables.c | 23 +++- + arch/s390/mm/gmap.c | 11 +- + arch/s390/mm/gup.c | 33 ++++- + arch/s390/mm/hugetlbpage.c | 30 +++-- + arch/s390/mm/mmap.c | 4 +- + arch/s390/mm/pageattr.c | 30 ++++- + arch/s390/mm/pgalloc.c | 57 +++++--- + arch/s390/mm/pgtable.c | 6 +- + arch/s390/mm/vmem.c | 44 +++++- + drivers/crypto/Kconfig | 2 +- + drivers/s390/block/Kconfig | 7 - + drivers/s390/block/Makefile | 3 - + drivers/s390/block/scm_blk.c | 246 +++++++++++++++------------------ + drivers/s390/block/scm_blk.h | 60 +-------- + drivers/s390/block/scm_blk_cluster.c | 255 ----------------------------------- + drivers/s390/cio/ccwgroup.c | 4 +- + drivers/s390/cio/qdio_debug.h | 2 +- + drivers/s390/crypto/pkey_api.c | 2 +- + drivers/tty/hvc/Kconfig | 3 +- + 37 files changed, 461 insertions(+), 565 deletions(-) + delete mode 100644 drivers/s390/block/scm_blk_cluster.c +Merging sparc-next/master (94836ecf1e73 Merge tag 'nfsd-4.11-2' of git://linux-nfs.org/~bfields/linux) +$ git merge sparc-next/master +Already up-to-date. +Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board) +$ git merge sh/for-next +Already up-to-date. +Merging tile/master (0af0bc38175d mm, tile: drop arch_{add,remove}_memory) +$ git merge tile/master +Merge made by the 'recursive' strategy. + arch/tile/include/uapi/arch/abi.h | 49 +++---------------------- + arch/tile/include/uapi/arch/intreg.h | 70 ++++++++++++++++++++++++++++++++++++ + arch/tile/mm/init.c | 30 ---------------- + 3 files changed, 74 insertions(+), 75 deletions(-) + create mode 100644 arch/tile/include/uapi/arch/intreg.h +Merging uml/linux-next (ce4586063f1a um: Add missing NR_CPUS include) +$ git merge uml/linux-next +Auto-merging arch/um/Kconfig.common +Merge made by the 'recursive' strategy. + arch/um/Kconfig.common | 5 +++++ + arch/um/kernel/initrd.c | 4 +--- + arch/um/kernel/sysrq.c | 6 ++---- + arch/um/kernel/um_arch.c | 6 ++++++ + arch/um/os-Linux/skas/process.c | 4 +--- + arch/x86/um/ptrace_64.c | 2 +- + arch/x86/um/shared/sysdep/kernel-offsets.h | 9 +-------- + 7 files changed, 17 insertions(+), 19 deletions(-) +Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface) +$ git merge unicore32/unicore32 +Auto-merging arch/unicore32/include/asm/Kbuild +Merge made by the 'recursive' strategy. + arch/unicore32/Kconfig | 14 + + arch/unicore32/include/asm/Kbuild | 3 - + arch/unicore32/include/asm/signal.h | 21 + + arch/unicore32/include/asm/syscalls.h | 25 + + arch/unicore32/include/uapi/asm/sigcontext.h | 14 + + arch/unicore32/include/uapi/asm/stat-oldabi.h | 71 +++ + arch/unicore32/include/uapi/asm/stat.h | 19 + + arch/unicore32/include/uapi/asm/unistd-oldabi.h | 770 ++++++++++++++++++++++++ + arch/unicore32/include/uapi/asm/unistd.h | 8 + + arch/unicore32/kernel/entry.S | 17 + + arch/unicore32/kernel/signal.c | 41 ++ + 11 files changed, 1000 insertions(+), 3 deletions(-) + create mode 100644 arch/unicore32/include/asm/signal.h + create mode 100644 arch/unicore32/include/asm/syscalls.h + create mode 100644 arch/unicore32/include/uapi/asm/stat-oldabi.h + create mode 100644 arch/unicore32/include/uapi/asm/stat.h + create mode 100644 arch/unicore32/include/uapi/asm/unistd-oldabi.h +Merging xtensa/xtensa-for-next (6fad04b7585d 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 (6f9d696f016f fscrypt: correct collision claim for digested names) +$ git merge fscrypt/master +Already up-to-date. +Merging befs/for-next (0bbabf98dd76 befs: make export work with cold dcache) +$ git merge befs/for-next +Merge made by the 'recursive' strategy. +Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults) +$ git merge btrfs/next +Already up-to-date. +Merging btrfs-kdave/for-next (953a8bf6cedd Merge branch 'for-next-next-v4.12-20170425' into for-next-20170425) +$ git merge btrfs-kdave/for-next +Recorded preimage for 'fs/btrfs/file.c' +Auto-merging fs/btrfs/qgroup.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/file.c +CONFLICT (content): Merge conflict in fs/btrfs/file.c +Auto-merging fs/btrfs/extent_io.h +Auto-merging fs/btrfs/ctree.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/btrfs/file.c'. +[master be34168b7c3e] Merge remote-tracking branch 'btrfs-kdave/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/ctree.h | 12 ++- + fs/btrfs/extent-tree.c | 31 +++++--- + fs/btrfs/extent_io.h | 14 +++- + fs/btrfs/file.c | 46 ++++++++---- + fs/btrfs/inode-map.c | 6 +- + fs/btrfs/inode.c | 64 ++++++++++------ + fs/btrfs/ioctl.c | 11 ++- + fs/btrfs/qgroup.c | 196 ++++++++++++++++++++++++++++++++++++------------- + fs/btrfs/qgroup.h | 8 +- + fs/btrfs/relocation.c | 13 ++-- + fs/btrfs/transaction.c | 10 --- + 11 files changed, 283 insertions(+), 128 deletions(-) +Merging ceph/master (eeca958dce0a ceph: fix memory leak in __ceph_setxattr()) +$ git merge ceph/master +Already up-to-date. +Merging cifs/for-next (de1892b887ee Don't delay freeing mids when blocked on slow socket write of request) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifssmb.c | 7 ------- + fs/cifs/file.c | 2 +- + fs/cifs/smb2pdu.c | 7 ------- + fs/cifs/transport.c | 2 -- + 4 files changed, 1 insertion(+), 17 deletions(-) +Merging configfs/for-next (e16769d4bca6 fs: configfs: don't return anything from drop_link) +$ git merge configfs/for-next +Already up-to-date. +Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/main.c +Auto-merging fs/ecryptfs/ecryptfs_kernel.h +Merge made by the 'recursive' strategy. + fs/ecryptfs/crypto.c | 15 --------------- + fs/ecryptfs/ecryptfs_kernel.h | 9 ++++++++- + fs/ecryptfs/keystore.c | 2 +- + fs/ecryptfs/main.c | 2 +- + fs/ecryptfs/miscdev.c | 2 +- + 5 files changed, 11 insertions(+), 19 deletions(-) +Merging ext3/for_next (07f7e3135e58 Merge branch 'fsnotify' into for_next) +$ git merge ext3/for_next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging ext4/dev (17f423b51607 jbd2: cleanup write flags handling from jbd2_write_superblock()) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (2d3e4866dea9 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm) +$ 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 (0b6e9ea041e6 fuse: Add support for pid namespaces) +$ git merge fuse/for-next +Already up-to-date. +Merging jfs/jfs-next (684666e51585 jfs: atomically read inode size) +$ git merge jfs/jfs-next +Auto-merging fs/jfs/super.c +Merge made by the 'recursive' strategy. + fs/jfs/resize.c | 4 ++-- + fs/jfs/super.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging nfs/linux-next (76b2a303384e pNFS/flexfiles: Always attempt to call layoutstats when flexfiles is enabled) +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next (b26b78cb7260 nfsd: Fix up the "supattr_exclcreat" attributes) +$ 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 (65f2673832d4 ovl: update documentation w.r.t. constant inode numbers) +$ git merge overlayfs/overlayfs-next +Already up-to-date. +Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (7bccd12d27b7 ubi: Add debugfs file for tracking PEB state) +$ git merge ubifs/linux-next +Auto-merging fs/ubifs/xattr.c +Auto-merging fs/ubifs/ubifs.h +Auto-merging fs/ubifs/ioctl.c +Auto-merging drivers/mtd/ubi/build.c +Merge made by the 'recursive' strategy. + drivers/mtd/ubi/build.c | 10 ++-- + drivers/mtd/ubi/debug.c | 126 +++++++++++++++++++++++++++++++++++++++++++++- + drivers/mtd/ubi/fastmap.c | 33 ++++++++++-- + fs/ubifs/Kconfig | 13 +++++ + fs/ubifs/debug.c | 4 +- + fs/ubifs/ioctl.c | 6 +-- + fs/ubifs/recovery.c | 1 - + fs/ubifs/ubifs.h | 14 +++++- + fs/ubifs/xattr.c | 6 +++ + 9 files changed, 195 insertions(+), 18 deletions(-) +Merging xfs/for-next (161f55efba5d xfs: fix use-after-free in xfs_finish_page_writeback) +$ git merge xfs/for-next +Already up-to-date. +Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2) +$ git merge file-locks/linux-next +Already up-to-date. +Merging vfs/for-next (919bb328b020 Merge branch 'work.misc' into for-next) +$ git merge vfs/for-next +Auto-merging fs/stat.c +Auto-merging fs/open.c +Auto-merging fs/namespace.c +Auto-merging fs/namei.c +Merge made by the 'recursive' strategy. + fs/namei.c | 104 +++++++++++++++++++++++++++++++++++---------- + fs/namespace.c | 18 +++++--- + fs/open.c | 9 ++-- + fs/stat.c | 4 +- + include/linux/namei.h | 3 ++ + include/uapi/linux/fcntl.h | 1 + + 6 files changed, 103 insertions(+), 36 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 (cf39bf58afda printk: fix double printing with earlycon) +$ git merge printk/for-next +Already up-to-date. +Merging pci/next (3146c8f4de9b Merge branch 'pci/remove' into next) +$ git merge pci/next +Already up-to-date. +Merging pstore/for-next/pstore (3a7d2fd16c57 pstore: Solve lockdep warning by moving inode locks) +$ git merge pstore/for-next/pstore +Already up-to-date. +Merging hid/for-next (edb2a51c6fbb Merge branch 'for-4.12/upstream-fixes' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/hid-magicmouse.c | 15 ++++++++------- + drivers/hid/wacom_wac.c | 45 ++++++++++++++++++++++---------------------- + 2 files changed, 31 insertions(+), 29 deletions(-) +Merging i2c/i2c/for-next (f49ee0593cde Merge branch 'i2c/for-4.12' into i2c/for-next) +$ git merge i2c/i2c/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge jdelvare-hwmon/master +Already up-to-date. +Merging dmi/master (b3398adc0da6 firmware: dmi_scan: Look for SMBIOS 3 entry point first) +$ git merge dmi/master +Merge made by the 'recursive' strategy. + drivers/firmware/dmi_scan.c | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) +Merging hwmon-staging/hwmon-next (6eaaea144dc5 hwmon: (pmbus) Add client driver for IR35221) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + Documentation/hwmon/ir35221 | 87 ++++++++++++ + drivers/hwmon/pmbus/Kconfig | 10 ++ + drivers/hwmon/pmbus/Makefile | 1 + + drivers/hwmon/pmbus/ir35221.c | 313 ++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 411 insertions(+) + create mode 100644 Documentation/hwmon/ir35221 + create mode 100644 drivers/hwmon/pmbus/ir35221.c +Merging jc_docs/docs-next (0fe397f0c65d docs: update references to the device io book) +$ git merge jc_docs/docs-next +Auto-merging Documentation/memory-barriers.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 2 +- + Documentation/index.rst | 1 + + Documentation/input/ff.rst | 4 ++-- + Documentation/memory-barriers.txt | 4 ++-- + Documentation/translations/ko_KR/memory-barriers.txt | 4 ++-- + 5 files changed, 8 insertions(+), 7 deletions(-) +Merging v4l-dvb/master (3622d3e77ece [media] ov2640: print error if devm_*_optional*() fails) +$ git merge v4l-dvb/master +Already up-to-date. +Merging v4l-dvb-next/master (6d95b3f24881 Merge branch 'TTT' into to_next) +$ git merge v4l-dvb-next/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging fbdev/fbdev-for-next (34bf129a7f06 fbdev: sti: don't select CONFIG_VT) +$ git merge fbdev/fbdev-for-next +Auto-merging drivers/video/fbdev/xen-fbfront.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/display/imx/fsl,imx-fb.txt | 2 ++ + drivers/video/Makefile | 1 + + drivers/video/console/Kconfig | 2 +- + drivers/video/fbdev/Kconfig | 2 -- + drivers/video/fbdev/acornfb.c | 12 +++++------- + drivers/video/fbdev/amba-clcd.c | 4 ++-- + drivers/video/fbdev/aty/radeon_base.c | 4 ++-- + drivers/video/fbdev/core/fbmon.c | 4 ++-- + drivers/video/fbdev/i810/i810_main.c | 6 +++--- + drivers/video/fbdev/imxfb.c | 17 +++++++++++++++++ + drivers/video/fbdev/omap/lcd_mipid.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/dss.c | 16 +++++++++++----- + drivers/video/fbdev/pmag-aa-fb.c | 4 ++-- + drivers/video/fbdev/pmag-ba-fb.c | 4 ++-- + drivers/video/fbdev/pmagb-b-fb.c | 4 ++-- + drivers/video/fbdev/pxafb.c | 7 +++---- + drivers/video/fbdev/sm501fb.c | 1 + + drivers/video/fbdev/udlfb.c | 14 ++++++++++++-- + drivers/video/fbdev/xen-fbfront.c | 10 ++++++++++ + drivers/video/logo/logo.c | 2 +- + include/linux/platform_data/video-imxfb.h | 1 + + 21 files changed, 81 insertions(+), 38 deletions(-) +Merging pm/linux-next (c2d1a8fd16dc Merge branches 'pm-domains', 'pm-cpuidle', 'powercap' and 'pm-sleep' into linux-next) +$ git merge pm/linux-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc()) +$ git merge idle/next +Merge made by the 'recursive' strategy. +Merging thermal/next (cb15c81a0c1c Merge branch 'thermal-soc' into next) +$ git merge thermal/next +Resolved 'drivers/thermal/Kconfig' using previous resolution. +Resolved 'drivers/thermal/Makefile' using previous resolution. +Auto-merging drivers/thermal/Makefile +CONFLICT (content): Merge conflict in drivers/thermal/Makefile +Auto-merging drivers/thermal/Kconfig +CONFLICT (content): Merge conflict in drivers/thermal/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f8ff38963384] Merge remote-tracking branch 'thermal/next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/thermal/brcm,bcm2835-thermal.txt | 32 ++- + .../devicetree/bindings/thermal/brcm,ns-thermal | 37 +++ + .../devicetree/bindings/thermal/da9062-thermal.txt | 36 +++ + Documentation/thermal/sysfs-api.txt | 21 ++ + drivers/thermal/Kconfig | 32 +++ + drivers/thermal/Makefile | 2 + + drivers/thermal/broadcom/Kconfig | 16 ++ + drivers/thermal/broadcom/Makefile | 2 + + drivers/thermal/broadcom/bcm2835_thermal.c | 314 ++++++++++++++++++++ + drivers/thermal/broadcom/ns-thermal.c | 106 +++++++ + drivers/thermal/da9062-thermal.c | 315 +++++++++++++++++++++ + drivers/thermal/devfreq_cooling.c | 152 +++++++--- + drivers/thermal/intel_soc_dts_thermal.c | 9 +- + drivers/thermal/mtk_thermal.c | 2 +- + drivers/thermal/rcar_gen3_thermal.c | 199 ++++++++++++- + drivers/thermal/thermal_core.c | 64 ++++- + .../thermal/ti-soc-thermal/dra752-thermal-data.c | 10 - + .../thermal/ti-soc-thermal/omap3-thermal-data.c | 4 - + .../thermal/ti-soc-thermal/omap4-thermal-data.c | 6 - + .../thermal/ti-soc-thermal/omap5-thermal-data.c | 4 - + drivers/thermal/ti-soc-thermal/ti-bandgap.h | 4 - + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 158 +---------- + drivers/thermal/ti-soc-thermal/ti-thermal.h | 16 -- + include/linux/devfreq_cooling.h | 19 ++ + include/trace/events/thermal.h | 11 +- + 25 files changed, 1305 insertions(+), 266 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/brcm,ns-thermal + create mode 100644 Documentation/devicetree/bindings/thermal/da9062-thermal.txt + create mode 100644 drivers/thermal/broadcom/Kconfig + create mode 100644 drivers/thermal/broadcom/Makefile + create mode 100644 drivers/thermal/broadcom/bcm2835_thermal.c + create mode 100644 drivers/thermal/broadcom/ns-thermal.c + create mode 100644 drivers/thermal/da9062-thermal.c +Merging thermal-soc/next (19fd1783c24e 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 +Merge made by the 'recursive' strategy. + drivers/firewire/net.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) +Merging dlm/next (c0ae14857677 dlm: Fix kernel memory disclosure) +$ git merge dlm/next +Auto-merging fs/dlm/user.c +Merge made by the 'recursive' strategy. + fs/dlm/user.c | 2 ++ + 1 file changed, 2 insertions(+) +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 (89c9fea3c803 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial) +$ git merge net-next/master +Already up-to-date. +Merging ipsec-next/master (e892d2d40445 esp: Fix misplaced spin_unlock_bh.) +$ git merge ipsec-next/master +Already up-to-date. +Merging netfilter-next/master (89c9fea3c803 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial) +$ git merge netfilter-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 (47d272f0f988 Merge tag 'iwlwifi-next-for-kalle-2017-04-26' 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 (2a25b3faef44 Bluetooth: hci_ldisc: Use rwlocking to avoid closing proto races) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/Kconfig | 2 +- + drivers/bluetooth/btusb.c | 4 ++++ + drivers/bluetooth/hci_ldisc.c | 40 ++++++++++++++++++++++++++++++++----- + drivers/bluetooth/hci_uart.h | 1 + + include/net/bluetooth/hci.h | 8 ++++++++ + net/bluetooth/hci_core.c | 46 ++++++++++++++++++++++++++++++++++++++----- + 6 files changed, 90 insertions(+), 11 deletions(-) +Merging mac80211-next/master (89c9fea3c803 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial) +$ git merge mac80211-next/master +Already up-to-date. +Merging rdma/for-next (67cf3623e097 rxe: expose num_possible_cpus() cnum_comp_vectors) +$ git merge rdma/for-next +Already up-to-date. +Merging gfs2/for-next (3ef2bc099d1c Merge tag 'devicetree-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux) +$ git merge gfs2/for-next +Already up-to-date. +Merging mtd/master (c1ae3cfa0e89 Linux 4.11-rc1) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (6a623e076944 mtd: nand: add ooblayout for old hamming layout) +$ git merge l2-mtd/master +Auto-merging include/linux/mtd/mtd.h +Auto-merging drivers/mtd/spi-nor/spi-nor.c +Auto-merging drivers/mtd/nand/nandsim.c +Removing drivers/mtd/nand/atmel_nand_nfc.h +Removing drivers/mtd/nand/atmel_nand_ecc.h +Removing drivers/mtd/nand/atmel_nand.c +Auto-merging drivers/mtd/maps/physmap_of_core.c +Auto-merging drivers/memory/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/atmel-nand.txt | 107 +- + .../devicetree/bindings/mtd/denali-nand.txt | 7 +- + .../devicetree/bindings/mtd/stm32-quadspi.txt | 43 + + MAINTAINERS | 6 +- + arch/cris/arch-v32/drivers/Kconfig | 1 - + drivers/memory/Kconfig | 2 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 12 +- + drivers/mtd/maps/Makefile | 10 +- + .../mtd/maps/{physmap_of.c => physmap_of_core.c} | 30 +- + drivers/mtd/mtdswap.c | 6 +- + drivers/mtd/nand/Kconfig | 23 +- + drivers/mtd/nand/Makefile | 11 +- + drivers/mtd/nand/atmel/Makefile | 4 + + drivers/mtd/nand/atmel/nand-controller.c | 2197 +++++++++++++++++ + drivers/mtd/nand/atmel/pmecc.c | 1020 ++++++++ + drivers/mtd/nand/atmel/pmecc.h | 73 + + drivers/mtd/nand/atmel_nand.c | 2479 -------------------- + drivers/mtd/nand/atmel_nand_ecc.h | 163 -- + drivers/mtd/nand/atmel_nand_nfc.h | 103 - + drivers/mtd/nand/brcmnand/brcmnand.c | 61 +- + drivers/mtd/nand/cmx270_nand.c | 4 +- + drivers/mtd/nand/davinci_nand.c | 11 + + drivers/mtd/nand/denali.c | 567 +++-- + drivers/mtd/nand/denali.h | 192 +- + drivers/mtd/nand/denali_dt.c | 74 +- + drivers/mtd/nand/fsmc_nand.c | 236 +- + drivers/mtd/nand/gpio.c | 18 +- + drivers/mtd/nand/nand_amd.c | 51 + + drivers/mtd/nand/nand_base.c | 588 +++-- + drivers/mtd/nand/nand_hynix.c | 631 +++++ + drivers/mtd/nand/nand_ids.c | 39 +- + drivers/mtd/nand/nand_macronix.c | 30 + + drivers/mtd/nand/nand_micron.c | 86 + + drivers/mtd/nand/nand_samsung.c | 112 + + drivers/mtd/nand/nand_toshiba.c | 51 + + drivers/mtd/nand/nandsim.c | 2 +- + drivers/mtd/nand/omap2.c | 9 + + drivers/mtd/nand/orion_nand.c | 48 +- + drivers/mtd/nand/oxnas_nand.c | 2 +- + drivers/mtd/nand/sunxi_nand.c | 20 +- + drivers/mtd/nand/tango_nand.c | 8 +- + drivers/mtd/ofpart.c | 4 +- + drivers/mtd/spi-nor/Kconfig | 7 + + drivers/mtd/spi-nor/Makefile | 1 + + drivers/mtd/spi-nor/hisi-sfc.c | 5 +- + drivers/mtd/spi-nor/intel-spi.c | 4 +- + drivers/mtd/spi-nor/mtk-quadspi.c | 27 + + drivers/mtd/spi-nor/spi-nor.c | 18 +- + drivers/mtd/spi-nor/stm32-quadspi.c | 693 ++++++ + fs/jffs2/readinode.c | 2 +- + include/linux/mtd/mtd.h | 2 +- + include/linux/mtd/nand.h | 96 +- + 52 files changed, 6167 insertions(+), 3829 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/stm32-quadspi.txt + rename drivers/mtd/maps/{physmap_of.c => physmap_of_core.c} (96%) + create mode 100644 drivers/mtd/nand/atmel/Makefile + create mode 100644 drivers/mtd/nand/atmel/nand-controller.c + create mode 100644 drivers/mtd/nand/atmel/pmecc.c + create mode 100644 drivers/mtd/nand/atmel/pmecc.h + delete mode 100644 drivers/mtd/nand/atmel_nand.c + delete mode 100644 drivers/mtd/nand/atmel_nand_ecc.h + delete mode 100644 drivers/mtd/nand/atmel_nand_nfc.h + create mode 100644 drivers/mtd/nand/nand_amd.c + create mode 100644 drivers/mtd/nand/nand_hynix.c + create mode 100644 drivers/mtd/nand/nand_macronix.c + create mode 100644 drivers/mtd/nand/nand_micron.c + create mode 100644 drivers/mtd/nand/nand_samsung.c + create mode 100644 drivers/mtd/nand/nand_toshiba.c + create mode 100644 drivers/mtd/spi-nor/stm32-quadspi.c +Merging nand/nand/next (9d2ee0a60b8b mtd: nand: brcmnand: Check flash #WP pin status before nand erase/program) +$ git merge nand/nand/next +Already up-to-date. +Merging spi-nor/next (b67166569698 mtd: spi-nor: Potential oops on error path in quad_enable()) +$ git merge spi-nor/next +Auto-merging drivers/mtd/spi-nor/spi-nor.c +Merge made by the 'recursive' strategy. + drivers/mtd/devices/m25p80.c | 121 ++++++--- + drivers/mtd/spi-nor/Kconfig | 2 +- + drivers/mtd/spi-nor/aspeed-smc.c | 23 +- + drivers/mtd/spi-nor/atmel-quadspi.c | 83 ++++-- + drivers/mtd/spi-nor/cadence-quadspi.c | 18 +- + drivers/mtd/spi-nor/fsl-quadspi.c | 6 +- + drivers/mtd/spi-nor/hisi-sfc.c | 31 ++- + drivers/mtd/spi-nor/intel-spi.c | 7 +- + drivers/mtd/spi-nor/mtk-quadspi.c | 15 +- + drivers/mtd/spi-nor/nxp-spifi.c | 22 +- + drivers/mtd/spi-nor/spi-nor.c | 475 +++++++++++++++++++++++++++------- + drivers/mtd/spi-nor/stm32-quadspi.c | 32 ++- + include/linux/mtd/spi-nor.h | 161 +++++++++++- + 13 files changed, 770 insertions(+), 226 deletions(-) +Merging crypto/master (929562b14478 crypto: stm32 - Fix OF module alias information) +$ git merge crypto/master +Already up-to-date. +Merging drm/drm-next (644b4930bf7e Merge tag 'drm/tegra/for-4.12-rc1' of git://anongit.freedesktop.org/tegra/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 (88326ef05b26 drm/i915: Confirm the request is still active before adding it to the await) +$ git merge drm-intel/for-linux-next +Already up-to-date. +Merging drm-tegra/drm/tegra/for-next (b0d36daa0ab5 gpu: host1x: Fix host1x driver shutdown) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging drm-misc/for-linux-next (e345da82bd6b drm/edid: Add 10 bpc quirk for LGD 764 panel in HP zBook 17 G2) +$ git merge drm-misc/for-linux-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_edid.c | 8 ++++++++ + 1 file changed, 8 insertions(+) +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 (98db803f6413 msm/drm: gpu: Dynamically locate the clocks from the device tree) +$ git merge drm-msm/msm-next +Already up-to-date. +Merging hdlcd/for-upstream/hdlcd (1de3cd4fb49f drm: hdlcd: Fix the calculation of the scanout start address) +$ git merge hdlcd/for-upstream/hdlcd +Auto-merging drivers/gpu/drm/arm/hdlcd_crtc.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/arm/hdlcd_crtc.c | 47 ++++++++++++++++++++++++++-------------- + 1 file changed, 31 insertions(+), 16 deletions(-) +Merging mali-dp/for-upstream/mali-dp (763656d30b3d drm: mali-dp: use div_u64 for expensive 64-bit divisions) +$ git merge mali-dp/for-upstream/mali-dp +Already up-to-date. +Merging sunxi-drm/sunxi-drm/for-next (2da042ac05e9 MAINTAINERS: Add sun4i-drm git repo) +$ git merge sunxi-drm/sunxi-drm/for-next +Already up-to-date. +Merging imx-drm/imx-drm/next (1465dc794b00 gpu: ipu-v3: prg: remove counter load enable) +$ git merge imx-drm/imx-drm/next +Merge made by the 'recursive' strategy. + drivers/gpu/ipu-v3/ipu-prg.c | 2 -- + 1 file changed, 2 deletions(-) +Merging etnaviv/etnaviv/next (d79fd1ccf2cd drm/etnaviv: implement cooling support for new GPU cores) +$ git merge etnaviv/etnaviv/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/etnaviv/common.xml.h | 150 ++++++++++++++++----------- + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 1 + + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 1 + + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 7 ++ + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 4 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 30 ++++-- + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 2 + + 7 files changed, 125 insertions(+), 70 deletions(-) +Merging kspp/for-next/kspp (62111ab351b8 Merge branch 'for-next/gcc-plugin-infrastructure' into for-next/kspp) +$ git merge kspp/for-next/kspp +Auto-merging arch/Kconfig +Merge made by the 'recursive' strategy. + arch/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (bbbed1951704 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/rbtree' into regmap-next) +$ git merge regmap/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging sound/for-next (a5c3b32a1146 Merge tag 'asoc-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ git merge sound/for-next +Already up-to-date. +Merging sound-asoc/for-next (20d5c84bef06 Merge remote-tracking branches 'asoc/topic/wm8960', 'asoc/topic/wm8978' and 'asoc/topic/zte-tdm' into asoc-next) +$ git merge sound-asoc/for-next +Already up-to-date. +Merging modules/modules-next (175861882769 kallsyms: Use bounded strnchr() when parsing string) +$ git merge modules/modules-next +Already up-to-date. +Merging input/next (c3f6f8612bda Input: switch to using sizeof(*type) when allocating memory) +$ git merge input/next +Merge made by the 'recursive' strategy. + drivers/input/input.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) +Merging block/for-next (0789bd7bdb5b Merge branch 'for-linus' into for-next) +$ git merge block/for-next +Merge made by the 'recursive' strategy. + Documentation/block/bfq-iosched.txt | 17 ++++++++++++++++- + block/bfq-iosched.c | 5 +++++ + block/bfq-wf2q.c | 13 +++++++++++-- + block/blk-mq.c | 6 +++--- + block/blk-stat.c | 17 ++++++++++------- + block/elevator.c | 5 +---- + drivers/nvme/host/lightnvm.c | 9 +++++---- + 7 files changed, 51 insertions(+), 21 deletions(-) +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 (2ba0320c4c40 dm ioctl: report event number in DM_LIST_DEVICES) +$ git merge device-mapper/for-next +Auto-merging drivers/md/dm.c +Auto-merging drivers/md/dm-ioctl.c +Auto-merging drivers/md/dm-core.h +Merge made by the 'recursive' strategy. + drivers/md/dm-core.h | 3 ++ + drivers/md/dm-ioctl.c | 109 +++++++++++++++++++++++++++++++++--------- + drivers/md/dm.c | 5 ++ + include/uapi/linux/dm-ioctl.h | 6 ++- + 4 files changed, 99 insertions(+), 24 deletions(-) +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 (a627f025eb05 mmc: sdhci-of-esdhc: limit SD clock for ls1012a/ls1046a) +$ 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 (29efc390b946 md/md0: optimize raid0 discard handling) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + drivers/md/md.c | 20 ++++----- + drivers/md/md.h | 2 +- + drivers/md/raid0.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++------- + drivers/md/raid1.c | 9 ++--- + drivers/md/raid5.c | 29 +++++--------- + 5 files changed, 124 insertions(+), 52 deletions(-) +Merging mfd/for-mfd-next (ab6241ae07c3 input: touchscreen: mxs-lradc: || vs && typos) +$ git merge mfd/for-mfd-next +Already up-to-date. +Merging backlight/for-backlight-next (e739c5bb20be backlight: Add support for Arctic Sand LED backlight driver chips) +$ git merge backlight/for-backlight-next +Already up-to-date. +Merging battery/for-next (35f4f99ccbc1 power: supply: cpcap-charger: Keep trickle charger bits disabled) +$ git merge battery/for-next +Auto-merging .mailmap +Merge made by the 'recursive' strategy. + .mailmap | 2 + + .../bindings/power/supply/axp20x_battery.txt | 20 + + drivers/power/supply/Kconfig | 27 +- + drivers/power/supply/Makefile | 1 + + drivers/power/supply/ab8500_charger.c | 2 +- + drivers/power/supply/axp20x_battery.c | 502 +++++++++++++++++++++ + drivers/power/supply/bq24190_charger.c | 149 ++++-- + drivers/power/supply/cpcap-charger.c | 11 +- + drivers/power/supply/generic-adc-battery.c | 17 +- + drivers/power/supply/isp1704_charger.c | 4 + + drivers/power/supply/max17042_battery.c | 181 ++++++-- + drivers/power/supply/pda_power.c | 49 +- + drivers/power/supply/power_supply_core.c | 20 +- + drivers/power/supply/rx51_battery.c | 1 - + drivers/power/supply/sbs-battery.c | 57 ++- + drivers/power/supply/twl4030_charger.c | 95 ++-- + drivers/power/supply/twl4030_madc_battery.c | 1 - + include/linux/power/max17042_battery.h | 9 +- + 18 files changed, 975 insertions(+), 173 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/supply/axp20x_battery.txt + create mode 100644 drivers/power/supply/axp20x_battery.c +Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (f123e7b2a6e3 Merge remote-tracking branch 'regulator/topic/vctrl' into regulator-next) +$ git merge regulator/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging security/next (8979b02aaf1d tpm: Fix reference count to main device) +$ git merge security/next +Already up-to-date. +Merging integrity/next (3dd0c8d06511 ima: provide ">" and "<" operators for fowner/uid/euid rules.) +$ git merge integrity/next +Already up-to-date. +Merging keys/keys-next (e36484b5ac31 crypto : asymmetric_keys : verify_pefile:zero memory content before freeing) +$ git merge keys/keys-next +Auto-merging security/keys/keyctl.c +Auto-merging security/keys/gc.c +Merge made by the 'recursive' strategy. + crypto/asymmetric_keys/verify_pefile.c | 4 +-- + include/linux/key.h | 1 - + include/linux/mpi.h | 2 +- + include/uapi/linux/keyctl.h | 4 +-- + lib/mpi/mpicoder.c | 10 ++++--- + security/keys/dh.c | 34 +++++++++++----------- + security/keys/encrypted-keys/encrypted.c | 31 +++++++++----------- + security/keys/gc.c | 4 +-- + security/keys/keyctl.c | 4 ++- + security/keys/trusted.c | 50 ++++++++++++++------------------ + security/keys/user_defined.c | 16 +++++++--- + 11 files changed, 79 insertions(+), 81 deletions(-) +Merging selinux/next (cae303df3f37 selinux: Fix an uninitialized variable bug) +$ git merge selinux/next +Already up-to-date. +Merging tpmdd/next (da4cee99ca6d tpm_tis: Consolidate the platform and acpi probe flow) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + drivers/char/tpm/tpm-interface.c | 79 ++++++++++-------- + drivers/char/tpm/tpm-sysfs.c | 6 +- + drivers/char/tpm/tpm.h | 2 +- + drivers/char/tpm/tpm_tis.c | 175 +++++++++++++-------------------------- + 4 files changed, 104 insertions(+), 158 deletions(-) +Merging watchdog/master (00078cff73db Merge branch 'watchdog-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging) +$ git merge watchdog/master +Resolved 'drivers/watchdog/iTCO_wdt.c' using previous resolution. +Auto-merging drivers/watchdog/iTCO_wdt.c +CONFLICT (content): Merge conflict in drivers/watchdog/iTCO_wdt.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9b4b78c780d2] Merge remote-tracking branch 'watchdog/master' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/watchdog/da9062-wdt.txt | 23 ++ + .../devicetree/bindings/watchdog/renesas-wdt.txt | 4 +- + .../devicetree/bindings/watchdog/st,stm32-iwdg.txt | 19 ++ + Documentation/watchdog/watchdog-parameters.txt | 2 +- + drivers/watchdog/Kconfig | 29 ++- + drivers/watchdog/Makefile | 2 + + drivers/watchdog/bcm_kona_wdt.c | 3 +- + drivers/watchdog/cadence_wdt.c | 2 +- + drivers/watchdog/f71808e_wdt.c | 27 ++- + drivers/watchdog/gpio_wdt.c | 73 ++---- + drivers/watchdog/iTCO_wdt.c | 22 +- + drivers/watchdog/intel-mid_wdt.c | 17 +- + drivers/watchdog/orion_wdt.c | 2 +- + drivers/watchdog/pcwd_usb.c | 3 + + drivers/watchdog/rza_wdt.c | 199 ++++++++++++++++ + drivers/watchdog/s3c2410_wdt.c | 58 +++-- + drivers/watchdog/sama5d4_wdt.c | 96 +++++--- + drivers/watchdog/stm32_iwdg.c | 253 +++++++++++++++++++++ + drivers/watchdog/wdt_pci.c | 2 +- + drivers/watchdog/zx2967_wdt.c | 4 +- + 20 files changed, 686 insertions(+), 154 deletions(-) + create mode 100644 Documentation/devicetree/bindings/watchdog/da9062-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/st,stm32-iwdg.txt + create mode 100644 drivers/watchdog/rza_wdt.c + create mode 100644 drivers/watchdog/stm32_iwdg.c +Merging iommu/next (2c0248d68880 Merge branches 'arm/exynos', 'arm/omap', 'arm/rockchip', 'arm/mediatek', 'arm/smmu', 'arm/core', 'x86/vt-d', 'x86/amd' 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 (7cb671e7a34d vfio/type1: Reduce repetitive calls in vfio_pin_pages_remote()) +$ 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 (48d0e023af97 audit: fix the RCU locking for the auditd_connection structure) +$ git merge audit/next +Already up-to-date. +Merging devicetree/for-next (17a70355ea57 of: fix sparse warnings in fdt, irq, reserved mem, and resolver code) +$ git merge devicetree/for-next +Already up-to-date. +Merging mailbox/mailbox-for-next (cb710ab1d8a2 mailbox: handle empty message in tx_tick) +$ git merge mailbox/mailbox-for-next +Already up-to-date. +Merging spi/for-next (282ec0ea65da Merge remote-tracking branches 'spi/topic/ti-qspi' and 'spi/topic/xlp' into spi-next) +$ git merge spi/for-next +Already up-to-date. +Merging tip/auto-latest (30e2fc1b448b Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Auto-merging kernel/trace/trace_events.c +Auto-merging kernel/padata.c +Auto-merging kernel/kprobes.c +Auto-merging kernel/fork.c +Auto-merging include/linux/pci.h +Auto-merging include/linux/cpuhotplug.h +Auto-merging drivers/pci/pci-driver.c +Auto-merging arch/x86/mm/init_64.c +Auto-merging arch/x86/kernel/machine_kexec_64.c +Auto-merging arch/powerpc/kvm/book3s_hv.c +Auto-merging arch/arm64/kernel/cpufeature.c +Auto-merging arch/arm64/include/asm/cpufeature.h +Merge made by the 'recursive' strategy. + Documentation/x86/intel_rdt_ui.txt | 2 +- + arch/arm/kernel/hw_breakpoint.c | 5 +- + arch/arm64/include/asm/cpufeature.h | 3 +- + arch/arm64/kernel/cpu_errata.c | 9 +- + arch/arm64/kernel/cpufeature.c | 5 +- + arch/mips/kernel/jump_label.c | 2 - + arch/powerpc/kvm/book3s_hv.c | 8 +- + arch/powerpc/platforms/powernv/subcore.c | 3 +- + arch/s390/kernel/time.c | 2 +- + arch/sparc/kernel/jump_label.c | 2 - + arch/tile/kernel/jump_label.c | 2 - + arch/x86/Makefile | 3 +- + arch/x86/boot/compressed/error.h | 4 +- + arch/x86/boot/compressed/pagetable.c | 2 +- + arch/x86/events/core.c | 1 - + arch/x86/events/intel/core.c | 4 +- + arch/x86/events/intel/cqm.c | 12 +- + arch/x86/events/intel/ds.c | 7 +- + arch/x86/events/intel/rapl.c | 2 +- + arch/x86/include/asm/asm.h | 1 + + arch/x86/include/asm/init.h | 3 +- + arch/x86/kernel/cpu/microcode/amd.c | 2 - + arch/x86/kernel/cpu/mtrr/main.c | 2 - + arch/x86/kernel/jump_label.c | 2 - + arch/x86/kernel/machine_kexec_64.c | 6 +- + arch/x86/kernel/setup.c | 15 ++ + arch/x86/kernel/setup_percpu.c | 10 +- + arch/x86/lib/csum-copy_64.S | 12 +- + arch/x86/lib/kaslr.c | 3 +- + arch/x86/mm/ident_map.c | 14 +- + arch/x86/mm/init_64.c | 12 +- + arch/x86/mm/numa_32.c | 1 + + arch/x86/power/hibernate_64.c | 2 +- + drivers/acpi/processor_driver.c | 4 +- + drivers/clocksource/arm_arch_timer.c | 2 +- + drivers/cpufreq/cpufreq.c | 9 +- + drivers/hwtracing/coresight/coresight-etm3x.c | 12 +- + drivers/hwtracing/coresight/coresight-etm4x.c | 12 +- + drivers/pci/pci-driver.c | 47 +++--- + include/linux/cpu.h | 2 + + include/linux/cpuhotplug.h | 38 +++++ + include/linux/jump_label.h | 27 +++- + include/linux/padata.h | 3 - + include/linux/pci.h | 1 + + include/linux/stop_machine.h | 26 +++- + kernel/cpu.c | 173 ++++++++------------- + kernel/events/callchain.c | 6 + + kernel/events/core.c | 56 ++++--- + kernel/fork.c | 2 +- + kernel/jump_label.c | 57 ++++++- + kernel/kprobes.c | 25 +-- + kernel/padata.c | 43 ++--- + kernel/stop_machine.c | 7 +- + kernel/trace/trace_events.c | 8 + + kernel/tracepoint.c | 4 +- + tools/build/feature/test-sched_getcpu.c | 2 + + tools/include/linux/string.h | 2 + + tools/lib/string.c | 9 ++ + tools/lib/subcmd/help.c | 1 + + tools/lib/subcmd/parse-options.c | 1 + + tools/lib/subcmd/subcmd-util.h | 9 -- + tools/perf/Documentation/perf-c2c.txt | 4 +- + tools/perf/Documentation/perf-record.txt | 2 +- + tools/perf/Documentation/perf-report.txt | 6 +- + tools/perf/Documentation/perf.data-file-format.txt | 4 +- + tools/perf/Documentation/tips.txt | 2 +- + tools/perf/arch/arm64/annotate/instructions.c | 2 +- + tools/perf/arch/powerpc/util/sym-handling.c | 12 ++ + tools/perf/builtin-buildid-cache.c | 13 +- + tools/perf/builtin-c2c.c | 1 + + tools/perf/builtin-config.c | 19 +-- + tools/perf/builtin-top.c | 2 +- + tools/perf/builtin-trace.c | 1 + + tools/perf/perf.c | 1 + + tools/perf/tests/hists_cumulate.c | 1 + + tools/perf/tests/hists_filter.c | 1 + + tools/perf/tests/hists_output.c | 1 + + tools/perf/tests/kmod-path.c | 2 + + tools/perf/tests/sdt.c | 1 - + tools/perf/ui/setup.c | 3 + + tools/perf/util/Build | 1 + + tools/perf/util/build-id.h | 4 + + tools/perf/util/event.c | 10 +- + tools/perf/util/event.h | 14 +- + tools/perf/util/evsel.c | 1 + + tools/perf/util/header.c | 1 + + tools/perf/util/intel-pt.c | 1 + + tools/perf/util/machine.c | 28 ++-- + tools/perf/util/map.c | 5 - + tools/perf/util/map.h | 5 +- + tools/perf/util/memswap.c | 24 +++ + tools/perf/util/memswap.h | 7 + + .../perf/util/scripting-engines/trace-event-perl.c | 4 +- + tools/perf/util/session.c | 1 + + tools/perf/util/strbuf.c | 9 -- + tools/perf/util/symbol.c | 72 ++++++--- + tools/perf/util/symbol.h | 11 ++ + tools/perf/util/units.c | 29 ++++ + tools/perf/util/units.h | 7 + + tools/perf/util/util.c | 49 ------ + tools/perf/util/util.h | 26 ---- + 101 files changed, 692 insertions(+), 446 deletions(-) + create mode 100644 tools/perf/util/memswap.c + create mode 100644 tools/perf/util/memswap.h +Merging clockevents/clockevents/next (6f9c89000c3f Merge tag 'arch-timer-errata' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into clockevents/4.12) +$ 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 (f8d5549df25e EDAC, ghes: Do not enable it by default) +$ 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 (4dbbe2d8e95c tracing: Use cpumask_available() to check if cpumask variable may be used) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (933dfbd7c437 rcu: Open-code the rcu_cblist_n_lazy_cbs() function) +$ git merge rcu/rcu/next +Already up-to-date. +Merging kvm/linux-next (36c344f3f1ff Merge tag 'kvm-arm-for-v4.12-round2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) +$ git merge kvm/linux-next +Already up-to-date. +Merging kvm-arm/next (a2b19e6e2d4b KVM: arm/arm64: vgic-its: Cleanup after failed ITT restore) +$ 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 (fb7dcf723dd2 Merge remote-tracking branch 'remotes/powerpc/topic/xive' into kvm-ppc-next) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (e000b8e0968d s390: kvm: Cpu model support for msa6, msa7 and msa8) +$ git merge kvms390/next +Already up-to-date. +Merging xen-tip/linux-next (d162809f85b4 xen/x86: Do not call xen_init_time_ops() until shared_info is initialized) +$ git merge xen-tip/linux-next +Merge made by the 'recursive' strategy. + arch/x86/xen/enlighten_pv.c | 41 ++++++++++++++++------------------------- + arch/x86/xen/time.c | 2 +- + 2 files changed, 17 insertions(+), 26 deletions(-) +Merging percpu/for-next (1328710b8ec3 mark most percpu globals as __ro_after_init) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + mm/percpu.c | 36 ++++++++++++++++++------------------ + 1 file changed, 18 insertions(+), 18 deletions(-) +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 (6df97f85611c platform/x86: Make SILEAD_DMI depend on TOUCHSCREEN_SILEAD) +$ git merge drivers-x86/for-next +Already up-to-date. +Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch") +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. +Merging hsi/for-next (3026050179a3 HSI: ssi_protocol: double free in ssip_pn_xmit()) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (28c5fe99016d leds: pca9532: Extend pca9532 device tree support) +$ git merge leds/for-next +Already up-to-date. +Merging ipmi/for-next (2c1175c2e8e5 ipmi/watchdog: fix wdog hang on panic waiting for ipmi response) +$ git merge ipmi/for-next +Already up-to-date. +Merging driver-core/driver-core-next (af82455f7dbd Merge tag 'char-misc-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging usb/usb-next (c034a43e72dd staging: typec: Fairchild FUSB302 Type-c chip driver) +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (2868b2513aa7 Merge tag 'linux-kselftest-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (31c5d1922b90 USB: serial: ftdi_sio: add device ID for Microsemi/Arrow SF2PLUS Dev Kit) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging usb-chipidea-next/ci-for-usb-next (a932a8041ff9 usb: chipidea: core: add sysfs group) +$ git merge usb-chipidea-next/ci-for-usb-next +Already up-to-date. +Merging phy-next/next (6239879b415e phy: qcom-qusb2: add NVMEM dependency) +$ git merge phy-next/next +Already up-to-date. +Merging tty/tty-next (8e1c21f48694 serial: small Makefile reordering) +$ git merge tty/tty-next +Already up-to-date. +Merging char-misc/char-misc-next (af82455f7dbd Merge tag 'char-misc-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging extcon/extcon-next (70641a0a84e1 extcon: Use BIT() macro for the left-shift operation) +$ git merge extcon/extcon-next +Already up-to-date. +Merging staging/staging-next (56868a460b83 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide) +$ git merge staging/staging-next +Already up-to-date. +Merging mux/for-next (a351e9b9fc24 Linux 4.11) +$ git merge mux/for-next +Already up-to-date. +Merging slave-dma/next (eb4b66156318 Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging cgroup/for-next (0948307b3a5d Merge branch 'for-4.12' into for-next) +$ git merge cgroup/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging scsi/for-next (e83d14310c40 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging scsi-mkp/for-next (2d3e4866dea9 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm) +$ git merge scsi-mkp/for-next +Already up-to-date. +Merging target-updates/for-next (38b2788edbd6 ibmvscsis: Clear left-over abort_cmd pointers) +$ git merge target-updates/for-next +Auto-merging drivers/target/target_core_pscsi.c +Auto-merging drivers/target/target_core_device.c +Auto-merging drivers/target/iscsi/iscsi_target_configfs.c +Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.c +Merge made by the 'recursive' strategy. + Documentation/target/target-export-device | 80 ++++ + drivers/infiniband/ulp/srpt/ib_srpt.c | 9 +- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 117 +++-- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.h | 2 + + drivers/target/iscsi/iscsi_target.c | 51 +-- + drivers/target/iscsi/iscsi_target_configfs.c | 1 + + drivers/target/iscsi/iscsi_target_login.c | 1 + + drivers/target/target_core_configfs.c | 54 ++- + drivers/target/target_core_device.c | 38 ++ + drivers/target/target_core_file.c | 32 +- + drivers/target/target_core_iblock.c | 12 +- + drivers/target/target_core_iblock.h | 3 +- + drivers/target/target_core_pr.c | 2 +- + drivers/target/target_core_pr.h | 9 +- + drivers/target/target_core_pscsi.c | 3 +- + drivers/target/target_core_rd.c | 50 +-- + drivers/target/target_core_sbc.c | 77 +++- + drivers/target/target_core_tpg.c | 7 + + drivers/target/target_core_transport.c | 2 +- + drivers/target/target_core_user.c | 645 +++++++++++++++++++++------ + include/scsi/scsi_proto.h | 1 + + include/target/target_core_backend.h | 1 + + include/target/target_core_base.h | 1 + + 23 files changed, 920 insertions(+), 278 deletions(-) + create mode 100755 Documentation/target/target-export-device +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 (0c4a75c68799 target: Fix overflow/underflow handling of commands with a Data-Out buffer) +$ git merge target-bva/for-next +Merge made by the 'recursive' strategy. + drivers/target/iscsi/iscsi_target.c | 66 +++++++++++++++++--- + drivers/target/target_core_sbc.c | 16 +++-- + drivers/target/target_core_transport.c | 17 ----- + drivers/target/target_core_xcopy.c | 110 +++++++++++++++++++++------------ + 4 files changed, 136 insertions(+), 73 deletions(-) +Merging libata/for-next (b4dd60a5ddbc ata: sata_rcar: Handle return value of clk_prepare_enable) +$ git merge libata/for-next +Merge made by the 'recursive' strategy. + drivers/ata/ahci.c | 38 ++++++++++++++++++++++++++++++++++++++ + drivers/ata/sata_rcar.c | 15 ++++++++++++--- + 2 files changed, 50 insertions(+), 3 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 (c8b0d7290657 s390/virtio: change maintainership) +$ git merge vhost/linux-next +Already up-to-date. +Merging rpmsg/for-next (5e78de7eee74 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Auto-merging drivers/rpmsg/virtio_rpmsg_bus.c +Merge made by the 'recursive' strategy. + drivers/rpmsg/qcom_smd.c | 11 +++++++++++ + drivers/rpmsg/virtio_rpmsg_bus.c | 9 +++++++++ + 2 files changed, 20 insertions(+) +Merging gpio/for-next (b86c86aa9805 gpio: f7188x: Add a missing break) +$ git merge gpio/for-next +Already up-to-date. +Merging pinctrl/for-next (1aa2faf52f76 pinctrl: mediatek: Add missing pinctrl bindings for mt7623) +$ git merge pinctrl/for-next +Already up-to-date. +Merging pinctrl-samsung/for-next (c8dd100397f3 Merge branch 'pinctrl-next' into for-next) +$ git merge pinctrl-samsung/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (97512ceafaac Merge branch 'for-4.12/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 4b6b9bcc115a] 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 (d66bb1607e2d proc: Fix unbalanced hard link numbers) +$ 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 (db61ffe3a71c random: move random_min_urandom_seed into CONFIG_SYSCTL ifdef block) +$ git merge random/dev +Already up-to-date. +Merging aio/master (b562e44f507e Linux 4.5) +$ git merge aio/master +Already up-to-date. +Merging kselftest/next (945f8f5f8633 selftests: x86: add missing executables to .gitignore) +$ 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 (608822c0f7af Merge branch 'for-4.12/upstream' into for-next) +$ git merge livepatching/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging coresight/next (8b3fa19142e8 coresight: tmc: minor fix for output log) +$ git merge coresight/next +Auto-merging drivers/hwtracing/coresight/coresight-tmc-etf.c +Auto-merging drivers/hwtracing/coresight/coresight-etm-perf.c +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight-etm-perf.c | 3 +-- + drivers/hwtracing/coresight/coresight-tmc-etf.c | 25 +++++++++++------ + drivers/hwtracing/coresight/coresight.c | 34 ++++++++++++++++++------ + 3 files changed, 44 insertions(+), 18 deletions(-) +Merging rtc/rtc-next (332e0d13d3c7 rtc: gemini: add return value validation) +$ git merge rtc/rtc-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Auto-merging Documentation/devicetree/bindings/trivial-devices.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/rtc/cpcap-rtc.txt | 18 ++ + Documentation/devicetree/bindings/rtc/rtc-sh.txt | 28 ++ + .../devicetree/bindings/trivial-devices.txt | 1 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/x86/kernel/i8259.c | 1 + + drivers/rtc/Kconfig | 11 +- + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-bq32k.c | 7 + + drivers/rtc/rtc-cmos.c | 17 +- + drivers/rtc/rtc-cpcap.c | 330 +++++++++++++++++++++ + drivers/rtc/rtc-ds1307.c | 85 +++++- + drivers/rtc/rtc-ds1374.c | 11 +- + drivers/rtc/rtc-ds1672.c | 9 +- + drivers/rtc/rtc-ds3232.c | 7 + + drivers/rtc/rtc-gemini.c | 2 + + drivers/rtc/rtc-hid-sensor-time.c | 4 +- + drivers/rtc/rtc-isl1208.c | 12 +- + drivers/rtc/rtc-m41t80.c | 68 ++++- + drivers/rtc/rtc-omap.c | 22 +- + drivers/rtc/rtc-rs5c372.c | 37 ++- + drivers/rtc/rtc-rv3029c2.c | 9 + + drivers/rtc/rtc-rv8803.c | 21 +- + drivers/rtc/rtc-rx8010.c | 7 + + drivers/rtc/rtc-rx8581.c | 7 + + drivers/rtc/rtc-s35390a.c | 8 + + drivers/rtc/rtc-sh.c | 39 ++- + drivers/rtc/rtc-snvs.c | 2 +- + drivers/rtc/rtc-wm8350.c | 2 - + 28 files changed, 721 insertions(+), 46 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/cpcap-rtc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/rtc-sh.txt + create mode 100644 drivers/rtc/rtc-cpcap.c +Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field) +$ git merge hwspinlock/for-next +Already up-to-date. +Merging nvdimm/libnvdimm-for-next (8376efd31d3d x86, pmem: Fix cache flushing for iovec write < 8 bytes) +$ git merge nvdimm/libnvdimm-for-next +Auto-merging include/linux/blkdev.h +Auto-merging fs/xfs/xfs_super.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ext2/super.c +Auto-merging fs/block_dev.c +Auto-merging block/Kconfig +Merge made by the 'recursive' strategy. + arch/x86/include/asm/pmem.h | 2 +- + block/Kconfig | 1 - + drivers/dax/Kconfig | 7 +--- + drivers/dax/super.c | 81 ++++++++++++++++++++++++++++++++++++++++----- + fs/Kconfig | 1 + + fs/block_dev.c | 66 ------------------------------------ + fs/ext2/super.c | 1 + + fs/ext4/super.c | 1 + + fs/xfs/xfs_super.c | 1 + + include/linux/blkdev.h | 2 -- + include/linux/dax.h | 30 +++++++++++++++-- + 11 files changed, 107 insertions(+), 86 deletions(-) +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 akpm-current/current (da567ccdcecf fault-inject: add /proc//fail-nth) +$ git merge --no-ff akpm-current/current +Auto-merging kernel/fork.c +Auto-merging fs/proc/base.c +Auto-merging arch/x86/kernel/machine_kexec_64.c +Merge made by the 'recursive' strategy. + Documentation/fault-injection/fault-injection.txt | 79 +++++++++++++++++++++++ + 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/proc/base.c | 44 +++++++++++++ + include/linux/crash_core.h | 2 + + include/linux/reboot.h | 4 ++ + include/linux/sched.h | 1 + + include/uapi/linux/sysctl.h | 4 ++ + kernel/fork.c | 4 ++ + kernel/gcov/base.c | 6 ++ + kernel/gcov/gcc_4_7.c | 4 +- + kernel/reboot.c | 27 ++++++++ + lib/fault-inject.c | 7 ++ + mm/khugepaged.c | 4 +- + mm/memory-failure.c | 3 + + mm/memory_hotplug.c | 4 ++ + mm/page_alloc.c | 5 ++ + mm/page_owner.c | 4 +- + mm/vmscan.c | 17 +++-- + mm/vmstat.c | 2 - + scripts/gdb/linux/constants.py.in | 7 ++ + scripts/gdb/linux/proc.py | 73 +++++++++++++++++++++ + 25 files changed, 357 insertions(+), 55 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: imx7: fix Kconfig warning and build errors +Applying: sparc64: NG4 memset 32 bits overflow +Applying: mm: zero hash tables in allocator +Applying: mm: update callers to use HASH_ZERO flag +Applying: mm: adaptive hash table scaling +Applying: time: delete current_fs_time() +Applying: lib/crc-ccitt: add CCITT-FALSE CRC16 variant +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + c5b095d3cf17...3237e8295d3f akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (3237e8295d3f 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 ++++++++--------- + drivers/soc/imx/Kconfig | 1 + + fs/dcache.c | 18 +++--------- + fs/inode.c | 14 ++------- + fs/namespace.c | 10 ++----- + include/linux/bootmem.h | 2 ++ + include/linux/crc-ccitt.h | 7 +++++ + include/linux/fs.h | 1 - + kernel/locking/qspinlock_paravirt.h | 3 +- + kernel/pid.c | 7 ++--- + kernel/time/time.c | 14 --------- + lib/crc-ccitt.c | 58 ++++++++++++++++++++++++++++++++++++- + mm/page_alloc.c | 31 ++++++++++++++++++-- + 13 files changed, 120 insertions(+), 72 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..65b58e875914 --- /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.11-rc5 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..2c19874c32cf --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20170511 -- cgit v1.2.3