diff options
| -rw-r--r-- | Next/SHA1s | 269 | ||||
| -rw-r--r-- | Next/Trees | 271 | ||||
| -rw-r--r-- | Next/merge.log | 7484 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 8029 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..db081d961b72 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,269 @@ +Name SHA1 +---- ---- +origin 8d31f80eb38819e4f2905ad21c0e8998382a08f7 +fixes b4b8cbf679c4866a523a35d1454884a31bd5d8dc +kbuild-current 4e433fc4d1a93310d31e7671faca8660a2890908 +arc-current b5ddb6d54729d814356937572d6c9b599f10c29f +arm-current ce184a0dee92a0a333236a26478e304dca29a3df +m68k-current 204a2be30a7a8a8d12642f23f3fbdc8b9923b500 +metag-fixes b884a190afcecdbef34ca508ea5ee88bb7c77861 +powerpc-fixes 785a12afdb4a52903447fd890633c82fdda4b6f7 +sparc 0a23ea65ce9f10ec2ea392571006b781b150327f +fscrypt-current 42d97eb0ade31e1bc537d086842f5d6e766d9d51 +net 48fb6f4db940e92cfb16cd878cddd59ea6120d06 +ipsec 4ff0308f06da5016aafb05330ed37809b54f81ae +netfilter 9beceb54fa2c0b47532dd2b07f37e410641cf9b2 +ipvs f7fb77fc12352d15180dc3c08ffba10573d5167d +wireless-drivers 9d6b9b8d1cdbda449bd30e6f63b8eeca15829475 +mac80211 d7f13f7450369281a5d0ea463cc69890a15923ae +sound-current 5ef26e966d3fd105ad9a7e8e8f6d12c7fbd4c03d +pci-current 8466489ef5ba48272ba4fa4ea9f8f403306de4c7 +driver-core.current 5771a8c08880cdca3bfb4a3fc6d309d6bba20877 +tty.current 9527b82ae3af1ebf465506868fb55e7f862cd9da +usb.current 8cc34c8d6113bef00a3a6d59ee101145cc350d61 +usb-gadget-fixes b7d44c36a6f6d956e1539e0dd42f98b26e5a4684 +usb-serial-fixes fd1b8668af59a11bb754a6c9b0051c6c5ce73b74 +usb-chipidea-fixes cbb22ebcfb9920380ed69854a7095d497798063d +phy 5771a8c08880cdca3bfb4a3fc6d309d6bba20877 +staging.current cef988642cdac44e910a27cb6e8166c96f86a0df +char-misc.current 520eccdfe187591a51ea9ab4c1a024ae4d0f68d9 +input-current 293b915fd9bebf33cdc906516fb28d54649a25ac +crypto-current 8861249c740fc4af9ddc5aee321eafefb960d7c6 +ide 921edf312a6a20be16cf2b60e0dec3dce35e5cb9 +vfio-fixes 796b755066dd6254bfb6388fec901631e868d1c7 +kselftest-fixes 7ba190be873a86b2b90a25daca93ca1ced6c4423 +backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f +ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600 +nand-fixes ee02f73e04c0e690600f621a3a1d2245834af7fe +spi-nor-fixes 5771a8c08880cdca3bfb4a3fc6d309d6bba20877 +mfd-fixes 9e69672e90ccff10dab6f0c9545226a886e5973c +v4l-dvb-fixes 0659445f47586b128613e011eae9f24b07ebe838 +reset-fixes 4497a224f759cd8350e07382307b55f870ef0df2 +drm-intel-fixes 1e2ba788787c86f527eca6ffd9adb97d691a810e +drm-misc-fixes 0fa375e6bc9023211eead30a6a79963c45a563da +kbuild 4e433fc4d1a93310d31e7671faca8660a2890908 +uuid 832e4c83abc5ec25af77db6c8a0f36d78f1cf825 +dma-mapping 878ec36765fa71ffe656bc003d25bb9f8bad28f9 +asm-generic a351e9b9fc24e982ec2f0e76379a49826036da12 +arc 6f8119230ed026cee037dad784e7f8968ebfb052 +arm 9182571b44a464a5a87fd39a2a79fdf03a714961 +arm-perf 5771a8c08880cdca3bfb4a3fc6d309d6bba20877 +arm-soc 41c454fa0e86e3d186abfe1598645ead667da4ac +actions 253d192bc4aab497656d8644e380c63613ce0236 +alpine a1144b2b1ec47f50951a83eb2bd847c74415b567 +amlogic 3a5fd3ca8f0847e3bca319a84462ec46b0915dd7 +aspeed 4944e5dbb215cb99491bc5cd519045ae84536d2c +at91 01c1fe77824eec3b1dc2f35152232f941c68342d +bcm2835 e83e7335d05989773de0f70c0bea6a912343c21a +berlin 5153351425c92f3e89358c8eb62ca8d901437581 +cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4 +imx-mxs 6694c45eb2d826ffc930411eb095113eeacfcc20 +keystone 04e89a1e052e85f5601e767936b4d2a9e4d69b3b +mvebu fb18f4b252a9db3ec4d198b322bd6b1cb1104e60 +omap 191ae5a412465c2cfec6886d8bc78a114d15ca1d +omap-pending c20c8f750d9f8f8617f07ee2352d3ff560e66bc2 +reset 694a52e62d23ccb9beba3aab7237ededd7a90e0d +qcom 2ab014d39cd5d28f21740975b9089c846e64e057 +realtek 5771a8c08880cdca3bfb4a3fc6d309d6bba20877 +renesas ac8924e85224e5b155451f622ebe0496e410e674 +rockchip 283d2211124b3094e786104f349f351a66c35835 +rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590 +samsung 2ea659a9ef488125eb46da6eb571de5eae5c43f6 +samsung-krzk 86247b536cd0e50e2099c83de67b3e465ff958f5 +sunxi e5578a5586ca6f5913667835db26ecad227b5f82 +tegra 20e72aa386b007d96d1ce444ffc6152baf9dcb2f +arm64 6ec4e2514decd6fb4782a9364fa71d6244d05af4 +clk 8e7be401f2f57673d71a9adf7dd8a9b58ae4e955 +c6x eab89e215ae4b1f5369094882087dec51f64bde7 +cris 8f50f2a1b46a11a9a9fb46c5d8325dfc88281a76 +h8300 58c57526711f7c87046b7c5a650535acbab2d3fb +hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a +ia64 fbb0e4da96f4503e65bc4fb627cf4e1d7c8c64e6 +m68k 204a2be30a7a8a8d12642f23f3fbdc8b9923b500 +m68knommu c483cdd22fc7501c6163556a5d9d5e3dd66f0fd5 +metag e3cd7f013bac3105d44b8bd5a90359989d45b5a5 +microblaze 14ef905bb2eecb02f7ce31b8fbedd4a75ddf0f57 +mips aa9a357f236f866f47cf7e9dab61cb14e1898ae4 +nios2 e118c3fec9c0d8d2a96462c4c035305dc952e402 +openrisc 9d15eb228b10fbe9c7ca2cfb257ddf8be826c428 +parisc-hd 6f7da290413ba713f0cdd9ff1a2a9bb129ef4f6c +powerpc 21a0e8c14bf61472723d2acc83f98ab35ff321b4 +fsl 61baf15555129f69720334f232b153890895ef71 +mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0 +s390 a3c1a2194a7c776c08ad704cd8a3b3ea694c60e6 +sparc-next cb8c65ccff7f77d0285f1b126c72d37b2572c865 +sh 6e2fbfdd585f46128ce8879738bca09719a65138 +tile 637f23abca87d26e091e0d6647ec878d97d2c6cd +uml 61e8d462457f202bf0c6393133425ad387825e22 +unicore32 bc27113620ca6b67320b8a57e70d801dc94221d5 +xtensa 271335b9726e230eda124c83af2b4773502288f5 +fscrypt c250b7dd8e73b5f7d88d231fbaac92e3360a7234 +befs 5771a8c08880cdca3bfb4a3fc6d309d6bba20877 +btrfs 8b8b08cbfb9021af4b54b4175fc4c51d655aac8c +btrfs-kdave 3497efbab8dc79090cfdf6c4712dfdd0c03ae2f1 +ceph 326547a91b3f0ee7482db136153bb84996d71756 +cifs 235b84fc862ae2637dc0dabada18d97f1bfc18e1 +configfs 19e72d3abb63cb16d021a4066ce1a18880509e99 +ecryptfs be280b25c3288824ed4c201b452c3e87a7074d7c +ext3 41e327b586762833e48b3703d53312ac32f05f24 +ext4 4e5620132144666ab41fc2799fbc055830187b7e +f2fs a36c106dffb616250117efb1cab271c19a8f94ff +freevxfs bf1bb4b460c8dc3a33793bff21464a9d816697ad +fscache d52bd54db8be8999df6df5a776f38c4f8b5e9cea +fuse 61c12b49e1c9c77d7a1bcc161de540d0fd21cf0c +jfs f070e5ac9bc7de71c34402048ce5526dccbd347c +nfs 92b2e6a6f5802b8c62b4a44fba48d73e0fff6bb7 +nfsd b20dae70bfa5014fdf201d0a8589271b888e4927 +orangefs 2f713b5c7d2a90baba6c88174c81fb9a96bfde21 +overlayfs 0e082555cec9510d276965fe391f709acb32c0f4 +v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc +ubifs a6664433d383eeb71cbdeb9aea2c66eeea76e742 +xfs 56bdf855e676f1f2ed7033f288f57dfd315725ba +file-locks 3953704fde7ec47f452ce6446fb7a0d5dc2f74df +wberr 6d4b51241394664fffbf68ea86c96d2699344583 +vfs 66bf9796772633c8b0650e858da94467ec43dc18 +vfs-jk 030b533c4fd4d2ec3402363323de4bb2983c9cee +vfs-miklos 0eb8af4916a540c362a2950e5ab54eca32eb7d58 +printk 5a814231ae3d4f248a8ecb668a072a1da471c656 +pci 16f73eb02d7e1765ccab3d2018e0bd98eb93d973 +pstore 520eccdfe187591a51ea9ab4c1a024ae4d0f68d9 +hid 5f6007965f07f29eb0b6d0c931fd008000bce58d +i2c ba1f668f388c5e09d379e43f7c4aa6ee3d43b1e7 +jdelvare-hwmon 08d27eb2066622cd659b91d877d0406ebd651225 +dmi f996c4155d0d10833cfc62e4d3081951fe188b5e +hwmon-staging 8ade9b3d740c6f0f36f500402ce347a2c24851b5 +jc_docs 720688c449997cc58c027ffff2b0323a422b9ca0 +v4l-dvb ec0c3ec497cabbf3bfa03a9eb5edcc252190a4e0 +v4l-dvb-next 474dfccf36850818214ce23a77fc2c7cdf8a57cb +fbdev 5ad3f3f6eb1fbec716a61dbe46565dcd9ca94387 +pm f5133732b52cdbedb6fb1b5d4324c89913afdf18 +idle 306899f94804aece6d8fa8b4223ede3b48dbb59c +thermal 5d72ed35678a351a1aed4b454c25d583f8bccb28 +thermal-soc aa647852c32a1890a4b1bc327b9d748b82bc1484 +ieee1394 72f3c27aa6460196ec0261bb780fbba036eef6de +dlm 1c24285372412b26af4f0f980c115e857fb87c02 +swiotlb 69369f52d28a34c84acb6f2a8a585e743441566a +net-next cd9cb3890b202f33ab4dfc287582ced6a2205137 +ipsec-next f70f250a77313b542531e1ff7a449cd0ccd83ec0 +netfilter-next 549d2d41c1a448380872858302ee91be5a3ed499 +nfc-next bd751808f9ff5e1822c627f6c4283009e66b2e53 +ipvs-next a910d20aa007b94cf1799df59341f5e27ca60e6f +wireless-drivers-next 2db3aaba0a9fc769435477059c1224c439061752 +bluetooth 198ec9ae052922d67491ab3cc3fd704580e0daf4 +mac80211-next 3dc02251f43fb5ec7fa576138005edbfe35ed1ca +rdma 913cc67159bc85a96d94df301ca39c1b2c540dca +gfs2 df7929266fe77ee9c1c3d8e1e6c02e7c0b7cc763 +mtd 33983675fbd5b2447430c3dd4c205e879576b475 +l2-mtd 1fbef470f3691a4a8afc4937c4ad1901e42901c4 +nand bd02f8e5a08c017646ace45b3e1b84804326cd95 +spi-nor eb353aaa7c552ee09a99510775e6be34f41375ce +crypto 2d97591ef43d0587be22ad1b0d758d6df4999a0b +drm 09ef2378dc42339f3871584dc26d27da220277cb +drm-panel e4bac408b08437d190785ab1250cc676304ed171 +drm-intel 912d64123d354dd2e4ced479e1d93e74ea4c99a8 +drm-tegra 43240bbd871e2c8f89584d369278a3d18680d9ea +drm-misc f3e31b73a54229a39db29345347b8f96d6cd312e +drm-exynos 7d1e042314619115153a0f6f06e4552c09a50e13 +drm-msm a49b9ec9cae3276fac6ebed65460537352a4b51c +hdlcd fee4964f0a6cd2ce6368d2c69e9ec8e6f44fb0ec +mali-dp e46477b8f23c4b7286884147928adefd725459d6 +sunxi-drm 7dafb83edd3271917458de0ae70586ac63098e2f +imx-drm 790cb4c7c9545953d22d3d425e49b36a711bae5b +etnaviv 23d1dd03cc51e2570045745c7a24ef0f45141558 +kconfig 6f7da290413ba713f0cdd9ff1a2a9bb129ef4f6c +regmap a7c33d98535c507c6bab8de984d176a3d0b989ab +sound 5e463d6d292a259bd1b50c56d9b2a547fc907afd +sound-asoc 19d71229654f90a917d1bb68cfed342603c0a965 +modules 0bf8bf50eddc7511b52461bae798cbfaa0157a34 +input 94aef061c796d3d47f1a2eed41e651ffaaade402 +block bdd2d5f6e545a45adcb8f9bde40f9dfa7d5806d4 +lightnvm 1c6286f26301ad154a1c10fb6e68925493dd28ba +device-mapper 2298b6212f1c1372d2142b1bdc461f7e40a0e7cd +pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8 +mmc 7bb2a5d1342fcba2e32406fdb1e4c3d501ec6782 +kgdb 7a6653fca50077f342bcdc39222d78928e3f0feb +md fb15258a6f4a846d0e004e308c88429e800ecc7d +mfd af74963b8c0a02941ddc06e6c9971a01cafd7611 +backlight 2606706e4d7b89ebf13f35895a7dfe00e394e782 +battery 67bd22c09ac1b54b5f42445783d2dc8e011f7a71 +omap_dss2 c456a2f30de53e77a2eb8eeb4202d742516aa76b +regulator 485dbd53900a20fd685947be8ea21947245730a5 +security be6f039747e7d2fa0cb7f1d9d7cbfa52fa051750 +integrity fc26bd50539b6f52aa75ffbaec7b083825ec5451 +keys 8ab2a6905b28a3a54cf833675ef555ab70cc9108 +selinux 476accbe2f6ef69caeebe99f52a286e12ac35aee +tpmdd 20ae91be32b55f3bb92c27d79e2d56a7c32a99cd +watchdog c013b65ad8a1e132f733404809afc72f7d00e768 +iommu a7521d49605be0be699e2624ccc8841c4a1ef91e +dwmw2-iommu 910170442944e1f8674fd5ddbeeb8ccd1877ea98 +vfio 7f56c30bd0a232822aca38d288da475613bdff9b +trivial 6fbc8798d9461c0ff22fab9fbaddde13de815941 +audit 4070ad3e8ffa357fd0a78a72adf56700df238a64 +devicetree a5d9f249ddec17ce749d100982abb6029114d754 +mailbox 25bfee16d5a3158086273cc51110c7470144c842 +spi 051dd7553387ce4c8191f5179c8728801009685b +tip f74b4d835d21b752b4cab2ce381a97b223475d22 +clockevents 2287d8664fe7345ead891017eccd879fc605305e +edac 345fb0a9a6340ba0b3b714d62f877fde88c8a755 +edac-amd 3e5d2bd19138d6683f69de26a34d7eb9ab3823ed +irqchip c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201 +ftrace a7e52ad7ed82e21273eccff93d1477a7b313aabb +rcu 73a1fd7c7255f465714ffc55c9cacf7911f0156d +kvm aae4e7a8bc44722fe70d58920a36916b1043195e +kvm-arm 7e5a672289c9754d07e1c3b33649786d3d70f5e4 +kvm-mips dc44abd6aad22411f7f9890e39fd4753dabf0d03 +kvm-ppc 8b24e69fc47e43679bb29ddb481aa0e8dce2a3c5 +kvms390 5091d7c8ca2ded27e96fe234c64422a60adda2ce +xen-tip e91b2b1194335ca83d8a40fa4e0efd480bf2babe +percpu 5e81ee3e6a79cc9fa85af5c3db0f1f269709bbf1 +workqueues 1fce1c2b4f517c37e8435556e18686f3b0863e8d +drivers-x86 c801603e6d0c1bf87930402462d2e4185b1e9264 +chrome-platform 3c778a7fcfaa4bb51aefb4f2c7364a5e2c4d0b66 +hsi 67ddd75771b6b860bc0cebb3b7fd4cbebeda9cd4 +leds 7358df4d5b01d9b5cccad6149b63804e8cdcf1dc +ipmi 1d51142219c31b99974df38778042618a6b3c7dc +driver-core 1f5000bd8afab0ceed58c67f673250b864e5a9c9 +usb e978e9b977b0884e16305b6c80807c05a882837d +usb-gadget 5771a8c08880cdca3bfb4a3fc6d309d6bba20877 +usb-serial 5771a8c08880cdca3bfb4a3fc6d309d6bba20877 +usb-chipidea-next f86c9d735b4990528d87ab68c9b7dc4cba0f64b8 +phy-next 29f2711eb51c65219ba38fc7d762b94248d441a0 +tty 8a5a90a2a477b86a3dc2eaa5a706db9bfdd647ca +char-misc e819accd74a671efd3b9f3ea6752a067d7cc6402 +extcon 1cf76c4eeb07ba31a03066c6540d96fd64d7a34f +staging 5551ad1e9fad2cf06288c6e93cb95f879b8cdf5e +mux a351e9b9fc24e982ec2f0e76379a49826036da12 +slave-dma d4381f3cff0b2812044d79ce5ae867503cc48e0a +cgroup 96e2c6dba80f053d4466cd972a4a03e3947f5714 +scsi c0d1f980d9c701430c35bd40fe3cacc07503efdf +scsi-mkp 2dd7cfcb67843322c42053f8fd9a8d505fed495f +target-updates 04229774f69250e0f7e63b4d1b50ba8371c9d165 +target-merge 2994a75183173defc21f0d26ce23b63232211b88 +target-bva 2ea659a9ef488125eb46da6eb571de5eae5c43f6 +libata d0e01c1d1f33319f9c88d847c0ee16b62848fc72 +binfmt_misc 4af75df6a410ce76d9f60f27b07e5645ecc2c5ed +vhost c9379b24d6fcf88f898810076b9712fd11e6b510 +rpmsg 99ec27115e392e52c87f70d78eff40501ffc776c +gpio 2fdefbf2e9d4ddb3663c1bab669b148d02977f98 +pinctrl fa2c92eceadb0e1954f4479c01958a28c3656f65 +pinctrl-samsung bbed85f45b2b727bb776b914b84c67e8fd825433 +pwm 5ec8c48a6235175f7ff59ed1acbe91d4d0398026 +dma-buf 194cad44c4e1553fd8fcfbc940d27e756324ec3a +userns 64a76d0d64bea159da997c002a916ffc03f98bfc +ktest f7c6401ff84ab8ffffc281a29aa0a787f7eb346e +random 72e5c740f6335e27253b8ff64d23d00337091535 +aio 4c1d69950da453318c938f8c480388e235c92bb9 +kselftest 43c6437453f2e777da306c81c1cb47612e21e972 +y2038 69973b830859bc6529a7a0468ba0d80ee5117826 +luto-misc 2dcd0af568b0cf583645c8a317dd12e344b1c72a +borntraeger e76d21c40bd6c67fd4e2c1540d77e113df962b4d +livepatching 26d8d1e9bb4878285f8ce852783cbd2f6bb95c1f +coresight 6d34a5f3806d2228eb229946775d83758c15cd3e +rtc 2f7f1b780dd60278819d396b67db8c41db6a3b1f +hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828 +nvdimm bbb3be170ac2891526ad07b18af7db226879a8e7 +dax-misc 4d9a2c8746671efbb0c27d3ae28c7474597a7aad +idr f0f3f2d0a3e0f7c48163fd8b45f5909d46e7f371 +kspp cb624a11ecd56d31de3edb9e550a21bab1a89925 +akpm-current de6bc1ead155c0c1a6d79aa6d8e0c700572ab769 +akpm e61fbc7dbf5e07a94c3817fbbd63057a1e57549c diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..42ae8afda58b --- /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 +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 +wberr git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#wberr-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..fef7fab21874 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,7484 @@ +$ date -R +Thu, 10 Aug 2017 09:24:03 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at bfa738cf3dfa Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma +Merging origin/master (8d31f80eb388 Merge tag 'pinctrl-v4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl) +$ git merge origin/master +Updating bfa738cf3dfa..8d31f80eb388 +Fast-forward + Documentation/gpio/gpio-legacy.txt | 2 +- + MAINTAINERS | 2 +- + arch/mips/net/ebpf_jit.c | 1950 ++++++++++++++++++++ + arch/s390/net/bpf_jit_comp.c | 3 +- + block/bfq-iosched.h | 22 +- + block/bfq-wf2q.c | 146 +- + block/blk-mq.c | 17 +- + drivers/crypto/inside-secure/safexcel_hash.c | 8 +- + drivers/i2c/busses/Kconfig | 2 +- + drivers/i2c/busses/i2c-designware-platdrv.c | 6 +- + drivers/i2c/i2c-core-acpi.c | 19 +- + drivers/i2c/i2c-core-base.c | 1 + + drivers/i2c/i2c-core.h | 9 + + drivers/i2c/muxes/Kconfig | 2 +- + drivers/isdn/hysdn/hysdn_proclog.c | 28 +- + drivers/net/dsa/mt7530.c | 38 + + drivers/net/dsa/mt7530.h | 1 + + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 6 +- + drivers/net/ethernet/broadcom/b44.c | 1 + + drivers/net/ethernet/ibm/ibmvnic.c | 15 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 2 + + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 4 + + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 15 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 29 +- + drivers/net/ethernet/mellanox/mlx4/fw.c | 9 +- + drivers/net/ethernet/mellanox/mlx4/fw.h | 1 + + drivers/net/ethernet/mellanox/mlx4/main.c | 2 + + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 37 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 2 + + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 2 +- + drivers/net/ethernet/ti/cpts.c | 111 +- + drivers/net/ethernet/ti/cpts.h | 2 +- + drivers/net/gtp.c | 2 +- + drivers/net/hyperv/hyperv_net.h | 3 +- + drivers/net/hyperv/netvsc.c | 3 + + drivers/net/hyperv/rndis_filter.c | 14 +- + drivers/net/ipvlan/ipvlan_main.c | 2 +- + drivers/net/ppp/ppp_generic.c | 18 +- + drivers/net/usb/asix.h | 1 + + drivers/net/usb/asix_common.c | 53 +- + drivers/net/usb/asix_devices.c | 1 + + drivers/net/usb/lan78xx.c | 18 +- + drivers/net/usb/qmi_wwan.c | 7 +- + drivers/net/vxlan.c | 1 + + drivers/pinctrl/intel/pinctrl-cherryview.c | 7 + + drivers/pinctrl/intel/pinctrl-merrifield.c | 6 +- + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 25 +- + drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c | 1 + + drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c | 2 +- + drivers/pinctrl/zte/pinctrl-zx.c | 11 +- + drivers/ptp/ptp_clock.c | 42 + + drivers/ptp/ptp_private.h | 3 + + drivers/s390/net/qeth_l3_main.c | 4 +- + include/linux/device.h | 2 +- + include/linux/i2c.h | 3 +- + include/linux/mlx4/device.h | 1 + + include/linux/pinctrl/pinconf-generic.h | 4 +- + include/linux/ptp_clock_kernel.h | 20 + + include/net/tcp.h | 10 + + kernel/futex.c | 5 +- + net/batman-adv/translation-table.c | 60 +- + net/batman-adv/types.h | 2 + + net/core/dev.c | 2 +- + net/ipv4/cipso_ipv4.c | 12 +- + net/ipv4/fou.c | 1 + + net/ipv4/tcp_input.c | 34 +- + net/ipv4/tcp_output.c | 27 +- + net/ipv4/tcp_timer.c | 3 +- + net/ipv4/udp_offload.c | 2 +- + net/ipv6/route.c | 11 +- + net/ipv6/udp_offload.c | 2 +- + net/rds/ib_recv.c | 5 +- + net/sched/act_ipt.c | 20 +- + tools/build/feature/test-bpf.c | 2 + + tools/lib/bpf/bpf.c | 2 + + tools/testing/selftests/bpf/test_pkt_md_access.c | 11 + + tools/testing/selftests/bpf/test_verifier.c | 19 +- + 77 files changed, 2682 insertions(+), 296 deletions(-) + create mode 100644 arch/mips/net/ebpf_jit.c +Merging fixes/master (b4b8cbf679c4 Cavium CNN55XX: fix broken default Kconfig entry) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/fixes (4e433fc4d1a9 fixdep: trivial: typo fix and correction) +$ git merge kbuild-current/fixes +Merge made by the 'recursive' strategy. + Makefile | 10 +++++----- + include/asm-generic/vmlinux.lds.h | 38 ++++++++++++++++++++++++++------------ + scripts/Kbuild.include | 7 +++---- + scripts/Makefile.build | 8 ++++---- + scripts/basic/Makefile | 2 +- + scripts/basic/fixdep.c | 6 +++--- + 6 files changed, 42 insertions(+), 29 deletions(-) +Merging arc-current/for-curr (b5ddb6d54729 ARCv2: PAE40: set MSB even if !CONFIG_ARC_HAS_PAE40 but PAE exists in SoC) +$ git merge arc-current/for-curr +Removing arch/arc/plat-sim/Kconfig +Auto-merging arch/arc/mm/dma.c +Merge made by the 'recursive' strategy. + arch/arc/Kconfig | 1 - + arch/arc/Makefile | 2 +- + arch/arc/boot/dts/axc001.dtsi | 20 ++++++------ + arch/arc/boot/dts/axc003.dtsi | 21 ++++++------- + arch/arc/boot/dts/axc003_idu.dtsi | 21 ++++++------- + arch/arc/boot/dts/axs10x_mb.dtsi | 2 +- + arch/arc/configs/haps_hs_defconfig | 1 - + arch/arc/configs/haps_hs_smp_defconfig | 1 - + arch/arc/configs/nps_defconfig | 1 - + arch/arc/configs/nsim_700_defconfig | 1 - + arch/arc/configs/nsim_hs_defconfig | 1 - + arch/arc/configs/nsim_hs_smp_defconfig | 1 - + arch/arc/configs/nsimosci_defconfig | 1 - + arch/arc/configs/nsimosci_hs_defconfig | 1 - + arch/arc/configs/nsimosci_hs_smp_defconfig | 1 - + arch/arc/configs/tb10x_defconfig | 1 - + arch/arc/include/asm/cache.h | 2 ++ + arch/arc/include/asm/mmu.h | 2 ++ + arch/arc/mm/cache.c | 50 +++++++++++++++++++++++++----- + arch/arc/mm/dma.c | 45 +++++++++++++++++++++++++++ + arch/arc/mm/tlb.c | 12 ++++++- + arch/arc/plat-sim/Kconfig | 13 -------- + arch/arc/plat-sim/platform.c | 5 ++- + 23 files changed, 137 insertions(+), 69 deletions(-) + delete mode 100644 arch/arc/plat-sim/Kconfig +Merging arm-current/fixes (ce184a0dee92 ARM: 8687/1: signal: Fix unparseable iwmmxt_sigframe in uc_regspace[]) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (204a2be30a7a m68k: Remove ptrace_signal_deliver) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging powerpc-fixes/fixes (785a12afdb4a powerpc/powernv/idle: Disable LOSE_FULL_CONTEXT states when stop-api fails) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/kernel/entry_64.S | 60 +++++++++++------------------------ + arch/powerpc/kernel/process.c | 4 --- + arch/powerpc/platforms/powernv/idle.c | 41 ++++++++++++++++++++++-- + drivers/cpuidle/cpuidle-powernv.c | 10 ++++++ + 4 files changed, 66 insertions(+), 49 deletions(-) +Merging sparc/master (0a23ea65ce9f 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 (48fb6f4db940 futex: Remove unnecessary warning from get_futex_key) +$ git merge net/master +Already up-to-date. +Merging ipsec/master (4ff0308f06da esp: Fix error handling on layer 2 xmit.) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/ipv4/esp4.c | 13 ++++++++----- + net/ipv4/esp4_offload.c | 2 +- + net/ipv6/esp6.c | 9 +++++---- + net/ipv6/esp6_offload.c | 2 +- + net/xfrm/xfrm_policy.c | 6 ++++++ + net/xfrm/xfrm_state.c | 8 ++++++++ + 6 files changed, 29 insertions(+), 11 deletions(-) +Merging netfilter/master (9beceb54fa2c netfilter: x_tables: Fix use-after-free in ipt_do_table.) +$ git merge netfilter/master +Merge made by the 'recursive' strategy. + net/ipv4/netfilter/arp_tables.c | 10 +++++----- + net/ipv4/netfilter/ip_tables.c | 9 +++++---- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 4 +++- + net/netfilter/nft_compat.c | 4 ++-- + 4 files changed, 15 insertions(+), 12 deletions(-) +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 (9d6b9b8d1cdb Merge tag 'iwlwifi-for-kalle-2018-08-09' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/intel/iwlwifi/cfg/9000.c | 14 +++++++------- + drivers/net/wireless/intel/iwlwifi/fw/file.h | 2 ++ + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 8 ++++---- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 5 +++-- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 19 +++++++++++-------- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 6 ++++-- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 12 +++++++++++- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 8 ++++---- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 10 ++++++---- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 7 ++++--- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 12 ++++++++++-- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 20 ++++++++++++++++++++ + include/net/mac80211.h | 15 +++++++++++++++ + net/mac80211/agg-rx.c | 22 +++++++++++++++++++++- + 14 files changed, 122 insertions(+), 38 deletions(-) +Merging mac80211/master (d7f13f745036 cfg80211: Validate frequencies nested in NL80211_ATTR_SCAN_FREQUENCIES) +$ git merge mac80211/master +Already up-to-date. +Merging sound-current/for-linus (5ef26e966d3f Merge tag 'asoc-fix-v4.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus (8466489ef5ba xhci: Reset Renesas uPD72020x USB controller for 32-bit DMA issue) +$ git merge pci-current/for-linus +Merge made by the 'recursive' strategy. + drivers/pci/pci.c | 35 +++++++++++++++++++++++++++++++++++ + drivers/usb/host/pci-quirks.c | 20 ++++++++++++++++++++ + drivers/usb/host/pci-quirks.h | 1 + + drivers/usb/host/xhci-pci.c | 7 +++++++ + include/linux/pci.h | 1 + + 5 files changed, 64 insertions(+) +Merging driver-core.current/driver-core-linus (5771a8c08880 Linux v4.13-rc1) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (9527b82ae3af Revert "serial: Delete dead code for CIR serial ports") +$ git merge tty.current/tty-linus +Merge made by the 'recursive' strategy. + drivers/acpi/spcr.c | 36 ++++++++++++++++++++++++++++++++++-- + drivers/tty/serial/8250/8250_core.c | 23 +++++++++++++++++------ + drivers/tty/serial/amba-pl011.c | 37 +++++++++++++++++++------------------ + include/linux/acpi.h | 1 + + 4 files changed, 71 insertions(+), 26 deletions(-) +Merging usb.current/usb-linus (8cc34c8d6113 Merge tag 'usb-serial-4.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/core/hcd.c | 4 +++- + drivers/usb/dwc3/gadget.c | 33 ++++++++++++++++++++++++++++++++- + drivers/usb/gadget/udc/renesas_usb3.c | 21 ++++++++++++++++----- + drivers/usb/musb/musb_host.c | 1 + + drivers/usb/phy/phy-msm-usb.c | 17 +++++++++-------- + drivers/usb/renesas_usbhs/mod_gadget.c | 5 +---- + drivers/usb/renesas_usbhs/rcar3.c | 9 +++++++-- + drivers/usb/serial/cp210x.c | 1 + + drivers/usb/serial/option.c | 2 ++ + drivers/usb/storage/unusual_uas.h | 4 ++-- + drivers/usb/storage/usb.c | 18 ++++++++++++------ + 11 files changed, 86 insertions(+), 29 deletions(-) +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 (cef988642cda staging: comedi: comedi_fops: do not call blocking ops when !TASK_RUNNING) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/iio/accel/bmc150-accel-core.c | 9 +----- + drivers/iio/accel/st_accel_core.c | 32 +++++++++++++++++++ + drivers/iio/adc/aspeed_adc.c | 26 +++++++++++++++ + drivers/iio/adc/axp288_adc.c | 42 ++++++++++++++++++++++++- + drivers/iio/adc/sun4i-gpadc-iio.c | 3 +- + drivers/iio/adc/vf610_adc.c | 2 +- + drivers/iio/common/st_sensors/st_sensors_core.c | 29 +++++++++++++++++ + drivers/iio/light/tsl2563.c | 2 +- + drivers/iio/pressure/st_pressure_core.c | 2 +- + drivers/staging/comedi/comedi_fops.c | 3 ++ + drivers/staging/iio/resolver/ad2s1210.c | 2 +- + include/linux/iio/common/st_sensors.h | 7 +++++ + include/linux/platform_data/st_sensors_pdata.h | 2 ++ + 13 files changed, 146 insertions(+), 15 deletions(-) +Merging char-misc.current/char-misc-linus (520eccdfe187 Linux 4.13-rc2) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (293b915fd9be Input: trackpoint - assume 3 buttons when buttons detection fails) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/mouse/trackpoint.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging crypto-current/master (8861249c740f crypto: x86/sha1 - Fix reads beyond the number of blocks passed) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + arch/x86/crypto/sha1_avx2_x86_64_asm.S | 67 ++++++++++++++++++---------------- + arch/x86/crypto/sha1_ssse3_glue.c | 2 +- + drivers/crypto/ixp4xx_crypto.c | 6 +-- + 3 files changed, 40 insertions(+), 35 deletions(-) +Merging ide/master (921edf312a6a ide: avoid warning for timings calculation) +$ git merge ide/master +Already up-to-date. +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 (7ba190be873a selftests: futex: fix run_tests target) +$ git merge kselftest-fixes/fixes +Merge made by the 'recursive' strategy. + tools/testing/selftests/futex/Makefile | 2 +- + tools/testing/selftests/kmod/kmod.sh | 0 + tools/testing/selftests/sysctl/sysctl.sh | 0 + 3 files changed, 1 insertion(+), 1 deletion(-) + mode change 100644 => 100755 tools/testing/selftests/kmod/kmod.sh + mode change 100644 => 100755 tools/testing/selftests/sysctl/sysctl.sh +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 (9e69672e90cc dt-bindings: mfd: Update STM32 timers clock names) +$ git merge mfd-fixes/for-mfd-fixes +Already up-to-date. +Merging v4l-dvb-fixes/fixes (0659445f4758 media: staging: atomisp: sh_css_calloc shall return a pointer to the allocated space) +$ git merge v4l-dvb-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/media/rc/lirc_dev.c | 4 ++++ + drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c | 1 + + 2 files changed, 5 insertions(+) +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 (1e2ba788787c drm/i915: fix backlight invert for non-zero minimum brightness) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/gvt/execlist.c | 27 ++++++++++++++++++----- + drivers/gpu/drm/i915/gvt/firmware.c | 11 ++++++++- + drivers/gpu/drm/i915/gvt/gvt.h | 14 +++++++++++- + drivers/gpu/drm/i915/gvt/handlers.c | 38 +++++++++++++++----------------- + drivers/gpu/drm/i915/gvt/scheduler.c | 3 ++- + drivers/gpu/drm/i915/gvt/vgpu.c | 8 ++++--- + drivers/gpu/drm/i915/i915_gem_shrinker.c | 11 ++++++--- + drivers/gpu/drm/i915/i915_perf.c | 4 ++-- + drivers/gpu/drm/i915/intel_color.c | 1 + + drivers/gpu/drm/i915/intel_panel.c | 2 +- + 10 files changed, 82 insertions(+), 37 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (0fa375e6bc90 drm/rockchip: Fix suspend crash when drm is not bound) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/dma-buf/sync_file.c | 5 ++-- + drivers/gpu/drm/bridge/tc358767.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 12 +++++++-- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 41 ++++++++++++++--------------- + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 3 +++ + include/linux/sync_file.h | 3 ++- + 6 files changed, 39 insertions(+), 27 deletions(-) +Merging kbuild/for-next (4e433fc4d1a9 fixdep: trivial: typo fix and correction) +$ git merge kbuild/for-next +Already up-to-date. +Merging uuid/for-next (832e4c83abc5 uuid: remove uuid_be) +$ git merge uuid/for-next +Already up-to-date. +Merging dma-mapping/for-next (878ec36765fa ARM: NOMMU: Wire-up default DMA interface) +$ git merge dma-mapping/for-next +Already up-to-date. +Merging asm-generic/master (a351e9b9fc24 Linux 4.11) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (6f8119230ed0 ARC: set boot print log level to PR_INFO) +$ git merge arc/for-next +Auto-merging arch/arc/mm/tlb.c +Auto-merging arch/arc/mm/cache.c +Auto-merging arch/arc/kernel/setup.c +Merge made by the 'recursive' strategy. + arch/arc/include/asm/irqflags-arcv2.h | 3 --- + arch/arc/include/asm/irqflags-compact.h | 2 -- + arch/arc/include/asm/spinlock.h | 12 ++++++++++++ + arch/arc/kernel/entry-compact.S | 22 +++++++++++----------- + arch/arc/kernel/process.c | 29 +++++++++++++++++++++++++++-- + arch/arc/kernel/setup.c | 6 +++--- + arch/arc/kernel/traps.c | 2 +- + arch/arc/mm/cache.c | 2 +- + arch/arc/mm/fault.c | 2 +- + arch/arc/mm/tlb.c | 2 +- + arch/arc/mm/tlbex.S | 9 +++++++++ + arch/arc/plat-eznps/Kconfig | 15 +++++++++++++-- + arch/arc/plat-eznps/include/plat/ctop.h | 1 + + arch/arc/plat-eznps/mtm.c | 11 +++++++++-- + 14 files changed, 89 insertions(+), 29 deletions(-) +Merging arm/for-next (9182571b44a4 Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +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 +++++++++++++++++++++++++++++------------- + 4 files changed, 36 insertions(+), 15 deletions(-) +Merging arm-perf/for-next/perf (5771a8c08880 Linux v4.13-rc1) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (41c454fa0e86 Merge tag 'davinci-fixes-for-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into fixes) +$ git merge arm-soc/for-next +Already up-to-date. +Merging actions/for-next (253d192bc4aa Merge branch 'v4.14/dt' into next) +$ git merge actions/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/owl-s500.dtsi | 3 +++ + 1 file changed, 3 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 (3a5fd3ca8f08 Merge branch 'v4.14/drivers' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/amlogic.txt | 41 +++++ + 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/arm64/boot/dts/amlogic/meson-gx.dtsi | 26 +-- + .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 58 +++++++ + arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 3 + + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 25 +++ + .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 56 +++++++ + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 25 +++ + 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 +++++++++++++++++++++ + 16 files changed, 498 insertions(+), 35 deletions(-) + create mode 100644 drivers/soc/amlogic/Kconfig + create mode 100644 drivers/soc/amlogic/Makefile + create mode 100644 drivers/soc/amlogic/meson-gx-socinfo.c +Merging aspeed/for-next (4944e5dbb215 Merge branches 'dt-for-v4.12' and 'defconfig-for-v4.12' into for-next) +$ git merge aspeed/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging at91/at91-next (01c1fe77824e Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next) +$ git merge at91/at91-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 1 + + 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 | 23 +- + arch/arm/boot/dts/sama5d2.dtsi | 50 ++- + drivers/memory/atmel-ebi.c | 10 +- + drivers/mfd/atmel-smc.c | 2 +- + drivers/soc/atmel/soc.c | 8 + + drivers/soc/atmel/soc.h | 4 + + 9 files changed, 715 insertions(+), 22 deletions(-) + create mode 100644 arch/arm/boot/dts/at91-sama5d27_som1.dtsi + create mode 100644 arch/arm/boot/dts/at91-sama5d27_som1_ek.dts +Merging bcm2835/for-next (e83e7335d059 Merge branch anholt/bcm2835-defconfig-next into for-next) +$ git merge bcm2835/for-next +Removing arch/arm64/boot/dts/broadcom/bcm283x.dtsi +Removing arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi +Removing arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi +Removing arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/bcm/brcm,bcm2835.txt | 4 + + arch/arm/boot/dts/Makefile | 3 +- + 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/bcm2837-rpi-3-b.dts | 52 +++++++- + .../dts/broadcom => arm/boot/dts}/bcm2837.dtsi | 0 + arch/arm/configs/bcm2835_defconfig | 7 ++ + 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 - + 19 files changed, 247 insertions(+), 48 deletions(-) + create mode 100644 arch/arm/boot/dts/bcm2835-rpi-zero-w.dts + rename arch/{arm64/boot/dts/broadcom => arm/boot/dts}/bcm2837.dtsi (100%) + 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 +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 (6694c45eb2d8 Merge branch 'zte/dt64' into for-next) +$ git merge imx-mxs/for-next +Removing arch/arm/boot/dts/imx6ul-isiot-common.dtsi +Auto-merging arch/arm/boot/dts/imx6ul-geam.dts +Removing arch/arm/boot/dts/imx6ul-geam-kit.dts +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/bhf.txt | 6 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/boot/dts/Makefile | 3 +- + arch/arm/boot/dts/imx25.dtsi | 8 + + 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-b850v3.dts | 2 +- + arch/arm/boot/dts/imx6q-gw52xx.dts | 58 ++++ + arch/arm/boot/dts/imx6q-gw53xx.dts | 58 ++++ + arch/arm/boot/dts/imx6q-gw54xx.dts | 58 ++++ + arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 54 ++++ + arch/arm/boot/dts/imx6qdl-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 ++- + arch/arm/boot/dts/imx6ul-geam-kit.dts | 101 ------- + .../boot/dts/{imx6ul-geam.dtsi => imx6ul-geam.dts} | 74 +++++ + arch/arm/boot/dts/imx6ul-isiot-common.dtsi | 141 ---------- + arch/arm/boot/dts/imx6ul-isiot-emmc.dts | 1 - + arch/arm/boot/dts/imx6ul-isiot-nand.dts | 1 - + arch/arm/boot/dts/imx6ul-isiot.dtsi | 183 +++++++++++++ + arch/arm/boot/dts/imx6ul-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 | 109 +++++--- + arch/arm/boot/dts/imx7s.dtsi | 32 +++ + arch/arm/boot/dts/zx296702-ad1.dts | 2 - + arch/arm/configs/imx_v6_v7_defconfig | 15 +- + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 17 ++ + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 43 +++ + 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-ls2088a-qds.dts | 5 - + arch/arm64/boot/dts/freescale/fsl-ls2088a-rdb.dts | 5 - + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 46 ++++ + arch/arm64/boot/dts/zte/zx296718.dtsi | 2 - + drivers/soc/imx/gpcv2.c | 15 +- + 51 files changed, 1493 insertions(+), 356 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/bhf.txt + create mode 100644 arch/arm/boot/dts/imx53-cx9020.dts + delete mode 100644 arch/arm/boot/dts/imx6ul-geam-kit.dts + rename arch/arm/boot/dts/{imx6ul-geam.dtsi => imx6ul-geam.dts} (87%) + delete mode 100644 arch/arm/boot/dts/imx6ul-isiot-common.dtsi +Merging keystone/next (04e89a1e052e Merge branch 'for_4.14/keystone_config' into next) +$ git merge keystone/next +Removing include/dt-bindings/genpd/k2g.h +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/dma/ti-edma.txt | 95 +++++++++++- + .../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 52 +++++-- + .../devicetree/bindings/soc/ti/sci-pm-domain.txt | 5 +- + 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 | 53 +++++++ + arch/arm/boot/dts/keystone-k2g.dtsi | 169 +++++++++++++++++++++ + 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/configs/keystone_defconfig | 10 ++ + drivers/soc/ti/ti_sci_pm_domains.c | 2 + + include/dt-bindings/genpd/k2g.h | 90 ----------- + 14 files changed, 698 insertions(+), 112 deletions(-) + delete mode 100644 include/dt-bindings/genpd/k2g.h +Merging mvebu/for-next (fb18f4b252a9 Merge branch 'mvebu/dt' into mvebu/for-next) +$ git merge mvebu/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pci/mvebu-pci.txt | 2 +- + 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/dove-d3plug.dts | 4 +- + arch/arm/boot/dts/dove.dtsi | 8 +- + 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/mach-mvebu/Kconfig | 2 + + .../boot/dts/marvell/armada-3720-espressobin.dts | 30 +++++++ + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 11 ++- + arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 94 +++++++++++++++++++++- + .../boot/dts/marvell/armada-cp110-master.dtsi | 43 ++++++---- + .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 43 ++++++---- + arch/arm64/configs/defconfig | 2 + + 36 files changed, 274 insertions(+), 69 deletions(-) +Merging omap/for-next (191ae5a41246 Merge branch 'omap-for-v4.14/debug-ll' into for-next) +$ git merge omap/for-next +Auto-merging include/linux/platform_data/hsmmc-omap.h +Merge made by the 'recursive' strategy. + arch/arm/Kconfig.debug | 44 ++++++++--- + arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts | 2 +- + arch/arm/boot/dts/dra7-evm.dts | 10 ++- + arch/arm/boot/dts/dra7.dtsi | 5 ++ + arch/arm/boot/dts/dra71-evm.dts | 14 ++++ + arch/arm/boot/dts/dra72-evm-common.dtsi | 2 - + arch/arm/boot/dts/dra72-evm-revc.dts | 18 +++++ + arch/arm/boot/dts/dra72-evm.dts | 18 +++++ + arch/arm/include/debug/omap2plus.S | 108 -------------------------- + arch/arm/mach-omap2/pdata-quirks.c | 31 ++++++++ + include/linux/platform_data/hsmmc-omap.h | 3 + + 11 files changed, 132 insertions(+), 123 deletions(-) +Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence) +$ git merge omap-pending/for-next +Already up-to-date. +Merging reset/reset/next (694a52e62d23 reset: uniphier: do not use per-SoC macro for system reset block) +$ git merge reset/reset/next +Resolved 'MAINTAINERS' using previous resolution. +Removing drivers/reset/reset-gemini.c +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2f6803dc9a34] Merge remote-tracking branch 'reset/reset/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/reset/uniphier-reset.txt | 2 - + MAINTAINERS | 7 + + 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-uniphier.c | 96 +++------ + drivers/reset/reset-zx2967.c | 2 +- + include/dt-bindings/reset/snps,hsdk-v1-reset.h | 17 ++ + include/linux/reset.h | 68 ++++++ + 11 files changed, 499 insertions(+), 189 deletions(-) + delete mode 100644 drivers/reset/reset-gemini.c + create mode 100644 drivers/reset/reset-hsdk-v1.c + create mode 100644 include/dt-bindings/reset/snps,hsdk-v1-reset.h +Merging qcom/for-next (2ab014d39cd5 soc: qcom: mdt_loader: Use request_firmware_into_buf()) +$ git merge qcom/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/qcom.txt | 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 +- + .../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/msm8916.dtsi | 2 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 314 +++++++++++++++++++++ + arch/arm64/boot/dts/qcom/pmi8994.dtsi | 17 ++ + 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 + + 15 files changed, 693 insertions(+), 35 deletions(-) +Merging realtek/for-next (5771a8c08880 Linux v4.13-rc1) +$ git merge realtek/for-next +Already up-to-date. +Merging renesas/next (ac8924e85224 Merge branch 'defconfig-for-v4.14' into next) +$ git merge renesas/next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/Kconfig.debug +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/shmobile.txt | 4 + + .../bindings/display/bridge/renesas,dw-hdmi.txt | 1 + + .../devicetree/bindings/display/renesas,du.txt | 51 ++-- + .../bindings/power/renesas,rcar-sysc.txt | 1 + + .../devicetree/bindings/reset/renesas,rst.txt | 1 + + .../devicetree/bindings/sram/renesas,smp-sram.txt | 27 ++ + arch/arm/Kconfig.debug | 9 +- + 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 | 179 +++++++++++- + arch/arm/boot/dts/r8a7745.dtsi | 23 ++ + arch/arm/boot/dts/r8a7790.dtsi | 26 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 2 +- + arch/arm/boot/dts/r8a7791.dtsi | 24 +- + arch/arm/boot/dts/r8a7792.dtsi | 18 ++ + arch/arm/boot/dts/r8a7793.dtsi | 18 ++ + arch/arm/boot/dts/r8a7794.dtsi | 22 +- + arch/arm/configs/multi_v7_defconfig | 5 +- + arch/arm/configs/shmobile_defconfig | 18 +- + arch/arm/mach-shmobile/Kconfig | 4 - + arch/arm/mach-shmobile/pm-rcar-gen2.c | 33 ++- + arch/arm/mach-shmobile/setup-rcar-gen2.c | 21 +- + arch/arm64/Kconfig.platforms | 6 + + 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 | 311 +++++++++++++++++++++ + 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 | 301 +++++++++++++++++++- + arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 46 +++ + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 150 ++++++++++ + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 6 +- + arch/arm64/boot/dts/renesas/salvator-xs.dtsi | 10 + + arch/arm64/boot/dts/renesas/ulcb.dtsi | 51 ++++ + arch/arm64/configs/defconfig | 4 +- + drivers/soc/renesas/Kconfig | 7 +- + drivers/soc/renesas/Makefile | 1 + + drivers/soc/renesas/r8a77995-sysc.c | 31 ++ + drivers/soc/renesas/rcar-rst.c | 1 + + drivers/soc/renesas/rcar-sysc.c | 3 + + drivers/soc/renesas/rcar-sysc.h | 1 + + drivers/soc/renesas/renesas-soc.c | 8 + + include/dt-bindings/power/r8a77995-sysc.h | 23 ++ + 52 files changed, 1738 insertions(+), 86 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sram/renesas,smp-sram.txt + create mode 100644 arch/arm64/boot/dts/renesas/r8a77995-draak.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a77995.dtsi + create mode 100644 drivers/soc/renesas/r8a77995-sysc.c + create mode 100644 include/dt-bindings/power/r8a77995-sysc.h +Merging rockchip/for-next (283d2211124b Merge branch 'v4.14-clk/next' into for-next) +$ git merge rockchip/for-next +Resolved 'arch/arm/boot/dts/rk3288.dtsi' using previous resolution. +Auto-merging arch/arm/boot/dts/rk3288.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/rk3288.dtsi +Auto-merging Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f0c6f02f5d13] Merge remote-tracking branch 'rockchip/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/rockchip.txt | 4 + + .../bindings/clock/rockchip,rk3128-cru.txt | 8 +- + .../devicetree/bindings/gpu/arm,mali-midgard.txt | 1 + + .../bindings/soc/rockchip/power_domain.txt | 3 + + arch/arm/boot/dts/rk3036-kylin.dts | 2 - + arch/arm/boot/dts/rk3036.dtsi | 3 +- + arch/arm/boot/dts/rk3066a-bqcurie2.dts | 2 - + arch/arm/boot/dts/rk3066a-mk808.dts | 2 - + arch/arm/boot/dts/rk3066a-rayeager.dts | 3 - + arch/arm/boot/dts/rk3188-px3-evb.dts | 2 - + arch/arm/boot/dts/rk3188-radxarock.dts | 1 - + arch/arm/boot/dts/rk3229-evb.dts | 129 +++- + arch/arm/boot/dts/rk3229.dtsi | 89 +++ + arch/arm/boot/dts/rk322x.dtsi | 163 +++++- + 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 | 4 + + arch/arm/boot/dts/rv1108.dtsi | 20 +- + arch/arm/mach-rockchip/Kconfig | 2 + + arch/arm/mach-rockchip/platsmp.c | 2 +- + arch/arm64/boot/dts/rockchip/Makefile | 1 + + arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 24 + + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 168 ++++++ + 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 | 19 + + 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 | 119 ++-- + arch/arm64/boot/dts/rockchip/rk3399-op1-opp.dtsi | 33 ++ + arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi | 33 ++ + .../dts/rockchip/rk3399-sapphire-excavator.dts | 240 ++++++++ + arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 646 +++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 231 +++++++- + drivers/clk/clk-fractional-divider.c | 28 +- + drivers/clk/rockchip/clk-rk3128.c | 69 ++- + drivers/clk/rockchip/clk-rv1108.c | 460 ++++++++++++--- + drivers/clk/rockchip/clk.c | 36 ++ + drivers/soc/rockchip/grf.c | 14 + + drivers/soc/rockchip/pm_domains.c | 32 + + include/dt-bindings/clock/rv1108-cru.h | 123 +++- + include/dt-bindings/power/rk3366-power.h | 24 + + include/linux/clk-provider.h | 3 + + 61 files changed, 2799 insertions(+), 332 deletions(-) + create mode 100644 arch/arm/boot/dts/rk3229.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi + create mode 100644 include/dt-bindings/power/rk3366-power.h +Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) +$ git merge rpi/for-rpi-next +Already up-to-date. +Merging samsung/for-next (2ea659a9ef48 Linux 4.12-rc1) +$ git merge samsung/for-next +Already up-to-date. +Merging samsung-krzk/for-next (86247b536cd0 Merge branch 'fixes' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. + 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/exynos5422-odroidxu3-common.dtsi | 1 + + arch/arm/boot/dts/exynos5440.dtsi | 2 + + arch/arm/boot/dts/exynos5800-peach-pi.dts | 3 - + arch/arm/configs/exynos_defconfig | 79 ++++++++++++++++++++-- + arch/arm/configs/ezx_defconfig | 1 - + arch/arm/configs/ixp4xx_defconfig | 4 -- + arch/arm/configs/multi_v7_defconfig | 7 -- + arch/arm/configs/qcom_defconfig | 1 - + arch/arm/configs/vexpress_defconfig | 1 - + 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-smdk2443.c | 8 --- + arch/arm/mach-s3c24xx/sleep.S | 11 +-- + arch/arm/plat-samsung/include/plat/map-s3c.h | 2 +- + .../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 - + drivers/soc/samsung/pm_domains.c | 2 +- + 35 files changed, 92 insertions(+), 150 deletions(-) +Merging sunxi/sunxi/for-next (e5578a5586ca Merge branch 'sunxi/dt-for-4.14' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 1 + + 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 | 56 ++++ + arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts | 62 ++++ + arch/arm/boot/dts/sun8i-a83t.dtsi | 100 +++++++ + arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 31 +- + arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts | 321 +++++++++++++++++++++ + arch/arm/configs/sunxi_defconfig | 15 +- + arch/arm64/boot/dts/allwinner/axp803.dtsi | 150 ++++++++++ + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 1 + + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 114 ++++++++ + .../dts/allwinner/sun50i-a64-sopine-baseboard.dts | 24 ++ + .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 86 ++++++ + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 9 + + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 13 +- + drivers/clk/sunxi-ng/ccu-sun8i-r.h | 2 +- + 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_nm.c | 19 +- + 22 files changed, 1013 insertions(+), 33 deletions(-) + create mode 100644 arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts + create mode 100644 arch/arm64/boot/dts/allwinner/axp803.dtsi +Merging tegra/for-next (20e72aa386b0 Merge branch for-4.14/arm/defconfig into for-next) +$ git merge tegra/for-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/tegra124.dtsi | 1 + + arch/arm/configs/multi_v7_defconfig | 2 ++ + arch/arm/configs/tegra_defconfig | 2 ++ + arch/arm/mach-tegra/Kconfig | 2 ++ + drivers/soc/tegra/pmc.c | 4 +--- + 5 files changed, 8 insertions(+), 3 deletions(-) +Merging arm64/for-next/core (6ec4e2514dec md/raid6: implement recovery using ARM NEON intrinsics) +$ git merge arm64/for-next/core +Merge made by the 'recursive' strategy. + Documentation/arm64/cpu-feature-registers.txt | 2 + + arch/arm64/Kconfig | 12 ++ + arch/arm64/include/asm/asm-bug.h | 54 +++++++++ + arch/arm64/include/asm/assembler.h | 17 +++ + arch/arm64/include/asm/bug.h | 35 +----- + arch/arm64/include/asm/cacheflush.h | 4 +- + arch/arm64/include/asm/cpucaps.h | 3 +- + arch/arm64/include/asm/esr.h | 42 +++++-- + arch/arm64/include/asm/irq.h | 39 ++----- + arch/arm64/include/asm/processor.h | 2 +- + arch/arm64/include/asm/ptrace.h | 31 ++++- + arch/arm64/include/asm/stacktrace.h | 1 - + arch/arm64/include/asm/string.h | 4 + + arch/arm64/include/asm/sysreg.h | 1 + + arch/arm64/include/asm/traps.h | 5 + + arch/arm64/include/asm/uaccess.h | 12 ++ + arch/arm64/include/uapi/asm/hwcap.h | 1 + + arch/arm64/kernel/asm-offsets.c | 1 + + arch/arm64/kernel/cpufeature.c | 13 +++ + arch/arm64/kernel/cpuinfo.c | 1 + + arch/arm64/kernel/entry.S | 162 ++++++++++++++------------ + arch/arm64/kernel/head.S | 22 ++-- + arch/arm64/kernel/perf_callchain.c | 1 - + arch/arm64/kernel/process.c | 5 +- + arch/arm64/kernel/ptrace.c | 4 +- + arch/arm64/kernel/return_address.c | 1 - + arch/arm64/kernel/signal.c | 10 +- + arch/arm64/kernel/signal32.c | 2 +- + arch/arm64/kernel/stacktrace.c | 57 ++------- + arch/arm64/kernel/time.c | 1 - + arch/arm64/kernel/traps.c | 39 ++----- + arch/arm64/kernel/vdso.c | 15 +++ + arch/arm64/lib/Makefile | 2 + + arch/arm64/mm/cache.S | 37 ++++-- + arch/arm64/mm/fault.c | 47 ++++++++ + arch/arm64/mm/flush.c | 16 +++ + drivers/acpi/arm64/iort.c | 140 +++++++++++++--------- + include/linux/raid/pq.h | 1 + + lib/raid6/Makefile | 4 +- + lib/raid6/algos.c | 3 + + lib/raid6/neon.uc | 33 +++++- + lib/raid6/recov_neon.c | 110 +++++++++++++++++ + lib/raid6/recov_neon_inner.c | 117 +++++++++++++++++++ + 43 files changed, 792 insertions(+), 317 deletions(-) + create mode 100644 arch/arm64/include/asm/asm-bug.h + create mode 100644 lib/raid6/recov_neon.c + create mode 100644 lib/raid6/recov_neon_inner.c +Merging clk/clk-next (8e7be401f2f5 Merge branch 'clk-fixes' into clk-next) +$ git merge clk/clk-next +Resolved 'MAINTAINERS' using previous resolution. +Auto-merging drivers/clk/sunxi-ng/ccu-sun8i-h3.c +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 54eb2865df4f] Merge remote-tracking branch 'clk/clk-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/clock/idt,versaclock5.txt | 30 +- + .../devicetree/bindings/clock/snps,pll-clock.txt | 28 ++ + MAINTAINERS | 6 + + drivers/clk/Kconfig | 6 +- + 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-moxart.c | 16 +- + drivers/clk/clk-qoriq.c | 26 +- + drivers/clk/clk-stm32f4.c | 4 +- + drivers/clk/clk-versaclock5.c | 172 +++++++++- + drivers/clk/clk-xgene.c | 15 +- + drivers/clk/clk.c | 4 +- + drivers/clk/clkdev.c | 4 +- + drivers/clk/mediatek/clk-cpumux.c | 6 +- + drivers/clk/mediatek/clk-mtk.c | 2 +- + drivers/clk/mediatek/reset.c | 2 +- + drivers/clk/mmp/clk.c | 2 +- + drivers/clk/qcom/clk-smd-rpm.c | 2 - + drivers/clk/renesas/clk-mstp.c | 2 +- + drivers/clk/renesas/clk-rcar-gen2.c | 3 +- + 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-sunxi.c | 17 +- + drivers/clk/tegra/clk-emc.c | 12 +- + drivers/clk/ti/clockdomain.c | 4 +- + 34 files changed, 649 insertions(+), 112 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/snps,pll-clock.txt + create mode 100644 drivers/clk/axs10x/pll_clock.c +Merging c6x/for-linux-next (eab89e215ae4 c6x: defconfig: Cleanup from old Kconfig options) +$ git merge c6x/for-linux-next +Merge made by the 'recursive' strategy. + arch/c6x/configs/dsk6455_defconfig | 2 -- + arch/c6x/configs/evmc6457_defconfig | 2 -- + arch/c6x/configs/evmc6472_defconfig | 2 -- + arch/c6x/configs/evmc6474_defconfig | 2 -- + arch/c6x/configs/evmc6678_defconfig | 2 -- + 5 files changed, 10 deletions(-) +Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE)) +$ git merge cris/for-next +Already up-to-date. +Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h) +$ git merge h8300/h8300-next +Merge made by the 'recursive' strategy. +Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error") +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (204a2be30a7a m68k: Remove ptrace_signal_deliver) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (c483cdd22fc7 m68k: allow NULL clock for clk_get_rate) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/coldfire/clk.c | 3 +++ + 1 file changed, 3 insertions(+) +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 (aa9a357f236f Merge branches '4.13-fixes' and '4.13-fp-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Removing arch/mips/kernel/r6000_fpu.S +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mips/ni.txt | 7 + + arch/mips/Kconfig | 19 +- + arch/mips/Makefile | 19 +- + arch/mips/ath79/clock.c | 9 +- + arch/mips/boot/Makefile | 16 +- + arch/mips/boot/compressed/.gitignore | 2 + + arch/mips/boot/dts/Makefile | 1 + + arch/mips/boot/dts/ni/169445.dts | 100 +++++++++ + arch/mips/boot/dts/ni/Makefile | 7 + + arch/mips/cavium-octeon/octeon-usb.c | 2 +- + arch/mips/cavium-octeon/smp.c | 6 +- + arch/mips/configs/cavium_octeon_defconfig | 25 ++- + arch/mips/configs/generic/board-ni169445.config | 27 +++ + arch/mips/configs/gpr_defconfig | 4 - + arch/mips/configs/lemote2f_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/pistachio_defconfig | 5 +- + arch/mips/dec/int-handler.S | 34 +-- + 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/vmlinux.its.S | 25 --- + arch/mips/include/asm/bmips.h | 4 +- + arch/mips/include/asm/cache.h | 2 + + arch/mips/include/asm/cpu-features.h | 3 + + arch/mips/include/asm/cpu-type.h | 5 - + arch/mips/include/asm/cpu.h | 5 - + .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 6 +- + arch/mips/include/asm/mach-ip27/topology.h | 1 - + arch/mips/include/asm/mach-loongson64/loongson.h | 2 +- + arch/mips/include/asm/mach-loongson64/topology.h | 1 - + arch/mips/include/asm/module.h | 2 - + arch/mips/include/asm/netlogic/common.h | 2 +- + arch/mips/include/asm/octeon/cvmx-l2c-defs.h | 37 +++- + arch/mips/include/asm/octeon/cvmx-l2d-defs.h | 60 +++++ + arch/mips/include/asm/octeon/cvmx.h | 1 + + arch/mips/include/asm/smp-ops.h | 12 +- + arch/mips/include/asm/smp.h | 10 +- + arch/mips/kernel/Makefile | 14 +- + arch/mips/kernel/cpu-probe.c | 18 -- + arch/mips/kernel/mips-r2-to-r6-emul.c | 8 +- + arch/mips/kernel/octeon_switch.S | 5 - + arch/mips/kernel/r2300_fpu.S | 78 ++++++- + 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 | 4 +- + arch/mips/kernel/smp-cmp.c | 2 +- + arch/mips/kernel/smp-cps.c | 4 +- + arch/mips/kernel/smp-mt.c | 2 +- + arch/mips/kernel/smp-up.c | 2 +- + arch/mips/kernel/smp.c | 10 +- + arch/mips/kernel/traps.c | 18 +- + arch/mips/loongson64/loongson-3/smp.c | 2 +- + 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/ieee754int.h | 4 + + arch/mips/math-emu/ieee754sp.h | 4 + + 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/mm/tlbex.c | 5 - + arch/mips/mm/uasm-mips.c | 2 +- + arch/mips/netlogic/common/smp.c | 2 +- + arch/mips/paravirt/paravirt-smp.c | 2 +- + arch/mips/paravirt/setup.c | 2 +- + arch/mips/pci/pci-legacy.c | 2 +- + arch/mips/pci/pci-mt7620.c | 2 +- + arch/mips/pci/pci-rt3883.c | 11 +- + arch/mips/pci/pci.c | 7 +- + arch/mips/sgi-ip27/ip27-smp.c | 2 +- + arch/mips/sibyte/bcm1480/smp.c | 2 +- + arch/mips/sibyte/common/cfe.c | 4 +- + arch/mips/sibyte/sb1250/smp.c | 2 +- + arch/mips/vdso/gettimeofday.c | 6 +- + 81 files changed, 1229 insertions(+), 918 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mips/ni.txt + create mode 100644 arch/mips/boot/compressed/.gitignore + create mode 100644 arch/mips/boot/dts/ni/169445.dts + create mode 100644 arch/mips/boot/dts/ni/Makefile + create mode 100644 arch/mips/configs/generic/board-ni169445.config + 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/octeon/cvmx-l2d-defs.h + delete mode 100644 arch/mips/kernel/r6000_fpu.S +Merging nios2/for-next (e118c3fec9c0 nios2: remove custom early console implementation) +$ git merge nios2/for-next +Already up-to-date. +Merging openrisc/for-next (9d15eb228b10 openrisc: defconfig: Cleanup from old Kconfig options) +$ git merge openrisc/for-next +Merge made by the 'recursive' strategy. +Merging parisc-hd/for-next (6f7da290413b Linux 4.12) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (21a0e8c14bf6 powerpc/mm/hash64: Make vmalloc 56T on hash) +$ git merge powerpc/next +Auto-merging include/linux/cpuhotplug.h +Auto-merging arch/powerpc/platforms/pseries/reconfig.c +Auto-merging arch/powerpc/platforms/powernv/pci-ioda.c +Auto-merging arch/powerpc/platforms/powernv/idle.c +Auto-merging arch/powerpc/mm/tlb-radix.c +Auto-merging arch/powerpc/mm/pgtable-radix.c +Auto-merging arch/powerpc/mm/mmu_context_book3s64.c +Removing arch/powerpc/mm/icswx_pid.c +Removing arch/powerpc/mm/icswx.h +Removing arch/powerpc/mm/icswx.c +Auto-merging arch/powerpc/kernel/idle_book3s.S +Auto-merging arch/powerpc/kernel/exceptions-64s.S +Auto-merging arch/powerpc/include/asm/mmu_context.h +Auto-merging arch/powerpc/include/asm/book3s/64/pgtable.h +Auto-merging arch/powerpc/include/asm/book3s/64/mmu.h +Auto-merging arch/powerpc/Makefile +Merge made by the 'recursive' strategy. + arch/powerpc/Makefile | 4 + + arch/powerpc/configs/be.config | 1 + + arch/powerpc/include/asm/Kbuild | 1 + + arch/powerpc/include/asm/book3s/64/hash.h | 6 +- + arch/powerpc/include/asm/book3s/64/mmu.h | 5 - + arch/powerpc/include/asm/book3s/64/pgtable.h | 3 +- + arch/powerpc/include/asm/book3s/64/radix.h | 2 + + .../powerpc/include/asm/book3s/64/tlbflush-radix.h | 5 +- + arch/powerpc/include/asm/cpuidle.h | 11 + + arch/powerpc/include/asm/imc-pmu.h | 128 ++ + arch/powerpc/include/asm/mmu_context.h | 6 - + arch/powerpc/include/asm/opal-api.h | 18 +- + arch/powerpc/include/asm/opal.h | 7 + + arch/powerpc/include/asm/paca.h | 7 + + arch/powerpc/include/asm/pnv-pci.h | 2 + + arch/powerpc/include/asm/ppc-opcode.h | 4 + + arch/powerpc/include/asm/reg.h | 69 +- + arch/powerpc/include/asm/reg_booke.h | 3 - + arch/powerpc/kernel/asm-offsets.c | 8 + + arch/powerpc/kernel/entry_32.S | 15 + + arch/powerpc/kernel/exceptions-64s.S | 8 +- + arch/powerpc/kernel/head_32.S | 6 +- + arch/powerpc/kernel/head_8xx.S | 4 +- + arch/powerpc/kernel/idle_book3s.S | 65 +- + arch/powerpc/kernel/iommu.c | 2 +- + arch/powerpc/kvm/book3s_64_mmu_radix.c | 4 +- + arch/powerpc/mm/Makefile | 2 - + arch/powerpc/mm/fault.c | 562 +++++---- + arch/powerpc/mm/hash_utils_64.c | 3 +- + arch/powerpc/mm/icswx.c | 292 ----- + arch/powerpc/mm/icswx.h | 68 - + arch/powerpc/mm/icswx_pid.c | 87 -- + arch/powerpc/mm/init_64.c | 4 +- + arch/powerpc/mm/mmu_context_book3s64.c | 18 - + arch/powerpc/mm/pgtable-radix.c | 6 +- + arch/powerpc/mm/pgtable_64.c | 2 + + arch/powerpc/mm/slb_low.S | 23 +- + arch/powerpc/mm/tlb-radix.c | 108 +- + arch/powerpc/perf/Makefile | 1 + + arch/powerpc/perf/imc-pmu.c | 1306 ++++++++++++++++++++ + arch/powerpc/platforms/Kconfig.cputype | 38 - + arch/powerpc/platforms/powernv/Makefile | 1 + + arch/powerpc/platforms/powernv/idle.c | 34 +- + arch/powerpc/platforms/powernv/opal-imc.c | 226 ++++ + arch/powerpc/platforms/powernv/opal-prd.c | 13 +- + arch/powerpc/platforms/powernv/opal-wrappers.S | 4 + + arch/powerpc/platforms/powernv/opal.c | 14 + + arch/powerpc/platforms/powernv/pci-ioda.c | 3 +- + arch/powerpc/platforms/powernv/pci.c | 75 ++ + arch/powerpc/platforms/powernv/pci.h | 5 + + arch/powerpc/platforms/powernv/rng.c | 39 + + arch/powerpc/platforms/powernv/smp.c | 11 +- + arch/powerpc/platforms/pseries/reconfig.c | 15 +- + arch/powerpc/sysdev/ipic.c | 1 + + drivers/tty/hvc/hvc_vio.c | 12 + + include/linux/cpuhotplug.h | 3 + + 56 files changed, 2469 insertions(+), 901 deletions(-) + create mode 100644 arch/powerpc/configs/be.config + create mode 100644 arch/powerpc/include/asm/imc-pmu.h + delete mode 100644 arch/powerpc/mm/icswx.c + delete mode 100644 arch/powerpc/mm/icswx.h + delete mode 100644 arch/powerpc/mm/icswx_pid.c + create mode 100644 arch/powerpc/perf/imc-pmu.c + create mode 100644 arch/powerpc/platforms/powernv/opal-imc.c +Merging fsl/next (61baf1555512 powerpc/64e: Don't place the stack beyond TASK_SIZE) +$ git merge fsl/next +Already up-to-date. +Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc) +$ git merge mpc5xxx/next +Already up-to-date. +Merging s390/features (a3c1a2194a7c s390/scm: use common completion path) +$ git merge s390/features +Auto-merging arch/s390/include/uapi/asm/vmcp.h +Removing arch/s390/include/uapi/asm/swab.h +Removing arch/s390/include/asm/unaligned.h +Removing arch/s390/include/asm/types.h +Removing arch/s390/include/asm/mman.h +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 4 + + arch/s390/Kconfig | 18 ++ + arch/s390/Makefile | 6 +- + arch/s390/include/asm/Kbuild | 1 + + arch/s390/include/asm/cpcmd.h | 7 +- + arch/s390/include/asm/ebcdic.h | 4 +- + arch/s390/include/asm/elf.h | 2 +- + arch/s390/include/asm/ipl.h | 2 +- + arch/s390/include/asm/lowcore.h | 48 ++--- + arch/s390/include/asm/mman.h | 11 -- + arch/s390/include/asm/mmu_context.h | 6 +- + arch/s390/include/asm/nmi.h | 2 +- + arch/s390/include/asm/page-states.h | 1 + + arch/s390/include/asm/page.h | 37 ++-- + arch/s390/include/asm/pgalloc.h | 18 +- + arch/s390/include/asm/pgtable.h | 195 +++++++++++++-------- + arch/s390/include/asm/qdio.h | 2 +- + arch/s390/include/asm/setup.h | 17 +- + arch/s390/include/asm/spinlock.h | 9 +- + arch/s390/include/asm/timex.h | 38 +++- + arch/s390/include/asm/tlb.h | 6 +- + arch/s390/include/asm/tlbflush.h | 7 +- + arch/s390/include/asm/types.h | 11 -- + arch/s390/include/asm/unaligned.h | 13 -- + arch/s390/include/uapi/asm/Kbuild | 1 + + arch/s390/include/uapi/asm/swab.h | 89 ---------- + .../char => arch/s390/include/uapi/asm}/vmcp.h | 20 +-- + arch/s390/kernel/asm-offsets.c | 1 + + arch/s390/kernel/cpcmd.c | 13 +- + arch/s390/kernel/debug.c | 9 +- + arch/s390/kernel/dumpstack.c | 2 +- + arch/s390/kernel/early.c | 15 +- + arch/s390/kernel/head.S | 3 +- + arch/s390/kernel/head64.S | 4 +- + arch/s390/kernel/irq.c | 3 +- + arch/s390/kernel/relocate_kernel.S | 5 +- + arch/s390/kernel/setup.c | 14 +- + arch/s390/kernel/suspend.c | 24 ++- + arch/s390/kernel/time.c | 65 ++++--- + arch/s390/kernel/vdso.c | 2 + + arch/s390/kernel/vdso32/vdso32.lds.S | 4 +- + arch/s390/kernel/vdso64/vdso64.lds.S | 4 +- + arch/s390/kvm/diag.c | 8 +- + arch/s390/kvm/gaccess.c | 35 ++-- + arch/s390/kvm/priv.c | 8 +- + arch/s390/kvm/vsie.c | 2 +- + arch/s390/lib/delay.c | 2 +- + arch/s390/lib/spinlock.c | 87 +++++---- + arch/s390/mm/fault.c | 10 +- + arch/s390/mm/gmap.c | 124 ++++++------- + arch/s390/mm/init.c | 60 ++++++- + arch/s390/mm/page-states.c | 192 ++++++++++++++++++-- + arch/s390/mm/pageattr.c | 5 +- + arch/s390/mm/pgalloc.c | 12 +- + arch/s390/mm/pgtable.c | 154 ++++++++++++---- + arch/s390/mm/vmem.c | 47 ++--- + arch/s390/pci/pci_clp.c | 10 +- + arch/s390/tools/gen_facilities.c | 3 + + drivers/s390/block/dasd_devmap.c | 2 +- + drivers/s390/block/scm_blk.c | 13 +- + drivers/s390/char/Kconfig | 11 ++ + drivers/s390/char/raw3270.c | 2 +- + drivers/s390/char/sclp_cmd.c | 1 + + drivers/s390/char/sclp_config.c | 2 +- + drivers/s390/char/sclp_early.c | 6 +- + drivers/s390/char/sclp_ocf.c | 2 +- + drivers/s390/char/tape_core.c | 2 +- + drivers/s390/char/vmcp.c | 113 +++++++++--- + drivers/s390/cio/chp.c | 4 +- + drivers/s390/cio/device.c | 4 +- + drivers/s390/cio/vfio_ccw_cp.c | 2 +- + drivers/s390/crypto/zcrypt_card.c | 2 +- + drivers/s390/crypto/zcrypt_queue.c | 2 +- + drivers/s390/net/qeth_l3_sys.c | 8 +- + 74 files changed, 1067 insertions(+), 611 deletions(-) + delete mode 100644 arch/s390/include/asm/mman.h + delete mode 100644 arch/s390/include/asm/types.h + delete mode 100644 arch/s390/include/asm/unaligned.h + delete mode 100644 arch/s390/include/uapi/asm/swab.h + rename {drivers/s390/char => arch/s390/include/uapi/asm}/vmcp.h (56%) +Merging sparc-next/master (cb8c65ccff7f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) +$ git merge sparc-next/master +Already up-to-date. +Merging sh/for-next (6e2fbfdd585f sh: fix futex FUTEX_OP_SET op on userspace addresses) +$ git merge sh/for-next +Merge made by the 'recursive' strategy. + arch/sh/include/asm/futex.h | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) +Merging tile/master (637f23abca87 tile: array underflow in setup_maxnodemem()) +$ git merge tile/master +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 (61e8d462457f um: Correctly check for PTRACE_GETRESET/SETREGSET) +$ git merge uml/linux-next +Already up-to-date. +Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface) +$ git merge unicore32/unicore32 +Resolved 'arch/unicore32/include/asm/Kbuild' using previous resolution. +Auto-merging arch/unicore32/include/asm/Kbuild +CONFLICT (content): Merge conflict in arch/unicore32/include/asm/Kbuild +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d90fffe2a2e3] 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 (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults) +$ git merge btrfs/next +Already up-to-date. +Merging btrfs-kdave/for-next (3497efbab8dc Merge branch 'for-next-next-v4.14-20170728' into for-next-20170728) +$ git merge btrfs-kdave/for-next +Resolved 'fs/btrfs/extent_io.c' using previous resolution. +Resolved 'fs/btrfs/scrub.c' using previous resolution. +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/scrub.c +CONFLICT (content): Merge conflict in fs/btrfs/scrub.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/extent_io.h +Auto-merging fs/btrfs/extent_io.c +CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c +Auto-merging fs/btrfs/disk-io.h +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/ctree.h +Auto-merging fs/btrfs/compression.h +Auto-merging fs/btrfs/compression.c +Auto-merging fs/btrfs/check-integrity.c +Auto-merging fs/btrfs/btrfs_inode.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 146e3da3750c] Merge remote-tracking branch 'btrfs-kdave/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/async-thread.c | 6 +- + fs/btrfs/async-thread.h | 6 +- + fs/btrfs/backref.c | 1074 ++++++++++++++------------------ + fs/btrfs/backref.h | 16 +- + fs/btrfs/btrfs_inode.h | 13 +- + fs/btrfs/check-integrity.c | 6 +- + fs/btrfs/compression.c | 35 +- + fs/btrfs/compression.h | 2 + + fs/btrfs/ctree.c | 14 +- + fs/btrfs/ctree.h | 164 +++-- + fs/btrfs/delayed-inode.c | 1 + + fs/btrfs/dev-replace.c | 74 ++- + fs/btrfs/disk-io.c | 229 +++---- + fs/btrfs/disk-io.h | 10 +- + fs/btrfs/extent-tree.c | 96 ++- + fs/btrfs/extent_io.c | 72 +-- + fs/btrfs/extent_io.h | 19 +- + fs/btrfs/file.c | 19 +- + fs/btrfs/free-space-cache.c | 2 +- + fs/btrfs/inode.c | 196 ++++-- + fs/btrfs/ioctl.c | 110 ++-- + fs/btrfs/print-tree.c | 12 +- + fs/btrfs/print-tree.h | 4 +- + fs/btrfs/props.c | 10 +- + fs/btrfs/qgroup.c | 4 +- + fs/btrfs/relocation.c | 2 - + fs/btrfs/root-tree.c | 2 +- + fs/btrfs/scrub.c | 5 +- + fs/btrfs/send.c | 2 +- + fs/btrfs/struct-funcs.c | 9 +- + fs/btrfs/super.c | 41 +- + fs/btrfs/tests/btrfs-tests.c | 1 - + fs/btrfs/tests/free-space-tree-tests.c | 2 +- + fs/btrfs/volumes.c | 242 +++---- + fs/btrfs/volumes.h | 7 +- + include/trace/events/btrfs.h | 313 ++++++---- + 36 files changed, 1419 insertions(+), 1401 deletions(-) +Merging ceph/master (326547a91b3f ceph: fix readpage from fscache) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + fs/ceph/addr.c | 24 +++++++++++++++--------- + fs/ceph/cache.c | 12 +++--------- + 2 files changed, 18 insertions(+), 18 deletions(-) +Merging cifs/for-next (235b84fc862a Merge branch 'i2c/for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge cifs/for-next +Already up-to-date. +Merging configfs/for-next (19e72d3abb63 configfs: Introduce config_item_get_unless_zero()) +$ git merge configfs/for-next +Already up-to-date. +Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/main.c +Auto-merging fs/ecryptfs/ecryptfs_kernel.h +Merge made by the 'recursive' strategy. + fs/ecryptfs/crypto.c | 15 --------------- + fs/ecryptfs/ecryptfs_kernel.h | 9 ++++++++- + fs/ecryptfs/keystore.c | 2 +- + fs/ecryptfs/main.c | 2 +- + fs/ecryptfs/miscdev.c | 2 +- + 5 files changed, 11 insertions(+), 19 deletions(-) +Merging ext3/for_next (41e327b58676 quota: correct space limit check) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/quota/dquot.c | 21 +++++++++++++++------ + 1 file changed, 15 insertions(+), 6 deletions(-) +Merging ext4/dev (4e5620132144 ext4: fix copy paste error in ext4_swap_extents()) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (a36c106dffb6 f2fs: use printk_ratelimited for f2fs_msg) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + Documentation/filesystems/f2fs.txt | 1 + + fs/f2fs/acl.c | 5 +- + fs/f2fs/checkpoint.c | 2 +- + fs/f2fs/data.c | 19 ++- + fs/f2fs/f2fs.h | 184 +++++++++++++++++--- + fs/f2fs/file.c | 341 +++++++++++++++++++++++++++++++------ + fs/f2fs/gc.c | 11 +- + fs/f2fs/inline.c | 132 +++++++------- + fs/f2fs/inode.c | 128 ++++++++++++-- + fs/f2fs/namei.c | 40 +++++ + fs/f2fs/node.c | 70 +++++--- + fs/f2fs/recovery.c | 7 +- + fs/f2fs/segment.c | 21 ++- + fs/f2fs/super.c | 96 +++++++++-- + fs/f2fs/sysfs.c | 164 ++++++++++++++---- + fs/f2fs/xattr.c | 2 +- + include/linux/f2fs_fs.h | 40 ++--- + 17 files changed, 1007 insertions(+), 256 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 (61c12b49e1c9 fuse: Dont call set_page_dirty_lock() for ITER_BVEC pages for async_dio) +$ git merge fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/file.c | 8 ++++---- + fs/fuse/fuse_i.h | 1 + + 2 files changed, 5 insertions(+), 4 deletions(-) +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 (92b2e6a6f580 Merge branch 'writeback') +$ git merge nfs/linux-next +Merge made by the 'recursive' strategy. + fs/nfs/callback_proc.c | 2 +- + fs/nfs/delegation.c | 2 +- + fs/nfs/direct.c | 4 +- + fs/nfs/inode.c | 10 +- + fs/nfs/nfs4proc.c | 206 ++++++++++---------- + fs/nfs/pagelist.c | 70 +++---- + fs/nfs/pnfs.c | 41 ---- + fs/nfs/pnfs.h | 2 - + fs/nfs/pnfs_nfs.c | 37 ++-- + fs/nfs/write.c | 440 ++++++++++++++++++++----------------------- + include/linux/nfs_fs.h | 5 +- + include/linux/nfs_page.h | 3 +- + include/linux/nfs_xdr.h | 2 +- + include/linux/sunrpc/sched.h | 3 + + net/sunrpc/sched.c | 22 +++ + net/sunrpc/xprt.c | 6 + + 16 files changed, 398 insertions(+), 457 deletions(-) +Merging nfsd/nfsd-next (b20dae70bfa5 svcrdma: fix an incorrect check on -E2BIG and -EINVAL) +$ git merge nfsd/nfsd-next +Already up-to-date. +Merging orangefs/for-next (2f713b5c7d2a orangefs: count directory pieces correctly) +$ git merge orangefs/for-next +Already up-to-date. +Merging overlayfs/overlayfs-next (0e082555cec9 ovl: check for bad and whiteout index on lookup) +$ git merge overlayfs/overlayfs-next +Already up-to-date. +Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (a6664433d383 ubifs: Set double hash cookie also for RENAME_EXCHANGE) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (56bdf855e676 xfs: Fix per-inode DAX flag inheritance) +$ git merge xfs/for-next +Already up-to-date. +Merging file-locks/locks-next (3953704fde7e locks: restore a warn for leaked locks on close) +$ git merge file-locks/locks-next +Auto-merging include/linux/fs.h +Auto-merging fs/fuse/file.c +Merge made by the 'recursive' strategy. + drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 2 +- + fs/9p/vfs_file.c | 2 +- + fs/ceph/locks.c | 2 +- + fs/cifs/cifssmb.c | 2 +- + fs/dlm/plock.c | 2 +- + fs/fuse/file.c | 6 +- + fs/locks.c | 130 ++++++++++++++++-------- + include/linux/fs.h | 1 - + 8 files changed, 93 insertions(+), 54 deletions(-) +Merging wberr/wberr-next (6d4b51241394 ecryptfs: convert to file_write_and_wait in ->fsync) +$ git merge wberr/wberr-next +Auto-merging include/linux/fs.h +Auto-merging fs/fuse/file.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/9p/vfs_file.c +Merge made by the 'recursive' strategy. + Documentation/errseq.rst | 149 +++++++++++++++++++++++++++++ + arch/powerpc/platforms/cell/spufs/file.c | 2 +- + drivers/staging/lustre/lustre/llite/file.c | 2 +- + drivers/video/fbdev/core/fb_defio.c | 2 +- + fs/9p/vfs_file.c | 4 +- + fs/affs/file.c | 2 +- + fs/afs/write.c | 2 +- + fs/cifs/file.c | 4 +- + fs/ecryptfs/file.c | 2 +- + fs/exofs/file.c | 2 +- + fs/f2fs/file.c | 2 +- + fs/fuse/file.c | 6 +- + fs/gfs2/file.c | 6 +- + fs/hfs/inode.c | 2 +- + fs/hfsplus/inode.c | 2 +- + fs/hostfs/hostfs_kern.c | 2 +- + fs/hpfs/file.c | 2 +- + fs/jffs2/file.c | 2 +- + fs/jfs/file.c | 2 +- + fs/ncpfs/file.c | 2 +- + fs/ntfs/dir.c | 2 +- + fs/ntfs/file.c | 2 +- + fs/ocfs2/file.c | 2 +- + fs/reiserfs/dir.c | 2 +- + fs/reiserfs/file.c | 2 +- + fs/sync.c | 4 +- + fs/ubifs/file.c | 2 +- + include/linux/errseq.h | 14 +-- + include/linux/fs.h | 20 +++- + lib/errseq.c | 17 ++-- + mm/filemap.c | 64 ++++++------- + 31 files changed, 241 insertions(+), 89 deletions(-) + create mode 100644 Documentation/errseq.rst +Merging vfs/for-next (66bf97967726 annotate RWF_... flags) +$ git merge vfs/for-next +Auto-merging include/uapi/linux/fs.h +Auto-merging include/linux/fs.h +Auto-merging fs/read_write.c +Merge made by the 'recursive' strategy. + arch/s390/include/asm/compat.h | 5 +++-- + fs/nfsd/vfs.c | 2 +- + fs/read_write.c | 50 +++++++++++++++++++++--------------------- + include/linux/compat.h | 18 ++++++++++++--- + include/linux/fs.h | 12 +++++----- + include/linux/syscalls.h | 13 ++++++----- + include/uapi/linux/aio_abi.h | 21 +++++++++--------- + include/uapi/linux/fs.h | 28 ++++++++++++++++------- + 8 files changed, 89 insertions(+), 60 deletions(-) +Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities) +$ git merge vfs-jk/vfs +Already up-to-date. +Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync()) +$ git merge vfs-miklos/next +Already up-to-date. +Merging printk/for-next (5a814231ae3d printk/console: Enhance the check for consoles using init memory) +$ git merge printk/for-next +Merge made by the 'recursive' strategy. + kernel/printk/printk.c | 34 ++++++++++++++++++++-------------- + 1 file changed, 20 insertions(+), 14 deletions(-) +Merging pci/next (16f73eb02d7e Linux 4.13-rc3) +$ git merge pci/next +Already up-to-date. +Merging pstore/for-next/pstore (520eccdfe187 Linux 4.13-rc2) +$ git merge pstore/for-next/pstore +Already up-to-date. +Merging hid/for-next (5f6007965f07 Merge branch 'for-4.14/ish' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/Kconfig | 2 +- + drivers/hid/hid-asus.c | 218 ++++++++++++++++----- + drivers/hid/hid-core.c | 16 +- + drivers/hid/hid-ids.h | 5 +- + drivers/hid/hid-input.c | 190 ++++++++++++------ + drivers/hid/hid-logitech-hidpp.c | 2 +- + drivers/hid/hid-multitouch.c | 50 ++++- + drivers/hid/hid-ntrig.c | 2 +- + drivers/hid/hid-sensor-custom.c | 2 +- + drivers/hid/hid-sensor-hub.c | 94 --------- + drivers/hid/i2c-hid/i2c-hid.c | 3 +- + drivers/hid/uhid.c | 3 +- + drivers/hid/usbhid/hid-core.c | 3 +- + drivers/hid/usbhid/hid-quirks.c | 1 + + drivers/hid/wacom_sys.c | 63 +++--- + drivers/hid/wacom_wac.c | 8 +- + .../iio/common/hid-sensors/hid-sensor-attributes.c | 3 + + include/linux/hid.h | 18 +- + net/bluetooth/hidp/core.c | 3 +- + 19 files changed, 426 insertions(+), 260 deletions(-) +Merging i2c/i2c/for-next (ba1f668f388c Merge branch 'i2c/for-4.14' into i2c/for-next) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/i2c-cbus-gpio.txt | 4 +- + Documentation/devicetree/bindings/mfd/retu.txt | 25 +++++++++ + Documentation/devicetree/bindings/mfd/tps6105x.txt | 17 ++++++ + arch/arm/boot/dts/omap2420-n8x0-common.dtsi | 4 +- + arch/arm/boot/dts/ste-hrefprev60.dtsi | 2 +- + arch/arm/mach-omap1/board-nokia770.c | 4 +- + drivers/i2c/busses/i2c-bcm-iproc.c | 6 +- + drivers/i2c/busses/i2c-cadence.c | 6 +- + drivers/i2c/busses/i2c-davinci.c | 6 +- + drivers/i2c/busses/i2c-designware-platdrv.c | 6 +- + drivers/i2c/busses/i2c-exynos5.c | 6 +- + drivers/i2c/busses/i2c-gpio.c | 4 +- + drivers/i2c/busses/i2c-hix5hd2.c | 6 +- + drivers/i2c/busses/i2c-lpc2k.c | 6 +- + drivers/i2c/busses/i2c-mt65xx.c | 65 +++++++++++++++------- + drivers/i2c/busses/i2c-mv64xxx.c | 3 +- + drivers/i2c/busses/i2c-powermac.c | 10 ++-- + drivers/i2c/busses/i2c-pxa.c | 6 +- + drivers/i2c/busses/i2c-s3c2410.c | 6 +- + drivers/i2c/busses/i2c-sirf.c | 6 +- + drivers/i2c/busses/i2c-st.c | 3 +- + drivers/i2c/busses/i2c-sun6i-p2wi.c | 4 +- + drivers/i2c/busses/i2c-xiic.c | 6 +- + drivers/i2c/i2c-core-of.c | 24 ++++---- + drivers/i2c/muxes/i2c-demux-pinctrl.c | 4 +- + drivers/mfd/retu-mfd.c | 12 +++- + drivers/mfd/tps6105x.c | 8 +++ + 27 files changed, 158 insertions(+), 101 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/retu.txt + create mode 100644 Documentation/devicetree/bindings/mfd/tps6105x.txt +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 +Merge made by the 'recursive' strategy. + 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/sbs.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 +- + 49 files changed, 53 insertions(+), 53 deletions(-) +Merging hwmon-staging/hwmon-next (8ade9b3d740c hwmon: (it87) Reapply probe path chip registers settings after resume) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + Documentation/hwmon/ftsteutates | 4 + + drivers/hwmon/adc128d818.c | 2 +- + drivers/hwmon/ads1015.c | 14 ++- + drivers/hwmon/adt7475.c | 16 +-- + drivers/hwmon/ftsteutates.c | 2 + + drivers/hwmon/hwmon.c | 4 +- + drivers/hwmon/i5k_amb.c | 2 +- + drivers/hwmon/it87.c | 214 ++++++++++++++++++++++++++++++---------- + drivers/hwmon/jc42.c | 19 ++++ + drivers/hwmon/nct7802.c | 10 +- + drivers/hwmon/scpi-hwmon.c | 2 +- + 11 files changed, 211 insertions(+), 78 deletions(-) +Merging jc_docs/docs-next (720688c44999 docs: driver-api: Remove trailing blank line) +$ git merge jc_docs/docs-next +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/Makefile | 10 - + Documentation/arm/firmware.txt | 2 +- + Documentation/dev-tools/gdb-kernel-debugging.rst | 6 +- + Documentation/dev-tools/kgdb.rst | 11 +- + Documentation/doc-guide/sphinx.rst | 109 +++- + Documentation/driver-api/basics.rst | 5 +- + Documentation/driver-api/dma-buf.rst | 3 - + Documentation/driver-api/miscellaneous.rst | 1 - + Documentation/driver-api/s390-drivers.rst | 2 +- + Documentation/driver-api/scsi.rst | 8 - + .../features/core/tracehook/arch-support.txt | 2 +- + Documentation/gpu/drm-mm.rst | 2 +- + Documentation/kbuild/makefiles.txt | 6 +- + Documentation/process/changes.rst | 16 +- + Documentation/process/submitting-patches.rst | 2 +- + Documentation/sphinx-static/theme_overrides.css | 17 + + Documentation/sphinx/requirements.txt | 3 + + Documentation/translations/zh_CN/HOWTO | 2 - + Makefile | 2 +- + scripts/sphinx-pre-install | 609 +++++++++++++++++++++ + 20 files changed, 764 insertions(+), 54 deletions(-) + create mode 100644 Documentation/sphinx/requirements.txt + create mode 100755 scripts/sphinx-pre-install +Merging v4l-dvb/master (ec0c3ec497ca media: ddbridge: split code into multiple files) +$ git merge v4l-dvb/master +Auto-merging drivers/media/i2c/ov6650.c +Auto-merging MAINTAINERS +Removing Documentation/media/uapi/v4l/pixfmt-008.rst +Auto-merging Documentation/media/uapi/v4l/colorspaces-details.rst +Auto-merging Documentation/media/uapi/v4l/colorspaces-defs.rst +Merge made by the 'recursive' strategy. + .../devicetree/bindings/media/i2c/adv748x.txt | 95 + + .../devicetree/bindings/media/meson-ao-cec.txt | 28 + + .../devicetree/bindings/media/renesas,drif.txt | 1 + + .../devicetree/bindings/media/video-interfaces.txt | 8 +- + Documentation/media/cec-drivers/index.rst | 32 + + Documentation/media/cec-drivers/pulse8-cec.rst | 11 + + Documentation/media/index.rst | 1 + + Documentation/media/kapi/cec-core.rst | 40 + + Documentation/media/uapi/cec/cec-func-close.rst | 2 +- + Documentation/media/uapi/cec/cec-func-ioctl.rst | 2 +- + Documentation/media/uapi/cec/cec-func-open.rst | 4 +- + Documentation/media/uapi/cec/cec-func-poll.rst | 8 +- + Documentation/media/uapi/cec/cec-funcs.rst | 1 - + .../media/uapi/cec/cec-ioc-adap-g-caps.rst | 9 +- + .../media/uapi/cec/cec-ioc-adap-g-log-addrs.rst | 6 +- + Documentation/media/uapi/cec/cec-ioc-dqevent.rst | 22 +- + Documentation/media/uapi/cec/cec-ioc-g-mode.rst | 80 +- + .../v4l/{pixfmt-006.rst => colorspaces-defs.rst} | 2 +- + .../{pixfmt-007.rst => colorspaces-details.rst} | 47 + + Documentation/media/uapi/v4l/dev-subdev.rst | 2 +- + Documentation/media/uapi/v4l/extended-controls.rst | 26 +- + Documentation/media/uapi/v4l/pixfmt-008.rst | 32 - + .../v4l/{pixfmt-013.rst => pixfmt-compressed.rst} | 0 + .../uapi/v4l/{pixfmt-004.rst => pixfmt-intro.rst} | 0 + .../v4l/{pixfmt-003.rst => pixfmt-v4l2-mplane.rst} | 0 + .../uapi/v4l/{pixfmt-002.rst => pixfmt-v4l2.rst} | 0 + Documentation/media/uapi/v4l/pixfmt.rst | 15 +- + MAINTAINERS | 35 +- + drivers/media/Kconfig | 3 + + drivers/media/cec/Makefile | 4 + + drivers/media/cec/cec-adap.c | 223 +- + drivers/media/cec/cec-api.c | 94 +- + drivers/media/cec/cec-core.c | 7 +- + drivers/media/cec/cec-pin.c | 794 ++++ + drivers/media/common/saa7146/saa7146_i2c.c | 2 +- + drivers/media/common/v4l2-tpg/v4l2-tpg-colors.c | 150 +- + drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 2 +- + drivers/media/dvb-core/demux.h | 2 +- + drivers/media/dvb-core/dvb-usb-ids.h | 1 + + drivers/media/dvb-core/dvb_ca_en50221.c | 945 ++-- + drivers/media/dvb-core/dvb_ca_en50221.h | 10 +- + drivers/media/dvb-frontends/Kconfig | 18 + + drivers/media/dvb-frontends/Makefile | 2 + + drivers/media/dvb-frontends/cx24123.c | 2 +- + drivers/media/dvb-frontends/cxd2841er.c | 73 +- + drivers/media/dvb-frontends/dib0090.c | 2 +- + drivers/media/dvb-frontends/dib7000p.c | 2 +- + drivers/media/dvb-frontends/dib8000.c | 2 +- + drivers/media/dvb-frontends/dib9000.c | 4 +- + drivers/media/dvb-frontends/drx39xyj/drxj.c | 35 +- + drivers/media/dvb-frontends/drxd_hard.c | 6 +- + drivers/media/dvb-frontends/mb86a16.c | 25 +- + drivers/media/dvb-frontends/s5h1420.c | 2 +- + drivers/media/dvb-frontends/stv0367.c | 154 +- + drivers/media/dvb-frontends/stv0910.c | 1771 ++++++++ + drivers/media/dvb-frontends/stv0910.h | 32 + + drivers/media/dvb-frontends/stv0910_regs.h | 4759 ++++++++++++++++++++ + drivers/media/dvb-frontends/stv6111.c | 674 +++ + drivers/media/dvb-frontends/stv6111.h | 20 + + drivers/media/dvb-frontends/zd1301_demod.c | 2 +- + drivers/media/i2c/Kconfig | 36 + + drivers/media/i2c/Makefile | 3 + + drivers/media/i2c/adv7180.c | 2 + + drivers/media/i2c/adv748x/Makefile | 7 + + drivers/media/i2c/adv748x/adv748x-afe.c | 552 +++ + drivers/media/i2c/adv748x/adv748x-core.c | 832 ++++ + drivers/media/i2c/adv748x/adv748x-csi2.c | 326 ++ + drivers/media/i2c/adv748x/adv748x-hdmi.c | 768 ++++ + drivers/media/i2c/adv748x/adv748x.h | 425 ++ + drivers/media/i2c/adv7511.c | 3 +- + drivers/media/i2c/adv7604.c | 7 +- + drivers/media/i2c/adv7842.c | 3 +- + drivers/media/i2c/m5mols/m5mols_core.c | 2 +- + drivers/media/i2c/ov13858.c | 70 +- + drivers/media/i2c/ov5640.c | 3 +- + drivers/media/i2c/ov5645.c | 49 +- + drivers/media/i2c/ov5670.c | 2588 +++++++++++ + drivers/media/i2c/{soc_camera => }/ov6650.c | 77 +- + drivers/media/i2c/ov7670.c | 6 +- + drivers/media/i2c/ov9650.c | 67 +- + drivers/media/i2c/s5k5baf.c | 2 +- + drivers/media/i2c/saa717x.c | 2 +- + drivers/media/i2c/smiapp/smiapp-core.c | 14 +- + drivers/media/i2c/smiapp/smiapp-quirk.c | 8 +- + drivers/media/i2c/soc_camera/Kconfig | 6 - + drivers/media/i2c/soc_camera/Makefile | 1 - + drivers/media/i2c/vs6624.c | 2 +- + drivers/media/media-device.c | 16 +- + drivers/media/media-entity.c | 2 +- + drivers/media/pci/b2c2/flexcop-pci.c | 2 +- + drivers/media/pci/bt8xx/bt878.c | 2 +- + drivers/media/pci/bt8xx/bttv-driver.c | 2 +- + drivers/media/pci/cobalt/cobalt-driver.c | 2 +- + drivers/media/pci/cx18/cx18-driver.c | 2 +- + drivers/media/pci/cx23885/cx23885-417.c | 2 +- + drivers/media/pci/cx23885/cx23885-core.c | 2 +- + drivers/media/pci/cx25821/cx25821-core.c | 5 +- + drivers/media/pci/cx25821/cx25821.h | 2 - + drivers/media/pci/ddbridge/Kconfig | 4 + + drivers/media/pci/ddbridge/Makefile | 2 +- + drivers/media/pci/ddbridge/ddbridge-core.c | 1354 ++---- + drivers/media/pci/ddbridge/ddbridge-i2c.c | 173 + + drivers/media/pci/ddbridge/ddbridge-i2c.h | 99 + + drivers/media/pci/ddbridge/ddbridge-main.c | 389 ++ + drivers/media/pci/ddbridge/ddbridge.h | 37 + + drivers/media/pci/dm1105/dm1105.c | 4 +- + drivers/media/pci/ivtv/ivtv-driver.c | 2 +- + drivers/media/pci/mantis/hopper_cards.c | 2 +- + drivers/media/pci/mantis/mantis_cards.c | 2 +- + drivers/media/pci/mantis/mantis_i2c.c | 2 +- + drivers/media/pci/meye/meye.c | 2 +- + drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 2 +- + drivers/media/pci/ngene/ngene-i2c.c | 2 +- + drivers/media/pci/pluto2/pluto2.c | 2 +- + drivers/media/pci/pt1/pt1.c | 2 +- + drivers/media/pci/pt3/pt3.c | 11 +- + drivers/media/pci/saa7146/hexium_gemini.c | 2 +- + drivers/media/pci/saa7146/hexium_orion.c | 2 +- + drivers/media/pci/saa7146/mxb.c | 2 +- + drivers/media/pci/saa7164/saa7164-core.c | 2 +- + drivers/media/pci/solo6x10/solo6x10-gpio.c | 97 + + drivers/media/pci/solo6x10/solo6x10-tw28.c | 3 +- + drivers/media/pci/solo6x10/solo6x10.h | 5 + + drivers/media/pci/ttpci/av7110.c | 2 +- + drivers/media/pci/ttpci/budget-av.c | 2 +- + drivers/media/pci/ttpci/budget-ci.c | 2 +- + drivers/media/pci/ttpci/budget-patch.c | 2 +- + drivers/media/pci/ttpci/budget.c | 2 +- + drivers/media/pci/zoran/zoran_card.c | 2 +- + drivers/media/platform/Kconfig | 14 +- + drivers/media/platform/Makefile | 2 + + drivers/media/platform/atmel/atmel-isc.c | 2 +- + drivers/media/platform/blackfin/bfin_capture.c | 2 +- + drivers/media/platform/coda/coda-bit.c | 29 +- + drivers/media/platform/coda/coda-common.c | 76 +- + drivers/media/platform/coda/coda_regs.h | 1 + + drivers/media/platform/davinci/vpbe.c | 2 +- + drivers/media/platform/davinci/vpbe_display.c | 2 +- + drivers/media/platform/davinci/vpif_capture.c | 12 +- + drivers/media/platform/davinci/vpif_display.c | 2 +- + drivers/media/platform/exynos4-is/fimc-is-i2c.c | 2 +- + drivers/media/platform/fsl-viu.c | 2 +- + drivers/media/platform/marvell-ccic/cafe-driver.c | 4 +- + drivers/media/platform/meson/Makefile | 1 + + drivers/media/platform/meson/ao-cec.c | 744 +++ + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 2 +- + drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 2 +- + .../media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 37 +- + drivers/media/platform/omap/omap_vout_vrfb.c | 3 +- + drivers/media/platform/omap3isp/isp.c | 25 +- + drivers/media/platform/omap3isp/ispccdc.c | 8 +- + drivers/media/platform/omap3isp/ispccp2.c | 6 + + drivers/media/platform/omap3isp/ispcsiphy.c | 41 +- + drivers/media/platform/omap3isp/ispcsiphy.h | 1 + + drivers/media/platform/omap3isp/omap3isp.h | 5 + + drivers/media/platform/pxa_camera.c | 5 +- + drivers/media/platform/rcar_fdp1.c | 2 +- + drivers/media/platform/s3c-camif/camif-core.c | 1 - + drivers/media/platform/s5p-jpeg/jpeg-core.c | 186 +- + drivers/media/platform/s5p-jpeg/jpeg-core.h | 7 + + drivers/media/platform/soc_camera/soc_camera.c | 2 +- + drivers/media/platform/soc_camera/soc_mediabus.c | 3 + + drivers/media/platform/sti/delta/delta-v4l2.c | 4 +- + drivers/media/platform/stm32/stm32-dcmi.c | 4 +- + drivers/media/platform/ti-vpe/cal.c | 2 +- + drivers/media/platform/video-mux.c | 53 +- + drivers/media/platform/vivid/vivid-cec.c | 3 +- + drivers/media/radio/radio-maxiradio.c | 2 +- + drivers/media/tuners/fc0012.c | 2 +- + drivers/media/tuners/fc0013.c | 2 +- + drivers/media/tuners/tuner-simple.c | 2 +- + drivers/media/usb/au0828/au0828-video.c | 2 +- + drivers/media/usb/cx231xx/cx231xx-417.c | 2 +- + drivers/media/usb/cx231xx/cx231xx-core.c | 3 + + drivers/media/usb/cx231xx/cx231xx-i2c.c | 8 +- + drivers/media/usb/cx231xx/cx231xx.h | 4 +- + drivers/media/usb/dvb-usb-v2/af9035.c | 2 + + drivers/media/usb/go7007/go7007-v4l2.c | 2 +- + drivers/media/usb/gspca/gspca.c | 2 +- + drivers/media/usb/gspca/xirlink_cit.c | 2 +- + drivers/media/usb/pulse8-cec/pulse8-cec.c | 5 +- + drivers/media/usb/pvrusb2/pvrusb2-encoder.c | 6 +- + drivers/media/usb/rainshadow-cec/rainshadow-cec.c | 5 +- + drivers/media/usb/stk1160/stk1160-v4l.c | 2 +- + drivers/media/usb/stkwebcam/stk-webcam.c | 2 +- + drivers/media/usb/tm6000/tm6000-video.c | 2 +- + drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | 2 +- + drivers/media/usb/usbvision/usbvision-i2c.c | 7 +- + drivers/media/usb/uvc/uvc_driver.c | 1 - + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 10 +- + drivers/media/v4l2-core/v4l2-flash-led-class.c | 30 +- + drivers/media/v4l2-core/v4l2-fwnode.c | 136 +- + drivers/media/v4l2-core/videobuf2-core.c | 10 +- + drivers/media/v4l2-core/videobuf2-dma-contig.c | 2 +- + drivers/media/v4l2-core/videobuf2-dma-sg.c | 2 +- + drivers/media/v4l2-core/videobuf2-vmalloc.c | 2 +- + drivers/staging/fbtft/fb_st7789v.c | 2 +- + drivers/staging/greybus/light.c | 4 +- + drivers/staging/media/atomisp/i2c/ap1302.c | 2 +- + drivers/staging/media/atomisp/i2c/gc0310.c | 5 +- + drivers/staging/media/atomisp/i2c/gc2235.c | 4 +- + drivers/staging/media/atomisp/i2c/gc2235.h | 6 +- + drivers/staging/media/atomisp/i2c/imx/imx.c | 24 +- + drivers/staging/media/atomisp/i2c/lm3554.c | 2 +- + drivers/staging/media/atomisp/i2c/mt9m114.c | 4 +- + drivers/staging/media/atomisp/i2c/ov2680.c | 19 +- + drivers/staging/media/atomisp/i2c/ov2722.c | 2 +- + drivers/staging/media/atomisp/i2c/ov5693/ov5693.c | 8 +- + drivers/staging/media/atomisp/i2c/ov8858.c | 2 +- + .../staging/media/atomisp/include/linux/atomisp.h | 6 - + .../media/atomisp/pci/atomisp2/atomisp_cmd.c | 50 +- + .../media/atomisp/pci/atomisp2/atomisp_cmd.h | 3 - + .../atomisp/pci/atomisp2/atomisp_compat_css20.c | 8 +- + .../media/atomisp/pci/atomisp2/atomisp_fops.c | 4 +- + .../media/atomisp/pci/atomisp2/atomisp_internal.h | 13 - + .../media/atomisp/pci/atomisp2/atomisp_ioctl.c | 3 - + .../media/atomisp/pci/atomisp2/atomisp_subdev.c | 6 +- + .../media/atomisp/pci/atomisp2/atomisp_v4l2.c | 35 +- + .../css2400/runtime/isys/src/ibuf_ctrl_rmgr.c | 27 +- + .../atomisp/pci/atomisp2/css2400/sh_css_firmware.c | 8 +- + .../staging/media/atomisp/pci/atomisp2/hmm/hmm.c | 139 +- + drivers/staging/media/bcm2048/radio-bcm2048.c | 1 - + drivers/staging/media/imx/Kconfig | 1 + + drivers/staging/media/imx/imx-ic-prpencvf.c | 52 +- + drivers/staging/media/imx/imx-media-csi.c | 32 +- + drivers/staging/media/imx/imx-media-dev.c | 4 +- + drivers/staging/media/imx/imx-media-of.c | 50 +- + drivers/staging/media/imx/imx-media-vdic.c | 37 +- + include/media/cec-notifier.h | 12 + + include/media/cec-pin.h | 183 + + include/media/cec.h | 72 +- + include/media/drv-intf/saa7146.h | 2 +- + include/media/media-device.h | 7 - + include/media/media-entity.h | 2 +- + include/media/v4l2-flash-led-class.h | 6 +- + include/media/v4l2-fwnode.h | 25 +- + include/media/v4l2-mediabus.h | 30 + + include/media/v4l2-subdev.h | 12 +- + include/uapi/linux/cec-funcs.h | 1 + + include/uapi/linux/cec.h | 8 +- + include/uapi/linux/media.h | 5 +- + 241 files changed, 18373 insertions(+), 2560 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/i2c/adv748x.txt + create mode 100644 Documentation/devicetree/bindings/media/meson-ao-cec.txt + create mode 100644 Documentation/media/cec-drivers/index.rst + create mode 100644 Documentation/media/cec-drivers/pulse8-cec.rst + rename Documentation/media/uapi/v4l/{pixfmt-006.rst => colorspaces-defs.rst} (98%) + rename Documentation/media/uapi/v4l/{pixfmt-007.rst => colorspaces-details.rst} (92%) + delete mode 100644 Documentation/media/uapi/v4l/pixfmt-008.rst + rename Documentation/media/uapi/v4l/{pixfmt-013.rst => pixfmt-compressed.rst} (100%) + rename Documentation/media/uapi/v4l/{pixfmt-004.rst => pixfmt-intro.rst} (100%) + rename Documentation/media/uapi/v4l/{pixfmt-003.rst => pixfmt-v4l2-mplane.rst} (100%) + rename Documentation/media/uapi/v4l/{pixfmt-002.rst => pixfmt-v4l2.rst} (100%) + create mode 100644 drivers/media/cec/cec-pin.c + create mode 100644 drivers/media/dvb-frontends/stv0910.c + create mode 100644 drivers/media/dvb-frontends/stv0910.h + create mode 100644 drivers/media/dvb-frontends/stv0910_regs.h + create mode 100644 drivers/media/dvb-frontends/stv6111.c + create mode 100644 drivers/media/dvb-frontends/stv6111.h + create mode 100644 drivers/media/i2c/adv748x/Makefile + create mode 100644 drivers/media/i2c/adv748x/adv748x-afe.c + create mode 100644 drivers/media/i2c/adv748x/adv748x-core.c + create mode 100644 drivers/media/i2c/adv748x/adv748x-csi2.c + create mode 100644 drivers/media/i2c/adv748x/adv748x-hdmi.c + create mode 100644 drivers/media/i2c/adv748x/adv748x.h + create mode 100644 drivers/media/i2c/ov5670.c + rename drivers/media/i2c/{soc_camera => }/ov6650.c (92%) + create mode 100644 drivers/media/pci/ddbridge/ddbridge-i2c.c + create mode 100644 drivers/media/pci/ddbridge/ddbridge-i2c.h + create mode 100644 drivers/media/pci/ddbridge/ddbridge-main.c + create mode 100644 drivers/media/platform/meson/Makefile + create mode 100644 drivers/media/platform/meson/ao-cec.c + create mode 100644 include/media/cec-pin.h +Merging v4l-dvb-next/master (474dfccf3685 media: svg: avoid too long lines) +$ git merge v4l-dvb-next/master +Already up-to-date. +Merging fbdev/fbdev-for-next (5ad3f3f6eb1f fbdev: matrox: hide unused 'hotplug' variable) +$ git merge fbdev/fbdev-for-next +Auto-merging drivers/video/fbdev/core/tileblit.c +Auto-merging drivers/video/fbdev/core/softcursor.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.c +Auto-merging drivers/video/fbdev/core/bitblit.c +Merge made by the 'recursive' strategy. + Documentation/fb/efifb.txt | 6 ++++ + drivers/video/console/Kconfig | 2 +- + drivers/video/console/Makefile | 8 ----- + drivers/video/fbdev/arkfb.c | 2 +- + drivers/video/fbdev/asiliantfb.c | 2 +- + drivers/video/fbdev/aty/aty128fb.c | 2 +- + drivers/video/fbdev/aty/atyfb_base.c | 2 +- + drivers/video/fbdev/aty/radeon_base.c | 2 +- + 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 | 11 ++++++ + drivers/video/{console => fbdev/core}/bitblit.c | 4 --- + drivers/video/{console => fbdev/core}/fbcon.c | 15 +++----- + drivers/video/{console => fbdev/core}/fbcon.h | 0 + drivers/video/{console => fbdev/core}/fbcon_ccw.c | 4 --- + drivers/video/{console => fbdev/core}/fbcon_cw.c | 4 --- + .../video/{console => fbdev/core}/fbcon_rotate.c | 4 --- + .../video/{console => fbdev/core}/fbcon_rotate.h | 0 + drivers/video/{console => fbdev/core}/fbcon_ud.c | 4 --- + drivers/video/fbdev/core/fbmem.c | 10 ++++-- + drivers/video/fbdev/core/fbmon.c | 4 +-- + drivers/video/{console => fbdev/core}/softcursor.c | 4 --- + drivers/video/{console => fbdev/core}/tileblit.c | 5 --- + drivers/video/fbdev/da8xx-fb.c | 2 +- + drivers/video/fbdev/efifb.c | 8 ++++- + drivers/video/fbdev/ffb.c | 4 +-- + drivers/video/fbdev/geode/gxfb_core.c | 2 +- + drivers/video/fbdev/i810/i810_main.c | 2 +- + drivers/video/fbdev/imsttfb.c | 2 +- + drivers/video/fbdev/imxfb.c | 10 ++---- + 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 | 10 +++--- + 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 +- + .../omap2/omapfb/displays/panel-sony-acx565akm.c | 2 +- + .../omap2/omapfb/displays/panel-tpo-td043mtea1.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/core.c | 1 - + 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/pvr2fb.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/skeletonfb.c | 2 +- + drivers/video/fbdev/sm712fb.c | 17 ++++----- + 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/uvesafb.c | 2 +- + drivers/video/fbdev/vermilion/vermilion.c | 2 +- + drivers/video/fbdev/via/via-core.c | 2 +- + drivers/video/fbdev/vt8623fb.c | 2 +- + drivers/video/fbdev/xilinxfb.c | 4 +-- + drivers/video/of_display_timing.c | 41 +++++++++------------- + drivers/video/of_videomode.c | 2 +- + include/linux/fb.h | 10 +----- + include/linux/fbcon.h | 12 +++++++ + 73 files changed, 152 insertions(+), 179 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 (100%) + rename drivers/video/{console => fbdev/core}/fbcon_ccw.c (98%) + rename drivers/video/{console => fbdev/core}/fbcon_cw.c (98%) + 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 (f5133732b52c Merge branches 'pm-cpufreq' and 'pm-cpufreq-sched' into linux-next) +$ git merge pm/linux-next +Resolved 'drivers/acpi/sbs.c' using previous resolution. +Auto-merging include/linux/acpi.h +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/cpufreq/mediatek-cpufreq.c +Auto-merging drivers/acpi/spcr.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/bus.c +Auto-merging drivers/acpi/arm64/iort.c +Auto-merging arch/x86/kernel/acpi/boot.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/clock/mt8173-cpu-dvfs.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fe8e4414f46d] Merge remote-tracking branch 'pm/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-power | 12 + + Documentation/admin-guide/pm/cpufreq.rst | 8 - + Documentation/admin-guide/pm/intel_pstate.rst | 61 +-- + .../devicetree/bindings/clock/mt8173-cpu-dvfs.txt | 83 --- + .../bindings/cpufreq/cpufreq-mediatek.txt | 247 +++++++++ + Documentation/power/states.txt | 4 +- + MAINTAINERS | 9 + + arch/arm/boot/dts/tango4-smp8758.dtsi | 1 - + arch/arm64/kernel/acpi.c | 4 +- + arch/ia64/kernel/acpi.c | 6 +- + arch/x86/include/asm/setup.h | 1 + + arch/x86/kernel/acpi/boot.c | 11 +- + arch/x86/kernel/early-quirks.c | 4 +- + arch/x86/kernel/quirks.c | 10 + + arch/x86/kernel/setup.c | 2 + + drivers/acpi/Makefile | 1 + + drivers/acpi/acpi_lpat.c | 6 +- + drivers/acpi/acpica/Makefile | 1 + + drivers/acpi/acpica/acapps.h | 2 + + drivers/acpi/acpica/acdispat.h | 13 + + drivers/acpi/acpica/aclocal.h | 7 +- + drivers/acpi/acpica/acobject.h | 15 +- + drivers/acpi/acpica/actables.h | 5 +- + drivers/acpi/acpica/acutils.h | 9 +- + drivers/acpi/acpica/dbdisply.c | 37 +- + drivers/acpi/acpica/dsfield.c | 2 + + drivers/acpi/acpica/dsobject.c | 398 +++----------- + drivers/acpi/acpica/dsopcode.c | 9 + + drivers/acpi/acpica/dspkginit.c | 496 +++++++++++++++++ + drivers/acpi/acpica/excreate.c | 62 +-- + drivers/acpi/acpica/exdump.c | 34 +- + drivers/acpi/acpica/exmisc.c | 9 + + drivers/acpi/acpica/exoparg2.c | 3 + + drivers/acpi/acpica/hwregs.c | 2 +- + drivers/acpi/acpica/hwxfsleep.c | 9 +- + drivers/acpi/acpica/nsaccess.c | 28 +- + drivers/acpi/acpica/nsarguments.c | 21 +- + drivers/acpi/acpica/nsinit.c | 14 + + drivers/acpi/acpica/nsnames.c | 9 +- + drivers/acpi/acpica/nsprepkg.c | 2 + + drivers/acpi/acpica/psloop.c | 14 + + drivers/acpi/acpica/psobject.c | 26 + + drivers/acpi/acpica/rsxface.c | 7 +- + drivers/acpi/acpica/tbdata.c | 230 +++++++- + drivers/acpi/acpica/tbinstal.c | 161 +----- + drivers/acpi/acpica/tbxface.c | 39 +- + drivers/acpi/acpica/tbxfload.c | 2 +- + drivers/acpi/acpica/uthex.c | 4 +- + drivers/acpi/acpica/utmath.c | 222 +++++++- + drivers/acpi/acpica/utmisc.c | 10 +- + drivers/acpi/acpica/utobject.c | 5 + + drivers/acpi/acpica/utprint.c | 8 +- + drivers/acpi/acpica/utresrc.c | 7 + + drivers/acpi/acpica/utstate.c | 2 +- + drivers/acpi/acpica/utstrtoul64.c | 9 +- + drivers/acpi/acpica/uttrack.c | 9 +- + drivers/acpi/apei/ghes.c | 3 +- + drivers/acpi/arm64/iort.c | 57 +- + drivers/acpi/bus.c | 3 - + drivers/acpi/device_pm.c | 167 ++++-- + drivers/acpi/dock.c | 2 +- + drivers/acpi/internal.h | 6 + + drivers/acpi/osi.c | 37 +- + drivers/acpi/pci_root.c | 4 +- + drivers/acpi/pmic/intel_pmic_xpower.c | 21 +- + drivers/acpi/processor_driver.c | 2 +- + drivers/acpi/property.c | 237 +++++---- + drivers/acpi/resource.c | 82 ++- + drivers/acpi/sbs.c | 25 +- + drivers/acpi/scan.c | 101 +++- + drivers/acpi/sleep.c | 8 +- + drivers/acpi/spcr.c | 9 +- + drivers/acpi/tables.c | 4 +- + drivers/acpi/video_detect.c | 14 + + drivers/acpi/x86/apple.c | 141 +++++ + drivers/base/power/domain.c | 237 ++++++++- + drivers/base/power/main.c | 103 ++-- + drivers/base/power/opp/of.c | 37 +- + drivers/base/power/wakeup.c | 8 +- + drivers/base/property.c | 131 +++-- + drivers/cpufreq/Kconfig.arm | 12 +- + drivers/cpufreq/Makefile | 3 +- + drivers/cpufreq/arm_big_little.c | 10 +- + drivers/cpufreq/cpufreq-dt-platdev.c | 5 +- + drivers/cpufreq/cpufreq-dt.c | 1 + + drivers/cpufreq/cpufreq-nforce2.c | 2 +- + drivers/cpufreq/cpufreq.c | 23 +- + drivers/cpufreq/cpufreq_conservative.c | 6 - + drivers/cpufreq/cpufreq_governor.c | 20 +- + drivers/cpufreq/cpufreq_governor.h | 3 +- + drivers/cpufreq/cpufreq_ondemand.c | 12 - + drivers/cpufreq/elanfreq.c | 4 +- + drivers/cpufreq/gx-suspmod.c | 2 +- + drivers/cpufreq/intel_pstate.c | 303 +---------- + drivers/cpufreq/longrun.c | 1 - + .../{mt8173-cpufreq.c => mediatek-cpufreq.c} | 2 + + drivers/cpufreq/pmac32-cpufreq.c | 7 +- + drivers/cpufreq/s5pv210-cpufreq.c | 3 + + drivers/cpufreq/sa1100-cpufreq.c | 5 +- + drivers/cpufreq/sa1110-cpufreq.c | 5 +- + drivers/cpufreq/sh-cpufreq.c | 3 +- + drivers/cpufreq/speedstep-ich.c | 2 +- + drivers/cpufreq/speedstep-smi.c | 2 +- + drivers/cpufreq/tango-cpufreq.c | 38 ++ + drivers/cpufreq/unicore2-cpufreq.c | 3 +- + drivers/firmware/efi/apple-properties.c | 5 +- + drivers/of/property.c | 66 ++- + drivers/pci/pci-acpi.c | 4 +- + drivers/pci/pci-driver.c | 4 +- + drivers/pci/pci.c | 7 + + drivers/pci/quirks.c | 5 +- + drivers/platform/x86/intel-hid.c | 17 +- + drivers/spi/spi.c | 32 ++ + drivers/thunderbolt/icm.c | 13 +- + drivers/thunderbolt/tb.c | 4 +- + include/acpi/acnames.h | 1 + + include/acpi/acpi.h | 4 +- + include/acpi/acpi_bus.h | 61 ++- + include/acpi/acpixf.h | 15 +- + include/acpi/acrestyp.h | 7 - + include/acpi/actbl.h | 1 + + include/acpi/actbl2.h | 30 +- + include/acpi/actypes.h | 8 + + include/acpi/platform/acenv.h | 9 +- + include/acpi/platform/acgcc.h | 4 + + include/acpi/platform/aclinux.h | 5 + + include/linux/acpi.h | 80 +-- + include/linux/acpi_iort.h | 5 +- + include/linux/cpufreq.h | 38 +- + include/linux/fwnode.h | 56 +- + include/linux/irqdomain.h | 4 +- + include/linux/of.h | 3 +- + include/linux/platform_data/x86/apple.h | 13 + + include/linux/pm.h | 4 + + include/linux/pm_domain.h | 3 + + include/linux/property.h | 67 +-- + include/linux/suspend.h | 16 + + kernel/cpu_pm.c | 50 +- + kernel/irq/irqdomain.c | 11 +- + kernel/power/hibernate.c | 29 +- + kernel/power/main.c | 64 ++- + kernel/power/power.h | 5 +- + kernel/power/suspend.c | 78 ++- + kernel/sched/cpufreq_schedutil.c | 85 ++- + kernel/sched/deadline.c | 2 +- + kernel/sched/fair.c | 8 +- + kernel/sched/rt.c | 2 +- + kernel/sched/sched.h | 10 +- + kernel/time/timekeeping_debug.c | 5 +- + .../acpi/os_specific/service_layers/oslinuxtbl.c | 105 ++-- + tools/power/acpi/tools/acpidump/apfiles.c | 2 +- + tools/power/acpi/tools/acpidump/apmain.c | 2 +- + tools/power/cpupower/utils/cpupower.c | 15 +- + tools/power/cpupower/utils/helpers/cpuid.c | 4 +- + tools/power/cpupower/utils/helpers/helpers.h | 5 +- + tools/power/cpupower/utils/helpers/misc.c | 2 +- + .../cpupower/utils/idle_monitor/hsw_ext_idle.c | 4 +- + .../cpupower/utils/idle_monitor/mperf_monitor.c | 3 +- + tools/power/cpupower/utils/idle_monitor/nhm_idle.c | 8 +- + tools/power/cpupower/utils/idle_monitor/snb_idle.c | 4 +- + tools/power/pm-graph/Makefile | 19 +- + tools/power/pm-graph/analyze_boot.py | 586 ++++++++++++++------- + tools/power/pm-graph/analyze_suspend.py | 534 +++++++++++++------ + tools/power/pm-graph/bootgraph.8 | 61 ++- + tools/power/pm-graph/sleepgraph.8 | 48 +- + 165 files changed, 4434 insertions(+), 2236 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/mt8173-cpu-dvfs.txt + create mode 100644 Documentation/devicetree/bindings/cpufreq/cpufreq-mediatek.txt + create mode 100644 drivers/acpi/acpica/dspkginit.c + create mode 100644 drivers/acpi/x86/apple.c + rename drivers/cpufreq/{mt8173-cpufreq.c => mediatek-cpufreq.c} (99%) + create mode 100644 drivers/cpufreq/tango-cpufreq.c + create mode 100644 include/linux/platform_data/x86/apple.h +Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc()) +$ git merge idle/next +Merge made by the 'recursive' strategy. +Merging thermal/next (5d72ed35678a Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next) +$ git merge thermal/next +Already up-to-date. +Merging thermal-soc/next (aa647852c32a Merge branch 'work-linus' into work-next) +$ git merge thermal-soc/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one) +$ git merge ieee1394/for-next +Auto-merging drivers/firewire/net.c +Merge made by the 'recursive' strategy. + drivers/firewire/net.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) +Merging dlm/next (1c2428537241 dlm: use sock_create_lite inside tcp_accept_from_sock) +$ git merge dlm/next +Merge made by the 'recursive' strategy. + fs/dlm/debug_fs.c | 25 ++++++++++++------------- + fs/dlm/lock.c | 8 +++----- + fs/dlm/lockspace.c | 9 +++++++-- + fs/dlm/lowcomms.c | 2 +- + fs/dlm/member.c | 15 ++++++--------- + fs/dlm/user.c | 6 ++++++ + include/uapi/linux/dlm_netlink.h | 1 + + 7 files changed, 36 insertions(+), 30 deletions(-) +Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging net-next/master (cd9cb3890b20 Merge branch 'rtnetlink-allow-selected-handlers-to-run-without-rtnl') +$ git merge net-next/master +Removing tools/hv/bondvf.sh +Auto-merging net/xfrm/xfrm_state.c +Auto-merging net/xfrm/xfrm_policy.c +Auto-merging net/rxrpc/protocol.h +Removing net/core/flow.c +Auto-merging include/uapi/linux/rxrpc.h +Removing include/net/flowcache.h +Auto-merging include/linux/syscalls.h +Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/drv.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/tx.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/sta.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/fw.c +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/dbg.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/dbg.c +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/api/tx.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/api/tof.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/api/stats.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/api/sta.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/api/scan.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/api/rx.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/api/rs.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/api/power.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/api/mac.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/api/d3.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/api/coex.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/api/cmdhdr.h +Auto-merging MAINTAINERS +Removing Documentation/networking/batman-adv.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/anarion-gmac.txt | 25 + + .../devicetree/bindings/net/marvell-pp2.txt | 28 +- + .../devicetree/bindings/net/mediatek-net.txt | 12 +- + .../devicetree/bindings/net/renesas,ravb.txt | 29 +- + .../devicetree/bindings/net/xilinx_axienet.txt | 55 + + Documentation/networking/00-INDEX | 2 - + Documentation/networking/batman-adv.rst | 220 + + Documentation/networking/batman-adv.txt | 215 - + Documentation/networking/filter.txt | 126 +- + Documentation/networking/index.rst | 1 + + Documentation/networking/ip-sysctl.txt | 13 +- + Documentation/networking/netvsc.txt | 63 + + Documentation/networking/strparser.txt | 207 +- + MAINTAINERS | 16 +- + arch/alpha/include/uapi/asm/socket.h | 2 + + arch/arm64/net/bpf_jit.h | 4 + + arch/arm64/net/bpf_jit_comp.c | 20 + + arch/frv/include/uapi/asm/socket.h | 2 + + arch/ia64/include/uapi/asm/socket.h | 2 + + arch/m32r/include/uapi/asm/socket.h | 2 + + arch/mips/include/uapi/asm/socket.h | 2 + + arch/mn10300/include/uapi/asm/socket.h | 2 + + arch/parisc/include/uapi/asm/socket.h | 2 + + arch/powerpc/net/bpf_jit.h | 1 + + arch/powerpc/net/bpf_jit_comp64.c | 20 + + arch/s390/include/uapi/asm/socket.h | 2 + + arch/s390/net/bpf_jit_comp.c | 24 + + arch/sparc/include/uapi/asm/socket.h | 2 + + arch/sparc/net/bpf_jit_comp_64.c | 34 + + arch/x86/net/bpf_jit_comp.c | 26 + + arch/xtensa/include/uapi/asm/socket.h | 2 + + drivers/atm/adummy.c | 2 +- + drivers/atm/ambassador.c | 2 +- + drivers/atm/eni.c | 2 +- + drivers/atm/firestream.c | 2 +- + drivers/atm/fore200e.c | 2 +- + drivers/atm/he.c | 2 +- + drivers/atm/horizon.c | 2 +- + drivers/atm/idt77252.c | 2 +- + drivers/atm/iphase.c | 2 +- + drivers/atm/lanai.c | 2 +- + drivers/atm/nicstar.c | 2 +- + drivers/atm/solos-pci.c | 6 +- + drivers/atm/zatm.c | 2 +- + drivers/bcma/driver_gpio.c | 1 + + drivers/bluetooth/Kconfig | 1 + + drivers/bluetooth/ath3k.c | 3 +- + drivers/bluetooth/bt3c_cs.c | 8 +- + drivers/bluetooth/btmrvl_sdio.c | 6 +- + drivers/bluetooth/btqca.c | 2 +- + drivers/bluetooth/btrtl.c | 2 + + drivers/bluetooth/btsdio.c | 3 +- + drivers/bluetooth/btuart_cs.c | 8 +- + drivers/bluetooth/btusb.c | 44 +- + drivers/bluetooth/btwilink.c | 8 +- + drivers/bluetooth/hci_bcm.c | 30 +- + drivers/bluetooth/hci_h4.c | 2 +- + drivers/bluetooth/hci_ldisc.c | 3 +- + drivers/bluetooth/hci_ll.c | 11 +- + drivers/bluetooth/hci_nokia.c | 10 +- + drivers/bluetooth/hci_serdev.c | 13 + + drivers/bluetooth/hci_uart.h | 1 + + drivers/infiniband/hw/bnxt_re/Kconfig | 1 + + drivers/isdn/capi/kcapi.c | 2 +- + drivers/isdn/hardware/eicon/divacapi.h | 16 +- + drivers/isdn/hardware/eicon/message.c | 247 +- + drivers/isdn/hardware/mISDN/hfcsusb.h | 2 +- + drivers/isdn/hisax/hfc_usb.c | 2 +- + drivers/net/appletalk/ipddp.c | 4 +- + drivers/net/arcnet/arcdevice.h | 2 +- + drivers/net/arcnet/com20020-pci.c | 2 +- + drivers/net/bonding/bond_sysfs.c | 2 +- + drivers/net/can/at91_can.c | 2 +- + drivers/net/can/janz-ican3.c | 2 +- + drivers/net/dsa/b53/b53_common.c | 83 +- + drivers/net/dsa/b53/b53_priv.h | 16 +- + drivers/net/dsa/bcm_sf2.c | 32 +- + drivers/net/dsa/dsa_loop.c | 38 - + drivers/net/dsa/lan9303-core.c | 135 +- + drivers/net/dsa/lan9303.h | 11 + + drivers/net/dsa/lan9303_i2c.c | 2 + + drivers/net/dsa/lan9303_mdio.c | 23 + + drivers/net/dsa/microchip/ksz_common.c | 124 +- + drivers/net/dsa/mt7530.c | 41 +- + drivers/net/dsa/mv88e6xxx/chip.c | 414 +- + drivers/net/dsa/mv88e6xxx/chip.h | 146 +- + drivers/net/dsa/mv88e6xxx/global2.c | 102 +- + drivers/net/dsa/mv88e6xxx/global2.h | 41 +- + drivers/net/dsa/mv88e6xxx/phy.c | 1 - + drivers/net/dsa/mv88e6xxx/port.h | 3 - + drivers/net/dsa/qca8k.c | 110 +- + drivers/net/dsa/qca8k.h | 1 - + drivers/net/dummy.c | 2 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 14 +- + drivers/net/ethernet/amd/xgbe/xgbe.h | 1 + + drivers/net/ethernet/apple/mace.c | 8 +- + drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 7 +- + drivers/net/ethernet/aquantia/atlantic/aq_ring.h | 5 +- + drivers/net/ethernet/aquantia/atlantic/aq_vec.c | 1 + + drivers/net/ethernet/arc/emac_main.c | 13 + + drivers/net/ethernet/broadcom/Kconfig | 3 + + drivers/net/ethernet/broadcom/bcmsysport.c | 78 +- + drivers/net/ethernet/broadcom/bcmsysport.h | 21 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 14 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 4 +- + drivers/net/ethernet/broadcom/bnxt/Makefile | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 251 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 54 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c | 17 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.h | 1 + + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 35 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 322 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 15 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 495 +++ + drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.h | 72 + + drivers/net/ethernet/broadcom/genet/bcmgenet.h | 1 + + drivers/net/ethernet/broadcom/genet/bcmmii.c | 256 +- + drivers/net/ethernet/cadence/macb_main.c | 2 +- + drivers/net/ethernet/cadence/macb_pci.c | 2 +- + drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 34 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 36 +- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 4 +- + .../net/ethernet/cavium/liquidio/liquidio_common.h | 6 +- + .../net/ethernet/cavium/liquidio/octeon_console.c | 21 +- + .../net/ethernet/cavium/liquidio/octeon_device.c | 13 +- + .../net/ethernet/cavium/liquidio/octeon_device.h | 4 + + drivers/net/ethernet/cavium/liquidio/octeon_droq.c | 6 +- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 8 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 15 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 100 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 100 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c | 9 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.h | 6 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 446 +- + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 2 + + drivers/net/ethernet/dec/tulip/tulip_core.c | 2 - + drivers/net/ethernet/ec_bhf.c | 2 +- + drivers/net/ethernet/emulex/benet/be_roce.c | 3 - + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 17 +- + drivers/net/ethernet/freescale/fec_main.c | 12 +- + drivers/net/ethernet/freescale/fec_mpc52xx.c | 4 +- + drivers/net/ethernet/freescale/fman/fman.c | 12 +- + drivers/net/ethernet/freescale/fman/fman_port.c | 4 +- + drivers/net/ethernet/freescale/fman/mac.c | 50 +- + drivers/net/ethernet/freescale/fsl_pq_mdio.c | 20 +- + drivers/net/ethernet/hisilicon/Kconfig | 27 + + drivers/net/ethernet/hisilicon/Makefile | 1 + + drivers/net/ethernet/hisilicon/hns/hnae.c | 1 + + drivers/net/ethernet/hisilicon/hns/hnae.h | 15 + + drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 1 + + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 135 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.h | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 9 +- + drivers/net/ethernet/hisilicon/hns3/Makefile | 7 + + drivers/net/ethernet/hisilicon/hns3/hnae3.c | 300 ++ + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 444 ++ + .../net/ethernet/hisilicon/hns3/hns3pf/Makefile | 11 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 356 ++ + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 740 ++++ + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 4265 ++++++++++++++++++++ + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 519 +++ + .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 213 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.h | 17 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 1015 +++++ + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 106 + + .../net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c | 2849 +++++++++++++ + .../net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.h | 592 +++ + .../ethernet/hisilicon/hns3/hns3pf/hns3_ethtool.c | 482 +++ + drivers/net/ethernet/ibm/ehea/ehea_main.c | 5 +- + drivers/net/ethernet/ibm/emac/core.c | 53 +- + drivers/net/ethernet/ibm/emac/debug.h | 2 +- + drivers/net/ethernet/ibm/emac/mal.c | 8 +- + drivers/net/ethernet/ibm/emac/rgmii.c | 18 +- + drivers/net/ethernet/ibm/emac/tah.c | 12 +- + drivers/net/ethernet/ibm/emac/zmii.c | 17 +- + drivers/net/ethernet/ibm/ibmvnic.c | 123 +- + drivers/net/ethernet/ibm/ibmvnic.h | 17 + + drivers/net/ethernet/intel/e1000e/hw.h | 4 + + drivers/net/ethernet/intel/e1000e/ich8lan.c | 2 + + drivers/net/ethernet/intel/e1000e/netdev.c | 4 + + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 14 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 6 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 72 +- + drivers/net/ethernet/intel/i40e/i40e_nvm.c | 21 +- + drivers/net/ethernet/intel/i40e/i40e_ptp.c | 5 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 18 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 32 +- + drivers/net/ethernet/intel/i40evf/i40e_osdep.h | 4 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 6 +- + drivers/net/ethernet/intel/i40evf/i40evf.h | 11 + + drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 4 +- + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 14 +- + drivers/net/ethernet/intel/igb/e1000_82575.c | 6 + + drivers/net/ethernet/intel/igb/e1000_defines.h | 1 + + drivers/net/ethernet/intel/igb/e1000_hw.h | 18 +- + drivers/net/ethernet/intel/igb/e1000_mbx.c | 57 +- + drivers/net/ethernet/intel/igb/e1000_mbx.h | 14 +- + drivers/net/ethernet/intel/igb/igb_main.c | 23 +- + drivers/net/ethernet/intel/igbvf/ethtool.c | 4 + + drivers/net/ethernet/intel/igbvf/mbx.c | 4 + + drivers/net/ethernet/intel/igbvf/netdev.c | 47 + + drivers/net/ethernet/intel/igbvf/vf.c | 12 +- + drivers/net/ethernet/intel/igbvf/vf.h | 1 + + drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 30 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 8 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 132 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 9 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 102 +- + drivers/net/ethernet/marvell/mvpp2.c | 611 ++- + drivers/net/ethernet/mediatek/Kconfig | 6 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 147 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 73 +- + drivers/net/ethernet/mellanox/mlx4/en_cq.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/en_main.c | 9 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 17 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 21 + + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 11 +- + drivers/net/ethernet/mellanox/mlx5/core/dev.c | 73 + + drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 17 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 152 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 58 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.h | 9 + + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 2 + + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 11 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 209 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 78 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 12 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h | 10 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 2 +- + .../net/ethernet/mellanox/mlx5/core/fs_counters.c | 13 +- + drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c | 201 + + drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.h | 95 + + drivers/net/ethernet/mellanox/mlx5/core/main.c | 37 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 4 + + drivers/net/ethernet/mellanox/mlx5/core/sriov.c | 14 +- + drivers/net/ethernet/mellanox/mlxsw/Kconfig | 1 + + drivers/net/ethernet/mellanox/mlxsw/core.c | 2 +- + .../ethernet/mellanox/mlxsw/core_acl_flex_keys.h | 6 + + drivers/net/ethernet/mellanox/mlxsw/reg.h | 83 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 170 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 4 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 2 +- + .../mellanox/mlxsw/spectrum_acl_flex_keys.h | 3 + + .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 3 + + drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c | 2 +- + .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 50 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 1711 ++++++-- + drivers/net/ethernet/mellanox/mlxsw/trap.h | 25 +- + drivers/net/ethernet/moxa/moxart_ether.c | 15 +- + drivers/net/ethernet/moxa/moxart_ether.h | 8 +- + drivers/net/ethernet/neterion/s2io.c | 45 - + drivers/net/ethernet/netronome/nfp/bpf/jit.c | 24 + + drivers/net/ethernet/netronome/nfp/bpf/main.c | 20 +- + drivers/net/ethernet/netronome/nfp/bpf/offload.c | 4 +- + drivers/net/ethernet/netronome/nfp/bpf/verifier.c | 24 +- + drivers/net/ethernet/netronome/nfp/flower/main.h | 4 +- + .../net/ethernet/netronome/nfp/flower/offload.c | 15 +- + drivers/net/ethernet/netronome/nfp/nfp_app.h | 8 +- + drivers/net/ethernet/netronome/nfp/nfp_main.c | 48 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 10 +- + drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 2 +- + drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 23 +- + drivers/net/ethernet/netronome/nfp/nfp_port.c | 36 +- + drivers/net/ethernet/netronome/nfp/nfp_port.h | 6 +- + .../ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.c | 18 +- + drivers/net/ethernet/qlogic/qed/qed_dev.c | 145 +- + drivers/net/ethernet/qlogic/qed/qed_dev_api.h | 43 +- + drivers/net/ethernet/qlogic/qed/qed_hsi.h | 49 + + drivers/net/ethernet/qlogic/qed/qed_l2.c | 115 + + drivers/net/ethernet/qlogic/qed/qed_l2.h | 18 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 58 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 66 + + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 37 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 157 + + drivers/net/ethernet/qlogic/qed/qed_sriov.h | 3 + + drivers/net/ethernet/qlogic/qed/qed_vf.c | 75 + + drivers/net/ethernet/qlogic/qed/qed_vf.h | 53 +- + drivers/net/ethernet/qlogic/qede/qede.h | 19 +- + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 205 +- + drivers/net/ethernet/qlogic/qede/qede_filter.c | 483 ++- + drivers/net/ethernet/qlogic/qede/qede_main.c | 9 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_minidump.c | 2 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 2 +- + drivers/net/ethernet/renesas/ravb.h | 2 + + drivers/net/ethernet/renesas/ravb_main.c | 131 +- + drivers/net/ethernet/rocker/rocker_main.c | 5 + + drivers/net/ethernet/rocker/rocker_ofdpa.c | 6 +- + drivers/net/ethernet/sfc/efx.h | 4 +- + drivers/net/ethernet/sfc/falcon/efx.h | 4 +- + drivers/net/ethernet/sfc/falcon/tx.c | 13 +- + drivers/net/ethernet/sfc/mcdi_port.c | 224 +- + drivers/net/ethernet/sfc/tx.c | 13 +- + drivers/net/ethernet/stmicro/stmmac/Kconfig | 9 + + drivers/net/ethernet/stmicro/stmmac/Makefile | 1 + + .../net/ethernet/stmicro/stmmac/dwmac-anarion.c | 152 + + drivers/net/ethernet/sun/ldmvsw.c | 2 +- + drivers/net/ethernet/sun/niu.c | 24 +- + drivers/net/ethernet/sun/sunvnet.c | 2 +- + drivers/net/ethernet/sun/sunvnet_common.c | 90 +- + drivers/net/ethernet/synopsys/dwc-xlgmac-net.c | 1 + + drivers/net/ethernet/ti/cpsw.c | 8 +- + drivers/net/ethernet/ti/davinci_emac.c | 4 +- + drivers/net/ethernet/ti/netcp_core.c | 13 +- + drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +- + drivers/net/ethernet/xilinx/xilinx_axienet.h | 4 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 48 +- + drivers/net/geneve.c | 242 +- + drivers/net/hamradio/baycom_par.c | 2 +- + drivers/net/hamradio/baycom_ser_fdx.c | 2 +- + drivers/net/hamradio/baycom_ser_hdx.c | 2 +- + drivers/net/hamradio/dmascc.c | 2 +- + drivers/net/hyperv/hyperv_net.h | 59 +- + drivers/net/hyperv/netvsc.c | 368 +- + drivers/net/hyperv/netvsc_drv.c | 511 ++- + drivers/net/hyperv/rndis_filter.c | 151 +- + drivers/net/ieee802154/ca8210.c | 1 + + drivers/net/ieee802154/mrf24j40.c | 3 +- + drivers/net/ipvlan/ipvlan_main.c | 2 +- + drivers/net/ipvlan/ipvtap.c | 2 +- + drivers/net/irda/irda-usb.c | 2 +- + drivers/net/irda/kingsun-sir.c | 2 +- + drivers/net/irda/ks959-sir.c | 2 +- + drivers/net/irda/ksdazzle-sir.c | 2 +- + drivers/net/irda/mcs7780.c | 2 +- + drivers/net/irda/stir4200.c | 2 +- + drivers/net/macvlan.c | 2 +- + drivers/net/macvtap.c | 2 +- + drivers/net/phy/Kconfig | 25 + + drivers/net/phy/Makefile | 6 + + drivers/net/phy/marvell.c | 320 +- + drivers/net/phy/mdio-bcm-unimac.c | 71 +- + drivers/net/phy/mdio-i2c.c | 109 + + drivers/net/phy/mdio-i2c.h | 19 + + drivers/net/phy/mdio-mux-mmioreg.c | 18 +- + drivers/net/phy/mdio-mux.c | 16 +- + drivers/net/phy/mdio_bus.c | 6 +- + drivers/net/phy/phy-core.c | 180 + + drivers/net/phy/phy.c | 235 +- + drivers/net/phy/phy_device.c | 15 + + drivers/net/phy/phylink.c | 1462 +++++++ + drivers/net/phy/sfp-bus.c | 475 +++ + drivers/net/phy/sfp.c | 915 +++++ + drivers/net/phy/sfp.h | 28 + + drivers/net/tap.c | 7 +- + drivers/net/tun.c | 9 +- + drivers/net/usb/catc.c | 2 +- + drivers/net/usb/cdc-phonet.c | 2 +- + drivers/net/usb/cdc_ncm.c | 2 +- + drivers/net/usb/ipheth.c | 2 +- + drivers/net/usb/kaweth.c | 2 +- + drivers/net/usb/r8152.c | 2 +- + drivers/net/usb/rtl8150.c | 2 +- + drivers/net/virtio_net.c | 344 +- + drivers/net/vrf.c | 17 +- + drivers/net/vxlan.c | 31 +- + drivers/net/wireless/ath/ath10k/ahb.c | 3 +- + drivers/net/wireless/ath/ath10k/ce.c | 299 +- + drivers/net/wireless/ath/ath10k/ce.h | 30 +- + drivers/net/wireless/ath/ath10k/core.c | 5 + + drivers/net/wireless/ath/ath10k/core.h | 2 + + drivers/net/wireless/ath/ath10k/debug.c | 2 +- + drivers/net/wireless/ath/ath10k/hw.c | 150 + + drivers/net/wireless/ath/ath10k/hw.h | 9 + + drivers/net/wireless/ath/ath10k/pci.c | 55 +- + drivers/net/wireless/ath/ath10k/pci.h | 14 +- + drivers/net/wireless/ath/ath10k/wmi.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/debug.c | 5 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 2 +- + drivers/net/wireless/cisco/airo.c | 2 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 30 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 2 +- + drivers/net/wireless/intel/iwlegacy/3945-mac.c | 2 +- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 2 +- + drivers/net/wireless/intel/iwlwifi/Makefile | 2 + + drivers/net/wireless/intel/iwlwifi/dvm/commands.h | 16 - + drivers/net/wireless/intel/iwlwifi/fw/api/alive.h | 206 + + .../net/wireless/intel/iwlwifi/fw/api/binding.h | 144 + + .../intel/iwlwifi/fw/{api.h => api/cmdhdr.h} | 78 +- + .../iwlwifi/{mvm/fw-api-coex.h => fw/api/coex.h} | 11 +- + .../net/wireless/intel/iwlwifi/fw/api/commands.h | 664 +++ + drivers/net/wireless/intel/iwlwifi/fw/api/config.h | 192 + + .../net/wireless/intel/iwlwifi/fw/api/context.h | 94 + + .../intel/iwlwifi/{mvm/fw-api-d3.h => fw/api/d3.h} | 11 +- + .../net/wireless/intel/iwlwifi/fw/api/datapath.h | 127 + + drivers/net/wireless/intel/iwlwifi/fw/api/debug.h | 345 ++ + drivers/net/wireless/intel/iwlwifi/fw/api/filter.h | 183 + + .../net/wireless/intel/iwlwifi/fw/api/mac-cfg.h | 152 + + .../iwlwifi/{mvm/fw-api-mac.h => fw/api/mac.h} | 33 +- + .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 386 ++ + .../net/wireless/intel/iwlwifi/fw/api/offload.h | 101 + + drivers/net/wireless/intel/iwlwifi/fw/api/paging.h | 108 + + .../net/wireless/intel/iwlwifi/fw/api/phy-ctxt.h | 164 + + drivers/net/wireless/intel/iwlwifi/fw/api/phy.h | 258 ++ + .../iwlwifi/{mvm/fw-api-power.h => fw/api/power.h} | 13 +- + .../intel/iwlwifi/{mvm/fw-api-rs.h => fw/api/rs.h} | 13 +- + .../intel/iwlwifi/{mvm/fw-api-rx.h => fw/api/rx.h} | 31 +- + .../iwlwifi/{mvm/fw-api-scan.h => fw/api/scan.h} | 11 +- + drivers/net/wireless/intel/iwlwifi/fw/api/sf.h | 138 + + .../iwlwifi/{mvm/fw-api-sta.h => fw/api/sta.h} | 15 +- + .../iwlwifi/{mvm/fw-api-stats.h => fw/api/stats.h} | 13 +- + drivers/net/wireless/intel/iwlwifi/fw/api/tdls.h | 208 + + .../net/wireless/intel/iwlwifi/fw/api/time-event.h | 386 ++ + .../iwlwifi/{mvm/fw-api-tof.h => fw/api/tof.h} | 9 +- + .../intel/iwlwifi/{mvm/fw-api-tx.h => fw/api/tx.h} | 42 +- + drivers/net/wireless/intel/iwlwifi/fw/api/txq.h | 163 + + drivers/net/wireless/intel/iwlwifi/fw/common_rx.c | 88 + + .../intel/iwlwifi/{mvm/fw-dbg.c => fw/dbg.c} | 438 +- + .../intel/iwlwifi/{mvm/fw-dbg.h => fw/dbg.h} | 125 +- + drivers/net/wireless/intel/iwlwifi/fw/init.c | 75 + + drivers/net/wireless/intel/iwlwifi/fw/paging.c | 414 ++ + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 156 + + drivers/net/wireless/intel/iwlwifi/fw/smem.c | 152 + + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 3 +- + drivers/net/wireless/intel/iwlwifi/mvm/Makefile | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/coex.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/constants.h | 2 +- + .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 21 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h | 2845 +------------ + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 484 +-- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 382 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 194 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 121 +- + drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 7 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 150 +- + drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/power.c | 25 +- + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 11 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 9 +- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 452 +-- + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 18 +- + .../net/wireless/intel/iwlwifi/mvm/time-event.c | 20 +- + drivers/net/wireless/intel/iwlwifi/mvm/tof.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/tof.h | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 155 +- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 18 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 4 +- + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 2 +- + .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 4 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 8 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 8 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 5 +- + drivers/net/wireless/intersil/hostap/hostap_main.c | 4 +- + drivers/net/wireless/marvell/mwifiex/11n.c | 2 + + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 6 +- + drivers/net/wireless/marvell/mwifiex/cfp.c | 4 +- + drivers/net/wireless/marvell/mwifiex/cmdevt.c | 15 +- + drivers/net/wireless/marvell/mwifiex/debugfs.c | 2 - + drivers/net/wireless/marvell/mwifiex/init.c | 32 +- + drivers/net/wireless/marvell/mwifiex/main.c | 133 +- + drivers/net/wireless/marvell/mwifiex/main.h | 7 +- + drivers/net/wireless/marvell/mwifiex/pcie.c | 126 +- + drivers/net/wireless/marvell/mwifiex/scan.c | 11 +- + drivers/net/wireless/marvell/mwifiex/sdio.c | 3 +- + drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 19 +- + drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 5 +- + drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 121 +- + drivers/net/wireless/marvell/mwifiex/tdls.c | 2 +- + drivers/net/wireless/marvell/mwifiex/usb.c | 3 +- + drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 315 +- + drivers/net/wireless/quantenna/qtnfmac/cfg80211.h | 4 + + drivers/net/wireless/quantenna/qtnfmac/commands.c | 486 ++- + drivers/net/wireless/quantenna/qtnfmac/commands.h | 5 + + drivers/net/wireless/quantenna/qtnfmac/core.c | 5 + + drivers/net/wireless/quantenna/qtnfmac/core.h | 27 +- + drivers/net/wireless/quantenna/qtnfmac/event.c | 67 +- + .../net/wireless/quantenna/qtnfmac/pearl/pcie.c | 30 +- + drivers/net/wireless/quantenna/qtnfmac/qlink.h | 202 +- + .../net/wireless/quantenna/qtnfmac/qlink_util.c | 26 +- + .../net/wireless/quantenna/qtnfmac/qlink_util.h | 10 +- + drivers/net/wireless/realtek/rtlwifi/base.c | 22 +- + drivers/net/wireless/realtek/rtlwifi/base.h | 2 + + .../realtek/rtlwifi/btcoexist/halbt_precomp.h | 16 - + .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 17 +- + .../wireless/realtek/rtlwifi/btcoexist/rtl_btc.c | 28 + + .../wireless/realtek/rtlwifi/btcoexist/rtl_btc.h | 1 + + drivers/net/wireless/realtek/rtlwifi/core.c | 2 + + drivers/net/wireless/realtek/rtlwifi/pci.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/sw.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/sw.c | 2 + + .../net/wireless/realtek/rtlwifi/rtl8192cu/hw.c | 5 - + .../net/wireless/realtek/rtlwifi/rtl8192cu/mac.c | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/sw.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/trx.c | 12 - + .../net/wireless/realtek/rtlwifi/rtl8192cu/trx.h | 3 - + .../net/wireless/realtek/rtlwifi/rtl8192de/sw.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.c | 9 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.c | 5 + + .../net/wireless/realtek/rtlwifi/rtl8192ee/sw.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.c | 6 - + .../net/wireless/realtek/rtlwifi/rtl8192se/sw.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/sw.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/fw.c | 9 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 7 + + .../net/wireless/realtek/rtlwifi/rtl8723be/phy.c | 365 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/sw.c | 17 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/table.c | 192 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/table.h | 10 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/fw.c | 13 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 43 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/sw.c | 21 +- + drivers/net/wireless/realtek/rtlwifi/wifi.h | 49 +- + drivers/net/wireless/rsi/rsi_91x_core.c | 10 +- + drivers/net/wireless/rsi/rsi_91x_debugfs.c | 3 + + drivers/net/wireless/rsi/rsi_91x_hal.c | 270 +- + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 63 +- + drivers/net/wireless/rsi/rsi_91x_main.c | 3 +- + drivers/net/wireless/rsi/rsi_91x_mgmt.c | 470 ++- + drivers/net/wireless/rsi/rsi_91x_sdio.c | 154 +- + drivers/net/wireless/rsi/rsi_91x_sdio_ops.c | 44 +- + drivers/net/wireless/rsi/rsi_91x_usb.c | 137 +- + drivers/net/wireless/rsi/rsi_91x_usb_ops.c | 6 +- + drivers/net/wireless/rsi/rsi_hal.h | 64 + + drivers/net/wireless/rsi/rsi_main.h | 52 +- + drivers/net/wireless/rsi/rsi_mgmt.h | 171 +- + drivers/net/wireless/rsi/rsi_sdio.h | 4 +- + drivers/net/wireless/rsi/rsi_usb.h | 6 +- + drivers/net/wireless/ti/wl1251/main.c | 1 + + drivers/net/wireless/wl3501_cs.c | 2 +- + drivers/net/wireless/zydas/zd1211rw/zd_rf_rf2959.c | 2 +- + drivers/of/of_mdio.c | 20 +- + drivers/vhost/net.c | 1 + + drivers/virtio/virtio_ring.c | 2 +- + fs/afs/misc.c | 1 - + fs/afs/rxrpc.c | 1 - + include/linux/bpf.h | 54 +- + include/linux/bpf_types.h | 3 + + include/linux/bpf_verifier.h | 55 +- + include/linux/ethtool.h | 4 + + include/linux/filter.h | 14 + + include/linux/igmp.h | 3 +- + include/linux/ipv6.h | 10 + + include/linux/mlx5/driver.h | 5 + + include/linux/mlx5/mlx5_ifc.h | 17 +- + include/linux/net.h | 12 + + include/linux/netdev_features.h | 6 +- + include/linux/netdevice.h | 47 +- + include/linux/phy.h | 21 + + include/linux/phylink.h | 148 + + include/linux/platform_data/mdio-bcm-unimac.h | 13 + + include/linux/qed/qed_eth_if.h | 1 + + include/linux/qed/qed_if.h | 37 +- + include/linux/sched/user.h | 3 +- + include/linux/sctp.h | 171 +- + include/linux/seg6_local.h | 6 + + include/linux/sfp.h | 434 ++ + include/linux/skbuff.h | 200 +- + include/linux/socket.h | 1 + + include/linux/syscalls.h | 12 + + include/linux/tcp.h | 17 +- + include/linux/tnum.h | 81 + + include/linux/virtio_net.h | 5 - + include/net/af_unix.h | 1 - + include/net/dsa.h | 39 +- + include/net/fib_notifier.h | 44 + + include/net/fib_rules.h | 9 + + include/net/flow.h | 34 - + include/net/flowcache.h | 25 - + include/net/inet6_hashtables.h | 22 +- + include/net/inet_hashtables.h | 31 +- + include/net/inetpeer.h | 11 +- + include/net/ip.h | 19 +- + include/net/ip6_fib.h | 51 + + include/net/ip6_route.h | 2 +- + include/net/ip_fib.h | 67 +- + include/net/net_namespace.h | 1 + + include/net/netlink.h | 16 + + include/net/netns/ipv4.h | 1 + + include/net/netns/ipv6.h | 2 + + include/net/netns/xfrm.h | 11 - + include/net/pkt_cls.h | 131 +- + include/net/raw.h | 2 +- + include/net/rawv6.h | 2 +- + include/net/rtnetlink.h | 9 +- + include/net/sch_generic.h | 8 +- + include/net/sctp/command.h | 12 +- + include/net/sctp/constants.h | 89 +- + include/net/sctp/sctp.h | 17 +- + include/net/sctp/sm.h | 21 +- + include/net/sctp/structs.h | 48 +- + include/net/seg6.h | 4 + + include/net/sock.h | 7 + + include/net/strparser.h | 119 +- + include/net/switchdev.h | 87 - + include/net/tcp.h | 73 +- + include/net/udp.h | 4 +- + include/net/udp_tunnel.h | 8 + + include/net/xfrm.h | 9 +- + include/trace/events/xdp.h | 31 +- + include/uapi/asm-generic/socket.h | 2 + + include/uapi/linux/bpf.h | 27 +- + include/uapi/linux/errqueue.h | 3 + + include/uapi/linux/ethtool.h | 48 +- + include/uapi/linux/ipv6_route.h | 1 + + include/uapi/linux/lwtunnel.h | 1 + + include/uapi/linux/netlink.h | 17 + + include/uapi/linux/rtnetlink.h | 23 +- + include/{ => uapi}/linux/rxrpc.h | 57 +- + include/uapi/linux/seg6_local.h | 68 + + include/uapi/linux/snmp.h | 9 - + include/uapi/linux/tcp.h | 8 + + kernel/bpf/Makefile | 5 +- + kernel/bpf/core.c | 60 + + kernel/bpf/devmap.c | 434 ++ + kernel/bpf/syscall.c | 78 +- + kernel/bpf/tnum.c | 180 + + kernel/bpf/verifier.c | 2223 +++++----- + kernel/events/core.c | 10 +- + kernel/trace/trace_syscalls.c | 53 +- + lib/nlattr.c | 30 + + lib/test_bpf.c | 364 ++ + net/batman-adv/bat_iv_ogm.c | 6 +- + net/batman-adv/bat_v_ogm.c | 16 +- + net/batman-adv/distributed-arp-table.c | 2 +- + net/batman-adv/main.h | 2 +- + net/batman-adv/send.c | 2 +- + net/bluetooth/6lowpan.c | 9 +- + net/bridge/br_fdb.c | 18 - + net/bridge/br_mdb.c | 6 +- + net/can/gw.c | 6 +- + net/core/Makefile | 4 +- + net/core/datagram.c | 55 +- + net/core/dev.c | 302 +- + net/core/ethtool.c | 42 +- + net/core/fib_notifier.c | 164 + + net/core/fib_rules.c | 69 +- + net/core/filter.c | 201 +- + net/core/flow.c | 516 --- + net/core/flow_dissector.c | 45 - + net/core/lwtunnel.c | 28 +- + net/core/neighbour.c | 10 +- + net/core/net_namespace.c | 5 +- + net/core/rtnetlink.c | 216 +- + net/core/skbuff.c | 566 ++- + net/core/sock.c | 69 + + net/dcb/dcbnl.c | 4 +- + net/dccp/ipv4.c | 4 +- + net/dccp/ipv6.c | 4 +- + net/decnet/dn_dev.c | 6 +- + net/decnet/dn_fib.c | 4 +- + net/decnet/dn_route.c | 4 +- + net/dsa/dsa.c | 38 +- + net/dsa/dsa2.c | 6 +- + net/dsa/dsa_priv.h | 37 +- + net/dsa/legacy.c | 40 +- + net/dsa/port.c | 51 +- + net/dsa/slave.c | 404 +- + net/dsa/switch.c | 21 +- + net/dsa/tag_lan9303.c | 3 +- + net/ipv4/af_inet.c | 22 +- + net/ipv4/devinet.c | 8 +- + net/ipv4/fib_frontend.c | 23 +- + net/ipv4/fib_notifier.c | 99 +- + net/ipv4/fib_rules.c | 44 +- + net/ipv4/fib_semantics.c | 11 +- + net/ipv4/fib_trie.c | 5 +- + net/ipv4/gre_offload.c | 14 +- + net/ipv4/icmp.c | 4 +- + net/ipv4/igmp.c | 6 +- + net/ipv4/inet_hashtables.c | 27 +- + net/ipv4/inetpeer.c | 428 +- + net/ipv4/ip_options.c | 9 +- + net/ipv4/ip_output.c | 78 +- + net/ipv4/ip_sockglue.c | 16 +- + net/ipv4/ip_vti.c | 31 - + net/ipv4/ipmr.c | 8 +- + net/ipv4/proc.c | 9 - + net/ipv4/raw.c | 18 +- + net/ipv4/raw_diag.c | 4 +- + net/ipv4/route.c | 2 +- + net/ipv4/syncookies.c | 2 +- + net/ipv4/sysctl_net_ipv4.c | 3 + + net/ipv4/tcp.c | 223 +- + net/ipv4/tcp_bic.c | 14 +- + net/ipv4/tcp_cdg.c | 12 +- + net/ipv4/tcp_cong.c | 2 +- + net/ipv4/tcp_cubic.c | 13 +- + net/ipv4/tcp_highspeed.c | 11 +- + net/ipv4/tcp_htcp.c | 3 +- + net/ipv4/tcp_illinois.c | 11 +- + net/ipv4/tcp_input.c | 309 +- + net/ipv4/tcp_ipv4.c | 80 +- + net/ipv4/tcp_minisocks.c | 3 - + net/ipv4/tcp_nv.c | 13 +- + net/ipv4/tcp_output.c | 19 +- + net/ipv4/tcp_probe.c | 5 +- + net/ipv4/tcp_recovery.c | 2 +- + net/ipv4/tcp_scalable.c | 16 +- + net/ipv4/tcp_timer.c | 12 - + net/ipv4/tcp_veno.c | 11 +- + net/ipv4/tcp_westwood.c | 31 +- + net/ipv4/tcp_yeah.c | 11 +- + net/ipv4/udp.c | 79 +- + net/ipv4/udp_diag.c | 10 +- + net/ipv4/udp_offload.c | 64 +- + net/ipv4/udp_tunnel.c | 25 +- + net/ipv4/xfrm4_policy.c | 11 +- + net/ipv6/Kconfig | 15 +- + net/ipv6/Makefile | 4 +- + net/ipv6/addrconf.c | 20 +- + net/ipv6/addrlabel.c | 6 +- + net/ipv6/af_inet6.c | 2 +- + net/ipv6/exthdrs.c | 4 +- + net/ipv6/fib6_notifier.c | 61 + + net/ipv6/fib6_rules.c | 69 +- + net/ipv6/inet6_hashtables.c | 28 +- + net/ipv6/ip6_fib.c | 134 +- + net/ipv6/ip6_output.c | 76 - + net/ipv6/ip6_vti.c | 31 - + net/ipv6/ip6mr.c | 2 +- + net/ipv6/raw.c | 13 +- + net/ipv6/route.c | 15 +- + net/ipv6/seg6.c | 7 +- + net/ipv6/seg6_iptunnel.c | 12 +- + net/ipv6/seg6_local.c | 766 ++++ + net/ipv6/tcp_ipv6.c | 18 +- + net/ipv6/udp.c | 47 +- + net/ipv6/udp_offload.c | 100 +- + net/ipv6/xfrm6_policy.c | 11 +- + net/kcm/kcmproc.c | 34 +- + net/kcm/kcmsock.c | 38 +- + net/key/af_key.c | 6 - + net/mpls/af_mpls.c | 8 +- + net/netfilter/xt_TPROXY.c | 6 +- + net/netfilter/xt_recent.c | 2 +- + net/openvswitch/datapath.c | 14 - + net/openvswitch/flow.c | 16 +- + net/openvswitch/flow.h | 2 + + net/openvswitch/flow_table.c | 4 +- + net/packet/af_packet.c | 2 - + net/phonet/pn_netlink.c | 12 +- + net/qrtr/qrtr.c | 2 +- + net/rds/connection.c | 50 +- + net/rds/rds.h | 4 +- + net/rds/tcp.c | 2 +- + net/rds/tcp_connect.c | 4 +- + net/rds/tcp_send.c | 2 +- + net/rds/threads.c | 2 +- + net/rxrpc/ar-internal.h | 2 +- + include/rxrpc/packet.h => net/rxrpc/protocol.h | 45 - + net/sched/act_api.c | 80 +- + net/sched/act_csum.c | 6 - + net/sched/cls_api.c | 211 +- + net/sched/cls_basic.c | 39 +- + net/sched/cls_bpf.c | 86 +- + net/sched/cls_cgroup.c | 30 +- + net/sched/cls_flow.c | 71 +- + net/sched/cls_flower.c | 95 +- + net/sched/cls_fw.c | 60 +- + net/sched/cls_matchall.c | 61 +- + net/sched/cls_route.c | 58 +- + net/sched/cls_rsvp.h | 28 +- + net/sched/cls_tcindex.c | 44 +- + net/sched/cls_u32.c | 143 +- + net/sched/sch_api.c | 12 +- + net/sched/sch_atm.c | 12 +- + net/sched/sch_mqprio.c | 16 +- + net/sctp/associola.c | 21 +- + net/sctp/auth.c | 13 +- + net/sctp/bind_addr.c | 20 +- + net/sctp/chunk.c | 4 +- + net/sctp/debug.c | 8 +- + net/sctp/endpointola.c | 12 +- + net/sctp/input.c | 2 +- + net/sctp/ipv6.c | 8 +- + net/sctp/output.c | 60 +- + net/sctp/outqueue.c | 20 +- + net/sctp/primitive.c | 4 +- + net/sctp/probe.c | 2 +- + net/sctp/protocol.c | 8 +- + net/sctp/sm_make_chunk.c | 198 +- + net/sctp/sm_sideeffect.c | 48 +- + net/sctp/sm_statefuns.c | 381 +- + net/sctp/sm_statetable.c | 23 +- + net/sctp/socket.c | 4 +- + net/sctp/sysctl.c | 2 +- + net/sctp/transport.c | 2 +- + net/sctp/ulpevent.c | 10 +- + net/smc/Kconfig | 4 - + net/smc/af_smc.c | 64 +- + net/smc/smc_clc.c | 12 +- + net/smc/smc_core.c | 388 +- + net/smc/smc_core.h | 31 +- + net/smc/smc_ib.c | 128 +- + net/smc/smc_ib.h | 19 +- + net/smc/smc_rx.c | 3 + + net/smc/smc_tx.c | 9 +- + net/smc/smc_wr.c | 63 + + net/smc/smc_wr.h | 1 + + net/socket.c | 33 +- + net/strparser/strparser.c | 313 +- + net/switchdev/switchdev.c | 519 --- + net/unix/af_unix.c | 24 +- + net/x25/af_x25.c | 2 +- + net/xfrm/xfrm_device.c | 4 +- + net/xfrm/xfrm_policy.c | 418 +- + net/xfrm/xfrm_state.c | 5 +- + net/xfrm/xfrm_user.c | 3 - + samples/bpf/Makefile | 12 + + samples/bpf/syscall_tp_kern.c | 62 + + samples/bpf/syscall_tp_user.c | 71 + + samples/bpf/xdp_redirect_kern.c | 81 + + samples/bpf/xdp_redirect_map_kern.c | 83 + + samples/bpf/xdp_redirect_map_user.c | 137 + + samples/bpf/xdp_redirect_user.c | 134 + + security/selinux/include/xfrm.h | 4 +- + tools/hv/bondvf.sh | 232 -- + tools/include/uapi/linux/bpf.h | 9 +- + tools/lib/bpf/Makefile | 4 + + tools/testing/selftests/bpf/Makefile | 4 +- + tools/testing/selftests/bpf/bpf_helpers.h | 2 + + tools/testing/selftests/bpf/test_align.c | 462 ++- + tools/testing/selftests/bpf/test_maps.c | 17 + + tools/testing/selftests/bpf/test_verifier.c | 822 ++-- + tools/testing/selftests/bpf/test_xdp_redirect.c | 28 + + tools/testing/selftests/bpf/test_xdp_redirect.sh | 54 + + tools/testing/selftests/net/.gitignore | 1 + + tools/testing/selftests/net/Makefile | 2 +- + tools/testing/selftests/net/msg_zerocopy.c | 697 ++++ + tools/testing/selftests/net/msg_zerocopy.sh | 112 + + 827 files changed, 47273 insertions(+), 18706 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/anarion-gmac.txt + create mode 100644 Documentation/devicetree/bindings/net/xilinx_axienet.txt + create mode 100644 Documentation/networking/batman-adv.rst + delete mode 100644 Documentation/networking/batman-adv.txt + create mode 100644 Documentation/networking/netvsc.txt + create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c + create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.h + create mode 100644 drivers/net/ethernet/hisilicon/hns3/Makefile + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hnae3.c + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hnae3.h + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.h + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.h + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_ethtool.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.h + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-anarion.c + create mode 100644 drivers/net/phy/mdio-i2c.c + create mode 100644 drivers/net/phy/mdio-i2c.h + create mode 100644 drivers/net/phy/phylink.c + create mode 100644 drivers/net/phy/sfp-bus.c + create mode 100644 drivers/net/phy/sfp.c + create mode 100644 drivers/net/phy/sfp.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/alive.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/binding.h + rename drivers/net/wireless/intel/iwlwifi/fw/{api.h => api/cmdhdr.h} (82%) + rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-coex.h => fw/api/coex.h} (96%) + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/commands.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/config.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/context.h + rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-d3.h => fw/api/d3.h} (98%) + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/datapath.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/debug.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/filter.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/mac-cfg.h + rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-mac.h => fw/api/mac.h} (93%) + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/offload.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/paging.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/phy-ctxt.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/phy.h + rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-power.h => fw/api/power.h} (98%) + rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-rs.h => fw/api/rs.h} (97%) + rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-rx.h => fw/api/rx.h} (95%) + rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-scan.h => fw/api/scan.h} (98%) + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/sf.h + rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-sta.h => fw/api/sta.h} (98%) + rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-stats.h => fw/api/stats.h} (97%) + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/tdls.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/time-event.h + rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-tof.h => fw/api/tof.h} (98%) + rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-tx.h => fw/api/tx.h} (98%) + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/txq.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/common_rx.c + rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-dbg.c => fw/dbg.c} (69%) + rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-dbg.h => fw/dbg.h} (59%) + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/init.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/paging.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/runtime.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/smem.c + create mode 100644 include/linux/phylink.h + create mode 100644 include/linux/platform_data/mdio-bcm-unimac.h + create mode 100644 include/linux/seg6_local.h + create mode 100644 include/linux/sfp.h + create mode 100644 include/linux/tnum.h + create mode 100644 include/net/fib_notifier.h + delete mode 100644 include/net/flowcache.h + rename include/{ => uapi}/linux/rxrpc.h (54%) + create mode 100644 include/uapi/linux/seg6_local.h + create mode 100644 kernel/bpf/devmap.c + create mode 100644 kernel/bpf/tnum.c + create mode 100644 net/core/fib_notifier.c + delete mode 100644 net/core/flow.c + create mode 100644 net/ipv6/fib6_notifier.c + create mode 100644 net/ipv6/seg6_local.c + rename include/rxrpc/packet.h => net/rxrpc/protocol.h (78%) + create mode 100644 samples/bpf/syscall_tp_kern.c + create mode 100644 samples/bpf/syscall_tp_user.c + create mode 100644 samples/bpf/xdp_redirect_kern.c + create mode 100644 samples/bpf/xdp_redirect_map_kern.c + create mode 100644 samples/bpf/xdp_redirect_map_user.c + create mode 100644 samples/bpf/xdp_redirect_user.c + delete mode 100755 tools/hv/bondvf.sh + create mode 100644 tools/testing/selftests/bpf/test_xdp_redirect.c + create mode 100755 tools/testing/selftests/bpf/test_xdp_redirect.sh + create mode 100644 tools/testing/selftests/net/msg_zerocopy.c + create mode 100755 tools/testing/selftests/net/msg_zerocopy.sh +Merging ipsec-next/master (f70f250a7731 net: Allow IPsec GSO for local sockets) +$ git merge ipsec-next/master +Auto-merging net/xfrm/xfrm_state.c +Auto-merging net/ipv6/esp6_offload.c +Auto-merging net/ipv6/esp6.c +Auto-merging net/ipv4/esp4_offload.c +Auto-merging net/ipv4/esp4.c +Auto-merging net/core/sock.c +Merge made by the 'recursive' strategy. + include/net/xfrm.h | 23 ++++++++++++++++++++++- + net/core/sock.c | 2 +- + net/ipv4/esp4.c | 14 +++++++++++--- + net/ipv4/esp4_offload.c | 5 ++++- + net/ipv6/esp6.c | 16 +++++++++++++--- + net/ipv6/esp6_offload.c | 5 ++++- + net/ipv6/xfrm6_input.c | 4 +++- + net/xfrm/xfrm_device.c | 2 +- + net/xfrm/xfrm_input.c | 2 ++ + net/xfrm/xfrm_state.c | 16 ++++++++++++---- + net/xfrm/xfrm_user.c | 2 +- + 11 files changed, 74 insertions(+), 17 deletions(-) +Merging netfilter-next/master (549d2d41c1a4 netfilter: constify nf_loginfo structures) +$ git merge netfilter-next/master +Auto-merging net/netfilter/xt_TPROXY.c +Auto-merging net/ipv4/netfilter/ipt_CLUSTERIP.c +Auto-merging net/ipv4/netfilter/ip_tables.c +Auto-merging net/ipv4/netfilter/arp_tables.c +Auto-merging lib/nlattr.c +Auto-merging include/net/netlink.h +Auto-merging drivers/net/ipvlan/ipvlan_main.c +Merge made by the 'recursive' strategy. + Documentation/networking/nf_conntrack-sysctl.txt | 11 -- + drivers/net/ipvlan/ipvlan_main.c | 2 +- + include/net/netfilter/nf_conntrack.h | 3 + + include/net/netfilter/nf_conntrack_expect.h | 5 + + include/net/netfilter/nf_conntrack_l3proto.h | 15 --- + include/net/netfilter/nf_conntrack_l4proto.h | 14 +-- + include/net/netfilter/nf_conntrack_timeout.h | 2 +- + include/net/netfilter/nf_tables.h | 10 +- + include/net/netfilter/nf_tables_core.h | 2 + + include/net/netlink.h | 1 + + include/uapi/linux/netfilter/nf_tables.h | 11 +- + lib/nlattr.c | 24 +++++ + net/bridge/br_netfilter_hooks.c | 2 +- + net/bridge/netfilter/ebtable_filter.c | 2 +- + net/bridge/netfilter/ebtable_nat.c | 2 +- + net/decnet/netfilter/dn_rtmsg.c | 2 +- + net/ipv4/netfilter/arp_tables.c | 2 - + net/ipv4/netfilter/ip_tables.c | 4 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 2 +- + net/ipv4/netfilter/ipt_SYNPROXY.c | 2 +- + net/ipv4/netfilter/iptable_nat.c | 2 +- + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 18 +--- + net/ipv4/netfilter/nf_defrag_ipv4.c | 2 +- + net/ipv4/netfilter/nf_log_arp.c | 2 +- + net/ipv4/netfilter/nf_log_ipv4.c | 2 +- + net/ipv4/netfilter/nft_fib_ipv4.c | 20 +++- + net/ipv6/ila/ila_xlat.c | 2 +- + net/ipv6/netfilter/ip6_tables.c | 2 +- + net/ipv6/netfilter/ip6t_SYNPROXY.c | 2 +- + net/ipv6/netfilter/ip6table_nat.c | 2 +- + net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 19 +--- + net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 2 +- + net/ipv6/netfilter/nf_log_ipv6.c | 2 +- + net/ipv6/netfilter/nft_fib_ipv6.c | 29 +++-- + net/netfilter/Kconfig | 9 ++ + net/netfilter/Makefile | 1 + + net/netfilter/ipvs/ip_vs_core.c | 10 +- + net/netfilter/ipvs/ip_vs_ctl.c | 3 - + net/netfilter/ipvs/ip_vs_ftp.c | 2 - + net/netfilter/ipvs/ip_vs_proto_sctp.c | 11 +- + net/netfilter/ipvs/ip_vs_proto_tcp.c | 10 +- + net/netfilter/ipvs/ip_vs_proto_udp.c | 10 +- + net/netfilter/ipvs/ip_vs_xmit.c | 46 +------- + net/netfilter/nf_conntrack_broadcast.c | 2 - + net/netfilter/nf_conntrack_core.c | 32 +++--- + net/netfilter/nf_conntrack_expect.c | 66 ++++++++++-- + net/netfilter/nf_conntrack_helper.c | 34 +++--- + net/netfilter/nf_conntrack_netlink.c | 81 +++++--------- + net/netfilter/nf_conntrack_pptp.c | 2 - + net/netfilter/nf_conntrack_proto.c | 53 +++------- + net/netfilter/nf_conntrack_sip.c | 6 +- + net/netfilter/nf_conntrack_standalone.c | 10 -- + net/netfilter/nf_queue.c | 1 + + net/netfilter/nf_tables_api.c | 128 ++++++++++++++++------- + net/netfilter/nf_tables_core.c | 28 +++-- + net/netfilter/nf_tables_trace.c | 42 ++++++-- + net/netfilter/nfnetlink_cttimeout.c | 8 +- + net/netfilter/nfnetlink_log.c | 2 +- + net/netfilter/nfnetlink_queue.c | 21 +++- + net/netfilter/nft_fib_netdev.c | 87 +++++++++++++++ + net/netfilter/nft_set_rbtree.c | 49 ++++++--- + net/netfilter/xt_TCPMSS.c | 2 - + net/netfilter/xt_TPROXY.c | 4 - + net/netfilter/xt_addrtype.c | 3 - + net/netfilter/xt_connlimit.c | 3 - + net/netfilter/xt_hashlimit.c | 8 +- + net/netfilter/xt_osf.c | 2 - + security/selinux/hooks.c | 2 +- + security/smack/smack_netfilter.c | 2 +- + 69 files changed, 566 insertions(+), 438 deletions(-) + create mode 100644 net/netfilter/nft_fib_netdev.c +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 (2db3aaba0a9f rt2x00: Fix MMIC Countermeasures) +$ git merge wireless-drivers-next/master +Merge made by the 'recursive' strategy. + drivers/bcma/Kconfig | 9 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 1 + + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 18 ++- + .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 2 + + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 4 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 9 +- + .../broadcom/brcm80211/include/brcm_hw_ids.h | 3 + + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 27 ++-- + drivers/net/wireless/marvell/mwifiex/join.c | 2 +- + drivers/net/wireless/marvell/mwifiex/main.c | 40 ++++-- + drivers/net/wireless/marvell/mwifiex/main.h | 4 + + drivers/net/wireless/ralink/rt2x00/rt2800mmio.c | 13 +- + drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 15 ++- + drivers/net/wireless/realtek/rtlwifi/rc.c | 2 +- + drivers/net/wireless/rsi/Makefile | 1 + + drivers/net/wireless/rsi/rsi_91x_hal.c | 7 + + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 71 +++++++++- + drivers/net/wireless/rsi/rsi_91x_main.c | 2 + + drivers/net/wireless/rsi/rsi_91x_mgmt.c | 105 ++++++++++++++- + drivers/net/wireless/rsi/rsi_91x_ps.c | 146 +++++++++++++++++++++ + drivers/net/wireless/rsi/rsi_91x_sdio.c | 2 +- + drivers/net/wireless/rsi/rsi_91x_sdio_ops.c | 40 +++--- + drivers/net/wireless/rsi/rsi_main.h | 11 +- + drivers/net/wireless/rsi/rsi_mgmt.h | 52 ++++++++ + drivers/net/wireless/rsi/rsi_ps.h | 64 +++++++++ + drivers/net/wireless/rsi/rsi_sdio.h | 3 +- + drivers/net/wireless/ti/wlcore/sysfs.c | 2 +- + include/linux/mmc/sdio_ids.h | 1 + + 28 files changed, 573 insertions(+), 83 deletions(-) + create mode 100644 drivers/net/wireless/rsi/rsi_91x_ps.c + create mode 100644 drivers/net/wireless/rsi/rsi_ps.h +Merging bluetooth/master (198ec9ae0529 Bluetooth: document config options) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/bluecard_cs.c | 58 +++++++++++++++++++---------------------- + drivers/bluetooth/btusb.c | 1 + + net/bluetooth/Kconfig | 12 +++++++++ + 3 files changed, 40 insertions(+), 31 deletions(-) +Merging mac80211-next/master (3dc02251f43f Merge branch 'skb-accessor-cleanups') +$ git merge mac80211-next/master +Already up-to-date. +Merging rdma/for-next (913cc67159bc IB/hfi1: Always perform offline transition) +$ git merge rdma/for-next +Resolved 'drivers/net/ethernet/mellanox/mlx5/core/main.c' using previous resolution. +Auto-merging include/linux/mlx5/qp.h +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging include/linux/mlx5/driver.h +Auto-merging include/linux/mlx4/device.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/sriov.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eq.c +Auto-merging drivers/net/ethernet/mellanox/mlx4/main.c +Auto-merging drivers/net/ethernet/mellanox/mlx4/en_rx.c +Auto-merging drivers/net/ethernet/mellanox/mlx4/en_netdev.c +Auto-merging drivers/net/ethernet/mellanox/mlx4/en_cq.c +Auto-merging drivers/infiniband/ulp/ipoib/ipoib_main.c +Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v1.c +Auto-merging drivers/infiniband/core/verbs.c +Auto-merging drivers/infiniband/core/uverbs_cmd.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6529914e3e84] Merge remote-tracking branch 'rdma/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/infiniband/core/cma.c | 22 +- + drivers/infiniband/core/roce_gid_mgmt.c | 2 + + drivers/infiniband/core/uverbs_cmd.c | 17 +- + drivers/infiniband/core/verbs.c | 117 ++- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 88 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.h | 3 - + drivers/infiniband/hw/bnxt_re/main.c | 58 +- + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 465 +++++++-- + drivers/infiniband/hw/bnxt_re/qplib_fp.h | 25 +- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 26 +- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.h | 10 +- + drivers/infiniband/hw/bnxt_re/qplib_res.c | 10 + + drivers/infiniband/hw/bnxt_re/qplib_res.h | 2 + + drivers/infiniband/hw/bnxt_re/qplib_sp.c | 77 +- + drivers/infiniband/hw/bnxt_re/qplib_sp.h | 2 + + drivers/infiniband/hw/bnxt_re/roce_hsi.h | 4 +- + drivers/infiniband/hw/cxgb3/iwch.c | 1 - + drivers/infiniband/hw/cxgb4/device.c | 1 - + drivers/infiniband/hw/hfi1/Makefile | 2 +- + drivers/infiniband/hw/hfi1/affinity.c | 18 +- + drivers/infiniband/hw/hfi1/affinity.h | 14 +- + drivers/infiniband/hw/hfi1/aspm.h | 6 +- + drivers/infiniband/hw/hfi1/chip.c | 660 +++++++------ + drivers/infiniband/hw/hfi1/chip.h | 24 +- + drivers/infiniband/hw/hfi1/common.h | 1 + + drivers/infiniband/hw/hfi1/driver.c | 191 ++-- + drivers/infiniband/hw/hfi1/eprom.c | 11 +- + drivers/infiniband/hw/hfi1/exp_rcv.c | 114 +++ + drivers/infiniband/hw/hfi1/exp_rcv.h | 190 ++++ + drivers/infiniband/hw/hfi1/file_ops.c | 152 +-- + drivers/infiniband/hw/hfi1/firmware.c | 16 + + drivers/infiniband/hw/hfi1/hfi.h | 156 ++- + drivers/infiniband/hw/hfi1/init.c | 111 ++- + drivers/infiniband/hw/hfi1/intr.c | 3 +- + drivers/infiniband/hw/hfi1/iowait.h | 70 +- + drivers/infiniband/hw/hfi1/mad.c | 690 +++++++++---- + drivers/infiniband/hw/hfi1/mad.h | 5 +- + drivers/infiniband/hw/hfi1/mmu_rb.c | 14 +- + drivers/infiniband/hw/hfi1/mmu_rb.h | 5 +- + drivers/infiniband/hw/hfi1/pcie.c | 384 +++++--- + drivers/infiniband/hw/hfi1/pio.c | 15 +- + drivers/infiniband/hw/hfi1/platform.c | 44 +- + drivers/infiniband/hw/hfi1/qp.c | 21 +- + drivers/infiniband/hw/hfi1/rc.c | 42 +- + drivers/infiniband/hw/hfi1/ruc.c | 100 +- + drivers/infiniband/hw/hfi1/sdma.c | 42 +- + drivers/infiniband/hw/hfi1/sdma.h | 3 +- + drivers/infiniband/hw/hfi1/trace.c | 58 +- + drivers/infiniband/hw/hfi1/trace_ibhdrs.h | 322 ++++-- + drivers/infiniband/hw/hfi1/trace_misc.h | 20 + + drivers/infiniband/hw/hfi1/trace_rx.h | 92 +- + drivers/infiniband/hw/hfi1/uc.c | 18 +- + drivers/infiniband/hw/hfi1/ud.c | 64 +- + drivers/infiniband/hw/hfi1/user_exp_rcv.c | 128 +-- + drivers/infiniband/hw/hfi1/user_exp_rcv.h | 26 +- + drivers/infiniband/hw/hfi1/user_sdma.c | 230 ++--- + drivers/infiniband/hw/hfi1/user_sdma.h | 6 +- + drivers/infiniband/hw/hfi1/verbs.c | 117 ++- + drivers/infiniband/hw/hfi1/verbs.h | 11 +- + drivers/infiniband/hw/hfi1/vnic.h | 1 + + drivers/infiniband/hw/hfi1/vnic_main.c | 17 +- + drivers/infiniband/hw/hfi1/vnic_sdma.c | 14 +- + drivers/infiniband/hw/hns/Kconfig | 2 +- + drivers/infiniband/hw/hns/hns_roce_alloc.c | 1 + + drivers/infiniband/hw/hns/hns_roce_device.h | 1 + + drivers/infiniband/hw/hns/hns_roce_eq.c | 3 +- + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 3 +- + drivers/infiniband/hw/hns/hns_roce_mr.c | 1 + + drivers/infiniband/hw/hns/hns_roce_qp.c | 2 +- + drivers/infiniband/hw/i40iw/i40iw_main.c | 1 - + drivers/infiniband/hw/mlx4/cq.c | 2 + + drivers/infiniband/hw/mlx4/main.c | 49 +- + drivers/infiniband/hw/mlx4/mlx4_ib.h | 42 +- + drivers/infiniband/hw/mlx4/qp.c | 1031 ++++++++++++++++++-- + drivers/infiniband/hw/mlx5/Makefile | 2 +- + drivers/infiniband/hw/mlx5/cmd.c | 20 + + drivers/infiniband/hw/mlx5/cmd.h | 4 + + drivers/infiniband/hw/mlx5/cong.c | 421 ++++++++ + drivers/infiniband/hw/mlx5/ib_virt.c | 9 + + drivers/infiniband/hw/mlx5/main.c | 328 ++++++- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 79 +- + drivers/infiniband/hw/mlx5/mr.c | 18 +- + drivers/infiniband/hw/mlx5/qp.c | 122 ++- + drivers/infiniband/hw/mthca/mthca_main.c | 1 - + drivers/infiniband/hw/nes/nes.c | 1 - + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 1 - + drivers/infiniband/hw/qedr/main.c | 2 +- + drivers/infiniband/hw/qedr/qedr.h | 3 +- + drivers/infiniband/hw/qedr/verbs.c | 3 + + drivers/infiniband/hw/qib/qib.h | 8 +- + drivers/infiniband/hw/qib/qib_driver.c | 1 - + drivers/infiniband/hw/qib/qib_iba6120.c | 6 +- + drivers/infiniband/hw/qib/qib_iba7220.c | 7 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 48 +- + drivers/infiniband/hw/qib/qib_mad.c | 15 +- + drivers/infiniband/hw/qib/qib_pcie.c | 149 ++- + drivers/infiniband/hw/qib/qib_ruc.c | 26 +- + drivers/infiniband/hw/qib/qib_ud.c | 43 +- + drivers/infiniband/hw/qib/qib_verbs.h | 4 +- + drivers/infiniband/hw/usnic/usnic_ib_main.c | 2 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 41 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.h | 1 + + drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 1 - + drivers/infiniband/sw/rdmavt/mr.c | 49 +- + drivers/infiniband/sw/rdmavt/qp.c | 54 +- + drivers/infiniband/sw/rdmavt/trace_mr.h | 62 ++ + drivers/infiniband/sw/rdmavt/trace_tx.h | 11 +- + drivers/infiniband/sw/rdmavt/vt.c | 9 +- + drivers/infiniband/sw/rxe/rxe.c | 1 - + drivers/infiniband/sw/rxe/rxe.h | 2 +- + drivers/infiniband/sw/rxe/rxe_loc.h | 2 +- + drivers/infiniband/sw/rxe/rxe_mmap.c | 2 +- + drivers/infiniband/sw/rxe/rxe_pool.c | 2 +- + drivers/infiniband/sw/rxe/rxe_req.c | 2 +- + drivers/infiniband/sw/rxe/rxe_task.c | 4 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 65 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 1 - + drivers/infiniband/ulp/iser/iscsi_iser.c | 1 - + drivers/infiniband/ulp/isert/ib_isert.c | 1 - + drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c | 28 +- + drivers/infiniband/ulp/srp/ib_srp.c | 1 - + drivers/net/ethernet/mellanox/mlx4/cq.c | 7 +- + drivers/net/ethernet/mellanox/mlx4/en_cq.c | 1 + + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 3 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 6 +- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 3 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 7 +- + drivers/net/ethernet/mellanox/mlx4/qp.c | 5 +- + .../net/ethernet/mellanox/mlx5/core/en_selftest.c | 13 + + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 23 + + drivers/net/ethernet/mellanox/mlx5/core/fw.c | 6 + + drivers/net/ethernet/mellanox/mlx5/core/main.c | 19 + + drivers/net/ethernet/mellanox/mlx5/core/qp.c | 14 + + drivers/net/ethernet/mellanox/mlx5/core/sriov.c | 42 + + drivers/net/ethernet/mellanox/mlx5/core/vport.c | 62 ++ + include/linux/mlx4/device.h | 12 +- + include/linux/mlx5/device.h | 11 +- + include/linux/mlx5/driver.h | 18 +- + include/linux/mlx5/mlx5_ifc.h | 88 +- + include/linux/mlx5/qp.h | 3 + + include/linux/mlx5/vport.h | 3 +- + include/rdma/ib_addr.h | 8 +- + include/rdma/ib_hdrs.h | 84 ++ + include/rdma/ib_verbs.h | 13 +- + include/rdma/rdma_vt.h | 21 +- + include/rdma/rdmavt_qp.h | 2 +- + include/uapi/rdma/ib_user_verbs.h | 2 +- + include/uapi/rdma/mlx4-abi.h | 54 +- + include/uapi/rdma/qedr-abi.h | 3 + + 149 files changed, 6205 insertions(+), 2287 deletions(-) + create mode 100644 drivers/infiniband/hw/hfi1/exp_rcv.c + create mode 100644 drivers/infiniband/hw/hfi1/exp_rcv.h + create mode 100644 drivers/infiniband/hw/mlx5/cong.c +Merging gfs2/for-next (df7929266fe7 gfs2: forcibly flush ail to relieve memory pressure) +$ git merge gfs2/for-next +Auto-merging fs/gfs2/file.c +Auto-merging fs/gfs2/dir.c +Merge made by the 'recursive' strategy. + fs/gfs2/acl.c | 27 +++++------ + fs/gfs2/aops.c | 14 +++++- + fs/gfs2/bmap.c | 5 +- + fs/gfs2/dir.c | 4 +- + fs/gfs2/file.c | 3 +- + fs/gfs2/glock.c | 126 +++++++++++++++++++++++++++++++++++++++++---------- + fs/gfs2/glock.h | 36 +++++++++++++++ + fs/gfs2/glops.c | 30 +----------- + fs/gfs2/incore.h | 1 + + fs/gfs2/inode.c | 17 ++++--- + fs/gfs2/log.c | 4 ++ + fs/gfs2/meta_io.c | 9 ++-- + fs/gfs2/ops_fstype.c | 1 - + fs/gfs2/quota.c | 2 +- + fs/gfs2/rgrp.c | 1 - + fs/gfs2/super.c | 59 ++++++++++++++++++++++-- + 16 files changed, 251 insertions(+), 88 deletions(-) +Merging mtd/master (33983675fbd5 Merge tag 'nand/fixes-for-4.13-rc4' of git://git.infradead.org/l2-mtd into MTD) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (1fbef470f369 mtd: mtdswap: remove unused variables 'dev' and 'gd') +$ git merge l2-mtd/master +Merge made by the 'recursive' strategy. + drivers/mtd/devices/docg3.c | 49 ++++++++++++++++----------------------------- + drivers/mtd/devices/docg3.h | 2 -- + drivers/mtd/mtdcore.c | 16 +++++++++++++++ + drivers/mtd/mtdswap.c | 21 ++++--------------- + drivers/mtd/nand/nandsim.c | 48 +++++++++++--------------------------------- + include/linux/mtd/mtd.h | 10 +++++++++ + 6 files changed, 59 insertions(+), 87 deletions(-) +Merging nand/nand/next (bd02f8e5a08c mtd: nand: mxc: Fix mxc_v1 ooblayout) +$ git merge nand/nand/next +Auto-merging include/linux/mtd/nand.h +Auto-merging drivers/mtd/nand/sunxi_nand.c +Auto-merging drivers/mtd/nand/nand_base.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/qcom_nandc.txt | 2 - + drivers/mtd/devices/st_spi_fsm.c | 20 +- + drivers/mtd/nand/Kconfig | 2 +- + drivers/mtd/nand/denali_dt.c | 4 +- + drivers/mtd/nand/lpc32xx_mlc.c | 9 +- + drivers/mtd/nand/lpc32xx_slc.c | 9 +- + drivers/mtd/nand/mxc_nand.c | 7 +- + drivers/mtd/nand/nand_base.c | 287 ++++----------------- + drivers/mtd/nand/orion_nand.c | 7 + + drivers/mtd/nand/oxnas_nand.c | 25 +- + drivers/mtd/nand/qcom_nandc.c | 163 ++++++++---- + drivers/mtd/nand/sunxi_nand.c | 2 +- + drivers/mtd/nand/vf610_nfc.c | 9 +- + include/linux/mtd/nand.h | 20 +- + 14 files changed, 227 insertions(+), 339 deletions(-) +Merging spi-nor/spi-nor/next (eb353aaa7c55 mtd: mtk-quadspi: Remove unneeded pinctrl header) +$ git merge spi-nor/spi-nor/next +Merge made by the 'recursive' strategy. + drivers/mtd/spi-nor/Kconfig | 16 + + drivers/mtd/spi-nor/Makefile | 1 + + drivers/mtd/spi-nor/atmel-quadspi.c | 1 - + drivers/mtd/spi-nor/intel-spi-pci.c | 82 ++++ + drivers/mtd/spi-nor/mtk-quadspi.c | 1 - + drivers/mtd/spi-nor/spi-nor.c | 804 +++++++++++++++++++++++++++++++++++- + include/linux/mtd/spi-nor.h | 11 + + 7 files changed, 893 insertions(+), 23 deletions(-) + create mode 100644 drivers/mtd/spi-nor/intel-spi-pci.c +Merging crypto/master (2d97591ef43d crypto: af_alg - consolidation of duplicate code) +$ git merge crypto/master +Removing drivers/crypto/ccp/ccp-platform.c +Removing drivers/crypto/ccp/ccp-pci.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/crypto/atmel-crypto.txt | 13 + + .../devicetree/bindings/crypto/st,stm32-hash.txt | 30 + + Documentation/devicetree/bindings/rng/imx-rngc.txt | 21 + + MAINTAINERS | 6 + + arch/arm/crypto/Kconfig | 5 +- + arch/arm/crypto/aes-ce-glue.c | 4 +- + arch/arm/crypto/aes-cipher-core.S | 88 +- + arch/arm/crypto/aes-neonbs-glue.c | 5 +- + arch/arm/crypto/ghash-ce-core.S | 234 ++- + arch/arm/crypto/ghash-ce-glue.c | 24 +- + arch/arm64/crypto/Kconfig | 22 +- + arch/arm64/crypto/aes-ce-ccm-core.S | 30 +- + arch/arm64/crypto/aes-ce-ccm-glue.c | 174 ++- + arch/arm64/crypto/aes-ce-cipher.c | 55 +- + arch/arm64/crypto/aes-ce.S | 12 +- + arch/arm64/crypto/aes-cipher-core.S | 152 +- + arch/arm64/crypto/aes-ctr-fallback.h | 53 + + arch/arm64/crypto/aes-glue.c | 63 +- + arch/arm64/crypto/aes-neonbs-glue.c | 53 +- + arch/arm64/crypto/chacha20-neon-glue.c | 5 +- + arch/arm64/crypto/crc32-ce-glue.c | 11 +- + arch/arm64/crypto/crct10dif-ce-glue.c | 13 +- + arch/arm64/crypto/ghash-ce-core.S | 401 ++++- + arch/arm64/crypto/ghash-ce-glue.c | 517 ++++++- + arch/arm64/crypto/sha1-ce-glue.c | 18 +- + arch/arm64/crypto/sha2-ce-glue.c | 30 +- + arch/arm64/crypto/sha256-glue.c | 1 + + arch/sparc/crypto/aes_glue.c | 3 +- + arch/x86/crypto/aesni-intel_glue.c | 4 +- + arch/x86/crypto/blowfish_glue.c | 3 +- + arch/x86/crypto/cast5_avx_glue.c | 3 +- + arch/x86/crypto/des3_ede_glue.c | 3 +- + crypto/Kconfig | 2 + + crypto/af_alg.c | 693 +++++++++ + crypto/algapi.c | 25 +- + crypto/algif_aead.c | 864 ++++------- + crypto/algif_skcipher.c | 829 ++--------- + crypto/ctr.c | 3 +- + crypto/ecdh.c | 51 +- + crypto/pcbc.c | 12 +- + crypto/rng.c | 6 +- + crypto/scompress.c | 55 +- + crypto/serpent_generic.c | 77 +- + crypto/tcrypt.c | 8 +- + drivers/char/hw_random/Kconfig | 20 +- + drivers/char/hw_random/Makefile | 1 + + drivers/char/hw_random/core.c | 42 +- + drivers/char/hw_random/imx-rngc.c | 331 ++++ + drivers/crypto/Kconfig | 28 +- + drivers/crypto/Makefile | 3 +- + drivers/crypto/atmel-ecc.c | 781 ++++++++++ + drivers/crypto/atmel-ecc.h | 128 ++ + drivers/crypto/atmel-sha.c | 2 +- + drivers/crypto/atmel-tdes.c | 2 +- + drivers/crypto/bcm/cipher.c | 114 +- + drivers/crypto/bcm/cipher.h | 13 +- + drivers/crypto/caam/caamalg.c | 66 +- + drivers/crypto/caam/caamalg_desc.c | 5 +- + drivers/crypto/caam/caamalg_qi.c | 55 +- + drivers/crypto/caam/caamhash.c | 7 +- + drivers/crypto/caam/caamrng.c | 6 +- + drivers/crypto/caam/ctrl.c | 127 +- + drivers/crypto/caam/ctrl.h | 2 + + drivers/crypto/caam/error.c | 40 + + drivers/crypto/caam/error.h | 4 + + drivers/crypto/caam/intern.h | 11 - + drivers/crypto/caam/jr.c | 7 +- + drivers/crypto/caam/qi.c | 30 +- + drivers/crypto/caam/qi.h | 3 + + drivers/crypto/caam/regs.h | 1 + + drivers/crypto/caam/sg_sw_qm2.h | 81 + + drivers/crypto/caam/sg_sw_sec4.h | 43 +- + drivers/crypto/ccp/Kconfig | 22 +- + drivers/crypto/ccp/Makefile | 7 +- + drivers/crypto/ccp/ccp-crypto-aes-galois.c | 2 +- + drivers/crypto/ccp/ccp-crypto-aes-xts.c | 96 +- + drivers/crypto/ccp/ccp-crypto-des3.c | 2 +- + drivers/crypto/ccp/ccp-crypto-main.c | 21 +- + drivers/crypto/ccp/ccp-crypto-rsa.c | 299 ++++ + drivers/crypto/ccp/ccp-crypto-sha.c | 2 +- + drivers/crypto/ccp/ccp-crypto.h | 36 +- + drivers/crypto/ccp/ccp-debugfs.c | 15 +- + drivers/crypto/ccp/ccp-dev-v3.c | 20 +- + drivers/crypto/ccp/ccp-dev-v5.c | 28 +- + drivers/crypto/ccp/ccp-dev.c | 134 +- + drivers/crypto/ccp/ccp-dev.h | 30 +- + drivers/crypto/ccp/ccp-dmaengine.c | 2 +- + drivers/crypto/ccp/ccp-ops.c | 131 +- + drivers/crypto/ccp/ccp-pci.c | 356 ----- + drivers/crypto/ccp/ccp-platform.c | 293 ---- + drivers/crypto/ccp/sp-dev.c | 277 ++++ + drivers/crypto/ccp/sp-dev.h | 133 ++ + drivers/crypto/ccp/sp-pci.c | 276 ++++ + drivers/crypto/ccp/sp-platform.c | 256 ++++ + drivers/crypto/geode-aes.c | 17 +- + drivers/crypto/img-hash.c | 2 +- + drivers/crypto/mediatek/mtk-platform.c | 2 +- + drivers/crypto/mxc-scc.c | 4 +- + drivers/crypto/mxs-dcp.c | 8 +- + drivers/crypto/n2_core.c | 60 +- + drivers/crypto/omap-aes.c | 1 + + drivers/crypto/omap-des.c | 3 +- + drivers/crypto/omap-sham.c | 2 +- + drivers/crypto/qat/qat_common/adf_aer.c | 2 +- + drivers/crypto/rockchip/rk3288_crypto.c | 58 +- + drivers/crypto/rockchip/rk3288_crypto.h | 4 +- + drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c | 17 +- + drivers/crypto/rockchip/rk3288_crypto_ahash.c | 16 +- + drivers/crypto/sahara.c | 2 +- + drivers/crypto/stm32/Kconfig | 19 +- + drivers/crypto/stm32/Makefile | 4 +- + drivers/crypto/stm32/stm32-hash.c | 1575 ++++++++++++++++++++ + drivers/crypto/stm32/stm32_crc32.c | 17 +- + drivers/crypto/sunxi-ss/Makefile | 1 + + drivers/crypto/sunxi-ss/sun4i-ss-core.c | 30 + + drivers/crypto/sunxi-ss/sun4i-ss-prng.c | 56 + + drivers/crypto/sunxi-ss/sun4i-ss.h | 11 + + drivers/crypto/virtio/virtio_crypto_algs.c | 109 +- + drivers/crypto/virtio/virtio_crypto_common.h | 22 +- + drivers/crypto/virtio/virtio_crypto_core.c | 37 +- + drivers/crypto/vmx/aes_ctr.c | 3 +- + drivers/md/dm-crypt.c | 11 +- + include/crypto/algapi.h | 23 +- + include/crypto/if_alg.h | 170 +++ + include/crypto/internal/akcipher.h | 6 + + include/crypto/kpp.h | 10 + + include/linux/ccp.h | 11 +- + 127 files changed, 8350 insertions(+), 3035 deletions(-) + create mode 100644 Documentation/devicetree/bindings/crypto/st,stm32-hash.txt + create mode 100644 Documentation/devicetree/bindings/rng/imx-rngc.txt + create mode 100644 arch/arm64/crypto/aes-ctr-fallback.h + create mode 100644 drivers/char/hw_random/imx-rngc.c + create mode 100644 drivers/crypto/atmel-ecc.c + create mode 100644 drivers/crypto/atmel-ecc.h + create mode 100644 drivers/crypto/caam/sg_sw_qm2.h + create mode 100644 drivers/crypto/ccp/ccp-crypto-rsa.c + delete mode 100644 drivers/crypto/ccp/ccp-pci.c + delete mode 100644 drivers/crypto/ccp/ccp-platform.c + create mode 100644 drivers/crypto/ccp/sp-dev.c + create mode 100644 drivers/crypto/ccp/sp-dev.h + create mode 100644 drivers/crypto/ccp/sp-pci.c + create mode 100644 drivers/crypto/ccp/sp-platform.c + create mode 100644 drivers/crypto/stm32/stm32-hash.c + create mode 100644 drivers/crypto/sunxi-ss/sun4i-ss-prng.c +Merging drm/drm-next (09ef2378dc42 Merge tag 'drm-misc-next-2017-08-08' of git://anongit.freedesktop.org/git/drm-misc into drm-next) +$ git merge drm/drm-next +Resolved 'drivers/gpu/drm/i915/intel_pm.c' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/nouveau/nv50_display.c' +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +Auto-merging drivers/gpu/drm/rockchip/rockchip_drm_vop.h +Auto-merging drivers/gpu/drm/rockchip/rockchip_drm_vop.c +Auto-merging drivers/gpu/drm/rockchip/rockchip_drm_drv.c +Auto-merging drivers/gpu/drm/nouveau/nv50_display.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/nouveau/nv50_display.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_display.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_connector.c +Auto-merging drivers/gpu/drm/i915/selftests/mock_gem_device.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/intel_color.c +Auto-merging drivers/gpu/drm/i915/i915_perf.c +Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/gvt/scheduler.c +Auto-merging drivers/gpu/drm/exynos/exynos_hdmi.c +Auto-merging drivers/gpu/drm/exynos/exynos_drm_dsi.c +Auto-merging drivers/gpu/drm/exynos/exynos_drm_drv.c +Auto-merging drivers/gpu/drm/bridge/tc358767.c +Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +Auto-merging drivers/gpu/drm/amd/amdgpu/si.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c +Auto-merging arch/x86/kernel/early-quirks.c +Auto-merging MAINTAINERS +Auto-merging Documentation/gpu/drm-mm.rst +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/gpu/drm/nouveau/nv50_display.c'. +[master 7650571d875f] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/bridge/dw_mipi_dsi.txt | 32 + + .../devicetree/bindings/display/repaper.txt | 52 + + .../bindings/display/rockchip/dw_hdmi-rockchip.txt | 7 +- + .../bindings/display/rockchip/rockchip-vop.txt | 4 + + .../devicetree/bindings/display/st,stm32-ltdc.txt | 105 +- + .../devicetree/bindings/vendor-prefixes.txt | 1 + + Documentation/gpu/drm-internals.rst | 2 + + Documentation/gpu/drm-kms.rst | 59 +- + Documentation/gpu/drm-mm.rst | 2 +- + Documentation/gpu/drm-uapi.rst | 2 + + Documentation/gpu/todo.rst | 4 +- + MAINTAINERS | 6 + + arch/x86/kernel/early-quirks.c | 1 + + drivers/char/agp/ali-agp.c | 2 +- + drivers/char/agp/amd-k7-agp.c | 4 +- + drivers/char/agp/amd64-agp.c | 2 +- + drivers/char/agp/ati-agp.c | 2 +- + drivers/char/agp/efficeon-agp.c | 2 +- + drivers/char/agp/intel-agp.c | 2 +- + drivers/char/agp/nvidia-agp.c | 2 +- + drivers/char/agp/sis-agp.c | 2 +- + drivers/char/agp/uninorth-agp.c | 2 +- + drivers/dma-buf/dma-fence.c | 4 +- + drivers/dma-buf/sw_sync.c | 201 +-- + drivers/dma-buf/sync_debug.c | 19 +- + drivers/dma-buf/sync_debug.h | 26 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 122 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 161 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 92 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 181 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 25 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 79 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | 77 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 13 - + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 70 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 63 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 40 + + drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 52 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 368 ++++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vf_error.c | 85 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_vf_error.h | 62 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 289 +++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 10 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 9 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 60 + + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 162 +-- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 107 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 145 +-- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 109 +- + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 123 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 32 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 15 +- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 71 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 68 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 81 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 139 ++- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 108 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 46 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h | 4 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 1 + + drivers/gpu/drm/amd/amdgpu/mxgpu_vi.h | 4 +- + drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 15 +- + drivers/gpu/drm/amd/amdgpu/nbio_v6_1.h | 1 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 96 +- + drivers/gpu/drm/amd/amdgpu/psp_v10_0.h | 5 + + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 10 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 42 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 34 +- + drivers/gpu/drm/amd/amdgpu/si.c | 28 + + drivers/gpu/drm/amd/amdgpu/si_dpm.c | 1 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 66 +- + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 7 + + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 2 +- + drivers/gpu/drm/amd/include/atomfirmware.h | 63 + + drivers/gpu/drm/amd/include/cgs_common.h | 6 + + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c | 239 ++-- + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h | 8 + + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 9 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 264 +++- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h | 15 +- + .../gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c | 1291 ++++++++++++++++++++ + .../gpu/drm/amd/powerplay/hwmgr/vega10_powertune.h | 16 + + .../amd/powerplay/hwmgr/vega10_processpptables.c | 88 +- + .../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 5 + + drivers/gpu/drm/amd/powerplay/inc/pp_debug.h | 6 + + drivers/gpu/drm/amd/powerplay/inc/pp_soc15.h | 2 + + drivers/gpu/drm/amd/powerplay/inc/smu9.h | 13 +- + drivers/gpu/drm/amd/powerplay/inc/smu9_driver_if.h | 5 +- + drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 3 + + drivers/gpu/drm/amd/powerplay/inc/vega10_ppsmc.h | 4 + + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c | 19 + + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.h | 1 + + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 184 +-- + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.h | 11 - + .../gpu/drm/amd/powerplay/smumgr/polaris10_smc.c | 4 +- + .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 34 +- + .../drm/amd/powerplay/smumgr/polaris10_smumgr.h | 12 +- + drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 6 +- + drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h | 8 +- + drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 11 +- + .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 30 +- + drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h | 9 +- + drivers/gpu/drm/arc/arcpgu_crtc.c | 43 +- + drivers/gpu/drm/arc/arcpgu_drv.c | 59 +- + drivers/gpu/drm/arm/hdlcd_crtc.c | 11 +- + drivers/gpu/drm/arm/hdlcd_drv.c | 4 - + drivers/gpu/drm/arm/malidp_crtc.c | 10 +- + drivers/gpu/drm/arm/malidp_drv.c | 4 +- + drivers/gpu/drm/arm/malidp_planes.c | 3 +- + drivers/gpu/drm/armada/armada_crtc.c | 20 +- + drivers/gpu/drm/armada/armada_crtc.h | 2 - + drivers/gpu/drm/armada/armada_drv.c | 4 +- + drivers/gpu/drm/armada/armada_fbdev.c | 3 - + drivers/gpu/drm/armada/armada_overlay.c | 3 +- + drivers/gpu/drm/ast/ast_dp501.c | 25 +- + drivers/gpu/drm/ast/ast_drv.c | 5 +- + drivers/gpu/drm/ast/ast_drv.h | 4 +- + drivers/gpu/drm/ast/ast_fb.c | 21 - + drivers/gpu/drm/ast/ast_main.c | 3 +- + drivers/gpu/drm/ast/ast_mode.c | 42 +- + drivers/gpu/drm/ast/ast_ttm.c | 19 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 17 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 32 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 16 + + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 45 +- + drivers/gpu/drm/bochs/bochs_drv.c | 5 +- + drivers/gpu/drm/bochs/bochs_fbdev.c | 7 +- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 7 +- + drivers/gpu/drm/bridge/analogix-anx78xx.c | 10 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 1 - + drivers/gpu/drm/bridge/dumb-vga-dac.c | 10 +- + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 1 - + drivers/gpu/drm/bridge/nxp-ptn3460.c | 7 +- + drivers/gpu/drm/bridge/panel.c | 36 +- + drivers/gpu/drm/bridge/parade-ps8622.c | 7 +- + drivers/gpu/drm/bridge/sii902x.c | 9 +- + drivers/gpu/drm/bridge/synopsys/Kconfig | 16 + + drivers/gpu/drm/bridge/synopsys/Makefile | 3 + + drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c | 327 +++++ + drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.h | 19 + + .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 3 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 107 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.h | 46 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 981 +++++++++++++++ + drivers/gpu/drm/bridge/tc358767.c | 7 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 7 +- + drivers/gpu/drm/cirrus/cirrus_drv.c | 5 +- + drivers/gpu/drm/cirrus/cirrus_drv.h | 8 - + drivers/gpu/drm/cirrus/cirrus_fbdev.c | 3 - + drivers/gpu/drm/cirrus/cirrus_mode.c | 71 +- + drivers/gpu/drm/drm_atomic.c | 219 ++-- + drivers/gpu/drm/drm_atomic_helper.c | 593 ++++----- + drivers/gpu/drm/drm_color_mgmt.c | 3 + + drivers/gpu/drm/drm_connector.c | 7 +- + drivers/gpu/drm/drm_crtc_helper.c | 3 +- + drivers/gpu/drm/drm_crtc_internal.h | 7 + + drivers/gpu/drm/drm_debugfs_crc.c | 59 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 89 +- + drivers/gpu/drm/drm_drv.c | 16 + + drivers/gpu/drm/drm_dumb_buffers.c | 26 +- + drivers/gpu/drm/drm_edid.c | 440 ++++++- + drivers/gpu/drm/drm_fb_cma_helper.c | 4 +- + drivers/gpu/drm/drm_fb_helper.c | 681 +++++++---- + drivers/gpu/drm/drm_file.c | 7 +- + drivers/gpu/drm/drm_framebuffer.c | 2 +- + drivers/gpu/drm/drm_gem.c | 45 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 2 +- + drivers/gpu/drm/drm_internal.h | 14 +- + drivers/gpu/drm/drm_ioc32.c | 2 +- + drivers/gpu/drm/drm_ioctl.c | 13 +- + drivers/gpu/drm/drm_mipi_dsi.c | 6 +- + drivers/gpu/drm/drm_mode_config.c | 7 + + drivers/gpu/drm/drm_mode_object.c | 159 ++- + drivers/gpu/drm/drm_modes.c | 91 +- + drivers/gpu/drm/drm_modeset_helper.c | 1 + + drivers/gpu/drm/drm_modeset_lock.c | 12 +- + drivers/gpu/drm/drm_of.c | 4 +- + drivers/gpu/drm/drm_pci.c | 40 +- + drivers/gpu/drm/drm_plane.c | 120 +- + drivers/gpu/drm/drm_probe_helper.c | 4 + + drivers/gpu/drm/drm_property.c | 23 + + drivers/gpu/drm/drm_scdc_helper.c | 33 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 23 +- + drivers/gpu/drm/drm_syncobj.c | 2 - + drivers/gpu/drm/drm_vblank.c | 187 ++- + drivers/gpu/drm/exynos/exynos_drm_crtc.c | 10 +- + drivers/gpu/drm/exynos/exynos_drm_dpi.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_drv.c | 6 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 4 +- + drivers/gpu/drm/exynos/exynos_drm_fb.c | 27 +- + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 26 +- + drivers/gpu/drm/exynos/exynos_drm_plane.c | 3 +- + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 1 - + drivers/gpu/drm/exynos/exynos_hdmi.c | 3 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 5 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 2 - + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 2 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 1 - + drivers/gpu/drm/gma500/framebuffer.c | 22 - + drivers/gpu/drm/gma500/gma_display.c | 32 +- + drivers/gpu/drm/gma500/mdfld_intel_display.c | 4 - + drivers/gpu/drm/gma500/psb_drv.c | 5 +- + drivers/gpu/drm/gma500/psb_intel_display.c | 7 +- + drivers/gpu/drm/gma500/psb_intel_drv.h | 1 - + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 12 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 4 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 1 - + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 1 - + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 17 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 28 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 2 - + drivers/gpu/drm/i2c/tda998x_drv.c | 12 +- + drivers/gpu/drm/i810/i810_drv.c | 5 +- + drivers/gpu/drm/i915/Kconfig | 1 + + drivers/gpu/drm/i915/gvt/scheduler.c | 2 +- + drivers/gpu/drm/i915/i915_debugfs.c | 103 +- + drivers/gpu/drm/i915/i915_drv.c | 139 ++- + drivers/gpu/drm/i915/i915_drv.h | 186 +-- + drivers/gpu/drm/i915/i915_gem.c | 165 ++- + drivers/gpu/drm/i915/i915_gem_context.c | 186 +-- + drivers/gpu/drm/i915/i915_gem_context.h | 34 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 21 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 66 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 3 +- + drivers/gpu/drm/i915/i915_gem_request.c | 7 +- + drivers/gpu/drm/i915/i915_gem_request.h | 2 + + drivers/gpu/drm/i915/i915_gpu_error.c | 3 + + drivers/gpu/drm/i915/i915_irq.c | 161 ++- + drivers/gpu/drm/i915/i915_params.c | 18 +- + drivers/gpu/drm/i915/i915_params.h | 7 +- + drivers/gpu/drm/i915/i915_pci.c | 6 +- + drivers/gpu/drm/i915/i915_perf.c | 6 +- + drivers/gpu/drm/i915/i915_reg.h | 6 +- + drivers/gpu/drm/i915/i915_sysfs.c | 10 +- + drivers/gpu/drm/i915/i915_vma.c | 9 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 15 + + drivers/gpu/drm/i915/intel_bios.c | 9 + + drivers/gpu/drm/i915/intel_color.c | 2 +- + drivers/gpu/drm/i915/intel_crt.c | 2 - + drivers/gpu/drm/i915/intel_ddi.c | 116 +- + drivers/gpu/drm/i915/intel_device_info.c | 2 +- + drivers/gpu/drm/i915/intel_display.c | 53 +- + drivers/gpu/drm/i915/intel_dp.c | 110 +- + drivers/gpu/drm/i915/intel_dp_aux_backlight.c | 185 ++- + drivers/gpu/drm/i915/intel_dp_mst.c | 49 +- + drivers/gpu/drm/i915/intel_drv.h | 6 +- + drivers/gpu/drm/i915/intel_dsi.c | 2 - + drivers/gpu/drm/i915/intel_dvo.c | 2 - + drivers/gpu/drm/i915/intel_engine_cs.c | 38 +- + drivers/gpu/drm/i915/intel_fbdev.c | 50 +- + drivers/gpu/drm/i915/intel_hdmi.c | 9 +- + drivers/gpu/drm/i915/intel_lrc.c | 2 +- + drivers/gpu/drm/i915/intel_lvds.c | 2 - + drivers/gpu/drm/i915/intel_pm.c | 148 +-- + drivers/gpu/drm/i915/intel_ringbuffer.c | 5 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 1 + + drivers/gpu/drm/i915/intel_runtime_pm.c | 139 ++- + drivers/gpu/drm/i915/intel_sdvo.c | 7 +- + drivers/gpu/drm/i915/intel_sprite.c | 6 +- + drivers/gpu/drm/i915/intel_tv.c | 2 - + drivers/gpu/drm/i915/intel_uncore.c | 15 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 10 +- + drivers/gpu/drm/i915/selftests/i915_vma.c | 8 +- + drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 159 +++ + drivers/gpu/drm/i915/selftests/mock_context.c | 11 +- + drivers/gpu/drm/i915/selftests/mock_context.h | 2 + + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 5 +- + drivers/gpu/drm/i915/selftests/mock_gtt.c | 3 +- + drivers/gpu/drm/imx/imx-drm-core.c | 10 +- + drivers/gpu/drm/imx/imx-ldb.c | 1 - + drivers/gpu/drm/imx/imx-tve.c | 1 - + drivers/gpu/drm/imx/ipuv3-crtc.c | 5 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 6 +- + drivers/gpu/drm/imx/parallel-display.c | 1 - + drivers/gpu/drm/mediatek/mtk_disp_color.c | 4 +- + drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 4 +- + drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 4 +- + drivers/gpu/drm/mediatek/mtk_dpi.c | 6 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 17 +- + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 6 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 32 +- + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 25 - + drivers/gpu/drm/mediatek/mtk_drm_gem.h | 3 - + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 2 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 5 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 11 +- + drivers/gpu/drm/meson/meson_crtc.c | 10 +- + drivers/gpu/drm/meson/meson_drv.c | 5 +- + drivers/gpu/drm/meson/meson_plane.c | 1 + + drivers/gpu/drm/meson/meson_venc_cvbs.c | 1 - + drivers/gpu/drm/mga/mga_drv.c | 5 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 6 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 5 - + drivers/gpu/drm/mgag200/mgag200_fb.c | 3 - + drivers/gpu/drm/mgag200/mgag200_mode.c | 62 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 1 - + drivers/gpu/drm/msm/edp/edp_connector.c | 1 - + drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 2 +- + drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 1 - + drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 11 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 4 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c | 1 - + drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 12 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 6 +- + drivers/gpu/drm/msm/msm_atomic.c | 34 +- + drivers/gpu/drm/msm/msm_fbdev.c | 1 - + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 5 +- + drivers/gpu/drm/mxsfb/mxsfb_out.c | 1 - + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 26 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 15 +- + drivers/gpu/drm/nouveau/nouveau_crtc.h | 3 - + drivers/gpu/drm/nouveau/nouveau_display.c | 2 - + drivers/gpu/drm/nouveau/nouveau_drm.c | 13 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 22 - + drivers/gpu/drm/nouveau/nv50_display.c | 138 +-- + drivers/gpu/drm/omapdrm/omap_connector.c | 1 - + drivers/gpu/drm/omapdrm/omap_crtc.c | 135 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 7 +- + drivers/gpu/drm/omapdrm/omap_encoder.c | 3 +- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 1 - + drivers/gpu/drm/omapdrm/omap_plane.c | 3 +- + drivers/gpu/drm/panel/panel-lvds.c | 16 +- + drivers/gpu/drm/pl111/pl111_connector.c | 1 - + drivers/gpu/drm/pl111/pl111_display.c | 2 +- + drivers/gpu/drm/pl111/pl111_drv.c | 4 +- + drivers/gpu/drm/qxl/qxl_display.c | 35 +- + drivers/gpu/drm/qxl/qxl_drv.c | 7 +- + drivers/gpu/drm/qxl/qxl_drv.h | 1 + + drivers/gpu/drm/qxl/qxl_fb.c | 1 - + drivers/gpu/drm/qxl/qxl_ioctl.c | 17 +- + drivers/gpu/drm/qxl/qxl_object.c | 4 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 2 +- + drivers/gpu/drm/r128/r128_drv.c | 5 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 1 - + drivers/gpu/drm/radeon/radeon_audio.c | 2 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 7 +- + drivers/gpu/drm/radeon/radeon_display.c | 83 +- + drivers/gpu/drm/radeon/radeon_dp_mst.c | 7 - + drivers/gpu/drm/radeon/radeon_drv.c | 7 +- + drivers/gpu/drm/radeon/radeon_fb.c | 10 +- + drivers/gpu/drm/radeon/radeon_irq_kms.c | 5 +- + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 1 - + drivers/gpu/drm/radeon/radeon_mode.h | 4 - + drivers/gpu/drm/radeon/radeon_ttm.c | 2 +- + drivers/gpu/drm/radeon/vce_v2_0.c | 4 + + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 199 ++- + drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 17 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 30 +- + drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 4 +- + drivers/gpu/drm/rcar-du/rcar_du_group.c | 38 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 129 +- + drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 1 - + drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c | 12 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 119 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.h | 3 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 56 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.h | 10 +- + drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c | 2 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 1 - + drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 1 - + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 110 +- + drivers/gpu/drm/rockchip/inno_hdmi.c | 3 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 21 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 25 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 26 - + drivers/gpu/drm/rockchip/rockchip_drm_gem.h | 3 - + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 170 +-- + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 81 +- + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 375 ++++-- + drivers/gpu/drm/rockchip/rockchip_vop_reg.h | 905 +++++++++++--- + drivers/gpu/drm/savage/savage_drv.c | 5 +- + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 6 +- + drivers/gpu/drm/sis/sis_drv.c | 5 +- + drivers/gpu/drm/sti/sti_crtc.c | 10 +- + drivers/gpu/drm/sti/sti_cursor.c | 3 +- + drivers/gpu/drm/sti/sti_drv.c | 3 - + drivers/gpu/drm/sti/sti_dvo.c | 3 +- + drivers/gpu/drm/sti/sti_gdp.c | 3 +- + drivers/gpu/drm/sti/sti_hda.c | 1 - + drivers/gpu/drm/sti/sti_hdmi.c | 4 +- + drivers/gpu/drm/sti/sti_hqvdp.c | 8 +- + drivers/gpu/drm/stm/Kconfig | 10 +- + drivers/gpu/drm/stm/Makefile | 2 + + drivers/gpu/drm/stm/drv.c | 23 +- + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 352 ++++++ + drivers/gpu/drm/stm/ltdc.c | 470 +++---- + drivers/gpu/drm/stm/ltdc.h | 4 +- + drivers/gpu/drm/sun4i/sun4i_crtc.c | 10 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 11 +- + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 3 +- + drivers/gpu/drm/sun4i/sun4i_layer.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 1 - + drivers/gpu/drm/sun4i/sun4i_tv.c | 1 - + drivers/gpu/drm/sun4i/sun8i_layer.c | 2 +- + drivers/gpu/drm/tdfx/tdfx_drv.c | 5 +- + drivers/gpu/drm/tegra/dc.c | 22 +- + drivers/gpu/drm/tegra/drm.c | 12 +- + drivers/gpu/drm/tegra/dsi.c | 1 - + drivers/gpu/drm/tegra/hdmi.c | 3 +- + drivers/gpu/drm/tegra/rgb.c | 1 - + drivers/gpu/drm/tegra/sor.c | 3 +- + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 20 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 8 +- + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 1 - + drivers/gpu/drm/tilcdc/tilcdc_plane.c | 1 - + drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 1 - + drivers/gpu/drm/tinydrm/Kconfig | 13 + + drivers/gpu/drm/tinydrm/Makefile | 1 + + drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c | 74 +- + drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c | 3 +- + drivers/gpu/drm/tinydrm/mi0283qt.c | 8 +- + drivers/gpu/drm/tinydrm/mipi-dbi.c | 17 +- + drivers/gpu/drm/tinydrm/repaper.c | 1095 +++++++++++++++++ + drivers/gpu/drm/ttm/ttm_bo_vm.c | 79 +- + drivers/gpu/drm/udl/udl_dmabuf.c | 2 +- + drivers/gpu/drm/udl/udl_drv.c | 6 - + drivers/gpu/drm/udl/udl_fb.c | 1 - + drivers/gpu/drm/udl/udl_main.c | 2 - + drivers/gpu/drm/vc4/Kconfig | 8 + + drivers/gpu/drm/vc4/vc4_bo.c | 265 +++- + drivers/gpu/drm/vc4/vc4_crtc.c | 44 +- + drivers/gpu/drm/vc4/vc4_dpi.c | 13 +- + drivers/gpu/drm/vc4/vc4_drv.c | 10 +- + drivers/gpu/drm/vc4/vc4_drv.h | 40 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 20 +- + drivers/gpu/drm/vc4/vc4_gem.c | 13 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 290 ++++- + drivers/gpu/drm/vc4/vc4_kms.c | 78 +- + drivers/gpu/drm/vc4/vc4_plane.c | 19 +- + drivers/gpu/drm/vc4/vc4_regs.h | 113 ++ + drivers/gpu/drm/vc4/vc4_render_cl.c | 2 +- + drivers/gpu/drm/vc4/vc4_v3d.c | 3 +- + drivers/gpu/drm/vc4/vc4_vec.c | 2 - + drivers/gpu/drm/vgem/vgem_drv.c | 82 +- + drivers/gpu/drm/vgem/vgem_drv.h | 4 + + drivers/gpu/drm/via/via_drv.c | 5 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 11 +- + drivers/gpu/drm/virtio/virtgpu_fb.c | 1 - + drivers/gpu/drm/virtio/virtgpu_plane.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_ttm.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 5 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 13 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 2 - + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 35 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 27 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 41 +- + drivers/gpu/drm/zte/zx_drm_drv.c | 6 +- + drivers/gpu/drm/zte/zx_hdmi.c | 3 +- + drivers/gpu/drm/zte/zx_plane.c | 2 +- + drivers/gpu/drm/zte/zx_tvenc.c | 1 - + drivers/gpu/drm/zte/zx_vga.c | 1 - + drivers/gpu/drm/zte/zx_vou.c | 10 +- + drivers/gpu/host1x/bus.c | 1 - + drivers/gpu/ipu-v3/ipu-common.c | 4 +- + drivers/media/platform/vsp1/vsp1.h | 7 +- + drivers/media/platform/vsp1/vsp1_bru.c | 45 +- + drivers/media/platform/vsp1/vsp1_bru.h | 4 +- + drivers/media/platform/vsp1/vsp1_dl.c | 205 ++-- + drivers/media/platform/vsp1/vsp1_dl.h | 1 - + drivers/media/platform/vsp1/vsp1_drm.c | 286 ++--- + drivers/media/platform/vsp1/vsp1_drm.h | 38 +- + drivers/media/platform/vsp1/vsp1_drv.c | 115 +- + drivers/media/platform/vsp1/vsp1_entity.c | 40 +- + drivers/media/platform/vsp1/vsp1_entity.h | 5 +- + drivers/media/platform/vsp1/vsp1_lif.c | 5 +- + drivers/media/platform/vsp1/vsp1_lif.h | 2 +- + drivers/media/platform/vsp1/vsp1_pipe.c | 27 +- + drivers/media/platform/vsp1/vsp1_pipe.h | 2 +- + drivers/media/platform/vsp1/vsp1_regs.h | 46 +- + drivers/media/platform/vsp1/vsp1_video.c | 69 +- + drivers/media/platform/vsp1/vsp1_wpf.c | 4 +- + drivers/staging/vboxvideo/vbox_drv.c | 5 +- + drivers/staging/vboxvideo/vbox_fb.c | 15 - + drivers/staging/vboxvideo/vbox_mode.c | 5 - + include/drm/bridge/dw_mipi_dsi.h | 39 + + include/drm/drmP.h | 37 +- + include/drm/drm_atomic.h | 132 +- + include/drm/drm_atomic_helper.h | 27 +- + include/drm/drm_bridge.h | 3 + + include/drm/drm_connector.h | 42 +- + include/drm/drm_crtc.h | 17 +- + include/drm/drm_dp_mst_helper.h | 10 + + include/drm/drm_drv.h | 72 +- + include/drm/drm_edid.h | 11 +- + include/drm/drm_fb_cma_helper.h | 4 +- + include/drm/drm_fb_helper.h | 74 +- + include/drm/drm_gem.h | 17 +- + include/drm/drm_mode_config.h | 6 + + include/drm/drm_modes.h | 11 + + include/drm/drm_modeset_helper_vtables.h | 125 +- + include/drm/drm_pci.h | 11 +- + include/drm/drm_plane.h | 28 +- + include/drm/drm_property.h | 2 + + include/drm/drm_scdc_helper.h | 25 - + include/drm/drm_simple_kms_helper.h | 1 + + include/drm/drm_vblank.h | 3 +- + include/drm/tinydrm/mipi-dbi.h | 6 +- + include/drm/tinydrm/tinydrm-helpers.h | 1 + + include/drm/tinydrm/tinydrm.h | 4 +- + include/drm/ttm/ttm_bo_driver.h | 17 + + include/linux/dma-fence.h | 19 +- + include/media/vsp1.h | 12 +- + include/uapi/drm/armada_drm.h | 22 +- + include/uapi/drm/drm_fourcc.h | 11 + + include/uapi/drm/drm_mode.h | 50 + + include/uapi/drm/qxl_drm.h | 6 +- + include/uapi/drm/vc4_drm.h | 11 + + 536 files changed, 15740 insertions(+), 6987 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/dw_mipi_dsi.txt + create mode 100644 Documentation/devicetree/bindings/display/repaper.txt + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vf_error.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vf_error.h + create mode 100644 drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c + create mode 100644 drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.h + create mode 100644 drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c + create mode 100644 drivers/gpu/drm/stm/dw_mipi_dsi-stm.c + create mode 100644 drivers/gpu/drm/tinydrm/repaper.c + create mode 100644 include/drm/bridge/dw_mipi_dsi.h +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 (912d64123d35 drm/i915/psr: Preserve SRD_CTL bit 29 on PSR init) +$ git merge drm-intel/for-linux-next +Resolved 'drivers/gpu/drm/i915/intel_display.c' using previous resolution. +Auto-merging drivers/gpu/drm/i915/selftests/mock_gem_device.c +Auto-merging drivers/gpu/drm/i915/intel_sprite.c +Auto-merging drivers/gpu/drm/i915/intel_sdvo.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_panel.c +Auto-merging drivers/gpu/drm/i915/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/intel_fbdev.c +Auto-merging drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/gpu/drm/i915/intel_display.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/intel_color.c +Auto-merging drivers/gpu/drm/i915/i915_perf.c +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/gvt/handlers.c +Auto-merging drivers/gpu/drm/i915/gvt/display.c +Auto-merging drivers/gpu/drm/drm_atomic_helper.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a327ff717b47] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/i915.rst | 4 + + drivers/gpu/drm/drm_atomic_helper.c | 18 +- + drivers/gpu/drm/i915/gvt/display.c | 6 +- + drivers/gpu/drm/i915/gvt/handlers.c | 8 +- + drivers/gpu/drm/i915/i915_debugfs.c | 91 +- + drivers/gpu/drm/i915/i915_drv.c | 87 +- + drivers/gpu/drm/i915/i915_drv.h | 165 +- + drivers/gpu/drm/i915/i915_gem.c | 206 +- + drivers/gpu/drm/i915/i915_gem_context.c | 6 +- + drivers/gpu/drm/i915/i915_gem_context.h | 6 +- + drivers/gpu/drm/i915/i915_gem_render_state.c | 4 + + drivers/gpu/drm/i915/i915_gem_request.c | 9 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 3 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 8 +- + drivers/gpu/drm/i915/i915_irq.c | 217 +- + drivers/gpu/drm/i915/i915_oa_bdw.c | 5362 +--------------------- + drivers/gpu/drm/i915/i915_oa_bdw.h | 8 +- + drivers/gpu/drm/i915/i915_oa_bxt.c | 2624 +---------- + drivers/gpu/drm/i915/i915_oa_bxt.h | 8 +- + drivers/gpu/drm/i915/i915_oa_chv.c | 2808 +---------- + drivers/gpu/drm/i915/i915_oa_chv.h | 8 +- + drivers/gpu/drm/i915/i915_oa_glk.c | 2536 +--------- + drivers/gpu/drm/i915/i915_oa_glk.h | 8 +- + drivers/gpu/drm/i915/i915_oa_hsw.c | 765 +-- + drivers/gpu/drm/i915/i915_oa_hsw.h | 8 +- + drivers/gpu/drm/i915/i915_oa_kblgt2.c | 2972 +----------- + drivers/gpu/drm/i915/i915_oa_kblgt2.h | 8 +- + drivers/gpu/drm/i915/i915_oa_kblgt3.c | 3021 +----------- + drivers/gpu/drm/i915/i915_oa_kblgt3.h | 8 +- + drivers/gpu/drm/i915/i915_oa_sklgt2.c | 3459 +------------- + drivers/gpu/drm/i915/i915_oa_sklgt2.h | 8 +- + drivers/gpu/drm/i915/i915_oa_sklgt3.c | 3020 +----------- + drivers/gpu/drm/i915/i915_oa_sklgt3.h | 8 +- + drivers/gpu/drm/i915/i915_oa_sklgt4.c | 3074 +------------ + drivers/gpu/drm/i915/i915_oa_sklgt4.h | 8 +- + drivers/gpu/drm/i915/i915_params.c | 12 +- + drivers/gpu/drm/i915/i915_params.h | 5 +- + drivers/gpu/drm/i915/i915_pci.c | 1 + + drivers/gpu/drm/i915/i915_perf.c | 801 +++- + drivers/gpu/drm/i915/i915_reg.h | 374 +- + drivers/gpu/drm/i915/i915_sysfs.c | 6 +- + drivers/gpu/drm/i915/intel_color.c | 45 +- + drivers/gpu/drm/i915/intel_ddi.c | 3 + + drivers/gpu/drm/i915/intel_display.c | 1190 +---- + drivers/gpu/drm/i915/intel_dp_aux_backlight.c | 87 +- + drivers/gpu/drm/i915/intel_dp_link_training.c | 8 +- + drivers/gpu/drm/i915/intel_drv.h | 48 +- + drivers/gpu/drm/i915/intel_engine_cs.c | 7 +- + drivers/gpu/drm/i915/intel_fbdev.c | 22 +- + drivers/gpu/drm/i915/intel_fifo_underrun.c | 6 +- + drivers/gpu/drm/i915/intel_hangcheck.c | 2 +- + drivers/gpu/drm/i915/intel_hdmi.c | 64 +- + drivers/gpu/drm/i915/intel_i2c.c | 36 +- + drivers/gpu/drm/i915/intel_lrc.c | 36 +- + drivers/gpu/drm/i915/intel_lrc.h | 1 - + drivers/gpu/drm/i915/intel_panel.c | 3 +- + drivers/gpu/drm/i915/intel_pm.c | 27 +- + drivers/gpu/drm/i915/intel_psr.c | 1 + + drivers/gpu/drm/i915/intel_ringbuffer.c | 3 + + drivers/gpu/drm/i915/intel_runtime_pm.c | 912 ++-- + drivers/gpu/drm/i915/intel_sdvo.c | 74 +- + drivers/gpu/drm/i915/intel_sprite.c | 8 +- + drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 292 +- + drivers/gpu/drm/i915/selftests/mock_context.c | 8 + + drivers/gpu/drm/i915/selftests/mock_context.h | 3 + + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 25 +- + include/uapi/drm/i915_drm.h | 20 + + 67 files changed, 2683 insertions(+), 32006 deletions(-) +Merging drm-tegra/drm/tegra/for-next (43240bbd871e gpu: host1x: At first try a non-blocking allocation for the gather copy) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging drm-misc/for-linux-next (f3e31b73a542 dma-buf: dma_fence_put is NULL safe) +$ git merge drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/arc/arcpgu_drv.c +Merge made by the 'recursive' strategy. + drivers/dma-buf/reservation.c | 6 +- + drivers/gpu/drm/arc/arcpgu_drv.c | 2 +- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 4 +- + .../gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c | 2 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 2 +- + drivers/gpu/drm/drm_plane.c | 2 +- + drivers/gpu/drm/pl111/pl111_drv.c | 2 +- + drivers/gpu/drm/rockchip/inno_hdmi.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_tv.c | 2 +- + drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c | 42 ++++-------- + drivers/gpu/drm/tinydrm/repaper.c | 28 +++++++- + drivers/gpu/drm/vc4/vc4_bo.c | 26 ++++---- + drivers/gpu/drm/vc4/vc4_crtc.c | 6 +- + drivers/gpu/drm/vc4/vc4_drv.c | 1 + + drivers/gpu/drm/vc4/vc4_dsi.c | 4 -- + drivers/gpu/drm/vc4/vc4_gem.c | 31 ++++----- + drivers/gpu/drm/vc4/vc4_kms.c | 4 +- + drivers/gpu/drm/vc4/vc4_render_cl.c | 61 ++++++++++------- + drivers/gpu/drm/vc4/vc4_validate.c | 78 +++++++++++----------- + drivers/gpu/drm/vc4/vc4_validate_shaders.c | 72 ++++++++++---------- + drivers/gpu/drm/virtio/virtgpu_fb.c | 2 +- + include/drm/tinydrm/tinydrm-helpers.h | 3 +- + include/uapi/drm/vc4_drm.h | 11 +++ + 24 files changed, 211 insertions(+), 184 deletions(-) +Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux) +$ git merge drm-exynos/exynos-drm/for-next +Already up-to-date. +Merging drm-msm/msm-next (a49b9ec9cae3 drm/msm: fix spelling mistake: "ringubffer" -> "ringbuffer") +$ git merge drm-msm/msm-next +Resolved 'drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c' using previous resolution. +Auto-merging drivers/gpu/drm/msm/msm_fbdev.c +Auto-merging drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c +Auto-merging drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c +Auto-merging drivers/gpu/drm/msm/hdmi/hdmi_connector.c +Auto-merging drivers/gpu/drm/msm/hdmi/hdmi_bridge.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master cc6a6809a0ee] Merge remote-tracking branch 'drm-msm/msm-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/msm/Kconfig | 2 +- + drivers/gpu/drm/msm/Makefile | 4 +- + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 12 +- + drivers/gpu/drm/msm/adreno/a3xx_gpu.h | 1 - + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 12 +- + drivers/gpu/drm/msm/adreno/a4xx_gpu.h | 1 - + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 444 +++++++++++++++--------- + drivers/gpu/drm/msm/adreno/a5xx_gpu.h | 105 +++++- + drivers/gpu/drm/msm/adreno/a5xx_power.c | 20 +- + drivers/gpu/drm/msm/adreno/a5xx_preempt.c | 294 ++++++++++++++++ + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 235 ++++++------- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 43 +-- + drivers/gpu/drm/msm/dsi/dsi.c | 5 + + drivers/gpu/drm/msm/dsi/dsi.h | 2 + + drivers/gpu/drm/msm/dsi/dsi_host.c | 108 +++--- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 2 +- + drivers/gpu/drm/msm/hdmi/hdmi.c | 2 + + drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 4 + + drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 63 +++- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c | 7 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 27 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c | 14 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c | 27 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 66 +++- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 7 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_mdss.c | 63 +++- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 4 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.c | 59 +++- + drivers/gpu/drm/msm/msm_drv.c | 98 +++++- + drivers/gpu/drm/msm/msm_drv.h | 34 +- + drivers/gpu/drm/msm/msm_fb.c | 45 ++- + drivers/gpu/drm/msm/msm_fbdev.c | 57 ++- + drivers/gpu/drm/msm/msm_fence.c | 2 +- + drivers/gpu/drm/msm/msm_fence.h | 2 +- + drivers/gpu/drm/msm/msm_gem.c | 58 +++- + drivers/gpu/drm/msm/msm_gem.h | 5 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 31 +- + drivers/gpu/drm/msm/msm_gem_vma.c | 2 +- + drivers/gpu/drm/msm/msm_gpu.c | 259 ++++++++++---- + drivers/gpu/drm/msm/msm_gpu.h | 54 ++- + drivers/gpu/drm/msm/msm_kms.h | 2 + + drivers/gpu/drm/msm/msm_ringbuffer.c | 35 +- + drivers/gpu/drm/msm/msm_ringbuffer.h | 32 +- + drivers/gpu/drm/msm/msm_submitqueue.c | 160 +++++++++ + include/uapi/drm/msm_drm.h | 30 +- + 45 files changed, 1888 insertions(+), 651 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 +Auto-merging drivers/gpu/drm/sun4i/sun4i_tv.c +Auto-merging drivers/gpu/drm/sun4i/sun4i_rgb.c +Auto-merging drivers/gpu/drm/sun4i/sun4i_layer.c +Auto-merging drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c +Auto-merging drivers/gpu/drm/sun4i/sun4i_drv.c +Merge made by the 'recursive' strategy. + .../bindings/display/sunxi/sun4i-drm.txt | 36 +++- + drivers/gpu/drm/sun4i/Kconfig | 16 +- + drivers/gpu/drm/sun4i/Makefile | 1 + + drivers/gpu/drm/sun4i/sun4i_drv.c | 8 + + drivers/gpu/drm/sun4i/sun4i_hdmi.h | 32 +++ + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 156 ++++++--------- + drivers/gpu/drm/sun4i/sun4i_hdmi_i2c.c | 220 +++++++++++++++++++++ + drivers/gpu/drm/sun4i/sun4i_layer.c | 9 +- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 8 - + drivers/gpu/drm/sun4i/sun4i_tcon.h | 2 - + drivers/gpu/drm/sun4i/sun4i_tv.c | 8 - + 11 files changed, 367 insertions(+), 129 deletions(-) + create mode 100644 drivers/gpu/drm/sun4i/sun4i_hdmi_i2c.c +Merging imx-drm/imx-drm/next (790cb4c7c954 drm/imx: lock scanout transfers for consecutive bursts) +$ git merge imx-drm/imx-drm/next +Auto-merging drivers/gpu/drm/imx/ipuv3-plane.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/ipuv3-plane.c | 53 +++++++++++++++++++++++++++++++-------- + 1 file changed, 42 insertions(+), 11 deletions(-) +Merging etnaviv/etnaviv/next (23d1dd03cc51 drm/etnaviv: switch to drm_*{get,put} helpers) +$ git merge etnaviv/etnaviv/next +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/etnaviv/Kconfig | 2 ++ + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 8 ++--- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 45 ++++++++++++++-------------- + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 4 +-- + 5 files changed, 32 insertions(+), 29 deletions(-) +Merging kconfig/for-next (6f7da290413b Linux 4.12) +$ git merge kconfig/for-next +Already up-to-date. +Merging regmap/for-next (a7c33d98535c Merge remote-tracking branch 'regmap/topic/namespace' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + include/linux/regmap.h | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) +Merging sound/for-next (5e463d6d292a ALSA: usbusx2y: constify usb_device_id.) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + include/sound/core.h | 2 - + sound/core/control.c | 252 +++++++++++++++++++++++-------------- + sound/core/init.c | 1 - + sound/hda/hdac_i915.c | 2 +- + sound/isa/ad1848/ad1848.c | 18 +-- + sound/isa/als100.c | 13 +- + sound/isa/cs423x/cs4231.c | 18 +-- + sound/isa/cs423x/cs4236.c | 20 +-- + sound/isa/opti9xx/miro.c | 7 +- + sound/isa/opti9xx/opti92x-ad1848.c | 14 ++- + sound/pci/hda/hda_intel.c | 3 + + sound/pci/ice1712/delta.c | 24 ++-- + sound/pci/ice1712/ews.c | 12 +- + sound/pci/ice1712/hoontech.c | 4 +- + sound/pci/ice1712/juli.c | 2 +- + sound/pci/ice1712/phase.c | 4 +- + sound/pci/ice1712/quartet.c | 2 +- + sound/pci/ice1712/revo.c | 20 +-- + sound/pci/mixart/mixart.c | 10 +- + sound/pci/mixart/mixart.h | 4 - + sound/pci/pcxhr/pcxhr.c | 19 +-- + sound/pci/pcxhr/pcxhr.h | 3 +- + sound/pci/rme9652/hdspm.c | 48 ++++--- + sound/usb/6fire/chip.c | 2 +- + sound/usb/bcd2000/bcd2000.c | 2 +- + sound/usb/caiaq/device.c | 2 +- + sound/usb/card.c | 4 +- + sound/usb/misc/ua101.c | 2 +- + sound/usb/usx2y/us122l.c | 2 +- + sound/usb/usx2y/usbusx2y.c | 2 +- + 30 files changed, 297 insertions(+), 221 deletions(-) +Merging sound-asoc/for-next (19d71229654f Merge remote-tracking branches 'asoc/topic/wm8523', 'asoc/topic/wm8524', 'asoc/topic/wm8804' and 'asoc/topic/zte' into asoc-next) +$ git merge sound-asoc/for-next +Removing include/sound/rt5677.h +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/dmic.txt | 12 + + .../devicetree/bindings/sound/rockchip-i2s.txt | 4 + + Documentation/devicetree/bindings/sound/rt274.txt | 33 + + Documentation/devicetree/bindings/sound/rt5663.txt | 8 + + .../devicetree/bindings/sound/samsung,odroid.txt | 6 - + .../devicetree/bindings/sound/tlv320aic32x4.txt | 13 +- + Documentation/devicetree/bindings/sound/wm8524.txt | 16 + + include/sound/rt5663.h | 22 + + include/sound/rt5677.h | 45 - + include/sound/soc.h | 10 +- + include/sound/tlv320aic32x4.h | 23 + + sound/atmel/ac97c.c | 8 +- + sound/soc/au1x/psc-ac97.c | 2 +- + sound/soc/au1x/psc-i2s.c | 2 +- + sound/soc/codecs/Kconfig | 12 + + sound/soc/codecs/Makefile | 4 + + sound/soc/codecs/adau1977.c | 6 +- + sound/soc/codecs/cs35l33.c | 12 +- + sound/soc/codecs/cs35l34.c | 3 +- + sound/soc/codecs/cs42l42.c | 11 +- + sound/soc/codecs/cs53l30.c | 15 +- + sound/soc/codecs/dmic.c | 6 + + sound/soc/codecs/hdac_hdmi.c | 41 +- + sound/soc/codecs/hdmi-codec.c | 33 +- + sound/soc/codecs/inno_rk3036.c | 2 +- + sound/soc/codecs/max9867.c | 2 +- + sound/soc/codecs/max98926.c | 2 +- + sound/soc/codecs/max98927.c | 1 - + sound/soc/codecs/msm8916-wcd-analog.c | 2 +- + sound/soc/codecs/msm8916-wcd-digital.c | 37 +- + sound/soc/codecs/rt274.c | 1228 ++++++++++++++++++++ + sound/soc/codecs/rt274.h | 217 ++++ + sound/soc/codecs/rt5514-spi.c | 144 +-- + sound/soc/codecs/rt5514-spi.h | 7 +- + sound/soc/codecs/rt5514.c | 107 +- + sound/soc/codecs/rt5514.h | 19 + + sound/soc/codecs/rt5616.c | 2 +- + sound/soc/codecs/rt5659.c | 2 +- + sound/soc/codecs/rt5663.c | 248 +++- + sound/soc/codecs/rt5663.h | 2 + + sound/soc/codecs/rt5665.c | 53 +- + sound/soc/codecs/rt5665.h | 21 + + sound/soc/codecs/rt5670.c | 44 +- + sound/soc/codecs/rt5677.c | 81 +- + sound/soc/codecs/rt5677.h | 30 +- + sound/soc/codecs/sta32x.c | 3 +- + sound/soc/codecs/tas5720.c | 2 +- + sound/soc/codecs/tlv320aic32x4-i2c.c | 2 + + sound/soc/codecs/tlv320aic32x4-spi.c | 2 + + sound/soc/codecs/tlv320aic32x4.c | 206 ++++ + sound/soc/codecs/tlv320aic32x4.h | 3 + + sound/soc/codecs/twl6040.c | 4 +- + sound/soc/codecs/wm8523.c | 6 +- + sound/soc/codecs/wm8524.c | 263 +++++ + sound/soc/codecs/wm8804.c | 3 +- + sound/soc/dwc/dwc-i2s.c | 2 +- + sound/soc/fsl/fsl_asrc.c | 2 +- + sound/soc/fsl/fsl_dma.c | 4 +- + sound/soc/fsl/fsl_esai.c | 2 +- + sound/soc/fsl/fsl_spdif.c | 2 +- + sound/soc/fsl/imx-audmux.c | 16 +- + sound/soc/hisilicon/hi6210-i2s.c | 2 +- + sound/soc/img/img-i2s-in.c | 2 +- + sound/soc/img/img-i2s-out.c | 2 +- + sound/soc/img/img-parallel-out.c | 2 +- + sound/soc/img/img-spdif-in.c | 2 +- + sound/soc/img/img-spdif-out.c | 2 +- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 6 +- + sound/soc/intel/atom/sst/sst_pci.c | 2 +- + sound/soc/intel/boards/bxt_rt298.c | 86 +- + sound/soc/intel/boards/kbl_rt5663_max98927.c | 276 ++++- + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 45 +- + sound/soc/intel/skylake/Makefile | 5 +- + sound/soc/intel/skylake/bxt-sst.c | 10 +- + sound/soc/intel/skylake/cnl-sst-dsp.c | 274 +++++ + sound/soc/intel/skylake/cnl-sst-dsp.h | 112 ++ + sound/soc/intel/skylake/cnl-sst.c | 495 ++++++++ + sound/soc/intel/skylake/skl-messages.c | 33 +- + sound/soc/intel/skylake/skl-pcm.c | 34 +- + sound/soc/intel/skylake/skl-sst-dsp.c | 2 +- + sound/soc/intel/skylake/skl-sst-ipc.c | 6 +- + sound/soc/intel/skylake/skl-sst-ipc.h | 12 +- + sound/soc/intel/skylake/skl-sst-utils.c | 6 +- + sound/soc/intel/skylake/skl-sst.c | 6 +- + sound/soc/intel/skylake/skl-topology.c | 28 +- + sound/soc/intel/skylake/skl.c | 30 +- + sound/soc/intel/skylake/skl.h | 1 + + sound/soc/jz4740/jz4740-i2s.c | 21 +- + sound/soc/kirkwood/kirkwood-i2s.c | 6 +- + sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.c | 2 +- + sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 2 +- + sound/soc/mxs/mxs-saif.c | 13 +- + sound/soc/pxa/mmp-sspa.c | 2 +- + sound/soc/qcom/apq8016_sbc.c | 23 +- + sound/soc/samsung/i2s.c | 39 +- + sound/soc/samsung/odroid.c | 44 +- + sound/soc/samsung/pcm.c | 8 +- + sound/soc/samsung/s3c-i2s-v2.c | 14 +- + sound/soc/samsung/s3c-i2s-v2.h | 7 + + sound/soc/samsung/s3c2412-i2s.c | 15 +- + sound/soc/samsung/s3c24xx-i2s.c | 11 +- + sound/soc/samsung/spdif.c | 8 +- + sound/soc/sh/fsi.c | 2 +- + sound/soc/sh/rcar/adg.c | 7 + + sound/soc/sh/rcar/core.c | 101 +- + sound/soc/sh/rcar/ctu.c | 5 +- + sound/soc/sh/rcar/dvc.c | 5 +- + sound/soc/sh/rcar/mix.c | 5 +- + sound/soc/sh/rcar/rsnd.h | 1 + + sound/soc/sh/rcar/src.c | 6 +- + sound/soc/sh/rcar/ssi.c | 65 +- + sound/soc/sh/rcar/ssiu.c | 2 +- + sound/soc/soc-core.c | 59 +- + sound/soc/soc-jack.c | 2 +- + sound/soc/soc-pcm.c | 5 +- + sound/soc/spear/spdif_in.c | 6 +- + sound/soc/stm/stm32_i2s.c | 2 +- + sound/soc/stm/stm32_sai.c | 2 +- + sound/soc/stm/stm32_spdifrx.c | 2 +- + sound/soc/sunxi/sun4i-codec.c | 14 +- + sound/soc/sunxi/sun4i-i2s.c | 24 +- + sound/soc/sunxi/sun4i-spdif.c | 14 +- + sound/soc/sunxi/sun8i-codec.c | 4 +- + sound/soc/tegra/tegra30_ahub.c | 4 +- + sound/soc/tegra/tegra30_i2s.c | 2 +- + sound/soc/zte/zx-i2s.c | 2 +- + sound/soc/zte/zx-spdif.c | 2 +- + sound/soc/zte/zx-tdm.c | 2 +- + 128 files changed, 4476 insertions(+), 685 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/dmic.txt + create mode 100644 Documentation/devicetree/bindings/sound/rt274.txt + create mode 100644 Documentation/devicetree/bindings/sound/wm8524.txt + create mode 100644 include/sound/rt5663.h + delete mode 100644 include/sound/rt5677.h + create mode 100644 sound/soc/codecs/rt274.c + create mode 100644 sound/soc/codecs/rt274.h + create mode 100644 sound/soc/codecs/wm8524.c + create mode 100644 sound/soc/intel/skylake/cnl-sst-dsp.c + create mode 100644 sound/soc/intel/skylake/cnl-sst-dsp.h + create mode 100644 sound/soc/intel/skylake/cnl-sst.c +Merging modules/modules-next (0bf8bf50eddc module: Remove const attribute from alias for MODULE_DEVICE_TABLE) +$ git merge modules/modules-next +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 (94aef061c796 Input: xpad - constify usb_device_id) +$ git merge input/next +Auto-merging lib/kobject_uevent.c +Auto-merging include/linux/kobject.h +Auto-merging include/linux/device.h +Auto-merging drivers/base/core.c +Merge made by the 'recursive' strategy. + arch/arm/mach-pxa/raumfeld.c | 2 +- + drivers/base/base.h | 5 -- + drivers/base/core.c | 132 +++++++++++++++++++++++++++++ + drivers/base/dd.c | 4 + + drivers/input/input.c | 6 +- + drivers/input/joystick/iforce/iforce-usb.c | 2 +- + drivers/input/joystick/xpad.c | 2 +- + drivers/input/keyboard/gpio_keys.c | 18 +--- + drivers/input/misc/Kconfig | 11 +++ + drivers/input/misc/Makefile | 1 + + drivers/input/misc/axp20x-pek.c | 18 +--- + drivers/input/misc/ims-pcu.c | 4 +- + drivers/input/misc/keyspan_remote.c | 2 +- + drivers/input/misc/powermate.c | 2 +- + drivers/input/misc/rk805-pwrkey.c | 111 ++++++++++++++++++++++++ + drivers/input/misc/yealink.c | 2 +- + drivers/input/mouse/appletouch.c | 2 +- + drivers/input/mouse/elantech.c | 2 +- + drivers/input/mouse/psmouse-base.c | 2 +- + drivers/input/mouse/synaptics_usb.c | 2 +- + drivers/input/mousedev.c | 62 ++++++++------ + drivers/input/rmi4/rmi_f01.c | 13 +-- + drivers/input/rmi4/rmi_f34.c | 2 +- + drivers/input/serio/serio.c | 4 +- + drivers/input/tablet/acecad.c | 2 +- + drivers/input/tablet/aiptek.c | 2 +- + drivers/input/tablet/kbtab.c | 2 +- + drivers/input/touchscreen/ads7846.c | 4 +- + drivers/input/touchscreen/elants_i2c.c | 2 +- + drivers/input/touchscreen/raydium_i2c_ts.c | 2 +- + drivers/input/touchscreen/sur40.c | 46 ++++++---- + include/linux/device.h | 30 +++++++ + include/linux/kobject.h | 2 + + lib/kobject_uevent.c | 2 + + 34 files changed, 390 insertions(+), 115 deletions(-) + create mode 100644 drivers/input/misc/rk805-pwrkey.c +Merging block/for-next (bdd2d5f6e545 Merge branch 'for-4.14/block' into for-next) +$ git merge block/for-next +Auto-merging kernel/cgroup/cgroup.c +Auto-merging drivers/md/dm-crypt.c +Auto-merging block/blk-mq.c +Auto-merging block/bfq-iosched.h +Merge made by the 'recursive' strategy. + block/bfq-iosched.h | 13 +- + block/bio-integrity.c | 6 +- + block/bio.c | 20 +-- + block/blk-core.c | 46 ++++--- + block/blk-merge.c | 4 +- + block/blk-mq-tag.c | 14 ++- + block/blk-mq.c | 50 +++++++- + block/blk-mq.h | 3 + + block/blk-throttle.c | 13 +- + block/cfq-iosched.c | 15 +-- + block/genhd.c | 43 ++++++- + block/partition-generic.c | 7 +- + drivers/block/DAC960.c | 12 +- + drivers/block/drbd/drbd_req.c | 10 +- + drivers/block/null_blk.c | 11 +- + drivers/block/rsxx/dev.c | 6 +- + drivers/block/zram/zram_drv.c | 5 +- + drivers/md/bcache/request.c | 7 +- + drivers/md/dm-crypt.c | 3 - + drivers/md/dm.c | 6 +- + drivers/nvdimm/nd.h | 5 +- + fs/kernfs/dir.c | 111 ++++++++++++---- + fs/kernfs/file.c | 10 +- + fs/kernfs/inode.c | 9 +- + fs/kernfs/kernfs-internal.h | 9 ++ + fs/kernfs/mount.c | 94 ++++++++++++-- + fs/kernfs/symlink.c | 6 +- + include/linux/bio.h | 9 +- + include/linux/blk-cgroup.h | 3 + + include/linux/blktrace_api.h | 13 +- + include/linux/cgroup.h | 16 ++- + include/linux/genhd.h | 26 ++-- + include/linux/kernfs.h | 28 ++++- + include/trace/events/writeback.h | 2 +- + include/uapi/linux/blktrace_api.h | 3 + + kernel/cgroup/cgroup.c | 15 ++- + kernel/trace/blktrace.c | 259 ++++++++++++++++++++++++++------------ + 37 files changed, 669 insertions(+), 243 deletions(-) +Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c) +$ git merge lightnvm/for-next +Already up-to-date. +Merging device-mapper/for-next (2298b6212f1c dm ioctl: constify ioctl lookup table) +$ git merge device-mapper/for-next +Auto-merging drivers/md/dm-crypt.c +Merge made by the 'recursive' strategy. + 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 | 14 +++++-- + drivers/md/dm-ioctl.c | 2 +- + drivers/md/dm-mpath.c | 10 ++--- + 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 +- + include/linux/device-mapper.h | 4 +- + 13 files changed, 106 insertions(+), 51 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 (7bb2a5d1342f Merge branch 'fixes' into next) +$ git merge mmc/next +Auto-merging arch/arc/boot/dts/axs10x_mb.dtsi +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/renesas,mmcif.txt | 3 +- + .../devicetree/bindings/mmc/rockchip-dw-mshc.txt | 1 + + .../devicetree/bindings/mmc/sunxi-mmc.txt | 1 + + arch/arc/boot/dts/axs10x_mb.dtsi | 1 - + arch/arc/boot/dts/vdk_axs10x_mb.dtsi | 1 - + drivers/clk/sunxi-ng/Makefile | 1 + + drivers/clk/sunxi-ng/ccu-sun8i-a83t.c | 10 +- + drivers/clk/sunxi-ng/ccu_common.h | 4 + + drivers/clk/sunxi-ng/ccu_mmc_timing.c | 70 +++++ + drivers/clk/sunxi-ng/ccu_mp.c | 80 ++++++ + drivers/clk/sunxi-ng/ccu_mp.h | 30 +++ + drivers/mmc/Kconfig | 7 - + drivers/mmc/Makefile | 2 - + drivers/mmc/core/block.c | 4 +- + drivers/mmc/core/core.c | 59 ++--- + drivers/mmc/core/mmc.c | 10 +- + drivers/mmc/core/mmc_ops.c | 2 +- + drivers/mmc/core/sd.c | 12 +- + drivers/mmc/host/Kconfig | 32 ++- + drivers/mmc/host/Makefile | 8 +- + drivers/mmc/host/android-goldfish.c | 8 +- + drivers/mmc/host/atmel-mci.c | 10 +- + drivers/mmc/host/bcm2835.c | 2 +- + drivers/mmc/host/cavium.c | 6 +- + drivers/mmc/host/davinci_mmc.c | 2 +- + drivers/mmc/host/dw_mmc.c | 2 +- + drivers/mmc/host/moxart-mmc.c | 2 +- + drivers/mmc/host/mtk-sd.c | 3 +- + drivers/mmc/host/mxcmmc.c | 34 ++- + drivers/mmc/host/of_mmc_spi.c | 2 +- + drivers/mmc/host/omap_hsmmc.c | 10 +- + drivers/mmc/host/renesas_sdhi.h | 2 + + drivers/mmc/host/renesas_sdhi_core.c | 21 +- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 286 +++++++++++++++++++++ + drivers/mmc/host/renesas_sdhi_sys_dmac.c | 23 +- + drivers/mmc/host/rtsx_usb_sdmmc.c | 2 +- + drivers/mmc/host/s3cmci.c | 2 +- + drivers/mmc/host/sdhci-acpi.c | 7 +- + drivers/mmc/host/sdhci-bcm-kona.c | 4 +- + drivers/mmc/host/sdhci-brcmstb.c | 2 +- + drivers/mmc/host/sdhci-msm.c | 5 +- + drivers/mmc/host/sdhci-of-arasan.c | 8 +- + drivers/mmc/host/sdhci-of-at91.c | 177 ++++++++----- + drivers/mmc/host/sdhci-pci-core.c | 20 ++ + drivers/mmc/host/sdhci-pic32.c | 2 +- + drivers/mmc/host/sdhci-pxav3.c | 2 +- + drivers/mmc/host/sdhci-sirf.c | 4 +- + drivers/mmc/host/sdhci-st.c | 28 +- + drivers/mmc/host/sdhci-tegra.c | 3 +- + drivers/mmc/host/sdhci-xenon.c | 5 +- + drivers/mmc/host/sdhci.c | 31 ++- + drivers/mmc/host/sdhci.h | 3 + + drivers/mmc/host/sdricoh_cs.c | 2 +- + drivers/mmc/host/sh_mmcif.c | 2 +- + drivers/mmc/host/sunxi-mmc.c | 91 +++++-- + drivers/mmc/host/tmio_mmc.h | 9 +- + drivers/mmc/host/tmio_mmc_core.c | 32 ++- + drivers/mmc/host/toshsd.c | 2 +- + drivers/mmc/host/usdhi6rol0.c | 2 +- + drivers/mmc/host/via-sdmmc.c | 2 +- + drivers/mmc/host/vub300.c | 2 +- + drivers/mmc/host/wbsd.c | 2 - + drivers/mmc/host/wmt-sdmmc.c | 8 +- + include/linux/clk/sunxi-ng.h | 35 +++ + include/linux/mfd/tmio.h | 2 + + include/linux/mmc/card.h | 4 +- + include/linux/mmc/host.h | 3 - + 67 files changed, 982 insertions(+), 272 deletions(-) + create mode 100644 drivers/clk/sunxi-ng/ccu_mmc_timing.c + create mode 100644 drivers/mmc/host/renesas_sdhi_internal_dmac.c + create mode 100644 include/linux/clk/sunxi-ng.h +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 (fb15258a6f4a md/r5cache: call mddev_lock/unlock() in r5c_journal_mode_show) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + drivers/md/md.c | 9 ++++-- + drivers/md/raid5-cache.c | 73 +++++++++++++++++++++++++++++++++++++----------- + 2 files changed, 63 insertions(+), 19 deletions(-) +Merging mfd/for-mfd-next (af74963b8c0a mfd: lp87565: Convert to use devm_mfd_add_devices()) +$ git merge mfd/for-mfd-next +Auto-merging drivers/mtd/nand/atmel/nand-controller.c +Auto-merging drivers/mfd/atmel-smc.c +Auto-merging drivers/memory/atmel-ebi.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mfd/atmel-smc.txt | 1 + + Documentation/devicetree/bindings/mfd/axp20x.txt | 50 ++++- + .../devicetree/bindings/mfd/da9052-i2c.txt | 8 + + MAINTAINERS | 11 + + drivers/memory/atmel-ebi.c | 13 +- + drivers/mfd/Kconfig | 33 +++ + drivers/mfd/Makefile | 2 + + drivers/mfd/ab8500-core.c | 6 +- + drivers/mfd/atmel-smc.c | 67 ++++-- + drivers/mfd/axp20x-rsb.c | 1 + + drivers/mfd/axp20x.c | 32 ++- + drivers/mfd/bd9571mwv.c | 230 +++++++++++++++++++++ + drivers/mfd/da9052-core.c | 2 + + drivers/mfd/hi6421-pmic-core.c | 89 +++++--- + drivers/mfd/lp87565.c | 7 +- + drivers/mfd/lpc_ich.c | 10 - + drivers/mfd/max8925-i2c.c | 2 +- + drivers/mfd/max8998.c | 6 +- + drivers/mfd/rtsx_pcr.c | 4 +- + drivers/mfd/tps68470.c | 106 ++++++++++ + drivers/mfd/twl-core.c | 4 +- + drivers/mtd/nand/atmel/nand-controller.c | 10 +- + include/linux/mfd/axp20x.h | 29 +++ + include/linux/mfd/bd9571mwv.h | 115 +++++++++++ + include/linux/mfd/hi6421-pmic.h | 5 + + include/linux/mfd/syscon/atmel-smc.h | 32 ++- + include/linux/mfd/tps68470.h | 97 +++++++++ + 27 files changed, 874 insertions(+), 98 deletions(-) + create mode 100644 drivers/mfd/bd9571mwv.c + create mode 100644 drivers/mfd/tps68470.c + create mode 100644 include/linux/mfd/bd9571mwv.h + create mode 100644 include/linux/mfd/tps68470.h +Merging backlight/for-backlight-next (2606706e4d7b backlight: gpio_backlight: Delete pdata inversion) +$ git merge backlight/for-backlight-next +Merge made by the 'recursive' strategy. + drivers/video/backlight/gpio_backlight.c | 62 +++++++++++++++------------- + drivers/video/backlight/lm3630a_bl.c | 5 ++- + drivers/video/backlight/pwm_bl.c | 2 +- + include/linux/platform_data/gpio_backlight.h | 1 - + 4 files changed, 37 insertions(+), 33 deletions(-) +Merging battery/for-next (67bd22c09ac1 power: supply: bq27xxx: move platform driver code into bq27xxx_battery_hdq.c) +$ git merge battery/for-next +Removing drivers/w1/slaves/w1_bq27000.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/supply/ltc2941.txt | 15 +- + drivers/power/reset/at91-sama5d2_shdwc.c | 4 +- + drivers/power/supply/Kconfig | 23 ++ + drivers/power/supply/Makefile | 2 + + drivers/power/supply/act8945a_charger.c | 4 +- + drivers/power/supply/bq27xxx_battery.c | 104 ----- + drivers/power/supply/bq27xxx_battery_hdq.c | 135 +++++++ + drivers/power/supply/ltc2941-battery-gauge.c | 156 +++++-- + drivers/power/supply/max1721x_battery.c | 448 +++++++++++++++++++++ + drivers/power/supply/pcf50633-charger.c | 2 +- + drivers/power/supply/sbs-battery.c | 26 +- + drivers/w1/slaves/Kconfig | 6 - + drivers/w1/slaves/Makefile | 1 - + drivers/w1/slaves/w1_bq27000.c | 117 ------ + include/linux/power/bq27xxx_battery.h | 17 - + 15 files changed, 746 insertions(+), 314 deletions(-) + create mode 100644 drivers/power/supply/bq27xxx_battery_hdq.c + create mode 100644 drivers/power/supply/max1721x_battery.c + delete mode 100644 drivers/w1/slaves/w1_bq27000.c +Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (485dbd53900a Merge remote-tracking branches 'regulator/topic/cpcap', 'regulator/topic/dt', 'regulator/topic/fan53555', 'regulator/topic/pwm' and 'regulator/topic/qcom' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regulator/pwm-regulator.txt | 2 +- + drivers/regulator/axp20x-regulator.c | 6 ++++++ + drivers/regulator/core.c | 16 ++++++++++++---- + drivers/regulator/cpcap-regulator.c | 21 ++++++++++++++++++--- + drivers/regulator/fan53555.c | 10 ++-------- + drivers/regulator/max1586.c | 2 +- + drivers/regulator/of_regulator.c | 2 +- + drivers/regulator/pwm-regulator.c | 6 ++---- + drivers/regulator/qcom_rpm-regulator.c | 5 +++++ + drivers/regulator/qcom_smd-regulator.c | 5 +++++ + drivers/regulator/s5m8767.c | 4 ++-- + drivers/reset/reset-socfpga.c | 4 ++-- + 12 files changed, 57 insertions(+), 26 deletions(-) +Merging security/next (be6f039747e7 security: fix description of values returned by cap_inode_need_killpriv) +$ git merge security/next +Merge made by the 'recursive' strategy. + Documentation/admin-guide/LSM/tomoyo.rst | 24 ++++++++++++------------ + include/linux/lsm_hooks.h | 7 ------- + include/linux/security.h | 6 ------ + kernel/fork.c | 4 ---- + security/commoncap.c | 6 +++--- + security/security.c | 5 ----- + 6 files changed, 15 insertions(+), 37 deletions(-) +Merging integrity/next (fc26bd50539b IMA: update IMA policy documentation to include pcr= option) +$ git merge integrity/next +Already up-to-date. +Merging keys/keys-next (8ab2a6905b28 KEYS: Add documentation for asymmetric keyring restrictions) +$ git merge keys/keys-next +Merge made by the 'recursive' strategy. +Merging selinux/next (476accbe2f6e selinux: use GFP_NOWAIT in the AVC kmem_caches) +$ git merge selinux/next +Auto-merging security/selinux/hooks.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + CREDITS | 8 +++--- + MAINTAINERS | 5 ++-- + scripts/selinux/genheaders/genheaders.c | 7 ++++- + security/selinux/avc.c | 14 +++++----- + security/selinux/hooks.c | 48 ++++++++++++++++++++++----------- + security/selinux/include/classmap.h | 2 ++ + security/selinux/include/security.h | 2 ++ + security/selinux/ss/services.c | 7 ++++- + 8 files changed, 61 insertions(+), 32 deletions(-) +Merging tpmdd/next (20ae91be32b5 Documentation: tpm: add powered-while-suspended binding documentation) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt | 6 ++++++ + drivers/char/tpm/tpm_crb.c | 2 +- + 2 files changed, 7 insertions(+), 1 deletion(-) +Merging watchdog/master (c013b65ad8a1 watchdog: introduce watchdog_worker_should_ping helper) +$ git merge watchdog/master +Already up-to-date. +Merging iommu/next (a7521d49605b Merge branches 'iommu/fixes', 'arm/exynos', 'arm/renesas', 'arm/rockchip', 'arm/omap', 'arm/mediatek', 'x86/vt-d' and 'core' into next) +$ git merge iommu/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/iommu/rockchip,iommu.txt | 5 + + .../memory-controllers/mediatek,smi-larb.txt | 15 ++ + drivers/iommu/Kconfig | 1 + + drivers/iommu/exynos-iommu.c | 40 +---- + drivers/iommu/fsl_pamu.c | 20 +-- + drivers/iommu/fsl_pamu_domain.c | 10 +- + drivers/iommu/intel-iommu.c | 38 ++-- + drivers/iommu/ipmmu-vmsa.c | 192 +++++---------------- + drivers/iommu/of_iommu.c | 107 ++++++------ + drivers/iommu/omap-iommu.c | 125 +++++++++----- + drivers/iommu/omap-iommu.h | 1 + + drivers/iommu/rockchip-iommu.c | 52 ++++-- + drivers/memory/mtk-smi.c | 26 +-- + include/linux/iommu.h | 4 +- + 14 files changed, 297 insertions(+), 339 deletions(-) +Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (7f56c30bd0a2 vfio: Remove unnecessary uses of vfio_container.group_lock) +$ git merge vfio/next +Already up-to-date. +Merging trivial/for-next (6fbc8798d946 tty: fix comment for __tty_alloc_driver()) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/next (4070ad3e8ffa audit: update the function comments) +$ git merge audit/next +Auto-merging security/selinux/avc.c +Auto-merging kernel/auditsc.c +Auto-merging kernel/audit.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 7 ++++--- + kernel/audit.c | 4 ++-- + kernel/auditsc.c | 20 ++++++++++---------- + security/selinux/avc.c | 2 -- + 4 files changed, 16 insertions(+), 17 deletions(-) +Merging devicetree/for-next (a5d9f249ddec of: Update Moxa vendor prefix description) +$ git merge devicetree/for-next +Auto-merging drivers/of/property.c +Auto-merging drivers/of/of_mdio.c +Auto-merging drivers/of/irq.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/chosen.txt | 26 +++- + .../devicetree/bindings/clock/silabs,si5351.txt | 6 +- + .../devicetree/bindings/clock/ti,sci-clk.txt | 7 +- + .../devicetree/bindings/gpu/arm,mali-utgard.txt | 5 + + .../devicetree/bindings/input/ti,drv260x.txt | 2 +- + .../devicetree/bindings/nvmem/mtk-efuse.txt | 5 +- + Documentation/devicetree/bindings/pci/pci.txt | 4 +- + .../devicetree/bindings/trivial-devices.txt | 10 ++ + .../devicetree/bindings/usb/usb-device.txt | 2 +- + .../devicetree/bindings/vendor-prefixes.txt | 2 +- + Documentation/devicetree/booting-without-of.txt | 2 +- + drivers/of/address.c | 24 ++-- + drivers/of/base.c | 46 +++---- + drivers/of/device.c | 68 ++++------ + drivers/of/dynamic.c | 33 +++-- + drivers/of/irq.c | 77 +++++------ + drivers/of/of_mdio.c | 4 +- + drivers/of/of_pci.c | 72 +++++------ + drivers/of/overlay.c | 142 ++++++++++++++++++--- + drivers/of/platform.c | 32 ++--- + drivers/of/property.c | 19 ++- + drivers/of/unittest-data/Makefile | 19 ++- + drivers/of/unittest-data/overlay.dts | 25 +++- + drivers/of/unittest-data/overlay_bad_symbol.dts | 22 ++++ + drivers/of/unittest-data/overlay_base.dts | 11 ++ + drivers/of/unittest.c | 77 ++++++----- + 26 files changed, 462 insertions(+), 280 deletions(-) + create mode 100644 drivers/of/unittest-data/overlay_bad_symbol.dts +Merging mailbox/mailbox-for-next (25bfee16d5a3 mailbox: Introduce Qualcomm APCS IPC driver) +$ git merge mailbox/mailbox-for-next +Already up-to-date. +Merging spi/for-next (051dd7553387 Merge remote-tracking branches 'spi/topic/tools' and 'spi/topic/xlp' into spi-next) +$ git merge spi/for-next +Auto-merging drivers/spi/spi.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/fsl-imx-cspi.txt | 1 + + Documentation/devicetree/bindings/spi/sh-msiof.txt | 1 + + drivers/spi/Kconfig | 4 +- + drivers/spi/spi-ath79.c | 13 +- + drivers/spi/spi-bcm-qspi.c | 89 ++-- + drivers/spi/spi-bcm63xx-hsspi.c | 10 +- + drivers/spi/spi-bcm63xx.c | 4 +- + drivers/spi/spi-cadence.c | 4 +- + drivers/spi/spi-ep93xx.c | 501 +++++++----------- + drivers/spi/spi-imx.c | 56 +- + drivers/spi/spi-loopback-test.c | 34 +- + drivers/spi/spi-orion.c | 4 +- + drivers/spi/spi-pic32.c | 4 +- + drivers/spi/spi-pxa2xx.c | 35 +- + drivers/spi/spi-pxa2xx.h | 2 +- + drivers/spi/spi-qup.c | 566 ++++++++++++++------- + drivers/spi/spi-rockchip.c | 51 +- + drivers/spi/spi-sh-msiof.c | 32 +- + drivers/spi/spi-sh.c | 4 +- + drivers/spi/spi-stm32.c | 2 +- + drivers/spi/spi-sun6i.c | 2 +- + drivers/spi/spi-tegra114.c | 2 +- + drivers/spi/spi-tegra20-sflash.c | 2 +- + drivers/spi/spi-tegra20-slink.c | 2 +- + drivers/spi/spi-xlp.c | 4 +- + drivers/spi/spi.c | 40 +- + tools/Makefile | 4 +- + tools/spi/Build | 2 + + tools/spi/Makefile | 64 ++- + 29 files changed, 857 insertions(+), 682 deletions(-) + create mode 100644 tools/spi/Build +Merging tip/auto-latest (f74b4d835d21 Merge branch 'x86/urgent' into auto-latest) +$ git merge tip/auto-latest +Resolved 'drivers/video/fbdev/core/fbmem.c' using previous resolution. +Auto-merging tools/perf/tests/attr/test-record-no-buffering +Auto-merging scripts/Makefile.build +Auto-merging kernel/futex.c +Auto-merging kernel/events/core.c +Auto-merging include/linux/syscalls.h +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging drivers/video/fbdev/core/fbmem.c +CONFLICT (content): Merge conflict in drivers/video/fbdev/core/fbmem.c +Auto-merging drivers/iommu/amd_iommu_init.c +Auto-merging drivers/iommu/amd_iommu.c +Auto-merging drivers/gpu/drm/udl/udl_fb.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo_vm.c +Auto-merging drivers/gpu/drm/drm_gem.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx.c +Auto-merging arch/x86/kvm/svm.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c +Auto-merging arch/x86/kernel/cpu/intel_rdt.h +Auto-merging arch/x86/kernel/acpi/boot.c +Removing arch/x86/include/asm/intel_rdt_common.h +Removing arch/x86/events/intel/cqm.c +Auto-merging arch/arm64/kernel/signal.c +Auto-merging arch/arm64/include/asm/uaccess.h +Auto-merging arch/arm/kernel/entry-common.S +Auto-merging MAINTAINERS +Removing Documentation/x86/early-microcode.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8dd588810d0a] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 13 + + Documentation/x86/amd-memory-encryption.txt | 68 + + Documentation/x86/early-microcode.txt | 70 - + Documentation/x86/intel_rdt_ui.txt | 323 +++- + Documentation/x86/microcode.txt | 137 ++ + Documentation/x86/orc-unwinder.txt | 179 ++ + Documentation/x86/protection-keys.txt | 6 +- + Documentation/x86/x86_64/5level-paging.txt | 64 + + MAINTAINERS | 2 +- + arch/arm/include/asm/thread_info.h | 15 +- + arch/arm/include/asm/uaccess.h | 2 + + arch/arm/kernel/entry-common.S | 9 +- + arch/arm/kernel/signal.c | 5 + + arch/arm64/include/asm/thread_info.h | 4 +- + arch/arm64/include/asm/uaccess.h | 3 + + arch/arm64/kernel/signal.c | 5 + + arch/ia64/include/asm/acpi.h | 2 - + arch/ia64/kernel/efi.c | 4 +- + arch/um/include/asm/unwind.h | 8 + + arch/x86/Kconfig | 64 +- + arch/x86/Kconfig.debug | 59 +- + arch/x86/boot/compressed/kaslr.c | 63 +- + arch/x86/boot/compressed/pagetable.c | 7 + + arch/x86/configs/tiny.config | 2 + + arch/x86/entry/Makefile | 1 - + arch/x86/entry/calling.h | 5 + + arch/x86/entry/common.c | 3 + + arch/x86/entry/entry_64.S | 170 +- + arch/x86/events/intel/Makefile | 2 +- + arch/x86/events/intel/cqm.c | 1766 -------------------- + arch/x86/events/intel/lbr.c | 52 +- + arch/x86/ia32/ia32_signal.c | 2 +- + arch/x86/include/asm/acpi.h | 13 +- + arch/x86/include/asm/atomic.h | 69 +- + arch/x86/include/asm/atomic64_32.h | 81 +- + arch/x86/include/asm/atomic64_64.h | 73 +- + arch/x86/include/asm/cmdline.h | 2 + + arch/x86/include/asm/cmpxchg.h | 2 +- + arch/x86/include/asm/cpufeatures.h | 1 + + arch/x86/include/asm/disabled-features.h | 4 +- + arch/x86/include/asm/dma-mapping.h | 5 +- + arch/x86/include/asm/dmi.h | 8 +- + arch/x86/include/asm/e820/api.h | 2 + + arch/x86/include/asm/elf.h | 14 +- + arch/x86/include/asm/fixmap.h | 20 + + arch/x86/include/asm/init.h | 1 + + arch/x86/include/asm/intel_rdt_common.h | 27 - + arch/x86/include/asm/intel_rdt_sched.h | 88 + + arch/x86/include/asm/io.h | 106 +- + arch/x86/include/asm/kexec.h | 11 +- + arch/x86/include/asm/kvm_host.h | 2 +- + arch/x86/include/asm/mem_encrypt.h | 80 + + arch/x86/include/asm/mmu.h | 25 +- + arch/x86/include/asm/mmu_context.h | 15 +- + arch/x86/include/asm/module.h | 9 + + arch/x86/include/asm/mpx.h | 9 + + arch/x86/include/asm/msr-index.h | 2 + + arch/x86/include/asm/orc_lookup.h | 46 + + arch/x86/include/asm/orc_types.h | 107 ++ + arch/x86/include/asm/page_types.h | 3 +- + arch/x86/include/asm/pgtable.h | 28 +- + arch/x86/include/asm/pgtable_types.h | 58 +- + arch/x86/include/asm/processor-flags.h | 7 +- + arch/x86/include/asm/processor.h | 23 +- + arch/x86/include/asm/ptrace.h | 32 +- + arch/x86/include/asm/realmode.h | 12 + + arch/x86/include/asm/rmwcc.h | 37 +- + arch/x86/include/asm/set_memory.h | 3 + + arch/x86/include/asm/thread_info.h | 5 +- + arch/x86/include/asm/tlbflush.h | 87 +- + arch/x86/include/asm/topology.h | 6 - + arch/x86/include/asm/uaccess.h | 7 +- + arch/x86/include/asm/unwind.h | 76 +- + arch/x86/include/asm/unwind_hints.h | 103 ++ + arch/x86/include/asm/vga.h | 14 +- + arch/x86/kernel/Makefile | 8 +- + arch/x86/kernel/acpi/boot.c | 6 +- + arch/x86/kernel/cpu/Makefile | 2 +- + arch/x86/kernel/cpu/amd.c | 29 +- + arch/x86/kernel/cpu/bugs.c | 8 + + arch/x86/kernel/cpu/common.c | 40 + + arch/x86/kernel/cpu/intel_rdt.c | 214 ++- + arch/x86/{include/asm => kernel/cpu}/intel_rdt.h | 262 ++- + ...ntel_rdt_schemata.c => intel_rdt_ctrlmondata.c} | 67 +- + arch/x86/kernel/cpu/intel_rdt_monitor.c | 523 ++++++ + arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 1129 ++++++++++--- + arch/x86/kernel/cpu/mcheck/mce_amd.c | 9 +- + arch/x86/kernel/cpu/microcode/amd.c | 5 +- + arch/x86/kernel/cpu/scattered.c | 1 + + arch/x86/kernel/dumpstack.c | 14 +- + arch/x86/kernel/dumpstack_32.c | 4 +- + arch/x86/kernel/dumpstack_64.c | 4 +- + arch/x86/kernel/e820.c | 26 +- + arch/x86/kernel/espfix_64.c | 2 +- + arch/x86/kernel/head64.c | 93 +- + arch/x86/kernel/head_32.S | 20 +- + arch/x86/kernel/head_64.S | 40 +- + arch/x86/kernel/kdebugfs.c | 34 +- + arch/x86/kernel/ksysfs.c | 28 +- + arch/x86/kernel/ldt.c | 21 + + arch/x86/kernel/machine_kexec_64.c | 25 +- + arch/x86/kernel/module.c | 11 +- + arch/x86/kernel/mpparse.c | 108 +- + arch/x86/kernel/pci-dma.c | 11 +- + arch/x86/kernel/pci-nommu.c | 2 +- + arch/x86/kernel/pci-swiotlb.c | 15 +- + arch/x86/kernel/process.c | 17 +- + arch/x86/kernel/process_32.c | 4 +- + arch/x86/kernel/process_64.c | 8 +- + arch/x86/kernel/relocate_kernel_64.S | 14 + + arch/x86/kernel/setup.c | 12 + + arch/x86/kernel/signal.c | 2 +- + arch/x86/kernel/step.c | 2 +- + arch/x86/kernel/sys_x86_64.c | 30 +- + arch/x86/kernel/unwind_frame.c | 39 +- + arch/x86/kernel/unwind_guess.c | 5 + + arch/x86/kernel/unwind_orc.c | 582 +++++++ + arch/x86/kernel/vmlinux.lds.S | 3 + + arch/x86/kvm/mmu.c | 11 +- + arch/x86/kvm/mmu.h | 2 +- + arch/x86/kvm/svm.c | 35 +- + arch/x86/kvm/vmx.c | 2 +- + arch/x86/kvm/x86.c | 3 +- + arch/x86/lib/cmdline.c | 105 ++ + arch/x86/mm/Makefile | 2 + + arch/x86/mm/dump_pagetables.c | 93 +- + arch/x86/mm/extable.c | 2 +- + arch/x86/mm/hugetlbpage.c | 27 +- + arch/x86/mm/ident_map.c | 12 +- + arch/x86/mm/init.c | 2 +- + arch/x86/mm/ioremap.c | 287 +++- + arch/x86/mm/kasan_init_64.c | 6 +- + arch/x86/mm/mem_encrypt.c | 593 +++++++ + arch/x86/mm/mem_encrypt_boot.S | 149 ++ + arch/x86/mm/mmap.c | 12 +- + arch/x86/mm/mpx.c | 33 +- + arch/x86/mm/numa_emulation.c | 55 +- + arch/x86/mm/pageattr.c | 67 + + arch/x86/mm/pat.c | 9 +- + arch/x86/mm/tlb.c | 331 +++- + arch/x86/pci/common.c | 4 +- + arch/x86/pci/intel_mid_pci.c | 12 +- + arch/x86/platform/efi/efi.c | 6 +- + arch/x86/platform/efi/efi_64.c | 15 +- + .../intel-mid/device_libs/platform_mrfld_wdt.c | 6 +- + arch/x86/platform/intel-mid/intel-mid.c | 2 +- + arch/x86/realmode/init.c | 12 + + arch/x86/realmode/rm/trampoline_64.S | 24 + + arch/x86/xen/Kconfig | 5 + + arch/x86/xen/enlighten_pv.c | 7 + + arch/x86/xen/mmu_pv.c | 5 +- + arch/x86/xen/xen-head.S | 2 +- + drivers/acpi/processor_idle.c | 2 - + drivers/firmware/dmi-sysfs.c | 5 +- + drivers/firmware/efi/efi.c | 33 + + drivers/firmware/pcdp.c | 4 +- + drivers/gpu/drm/drm_gem.c | 2 + + drivers/gpu/drm/drm_vm.c | 4 + + drivers/gpu/drm/ttm/ttm_bo_vm.c | 7 +- + drivers/gpu/drm/udl/udl_fb.c | 4 + + drivers/idle/intel_idle.c | 9 +- + drivers/iommu/amd_iommu.c | 30 +- + drivers/iommu/amd_iommu_init.c | 34 +- + drivers/iommu/amd_iommu_proto.h | 10 + + drivers/iommu/amd_iommu_types.h | 2 +- + drivers/sfi/sfi_core.c | 23 +- + drivers/video/fbdev/core/fbmem.c | 12 + + include/asm-generic/early_ioremap.h | 2 + + include/asm-generic/io.h | 27 + + include/asm-generic/pgtable.h | 12 + + include/asm-generic/vmlinux.lds.h | 27 +- + include/linux/compiler-gcc.h | 13 +- + include/linux/compiler.h | 32 +- + include/linux/dma-mapping.h | 13 + + include/linux/efi.h | 9 +- + include/linux/futex.h | 7 +- + include/linux/io.h | 2 + + include/linux/kasan-checks.h | 10 +- + include/linux/kexec.h | 8 + + include/linux/mem_encrypt.h | 48 + + include/linux/perf_event.h | 18 - + include/linux/sched.h | 5 +- + include/linux/swiotlb.h | 1 + + include/linux/syscalls.h | 16 + + include/uapi/linux/perf_event.h | 27 +- + init/Kconfig | 7 +- + init/main.c | 10 + + kernel/cpu.c | 12 +- + kernel/events/core.c | 14 +- + kernel/futex.c | 22 + + kernel/kexec_core.c | 12 +- + kernel/locking/rtmutex_common.h | 29 + + kernel/memremap.c | 20 +- + lib/Kconfig.debug | 9 +- + lib/swiotlb.c | 57 +- + mm/early_ioremap.c | 28 +- + mm/kasan/kasan.c | 4 +- + scripts/Makefile.build | 17 +- + tools/arch/x86/include/asm/unistd_32.h | 3 + + tools/arch/x86/include/asm/unistd_64.h | 3 + + tools/arch/x86/include/uapi/asm/unistd.h | 17 + + tools/build/Makefile.feature | 3 +- + tools/build/feature/Makefile | 6 +- + tools/build/feature/test-all.c | 5 + + tools/build/feature/test-setns.c | 7 + + tools/include/linux/string.h | 12 +- + tools/include/uapi/asm-generic/fcntl.h | 220 +++ + tools/include/uapi/linux/fcntl.h | 21 + + tools/include/uapi/linux/perf_event.h | 27 +- + tools/include/uapi/linux/sched.h | 52 + + tools/lib/string.c | 41 +- + tools/lib/subcmd/help.c | 2 +- + tools/lib/subcmd/parse-options.c | 18 +- + tools/objtool/Build | 3 + + tools/objtool/Documentation/stack-validation.txt | 56 +- + tools/objtool/Makefile | 6 +- + tools/objtool/arch.h | 5 +- + tools/objtool/arch/x86/decode.c | 43 +- + tools/objtool/builtin-check.c | 7 +- + tools/objtool/builtin-orc.c | 70 + + tools/objtool/builtin.h | 1 + + tools/objtool/check.c | 345 +++- + tools/objtool/check.h | 19 +- + tools/objtool/elf.c | 212 ++- + tools/objtool/elf.h | 15 +- + tools/objtool/objtool.c | 3 +- + tools/objtool/orc.h | 30 + + tools/objtool/orc_dump.c | 212 +++ + tools/objtool/orc_gen.c | 214 +++ + tools/objtool/orc_types.h | 107 ++ + tools/perf/Build | 2 +- + tools/perf/Documentation/perf-buildid-cache.txt | 5 + + tools/perf/Documentation/perf-probe.txt | 14 + + tools/perf/Documentation/perf-record.txt | 1 + + tools/perf/Documentation/perf-top.txt | 4 + + tools/perf/Documentation/perf.data-file-format.txt | 10 +- + tools/perf/MANIFEST | 2 + + tools/perf/Makefile.config | 5 + + tools/perf/Makefile.perf | 10 +- + tools/perf/arch/powerpc/util/sym-handling.c | 2 +- + tools/perf/arch/s390/util/Build | 1 + + tools/perf/arch/s390/util/sym-handling.c | 22 + + tools/perf/arch/x86/annotate/instructions.c | 46 + + tools/perf/arch/x86/util/intel-pt.c | 3 + + tools/perf/builtin-annotate.c | 7 +- + tools/perf/builtin-buildid-cache.c | 54 +- + tools/perf/builtin-config.c | 3 +- + tools/perf/builtin-data.c | 2 +- + tools/perf/builtin-ftrace.c | 2 +- + tools/perf/builtin-help.c | 6 +- + tools/perf/builtin-inject.c | 1 + + tools/perf/builtin-probe.c | 45 +- + tools/perf/builtin-record.c | 9 +- + tools/perf/builtin-report.c | 57 +- + tools/perf/builtin-script.c | 11 +- + tools/perf/builtin-stat.c | 30 +- + tools/perf/builtin-top.c | 22 +- + tools/perf/builtin-trace.c | 704 ++++---- + tools/perf/check-headers.sh | 2 + + tools/perf/perf.c | 16 +- + tools/perf/perf.h | 1 + + tools/perf/pmu-events/README | 4 - + tools/perf/pmu-events/arch/powerpc/mapfile.csv | 4 + + .../perf/pmu-events/arch/powerpc/power9/cache.json | 176 ++ + .../arch/powerpc/power9/floating-point.json | 44 + + .../pmu-events/arch/powerpc/power9/frontend.json | 446 +++++ + .../pmu-events/arch/powerpc/power9/marked.json | 782 +++++++++ + .../pmu-events/arch/powerpc/power9/memory.json | 158 ++ + .../perf/pmu-events/arch/powerpc/power9/other.json | 836 +++++++++ + .../pmu-events/arch/powerpc/power9/pipeline.json | 680 ++++++++ + tools/perf/pmu-events/arch/powerpc/power9/pmc.json | 146 ++ + .../arch/powerpc/power9/translation.json | 272 +++ + tools/perf/pmu-events/jevents.c | 21 +- + tools/perf/tests/attr.c | 12 +- + tools/perf/tests/attr.py | 50 +- + tools/perf/tests/attr/base-record | 6 +- + tools/perf/tests/attr/base-stat | 4 +- + tools/perf/tests/attr/test-record-C0 | 1 + + tools/perf/tests/attr/test-record-basic | 1 + + tools/perf/tests/attr/test-record-branch-any | 2 +- + .../perf/tests/attr/test-record-branch-filter-any | 2 +- + .../tests/attr/test-record-branch-filter-any_call | 2 +- + .../tests/attr/test-record-branch-filter-any_ret | 2 +- + tools/perf/tests/attr/test-record-branch-filter-hv | 2 +- + .../tests/attr/test-record-branch-filter-ind_call | 2 +- + tools/perf/tests/attr/test-record-branch-filter-k | 2 +- + tools/perf/tests/attr/test-record-branch-filter-u | 2 +- + tools/perf/tests/attr/test-record-count | 1 + + tools/perf/tests/attr/test-record-data | 3 +- + tools/perf/tests/attr/test-record-freq | 1 + + tools/perf/tests/attr/test-record-graph-default | 1 + + tools/perf/tests/attr/test-record-graph-dwarf | 4 +- + tools/perf/tests/attr/test-record-graph-fp | 1 + + tools/perf/tests/attr/test-record-group | 1 + + tools/perf/tests/attr/test-record-group-sampling | 1 + + tools/perf/tests/attr/test-record-group1 | 1 + + ...st-record-no-delay => test-record-no-buffering} | 4 +- + tools/perf/tests/attr/test-record-no-inherit | 1 + + tools/perf/tests/attr/test-record-no-samples | 1 + + tools/perf/tests/attr/test-record-period | 1 + + tools/perf/tests/attr/test-record-raw | 2 +- + tools/perf/tests/attr/test-stat-C0 | 4 +- + tools/perf/tests/attr/test-stat-default | 2 + + tools/perf/tests/attr/test-stat-detailed-1 | 2 + + tools/perf/tests/attr/test-stat-detailed-2 | 3 + + tools/perf/tests/attr/test-stat-detailed-3 | 5 + + tools/perf/tests/sdt.c | 8 +- + tools/perf/trace/beauty/Build | 2 + + tools/perf/trace/beauty/beauty.h | 68 + + tools/perf/trace/beauty/clone.c | 75 + + tools/perf/trace/beauty/fcntl.c | 100 ++ + tools/perf/trace/beauty/mmap.c | 3 + + tools/perf/trace/beauty/open_flags.c | 29 +- + tools/perf/trace/beauty/pid.c | 4 +- + tools/perf/ui/browser.c | 32 +- + tools/perf/ui/browser.h | 2 + + tools/perf/ui/browsers/annotate.c | 73 +- + tools/perf/ui/browsers/hists.c | 3 - + tools/perf/ui/gtk/annotate.c | 6 +- + tools/perf/ui/stdio/hist.c | 6 +- + tools/perf/util/Build | 5 + + tools/perf/util/annotate.c | 135 +- + tools/perf/util/annotate.h | 22 +- + tools/perf/util/bpf-loader.c | 2 +- + tools/perf/util/branch.c | 147 ++ + tools/perf/util/branch.h | 25 + + tools/perf/util/build-id.c | 129 +- + tools/perf/util/build-id.h | 16 +- + tools/perf/util/callchain.c | 249 ++- + tools/perf/util/callchain.h | 5 +- + tools/perf/util/cgroup.c | 8 +- + tools/perf/util/config.c | 13 +- + tools/perf/util/counts.h | 1 + + tools/perf/util/data-convert-bt.c | 127 +- + tools/perf/util/dso.c | 21 +- + tools/perf/util/dso.h | 3 + + tools/perf/util/event.c | 1 + + tools/perf/util/event.h | 11 +- + tools/perf/util/evlist.c | 4 +- + tools/perf/util/evlist.h | 14 +- + tools/perf/util/evsel.c | 165 +- + tools/perf/util/evsel.h | 5 +- + tools/perf/util/header.c | 1015 ++++++----- + tools/perf/util/header.h | 16 +- + tools/perf/util/hist.c | 7 +- + tools/perf/util/llvm-utils.c | 2 +- + tools/perf/util/machine.c | 46 +- + tools/perf/util/map.c | 23 +- + tools/perf/util/map.h | 2 +- + tools/perf/util/namespaces.c | 211 +++ + tools/perf/util/namespaces.h | 38 + + tools/perf/util/parse-branch-options.c | 1 + + tools/perf/util/parse-events.c | 2 +- + tools/perf/util/probe-event.c | 86 +- + tools/perf/util/probe-event.h | 10 +- + tools/perf/util/probe-file.c | 19 +- + tools/perf/util/probe-file.h | 4 +- + tools/perf/util/python-ext-sources | 1 + + .../util/scripting-engines/trace-event-python.c | 246 ++- + tools/perf/util/session.c | 4 + + tools/perf/util/setns.c | 8 + + tools/perf/util/sort.c | 2 +- + tools/perf/util/stat.c | 4 + + tools/perf/util/stat.h | 5 +- + tools/perf/util/symbol.c | 92 +- + tools/perf/util/thread.c | 3 + + tools/perf/util/thread.h | 1 + + tools/perf/util/tool.h | 10 +- + tools/perf/util/util.c | 40 +- + tools/perf/util/util.h | 8 +- + 370 files changed, 16049 insertions(+), 4512 deletions(-) + create mode 100644 Documentation/x86/amd-memory-encryption.txt + delete mode 100644 Documentation/x86/early-microcode.txt + create mode 100644 Documentation/x86/microcode.txt + create mode 100644 Documentation/x86/orc-unwinder.txt + create mode 100644 Documentation/x86/x86_64/5level-paging.txt + create mode 100644 arch/um/include/asm/unwind.h + delete mode 100644 arch/x86/events/intel/cqm.c + delete mode 100644 arch/x86/include/asm/intel_rdt_common.h + create mode 100644 arch/x86/include/asm/intel_rdt_sched.h + create mode 100644 arch/x86/include/asm/mem_encrypt.h + create mode 100644 arch/x86/include/asm/orc_lookup.h + create mode 100644 arch/x86/include/asm/orc_types.h + create mode 100644 arch/x86/include/asm/unwind_hints.h + rename arch/x86/{include/asm => kernel/cpu}/intel_rdt.h (51%) + rename arch/x86/kernel/cpu/{intel_rdt_schemata.c => intel_rdt_ctrlmondata.c} (82%) + create mode 100644 arch/x86/kernel/cpu/intel_rdt_monitor.c + create mode 100644 arch/x86/kernel/unwind_orc.c + create mode 100644 arch/x86/mm/mem_encrypt.c + create mode 100644 arch/x86/mm/mem_encrypt_boot.S + create mode 100644 include/linux/mem_encrypt.h + create mode 100644 tools/arch/x86/include/uapi/asm/unistd.h + create mode 100644 tools/build/feature/test-setns.c + create mode 100644 tools/include/uapi/asm-generic/fcntl.h + create mode 100644 tools/include/uapi/linux/sched.h + create mode 100644 tools/objtool/builtin-orc.c + create mode 100644 tools/objtool/orc.h + create mode 100644 tools/objtool/orc_dump.c + create mode 100644 tools/objtool/orc_gen.c + create mode 100644 tools/objtool/orc_types.h + create mode 100644 tools/perf/arch/s390/util/sym-handling.c + create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/cache.json + create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/frontend.json + create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/marked.json + create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/memory.json + create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/other.json + create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/pmc.json + create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/translation.json + rename tools/perf/tests/attr/{test-record-no-delay => test-record-no-buffering} (61%) + create mode 100644 tools/perf/trace/beauty/clone.c + create mode 100644 tools/perf/trace/beauty/fcntl.c + create mode 100644 tools/perf/util/branch.c + create mode 100644 tools/perf/util/branch.h + create mode 100644 tools/perf/util/setns.c +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 (3e5d2bd19138 EDAC, pnd2: Build in a minimal sideband driver for Apollo Lake) +$ git merge edac-amd/for-next +Merge made by the 'recursive' strategy. + drivers/edac/altera_edac.c | 2 - + drivers/edac/amd64_edac.c | 1 - + drivers/edac/amd76x_edac.c | 2 - + drivers/edac/cpc925_edac.c | 3 +- + drivers/edac/e752x_edac.c | 2 - + drivers/edac/e7xxx_edac.c | 2 - + drivers/edac/edac_mc_sysfs.c | 6 +-- + drivers/edac/ghes_edac.c | 3 -- + drivers/edac/highbank_mc_edac.c | 1 - + drivers/edac/i3000_edac.c | 3 -- + drivers/edac/i3200_edac.c | 3 -- + drivers/edac/i5000_edac.c | 1 - + drivers/edac/i5100_edac.c | 1 - + drivers/edac/i5400_edac.c | 1 - + drivers/edac/i7300_edac.c | 1 - + drivers/edac/i7core_edac.c | 5 +-- + drivers/edac/i82443bxgx_edac.c | 3 -- + drivers/edac/i82860_edac.c | 2 - + drivers/edac/i82875p_edac.c | 2 - + drivers/edac/i82975x_edac.c | 2 - + drivers/edac/ie31200_edac.c | 2 - + drivers/edac/mce_amd.c | 6 +-- + drivers/edac/mv64x60_edac.c | 1 - + drivers/edac/pnd2_edac.c | 88 +++++++++++++++++++++++++++-------------- + drivers/edac/ppc4xx_edac.c | 9 ++--- + drivers/edac/r82600_edac.c | 2 - + drivers/edac/sb_edac.c | 64 ++++++++++++++++++++++-------- + drivers/edac/skx_edac.c | 3 -- + drivers/edac/synopsys_edac.c | 1 - + drivers/edac/thunderx_edac.c | 1 - + drivers/edac/x38_edac.c | 3 -- + drivers/edac/xgene_edac.c | 1 - + include/linux/edac.h | 1 - + 33 files changed, 117 insertions(+), 111 deletions(-) +Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1) +$ git merge irqchip/irqchip/for-next +Already up-to-date. +Merging ftrace/for-next (a7e52ad7ed82 ring-buffer: Have ring_buffer_alloc_read_page() return error on offline CPU) +$ git merge ftrace/for-next +Merge made by the 'recursive' strategy. + kernel/trace/ring_buffer.c | 14 +++++++++----- + kernel/trace/ring_buffer_benchmark.c | 2 +- + kernel/trace/trace.c | 19 +++++++++++++------ + 3 files changed, 23 insertions(+), 12 deletions(-) +Merging rcu/rcu/next (73a1fd7c7255 documentation: Long-running irq handlers can stall RCU grace periods) +$ git merge rcu/rcu/next +Removing tools/testing/selftests/rcutorture/configs/rcu/SRCU-C.boot +Auto-merging net/netfilter/nf_conntrack_core.c +Auto-merging kernel/sched/core.c +Removing kernel/rcu/tiny_plugin.h +Removing kernel/membarrier.c +Auto-merging kernel/cpu.c +Auto-merging ipc/sem.c +Auto-merging include/linux/sched.h +Auto-merging drivers/ata/libata-eh.c +Auto-merging arch/s390/include/asm/spinlock.h +Auto-merging arch/arm64/kernel/process.c +Auto-merging arch/arc/include/asm/spinlock.h +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + .../Design/Memory-Ordering/Tree-RCU-Diagram.html | 9 + + .../Memory-Ordering/Tree-RCU-Memory-Ordering.html | 707 +++ + .../TreeRCU-callback-invocation.svg | 486 ++ + .../Memory-Ordering/TreeRCU-callback-registry.svg | 655 +++ + .../RCU/Design/Memory-Ordering/TreeRCU-dyntick.svg | 700 +++ + .../Design/Memory-Ordering/TreeRCU-gp-cleanup.svg | 1126 +++++ + .../RCU/Design/Memory-Ordering/TreeRCU-gp-fqs.svg | 1309 +++++ + .../Design/Memory-Ordering/TreeRCU-gp-init-1.svg | 656 +++ + .../Design/Memory-Ordering/TreeRCU-gp-init-2.svg | 656 +++ + .../Design/Memory-Ordering/TreeRCU-gp-init-3.svg | 632 +++ + .../RCU/Design/Memory-Ordering/TreeRCU-gp.svg | 5135 ++++++++++++++++++++ + .../RCU/Design/Memory-Ordering/TreeRCU-hotplug.svg | 775 +++ + .../RCU/Design/Memory-Ordering/TreeRCU-qs.svg | 1095 +++++ + .../RCU/Design/Memory-Ordering/rcu_node-lock.svg | 229 + + .../RCU/Design/Requirements/Requirements.html | 130 + + Documentation/RCU/checklist.txt | 121 +- + Documentation/RCU/rcu.txt | 9 +- + Documentation/RCU/rcu_dereference.txt | 61 +- + Documentation/RCU/rcubarrier.txt | 5 + + Documentation/RCU/stallwarn.txt | 12 +- + Documentation/RCU/torture.txt | 20 +- + Documentation/RCU/whatisRCU.txt | 5 +- + Documentation/admin-guide/kernel-parameters.txt | 7 +- + Documentation/core-api/kernel-api.rst | 49 + + Documentation/memory-barriers.txt | 41 +- + MAINTAINERS | 2 +- + arch/alpha/include/asm/spinlock.h | 5 - + arch/arc/include/asm/spinlock.h | 5 - + arch/arm/include/asm/spinlock.h | 16 - + arch/arm64/include/asm/spinlock.h | 58 +- + arch/arm64/kernel/process.c | 2 + + arch/blackfin/include/asm/spinlock.h | 5 - + arch/blackfin/kernel/module.c | 39 +- + arch/hexagon/include/asm/spinlock.h | 5 - + arch/ia64/include/asm/spinlock.h | 21 - + arch/m32r/include/asm/spinlock.h | 5 - + arch/metag/include/asm/spinlock.h | 5 - + arch/mn10300/include/asm/spinlock.h | 5 - + arch/parisc/include/asm/spinlock.h | 7 - + arch/powerpc/include/asm/spinlock.h | 33 - + arch/s390/include/asm/spinlock.h | 7 - + arch/sh/include/asm/spinlock-cas.h | 5 - + arch/sh/include/asm/spinlock-llsc.h | 5 - + arch/sparc/include/asm/spinlock_32.h | 5 - + arch/tile/include/asm/spinlock_32.h | 2 - + arch/tile/include/asm/spinlock_64.h | 2 - + arch/tile/lib/spinlock_32.c | 23 - + arch/tile/lib/spinlock_64.c | 22 - + arch/xtensa/include/asm/spinlock.h | 5 - + drivers/ata/libata-eh.c | 8 +- + include/asm-generic/qspinlock.h | 14 - + include/linux/init_task.h | 8 +- + include/linux/rcupdate.h | 15 +- + include/linux/rcutiny.h | 8 +- + include/linux/sched.h | 8 +- + include/linux/spinlock.h | 31 - + include/linux/spinlock_up.h | 6 - + include/linux/srcutiny.h | 13 + + include/linux/srcutree.h | 3 +- + include/linux/swait.h | 55 + + include/trace/events/rcu.h | 7 +- + include/uapi/linux/membarrier.h | 23 +- + ipc/sem.c | 3 +- + kernel/Makefile | 1 - + kernel/cpu.c | 1 + + kernel/exit.c | 10 +- + kernel/locking/qspinlock.c | 117 - + kernel/membarrier.c | 70 - + kernel/rcu/Kconfig | 3 +- + kernel/rcu/rcu.h | 128 +- + kernel/rcu/rcu_segcblist.c | 108 +- + kernel/rcu/rcu_segcblist.h | 28 +- + kernel/rcu/rcuperf.c | 17 +- + kernel/rcu/rcutorture.c | 83 +- + kernel/rcu/srcutiny.c | 8 + + kernel/rcu/srcutree.c | 50 +- + kernel/rcu/tiny.c | 2 - + kernel/rcu/tiny_plugin.h | 47 - + kernel/rcu/tree.c | 238 +- + kernel/rcu/tree.h | 15 +- + kernel/rcu/tree_exp.h | 2 +- + kernel/rcu/tree_plugin.h | 240 +- + kernel/rcu/update.c | 28 +- + kernel/sched/Makefile | 1 + + kernel/sched/completion.c | 11 +- + kernel/sched/core.c | 40 +- + kernel/sched/membarrier.c | 152 + + kernel/sched/swait.c | 6 - + kernel/task_work.c | 8 +- + kernel/torture.c | 2 +- + net/netfilter/nf_conntrack_core.c | 52 +- + .../selftests/rcutorture/bin/config_override.sh | 61 + + .../testing/selftests/rcutorture/bin/functions.sh | 27 +- + .../testing/selftests/rcutorture/bin/kvm-build.sh | 11 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 58 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 34 +- + .../selftests/rcutorture/configs/rcu/BUSTED.boot | 2 +- + .../selftests/rcutorture/configs/rcu/SRCU-C.boot | 1 - + .../selftests/rcutorture/configs/rcu/SRCU-u | 3 +- + .../selftests/rcutorture/configs/rcu/TREE01.boot | 2 +- + .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 2 +- + 101 files changed, 15438 insertions(+), 1352 deletions(-) + create mode 100644 Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Diagram.html + create mode 100644 Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Memory-Ordering.html + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-callback-invocation.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-callback-registry.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-dyntick.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp-cleanup.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp-fqs.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp-init-1.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp-init-2.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp-init-3.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-hotplug.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-qs.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/rcu_node-lock.svg + delete mode 100644 kernel/membarrier.c + delete mode 100644 kernel/rcu/tiny_plugin.h + create mode 100644 kernel/sched/membarrier.c + create mode 100755 tools/testing/selftests/rcutorture/bin/config_override.sh + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/SRCU-C.boot +Merging kvm/linux-next (aae4e7a8bc44 Linux 4.13-rc4) +$ git merge kvm/linux-next +Already up-to-date. +Merging kvm-arm/next (7e5a672289c9 KVM: arm/arm64: Handle hva aging while destroying the vm) +$ git merge kvm-arm/next +Already up-to-date. +Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E) +$ git merge kvm-mips/next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (8b24e69fc47e KVM: PPC: Book3S HV: Close race with testing for signals on guest entry) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (5091d7c8ca2d KVM: s390: Multiple Epoch Facility support) +$ git merge kvms390/next +Auto-merging arch/s390/tools/gen_facilities.c +Auto-merging arch/s390/kvm/vsie.c +Auto-merging arch/s390/kvm/kvm-s390.c +Merge made by the 'recursive' strategy. + Documentation/virtual/kvm/devices/vm.txt | 14 ++++- + arch/s390/include/asm/kvm_host.h | 6 +- + arch/s390/include/uapi/asm/kvm.h | 6 ++ + arch/s390/kvm/kvm-s390.c | 101 +++++++++++++++++++++++++++++++ + arch/s390/kvm/kvm-s390.h | 2 + + arch/s390/kvm/sigp.c | 36 ++++++----- + arch/s390/kvm/vsie.c | 10 +++ + arch/s390/tools/gen_facilities.c | 2 + + 8 files changed, 156 insertions(+), 21 deletions(-) +Merging xen-tip/linux-next (e91b2b119433 xen: dont fiddle with event channel masking in suspend/resume) +$ 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 +Auto-merging init/main.c +Merge made by the 'recursive' strategy. + include/linux/percpu.h | 20 +- + init/main.c | 1 - + mm/percpu-internal.h | 82 ++- + mm/percpu-km.c | 2 +- + mm/percpu-stats.c | 111 ++-- + mm/percpu.c | 1522 ++++++++++++++++++++++++++++++------------------ + 6 files changed, 1112 insertions(+), 626 deletions(-) +Merging workqueues/for-next (1fce1c2b4f51 Merge branch 'for-4.14' into for-next) +$ git merge workqueues/for-next +Merge made by the 'recursive' strategy. + Documentation/core-api/workqueue.rst | 10 +++++++--- + kernel/workqueue.c | 2 +- + 2 files changed, 8 insertions(+), 4 deletions(-) +Merging drivers-x86/for-next (c801603e6d0c platform/x86: intel-vbtn: match power button on press rather than release) +$ git merge drivers-x86/for-next +Auto-merging drivers/platform/x86/ibm_rtl.c +Merge made by the 'recursive' strategy. + drivers/platform/x86/alienware-wmi.c | 40 ++++++++++++++------------ + drivers/platform/x86/ibm_rtl.c | 2 +- + drivers/platform/x86/intel_telemetry_debugfs.c | 1 + + drivers/platform/x86/intel_telemetry_pltdrv.c | 36 ++++++++++++++++++++++- + drivers/platform/x86/msi-wmi.c | 2 +- + drivers/platform/x86/peaq-wmi.c | 2 +- + 6 files changed, 60 insertions(+), 23 deletions(-) +Merging chrome-platform/for-next (3c778a7fcfaa platform/chrome : Add myself as Maintainer) +$ git merge chrome-platform/for-next +Already up-to-date. +Merging hsi/for-next (67ddd75771b6 HSI: core: Use kcalloc() in two functions) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (7358df4d5b01 leds: blinkm: constify attribute_group structures.) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + drivers/leds/leds-blinkm.c | 2 +- + drivers/leds/leds-tlc591xx.c | 11 +++++++---- + 2 files changed, 8 insertions(+), 5 deletions(-) +Merging ipmi/for-next (1d51142219c3 ipmi: fix unsigned long underflow) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_msghandler.c | 10 ++++++---- + drivers/char/ipmi/ipmi_si_intf.c | 2 +- + 2 files changed, 7 insertions(+), 5 deletions(-) +Merging driver-core/driver-core-next (1f5000bd8afa initcall_debug: add deferred probe times) +$ git merge driver-core/driver-core-next +Merge made by the 'recursive' strategy. + drivers/base/arch_topology.c | 78 +++++++++++++++++++++---------------------- + drivers/base/dd.c | 28 +++++++++++++++- + include/linux/arch_topology.h | 4 ++- + include/linux/debugfs.h | 16 +++++++++ + 4 files changed, 85 insertions(+), 41 deletions(-) +Merging usb/usb-next (e978e9b977b0 c67x00-hcd: constify hc_driver structures) +$ git merge usb/usb-next +Merge made by the 'recursive' strategy. + drivers/usb/atm/cxacru.c | 2 -- + drivers/usb/atm/speedtch.c | 4 +--- + drivers/usb/atm/ueagle-atm.c | 2 +- + drivers/usb/atm/usbatm.c | 4 +--- + drivers/usb/atm/xusbatm.c | 1 - + drivers/usb/c67x00/c67x00-hcd.c | 2 +- + drivers/usb/chipidea/ci_hdrc_pci.c | 1 - + drivers/usb/class/cdc-wdm.c | 4 ---- + drivers/usb/common/common.c | 4 ++-- + drivers/usb/core/hub.c | 17 +++++++++++++++-- + drivers/usb/core/ledtrig-usbport.c | 4 ++-- + drivers/usb/core/sysfs.c | 2 +- + drivers/usb/gadget/legacy/webcam.c | 1 - + drivers/usb/gadget/udc/mv_udc_core.c | 2 -- + drivers/usb/gadget/udc/s3c2410_udc.c | 4 +--- + drivers/usb/host/fsl-mph-dr-of.c | 4 ++-- + drivers/usb/host/hwa-hc.c | 2 +- + drivers/usb/host/isp116x-hcd.c | 2 +- + drivers/usb/host/isp1362-hcd.c | 2 +- + drivers/usb/host/max3421-hcd.c | 2 +- + drivers/usb/host/r8a66597-hcd.c | 2 +- + drivers/usb/host/sl811-hcd.c | 2 +- + drivers/usb/host/u132-hcd.c | 2 +- + drivers/usb/host/whci/hcd.c | 2 +- + drivers/usb/image/microtek.c | 4 ---- + drivers/usb/isp1760/isp1760-hcd.c | 6 ++---- + drivers/usb/misc/adutux.c | 2 -- + drivers/usb/misc/chaoskey.c | 2 -- + drivers/usb/misc/cytherm.c | 1 - + drivers/usb/misc/ftdi-elan.c | 6 +++--- + drivers/usb/misc/idmouse.c | 2 -- + drivers/usb/misc/iowarrior.c | 4 +--- + drivers/usb/misc/ldusb.c | 1 - + drivers/usb/misc/legousbtower.c | 2 -- + drivers/usb/misc/rio500.c | 4 ---- + drivers/usb/misc/sisusbvga/sisusb.c | 13 +++---------- + drivers/usb/misc/trancevibrator.c | 2 -- + drivers/usb/misc/usb251xb.c | 1 - + drivers/usb/misc/uss720.c | 7 +------ + drivers/usb/mtu3/mtu3.h | 2 ++ + drivers/usb/mtu3/mtu3_gadget.c | 4 ++++ + drivers/usb/mtu3/mtu3_gadget_ep0.c | 23 ++++++++++++++++++++--- + drivers/usb/mtu3/mtu3_host.c | 4 ++-- + drivers/usb/mtu3/mtu3_hw_regs.h | 4 +++- + drivers/usb/phy/phy-mv-usb.c | 2 -- + drivers/usb/phy/phy.c | 4 ++-- + drivers/usb/renesas_usbhs/mod_host.c | 2 +- + drivers/usb/renesas_usbhs/pipe.c | 2 +- + drivers/usb/storage/realtek_cr.c | 1 - + drivers/usb/usbip/stub_main.c | 2 -- + drivers/usb/usbip/usbip_common.c | 2 -- + drivers/usb/usbip/usbip_common.h | 2 -- + drivers/usb/usbip/vhci_hcd.c | 2 -- + 53 files changed, 80 insertions(+), 107 deletions(-) +Merging usb-gadget/next (5771a8c08880 Linux v4.13-rc1) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (5771a8c08880 Linux v4.13-rc1) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging usb-chipidea-next/ci-for-usb-next (f86c9d735b49 usb: chipidea: Add support for Tegra20/30/114/124) +$ git merge usb-chipidea-next/ci-for-usb-next +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/Makefile | 1 + + drivers/usb/chipidea/ci_hdrc_msm.c | 2 +- + drivers/usb/chipidea/ci_hdrc_tegra.c | 156 +++++++++++++++++++++++++++++++++++ + drivers/usb/chipidea/core.c | 4 +- + drivers/usb/chipidea/udc.c | 8 +- + include/linux/usb/chipidea.h | 1 + + 6 files changed, 165 insertions(+), 7 deletions(-) + create mode 100644 drivers/usb/chipidea/ci_hdrc_tegra.c +Merging phy-next/next (29f2711eb51c phy: ti-pipe3: Use TRM recommended settings for SATA DPLL) +$ git merge phy-next/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/phy/qcom-qmp-phy.txt | 11 ++ + drivers/phy/allwinner/phy-sun4i-usb.c | 25 +++- + drivers/phy/qualcomm/phy-qcom-qmp.c | 162 ++++++++++++++++++--- + drivers/phy/ti/phy-ti-pipe3.c | 10 +- + 4 files changed, 177 insertions(+), 31 deletions(-) +Merging tty/tty-next (8a5a90a2a477 tty: fix __tty_insert_flip_char regression) +$ git merge tty/tty-next +Resolved 'drivers/tty/serial/8250/8250_core.c' using previous resolution. +Auto-merging drivers/tty/serial/8250/8250_exar.c +Auto-merging drivers/tty/serial/8250/8250_core.c +CONFLICT (content): Merge conflict in drivers/tty/serial/8250/8250_core.c +Auto-merging drivers/tty/hvc/hvc_vio.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 47bcee369cc7] Merge remote-tracking branch 'tty/tty-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/serial/rs485.txt | 5 +- + .../devicetree/bindings/serial/st,stm32-usart.txt | 17 +- + drivers/tty/ehv_bytechan.c | 2 +- + drivers/tty/hvc/hvc_opal.c | 16 +- + drivers/tty/hvc/hvc_vio.c | 6 +- + drivers/tty/isicom.c | 2 +- + drivers/tty/moxa.c | 2 +- + drivers/tty/mxser.c | 2 +- + drivers/tty/serdev/core.c | 2 +- + drivers/tty/serial/8250/8250_aspeed_vuart.c | 7 +- + drivers/tty/serial/8250/8250_core.c | 16 +- + drivers/tty/serial/8250/8250_dw.c | 2 +- + drivers/tty/serial/8250/8250_early.c | 8 +- + drivers/tty/serial/8250/8250_exar.c | 2 +- + drivers/tty/serial/8250/8250_ingenic.c | 8 +- + drivers/tty/serial/8250/8250_of.c | 23 +- + drivers/tty/serial/8250/8250_pci.c | 43 +- + drivers/tty/serial/8250/8250_port.c | 2 +- + drivers/tty/serial/Kconfig | 4 +- + drivers/tty/serial/arc_uart.c | 4 +- + drivers/tty/serial/fsl_lpuart.c | 63 +- + drivers/tty/serial/imx.c | 13 +- + drivers/tty/serial/jsm/jsm_driver.c | 2 +- + drivers/tty/serial/mpc52xx_uart.c | 12 +- + drivers/tty/serial/omap-serial.c | 13 +- + drivers/tty/serial/owl-uart.c | 635 ++++++++++++++++++++- + drivers/tty/serial/pmac_zilog.c | 4 +- + drivers/tty/serial/serial-tegra.c | 2 +- + drivers/tty/serial/serial_core.c | 4 +- + drivers/tty/serial/sprd_serial.c | 4 +- + drivers/tty/serial/stm32-usart.c | 121 +++- + drivers/tty/serial/stm32-usart.h | 37 +- + drivers/tty/serial/sunsu.c | 4 +- + drivers/tty/serial/xilinx_uartps.c | 2 +- + drivers/tty/synclink.c | 2 +- + drivers/tty/synclink_gt.c | 2 +- + drivers/tty/synclinkmp.c | 2 +- + drivers/tty/tty_buffer.c | 26 + + include/linux/serial_core.h | 9 +- + include/linux/tty_flip.h | 3 +- + include/uapi/linux/serial_core.h | 1 + + 41 files changed, 1009 insertions(+), 125 deletions(-) +Merging char-misc/char-misc-next (e819accd74a6 Merge tag 'lkdtm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into char-misc-next) +$ git merge char-misc/char-misc-next +Auto-merging include/linux/fs.h +Auto-merging block/genhd.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-driver-altera-cvp | 8 + + Documentation/admin-guide/devices.txt | 5 + + .../bindings/fpga/altera-passive-serial.txt | 29 + + .../bindings/fpga/xilinx-pr-decoupler.txt | 36 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/boot/dts/imx6q-evi.dts | 16 + + arch/x86/include/asm/mshyperv.h | 2 + + arch/x86/kernel/cpu/mshyperv.c | 12 +- + block/genhd.c | 18 +- + drivers/android/Makefile | 2 +- + drivers/android/binder.c | 3455 +++++++++++++------- + drivers/android/binder_alloc.c | 802 +++++ + drivers/android/binder_alloc.h | 163 + + drivers/android/binder_trace.h | 41 +- + drivers/auxdisplay/panel.c | 6 +- + drivers/char/mwave/smapi.c | 48 +- + drivers/char/ppdev.c | 3 - + drivers/fpga/Kconfig | 20 +- + drivers/fpga/Makefile | 2 + + drivers/fpga/altera-cvp.c | 500 +++ + drivers/fpga/altera-ps-spi.c | 308 ++ + drivers/hv/ring_buffer.c | 169 +- + drivers/misc/Makefile | 1 + + drivers/misc/aspeed-lpc-snoop.c | 34 +- + drivers/misc/lkdtm.h | 27 +- + drivers/misc/lkdtm_bugs.c | 83 - + drivers/misc/lkdtm_core.c | 25 +- + drivers/misc/lkdtm_refcount.c | 400 +++ + drivers/misc/mei/hw-me.c | 45 +- + drivers/misc/mei/hw-me.h | 39 +- + drivers/misc/mei/pci-me.c | 109 +- + fs/char_dev.c | 58 +- + fs/proc/devices.c | 8 +- + include/linux/bitrev.h | 19 + + include/linux/fpga/fpga-mgr.h | 4 + + include/linux/fs.h | 10 +- + include/linux/hyperv.h | 65 - + 37 files changed, 4927 insertions(+), 1646 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-altera-cvp + create mode 100644 Documentation/devicetree/bindings/fpga/altera-passive-serial.txt + create mode 100644 Documentation/devicetree/bindings/fpga/xilinx-pr-decoupler.txt + create mode 100644 drivers/android/binder_alloc.c + create mode 100644 drivers/android/binder_alloc.h + create mode 100644 drivers/fpga/altera-cvp.c + create mode 100644 drivers/fpga/altera-ps-spi.c + create mode 100644 drivers/misc/lkdtm_refcount.c +Merging extcon/extcon-next (1cf76c4eeb07 extcon: cros-ec: Fix a potential NULL pointer dereference) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + .../bindings/extcon/extcon-usbc-cros-ec.txt | 24 ++ + drivers/extcon/Kconfig | 7 + + drivers/extcon/Makefile | 1 + + drivers/extcon/extcon-intel-int3496.c | 2 +- + drivers/extcon/extcon-usbc-cros-ec.c | 417 +++++++++++++++++++++ + drivers/extcon/extcon.c | 4 +- + include/linux/mfd/cros_ec_commands.h | 75 ++++ + 7 files changed, 527 insertions(+), 3 deletions(-) + create mode 100644 Documentation/devicetree/bindings/extcon/extcon-usbc-cros-ec.txt + create mode 100644 drivers/extcon/extcon-usbc-cros-ec.c +Merging staging/staging-next (5551ad1e9fad staging: wlan-ng: Fix the types of the hfa384x_comm_tallies_16/32 members) +$ git merge staging/staging-next +Auto-merging include/linux/iio/common/st_sensors.h +Auto-merging drivers/staging/vboxvideo/vbox_mode.c +Auto-merging drivers/staging/vboxvideo/vbox_drv.c +Removing drivers/staging/lustre/lustre/lov/lovsub_io.c +Auto-merging drivers/staging/lustre/lustre/llite/file.c +Removing drivers/staging/ccree/ssi_fips_local.h +Removing drivers/staging/ccree/ssi_fips_local.c +Removing drivers/staging/ccree/ssi_fips_ll.c +Removing drivers/staging/ccree/ssi_fips_ext.c +Removing drivers/staging/ccree/ssi_fips_data.h +Auto-merging drivers/iio/common/st_sensors/st_sensors_core.c +Auto-merging drivers/iio/accel/st_accel_core.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-iio | 9 + + .../bindings/iio/adc/at91-sama5d2_adc.txt | 6 + + .../devicetree/bindings/iio/adc/mt6577_auxadc.txt | 1 + + .../devicetree/bindings/iio/dac/st,stm32-dac.txt | 4 +- + .../devicetree/bindings/iio/humidity/hdc100x.txt | 17 + + .../devicetree/bindings/iio/humidity/hts221.txt | 11 +- + .../devicetree/bindings/iio/humidity/htu21.txt | 13 + + .../devicetree/bindings/iio/imu/st_lsm6dsx.txt | 8 + + .../devicetree/bindings/iio/pressure/ms5637.txt | 17 + + .../devicetree/bindings/iio/st-sensors.txt | 2 + + .../devicetree/bindings/iio/temperature/tsys01.txt | 19 + + .../bindings/iio/timer/stm32-timer-trigger.txt | 2 +- + Documentation/iio/ep93xx_adc.txt | 29 + + drivers/iio/accel/bmc150-accel-i2c.c | 1 + + drivers/iio/accel/da311.c | 2 +- + drivers/iio/accel/sca3000.c | 6 +- + drivers/iio/accel/st_accel.h | 5 +- + drivers/iio/accel/st_accel_core.c | 2 +- + drivers/iio/accel/st_accel_i2c.c | 8 +- + drivers/iio/accel/st_accel_spi.c | 86 +- + drivers/iio/adc/Kconfig | 32 +- + drivers/iio/adc/Makefile | 3 + + drivers/iio/adc/ad7766.c | 6 +- + drivers/iio/adc/at91-sama5d2_adc.c | 329 +++- + drivers/iio/adc/at91_adc.c | 2 +- + drivers/iio/adc/dln2-adc.c | 722 +++++++++ + drivers/iio/adc/ep93xx_adc.c | 255 +++ + drivers/iio/adc/ina2xx-adc.c | 36 +- + drivers/iio/adc/ltc2471.c | 160 ++ + drivers/iio/adc/ltc2497.c | 54 +- + drivers/iio/adc/max9611.c | 4 +- + drivers/iio/adc/mcp3422.c | 6 +- + drivers/iio/adc/meson_saradc.c | 13 +- + drivers/iio/adc/mt6577_auxadc.c | 37 + + drivers/iio/adc/rockchip_saradc.c | 5 + + drivers/iio/adc/stm32-adc-core.c | 2 +- + drivers/iio/adc/ti-ads1015.c | 16 +- + drivers/iio/chemical/Kconfig | 7 + + drivers/iio/chemical/Makefile | 1 + + drivers/iio/chemical/ccs811.c | 339 ++++ + drivers/iio/common/st_sensors/st_sensors_core.c | 31 + + drivers/iio/common/st_sensors/st_sensors_i2c.c | 29 - + drivers/iio/dac/stm32-dac-core.c | 38 +- + drivers/iio/dac/stm32-dac.c | 2 +- + drivers/iio/gyro/mpu3050-core.c | 10 - + drivers/iio/gyro/st_gyro.h | 1 + + drivers/iio/gyro/st_gyro_core.c | 13 +- + drivers/iio/gyro/st_gyro_i2c.c | 8 +- + drivers/iio/gyro/st_gyro_spi.c | 54 + + drivers/iio/humidity/Kconfig | 3 +- + drivers/iio/humidity/hdc100x.c | 22 + + drivers/iio/humidity/hts221.h | 11 +- + drivers/iio/humidity/hts221_buffer.c | 43 +- + drivers/iio/humidity/hts221_core.c | 144 +- + drivers/iio/humidity/htu21.c | 8 + + drivers/iio/imu/adis16400_core.c | 4 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 17 + + drivers/iio/inkern.c | 6 +- + drivers/iio/light/rpr0521.c | 336 +++- + drivers/iio/light/tcs3472.c | 4 +- + drivers/iio/magnetometer/ak8975.c | 2 + + drivers/iio/magnetometer/st_magn_core.c | 2 +- + drivers/iio/magnetometer/st_magn_i2c.c | 3 +- + drivers/iio/magnetometer/st_magn_spi.c | 25 + + drivers/iio/orientation/hid-sensor-rotation.c | 2 +- + drivers/iio/pressure/ms5637.c | 12 +- + drivers/iio/pressure/st_pressure_i2c.c | 3 +- + drivers/iio/pressure/st_pressure_spi.c | 33 + + drivers/iio/pressure/zpa2326.c | 12 +- + drivers/iio/temperature/tsys01.c | 7 + + drivers/staging/Kconfig | 2 + + drivers/staging/Makefile | 1 + + drivers/staging/android/ion/ion.h | 12 +- + drivers/staging/android/ion/ion_cma_heap.c | 5 +- + drivers/staging/android/ion/ion_system_heap.c | 2 - + drivers/staging/ccree/Kconfig | 9 - + drivers/staging/ccree/Makefile | 2 +- + drivers/staging/ccree/cc_hw_queue_defs.h | 3 +- + drivers/staging/ccree/ssi_aead.c | 242 +-- + drivers/staging/ccree/ssi_aead.h | 12 +- + drivers/staging/ccree/ssi_buffer_mgr.c | 473 +++--- + drivers/staging/ccree/ssi_cipher.c | 142 +- + drivers/staging/ccree/ssi_driver.c | 59 +- + drivers/staging/ccree/ssi_driver.h | 1 - + drivers/staging/ccree/ssi_fips.c | 119 +- + drivers/staging/ccree/ssi_fips.h | 58 +- + drivers/staging/ccree/ssi_fips_data.h | 306 ---- + drivers/staging/ccree/ssi_fips_ext.c | 92 -- + drivers/staging/ccree/ssi_fips_ll.c | 1649 -------------------- + drivers/staging/ccree/ssi_fips_local.c | 357 ----- + drivers/staging/ccree/ssi_fips_local.h | 67 - + drivers/staging/ccree/ssi_hash.c | 270 ++-- + drivers/staging/ccree/ssi_ivgen.c | 8 +- + drivers/staging/ccree/ssi_pm.c | 4 +- + drivers/staging/ccree/ssi_request_mgr.c | 52 +- + drivers/staging/ccree/ssi_sram_mgr.c | 6 +- + drivers/staging/ccree/ssi_sysfs.c | 80 +- + drivers/staging/comedi/comedi_buf.c | 2 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 3 +- + drivers/staging/fbtft/fbtft-core.c | 4 +- + drivers/staging/fsl-dpaa2/Kconfig | 2 +- + drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c | 6 +- + drivers/staging/fsl-dpaa2/ethernet/dpaa2-ethtool.c | 2 - + drivers/staging/fsl-mc/bus/Kconfig | 4 +- + drivers/staging/fsl-mc/bus/dpio/qbman-portal.c | 24 +- + drivers/staging/fsl-mc/bus/fsl-mc-bus.c | 4 +- + drivers/staging/fsl-mc/bus/fsl-mc-msi.c | 9 +- + .../staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c | 11 +- + drivers/staging/fsl-mc/bus/mc-io.c | 11 +- + drivers/staging/fsl-mc/bus/mc-sys.c | 36 +- + drivers/staging/fsl-mc/include/dpaa2-io.h | 1 + + drivers/staging/goldfish/goldfish_nand.c | 20 +- + drivers/staging/greybus/arche-platform.c | 12 +- + drivers/staging/greybus/interface.c | 40 +- + drivers/staging/greybus/spilib.h | 3 +- + drivers/staging/greybus/tools/loopback_test.c | 13 +- + drivers/staging/greybus/usb.c | 2 +- + drivers/staging/gs_fpgaboot/gs_fpgaboot.c | 90 +- + drivers/staging/gs_fpgaboot/gs_fpgaboot.h | 2 +- + drivers/staging/gs_fpgaboot/io.c | 4 - + drivers/staging/iio/adc/ad7280a.c | 21 +- + drivers/staging/iio/light/tsl2x7x.c | 372 +++-- + drivers/staging/ks7010/ks_wlan_net.c | 2 +- + .../staging/lustre/include/linux/lnet/lib-lnet.h | 3 +- + .../staging/lustre/include/linux/lnet/lib-types.h | 46 +- + drivers/staging/lustre/include/linux/lnet/lnetst.h | 129 +- + .../staging/lustre/include/linux/lnet/socklnd.h | 3 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 11 - + .../lustre/lnet/klnds/socklnd/socklnd_lib.c | 20 +- + drivers/staging/lustre/lnet/libcfs/hash.c | 47 +- + .../lustre/lnet/libcfs/linux/linux-module.c | 2 +- + drivers/staging/lustre/lnet/selftest/conctl.c | 2 +- + drivers/staging/lustre/lnet/selftest/conrpc.c | 5 +- + drivers/staging/lustre/lustre/fld/fld_cache.c | 3 +- + drivers/staging/lustre/lustre/include/cl_object.h | 2 +- + .../staging/lustre/lustre/include/interval_tree.h | 4 + + .../staging/lustre/lustre/include/lprocfs_status.h | 4 +- + .../lustre/lustre/include/lustre/lustre_idl.h | 7 +- + .../staging/lustre/lustre/include/lustre_linkea.h | 15 +- + drivers/staging/lustre/lustre/include/lustre_net.h | 10 +- + drivers/staging/lustre/lustre/include/obd.h | 2 - + drivers/staging/lustre/lustre/include/obd_class.h | 9 +- + drivers/staging/lustre/lustre/ldlm/interval_tree.c | 40 + + drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 3 - + drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 9 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 2 +- + drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 47 +- + drivers/staging/lustre/lustre/llite/file.c | 3 - + drivers/staging/lustre/lustre/llite/llite_lib.c | 6 +- + drivers/staging/lustre/lustre/llite/rw.c | 2 +- + drivers/staging/lustre/lustre/llite/vvp_dev.c | 5 +- + drivers/staging/lustre/lustre/llite/xattr.c | 1 + + .../staging/lustre/lustre/llite/xattr_security.c | 23 +- + drivers/staging/lustre/lustre/lmv/lmv_intent.c | 5 - + drivers/staging/lustre/lustre/lmv/lmv_internal.h | 2 - + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 161 +- + drivers/staging/lustre/lustre/lmv/lproc_lmv.c | 2 +- + drivers/staging/lustre/lustre/lov/Makefile | 2 +- + .../staging/lustre/lustre/lov/lov_cl_internal.h | 90 -- + drivers/staging/lustre/lustre/lov/lov_dev.c | 85 - + drivers/staging/lustre/lustre/lov/lov_ea.c | 23 +- + drivers/staging/lustre/lustre/lov/lov_internal.h | 27 - + drivers/staging/lustre/lustre/lov/lov_io.c | 152 +- + drivers/staging/lustre/lustre/lov/lov_lock.c | 11 - + drivers/staging/lustre/lustre/lov/lov_obd.c | 3 +- + drivers/staging/lustre/lustre/lov/lov_object.c | 469 +++--- + drivers/staging/lustre/lustre/lov/lov_page.c | 1 - + drivers/staging/lustre/lustre/lov/lov_request.c | 40 +- + drivers/staging/lustre/lustre/lov/lovsub_dev.c | 1 - + drivers/staging/lustre/lustre/lov/lovsub_io.c | 51 - + drivers/staging/lustre/lustre/lov/lovsub_lock.c | 2 - + drivers/staging/lustre/lustre/lov/lproc_lov.c | 2 +- + drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 4 +- + drivers/staging/lustre/lustre/obdclass/linkea.c | 69 +- + .../lustre/lustre/obdclass/linux/linux-module.c | 2 +- + .../lustre/lustre/obdclass/linux/linux-sysctl.c | 2 +- + .../lustre/lustre/obdclass/lprocfs_status.c | 2 +- + drivers/staging/lustre/lustre/osc/lproc_osc.c | 2 +- + drivers/staging/lustre/lustre/osc/osc_cache.c | 31 +- + drivers/staging/lustre/lustre/ptlrpc/client.c | 35 +- + drivers/staging/lustre/lustre/ptlrpc/import.c | 2 +- + .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 15 +- + drivers/staging/lustre/lustre/ptlrpc/sec_gc.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/service.c | 15 +- + drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 16 +- + drivers/staging/nvec/nvec.c | 2 +- + .../Documentation/devicetree/pi433-overlay.dts | 53 + + .../pi433/Documentation/devicetree/pi433.txt | 62 + + drivers/staging/pi433/Documentation/pi433.txt | 274 ++++ + drivers/staging/pi433/Kconfig | 16 + + drivers/staging/pi433/Makefile | 3 + + drivers/staging/pi433/TODO | 5 + + drivers/staging/pi433/pi433_if.c | 1322 ++++++++++++++++ + drivers/staging/pi433/pi433_if.h | 152 ++ + drivers/staging/pi433/rf69.c | 985 ++++++++++++ + drivers/staging/pi433/rf69.h | 82 + + drivers/staging/pi433/rf69_enum.h | 201 +++ + drivers/staging/pi433/rf69_registers.h | 489 ++++++ + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 3 +- + drivers/staging/rtl8188eu/include/rtw_ioctl.h | 3 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 78 +- + .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 2 +- + drivers/staging/rtl8192u/r8192U_core.c | 23 +- + drivers/staging/rtl8192u/r8192U_hw.h | 11 +- + drivers/staging/rtl8192u/r819xU_cmdpkt.c | 2 +- + drivers/staging/rtl8712/mlme_linux.c | 4 +- + drivers/staging/rtl8712/rtl8712_cmd.c | 2 +- + drivers/staging/rtl8712/rtl8712_efuse.c | 2 +- + drivers/staging/rtl8712/rtl8712_xmit.c | 8 +- + drivers/staging/rtl8723bs/core/rtw_btcoex.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_efuse.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 5 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 4 +- + drivers/staging/rtl8723bs/core/rtw_recv.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_security.c | 14 +- + drivers/staging/rtl8723bs/core/rtw_xmit.c | 4 +- + drivers/staging/rts5208/ms.c | 5 +- + drivers/staging/rts5208/rtsx.c | 4 +- + drivers/staging/rts5208/rtsx_chip.c | 4 +- + drivers/staging/rts5208/sd.c | 21 +- + drivers/staging/rts5208/spi.c | 8 +- + drivers/staging/rts5208/xd.c | 17 +- + drivers/staging/skein/skein_block.c | 323 ---- + drivers/staging/skein/skein_block.h | 323 ++++ + drivers/staging/typec/tcpm.c | 3 +- + drivers/staging/unisys/include/channel.h | 338 ++-- + drivers/staging/unisys/include/iochannel.h | 524 ++++--- + drivers/staging/unisys/include/visorbus.h | 6 +- + drivers/staging/unisys/visorbus/controlvmchannel.h | 706 +++++---- + drivers/staging/unisys/visorbus/vbuschannel.h | 93 +- + drivers/staging/unisys/visorbus/visorbus_main.c | 373 ++--- + drivers/staging/unisys/visorbus/visorbus_private.h | 4 - + drivers/staging/unisys/visorbus/visorchannel.c | 129 +- + drivers/staging/unisys/visorbus/visorchipset.c | 108 +- + drivers/staging/unisys/visorbus/vmcallinterface.h | 57 +- + drivers/staging/unisys/visorhba/visorhba_main.c | 402 ++--- + .../staging/unisys/visorinput/ultrainputreport.h | 65 +- + drivers/staging/unisys/visorinput/visorinput.c | 84 +- + drivers/staging/unisys/visornic/visornic_main.c | 213 ++- + drivers/staging/vboxvideo/Kconfig | 10 +- + drivers/staging/vboxvideo/vbox_drv.c | 2 +- + drivers/staging/vboxvideo/vbox_mode.c | 5 - + drivers/staging/vboxvideo/vbox_ttm.c | 2 +- + .../vc04_services/bcm2835-audio/bcm2835-pcm.c | 4 +- + .../vc04_services/interface/vchiq_arm/vchiq_util.c | 2 +- + drivers/staging/vt6655/card.c | 6 +- + drivers/staging/vt6655/mac.c | 2 +- + drivers/staging/vt6656/device.h | 2 +- + drivers/staging/vt6656/firmware.c | 2 +- + drivers/staging/vt6656/key.h | 2 +- + drivers/staging/vt6656/main_usb.c | 5 +- + drivers/staging/vt6656/power.c | 6 +- + drivers/staging/vt6656/rf.c | 6 +- + drivers/staging/vt6656/usbpipe.c | 4 +- + drivers/staging/wilc1000/host_interface.c | 4 +- + drivers/staging/wilc1000/linux_wlan.c | 5 +- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 65 +- + drivers/staging/wilc1000/wilc_wfi_netdevice.h | 4 +- + drivers/staging/wlan-ng/hfa384x.h | 98 +- + drivers/staging/wlan-ng/p80211netdev.c | 2 +- + drivers/staging/wlan-ng/prism2fw.c | 27 +- + drivers/staging/wlan-ng/prism2sta.c | 25 +- + include/linux/iio/common/st_sensors.h | 12 + + include/linux/iio/common/st_sensors_i2c.h | 10 - + include/linux/msi.h | 1 + + 266 files changed, 10652 insertions(+), 6976 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/humidity/hdc100x.txt + create mode 100644 Documentation/devicetree/bindings/iio/humidity/htu21.txt + create mode 100644 Documentation/devicetree/bindings/iio/pressure/ms5637.txt + create mode 100644 Documentation/devicetree/bindings/iio/temperature/tsys01.txt + create mode 100644 Documentation/iio/ep93xx_adc.txt + create mode 100644 drivers/iio/adc/dln2-adc.c + create mode 100644 drivers/iio/adc/ep93xx_adc.c + create mode 100644 drivers/iio/adc/ltc2471.c + create mode 100644 drivers/iio/chemical/ccs811.c + delete mode 100644 drivers/staging/ccree/ssi_fips_data.h + delete mode 100644 drivers/staging/ccree/ssi_fips_ext.c + delete mode 100644 drivers/staging/ccree/ssi_fips_ll.c + delete mode 100644 drivers/staging/ccree/ssi_fips_local.c + delete mode 100644 drivers/staging/ccree/ssi_fips_local.h + delete mode 100644 drivers/staging/lustre/lustre/lov/lovsub_io.c + create mode 100644 drivers/staging/pi433/Documentation/devicetree/pi433-overlay.dts + create mode 100644 drivers/staging/pi433/Documentation/devicetree/pi433.txt + create mode 100644 drivers/staging/pi433/Documentation/pi433.txt + create mode 100644 drivers/staging/pi433/Kconfig + create mode 100644 drivers/staging/pi433/Makefile + create mode 100644 drivers/staging/pi433/TODO + create mode 100644 drivers/staging/pi433/pi433_if.c + create mode 100644 drivers/staging/pi433/pi433_if.h + create mode 100644 drivers/staging/pi433/rf69.c + create mode 100644 drivers/staging/pi433/rf69.h + create mode 100644 drivers/staging/pi433/rf69_enum.h + create mode 100644 drivers/staging/pi433/rf69_registers.h +$ git am -3 ../patches/0001-Revert-staging-fsl-mc-allow-the-driver-compile-multi.patch +Applying: Revert "staging: fsl-mc: allow the driver compile multi-arch" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/staging/fsl-dpaa2/Kconfig +M drivers/staging/fsl-mc/bus/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master abd80978df3b] Merge remote-tracking branch 'staging/staging-next' + Date: Thu Aug 10 14:22:31 2017 +1000 +Merging mux/for-next (a351e9b9fc24 Linux 4.11) +$ git merge mux/for-next +Already up-to-date. +Merging slave-dma/next (d4381f3cff0b Merge branch 'topic/bcm' into next) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. + drivers/dma/Kconfig | 6 + + drivers/dma/Makefile | 1 + + drivers/dma/altera-msgdma.c | 1031 +++++++++++++++++++++++++++++++++++++++++ + drivers/dma/bcm-sba-raid.c | 6 +- + drivers/dma/dmatest.c | 88 +++- + drivers/dma/ioat/init.c | 2 +- + drivers/dma/of-dma.c | 8 +- + drivers/dma/ppc4xx/adma.c | 37 +- + drivers/dma/qcom/hidma.c | 37 +- + drivers/dma/qcom/hidma.h | 7 +- + drivers/dma/qcom/hidma_ll.c | 11 +- + drivers/dma/qcom/hidma_mgmt.c | 14 +- + 12 files changed, 1181 insertions(+), 67 deletions(-) + create mode 100644 drivers/dma/altera-msgdma.c +Merging cgroup/for-next (96e2c6dba80f Merge branch 'for-4.14' into for-next) +$ git merge cgroup/for-next +Auto-merging kernel/events/core.c +Auto-merging kernel/cgroup/cpuset.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging include/linux/cgroup.h +Merge made by the 'recursive' strategy. + Documentation/cgroup-v2.txt | 221 +++++++++- + include/linux/cgroup-defs.h | 63 ++- + include/linux/cgroup.h | 15 +- + kernel/cgroup/cgroup-internal.h | 12 +- + kernel/cgroup/cgroup-v1.c | 69 ++- + kernel/cgroup/cgroup.c | 936 ++++++++++++++++++++++++++++++++-------- + kernel/cgroup/cpuset.c | 6 +- + kernel/cgroup/debug.c | 53 ++- + kernel/cgroup/freezer.c | 6 +- + kernel/cgroup/pids.c | 1 + + kernel/events/core.c | 1 + + mm/memcontrol.c | 2 +- + net/core/netclassid_cgroup.c | 2 +- + 13 files changed, 1143 insertions(+), 244 deletions(-) +Merging scsi/for-next (c0d1f980d9c7 Merge branch 'fixes' into for-next) +$ git merge scsi/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 +- + drivers/message/fusion/mptbase.c | 8 +- + drivers/scsi/aacraid/aachba.c | 9 +- + drivers/scsi/aacraid/aacraid.h | 3 +- + drivers/scsi/aacraid/commsup.c | 3 +- + drivers/scsi/aacraid/linit.c | 318 +++-- + drivers/scsi/aic7xxx/Makefile | 10 +- + drivers/scsi/aic7xxx/aic79xx_reg.h_shipped | 1469 +++++----------------- + drivers/scsi/aic7xxx/aic79xx_reg_print.c_shipped | 34 +- + drivers/scsi/aic7xxx/aic7xxx_core.c | 1 - + drivers/scsi/aic7xxx/aic7xxx_osm.c | 5 - + drivers/scsi/aic7xxx/aic7xxx_osm.h | 1 - + drivers/scsi/aic7xxx/aic7xxx_reg.h_shipped | 44 +- + drivers/scsi/aic94xx/aic94xx_init.c | 4 +- + drivers/scsi/be2iscsi/be_iscsi.c | 6 +- + drivers/scsi/be2iscsi/be_main.c | 6 +- + drivers/scsi/be2iscsi/be_main.h | 2 +- + drivers/scsi/csiostor/csio_hw.c | 4 +- + drivers/scsi/csiostor/csio_hw.h | 2 +- + drivers/scsi/csiostor/csio_init.c | 23 +- + drivers/scsi/csiostor/csio_scsi.c | 6 +- + drivers/scsi/cxgbi/libcxgbi.c | 27 +- + drivers/scsi/fnic/fnic.h | 2 +- + drivers/scsi/g_NCR5380.c | 277 ++-- + drivers/scsi/gdth.c | 2 +- + drivers/scsi/gdth_proc.c | 2 +- + drivers/scsi/ipr.c | 33 +- + drivers/scsi/ipr.h | 2 + + drivers/scsi/lpfc/lpfc.h | 16 +- + drivers/scsi/lpfc/lpfc_init.c | 16 +- + drivers/scsi/lpfc/lpfc_mem.c | 90 +- + drivers/scsi/lpfc/lpfc_nvme.c | 6 +- + drivers/scsi/lpfc/lpfc_nvmet.c | 4 +- + drivers/scsi/lpfc/lpfc_scsi.c | 12 +- + drivers/scsi/lpfc/lpfc_sli.c | 6 +- + drivers/scsi/mac53c94.c | 13 +- + drivers/scsi/megaraid.c | 6 +- + drivers/scsi/megaraid/megaraid_mbox.c | 30 +- + drivers/scsi/megaraid/megaraid_mm.c | 29 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 65 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 46 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 81 +- + drivers/scsi/mpt3sas/mpt3sas_base.h | 2 +- + drivers/scsi/mvsas/mv_init.c | 6 +- + drivers/scsi/mvsas/mv_sas.c | 6 +- + drivers/scsi/osst.c | 4 +- + drivers/scsi/pmcraid.c | 10 +- + drivers/scsi/pmcraid.h | 2 +- + drivers/scsi/qla2xxx/qla_dbg.c | 2 +- + drivers/scsi/qla2xxx/qla_def.h | 13 +- + drivers/scsi/qla2xxx/qla_gbl.h | 14 +- + drivers/scsi/qla2xxx/qla_isr.c | 43 +- + drivers/scsi/qla2xxx/qla_mbx.c | 71 +- + drivers/scsi/qla2xxx/qla_nvme.c | 140 +-- + drivers/scsi/qla2xxx/qla_nvme.h | 17 + + drivers/scsi/qla2xxx/qla_os.c | 31 +- + drivers/scsi/qla2xxx/qla_tmpl.c | 12 - + drivers/scsi/scsi_lib.c | 10 +- + drivers/scsi/scsi_transport_fc.c | 31 +- + drivers/scsi/ses.c | 2 +- + drivers/scsi/st.c | 4 +- + include/scsi/scsi_transport_fc.h | 1 + + 62 files changed, 1270 insertions(+), 1878 deletions(-) +Merging scsi-mkp/for-next (2dd7cfcb6784 scsi: zfcp: early returns for traces disabled via level) +$ git merge scsi-mkp/for-next +Merge made by the 'recursive' strategy. + drivers/s390/scsi/zfcp_aux.c | 1 - + drivers/s390/scsi/zfcp_dbf.c | 95 +++++++++++++++++++++++++++++++++++-------- + drivers/s390/scsi/zfcp_dbf.h | 25 ++++++++---- + drivers/s390/scsi/zfcp_erp.c | 5 +-- + drivers/s390/scsi/zfcp_ext.h | 1 - + drivers/s390/scsi/zfcp_fc.c | 52 +++++++++++------------ + drivers/s390/scsi/zfcp_fc.h | 25 ++++++++---- + drivers/s390/scsi/zfcp_fsf.c | 35 ++++++++-------- + drivers/s390/scsi/zfcp_fsf.h | 12 ++++-- + drivers/s390/scsi/zfcp_qdio.c | 2 +- + drivers/s390/scsi/zfcp_qdio.h | 17 -------- + drivers/s390/scsi/zfcp_scsi.c | 18 ++++---- + 12 files changed, 178 insertions(+), 110 deletions(-) +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/scsi/qla2xxx/tcm_qla2xxx.c | 30 ------ + drivers/target/iscsi/cxgbit/cxgbit_cm.c | 16 ++- + drivers/target/iscsi/cxgbit/cxgbit_target.c | 12 ++- + drivers/target/iscsi/iscsi_target.c | 6 +- + drivers/target/iscsi/iscsi_target_login.c | 7 +- + drivers/target/target_core_tpg.c | 4 +- + drivers/target/target_core_transport.c | 4 +- + drivers/target/target_core_user.c | 149 ++++++++++++++++++++++------ + include/target/iscsi/iscsi_target_core.h | 1 + + 9 files changed, 154 insertions(+), 75 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 (d0e01c1d1f33 Merge branch 'for-4.14' into for-next) +$ git merge libata/for-next +Merge made by the 'recursive' strategy. + drivers/ata/ahci_platform.c | 1 + + drivers/ata/libahci_platform.c | 34 ++++++++++++++++++++++++++++++++++ + drivers/ata/sata_gemini.c | 6 +++--- + drivers/ata/sata_svw.c | 2 +- + include/linux/ahci_platform.h | 2 ++ + 5 files changed, 41 insertions(+), 4 deletions(-) +Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation) +$ git merge binfmt_misc/for-next +Already up-to-date. +Merging vhost/linux-next (c9379b24d6fc virtio_blk: fix incorrect message when disk is resized) +$ git merge vhost/linux-next +Merge made by the 'recursive' strategy. + drivers/block/virtio_blk.c | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) +Merging rpmsg/for-next (99ec27115e39 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Resolved 'drivers/soc/qcom/Kconfig' using previous resolution. +Auto-merging drivers/soc/qcom/Kconfig +CONFLICT (content): Merge conflict in drivers/soc/qcom/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1cd8fde39d5c] Merge remote-tracking branch 'rpmsg/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/remoteproc/qcom_adsp_pil.c | 6 ++ + drivers/remoteproc/qcom_common.c | 71 +++++++++++++ + drivers/remoteproc/qcom_common.h | 10 ++ + drivers/remoteproc/qcom_q6v5_pil.c | 3 + + drivers/remoteproc/remoteproc_core.c | 13 +-- + drivers/remoteproc/remoteproc_internal.h | 1 - + drivers/rpmsg/qcom_smd.c | 1 + + drivers/rpmsg/virtio_rpmsg_bus.c | 1 - + drivers/soc/qcom/Kconfig | 9 ++ + drivers/soc/qcom/Makefile | 1 + + drivers/soc/qcom/glink_ssr.c | 164 +++++++++++++++++++++++++++++++ + include/linux/remoteproc/qcom_rproc.h | 22 +++++ + 12 files changed, 289 insertions(+), 13 deletions(-) + create mode 100644 drivers/soc/qcom/glink_ssr.c + create mode 100644 include/linux/remoteproc/qcom_rproc.h +Merging gpio/for-next (2fdefbf2e9d4 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-vf610.txt | 4 +- + .../devicetree/bindings/gpio/renesas,gpio-rcar.txt | 15 ++- + Documentation/driver-api/gpio.rst | 45 +++++++ + Documentation/driver-api/index.rst | 1 + + drivers/gpio/devres.c | 3 + + drivers/gpio/gpio-altera-a10sr.c | 2 +- + drivers/gpio/gpio-altera.c | 4 +- + drivers/gpio/gpio-brcmstb.c | 2 +- + drivers/gpio/gpio-davinci.c | 17 ++- + drivers/gpio/gpio-ge.c | 6 +- + drivers/gpio/gpio-grgpio.c | 2 +- + drivers/gpio/gpio-it87.c | 3 + + drivers/gpio/gpio-mpc8xxx.c | 4 +- + drivers/gpio/gpio-mxc.c | 11 +- + drivers/gpio/gpio-pca953x.c | 8 +- + drivers/gpio/gpio-pxa.c | 8 +- + drivers/gpio/gpio-rcar.c | 10 ++ + drivers/gpio/gpio-tb10x.c | 3 +- + drivers/gpio/gpio-tegra.c | 129 ++++++++++----------- + drivers/gpio/gpio-tz1090.c | 10 +- + drivers/gpio/gpio-xilinx.c | 4 +- + drivers/gpio/gpiolib-acpi.c | 4 +- + drivers/gpio/gpiolib-of.c | 36 +++--- + drivers/gpio/gpiolib-sysfs.c | 8 +- + drivers/gpio/gpiolib.c | 124 ++++++++++++-------- + drivers/gpio/gpiolib.h | 2 +- + include/linux/gpio/driver.h | 24 +++- + 27 files changed, 304 insertions(+), 185 deletions(-) + create mode 100644 Documentation/driver-api/gpio.rst +Merging pinctrl/for-next (fa2c92eceadb Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/cortina,gemini-pinctrl.txt | 59 + + .../bindings/pinctrl/fsl,imx7ulp-pinctrl.txt | 61 + + .../devicetree/bindings/pinctrl/pinctrl-aspeed.txt | 8 +- + .../devicetree/bindings/pinctrl/pinctrl-mt65xx.txt | 1 + + .../bindings/pinctrl/qcom,ipq4019-pinctrl.txt | 6 +- + .../devicetree/bindings/pinctrl/qcom,pmic-gpio.txt | 2 + + .../bindings/pinctrl/rockchip,pinctrl.txt | 1 + + arch/arm/boot/dts/imx7ulp-pinfunc.h | 468 ++++ + drivers/pinctrl/Kconfig | 7 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c | 66 +- + drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 58 +- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 31 +- + drivers/pinctrl/berlin/berlin.c | 4 +- + drivers/pinctrl/core.c | 16 +- + drivers/pinctrl/core.h | 6 +- + drivers/pinctrl/devicetree.c | 4 +- + drivers/pinctrl/freescale/Kconfig | 7 + + drivers/pinctrl/freescale/Makefile | 1 + + drivers/pinctrl/freescale/pinctrl-imx.c | 131 +- + drivers/pinctrl/freescale/pinctrl-imx.h | 20 + + drivers/pinctrl/freescale/pinctrl-imx7ulp.c | 364 +++ + drivers/pinctrl/freescale/pinctrl-vf610.c | 25 + + drivers/pinctrl/intel/Kconfig | 11 + + drivers/pinctrl/intel/Makefile | 1 + + drivers/pinctrl/intel/pinctrl-baytrail.c | 4 +- + drivers/pinctrl/intel/pinctrl-denverton.c | 302 +++ + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 4 +- + drivers/pinctrl/nomadik/pinctrl-abx500.c | 2 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 2 +- + drivers/pinctrl/pinconf-generic.c | 7 +- + drivers/pinctrl/pinconf.c | 14 +- + drivers/pinctrl/pinconf.h | 24 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 11 +- + drivers/pinctrl/pinctrl-coh901.c | 2 +- + drivers/pinctrl/pinctrl-gemini.c | 2359 ++++++++++++++++++++ + drivers/pinctrl/pinctrl-rockchip.c | 249 ++- + drivers/pinctrl/pinctrl-rza1.c | 2 +- + drivers/pinctrl/pinctrl-st.c | 6 +- + drivers/pinctrl/pinctrl-tb10x.c | 4 +- + drivers/pinctrl/pinctrl-zynq.c | 34 +- + drivers/pinctrl/pinmux.c | 16 +- + drivers/pinctrl/pinmux.h | 29 +- + drivers/pinctrl/qcom/pinctrl-ipq4019.c | 432 +++- + drivers/pinctrl/qcom/pinctrl-msm.c | 27 +- + drivers/pinctrl/qcom/pinctrl-msm.h | 16 +- + drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 2 +- + drivers/pinctrl/samsung/pinctrl-samsung.c | 6 +- + drivers/pinctrl/sh-pfc/pinctrl.c | 2 +- + drivers/pinctrl/sirf/pinctrl-atlas7.c | 11 +- + drivers/pinctrl/sirf/pinctrl-sirf.c | 6 +- + drivers/pinctrl/stm32/pinctrl-stm32.c | 2 +- + drivers/pinctrl/sunxi/Kconfig | 2 +- + drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c | 273 ++- + drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c | 6 +- + drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c | 6 +- + drivers/pinctrl/sunxi/pinctrl-sun8i-h3-r.c | 4 +- + drivers/pinctrl/sunxi/pinctrl-sun8i-v3s.c | 1 + + drivers/pinctrl/tegra/pinctrl-tegra-xusb.c | 2 +- + drivers/pinctrl/uniphier/Kconfig | 4 + + drivers/pinctrl/uniphier/Makefile | 1 + + drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 279 ++- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | 660 ++---- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 709 ++---- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c | 273 +-- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c | 386 +--- + drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c | 451 +--- + drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c | 458 +--- + drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c | 386 +--- + drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c | 989 ++++++++ + drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c | 273 +-- + drivers/pinctrl/uniphier/pinctrl-uniphier.h | 40 +- + drivers/pinctrl/vt8500/pinctrl-wmt.c | 2 +- + drivers/pinctrl/zte/pinctrl-zx.c | 7 +- + include/linux/pinctrl/machine.h | 4 +- + 76 files changed, 6559 insertions(+), 3593 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/cortina,gemini-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx7ulp-pinctrl.txt + create mode 100644 arch/arm/boot/dts/imx7ulp-pinfunc.h + create mode 100644 drivers/pinctrl/freescale/pinctrl-imx7ulp.c + create mode 100644 drivers/pinctrl/intel/pinctrl-denverton.c + create mode 100644 drivers/pinctrl/pinctrl-gemini.c + create mode 100644 drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c +Merging pinctrl-samsung/for-next (bbed85f45b2b pinctrl: samsung: Remove unneeded local variable initialization) +$ git merge pinctrl-samsung/for-next +Auto-merging drivers/pinctrl/samsung/pinctrl-samsung.c +Merge made by the 'recursive' strategy. + drivers/pinctrl/samsung/pinctrl-exynos.c | 32 ++++++++++--------------- + drivers/pinctrl/samsung/pinctrl-exynos.h | 1 - + drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 37 +++++++++++++++------------- + drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 40 ++++++++++++++----------------- + drivers/pinctrl/samsung/pinctrl-samsung.c | 12 ++++++++-- + drivers/pinctrl/samsung/pinctrl-samsung.h | 15 ++++++------ + include/dt-bindings/pinctrl/samsung.h | 3 ++- + 7 files changed, 71 insertions(+), 69 deletions(-) +Merging pwm/for-next (5ec8c48a6235 Merge branch 'for-4.13/drivers' into for-next) +$ git merge pwm/for-next +Already up-to-date. +Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files) +$ git merge dma-buf/for-next +Resolved 'drivers/dma-buf/Kconfig' using previous resolution. +Auto-merging drivers/dma-buf/Kconfig +CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 35d5a4826a94] 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 (64a76d0d64be signal: Fix sending signals with siginfo) +$ 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 arch/sparc/kernel/traps_64.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 +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c5320964680e] 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 | 11 ++- + arch/mips/kernel/signal32.c | 19 ++--- + 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 ++--- + include/linux/signal.h | 22 +++++ + include/linux/user_namespace.h | 9 +- + include/uapi/asm-generic/siginfo.h | 115 +++++++++++--------------- + 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 | 7 +- + tools/testing/selftests/x86/mpx-mini-test.c | 3 +- + tools/testing/selftests/x86/protection_keys.c | 13 ++- + 35 files changed, 348 insertions(+), 274 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 (4c1d69950da4 fs: aio: fix the increment of aio-nr and counting against aio-max-nr) +$ git merge aio/master +Auto-merging fs/aio.c +Merge made by the 'recursive' strategy. + fs/aio.c | 19 ++++++++++++------- + 1 file changed, 12 insertions(+), 7 deletions(-) +Merging kselftest/next (43c6437453f2 selftests: warn if failure is due to lack of executable bit) +$ git merge kselftest/next +Merge made by the 'recursive' strategy. + .../selftests/breakpoints/breakpoint_test.c | 4 +- + tools/testing/selftests/capabilities/test_execve.c | 88 ++++++---- + .../testing/selftests/capabilities/validate_cap.c | 15 +- + tools/testing/selftests/ftrace/ftracetest | 51 ++++-- + tools/testing/selftests/kselftest.h | 27 ++- + tools/testing/selftests/lib.mk | 7 +- + tools/testing/selftests/nsfs/config | 3 + + tools/testing/selftests/pstore/.gitignore | 2 + + tools/testing/selftests/ptp/Makefile | 1 + + tools/testing/selftests/sigaltstack/sas.c | 53 +++--- + tools/testing/selftests/splice/.gitignore | 1 + + tools/testing/selftests/splice/Makefile | 5 +- + tools/testing/selftests/sync/sync_test.c | 71 +++++--- + tools/testing/selftests/sync/synctest.h | 3 +- + tools/testing/selftests/watchdog/watchdog-test.c | 190 +++++++++++++-------- + 15 files changed, 341 insertions(+), 180 deletions(-) + create mode 100644 tools/testing/selftests/nsfs/config + create mode 100644 tools/testing/selftests/pstore/.gitignore + create mode 100644 tools/testing/selftests/splice/.gitignore +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 (6d34a5f3806d coresight: STM: Clean up __iomem type usage) +$ git merge coresight/next +Auto-merging drivers/hwtracing/coresight/coresight-dynamic-replicator.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/coresight.txt | 4 +- + arch/arm64/boot/dts/arm/juno-base.dtsi | 2 +- + drivers/hwtracing/coresight/Kconfig | 10 +- + drivers/hwtracing/coresight/Makefile | 2 +- + ...cator-qcom.c => coresight-dynamic-replicator.c} | 36 ++++++- + drivers/hwtracing/coresight/coresight-etb10.c | 70 ++++++++----- + drivers/hwtracing/coresight/coresight-etm-perf.c | 4 +- + drivers/hwtracing/coresight/coresight-etm.h | 1 + + .../hwtracing/coresight/coresight-etm3x-sysfs.c | 26 ++--- + drivers/hwtracing/coresight/coresight-etm3x.c | 44 ++++++--- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 24 ++--- + drivers/hwtracing/coresight/coresight-etm4x.c | 4 + + drivers/hwtracing/coresight/coresight-funnel.c | 9 +- + drivers/hwtracing/coresight/coresight-priv.h | 39 +++++++- + drivers/hwtracing/coresight/coresight-stm.c | 55 ++++++----- + drivers/hwtracing/coresight/coresight-tmc-etf.c | 42 ++++++-- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 49 ++++++--- + drivers/hwtracing/coresight/coresight-tmc.c | 110 ++++++++++++++++----- + drivers/hwtracing/coresight/coresight-tmc.h | 85 +++++++++++++++- + drivers/hwtracing/coresight/coresight-tpiu.c | 9 +- + drivers/hwtracing/coresight/coresight.c | 8 ++ + include/linux/coresight-pmu.h | 6 ++ + tools/include/linux/coresight-pmu.h | 6 ++ + tools/perf/arch/arm/util/cs-etm.c | 28 +++++- + 24 files changed, 511 insertions(+), 162 deletions(-) + rename drivers/hwtracing/coresight/{coresight-replicator-qcom.c => coresight-dynamic-replicator.c} (86%) +Merging rtc/rtc-next (2f7f1b780dd6 rtc: max8925: remove redundant check on ret) +$ git merge rtc/rtc-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/wakeup-source.txt | 9 +- + .../devicetree/bindings/rtc/isil,isl12057.txt | 1 - + drivers/rtc/rtc-ds1307.c | 8 +- + drivers/rtc/rtc-max8925.c | 2 - + drivers/rtc/rtc-s35390a.c | 104 +++++++++++++++------ + drivers/rtc/rtc-sun6i.c | 10 +- + 6 files changed, 85 insertions(+), 49 deletions(-) +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 (bbb3be170ac2 device-dax: fix sysfs duplicate warnings) +$ git merge nvdimm/libnvdimm-for-next +Already up-to-date. +Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection) +$ git merge dax-misc/dax-misc +Already up-to-date. +Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too) +$ git merge idr/idr-4.11 +Already up-to-date. +Merging kspp/for-next/kspp (cb624a11ecd5 Merge branch 'for-next/secureexec' into for-next/kspp) +$ git merge kspp/for-next/kspp +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging security/commoncap.c +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Merge made by the 'recursive' strategy. + arch/Kconfig | 19 ++++++--- + drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c | 8 ++-- + drivers/net/wan/z85230.c | 30 +++++++------- + fs/binfmt_elf.c | 2 +- + fs/binfmt_elf_fdpic.c | 2 +- + fs/binfmt_flat.c | 2 +- + fs/exec.c | 56 +++++++++++++++++++------- + include/linux/binfmts.h | 24 ++++++++--- + include/linux/lsm_hooks.h | 14 +++---- + include/linux/security.h | 7 ---- + scripts/Makefile.gcc-plugins | 1 + + scripts/gcc-plugins/randomize_layout_plugin.c | 3 -- + scripts/gcc-plugins/structleak_plugin.c | 13 +++++- + security/apparmor/domain.c | 21 +--------- + security/apparmor/include/domain.h | 1 - + security/apparmor/include/file.h | 3 -- + security/apparmor/lsm.c | 1 - + security/commoncap.c | 50 +++++------------------ + security/security.c | 5 --- + security/selinux/hooks.c | 26 +++--------- + security/smack/smack_lsm.c | 34 ++-------------- + security/tomoyo/tomoyo.c | 2 +- + 22 files changed, 135 insertions(+), 189 deletions(-) +Merging akpm-current/current (de6bc1ead155 ipc: convert kern_ipc_perm.refcount from atomic_t to refcount_t) +$ git merge --no-ff akpm-current/current +Auto-merging tools/objtool/check.c +Auto-merging mm/memcontrol.c +Auto-merging mm/filemap.c +Auto-merging kernel/sched/sched.h +Auto-merging kernel/sched/fair.c +Auto-merging kernel/sched/deadline.c +Auto-merging kernel/locking/rtmutex_common.h +Auto-merging kernel/fork.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging ipc/sem.c +Auto-merging init/main.c +Auto-merging include/rdma/ib_verbs.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/init_task.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/bio.h +Auto-merging include/asm-generic/pgtable.h +Auto-merging fs/sync.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/file.c +Auto-merging fs/exec.c +Auto-merging fs/ceph/cache.c +Auto-merging drivers/nvdimm/nd.h +Auto-merging drivers/infiniband/hw/hfi1/mmu_rb.c +Auto-merging drivers/infiniband/core/uverbs_cmd.c +Auto-merging drivers/gpu/drm/msm/msm_gem_submit.c +Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c +Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c +Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c +Auto-merging drivers/gpu/drm/drm_scdc_helper.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c +Auto-merging drivers/block/zram/zram_drv.c +Auto-merging block/genhd.c +Auto-merging block/cfq-iosched.c +Auto-merging arch/x86/kernel/machine_kexec_64.c +Auto-merging arch/x86/include/asm/pgtable_types.h +Auto-merging arch/x86/include/asm/pgtable.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/arc/kernel/setup.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-block-zram | 8 + + Documentation/admin-guide/kernel-parameters.txt | 2 +- + Documentation/blockdev/zram.txt | 11 + + Documentation/filesystems/caching/netfs-api.txt | 2 - + Documentation/filesystems/dax.txt | 5 +- + Documentation/rbtree.txt | 33 ++ + Documentation/sysctl/vm.txt | 4 +- + Documentation/vm/numa | 7 +- + arch/alpha/include/uapi/asm/mman.h | 11 - + arch/arc/kernel/setup.c | 2 +- + arch/arc/kernel/troubleshoot.c | 2 +- + arch/arm/include/asm/page.h | 2 + + arch/m32r/configs/m32104ut_defconfig | 4 - + arch/m32r/configs/m32700ut.smp_defconfig | 3 - + arch/m32r/configs/m32700ut.up_defconfig | 3 - + arch/m32r/configs/mappi.nommu_defconfig | 2 - + arch/m32r/configs/mappi.smp_defconfig | 4 - + arch/m32r/configs/mappi.up_defconfig | 4 - + arch/m32r/configs/mappi2.opsp_defconfig | 2 - + arch/m32r/configs/mappi2.vdec2_defconfig | 2 - + arch/m32r/configs/mappi3.smp_defconfig | 4 - + arch/m32r/configs/oaks32r_defconfig | 2 - + arch/m32r/configs/opsput_defconfig | 2 - + arch/m32r/configs/usrv_defconfig | 5 - + arch/metag/include/asm/topology.h | 1 - + arch/mips/include/uapi/asm/mman.h | 11 - + arch/mn10300/configs/asb2303_defconfig | 6 - + arch/mn10300/configs/asb2364_defconfig | 8 - + arch/parisc/include/uapi/asm/mman.h | 11 - + arch/powerpc/include/uapi/asm/mman.h | 16 - + arch/powerpc/kernel/rtas.c | 4 +- + arch/powerpc/platforms/pseries/suspend.c | 2 +- + arch/sh/configs/ap325rxa_defconfig | 10 - + arch/sh/configs/apsh4a3a_defconfig | 9 - + arch/sh/configs/apsh4ad0a_defconfig | 6 - + arch/sh/configs/cayman_defconfig | 4 - + arch/sh/configs/dreamcast_defconfig | 6 - + arch/sh/configs/ecovec24-romimage_defconfig | 7 - + arch/sh/configs/ecovec24_defconfig | 9 - + arch/sh/configs/edosk7705_defconfig | 2 - + arch/sh/configs/edosk7760_defconfig | 11 - + arch/sh/configs/espt_defconfig | 10 - + arch/sh/configs/hp6xx_defconfig | 4 - + arch/sh/configs/kfr2r09-romimage_defconfig | 5 - + arch/sh/configs/kfr2r09_defconfig | 7 - + arch/sh/configs/landisk_defconfig | 4 - + arch/sh/configs/lboxre2_defconfig | 3 - + arch/sh/configs/magicpanelr2_defconfig | 9 - + arch/sh/configs/microdev_defconfig | 3 - + arch/sh/configs/migor_defconfig | 8 - + arch/sh/configs/polaris_defconfig | 9 - + arch/sh/configs/r7780mp_defconfig | 4 - + arch/sh/configs/r7785rp_defconfig | 3 - + arch/sh/configs/rsk7201_defconfig | 8 - + arch/sh/configs/rsk7203_defconfig | 10 - + arch/sh/configs/rsk7264_defconfig | 3 - + arch/sh/configs/rsk7269_defconfig | 4 - + arch/sh/configs/rts7751r2d1_defconfig | 5 - + arch/sh/configs/rts7751r2dplus_defconfig | 8 - + arch/sh/configs/sdk7780_defconfig | 9 - + arch/sh/configs/sdk7786_defconfig | 9 - + arch/sh/configs/se7206_defconfig | 8 - + arch/sh/configs/se7343_defconfig | 9 - + arch/sh/configs/se7619_defconfig | 5 - + arch/sh/configs/se7705_defconfig | 5 - + arch/sh/configs/se7712_defconfig | 7 - + arch/sh/configs/se7721_defconfig | 6 - + arch/sh/configs/se7722_defconfig | 3 - + arch/sh/configs/se7724_defconfig | 9 - + arch/sh/configs/se7750_defconfig | 5 - + arch/sh/configs/se7751_defconfig | 5 - + arch/sh/configs/se7780_defconfig | 7 - + arch/sh/configs/secureedge5410_defconfig | 9 - + arch/sh/configs/sh03_defconfig | 4 - + arch/sh/configs/sh2007_defconfig | 8 - + arch/sh/configs/sh7710voipgw_defconfig | 5 - + arch/sh/configs/sh7724_generic_defconfig | 3 - + arch/sh/configs/sh7757lcr_defconfig | 4 - + arch/sh/configs/sh7763rdp_defconfig | 9 - + arch/sh/configs/sh7770_generic_defconfig | 3 - + arch/sh/configs/sh7785lcr_32bit_defconfig | 10 - + arch/sh/configs/sh7785lcr_defconfig | 9 - + arch/sh/configs/shmin_defconfig | 4 - + arch/sh/configs/shx3_defconfig | 6 - + arch/sh/configs/titan_defconfig | 8 - + arch/sh/configs/ul2_defconfig | 9 - + arch/sh/configs/urquell_defconfig | 9 - + arch/x86/Kconfig | 4 + + arch/x86/boot/compressed/misc.c | 2 +- + arch/x86/include/asm/pgtable.h | 17 + + arch/x86/include/asm/pgtable_64.h | 14 +- + arch/x86/include/asm/pgtable_types.h | 10 +- + arch/x86/include/uapi/asm/mman.h | 3 - + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/xtensa/include/uapi/asm/mman.h | 11 - + block/cfq-iosched.c | 81 ++-- + block/genhd.c | 2 +- + drivers/base/memory.c | 30 +- + drivers/block/brd.c | 10 - + drivers/block/zram/Kconfig | 12 + + drivers/block/zram/zram_drv.c | 539 +++++++++++++++++---- + drivers/block/zram/zram_drv.h | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 +- + drivers/gpu/drm/drm_blend.c | 2 +- + drivers/gpu/drm/drm_dp_dual_mode_helper.c | 2 +- + drivers/gpu/drm/drm_mm.c | 19 +- + drivers/gpu/drm/drm_scdc_helper.c | 2 +- + drivers/gpu/drm/drm_vma_manager.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 | 10 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 10 +- + 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/radeon/radeon.h | 2 +- + drivers/gpu/drm/radeon/radeon_mn.c | 8 +- + drivers/gpu/drm/radeon/radeon_vm.c | 7 +- + drivers/gpu/drm/selftests/test-drm_mm.c | 4 +- + drivers/infiniband/core/umem_rbtree.c | 4 +- + drivers/infiniband/core/uverbs_cmd.c | 2 +- + drivers/infiniband/hw/hfi1/mmu_rb.c | 10 +- + drivers/infiniband/hw/usnic/usnic_uiom.c | 6 +- + drivers/infiniband/hw/usnic/usnic_uiom.h | 2 +- + .../infiniband/hw/usnic/usnic_uiom_interval_tree.c | 15 +- + .../infiniband/hw/usnic/usnic_uiom_interval_tree.h | 12 +- + drivers/misc/cxl/pci.c | 2 +- + drivers/mtd/nand/denali.c | 3 - + drivers/nvdimm/btt.c | 15 - + drivers/nvdimm/nd.h | 4 +- + drivers/nvdimm/pmem.c | 59 ++- + drivers/vhost/vhost.c | 2 +- + drivers/vhost/vhost.h | 2 +- + drivers/xen/gntalloc.c | 2 +- + fs/9p/cache.c | 29 -- + fs/adfs/dir_f.c | 5 +- + fs/afs/cache.c | 43 -- + fs/buffer.c | 31 +- + fs/ceph/cache.c | 31 -- + fs/cifs/cache.c | 31 -- + fs/coredump.c | 2 +- + fs/dax.c | 345 ++++++------- + fs/eventpoll.c | 30 +- + fs/exec.c | 4 +- + fs/ext2/file.c | 25 +- + fs/ext4/file.c | 48 +- + fs/ext4/inode.c | 15 +- + fs/fat/namei_vfat.c | 35 +- + fs/fscache/page.c | 5 +- + fs/hugetlbfs/inode.c | 36 +- + fs/inode.c | 2 +- + fs/nfs/fscache-index.c | 40 -- + fs/nilfs2/page.c | 3 +- + fs/ocfs2/acl.c | 2 +- + fs/ocfs2/acl.h | 7 - + fs/ocfs2/dlm/dlmmaster.c | 66 ++- + fs/ocfs2/dlm/dlmrecovery.c | 40 +- + fs/ocfs2/dlmglue.c | 2 +- + fs/ocfs2/filecheck.c | 357 ++++++-------- + fs/ocfs2/filecheck.h | 29 +- + fs/ocfs2/ocfs2.h | 8 + + fs/ocfs2/stackglue.c | 6 - + fs/ocfs2/stackglue.h | 3 - + fs/ocfs2/super.c | 35 +- + fs/overlayfs/copy_up.c | 2 +- + fs/overlayfs/dir.c | 2 +- + fs/overlayfs/namei.c | 12 +- + fs/proc/base.c | 8 +- + fs/proc/generic.c | 26 +- + fs/proc/internal.h | 2 +- + fs/proc/meminfo.c | 18 +- + fs/proc/proc_net.c | 2 +- + fs/proc/root.c | 2 +- + fs/proc/task_mmu.c | 69 +-- + fs/proc/task_nommu.c | 5 +- + fs/ramfs/file-nommu.c | 2 +- + fs/seq_file.c | 10 - + fs/sync.c | 5 - + fs/userfaultfd.c | 13 +- + fs/xfs/xfs_file.c | 2 +- + include/asm-generic/pgtable.h | 52 +- + include/drm/drm_mm.h | 2 +- + include/linux/bio.h | 8 + + include/linux/crash_core.h | 2 + + include/linux/dax.h | 45 -- + include/linux/fs.h | 6 +- + include/linux/fscache.h | 9 - + include/linux/gfp.h | 2 - + include/linux/huge_mm.h | 24 +- + include/linux/init_task.h | 5 +- + include/linux/interval_tree.h | 8 +- + include/linux/interval_tree_generic.h | 48 +- + include/linux/ipc.h | 3 +- + include/linux/ipc_namespace.h | 5 +- + include/linux/kernel.h | 7 +- + include/linux/memcontrol.h | 52 +- + include/linux/memory_hotplug.h | 2 +- + include/linux/migrate.h | 15 +- + include/linux/mm.h | 19 +- + include/linux/mmzone.h | 5 +- + include/linux/page-flags.h | 4 +- + include/linux/pagemap.h | 12 +- + include/linux/pagevec.h | 12 +- + include/linux/rbtree.h | 21 + + include/linux/rbtree_augmented.h | 33 +- + include/linux/reboot.h | 4 + + include/linux/rmap.h | 7 +- + include/linux/rtmutex.h | 11 +- + include/linux/sched.h | 3 +- + include/linux/shm.h | 17 - + include/linux/shmem_fs.h | 6 + + include/linux/string.h | 30 +- + include/linux/swap.h | 18 +- + include/linux/swapops.h | 75 ++- + include/linux/vm_event_item.h | 2 + + include/linux/vmstat.h | 4 +- + include/rdma/ib_umem_odp.h | 11 +- + include/rdma/ib_verbs.h | 2 +- + include/trace/events/fs_dax.h | 2 - + include/trace/events/mmflags.h | 1 - + include/uapi/asm-generic/hugetlb_encode.h | 34 ++ + include/uapi/asm-generic/mman-common.h | 11 - + include/uapi/linux/mman.h | 22 + + include/uapi/linux/shm.h | 31 +- + include/uapi/linux/sysctl.h | 4 + + include/uapi/linux/userfaultfd.h | 10 +- + init/main.c | 5 +- + ipc/msgutil.c | 2 +- + ipc/namespace.c | 4 +- + ipc/sem.c | 8 +- + ipc/util.c | 6 +- + kernel/cgroup/cgroup.c | 3 - + kernel/fork.c | 3 +- + kernel/locking/rtmutex-debug.c | 2 +- + kernel/locking/rtmutex.c | 35 +- + kernel/locking/rtmutex_common.h | 12 +- + kernel/locking/test-ww_mutex.c | 2 +- + kernel/power/snapshot.c | 2 +- + kernel/reboot.c | 27 ++ + kernel/sched/deadline.c | 50 +- + kernel/sched/debug.c | 2 +- + kernel/sched/fair.c | 39 +- + kernel/sched/sched.h | 9 +- + kernel/sysctl.c | 2 - + kernel/trace/trace_events_filter.c | 2 +- + lib/hexdump.c | 5 +- + lib/interval_tree_test.c | 4 +- + lib/rbtree.c | 65 ++- + lib/rbtree_test.c | 230 +++++++-- + lib/string.c | 7 +- + lib/string_helpers.c | 4 +- + mm/Kconfig | 3 + + mm/filemap.c | 67 +-- + mm/gup.c | 24 +- + mm/huge_memory.c | 202 +++++++- + mm/hugetlb.c | 28 +- + mm/internal.h | 1 + + mm/interval_tree.c | 10 +- + mm/ksm.c | 2 +- + mm/memcontrol.c | 66 ++- + mm/memory.c | 86 +++- + mm/memory_hotplug.c | 122 ++--- + mm/mempolicy.c | 130 +++-- + mm/migrate.c | 77 ++- + mm/mmap.c | 16 +- + mm/mprotect.c | 4 +- + mm/mremap.c | 15 +- + mm/nommu.c | 4 +- + mm/page-writeback.c | 4 +- + mm/page_alloc.c | 376 +++++--------- + mm/page_ext.c | 10 +- + mm/page_idle.c | 2 +- + mm/page_io.c | 21 +- + mm/page_owner.c | 39 +- + mm/page_vma_mapped.c | 18 +- + mm/pgtable-generic.c | 3 +- + mm/rmap.c | 24 +- + mm/shmem.c | 169 ++++--- + mm/slub.c | 8 +- + mm/sparse-vmemmap.c | 11 +- + mm/sparse.c | 10 +- + mm/swap.c | 24 +- + mm/swapfile.c | 234 ++++++++- + mm/userfaultfd.c | 48 +- + mm/util.c | 4 +- + mm/vmscan.c | 123 +++-- + mm/vmstat.c | 6 +- + mm/zsmalloc.c | 8 +- + sound/soc/codecs/pcm512x.c | 3 - + tools/objtool/check.c | 1 - + tools/perf/builtin-kmem.c | 1 - + tools/testing/selftests/vm/userfaultfd.c | 129 ++++- + 298 files changed, 3584 insertions(+), 2823 deletions(-) + create mode 100644 include/uapi/asm-generic/hugetlb_encode.h +$ git am -3 ../patches/0001-mm-thp-enable-thp-migration-in-generic-path-fix-fix.patch +Applying: mm-thp-enable-thp-migration-in-generic-path-fix-fix +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/swapops.h +$ git add -A . +$ git commit -v -a --amend +[master f92ca094ca1a] Merge branch 'akpm-current/current' + Date: Thu Aug 10 15:42:37 2017 +1000 +$ 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: fscache: fix fscache_objlist_show format processing +Applying: IB/mlx4: fix sprintf format warning +Applying: iopoll: avoid -Wint-in-bool-context warning +Applying: Kbuild: use -fshort-wchar globally +Applying: sparc64: NG4 memset 32 bits overflow +Applying: lib/crc-ccitt: add CCITT-FALSE CRC16 variant +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 8e8f2510e6ec...e61fbc7dbf5e akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (e61fbc7dbf5e lib/crc-ccitt: add CCITT-FALSE CRC16 variant) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + Makefile | 2 +- + arch/sparc/lib/NG4memset.S | 26 ++++++++--------- + drivers/infiniband/hw/mlx4/sysfs.c | 2 +- + drivers/xen/Makefile | 3 -- + fs/fscache/object-list.c | 3 +- + include/linux/crc-ccitt.h | 7 +++++ + include/linux/iopoll.h | 24 ++++++++++------ + include/linux/regmap.h | 12 ++++---- + lib/crc-ccitt.c | 58 +++++++++++++++++++++++++++++++++++++- + 9 files changed, 103 insertions(+), 34 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..1dc478596b0e --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20170810 |