diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-09-12 14:13:14 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-09-12 14:13:14 +1000 |
| commit | 0d71e2d4aa1415c467c275475aaa4d618e2702bc (patch) | |
| tree | 528ae2975af4bd95d5053518d18d33b3b062b759 | |
| parent | e84f033c6225c95e6ddd75b50d3abe6d7d66fde9 (diff) | |
| download | linux-0d71e2d4aa1415c467c275475aaa4d618e2702bc.tar.gz linux-0d71e2d4aa1415c467c275475aaa4d618e2702bc.tar.xz | |
Add linux-next specific files for 20170912next-20170912
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 269 | ||||
| -rw-r--r-- | Next/Trees | 271 | ||||
| -rw-r--r-- | Next/merge.log | 3615 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 4160 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..25771a1b4248 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,269 @@ +Name SHA1 +---- ---- +origin f007cad159e99fa2acd3b2e9364fbb32ad28b971 +fixes b4b8cbf679c4866a523a35d1454884a31bd5d8dc +kbuild-current 64236e315955cc59e2b612e6a0e59579395530ae +arc-current 1ee55a8f7f6b7ca4c0c59e0b4b4e3584a085c2d3 +arm-current 746a272e44141af24a02f6c9b0f65f4c4598ed42 +m68k-current 558d5ad276c9b2ffbe706e78310a777f87e65c5f +metag-fixes b884a190afcecdbef34ca508ea5ee88bb7c77861 +powerpc-fixes 1a92a80ad386a1a6e3b36d576d52a1a456394b70 +sparc 6470812e22261d2342ef1597be62e63a0423d691 +fscrypt-current 42d97eb0ade31e1bc537d086842f5d6e766d9d51 +net 4400081b631af69abc63cea3352680e3d85e0c39 +ipsec 1f4f554a72be0d8c164c2f5bc6ba939a1c624fb4 +netfilter 90c4ae4e2c1da9f1eaf846136861af43d4c1ff34 +ipvs f7fb77fc12352d15180dc3c08ffba10573d5167d +wireless-drivers f957dd3c8db2781c8a334b166800788feb618625 +mac80211 126f760ca94dae77425695f9f9238b731de86e32 +sound-current 2a0d85d9add77bb7a4ddd61557ffb21ca5370d15 +pci-current 8e1101d251647802d0a4ae19eb3d0e1453eaeff4 +driver-core.current d34fc1adf01ff87026da85fb972dc259dc347540 +tty.current d34fc1adf01ff87026da85fb972dc259dc347540 +usb.current d34fc1adf01ff87026da85fb972dc259dc347540 +usb-gadget-fixes b7d44c36a6f6d956e1539e0dd42f98b26e5a4684 +usb-serial-fixes fd1b8668af59a11bb754a6c9b0051c6c5ce73b74 +usb-chipidea-fixes cbb22ebcfb9920380ed69854a7095d497798063d +phy 5771a8c08880cdca3bfb4a3fc6d309d6bba20877 +staging.current f007cad159e99fa2acd3b2e9364fbb32ad28b971 +char-misc.current d34fc1adf01ff87026da85fb972dc259dc347540 +input-current a6cbfa1e6d38c4b3ab0ce7e3aea4bb4e744f24b8 +crypto-current 2d45a7e89833f88b38112292ff227af437f81f2f +ide b671e1703394d77163130c91f53b075db1c446bf +vfio-fixes 796b755066dd6254bfb6388fec901631e868d1c7 +kselftest-fixes 622b2fbe625bc255faa4ee69a0fbcab80d3e40e6 +backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f +ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600 +nand-fixes ee02f73e04c0e690600f621a3a1d2245834af7fe +spi-nor-fixes 5771a8c08880cdca3bfb4a3fc6d309d6bba20877 +mfd-fixes 0f0fc5c090055983163ed8e7b3a73980e128048c +v4l-dvb-fixes 4cd7d6c957b085d319bcf97814f95854375da0a6 +reset-fixes 4497a224f759cd8350e07382307b55f870ef0df2 +drm-intel-fixes cc4a41fe5541a73019a864883297bd5043aa6d98 +drm-misc-fixes 79964dbaf662229253b281c42e82e2675a9d3b80 +kbuild cf67100b797d74f15a2aac99e55f936dd6db11dc +uuid c0020756315eebec58310aca42cf9fb73e1322eb +dma-mapping d35b0996fef3bfe76665e87bbff7d95c6807350a +asm-generic a351e9b9fc24e982ec2f0e76379a49826036da12 +arc cc4a41fe5541a73019a864883297bd5043aa6d98 +arm 67715a8964fc0593e309aaea456b8693138d34f5 +arm-perf e884f80cf2a76a86547e2316982e1f200f556ddf +arm-soc 765a385caf94f07b5c0b808bb5b0d387409e2a19 +actions 7d5700467a9425e01c31ac94f4348b2d9b4983b0 +alpine a1144b2b1ec47f50951a83eb2bd847c74415b567 +amlogic 293cd5ae9884065af9048dc9f5d7e8a55eb9226a +aspeed 0eead81e7847cb46e4698f60e1631e85c5fffb95 +at91 569dbb88e80deb68974ef6fdd6a13edb9d686261 +bcm2835 e83e7335d05989773de0f70c0bea6a912343c21a +berlin 5153351425c92f3e89358c8eb62ca8d901437581 +cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4 +imx-mxs b90b6c45ff6b23acc899c46a24ae697761a08869 +keystone f922ce7bbcf5fcdf31decad861aef079c29f401e +mvebu b9d2ea8a7107d0284e9ffc2b340e38287b96d282 +omap a70cb93b6c2f23030a8730a6c870efaf642203b5 +omap-pending c20c8f750d9f8f8617f07ee2352d3ff560e66bc2 +reset d9753c03a0de68f6a8b5041da72a0d3104d5cbd0 +qcom b212aba8f7bf5cf8a1c288e0efc118c162d94ccb +realtek 932a3d80019d6a063b05bf602d9d3066be07a007 +renesas e6bf13206283dbb157e83114d659b7ef6714ac8b +rockchip 23b856f7af3cf2ef74371fe3888fab1c738757a3 +rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590 +samsung 2ea659a9ef488125eb46da6eb571de5eae5c43f6 +samsung-krzk e6f2efc1a7da5235090f9b02a74ca8164f2d8b25 +sunxi a5cedb2ecb7f1811b48ee89bbfa5e292e5e012b9 +tegra b4aed883ebbe0855c9a8cceea22ce28d621afb0a +arm64 d1be5c99a0341249bf6f74eb1cbc3d5fc4ef2be7 +clk 73c950da6ec523136090d6d4d6907a6ea8e8b67b +clk-samsung 599cebea93e69c25e4cf027fc21d2bdf9a4a1ec7 +c6x 62016565bb04cb9f138510e87c9e4da95e00fdfb +cris 8f50f2a1b46a11a9a9fb46c5d8325dfc88281a76 +h8300 58c57526711f7c87046b7c5a650535acbab2d3fb +hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a +ia64 fbb0e4da96f4503e65bc4fb627cf4e1d7c8c64e6 +m68k 558d5ad276c9b2ffbe706e78310a777f87e65c5f +m68knommu 8a1943492bd629b7eae64535a96fcb959a01bbd0 +metag e3cd7f013bac3105d44b8bd5a90359989d45b5a5 +microblaze 14ef905bb2eecb02f7ce31b8fbedd4a75ddf0f57 +mips 094032707c2c939dc0945683b4dd8bd33a5ee75e +nios2 e118c3fec9c0d8d2a96462c4c035305dc952e402 +openrisc 56ce2f25ab0d8830d914e626bc88e45b42e11661 +parisc-hd 569dbb88e80deb68974ef6fdd6a13edb9d686261 +powerpc 265601f034df3566f22da11240977aab8860f6a7 +fsl a4e89ffb59235fd11d27107dea3efa4562ac0a12 +mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0 +s390 e443343e509aac82e7281020f25bf8fa0dd46ab7 +sparc-next d719518d9ce9132bad8a06e8029aeead328f66a3 +sh 6e2fbfdd585f46128ce8879738bca09719a65138 +tile 637f23abca87d26e091e0d6647ec878d97d2c6cd +uml 2fb44600fe784449404c6639de26af8361999ec7 +unicore32 bc27113620ca6b67320b8a57e70d801dc94221d5 +xtensa 271335b9726e230eda124c83af2b4773502288f5 +fscrypt c250b7dd8e73b5f7d88d231fbaac92e3360a7234 +befs 5771a8c08880cdca3bfb4a3fc6d309d6bba20877 +btrfs 5226fcac7841f66e5c141d27f0d099b5fd0d626f +btrfs-kdave d112b114021d8a594061ef739a306446f251bf87 +ceph 15b51bd6badbb373c723aa019cf530c8263efd7e +cifs 5b6d827f246fe24eb50aca5b671331afd63a8325 +configfs 19e72d3abb63cb16d021a4066ce1a18880509e99 +ecryptfs be280b25c3288824ed4c201b452c3e87a7074d7c +ext3 f007cad159e99fa2acd3b2e9364fbb32ad28b971 +ext4 b5f515735bea4ae71c248aea3e049073f8852889 +f2fs 27161f13e3c3241944846ac24942a85cceda0a2c +freevxfs bf1bb4b460c8dc3a33793bff21464a9d816697ad +fscache d52bd54db8be8999df6df5a776f38c4f8b5e9cea +fuse 9183976ef1c858c289b09066fd57aae51b86653c +jfs f070e5ac9bc7de71c34402048ce5526dccbd347c +nfs 1bd5d6d08ea7ed0794c8a3908383d6d6fc202cdd +nfsd 26fb2254dd33b02a522fac42745693f5969b7d4b +orangefs 2f713b5c7d2a90baba6c88174c81fb9a96bfde21 +overlayfs 7c6893e3c9abf6a9676e060a1e35e5caca673d57 +v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc +ubifs a6664433d383eeb71cbdeb9aea2c66eeea76e742 +xfs 6c370590cfe0c36bcd62d548148aa65c984540b7 +file-locks 3b9f8ed25dbe5f858b1331588929f2a766aef55f +vfs 976a5f29dd6b139ea0de82e5d41d604ff5c11afe +vfs-jk 030b533c4fd4d2ec3402363323de4bb2983c9cee +vfs-miklos 0eb8af4916a540c362a2950e5ab54eca32eb7d58 +printk 077a1cc06f72f95efd077d433993c16191008e47 +pci cf2d804110d3c20dc6865ade514c44179de34855 +pstore c71b02e4d207cbcf097f9746d5f7967b22905e70 +hid abbc4db7a3a0c8e395849f36ff9660e187420b38 +i2c 2f1db5e1f86f35a5c083a13f0bc7069c4d42359f +jdelvare-hwmon 08d27eb2066622cd659b91d877d0406ebd651225 +dmi f996c4155d0d10833cfc62e4d3081951fe188b5e +hwmon-staging 7074d0a92758603369655ef5d4f49e6caaae0b4e +jc_docs 6fad4e69e835932ed5a79c13c5bd4772dd96101d +v4l-dvb 1efdf1776e2253b77413c997bed862410e4b6aaf +v4l-dvb-next 4cd7d6c957b085d319bcf97814f95854375da0a6 +fbdev 23e9f4ef99dd313fc8d19c326f6518459a402d71 +pm 7f8122a4e8c83711abaf447586980f0ba41a2197 +idle 306899f94804aece6d8fa8b4223ede3b48dbb59c +thermal b32b5e14b4e0d40e06f094d2593b447e00acdf37 +thermal-soc aa647852c32a1890a4b1bc327b9d748b82bc1484 +ieee1394 72f3c27aa6460196ec0261bb780fbba036eef6de +dlm 1c24285372412b26af4f0f980c115e857fb87c02 +swiotlb 69369f52d28a34c84acb6f2a8a585e743441566a +net-next ad9a19d003703ae06a6e8efc64cf26a939d9e84d +ipsec-next 8598112d04af21cf6c895670e72dcb8a9f58e74f +netfilter-next 80cee03bf1d626db0278271b505d7f5febb37bba +nfc-next bd751808f9ff5e1822c627f6c4283009e66b2e53 +ipvs-next a910d20aa007b94cf1799df59341f5e27ca60e6f +wireless-drivers-next eb464d4a8d092a793b97b724cd3cc6eeb229232a +bluetooth f5f3dc0abf8baa7dfbdb2e0720e9a3d221a67ea9 +mac80211-next 80cee03bf1d626db0278271b505d7f5febb37bba +rdma c50c98d382918fe33aa5ed4a6fc5d2ebe26edd49 +gfs2 309e8cda596f6552a32dd14b969ce9b17f837f2f +mtd be3e83e3471cd0faff2c2d88fe9cfc73d9a9745a +l2-mtd d1f936d73683a540227cca3aaecdb68b6c3d53c5 +nand 2d2a2b8c080ad8feab7ca87769dedb3c7a83a375 +spi-nor 90074de6630fbec265fe6a4d8c719c0aac11fc29 +crypto 2d45a7e89833f88b38112292ff227af437f81f2f +drm 7846b12fe0b5feab5446d892f41b5140c1419109 +drm-panel e4bac408b08437d190785ab1250cc676304ed171 +drm-intel 426ca2cb69cda59f32c251d1f3e111aee8c42814 +drm-tegra 65d5d30ccebd555de9ad8fd2b5dfc50291922337 +drm-misc f44d85389e17b2e960620c1c6d89bda978a11f2b +drm-exynos 7d1e042314619115153a0f6f06e4552c09a50e13 +drm-msm 0502a625c2ee0c00fee22a87e3fa185cd8467baf +hdlcd fee4964f0a6cd2ce6368d2c69e9ec8e6f44fb0ec +mali-dp e46477b8f23c4b7286884147928adefd725459d6 +sunxi-drm 7dafb83edd3271917458de0ae70586ac63098e2f +imx-drm 9303519985ed36bf0b294d0b38eb05968043e534 +etnaviv 65375b873cb553c1e52d6e0d77d954011f44433e +kconfig 6f7da290413ba713f0cdd9ff1a2a9bb129ef4f6c +regmap 1874021ec3a8654d80ca1794958dc2230b22889d +sound 2a0d85d9add77bb7a4ddd61557ffb21ca5370d15 +sound-asoc 469e959404062870b2e37f81b9571140b1b6f926 +modules 0bf8bf50eddc7511b52461bae798cbfaa0157a34 +input 39467fc1054a91efa697162a94e5b0e1a4b7b580 +block 50305e13dc24925398af02a7e04988ecd089fe9e +lightnvm 1c6286f26301ad154a1c10fb6e68925493dd28ba +device-mapper c3ca015fab6df124c933b91902f3f2a3473f9da5 +pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8 +mmc b917c6d18c031cfce11ec35139033845f205b1d0 +kgdb 7a6653fca50077f342bcdc39222d78928e3f0feb +md 184a09eb9a2fe425e49c9538f1604b05ed33cfef +mfd b01e9348e106544e50691252bf58cde239681f19 +backlight 2606706e4d7b89ebf13f35895a7dfe00e394e782 +battery 5d01fd38a3b01ca2112a689d70f7ecec40d952ee +omap_dss2 c456a2f30de53e77a2eb8eeb4202d742516aa76b +regulator f039685b2e3a5b77461cd5006a5651ccaeafa396 +security 10e3781dda776f9bccb8aab31daa251dc149dd00 +integrity ed301d2614d2658b1d54115501cc9295de79a819 +keys 8ab2a6905b28a3a54cf833675ef555ab70cc9108 +selinux 0c3014f22dec0e1d14c8298551bfb6434638bdd9 +tpmdd 6227756a7b0a4d0fa2365c5c349f70cb260c0728 +watchdog 4cb30b044a8f06e6e6418ae12c3c00bb02679dac +iommu 47b59d8e40850a05370ee9198ea5e505d89489f1 +dwmw2-iommu 910170442944e1f8674fd5ddbeeb8ccd1877ea98 +vfio 417fb50d5516e8526769c16ff5b92de47adbe727 +trivial 6fbc8798d9461c0ff22fab9fbaddde13de815941 +audit 196a5085592c62ffa4eb739d7ce49c040c2953a1 +devicetree 84024468cf1612783e6ab317da5b72fa41487ac6 +mailbox 1da92afbbfcde9dcbbf85cc94ef506c986c7e4a1 +spi ecb478bf866b8450c724958815e8d46b97c1b113 +tip bdc56fb7a7f9213d3d3c98e704ac6d7520af6440 +clockevents 2287d8664fe7345ead891017eccd879fc605305e +edac 345fb0a9a6340ba0b3b714d62f877fde88c8a755 +edac-amd 398443471f1698003832972637d5508a0c0809e0 +irqchip c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201 +ftrace 170b3b1050e28d1ba0700e262f0899ffa4fccc52 +rcu 656e7c0c0a2e8d899f87fd7f081ea7a711146604 +kvm 5f54c8b2d4fad95d1f8ecbe023ebe6038e6d3760 +kvm-arm 9b87e7a8bfb5098129836757608b3cbbdc11245a +kvm-mips dc44abd6aad22411f7f9890e39fd4753dabf0d03 +kvm-ppc 43f6b0cfb2e4dfd5aa452a1d44491e805e37b7da +kvms390 c95c895303ed13e883e0e6386e0b978174329210 +xen-tip d785d9ec7894d0e92f0d0eecc8add9c84131daa4 +percpu 5e81ee3e6a79cc9fa85af5c3db0f1f269709bbf1 +workqueues f7db01f6cbac655041cccf5200ab6e529fc57c33 +drivers-x86 00ebbeb39b70072cc0d0acad32c47e4660eb84e7 +chrome-platform 859eb05676f67d4960130dff36d3368006716110 +hsi 67ddd75771b6b860bc0cebb3b7fd4cbebeda9cd4 +leds 1591caf2d5eafdfb3b300691f8f99e5bb97d5406 +ipmi 80a46955998024494ab845d404683475607eefab +driver-core d34fc1adf01ff87026da85fb972dc259dc347540 +usb d34fc1adf01ff87026da85fb972dc259dc347540 +usb-gadget 0852659ef071ccd84e85e37195e7c2f3e7c64d1f +usb-serial b5fdde28d4b7731554dc9bdeab529fcddd6ba4c7 +usb-chipidea-next dfebb5f43a78827a4a493048552e500f89fa3b31 +phy-next d9c51f4c53ae2af03aa8bd001d46f21b0adcdab8 +tty d34fc1adf01ff87026da85fb972dc259dc347540 +char-misc d34fc1adf01ff87026da85fb972dc259dc347540 +extcon 6d43755813fa2453c9d29dabda8d2c4d1315a7ee +staging f007cad159e99fa2acd3b2e9364fbb32ad28b971 +mux aae4e7a8bc44722fe70d58920a36916b1043195e +slave-dma 7024d0a3f107feb2d38b13bacb08c156e489515a +cgroup 9c3bace4684bbb227d12f2705099ce7d0c0431d8 +scsi 580b71e9f64e0e6e9063466fce4564c56156695d +scsi-mkp 9189e380e2d3d01f07936b0db9a5ad3da1b3a112 +target-updates 04229774f69250e0f7e63b4d1b50ba8371c9d165 +target-merge 2994a75183173defc21f0d26ce23b63232211b88 +target-bva 2ea659a9ef488125eb46da6eb571de5eae5c43f6 +libata 2ca77e8f558be90f476d5e9c23af37fe09bdb362 +binfmt_misc 4af75df6a410ce76d9f60f27b07e5645ecc2c5ed +vhost ac7380709f6557c1c85fd9011cbe4055433a33ad +rpmsg 7148e5c13dd717561b68dcf142ff8d459835b73c +gpio 02b6bddb0b0a4e27fad6623d82579f2a1e35d3d3 +pinctrl ac059e2aa01dcbbd7e0b2609abbef5790486fafe +pinctrl-samsung bbed85f45b2b727bb776b914b84c67e8fd825433 +pwm 7755daf5e7e82499a4cdd7c2ad2be2578cc1df20 +dma-buf 194cad44c4e1553fd8fcfbc940d27e756324ec3a +userns 076a9bcacfc7ccbc2b3fdf3bd490718f6b182419 +ktest f7c6401ff84ab8ffffc281a29aa0a787f7eb346e +random 72e5c740f6335e27253b8ff64d23d00337091535 +aio 2a8a98673c13cb2a61a6476153acf8344adfa992 +kselftest 369130b63178e0e2f863a2da2a5ad0238ded6d9d +y2038 69973b830859bc6529a7a0468ba0d80ee5117826 +luto-misc 2dcd0af568b0cf583645c8a317dd12e344b1c72a +borntraeger e76d21c40bd6c67fd4e2c1540d77e113df962b4d +livepatching 26d8d1e9bb4878285f8ce852783cbd2f6bb95c1f +coresight 817ee52788a575a0f3502ac25e9a5846783e9b77 +rtc b4be271cebb6f8b475f8bf2199091be8fe4c4278 +hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828 +nvdimm 04c3c982fcc0151ed3574d7ae4f1e62278054d72 +dax-misc 4d9a2c8746671efbb0c27d3ae28c7474597a7aad +idr f0f3f2d0a3e0f7c48163fd8b45f5909d46e7f371 +kspp cb624a11ecd56d31de3edb9e550a21bab1a89925 +akpm-current b57e644ad05d2c3fe75761df96d736808138b5e4 +akpm 48b0d5c128bf8c23a186654690079128cf9e07b1 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..7a0dc179c0ac --- /dev/null +++ b/Next/Trees @@ -0,0 +1,271 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +metag-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#fixes +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt.git#for-stable +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master +mac80211 git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +usb-chipidea-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-stable +phy git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git#fixes +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +ftrace-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next-urgent +nand-fixes git git://git.infradead.org/linux-mtd.git#nand/fixes +spi-nor-fixes git git://git.infradead.org/linux-mtd.git#spi-nor/fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +uuid git git://git.infradead.org/users/hch/uuid.git#for-next +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next +actions git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions.git#for-next +alpine git git://git.kernel.org/pub/scm/linux/kernel/git/atenart/linux.git#alpine/for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git#for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git#at91-next +bcm2835 git git://github.com/anholt/linux.git#for-next +berlin git git://git.infradead.org/users/hesselba/linux-berlin.git#berlin/for-next +cortex-m git git://git.pengutronix.de/git/ukl/linux.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mvebu git git://git.infradead.org/linux-mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +omap-pending git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending.git#for-next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git#for-next +realtek git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +rpi git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-rpi-next +samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +cris git git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git#for-next +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next +hexagon git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git#linux-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +metag git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git#mips-for-linux-next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +mpc5xxx git git://git.denx.de/linux-denx-agust.git#next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +sh git git://git.libc.org/linux-sh#for-next +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +unicore32 git git://github.com/gxt/linux.git#unicore32 +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +fscrypt git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt.git#master +befs git git://git.kernel.org/pub/scm/linux/kernel/git/luisbg/linux-befs.git#for-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next +btrfs-kdave git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +freevxfs git git://git.infradead.org/users/hch/freevxfs.git#for-next +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +vfs-jk git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#vfs +vfs-miklos git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +jdelvare-hwmon quilt http://jdelvare.nerim.net/devel/linux/jdelvare-hwmon/ +dmi quilt http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +fbdev git git://github.com/bzolnier/linux.git#fbdev-for-next +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next +thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +nfc-next git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +mtd git git://git.infradead.org/mtd-2.6.git#master +l2-mtd git git://git.infradead.org/l2-mtd.git#master +nand git git://git.infradead.org/l2-mtd.git#nand/next +spi-nor git git://git.infradead.org/l2-mtd.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://people.freedesktop.org/~airlied/linux.git#drm-next +drm-panel git git://anongit.freedesktop.org/tegra/linux.git#drm/panel/for-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +drm-exynos git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#exynos-drm/for-next +drm-msm git git://people.freedesktop.org/~robclark/linux#msm-next +hdlcd git git://linux-arm.org/linux-ld#for-upstream/hdlcd +mali-dp git git://linux-arm.org/linux-ld#for-upstream/mali-dp +sunxi-drm git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi-drm/for-next +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +lightnvm git git://github.com/OpenChannelSSD/linux.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git#master +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next +md git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +omap_dss2 git git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#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.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#clockevents/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +irqchip git git://git.infradead.org/users/jcooper/linux.git#irqchip/for-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvm-mips git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/kvm-mips.git#next +kvm-ppc git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#kvm-ppc-next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git#for-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-next +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git#next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next +target-merge git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next-merge +target-bva git git://git.kernel.org/pub/scm/linux/kernel/git/bvanassche/linux.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#for-next +binfmt_misc git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/binfmt_misc.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://github.com/andersson/remoteproc.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +dma-buf git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +aio git git://git.kvack.org/~bcrl/aio-next.git#master +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +y2038 git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038 +luto-misc git git://git.kernel.org/pub/scm/linux/kernel/git/luto/linux.git#next +borntraeger git git://git.kernel.org/pub/scm/linux/kernel/git/borntraeger/linux.git#linux-next +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching#for-next +coresight git git://git.linaro.org/kernel/coresight.git#next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +hwspinlock git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git#for-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +dax-misc git git://git.kernel.org/cgit/linux/kernel/git/nvdimm/nvdimm.git#dax-misc +idr git git://git.infradead.org/users/willy/linux-dax.git#idr-4.11 +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +akpm-current mmotm http://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm http://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..3fc86d201621 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3615 @@ +$ date -R +Tue, 12 Sep 2017 09:48:16 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at d719518d9ce9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next +Merging origin/master (f007cad159e9 Revert "firmware: add sanity check on shutdown/suspend") +$ git merge origin/master +Updating d719518d9ce9..f007cad159e9 +Fast-forward + Documentation/devicetree/bindings/arm/amlogic.txt | 41 ++ + .../devicetree/bindings/arm/bcm/brcm,bcm2835.txt | 4 + + Documentation/devicetree/bindings/arm/bhf.txt | 6 + + Documentation/devicetree/bindings/arm/cpus.txt | 1 + + .../devicetree/bindings/arm/marvell/armada-8kp.txt | 15 + + Documentation/devicetree/bindings/arm/mediatek.txt | 18 +- + .../devicetree/bindings/arm/omap/omap.txt | 9 + + Documentation/devicetree/bindings/arm/qcom.txt | 2 + + Documentation/devicetree/bindings/arm/rockchip.txt | 12 + + Documentation/devicetree/bindings/arm/shmobile.txt | 8 + + .../bindings/clock/amlogic,meson8b-clkc.txt | 9 +- + .../bindings/display/bridge/renesas,dw-hdmi.txt | 1 + + .../devicetree/bindings/display/renesas,du.txt | 51 +- + Documentation/devicetree/bindings/dma/ti-edma.txt | 95 ++- + .../devicetree/bindings/gpu/arm,mali-midgard.txt | 1 + + .../interrupt-controller/mediatek,sysirq.txt | 1 + + .../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 52 +- + .../devicetree/bindings/net/can/c_can.txt | 13 +- + .../devicetree/bindings/net/mediatek-net.txt | 6 +- + .../devicetree/bindings/pci/mvebu-pci.txt | 2 +- + .../devicetree/bindings/power/renesas,apmu.txt | 3 +- + .../bindings/power/renesas,rcar-sysc.txt | 1 + + .../devicetree/bindings/reset/renesas,rst.txt | 1 + + .../devicetree/bindings/reset/uniphier-reset.txt | 27 +- + .../devicetree/bindings/serial/mtk-uart.txt | 1 + + .../devicetree/bindings/soc/mediatek/scpsys.txt | 3 + + .../devicetree/bindings/soc/rockchip/grf.txt | 3 + + .../bindings/soc/rockchip/power_domain.txt | 3 + + .../devicetree/bindings/soc/ti/sci-pm-domain.txt | 5 +- + .../devicetree/bindings/sram/renesas,smp-sram.txt | 27 + + .../devicetree/bindings/sram/sunxi-sram.txt | 9 +- + .../devicetree/bindings/vendor-prefixes.txt | 1 + + .../devicetree/bindings/watchdog/mtk-wdt.txt | 6 +- + .../driver-api/firmware/request_firmware.rst | 11 - + MAINTAINERS | 33 +- + arch/arm/Kconfig.debug | 53 +- + arch/arm/boot/dts/Makefile | 24 +- + arch/arm/boot/dts/am335x-bone-common.dtsi | 3 - + arch/arm/boot/dts/am335x-chiliboard.dts | 3 - + arch/arm/boot/dts/am335x-evm.dts | 1 + + arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts | 525 +++++++++++++++++ + arch/arm/boot/dts/am437x-gp-evm.dts | 15 + + arch/arm/boot/dts/am43x-epos-evm.dts | 1 + + arch/arm/boot/dts/am571x-idk.dts | 35 +- + arch/arm/boot/dts/am572x-idk.dts | 34 +- + arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 36 +- + arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts | 17 +- + arch/arm/boot/dts/am57xx-beagle-x15-revc.dts | 39 ++ + arch/arm/boot/dts/am57xx-beagle-x15.dts | 11 + + arch/arm/boot/dts/am57xx-idk-common.dtsi | 8 + + arch/arm/boot/dts/armada-370.dtsi | 4 +- + arch/arm/boot/dts/armada-375.dtsi | 4 +- + arch/arm/boot/dts/armada-380.dtsi | 5 +- + arch/arm/boot/dts/armada-385-db-ap.dts | 2 +- + arch/arm/boot/dts/armada-385-turris-omnia.dts | 2 +- + arch/arm/boot/dts/armada-385.dtsi | 6 +- + arch/arm/boot/dts/armada-388-clearfog.dts | 2 +- + arch/arm/boot/dts/armada-388-clearfog.dtsi | 2 +- + arch/arm/boot/dts/armada-388-db.dts | 2 +- + arch/arm/boot/dts/armada-388-gp.dts | 2 +- + arch/arm/boot/dts/armada-388-rd.dts | 2 +- + arch/arm/boot/dts/armada-38x.dtsi | 7 + + arch/arm/boot/dts/armada-390-db.dts | 2 +- + arch/arm/boot/dts/armada-395-gp.dts | 2 +- + arch/arm/boot/dts/armada-398-db.dts | 2 +- + arch/arm/boot/dts/armada-39x.dtsi | 6 +- + arch/arm/boot/dts/armada-xp-98dx3236.dtsi | 3 +- + arch/arm/boot/dts/armada-xp-db.dts | 2 +- + arch/arm/boot/dts/armada-xp-gp.dts | 2 +- + arch/arm/boot/dts/armada-xp-mv78230.dtsi | 7 +- + arch/arm/boot/dts/armada-xp-mv78260.dtsi | 11 +- + arch/arm/boot/dts/armada-xp-mv78460.dtsi | 14 +- + arch/arm/boot/dts/aspeed-g4.dtsi | 4 +- + arch/arm/boot/dts/at91-sama5d27_som1.dtsi | 102 ++++ + arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 537 +++++++++++++++++ + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 39 +- + arch/arm/boot/dts/at91sam9g45.dtsi | 21 + + arch/arm/boot/dts/at91sam9m10g45ek.dts | 4 + + arch/arm/boot/dts/bcm-cygnus.dtsi | 149 ++++- + arch/arm/boot/dts/bcm-nsp.dtsi | 59 +- + arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 6 + + arch/arm/boot/dts/bcm2835-rpi-a.dts | 6 + + arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 6 + + arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 6 + + arch/arm/boot/dts/bcm2835-rpi-b.dts | 6 + + arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 139 +++++ + arch/arm/boot/dts/bcm2835-rpi-zero.dts | 6 + + arch/arm/boot/dts/bcm2835-rpi.dtsi | 2 +- + arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 6 + + arch/arm/boot/dts/bcm2836.dtsi | 1 + + arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 52 +- + .../dts/broadcom => arm/boot/dts}/bcm2837.dtsi | 1 + + arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 4 + + arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 3 + + arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 6 + + arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 4 + + arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 5 + + arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 3 + + arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 3 + + arch/arm/boot/dts/bcm47189-tenda-ac9.dts | 2 + + arch/arm/boot/dts/bcm5301x.dtsi | 34 ++ + arch/arm/boot/dts/bcm53573.dtsi | 4 + + arch/arm/boot/dts/bcm911360_entphn.dts | 7 +- + arch/arm/boot/dts/bcm947189acdbmr.dts | 97 +++ + arch/arm/boot/dts/bcm958522er.dts | 8 + + arch/arm/boot/dts/bcm958525er.dts | 8 + + arch/arm/boot/dts/bcm958525xmc.dts | 8 + + arch/arm/boot/dts/bcm958622hr.dts | 8 + + arch/arm/boot/dts/bcm958623hr.dts | 8 + + arch/arm/boot/dts/bcm958625hr.dts | 8 + + arch/arm/boot/dts/bcm958625k.dts | 8 + + arch/arm/boot/dts/da850-lego-ev3.dts | 24 + + arch/arm/boot/dts/dove-d3plug.dts | 4 +- + arch/arm/boot/dts/dove.dtsi | 8 +- + arch/arm/boot/dts/dra7-evm-common.dtsi | 258 ++++++++ + arch/arm/boot/dts/dra7-evm.dts | 277 +-------- + arch/arm/boot/dts/dra7.dtsi | 36 +- + arch/arm/boot/dts/dra71-evm.dts | 32 +- + arch/arm/boot/dts/dra72-evm-common.dtsi | 7 +- + arch/arm/boot/dts/dra72-evm-revc.dts | 34 ++ + arch/arm/boot/dts/dra72-evm-tps65917.dtsi | 2 +- + arch/arm/boot/dts/dra72-evm.dts | 32 + + arch/arm/boot/dts/dra72x-mmc-iodelay.dtsi | 350 +++++++++++ + arch/arm/boot/dts/dra74x-mmc-iodelay.dtsi | 647 +++++++++++++++++++++ + arch/arm/boot/dts/dra76-evm.dts | 423 ++++++++++++++ + arch/arm/boot/dts/dra76x.dtsi | 19 + + arch/arm/boot/dts/exynos3250-artik5-eval.dts | 1 - + arch/arm/boot/dts/exynos3250-artik5.dtsi | 1 - + arch/arm/boot/dts/exynos3250-monk.dts | 1 - + arch/arm/boot/dts/exynos3250-rinato.dts | 22 - + arch/arm/boot/dts/exynos4210-trats.dts | 21 - + arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi | 1 - + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 1 - + arch/arm/boot/dts/exynos4412-origen.dts | 1 - + arch/arm/boot/dts/exynos4412-trats2.dts | 22 - + arch/arm/boot/dts/exynos5250-arndale.dts | 2 - + arch/arm/boot/dts/exynos5250-smdk5250.dts | 2 - + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 3 - + arch/arm/boot/dts/exynos5250-spring.dts | 2 - + arch/arm/boot/dts/exynos5260-xyref5260.dts | 2 - + arch/arm/boot/dts/exynos5410-smdk5410.dts | 2 - + arch/arm/boot/dts/exynos5420-peach-pit.dts | 3 - + arch/arm/boot/dts/exynos5440.dtsi | 2 + + arch/arm/boot/dts/exynos5800-peach-pi.dts | 3 - + arch/arm/boot/dts/gemini-dlink-dir-685.dts | 246 ++++++++ + arch/arm/boot/dts/gemini-nas4220b.dts | 24 + + arch/arm/boot/dts/gemini-rut1xx.dts | 39 ++ + arch/arm/boot/dts/gemini-sq201.dts | 36 +- + arch/arm/boot/dts/gemini-wbd111.dts | 26 + + arch/arm/boot/dts/gemini-wbd222.dts | 26 + + arch/arm/boot/dts/gemini.dtsi | 173 +++++- + arch/arm/boot/dts/imx25.dtsi | 7 + + arch/arm/boot/dts/imx53-cx9020.dts | 297 ++++++++++ + arch/arm/boot/dts/imx53-pinfunc.h | 4 + + arch/arm/boot/dts/imx53.dtsi | 9 + + arch/arm/boot/dts/imx6dl-gw52xx.dts | 58 ++ + arch/arm/boot/dts/imx6dl-gw53xx.dts | 58 ++ + arch/arm/boot/dts/imx6dl-gw54xx.dts | 58 ++ + arch/arm/boot/dts/imx6dl-riotboard.dts | 45 ++ + arch/arm/boot/dts/imx6q-apalis-eval.dts | 278 +++++++++ + arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 291 +++++++++ + arch/arm/boot/dts/imx6q-apalis-ixora.dts | 32 +- + arch/arm/boot/dts/imx6q-b850v3.dts | 2 +- + arch/arm/boot/dts/imx6q-bx50v3.dtsi | 42 ++ + arch/arm/boot/dts/imx6q-gw52xx.dts | 58 ++ + arch/arm/boot/dts/imx6q-gw53xx.dts | 58 ++ + arch/arm/boot/dts/imx6q-gw54xx.dts | 58 ++ + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 44 +- + arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 54 ++ + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-gw553x.dtsi | 54 ++ + arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 19 + + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 19 + + arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 112 +++- + arch/arm/boot/dts/imx6qdl.dtsi | 1 + + arch/arm/boot/dts/imx6sl.dtsi | 1 + + arch/arm/boot/dts/imx6sx.dtsi | 1 + + arch/arm/boot/dts/imx6ul-14x14-evk.dts | 40 +- + .../boot/dts/{imx6ul-geam.dtsi => imx6ul-geam.dts} | 74 +++ + arch/arm/boot/dts/imx6ul-isiot-common.dtsi | 141 ----- + arch/arm/boot/dts/imx6ul-isiot-emmc.dts | 1 - + arch/arm/boot/dts/imx6ul-isiot-nand.dts | 1 - + arch/arm/boot/dts/imx6ul-isiot.dtsi | 183 ++++++ + arch/arm/boot/dts/imx6ul-liteboard.dts | 4 + + arch/arm/boot/dts/imx6ul.dtsi | 1 + + arch/arm/boot/dts/imx7-colibri.dtsi | 9 + + arch/arm/boot/dts/imx7d-sdb.dts | 93 +-- + arch/arm/boot/dts/imx7s.dtsi | 32 + + arch/arm/boot/dts/keystone-k2e-evm.dts | 18 + + arch/arm/boot/dts/keystone-k2e.dtsi | 20 + + arch/arm/boot/dts/keystone-k2g-evm.dts | 71 +++ + arch/arm/boot/dts/keystone-k2g-ice.dts | 18 + + arch/arm/boot/dts/keystone-k2g.dtsi | 204 +++++++ + arch/arm/boot/dts/keystone-k2hk-evm.dts | 53 ++ + arch/arm/boot/dts/keystone-k2hk.dtsi | 139 +++++ + arch/arm/boot/dts/keystone-k2l-evm.dts | 33 ++ + arch/arm/boot/dts/keystone-k2l.dtsi | 71 +++ + arch/arm/boot/dts/kirkwood-6192.dtsi | 3 +- + arch/arm/boot/dts/kirkwood-6281.dtsi | 3 +- + arch/arm/boot/dts/kirkwood-6282.dtsi | 4 +- + arch/arm/boot/dts/kirkwood-98dx4122.dtsi | 3 +- + arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts | 2 +- + arch/arm/boot/dts/meson.dtsi | 30 +- + arch/arm/boot/dts/meson6.dtsi | 28 + + arch/arm/boot/dts/meson8.dtsi | 16 + + arch/arm/boot/dts/meson8b.dtsi | 33 +- + arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi | 1 + + arch/arm/boot/dts/mt2701.dtsi | 106 ++++ + arch/arm/boot/dts/mt6323.dtsi | 241 ++++++++ + arch/arm/boot/dts/mt7623-evb.dts | 33 -- + arch/arm/boot/dts/mt7623.dtsi | 211 +++++-- + arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 487 ++++++++++++++++ + arch/arm/boot/dts/mt7623n-rfb-nand.dts | 111 ++++ + arch/arm/boot/dts/mt7623n-rfb.dtsi | 92 +++ + arch/arm/boot/dts/omap3-beagle-xm.dts | 2 +- + arch/arm/boot/dts/omap3-beagle.dts | 2 +- + arch/arm/boot/dts/omap3-cm-t3517.dts | 2 +- + arch/arm/boot/dts/omap3-cm-t3730.dts | 2 +- + arch/arm/boot/dts/omap3-devkit8000-common.dtsi | 2 +- + arch/arm/boot/dts/omap3-evm-common.dtsi | 2 +- + arch/arm/boot/dts/omap3-n900.dts | 89 ++- + arch/arm/boot/dts/omap3-overo-base.dtsi | 2 +- + arch/arm/boot/dts/omap3-tao3530.dtsi | 2 +- + arch/arm/boot/dts/omap3-zoom3.dts | 2 +- + arch/arm/boot/dts/omap3.dtsi | 4 - + arch/arm/boot/dts/omap3430-sdp.dts | 2 +- + arch/arm/boot/dts/omap4-droid4-xt894.dts | 42 +- + arch/arm/boot/dts/omap4-duovero-parlor.dts | 2 +- + arch/arm/boot/dts/omap4-panda-common.dtsi | 2 +- + arch/arm/boot/dts/omap4-sdp-es23plus.dts | 2 +- + arch/arm/boot/dts/omap4-sdp.dts | 2 +- + arch/arm/boot/dts/omap4-var-om44customboard.dtsi | 2 +- + arch/arm/boot/dts/omap5-board-common.dtsi | 2 +- + arch/arm/boot/dts/omap5-cm-t54.dts | 2 +- + arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi | 29 +- + arch/arm/boot/dts/qcom-ipq4019.dtsi | 109 +++- + arch/arm/boot/dts/qcom-msm8974.dtsi | 2 +- + arch/arm/boot/dts/r7s72100-genmai.dts | 71 ++- + arch/arm/boot/dts/r7s72100-rskrza1.dts | 61 ++ + arch/arm/boot/dts/r7s72100.dtsi | 78 +++ + arch/arm/boot/dts/r8a7743-iwg20d-q7.dts | 31 + + arch/arm/boot/dts/r8a7743-iwg20m.dtsi | 26 + + arch/arm/boot/dts/r8a7743-sk-rzg1m.dts | 25 +- + arch/arm/boot/dts/r8a7743.dtsi | 301 +++++++++- + arch/arm/boot/dts/r8a7745-sk-rzg1e.dts | 25 +- + arch/arm/boot/dts/r8a7745.dtsi | 30 +- + arch/arm/boot/dts/r8a7790.dtsi | 30 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 10 +- + arch/arm/boot/dts/r8a7791.dtsi | 28 +- + arch/arm/boot/dts/r8a7792.dtsi | 18 + + arch/arm/boot/dts/r8a7793.dtsi | 18 + + arch/arm/boot/dts/r8a7794.dtsi | 22 +- + arch/arm/boot/dts/rk3036-kylin.dts | 2 - + arch/arm/boot/dts/rk3036.dtsi | 3 +- + arch/arm/boot/dts/rk3066a-bqcurie2.dts | 2 - + arch/arm/boot/dts/rk3066a-mk808.dts | 2 - + arch/arm/boot/dts/rk3066a-rayeager.dts | 3 - + arch/arm/boot/dts/rk3188-px3-evb.dts | 2 - + arch/arm/boot/dts/rk3188-radxarock.dts | 1 - + arch/arm/boot/dts/rk3229-evb.dts | 129 +++- + .../boot/dts/{imx6ul-geam-kit.dts => rk3229.dtsi} | 104 ++-- + arch/arm/boot/dts/rk322x.dtsi | 199 ++++++- + arch/arm/boot/dts/rk3288-evb.dtsi | 51 +- + arch/arm/boot/dts/rk3288-fennec.dts | 8 +- + arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 3 +- + arch/arm/boot/dts/rk3288-firefly-reload.dts | 2 - + arch/arm/boot/dts/rk3288-firefly.dtsi | 5 +- + arch/arm/boot/dts/rk3288-miqi.dts | 4 +- + arch/arm/boot/dts/rk3288-phycore-rdk.dts | 1 - + arch/arm/boot/dts/rk3288-phycore-som.dtsi | 3 +- + arch/arm/boot/dts/rk3288-popmetal.dts | 4 +- + arch/arm/boot/dts/rk3288-r89.dts | 3 +- + arch/arm/boot/dts/rk3288-rock2-som.dtsi | 3 +- + arch/arm/boot/dts/rk3288-rock2-square.dts | 2 - + arch/arm/boot/dts/rk3288-tinker.dts | 8 +- + arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi | 1 - + arch/arm/boot/dts/rk3288-veyron.dtsi | 4 +- + arch/arm/boot/dts/rk3288.dtsi | 215 ++++--- + arch/arm/boot/dts/rv1108-evb.dts | 190 ++++++ + arch/arm/boot/dts/rv1108.dtsi | 369 +++++++++++- + arch/arm/boot/dts/sama5d2.dtsi | 77 ++- + arch/arm/boot/dts/spear1310.dtsi | 3 + + arch/arm/boot/dts/spear1340.dtsi | 1 + + arch/arm/boot/dts/ste-dbx5x0.dtsi | 15 +- + arch/arm/boot/dts/stm32429i-eval.dts | 2 +- + arch/arm/boot/dts/stm32f429-disco.dts | 2 +- + arch/arm/boot/dts/stm32f429.dtsi | 25 + + arch/arm/boot/dts/stm32f469-disco.dts | 2 +- + arch/arm/boot/dts/stm32f746.dtsi | 51 ++ + arch/arm/boot/dts/stm32f769-disco.dts | 6 + + arch/arm/boot/dts/stm32h743.dtsi | 127 +++- + arch/arm/boot/dts/stm32h743i-eval.dts | 18 + + arch/arm/boot/dts/sun6i-a31.dtsi | 6 +- + arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 4 + + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 6 +- + .../boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts | 85 +++ + arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts | 148 +++++ + arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts | 101 ++++ + arch/arm/boot/dts/sun8i-a83t.dtsi | 176 ++++++ + arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 22 +- + arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts | 321 ++++++++++ + arch/arm/boot/dts/tegra114-dalmore.dts | 10 + + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 12 +- + arch/arm/boot/dts/tegra124.dtsi | 1 + + arch/arm/boot/dts/tegra20-paz00.dts | 2 + + arch/arm/boot/dts/tegra30-beaver.dts | 10 + + arch/arm/boot/dts/tps65217.dtsi | 3 + + arch/arm/boot/dts/uniphier-ld4-ref.dts | 10 +- + arch/arm/boot/dts/uniphier-ld4.dtsi | 20 +- + arch/arm/boot/dts/uniphier-ld6b-ref.dts | 10 +- + arch/arm/boot/dts/uniphier-ld6b.dtsi | 2 +- + arch/arm/boot/dts/uniphier-pinctrl.dtsi | 58 +- + arch/arm/boot/dts/uniphier-pro4-ace.dts | 2 +- + arch/arm/boot/dts/uniphier-pro4-ref.dts | 10 +- + arch/arm/boot/dts/uniphier-pro4-sanji.dts | 2 +- + arch/arm/boot/dts/uniphier-pro4.dtsi | 20 +- + arch/arm/boot/dts/uniphier-pro5.dtsi | 60 +- + arch/arm/boot/dts/uniphier-pxs2-gentil.dts | 2 +- + arch/arm/boot/dts/uniphier-pxs2-vodka.dts | 2 +- + arch/arm/boot/dts/uniphier-pxs2.dtsi | 22 +- + arch/arm/boot/dts/uniphier-sld3-ref.dts | 75 --- + arch/arm/boot/dts/uniphier-sld3.dtsi | 260 --------- + arch/arm/boot/dts/uniphier-sld8-ref.dts | 10 +- + arch/arm/boot/dts/uniphier-sld8.dtsi | 20 +- + arch/arm/boot/dts/versatile-pb.dts | 2 +- + arch/arm/boot/dts/zx296702-ad1.dts | 2 - + arch/arm/boot/dts/zynq-7000.dtsi | 8 + + arch/arm/boot/dts/zynq-parallella.dts | 3 +- + arch/arm/boot/dts/zynq-zc702.dts | 20 +- + arch/arm/boot/dts/zynq-zc706.dts | 20 +- + arch/arm/boot/dts/zynq-zed.dts | 5 +- + arch/arm/boot/dts/zynq-zybo.dts | 5 +- + arch/arm/configs/aspeed_g4_defconfig | 5 +- + arch/arm/configs/aspeed_g5_defconfig | 4 +- + arch/arm/configs/bcm2835_defconfig | 7 + + arch/arm/configs/davinci_all_defconfig | 2 + + arch/arm/configs/exynos_defconfig | 79 ++- + arch/arm/configs/ezx_defconfig | 1 - + arch/arm/configs/imx_v6_v7_defconfig | 15 +- + arch/arm/configs/ixp4xx_defconfig | 4 - + arch/arm/configs/keystone_defconfig | 13 + + arch/arm/configs/multi_v7_defconfig | 17 +- + arch/arm/configs/omap2plus_defconfig | 4 + + arch/arm/configs/qcom_defconfig | 1 - + arch/arm/configs/shmobile_defconfig | 18 +- + arch/arm/configs/sunxi_defconfig | 15 +- + arch/arm/configs/tegra_defconfig | 12 +- + arch/arm/configs/vexpress_defconfig | 1 - + arch/arm/include/debug/omap2plus.S | 108 ---- + arch/arm/kernel/cpuidle.c | 4 +- + arch/arm/kernel/devtree.c | 5 +- + arch/arm/kernel/topology.c | 3 +- + arch/arm/mach-ep93xx/clock.c | 8 + + arch/arm/mach-ep93xx/core.c | 24 + + arch/arm/mach-ep93xx/edb93xx.c | 1 + + arch/arm/mach-ep93xx/include/mach/platform.h | 1 + + arch/arm/mach-ep93xx/soc.h | 1 + + arch/arm/mach-exynos/suspend.c | 7 +- + arch/arm/mach-gemini/Kconfig | 5 + + arch/arm/mach-hisi/platsmp.c | 2 +- + arch/arm/mach-imx/gpc.c | 4 +- + arch/arm/mach-mediatek/mediatek.c | 2 + + arch/arm/mach-mediatek/platsmp.c | 1 + + arch/arm/mach-mvebu/Kconfig | 2 + + arch/arm/mach-mvebu/kirkwood.c | 3 +- + arch/arm/mach-omap2/Kconfig | 1 + + arch/arm/mach-omap2/board-generic.c | 1 + + arch/arm/mach-omap2/dma.c | 148 +---- + arch/arm/mach-omap2/id.c | 9 + + arch/arm/mach-omap2/omap-smp.c | 4 +- + arch/arm/mach-omap2/omap-wakeupgen.c | 4 +- + arch/arm/mach-omap2/omap_device.c | 10 - + arch/arm/mach-omap2/omap_hwmod.c | 4 +- + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 11 +- + arch/arm/mach-omap2/pdata-quirks.c | 31 + + arch/arm/mach-omap2/powerdomains7xx_data.c | 33 +- + arch/arm/mach-omap2/prm3xxx.c | 2 +- + arch/arm/mach-omap2/prm44xx.c | 4 +- + arch/arm/mach-omap2/soc.h | 5 + + arch/arm/mach-rockchip/Kconfig | 2 + + arch/arm/mach-rockchip/platsmp.c | 6 +- + arch/arm/mach-s3c24xx/Kconfig | 2 +- + arch/arm/mach-s3c24xx/common.c | 2 +- + arch/arm/mach-s3c24xx/include/mach/regs-clock.h | 4 +- + arch/arm/mach-s3c24xx/mach-mini2440.c | 2 +- + arch/arm/mach-s3c24xx/mach-smdk2443.c | 8 - + arch/arm/mach-s3c24xx/sleep.S | 11 +- + arch/arm/mach-shmobile/Kconfig | 4 - + arch/arm/mach-shmobile/pm-rcar-gen2.c | 33 +- + arch/arm/mach-shmobile/pm-rmobile.c | 7 +- + arch/arm/mach-shmobile/setup-rcar-gen2.c | 21 +- + arch/arm/mach-tegra/Kconfig | 2 + + arch/arm/mach-tegra/tegra.c | 29 +- + arch/arm/plat-samsung/include/plat/map-s3c.h | 2 +- + arch/arm64/Kconfig.platforms | 7 + + arch/arm64/boot/dts/allwinner/Makefile | 2 + + arch/arm64/boot/dts/allwinner/axp803.dtsi | 150 +++++ + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 143 ++++- + .../boot/dts/allwinner/sun50i-a64-nanopi-a64.dts | 207 +++++++ + .../boot/dts/allwinner/sun50i-a64-olinuxino.dts | 199 +++++++ + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 112 ++++ + .../dts/allwinner/sun50i-a64-sopine-baseboard.dts | 22 + + .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 86 +++ + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 9 + + .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 7 + + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 46 +- + .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 58 ++ + .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 7 + + arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 10 + + .../boot/dts/amlogic/meson-gxbb-wetek-play2.dts | 6 + + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 34 ++ + .../boot/dts/amlogic/meson-gxl-s905d-p230.dts | 8 +- + .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 63 ++ + .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 64 ++ + .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 7 + + .../boot/dts/amlogic/meson-gxl-s905x-p212.dts | 7 + + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 35 ++ + .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 7 + + arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 4 + + arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 2 + + arch/arm64/boot/dts/apm/apm-storm.dtsi | 5 + + arch/arm64/boot/dts/arm/foundation-v8.dtsi | 2 +- + arch/arm64/boot/dts/arm/juno-base.dtsi | 14 +- + arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi | 2 +- + arch/arm64/boot/dts/broadcom/Makefile | 4 +- + arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi | 1 - + arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts | 42 +- + .../boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi | 1 - + .../boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi | 1 - + arch/arm64/boot/dts/broadcom/bcm283x.dtsi | 1 - + arch/arm64/boot/dts/broadcom/northstar2/Makefile | 6 + + .../dts/broadcom/{ => northstar2}/ns2-clock.dtsi | 0 + .../boot/dts/broadcom/{ => northstar2}/ns2-svk.dts | 0 + .../boot/dts/broadcom/{ => northstar2}/ns2-xmc.dts | 0 + .../boot/dts/broadcom/{ => northstar2}/ns2.dtsi | 0 + .../boot/dts/broadcom/stingray/bcm958742-base.dtsi | 78 +++ + .../boot/dts/broadcom/stingray/bcm958742k.dts | 4 + + .../boot/dts/broadcom/stingray/bcm958742t.dts | 4 + + .../boot/dts/broadcom/stingray/stingray-fs4.dtsi | 118 ++++ + .../boot/dts/broadcom/stingray/stingray-sata.dtsi | 278 +++++++++ + .../arm64/boot/dts/broadcom/stingray/stingray.dtsi | 136 +++++ + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 19 +- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 4 +- + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 2 - + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 17 + + arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 65 +++ + arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts | 5 - + arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts | 5 - + arch/arm64/boot/dts/freescale/fsl-ls2080a-simu.dts | 5 - + arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 17 + + arch/arm64/boot/dts/freescale/fsl-ls2088a-qds.dts | 5 - + arch/arm64/boot/dts/freescale/fsl-ls2088a-rdb.dts | 5 - + arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi | 17 + + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 51 ++ + arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 37 +- + arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 130 +++++ + arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 9 +- + arch/arm64/boot/dts/hisilicon/hip07-d05.dts | 4 + + arch/arm64/boot/dts/hisilicon/hip07.dtsi | 22 + + arch/arm64/boot/dts/marvell/Makefile | 1 + + .../boot/dts/marvell/armada-3720-espressobin.dts | 30 + + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 11 +- + arch/arm64/boot/dts/marvell/armada-7040-db.dts | 39 ++ + arch/arm64/boot/dts/marvell/armada-8040-db.dts | 65 +++ + arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 124 +++- + arch/arm64/boot/dts/marvell/armada-8080-db.dts | 67 +++ + arch/arm64/boot/dts/marvell/armada-8080.dtsi | 53 ++ + .../dts/marvell/armada-ap810-ap0-octa-core.dtsi | 104 ++++ + arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi | 163 ++++++ + .../boot/dts/marvell/armada-cp110-master.dtsi | 83 ++- + .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 83 ++- + arch/arm64/boot/dts/mediatek/Makefile | 2 + + arch/arm64/boot/dts/mediatek/mt2712-evb.dts | 32 + + arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 171 ++++++ + arch/arm64/boot/dts/mediatek/mt6797.dtsi | 12 +- + arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 27 + + arch/arm64/boot/dts/mediatek/mt7622.dtsi | 110 ++++ + arch/arm64/boot/dts/qcom/Makefile | 1 + + .../arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi | 1 + + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 17 +- + .../boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi | 24 + + arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 198 +++++++ + arch/arm64/boot/dts/qcom/ipq8074-hk01.dts | 52 ++ + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 194 ++++++ + arch/arm64/boot/dts/qcom/msm8916.dtsi | 120 +++- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 314 ++++++++++ + arch/arm64/boot/dts/qcom/pmi8994.dtsi | 17 + + arch/arm64/boot/dts/renesas/Makefile | 1 + + arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts | 2 - + .../boot/dts/renesas/r8a7795-es1-salvator-x.dts | 2 - + arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 9 +- + arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts | 16 +- + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 2 - + .../arm64/boot/dts/renesas/r8a7795-salvator-xs.dts | 8 +- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 314 +++++++++- + arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts | 14 +- + arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 31 +- + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 414 ++++++++++++- + arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 46 ++ + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 155 +++++ + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 4 - + arch/arm64/boot/dts/renesas/salvator-xs.dtsi | 10 + + arch/arm64/boot/dts/renesas/ulcb.dtsi | 51 ++ + arch/arm64/boot/dts/rockchip/Makefile | 3 + + arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 164 ++++++ + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 333 +++++++++++ + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 398 +++++++++++++ + arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi | 1 - + arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts | 1 - + .../boot/dts/rockchip/rk3368-orion-r68-meta.dts | 2 - + arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts | 3 - + arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 2 - + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 140 ++++- + arch/arm64/boot/dts/rockchip/rk3399-evb.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 16 +- + arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts | 44 ++ + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 132 +++-- + arch/arm64/boot/dts/rockchip/rk3399-op1-opp.dtsi | 33 ++ + arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi | 33 ++ + .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 228 ++++++++ + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 547 +++++++++++++++++ + .../dts/rockchip/rk3399-sapphire-excavator.dts | 240 ++++++++ + arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 644 ++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 284 ++++++++- + arch/arm64/boot/dts/socionext/Makefile | 3 +- + .../boot/dts/socionext/uniphier-ld11-global.dts | 6 +- + .../arm64/boot/dts/socionext/uniphier-ld11-ref.dts | 6 +- + arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 35 +- + .../boot/dts/socionext/uniphier-ld20-global.dts | 6 +- + .../arm64/boot/dts/socionext/uniphier-ld20-ref.dts | 6 +- + arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 37 +- + .../arm64/boot/dts/socionext/uniphier-pinctrl.dtsi | 2 +- + .../arm64/boot/dts/socionext/uniphier-pxs3-ref.dts | 62 ++ + arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi | 367 ++++++++++++ + .../boot/dts/socionext/uniphier-ref-daughter.dtsi | 2 +- + .../boot/dts/socionext/uniphier-support-card.dtsi | 2 +- + arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi | 50 +- + arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts | 18 +- + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 277 ++++++++- + arch/arm64/boot/dts/zte/Makefile | 1 + + arch/arm64/boot/dts/zte/zx296718-evb.dts | 68 ++- + arch/arm64/boot/dts/zte/zx296718-pcbox.dts | 143 +++++ + arch/arm64/boot/dts/zte/zx296718.dtsi | 171 +++++- + arch/arm64/configs/defconfig | 40 +- + arch/m68k/coldfire/clk.c | 3 + + arch/m68k/coldfire/m5441x.c | 37 -- + drivers/base/firmware_class.c | 99 ---- + drivers/bus/Kconfig | 2 +- + drivers/bus/arm-cci.c | 12 +- + drivers/bus/imx-weim.c | 8 +- + drivers/bus/omap-ocp2scp.c | 9 +- + drivers/bus/sunxi-rsb.c | 22 +- + drivers/clk/meson/gxbb.c | 2 + + drivers/clk/meson/gxbb.h | 125 +--- + drivers/clk/meson/meson8b.c | 1 + + drivers/clk/meson/meson8b.h | 103 +--- + drivers/firmware/arm_scpi.c | 4 +- + drivers/firmware/psci.c | 4 +- + drivers/firmware/tegra/bpmp.c | 4 +- + drivers/memory/atmel-ebi.c | 17 +- + drivers/memory/jz4780-nemc.c | 12 +- + drivers/memory/mvebu-devbus.c | 12 +- + drivers/memory/omap-gpmc.c | 16 +- + drivers/reset/Kconfig | 9 +- + drivers/reset/Makefile | 2 +- + drivers/reset/core.c | 238 +++++++- + drivers/reset/reset-gemini.c | 110 ---- + drivers/reset/reset-hsdk-v1.c | 137 +++++ + drivers/reset/reset-sunxi.c | 4 +- + drivers/reset/reset-uniphier.c | 117 ++-- + drivers/reset/reset-zx2967.c | 2 +- + drivers/soc/Kconfig | 1 + + drivers/soc/Makefile | 1 + + drivers/soc/amlogic/Kconfig | 12 + + drivers/soc/amlogic/Makefile | 1 + + drivers/soc/amlogic/meson-gx-socinfo.c | 177 ++++++ + drivers/soc/fsl/qbman/bman_ccsr.c | 10 +- + drivers/soc/fsl/qbman/bman_portal.c | 8 +- + drivers/soc/fsl/qbman/qman_ccsr.c | 12 +- + drivers/soc/fsl/qbman/qman_portal.c | 11 +- + drivers/soc/fsl/qe/gpio.c | 4 +- + drivers/soc/mediatek/mtk-pmic-wrap.c | 10 +- + drivers/soc/mediatek/mtk-scpsys.c | 247 ++++---- + drivers/soc/qcom/Kconfig | 4 + + drivers/soc/qcom/mdt_loader.c | 5 +- + drivers/soc/qcom/smsm.c | 3 +- + drivers/soc/qcom/wcnss_ctrl.c | 1 + + drivers/soc/renesas/Kconfig | 7 +- + drivers/soc/renesas/Makefile | 1 + + drivers/soc/renesas/r8a77995-sysc.c | 31 + + drivers/soc/renesas/rcar-rst.c | 5 +- + drivers/soc/renesas/rcar-sysc.c | 9 +- + drivers/soc/renesas/rcar-sysc.h | 1 + + drivers/soc/renesas/renesas-soc.c | 8 + + drivers/soc/rockchip/grf.c | 14 + + drivers/soc/rockchip/pm_domains.c | 32 + + drivers/soc/samsung/pm_domains.c | 10 +- + drivers/soc/sunxi/sunxi_sram.c | 57 +- + drivers/soc/tegra/Kconfig | 5 + + drivers/soc/tegra/fuse/fuse-tegra.c | 56 +- + drivers/soc/tegra/pmc.c | 4 +- + drivers/soc/versatile/soc-realview.c | 2 +- + drivers/tee/optee/core.c | 19 +- + drivers/tee/optee/optee_smc.h | 12 +- + drivers/tee/optee/rpc.c | 15 +- + drivers/tee/tee_core.c | 5 + + drivers/tee/tee_shm.c | 2 +- + include/dt-bindings/clock/gxbb-aoclkc.h | 1 + + include/dt-bindings/clock/gxbb-clkc.h | 63 ++ + include/dt-bindings/clock/meson8b-clkc.h | 70 +++ + include/dt-bindings/clock/rv1108-cru.h | 123 +++- + include/dt-bindings/genpd/k2g.h | 90 --- + include/dt-bindings/pinctrl/dra.h | 3 + + include/dt-bindings/power/mt7622-power.h | 22 + + include/dt-bindings/power/r8a77995-sysc.h | 23 + + include/dt-bindings/power/rk3366-power.h | 24 + + .../dt-bindings/reset/amlogic,meson8b-clkc-reset.h | 27 + + include/dt-bindings/reset/snps,hsdk-v1-reset.h | 17 + + include/linux/platform_data/hsmmc-omap.h | 3 + + include/linux/reset.h | 68 +++ + include/linux/soc/mediatek/infracfg.h | 7 + + include/linux/tee_drv.h | 1 + + include/soc/tegra/fuse.h | 2 + + include/uapi/linux/tee.h | 1 + + 628 files changed, 24222 insertions(+), 3321 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/bhf.txt + create mode 100644 Documentation/devicetree/bindings/arm/marvell/armada-8kp.txt + create mode 100644 Documentation/devicetree/bindings/sram/renesas,smp-sram.txt + create mode 100644 arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts + create mode 100644 arch/arm/boot/dts/am57xx-beagle-x15-revc.dts + create mode 100644 arch/arm/boot/dts/at91-sama5d27_som1.dtsi + create mode 100644 arch/arm/boot/dts/at91-sama5d27_som1_ek.dts + create mode 100644 arch/arm/boot/dts/bcm2835-rpi-zero-w.dts + rename arch/{arm64/boot/dts/broadcom => arm/boot/dts}/bcm2837.dtsi (96%) + create mode 100644 arch/arm/boot/dts/bcm947189acdbmr.dts + create mode 100644 arch/arm/boot/dts/dra7-evm-common.dtsi + create mode 100644 arch/arm/boot/dts/dra72x-mmc-iodelay.dtsi + create mode 100644 arch/arm/boot/dts/dra74x-mmc-iodelay.dtsi + create mode 100644 arch/arm/boot/dts/dra76-evm.dts + create mode 100644 arch/arm/boot/dts/dra76x.dtsi + create mode 100644 arch/arm/boot/dts/gemini-dlink-dir-685.dts + create mode 100644 arch/arm/boot/dts/imx53-cx9020.dts + create mode 100644 arch/arm/boot/dts/imx6q-apalis-eval.dts + create mode 100644 arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts + rename arch/arm/boot/dts/{imx6ul-geam.dtsi => imx6ul-geam.dts} (87%) + delete mode 100644 arch/arm/boot/dts/imx6ul-isiot-common.dtsi + create mode 100644 arch/arm/boot/dts/mt6323.dtsi + delete mode 100644 arch/arm/boot/dts/mt7623-evb.dts + create mode 100644 arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts + create mode 100644 arch/arm/boot/dts/mt7623n-rfb-nand.dts + create mode 100644 arch/arm/boot/dts/mt7623n-rfb.dtsi + rename arch/arm/boot/dts/{imx6ul-geam-kit.dts => rk3229.dtsi} (56%) + create mode 100644 arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts + create mode 100644 arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts + delete mode 100644 arch/arm/boot/dts/uniphier-sld3-ref.dts + delete mode 100644 arch/arm/boot/dts/uniphier-sld3.dtsi + create mode 100644 arch/arm64/boot/dts/allwinner/axp803.dtsi + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts + delete mode 120000 arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi + delete mode 120000 arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi + delete mode 120000 arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi + delete mode 120000 arch/arm64/boot/dts/broadcom/bcm283x.dtsi + create mode 100644 arch/arm64/boot/dts/broadcom/northstar2/Makefile + rename arch/arm64/boot/dts/broadcom/{ => northstar2}/ns2-clock.dtsi (100%) + rename arch/arm64/boot/dts/broadcom/{ => northstar2}/ns2-svk.dts (100%) + rename arch/arm64/boot/dts/broadcom/{ => northstar2}/ns2-xmc.dts (100%) + rename arch/arm64/boot/dts/broadcom/{ => northstar2}/ns2.dtsi (100%) + create mode 100644 arch/arm64/boot/dts/broadcom/stingray/stingray-fs4.dtsi + create mode 100644 arch/arm64/boot/dts/broadcom/stingray/stingray-sata.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/armada-8080-db.dts + create mode 100644 arch/arm64/boot/dts/marvell/armada-8080.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/armada-ap810-ap0-octa-core.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt2712-evb.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt2712e.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt7622.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/ipq8074-hk01.dts + create mode 100644 arch/arm64/boot/dts/qcom/ipq8074.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a77995-draak.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a77995.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-rock64.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi + mode change 120000 => 100644 arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi + create mode 100644 arch/arm64/boot/dts/socionext/uniphier-pxs3-ref.dts + create mode 100644 arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi + mode change 120000 => 100644 arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi + mode change 120000 => 100644 arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi + create mode 100644 arch/arm64/boot/dts/zte/zx296718-pcbox.dts + delete mode 100644 drivers/reset/reset-gemini.c + create mode 100644 drivers/reset/reset-hsdk-v1.c + create mode 100644 drivers/soc/amlogic/Kconfig + create mode 100644 drivers/soc/amlogic/Makefile + create mode 100644 drivers/soc/amlogic/meson-gx-socinfo.c + create mode 100644 drivers/soc/renesas/r8a77995-sysc.c + delete mode 100644 include/dt-bindings/genpd/k2g.h + create mode 100644 include/dt-bindings/power/mt7622-power.h + create mode 100644 include/dt-bindings/power/r8a77995-sysc.h + create mode 100644 include/dt-bindings/power/rk3366-power.h + create mode 100644 include/dt-bindings/reset/amlogic,meson8b-clkc-reset.h + create mode 100644 include/dt-bindings/reset/snps,hsdk-v1-reset.h +Merging fixes/master (b4b8cbf679c4 Cavium CNN55XX: fix broken default Kconfig entry) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/fixes (64236e315955 kbuild: update comments of Makefile.asm-generic) +$ git merge kbuild-current/fixes +Already up-to-date. +Merging arc-current/for-curr (1ee55a8f7f6b ARC: Re-enable MMU upon Machine Check exception) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (746a272e4414 ARM: 8692/1: mm: abort uaccess retries upon fatal signal) +$ git merge arm-current/fixes +Auto-merging arch/arm/kernel/entry-armv.S +Auto-merging arch/arm/include/debug/omap2plus.S +Merge made by the 'recursive' strategy. + arch/arm/include/debug/omap2plus.S | 1 + + arch/arm/kernel/entry-armv.S | 2 ++ + arch/arm/kernel/head.S | 2 ++ + arch/arm/kernel/hyp-stub.S | 1 + + arch/arm/kernel/iwmmxt.S | 1 + + arch/arm/kernel/sleep.S | 1 + + arch/arm/mach-exynos/sleep.S | 1 + + arch/arm/mach-omap2/sleep34xx.S | 2 ++ + arch/arm/mach-omap2/sleep44xx.S | 1 + + arch/arm/mach-pxa/mioa701_bootresume.S | 2 ++ + arch/arm/mach-rockchip/sleep.S | 2 +- + arch/arm/mm/cache-v4wb.S | 1 + + arch/arm/mm/fault.c | 5 ++++- + arch/arm/mm/proc-v7-3level.S | 3 +-- + arch/arm/mm/proc-xscale.S | 1 + + 15 files changed, 22 insertions(+), 4 deletions(-) +Merging m68k-current/for-linus (558d5ad276c9 m68k/mac: Avoid soft-lockup warning after mach_power_off) +$ 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 (1a92a80ad386 powerpc/mm: Ensure cpumask update is ordered) +$ git merge powerpc-fixes/fixes +Already up-to-date. +Merging sparc/master (6470812e2226 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) +$ 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 (4400081b631a mlxsw: spectrum: Fix EEPROM access in case of SFP/SFP+) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 19 +++++++++++++++++-- + drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c | 10 ++++------ + 2 files changed, 21 insertions(+), 8 deletions(-) +Merging ipsec/master (1f4f554a72be net: qualcomm: rmnet: Fix a double free) +$ git merge ipsec/master +Already up-to-date. +Merging netfilter/master (90c4ae4e2c1d netfilter: xt_hashlimit: fix build error caused by 64bit division) +$ git merge netfilter/master +Already up-to-date. +Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set) +$ git merge ipvs/master +Already up-to-date. +Merging wireless-drivers/master (f957dd3c8db2 brcmfmac: feature check for multi-scheduled scan fails on bcm4345 devices) +$ git merge wireless-drivers/master +Already up-to-date. +Merging mac80211/master (126f760ca94d rds: Fix incorrect statistics counting) +$ git merge mac80211/master +Already up-to-date. +Merging sound-current/for-linus (2a0d85d9add7 ALSA: asihpi: Kill BUG_ON() usages) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/core/device.c | 4 +-- + sound/pci/asihpi/asihpi.c | 6 +--- + sound/pci/maestro3.c | 57 +++++++++++++++++++------------------- + sound/pci/rme9652/hdsp.c | 26 ++++++++---------- + sound/pci/rme9652/hdspm.c | 16 +++++------ + sound/pci/ymfpci/ymfpci.c | 62 ++++++++++++++++++++---------------------- + sound/pci/ymfpci/ymfpci_main.c | 41 ++++++++++++++-------------- + sound/usb/6fire/chip.c | 31 +++++++++------------ + sound/usb/usx2y/us122l.c | 10 ++++--- + sound/usb/usx2y/usb_stream.c | 18 ++++++------ + 10 files changed, 130 insertions(+), 141 deletions(-) +Merging pci-current/for-linus (8e1101d25164 PCI/MSI: Don't warn when irq_create_affinity_masks() returns NULL) +$ git merge pci-current/for-linus +Already up-to-date. +Merging driver-core.current/driver-core-linus (d34fc1adf01f Merge branch 'akpm' (patches from Andrew)) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (d34fc1adf01f Merge branch 'akpm' (patches from Andrew)) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (d34fc1adf01f Merge branch 'akpm' (patches from Andrew)) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (b7d44c36a6f6 usb: renesas_usbhs: gadget: fix unused-but-set-variable warning) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (fd1b8668af59 USB: serial: option: add D-Link DWM-222 device ID) +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +Merging usb-chipidea-fixes/ci-for-usb-stable (cbb22ebcfb99 usb: chipidea: core: check before accessing ci_role in ci_role_show) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Already up-to-date. +Merging phy/fixes (5771a8c08880 Linux v4.13-rc1) +$ git merge phy/fixes +Already up-to-date. +Merging staging.current/staging-linus (f007cad159e9 Revert "firmware: add sanity check on shutdown/suspend") +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (d34fc1adf01f Merge branch 'akpm' (patches from Andrew)) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (a6cbfa1e6d38 Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up-to-date. +Merging crypto-current/master (2d45a7e89833 crypto: af_alg - get_page upon reassignment to TX SGL) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (b671e1703394 PNP: ide: constify pnp_device_id) +$ git merge ide/master +Merge made by the 'recursive' strategy. + drivers/ide/ide-pnp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging vfio-fixes/for-linus (796b755066dd vfio/pci: Fix handling of RC integrated endpoint PCIe capability size) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (622b2fbe625b selftests: timers: freq-step: fix compile error) +$ git merge kselftest-fixes/fixes +Already up-to-date. +Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) +$ git merge backlight-fixes/for-backlight-fixes +Already up-to-date. +Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct) +$ git merge ftrace-fixes/for-next-urgent +Already up-to-date. +Merging nand-fixes/nand/fixes (ee02f73e04c0 mtd: nand: atmel: Fix EDO mode check) +$ git merge nand-fixes/nand/fixes +Already up-to-date. +Merging spi-nor-fixes/spi-nor/fixes (5771a8c08880 Linux v4.13-rc1) +$ git merge spi-nor-fixes/spi-nor/fixes +Already up-to-date. +Merging mfd-fixes/for-mfd-fixes (0f0fc5c09005 Revert "mfd: da9061: Fix to remove BBAT_CONT register from chip model") +$ git merge mfd-fixes/for-mfd-fixes +Already up-to-date. +Merging v4l-dvb-fixes/fixes (4cd7d6c957b0 media: get rid of removed DMX_GET_CAPS and DMX_SET_SOURCE leftovers) +$ git merge v4l-dvb-fixes/fixes +Already up-to-date. +Merging reset-fixes/reset/fixes (4497a224f759 reset: hi6220: Set module license so that it can be loaded) +$ git merge reset-fixes/reset/fixes +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (cc4a41fe5541 Linux 4.13-rc7) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up-to-date. +Merging drm-misc-fixes/for-linux-next-fixes (79964dbaf662 drm/bridge/sii8620: Fix memory corruption) +$ git merge drm-misc-fixes/for-linux-next-fixes +Already up-to-date. +Merging kbuild/for-next (cf67100b797d Merge branch 'kbuild' into for-next) +$ git merge kbuild/for-next +Auto-merging tools/scripts/Makefile.include +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 12 ++++++------ + scripts/Makefile.extrawarn | 1 + + scripts/gdb/linux/Makefile | 2 +- + scripts/package/buildtar | 4 ++-- + tools/power/cpupower/Makefile | 2 +- + tools/scripts/Makefile.include | 6 +++--- + 6 files changed, 14 insertions(+), 13 deletions(-) +Merging uuid/for-next (c0020756315e efi: switch to use new generic UUID API) +$ git merge uuid/for-next +Auto-merging include/linux/efi.h +Auto-merging drivers/firmware/efi/cper.c +Merge made by the 'recursive' strategy. + drivers/firmware/efi/cper.c | 10 ++--- + include/linux/cper.h | 94 ++++++++++++++++++++++----------------------- + include/linux/efi.h | 4 +- + 3 files changed, 54 insertions(+), 54 deletions(-) +Merging dma-mapping/for-next (d35b0996fef3 dma-coherent: fix dma_declare_coherent_memory() logic error) +$ git merge dma-mapping/for-next +Auto-merging include/linux/dma-mapping.h +Auto-merging drivers/of/device.c +Auto-merging drivers/net/ethernet/i825xx/lasi_82596.c +Auto-merging drivers/char/virtio_console.c +Auto-merging arch/sh/drivers/pci/fixups-dreamcast.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/DMA-API.txt | 55 +++++--------- + MAINTAINERS | 2 +- + arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 44 +++++------ + arch/arm/mach-imx/mach-mx31moboard.c | 12 +-- + arch/metag/include/asm/dma-mapping.h | 2 +- + arch/nios2/include/asm/dma-mapping.h | 2 +- + arch/sh/drivers/pci/fixups-dreamcast.c | 3 +- + arch/tile/include/asm/dma-mapping.h | 4 +- + drivers/base/dma-coherent.c | 85 ++++++++++------------ + drivers/base/dma-mapping.c | 7 +- + drivers/char/virtio_console.c | 3 - + .../platform/soc_camera/sh_mobile_ceu_camera.c | 5 +- + drivers/net/ethernet/amd/au1000_eth.c | 18 +++-- + drivers/net/ethernet/i825xx/lasi_82596.c | 6 +- + drivers/net/ethernet/i825xx/lib82596.c | 9 ++- + drivers/net/ethernet/i825xx/sni_82596.c | 6 +- + drivers/net/ethernet/seeq/sgiseeq.c | 8 +- + drivers/of/device.c | 48 ++++++++---- + drivers/scsi/NCR_Q720.c | 3 +- + drivers/usb/host/ohci-sm501.c | 7 +- + drivers/usb/host/ohci-tmio.c | 9 +-- + include/linux/dma-mapping.h | 28 ++----- + 22 files changed, 156 insertions(+), 210 deletions(-) +Merging asm-generic/master (a351e9b9fc24 Linux 4.11) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (cc4a41fe5541 Linux 4.13-rc7) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (67715a8964fc Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Auto-merging arch/arm/kernel/entry-common.S +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 4 ++-- + arch/arm/include/asm/smp_scu.h | 1 + + arch/arm/include/asm/suspend.h | 2 ++ + arch/arm/kernel/entry-common.S | 44 +++++++++++++++++++++++++++++------------- + arch/arm/kernel/stacktrace.c | 1 + + 5 files changed, 37 insertions(+), 15 deletions(-) +Merging arm-perf/for-next/perf (e884f80cf2a7 arm64: perf: add support for Cortex-A35) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (765a385caf94 ARM: SoC: Document merges) +$ git merge arm-soc/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/bcm/brcm,brcmstb.txt | 6 +- + .../bindings/memory-controllers/brcm,dpfe-cpu.txt | 27 + + .../devicetree/bindings/mips/brcm/soc.txt | 153 ++++ + MAINTAINERS | 8 + + arch/arm/arm-soc-for-next-contents.txt | 260 +++++++ + drivers/memory/Makefile | 1 + + drivers/memory/brcmstb_dpfe.c | 701 ++++++++++++++++++ + drivers/soc/bcm/Kconfig | 2 + + drivers/soc/bcm/brcmstb/Kconfig | 9 + + drivers/soc/bcm/brcmstb/Makefile | 1 + + drivers/soc/bcm/brcmstb/pm/Makefile | 3 + + drivers/soc/bcm/brcmstb/pm/aon_defs.h | 113 +++ + drivers/soc/bcm/brcmstb/pm/pm-arm.c | 822 +++++++++++++++++++++ + drivers/soc/bcm/brcmstb/pm/pm-mips.c | 461 ++++++++++++ + drivers/soc/bcm/brcmstb/pm/pm.h | 89 +++ + drivers/soc/bcm/brcmstb/pm/s2-arm.S | 76 ++ + drivers/soc/bcm/brcmstb/pm/s2-mips.S | 200 +++++ + drivers/soc/bcm/brcmstb/pm/s3-mips.S | 146 ++++ + 18 files changed, 3077 insertions(+), 1 deletion(-) + create mode 100644 Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 drivers/memory/brcmstb_dpfe.c + create mode 100644 drivers/soc/bcm/brcmstb/Kconfig + create mode 100644 drivers/soc/bcm/brcmstb/pm/Makefile + create mode 100644 drivers/soc/bcm/brcmstb/pm/aon_defs.h + create mode 100644 drivers/soc/bcm/brcmstb/pm/pm-arm.c + create mode 100644 drivers/soc/bcm/brcmstb/pm/pm-mips.c + create mode 100644 drivers/soc/bcm/brcmstb/pm/pm.h + create mode 100644 drivers/soc/bcm/brcmstb/pm/s2-arm.S + create mode 100644 drivers/soc/bcm/brcmstb/pm/s2-mips.S + create mode 100644 drivers/soc/bcm/brcmstb/pm/s3-mips.S +Merging actions/for-next (7d5700467a94 Merge branch 'v4.14/dt64' into next) +$ git merge actions/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/owl-s500-guitar-bb-rev-b.dts | 7 +++++++ + arch/arm/boot/dts/owl-s500.dtsi | 3 +++ + arch/arm64/boot/dts/actions/s900-bubblegum-96.dts | 7 +++++++ + 3 files changed, 17 insertions(+) +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 (293cd5ae9884 Merge branch 'v4.14/drivers' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 10 +++--- + .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 19 ++++++++--- + .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 12 ++++--- + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 9 ++--- + arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 13 +++++--- + .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 10 +++--- + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 39 ++++++++++++++++++++-- + .../dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts | 7 ++-- + .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 13 ++++++-- + .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 10 +++--- + .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 10 +++--- + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 39 ++++++++++++++++++++-- + .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 7 ++-- + arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 1 - + 14 files changed, 150 insertions(+), 49 deletions(-) +Merging aspeed/for-next (0eead81e7847 Merge branches 'dt-for-v4.14' and 'defconfig-for-v4.14' into for-next) +$ git merge aspeed/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging at91/at91-next (569dbb88e80d Linux 4.13) +$ git merge at91/at91-next +Already up-to-date. +Merging bcm2835/for-next (e83e7335d059 Merge branch anholt/bcm2835-defconfig-next into for-next) +$ git merge bcm2835/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next) +$ git merge berlin/berlin/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings) +$ git merge cortex-m/for-next +Already up-to-date. +Merging imx-mxs/for-next (b90b6c45ff6b 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 (f922ce7bbcf5 Merge branch 'for_4.14/keystone_dts' into next) +$ git merge keystone/next +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (b9d2ea8a7107 Merge branch 'mvebu/dt' into mvebu/for-next) +$ git merge mvebu/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (a70cb93b6c2f Merge branch 'omap-for-v4.14/dt-v3' 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 reset/reset/next (d9753c03a0de reset: uniphier: add ethernet reset control support) +$ git merge reset/reset/next +Merge made by the 'recursive' strategy. + drivers/reset/reset-uniphier.c | 4 ++++ + 1 file changed, 4 insertions(+) +Merging qcom/for-next (b212aba8f7bf Merge tag 'qcom-drivers-for-4.14' into final-for-sure-4.14) +$ git merge qcom/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging realtek/for-next (932a3d80019d Merge branch 'v4.14/dt64' into next) +$ git merge realtek/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/realtek/rtd1295.dtsi | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) +Merging renesas/next (e6bf13206283 Merge branches 'arm64-dt-for-v4.14', 'dt-bindings-for-v4.14' and 'dt-for-v4.14' into next) +$ git merge renesas/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging rockchip/for-next (23b856f7af3c Merge branch 'v4.14-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Recorded preimage for 'arch/arm64/boot/dts/rockchip/rk3328-evb.dts' +Auto-merging arch/arm64/boot/dts/rockchip/rk3328-evb.dts +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/rockchip/rk3328-evb.dts +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/arm64/boot/dts/rockchip/rk3328-evb.dts'. +[master 473a1eee73f7] Merge remote-tracking branch 'rockchip/for-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/clock/rockchip,rk3128-cru.txt | 8 +- + arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 70 ++++ + drivers/clk/clk-fractional-divider.c | 28 +- + drivers/clk/rockchip/clk-rk3128.c | 69 ++- + drivers/clk/rockchip/clk-rk3228.c | 2 +- + drivers/clk/rockchip/clk-rv1108.c | 462 +++++++++++++++++---- + drivers/clk/rockchip/clk.c | 36 ++ + include/dt-bindings/clock/rk3228-cru.h | 1 + + include/dt-bindings/clock/rv1108-cru.h | 8 +- + include/linux/clk-provider.h | 3 + + 10 files changed, 577 insertions(+), 110 deletions(-) +Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) +$ git merge rpi/for-rpi-next +Already up-to-date. +Merging samsung/for-next (2ea659a9ef48 Linux 4.12-rc1) +$ git merge samsung/for-next +Already up-to-date. +Merging samsung-krzk/for-next (e6f2efc1a7da Merge branch 'next/soc' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. +Merging sunxi/sunxi/for-next (a5cedb2ecb7f Merge branch 'sunxi/clk-for-4.14' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging drivers/clk/sunxi-ng/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/sunxi-ccu.txt | 6 + + drivers/clk/sunxi-ng/Kconfig | 18 + + drivers/clk/sunxi-ng/Makefile | 2 + + drivers/clk/sunxi-ng/ccu-sun4i-a10.c | 1456 ++++++++++++++++++++ + drivers/clk/sunxi-ng/ccu-sun4i-a10.h | 61 + + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 13 +- + drivers/clk/sunxi-ng/ccu-sun8i-r.h | 2 +- + drivers/clk/sunxi-ng/ccu-sun8i-r40.c | 1290 +++++++++++++++++ + drivers/clk/sunxi-ng/ccu-sun8i-r40.h | 69 + + drivers/clk/sunxi-ng/ccu_div.c | 22 +- + drivers/clk/sunxi-ng/ccu_div.h | 3 +- + drivers/clk/sunxi-ng/ccu_frac.c | 14 +- + drivers/clk/sunxi-ng/ccu_frac.h | 2 +- + drivers/clk/sunxi-ng/ccu_mult.c | 10 +- + drivers/clk/sunxi-ng/ccu_nkm.c | 22 +- + drivers/clk/sunxi-ng/ccu_nkm.h | 2 + + drivers/clk/sunxi-ng/ccu_nm.c | 19 +- + include/dt-bindings/clock/sun4i-a10-ccu.h | 200 +++ + include/dt-bindings/clock/sun7i-a20-ccu.h | 53 + + include/dt-bindings/clock/sun8i-r40-ccu.h | 187 +++ + include/dt-bindings/reset/sun4i-a10-ccu.h | 69 + + include/dt-bindings/reset/sun8i-r40-ccu.h | 130 ++ + 22 files changed, 3628 insertions(+), 22 deletions(-) + create mode 100644 drivers/clk/sunxi-ng/ccu-sun4i-a10.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun4i-a10.h + create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-r40.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-r40.h + create mode 100644 include/dt-bindings/clock/sun4i-a10-ccu.h + create mode 100644 include/dt-bindings/clock/sun7i-a20-ccu.h + create mode 100644 include/dt-bindings/clock/sun8i-r40-ccu.h + create mode 100644 include/dt-bindings/reset/sun4i-a10-ccu.h + create mode 100644 include/dt-bindings/reset/sun8i-r40-ccu.h +Merging tegra/for-next (b4aed883ebbe Merge branch for-4.14/arm/defconfig into for-next) +$ git merge tegra/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (d1be5c99a034 arm64: cleanup {COMPAT_,}SET_PERSONALITY() macro) +$ git merge arm64/for-next/core +Already up-to-date. +Merging clk/clk-next (73c950da6ec5 clk: si5351: fix PLL reset) +$ git merge clk/clk-next +Resolved 'MAINTAINERS' using previous resolution. +Auto-merging sound/soc/atmel/atmel-classd.c +Removing drivers/clk/clk-mb86s7x.c +Auto-merging arch/arm/mach-at91/Kconfig +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging Documentation/devicetree/bindings/clock/renesas,cpg-mssr.txt +Auto-merging Documentation/devicetree/bindings/clock/amlogic,gxbb-aoclkc.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d6cf48e30f3d] Merge remote-tracking branch 'clk/clk-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/clock/amlogic,gxbb-aoclkc.txt | 22 +- + .../devicetree/bindings/clock/at91-clock.txt | 10 + + .../devicetree/bindings/clock/idt,versaclock5.txt | 30 +- + .../devicetree/bindings/clock/renesas,cpg-mssr.txt | 3 +- + .../bindings/clock/renesas,rcar-usb2-clock-sel.txt | 55 + + .../bindings/clock/snps,hsdk-pll-clock.txt | 28 + + .../devicetree/bindings/clock/snps,pll-clock.txt | 28 + + .../devicetree/bindings/clock/st,stm32h7-rcc.txt | 71 + + .../devicetree/bindings/clock/uniphier-clock.txt | 8 +- + .../devicetree/bindings/sound/atmel-classd.txt | 9 +- + MAINTAINERS | 12 + + arch/arm/mach-at91/Kconfig | 4 + + drivers/clk/Kconfig | 17 +- + drivers/clk/Makefile | 3 +- + drivers/clk/at91/Makefile | 1 + + drivers/clk/at91/clk-audio-pll.c | 536 ++++++++ + drivers/clk/at91/clk-generated.c | 101 +- + drivers/clk/axs10x/Makefile | 1 + + drivers/clk/axs10x/pll_clock.c | 346 +++++ + drivers/clk/berlin/bg2.c | 3 +- + drivers/clk/berlin/bg2q.c | 7 +- + drivers/clk/clk-asm9260.c | 4 +- + drivers/clk/clk-conf.c | 16 +- + drivers/clk/clk-cs2000-cp.c | 14 +- + drivers/clk/clk-divider.c | 6 +- + drivers/clk/clk-gate.c | 3 +- + drivers/clk/clk-gemini.c | 7 - + drivers/clk/clk-hsdk-pll.c | 431 ++++++ + drivers/clk/clk-mb86s7x.c | 390 ------ + drivers/clk/clk-moxart.c | 16 +- + drivers/clk/clk-qoriq.c | 26 +- + drivers/clk/clk-si5351.c | 12 +- + drivers/clk/clk-stm32f4.c | 4 +- + drivers/clk/clk-stm32h7.c | 1410 ++++++++++++++++++++ + drivers/clk/clk-versaclock5.c | 172 ++- + drivers/clk/clk-xgene.c | 15 +- + drivers/clk/clk.c | 4 +- + drivers/clk/clkdev.c | 4 +- + drivers/clk/hisilicon/clk-hi6220.c | 6 +- + drivers/clk/imx/clk-imx51-imx53.c | 8 +- + drivers/clk/imx/clk-imx6sl.c | 6 +- + drivers/clk/imx/clk-imx6sx.c | 6 +- + drivers/clk/imx/clk-imx6ul.c | 6 +- + drivers/clk/imx/clk-imx7d.c | 4 +- + drivers/clk/imx/clk-vf610.c | 2 +- + drivers/clk/mediatek/clk-cpumux.c | 6 +- + drivers/clk/mediatek/clk-mtk.c | 2 +- + drivers/clk/mediatek/reset.c | 2 +- + drivers/clk/meson/Kconfig | 1 + + drivers/clk/meson/Makefile | 2 +- + drivers/clk/meson/gxbb-aoclk-32k.c | 194 +++ + drivers/clk/meson/gxbb-aoclk-regmap.c | 46 + + drivers/clk/meson/gxbb-aoclk.c | 65 +- + drivers/clk/meson/gxbb-aoclk.h | 42 + + drivers/clk/meson/gxbb.c | 187 ++- + drivers/clk/meson/meson8b.c | 159 ++- + drivers/clk/meson/meson8b.h | 9 +- + drivers/clk/mmp/clk.c | 2 +- + drivers/clk/nxp/clk-lpc32xx.c | 12 +- + drivers/clk/qcom/clk-smd-rpm.c | 2 - + drivers/clk/qcom/gcc-msm8916.c | 2 +- + drivers/clk/qcom/gcc-msm8996.c | 28 + + drivers/clk/renesas/Kconfig | 48 +- + drivers/clk/renesas/Makefile | 2 + + drivers/clk/renesas/clk-div6.c | 3 + + drivers/clk/renesas/clk-mstp.c | 2 +- + drivers/clk/renesas/clk-rcar-gen2.c | 3 +- + drivers/clk/renesas/r8a7792-cpg-mssr.c | 7 + + drivers/clk/renesas/r8a7795-cpg-mssr.c | 34 +- + drivers/clk/renesas/r8a7796-cpg-mssr.c | 35 +- + drivers/clk/renesas/r8a77995-cpg-mssr.c | 236 ++++ + drivers/clk/renesas/rcar-gen3-cpg.c | 69 +- + drivers/clk/renesas/rcar-gen3-cpg.h | 15 +- + drivers/clk/renesas/rcar-usb2-clock-sel.c | 188 +++ + drivers/clk/renesas/renesas-cpg-mssr.c | 6 + + drivers/clk/renesas/renesas-cpg-mssr.h | 1 + + drivers/clk/rockchip/clk.c | 2 +- + drivers/clk/samsung/clk-exynos-audss.c | 8 +- + drivers/clk/samsung/clk-exynos5420.c | 23 +- + drivers/clk/sunxi-ng/ccu-sun5i.c | 3 +- + drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 3 +- + drivers/clk/sunxi-ng/ccu-sun8i-a23.c | 3 +- + drivers/clk/sunxi-ng/ccu-sun8i-a33.c | 3 +- + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 3 +- + drivers/clk/sunxi-ng/ccu-sun8i-r.c | 3 +- + drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 3 +- + drivers/clk/sunxi/clk-sun8i-bus-gates.c | 4 + + drivers/clk/sunxi/clk-sunxi.c | 17 +- + drivers/clk/tegra/clk-emc.c | 12 +- + drivers/clk/tegra/clk-pll.c | 159 +-- + drivers/clk/tegra/clk-tegra-periph.c | 3 +- + drivers/clk/tegra/clk-tegra-super-gen4.c | 11 +- + drivers/clk/tegra/clk-tegra210.c | 32 +- + drivers/clk/tegra/clk.h | 6 - + drivers/clk/ti/adpll.c | 4 +- + drivers/clk/ti/apll.c | 2 +- + drivers/clk/ti/clockdomain.c | 4 +- + drivers/clk/ti/fapll.c | 4 +- + drivers/clk/uniphier/clk-uniphier-core.c | 26 +- + drivers/clk/uniphier/clk-uniphier-mio.c | 4 +- + drivers/clk/uniphier/clk-uniphier-sys.c | 98 +- + drivers/clk/uniphier/clk-uniphier.h | 4 +- + drivers/clk/ux500/clk-prcc.c | 6 +- + drivers/clk/ux500/clk-prcmu.c | 14 +- + drivers/clk/ux500/clk-sysctrl.c | 8 +- + drivers/clk/versatile/clk-vexpress-osc.c | 2 +- + drivers/clk/zte/clk-zx296718.c | 6 +- + include/dt-bindings/clock/qcom,gcc-msm8996.h | 2 + + include/dt-bindings/clock/r8a77995-cpg-mssr.h | 57 + + include/dt-bindings/clock/stm32h7-clks.h | 165 +++ + include/dt-bindings/mfd/stm32h7-rcc.h | 136 ++ + include/linux/clk-provider.h | 1 + + include/linux/clk/at91_pmc.h | 25 + + sound/soc/atmel/atmel-classd.c | 47 +- + 114 files changed, 5220 insertions(+), 970 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/renesas,rcar-usb2-clock-sel.txt + create mode 100644 Documentation/devicetree/bindings/clock/snps,hsdk-pll-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/snps,pll-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/st,stm32h7-rcc.txt + create mode 100644 drivers/clk/at91/clk-audio-pll.c + create mode 100644 drivers/clk/axs10x/pll_clock.c + create mode 100644 drivers/clk/clk-hsdk-pll.c + delete mode 100644 drivers/clk/clk-mb86s7x.c + create mode 100644 drivers/clk/clk-stm32h7.c + create mode 100644 drivers/clk/meson/gxbb-aoclk-32k.c + create mode 100644 drivers/clk/meson/gxbb-aoclk-regmap.c + create mode 100644 drivers/clk/meson/gxbb-aoclk.h + create mode 100644 drivers/clk/renesas/r8a77995-cpg-mssr.c + create mode 100644 drivers/clk/renesas/rcar-usb2-clock-sel.c + create mode 100644 include/dt-bindings/clock/r8a77995-cpg-mssr.h + create mode 100644 include/dt-bindings/clock/stm32h7-clks.h + create mode 100644 include/dt-bindings/mfd/stm32h7-rcc.h +Merging clk-samsung/for-next (599cebea93e6 clk: samsung: exynos542x: Enable clock rate propagation up to the EPLL) +$ git merge clk-samsung/for-next +Already up-to-date. +Merging c6x/for-linux-next (62016565bb04 c6x: remove unused KTHREAD_SIZE definition) +$ git merge c6x/for-linux-next +Merge made by the 'recursive' strategy. + arch/c6x/kernel/asm-offsets.c | 1 - + 1 file changed, 1 deletion(-) +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 (558d5ad276c9 m68k/mac: Avoid soft-lockup warning after mach_power_off) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (8a1943492bd6 m68knommu: remove dead code) +$ git merge m68knommu/for-next +Already up-to-date. +Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment) +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (14ef905bb2ee microblaze: Fix MSR flags when returning from exception) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (094032707c2c Merge branches '4.13-fixes' and '4.14-features' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Resolved 'drivers/irqchip/irq-mips-gic.c' using previous resolution. +Resolved 'drivers/phy/Makefile' using previous resolution. +Removing include/linux/irqchip/mips-gic.h +Auto-merging drivers/soc/Makefile +Auto-merging drivers/reset/Makefile +Auto-merging drivers/reset/Kconfig +Auto-merging drivers/phy/Makefile +CONFLICT (content): Merge conflict in drivers/phy/Makefile +Auto-merging drivers/phy/Kconfig +Auto-merging drivers/irqchip/irq-mips-gic.c +CONFLICT (content): Merge conflict in drivers/irqchip/irq-mips-gic.c +Auto-merging arch/mips/pci/pci-legacy.c +Removing arch/mips/lantiq/xway/xrx200_phy_fw.c +Removing arch/mips/lantiq/xway/reset.c +Auto-merging arch/mips/kernel/smp.c +Removing arch/mips/kernel/r6000_fpu.S +Auto-merging arch/mips/configs/pistachio_defconfig +Auto-merging arch/mips/alchemy/devboards/db1300.c +Auto-merging arch/mips/alchemy/devboards/db1200.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 19c45d36f3cf] Merge remote-tracking branch 'mips/mips-for-linux-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/mips/lantiq/fpi-bus.txt | 31 ++ + .../devicetree/bindings/mips/lantiq/rcu-gphy.txt | 36 ++ + .../devicetree/bindings/mips/lantiq/rcu.txt | 89 +++ + Documentation/devicetree/bindings/mips/ni.txt | 7 + + Documentation/devicetree/bindings/mips/ralink.txt | 1 + + .../bindings/phy/phy-lantiq-rcu-usb2.txt | 40 ++ + .../devicetree/bindings/reset/lantiq,reset.txt | 30 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + .../devicetree/bindings/watchdog/lantiq-wdt.txt | 24 + + MAINTAINERS | 21 + + arch/mips/Kconfig | 21 +- + arch/mips/Makefile | 31 +- + arch/mips/alchemy/devboards/db1200.c | 64 ++- + arch/mips/alchemy/devboards/db1300.c | 31 +- + arch/mips/alchemy/devboards/db1xxx.c | 2 + + arch/mips/ar7/clock.c | 3 + + arch/mips/ath79/clock.c | 9 +- + arch/mips/bcm63xx/clk.c | 3 + + arch/mips/boot/Makefile | 16 +- + arch/mips/boot/dts/Makefile | 1 + + arch/mips/boot/dts/ingenic/ci20.dts | 37 ++ + arch/mips/boot/dts/ingenic/jz4780.dtsi | 11 + + arch/mips/boot/dts/ni/169445.dts | 100 ++++ + arch/mips/boot/dts/ni/Makefile | 7 + + arch/mips/boot/dts/ralink/Makefile | 2 + + arch/mips/boot/dts/ralink/mt7628a.dtsi | 126 +++++ + arch/mips/boot/dts/ralink/omega2p.dts | 18 + + arch/mips/boot/dts/ralink/vocore2.dts | 18 + + arch/mips/cavium-octeon/executive/Makefile | 2 +- + .../cavium-octeon/executive/cvmx-boot-vector.c | 167 ++++++ + arch/mips/cavium-octeon/executive/cvmx-bootmem.c | 85 +++ + arch/mips/cavium-octeon/octeon-irq.c | 9 + + arch/mips/cavium-octeon/smp.c | 14 +- + arch/mips/configs/cavium_octeon_defconfig | 25 +- + arch/mips/configs/ci20_defconfig | 3 + + arch/mips/configs/generic/board-ni169445.config | 30 + + arch/mips/configs/generic/board-sead-3.config | 2 + + arch/mips/configs/generic_defconfig | 3 +- + arch/mips/configs/gpr_defconfig | 4 - + arch/mips/configs/lemote2f_defconfig | 1 - + arch/mips/configs/malta_defconfig | 1 - + arch/mips/configs/malta_kvm_defconfig | 1 - + arch/mips/configs/malta_kvm_guest_defconfig | 1 + + arch/mips/configs/maltasmvp_defconfig | 1 - + arch/mips/configs/maltasmvp_eva_defconfig | 1 - + arch/mips/configs/mtx1_defconfig | 4 - + arch/mips/configs/nlm_xlp_defconfig | 1 - + arch/mips/configs/nlm_xlr_defconfig | 4 - + arch/mips/configs/omega2p_defconfig | 129 +++++ + arch/mips/configs/pistachio_defconfig | 5 +- + arch/mips/configs/vocore2_defconfig | 129 +++++ + arch/mips/fw/arc/init.c | 2 +- + arch/mips/generic/Kconfig | 6 + + arch/mips/generic/Platform | 4 + + arch/mips/generic/board-boston.its.S | 22 + + arch/mips/generic/board-ni169445.its.S | 22 + + arch/mips/generic/init.c | 5 + + arch/mips/generic/irq.c | 9 +- + arch/mips/generic/vmlinux.its.S | 25 - + arch/mips/include/asm/asm.h | 3 + + arch/mips/include/asm/bmips.h | 4 +- + arch/mips/include/asm/cpu-info.h | 62 ++- + arch/mips/include/asm/cpu-type.h | 5 - + arch/mips/include/asm/cpu.h | 5 - + arch/mips/include/asm/floppy.h | 4 +- + arch/mips/include/asm/fpu_emulator.h | 118 +++- + arch/mips/include/asm/io.h | 2 + + .../asm/mach-au1x00/cpu-feature-overrides.h | 26 + + arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 2 +- + .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 6 +- + arch/mips/include/asm/mach-ip27/topology.h | 1 - + arch/mips/include/asm/mach-lantiq/lantiq.h | 2 - + arch/mips/include/asm/mach-loongson64/loongson.h | 2 +- + arch/mips/include/asm/mach-loongson64/topology.h | 1 - + arch/mips/include/asm/mips-boards/maltaint.h | 5 - + arch/mips/include/asm/mips-cm.h | 567 +++++++++---------- + arch/mips/include/asm/mips-cpc.h | 177 +++--- + arch/mips/include/asm/mips-cps.h | 240 ++++++++ + arch/mips/include/asm/mips-gic.h | 347 ++++++++++++ + arch/mips/include/asm/mipsregs.h | 13 + + arch/mips/include/asm/module.h | 2 - + arch/mips/include/asm/netlogic/common.h | 2 +- + arch/mips/include/asm/octeon/cvmx-boot-vector.h | 53 ++ + arch/mips/include/asm/octeon/cvmx-bootmem.h | 28 + + arch/mips/include/asm/octeon/cvmx-ciu-defs.h | 10 + + arch/mips/include/asm/octeon/cvmx.h | 28 + + arch/mips/include/asm/octeon/octeon.h | 2 + + arch/mips/include/asm/smp-ops.h | 16 +- + arch/mips/include/asm/smp.h | 10 +- + arch/mips/include/asm/stackframe.h | 280 ++++++---- + arch/mips/include/asm/stacktrace.h | 64 ++- + arch/mips/include/asm/topology.h | 2 +- + arch/mips/include/uapi/asm/inst.h | 2 +- + arch/mips/kernel/Makefile | 14 +- + arch/mips/kernel/cps-vec.S | 4 +- + arch/mips/kernel/cpu-probe.c | 59 +- + arch/mips/kernel/genex.S | 13 +- + arch/mips/kernel/idle.c | 1 + + arch/mips/kernel/mips-cm.c | 94 ++-- + arch/mips/kernel/mips-cpc.c | 17 +- + arch/mips/kernel/mips-r2-to-r6-emul.c | 16 +- + arch/mips/kernel/octeon_switch.S | 11 +- + arch/mips/kernel/pm-cps.c | 17 +- + arch/mips/kernel/proc.c | 6 +- + arch/mips/kernel/process.c | 102 ++-- + arch/mips/kernel/r2300_fpu.S | 80 ++- + arch/mips/kernel/r2300_switch.S | 81 --- + arch/mips/kernel/r4k_fpu.S | 196 +++++++ + arch/mips/kernel/r4k_switch.S | 203 ------- + arch/mips/kernel/r6000_fpu.S | 99 ---- + arch/mips/kernel/smp-bmips.c | 10 +- + arch/mips/kernel/smp-cmp.c | 6 +- + arch/mips/kernel/smp-cps.c | 152 ++--- + arch/mips/kernel/smp-mt.c | 14 +- + arch/mips/kernel/smp-up.c | 5 +- + arch/mips/kernel/smp.c | 24 +- + arch/mips/kernel/time.c | 14 - + arch/mips/kernel/traps.c | 29 +- + arch/mips/kernel/unaligned.c | 2 +- + arch/mips/kernel/vdso.c | 15 +- + arch/mips/lantiq/Kconfig | 2 + + arch/mips/lantiq/falcon/reset.c | 23 +- + arch/mips/lantiq/irq.c | 4 - + arch/mips/lantiq/prom.c | 2 +- + arch/mips/lantiq/xway/Makefile | 4 +- + arch/mips/lantiq/xway/reset.c | 387 ------------- + arch/mips/lantiq/xway/sysctrl.c | 83 +-- + arch/mips/lantiq/xway/xrx200_phy_fw.c | 113 ---- + arch/mips/lib/Makefile | 2 +- + arch/mips/lib/delay.c | 1 + + arch/mips/lib/iomap_copy.c | 42 ++ + arch/mips/loongson64/lemote-2f/clock.c | 3 + + arch/mips/loongson64/loongson-3/smp.c | 16 +- + arch/mips/math-emu/Makefile | 6 +- + arch/mips/math-emu/cp1emu.c | 284 +++++++++- + arch/mips/math-emu/dp_fmax.c | 84 ++- + arch/mips/math-emu/dp_fmin.c | 86 ++- + arch/mips/math-emu/dp_maddf.c | 246 +++++--- + arch/mips/math-emu/dp_rint.c | 89 +++ + arch/mips/math-emu/ieee754.h | 2 + + arch/mips/math-emu/ieee754int.h | 4 + + arch/mips/math-emu/ieee754sp.h | 4 + + arch/mips/math-emu/me-debugfs.c | 318 ++++++++++- + arch/mips/math-emu/sp_fmax.c | 84 ++- + arch/mips/math-emu/sp_fmin.c | 86 ++- + arch/mips/math-emu/sp_maddf.c | 229 ++++---- + arch/mips/math-emu/sp_rint.c | 90 +++ + arch/mips/mm/c-r4k.c | 2 +- + arch/mips/mm/cache.c | 2 +- + arch/mips/mm/dma-default.c | 46 +- + arch/mips/mm/init.c | 1 + + arch/mips/mm/mmap.c | 1 + + arch/mips/mm/sc-mips.c | 47 +- + arch/mips/mm/tlbex-fault.S | 7 +- + arch/mips/mm/tlbex.c | 5 - + arch/mips/mti-malta/malta-dtshim.c | 4 +- + arch/mips/mti-malta/malta-init.c | 3 +- + arch/mips/mti-malta/malta-int.c | 5 +- + arch/mips/mti-malta/malta-setup.c | 4 +- + arch/mips/mti-malta/malta-time.c | 26 +- + arch/mips/netlogic/common/smp.c | 8 +- + arch/mips/oprofile/op_model_mipsxx.c | 4 +- + arch/mips/paravirt/paravirt-smp.c | 5 +- + arch/mips/paravirt/setup.c | 2 +- + arch/mips/pci/pci-legacy.c | 2 +- + arch/mips/pci/pci-malta.c | 6 +- + arch/mips/pci/pci-mt7620.c | 2 +- + arch/mips/pci/pci-rt3883.c | 11 +- + arch/mips/pistachio/init.c | 3 +- + arch/mips/pistachio/irq.c | 1 - + arch/mips/pistachio/time.c | 2 +- + arch/mips/ralink/Kconfig | 10 + + arch/mips/ralink/clk.c | 3 + + arch/mips/ralink/irq-gic.c | 2 +- + arch/mips/ralink/mt7621.c | 5 +- + arch/mips/sgi-ip27/ip27-smp.c | 5 +- + arch/mips/sibyte/bcm1480/smp.c | 5 +- + arch/mips/sibyte/common/cfe.c | 4 +- + arch/mips/sibyte/sb1250/smp.c | 5 +- + arch/mips/tools/generic-board-config.sh | 90 +++ + arch/mips/vdso/gettimeofday.c | 8 +- + arch/mips/vdso/sigreturn.S | 10 - + drivers/clocksource/mips-gic-timer.c | 37 +- + drivers/cpuidle/cpuidle-cps.c | 2 +- + drivers/irqchip/irq-mips-cpu.c | 2 +- + drivers/irqchip/irq-mips-gic.c | 616 ++++++--------------- + drivers/mtd/maps/lantiq-flash.c | 6 - + drivers/pcmcia/db1xxx_ss.c | 33 +- + drivers/phy/Kconfig | 1 + + drivers/phy/Makefile | 2 +- + drivers/phy/lantiq/Kconfig | 9 + + drivers/phy/lantiq/Makefile | 1 + + drivers/phy/lantiq/phy-lantiq-rcu-usb2.c | 254 +++++++++ + drivers/reset/Kconfig | 6 + + drivers/reset/Makefile | 1 + + drivers/reset/reset-lantiq.c | 212 +++++++ + drivers/soc/Makefile | 1 + + drivers/soc/lantiq/Makefile | 2 + + drivers/soc/lantiq/fpi-bus.c | 87 +++ + drivers/soc/lantiq/gphy.c | 260 +++++++++ + drivers/watchdog/lantiq_wdt.c | 74 ++- + drivers/watchdog/octeon-wdt-main.c | 354 ++++++------ + drivers/watchdog/octeon-wdt-nmi.S | 42 +- + include/dt-bindings/mips/lantiq_rcu_gphy.h | 15 + + include/linux/irqchip/mips-gic.h | 297 ---------- + 205 files changed, 6399 insertions(+), 3427 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mips/lantiq/fpi-bus.txt + create mode 100644 Documentation/devicetree/bindings/mips/lantiq/rcu-gphy.txt + create mode 100644 Documentation/devicetree/bindings/mips/lantiq/rcu.txt + create mode 100644 Documentation/devicetree/bindings/mips/ni.txt + create mode 100644 Documentation/devicetree/bindings/phy/phy-lantiq-rcu-usb2.txt + create mode 100644 Documentation/devicetree/bindings/reset/lantiq,reset.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/lantiq-wdt.txt + create mode 100644 arch/mips/boot/dts/ni/169445.dts + create mode 100644 arch/mips/boot/dts/ni/Makefile + create mode 100644 arch/mips/boot/dts/ralink/mt7628a.dtsi + create mode 100644 arch/mips/boot/dts/ralink/omega2p.dts + create mode 100644 arch/mips/boot/dts/ralink/vocore2.dts + create mode 100644 arch/mips/cavium-octeon/executive/cvmx-boot-vector.c + create mode 100644 arch/mips/configs/generic/board-ni169445.config + create mode 100644 arch/mips/configs/omega2p_defconfig + create mode 100644 arch/mips/configs/vocore2_defconfig + create mode 100644 arch/mips/generic/board-boston.its.S + create mode 100644 arch/mips/generic/board-ni169445.its.S + create mode 100644 arch/mips/include/asm/mips-cps.h + create mode 100644 arch/mips/include/asm/mips-gic.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-boot-vector.h + delete mode 100644 arch/mips/kernel/r6000_fpu.S + delete mode 100644 arch/mips/lantiq/xway/reset.c + delete mode 100644 arch/mips/lantiq/xway/xrx200_phy_fw.c + create mode 100644 arch/mips/lib/iomap_copy.c + create mode 100644 arch/mips/math-emu/dp_rint.c + create mode 100644 arch/mips/math-emu/sp_rint.c + create mode 100755 arch/mips/tools/generic-board-config.sh + create mode 100644 drivers/phy/lantiq/Kconfig + create mode 100644 drivers/phy/lantiq/Makefile + create mode 100644 drivers/phy/lantiq/phy-lantiq-rcu-usb2.c + create mode 100644 drivers/reset/reset-lantiq.c + create mode 100644 drivers/soc/lantiq/Makefile + create mode 100644 drivers/soc/lantiq/fpi-bus.c + create mode 100644 drivers/soc/lantiq/gphy.c + create mode 100644 include/dt-bindings/mips/lantiq_rcu_gphy.h + delete mode 100644 include/linux/irqchip/mips-gic.h +Merging nios2/for-next (e118c3fec9c0 nios2: remove custom early console implementation) +$ git merge nios2/for-next +Already up-to-date. +Merging openrisc/for-next (56ce2f25ab0d openrisc: add forward declaration for struct vm_area_struct) +$ git merge openrisc/for-next +Merge made by the 'recursive' strategy. + arch/openrisc/include/asm/pgtable.h | 2 ++ + 1 file changed, 2 insertions(+) +Merging parisc-hd/for-next (569dbb88e80d Linux 4.13) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (265601f034df powerpc/xive: Fix section __init warning) +$ git merge powerpc/next +Already up-to-date. +Merging fsl/next (a4e89ffb5923 powerpc/e6500: Update machine check for L1D cache err) +$ git merge fsl/next +Auto-merging arch/powerpc/kernel/traps.c +Merge made by the 'recursive' strategy. + arch/powerpc/kernel/traps.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) +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 (e443343e509a s390/dasd: blk-mq conversion) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/include/asm/ap.h | 126 ++++++++++++++ + arch/s390/include/asm/mmu.h | 7 +- + arch/s390/include/asm/mmu_context.h | 10 +- + arch/s390/include/asm/tlbflush.h | 30 +--- + arch/s390/mm/gmap.c | 8 +- + arch/s390/mm/pgalloc.c | 20 +-- + drivers/s390/block/dasd.c | 331 +++++++++++++++++++----------------- + drivers/s390/block/dasd_devmap.c | 8 +- + drivers/s390/block/dasd_int.h | 19 ++- + drivers/s390/crypto/ap_asm.h | 9 +- + drivers/s390/crypto/ap_bus.c | 49 ++++-- + drivers/s390/crypto/ap_bus.h | 47 +---- + drivers/s390/crypto/ap_queue.c | 26 ++- + 13 files changed, 416 insertions(+), 274 deletions(-) + create mode 100644 arch/s390/include/asm/ap.h +Merging sparc-next/master (d719518d9ce9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next) +$ git merge sparc-next/master +Already up-to-date. +Merging sh/for-next (6e2fbfdd585f sh: fix futex FUTEX_OP_SET op on userspace addresses) +$ git merge sh/for-next +Auto-merging arch/sh/include/asm/futex.h +Merge made by the 'recursive' strategy. + arch/sh/include/asm/futex.h | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) +Merging tile/master (637f23abca87 tile: array underflow in setup_maxnodemem()) +$ git merge tile/master +Auto-merging arch/tile/kernel/setup.c +Merge made by the 'recursive' strategy. + arch/tile/configs/tilegx_defconfig | 1 - + arch/tile/configs/tilepro_defconfig | 2 -- + arch/tile/kernel/setup.c | 2 +- + 3 files changed, 1 insertion(+), 4 deletions(-) +Merging uml/linux-next (2fb44600fe78 um: Fix check for _xstate for older hosts) +$ git merge uml/linux-next +Already up-to-date. +Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface) +$ git merge unicore32/unicore32 +Resolved 'arch/unicore32/include/asm/Kbuild' using previous resolution. +Auto-merging arch/unicore32/include/asm/Kbuild +CONFLICT (content): Merge conflict in arch/unicore32/include/asm/Kbuild +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master aa68e1d7d6b2] Merge remote-tracking branch 'unicore32/unicore32' +$ git diff -M --stat --summary HEAD^.. + arch/unicore32/Kconfig | 14 + + arch/unicore32/include/asm/Kbuild | 1 - + arch/unicore32/include/asm/signal.h | 21 + + arch/unicore32/include/asm/syscalls.h | 25 + + arch/unicore32/include/uapi/asm/sigcontext.h | 14 + + arch/unicore32/include/uapi/asm/stat-oldabi.h | 71 +++ + arch/unicore32/include/uapi/asm/stat.h | 19 + + arch/unicore32/include/uapi/asm/unistd-oldabi.h | 770 ++++++++++++++++++++++++ + arch/unicore32/include/uapi/asm/unistd.h | 8 + + arch/unicore32/kernel/entry.S | 17 + + arch/unicore32/kernel/signal.c | 41 ++ + 11 files changed, 1000 insertions(+), 1 deletion(-) + create mode 100644 arch/unicore32/include/asm/signal.h + create mode 100644 arch/unicore32/include/asm/syscalls.h + create mode 100644 arch/unicore32/include/uapi/asm/stat-oldabi.h + create mode 100644 arch/unicore32/include/uapi/asm/stat.h + create mode 100644 arch/unicore32/include/uapi/asm/unistd-oldabi.h +Merging xtensa/xtensa-for-next (271335b9726e Merge branch 'xtensa-fixes' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging fscrypt/master (c250b7dd8e73 fscrypt: make ->dummy_context() return bool) +$ git merge fscrypt/master +Already up-to-date. +Merging befs/for-next (5771a8c08880 Linux v4.13-rc1) +$ git merge befs/for-next +Already up-to-date. +Merging btrfs/next (5226fcac7841 squashfs: Add zstd support) +$ git merge btrfs/next +Resolved 'fs/btrfs/compression.h' using previous resolution. +Auto-merging lib/Makefile +Auto-merging lib/Kconfig +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/props.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/ctree.h +Auto-merging fs/btrfs/compression.h +CONFLICT (content): Merge conflict in fs/btrfs/compression.h +Auto-merging fs/btrfs/compression.c +Auto-merging crypto/testmgr.h +Auto-merging crypto/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6b6c13531d05] Merge remote-tracking branch 'btrfs/next' +$ git diff -M --stat --summary HEAD^.. + crypto/Kconfig | 9 + + crypto/Makefile | 1 + + crypto/testmgr.c | 10 + + crypto/testmgr.h | 71 + + crypto/zstd.c | 265 ++++ + fs/btrfs/Kconfig | 2 + + fs/btrfs/Makefile | 2 +- + fs/btrfs/compression.c | 1 + + fs/btrfs/compression.h | 4 +- + fs/btrfs/ctree.h | 1 + + fs/btrfs/disk-io.c | 2 + + fs/btrfs/ioctl.c | 6 +- + fs/btrfs/props.c | 6 + + fs/btrfs/super.c | 12 +- + fs/btrfs/sysfs.c | 2 + + fs/btrfs/zstd.c | 432 ++++++ + fs/squashfs/Kconfig | 14 + + fs/squashfs/Makefile | 1 + + fs/squashfs/decompressor.c | 7 + + fs/squashfs/decompressor.h | 4 + + fs/squashfs/squashfs_fs.h | 1 + + fs/squashfs/zstd_wrapper.c | 151 ++ + include/linux/xxhash.h | 236 +++ + include/linux/zstd.h | 1157 +++++++++++++++ + include/uapi/linux/btrfs.h | 8 +- + lib/Kconfig | 11 + + lib/Makefile | 3 + + lib/xxhash.c | 500 +++++++ + lib/zstd/Makefile | 18 + + lib/zstd/bitstream.h | 374 +++++ + lib/zstd/compress.c | 3484 ++++++++++++++++++++++++++++++++++++++++++++ + lib/zstd/decompress.c | 2528 ++++++++++++++++++++++++++++++++ + lib/zstd/entropy_common.c | 243 +++ + lib/zstd/error_private.h | 53 + + lib/zstd/fse.h | 575 ++++++++ + lib/zstd/fse_compress.c | 795 ++++++++++ + lib/zstd/fse_decompress.c | 332 +++++ + lib/zstd/huf.h | 212 +++ + lib/zstd/huf_compress.c | 770 ++++++++++ + lib/zstd/huf_decompress.c | 960 ++++++++++++ + lib/zstd/mem.h | 151 ++ + lib/zstd/zstd_common.c | 75 + + lib/zstd/zstd_internal.h | 263 ++++ + lib/zstd/zstd_opt.h | 1014 +++++++++++++ + 44 files changed, 14755 insertions(+), 11 deletions(-) + create mode 100644 crypto/zstd.c + create mode 100644 fs/btrfs/zstd.c + create mode 100644 fs/squashfs/zstd_wrapper.c + create mode 100644 include/linux/xxhash.h + create mode 100644 include/linux/zstd.h + create mode 100644 lib/xxhash.c + create mode 100644 lib/zstd/Makefile + create mode 100644 lib/zstd/bitstream.h + create mode 100644 lib/zstd/compress.c + create mode 100644 lib/zstd/decompress.c + create mode 100644 lib/zstd/entropy_common.c + create mode 100644 lib/zstd/error_private.h + create mode 100644 lib/zstd/fse.h + create mode 100644 lib/zstd/fse_compress.c + create mode 100644 lib/zstd/fse_decompress.c + create mode 100644 lib/zstd/huf.h + create mode 100644 lib/zstd/huf_compress.c + create mode 100644 lib/zstd/huf_decompress.c + create mode 100644 lib/zstd/mem.h + create mode 100644 lib/zstd/zstd_common.c + create mode 100644 lib/zstd/zstd_internal.h + create mode 100644 lib/zstd/zstd_opt.h +Merging btrfs-kdave/for-next (d112b114021d Merge branch 'for-next-next-v4.14-20170822' into for-next-20170822) +$ git merge btrfs-kdave/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging ceph/master (15b51bd6badb ceph: stop on-going cached readdir if mds revokes FILE_SHARED cap) +$ git merge ceph/master +Auto-merging fs/ceph/cache.c +Merge made by the 'recursive' strategy. + drivers/block/rbd.c | 2 +- + fs/ceph/addr.c | 403 ++++++++++++++++++++++------------------ + fs/ceph/cache.c | 2 +- + fs/ceph/caps.c | 40 ++-- + fs/ceph/debugfs.c | 2 +- + fs/ceph/dir.c | 6 +- + fs/ceph/file.c | 50 ++--- + fs/ceph/inode.c | 53 +++--- + fs/ceph/mds_client.c | 37 ++-- + fs/ceph/mdsmap.c | 6 +- + fs/ceph/snap.c | 37 ++-- + fs/ceph/super.c | 78 ++++---- + fs/ceph/super.h | 16 +- + fs/ceph/xattr.c | 8 +- + include/linux/ceph/ceph_fs.h | 6 +- + include/linux/ceph/libceph.h | 11 -- + include/linux/ceph/mon_client.h | 4 +- + include/linux/ceph/rados.h | 1 - + net/ceph/mon_client.c | 6 +- + net/ceph/osd_client.c | 5 - + 20 files changed, 421 insertions(+), 352 deletions(-) +Merging cifs/for-next (5b6d827f246f cifs: check rsp for NULL before dereferencing in SMB2_open) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/smb2pdu.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging configfs/for-next (19e72d3abb63 configfs: Introduce config_item_get_unless_zero()) +$ git merge configfs/for-next +Already up-to-date. +Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/main.c +Auto-merging fs/ecryptfs/ecryptfs_kernel.h +Merge made by the 'recursive' strategy. + fs/ecryptfs/crypto.c | 15 --------------- + fs/ecryptfs/ecryptfs_kernel.h | 9 ++++++++- + fs/ecryptfs/keystore.c | 2 +- + fs/ecryptfs/main.c | 2 +- + fs/ecryptfs/miscdev.c | 2 +- + 5 files changed, 11 insertions(+), 19 deletions(-) +Merging ext3/for_next (f007cad159e9 Revert "firmware: add sanity check on shutdown/suspend") +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (b5f515735bea ext4: avoid Y2038 overflow in recently_deleted()) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (27161f13e3c3 f2fs: avoid race in between read xattr & write xattr) +$ git merge f2fs/dev +Auto-merging include/trace/events/f2fs.h +Auto-merging fs/f2fs/segment.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/data.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 21 ++ + Documentation/filesystems/f2fs.txt | 19 ++ + fs/f2fs/acl.c | 5 +- + fs/f2fs/checkpoint.c | 60 ++++- + fs/f2fs/data.c | 177 +++++++------ + fs/f2fs/f2fs.h | 284 ++++++++++++++++++--- + fs/f2fs/file.c | 360 ++++++++++++++++++++++---- + fs/f2fs/gc.c | 115 ++++++--- + fs/f2fs/gc.h | 27 +- + fs/f2fs/inline.c | 135 +++++----- + fs/f2fs/inode.c | 129 +++++++++- + fs/f2fs/namei.c | 43 ++++ + fs/f2fs/node.c | 79 ++++-- + fs/f2fs/recovery.c | 83 ++++-- + fs/f2fs/segment.c | 255 +++++++++++++++---- + fs/f2fs/segment.h | 34 ++- + fs/f2fs/super.c | 433 +++++++++++++++++++++++++++++--- + fs/f2fs/sysfs.c | 249 +++++++++++++++--- + fs/f2fs/xattr.c | 8 +- + include/linux/f2fs_fs.h | 40 ++- + include/trace/events/f2fs.h | 113 ++++++++- + 21 files changed, 2173 insertions(+), 496 deletions(-) +Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information) +$ git merge freevxfs/for-next +Already up-to-date. +Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew)) +$ git merge fscache/fscache +Already up-to-date. +Merging fuse/for-next (9183976ef1c8 fuse: set mapping error in writepage_locked when it fails) +$ git merge fuse/for-next +Already up-to-date. +Merging jfs/jfs-next (f070e5ac9bc7 jfs: preserve i_mode if __jfs_set_acl() fails) +$ git merge jfs/jfs-next +Already up-to-date. +Merging nfs/linux-next (1bd5d6d08ea7 NFS: Count the bytes of skipped subrequests in nfs_lock_and_join_requests()) +$ git merge nfs/linux-next +Auto-merging net/sunrpc/svcsock.c +Merge made by the 'recursive' strategy. + fs/lockd/clntlock.c | 6 +- + fs/nfs/callback_proc.c | 2 +- + fs/nfs/delegation.c | 2 +- + fs/nfs/dir.c | 4 - + fs/nfs/direct.c | 4 +- + fs/nfs/file.c | 17 +- + fs/nfs/inode.c | 10 +- + fs/nfs/internal.h | 1 - + fs/nfs/nfs4_fs.h | 11 + + fs/nfs/nfs4proc.c | 274 +++++---- + fs/nfs/pagelist.c | 170 +++--- + fs/nfs/pnfs.c | 43 -- + fs/nfs/pnfs.h | 2 - + fs/nfs/pnfs_nfs.c | 44 +- + fs/nfs/read.c | 2 +- + fs/nfs/super.c | 12 +- + fs/nfs/write.c | 457 +++++++-------- + include/linux/nfs_fs.h | 6 +- + include/linux/nfs_page.h | 6 +- + include/linux/nfs_xdr.h | 2 +- + include/linux/sunrpc/sched.h | 2 + + include/linux/sunrpc/xdr.h | 13 + + include/linux/sunrpc/xprt.h | 5 +- + net/sunrpc/backchannel_rqst.c | 4 +- + net/sunrpc/clnt.c | 12 +- + net/sunrpc/svcsock.c | 6 +- + net/sunrpc/xprt.c | 57 +- + net/sunrpc/xprtrdma/backchannel.c | 71 +-- + net/sunrpc/xprtrdma/fmr_ops.c | 10 +- + net/sunrpc/xprtrdma/frwr_ops.c | 12 +- + net/sunrpc/xprtrdma/rpc_rdma.c | 902 +++++++++++++++++------------ + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 9 +- + net/sunrpc/xprtrdma/transport.c | 8 +- + net/sunrpc/xprtrdma/verbs.c | 22 +- + net/sunrpc/xprtrdma/xprt_rdma.h | 63 +- + net/sunrpc/xprtsock.c | 90 +-- + 36 files changed, 1228 insertions(+), 1133 deletions(-) +Merging nfsd/nfsd-next (26fb2254dd33 svcrdma: Estimate Send Queue depth properly) +$ 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 (7c6893e3c9ab ovl: don't allow writing ioctl on lower layer) +$ git merge overlayfs/overlayfs-next +Auto-merging include/linux/fs.h +Auto-merging fs/overlayfs/readdir.c +Auto-merging fs/internal.h +Auto-merging fs/inode.c +Auto-merging Documentation/filesystems/vfs.txt +Merge made by the 'recursive' strategy. + Documentation/filesystems/Locking | 2 +- + Documentation/filesystems/vfs.txt | 2 +- + fs/inode.c | 21 ++- + fs/internal.h | 2 + + fs/namespace.c | 64 ++++++- + fs/open.c | 8 +- + fs/overlayfs/dir.c | 11 +- + fs/overlayfs/inode.c | 3 + + fs/overlayfs/overlayfs.h | 8 +- + fs/overlayfs/readdir.c | 383 ++++++++++++++++++++++++++++++++++---- + fs/overlayfs/super.c | 11 +- + fs/overlayfs/util.c | 24 ++- + fs/xattr.c | 9 +- + include/linux/dcache.h | 14 +- + include/linux/fs.h | 2 +- + 15 files changed, 489 insertions(+), 75 deletions(-) +Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (a6664433d383 ubifs: Set double hash cookie also for RENAME_EXCHANGE) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (6c370590cfe0 xfs: use kmem_free to free return value of kmem_zalloc) +$ git merge xfs/for-next +Already up-to-date. +Merging file-locks/locks-next (3b9f8ed25dbe Merge branch 'for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata) +$ git merge file-locks/locks-next +Already up-to-date. +Merging vfs/for-next (976a5f29dd6b Merge branch 'work.mount' into for-next) +$ git merge vfs/for-next +Resolved 'fs/read_write.c' using previous resolution. +Resolved 'include/linux/fs.h' using previous resolution. +Auto-merging virt/kvm/kvm_main.c +Auto-merging tools/testing/selftests/seccomp/seccomp_bpf.c +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging security/commoncap.c +Auto-merging security/apparmor/lsm.c +Auto-merging security/apparmor/include/domain.h +Auto-merging security/apparmor/domain.c +Auto-merging mm/shmem.c +Auto-merging mm/nommu.c +Auto-merging mm/filemap.c +Auto-merging kernel/fork.c +Auto-merging kernel/auditsc.c +Auto-merging ipc/util.h +Auto-merging ipc/shm.c +Auto-merging ipc/sem.c +Auto-merging ipc/msg.c +Auto-merging include/uapi/linux/fs.h +Auto-merging include/linux/time.h +Auto-merging include/linux/shm.h +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/fs.h +CONFLICT (content): Merge conflict in include/linux/fs.h +Auto-merging include/linux/compat.h +Auto-merging fs/xfs/xfs_super.c +Auto-merging fs/xfs/xfs_log.c +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/udf/super.c +Auto-merging fs/ubifs/file.c +Auto-merging fs/sync.c +Auto-merging fs/super.c +Auto-merging fs/select.c +Auto-merging fs/reiserfs/journal.c +Auto-merging fs/read_write.c +CONFLICT (content): Merge conflict in fs/read_write.c +Auto-merging fs/proc/root.c +Auto-merging fs/overlayfs/super.c +Auto-merging fs/ocfs2/xattr.c +Auto-merging fs/ocfs2/super.c +Auto-merging fs/ocfs2/file.c +Auto-merging fs/nfs/super.c +Auto-merging fs/nfs/internal.h +Auto-merging fs/nfs/inode.c +Auto-merging fs/nfs/dir.c +Auto-merging fs/namespace.c +Auto-merging fs/namei.c +Auto-merging fs/locks.c +Auto-merging fs/kernfs/mount.c +Auto-merging fs/jfs/super.c +Auto-merging fs/jffs2/wbuf.c +Auto-merging fs/isofs/inode.c +Auto-merging fs/inode.c +Auto-merging fs/gfs2/super.c +Auto-merging fs/gfs2/quota.c +Auto-merging fs/gfs2/ops_fstype.c +Auto-merging fs/gfs2/glops.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/recovery.c +Auto-merging fs/f2fs/gc.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/ialloc.c +Auto-merging fs/ext4/file.c +Auto-merging fs/exec.c +Auto-merging fs/eventpoll.c +Auto-merging fs/ecryptfs/main.c +Auto-merging fs/cifs/xattr.c +Auto-merging fs/cifs/cifsglob.h +Auto-merging fs/ceph/super.c +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/sysfs.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/send.c +Auto-merging fs/btrfs/root-tree.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/dev-replace.c +Auto-merging fs/btrfs/ctree.h +Auto-merging fs/block_dev.c +Auto-merging fs/binfmt_flat.c +Auto-merging fs/binfmt_elf_fdpic.c +Auto-merging fs/binfmt_elf.c +Auto-merging fs/aio.c +Auto-merging drivers/staging/lustre/lustre/obdclass/kernelcomm.c +Auto-merging drivers/staging/lustre/lustre/llite/namei.c +Auto-merging drivers/staging/lustre/lustre/llite/llite_lib.c +Auto-merging drivers/staging/lustre/lustre/llite/file.c +Auto-merging drivers/staging/lustre/lnet/libcfs/tracefile.c +Auto-merging drivers/mtd/nand/nandsim.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/sparc/kernel/setup_64.c +Auto-merging arch/arc/kernel/setup.c +Auto-merging MAINTAINERS +Auto-merging Documentation/sysctl/kernel.txt +Auto-merging Documentation/networking/filter.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2e2d6aad301c] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/LSM/tomoyo.rst | 24 +- + Documentation/filesystems/porting | 2 +- + Documentation/networking/filter.txt | 2 +- + Documentation/sysctl/kernel.txt | 1 + + Documentation/userspace-api/seccomp_filter.rst | 52 +- + MAINTAINERS | 24 +- + arch/arc/kernel/setup.c | 1 + + arch/arm/kernel/atags_parse.c | 1 + + arch/ia64/Kconfig.debug | 5 - + arch/m32r/kernel/setup.c | 1 + + arch/mips/include/asm/compat-signal.h | 37 +- + arch/mips/kernel/elf.c | 12 +- + arch/parisc/kernel/signal.c | 9 +- + arch/parisc/kernel/signal32.c | 13 - + arch/parisc/kernel/signal32.h | 2 - + arch/powerpc/kernel/signal_32.c | 31 +- + arch/s390/kernel/compat_signal.c | 33 +- + arch/sh/kernel/setup.c | 1 + + arch/sparc/kernel/setup_32.c | 1 + + arch/sparc/kernel/setup_64.c | 1 + + arch/sparc/kernel/signal32.c | 9 +- + arch/sparc/kernel/sys_sparc32.c | 8 +- + arch/um/drivers/mconsole_kern.c | 7 +- + arch/x86/ia32/ia32_aout.c | 4 +- + arch/x86/kernel/setup.c | 1 + + drivers/base/devtmpfs.c | 1 + + drivers/media/pci/cx25821/cx25821-audio-upstream.c | 13 +- + drivers/mtd/mtdsuper.c | 6 +- + drivers/mtd/nand/nandsim.c | 4 +- + drivers/staging/android/ashmem.c | 29 +- + drivers/staging/comedi/drivers/serial2002.c | 24 +- + drivers/staging/lustre/lnet/libcfs/tracefile.c | 10 +- + drivers/staging/lustre/lustre/llite/file.c | 2 +- + drivers/staging/lustre/lustre/llite/llite_lib.c | 16 +- + drivers/staging/lustre/lustre/llite/namei.c | 3 +- + .../staging/lustre/lustre/obdclass/kernelcomm.c | 7 +- + drivers/target/target_core_alua.c | 3 +- + drivers/target/target_core_file.c | 2 +- + drivers/target/target_core_pr.c | 3 +- + drivers/usb/gadget/function/f_mass_storage.c | 21 +- + fs/9p/vfs_super.c | 6 +- + fs/adfs/super.c | 4 +- + fs/affs/amigaffs.c | 4 +- + fs/affs/bitmap.c | 8 +- + fs/affs/super.c | 20 +- + fs/afs/super.c | 4 +- + fs/aio.c | 61 +- + fs/autofs4/waitq.c | 9 +- + fs/befs/ChangeLog | 2 +- + fs/befs/linuxvfs.c | 6 +- + fs/binfmt_aout.c | 3 +- + fs/binfmt_elf.c | 23 +- + fs/binfmt_elf_fdpic.c | 17 +- + fs/binfmt_flat.c | 18 +- + fs/binfmt_misc.c | 5 +- + fs/block_dev.c | 5 + + fs/btrfs/ctree.h | 2 +- + fs/btrfs/dev-replace.c | 2 +- + fs/btrfs/disk-io.c | 12 +- + fs/btrfs/extent_io.c | 6 +- + fs/btrfs/file.c | 6 +- + fs/btrfs/inode.c | 2 +- + fs/btrfs/ioctl.c | 6 +- + fs/btrfs/root-tree.c | 2 +- + fs/btrfs/send.c | 18 +- + fs/btrfs/super.c | 61 +- + fs/btrfs/sysfs.c | 4 +- + fs/btrfs/volumes.c | 6 +- + fs/cachefiles/bind.c | 2 +- + fs/ceph/super.c | 8 +- + fs/cifs/cifs_fs_sb.h | 2 +- + fs/cifs/cifsfs.c | 12 +- + fs/cifs/cifsglob.h | 4 +- + fs/cifs/inode.c | 2 +- + fs/cifs/xattr.c | 8 +- + fs/coda/dir.c | 5 +- + fs/coda/inode.c | 4 +- + fs/cramfs/inode.c | 4 +- + fs/ecryptfs/main.c | 11 +- + fs/ecryptfs/read_write.c | 4 +- + fs/efs/super.c | 6 +- + fs/eventpoll.c | 4 +- + fs/exec.c | 24 +- + fs/ext2/balloc.c | 4 +- + fs/ext2/ialloc.c | 4 +- + fs/ext2/super.c | 31 +- + fs/ext4/ext4_jbd2.c | 2 +- + fs/ext4/file.c | 8 +- + fs/ext4/fsync.c | 2 +- + fs/ext4/ialloc.c | 2 +- + fs/ext4/inode.c | 4 +- + fs/ext4/mmp.c | 2 +- + fs/ext4/super.c | 107 ++- + fs/f2fs/checkpoint.c | 8 +- + fs/f2fs/f2fs.h | 2 +- + fs/f2fs/gc.c | 2 +- + fs/f2fs/recovery.c | 6 +- + fs/f2fs/super.c | 28 +- + fs/fat/fatent.c | 8 +- + fs/fat/inode.c | 14 +- + fs/fat/misc.c | 4 +- + fs/fat/namei_msdos.c | 2 +- + fs/file_table.c | 12 +- + fs/freevxfs/vxfs_super.c | 4 +- + fs/fs-writeback.c | 2 +- + fs/fuse/inode.c | 12 +- + fs/gfs2/glops.c | 2 +- + fs/gfs2/ops_fstype.c | 20 +- + fs/gfs2/quota.c | 2 +- + fs/gfs2/recovery.c | 2 +- + fs/gfs2/super.c | 14 +- + fs/gfs2/sys.c | 2 +- + fs/gfs2/trans.c | 2 +- + fs/hfs/mdb.c | 10 +- + fs/hfs/super.c | 18 +- + fs/hfsplus/super.c | 30 +- + fs/hpfs/alloc.c | 4 +- + fs/hpfs/dir.c | 2 +- + fs/hpfs/map.c | 2 +- + fs/hpfs/super.c | 21 +- + fs/inode.c | 10 +- + fs/isofs/inode.c | 4 +- + fs/jffs2/fs.c | 10 +- + fs/jffs2/os-linux.h | 2 +- + fs/jffs2/super.c | 6 +- + fs/jffs2/wbuf.c | 4 +- + fs/jfs/jfs_mount.c | 2 +- + fs/jfs/super.c | 22 +- + fs/kernfs/mount.c | 2 +- + fs/libfs.c | 6 +- + fs/locks.c | 2 +- + fs/minix/inode.c | 8 +- + fs/namei.c | 3 +- + fs/namespace.c | 71 +- + fs/ncpfs/inode.c | 4 +- + fs/nfs/dir.c | 2 +- + fs/nfs/fscache.c | 2 +- + fs/nfs/inode.c | 2 +- + fs/nfs/internal.h | 2 +- + fs/nfs/super.c | 26 +- + fs/nilfs2/inode.c | 4 +- + fs/nilfs2/mdt.c | 2 +- + fs/nilfs2/segment.c | 2 +- + fs/nilfs2/super.c | 41 +- + fs/nilfs2/the_nilfs.c | 6 +- + fs/notify/fsnotify.c | 2 +- + fs/nsfs.c | 2 +- + fs/ntfs/super.c | 59 +- + fs/ocfs2/file.c | 2 +- + fs/ocfs2/super.c | 41 +- + fs/ocfs2/xattr.c | 2 +- + fs/openpromfs/inode.c | 4 +- + fs/orangefs/super.c | 8 +- + fs/overlayfs/super.c | 10 +- + fs/pnode.c | 1 + + fs/proc/inode.c | 2 +- + fs/proc/root.c | 2 +- + fs/proc_namespace.c | 10 +- + fs/qnx4/inode.c | 4 +- + fs/qnx6/inode.c | 4 +- + fs/quota/quota.c | 2 +- + fs/read_write.c | 43 +- + fs/reiserfs/inode.c | 4 +- + fs/reiserfs/journal.c | 8 +- + fs/reiserfs/prints.c | 6 +- + fs/reiserfs/super.c | 34 +- + fs/reiserfs/xattr.c | 10 +- + fs/romfs/super.c | 4 +- + fs/select.c | 68 +- + fs/signalfd.c | 4 +- + fs/splice.c | 16 - + fs/squashfs/super.c | 4 +- + fs/statfs.c | 6 +- + fs/super.c | 75 +-- + fs/sync.c | 6 +- + fs/sysfs/mount.c | 2 +- + fs/sysv/balloc.c | 2 +- + fs/sysv/ialloc.c | 2 +- + fs/sysv/inode.c | 4 +- + fs/sysv/super.c | 4 +- + fs/ubifs/file.c | 2 +- + fs/ubifs/io.c | 2 +- + fs/ubifs/super.c | 22 +- + fs/ubifs/ubifs.h | 4 +- + fs/udf/super.c | 18 +- + fs/ufs/balloc.c | 8 +- + fs/ufs/ialloc.c | 10 +- + fs/ufs/super.c | 52 +- + fs/utimes.c | 23 +- + fs/xfs/xfs_file.c | 11 +- + fs/xfs/xfs_log.c | 6 +- + fs/xfs/xfs_quotaops.c | 10 +- + fs/xfs/xfs_super.c | 12 +- + fs/xfs/xfs_super.h | 2 +- + include/asm-generic/uaccess.h | 8 +- + include/linux/audit.h | 12 +- + include/linux/compat.h | 19 +- + include/linux/fs.h | 63 +- + include/linux/lsm_hooks.h | 7 - + include/linux/msg.h | 15 +- + include/linux/seccomp.h | 3 +- + include/linux/security.h | 6 - + include/linux/sem.h | 3 +- + include/linux/shm.h | 6 +- + include/linux/time.h | 2 +- + include/uapi/linux/bfs_fs.h | 2 +- + include/uapi/linux/fs.h | 56 +- + include/uapi/linux/mount.h | 58 ++ + include/uapi/linux/seccomp.h | 23 +- + init/do_mounts.c | 7 +- + init/do_mounts_initrd.c | 1 + + init/initramfs.c | 2 +- + ipc/compat.c | 740 +-------------------- + ipc/mqueue.c | 30 +- + ipc/msg.c | 366 ++++++---- + ipc/sem.c | 344 ++++++---- + ipc/shm.c | 533 ++++++++++----- + ipc/syscall.c | 90 ++- + ipc/util.h | 30 + + kernel/acct.c | 2 +- + kernel/audit.h | 2 +- + kernel/auditsc.c | 12 +- + kernel/compat.c | 84 +-- + kernel/fork.c | 4 - + kernel/seccomp.c | 321 ++++++++- + kernel/signal.c | 78 +-- + kernel/sysctl_binary.c | 21 +- + mm/filemap.c | 24 +- + mm/nommu.c | 7 +- + mm/shmem.c | 10 +- + net/9p/trans_fd.c | 14 +- + scripts/gdb/linux/constants.py.in | 12 +- + scripts/gdb/linux/proc.py | 8 +- + security/apparmor/Makefile | 2 +- + security/apparmor/apparmorfs.c | 21 +- + security/apparmor/domain.c | 4 +- + security/apparmor/include/apparmor.h | 2 + + security/apparmor/include/audit.h | 13 + + security/apparmor/include/domain.h | 5 + + security/apparmor/include/ipc.h | 6 + + security/apparmor/include/lib.h | 2 +- + security/apparmor/include/mount.h | 55 ++ + security/apparmor/include/sig_names.h | 95 +++ + security/apparmor/ipc.c | 99 +++ + security/apparmor/label.c | 2 +- + security/apparmor/lsm.c | 85 +++ + security/apparmor/mount.c | 696 +++++++++++++++++++ + security/apparmor/policy_unpack.c | 6 +- + security/commoncap.c | 6 +- + security/keys/big_key.c | 6 +- + security/security.c | 5 - + security/selinux/hooks.c | 3 +- + security/tomoyo/mount.c | 1 + + tools/testing/selftests/seccomp/Makefile | 18 +- + .../testing/selftests/seccomp/seccomp_benchmark.c | 99 +++ + tools/testing/selftests/seccomp/seccomp_bpf.c | 610 ++++++++++++++--- + virt/kvm/kvm_main.c | 7 +- + 257 files changed, 4302 insertions(+), 2704 deletions(-) + create mode 100644 include/uapi/linux/mount.h + create mode 100644 security/apparmor/include/mount.h + create mode 100644 security/apparmor/include/sig_names.h + create mode 100644 security/apparmor/mount.c + create mode 100644 tools/testing/selftests/seccomp/seccomp_benchmark.c +Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities) +$ git merge vfs-jk/vfs +Already up-to-date. +Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync()) +$ git merge vfs-miklos/next +Already up-to-date. +Merging printk/for-next (077a1cc06f72 printk: Clean up do_syslog() error handling) +$ git merge printk/for-next +Already up-to-date. +Merging pci/next (cf2d804110d3 Merge branch 'pci/virtualization' into next) +$ git merge pci/next +Already up-to-date. +Merging pstore/for-next/pstore (c71b02e4d207 Revert "pstore: Honor dmesg_restrict sysctl on dmesg dumps") +$ git merge pstore/for-next/pstore +Already up-to-date. +Merging hid/for-next (abbc4db7a3a0 Merge branch 'for-4.14/upstream' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. +Merging i2c/i2c/for-next (2f1db5e1f86f Merge branch 'i2c/for-current' 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 (f996c4155d0d dmi: Mark all struct dmi_system_id instances const) +$ git merge dmi/master +Resolved 'drivers/acpi/blacklist.c' using previous resolution. +Resolved 'drivers/acpi/sbs.c' using previous resolution. +Auto-merging sound/soc/codecs/rt5645.c +Auto-merging drivers/tty/serial/pch_uart.c +Auto-merging drivers/platform/x86/ibm_rtl.c +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/pci/pcie/portdrv_pci.c +Auto-merging drivers/net/ethernet/marvell/skge.c +Auto-merging drivers/acpi/sleep.c +Auto-merging drivers/acpi/sbs.c +CONFLICT (content): Merge conflict in drivers/acpi/sbs.c +Auto-merging drivers/acpi/osi.c +Auto-merging drivers/acpi/ec.c +Auto-merging drivers/acpi/bus.c +Auto-merging drivers/acpi/blacklist.c +CONFLICT (content): Merge conflict in drivers/acpi/blacklist.c +Auto-merging arch/x86/power/cpu.c +Auto-merging arch/x86/kernel/reboot.c +Auto-merging arch/x86/kernel/acpi/boot.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7cfa3a866ea8] Merge branch 'dmi/master' +$ git diff -M --stat --summary HEAD^.. + arch/x86/kernel/acpi/boot.c | 4 ++-- + arch/x86/kernel/apm_32.c | 2 +- + arch/x86/kernel/io_delay.c | 2 +- + arch/x86/kernel/reboot.c | 2 +- + arch/x86/pci/irq.c | 2 +- + arch/x86/power/cpu.c | 2 +- + drivers/acpi/acpi_video.c | 2 +- + drivers/acpi/blacklist.c | 4 ++-- + drivers/acpi/bus.c | 4 ++-- + drivers/acpi/ec.c | 2 +- + drivers/acpi/osi.c | 2 +- + drivers/acpi/pci_slot.c | 2 +- + drivers/acpi/processor_pdc.c | 2 +- + drivers/acpi/sleep.c | 2 +- + drivers/acpi/thermal.c | 2 +- + drivers/char/sonypi.c | 2 +- + drivers/cpufreq/powernow-k7.c | 2 +- + drivers/firmware/google/gsmi.c | 2 +- + drivers/firmware/google/memconsole-x86-legacy.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gpio/base.c | 2 +- + drivers/hwmon/acpi_power_meter.c | 2 +- + drivers/hwmon/applesmc.c | 2 +- + drivers/hwmon/dell-smm-hwmon.c | 4 ++-- + drivers/input/touchscreen/htcpen.c | 2 +- + drivers/leds/leds-clevo-mail.c | 2 +- + drivers/leds/leds-ss4200.c | 2 +- + drivers/mfd/kempld-core.c | 2 +- + drivers/net/ethernet/marvell/skge.c | 2 +- + drivers/net/ethernet/via/via-rhine.c | 2 +- + drivers/pci/pcie/portdrv_pci.c | 2 +- + drivers/pci/quirks.c | 2 +- + drivers/platform/chrome/chromeos_laptop.c | 2 +- + drivers/platform/chrome/chromeos_pstore.c | 2 +- + drivers/platform/chrome/cros_ec_lpc.c | 2 +- + drivers/platform/x86/compal-laptop.c | 2 +- + drivers/platform/x86/hdaps.c | 2 +- + drivers/platform/x86/ibm_rtl.c | 2 +- + drivers/platform/x86/intel_oaktrail.c | 2 +- + drivers/platform/x86/mlx-platform.c | 2 +- + drivers/platform/x86/msi-laptop.c | 2 +- + drivers/platform/x86/samsung-laptop.c | 2 +- + drivers/platform/x86/samsung-q10.c | 2 +- + drivers/platform/x86/sony-laptop.c | 2 +- + drivers/platform/x86/toshiba-wmi.c | 2 +- + drivers/pnp/pnpbios/core.c | 2 +- + drivers/tty/serial/pch_uart.c | 2 +- + drivers/video/backlight/kb3886_bl.c | 2 +- + sound/soc/codecs/rt5645.c | 2 +- + 48 files changed, 52 insertions(+), 52 deletions(-) +Merging hwmon-staging/hwmon-next (7074d0a92758 hwmon: (ltq-cputemp) add cpu temp sensor driver) +$ git merge hwmon-staging/hwmon-next +Already up-to-date. +Merging jc_docs/docs-next (6fad4e69e835 kokr/memory-barriers.txt: Apply atomic_t.txt change) +$ git merge jc_docs/docs-next +Merge made by the 'recursive' strategy. + Documentation/conf.py | 62 ++++++---- + .../translations/ko_KR/memory-barriers.txt | 132 +++++---------------- + scripts/sphinx-pre-install | 1 - + 3 files changed, 69 insertions(+), 126 deletions(-) +Merging v4l-dvb/master (1efdf1776e22 media: leds: as3645a: add V4L2_FLASH_LED_CLASS dependency) +$ git merge v4l-dvb/master +Already up-to-date. +Merging v4l-dvb-next/master (4cd7d6c957b0 media: get rid of removed DMX_GET_CAPS and DMX_SET_SOURCE leftovers) +$ git merge v4l-dvb-next/master +Already up-to-date. +Merging fbdev/fbdev-for-next (23e9f4ef99dd video/console: Update BIOS dates list for GPD win console rotation DMI quirk) +$ git merge fbdev/fbdev-for-next +Resolved 'drivers/video/fbdev/core/fbmem.c' using previous resolution. +Auto-merging drivers/video/fbdev/uvesafb.c +Auto-merging drivers/video/fbdev/core/tileblit.c +Auto-merging drivers/video/fbdev/core/softcursor.c +Auto-merging drivers/video/fbdev/core/fbmem.c +CONFLICT (content): Merge conflict in drivers/video/fbdev/core/fbmem.c +Auto-merging drivers/video/fbdev/core/fbcon_ud.c +Auto-merging drivers/video/fbdev/core/fbcon_rotate.c +Auto-merging drivers/video/fbdev/core/fbcon_cw.c +Auto-merging drivers/video/fbdev/core/fbcon_ccw.c +Auto-merging drivers/video/fbdev/core/fbcon.h +Auto-merging drivers/video/fbdev/core/fbcon.c +Auto-merging drivers/video/fbdev/core/bitblit.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9595dc5d72a9] Merge remote-tracking branch 'fbdev/fbdev-for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/fb/fbcon.txt | 7 + + drivers/video/console/Kconfig | 2 +- + drivers/video/console/Makefile | 8 -- + drivers/video/console/vgacon.c | 5 +- + drivers/video/fbdev/68328fb.c | 2 +- + drivers/video/fbdev/Kconfig | 2 +- + drivers/video/fbdev/amba-clcd.c | 2 +- + drivers/video/fbdev/arkfb.c | 2 +- + drivers/video/fbdev/asiliantfb.c | 2 +- + drivers/video/fbdev/atmel_lcdfb.c | 2 +- + drivers/video/fbdev/aty/aty128fb.c | 4 +- + drivers/video/fbdev/aty/atyfb_base.c | 6 +- + drivers/video/fbdev/aty/radeon_base.c | 6 +- + drivers/video/fbdev/bfin-lq035q1-fb.c | 2 +- + drivers/video/fbdev/bw2.c | 4 +- + drivers/video/fbdev/cg14.c | 4 +- + drivers/video/fbdev/cg3.c | 4 +- + drivers/video/fbdev/cg6.c | 4 +- + drivers/video/fbdev/chipsfb.c | 4 +- + drivers/video/fbdev/cobalt_lcdfb.c | 2 +- + drivers/video/fbdev/core/Makefile | 14 ++ + drivers/video/{console => fbdev/core}/bitblit.c | 8 +- + drivers/video/{console => fbdev/core}/fbcon.c | 37 +++--- + drivers/video/{console => fbdev/core}/fbcon.h | 9 +- + drivers/video/{console => fbdev/core}/fbcon_ccw.c | 8 +- + drivers/video/{console => fbdev/core}/fbcon_cw.c | 8 +- + drivers/video/fbdev/core/fbcon_dmi_quirks.c | 145 +++++++++++++++++++++ + .../video/{console => fbdev/core}/fbcon_rotate.c | 4 - + .../video/{console => fbdev/core}/fbcon_rotate.h | 0 + drivers/video/{console => fbdev/core}/fbcon_ud.c | 8 +- + drivers/video/fbdev/core/fbmem.c | 12 +- + drivers/video/fbdev/core/fbmon.c | 4 +- + drivers/video/{console => fbdev/core}/softcursor.c | 4 - + drivers/video/{console => fbdev/core}/tileblit.c | 7 +- + drivers/video/fbdev/cyber2000fb.c | 2 +- + drivers/video/fbdev/da8xx-fb.c | 2 +- + drivers/video/fbdev/dnfb.c | 2 +- + drivers/video/fbdev/fb-puv3.c | 2 +- + drivers/video/fbdev/ffb.c | 4 +- + drivers/video/fbdev/fm2fb.c | 2 +- + drivers/video/fbdev/geode/gxfb_core.c | 2 +- + drivers/video/fbdev/grvga.c | 2 +- + drivers/video/fbdev/i810/i810_main.c | 4 +- + drivers/video/fbdev/imsttfb.c | 2 +- + drivers/video/fbdev/intelfb/intelfbdrv.c | 2 +- + drivers/video/fbdev/kyro/fbdev.c | 2 +- + drivers/video/fbdev/leo.c | 4 +- + drivers/video/fbdev/matrox/matroxfb_base.c | 14 +- + drivers/video/fbdev/maxinefb.c | 2 +- + drivers/video/fbdev/mb862xx/mb862xxfbdrv.c | 2 +- + drivers/video/fbdev/mbx/mbxfb.c | 4 +- + drivers/video/fbdev/neofb.c | 2 +- + drivers/video/fbdev/nvidia/nvidia.c | 2 +- + drivers/video/fbdev/offb.c | 10 +- + drivers/video/fbdev/omap/lcd_mipid.c | 2 +- + .../omapfb/displays/panel-lgphilips-lb035q02.c | 2 +- + .../omap2/omapfb/displays/panel-sony-acx565akm.c | 2 +- + .../omap2/omapfb/displays/panel-tpo-td028ttec1.c | 2 +- + .../omap2/omapfb/displays/panel-tpo-td043mtea1.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/dss-of.c | 3 +- + drivers/video/fbdev/p9100.c | 4 +- + drivers/video/fbdev/pm2fb.c | 2 +- + drivers/video/fbdev/pm3fb.c | 2 +- + 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/ps3fb.c | 2 +- + drivers/video/fbdev/pvr2fb.c | 4 +- + drivers/video/fbdev/pxa3xx-gcu.c | 4 +- + drivers/video/fbdev/q40fb.c | 2 +- + drivers/video/fbdev/riva/fbdev.c | 2 +- + drivers/video/fbdev/s3fb.c | 2 +- + drivers/video/fbdev/savage/savagefb_driver.c | 2 +- + drivers/video/fbdev/sis/init301.c | 15 +-- + drivers/video/fbdev/skeletonfb.c | 4 +- + drivers/video/fbdev/sm501fb.c | 2 +- + drivers/video/fbdev/sm712fb.c | 17 +-- + drivers/video/fbdev/smscufx.c | 2 +- + drivers/video/fbdev/sunxvr1000.c | 10 +- + drivers/video/fbdev/sunxvr2500.c | 2 +- + drivers/video/fbdev/sunxvr500.c | 2 +- + drivers/video/fbdev/tcx.c | 4 +- + drivers/video/fbdev/tdfxfb.c | 2 +- + drivers/video/fbdev/tridentfb.c | 2 +- + drivers/video/fbdev/udlfb.c | 5 +- + drivers/video/fbdev/uvesafb.c | 2 +- + drivers/video/fbdev/vermilion/vermilion.c | 4 +- + drivers/video/fbdev/via/via-core.c | 2 +- + drivers/video/fbdev/vt8623fb.c | 4 +- + drivers/video/fbdev/xilinxfb.c | 62 ++++----- + drivers/video/of_display_timing.c | 41 +++--- + drivers/video/of_videomode.c | 2 +- + include/linux/fb.h | 10 +- + include/linux/fbcon.h | 12 ++ + 94 files changed, 398 insertions(+), 269 deletions(-) + rename drivers/video/{console => fbdev/core}/bitblit.c (98%) + rename drivers/video/{console => fbdev/core}/fbcon.c (99%) + rename drivers/video/{console => fbdev/core}/fbcon.h (97%) + rename drivers/video/{console => fbdev/core}/fbcon_ccw.c (98%) + rename drivers/video/{console => fbdev/core}/fbcon_cw.c (98%) + create mode 100644 drivers/video/fbdev/core/fbcon_dmi_quirks.c + rename drivers/video/{console => fbdev/core}/fbcon_rotate.c (95%) + rename drivers/video/{console => fbdev/core}/fbcon_rotate.h (100%) + rename drivers/video/{console => fbdev/core}/fbcon_ud.c (98%) + rename drivers/video/{console => fbdev/core}/softcursor.c (93%) + rename drivers/video/{console => fbdev/core}/tileblit.c (96%) + create mode 100644 include/linux/fbcon.h +Merging pm/linux-next (7f8122a4e8c8 Merge branch 'acpi-apei' into linux-next) +$ git merge pm/linux-next +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 (b32b5e14b4e0 Merge branches 'thermal-core', 'thermal-soc', 'thermal-intel' and 'const-thermal-zone-structure' into next) +$ git merge thermal/next +Merge made by the 'recursive' strategy. + .../bindings/thermal/mediatek-thermal.txt | 1 + + .../bindings/thermal/rockchip-thermal.txt | 1 + + .../bindings/thermal/uniphier-thermal.txt | 64 ++++ + drivers/thermal/Kconfig | 12 +- + drivers/thermal/Makefile | 1 + + drivers/thermal/broadcom/bcm2835_thermal.c | 2 +- + drivers/thermal/hisi_thermal.c | 2 +- + drivers/thermal/int340x_thermal/acpi_thermal_rel.c | 2 +- + drivers/thermal/int340x_thermal/acpi_thermal_rel.h | 8 +- + drivers/thermal/int340x_thermal/int3400_thermal.c | 43 ++- + drivers/thermal/int340x_thermal/int3406_thermal.c | 96 ++---- + .../int340x_thermal/processor_thermal_device.c | 2 +- + drivers/thermal/intel_pch_thermal.c | 12 +- + drivers/thermal/mtk_thermal.c | 88 ++++- + drivers/thermal/qoriq_thermal.c | 2 +- + drivers/thermal/rcar_gen3_thermal.c | 2 +- + drivers/thermal/rockchip_thermal.c | 65 ++++ + drivers/thermal/samsung/exynos_tmu.c | 2 +- + drivers/thermal/thermal_core.c | 31 +- + drivers/thermal/thermal_core.h | 1 + + drivers/thermal/thermal_sysfs.c | 29 ++ + drivers/thermal/uniphier_thermal.c | 384 +++++++++++++++++++++ + drivers/thermal/zx2967_thermal.c | 2 +- + include/linux/thermal.h | 1 + + 24 files changed, 747 insertions(+), 106 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/uniphier-thermal.txt + create mode 100644 drivers/thermal/uniphier_thermal.c +Merging thermal-soc/next (aa647852c32a Merge branch 'work-linus' into work-next) +$ git merge thermal-soc/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one) +$ git merge ieee1394/for-next +Auto-merging drivers/firewire/net.c +Merge made by the 'recursive' strategy. + drivers/firewire/net.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) +Merging dlm/next (1c2428537241 dlm: use sock_create_lite inside tcp_accept_from_sock) +$ git merge dlm/next +Already up-to-date. +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 (ad9a19d00370 Merge tag 'nfsd-4.14' of git://linux-nfs.org/~bfields/linux) +$ git merge net-next/master +Already up-to-date. +Merging ipsec-next/master (8598112d04af xfrm: Fix return value check of copy_sec_ctx.) +$ git merge ipsec-next/master +Already up-to-date. +Merging netfilter-next/master (80cee03bf1d6 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge netfilter-next/master +Already up-to-date. +Merging nfc-next/master (bd751808f9ff NFC: trf7970a: Correct register settings for 27MHz clock) +$ git merge nfc-next/master +Already up-to-date. +Merging ipvs-next/master (a910d20aa007 netfilter: ipvs: Fix space before '[' error.) +$ git merge ipvs-next/master +Auto-merging net/netfilter/ipvs/ip_vs_proto_tcp.c +Merge made by the 'recursive' strategy. + net/netfilter/ipvs/ip_vs_proto_tcp.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging wireless-drivers-next/master (eb464d4a8d09 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) +$ git merge wireless-drivers-next/master +Already up-to-date. +Merging bluetooth/master (f5f3dc0abf8b Bluetooth: btqcomsmd: retrieve BD address from DT property) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/bluetooth.txt | 5 +++ + .../devicetree/bindings/soc/qcom/qcom,wcnss.txt | 8 ++++ + drivers/bluetooth/btqcomsmd.c | 45 ++++++++++++++++++++++ + 3 files changed, 58 insertions(+) + create mode 100644 Documentation/devicetree/bindings/net/bluetooth.txt +Merging mac80211-next/master (80cee03bf1d6 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge mac80211-next/master +Already up-to-date. +Merging rdma/for-next (c50c98d38291 Merge branch 'k.o/net-next-base' into k.o/for-next-merged-2) +$ git merge rdma/for-next +Auto-merging drivers/infiniband/hw/qedr/qedr_roce_cm.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/infiniband/hw/qedr/Makefile | 2 +- + drivers/infiniband/hw/qedr/main.c | 105 ++- + drivers/infiniband/hw/qedr/qedr.h | 31 +- + drivers/infiniband/hw/qedr/qedr_hsi_rdma.h | 6 +- + drivers/infiniband/hw/qedr/qedr_iw_cm.c | 746 +++++++++++++++++++++ + drivers/infiniband/hw/qedr/qedr_iw_cm.h | 49 ++ + .../hw/qedr/{qedr_cm.c => qedr_roce_cm.c} | 2 +- + .../hw/qedr/{qedr_cm.h => qedr_roce_cm.h} | 0 + drivers/infiniband/hw/qedr/verbs.c | 352 +++++++--- + drivers/infiniband/hw/qedr/verbs.h | 2 + + 11 files changed, 1205 insertions(+), 91 deletions(-) + create mode 100644 drivers/infiniband/hw/qedr/qedr_iw_cm.c + create mode 100644 drivers/infiniband/hw/qedr/qedr_iw_cm.h + rename drivers/infiniband/hw/qedr/{qedr_cm.c => qedr_roce_cm.c} (99%) + rename drivers/infiniband/hw/qedr/{qedr_cm.h => qedr_roce_cm.h} (100%) +Merging gfs2/for-next (309e8cda596f gfs2: preserve i_mode if __gfs2_set_acl() fails) +$ git merge gfs2/for-next +Already up-to-date. +Merging mtd/master (be3e83e3471c mtd: nand: atmel: Relax tADL_min constraint) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (d1f936d73683 Merge tag 'nand/for-4.14' of git://git.infradead.org/l2-mtd into mtd/next) +$ git merge l2-mtd/master +Already up-to-date. +Merging nand/nand/next (2d2a2b8c080a mtd: nand: complain loudly when chip->bits_per_cell is not correctly initialized) +$ git merge nand/nand/next +Already up-to-date. +Merging spi-nor/spi-nor/next (90074de6630f mtd: spi-nor: fix DMA unsafe buffer issue in spi_nor_read_sfdp()) +$ git merge spi-nor/spi-nor/next +Merge made by the 'recursive' strategy. + drivers/mtd/spi-nor/spi-nor.c | 36 +++++++++++++++++++++++++++++++++--- + 1 file changed, 33 insertions(+), 3 deletions(-) +Merging crypto/master (2d45a7e89833 crypto: af_alg - get_page upon reassignment to TX SGL) +$ git merge crypto/master +Already up-to-date. +Merging drm/drm-next (7846b12fe0b5 Merge branch 'drm-vmwgfx-next' of git://people.freedesktop.org/~syeh/repos_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 (426ca2cb69cd Merge tag 'gvt-fixes-2017-09-06' of https://github.com/01org/gvt-linux into drm-intel-next-fixes) +$ git merge drm-intel/for-linux-next +Already up-to-date. +Merging drm-tegra/drm/tegra/for-next (65d5d30ccebd drm/tegra: trace: Fix path to include) +$ git merge drm-tegra/drm/tegra/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/trace.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging drm-misc/for-linux-next (f44d85389e17 drm: rename u32 in __u32 in uapi) +$ git merge drm-misc/for-linux-next +Already up-to-date. +Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux) +$ git merge drm-exynos/exynos-drm/for-next +Already up-to-date. +Merging drm-msm/msm-next (0502a625c2ee drm/msm: fix error path cleanup) +$ git merge drm-msm/msm-next +Auto-merging drivers/gpu/drm/msm/msm_drv.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/msm/Makefile | 4 +- + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 10 +- + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 10 +- + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 222 +++++++++++++++++++--- + drivers/gpu/drm/msm/adreno/a5xx_gpu.h | 103 ++++++++++- + drivers/gpu/drm/msm/adreno/a5xx_power.c | 6 +- + drivers/gpu/drm/msm/adreno/a5xx_preempt.c | 294 ++++++++++++++++++++++++++++++ + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 183 ++++++++++--------- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 43 ++--- + drivers/gpu/drm/msm/msm_drv.c | 67 ++++++- + drivers/gpu/drm/msm/msm_drv.h | 22 ++- + drivers/gpu/drm/msm/msm_fence.c | 2 +- + drivers/gpu/drm/msm/msm_fence.h | 2 +- + drivers/gpu/drm/msm/msm_gem.h | 5 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 25 ++- + drivers/gpu/drm/msm/msm_gpu.c | 182 +++++++++++++----- + drivers/gpu/drm/msm/msm_gpu.h | 54 ++++-- + drivers/gpu/drm/msm/msm_ringbuffer.c | 29 ++- + drivers/gpu/drm/msm/msm_ringbuffer.h | 32 +++- + drivers/gpu/drm/msm/msm_submitqueue.c | 160 ++++++++++++++++ + include/uapi/drm/msm_drm.h | 24 +++ + 21 files changed, 1224 insertions(+), 255 deletions(-) + create mode 100644 drivers/gpu/drm/msm/adreno/a5xx_preempt.c + create mode 100644 drivers/gpu/drm/msm/msm_submitqueue.c +Merging hdlcd/for-upstream/hdlcd (fee4964f0a6c drm/arm: hdlcd: remove unused variables) +$ git merge hdlcd/for-upstream/hdlcd +Already up-to-date. +Merging mali-dp/for-upstream/mali-dp (e46477b8f23c drm: mali-dp: Restore commit_tail behaviour to the runtime_pm friendly version.) +$ git merge mali-dp/for-upstream/mali-dp +Auto-merging drivers/gpu/drm/arm/malidp_drv.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/arm/malidp_crtc.c | 4 ++++ + drivers/gpu/drm/arm/malidp_drv.c | 11 +++-------- + 2 files changed, 7 insertions(+), 8 deletions(-) +Merging sunxi-drm/sunxi-drm/for-next (7dafb83edd32 Merge branches 'sunxi/drm-fixes-for-4.13' and 'sunxi/drm-for-4.14' into sunxi-drm/for-next) +$ git merge sunxi-drm/sunxi-drm/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging imx-drm/imx-drm/next (9303519985ed drm/imx: parallel-display: use correct connector enum) +$ git merge imx-drm/imx-drm/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/ipuv3-crtc.c | 2 +- + drivers/gpu/drm/imx/parallel-display.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging etnaviv/etnaviv/next (65375b873cb5 drm/etnaviv: switch GEM allocations to __GFP_RETRY_MAYFAIL) +$ git merge etnaviv/etnaviv/next +Already up-to-date. +Merging kconfig/for-next (6f7da290413b Linux 4.12) +$ git merge kconfig/for-next +Already up-to-date. +Merging regmap/for-next (1874021ec3a8 Merge remote-tracking branches 'regmap/topic/const' and 'regmap/topic/namespace' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-spi.c | 2 +- + drivers/base/regmap/regmap-spmi.c | 4 ++-- + include/linux/regmap.h | 17 +++++++++-------- + 3 files changed, 12 insertions(+), 11 deletions(-) +Merging sound/for-next (2a0d85d9add7 ALSA: asihpi: Kill BUG_ON() usages) +$ git merge sound/for-next +Already up-to-date. +Merging sound-asoc/for-next (469e95940406 Merge remote-tracking branches 'asoc/topic/ac97', 'asoc/topic/cs43130' and 'asoc/topic/fsl' into asoc-next) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + include/sound/ac97/codec.h | 118 +++++++++ + include/sound/ac97/compat.h | 20 ++ + include/sound/ac97/controller.h | 85 +++++++ + include/sound/ac97/regs.h | 262 +++++++++++++++++++ + include/sound/ac97_codec.h | 239 +----------------- + include/sound/pxa2xx-lib.h | 15 +- + sound/Kconfig | 2 + + sound/Makefile | 1 + + sound/ac97/Kconfig | 19 ++ + sound/ac97/Makefile | 8 + + sound/ac97/ac97_core.h | 16 ++ + sound/ac97/bus.c | 539 ++++++++++++++++++++++++++++++++++++++++ + sound/ac97/codec.c | 15 ++ + sound/ac97/snd_ac97_compat.c | 108 ++++++++ + sound/arm/pxa2xx-ac97-lib.c | 37 +-- + sound/arm/pxa2xx-ac97.c | 35 ++- + sound/soc/codecs/adau17x1.c | 24 +- + sound/soc/codecs/adau17x1.h | 2 + + sound/soc/codecs/cs43130.c | 16 +- + sound/soc/fsl/fsl_spdif.c | 4 +- + sound/soc/pxa/pxa2xx-ac97.c | 32 ++- + sound/soc/samsung/i2s.c | 5 +- + 22 files changed, 1322 insertions(+), 280 deletions(-) + create mode 100644 include/sound/ac97/codec.h + create mode 100644 include/sound/ac97/compat.h + create mode 100644 include/sound/ac97/controller.h + create mode 100644 include/sound/ac97/regs.h + create mode 100644 sound/ac97/Kconfig + create mode 100644 sound/ac97/Makefile + create mode 100644 sound/ac97/ac97_core.h + create mode 100644 sound/ac97/bus.c + create mode 100644 sound/ac97/codec.c + create mode 100644 sound/ac97/snd_ac97_compat.c +Merging modules/modules-next (0bf8bf50eddc module: Remove const attribute from alias for MODULE_DEVICE_TABLE) +$ git merge modules/modules-next +Auto-merging scripts/mod/modpost.c +Merge made by the 'recursive' strategy. + include/linux/module.h | 2 +- + kernel/module.c | 12 ++++++------ + scripts/mod/modpost.c | 29 ++++++++++++++++++++++++----- + 3 files changed, 31 insertions(+), 12 deletions(-) +Merging input/next (39467fc1054a Input: ucb1400_ts - fix suspend and resume handling) +$ git merge input/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/pwm-vibrator.txt | 66 +++++ + drivers/input/joystick/adi.c | 2 +- + drivers/input/misc/Kconfig | 12 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/pwm-vibra.c | 267 +++++++++++++++++++++ + drivers/input/mouse/elantech.c | 8 +- + drivers/input/touchscreen/edt-ft5x06.c | 3 +- + drivers/input/touchscreen/goodix.c | 9 + + drivers/input/touchscreen/surface3_spi.c | 2 +- + drivers/input/touchscreen/ucb1400_ts.c | 4 +- + 10 files changed, 367 insertions(+), 7 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/pwm-vibrator.txt + create mode 100644 drivers/input/misc/pwm-vibra.c +Merging block/for-next (50305e13dc24 Merge branch 'for-4.14/block-postmerge' into for-next) +$ git merge block/for-next +Resolved 'mm/page_io.c' using previous resolution. +Auto-merging mm/page_io.c +CONFLICT (content): Merge conflict in mm/page_io.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master da1e8946a3eb] Merge remote-tracking branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. +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 (c3ca015fab6d dax: remove the pmem_dax_ops->flush abstraction) +$ git merge device-mapper/for-next +Auto-merging include/linux/dax.h +Auto-merging fs/dax.c +Auto-merging drivers/nvdimm/pmem.c +Auto-merging drivers/md/dm.c +Auto-merging drivers/md/dm-verity-target.c +Auto-merging drivers/md/dm-thin.c +Auto-merging drivers/md/dm-switch.c +Auto-merging drivers/md/dm-stripe.c +Auto-merging drivers/md/dm-mpath.c +Auto-merging drivers/md/dm-log-writes.c +Auto-merging drivers/md/dm-linear.c +Auto-merging drivers/md/dm-integrity.c +Auto-merging drivers/md/dm-flakey.c +Auto-merging drivers/md/dm-crypt.c +Auto-merging drivers/md/dm-cache-target.c +Auto-merging drivers/md/dm-bufio.c +Merge made by the 'recursive' strategy. + drivers/dax/super.c | 21 ++++++---- + drivers/md/dm-bufio.c | 95 ++++++++++++++++++++++++++++++------------- + drivers/md/dm-bufio.h | 9 ++++ + drivers/md/dm-cache-target.c | 4 +- + drivers/md/dm-crypt.c | 2 +- + drivers/md/dm-flakey.c | 4 +- + drivers/md/dm-integrity.c | 42 +++++++++++-------- + drivers/md/dm-ioctl.c | 2 +- + drivers/md/dm-linear.c | 15 ------- + drivers/md/dm-log-writes.c | 44 ++++++++++++++------ + drivers/md/dm-mpath.c | 15 ++++--- + drivers/md/dm-rq.c | 27 ++++++------ + drivers/md/dm-rq.h | 1 + + drivers/md/dm-stripe.c | 20 --------- + drivers/md/dm-switch.c | 2 +- + drivers/md/dm-table.c | 7 ++-- + drivers/md/dm-thin.c | 2 +- + drivers/md/dm-verity-target.c | 2 +- + drivers/md/dm.c | 19 --------- + drivers/nvdimm/pmem.c | 7 ---- + fs/dax.c | 4 +- + include/linux/dax.h | 5 +-- + include/linux/device-mapper.h | 7 +--- + 23 files changed, 189 insertions(+), 167 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 (b917c6d18c03 mmc: cavium: Fix use-after-free in of_platform_device_destroy) +$ git merge mmc/next +Merge made by the 'recursive' strategy. + drivers/mmc/core/queue.c | 7 ++++++- + drivers/mmc/host/Kconfig | 2 +- + drivers/mmc/host/cavium-thunderx.c | 6 +++++- + 3 files changed, 12 insertions(+), 3 deletions(-) +Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value) +$ git merge kgdb/kgdb-next +Auto-merging kernel/debug/kdb/kdb_io.c +Merge made by the 'recursive' strategy. + kernel/debug/kdb/kdb_io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging md/for-next (184a09eb9a2f md/raid5: preserve STRIPE_ON_UNPLUG_LIST in break_stripe_batch_list) +$ git merge md/for-next +Auto-merging drivers/md/raid5.c +Merge made by the 'recursive' strategy. + drivers/md/raid5.c | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) +Merging mfd/for-mfd-next (b01e9348e106 mfd: intel_soc_pmic: Differentiate between Bay and Cherry Trail CRC variants) +$ git merge mfd/for-mfd-next +Already up-to-date. +Merging backlight/for-backlight-next (2606706e4d7b backlight: gpio_backlight: Delete pdata inversion) +$ git merge backlight/for-backlight-next +Already up-to-date. +Merging battery/for-next (5d01fd38a3b0 power: supply: bq27xxx: enable writing capacity values for bq27421) +$ git merge battery/for-next +Already up-to-date. +Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (f039685b2e3a Merge remote-tracking branches 'regulator/topic/rc5t619' and 'regulator/topic/stm32-vref' into regulator-next) +$ git merge regulator/for-next +Already up-to-date. +Merging security/next (10e3781dda77 Revert "ima: use fs method to read integrity data") +$ git merge security/next +Auto-merging security/selinux/hooks.c +Auto-merging security/selinux/avc.c +Auto-merging security/apparmor/lsm.c +Auto-merging security/apparmor/apparmorfs.c +Auto-merging include/linux/fs.h +Auto-merging fs/libfs.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging CREDITS +Merge made by the 'recursive' strategy. + CREDITS | 8 +- + Documentation/ABI/testing/ima_policy | 3 +- + Documentation/admin-guide/kernel-parameters.txt | 8 +- + .../devicetree/bindings/security/tpm/tpm-i2c.txt | 6 + + MAINTAINERS | 5 +- + drivers/char/tpm/tpm-interface.c | 10 +- + drivers/char/tpm/tpm.h | 9 +- + drivers/char/tpm/tpm2-cmd.c | 2 +- + drivers/char/tpm/tpm_crb.c | 2 +- + drivers/char/tpm/tpm_ibmvtpm.c | 98 ++++-- + drivers/char/tpm/tpm_infineon.c | 6 +- + drivers/char/tpm/tpm_tis_core.c | 8 +- + fs/efivarfs/file.c | 11 +- + fs/libfs.c | 32 ++ + include/linux/fs.h | 2 + + include/linux/lsm_audit.h | 2 +- + scripts/selinux/genheaders/genheaders.c | 7 +- + security/apparmor/.gitignore | 1 + + security/apparmor/Makefile | 43 ++- + security/apparmor/apparmorfs.c | 18 + + security/apparmor/file.c | 30 ++ + security/apparmor/include/audit.h | 30 +- + security/apparmor/include/label.h | 1 + + security/apparmor/include/net.h | 114 ++++++ + security/apparmor/include/perms.h | 5 +- + security/apparmor/include/policy.h | 13 + + security/apparmor/include/sig_names.h | 5 +- + security/apparmor/label.c | 34 +- + security/apparmor/lib.c | 5 +- + security/apparmor/lsm.c | 387 +++++++++++++++++++++ + security/apparmor/net.c | 184 ++++++++++ + security/apparmor/policy.c | 166 ++++----- + security/apparmor/policy_ns.c | 2 + + security/apparmor/policy_unpack.c | 99 +++++- + security/integrity/ima/ima.h | 1 + + security/integrity/ima/ima_api.c | 67 ++-- + security/integrity/ima/ima_crypto.c | 10 + + security/integrity/ima/ima_fs.c | 4 +- + security/integrity/ima/ima_main.c | 19 +- + security/integrity/ima/ima_policy.c | 41 ++- + security/lsm_audit.c | 2 +- + security/selinux/avc.c | 16 +- + security/selinux/hooks.c | 54 ++- + security/selinux/include/avc.h | 2 +- + security/selinux/include/avc_ss.h | 2 +- + security/selinux/include/classmap.h | 2 + + security/selinux/include/objsec.h | 2 +- + security/selinux/include/security.h | 4 +- + security/selinux/ss/avtab.c | 2 +- + security/selinux/ss/avtab.h | 2 +- + security/selinux/ss/constraint.h | 2 +- + security/selinux/ss/context.h | 2 +- + security/selinux/ss/ebitmap.c | 2 +- + security/selinux/ss/ebitmap.h | 2 +- + security/selinux/ss/hashtab.c | 2 +- + security/selinux/ss/hashtab.h | 2 +- + security/selinux/ss/mls.c | 2 +- + security/selinux/ss/mls.h | 2 +- + security/selinux/ss/mls_types.h | 2 +- + security/selinux/ss/policydb.c | 2 +- + security/selinux/ss/policydb.h | 2 +- + security/selinux/ss/services.c | 9 +- + security/selinux/ss/services.h | 2 +- + security/selinux/ss/sidtab.c | 2 +- + security/selinux/ss/sidtab.h | 2 +- + security/selinux/ss/symtab.c | 2 +- + security/selinux/ss/symtab.h | 2 +- + 67 files changed, 1346 insertions(+), 281 deletions(-) + create mode 100644 security/apparmor/include/net.h + create mode 100644 security/apparmor/net.c +Merging integrity/next (ed301d2614d2 ima: define "fs_unsafe" builtin policy) +$ git merge integrity/next +Already up-to-date. +Merging keys/keys-next (8ab2a6905b28 KEYS: Add documentation for asymmetric keyring restrictions) +$ git merge keys/keys-next +Merge made by the 'recursive' strategy. +Merging selinux/next (0c3014f22dec selinux: constify nf_hook_ops) +$ git merge selinux/next +Already up-to-date. +Merging tpmdd/next (6227756a7b0a tpm/tpm_crb: Use start method value from ACPI table directly) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + drivers/char/tpm/tpm-sysfs.c | 87 +++++++++++++++++++++++------------------ + drivers/char/tpm/tpm.h | 13 ------ + drivers/char/tpm/tpm_crb.c | 59 ++++++++++++++-------------- + drivers/char/tpm/tpm_tis.c | 2 +- + drivers/char/tpm/tpm_tis_core.c | 6 +-- + drivers/char/tpm/tpm_tis_core.h | 4 +- + drivers/char/tpm/tpm_tis_spi.c | 25 ++++++------ + 7 files changed, 94 insertions(+), 102 deletions(-) +Merging watchdog/master (4cb30b044a8f watchdog: mei_wdt: constify mei_cl_device_id) +$ git merge watchdog/master +Resolved 'Documentation/devicetree/bindings/watchdog/mtk-wdt.txt' using previous resolution. +Auto-merging Documentation/devicetree/bindings/watchdog/mtk-wdt.txt +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/watchdog/mtk-wdt.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a4bfa0254845] Merge remote-tracking branch 'watchdog/master' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/watchdog/aspeed-wdt.txt | 40 +++++++ + .../devicetree/bindings/watchdog/meson-wdt.txt | 6 +- + .../devicetree/bindings/watchdog/mtk-wdt.txt | 2 + + .../devicetree/bindings/watchdog/renesas-wdt.txt | 1 + + Documentation/watchdog/watchdog-parameters.txt | 2 +- + drivers/watchdog/asm9260_wdt.c | 4 +- + drivers/watchdog/aspeed_wdt.c | 132 +++++++++++++++++++-- + drivers/watchdog/bcm7038_wdt.c | 4 +- + drivers/watchdog/cadence_wdt.c | 6 +- + drivers/watchdog/coh901327_wdt.c | 2 +- + drivers/watchdog/da9063_wdt.c | 67 +++++------ + drivers/watchdog/diag288_wdt.c | 2 +- + drivers/watchdog/iTCO_wdt.c | 22 ++-- + drivers/watchdog/it87_wdt.c | 2 +- + drivers/watchdog/max77620_wdt.c | 2 +- + drivers/watchdog/mei_wdt.c | 2 +- + drivers/watchdog/meson_wdt.c | 2 + + drivers/watchdog/mt7621_wdt.c | 4 +- + drivers/watchdog/of_xilinx_wdt.c | 83 +++++++++++-- + drivers/watchdog/pcwd_usb.c | 2 +- + drivers/watchdog/qcom-wdt.c | 2 + + drivers/watchdog/renesas_wdt.c | 80 ++++++++----- + drivers/watchdog/rt2880_wdt.c | 4 +- + drivers/watchdog/sc1200wdt.c | 2 +- + drivers/watchdog/sp805_wdt.c | 2 +- + drivers/watchdog/stm32_iwdg.c | 2 +- + drivers/watchdog/ts72xx_wdt.c | 2 +- + drivers/watchdog/w83627hf_wdt.c | 2 +- + drivers/watchdog/ziirave_wdt.c | 2 +- + drivers/watchdog/zx2967_wdt.c | 2 +- + 30 files changed, 363 insertions(+), 124 deletions(-) +Merging iommu/next (47b59d8e4085 Merge branches 'arm/exynos', 'arm/renesas', 'arm/rockchip', 'arm/omap', 'arm/mediatek', 'arm/tegra', 'arm/qcom', 'arm/smmu', 'ppc/pamu', 'x86/vt-d', 'x86/amd', 's390' and 'core' into next) +$ git merge iommu/next +Already up-to-date. +Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (417fb50d5516 vfio: platform: constify amba_id) +$ 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 (196a5085592c audit: update the function comments) +$ git merge audit/next +Already up-to-date. +Merging devicetree/for-next (84024468cf16 devicetree: Adjust status "ok" -> "okay" under drivers/of/) +$ git merge devicetree/for-next +Already up-to-date. +Merging mailbox/mailbox-for-next (1da92afbbfcd mailbox: bcm-flexrm-mailbox: Use txdone_ack instead of txdone_poll) +$ git merge mailbox/mailbox-for-next +Already up-to-date. +Merging spi/for-next (ecb478bf866b Merge remote-tracking branch 'spi/topic/xlp' into spi-next) +$ git merge spi/for-next +Already up-to-date. +Merging tip/auto-latest (bdc56fb7a7f9 Merge branch 'x86/platform') +$ git merge tip/auto-latest +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging clockevents/clockevents/next (2287d8664fe7 timers: Make the cpu base lock raw) +$ git merge clockevents/clockevents/next +Already up-to-date. +Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (398443471f16 EDAC, mce_amd: Get rid of local var in amd_filter_mce()) +$ 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 (170b3b1050e2 tracing: Apply trace_clock changes to instance max buffer) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (656e7c0c0a2e Merge branches 'doc.2017.08.17a', 'fixes.2017.08.17a', 'hotplug.2017.07.25b', 'misc.2017.08.17a', 'spin_unlock_wait_no.2017.08.17a', 'srcu.2017.07.27c' and 'torture.2017.07.24c' into HEAD) +$ git merge rcu/rcu/next +Already up-to-date. +Merging kvm/linux-next (5f54c8b2d4fa Merge branch 'kvm-ppc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc) +$ git merge kvm/linux-next +Already up-to-date. +Merging kvm-arm/next (9b87e7a8bfb5 KVM: arm/arm64: Support uaccess of GICC_APRn) +$ 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 (43f6b0cfb2e4 KVM: PPC: Book3S HV: Fix memory leak in kvm_vm_ioctl_get_htab_fd) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (c95c895303ed KVM: s390: vsie: cleanup mcck reinjection) +$ git merge kvms390/next +Already up-to-date. +Merging xen-tip/linux-next (d785d9ec7894 xen/mmu: set MMU_NORMAL_PT_UPDATE in remap_area_mfn_pte_fn) +$ git merge xen-tip/linux-next +Already up-to-date. +Merging percpu/for-next (5e81ee3e6a79 percpu: update header to contain bitmap allocator explanation.) +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next (f7db01f6cbac Merge branch 'for-4.14' into for-next) +$ git merge workqueues/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging drivers-x86/for-next (00ebbeb39b70 platform/x86: dell-wmi: Update dell_wmi_check_descriptor_buffer() to new model) +$ git merge drivers-x86/for-next +Already up-to-date. +Merging chrome-platform/for-next (859eb05676f6 platform/chrome: Use proper protocol transfer function) +$ git merge chrome-platform/for-next +Auto-merging drivers/platform/chrome/chromeos_laptop.c +Merge made by the 'recursive' strategy. + drivers/platform/chrome/chromeos_laptop.c | 22 +++---- + drivers/platform/chrome/cros_ec_debugfs.c | 18 +++++ + drivers/platform/chrome/cros_ec_debugfs.h | 2 + + drivers/platform/chrome/cros_ec_dev.c | 49 ++++++++------ + drivers/platform/chrome/cros_ec_proto.c | 8 ++- + drivers/platform/chrome/cros_ec_sysfs.c | 105 ++++++++++++++++++++++++------ + include/linux/mfd/cros_ec.h | 1 + + 7 files changed, 149 insertions(+), 56 deletions(-) +Merging hsi/for-next (67ddd75771b6 HSI: core: Use kcalloc() in two functions) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (1591caf2d5ea leds: pca955x: check for I2C errors) +$ git merge leds/for-next +Already up-to-date. +Merging ipmi/for-next (80a469559980 ipmi: Remove the device id from ipmi_register_smi()) +$ git merge ipmi/for-next +Auto-merging drivers/char/ipmi/ipmi_si_intf.c +Merge made by the 'recursive' strategy. + Documentation/IPMI.txt | 4 +- + drivers/char/ipmi/Kconfig | 27 +- + drivers/char/ipmi/ipmi_msghandler.c | 697 +++++++++++++++++++++++++++--------- + drivers/char/ipmi/ipmi_powernv.c | 4 +- + drivers/char/ipmi/ipmi_poweroff.c | 2 +- + drivers/char/ipmi/ipmi_si_intf.c | 44 ++- + drivers/char/ipmi/ipmi_ssif.c | 18 - + drivers/char/ipmi/ipmi_watchdog.c | 11 +- + include/linux/ipmi.h | 6 +- + include/linux/ipmi_smi.h | 25 +- + 10 files changed, 603 insertions(+), 235 deletions(-) +Merging driver-core/driver-core-next (d34fc1adf01f Merge branch 'akpm' (patches from Andrew)) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging usb/usb-next (d34fc1adf01f Merge branch 'akpm' (patches from Andrew)) +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (0852659ef071 usb: gadget: f_ncm/u_ether: Move 'SKB reserve' quirk setup to u_ether) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (b5fdde28d4b7 USB: serial: option: simplify 3 D-Link device entries) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging usb-chipidea-next/ci-for-usb-next (dfebb5f43a78 usb: chipidea: Add support for Tegra20/30/114/124) +$ git merge usb-chipidea-next/ci-for-usb-next +Already up-to-date. +Merging phy-next/next (d9c51f4c53ae phy: brcm-sata: fix a timeout test in init) +$ git merge phy-next/next +Already up-to-date. +Merging tty/tty-next (d34fc1adf01f Merge branch 'akpm' (patches from Andrew)) +$ git merge tty/tty-next +Already up-to-date. +Merging char-misc/char-misc-next (d34fc1adf01f Merge branch 'akpm' (patches from Andrew)) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging extcon/extcon-next (6d43755813fa extcon: make extcon_info static const, fixes warning) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/extcon.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging staging/staging-next (f007cad159e9 Revert "firmware: add sanity check on shutdown/suspend") +$ git merge staging/staging-next +Already up-to-date. +Merging mux/for-next (aae4e7a8bc44 Linux 4.13-rc4) +$ git merge mux/for-next +Already up-to-date. +Merging slave-dma/next (7024d0a3f107 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 (9c3bace4684b Merge branch 'for-4.13-fixes' into for-next) +$ git merge cgroup/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging scsi/for-next (580b71e9f64e scsi: scsi_transport_sas: select BLK_DEV_BSGLIB) +$ git merge scsi/for-next +Auto-merging drivers/scsi/Kconfig +Merge made by the 'recursive' strategy. + drivers/scsi/Kconfig | 2 +- + drivers/scsi/hosts.c | 8 -------- + include/scsi/scsi_host.h | 6 ------ + 3 files changed, 1 insertion(+), 15 deletions(-) +Merging scsi-mkp/for-next (9189e380e2d3 scsi: qla2xxx: Fix an integer overflow in sysfs code) +$ git merge scsi-mkp/for-next +Merge made by the 'recursive' strategy. +Merging target-updates/for-next (04229774f692 tcmu: Oops in unmap_thread_fn()) +$ git merge target-updates/for-next +Merge made by the 'recursive' strategy. + drivers/target/target_core_user.c | 136 ++++++++++++++++++++++++++++++++------ + 1 file changed, 114 insertions(+), 22 deletions(-) +Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging target-bva/for-next (2ea659a9ef48 Linux 4.12-rc1) +$ git merge target-bva/for-next +Already up-to-date. +Merging libata/for-next (2ca77e8f558b Merge branch 'for-4.14' into for-next) +$ git merge libata/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation) +$ git merge binfmt_misc/for-next +Already up-to-date. +Merging vhost/linux-next (ac7380709f65 vhost: fix end of range for access_ok) +$ git merge vhost/linux-next +Auto-merging drivers/vhost/vhost.c +Merge made by the 'recursive' strategy. + drivers/vhost/vhost.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging rpmsg/for-next (7148e5c13dd7 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging gpio/for-next (02b6bddb0b0a gpio: mockup: remove unused variable gc) +$ git merge gpio/for-next +Already up-to-date. +Merging pinctrl/for-next (ac059e2aa01d Revert "pinctrl: sunxi: Don't enforce bias disable (for now)") +$ git merge pinctrl/for-next +Already up-to-date. +Merging pinctrl-samsung/for-next (bbed85f45b2b pinctrl: samsung: Remove unneeded local variable initialization) +$ git merge pinctrl-samsung/for-next +Already up-to-date. +Merging pwm/for-next (7755daf5e7e8 Merge branch 'for-4.14/drivers' into for-next) +$ git merge pwm/for-next +Auto-merging drivers/pwm/Makefile +Auto-merging drivers/pwm/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pwm/pwm-bcm2835.txt | 4 +- + .../devicetree/bindings/pwm/pwm-mediatek.txt | 6 +- + .../devicetree/bindings/pwm/pwm-rockchip.txt | 11 +- + .../devicetree/bindings/pwm/pwm-tiecap.txt | 1 + + Documentation/devicetree/bindings/pwm/pwm-zx.txt | 22 ++ + .../devicetree/bindings/pwm/renesas,tpu-pwm.txt | 1 - + drivers/pwm/Kconfig | 13 +- + drivers/pwm/Makefile | 1 + + drivers/pwm/pwm-bcm2835.c | 2 + + drivers/pwm/pwm-hibvt.c | 2 +- + drivers/pwm/pwm-mediatek.c | 78 ++++-- + drivers/pwm/pwm-meson.c | 2 +- + drivers/pwm/pwm-pca9685.c | 14 +- + drivers/pwm/pwm-renesas-tpu.c | 1 - + drivers/pwm/pwm-rockchip.c | 281 ++++++++++---------- + drivers/pwm/pwm-samsung.c | 70 ++--- + drivers/pwm/pwm-tegra.c | 2 +- + drivers/pwm/pwm-tiecap.c | 90 ++++--- + drivers/pwm/pwm-tiehrpwm.c | 122 +++++---- + drivers/pwm/pwm-vt8500.c | 1 + + drivers/pwm/pwm-zx.c | 282 +++++++++++++++++++++ + 21 files changed, 699 insertions(+), 307 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pwm/pwm-zx.txt + create mode 100644 drivers/pwm/pwm-zx.c +Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files) +$ git merge dma-buf/for-next +Resolved 'drivers/dma-buf/Kconfig' using previous resolution. +Auto-merging drivers/dma-buf/Kconfig +CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8a8fa51b6d3e] 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 (076a9bcacfc7 signal/mips: Remove FPE_FIXME usage from mips) +$ git merge userns/for-next +Resolved 'arch/mips/kernel/traps.c' using previous resolution. +Auto-merging security/commoncap.c +Auto-merging kernel/signal.c +Auto-merging kernel/exit.c +Auto-merging include/linux/user_namespace.h +Auto-merging include/linux/security.h +Auto-merging fs/xattr.c +Auto-merging fs/signalfd.c +Auto-merging arch/sparc/kernel/traps_64.c +Auto-merging arch/sparc/kernel/signal32.c +Auto-merging arch/s390/kernel/compat_signal.c +Auto-merging arch/powerpc/kernel/signal_32.c +Auto-merging arch/parisc/kernel/signal32.c +Auto-merging arch/mips/kernel/traps.c +CONFLICT (content): Merge conflict in arch/mips/kernel/traps.c +Auto-merging arch/arm64/kernel/signal32.c +Auto-merging arch/alpha/kernel/traps.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ccb6ac4ebd6c] Merge remote-tracking branch 'userns/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/include/uapi/asm/siginfo.h | 14 ++ + arch/alpha/kernel/traps.c | 6 +- + arch/arm64/kernel/signal32.c | 23 +-- + arch/blackfin/include/uapi/asm/siginfo.h | 30 ++- + arch/frv/include/uapi/asm/siginfo.h | 2 +- + arch/ia64/include/uapi/asm/siginfo.h | 21 +- + arch/ia64/kernel/signal.c | 17 +- + arch/ia64/kernel/traps.c | 4 +- + arch/mips/include/uapi/asm/siginfo.h | 4 +- + arch/mips/kernel/signal32.c | 19 +- + arch/mips/kernel/traps.c | 3 +- + arch/parisc/kernel/signal32.c | 31 ++- + arch/powerpc/kernel/signal_32.c | 20 +- + arch/s390/kernel/compat_signal.c | 32 ++- + arch/sparc/include/uapi/asm/siginfo.h | 9 +- + arch/sparc/kernel/signal32.c | 16 +- + arch/sparc/kernel/traps_32.c | 2 +- + arch/sparc/kernel/traps_64.c | 2 +- + arch/tile/include/uapi/asm/siginfo.h | 4 +- + arch/tile/kernel/compat_signal.c | 18 +- + arch/tile/kernel/traps.c | 2 +- + arch/x86/kernel/signal_compat.c | 21 +- + fs/fcntl.c | 13 +- + fs/signalfd.c | 22 +- + fs/xattr.c | 6 + + include/linux/capability.h | 2 + + include/linux/security.h | 2 + + include/linux/signal.h | 22 ++ + include/linux/user_namespace.h | 9 +- + include/uapi/asm-generic/siginfo.h | 115 +++++------ + include/uapi/linux/capability.h | 22 +- + kernel/exit.c | 4 +- + kernel/pid_namespace.c | 4 + + kernel/ptrace.c | 6 +- + kernel/signal.c | 72 +++++-- + kernel/sys.c | 8 +- + kernel/user_namespace.c | 20 +- + security/commoncap.c | 277 ++++++++++++++++++++++++-- + tools/testing/selftests/x86/mpx-mini-test.c | 3 +- + tools/testing/selftests/x86/protection_keys.c | 13 +- + 40 files changed, 623 insertions(+), 297 deletions(-) +Merging ktest/for-next (f7c6401ff84a ktest: Make sure wait_for_input does honor the timeout) +$ git merge ktest/for-next +Already up-to-date. +Merging random/dev (72e5c740f633 random: reorder READ_ONCE() in get_random_uXX) +$ git merge random/dev +Already up-to-date. +Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and counting against aio-max-nr) +$ git merge aio/master +Already up-to-date. +Merging kselftest/next (369130b63178 selftests: Enhance kselftest_harness.h to print which assert failed) +$ git merge kselftest/next +Already up-to-date. +Merging y2038/y2038 (69973b830859 Linux 4.9) +$ git merge y2038/y2038 +Already up-to-date. +Merging luto-misc/next (2dcd0af568b0 Linux 4.6) +$ git merge luto-misc/next +Already up-to-date. +Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge borntraeger/linux-next +Already up-to-date. +Merging livepatching/for-next (26d8d1e9bb48 Merge branch 'for-4.12/upstream-fixes' into for-next) +$ git merge livepatching/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging coresight/next (817ee52788a5 coresight: Extend the PIDR mask to cover relevant bits in PIDR2) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + .../coresight/coresight-dynamic-replicator.c | 4 ++-- + drivers/hwtracing/coresight/coresight-etb10.c | 4 ++-- + drivers/hwtracing/coresight/coresight-etm3x.c | 24 +++++++++++----------- + drivers/hwtracing/coresight/coresight-funnel.c | 4 ++-- + drivers/hwtracing/coresight/coresight-stm.c | 8 ++++---- + drivers/hwtracing/coresight/coresight-tmc.c | 4 ++-- + drivers/hwtracing/coresight/coresight-tpiu.c | 4 ++-- + 7 files changed, 26 insertions(+), 26 deletions(-) +Merging rtc/rtc-next (b4be271cebb6 rtc: ds1307: use octal permissions) +$ git merge rtc/rtc-next +Auto-merging drivers/rtc/rtc-ds1307.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/wakeup-source.txt | 9 +- + .../bindings/rtc/google,goldfish-rtc.txt | 17 + + .../devicetree/bindings/rtc/isil,isl12057.txt | 1 - + .../devicetree/bindings/rtc/realtek,rtd119x.txt | 16 + + .../devicetree/bindings/rtc/sun6i-rtc.txt | 4 +- + MAINTAINERS | 6 + + drivers/rtc/Kconfig | 30 +- + drivers/rtc/Makefile | 2 + + drivers/rtc/rtc-dev.c | 20 +- + drivers/rtc/rtc-ds1307.c | 457 +++++++++++---------- + drivers/rtc/rtc-ds1672.c | 2 +- + drivers/rtc/rtc-em3027.c | 2 +- + drivers/rtc/rtc-goldfish.c | 237 +++++++++++ + drivers/rtc/rtc-m41t80.c | 67 +-- + drivers/rtc/rtc-max6900.c | 2 +- + drivers/rtc/rtc-max8925.c | 2 - + drivers/rtc/rtc-mxc.c | 21 - + drivers/rtc/rtc-puv3.c | 72 +--- + drivers/rtc/rtc-pxa.c | 4 +- + drivers/rtc/rtc-rtd119x.c | 242 +++++++++++ + drivers/rtc/rtc-rv3029c2.c | 2 +- + drivers/rtc/rtc-s35390a.c | 104 +++-- + drivers/rtc/rtc-sa1100.c | 65 +-- + drivers/rtc/rtc-sun6i.c | 34 +- + drivers/rtc/rtc-vr41xx.c | 18 - + include/linux/rtc.h | 2 - + 26 files changed, 953 insertions(+), 485 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/google,goldfish-rtc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/realtek,rtd119x.txt + create mode 100644 drivers/rtc/rtc-goldfish.c + create mode 100644 drivers/rtc/rtc-rtd119x.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 (04c3c982fcc0 libnvdimm, btt: fix format string warnings) +$ git merge nvdimm/libnvdimm-for-next +Auto-merging lib/Kconfig +Auto-merging include/linux/dax.h +Auto-merging fs/xfs/xfs_super.c +Auto-merging fs/xfs/xfs_iomap.c +Auto-merging fs/xfs/xfs_buf.c +Auto-merging fs/xfs/xfs_aops.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/ext2/super.c +Auto-merging drivers/nvdimm/nd.h +Auto-merging drivers/nvdimm/btt.c +Auto-merging drivers/dax/super.c +Auto-merging drivers/acpi/nfit/core.c +Auto-merging arch/x86/Kconfig +Merge made by the 'recursive' strategy. + arch/x86/Kconfig | 1 - + arch/x86/include/asm/cacheflush.h | 2 - + drivers/acpi/nfit/Kconfig | 2 +- + drivers/acpi/nfit/core.c | 50 ++++++++-- + drivers/dax/super.c | 12 +++ + drivers/nvdimm/btt.c | 197 ++++++++++++++++++++++++++++++-------- + drivers/nvdimm/btt.h | 11 +++ + drivers/nvdimm/btt_devs.c | 4 +- + drivers/nvdimm/bus.c | 27 +++--- + drivers/nvdimm/claim.c | 9 +- + drivers/nvdimm/core.c | 10 +- + drivers/nvdimm/label.c | 30 +++--- + drivers/nvdimm/namespace_devs.c | 6 +- + drivers/nvdimm/nd.h | 16 +++- + drivers/nvdimm/pfn_devs.c | 53 ++++++---- + drivers/nvdimm/pmem.h | 14 --- + drivers/nvdimm/region_devs.c | 6 +- + fs/ext2/ext2.h | 1 + + fs/ext2/inode.c | 11 +-- + fs/ext2/super.c | 4 + + fs/ext4/ext4.h | 1 + + fs/ext4/inode.c | 11 +-- + fs/ext4/super.c | 4 + + fs/xfs/xfs_aops.c | 13 +++ + fs/xfs/xfs_aops.h | 1 + + fs/xfs/xfs_buf.c | 4 +- + fs/xfs/xfs_buf.h | 3 +- + fs/xfs/xfs_iomap.c | 10 +- + fs/xfs/xfs_super.c | 25 ++++- + include/linux/dax.h | 6 ++ + include/linux/libnvdimm.h | 16 ++++ + lib/Kconfig | 3 - + tools/testing/nvdimm/test/nfit.c | 4 +- + 33 files changed, 397 insertions(+), 170 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 kspp/for-next/kspp (cb624a11ecd5 Merge branch 'for-next/secureexec' into for-next/kspp) +$ git merge kspp/for-next/kspp +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging akpm-current/current (b57e644ad05d kernel-reboot-add-devm_register_reboot_notifier-fix) +$ git merge --no-ff akpm-current/current +Auto-merging mm/page_alloc.c +Auto-merging mm/memory_hotplug.c +Auto-merging include/linux/mm.h +Auto-merging include/linux/memory_hotplug.h +Auto-merging fs/ocfs2/super.c +Merge made by the 'recursive' strategy. + arch/arm/include/asm/page.h | 2 + + arch/arm/mm/dma-mapping.c | 8 +- + arch/powerpc/sysdev/fsl_rio.c | 17 +- + arch/powerpc/sysdev/fsl_rmu.c | 8 + + arch/x86/kernel/machine_kexec_64.c | 1 + + block/genhd.c | 2 +- + drivers/rapidio/devices/tsi721.c | 7 + + drivers/rapidio/rio-access.c | 40 +---- + fs/ocfs2/dlm/dlmmaster.c | 66 +++++-- + fs/ocfs2/dlmglue.c | 2 +- + fs/ocfs2/filecheck.c | 357 ++++++++++++++----------------------- + fs/ocfs2/filecheck.h | 29 ++- + fs/ocfs2/ocfs2.h | 8 + + fs/ocfs2/stackglue.c | 6 - + fs/ocfs2/stackglue.h | 3 - + fs/ocfs2/super.c | 35 +++- + fs/seq_file.c | 10 -- + include/linux/crash_core.h | 2 + + include/linux/memory_hotplug.h | 3 - + include/linux/mm.h | 1 + + include/linux/pageblock-flags.h | 11 ++ + include/linux/reboot.h | 4 + + include/uapi/linux/sysctl.h | 4 + + kernel/reboot.c | 27 +++ + mm/cma.c | 83 +++++++-- + mm/compaction.c | 63 +++++-- + mm/internal.h | 4 +- + mm/memory_hotplug.c | 4 + + mm/page_alloc.c | 92 ++++++---- + mm/page_owner.c | 4 +- + mm/vmscan.c | 17 +- + scripts/parse-maintainers.pl | 52 +++++- + 32 files changed, 588 insertions(+), 384 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: drivers/media/cec/cec-adap.c: fix build with gcc-4.4.4 +Applying: fscache: fix fscache_objlist_show format processing +Applying: IB/mlx4: fix sprintf format warning +Applying: iopoll: avoid -Wint-in-bool-context warning +Applying: sparc64: NG4 memset 32 bits overflow +Applying: mm: treewide: remove GFP_TEMPORARY allocation flag +Applying: treewide-remove-gfp_temporary-allocation-flag-fix +Applying: treewide-remove-gfp_temporary-allocation-flag-checkpatch-fixes +Applying: drm/i915: fix up for mm: treewide: remove GFP_TEMPORARY allocation flag +Applying: arm64: stacktrace: avoid listing stacktrace functions in stacktrace +Applying: mm, page_owner: skip unnecessary stack_trace entries +Applying: lib/crc-ccitt: add CCITT-FALSE CRC16 variant +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 6cfc8998d314...48b0d5c128bf akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (48b0d5c128bf lib/crc-ccitt: add CCITT-FALSE CRC16 variant) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + arch/arc/kernel/setup.c | 2 +- + arch/arc/kernel/troubleshoot.c | 2 +- + arch/arm64/kernel/stacktrace.c | 18 +++++-- + arch/powerpc/kernel/rtas.c | 4 +- + arch/powerpc/platforms/pseries/suspend.c | 2 +- + arch/sparc/lib/NG4memset.S | 26 +++++----- + drivers/gpu/drm/drm_blend.c | 2 +- + drivers/gpu/drm/drm_dp_dual_mode_helper.c | 2 +- + drivers/gpu/drm/drm_scdc_helper.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 2 +- + drivers/gpu/drm/i915/i915_gem.c | 2 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 12 ++--- + drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 4 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 6 +-- + drivers/gpu/drm/i915/selftests/i915_random.c | 2 +- + drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c | 10 ++-- + drivers/gpu/drm/i915/selftests/intel_uncore.c | 2 +- + drivers/gpu/drm/lib/drm_random.c | 2 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 2 +- + drivers/gpu/drm/selftests/test-drm_mm.c | 4 +- + drivers/infiniband/hw/mlx4/sysfs.c | 2 +- + drivers/media/cec/cec-adap.c | 5 +- + drivers/misc/cxl/pci.c | 2 +- + drivers/xen/gntalloc.c | 2 +- + fs/coredump.c | 2 +- + fs/exec.c | 4 +- + fs/fscache/object-list.c | 3 +- + fs/overlayfs/copy_up.c | 2 +- + fs/overlayfs/dir.c | 2 +- + fs/overlayfs/namei.c | 12 ++--- + fs/proc/base.c | 8 +-- + fs/proc/task_mmu.c | 2 +- + include/linux/crc-ccitt.h | 7 +++ + include/linux/gfp.h | 2 - + include/linux/iopoll.h | 24 +++++---- + include/linux/regmap.h | 12 +++-- + include/trace/events/mmflags.h | 1 - + kernel/locking/test-ww_mutex.c | 2 +- + kernel/trace/trace_events_filter.c | 2 +- + lib/crc-ccitt.c | 58 +++++++++++++++++++++- + lib/string_helpers.c | 4 +- + mm/page_owner.c | 2 +- + mm/shmem.c | 2 +- + mm/slub.c | 2 +- + tools/perf/builtin-kmem.c | 1 - + 46 files changed, 177 insertions(+), 98 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..eff91407a2a6 --- /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.13-rc3 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..c247f19550fe --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20170912 |