diff options
| -rw-r--r-- | Next/SHA1s | 259 | ||||
| -rw-r--r-- | Next/Trees | 261 | ||||
| -rw-r--r-- | Next/merge.log | 5840 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 6363 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..eb51815d527e --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,259 @@ +Name SHA1 +---- ---- +origin a638af00b27266c09ab7ac69141e6f4ac6c00eff +fixes 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +kbuild-current 36c1681678b507346e7397a235a7303dad665fc3 +arc-current 05382333595612204d6c91820bd77be20119cb9b +arm-current 091f02483df7b56615b524491f404e574c5e0668 +m68k-current 2334b1ac1235934fc196f2d25bae7f348d3bf42e +metag-fixes b884a190afcecdbef34ca508ea5ee88bb7c77861 +powerpc-fixes 083b20907185b076f21c265b30fe5b5f24c03d8c +sparc aebb48f5e465772576359c1705c4a84abea92027 +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net 93c62c45ed5fad1b87e3a45835b251cd68de9c46 +bpf 6c5f61023c5b0edb0c8a64c902fe97c6453b1852 +ipsec 013cb81e89f8a70deef086ca29a923faf5585ab0 +netfilter cfd092f2db8b4b6727e1c03ef68a7842e1023573 +ipvs f7fb77fc12352d15180dc3c08ffba10573d5167d +wireless-drivers 7ac8ff95f48cbfa609a060fd6a1e361dd62feeb3 +mac80211 657308f73e674e86b60509a430a46e569bf02846 +rdma-fixes f45765872e7aae7b81feb3044aaf9886b21885ef +sound-current 7229b12f5da33d5c376ee264f063703844b8092d +pci-current 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +driver-core.current 91ab883eb21325ad80f3473633f794c78ac87f51 +tty.current 91ab883eb21325ad80f3473633f794c78ac87f51 +usb.current 44eb5e12b845cc8a0634f21b70ef07d774eb4b25 +usb-gadget-fixes 98112041bcca164676367e261c8c1073ef70cb51 +usb-serial-fixes d14ac576d10f865970bb1324d337e5e24d79aaf4 +usb-chipidea-fixes 964728f9f407eca0b417fdf8e784b7a76979490c +phy 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +staging.current c6754712e05317923e3f67ac01d45c7d5ec6f79f +char-misc.current 2a4ac172c2f257d28c47b90c9e381bec31edcc44 +input-current ea4f7bd2aca9f68470e9aac0fc9432fd180b1fe7 +crypto-current c927b080c67e3e97193c81fc1d27f4251bf4e036 +ide 8e44e6600caa7b96a5b71ae36c8829db753c2d70 +vfio-fixes 563b5cbe334e9503ab2b234e279d500fc4f76018 +kselftest-fixes 9eaa1fb2196156b31db1b2b4eb9182964efbeb17 +backlight-fixes 8ff5cbc6e3c5c2855245c014f3ba572ddfc5ab0f +nand-fixes ee02f73e04c0e690600f621a3a1d2245834af7fe +spi-nor-fixes 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +mfd-fixes 107b7d9fa94c4692d9104243f0e793e2a4e1366e +v4l-dvb-fixes 781b045baefdabf7e0bc9f33672ca830d3db9f27 +reset-fixes f450f28e70a2378d9d6ded0932fe480055888cfa +mips-fixes 6ae1756faddefd7494353380ee546dd38c2f97eb +kvm-fixes 722c2cd7b7c99d5731689e61f674abeb8f2da537 +kvms390-fixes 0e7def5fb0dc53ddbb9f62a497d15f1e11ccdc36 +drm-intel-fixes 15fa4d7a8fb9cea93b1525880f6b968b6c3d4e5a +drm-misc-fixes 30a3317ddc2427d173d8bcffaa3f41a61eb66560 +kbuild b91233a1b7b51d9aec824bcaae895a85f86027af +uuid c0020756315eebec58310aca42cf9fb73e1322eb +dma-mapping 04f56534786c885f578c24461bcd782fe9a787cf +asm-generic a351e9b9fc24e982ec2f0e76379a49826036da12 +arc 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +arm 3a175cdf439275c3da347b6b42c4e9b652a12904 +arm-perf 44300aed5d28e61aae124c401170ac94c98d2127 +arm-soc 8337d083507b9827dfb36d545538b7789df834fd +actions 61862a89e6acb61e1193c3ad6d4eeab966c470ed +alpine a1144b2b1ec47f50951a83eb2bd847c74415b567 +amlogic b1303f3fa73b71b0121990405a137c8c8d946735 +aspeed 91b55cc53a171a2330536a820cbbd6af9dd5307c +at91 fa4cf68ab4b1972161d38bce2859850da4236994 +bcm2835 a6189bcc00123f47a256d5a6a46d93c9a2cab52e +imx-mxs 8daaaaab151eb5deb72fafbfd07aa8b5f63c8912 +keystone a29b8b93e1582aaff0b13b84679b3dda935186d9 +mvebu b4e369232fa8da87fead8fb04e19f7c15cc385c4 +omap fcb508cddbceb101bcdffa85f996e6df5c9fee7a +reset 1d7592f84f92c6344978186fdbe547af044274b5 +qcom f5788d2f292935cb841cb57a61868360fd726de6 +realtek 2b6286eb7ab8b9a22f7238bdaad403badd4a93e9 +renesas 04609e2cf07b21c13b52eb3a40033cb78e1f50e4 +rockchip aed958de4a401b47b28b97901ae4b920d5f5991c +samsung bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +samsung-krzk 6e3d094fcf5964d69dbc1de49fea49cd550dfd90 +sunxi 454c4bf0d36fbc2ee75d7782ba37182399c32eea +tegra 983371acdeda5fd76cab580f66438c02d633d512 +arm64 3a0a397ff5ff8b56ca9f7908b75dee6bf0b5fabb +clk 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +clk-samsung 83942bdd992ff347442ec72d86c2d77fe51a0270 +c6x 9d440f7a282433338207c4ffb13cafaccaa27818 +cris fd989db807a00d552ebf29d8ffb20c2ef04742da +m68k 2334b1ac1235934fc196f2d25bae7f348d3bf42e +m68knommu 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +metag e3cd7f013bac3105d44b8bd5a90359989d45b5a5 +microblaze 5b325e3b291266f5f430839fdbd820072cdfe398 +mips ea4d340cbea470247b19ee696e31f102bc64466a +mips-james 35868f09594827299106a2b0411c276b307767aa +nds32 d0d7a6fe427c95178e37bbec40fe6da9753dad8d +nios2 e0691ebb33c12084ef11b6b59228c004e19f59c8 +openrisc 0fedb7653af7a8cac606c3eff213ac92693035b9 +parisc-hd 8760d9c7e2b02b8cc3e5fbb3ac908c2a873a1c40 +powerpc 91ab883eb21325ad80f3473633f794c78ac87f51 +fsl c095ff93f901c1620b28dce4d813dd548bc5236b +risc-v 91ab883eb21325ad80f3473633f794c78ac87f51 +s390 b35fe61df4bf10c7e164a416ff8241e42f3991aa +sparc-next 8e44e6600caa7b96a5b71ae36c8829db753c2d70 +sh 6e2fbfdd585f46128ce8879738bca09719a65138 +uml 584bfe635481d9b2b7f181b05a84d6cfdce79ee7 +xtensa ae6063c83634cbef7f73ec8a3ab7a6adf5294716 +fscrypt 0b1dfa4cc6c60052b2c30ead316fa84c46d3c43c +befs 55d945e2e4aa148ef38bdfabb9569af78183a539 +btrfs 7c9a09f56a91c4ee5636703d3a95c72710917718 +btrfs-kdave 6537ffbd6382c25a2cbd26f5b5abf28ccf89bc87 +ceph a25df1968a0c42ac2a230294ac797e1164876fae +cifs 13b8cb522ed344b9478eac875e0fb47536a62ab3 +configfs 6ace4f6bbcfde70278a33c11443ecda3ed0ec1b6 +ecryptfs 4670269faba728683f7250319a65390946c028e3 +ext3 1d37d05f3c2c3c6bd329ccacb9f7415d389d85ce +ext4 5dc397113d195a004899ee672c5a8a19809495ba +f2fs 1c1d35df71104c76a4a2e25862926f22c334c9d6 +fuse c6cdd51404b7ac12dd95173ddfc548c59ecf037f +jfs 86313903430d08739e391ad51b4865dc3a2bf522 +nfs 1b7204064582792b77c6be796e78bd821c9f71b1 +nfs-anna c54c14ba000d769b7f5e4a33f915f0171b378437 +nfsd 1330e3b03a10dc64d26a5145044149b110337f3a +orangefs 74e938c22705c7b80d4422e84eea927fc78e60a8 +overlayfs 7168179fcf25f7812e8541decac686a91359e522 +ubifs 7f29ae9f977bcdc3654e68bc36d170223c52fd48 +xfs 76883f7988e6d06a97232e979bc7aaa7846a134b +file-locks 1deab8ce2c91e3b16563b7a7ea150f82334262ec +vfs d85e2aa2e34dac793e70b900d865f48c69ecbc27 +vfs-miklos 0eb8af4916a540c362a2950e5ab54eca32eb7d58 +iversion 581e400ff935d34d95811258586128bf11baef15 +printk 02fffdcaed199d4bf13fc57ccedbd1e80463b717 +pci c8989cd7ece73a807091d27e93a7c7825f0c922b +pstore a99f41a1b4412a0f27cc0b287ea34b168da750f1 +hid ba6986149ce37a172040d56ca1b0bd2ed69923c0 +i2c 91ab883eb21325ad80f3473633f794c78ac87f51 +dmi 36a840c73dc6e70a440d05da3b6ee72f7187a5d3 +hwmon-staging e464243586cbd061928f7fb6075f42bb34e50897 +jc_docs fcdf1df2032c6f12f86d71feef29cf1cfbcee758 +v4l-dvb 4395fb475a27ddcb33c27380e132ef5354ff67c6 +v4l-dvb-next a1dfb4c48cc1e64eeb7800a27c66a6f7e88d075a +fbdev 5865889fe4319415e439095391dda52f23030d60 +pm a8135650d21e4ed6d96b94c4ae177b24c1b2e56e +cpupower 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +idle 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f +opp 4a823c0be80fa996234ebb41c80d40458b1bec1e +thermal 134f4010799a30acd969e603985c27b9f3e6f58d +thermal-soc d0ecbbbe518e1b256fcda1770ec06a5a1a058567 +ieee1394 188775181bc05f29372b305ef96485840e351fde +dlm 9250e523592a8ced3ecd14abe29fbb1e036bd7eb +swiotlb 69369f52d28a34c84acb6f2a8a585e743441566a +net-next 46182452cf5abe95782e100f0719b7497641d263 +bpf-next 0b6b8a3dd86db78c3f38587d667d77065c75e4f8 +ipsec-next 60aa80460da115216070082b4ab686b9e37c86ef +netfilter-next c746fc0e8b2d144e2ee9122e4efd72326ff3cd1b +nfc-next 4d63adfe12dd9cb61ed8badb4d798955399048c2 +ipvs-next a910d20aa007b94cf1799df59341f5e27ca60e6f +wireless-drivers-next cf19e5e2054f5172c07a152f9e04eb3bae3d86dd +bluetooth 1ec010e705934c8acbe7dbf31afc81e60e3d828b +mac80211-next 94ba92713f8329c96e0a8e2880b3c1a785d1c95c +rdma 3a148896b24adf8688dc0c59af54531931677a40 +gfs2 3fc7c7e1cfaac17cb7b0bfd54e5abf9b1ef2b819 +mtd f23def8038611fa362de345c540107c78edaa085 +l2-mtd 0dbe4ea78d69756efeb0bba0764f6bd4a9ee9567 +nand d8757f4c59c9fafe5a1ce75a237164f268904b18 +spi-nor 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +crypto 017457061e07852b7173e6a2578c129b49033204 +drm e53a2079f46aadb4c3d86ba2528e2b5b7eae49dc +drm-panel e4bac408b08437d190785ab1250cc676304ed171 +drm-intel 61b8b359d02e33aa8b378fdb974c2e2a8fb932dc +drm-tegra 8f62142e490d761ceb92b55a7c05bb79294d6c6c +drm-misc 761e05a702f5d537ffcca1ba933f9f0a968aa022 +drm-msm 668c5de403450aa4e7992a02f437452e26e7e033 +hdlcd f73e8b82531573a198a4d0e5bff0d3256cbbd1d8 +mali-dp 54243016ae35a0912a680f884835237fd6176820 +sunxi-drm 7dafb83edd3271917458de0ae70586ac63098e2f +imx-drm 50b0f0aee839b5a9995fe7964a678634f75a0518 +etnaviv 246774d17fc05a9b33c769c937003cc73d258674 +kconfig bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +regmap c3270f2b83403d8f04756a5d95ccd54eeb920316 +sound 248a380a3c2e7e3363f26c17b6923b430cf6463e +sound-asoc 0de0a757faa37285646f1b82f86441d228283758 +modules 0cad61d7a3d51e0237a7e421c75b04ebbb5062d0 +input cdc2466df40f26af60f6b18123069bd52336a80c +block 0ccfb3c0032b20a7f137976e9e783c896d55301e +lightnvm 1c6286f26301ad154a1c10fb6e68925493dd28ba +device-mapper 51a05338a6f82d53843743c3813c52b02ca24ff5 +mmc 80a7d93164966b8a55fe8e63cc6ce8cd7c0db168 +kgdb 2cf2f0d5b91fd1b06a6ae260462fc7945ea84add +md 53b8d89ddbdbb0e4625a46d2cdbb6f106c52f801 +mfd 0f89ffefa4e122e7e9bc1c2d716c6052b4601b76 +backlight cfce992766ff0c7748f421183cf359a5d4592927 +battery 416a1ae673db0918fbe6707c7d6f4459598e2c65 +regulator 076fe848334011079fa619803602b5ebc0a6ce61 +security a58e3226e2e42488a5b5b52cfce11b92d2313abe +integrity 5f26b1bddb4ae019e085b7b82830c1fafab63291 +keys 1e684d3820d8f72d877c0adb521ae17c6fc9bc88 +selinux db97c9f9d31217e3e133056fe2bea76639f87ec1 +tpmdd c3211d722c614bfa0e2f728a1a0598f099f7adb0 +watchdog a17f4f032b61abd998a1f81b206a4517e2e3db2f +iommu 18b3c16e25fb85ad711c90cea1bdb258392f0cbd +dwmw2-iommu 910170442944e1f8674fd5ddbeeb8ccd1877ea98 +vfio 46ed90f157f42d956ffed17c003f089a59b76e3e +trivial 1972d6c0c86dd8620ff9f2811ce875135ffb5405 +audit 23138ead270045f1b3e912e667967b6094244999 +devicetree 7ea5c83472d39ec6065d98606f058c8fd9916616 +mailbox 0ae7d327a64b262443b7d3ebee5831e4dde47b89 +spi a484784130356fcdfaa30bbe54eb588db9f5850a +tip ecb8c06dc1c7c02afbc4bd8e91480b223b4d814e +clockevents 322fd24f5e67c396f04bef01ed33ac6bfca46bcd +edac 345fb0a9a6340ba0b3b714d62f877fde88c8a755 +edac-amd 68fa24f9121c04ef146b5158f538c8b32f285be5 +irqchip c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201 +ftrace 841a915d20c7b22fc4f36f12368daf94d9f8cb10 +rcu 4cad5591fc03b61a017fb58f74497e613f3af359 +kvm 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +kvm-arm 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +kvm-mips dc44abd6aad22411f7f9890e39fd4753dabf0d03 +kvm-ppc 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +kvms390 0e394a53c11e713fa098d4eeae453eb190c2e936 +xen-tip d1a75e0896f5e9f5cb6a979caaea39f1f4b9feb1 +percpu 554fef1c39ee148623a496e04569dabb11463406 +workqueues a10eb37ccf1d47f9d97269ede326aa949816be87 +drivers-x86 c8ba9db2a790c0fcf2f6c4cafd45ff3a0751800e +chrome-platform 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +hsi b6dc80dbe6cdf4effd5a07bcd37f34cbf25eb07a +leds 2dd1ea5b8a492121dc7cb3cb2bc17c22415260e6 +ipmi 09c0179286c76c2feeafd752c7aae961b9b11d35 +driver-core 91ab883eb21325ad80f3473633f794c78ac87f51 +usb b382a5c3c592a53cdf0097e314dc9936f7eae16d +usb-gadget 8ada211d0383b72878582bd312b984a9eae62b30 +usb-serial d1c48227d7c45fbb35c81f846a62ec92a74f4701 +usb-chipidea-next ce4c1b820c5269437ce2e7831f638159b3b83269 +phy-next 2434c6789d8e09fb5bec12b4eaa63f722f4090b7 +tty 91ab883eb21325ad80f3473633f794c78ac87f51 +char-misc 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +extcon 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +staging 7afe031c1a49c3630e39ec8d964334d0032fe6da +mux 6cd361c99ef2bbe23edd554079c4187321a21219 +slave-dma 5ec91512231afbca3b98cd9e49c56bc345f4a4e0 +cgroup d1897c9538edafd4ae6bbd03cc075962ddde2c21 +scsi 0e6dbc33f3878a9574a0fcfaa4143910373ffb58 +scsi-mkp cf8037f8d08a078d263a9b725e3ae7603ad0d42e +target-updates 1c130ae00b769a2e2df41bad3d6051ee8234b636 +target-bva 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +libata 6e627173fd1277c7a63d06782f0492d1493eba9b +vhost fa08a3b4eba59429cf7e241a7af089103e79160f +rpmsg ec6e6903695637d7446d140c3be3eb1f78c37015 +gpio 3c87d7c874b2119c1cff4eee5586b9a6bc0b7fe9 +pinctrl cfc09838477f3d1606bba0f4b62f9c3def8ba173 +pinctrl-samsung 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +pwm bccaa3f917c90917a758020dfbdd9027290a7c4e +userns 9eba1cd4b565f66456e0705475f66bf32cd75ee1 +ktest f7c6401ff84ab8ffffc281a29aa0a787f7eb346e +random 9e66317d3c92ddaab330c125dfe9d06eee268aff +aio 2a8a98673c13cb2a61a6476153acf8344adfa992 +kselftest 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +y2038 69973b830859bc6529a7a0468ba0d80ee5117826 +livepatching d13f5d84ca2774e76f8461a383c222cbc75adad5 +coresight 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +rtc 556831d8a19bb7bfb28a6e8d523bf9769a385f82 +nvdimm ee95f4059a833839bf52972191b2d4c3d3cec552 +idr f0f3f2d0a3e0f7c48163fd8b45f5909d46e7f371 +at24 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +ntb 53c3677c56c76f90cacd3a1063272fc6d6bc8f76 +kspp 2d00fcb32f71904a789d285c1ae335d5f42a38d2 +init_task e1e871aff3ded26348c631b1370e257d401cd22d +akpm-current 9ec53107cdd9d0bf59add6e0f186290ed5ff5f93 +akpm f3a3e134494892bdb410de651e24ec4eef3d43dc diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..25b64a6dabf3 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,261 @@ +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 +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.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 +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +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 +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 +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips.git#mips-fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +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 +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 +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 +samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +cris git git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git#for-next +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#mips-next +mips-james git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips.git#mips-next +nds32 git https://github.com/andestech/linux.git#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 +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux.git#for-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 +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +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 +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 +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.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 +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +vfs-miklos git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#next +iversion git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#iversion-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 +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 +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-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 +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-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/rdma/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/linux-mtd.git#mtd/next +nand git git://git.infradead.org/linux-mtd.git#nand/next +spi-nor git git://git.infradead.org/linux-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-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 +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 +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-testing +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +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 https://github.com/dvhart/linux-pdx86.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-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 +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 +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 +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 +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +idr git git://git.infradead.org/users/willy/linux-dax.git#idr-4.11 +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +init_task git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#init_task +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..260be97ba4e4 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,5840 @@ +$ date -R +Fri, 23 Feb 2018 08:59:56 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at af3e79d29555 Merge tag 'leds_for-4.16-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds +Merging origin/master (a638af00b272 Merge tag 'usb-4.16-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb) +$ git merge origin/master +Updating af3e79d29555..a638af00b272 +Fast-forward + arch/arc/include/asm/bug.h | 3 +- + arch/cris/include/arch-v10/arch/bug.h | 11 ++- + arch/ia64/include/asm/bug.h | 6 +- + arch/m68k/include/asm/bug.h | 3 + + arch/riscv/Kconfig | 3 - + arch/riscv/kernel/entry.S | 5 +- + arch/riscv/kernel/head.S | 2 +- + arch/riscv/kernel/setup.c | 2 +- + arch/sparc/include/asm/bug.h | 6 +- + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/x86/kernel/module.c | 1 + + arch/x86/tools/relocs.c | 3 + + certs/blacklist_nohashes.c | 2 +- + drivers/android/binder.c | 29 +++++-- + drivers/extcon/extcon-axp288.c | 36 +------- + drivers/extcon/extcon-intel-int3496.c | 3 +- + drivers/hid/hid-ids.h | 3 + + drivers/hid/hid-quirks.c | 3 + + drivers/iio/adc/aspeed_adc.c | 7 +- + drivers/iio/adc/stm32-adc.c | 7 +- + drivers/iio/imu/adis_trigger.c | 7 +- + drivers/iio/industrialio-buffer.c | 2 +- + drivers/iio/proximity/Kconfig | 2 + + drivers/infiniband/core/core_priv.h | 7 +- + drivers/infiniband/core/rdma_core.c | 38 ++++++--- + drivers/infiniband/core/restrack.c | 23 +++-- + drivers/infiniband/core/uverbs_cmd.c | 50 ++++++++--- + drivers/infiniband/core/uverbs_ioctl.c | 3 + + drivers/infiniband/core/uverbs_ioctl_merge.c | 18 ++-- + drivers/infiniband/core/uverbs_main.c | 29 +++++-- + drivers/infiniband/core/uverbs_std_types.c | 12 ++- + drivers/infiniband/core/verbs.c | 3 +- + drivers/infiniband/hw/bnxt_re/bnxt_re.h | 2 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 54 ++++++++++-- + drivers/infiniband/hw/bnxt_re/ib_verbs.h | 2 + + drivers/infiniband/hw/bnxt_re/main.c | 12 ++- + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 21 ++--- + drivers/infiniband/hw/bnxt_re/qplib_fp.h | 4 +- + drivers/infiniband/hw/bnxt_re/qplib_sp.c | 14 +-- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c | 4 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c | 4 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c | 4 +- + drivers/infiniband/ulp/ipoib/ipoib_fs.c | 2 - + drivers/misc/mei/bus.c | 6 -- + drivers/misc/mei/client.c | 6 ++ + drivers/misc/mei/hw-me-regs.h | 5 ++ + drivers/misc/mei/pci-me.c | 5 ++ + drivers/staging/android/ashmem.c | 19 +++-- + drivers/staging/android/ion/ion_cma_heap.c | 17 ++++ + drivers/staging/fsl-mc/bus/Kconfig | 2 +- + drivers/staging/iio/adc/ad7192.c | 27 ++++-- + drivers/staging/iio/impedance-analyzer/ad5933.c | 4 +- + drivers/usb/class/cdc-acm.c | 9 +- + drivers/usb/core/quirks.c | 3 + + drivers/usb/dwc2/gadget.c | 26 +++--- + drivers/usb/dwc3/core.c | 86 +++++++++++++------ + drivers/usb/dwc3/core.h | 21 +++-- + drivers/usb/dwc3/dwc3-of-simple.c | 1 + + drivers/usb/dwc3/dwc3-omap.c | 16 ++++ + drivers/usb/dwc3/ep0.c | 7 +- + drivers/usb/dwc3/gadget.c | 2 + + drivers/usb/gadget/function/f_fs.c | 44 ++-------- + drivers/usb/gadget/function/f_uac2.c | 2 + + drivers/usb/gadget/udc/Kconfig | 1 - + drivers/usb/gadget/udc/bdc/bdc_pci.c | 1 + + drivers/usb/gadget/udc/core.c | 2 +- + drivers/usb/gadget/udc/fsl_udc_core.c | 4 +- + drivers/usb/gadget/udc/renesas_usb3.c | 2 +- + drivers/usb/host/ehci-hub.c | 4 +- + drivers/usb/host/ehci-q.c | 12 +-- + drivers/usb/host/ohci-hcd.c | 10 ++- + drivers/usb/host/ohci-hub.c | 4 +- + drivers/usb/host/ohci-q.c | 17 ++-- + drivers/usb/host/pci-quirks.c | 109 ++++++++++++++++++++++++ + drivers/usb/host/pci-quirks.h | 5 ++ + drivers/usb/host/xhci-debugfs.c | 4 +- + drivers/usb/host/xhci-hub.c | 25 ++++-- + drivers/usb/host/xhci-pci.c | 11 +++ + drivers/usb/host/xhci.c | 10 +-- + drivers/usb/host/xhci.h | 2 +- + drivers/usb/misc/ldusb.c | 6 ++ + drivers/usb/musb/musb_core.c | 3 +- + drivers/usb/musb/musb_host.c | 8 +- + drivers/usb/phy/phy-mxs-usb.c | 3 + + drivers/usb/renesas_usbhs/fifo.c | 5 ++ + drivers/usb/serial/option.c | 7 ++ + drivers/usb/usbip/stub_dev.c | 3 + + drivers/usb/usbip/vhci_hcd.c | 2 + + drivers/xen/tmem.c | 4 + + fs/efivarfs/file.c | 6 ++ + include/asm-generic/bug.h | 1 + + include/linux/compiler-gcc.h | 15 +++- + include/linux/compiler.h | 5 ++ + include/linux/kconfig.h | 9 ++ + include/linux/memcontrol.h | 24 ++++-- + include/linux/sched/mm.h | 13 ++- + include/linux/sched/user.h | 4 + + include/linux/swap.h | 2 - + include/rdma/restrack.h | 4 - + include/rdma/uverbs_ioctl.h | 43 +++++++--- + include/uapi/rdma/rdma_user_ioctl.h | 4 +- + kernel/fork.c | 15 +--- + kernel/relay.c | 2 +- + kernel/user.c | 3 + + lib/Kconfig.debug | 1 + + lib/idr.c | 2 - + lib/radix-tree.c | 2 +- + mm/mlock.c | 6 ++ + mm/page_alloc.c | 4 + + mm/swap.c | 84 ++++++++++-------- + mm/vmalloc.c | 10 ++- + mm/vmscan.c | 59 +------------ + mm/zpool.c | 2 +- + mm/zswap.c | 6 ++ + tools/cgroup/Makefile | 1 - + tools/gpio/Makefile | 2 - + tools/hv/Makefile | 1 - + tools/iio/Makefile | 2 - + tools/laptop/freefall/Makefile | 1 - + tools/leds/Makefile | 1 - + tools/perf/Makefile.perf | 6 -- + tools/power/acpi/Makefile.config | 3 - + tools/scripts/Makefile.include | 18 ++++ + tools/spi/Makefile | 2 - + tools/testing/selftests/memfd/Makefile | 1 + + tools/usb/Makefile | 1 - + tools/vm/Makefile | 1 - + tools/wmi/Makefile | 1 - + 128 files changed, 907 insertions(+), 485 deletions(-) +Merging fixes/master (7928b2cbe55b Linux 4.16-rc1) +$ git merge fixes/master +Already up to date. +Merging kbuild-current/fixes (36c1681678b5 genksyms: drop *.hash.c from .gitignore) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (053823335956 arc: dts: use 'atmel' as manufacturer for at24 in axs10x_mb) +$ git merge arc-current/for-curr +Auto-merging arch/arc/Kconfig +Merge made by the 'recursive' strategy. + arch/arc/Kconfig | 1 - + arch/arc/boot/dts/axs101.dts | 2 +- + arch/arc/boot/dts/axs10x_mb.dtsi | 4 ++-- + arch/arc/boot/dts/haps_hs_idu.dts | 2 +- + arch/arc/boot/dts/nsim_700.dts | 2 +- + arch/arc/boot/dts/nsim_hs.dts | 2 +- + arch/arc/boot/dts/nsim_hs_idu.dts | 2 +- + arch/arc/boot/dts/nsimosci.dts | 2 +- + arch/arc/boot/dts/nsimosci_hs.dts | 2 +- + arch/arc/boot/dts/nsimosci_hs_idu.dts | 2 +- + arch/arc/include/asm/entry-arcv2.h | 2 +- + arch/arc/kernel/setup.c | 2 +- + arch/arc/kernel/unwind.c | 2 +- + arch/arc/mm/cache.c | 5 ++++- + 14 files changed, 17 insertions(+), 15 deletions(-) +Merging arm-current/fixes (091f02483df7 ARM: net: bpf: clarify tail_call index) +$ git merge arm-current/fixes +Already up to date. +Merging m68k-current/for-linus (2334b1ac1235 MAINTAINERS: Add NuBus subsystem entry) +$ 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 (083b20907185 powerpc/bpf/jit: Fix 32-bit JIT for seccomp_data access) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/firmware.h | 2 +- + arch/powerpc/kernel/eeh_driver.c | 3 ++- + arch/powerpc/kernel/prom_init.c | 2 +- + arch/powerpc/net/bpf_jit_comp.c | 3 +++ + drivers/misc/ocxl/file.c | 6 ++++-- + 5 files changed, 11 insertions(+), 5 deletions(-) +Merging sparc/master (aebb48f5e465 sparc64: fix typo in CONFIG_CRYPTO_DES_SPARC64 => CONFIG_CRYPTO_CAMELLIA_SPARC64) +$ git merge sparc/master +Already up to date. +Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (93c62c45ed5f rxrpc: Fix send in rxrpc_send_data_packet()) +$ git merge net/master +Merge made by the 'recursive' strategy. + .gitignore | 4 ++ + drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 2 + + .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 14 ++-- + drivers/net/ethernet/ibm/ibmvnic.c | 7 +- + .../mellanox/mlx5/core/diag/fs_tracepoint.c | 8 +-- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 14 ++-- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 49 ++++++++++---- + .../net/ethernet/mellanox/mlx5/core/en_selftest.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 8 +-- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 13 +++- + .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 1 + + drivers/net/ethernet/mellanox/mlx5/core/main.c | 2 +- + drivers/net/ethernet/smsc/Kconfig | 2 +- + drivers/net/usb/smsc75xx.c | 7 +- + drivers/net/virtio_net.c | 58 ++++++++++------- + drivers/net/wireless/mac80211_hwsim.c | 2 +- + include/net/mac80211.h | 2 +- + include/net/regulatory.h | 2 +- + kernel/bpf/arraymap.c | 28 ++++---- + kernel/bpf/core.c | 2 +- + kernel/bpf/cpumap.c | 2 +- + kernel/bpf/lpm_trie.c | 11 ++-- + kernel/bpf/sockmap.c | 3 +- + kernel/trace/bpf_trace.c | 2 + + net/bridge/netfilter/ebt_among.c | 10 +-- + net/bridge/netfilter/ebt_limit.c | 4 +- + net/ipv4/ip_sockglue.c | 7 +- + net/ipv4/netfilter/arp_tables.c | 4 ++ + net/ipv4/netfilter/ip_tables.c | 7 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 20 +++--- + net/ipv4/netfilter/ipt_ECN.c | 12 ++-- + net/ipv4/netfilter/ipt_REJECT.c | 4 +- + net/ipv4/netfilter/ipt_rpfilter.c | 6 +- + net/ipv4/route.c | 2 + + net/ipv4/tcp_output.c | 9 +-- + net/ipv6/ipv6_sockglue.c | 10 +-- + net/ipv6/netfilter/ip6_tables.c | 4 ++ + net/ipv6/netfilter/ip6t_REJECT.c | 4 +- + net/ipv6/netfilter/ip6t_rpfilter.c | 6 +- + net/ipv6/netfilter/ip6t_srh.c | 6 +- + net/mac80211/agg-rx.c | 4 +- + net/mac80211/cfg.c | 2 +- + net/mac80211/ieee80211_i.h | 2 +- + net/mac80211/mesh.c | 17 ++--- + net/mac80211/spectmgmt.c | 7 +- + net/mac80211/sta_info.c | 3 +- + net/netfilter/nf_nat_proto_common.c | 7 +- + net/netfilter/x_tables.c | 74 ++++++++++------------ + net/netfilter/xt_AUDIT.c | 4 +- + net/netfilter/xt_CHECKSUM.c | 8 +-- + net/netfilter/xt_CONNSECMARK.c | 10 +-- + net/netfilter/xt_CT.c | 25 ++++---- + net/netfilter/xt_DSCP.c | 4 +- + net/netfilter/xt_HL.c | 13 +--- + net/netfilter/xt_HMARK.c | 27 ++++---- + net/netfilter/xt_IDLETIMER.c | 9 ++- + net/netfilter/xt_LED.c | 16 ++--- + net/netfilter/xt_NFQUEUE.c | 8 ++- + net/netfilter/xt_SECMARK.c | 18 +++--- + net/netfilter/xt_TCPMSS.c | 10 ++- + net/netfilter/xt_TPROXY.c | 6 +- + net/netfilter/xt_addrtype.c | 33 +++++----- + net/netfilter/xt_bpf.c | 4 +- + net/netfilter/xt_cgroup.c | 8 ++- + net/netfilter/xt_cluster.c | 8 +-- + net/netfilter/xt_connbytes.c | 4 +- + net/netfilter/xt_connlabel.c | 7 +- + net/netfilter/xt_connmark.c | 8 +-- + net/netfilter/xt_conntrack.c | 4 +- + net/netfilter/xt_dscp.c | 4 +- + net/netfilter/xt_ecn.c | 4 +- + net/netfilter/xt_hashlimit.c | 26 ++++---- + net/netfilter/xt_helper.c | 4 +- + net/netfilter/xt_ipcomp.c | 2 +- + net/netfilter/xt_ipvs.c | 3 +- + net/netfilter/xt_l2tp.c | 22 ++++--- + net/netfilter/xt_limit.c | 4 +- + net/netfilter/xt_nat.c | 5 +- + net/netfilter/xt_nfacct.c | 6 +- + net/netfilter/xt_physdev.c | 4 +- + net/netfilter/xt_policy.c | 23 ++++--- + net/netfilter/xt_recent.c | 14 ++-- + net/netfilter/xt_set.c | 50 +++++++-------- + net/netfilter/xt_socket.c | 10 +-- + net/netfilter/xt_state.c | 4 +- + net/netfilter/xt_time.c | 6 +- + net/netlink/af_netlink.c | 4 +- + net/rxrpc/output.c | 2 +- + net/sched/cls_api.c | 7 +- + net/wireless/mesh.c | 25 +++++++- + net/wireless/sme.c | 2 + + tools/bpf/bpftool/main.c | 2 +- + tools/bpf/bpftool/prog.c | 3 + + tools/lib/bpf/libbpf.c | 5 +- + 96 files changed, 535 insertions(+), 422 deletions(-) +Merging bpf/master (6c5f61023c5b bpf: fix rcu lockdep warning for lpm_trie map_free callback) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + kernel/bpf/arraymap.c | 5 ++++- + kernel/bpf/lpm_trie.c | 3 +-- + net/core/filter.c | 6 +----- + tools/testing/selftests/bpf/.gitignore | 1 + + tools/testing/selftests/bpf/test_maps.c | 2 ++ + tools/testing/selftests/bpf/test_tcpbpf_kern.c | 1 - + 6 files changed, 9 insertions(+), 9 deletions(-) +Merging ipsec/master (013cb81e89f8 xfrm: Fix infinite loop in xfrm_get_dst_nexthop with transport mode.) +$ git merge ipsec/master +Auto-merging net/ipv6/route.c +Auto-merging net/ipv4/route.c +Merge made by the 'recursive' strategy. + include/net/ip6_route.h | 3 +++ + include/net/route.h | 3 +++ + net/ipv4/route.c | 21 +++++++++++++-------- + net/ipv4/xfrm4_policy.c | 4 +++- + net/ipv6/route.c | 4 ++-- + net/ipv6/xfrm6_policy.c | 5 +++++ + net/xfrm/xfrm_policy.c | 13 ++++++++----- + net/xfrm/xfrm_state.c | 5 +++++ + net/xfrm/xfrm_user.c | 21 ++++++++------------- + 9 files changed, 50 insertions(+), 29 deletions(-) +Merging netfilter/master (cfd092f2db8b amd-xgbe: Restore PCI interrupt enablement setting on resume) +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (7ac8ff95f48c mvpp2: fix multicast address filter) +$ git merge wireless-drivers/master +Already up to date. +Merging mac80211/master (657308f73e67 regulatory: add NUL to request alpha2) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (f45765872e7a RDMA/uverbs: Fix kernel panic while using XRC_TGT QP type) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (7229b12f5da3 ALSA: x86: hdmi: Add single_port option for compatible behavior) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/x86/intel_hdmi_audio.c | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) +Merging pci-current/for-linus (7928b2cbe55b Linux 4.16-rc1) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (91ab883eb213 Linux 4.16-rc2) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (91ab883eb213 Linux 4.16-rc2) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (44eb5e12b845 Revert "usb: musb: host: don't start next rx urb if current one failed") +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (98112041bcca usb: dwc3: core: Fix ULPI PHYs and prevent phy_get/ulpi_init during suspend/resume) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (d14ac576d10f USB: serial: cp210x: add new device ID ELV ALC 8xxx) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/ci-for-usb-stable (964728f9f407 USB: chipidea: msm: fix ulpi-node lookup) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Already up to date. +Merging phy/fixes (7928b2cbe55b Linux 4.16-rc1) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (c6754712e053 Merge tag 'iio-fixes-for-4.16a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (2a4ac172c2f2 mei: me: add cannon point device ids for 4th device) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging input-current/for-linus (ea4f7bd2aca9 Input: matrix_keypad - fix race when disabling interrupts) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/keyboard/matrix_keypad.c | 4 +++- + drivers/input/touchscreen/mms114.c | 15 ++++++--------- + 2 files changed, 9 insertions(+), 10 deletions(-) +Merging crypto-current/master (c927b080c67e crypto: s5p-sss - Fix kernel Oops in AES-ECB mode) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + drivers/crypto/s5p-sss.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) +Merging ide/master (8e44e6600caa Merge branch 'KASAN-read_word_at_a_time') +$ git merge ide/master +Already up to date. +Merging vfio-fixes/for-linus (563b5cbe334e iommu/arm-smmu-v3: Cope with duplicated Stream IDs) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (9eaa1fb21961 selftests: vm: update .gitignore with new test) +$ git merge kselftest-fixes/fixes +Resolved 'tools/testing/selftests/x86/Makefile' using previous resolution. +Auto-merging tools/testing/selftests/x86/Makefile +CONFLICT (content): Merge conflict in tools/testing/selftests/x86/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 742fb40e43ff] Merge remote-tracking branch 'kselftest-fixes/fixes' +$ git diff -M --stat --summary HEAD^.. + tools/testing/selftests/android/Makefile | 8 ++++---- + tools/testing/selftests/futex/Makefile | 6 +++--- + tools/testing/selftests/memfd/config | 1 + + tools/testing/selftests/memory-hotplug/Makefile | 2 +- + tools/testing/selftests/pstore/config | 1 + + tools/testing/selftests/sync/Makefile | 2 +- + tools/testing/selftests/vDSO/Makefile | 14 +++++++------- + tools/testing/selftests/vm/.gitignore | 1 + + 8 files changed, 19 insertions(+), 16 deletions(-) + create mode 100644 tools/testing/selftests/memfd/config +Merging backlight-fixes/for-backlight-fixes (8ff5cbc6e3c5 backlight: as3711_bl: fix device-tree node leaks) +$ git merge backlight-fixes/for-backlight-fixes +Merge made by the 'recursive' strategy. + drivers/video/backlight/as3711_bl.c | 45 ++++++++++++++++++++++------------- + drivers/video/backlight/max8925_bl.c | 4 +++- + drivers/video/backlight/tps65217_bl.c | 4 ++-- + include/linux/mfd/as3711.h | 4 ++-- + 4 files changed, 36 insertions(+), 21 deletions(-) +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 (7928b2cbe55b Linux 4.16-rc1) +$ git merge spi-nor-fixes/spi-nor/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (107b7d9fa94c mfd: rtsx: Release IRQ during shutdown) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (781b045baefd media: imx274: Fix error handling, add MAINTAINERS entry) +$ git merge v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (f450f28e70a2 reset: socfpga: fix for 64-bit compilation) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (6ae1756fadde MIPS: Drop spurious __unused in struct compat_flock) +$ git merge mips-fixes/mips-fixes +Merge made by the 'recursive' strategy. + arch/mips/include/asm/compat.h | 1 - + 1 file changed, 1 deletion(-) +Merging kvm-fixes/master (722c2cd7b7c9 Merge tag 'kvm-s390-master-4.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) +$ git merge kvm-fixes/master +Merge made by the 'recursive' strategy. + arch/s390/kvm/intercept.c | 51 +++++++------ + arch/s390/kvm/interrupt.c | 98 +++++++++++++++---------- + arch/s390/kvm/kvm-s390.h | 2 - + arch/s390/kvm/priv.c | 183 +++++++++++++++++++++++----------------------- + arch/s390/kvm/vsie.c | 20 +++++ + 5 files changed, 200 insertions(+), 154 deletions(-) +Merging kvms390-fixes/master (0e7def5fb0dc KVM: s390: provide only a single function for setting the tod (fix SCK)) +$ git merge kvms390-fixes/master +Merge made by the 'recursive' strategy. + arch/s390/kvm/interrupt.c | 25 +++++++++++---- + arch/s390/kvm/kvm-s390.c | 79 +++++++++++++++++++++++++++-------------------- + arch/s390/kvm/kvm-s390.h | 5 ++- + arch/s390/kvm/priv.c | 9 +++--- + 4 files changed, 71 insertions(+), 47 deletions(-) +Merging drm-intel-fixes/for-linux-next-fixes (15fa4d7a8fb9 drm/i915: Make global seqno known in i915_gem_request_execute tracepoint) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 4 +++- + drivers/gpu/drm/i915/i915_gem_request.c | 4 ++-- + drivers/gpu/drm/i915/i915_reg.h | 4 ++-- + drivers/gpu/drm/i915/intel_audio.c | 6 +++--- + 4 files changed, 10 insertions(+), 8 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (30a3317ddc24 drm/tve200: fix kernel-doc documentation comment include) +$ git merge drm-misc-fixes/for-linux-next-fixes +Auto-merging kernel/workqueue.c +Auto-merging include/drm/drm_atomic.h +Auto-merging drivers/gpu/drm/radeon/radeon_connectors.c +Auto-merging drivers/gpu/drm/meson/meson_plane.c +Auto-merging drivers/gpu/drm/drm_probe_helper.c +Auto-merging drivers/gpu/drm/drm_mm.c +Auto-merging drivers/gpu/drm/drm_edid.c +Auto-merging drivers/gpu/drm/drm_atomic_helper.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +Merge made by the 'recursive' strategy. + Documentation/gpu/tve200.rst | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 58 +++++++++++++------- + drivers/gpu/drm/cirrus/cirrus_mode.c | 40 ++++++++------ + drivers/gpu/drm/drm_atomic_helper.c | 15 ++++++ + drivers/gpu/drm/drm_edid.c | 3 ++ + drivers/gpu/drm/drm_mm.c | 21 ++++++-- + drivers/gpu/drm/drm_probe_helper.c | 20 +++++++ + drivers/gpu/drm/meson/meson_crtc.c | 6 +++ + drivers/gpu/drm/meson/meson_drv.h | 3 ++ + drivers/gpu/drm/meson/meson_plane.c | 7 ++- + drivers/gpu/drm/nouveau/nouveau_connector.c | 18 +++++-- + drivers/gpu/drm/radeon/radeon_connectors.c | 74 +++++++++++++++++--------- + include/drm/drm_atomic.h | 9 ++++ + include/drm/drm_crtc_helper.h | 1 + + include/linux/workqueue.h | 1 + + kernel/workqueue.c | 16 ++++++ + 16 files changed, 219 insertions(+), 75 deletions(-) +Merging kbuild/for-next (b91233a1b7b5 kbuild: disable sparse warnings about unknown attributes) +$ git merge kbuild/for-next +Auto-merging lib/Kconfig.debug +Merge made by the 'recursive' strategy. + Documentation/kbuild/makefiles.txt | 22 ++++++--- + Documentation/process/changes.rst | 2 +- + Makefile | 27 +++++++---- + arch/Kconfig | 6 --- + arch/blackfin/kernel/bfin_ksyms.c | 2 +- + arch/powerpc/kernel/Makefile | 2 +- + arch/sh/boot/dts/Makefile | 4 +- + drivers/s390/Makefile | 2 +- + lib/Kconfig.debug | 4 +- + scripts/Kbuild.include | 2 +- + scripts/Makefile.build | 40 ++++++--------- + scripts/Makefile.lib | 6 +-- + scripts/adjust_autoksyms.sh | 4 +- + scripts/gen_initramfs_list.sh | 2 +- + scripts/headers_install.sh | 10 ++-- + scripts/link-vmlinux.sh | 99 ++++++++++++++------------------------ + scripts/namespace.pl | 2 +- + usr/initramfs_data.S | 2 +- + 18 files changed, 107 insertions(+), 131 deletions(-) +Merging uuid/for-next (c0020756315e efi: switch to use new generic UUID API) +$ git merge uuid/for-next +Already up to date. +Merging dma-mapping/for-next (04f56534786c MAINTAINERS: add the iommu list for swiotlb and xen-swiotlb) +$ 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 (4fbd8d194f06 Linux 4.15-rc1) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (3a175cdf4392 Merge branches 'fixes', 'misc', 'sa1111' and 'sa1100-for-next' into for-next) +$ git merge arm/for-next +Already up to date. +Merging arm-perf/for-next/perf (44300aed5d28 perf: arm_spe: include linux/vmalloc.h for vmap()) +$ git merge arm-perf/for-next/perf +Merge made by the 'recursive' strategy. + drivers/perf/arm_spe_pmu.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) +Merging arm-soc/for-next (8337d083507b ARM: orion: fix orion_ge00_switch_board_info initialization) +$ git merge arm-soc/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 +++--- + arch/arm/boot/dts/logicpd-som-lv.dtsi | 9 ++++++++- + arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 8 ++++++++ + arch/arm/boot/dts/omap5-uevm.dts | 2 +- + arch/arm/boot/dts/rk3036.dtsi | 4 ++-- + arch/arm/boot/dts/rk322x.dtsi | 6 +++--- + arch/arm/boot/dts/rk3288-phycore-som.dtsi | 20 -------------------- + arch/arm/boot/dts/zx296702.dtsi | 20 ++++++++++---------- + arch/arm/mach-clps711x/board-dt.c | 2 +- + arch/arm/mach-davinci/board-dm355-evm.c | 2 +- + arch/arm/mach-davinci/board-dm355-leopard.c | 2 +- + arch/arm/mach-davinci/board-dm365-evm.c | 2 +- + arch/arm/mach-mvebu/Kconfig | 4 ++-- + arch/arm/mach-omap1/clock.c | 6 +++--- + arch/arm/mach-omap2/omap-wakeupgen.c | 4 ++-- + arch/arm/mach-omap2/omap_hwmod.c | 6 +++--- + arch/arm/mach-omap2/pm.c | 4 ++-- + arch/arm/mach-omap2/timer.c | 19 +++++++++++-------- + arch/arm/plat-orion/common.c | 23 +++++++++++------------ + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 4 ++-- + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 10 +++++----- + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 1 + + arch/arm64/boot/dts/cavium/thunder2-99xx.dtsi | 3 ++- + arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 2 +- + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 2 +- + arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 6 +++--- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 6 +++--- + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 7 +++---- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 6 +++--- + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 4 ++-- + drivers/bus/ti-sysc.c | 2 +- + 33 files changed, 102 insertions(+), 104 deletions(-) +Merging actions/for-next (61862a89e6ac Merge branch 'v4.16/drivers' into next) +$ git merge actions/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging alpine/alpine/for-next (a1144b2b1ec4 ARM: dts: alpine: add valid clock-frequency values) +$ git merge alpine/alpine/for-next +Merge made by the 'recursive' strategy. +Merging amlogic/for-next (b1303f3fa73b Merge branch 'v4.17/drivers' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/meson8.dtsi | 9 + + arch/arm/boot/dts/meson8b-odroidc1.dts | 30 +++ + arch/arm/boot/dts/meson8b.dtsi | 37 ++- + arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 15 ++ + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 264 ++++++++++++++++++++- + .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 1 + + .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 1 + + .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 1 + + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 1 + + arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 1 + + .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 1 + + .../dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts | 1 + + .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 1 + + .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 1 + + .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 1 + + .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 1 + + .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 1 + + arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 1 + + arch/arm64/configs/defconfig | 1 + + drivers/soc/amlogic/meson-gx-pwrc-vpu.c | 9 +- + drivers/soc/amlogic/meson-gx-socinfo.c | 2 +- + drivers/soc/amlogic/meson-mx-socinfo.c | 2 +- + 22 files changed, 373 insertions(+), 9 deletions(-) +Merging aspeed/for-next (91b55cc53a17 Merge branch 'dt-for-4.17' into for-next) +$ git merge aspeed/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 188 +++++++++++++++++++++++ + arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 4 + + arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 4 + + arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 4 + + arch/arm/boot/dts/aspeed-g4.dtsi | 8 + + arch/arm/boot/dts/aspeed-g5.dtsi | 15 +- + 6 files changed, 219 insertions(+), 4 deletions(-) +Merging at91/at91-next (fa4cf68ab4b1 Merge tag 'at91-ab-4.16-dt' into at91-next) +$ git merge at91/at91-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging bcm2835/for-next (a6189bcc0012 Merge branch anholt/bcm2835-drivers-next into for-next) +$ git merge bcm2835/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (8daaaaab151e Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Removing arch/arm/mach-imx/epit.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/crypto/fsl-sec4.txt | 17 + + arch/arm/boot/dts/Makefile | 8 +- + arch/arm/boot/dts/imx1-ads.dts | 2 +- + arch/arm/boot/dts/imx1-apf9328.dts | 2 +- + arch/arm/boot/dts/imx1.dtsi | 2 +- + arch/arm/boot/dts/imx23-evk.dts | 2 +- + arch/arm/boot/dts/imx23-olinuxino.dts | 2 +- + arch/arm/boot/dts/imx23-sansa.dts | 2 +- + arch/arm/boot/dts/imx23-stmp378x_devb.dts | 2 +- + arch/arm/boot/dts/imx23-xfi3.dts | 2 +- + arch/arm/boot/dts/imx23.dtsi | 8 +- + arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi | 2 +- + .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 12 +- + arch/arm/boot/dts/imx25-karo-tx25.dts | 2 +- + arch/arm/boot/dts/imx25-pdk.dts | 14 +- + arch/arm/boot/dts/imx25-pinfunc.h | 72 ++- + arch/arm/boot/dts/imx25.dtsi | 2 +- + arch/arm/boot/dts/imx27-apf27.dts | 2 +- + arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi | 17 +- + .../boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts | 2 +- + arch/arm/boot/dts/imx27-pdk.dts | 2 +- + arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi | 2 +- + arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi | 2 +- + arch/arm/boot/dts/imx27.dtsi | 2 +- + arch/arm/boot/dts/imx28-apf28.dts | 2 +- + arch/arm/boot/dts/imx28-apx4devkit.dts | 5 +- + arch/arm/boot/dts/imx28-cfa10036.dts | 2 +- + arch/arm/boot/dts/imx28-cfa10049.dts | 130 ++--- + arch/arm/boot/dts/imx28-duckbill-2-485.dts | 2 +- + arch/arm/boot/dts/imx28-duckbill-2-enocean.dts | 2 +- + arch/arm/boot/dts/imx28-duckbill-2-spi.dts | 2 +- + arch/arm/boot/dts/imx28-duckbill-2.dts | 2 +- + arch/arm/boot/dts/imx28-duckbill.dts | 2 +- + arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts | 2 +- + arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts | 2 +- + arch/arm/boot/dts/imx28-evk.dts | 2 +- + arch/arm/boot/dts/imx28-m28.dtsi | 2 +- + arch/arm/boot/dts/imx28-m28cu3.dts | 2 +- + arch/arm/boot/dts/imx28-sps1.dts | 2 +- + arch/arm/boot/dts/imx28-ts4600.dts | 2 +- + arch/arm/boot/dts/imx28-tx28.dts | 30 +- + arch/arm/boot/dts/imx28.dtsi | 20 +- + arch/arm/boot/dts/imx31-bug.dts | 2 +- + arch/arm/boot/dts/imx31.dtsi | 2 +- + arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi | 2 +- + arch/arm/boot/dts/imx35-pdk.dts | 2 +- + arch/arm/boot/dts/imx35.dtsi | 2 +- + arch/arm/boot/dts/imx50-evk.dts | 2 +- + arch/arm/boot/dts/imx50.dtsi | 2 +- + arch/arm/boot/dts/imx51-apf51.dts | 2 +- + arch/arm/boot/dts/imx51-babbage.dts | 2 +- + arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi | 2 +- + arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi | 2 +- + arch/arm/boot/dts/imx51-ts4800.dts | 2 +- + arch/arm/boot/dts/imx51-zii-rdu1.dts | 5 + + arch/arm/boot/dts/imx51.dtsi | 2 +- + arch/arm/boot/dts/imx53-ard.dts | 2 +- + arch/arm/boot/dts/imx53-cx9020.dts | 2 +- + arch/arm/boot/dts/imx53-m53.dtsi | 2 +- + arch/arm/boot/dts/imx53-ppd.dts | 11 + + arch/arm/boot/dts/imx53-qsb-common.dtsi | 2 +- + arch/arm/boot/dts/imx53-smd.dts | 2 +- + arch/arm/boot/dts/imx53-tqma53.dtsi | 2 +- + arch/arm/boot/dts/imx53-tx53.dtsi | 5 + + arch/arm/boot/dts/imx53-usbarmory.dts | 2 +- + arch/arm/boot/dts/imx53.dtsi | 2 +- + arch/arm/boot/dts/imx6dl-apf6dev.dts | 2 +- + arch/arm/boot/dts/imx6dl-aristainetos2_4.dts | 2 +- + arch/arm/boot/dts/imx6dl-aristainetos2_7.dts | 2 +- + arch/arm/boot/dts/imx6dl-aristainetos_4.dts | 2 +- + arch/arm/boot/dts/imx6dl-aristainetos_7.dts | 2 +- + arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 5 + + arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts | 5 + + arch/arm/boot/dts/imx6dl-phytec-mira-rdk-nand.dts | 64 +++ + arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi | 2 +- + arch/arm/boot/dts/imx6dl-rex-basic.dts | 2 +- + arch/arm/boot/dts/imx6dl-riotboard.dts | 2 +- + arch/arm/boot/dts/imx6dl-ts4900.dts | 5 + + arch/arm/boot/dts/imx6dl-ts7970.dts | 5 + + arch/arm/boot/dts/imx6dl-wandboard-revb1.dts | 2 +- + arch/arm/boot/dts/imx6dl-wandboard-revd1.dts | 2 +- + arch/arm/boot/dts/imx6dl-wandboard.dts | 2 +- + arch/arm/boot/dts/imx6q-apf6dev.dts | 2 +- + arch/arm/boot/dts/imx6q-arm2.dts | 2 +- + arch/arm/boot/dts/imx6q-ba16.dtsi | 2 +- + arch/arm/boot/dts/imx6q-bx50v3.dtsi | 8 + + arch/arm/boot/dts/imx6q-cm-fx6.dts | 2 +- + arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts | 5 + + arch/arm/boot/dts/imx6q-display5.dtsi | 2 +- + arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 2 +- + arch/arm/boot/dts/imx6q-evi.dts | 2 +- + arch/arm/boot/dts/imx6q-gk802.dts | 2 +- + arch/arm/boot/dts/imx6q-gw5400-a.dts | 2 +- + arch/arm/boot/dts/imx6q-h100.dts | 7 +- + arch/arm/boot/dts/imx6q-marsboard.dts | 2 +- + arch/arm/boot/dts/imx6q-mccmon6.dts | 2 +- + arch/arm/boot/dts/imx6q-novena.dts | 5 + + arch/arm/boot/dts/imx6q-phytec-mira-rdk-emmc.dts | 72 +++ + arch/arm/boot/dts/imx6q-phytec-mira-rdk-nand.dts | 72 +++ + arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi | 2 +- + arch/arm/boot/dts/imx6q-pistachio.dts | 2 +- + arch/arm/boot/dts/imx6q-rex-pro.dts | 2 +- + arch/arm/boot/dts/imx6q-sbc6x.dts | 2 +- + arch/arm/boot/dts/imx6q-tbs2910.dts | 2 +- + arch/arm/boot/dts/imx6q-ts4900.dts | 5 + + arch/arm/boot/dts/imx6q-ts7970.dts | 5 + + arch/arm/boot/dts/imx6q-wandboard-revb1.dts | 2 +- + arch/arm/boot/dts/imx6q-wandboard-revd1.dts | 2 +- + arch/arm/boot/dts/imx6q-wandboard.dts | 2 +- + arch/arm/boot/dts/imx6q-zii-rdu2.dts | 5 + + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 5 + + arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 5 + + arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw553x.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw5903.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw5904.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 5 + + arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi | 5 + + arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-icore.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-phytec-mira.dtsi | 390 +++++++++++++++ + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi | 279 +++++++++++ + arch/arm/boot/dts/imx6qdl-rex.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-udoo.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-var-dart.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl.dtsi | 4 +- + arch/arm/boot/dts/imx6qp-phytec-mira-rdk-nand.dts | 72 +++ + arch/arm/boot/dts/imx6qp-wandboard-revd1.dts | 2 +- + arch/arm/boot/dts/imx6qp-zii-rdu2.dts | 5 + + arch/arm/boot/dts/imx6sl-evk.dts | 2 +- + arch/arm/boot/dts/imx6sl-warp.dts | 2 +- + arch/arm/boot/dts/imx6sl.dtsi | 2 +- + arch/arm/boot/dts/imx6sx-nitrogen6sx.dts | 2 +- + arch/arm/boot/dts/imx6sx-sabreauto.dts | 2 +- + arch/arm/boot/dts/imx6sx-sdb.dtsi | 2 +- + arch/arm/boot/dts/imx6sx-softing-vining-2000.dts | 2 +- + arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts | 2 +- + arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts | 2 +- + arch/arm/boot/dts/imx6sx-udoo-neo-full.dts | 2 +- + arch/arm/boot/dts/imx6sx.dtsi | 15 +- + arch/arm/boot/dts/imx6ul-14x14-evk.dts | 480 +----------------- + arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 499 +++++++++++++++++++ + arch/arm/boot/dts/imx6ul-geam.dts | 2 +- + arch/arm/boot/dts/imx6ul-isiot.dtsi | 2 +- + arch/arm/boot/dts/imx6ul-litesom.dtsi | 2 +- + arch/arm/boot/dts/imx6ul-opos6ul.dtsi | 2 +- + arch/arm/boot/dts/imx6ul-pico-hobbit.dts | 2 +- + arch/arm/boot/dts/imx6ul-pinfunc.h | 169 ++++--- + arch/arm/boot/dts/imx6ul.dtsi | 23 +- + arch/arm/boot/dts/imx6ull-14x14-evk.dts | 5 +- + arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts | 14 + + arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 157 ++++++ + arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi | 23 + + arch/arm/boot/dts/imx6ull-colibri-wifi-eval-v3.dts | 14 + + arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi | 65 +++ + arch/arm/boot/dts/imx6ull-colibri.dtsi | 553 +++++++++++++++++++++ + arch/arm/boot/dts/imx6ull-pinfunc-snvs.h | 26 + + arch/arm/boot/dts/imx6ull.dtsi | 32 ++ + arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 54 +- + arch/arm/boot/dts/imx7d-colibri-emmc.dtsi | 2 +- + arch/arm/boot/dts/imx7d-colibri.dtsi | 2 +- + arch/arm/boot/dts/imx7d-nitrogen7.dts | 2 +- + arch/arm/boot/dts/imx7d-pico.dtsi | 2 +- + arch/arm/boot/dts/imx7d-sdb.dts | 7 +- + arch/arm/boot/dts/imx7s-colibri.dtsi | 2 +- + arch/arm/boot/dts/imx7s-warp.dts | 18 +- + arch/arm/boot/dts/imx7s.dtsi | 4 +- + arch/arm/boot/dts/ls1021a.dtsi | 16 + + arch/arm/configs/imx_v6_v7_defconfig | 9 + + arch/arm/mach-imx/Kconfig | 13 - + arch/arm/mach-imx/Makefile | 1 - + arch/arm/mach-imx/anatop.c | 56 +-- + arch/arm/mach-imx/cpuidle-imx6sx.c | 1 + + arch/arm/mach-imx/epit.c | 228 --------- + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 62 +-- + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 62 +-- + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 62 +-- + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 132 +++-- + arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi | 8 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 98 ++-- + .../boot/dts/freescale/qoriq-bman-portals.dtsi | 6 + + .../boot/dts/freescale/qoriq-qman-portals.dtsi | 7 + + drivers/clk/imx/clk-imx51-imx53.c | 20 +- + drivers/clk/imx/clk-imx6sx.c | 14 +- + drivers/clk/imx/clk-imx7d.c | 1 + + drivers/soc/imx/gpc.c | 22 +- + drivers/soc/imx/gpcv2.c | 13 +- + include/dt-bindings/clock/imx7d-clock.h | 3 +- + 202 files changed, 3306 insertions(+), 1334 deletions(-) + create mode 100644 arch/arm/boot/dts/imx6dl-phytec-mira-rdk-nand.dts + create mode 100644 arch/arm/boot/dts/imx6q-phytec-mira-rdk-emmc.dts + create mode 100644 arch/arm/boot/dts/imx6q-phytec-mira-rdk-nand.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-phytec-mira.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi + create mode 100644 arch/arm/boot/dts/imx6qp-phytec-mira-rdk-nand.dts + create mode 100644 arch/arm/boot/dts/imx6ul-14x14-evk.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts + create mode 100644 arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-colibri-wifi-eval-v3.dts + create mode 100644 arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-colibri.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-pinfunc-snvs.h + delete mode 100644 arch/arm/mach-imx/epit.c +Merging keystone/next (a29b8b93e158 Merge branch 'for_4.16/keystone-config' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (b4e369232fa8 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/armada-370-netgear-rn102.dts | 2 +- + arch/arm/boot/dts/armada-370-netgear-rn104.dts | 2 +- + arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 2 +- + arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts | 2 +- + arch/arm64/boot/dts/marvell/armada-371x.dtsi | 38 +------------ + arch/arm64/boot/dts/marvell/armada-3720-db.dts | 39 +------------ + .../boot/dts/marvell/armada-3720-espressobin.dts | 38 +------------ + arch/arm64/boot/dts/marvell/armada-372x.dtsi | 38 +------------ + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 38 +------------ + arch/arm64/boot/dts/marvell/armada-7020.dtsi | 41 +------------- + arch/arm64/boot/dts/marvell/armada-7040-db.dts | 41 +------------- + arch/arm64/boot/dts/marvell/armada-7040.dtsi | 41 +------------- + arch/arm64/boot/dts/marvell/armada-70x0.dtsi | 41 +------------- + arch/arm64/boot/dts/marvell/armada-8020.dtsi | 41 +------------- + arch/arm64/boot/dts/marvell/armada-8040-db.dts | 41 +------------- + arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 65 ++++++++-------------- + arch/arm64/boot/dts/marvell/armada-8040.dtsi | 41 +------------- + arch/arm64/boot/dts/marvell/armada-8080-db.dts | 41 +------------- + arch/arm64/boot/dts/marvell/armada-8080.dtsi | 41 +------------- + arch/arm64/boot/dts/marvell/armada-80x0.dtsi | 41 +------------- + arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi | 41 +------------- + arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi | 41 +------------- + arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 41 +------------- + .../dts/marvell/armada-ap810-ap0-octa-core.dtsi | 41 +------------- + arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi | 41 +------------- + arch/arm64/boot/dts/marvell/armada-common.dtsi | 2 +- + arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 60 +++++++++++++++++--- + 27 files changed, 102 insertions(+), 839 deletions(-) +Merging omap/for-next (fcb508cddbce Merge branch 'omap-for-v4.17/timer' into for-next) +$ git merge omap/for-next +Auto-merging include/clocksource/timer-ti-dm.h +Auto-merging drivers/clocksource/timer-ti-dm.c +Auto-merging arch/arm/mach-omap1/i2c.h +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/am335x-boneblue.dts | 2 +- + arch/arm/boot/dts/am335x-pdu001.dts | 595 +++++++++++++++++++++ + arch/arm/boot/dts/dra7.dtsi | 2 - + arch/arm/boot/dts/omap3-n9.dts | 7 + + arch/arm/boot/dts/omap4-droid4-xt894.dts | 22 +- + arch/arm/boot/dts/omap443x.dtsi | 2 - + arch/arm/boot/dts/omap4460.dtsi | 2 - + arch/arm/boot/dts/omap5.dtsi | 2 - + arch/arm/mach-omap1/Kconfig | 1 + + arch/arm/mach-omap1/common.h | 3 +- + arch/arm/mach-omap1/i2c.c | 2 - + .../{plat-omap/include/plat => mach-omap1}/i2c.h | 9 +- + arch/arm/mach-omap1/pm.c | 2 +- + arch/arm/mach-omap1/timer.c | 2 +- + arch/arm/mach-omap2/devices.c | 2 +- + arch/arm/mach-omap2/hsmmc.c | 2 - + arch/arm/mach-omap2/i2c.h | 15 +- + arch/arm/mach-omap2/msdi.c | 1 - + arch/arm/mach-omap2/omap_hwmod_2420_data.c | 11 - + arch/arm/mach-omap2/omap_hwmod_2430_data.c | 18 - + arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 61 +-- + .../mach-omap2/omap_hwmod_33xx_43xx_common_data.h | 3 - + .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 25 +- + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 4 - + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 116 ---- + arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 8 - + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 75 --- + arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 54 -- + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 53 -- + arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 31 +- + arch/arm/mach-omap2/omap_hwmod_common_data.h | 1 - + arch/arm/mach-omap2/pdata-quirks.c | 32 -- + arch/arm/mach-omap2/timer.c | 2 +- + arch/arm/plat-omap/Kconfig | 6 - + arch/arm/plat-omap/Makefile | 1 - + drivers/clocksource/Kconfig | 3 + + drivers/clocksource/Makefile | 1 + + .../dmtimer.c => drivers/clocksource/timer-ti-dm.c | 71 ++- + drivers/pwm/pwm-omap-dmtimer.c | 68 ++- + .../dmtimer.h => include/clocksource/timer-ti-dm.h | 29 +- + include/linux/platform_data/asoc-ti-mcbsp.h | 12 - + include/linux/platform_data/dmtimer-omap.h | 38 ++ + include/linux/platform_data/gpio-omap.h | 5 - + include/linux/platform_data/spi-omap2-mcspi.h | 8 - + 45 files changed, 762 insertions(+), 648 deletions(-) + create mode 100644 arch/arm/boot/dts/am335x-pdu001.dts + rename arch/arm/{plat-omap/include/plat => mach-omap1}/i2c.h (90%) + rename arch/arm/plat-omap/dmtimer.c => drivers/clocksource/timer-ti-dm.c (93%) + rename arch/arm/plat-omap/include/plat/dmtimer.h => include/clocksource/timer-ti-dm.h (96%) +Merging reset/reset/next (1d7592f84f92 reset: simple: Enable for ASPEED systems) +$ git merge reset/reset/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mfd/aspeed-lpc.txt | 21 +++++++++++++++++++++ + drivers/reset/Kconfig | 10 +++++++--- + drivers/reset/reset-meson.c | 22 +++++----------------- + drivers/reset/reset-simple.c | 2 ++ + 4 files changed, 35 insertions(+), 20 deletions(-) +Merging qcom/for-next (f5788d2f2929 Merge tag 'qcom-arm64-defconfig-for-4.16' into tagged-for-4.16) +$ git merge qcom/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next) +$ git merge realtek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging renesas/next (04609e2cf07b Merge branches 'arm64-defconfig-for-v4.17', 'arm64-dt-for-v4.17', 'defconfig-for-v4.17', 'dt-bindings-for-v4.17', 'dt-for-v4.17' and 'soc-for-v4.17' into next) +$ git merge renesas/next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/shmobile.txt | 8 + + .../bindings/power/renesas,rcar-sysc.txt | 2 + + .../devicetree/bindings/reset/renesas,rst.txt | 1 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/emev2-kzm9d.dts | 8 +- + arch/arm/boot/dts/r7s72100.dtsi | 1018 +++---- + arch/arm/boot/dts/r8a7743-iwg20m.dtsi | 9 + + arch/arm/boot/dts/r8a7743.dtsi | 1334 +++++---- + arch/arm/boot/dts/r8a7745-iwg22m.dtsi | 9 + + arch/arm/boot/dts/r8a7745.dtsi | 1786 ++++++------ + arch/arm/boot/dts/r8a7790-lager.dts | 292 +- + arch/arm/boot/dts/r8a7790-stout.dts | 363 +++ + arch/arm/boot/dts/r8a7790.dtsi | 2847 ++++++++++--------- + arch/arm/boot/dts/r8a7791-koelsch.dts | 237 +- + arch/arm/boot/dts/r8a7791-porter.dts | 135 +- + arch/arm/boot/dts/r8a7791.dtsi | 2994 ++++++++++---------- + arch/arm/boot/dts/r8a7792-blanche.dts | 5 + + arch/arm/boot/dts/r8a7792-wheat.dts | 5 + + arch/arm/boot/dts/r8a7792.dtsi | 502 ++-- + arch/arm/boot/dts/r8a7793-gose.dts | 257 +- + arch/arm/boot/dts/r8a7793.dtsi | 2402 ++++++++-------- + arch/arm/boot/dts/r8a7794-alt.dts | 58 +- + arch/arm/boot/dts/r8a7794-silk.dts | 133 +- + arch/arm/boot/dts/r8a7794.dtsi | 2429 ++++++++-------- + arch/arm/configs/shmobile_defconfig | 1 + + arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 23 +- + arch/arm64/Kconfig.platforms | 12 + + arch/arm64/boot/dts/renesas/Makefile | 2 + + arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 133 +- + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 128 +- + .../arm64/boot/dts/renesas/r8a77965-salvator-x.dts | 21 + + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 741 +++++ + arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 12 + + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 117 +- + arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 58 + + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 385 +++ + arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 123 + + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 191 +- + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 7 + + arch/arm64/configs/defconfig | 5 + + drivers/soc/renesas/Kconfig | 12 +- + drivers/soc/renesas/Makefile | 2 + + drivers/soc/renesas/r8a77965-sysc.c | 37 + + drivers/soc/renesas/r8a77970-sysc.c | 12 +- + drivers/soc/renesas/r8a77980-sysc.c | 52 + + drivers/soc/renesas/rcar-rst.c | 36 +- + drivers/soc/renesas/rcar-sysc.c | 8 +- + drivers/soc/renesas/rcar-sysc.h | 2 + + drivers/soc/renesas/renesas-soc.c | 16 + + include/dt-bindings/power/r8a77965-sysc.h | 30 + + include/dt-bindings/power/r8a77980-sysc.h | 43 + + 52 files changed, 11148 insertions(+), 7898 deletions(-) + create mode 100644 arch/arm/boot/dts/r8a7790-stout.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a77965-salvator-x.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a77965.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a77980-condor.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a77980.dtsi + create mode 100644 drivers/soc/renesas/r8a77965-sysc.c + create mode 100644 drivers/soc/renesas/r8a77980-sysc.c + create mode 100644 include/dt-bindings/power/r8a77965-sysc.h + create mode 100644 include/dt-bindings/power/r8a77980-sysc.h +Merging rockchip/for-next (aed958de4a40 Merge branch 'v4.17-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/rockchip.txt | 12 + + .../bindings/clock/rockchip,rk3328-cru.txt | 1 + + arch/arm/boot/dts/rk322x.dtsi | 2 +- + arch/arm/boot/dts/rk3288-phycore-rdk.dts | 6 +- + arch/arm/boot/dts/rk3288-phycore-som.dtsi | 5 +- + arch/arm/boot/dts/rk3288-rock2-som.dtsi | 4 + + arch/arm/boot/dts/rk3288-rock2-square.dts | 41 +++ + arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 1 - + arch/arm/boot/dts/rk3288-vyasa.dts | 11 + + arch/arm64/boot/dts/rockchip/Makefile | 3 + + arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 267 +++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 6 +- + .../arm64/boot/dts/rockchip/rk3368-lion-haikou.dts | 146 ++++++++++ + arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi | 317 +++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 7 +- + .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 71 ++++- + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 28 ++ + .../dts/rockchip/rk3399-sapphire-excavator.dts | 44 ++- + arch/arm64/boot/dts/rockchip/rk3399-sapphire.dts | 12 + + arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 66 +++-- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 73 +++++ + drivers/clk/rockchip/clk-rk3328.c | 67 +++-- + drivers/soc/rockchip/grf.c | 14 + + include/dt-bindings/clock/rk3328-cru.h | 1 - + 24 files changed, 1107 insertions(+), 98 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-sapphire.dts +Merging samsung/for-next (bebc6082da0a Linux 4.14) +$ git merge samsung/for-next +Already up to date. +Merging samsung-krzk/for-next (6e3d094fcf59 Merge branch 'next/dt' into for-next) +$ git merge samsung-krzk/for-next +Removing arch/arm/boot/dts/samsung_k3pe0e000b.dtsi +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/samsung/pmu.txt | 6 + + .../bindings/arm/samsung/samsung-boards.txt | 4 + + MAINTAINERS | 1 - + arch/arm/boot/dts/Makefile | 3 + + arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi | 5 +- + arch/arm/boot/dts/exynos-syscon-restart.dtsi | 5 +- + arch/arm/boot/dts/exynos3250-artik5.dtsi | 36 + + arch/arm/boot/dts/exynos3250.dtsi | 15 +- + arch/arm/boot/dts/exynos4.dtsi | 1723 +++++++++--------- + arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 1680 +++++++++-------- + arch/arm/boot/dts/exynos4210-trats.dts | 73 +- + arch/arm/boot/dts/exynos4210-universal_c210.dts | 115 +- + arch/arm/boot/dts/exynos4210.dtsi | 606 +++---- + arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 140 ++ + arch/arm/boot/dts/exynos4412-i9300.dts | 22 + + arch/arm/boot/dts/exynos4412-i9305.dts | 20 + + arch/arm/boot/dts/exynos4412-itop-elite.dts | 16 +- + arch/arm/boot/dts/exynos4412-midas.dtsi | 1308 +++++++++++++ + arch/arm/boot/dts/exynos4412-n710x.dts | 77 + + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 12 +- + arch/arm/boot/dts/exynos4412-pinctrl.dtsi | 1914 ++++++++++---------- + arch/arm/boot/dts/exynos4412-tiny4412.dts | 7 +- + arch/arm/boot/dts/exynos4412-tmu-sensor-conf.dtsi | 6 +- + arch/arm/boot/dts/exynos4412-trats2.dts | 1396 +------------- + arch/arm/boot/dts/exynos4412.dtsi | 868 ++++----- + arch/arm/boot/dts/exynos5250.dtsi | 2 - + arch/arm/boot/dts/exynos5410.dtsi | 1 - + arch/arm/boot/dts/exynos5420-cpus.dtsi | 16 - + arch/arm/boot/dts/exynos5422-cpus.dtsi | 16 - + arch/arm/boot/dts/exynos5440.dtsi | 514 +++--- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 5 +- + arch/arm/boot/dts/exynos5800.dtsi | 5 +- + arch/arm/boot/dts/samsung_k3pe0e000b.dtsi | 68 - + arch/arm/include/debug/exynos.S | 7 +- + arch/arm/include/debug/samsung.S | 10 +- + arch/arm/mach-exynos/exynos.c | 3 +- + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 52 +- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 24 +- + drivers/memory/samsung/Kconfig | 1 + + drivers/memory/samsung/Makefile | 1 + + drivers/memory/samsung/exynos-srom.c | 18 +- + drivers/memory/samsung/exynos-srom.h | 7 +- + drivers/soc/samsung/exynos-pmu.c | 7 + + include/linux/serial_s3c.h | 17 +- + include/linux/soc/samsung/exynos-pmu.h | 5 +- + include/linux/soc/samsung/exynos-regs-pmu.h | 6 +- + 46 files changed, 5513 insertions(+), 5330 deletions(-) + create mode 100644 arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi + create mode 100644 arch/arm/boot/dts/exynos4412-i9300.dts + create mode 100644 arch/arm/boot/dts/exynos4412-i9305.dts + create mode 100644 arch/arm/boot/dts/exynos4412-midas.dtsi + create mode 100644 arch/arm/boot/dts/exynos4412-n710x.dts + delete mode 100644 arch/arm/boot/dts/samsung_k3pe0e000b.dtsi +Merging sunxi/sunxi/for-next (454c4bf0d36f Merge branch 'sunxi/dt-for-4.17' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/sunxi/smp-sram.txt | 44 ++ + MAINTAINERS | 4 +- + arch/arm/boot/dts/Makefile | 3 + + arch/arm/boot/dts/axp209.dtsi | 5 + + arch/arm/boot/dts/axp22x.dtsi | 5 + + arch/arm/boot/dts/axp81x.dtsi | 12 +- + arch/arm/boot/dts/sun4i-a10-a1000.dts | 3 +- + arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 3 +- + arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 3 +- + arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 3 +- + arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts | 3 +- + arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 3 +- + arch/arm/boot/dts/sun4i-a10-hackberry.dts | 3 +- + arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts | 3 +- + arch/arm/boot/dts/sun4i-a10-inet1.dts | 3 +- + arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 3 +- + arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 3 +- + .../boot/dts/sun4i-a10-itead-iteaduino-plus.dts | 3 +- + arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 3 +- + arch/arm/boot/dts/sun4i-a10-marsboard.dts | 3 +- + arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 3 +- + arch/arm/boot/dts/sun4i-a10-mk802.dts | 28 +- + arch/arm/boot/dts/sun4i-a10-mk802ii.dts | 3 +- + arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 4 +- + arch/arm/boot/dts/sun4i-a10-pcduino.dts | 3 +- + arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 3 +- + arch/arm/boot/dts/sun4i-a10.dtsi | 2 - + arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts | 3 +- + arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 3 +- + arch/arm/boot/dts/sun5i-a10s-mk802.dts | 3 +- + arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 6 +- + arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 3 +- + arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts | 3 +- + .../boot/dts/sun5i-a13-empire-electronix-d709.dts | 3 +- + arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 3 +- + arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 3 +- + arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 3 +- + arch/arm/boot/dts/sun5i-a13.dtsi | 2 - + arch/arm/boot/dts/sun5i-gr8-evb.dts | 3 +- + .../boot/dts/sun5i-reference-design-tablet.dtsi | 3 +- + arch/arm/boot/dts/sun6i-a31-colombus.dts | 3 +- + arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 3 +- + arch/arm/boot/dts/sun6i-a31-i7.dts | 32 +- + arch/arm/boot/dts/sun6i-a31-m9.dts | 3 +- + arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts | 3 +- + arch/arm/boot/dts/sun6i-a31.dtsi | 2 - + arch/arm/boot/dts/sun6i-a31s-primo81.dts | 3 +- + arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 3 +- + arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 66 +- + .../dts/sun6i-a31s-yones-toptech-bs1078-v2.dts | 3 +- + .../boot/dts/sun6i-reference-design-tablet.dtsi | 3 +- + arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-bananapi.dts | 28 +- + arch/arm/boot/dts/sun7i-a20-bananapro.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-icnova-swac.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-itead-ibox.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-m3.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-mk808c.dts | 28 +- + arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 31 +- + .../boot/dts/sun7i-a20-olimex-som204-evb-emmc.dts | 36 + + arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts | 335 +++++++++ + arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 6 +- + arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 31 +- + arch/arm/boot/dts/sun7i-a20-orangepi.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 3 +- + arch/arm/boot/dts/sun7i-a20.dtsi | 29 +- + arch/arm/boot/dts/sun8i-a23-evb.dts | 3 +- + arch/arm/boot/dts/sun8i-a33-olinuxino.dts | 3 +- + arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 3 +- + arch/arm/boot/dts/sun8i-a33.dtsi | 1 - + .../boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts | 3 +- + arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts | 42 +- + arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts | 3 +- + arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 4 + + arch/arm/boot/dts/sun8i-a83t.dtsi | 108 ++- + .../boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts | 121 ++++ + arch/arm/boot/dts/sun8i-h2-plus-orangepi-r1.dts | 8 + + arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 11 +- + arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts | 7 +- + arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 7 +- + arch/arm/boot/dts/sun8i-h3-libretech-all-h3-cc.dts | 5 +- + arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts | 2 - + arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts | 27 +- + arch/arm/boot/dts/sun8i-h3-nanopi.dtsi | 5 +- + arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 7 +- + arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts | 7 +- + arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 5 +- + arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts | 2 - + arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 5 +- + arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts | 3 +- + arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts | 3 +- + .../boot/dts/sun8i-reference-design-tablet.dtsi | 3 +- + arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 3 +- + arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 3 +- + arch/arm/boot/dts/sun9i-a80-optimus.dts | 3 +- + arch/arm/boot/dts/sun9i-a80.dtsi | 75 ++ + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 14 +- + arch/arm/mach-sunxi/Kconfig | 7 + + arch/arm/mach-sunxi/Makefile | 3 + + arch/arm/mach-sunxi/mc_smp.c | 791 +++++++++++++++++++++ + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 3 +- + .../boot/dts/allwinner/sun50i-a64-nanopi-a64.dts | 3 +- + .../boot/dts/allwinner/sun50i-a64-olinuxino.dts | 3 +- + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 3 +- + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 8 +- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 67 ++ + .../dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts | 4 - + .../boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts | 2 - + .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 2 - + .../dts/allwinner/sun50i-h5-orangepi-prime.dts | 4 - + .../allwinner/sun50i-h5-orangepi-zero-plus2.dts | 4 - + drivers/clk/sunxi-ng/Kconfig | 7 - + drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 6 +- + drivers/clk/sunxi-ng/ccu_nkmp.c | 42 +- + 124 files changed, 2064 insertions(+), 292 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/sunxi/smp-sram.txt + create mode 100644 arch/arm/boot/dts/sun7i-a20-olimex-som204-evb-emmc.dts + create mode 100644 arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts + create mode 100644 arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts + create mode 100644 arch/arm/mach-sunxi/mc_smp.c +Merging tegra/for-next (983371acdeda Merge branch for-4.16/arm64/dt into for-next) +$ git merge tegra/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (3a0a397ff5ff arm64: Kill PSCI_GET_VERSION as a variant-2 workaround) +$ git merge arm64/for-next/core +Already up to date. +Merging clk/clk-next (7928b2cbe55b Linux 4.16-rc1) +$ git merge clk/clk-next +Already up to date. +Merging clk-samsung/for-next (83942bdd992f clk: exynos5433: Extend list of available AUD_PLL output frequencies) +$ git merge clk-samsung/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/clk/samsung/clk-exynos-audss.c | 4 +--- + drivers/clk/samsung/clk-exynos5433.c | 7 +++---- + drivers/clk/samsung/clk-s3c2412.c | 11 ++--------- + drivers/clk/samsung/clk-s3c2443.c | 17 ++++------------- + drivers/clk/samsung/clk-s3c64xx.c | 17 ++++++----------- + 6 files changed, 17 insertions(+), 40 deletions(-) +Merging c6x/for-linux-next (9d440f7a2824 c6x: fix platforms/plldata.c get_coreid build error) +$ git merge c6x/for-linux-next +Auto-merging arch/c6x/kernel/asm-offsets.c +Merge made by the 'recursive' strategy. + arch/c6x/kernel/asm-offsets.c | 1 - + arch/c6x/platforms/plldata.c | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) +Merging cris/for-next (fd989db807a0 cris: Fix conflicting types for _etext, _edata, _end) +$ git merge cris/for-next +Already up to date. +Merging m68k/for-next (2334b1ac1235 MAINTAINERS: Add NuBus subsystem entry) +$ git merge m68k/for-next +Already up to date. +Merging m68knommu/for-next (7928b2cbe55b Linux 4.16-rc1) +$ git merge m68knommu/for-next +Already up to date. +Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment) +$ git merge metag/for-next +Already up to date. +Merging microblaze/next (5b325e3b2912 microblaze: Use generic pci_mmap_resource_range()) +$ git merge microblaze/next +Merge made by the 'recursive' strategy. + arch/microblaze/include/asm/pci.h | 7 +-- + arch/microblaze/pci/pci-common.c | 99 ++++----------------------------------- + 2 files changed, 13 insertions(+), 93 deletions(-) +Merging mips/mips-next (ea4d340cbea4 Merge branches '4.15-fixes', '4.16-features' and 'octeon-3-net-mips-bits' into mips-next) +$ git merge mips/mips-next +Auto-merging drivers/staging/octeon/ethernet-tx.c +Auto-merging drivers/staging/octeon/ethernet-rx.c +Auto-merging drivers/staging/octeon/ethernet-defines.h +Auto-merging arch/mips/include/asm/mipsregs.h +Auto-merging arch/mips/cavium-octeon/Kconfig +Merge made by the 'recursive' strategy. + arch/mips/cavium-octeon/Kconfig | 27 +- + arch/mips/cavium-octeon/Makefile | 1 + + arch/mips/cavium-octeon/resource-mgr.c | 351 +++++++++++++++++++++ + arch/mips/cavium-octeon/setup.c | 22 +- + arch/mips/include/asm/barrier.h | 2 +- + .../asm/mach-cavium-octeon/kernel-entry-init.h | 20 +- + arch/mips/include/asm/mipsregs.h | 2 + + arch/mips/include/asm/octeon/octeon.h | 32 +- + arch/mips/include/asm/processor.h | 2 +- + arch/mips/kernel/octeon_switch.S | 2 - + arch/mips/mm/tlbex.c | 29 +- + drivers/staging/octeon/ethernet-defines.h | 6 - + drivers/staging/octeon/ethernet-rx.c | 25 +- + drivers/staging/octeon/ethernet-tx.c | 85 ++--- + 14 files changed, 473 insertions(+), 133 deletions(-) + create mode 100644 arch/mips/cavium-octeon/resource-mgr.c +Merging mips-james/mips-next (35868f095948 MIPS: generic: Enable crc32-mips on r6 configs) +$ git merge mips-james/mips-next +Auto-merging arch/mips/include/asm/mipsregs.h +Merge made by the 'recursive' strategy. + arch/mips/Kconfig | 4 + + arch/mips/Makefile | 3 + + arch/mips/alchemy/board-gpr.c | 2 +- + arch/mips/alchemy/board-mtx1.c | 2 +- + arch/mips/ar7/platform.c | 14 +- + arch/mips/boot/dts/img/boston.dts | 2 +- + arch/mips/boot/dts/ingenic/ci20.dts | 8 +- + arch/mips/cavium-octeon/octeon-irq.c | 10 +- + arch/mips/configs/bmips_stb_defconfig | 1 + + arch/mips/configs/generic/32r6.config | 2 + + arch/mips/configs/generic/64r6.config | 2 + + arch/mips/crypto/Makefile | 6 + + arch/mips/crypto/crc32-mips.c | 348 ++++++++++++++++++++++++++++++++++ + arch/mips/include/asm/mipsregs.h | 1 + + arch/mips/include/uapi/asm/hwcap.h | 1 + + arch/mips/kernel/cpu-probe.c | 3 + + arch/mips/kernel/setup.c | 5 +- + arch/mips/mm/init.c | 2 - + arch/mips/txx9/rbtx4927/setup.c | 2 +- + crypto/Kconfig | 9 + + 20 files changed, 403 insertions(+), 24 deletions(-) + create mode 100644 arch/mips/crypto/Makefile + create mode 100644 arch/mips/crypto/crc32-mips.c +Merging nds32/next (d0d7a6fe427c dt-bindings: timer: Add andestech atcpit100 timer binding doc) +$ git merge nds32/next +Auto-merging drivers/clocksource/Makefile +Auto-merging drivers/clocksource/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../interrupt-controller/andestech,ativic32.txt | 19 + + .../devicetree/bindings/nds32/andestech-boards | 40 + + Documentation/devicetree/bindings/nds32/atl2c.txt | 28 + + Documentation/devicetree/bindings/nds32/cpus.txt | 38 + + .../bindings/timer/andestech,atcpit100-timer.txt | 33 + + MAINTAINERS | 11 + + arch/nds32/Kconfig | 103 +++ + arch/nds32/Kconfig.cpu | 174 ++++ + arch/nds32/Makefile | 66 ++ + arch/nds32/boot/Makefile | 15 + + arch/nds32/boot/dts/Makefile | 8 + + arch/nds32/boot/dts/ae3xx.dts | 85 ++ + arch/nds32/configs/defconfig | 104 +++ + arch/nds32/include/asm/Kbuild | 55 ++ + arch/nds32/include/asm/assembler.h | 39 + + arch/nds32/include/asm/barrier.h | 15 + + arch/nds32/include/asm/bitfield.h | 963 +++++++++++++++++++++ + arch/nds32/include/asm/cache.h | 12 + + arch/nds32/include/asm/cache_info.h | 13 + + arch/nds32/include/asm/cacheflush.h | 44 + + arch/nds32/include/asm/current.h | 12 + + arch/nds32/include/asm/delay.h | 39 + + arch/nds32/include/asm/dma-mapping.h | 14 + + arch/nds32/include/asm/elf.h | 171 ++++ + arch/nds32/include/asm/fixmap.h | 29 + + arch/nds32/include/asm/futex.h | 103 +++ + arch/nds32/include/asm/highmem.h | 65 ++ + arch/nds32/include/asm/io.h | 83 ++ + arch/nds32/include/asm/irqflags.h | 36 + + arch/nds32/include/asm/l2_cache.h | 137 +++ + arch/nds32/include/asm/linkage.h | 11 + + arch/nds32/include/asm/memory.h | 105 +++ + arch/nds32/include/asm/mmu.h | 12 + + arch/nds32/include/asm/mmu_context.h | 68 ++ + arch/nds32/include/asm/module.h | 11 + + arch/nds32/include/asm/nds32.h | 81 ++ + arch/nds32/include/asm/page.h | 67 ++ + arch/nds32/include/asm/pgalloc.h | 96 ++ + arch/nds32/include/asm/pgtable.h | 409 +++++++++ + arch/nds32/include/asm/proc-fns.h | 44 + + arch/nds32/include/asm/processor.h | 103 +++ + arch/nds32/include/asm/ptrace.h | 77 ++ + arch/nds32/include/asm/shmparam.h | 19 + + arch/nds32/include/asm/string.h | 17 + + arch/nds32/include/asm/swab.h | 35 + + arch/nds32/include/asm/syscall.h | 188 ++++ + arch/nds32/include/asm/syscalls.h | 13 + + arch/nds32/include/asm/thread_info.h | 76 ++ + arch/nds32/include/asm/tlb.h | 28 + + arch/nds32/include/asm/tlbflush.h | 47 + + arch/nds32/include/asm/uaccess.h | 283 ++++++ + arch/nds32/include/asm/unistd.h | 6 + + arch/nds32/include/asm/vdso.h | 24 + + arch/nds32/include/asm/vdso_datapage.h | 36 + + arch/nds32/include/asm/vdso_timer_info.h | 14 + + arch/nds32/include/uapi/asm/Kbuild | 29 + + arch/nds32/include/uapi/asm/auxvec.h | 12 + + arch/nds32/include/uapi/asm/byteorder.h | 13 + + arch/nds32/include/uapi/asm/cachectl.h | 14 + + arch/nds32/include/uapi/asm/param.h | 11 + + arch/nds32/include/uapi/asm/ptrace.h | 25 + + arch/nds32/include/uapi/asm/sigcontext.h | 60 ++ + arch/nds32/include/uapi/asm/unistd.h | 11 + + arch/nds32/kernel/Makefile | 23 + + arch/nds32/kernel/asm-offsets.c | 28 + + arch/nds32/kernel/atl2c.c | 64 ++ + arch/nds32/kernel/cacheinfo.c | 49 ++ + arch/nds32/kernel/devtree.c | 19 + + arch/nds32/kernel/dma.c | 477 ++++++++++ + arch/nds32/kernel/ex-entry.S | 157 ++++ + arch/nds32/kernel/ex-exit.S | 184 ++++ + arch/nds32/kernel/ex-scall.S | 98 +++ + arch/nds32/kernel/head.S | 188 ++++ + arch/nds32/kernel/irq.c | 9 + + arch/nds32/kernel/module.c | 278 ++++++ + arch/nds32/kernel/nds32_ksyms.c | 31 + + arch/nds32/kernel/process.c | 208 +++++ + arch/nds32/kernel/ptrace.c | 119 +++ + arch/nds32/kernel/setup.c | 363 ++++++++ + arch/nds32/kernel/signal.c | 324 +++++++ + arch/nds32/kernel/stacktrace.c | 47 + + arch/nds32/kernel/sys_nds32.c | 50 ++ + arch/nds32/kernel/syscall_table.c | 17 + + arch/nds32/kernel/time.c | 11 + + arch/nds32/kernel/traps.c | 442 ++++++++++ + arch/nds32/kernel/vdso.c | 230 +++++ + arch/nds32/kernel/vdso/Makefile | 82 ++ + arch/nds32/kernel/vdso/datapage.S | 21 + + arch/nds32/kernel/vdso/gen_vdso_offsets.sh | 15 + + arch/nds32/kernel/vdso/gettimeofday.c | 270 ++++++ + arch/nds32/kernel/vdso/note.S | 11 + + arch/nds32/kernel/vdso/sigreturn.S | 19 + + arch/nds32/kernel/vdso/vdso.S | 18 + + arch/nds32/kernel/vdso/vdso.lds.S | 76 ++ + arch/nds32/kernel/vmlinux.lds.S | 57 ++ + arch/nds32/lib/Makefile | 3 + + arch/nds32/lib/clear_user.S | 42 + + arch/nds32/lib/copy_from_user.S | 45 + + arch/nds32/lib/copy_page.S | 37 + + arch/nds32/lib/copy_template.S | 69 ++ + arch/nds32/lib/copy_to_user.S | 45 + + arch/nds32/lib/memcpy.S | 30 + + arch/nds32/lib/memmove.S | 70 ++ + arch/nds32/lib/memset.S | 33 + + arch/nds32/lib/memzero.S | 18 + + arch/nds32/mm/Makefile | 7 + + arch/nds32/mm/alignment.c | 576 ++++++++++++ + arch/nds32/mm/cacheflush.c | 322 +++++++ + arch/nds32/mm/extable.c | 16 + + arch/nds32/mm/fault.c | 410 +++++++++ + arch/nds32/mm/highmem.c | 79 ++ + arch/nds32/mm/init.c | 277 ++++++ + arch/nds32/mm/ioremap.c | 62 ++ + arch/nds32/mm/mm-nds32.c | 90 ++ + arch/nds32/mm/mmap.c | 73 ++ + arch/nds32/mm/proc.c | 533 ++++++++++++ + arch/nds32/mm/tlb.c | 50 ++ + arch/openrisc/include/asm/io.h | 3 +- + arch/sparc/include/asm/io_32.h | 5 - + arch/sparc/kernel/ioport.c | 4 +- + arch/xtensa/include/asm/io.h | 1 + + drivers/clocksource/Kconfig | 9 + + drivers/clocksource/Makefile | 1 + + drivers/clocksource/timer-atcpit100.c | 266 ++++++ + drivers/irqchip/Makefile | 1 + + drivers/irqchip/irq-ativic32.c | 107 +++ + drivers/net/ethernet/faraday/Kconfig | 8 +- + drivers/tty/serial/earlycon.c | 3 +- + drivers/video/console/Kconfig | 2 +- + include/asm-generic/io.h | 18 +- + 130 files changed, 11877 insertions(+), 22 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/andestech,ativic32.txt + create mode 100644 Documentation/devicetree/bindings/nds32/andestech-boards + create mode 100644 Documentation/devicetree/bindings/nds32/atl2c.txt + create mode 100644 Documentation/devicetree/bindings/nds32/cpus.txt + create mode 100644 Documentation/devicetree/bindings/timer/andestech,atcpit100-timer.txt + create mode 100644 arch/nds32/Kconfig + create mode 100644 arch/nds32/Kconfig.cpu + create mode 100644 arch/nds32/Makefile + create mode 100644 arch/nds32/boot/Makefile + create mode 100644 arch/nds32/boot/dts/Makefile + create mode 100644 arch/nds32/boot/dts/ae3xx.dts + create mode 100644 arch/nds32/configs/defconfig + create mode 100644 arch/nds32/include/asm/Kbuild + create mode 100644 arch/nds32/include/asm/assembler.h + create mode 100644 arch/nds32/include/asm/barrier.h + create mode 100644 arch/nds32/include/asm/bitfield.h + create mode 100644 arch/nds32/include/asm/cache.h + create mode 100644 arch/nds32/include/asm/cache_info.h + create mode 100644 arch/nds32/include/asm/cacheflush.h + create mode 100644 arch/nds32/include/asm/current.h + create mode 100644 arch/nds32/include/asm/delay.h + create mode 100644 arch/nds32/include/asm/dma-mapping.h + create mode 100644 arch/nds32/include/asm/elf.h + create mode 100644 arch/nds32/include/asm/fixmap.h + create mode 100644 arch/nds32/include/asm/futex.h + create mode 100644 arch/nds32/include/asm/highmem.h + create mode 100644 arch/nds32/include/asm/io.h + create mode 100644 arch/nds32/include/asm/irqflags.h + create mode 100644 arch/nds32/include/asm/l2_cache.h + create mode 100644 arch/nds32/include/asm/linkage.h + create mode 100644 arch/nds32/include/asm/memory.h + create mode 100644 arch/nds32/include/asm/mmu.h + create mode 100644 arch/nds32/include/asm/mmu_context.h + create mode 100644 arch/nds32/include/asm/module.h + create mode 100644 arch/nds32/include/asm/nds32.h + create mode 100644 arch/nds32/include/asm/page.h + create mode 100644 arch/nds32/include/asm/pgalloc.h + create mode 100644 arch/nds32/include/asm/pgtable.h + create mode 100644 arch/nds32/include/asm/proc-fns.h + create mode 100644 arch/nds32/include/asm/processor.h + create mode 100644 arch/nds32/include/asm/ptrace.h + create mode 100644 arch/nds32/include/asm/shmparam.h + create mode 100644 arch/nds32/include/asm/string.h + create mode 100644 arch/nds32/include/asm/swab.h + create mode 100644 arch/nds32/include/asm/syscall.h + create mode 100644 arch/nds32/include/asm/syscalls.h + create mode 100644 arch/nds32/include/asm/thread_info.h + create mode 100644 arch/nds32/include/asm/tlb.h + create mode 100644 arch/nds32/include/asm/tlbflush.h + create mode 100644 arch/nds32/include/asm/uaccess.h + create mode 100644 arch/nds32/include/asm/unistd.h + create mode 100644 arch/nds32/include/asm/vdso.h + create mode 100644 arch/nds32/include/asm/vdso_datapage.h + create mode 100644 arch/nds32/include/asm/vdso_timer_info.h + create mode 100644 arch/nds32/include/uapi/asm/Kbuild + create mode 100644 arch/nds32/include/uapi/asm/auxvec.h + create mode 100644 arch/nds32/include/uapi/asm/byteorder.h + create mode 100644 arch/nds32/include/uapi/asm/cachectl.h + create mode 100644 arch/nds32/include/uapi/asm/param.h + create mode 100644 arch/nds32/include/uapi/asm/ptrace.h + create mode 100644 arch/nds32/include/uapi/asm/sigcontext.h + create mode 100644 arch/nds32/include/uapi/asm/unistd.h + create mode 100644 arch/nds32/kernel/Makefile + create mode 100644 arch/nds32/kernel/asm-offsets.c + create mode 100644 arch/nds32/kernel/atl2c.c + create mode 100644 arch/nds32/kernel/cacheinfo.c + create mode 100644 arch/nds32/kernel/devtree.c + create mode 100644 arch/nds32/kernel/dma.c + create mode 100644 arch/nds32/kernel/ex-entry.S + create mode 100644 arch/nds32/kernel/ex-exit.S + create mode 100644 arch/nds32/kernel/ex-scall.S + create mode 100644 arch/nds32/kernel/head.S + create mode 100644 arch/nds32/kernel/irq.c + create mode 100644 arch/nds32/kernel/module.c + create mode 100644 arch/nds32/kernel/nds32_ksyms.c + create mode 100644 arch/nds32/kernel/process.c + create mode 100644 arch/nds32/kernel/ptrace.c + create mode 100644 arch/nds32/kernel/setup.c + create mode 100644 arch/nds32/kernel/signal.c + create mode 100644 arch/nds32/kernel/stacktrace.c + create mode 100644 arch/nds32/kernel/sys_nds32.c + create mode 100644 arch/nds32/kernel/syscall_table.c + create mode 100644 arch/nds32/kernel/time.c + create mode 100644 arch/nds32/kernel/traps.c + create mode 100644 arch/nds32/kernel/vdso.c + create mode 100644 arch/nds32/kernel/vdso/Makefile + create mode 100644 arch/nds32/kernel/vdso/datapage.S + create mode 100755 arch/nds32/kernel/vdso/gen_vdso_offsets.sh + create mode 100644 arch/nds32/kernel/vdso/gettimeofday.c + create mode 100644 arch/nds32/kernel/vdso/note.S + create mode 100644 arch/nds32/kernel/vdso/sigreturn.S + create mode 100644 arch/nds32/kernel/vdso/vdso.S + create mode 100644 arch/nds32/kernel/vdso/vdso.lds.S + create mode 100644 arch/nds32/kernel/vmlinux.lds.S + create mode 100644 arch/nds32/lib/Makefile + create mode 100644 arch/nds32/lib/clear_user.S + create mode 100644 arch/nds32/lib/copy_from_user.S + create mode 100644 arch/nds32/lib/copy_page.S + create mode 100644 arch/nds32/lib/copy_template.S + create mode 100644 arch/nds32/lib/copy_to_user.S + create mode 100644 arch/nds32/lib/memcpy.S + create mode 100644 arch/nds32/lib/memmove.S + create mode 100644 arch/nds32/lib/memset.S + create mode 100644 arch/nds32/lib/memzero.S + create mode 100644 arch/nds32/mm/Makefile + create mode 100644 arch/nds32/mm/alignment.c + create mode 100644 arch/nds32/mm/cacheflush.c + create mode 100644 arch/nds32/mm/extable.c + create mode 100644 arch/nds32/mm/fault.c + create mode 100644 arch/nds32/mm/highmem.c + create mode 100644 arch/nds32/mm/init.c + create mode 100644 arch/nds32/mm/ioremap.c + create mode 100644 arch/nds32/mm/mm-nds32.c + create mode 100644 arch/nds32/mm/mmap.c + create mode 100644 arch/nds32/mm/proc.c + create mode 100644 arch/nds32/mm/tlb.c + create mode 100644 drivers/clocksource/timer-atcpit100.c + create mode 100644 drivers/irqchip/irq-ativic32.c +Merging nios2/for-next (e0691ebb33c1 nios2: defconfig: Cleanup from old Kconfig options) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (0fedb7653af7 openrisc: remove unused __ARCH_HAVE_MMU define) +$ git merge openrisc/for-next +Merge made by the 'recursive' strategy. + arch/openrisc/include/uapi/asm/unistd.h | 2 -- + 1 file changed, 2 deletions(-) +Merging parisc-hd/for-next (8760d9c7e2b0 parisc: Reduce irq overhead when run in qemu) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/include/asm/cacheflush.h | 1 + + arch/parisc/include/asm/processor.h | 2 ++ + arch/parisc/kernel/cache.c | 51 ++++++++++++++++++++---------------- + arch/parisc/kernel/head.S | 18 ++++++++----- + arch/parisc/kernel/pacache.S | 22 ++++++++++++++++ + arch/parisc/kernel/smp.c | 7 ++++- + arch/parisc/kernel/time.c | 11 ++++---- + arch/parisc/mm/init.c | 7 ++++- + 8 files changed, 84 insertions(+), 35 deletions(-) +Merging powerpc/next (91ab883eb213 Linux 4.16-rc2) +$ git merge powerpc/next +Already up to date. +Merging fsl/next (c095ff93f901 powerpc/sysdev: change CPM GPIO to platform_device) +$ git merge fsl/next +Already up to date. +Merging risc-v/for-next (91ab883eb213 Linux 4.16-rc2) +$ git merge risc-v/for-next +Already up to date. +Merging s390/features (b35fe61df4bf s390: fix comment for scsw_cmd_is_valid_sctl) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/include/asm/pgalloc.h | 3 + + arch/s390/include/asm/scsw.h | 4 +- + arch/s390/include/uapi/asm/dasd.h | 38 +-- + arch/s390/kernel/entry.S | 6 +- + arch/s390/kernel/nospec-branch.c | 4 +- + arch/s390/mm/pgalloc.c | 293 ++++++++++++++++++- + drivers/s390/block/dasd.c | 21 +- + drivers/s390/block/dasd_3990_erp.c | 17 +- + drivers/s390/block/dasd_devmap.c | 43 ++- + drivers/s390/char/Makefile | 2 +- + drivers/s390/char/sclp.c | 58 ++-- + drivers/s390/char/sclp.h | 61 +++- + drivers/s390/char/sclp_early.c | 2 +- + drivers/s390/char/sclp_early_core.c | 38 ++- + drivers/s390/char/sclp_sd.c | 569 ++++++++++++++++++++++++++++++++++++ + drivers/s390/cio/device_fsm.c | 7 +- + drivers/s390/cio/device_ops.c | 72 ++--- + drivers/s390/cio/io_sch.h | 1 + + 18 files changed, 1114 insertions(+), 125 deletions(-) + create mode 100644 drivers/s390/char/sclp_sd.c +Merging sparc-next/master (8e44e6600caa Merge branch 'KASAN-read_word_at_a_time') +$ git merge sparc-next/master +Already up to date. +Merging sh/for-next (6e2fbfdd585f sh: fix futex FUTEX_OP_SET op on userspace addresses) +$ git merge sh/for-next +Auto-merging arch/sh/include/asm/futex.h +Merge made by the 'recursive' strategy. + arch/sh/include/asm/futex.h | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) +Merging uml/linux-next (584bfe635481 um: vector: Fix an error handling path in 'vector_parse()') +$ git merge uml/linux-next +Merge made by the 'recursive' strategy. + arch/um/Kconfig.net | 11 + + arch/um/drivers/Makefile | 4 +- + arch/um/drivers/chan_kern.c | 53 +- + arch/um/drivers/line.c | 2 +- + arch/um/drivers/net_kern.c | 4 +- + arch/um/drivers/random.c | 11 +- + arch/um/drivers/ubd_kern.c | 4 +- + arch/um/drivers/vector_kern.c | 1632 ++++++++++++++++++++++++++++++++++ + arch/um/drivers/vector_kern.h | 129 +++ + arch/um/drivers/vector_transports.c | 458 ++++++++++ + arch/um/drivers/vector_user.c | 586 ++++++++++++ + arch/um/drivers/vector_user.h | 99 +++ + arch/um/include/asm/asm-prototypes.h | 1 + + arch/um/include/asm/irq.h | 12 + + arch/um/include/shared/irq_user.h | 12 +- + arch/um/include/shared/net_kern.h | 2 + + arch/um/include/shared/os.h | 17 +- + arch/um/kernel/irq.c | 461 ++++++---- + arch/um/kernel/time.c | 6 +- + arch/um/os-Linux/irq.c | 202 +++-- + arch/um/os-Linux/signal.c | 2 +- + arch/x86/um/stub_segv.c | 2 +- + 22 files changed, 3385 insertions(+), 325 deletions(-) + create mode 100644 arch/um/drivers/vector_kern.c + create mode 100644 arch/um/drivers/vector_kern.h + create mode 100644 arch/um/drivers/vector_transports.c + create mode 100644 arch/um/drivers/vector_user.c + create mode 100644 arch/um/drivers/vector_user.h + create mode 100644 arch/um/include/asm/asm-prototypes.h +Merging xtensa/xtensa-for-next (ae6063c83634 Merge branch 'xtensa-fixes' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Merge made by the 'recursive' strategy. + arch/xtensa/kernel/pci-dma.c | 46 ++++++++++++++++++++++------- + arch/xtensa/mm/init.c | 70 +++++++++++++++++++++++++++++++++++++++----- + 2 files changed, 99 insertions(+), 17 deletions(-) +Merging fscrypt/master (0b1dfa4cc6c6 fscrypt: fix build with pre-4.6 gcc versions) +$ git merge fscrypt/master +Already up to date. +Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard issues) +$ git merge befs/for-next +Merge made by the 'recursive' strategy. + fs/befs/btree.c | 97 ++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 51 insertions(+), 46 deletions(-) +Merging btrfs/next (7c9a09f56a91 btrfs: don't use async helpers for crcs when under IO limits) +$ git merge btrfs/next +Auto-merging kernel/cgroup/cgroup.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/buffer_head.h +Auto-merging include/linux/backing-dev.h +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext2/super.c +Auto-merging fs/buffer.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/disk-io.c +Merge made by the 'recursive' strategy. + block/blk-cgroup.c | 1 + + fs/block_dev.c | 3 +-- + fs/btrfs/check-integrity.c | 2 +- + fs/btrfs/disk-io.c | 4 ++++ + fs/btrfs/inode.c | 15 ++++++++++++--- + fs/btrfs/ioctl.c | 8 +++++++- + fs/btrfs/super.c | 1 - + fs/buffer.c | 42 ++++++++++++++++++++++++++++++++++-------- + fs/ext2/inode.c | 3 ++- + fs/ext2/super.c | 1 - + fs/ext4/inode.c | 4 +++- + fs/ext4/super.c | 2 -- + include/linux/backing-dev.h | 2 +- + include/linux/buffer_head.h | 3 +++ + include/linux/fs.h | 3 ++- + kernel/cgroup/cgroup.c | 1 + + 16 files changed, 72 insertions(+), 23 deletions(-) +$ git am -3 ../patches/0001-f2fs-fixup-for-cgroup-writeback-change.patch +Applying: f2fs: fixup for cgroup/writeback change +$ git reset HEAD^ +Unstaged changes after reset: +M fs/f2fs/inode.c +M fs/f2fs/super.c +$ git add -A . +$ git commit -v -a --amend +[master c1086c16ab8f] Merge remote-tracking branch 'btrfs/next' + Date: Fri Feb 23 10:07:11 2018 +1100 +Merging btrfs-kdave/for-next (6537ffbd6382 Merge branch 'for-next-next-v4.16-20180213' into for-next-20180213) +$ git merge btrfs-kdave/for-next +Resolved 'fs/btrfs/disk-io.c' using previous resolution. +Resolved 'fs/btrfs/tree-log.c' using previous resolution. +Auto-merging fs/btrfs/tree-log.c +CONFLICT (content): Merge conflict in fs/btrfs/tree-log.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Removing fs/btrfs/hash.h +Removing fs/btrfs/hash.c +Auto-merging fs/btrfs/free-space-cache.c +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/extent_io.h +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/disk-io.c +CONFLICT (content): Merge conflict in fs/btrfs/disk-io.c +Auto-merging fs/btrfs/delayed-inode.c +Auto-merging fs/btrfs/compression.c +Auto-merging fs/btrfs/check-integrity.c +Auto-merging fs/btrfs/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1e1a9606851b] Merge remote-tracking branch 'btrfs-kdave/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/Kconfig | 3 +- + fs/btrfs/Makefile | 2 +- + fs/btrfs/btrfs_inode.h | 1 - + fs/btrfs/check-integrity.c | 4 +- + fs/btrfs/compression.c | 21 ++- + fs/btrfs/ctree.h | 50 +++-- + fs/btrfs/delayed-inode.c | 64 ++++--- + fs/btrfs/delayed-inode.h | 6 +- + fs/btrfs/dev-replace.c | 29 +-- + fs/btrfs/dev-replace.h | 3 +- + fs/btrfs/dir-item.c | 1 - + fs/btrfs/disk-io.c | 48 ++--- + fs/btrfs/extent-tree.c | 159 +++++++--------- + fs/btrfs/extent_io.c | 9 +- + fs/btrfs/extent_io.h | 6 +- + fs/btrfs/extent_map.c | 3 + + fs/btrfs/file.c | 23 +-- + fs/btrfs/free-space-cache.c | 2 +- + fs/btrfs/free-space-tree.c | 4 +- + fs/btrfs/hash.c | 54 ------ + fs/btrfs/hash.h | 43 ----- + fs/btrfs/inode-item.c | 1 - + fs/btrfs/inode-map.c | 4 +- + fs/btrfs/inode.c | 142 +++++++++----- + fs/btrfs/ioctl.c | 128 +++---------- + fs/btrfs/ordered-data.c | 2 +- + fs/btrfs/ordered-data.h | 4 +- + fs/btrfs/props.c | 4 +- + fs/btrfs/qgroup.c | 386 +++++++++++++++++++++++++++----------- + fs/btrfs/qgroup.h | 102 +++++++++- + fs/btrfs/relocation.c | 27 ++- + fs/btrfs/scrub.c | 11 +- + fs/btrfs/send.c | 33 +++- + fs/btrfs/super.c | 102 ++++------ + fs/btrfs/tests/btrfs-tests.c | 3 +- + fs/btrfs/tests/extent-map-tests.c | 2 +- + fs/btrfs/transaction.c | 184 +++++++++--------- + fs/btrfs/transaction.h | 25 ++- + fs/btrfs/tree-checker.c | 148 ++++++++------- + fs/btrfs/tree-checker.h | 7 +- + fs/btrfs/tree-log.c | 14 +- + fs/btrfs/volumes.c | 79 +++++--- + fs/btrfs/volumes.h | 27 ++- + fs/btrfs/zstd.c | 19 +- + include/linux/crc32c.h | 1 + + include/trace/events/btrfs.h | 108 ++++++++++- + lib/libcrc32c.c | 6 + + 47 files changed, 1189 insertions(+), 915 deletions(-) + delete mode 100644 fs/btrfs/hash.c + delete mode 100644 fs/btrfs/hash.h +Merging ceph/master (a25df1968a0c ceph: fix dentry leak when failing to init debugfs) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + fs/ceph/caps.c | 26 ++++++++++++++++++++++++++ + fs/ceph/dir.c | 28 +++++----------------------- + fs/ceph/super.c | 18 +++++++----------- + fs/ceph/super.h | 2 +- + net/ceph/ceph_common.c | 7 +++++++ + 5 files changed, 46 insertions(+), 35 deletions(-) +Merging cifs/for-next (13b8cb522ed3 [SMB3] fix smb3-encryption breakage when CONFIG_DEBUG_SG=y) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/cifs/README | 29 +++++------ + Documentation/filesystems/cifs/TODO | 25 +++++---- + fs/cifs/Kconfig | 1 + + fs/cifs/cifsencrypt.c | 85 +++++------------------------- + fs/cifs/cifsfs.c | 1 + + fs/cifs/cifsglob.h | 7 ++- + fs/cifs/cifsproto.h | 5 ++ + fs/cifs/link.c | 27 +++------- + fs/cifs/misc.c | 54 +++++++++++++++++++ + fs/cifs/smb2misc.c | 64 +++++++++++++++++++++++ + fs/cifs/smb2ops.c | 15 ++++-- + fs/cifs/smb2pdu.c | 33 +++++++++++- + fs/cifs/smb2pdu.h | 1 + + fs/cifs/smb2proto.h | 5 ++ + fs/cifs/smb2transport.c | 97 +++++++++++++++-------------------- + fs/cifs/smbdirect.c | 4 +- + fs/cifs/smbencrypt.c | 27 +++------- + fs/cifs/transport.c | 17 ++++++ + 18 files changed, 292 insertions(+), 205 deletions(-) +Merging configfs/for-next (6ace4f6bbcfd RDMA/cma: make config_item_type const) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (4670269faba7 eCryptfs: constify attribute_group structures.) +$ git merge ecryptfs/next +Already up to date. +Merging ext3/for_next (1d37d05f3c2c udf: Fix handling of Partition Descriptors) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/notify/inotify/inotify_user.c | 14 +++ + fs/udf/super.c | 194 ++++++++++++++++++++++----------------- + include/uapi/linux/inotify.h | 8 ++ + 3 files changed, 132 insertions(+), 84 deletions(-) +Merging ext4/dev (5dc397113d19 ext4: create ext4_kset dynamically) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (1c1d35df7110 f2fs: support inode creation time) +$ git merge f2fs/dev +Already up to date. +Merging fuse/for-next (c6cdd51404b7 fuse: fix READDIRPLUS skipping an entry) +$ git merge fuse/for-next +Already up to date. +Merging jfs/jfs-next (86313903430d MAINTAINERS: fix jfs tree location) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (1b7204064582 NFS: make struct nlmclnt_fl_close_lock_ops static) +$ git merge nfs/linux-next +Merge made by the 'recursive' strategy. + fs/nfs/callback_proc.c | 14 ++++++-------- + fs/nfs/nfs3proc.c | 2 +- + fs/nfs/nfs4client.c | 6 ++++-- + 3 files changed, 11 insertions(+), 11 deletions(-) +Merging nfs-anna/linux-next (c54c14ba000d xprtrdma: Spread reply processing over more CPUs) +$ git merge nfs-anna/linux-next +Resolved 'net/sunrpc/xprt.c' using previous resolution. +Resolved 'net/sunrpc/xprtrdma/transport.c' using previous resolution. +Auto-merging net/sunrpc/xprtrdma/transport.c +CONFLICT (content): Merge conflict in net/sunrpc/xprtrdma/transport.c +Auto-merging net/sunrpc/xprt.c +CONFLICT (content): Merge conflict in net/sunrpc/xprt.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ae7c6d37723f] Merge remote-tracking branch 'nfs-anna/linux-next' +$ git diff -M --stat --summary HEAD^.. +Merging nfsd/nfsd-next (1330e3b03a10 NFSD stop queued async copies on client shutdown) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/lockd/svc.c | 4 +- + fs/nfsd/netns.h | 8 + + fs/nfsd/nfs4callback.c | 98 +++++++++++ + fs/nfsd/nfs4proc.c | 317 +++++++++++++++++++++++++++++++--- + fs/nfsd/nfs4state.c | 99 ++++++++++- + fs/nfsd/nfs4xdr.c | 50 +++++- + fs/nfsd/nfsctl.c | 1 + + fs/nfsd/state.h | 21 ++- + fs/nfsd/xdr4.h | 28 +++ + fs/nfsd/xdr4cb.h | 10 ++ + net/sunrpc/auth_gss/gss_krb5_seal.c | 5 +- + net/sunrpc/auth_gss/gss_krb5_unseal.c | 4 +- + net/sunrpc/cache.c | 32 ++-- + 13 files changed, 616 insertions(+), 61 deletions(-) +Merging orangefs/for-next (74e938c22705 orangefs: reverse sense of is-inode-stale test in d_revalidate) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (7168179fcf25 ovl: check ERR_PTR() return value from ovl_lookup_real()) +$ git merge overlayfs/overlayfs-next +Merge made by the 'recursive' strategy. + fs/overlayfs/export.c | 214 +++++++++++++++++++++++++++++++++++++---------- + fs/overlayfs/inode.c | 58 +++++++++---- + fs/overlayfs/overlayfs.h | 1 + + fs/overlayfs/super.c | 1 + + 4 files changed, 210 insertions(+), 64 deletions(-) +Merging ubifs/linux-next (7f29ae9f977b ubi: block: Fix locking for idr_alloc/idr_remove) +$ git merge ubifs/linux-next +Already up to date. +Merging xfs/for-next (76883f7988e6 xfs: remove experimental tag for reverse mapping) +$ git merge xfs/for-next +Already up to date. +Merging file-locks/locks-next (1deab8ce2c91 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) +$ git merge file-locks/locks-next +Already up to date. +Merging vfs/for-next (d85e2aa2e34d annotate ep_scan_ready_list()) +$ git merge vfs/for-next +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 iversion/iversion-next (581e400ff935 Merge tag 'modules-for-v4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux) +$ git merge iversion/iversion-next +Already up to date. +Merging printk/for-next (02fffdcaed19 Merge branch 'for-4.17' into for-next) +$ git merge printk/for-next +Auto-merging kernel/printk/printk.c +Merge made by the 'recursive' strategy. + kernel/printk/printk.c | 24 ++++++++++++++---------- + lib/vsprintf.c | 2 +- + 2 files changed, 15 insertions(+), 11 deletions(-) +Merging pci/next (c8989cd7ece7 Merge branch 'pci/sparc' into next) +$ git merge pci/next +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Merge made by the 'recursive' strategy. + arch/sparc/kernel/pci.c | 6 ++--- + arch/sparc/kernel/pci_common.c | 54 +++++++++++++++++++--------------------- + arch/sparc/kernel/pci_impl.h | 4 +++ + arch/sparc/mm/init_64.c | 17 +++++++++++++ + drivers/gpu/drm/i915/i915_drv.c | 5 +++- + drivers/rapidio/devices/tsi721.c | 5 ++-- + include/linux/pci.h | 8 ------ + 7 files changed, 57 insertions(+), 42 deletions(-) +Merging pstore/for-next/pstore (a99f41a1b441 fs: pstore: remove unused hardirq.h) +$ git merge pstore/for-next/pstore +Already up to date. +Merging hid/for-next (ba6986149ce3 Merge branch 'for-4.16/upstream-fixes' into for-next) +$ git merge hid/for-next +Auto-merging drivers/hid/uhid.c +Auto-merging drivers/hid/hid-quirks.c +Auto-merging drivers/hid/hid-ids.h +Merge made by the 'recursive' strategy. + drivers/hid/Kconfig | 8 + + drivers/hid/Makefile | 1 + + drivers/hid/hid-asus.c | 4 +- + drivers/hid/hid-core.c | 10 +- + drivers/hid/hid-corsair.c | 24 ++- + drivers/hid/hid-elan.c | 421 ++++++++++++++++++++++++++++++++++++++++++ + drivers/hid/hid-ids.h | 2 + + drivers/hid/hid-input.c | 3 +- + drivers/hid/hid-multitouch.c | 5 +- + drivers/hid/hid-quirks.c | 5 + + drivers/hid/hid-rmi.c | 4 +- + drivers/hid/i2c-hid/i2c-hid.c | 17 +- + drivers/hid/uhid.c | 12 +- + drivers/hid/wacom_sys.c | 4 +- + include/linux/hid.h | 6 +- + 15 files changed, 490 insertions(+), 36 deletions(-) + create mode 100644 drivers/hid/hid-elan.c +Merging i2c/i2c/for-next (91ab883eb213 Linux 4.16-rc2) +$ git merge i2c/i2c/for-next +Already up to date. +Merging dmi/master (36a840c73dc6 firmware: dmi: handle missing DMI data gracefully) +$ git merge dmi/master +Merge made by the 'recursive' strategy. +Merging hwmon-staging/hwmon-next (e464243586cb hwmon: (sht3x) Update data sheet URL) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + Documentation/hwmon/sht21 | 6 +++--- + Documentation/hwmon/sht3x | 2 +- + drivers/hwmon/sht21.c | 3 +-- + 3 files changed, 5 insertions(+), 6 deletions(-) +Merging jc_docs/docs-next (fcdf1df2032c Merge branch 'kerneldoc2' into docs-next) +$ git merge jc_docs/docs-next +Merge made by the 'recursive' strategy. + Documentation/admin-guide/tainted-kernels.rst | 18 +- + Documentation/doc-guide/kernel-doc.rst | 552 ++++++++++----------- + Documentation/driver-api/slimbus.rst | 2 +- + Documentation/process/5.Posting.rst | 2 +- + Documentation/process/howto.rst | 15 - + Documentation/trace/events.txt | 2 +- + scripts/kernel-doc | 668 ++++++++++++++------------ + scripts/split-man.pl | 28 ++ + 8 files changed, 667 insertions(+), 620 deletions(-) + create mode 100755 scripts/split-man.pl +Merging v4l-dvb/master (4395fb475a27 tda1997x: get rid of an unused var) +$ git merge v4l-dvb/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/media/i2c/tda1997x.txt | 178 ++ + Documentation/media/uapi/mediactl/media-types.rst | 11 + + Documentation/media/uapi/v4l/vidioc-g-parm.rst | 7 +- + MAINTAINERS | 8 + + drivers/input/touchscreen/sur40.c | 178 +- + drivers/media/cec/cec-adap.c | 14 +- + drivers/media/cec/cec-api.c | 14 +- + drivers/media/cec/cec-core.c | 14 +- + drivers/media/cec/cec-edid.c | 14 +- + drivers/media/cec/cec-notifier.c | 14 +- + drivers/media/cec/cec-pin-priv.h | 14 +- + drivers/media/cec/cec-pin.c | 14 +- + drivers/media/cec/cec-priv.h | 14 +- + drivers/media/common/v4l2-tpg/v4l2-tpg-colors.c | 14 +- + drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 14 +- + drivers/media/i2c/Kconfig | 9 + + drivers/media/i2c/Makefile | 1 + + drivers/media/i2c/ad9389b.c | 14 +- + drivers/media/i2c/adv7511.c | 14 +- + drivers/media/i2c/adv7604.c | 14 +- + drivers/media/i2c/adv7842.c | 15 +- + drivers/media/i2c/mt9v011.c | 29 +- + drivers/media/i2c/ov6650.c | 33 +- + drivers/media/i2c/ov7670.c | 22 +- + drivers/media/i2c/ov7740.c | 29 +- + drivers/media/i2c/tc358743.c | 15 +- + drivers/media/i2c/tc358743_regs.h | 15 +- + drivers/media/i2c/tda1997x.c | 2820 ++++++++++++++++++++ + drivers/media/i2c/tda1997x_regs.h | 641 +++++ + drivers/media/i2c/tvp514x.c | 37 +- + drivers/media/i2c/vs6624.c | 27 +- + drivers/media/pci/cobalt/Makefile | 1 + + drivers/media/pci/cobalt/cobalt-alsa-main.c | 14 +- + drivers/media/pci/cobalt/cobalt-alsa-pcm.c | 14 +- + drivers/media/pci/cobalt/cobalt-alsa-pcm.h | 14 +- + drivers/media/pci/cobalt/cobalt-alsa.h | 14 +- + drivers/media/pci/cobalt/cobalt-cpld.c | 14 +- + drivers/media/pci/cobalt/cobalt-cpld.h | 14 +- + drivers/media/pci/cobalt/cobalt-driver.c | 14 +- + drivers/media/pci/cobalt/cobalt-driver.h | 14 +- + drivers/media/pci/cobalt/cobalt-flash.c | 14 +- + drivers/media/pci/cobalt/cobalt-flash.h | 14 +- + drivers/media/pci/cobalt/cobalt-i2c.c | 14 +- + drivers/media/pci/cobalt/cobalt-i2c.h | 14 +- + drivers/media/pci/cobalt/cobalt-irq.c | 14 +- + drivers/media/pci/cobalt/cobalt-irq.h | 14 +- + drivers/media/pci/cobalt/cobalt-omnitek.c | 14 +- + drivers/media/pci/cobalt/cobalt-omnitek.h | 14 +- + drivers/media/pci/cobalt/cobalt-v4l2.c | 14 +- + drivers/media/pci/cobalt/cobalt-v4l2.h | 14 +- + .../cobalt/m00233_video_measure_memmap_package.h | 14 +- + .../pci/cobalt/m00235_fdma_packer_memmap_package.h | 14 +- + .../media/pci/cobalt/m00389_cvi_memmap_package.h | 14 +- + .../media/pci/cobalt/m00460_evcnt_memmap_package.h | 14 +- + .../pci/cobalt/m00473_freewheel_memmap_package.h | 14 +- + .../m00479_clk_loss_detector_memmap_package.h | 14 +- + .../m00514_syncgen_flow_evcnt_memmap_package.h | 14 +- + drivers/media/platform/atmel/atmel-isc.c | 10 +- + drivers/media/platform/atmel/atmel-isi.c | 12 +- + drivers/media/platform/blackfin/bfin_capture.c | 14 +- + drivers/media/platform/cec-gpio/cec-gpio.c | 14 +- + drivers/media/platform/marvell-ccic/mcam-core.c | 12 +- + drivers/media/platform/soc_camera/soc_camera.c | 10 +- + drivers/media/platform/via-camera.c | 4 +- + drivers/media/platform/vivid/vivid-cec.c | 14 +- + drivers/media/platform/vivid/vivid-cec.h | 14 +- + drivers/media/platform/vivid/vivid-core.c | 14 +- + drivers/media/platform/vivid/vivid-core.h | 14 +- + drivers/media/platform/vivid/vivid-ctrls.c | 14 +- + drivers/media/platform/vivid/vivid-ctrls.h | 14 +- + drivers/media/platform/vivid/vivid-kthread-cap.c | 14 +- + drivers/media/platform/vivid/vivid-kthread-cap.h | 14 +- + drivers/media/platform/vivid/vivid-kthread-out.c | 14 +- + drivers/media/platform/vivid/vivid-kthread-out.h | 14 +- + drivers/media/platform/vivid/vivid-osd.c | 14 +- + drivers/media/platform/vivid/vivid-osd.h | 14 +- + drivers/media/platform/vivid/vivid-radio-common.c | 14 +- + drivers/media/platform/vivid/vivid-radio-common.h | 14 +- + drivers/media/platform/vivid/vivid-radio-rx.c | 14 +- + drivers/media/platform/vivid/vivid-radio-rx.h | 14 +- + drivers/media/platform/vivid/vivid-radio-tx.c | 14 +- + drivers/media/platform/vivid/vivid-radio-tx.h | 14 +- + drivers/media/platform/vivid/vivid-rds-gen.c | 14 +- + drivers/media/platform/vivid/vivid-rds-gen.h | 14 +- + drivers/media/platform/vivid/vivid-sdr-cap.c | 14 +- + drivers/media/platform/vivid/vivid-sdr-cap.h | 14 +- + drivers/media/platform/vivid/vivid-vbi-cap.c | 14 +- + drivers/media/platform/vivid/vivid-vbi-cap.h | 14 +- + drivers/media/platform/vivid/vivid-vbi-gen.c | 14 +- + drivers/media/platform/vivid/vivid-vbi-gen.h | 14 +- + drivers/media/platform/vivid/vivid-vbi-out.c | 14 +- + drivers/media/platform/vivid/vivid-vbi-out.h | 14 +- + drivers/media/platform/vivid/vivid-vid-cap.c | 14 +- + drivers/media/platform/vivid/vivid-vid-cap.h | 14 +- + drivers/media/platform/vivid/vivid-vid-common.c | 14 +- + drivers/media/platform/vivid/vivid-vid-common.h | 14 +- + drivers/media/platform/vivid/vivid-vid-out.c | 14 +- + drivers/media/platform/vivid/vivid-vid-out.h | 14 +- + drivers/media/radio/radio-raremono.c | 14 +- + drivers/media/radio/si4713/radio-usb-si4713.c | 14 +- + drivers/media/rc/Kconfig | 11 - + drivers/media/rc/ir-hix5hd2.c | 35 +- + drivers/media/rc/ir-jvc-decoder.c | 14 +- + drivers/media/rc/ir-mce_kbd-decoder.c | 60 +- + drivers/media/rc/ir-nec-decoder.c | 20 +- + drivers/media/rc/ir-rc5-decoder.c | 12 +- + drivers/media/rc/ir-rc6-decoder.c | 26 +- + drivers/media/rc/ir-sanyo-decoder.c | 18 +- + drivers/media/rc/ir-sharp-decoder.c | 17 +- + drivers/media/rc/ir-sony-decoder.c | 14 +- + drivers/media/rc/ir-spi.c | 24 +- + drivers/media/rc/ir-xmp-decoder.c | 29 +- + drivers/media/rc/lirc_dev.c | 16 +- + drivers/media/rc/rc-core-priv.h | 7 - + drivers/media/rc/rc-ir-raw.c | 6 +- + drivers/media/rc/rc-main.c | 91 +- + drivers/media/usb/em28xx/em28xx-video.c | 36 +- + drivers/media/v4l2-core/v4l2-common.c | 48 + + drivers/media/v4l2-core/v4l2-dv-timings.c | 156 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 2 +- + drivers/media/v4l2-core/v4l2-subdev.c | 13 + + drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 53 - + drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 53 - + .../staging/media/atomisp/i2c/atomisp-mt9m114.c | 6 - + drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 56 - + drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 53 - + drivers/staging/media/atomisp/i2c/gc0310.h | 43 - + drivers/staging/media/atomisp/i2c/gc2235.h | 7 +- + drivers/staging/media/atomisp/i2c/ov2680.h | 68 - + drivers/staging/media/atomisp/i2c/ov2722.h | 6 + + .../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 54 - + drivers/staging/media/atomisp/i2c/ov5693/ov5693.h | 6 + + .../media/atomisp/pci/atomisp2/atomisp_cmd.c | 9 +- + .../media/atomisp/pci/atomisp2/atomisp_file.c | 16 - + .../media/atomisp/pci/atomisp2/atomisp_subdev.c | 12 +- + .../media/atomisp/pci/atomisp2/atomisp_tpg.c | 14 - + include/dt-bindings/media/tda1997x.h | 74 + + include/media/cec-notifier.h | 14 +- + include/media/cec-pin.h | 14 +- + include/media/cec.h | 14 +- + include/media/i2c/ad9389b.h | 14 +- + include/media/i2c/adv7511.h | 14 +- + include/media/i2c/adv7604.h | 15 +- + include/media/i2c/adv7842.h | 15 +- + include/media/i2c/tc358743.h | 18 +- + include/media/i2c/tda1997x.h | 42 + + include/media/i2c/ths7303.h | 10 +- + include/media/i2c/uda1342.h | 15 +- + include/media/rc-core.h | 7 - + include/media/tpg/v4l2-tpg.h | 14 +- + include/media/v4l2-common.h | 26 + + include/media/v4l2-dv-timings.h | 36 +- + include/media/v4l2-rect.h | 14 +- + include/media/v4l2-subdev.h | 6 - + include/uapi/linux/cec-funcs.h | 29 - + include/uapi/linux/cec.h | 29 - + include/uapi/linux/media.h | 5 + + 157 files changed, 4637 insertions(+), 2087 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/i2c/tda1997x.txt + create mode 100644 drivers/media/i2c/tda1997x.c + create mode 100644 drivers/media/i2c/tda1997x_regs.h + create mode 100644 include/dt-bindings/media/tda1997x.h + create mode 100644 include/media/i2c/tda1997x.h +Merging v4l-dvb-next/master (a1dfb4c48cc1 media: v4l2-compat-ioctl32.c: refactor compat ioctl32 logic) +$ git merge v4l-dvb-next/master +Already up to date. +Merging fbdev/fbdev-for-next (5865889fe431 video: udlfb: Switch from the pr_*() to the dev_*() logging functions) +$ git merge fbdev/fbdev-for-next +Already up to date. +Merging pm/linux-next (a8135650d21e Merge branches 'acpica', 'acpi-battery' and 'acpi-doc' into linux-next) +$ git merge pm/linux-next +Auto-merging tools/power/pm-graph/sleepgraph.py +Auto-merging tools/power/pm-graph/bootgraph.py +Removing drivers/acpi/battery.h +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-acpi | 37 + + drivers/acpi/ac.c | 2 +- + drivers/acpi/acpica/acopcode.h | 14 +- + drivers/acpi/acpica/amlcode.h | 20 +- + drivers/acpi/acpica/dsargs.c | 1 + + drivers/acpi/acpica/dsopcode.c | 4 +- + drivers/acpi/acpica/dspkginit.c | 164 +- + drivers/acpi/acpica/dswexec.c | 6 +- + drivers/acpi/acpica/dswload.c | 2 +- + drivers/acpi/acpica/exconvrt.c | 1 + + drivers/acpi/acpica/exnames.c | 7 +- + drivers/acpi/acpica/exresop.c | 1 + + drivers/acpi/acpica/nseval.c | 8 +- + drivers/acpi/acpica/nsinit.c | 7 +- + drivers/acpi/acpica/nsnames.c | 3 + + drivers/acpi/acpica/nsparse.c | 10 +- + drivers/acpi/acpica/psloop.c | 4 +- + drivers/acpi/acpica/psparse.c | 2 +- + drivers/acpi/acpica/pstree.c | 1 + + drivers/acpi/acpica/utcache.c | 7 +- + drivers/acpi/acpica/utdelete.c | 20 +- + drivers/acpi/battery.c | 169 +- + drivers/acpi/battery.h | 11 - + drivers/acpi/sbs.c | 2 +- + drivers/acpi/sleep.c | 11 +- + drivers/platform/x86/Kconfig | 1 + + drivers/platform/x86/thinkpad_acpi.c | 389 +++- + drivers/power/supply/ds2780_battery.c | 5 - + drivers/power/supply/ds2781_battery.c | 5 - + drivers/power/supply/power_supply_core.c | 2 +- + include/acpi/acpixf.h | 10 +- + include/acpi/actbl1.h | 1638 ++++++++-------- + include/acpi/actbl2.h | 1964 +++++++++++--------- + include/acpi/actbl3.h | 1016 +++++----- + include/acpi/battery.h | 21 + + include/acpi/platform/aclinux.h | 1 + + include/linux/power_supply.h | 2 + + tools/power/pm-graph/Makefile | 29 +- + tools/power/pm-graph/bootgraph.8 | 18 +- + .../pm-graph/{analyze_boot.py => bootgraph.py} | 219 ++- + tools/power/pm-graph/config/cgskip.txt | 65 + + .../pm-graph/config/custom-timeline-functions.cfg | 205 ++ + tools/power/pm-graph/config/example.cfg | 133 ++ + tools/power/pm-graph/config/freeze-callgraph.cfg | 94 + + tools/power/pm-graph/config/freeze-dev.cfg | 93 + + tools/power/pm-graph/config/freeze.cfg | 93 + + tools/power/pm-graph/config/standby-callgraph.cfg | 94 + + tools/power/pm-graph/config/standby-dev.cfg | 93 + + tools/power/pm-graph/config/standby.cfg | 93 + + tools/power/pm-graph/config/suspend-callgraph.cfg | 98 + + tools/power/pm-graph/config/suspend-dev.cfg | 93 + + tools/power/pm-graph/config/suspend-x2-proc.cfg | 93 + + tools/power/pm-graph/config/suspend.cfg | 93 + + tools/power/pm-graph/sleepgraph.8 | 47 +- + .../pm-graph/{analyze_suspend.py => sleepgraph.py} | 1625 ++++++++++------ + 55 files changed, 5671 insertions(+), 3175 deletions(-) + delete mode 100644 drivers/acpi/battery.h + create mode 100644 include/acpi/battery.h + rename tools/power/pm-graph/{analyze_boot.py => bootgraph.py} (85%) + create mode 100644 tools/power/pm-graph/config/cgskip.txt + create mode 100644 tools/power/pm-graph/config/custom-timeline-functions.cfg + create mode 100644 tools/power/pm-graph/config/example.cfg + create mode 100644 tools/power/pm-graph/config/freeze-callgraph.cfg + create mode 100644 tools/power/pm-graph/config/freeze-dev.cfg + create mode 100644 tools/power/pm-graph/config/freeze.cfg + create mode 100644 tools/power/pm-graph/config/standby-callgraph.cfg + create mode 100644 tools/power/pm-graph/config/standby-dev.cfg + create mode 100644 tools/power/pm-graph/config/standby.cfg + create mode 100644 tools/power/pm-graph/config/suspend-callgraph.cfg + create mode 100644 tools/power/pm-graph/config/suspend-dev.cfg + create mode 100644 tools/power/pm-graph/config/suspend-x2-proc.cfg + create mode 100644 tools/power/pm-graph/config/suspend.cfg + rename tools/power/pm-graph/{analyze_suspend.py => sleepgraph.py} (82%) +Merging cpupower/cpupower (7928b2cbe55b Linux 4.16-rc1) +$ git merge cpupower/cpupower +Already up to date. +Merging idle/next (8a5776a5f498 Linux 4.14-rc4) +$ git merge idle/next +Already up to date. +Merging opp/opp/linux-next (4a823c0be80f opp: cpu: Replace GFP_ATOMIC with GFP_KERNEL in dev_pm_opp_init_cpufreq_table) +$ git merge opp/opp/linux-next +Already up to date. +Merging thermal/next (134f4010799a Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next) +$ git merge thermal/next +Already up to date. +Merging thermal-soc/next (d0ecbbbe518e thermal/drivers/hisi: Remove bogus const from function return type) +$ git merge thermal-soc/next +Already up to date. +Merging ieee1394/for-next (188775181bc0 firewire-ohci: work around oversized DMA reads on JMicron controllers) +$ git merge ieee1394/for-next +Already up to date. +Merging dlm/next (9250e523592a dlm: remove dlm_send_rcom_lookup_dump) +$ git merge dlm/next +Already up to date. +Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback) +$ git merge swiotlb/linux-next +Already up to date. +Merging net-next/master (46182452cf5a dsa: ptp: mark dummy helpers as 'inline') +$ git merge net-next/master +Auto-merging net/xfrm/xfrm_policy.c +Auto-merging net/tipc/topsrv.h +Removing net/tipc/server.c +Auto-merging net/sctp/diag.c +Auto-merging net/sched/cls_api.c +Auto-merging net/netlink/af_netlink.c +Auto-merging net/netfilter/x_tables.c +Auto-merging net/mac80211/sta_info.c +Auto-merging net/ipv6/xfrm6_policy.c +Auto-merging net/ipv6/route.c +Auto-merging net/ipv4/xfrm4_policy.c +Auto-merging net/ipv4/tcp_output.c +Auto-merging net/ipv4/route.c +Auto-merging net/ipv4/netfilter/ip_tables.c +Auto-merging net/ipv4/ip_sockglue.c +Auto-merging include/net/route.h +Auto-merging include/net/mac80211.h +Auto-merging drivers/net/wireless/mac80211_hwsim.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_rx.c +Auto-merging drivers/net/ethernet/ibm/ibmvnic.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/ti,dp83867.txt | 2 + + drivers/bluetooth/ath3k.c | 28 +- + drivers/bluetooth/btmrvl_main.c | 2 +- + drivers/bluetooth/btrtl.c | 119 ++- + drivers/bluetooth/btusb.c | 10 + + drivers/bluetooth/hci_ath.c | 4 +- + drivers/bluetooth/hci_ll.c | 2 +- + drivers/infiniband/hw/mlx5/cq.c | 64 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 6 +- + drivers/infiniband/hw/usnic/usnic_transport.c | 5 +- + drivers/isdn/mISDN/socket.c | 5 +- + drivers/net/Kconfig | 3 +- + drivers/net/Space.c | 3 - + drivers/net/dsa/mv88e6xxx/Kconfig | 10 + + drivers/net/dsa/mv88e6xxx/Makefile | 4 + + drivers/net/dsa/mv88e6xxx/chip.c | 100 +- + drivers/net/dsa/mv88e6xxx/chip.h | 103 ++ + drivers/net/dsa/mv88e6xxx/global2.c | 9 +- + drivers/net/dsa/mv88e6xxx/global2.h | 99 +- + drivers/net/dsa/mv88e6xxx/global2_avb.c | 193 ++++ + drivers/net/dsa/mv88e6xxx/global2_scratch.c | 291 ++++++ + drivers/net/dsa/mv88e6xxx/hwtstamp.c | 576 +++++++++++ + drivers/net/dsa/mv88e6xxx/hwtstamp.h | 172 ++++ + drivers/net/dsa/mv88e6xxx/ptp.c | 381 ++++++++ + drivers/net/dsa/mv88e6xxx/ptp.h | 108 +++ + drivers/net/ethernet/8390/Makefile | 6 +- + drivers/net/ethernet/8390/ax88796.c | 3 - + drivers/net/ethernet/8390/axnet_cs.c | 2 - + drivers/net/ethernet/8390/etherh.c | 17 - + drivers/net/ethernet/8390/hydra.c | 4 - + drivers/net/ethernet/8390/lib8390.c | 2 + + drivers/net/ethernet/8390/mac8390.c | 171 ++-- + drivers/net/ethernet/8390/mcf8390.c | 4 - + drivers/net/ethernet/8390/ne.c | 2 +- + drivers/net/ethernet/8390/pcnet_cs.c | 4 - + drivers/net/ethernet/8390/wd.c | 2 +- + drivers/net/ethernet/8390/zorro8390.c | 5 - + .../net/ethernet/aquantia/atlantic/hw_atl/Makefile | 2 + + drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c | 86 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 5 + + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 193 ++-- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +- + drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 2 +- + drivers/net/ethernet/ibm/ibmvnic.c | 167 ++-- + drivers/net/ethernet/ibm/ibmvnic.h | 8 +- + drivers/net/ethernet/intel/i40e/i40e.h | 10 +- + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 52 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 89 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 158 ++-- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 421 +++++--- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 68 +- + drivers/net/ethernet/intel/i40e/i40e_type.h | 2 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 1000 ++++++++++++++++++-- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 20 + + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 425 ++++++--- + drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 67 +- + drivers/net/ethernet/intel/i40evf/i40evf.h | 75 +- + drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 52 +- + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 931 ++++++++++++++++-- + .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 334 ++++++- + drivers/net/ethernet/mellanox/mlx5/core/alloc.c | 37 +- + drivers/net/ethernet/mellanox/mlx5/core/cq.c | 116 +-- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 11 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 92 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 8 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 21 + + drivers/net/ethernet/mellanox/mlx5/core/wq.c | 18 +- + drivers/net/ethernet/mellanox/mlx5/core/wq.h | 22 +- + drivers/net/ethernet/mellanox/mlxsw/Makefile | 2 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 437 +-------- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 37 +- + .../mellanox/mlxsw/spectrum_acl_flex_actions.c | 1 + + .../net/ethernet/mellanox/mlxsw/spectrum_ipip.c | 141 ++- + .../net/ethernet/mellanox/mlxsw/spectrum_ipip.h | 7 +- + .../net/ethernet/mellanox/mlxsw/spectrum_kvdl.c | 187 +++- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 22 +- + .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 356 +++++++ + .../net/ethernet/mellanox/mlxsw/spectrum_span.h | 73 ++ + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 6 +- + drivers/net/ethernet/netronome/nfp/bpf/Makefile | 2 + + drivers/net/ethernet/netronome/nfp/flower/Makefile | 2 + + drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 11 +- + drivers/net/ethernet/netronome/nfp/flower/main.h | 1 + + drivers/net/ethernet/netronome/nfp/flower/match.c | 20 + + .../net/ethernet/netronome/nfp/flower/offload.c | 34 + + drivers/net/ethernet/netronome/nfp/nfp_main.c | 1 + + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 280 +++--- + .../net/ethernet/netronome/nfp/nfpcore/Makefile | 2 + + .../netronome/nfp/nfpcore/nfp6000/Makefile | 2 + + drivers/net/ethernet/netronome/nfp/nic/Makefile | 2 + + drivers/net/ethernet/realtek/r8169.c | 41 +- + drivers/net/ethernet/renesas/ravb.h | 1 + + drivers/net/ethernet/renesas/ravb_main.c | 34 +- + drivers/net/ethernet/renesas/sh_eth.c | 16 +- + .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 208 ++-- + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 6 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 23 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 34 +- + drivers/net/ipvlan/ipvlan_core.c | 72 +- + drivers/net/ipvlan/ipvlan_main.c | 48 +- + drivers/net/loopback.c | 1 + + drivers/net/phy/dp83867.c | 19 + + drivers/net/ppp/pppoe.c | 6 +- + drivers/net/ppp/pptp.c | 6 +- + drivers/net/tun.c | 72 +- + drivers/net/vrf.c | 2 +- + drivers/net/wireless/ath/wil6210/cfg80211.c | 3 +- + drivers/net/wireless/mac80211_hwsim.c | 81 +- + drivers/net/wireless/mac80211_hwsim.h | 9 +- + drivers/scsi/iscsi_tcp.c | 14 +- + drivers/soc/qcom/qmi_interface.c | 3 +- + drivers/staging/ipx/af_ipx.c | 6 +- + drivers/staging/irda/net/af_irda.c | 8 +- + drivers/staging/lustre/lnet/lnet/lib-socket.c | 7 +- + drivers/target/iscsi/iscsi_target_login.c | 18 +- + drivers/vhost/net.c | 7 +- + fs/dlm/lowcomms.c | 7 +- + fs/nsfs.c | 1 + + fs/ocfs2/cluster/tcp.c | 6 +- + fs/proc/proc_net.c | 1 + + include/dt-bindings/net/ti-dp83867.h | 14 + + include/linux/atalk.h | 2 + + include/linux/avf/virtchnl.h | 107 ++- + include/linux/ieee80211.h | 14 +- + include/linux/mlx5/cq.h | 14 +- + include/linux/mlx5/driver.h | 88 +- + include/linux/net.h | 8 +- + include/linux/netdevice.h | 6 + + include/linux/ptp_classify.h | 4 + + include/linux/ptr_ring.h | 7 +- + include/linux/rtnetlink.h | 2 +- + include/linux/skbuff.h | 3 + + include/linux/socket.h | 2 + + include/net/Space.h | 1 - + include/net/act_api.h | 17 +- + include/net/ax25.h | 2 + + include/net/cfg80211.h | 104 +- + include/net/devlink.h | 4 - + include/net/dsa.h | 20 + + include/net/fib_rules.h | 3 +- + include/net/ieee80211_radiotap.h | 2 + + include/net/inet_common.h | 2 +- + include/net/ipv6.h | 2 +- + include/net/lwtunnel.h | 15 + + include/net/mac80211.h | 19 + + include/net/net_namespace.h | 16 +- + include/net/route.h | 2 - + include/net/sock.h | 12 +- + include/net/tcp.h | 3 +- + include/net/tcp_states.h | 26 +- + include/uapi/linux/errqueue.h | 2 + + include/uapi/linux/fib_rules.h | 2 +- + include/uapi/linux/if_ether.h | 1 + + include/uapi/linux/if_link.h | 18 + + include/uapi/linux/nl80211.h | 90 +- + include/uapi/linux/pkt_cls.h | 3 +- + include/uapi/linux/rds.h | 1 + + include/uapi/linux/tc_ematch/tc_em_ipt.h | 20 + + kernel/audit.c | 1 + + lib/kobject_uevent.c | 1 + + net/appletalk/ddp.c | 5 +- + net/atm/pvc.c | 5 +- + net/atm/svc.c | 5 +- + net/ax25/af_ax25.c | 4 +- + net/bluetooth/hci_request.c | 6 +- + net/bluetooth/hci_sock.c | 4 +- + net/bluetooth/l2cap_sock.c | 5 +- + net/bluetooth/rfcomm/sock.c | 5 +- + net/bluetooth/sco.c | 5 +- + net/can/raw.c | 6 +- + net/core/dev.c | 5 +- + net/core/devlink.c | 32 +- + net/core/fib_notifier.c | 1 + + net/core/fib_rules.c | 8 +- + net/core/net-procfs.c | 2 + + net/core/net_namespace.c | 134 +-- + net/core/rtnetlink.c | 5 +- + net/core/skbuff.c | 6 +- + net/core/sock.c | 34 +- + net/core/sock_diag.c | 1 + + net/core/sysctl_net_core.c | 1 + + net/decnet/af_decnet.c | 6 +- + net/dsa/dsa.c | 36 + + net/dsa/slave.c | 59 ++ + net/ipv4/af_inet.c | 7 +- + net/ipv4/arp.c | 1 + + net/ipv4/devinet.c | 1 + + net/ipv4/fib_frontend.c | 1 + + net/ipv4/fib_semantics.c | 12 +- + net/ipv4/icmp.c | 1 + + net/ipv4/igmp.c | 1 + + net/ipv4/ip_fragment.c | 1 + + net/ipv4/ip_sockglue.c | 6 +- + net/ipv4/ipmr.c | 1 + + net/ipv4/netfilter/ip_tables.c | 1 + + net/ipv4/netfilter/iptable_filter.c | 1 + + net/ipv4/ping.c | 1 + + net/ipv4/proc.c | 1 + + net/ipv4/raw.c | 1 + + net/ipv4/route.c | 31 +- + net/ipv4/sysctl_net_ipv4.c | 1 + + net/ipv4/tcp.c | 57 +- + net/ipv4/tcp_input.c | 7 +- + net/ipv4/tcp_ipv4.c | 28 +- + net/ipv4/tcp_metrics.c | 1 + + net/ipv4/tcp_minisocks.c | 3 +- + net/ipv4/tcp_output.c | 40 +- + net/ipv4/udp.c | 1 + + net/ipv4/udplite.c | 1 + + net/ipv4/xfrm4_policy.c | 2 +- + net/ipv6/addrconf.c | 2 + + net/ipv6/addrlabel.c | 1 + + net/ipv6/af_inet6.c | 6 +- + net/ipv6/fib6_rules.c | 1 + + net/ipv6/icmp.c | 1 + + net/ipv6/ip6_fib.c | 1 + + net/ipv6/ip6_flowlabel.c | 1 + + net/ipv6/ip6mr.c | 1 + + net/ipv6/mcast.c | 1 + + net/ipv6/ndisc.c | 1 + + net/ipv6/ping.c | 1 + + net/ipv6/proc.c | 1 + + net/ipv6/raw.c | 1 + + net/ipv6/reassembly.c | 1 + + net/ipv6/route.c | 12 +- + net/ipv6/seg6.c | 1 + + net/ipv6/sysctl_net_ipv6.c | 1 + + net/ipv6/tcp_ipv6.c | 14 +- + net/ipv6/udplite.c | 1 + + net/ipv6/xfrm6_policy.c | 1 + + net/iucv/af_iucv.c | 5 +- + net/kcm/kcmsock.c | 1 + + net/l2tp/l2tp_ip.c | 5 +- + net/l2tp/l2tp_ip6.c | 5 +- + net/l2tp/l2tp_ppp.c | 5 +- + net/llc/af_llc.c | 5 +- + net/mac80211/debugfs.c | 1 + + net/mac80211/debugfs_sta.c | 10 +- + net/mac80211/iface.c | 3 +- + net/mac80211/michael.c | 2 +- + net/mac80211/mlme.c | 18 +- + net/mac80211/rc80211_minstrel_ht.c | 2 +- + net/mac80211/rx.c | 24 +- + net/mac80211/sta_info.c | 6 + + net/mac80211/sta_info.h | 2 + + net/mac80211/status.c | 11 +- + net/mac80211/tx.c | 11 +- + net/mac80211/vht.c | 9 + + net/mac80211/wpa.c | 8 +- + net/netfilter/core.c | 1 + + net/netfilter/nf_log.c | 1 + + net/netfilter/x_tables.c | 1 + + net/netlink/af_netlink.c | 7 +- + net/netlink/genetlink.c | 1 + + net/netrom/af_netrom.c | 9 +- + net/nfc/llcp_sock.c | 5 +- + net/packet/af_packet.c | 11 +- + net/phonet/socket.c | 5 +- + net/qrtr/qrtr.c | 5 +- + net/rds/af_rds.c | 7 +- + net/rds/message.c | 132 ++- + net/rds/rds.h | 17 +- + net/rds/recv.c | 2 + + net/rds/send.c | 53 +- + net/rds/tcp.c | 7 +- + net/rose/af_rose.c | 5 +- + net/sched/Kconfig | 12 + + net/sched/Makefile | 1 + + net/sched/act_api.c | 140 ++- + net/sched/act_bpf.c | 10 +- + net/sched/act_connmark.c | 11 +- + net/sched/act_csum.c | 10 +- + net/sched/act_gact.c | 10 +- + net/sched/act_ife.c | 10 +- + net/sched/act_ipt.c | 20 +- + net/sched/act_mirred.c | 25 +- + net/sched/act_nat.c | 11 +- + net/sched/act_pedit.c | 10 +- + net/sched/act_police.c | 11 +- + net/sched/act_sample.c | 10 +- + net/sched/act_simple.c | 10 +- + net/sched/act_skbedit.c | 10 +- + net/sched/act_skbmod.c | 10 +- + net/sched/act_tunnel_key.c | 10 +- + net/sched/act_vlan.c | 10 +- + net/sched/cls_api.c | 4 +- + net/sched/em_ipt.c | 257 +++++ + net/sched/sch_api.c | 1 + + net/sctp/Makefile | 2 + + net/sctp/{sctp_diag.c => diag.c} | 31 + + net/sctp/ipv6.c | 8 +- + net/smc/af_smc.c | 11 +- + net/socket.c | 39 +- + net/sunrpc/clnt.c | 6 +- + net/sunrpc/svcsock.c | 13 +- + net/sunrpc/xprtsock.c | 3 +- + net/sysctl_net.c | 1 + + net/tipc/Makefile | 2 +- + net/tipc/bearer.c | 8 +- + net/tipc/core.h | 6 +- + net/tipc/group.c | 2 +- + net/tipc/link.c | 3 +- + net/tipc/name_table.c | 73 +- + net/tipc/name_table.h | 2 +- + net/tipc/node.c | 24 + + net/tipc/node.h | 1 + + net/tipc/server.c | 710 -------------- + net/tipc/socket.c | 5 +- + net/tipc/subscr.c | 361 ++----- + net/tipc/subscr.h | 66 +- + net/tipc/topsrv.c | 703 ++++++++++++++ + net/tipc/{server.h => topsrv.h} | 57 +- + net/unix/af_unix.c | 11 +- + net/vmw_vsock/af_vsock.c | 4 +- + net/wireless/core.c | 1 + + net/wireless/nl80211.c | 203 +++- + net/wireless/rdev-ops.h | 15 + + net/wireless/trace.h | 23 + + net/wireless/wext-core.c | 1 + + net/x25/af_x25.c | 4 +- + net/x25/x25_subr.c | 3 +- + net/xfrm/xfrm_policy.c | 1 + + security/tomoyo/network.c | 5 +- + tools/testing/selftests/net/fib-onlink-tests.sh | 375 ++++++++ + tools/testing/selftests/net/fib_tests.sh | 483 +++++----- + tools/testing/selftests/net/msg_zerocopy.c | 133 ++- + tools/testing/selftests/net/psock_fanout.c | 3 +- + tools/testing/selftests/tc-testing/README | 173 +++- + tools/testing/selftests/tc-testing/TODO.txt | 25 +- + tools/testing/selftests/tc-testing/TdcPlugin.py | 74 ++ + .../tc-testing/creating-plugins/AddingPlugins.txt | 104 ++ + .../creating-testcases/AddingTestCases.txt | 35 +- + .../selftests/tc-testing/plugin-lib/README-PLUGINS | 27 + + .../selftests/tc-testing/plugin-lib/nsPlugin.py | 141 +++ + .../selftests/tc-testing/plugin-lib/rootPlugin.py | 19 + + .../tc-testing/plugin-lib/valgrindPlugin.py | 142 +++ + .../selftests/tc-testing/plugins/__init__.py | 0 + tools/testing/selftests/tc-testing/tdc.py | 486 ++++++---- + tools/testing/selftests/tc-testing/tdc_helper.py | 15 +- + 340 files changed, 11883 insertions(+), 4467 deletions(-) + create mode 100644 drivers/net/dsa/mv88e6xxx/global2_avb.c + create mode 100644 drivers/net/dsa/mv88e6xxx/global2_scratch.c + create mode 100644 drivers/net/dsa/mv88e6xxx/hwtstamp.c + create mode 100644 drivers/net/dsa/mv88e6xxx/hwtstamp.h + create mode 100644 drivers/net/dsa/mv88e6xxx/ptp.c + create mode 100644 drivers/net/dsa/mv88e6xxx/ptp.h + create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl/Makefile + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_span.h + create mode 100644 drivers/net/ethernet/netronome/nfp/bpf/Makefile + create mode 100644 drivers/net/ethernet/netronome/nfp/flower/Makefile + create mode 100644 drivers/net/ethernet/netronome/nfp/nfpcore/Makefile + create mode 100644 drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000/Makefile + create mode 100644 drivers/net/ethernet/netronome/nfp/nic/Makefile + create mode 100644 include/uapi/linux/tc_ematch/tc_em_ipt.h + create mode 100644 net/sched/em_ipt.c + rename net/sctp/{sctp_diag.c => diag.c} (92%) + delete mode 100644 net/tipc/server.c + create mode 100644 net/tipc/topsrv.c + rename net/tipc/{server.h => topsrv.h} (55%) + create mode 100755 tools/testing/selftests/net/fib-onlink-tests.sh + create mode 100644 tools/testing/selftests/tc-testing/TdcPlugin.py + create mode 100644 tools/testing/selftests/tc-testing/creating-plugins/AddingPlugins.txt + create mode 100644 tools/testing/selftests/tc-testing/plugin-lib/README-PLUGINS + create mode 100644 tools/testing/selftests/tc-testing/plugin-lib/nsPlugin.py + create mode 100644 tools/testing/selftests/tc-testing/plugin-lib/rootPlugin.py + create mode 100644 tools/testing/selftests/tc-testing/plugin-lib/valgrindPlugin.py + create mode 100644 tools/testing/selftests/tc-testing/plugins/__init__.py +Merging bpf-next/master (0b6b8a3dd86d Merge branch 'bpf-misc-selftest-improvements') +$ git merge bpf-next/master +Merge made by the 'recursive' strategy. + include/linux/filter.h | 2 +- + kernel/bpf/verifier.c | 4 --- + samples/bpf/xdp_redirect_user.c | 7 +++++ + samples/sockmap/Makefile | 2 +- + samples/sockmap/sockmap_user.c | 1 + + tools/testing/selftests/bpf/Makefile | 4 ++- + tools/testing/selftests/bpf/test_tcpbpf_user.c | 6 ++++ + tools/testing/selftests/bpf/test_verifier.c | 39 ++++++++++++++++++++++---- + 8 files changed, 53 insertions(+), 12 deletions(-) +Merging ipsec-next/master (60aa80460da1 esp4: remove redundant initialization of pointer esph) +$ git merge ipsec-next/master +Merge made by the 'recursive' strategy. + net/ipv4/esp4.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging netfilter-next/master (c746fc0e8b2d cxgb4: add geneve offload support for T6) +$ git merge netfilter-next/master +Already up to date. +Merging nfc-next/master (4d63adfe12dd NFC: Add NFC_CMD_DEACTIVATE_TARGET support) +$ 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 (cf19e5e2054f Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue) +$ git merge wireless-drivers-next/master +Already up to date. +Merging bluetooth/master (1ec010e70593 tun: export flags, uid, gid, queue information over netlink) +$ git merge bluetooth/master +Already up to date. +Merging mac80211-next/master (94ba92713f83 mac80211: Call mgd_prep_tx before transmitting deauthentication) +$ git merge mac80211-next/master +Already up to date. +Merging rdma/for-next (3a148896b24a IB/srp: Fix completion vector assignment algorithm) +$ git merge rdma/for-next +Removing drivers/infiniband/hw/cxgb3/cxio_dbg.c +Merge made by the 'recursive' strategy. + drivers/infiniband/hw/cxgb3/Kconfig | 9 -- + drivers/infiniband/hw/cxgb3/Makefile | 2 - + drivers/infiniband/hw/cxgb3/cxio_dbg.c | 206 ----------------------------- + drivers/infiniband/hw/cxgb3/cxio_hal.h | 9 -- + drivers/infiniband/hw/cxgb3/iwch_cq.c | 6 - + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 8 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 10 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 3 +- + drivers/infiniband/hw/hns/hns_roce_mr.c | 2 +- + drivers/infiniband/sw/rxe/rxe_av.c | 5 +- + drivers/infiniband/ulp/srp/ib_srp.c | 10 +- + include/uapi/rdma/hfi/hfi1_user.h | 6 +- + include/uapi/rdma/ocrdma-abi.h | 2 +- + include/uapi/rdma/rdma_user_rxe.h | 4 +- + 14 files changed, 26 insertions(+), 256 deletions(-) + delete mode 100644 drivers/infiniband/hw/cxgb3/cxio_dbg.c +Merging gfs2/for-next (3fc7c7e1cfaa gfs2: Fix fallocate chunk size) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/file.c | 5 +++-- + fs/gfs2/quota.h | 2 ++ + 2 files changed, 5 insertions(+), 2 deletions(-) +Merging mtd/master (f23def803861 mtd: nand: MTD_NAND_MARVELL should depend on HAS_DMA) +$ git merge mtd/master +Already up to date. +Merging l2-mtd/mtd/next (0dbe4ea78d69 mtd: get rid of the mtd_add_device_partitions()) +$ git merge l2-mtd/mtd/next +Merge made by the 'recursive' strategy. + drivers/mtd/mtdcore.c | 62 ++++++++++++++++++++------------------------------- + 1 file changed, 24 insertions(+), 38 deletions(-) +Merging nand/nand/next (d8757f4c59c9 Update Boris Brezillon email address) +$ git merge nand/nand/next +Resolved 'drivers/mtd/nand/Kconfig' using previous resolution. +Auto-merging drivers/mtd/nand/raw/vf610_nfc.c +Auto-merging drivers/mtd/nand/raw/socrates_nand.c +Auto-merging drivers/mtd/nand/raw/sharpsl.c +Auto-merging drivers/mtd/nand/raw/s3c2410.c +Auto-merging drivers/mtd/nand/raw/pxa3xx_nand.c +Auto-merging drivers/mtd/nand/raw/orion_nand.c +Auto-merging drivers/mtd/nand/raw/nand_toshiba.c +Auto-merging drivers/mtd/nand/raw/nand_ecc.c +Auto-merging drivers/mtd/nand/raw/mxc_nand.c +Auto-merging drivers/mtd/nand/raw/mpc5121_nfc.c +Auto-merging drivers/mtd/nand/raw/marvell_nand.c +Auto-merging drivers/mtd/nand/raw/gpio.c +Auto-merging drivers/mtd/nand/raw/fsmc_nand.c +Auto-merging drivers/mtd/nand/raw/diskonchip.c +Auto-merging drivers/mtd/nand/raw/cs553x_nand.c +Auto-merging drivers/mtd/nand/raw/cmx270_nand.c +Auto-merging drivers/mtd/nand/raw/bf5xx_nand.c +Auto-merging drivers/mtd/nand/raw/au1550nd.c +Auto-merging drivers/mtd/nand/raw/atmel/pmecc.h +Auto-merging drivers/mtd/nand/raw/atmel/pmecc.c +Auto-merging drivers/mtd/nand/raw/atmel/nand-controller.c +Auto-merging drivers/mtd/nand/raw/ams-delta.c +Auto-merging drivers/mtd/nand/Kconfig +CONFLICT (content): Merge conflict in drivers/mtd/nand/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3d80ce1bc055] Merge remote-tracking branch 'nand/nand/next' +$ git diff -M --stat --summary HEAD^.. + .mailmap | 7 +- + Documentation/arm/Samsung-S3C24XX/S3C2412.txt | 2 +- + Documentation/driver-api/mtdnand.rst | 8 +- + Documentation/gpio/drivers-on-gpio.txt | 4 +- + MAINTAINERS | 34 +- + arch/cris/arch-v32/drivers/mach-a3/nandflash.c | 2 +- + arch/cris/arch-v32/drivers/mach-fs/nandflash.c | 2 +- + drivers/mtd/nand/Kconfig | 580 +--------------- + drivers/mtd/nand/Makefile | 71 +- + drivers/mtd/nand/bbt.c | 130 ++++ + drivers/mtd/nand/core.c | 244 +++++++ + drivers/mtd/nand/raw/Kconfig | 580 ++++++++++++++++ + drivers/mtd/nand/raw/Makefile | 68 ++ + drivers/mtd/nand/{ => raw}/ams-delta.c | 9 +- + drivers/mtd/nand/{ => raw}/atmel/Makefile | 0 + drivers/mtd/nand/{ => raw}/atmel/nand-controller.c | 4 +- + drivers/mtd/nand/{ => raw}/atmel/pmecc.c | 4 +- + drivers/mtd/nand/{ => raw}/atmel/pmecc.h | 4 +- + drivers/mtd/nand/{ => raw}/au1550nd.c | 2 - + drivers/mtd/nand/{ => raw}/bcm47xxnflash/Makefile | 0 + .../nand/{ => raw}/bcm47xxnflash/bcm47xxnflash.h | 0 + drivers/mtd/nand/{ => raw}/bcm47xxnflash/main.c | 0 + .../mtd/nand/{ => raw}/bcm47xxnflash/ops_bcm4706.c | 0 + drivers/mtd/nand/{ => raw}/bf5xx_nand.c | 7 +- + drivers/mtd/nand/{ => raw}/brcmnand/Makefile | 0 + .../mtd/nand/{ => raw}/brcmnand/bcm63138_nand.c | 0 + drivers/mtd/nand/{ => raw}/brcmnand/bcm6368_nand.c | 0 + drivers/mtd/nand/{ => raw}/brcmnand/brcmnand.c | 0 + drivers/mtd/nand/{ => raw}/brcmnand/brcmnand.h | 0 + drivers/mtd/nand/{ => raw}/brcmnand/brcmstb_nand.c | 0 + drivers/mtd/nand/{ => raw}/brcmnand/iproc_nand.c | 0 + drivers/mtd/nand/{ => raw}/cafe_nand.c | 0 + drivers/mtd/nand/{ => raw}/cmx270_nand.c | 4 +- + drivers/mtd/nand/{ => raw}/cs553x_nand.c | 2 - + drivers/mtd/nand/{ => raw}/davinci_nand.c | 0 + drivers/mtd/nand/{ => raw}/denali.c | 0 + drivers/mtd/nand/{ => raw}/denali.h | 0 + drivers/mtd/nand/{ => raw}/denali_dt.c | 0 + drivers/mtd/nand/{ => raw}/denali_pci.c | 0 + drivers/mtd/nand/{ => raw}/diskonchip.c | 2 - + drivers/mtd/nand/{ => raw}/docg4.c | 0 + drivers/mtd/nand/{ => raw}/fsl_elbc_nand.c | 0 + drivers/mtd/nand/{ => raw}/fsl_ifc_nand.c | 0 + drivers/mtd/nand/{ => raw}/fsl_upm.c | 0 + drivers/mtd/nand/{ => raw}/fsmc_nand.c | 252 +++---- + drivers/mtd/nand/{ => raw}/gpio.c | 2 - + drivers/mtd/nand/{ => raw}/gpmi-nand/Makefile | 0 + drivers/mtd/nand/{ => raw}/gpmi-nand/bch-regs.h | 0 + drivers/mtd/nand/{ => raw}/gpmi-nand/gpmi-lib.c | 0 + drivers/mtd/nand/{ => raw}/gpmi-nand/gpmi-nand.c | 0 + drivers/mtd/nand/{ => raw}/gpmi-nand/gpmi-nand.h | 0 + drivers/mtd/nand/{ => raw}/gpmi-nand/gpmi-regs.h | 0 + drivers/mtd/nand/{ => raw}/hisi504_nand.c | 0 + drivers/mtd/nand/{ => raw}/jz4740_nand.c | 0 + drivers/mtd/nand/{ => raw}/jz4780_bch.c | 0 + drivers/mtd/nand/{ => raw}/jz4780_bch.h | 0 + drivers/mtd/nand/{ => raw}/jz4780_nand.c | 0 + drivers/mtd/nand/{ => raw}/lpc32xx_mlc.c | 0 + drivers/mtd/nand/{ => raw}/lpc32xx_slc.c | 0 + drivers/mtd/nand/{ => raw}/marvell_nand.c | 39 +- + drivers/mtd/nand/{ => raw}/mpc5121_nfc.c | 5 +- + drivers/mtd/nand/{ => raw}/mtk_ecc.c | 0 + drivers/mtd/nand/{ => raw}/mtk_ecc.h | 0 + drivers/mtd/nand/{ => raw}/mtk_nand.c | 0 + drivers/mtd/nand/{ => raw}/mxc_nand.c | 509 ++++++++------ + drivers/mtd/nand/{ => raw}/nand_amd.c | 0 + drivers/mtd/nand/{ => raw}/nand_base.c | 0 + drivers/mtd/nand/{ => raw}/nand_bbt.c | 0 + drivers/mtd/nand/{ => raw}/nand_bch.c | 0 + drivers/mtd/nand/{ => raw}/nand_ecc.c | 2 - + drivers/mtd/nand/{ => raw}/nand_hynix.c | 0 + drivers/mtd/nand/{ => raw}/nand_ids.c | 0 + drivers/mtd/nand/{ => raw}/nand_macronix.c | 0 + drivers/mtd/nand/{ => raw}/nand_micron.c | 0 + drivers/mtd/nand/{ => raw}/nand_samsung.c | 0 + drivers/mtd/nand/{ => raw}/nand_timings.c | 0 + drivers/mtd/nand/{ => raw}/nand_toshiba.c | 26 + + drivers/mtd/nand/{ => raw}/nandsim.c | 0 + drivers/mtd/nand/{ => raw}/ndfc.c | 0 + drivers/mtd/nand/{ => raw}/nuc900_nand.c | 0 + drivers/mtd/nand/{ => raw}/omap2.c | 0 + drivers/mtd/nand/{ => raw}/omap_elm.c | 0 + drivers/mtd/nand/{ => raw}/orion_nand.c | 2 - + drivers/mtd/nand/{ => raw}/oxnas_nand.c | 0 + drivers/mtd/nand/{ => raw}/pasemi_nand.c | 0 + drivers/mtd/nand/{ => raw}/plat_nand.c | 0 + drivers/mtd/nand/{ => raw}/pxa3xx_nand.c | 2 - + drivers/mtd/nand/{ => raw}/qcom_nandc.c | 0 + drivers/mtd/nand/{ => raw}/r852.c | 0 + drivers/mtd/nand/{ => raw}/r852.h | 0 + drivers/mtd/nand/{ => raw}/s3c2410.c | 3 +- + drivers/mtd/nand/{ => raw}/sh_flctl.c | 0 + drivers/mtd/nand/{ => raw}/sharpsl.c | 2 - + drivers/mtd/nand/{ => raw}/sm_common.c | 0 + drivers/mtd/nand/{ => raw}/sm_common.h | 0 + drivers/mtd/nand/{ => raw}/socrates_nand.c | 2 - + drivers/mtd/nand/{ => raw}/sunxi_nand.c | 0 + drivers/mtd/nand/{ => raw}/tango_nand.c | 0 + drivers/mtd/nand/{ => raw}/tmio_nand.c | 0 + drivers/mtd/nand/{ => raw}/txx9ndfmc.c | 0 + drivers/mtd/nand/{ => raw}/vf610_nfc.c | 44 +- + drivers/mtd/nand/{ => raw}/xway_nand.c | 0 + drivers/mtd/sm_ftl.c | 2 +- + include/linux/mtd/bbm.h | 2 - + include/linux/mtd/nand.h | 731 +++++++++++++++++++++ + include/linux/mtd/nand_ecc.h | 2 - + include/linux/mtd/ndfc.h | 2 - + 107 files changed, 2331 insertions(+), 1068 deletions(-) + create mode 100644 drivers/mtd/nand/bbt.c + create mode 100644 drivers/mtd/nand/core.c + create mode 100644 drivers/mtd/nand/raw/Kconfig + create mode 100644 drivers/mtd/nand/raw/Makefile + rename drivers/mtd/nand/{ => raw}/ams-delta.c (97%) + rename drivers/mtd/nand/{ => raw}/atmel/Makefile (100%) + rename drivers/mtd/nand/{ => raw}/atmel/nand-controller.c (99%) + rename drivers/mtd/nand/{ => raw}/atmel/pmecc.c (99%) + rename drivers/mtd/nand/{ => raw}/atmel/pmecc.h (94%) + rename drivers/mtd/nand/{ => raw}/au1550nd.c (99%) + rename drivers/mtd/nand/{ => raw}/bcm47xxnflash/Makefile (100%) + rename drivers/mtd/nand/{ => raw}/bcm47xxnflash/bcm47xxnflash.h (100%) + rename drivers/mtd/nand/{ => raw}/bcm47xxnflash/main.c (100%) + rename drivers/mtd/nand/{ => raw}/bcm47xxnflash/ops_bcm4706.c (100%) + rename drivers/mtd/nand/{ => raw}/bf5xx_nand.c (99%) + rename drivers/mtd/nand/{ => raw}/brcmnand/Makefile (100%) + rename drivers/mtd/nand/{ => raw}/brcmnand/bcm63138_nand.c (100%) + rename drivers/mtd/nand/{ => raw}/brcmnand/bcm6368_nand.c (100%) + rename drivers/mtd/nand/{ => raw}/brcmnand/brcmnand.c (100%) + rename drivers/mtd/nand/{ => raw}/brcmnand/brcmnand.h (100%) + rename drivers/mtd/nand/{ => raw}/brcmnand/brcmstb_nand.c (100%) + rename drivers/mtd/nand/{ => raw}/brcmnand/iproc_nand.c (100%) + rename drivers/mtd/nand/{ => raw}/cafe_nand.c (100%) + rename drivers/mtd/nand/{ => raw}/cmx270_nand.c (98%) + rename drivers/mtd/nand/{ => raw}/cs553x_nand.c (99%) + rename drivers/mtd/nand/{ => raw}/davinci_nand.c (100%) + rename drivers/mtd/nand/{ => raw}/denali.c (100%) + rename drivers/mtd/nand/{ => raw}/denali.h (100%) + rename drivers/mtd/nand/{ => raw}/denali_dt.c (100%) + rename drivers/mtd/nand/{ => raw}/denali_pci.c (100%) + rename drivers/mtd/nand/{ => raw}/diskonchip.c (99%) + rename drivers/mtd/nand/{ => raw}/docg4.c (100%) + rename drivers/mtd/nand/{ => raw}/fsl_elbc_nand.c (100%) + rename drivers/mtd/nand/{ => raw}/fsl_ifc_nand.c (100%) + rename drivers/mtd/nand/{ => raw}/fsl_upm.c (100%) + rename drivers/mtd/nand/{ => raw}/fsmc_nand.c (86%) + rename drivers/mtd/nand/{ => raw}/gpio.c (99%) + rename drivers/mtd/nand/{ => raw}/gpmi-nand/Makefile (100%) + rename drivers/mtd/nand/{ => raw}/gpmi-nand/bch-regs.h (100%) + rename drivers/mtd/nand/{ => raw}/gpmi-nand/gpmi-lib.c (100%) + rename drivers/mtd/nand/{ => raw}/gpmi-nand/gpmi-nand.c (100%) + rename drivers/mtd/nand/{ => raw}/gpmi-nand/gpmi-nand.h (100%) + rename drivers/mtd/nand/{ => raw}/gpmi-nand/gpmi-regs.h (100%) + rename drivers/mtd/nand/{ => raw}/hisi504_nand.c (100%) + rename drivers/mtd/nand/{ => raw}/jz4740_nand.c (100%) + rename drivers/mtd/nand/{ => raw}/jz4780_bch.c (100%) + rename drivers/mtd/nand/{ => raw}/jz4780_bch.h (100%) + rename drivers/mtd/nand/{ => raw}/jz4780_nand.c (100%) + rename drivers/mtd/nand/{ => raw}/lpc32xx_mlc.c (100%) + rename drivers/mtd/nand/{ => raw}/lpc32xx_slc.c (100%) + rename drivers/mtd/nand/{ => raw}/marvell_nand.c (99%) + rename drivers/mtd/nand/{ => raw}/mpc5121_nfc.c (99%) + rename drivers/mtd/nand/{ => raw}/mtk_ecc.c (100%) + rename drivers/mtd/nand/{ => raw}/mtk_ecc.h (100%) + rename drivers/mtd/nand/{ => raw}/mtk_nand.c (100%) + rename drivers/mtd/nand/{ => raw}/mxc_nand.c (88%) + rename drivers/mtd/nand/{ => raw}/nand_amd.c (100%) + rename drivers/mtd/nand/{ => raw}/nand_base.c (100%) + rename drivers/mtd/nand/{ => raw}/nand_bbt.c (100%) + rename drivers/mtd/nand/{ => raw}/nand_bch.c (100%) + rename drivers/mtd/nand/{ => raw}/nand_ecc.c (99%) + rename drivers/mtd/nand/{ => raw}/nand_hynix.c (100%) + rename drivers/mtd/nand/{ => raw}/nand_ids.c (100%) + rename drivers/mtd/nand/{ => raw}/nand_macronix.c (100%) + rename drivers/mtd/nand/{ => raw}/nand_micron.c (100%) + rename drivers/mtd/nand/{ => raw}/nand_samsung.c (100%) + rename drivers/mtd/nand/{ => raw}/nand_timings.c (100%) + rename drivers/mtd/nand/{ => raw}/nand_toshiba.c (71%) + rename drivers/mtd/nand/{ => raw}/nandsim.c (100%) + rename drivers/mtd/nand/{ => raw}/ndfc.c (100%) + rename drivers/mtd/nand/{ => raw}/nuc900_nand.c (100%) + rename drivers/mtd/nand/{ => raw}/omap2.c (100%) + rename drivers/mtd/nand/{ => raw}/omap_elm.c (100%) + rename drivers/mtd/nand/{ => raw}/orion_nand.c (99%) + rename drivers/mtd/nand/{ => raw}/oxnas_nand.c (100%) + rename drivers/mtd/nand/{ => raw}/pasemi_nand.c (100%) + rename drivers/mtd/nand/{ => raw}/plat_nand.c (100%) + rename drivers/mtd/nand/{ => raw}/pxa3xx_nand.c (99%) + rename drivers/mtd/nand/{ => raw}/qcom_nandc.c (100%) + rename drivers/mtd/nand/{ => raw}/r852.c (100%) + rename drivers/mtd/nand/{ => raw}/r852.h (100%) + rename drivers/mtd/nand/{ => raw}/s3c2410.c (99%) + rename drivers/mtd/nand/{ => raw}/sh_flctl.c (100%) + rename drivers/mtd/nand/{ => raw}/sharpsl.c (99%) + rename drivers/mtd/nand/{ => raw}/sm_common.c (100%) + rename drivers/mtd/nand/{ => raw}/sm_common.h (100%) + rename drivers/mtd/nand/{ => raw}/socrates_nand.c (99%) + rename drivers/mtd/nand/{ => raw}/sunxi_nand.c (100%) + rename drivers/mtd/nand/{ => raw}/tango_nand.c (100%) + rename drivers/mtd/nand/{ => raw}/tmio_nand.c (100%) + rename drivers/mtd/nand/{ => raw}/txx9ndfmc.c (100%) + rename drivers/mtd/nand/{ => raw}/vf610_nfc.c (97%) + rename drivers/mtd/nand/{ => raw}/xway_nand.c (100%) + create mode 100644 include/linux/mtd/nand.h +$ git am -3 ../patches/0001-mtd-nand-fix-up-for-raw-Kconfig-move.patch +Applying: mtd: nand: fix up for raw Kconfig move +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/mtd/nand/raw/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master 14518d861b7c] Merge remote-tracking branch 'nand/nand/next' + Date: Fri Feb 23 10:58:48 2018 +1100 +Merging spi-nor/spi-nor/next (7928b2cbe55b Linux 4.16-rc1) +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (017457061e07 crypto: ccree - fix memdup.cocci warnings) +$ git merge crypto/master +Auto-merging crypto/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/crypto/crypto_engine.rst | 48 + + MAINTAINERS | 15 +- + arch/arm/crypto/Kconfig | 6 + + arch/arm/crypto/Makefile | 2 + + arch/arm/crypto/aes-cipher-core.S | 19 +- + arch/arm/crypto/speck-neon-core.S | 432 ++++ + arch/arm/crypto/speck-neon-glue.c | 288 +++ + arch/x86/crypto/aesni-intel_asm.S | 1414 ++++++------- + arch/x86/crypto/aesni-intel_glue.c | 230 +- + arch/x86/crypto/sha1-mb/sha1_mb.c | 28 +- + arch/x86/crypto/sha1-mb/sha1_mb_ctx.h | 8 +- + arch/x86/crypto/sha256-mb/sha256_mb.c | 27 +- + arch/x86/crypto/sha256-mb/sha256_mb_ctx.h | 8 +- + arch/x86/crypto/sha512-mb/sha512_mb.c | 30 +- + arch/x86/crypto/sha512-mb/sha512_mb_ctx.h | 8 +- + crypto/Kconfig | 14 + + crypto/Makefile | 1 + + crypto/ahash.c | 18 +- + crypto/crypto_engine.c | 301 +-- + crypto/crypto_user.c | 2 +- + crypto/mcryptd.c | 34 +- + crypto/rsa-pkcs1pad.c | 2 +- + crypto/speck.c | 307 +++ + crypto/testmgr.c | 36 + + crypto/testmgr.h | 1492 ++++++++++++- + drivers/char/hw_random/bcm2835-rng.c | 2 + + drivers/char/hw_random/imx-rngc.c | 2 +- + drivers/crypto/Kconfig | 27 + + drivers/crypto/Makefile | 1 + + drivers/crypto/atmel-aes.c | 6 +- + drivers/crypto/atmel-sha.c | 9 +- + drivers/crypto/atmel-tdes.c | 9 +- + drivers/crypto/bcm/util.c | 1 - + drivers/crypto/bfin_crc.c | 16 +- + drivers/crypto/caam/caamalg.c | 19 +- + drivers/crypto/caam/caamalg_desc.c | 165 +- + drivers/crypto/caam/caamalg_desc.h | 24 +- + drivers/crypto/caam/caamalg_qi.c | 386 +++- + drivers/crypto/caam/qi.c | 11 +- + drivers/crypto/ccp/ccp-dmaengine.c | 2 +- + drivers/crypto/ccree/Makefile | 7 + + drivers/crypto/ccree/cc_aead.c | 2702 ++++++++++++++++++++++++ + drivers/crypto/ccree/cc_aead.h | 109 + + drivers/crypto/ccree/cc_buffer_mgr.c | 1651 +++++++++++++++ + drivers/crypto/ccree/cc_buffer_mgr.h | 71 + + drivers/crypto/ccree/cc_cipher.c | 1129 ++++++++++ + drivers/crypto/ccree/cc_cipher.h | 59 + + drivers/crypto/ccree/cc_crypto_ctx.h | 169 ++ + drivers/crypto/ccree/cc_debugfs.c | 101 + + drivers/crypto/ccree/cc_debugfs.h | 32 + + drivers/crypto/ccree/cc_driver.c | 476 +++++ + drivers/crypto/ccree/cc_driver.h | 193 ++ + drivers/crypto/ccree/cc_fips.c | 111 + + drivers/crypto/ccree/cc_fips.h | 36 + + drivers/crypto/ccree/cc_hash.c | 2295 ++++++++++++++++++++ + drivers/crypto/ccree/cc_hash.h | 113 + + drivers/crypto/ccree/cc_host_regs.h | 142 ++ + drivers/crypto/ccree/cc_hw_queue_defs.h | 590 ++++++ + drivers/crypto/ccree/cc_ivgen.c | 279 +++ + drivers/crypto/ccree/cc_ivgen.h | 55 + + drivers/crypto/ccree/cc_kernel_regs.h | 167 ++ + drivers/crypto/ccree/cc_lli_defs.h | 59 + + drivers/crypto/ccree/cc_pm.c | 122 ++ + drivers/crypto/ccree/cc_pm.h | 56 + + drivers/crypto/ccree/cc_request_mgr.c | 712 +++++++ + drivers/crypto/ccree/cc_request_mgr.h | 51 + + drivers/crypto/ccree/cc_sram_mgr.c | 106 + + drivers/crypto/ccree/cc_sram_mgr.h | 65 + + drivers/crypto/chelsio/chcr_algo.c | 8 +- + drivers/crypto/inside-secure/safexcel.c | 40 +- + drivers/crypto/inside-secure/safexcel.h | 6 +- + drivers/crypto/inside-secure/safexcel_cipher.c | 2 +- + drivers/crypto/inside-secure/safexcel_hash.c | 10 +- + drivers/crypto/mxs-dcp.c | 14 + + drivers/crypto/n2_core.c | 12 + + drivers/crypto/nx/nx-842-pseries.c | 5 +- + drivers/crypto/omap-aes.c | 21 +- + drivers/crypto/omap-aes.h | 3 + + drivers/crypto/omap-des.c | 24 +- + drivers/crypto/qat/qat_common/qat_asym_algs.c | 9 +- + drivers/crypto/sahara.c | 6 +- + drivers/crypto/stm32/stm32-cryp.c | 964 ++++++++- + drivers/crypto/stm32/stm32-hash.c | 41 +- + drivers/crypto/sunxi-ss/sun4i-ss-core.c | 1 + + drivers/crypto/ux500/cryp/cryp_core.c | 14 +- + drivers/crypto/ux500/hash/hash_core.c | 18 + + drivers/crypto/virtio/virtio_crypto_algs.c | 16 +- + drivers/crypto/virtio/virtio_crypto_common.h | 3 +- + drivers/crypto/virtio/virtio_crypto_core.c | 3 - + drivers/staging/ccree/Kconfig | 4 +- + drivers/staging/ccree/Makefile | 2 +- + include/crypto/engine.h | 68 +- + include/crypto/internal/hash.h | 5 - + include/crypto/speck.h | 62 + + 94 files changed, 17219 insertions(+), 1250 deletions(-) + create mode 100644 Documentation/crypto/crypto_engine.rst + create mode 100644 arch/arm/crypto/speck-neon-core.S + create mode 100644 arch/arm/crypto/speck-neon-glue.c + create mode 100644 crypto/speck.c + create mode 100644 drivers/crypto/ccree/Makefile + create mode 100644 drivers/crypto/ccree/cc_aead.c + create mode 100644 drivers/crypto/ccree/cc_aead.h + create mode 100644 drivers/crypto/ccree/cc_buffer_mgr.c + create mode 100644 drivers/crypto/ccree/cc_buffer_mgr.h + create mode 100644 drivers/crypto/ccree/cc_cipher.c + create mode 100644 drivers/crypto/ccree/cc_cipher.h + create mode 100644 drivers/crypto/ccree/cc_crypto_ctx.h + create mode 100644 drivers/crypto/ccree/cc_debugfs.c + create mode 100644 drivers/crypto/ccree/cc_debugfs.h + create mode 100644 drivers/crypto/ccree/cc_driver.c + create mode 100644 drivers/crypto/ccree/cc_driver.h + create mode 100644 drivers/crypto/ccree/cc_fips.c + create mode 100644 drivers/crypto/ccree/cc_fips.h + create mode 100644 drivers/crypto/ccree/cc_hash.c + create mode 100644 drivers/crypto/ccree/cc_hash.h + create mode 100644 drivers/crypto/ccree/cc_host_regs.h + create mode 100644 drivers/crypto/ccree/cc_hw_queue_defs.h + create mode 100644 drivers/crypto/ccree/cc_ivgen.c + create mode 100644 drivers/crypto/ccree/cc_ivgen.h + create mode 100644 drivers/crypto/ccree/cc_kernel_regs.h + create mode 100644 drivers/crypto/ccree/cc_lli_defs.h + create mode 100644 drivers/crypto/ccree/cc_pm.c + create mode 100644 drivers/crypto/ccree/cc_pm.h + create mode 100644 drivers/crypto/ccree/cc_request_mgr.c + create mode 100644 drivers/crypto/ccree/cc_request_mgr.h + create mode 100644 drivers/crypto/ccree/cc_sram_mgr.c + create mode 100644 drivers/crypto/ccree/cc_sram_mgr.h + create mode 100644 include/crypto/speck.h +Merging drm/drm-next (e53a2079f46a Merge branch 'drm/next/du' of git://linuxtv.org/pinchartl/media into drm-next) +$ git merge drm/drm-next +Resolved 'drivers/gpu/drm/i915/i915_pmu.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_pmu.h' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_breadcrumbs.c' using previous resolution. +Removing include/drm/tinydrm/ili9341.h +Auto-merging drivers/gpu/drm/meson/meson_plane.c +Auto-merging drivers/gpu/drm/i915/intel_engine_cs.c +Auto-merging drivers/gpu/drm/i915/intel_cdclk.c +Auto-merging drivers/gpu/drm/i915/intel_breadcrumbs.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_breadcrumbs.c +Auto-merging drivers/gpu/drm/i915/intel_bios.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_pmu.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_pmu.h +Auto-merging drivers/gpu/drm/i915/i915_pmu.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_pmu.c +Auto-merging drivers/gpu/drm/i915/i915_gem_request.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/drm_probe_helper.c +Auto-merging drivers/gpu/drm/drm_edid.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/display/bridge/ti,ths813x.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e0fbf3ef2c9f] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + .../bridge/{ti,ths8135.txt => ti,ths813x.txt} | 13 +- + .../display/panel/arm,versatile-tft-panel.txt | 31 + + .../devicetree/bindings/display/st,stm32-ltdc.txt | 2 +- + MAINTAINERS | 9 +- + drivers/dma-buf/reservation.c | 31 +- + drivers/dma-buf/sw_sync.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 3 + + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 2 + + drivers/gpu/drm/arc/arcpgu_hdmi.c | 3 +- + drivers/gpu/drm/arc/arcpgu_sim.c | 16 +- + drivers/gpu/drm/arm/hdlcd_crtc.c | 5 +- + drivers/gpu/drm/arm/malidp_planes.c | 6 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 24 +- + drivers/gpu/drm/bridge/analogix-anx78xx.c | 3 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 6 +- + drivers/gpu/drm/bridge/dumb-vga-dac.c | 59 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 200 ++--- + drivers/gpu/drm/drm_atomic.c | 14 +- + drivers/gpu/drm/drm_connector.c | 96 ++- + drivers/gpu/drm/drm_crtc.c | 6 +- + drivers/gpu/drm/drm_debugfs_crc.c | 19 + + drivers/gpu/drm/drm_dp_helper.c | 4 + + drivers/gpu/drm/drm_dp_mst_topology.c | 3 + + drivers/gpu/drm/drm_edid.c | 4 +- + drivers/gpu/drm/drm_encoder.c | 4 + + drivers/gpu/drm/drm_fourcc.c | 50 +- + drivers/gpu/drm/drm_ioctl.c | 6 +- + drivers/gpu/drm/drm_memory.c | 13 + + drivers/gpu/drm/drm_mipi_dsi.c | 9 +- + drivers/gpu/drm/drm_modes.c | 62 +- + drivers/gpu/drm/drm_plane.c | 4 + + drivers/gpu/drm/drm_prime.c | 141 +++- + drivers/gpu/drm/drm_probe_helper.c | 2 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 5 +- + drivers/gpu/drm/exynos/exynos_mixer.c | 14 +- + drivers/gpu/drm/i2c/sil164_drv.c | 3 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 3 +- + drivers/gpu/drm/i915/Makefile | 2 + + drivers/gpu/drm/i915/i915_debugfs.c | 85 ++- + drivers/gpu/drm/i915/i915_drv.c | 206 +++--- + drivers/gpu/drm/i915/i915_drv.h | 57 +- + drivers/gpu/drm/i915/i915_gem.c | 145 +++- + drivers/gpu/drm/i915/i915_gem_fence_reg.c | 8 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 76 +- + drivers/gpu/drm/i915/i915_gem_request.c | 30 +- + drivers/gpu/drm/i915/i915_gem_request.h | 33 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 82 ++- + drivers/gpu/drm/i915/i915_irq.c | 82 +-- + drivers/gpu/drm/i915/i915_params.c | 5 +- + drivers/gpu/drm/i915/i915_params.h | 2 +- + drivers/gpu/drm/i915/i915_pci.c | 18 +- + drivers/gpu/drm/i915/i915_pmu.c | 296 ++++++-- + drivers/gpu/drm/i915/i915_pmu.h | 8 + + drivers/gpu/drm/i915/i915_reg.h | 240 +++++- + drivers/gpu/drm/i915/i915_sw_fence.c | 56 +- + drivers/gpu/drm/i915/intel_atomic.c | 2 + + drivers/gpu/drm/i915/intel_atomic_plane.c | 9 - + drivers/gpu/drm/i915/intel_bios.c | 30 + + drivers/gpu/drm/i915/intel_breadcrumbs.c | 143 ++-- + drivers/gpu/drm/i915/intel_cdclk.c | 68 +- + drivers/gpu/drm/i915/intel_crt.c | 3 - + drivers/gpu/drm/i915/intel_csr.c | 5 +- + drivers/gpu/drm/i915/intel_ddi.c | 82 +++ + drivers/gpu/drm/i915/intel_device_info.c | 1 + + drivers/gpu/drm/i915/intel_device_info.h | 2 + + drivers/gpu/drm/i915/intel_display.c | 160 +++- + drivers/gpu/drm/i915/intel_display.h | 4 + + drivers/gpu/drm/i915/intel_dp.c | 540 +++++++++++--- + drivers/gpu/drm/i915/intel_drv.h | 119 ++- + drivers/gpu/drm/i915/intel_dsi.c | 5 - + drivers/gpu/drm/i915/intel_dvo.c | 3 - + drivers/gpu/drm/i915/intel_engine_cs.c | 8 +- + drivers/gpu/drm/i915/intel_fbc.c | 30 +- + drivers/gpu/drm/i915/intel_guc.c | 47 +- + drivers/gpu/drm/i915/intel_guc_ads.c | 151 ++++ + drivers/gpu/drm/i915/intel_guc_ads.h | 33 + + drivers/gpu/drm/i915/intel_guc_log.c | 297 +++++--- + drivers/gpu/drm/i915/intel_guc_log.h | 14 +- + drivers/gpu/drm/i915/intel_guc_submission.c | 134 ---- + drivers/gpu/drm/i915/intel_hangcheck.c | 2 +- + drivers/gpu/drm/i915/intel_hdcp.c | 807 +++++++++++++++++++++ + drivers/gpu/drm/i915/intel_hdmi.c | 296 +++++++- + drivers/gpu/drm/i915/intel_hotplug.c | 19 +- + drivers/gpu/drm/i915/intel_i2c.c | 98 ++- + drivers/gpu/drm/i915/intel_lrc.c | 245 ++++--- + drivers/gpu/drm/i915/intel_lrc.h | 1 + + drivers/gpu/drm/i915/intel_lrc_reg.h | 67 ++ + drivers/gpu/drm/i915/intel_lspcon.c | 3 +- + drivers/gpu/drm/i915/intel_modes.c | 17 - + drivers/gpu/drm/i915/intel_panel.c | 8 +- + drivers/gpu/drm/i915/intel_pm.c | 101 ++- + drivers/gpu/drm/i915/intel_psr.c | 54 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 46 ++ + drivers/gpu/drm/i915/intel_sdvo.c | 3 - + drivers/gpu/drm/i915/intel_sprite.c | 120 ++- + drivers/gpu/drm/i915/intel_uc.c | 92 ++- + drivers/gpu/drm/i915/intel_uc.h | 4 +- + drivers/gpu/drm/i915/intel_uncore.c | 28 +- + drivers/gpu/drm/i915/intel_uncore.h | 14 +- + drivers/gpu/drm/i915/intel_vbt_defs.h | 13 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 114 ++- + drivers/gpu/drm/i915/selftests/i915_random.c | 3 +- + drivers/gpu/drm/i915/selftests/i915_sw_fence.c | 134 ++++ + drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 105 ++- + drivers/gpu/drm/i915/selftests/mock_context.c | 11 + + drivers/gpu/drm/i915/selftests/mock_context.h | 3 + + drivers/gpu/drm/imx/ipuv3-plane.c | 10 +- + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 5 +- + drivers/gpu/drm/meson/meson_plane.c | 5 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 4 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 20 +- + drivers/gpu/drm/nouveau/nv50_display.c | 20 +- + drivers/gpu/drm/panel/Kconfig | 10 + + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-arm-versatile.c | 377 ++++++++++ + .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 16 +- + drivers/gpu/drm/pl111/Kconfig | 1 + + drivers/gpu/drm/pl111/pl111_display.c | 64 +- + drivers/gpu/drm/pl111/pl111_drm.h | 8 + + drivers/gpu/drm/pl111/pl111_drv.c | 138 ++-- + drivers/gpu/drm/pl111/pl111_versatile.c | 86 ++- + drivers/gpu/drm/radeon/radeon.h | 1 + + drivers/gpu/drm/radeon/radeon_device.c | 2 + + drivers/gpu/drm/radeon/radeon_ttm.c | 6 +- + drivers/gpu/drm/rcar-du/Kconfig | 3 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 51 +- + drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c | 140 ++-- + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 9 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.h | 2 - + drivers/gpu/drm/rcar-du/rcar_lvds_regs.h | 6 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 22 +- + drivers/gpu/drm/stm/drv.c | 20 +- + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 53 +- + drivers/gpu/drm/stm/ltdc.c | 118 ++- + drivers/gpu/drm/stm/ltdc.h | 1 + + drivers/gpu/drm/sun4i/Makefile | 3 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 248 ++++++- + drivers/gpu/drm/sun4i/sun4i_backend.h | 18 +- + drivers/gpu/drm/sun4i/sun4i_crtc.c | 21 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 27 +- + drivers/gpu/drm/sun4i/sun4i_drv.h | 1 + + drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 24 +- + drivers/gpu/drm/sun4i/sun4i_frontend.c | 389 ++++++++++ + drivers/gpu/drm/sun4i/sun4i_frontend.h | 99 +++ + drivers/gpu/drm/sun4i/sun4i_layer.c | 117 ++- + drivers/gpu/drm/sun4i/sun4i_layer.h | 11 + + drivers/gpu/drm/sun4i/sun4i_tcon.c | 4 + + drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 9 +- + drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 9 +- + drivers/gpu/drm/sun4i/sunxi_engine.h | 90 +++ + drivers/gpu/drm/tegra/plane.c | 9 +- + drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c | 34 +- + drivers/gpu/drm/tinydrm/ili9225.c | 6 +- + drivers/gpu/drm/tinydrm/mi0283qt.c | 106 ++- + drivers/gpu/drm/tinydrm/mipi-dbi.c | 101 ++- + drivers/gpu/drm/tinydrm/st7586.c | 15 +- + drivers/gpu/drm/tinydrm/st7735r.c | 11 +- + drivers/gpu/drm/vc4/Makefile | 1 + + drivers/gpu/drm/vc4/vc4_drv.c | 26 + + drivers/gpu/drm/vc4/vc4_drv.h | 68 ++ + drivers/gpu/drm/vc4/vc4_gem.c | 48 +- + drivers/gpu/drm/vc4/vc4_irq.c | 40 +- + drivers/gpu/drm/vc4/vc4_perfmon.c | 188 +++++ + drivers/gpu/drm/vc4/vc4_plane.c | 23 +- + drivers/gpu/drm/vc4/vc4_regs.h | 35 +- + drivers/gpu/drm/vc4/vc4_v3d.c | 64 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 2 + + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 7 +- + drivers/gpu/drm/zte/zx_plane.c | 18 +- + include/drm/bridge/dw_mipi_dsi.h | 17 +- + include/drm/drm_bridge.h | 35 +- + include/drm/drm_cache.h | 2 + + include/drm/drm_connector.h | 16 + + include/drm/drm_dp_helper.h | 35 + + include/drm/drm_fourcc.h | 2 + + include/drm/drm_hdcp.h | 41 ++ + include/drm/drm_mode_config.h | 12 + + include/drm/drm_modes.h | 24 +- + include/drm/drm_prime.h | 22 + + include/drm/i915_component.h | 3 +- + include/drm/i915_pciids.h | 18 +- + include/drm/tinydrm/ili9341.h | 54 -- + include/drm/tinydrm/mipi-dbi.h | 5 +- + include/uapi/drm/drm_mode.h | 34 +- + include/uapi/drm/i915_drm.h | 4 +- + include/uapi/drm/vc4_drm.h | 76 ++ + 190 files changed, 7964 insertions(+), 2126 deletions(-) + rename Documentation/devicetree/bindings/display/bridge/{ti,ths8135.txt => ti,ths813x.txt} (69%) + create mode 100644 Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.txt + create mode 100644 drivers/gpu/drm/i915/intel_guc_ads.c + create mode 100644 drivers/gpu/drm/i915/intel_guc_ads.h + create mode 100644 drivers/gpu/drm/i915/intel_hdcp.c + create mode 100644 drivers/gpu/drm/i915/intel_lrc_reg.h + create mode 100644 drivers/gpu/drm/panel/panel-arm-versatile.c + create mode 100644 drivers/gpu/drm/sun4i/sun4i_frontend.c + create mode 100644 drivers/gpu/drm/sun4i/sun4i_frontend.h + create mode 100644 drivers/gpu/drm/vc4/vc4_perfmon.c + create mode 100644 include/drm/drm_hdcp.h + delete mode 100644 include/drm/tinydrm/ili9341.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 (61b8b359d02e drm/i915: Add a FIXME about FBC vs. fence. 90/270 degree rotation) +$ git merge drm-intel/for-linux-next +Recorded preimage for 'drivers/gpu/drm/i915/i915_request.c' +Resolved 'drivers/gpu/drm/i915/intel_breadcrumbs.c' using previous resolution. +Auto-merging include/drm/drm_atomic.h +Auto-merging drivers/gpu/drm/i915/selftests/i915_request.c +Auto-merging drivers/gpu/drm/i915/intel_uncore.h +Auto-merging drivers/gpu/drm/i915/intel_uncore.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_fbc.c +Auto-merging drivers/gpu/drm/i915/intel_engine_cs.c +Auto-merging drivers/gpu/drm/i915/intel_dvo.c +Auto-merging drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/gpu/drm/i915/intel_dp.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_crt.c +Auto-merging drivers/gpu/drm/i915/intel_breadcrumbs.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_breadcrumbs.c +Auto-merging drivers/gpu/drm/i915/intel_bios.c +Auto-merging drivers/gpu/drm/i915/intel_audio.c +Auto-merging drivers/gpu/drm/i915/intel_atomic_plane.c +Auto-merging drivers/gpu/drm/i915/intel_atomic.c +Auto-merging drivers/gpu/drm/i915/i915_request.h +Auto-merging drivers/gpu/drm/i915/i915_request.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_request.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +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/i915_gem_context.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/gvt/scheduler.h +Auto-merging drivers/gpu/drm/i915/gvt/scheduler.c +Auto-merging drivers/gpu/drm/i915/gvt/dmabuf.c +Auto-merging drivers/gpu/drm/i915/Makefile +Auto-merging drivers/gpu/drm/drm_plane.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/i915_request.c'. +[master 4f210123b2e8] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/todo.rst | 7 + + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +- + drivers/gpu/drm/drm_plane.c | 2 +- + drivers/gpu/drm/drm_vblank.c | 91 ++++- + drivers/gpu/drm/i915/Makefile | 3 +- + drivers/gpu/drm/i915/dvo_ivch.c | 28 +- + drivers/gpu/drm/i915/gvt/dmabuf.c | 4 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 16 +- + drivers/gpu/drm/i915/gvt/scheduler.h | 2 +- + drivers/gpu/drm/i915/i915_debugfs.c | 201 ++++++---- + drivers/gpu/drm/i915/i915_drv.c | 272 +++++++------- + drivers/gpu/drm/i915/i915_drv.h | 82 ++-- + drivers/gpu/drm/i915/i915_gem.c | 215 +++++------ + drivers/gpu/drm/i915/i915_gem_batch_pool.c | 2 +- + drivers/gpu/drm/i915/i915_gem_clflush.c | 2 +- + drivers/gpu/drm/i915/i915_gem_context.c | 56 ++- + drivers/gpu/drm/i915/i915_gem_context.h | 5 +- + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 4 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 4 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 80 ++-- + drivers/gpu/drm/i915/i915_gem_fence_reg.c | 2 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 76 ++-- + drivers/gpu/drm/i915/i915_gem_gtt.h | 5 +- + drivers/gpu/drm/i915/i915_gem_internal.c | 8 +- + drivers/gpu/drm/i915/i915_gem_object.h | 17 +- + drivers/gpu/drm/i915/i915_gem_render_state.c | 2 +- + drivers/gpu/drm/i915/i915_gem_render_state.h | 4 +- + drivers/gpu/drm/i915/i915_gem_shrinker.c | 4 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 4 +- + drivers/gpu/drm/i915/i915_gem_timeline.h | 4 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 10 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 51 +-- + drivers/gpu/drm/i915/i915_ioc32.c | 27 +- + drivers/gpu/drm/i915/i915_irq.c | 121 +++--- + drivers/gpu/drm/i915/i915_pci.c | 111 +++--- + drivers/gpu/drm/i915/i915_perf.c | 28 +- + drivers/gpu/drm/i915/i915_reg.h | 82 +++- + .../i915/{i915_gem_request.c => i915_request.c} | 414 +++++++++++---------- + .../i915/{i915_gem_request.h => i915_request.h} | 220 +++++------ + drivers/gpu/drm/i915/i915_syncmap.c | 16 +- + drivers/gpu/drm/i915/i915_trace.h | 128 ++++--- + drivers/gpu/drm/i915/i915_vma.c | 3 +- + drivers/gpu/drm/i915/i915_vma.h | 2 +- + drivers/gpu/drm/i915/intel_atomic.c | 5 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 1 + + drivers/gpu/drm/i915/intel_audio.c | 2 +- + drivers/gpu/drm/i915/intel_bios.c | 2 +- + drivers/gpu/drm/i915/intel_breadcrumbs.c | 31 +- + drivers/gpu/drm/i915/intel_cdclk.c | 239 +++++++++++- + drivers/gpu/drm/i915/intel_color.c | 29 +- + drivers/gpu/drm/i915/intel_crt.c | 13 +- + drivers/gpu/drm/i915/intel_ddi.c | 2 +- + drivers/gpu/drm/i915/intel_device_info.c | 63 +++- + drivers/gpu/drm/i915/intel_device_info.h | 11 +- + drivers/gpu/drm/i915/intel_display.c | 247 ++++++++---- + drivers/gpu/drm/i915/intel_dp.c | 6 +- + drivers/gpu/drm/i915/intel_dpio_phy.c | 2 +- + drivers/gpu/drm/i915/intel_drv.h | 24 +- + drivers/gpu/drm/i915/intel_dvo.c | 28 +- + drivers/gpu/drm/i915/intel_engine_cs.c | 190 +++++----- + drivers/gpu/drm/i915/intel_fbc.c | 45 +-- + drivers/gpu/drm/i915/intel_fbdev.c | 13 +- + drivers/gpu/drm/i915/intel_guc_submission.c | 84 +++-- + drivers/gpu/drm/i915/intel_huc.c | 3 +- + drivers/gpu/drm/i915/intel_lpe_audio.c | 14 +- + drivers/gpu/drm/i915/intel_lrc.c | 160 ++++---- + drivers/gpu/drm/i915/intel_lvds.c | 44 ++- + drivers/gpu/drm/i915/intel_mocs.c | 30 +- + drivers/gpu/drm/i915/intel_mocs.h | 2 +- + drivers/gpu/drm/i915/intel_overlay.c | 85 ++--- + drivers/gpu/drm/i915/intel_panel.c | 12 +- + drivers/gpu/drm/i915/intel_pm.c | 96 +++-- + drivers/gpu/drm/i915/intel_psr.c | 4 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 226 ++++++----- + drivers/gpu/drm/i915/intel_ringbuffer.h | 89 +++-- + drivers/gpu/drm/i915/intel_runtime_pm.c | 161 +++++++- + drivers/gpu/drm/i915/intel_sdvo.c | 82 ++-- + drivers/gpu/drm/i915/intel_sprite.c | 7 +- + drivers/gpu/drm/i915/intel_tv.c | 28 +- + drivers/gpu/drm/i915/intel_uc_fw.c | 5 +- + drivers/gpu/drm/i915/intel_uncore.c | 23 +- + drivers/gpu/drm/i915/intel_uncore.h | 5 + + drivers/gpu/drm/i915/selftests/huge_gem_object.c | 4 +- + drivers/gpu/drm/i915/selftests/huge_pages.c | 14 +- + .../gpu/drm/i915/selftests/i915_gem_coherency.c | 8 +- + drivers/gpu/drm/i915/selftests/i915_gem_context.c | 12 +- + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 6 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 6 +- + drivers/gpu/drm/i915/selftests/i915_gem_object.c | 24 +- + .../gpu/drm/i915/selftests/i915_live_selftests.h | 2 +- + .../gpu/drm/i915/selftests/i915_mock_selftests.h | 2 +- + .../{i915_gem_request.c => i915_request.c} | 125 +++---- + drivers/gpu/drm/i915/selftests/intel_guc.c | 20 +- + drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 117 +++--- + drivers/gpu/drm/i915/selftests/mock_engine.c | 10 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 8 +- + drivers/gpu/drm/i915/selftests/mock_request.c | 10 +- + drivers/gpu/drm/i915/selftests/mock_request.h | 8 +- + drivers/gpu/drm/radeon/radeon_display.c | 2 +- + drivers/gpu/drm/tegra/dc.c | 2 +- + include/drm/drm_atomic.h | 2 +- + include/drm/drm_gem.h | 15 - + include/drm/drm_vblank.h | 4 +- + include/drm/i915_pciids.h | 27 +- + 105 files changed, 2937 insertions(+), 2025 deletions(-) + rename drivers/gpu/drm/i915/{i915_gem_request.c => i915_request.c} (77%) + rename drivers/gpu/drm/i915/{i915_gem_request.h => i915_request.h} (79%) + rename drivers/gpu/drm/i915/selftests/{i915_gem_request.c => i915_request.c} (87%) +Merging drm-tegra/drm/tegra/for-next (8f62142e490d drm/tegra: dc: Properly cleanup overlay planes) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (761e05a702f5 drm: Check for lessee in DROP_MASTER ioctl) +$ git merge drm-misc/for-linux-next +Already up to date. +Merging drm-msm/msm-next (668c5de40345 drm/msm/mdp5: don't pre-reserve LM's if no dual-dsi) +$ git merge drm-msm/msm-next +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.h +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_encoder.c +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_ctl.h +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_ctl.c +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c +Auto-merging drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.h +Auto-merging drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +Auto-merging drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/display/msm/dsi.txt | 26 +- + drivers/gpu/drm/msm/Kconfig | 20 + + drivers/gpu/drm/msm/Makefile | 50 +- + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 9 +- + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 9 +- + drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 187 +++++ + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 99 ++- + drivers/gpu/drm/msm/adreno/a5xx_gpu.h | 4 + + drivers/gpu/drm/msm/adreno/a5xx_power.c | 26 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 50 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 70 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 14 +- + drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4.xml.h | 0 + drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_crtc.c | 6 +- + .../drm/msm/{mdp => disp}/mdp4/mdp4_dsi_encoder.c | 0 + .../drm/msm/{mdp => disp}/mdp4/mdp4_dtv_encoder.c | 0 + drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_irq.c | 0 + drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_kms.c | 2 +- + drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_kms.h | 2 +- + .../drm/msm/{mdp => disp}/mdp4/mdp4_lcdc_encoder.c | 0 + .../msm/{mdp => disp}/mdp4/mdp4_lvds_connector.c | 0 + .../gpu/drm/msm/{mdp => disp}/mdp4/mdp4_lvds_pll.c | 0 + .../gpu/drm/msm/{mdp => disp}/mdp4/mdp4_plane.c | 0 + drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5.xml.h | 0 + drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_cfg.c | 0 + drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_cfg.h | 0 + .../drm/msm/{mdp => disp}/mdp5/mdp5_cmd_encoder.c | 4 +- + drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_crtc.c | 13 +- + drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_ctl.c | 60 +- + drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_ctl.h | 2 +- + .../gpu/drm/msm/{mdp => disp}/mdp5/mdp5_encoder.c | 5 +- + drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_irq.c | 0 + drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_kms.c | 2 +- + drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_kms.h | 10 +- + drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_mdss.c | 0 + .../gpu/drm/msm/{mdp => disp}/mdp5/mdp5_mixer.c | 0 + .../gpu/drm/msm/{mdp => disp}/mdp5/mdp5_mixer.h | 0 + drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_pipe.c | 0 + drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_pipe.h | 0 + .../gpu/drm/msm/{mdp => disp}/mdp5/mdp5_plane.c | 2 +- + drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_smp.c | 0 + drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_smp.h | 0 + drivers/gpu/drm/msm/{mdp => disp}/mdp_common.xml.h | 0 + drivers/gpu/drm/msm/{mdp => disp}/mdp_format.c | 0 + drivers/gpu/drm/msm/{mdp => disp}/mdp_kms.c | 0 + drivers/gpu/drm/msm/{mdp => disp}/mdp_kms.h | 0 + drivers/gpu/drm/msm/dsi/dsi.c | 25 +- + drivers/gpu/drm/msm/dsi/dsi.h | 1 + + drivers/gpu/drm/msm/dsi/dsi.xml.h | 187 ++++- + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 19 + + drivers/gpu/drm/msm/dsi/dsi_cfg.h | 1 + + drivers/gpu/drm/msm/dsi/dsi_host.c | 47 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 6 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 10 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 1 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 251 +++++++ + drivers/gpu/drm/msm/dsi/pll/dsi_pll.c | 5 +- + drivers/gpu/drm/msm/dsi/pll/dsi_pll.h | 9 + + drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c | 822 +++++++++++++++++++++ + drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c | 2 +- + drivers/gpu/drm/msm/msm_debugfs.c | 5 +- + drivers/gpu/drm/msm/msm_drv.c | 20 +- + drivers/gpu/drm/msm/msm_drv.h | 1 - + drivers/gpu/drm/msm/msm_fb.c | 6 +- + drivers/gpu/drm/msm/msm_fence.h | 2 - + drivers/gpu/drm/msm/msm_gem.c | 13 +- + drivers/gpu/drm/msm/msm_gem.h | 1 + + drivers/gpu/drm/msm/msm_gem_submit.c | 9 + + drivers/gpu/drm/msm/msm_gem_vma.c | 4 +- + drivers/gpu/drm/msm/msm_gpu.c | 12 +- + drivers/gpu/drm/msm/msm_gpu.h | 2 + + drivers/gpu/drm/msm/msm_ringbuffer.c | 2 +- + include/uapi/drm/msm_drm.h | 2 + + 73 files changed, 1886 insertions(+), 251 deletions(-) + create mode 100644 drivers/gpu/drm/msm/adreno/a5xx_debugfs.c + rename drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4.xml.h (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_crtc.c (99%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_dsi_encoder.c (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_dtv_encoder.c (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_irq.c (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_kms.c (99%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_kms.h (99%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_lcdc_encoder.c (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_lvds_connector.c (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_lvds_pll.c (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_plane.c (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5.xml.h (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_cfg.c (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_cfg.h (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_cmd_encoder.c (99%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_crtc.c (99%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_ctl.c (94%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_ctl.h (98%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_encoder.c (99%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_irq.c (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_kms.c (99%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_kms.h (96%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_mdss.c (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_mixer.c (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_mixer.h (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_pipe.c (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_pipe.h (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_plane.c (99%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_smp.c (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_smp.h (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp_common.xml.h (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp_format.c (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp_kms.c (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp_kms.h (100%) + create mode 100644 drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c + create mode 100644 drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c +Merging hdlcd/for-upstream/hdlcd (f73e8b825315 drm/arm: Replace instances of drm_dev_unref with drm_dev_put.) +$ git merge hdlcd/for-upstream/hdlcd +Already up to date. +Merging mali-dp/for-upstream/mali-dp (54243016ae35 drm: mali-dp: Disable planes when their CRTC gets disabled.) +$ git merge mali-dp/for-upstream/mali-dp +Already up to date. +Merging sunxi-drm/sunxi-drm/for-next (7dafb83edd32 Merge branches 'sunxi/drm-fixes-for-4.13' and 'sunxi/drm-for-4.14' into sunxi-drm/for-next) +$ git merge sunxi-drm/sunxi-drm/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging imx-drm/imx-drm/next (50b0f0aee839 gpu: ipu-csi: add 10/12-bit grayscale support to mbus_code_to_bus_cfg) +$ git merge imx-drm/imx-drm/next +Merge made by the 'recursive' strategy. + drivers/gpu/ipu-v3/ipu-common.c | 4 ++-- + drivers/gpu/ipu-v3/ipu-cpmem.c | 2 ++ + drivers/gpu/ipu-v3/ipu-csi.c | 2 ++ + drivers/gpu/ipu-v3/ipu-pre.c | 3 +++ + drivers/gpu/ipu-v3/ipu-prg.c | 3 +++ + 5 files changed, 12 insertions(+), 2 deletions(-) +Merging etnaviv/etnaviv/next (246774d17fc0 drm/etnaviv: remove the need for a gpu-subsystem DT node) +$ git merge etnaviv/etnaviv/next +Merge made by the 'recursive' strategy. + .../bindings/display/etnaviv/etnaviv-drm.txt | 24 +- + drivers/gpu/drm/etnaviv/Kconfig | 1 + + drivers/gpu/drm/etnaviv/Makefile | 3 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 52 ++-- + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 7 +- + drivers/gpu/drm/etnaviv/etnaviv_dump.c | 21 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.h | 5 + + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 68 ++--- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 275 ++++++--------------- + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 29 +-- + drivers/gpu/drm/etnaviv/etnaviv_iommu.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 4 +- + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 169 +++++++++++++ + drivers/gpu/drm/etnaviv/etnaviv_sched.h | 35 +++ + 15 files changed, 397 insertions(+), 300 deletions(-) + create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_sched.c + create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_sched.h +Merging kconfig/for-next (bebc6082da0a Linux 4.14) +$ git merge kconfig/for-next +Already up to date. +Merging regmap/for-next (c3270f2b8340 Merge remote-tracking branches 'regmap/topic/bulk' and 'regmap/topic/debugfs' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-debugfs.c | 6 +- + drivers/base/regmap/regmap-i2c.c | 4 - + drivers/base/regmap/regmap.c | 167 +++++++++++++++-------------------- + 3 files changed, 76 insertions(+), 101 deletions(-) +Merging sound/for-next (248a380a3c2e ALSA: hda-beep: add SPDX identifiers) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + include/sound/emu10k1.h | 4 +- + include/sound/hdaudio.h | 2 + + sound/hda/hdac_device.c | 35 ++++++++++++++ + sound/pci/emu10k1/emu10k1_main.c | 71 ++++++++++++++++++++------- + sound/pci/emu10k1/emupcm.c | 10 +++- + sound/pci/emu10k1/memory.c | 101 ++++++++++++++++++++++++++++++--------- + sound/pci/hda/hda_beep.c | 17 +------ + sound/pci/hda/hda_beep.h | 17 +------ + sound/pci/hda/hda_codec.c | 28 +---------- + sound/pci/hda/hda_local.h | 6 ++- + 10 files changed, 190 insertions(+), 101 deletions(-) +Merging sound-asoc/for-next (0de0a757faa3 Merge remote-tracking branches 'asoc/topic/wm9713', 'asoc/topic/wm9867', 'asoc/topic/wm_adsp' and 'asoc/topic/zx_aud96p22' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/ak4458.txt | 23 + + Documentation/devicetree/bindings/sound/ak5558.txt | 22 + + Documentation/devicetree/bindings/sound/dmic.txt | 2 + + .../devicetree/bindings/sound/maxim,max9759.txt | 18 + + Documentation/devicetree/bindings/sound/rt5665.txt | 4 +- + .../bindings/sound/samsung,tm2-audio.txt | 14 +- + .../devicetree/bindings/sound/samsung-i2s.txt | 22 +- + .../devicetree/bindings/sound/uniphier,aio.txt | 36 + + MAINTAINERS | 8 + + drivers/gpu/drm/vc4/vc4_hdmi.c | 47 +- + include/sound/dmaengine_pcm.h | 2 + + include/sound/rt5659.h | 1 + + include/sound/soc.h | 13 +- + sound/soc/amd/Kconfig | 9 + + sound/soc/amd/Makefile | 2 + + sound/soc/amd/acp-da7219-max98357a.c | 246 +++++ + sound/soc/amd/acp-pcm-dma.c | 202 ++-- + sound/soc/amd/acp-rt5645.c | 4 +- + sound/soc/amd/acp.h | 8 +- + sound/soc/atmel/atmel-classd.c | 58 +- + sound/soc/atmel/atmel-pcm-pdc.c | 6 +- + sound/soc/atmel/atmel-pdmic.c | 60 +- + sound/soc/au1x/dbdma2.c | 13 +- + sound/soc/au1x/dma.c | 12 +- + sound/soc/bcm/cygnus-pcm.c | 7 +- + sound/soc/blackfin/bf5xx-ac97-pcm.c | 6 +- + sound/soc/blackfin/bf5xx-i2s-pcm.c | 6 +- + sound/soc/codecs/88pm860x-codec.c | 166 +-- + sound/soc/codecs/88pm860x-codec.h | 4 +- + sound/soc/codecs/Kconfig | 17 + + sound/soc/codecs/Makefile | 7 +- + sound/soc/codecs/ab8500-codec.c | 295 +++--- + sound/soc/codecs/ac97.c | 46 +- + sound/soc/codecs/ad1836.c | 68 +- + sound/soc/codecs/ad193x-i2c.c | 7 - + sound/soc/codecs/ad193x-spi.c | 7 - + sound/soc/codecs/ad193x.c | 46 +- + sound/soc/codecs/ad1980.c | 87 +- + sound/soc/codecs/ad73311.c | 27 +- + sound/soc/codecs/adau1373.c | 84 +- + sound/soc/codecs/adau1701.c | 101 +- + sound/soc/codecs/adau1761.c | 88 +- + sound/soc/codecs/adau1781.c | 51 +- + sound/soc/codecs/adau17x1.c | 69 +- + sound/soc/codecs/adau17x1.h | 8 +- + sound/soc/codecs/adau1977-i2c.c | 7 - + sound/soc/codecs/adau1977-spi.c | 7 - + sound/soc/codecs/adau1977.c | 59 +- + sound/soc/codecs/adau7002.c | 30 +- + sound/soc/codecs/adav801.c | 7 - + sound/soc/codecs/adav803.c | 7 - + sound/soc/codecs/adav80x.c | 130 +-- + sound/soc/codecs/ads117x.c | 27 +- + sound/soc/codecs/ak4104.c | 68 +- + sound/soc/codecs/ak4458.c | 657 ++++++++++++ + sound/soc/codecs/ak4458.h | 86 ++ + sound/soc/codecs/ak4535.c | 78 +- + sound/soc/codecs/ak4554.c | 27 +- + sound/soc/codecs/ak4613.c | 72 +- + sound/soc/codecs/ak4641.c | 91 +- + sound/soc/codecs/ak4642.c | 104 +- + sound/soc/codecs/ak4671.c | 67 +- + sound/soc/codecs/ak5386.c | 62 +- + sound/soc/codecs/ak5558.c | 415 ++++++++ + sound/soc/codecs/ak5558.h | 52 + + sound/soc/codecs/alc5623.c | 147 ++- + sound/soc/codecs/alc5632.c | 138 ++- + sound/soc/codecs/arizona.c | 249 ++--- + sound/soc/codecs/arizona.h | 24 +- + sound/soc/codecs/bt-sco.c | 21 +- + sound/soc/codecs/cq93vc.c | 33 +- + sound/soc/codecs/cs35l32.c | 45 +- + sound/soc/codecs/cs35l33.c | 186 ++-- + sound/soc/codecs/cs35l34.c | 127 ++- + sound/soc/codecs/cs35l35.c | 104 +- + sound/soc/codecs/cs4265.c | 98 +- + sound/soc/codecs/cs4270.c | 124 +-- + sound/soc/codecs/cs4271-i2c.c | 7 - + sound/soc/codecs/cs4271-spi.c | 7 - + sound/soc/codecs/cs4271.c | 105 +- + sound/soc/codecs/cs42l42.c | 154 ++- + sound/soc/codecs/cs42l42.h | 2 +- + sound/soc/codecs/cs42l51-i2c.c | 8 - + sound/soc/codecs/cs42l51.c | 81 +- + sound/soc/codecs/cs42l52.c | 146 ++- + sound/soc/codecs/cs42l56.c | 158 ++- + sound/soc/codecs/cs42l73.c | 122 +-- + sound/soc/codecs/cs42xx8-i2c.c | 1 - + sound/soc/codecs/cs42xx8.c | 57 +- + sound/soc/codecs/cs43130.c | 243 ++--- + sound/soc/codecs/cs43130.h | 2 +- + sound/soc/codecs/cs4349.c | 39 +- + sound/soc/codecs/cs47l24.c | 136 ++- + sound/soc/codecs/cs53l30.c | 57 +- + sound/soc/codecs/cx20442.c | 89 +- + sound/soc/codecs/da7210.c | 181 ++-- + sound/soc/codecs/da7213.c | 328 +++--- + sound/soc/codecs/da7218.c | 498 +++++---- + sound/soc/codecs/da7218.h | 2 +- + sound/soc/codecs/da7219-aad.c | 236 ++--- + sound/soc/codecs/da7219-aad.h | 12 +- + sound/soc/codecs/da7219.c | 307 +++--- + sound/soc/codecs/da7219.h | 2 +- + sound/soc/codecs/da732x.c | 241 ++--- + sound/soc/codecs/da9055.c | 186 ++-- + sound/soc/codecs/dmic.c | 92 +- + sound/soc/codecs/es7134.c | 27 +- + sound/soc/codecs/es8316.c | 80 +- + sound/soc/codecs/es8328-i2c.c | 7 - + sound/soc/codecs/es8328-spi.c | 7 - + sound/soc/codecs/es8328.c | 147 ++- + sound/soc/codecs/gtm601.c | 28 +- + sound/soc/codecs/hdac_hdmi.c | 65 +- + sound/soc/codecs/hdac_hdmi.h | 2 +- + sound/soc/codecs/hdmi-codec.c | 35 +- + sound/soc/codecs/ics43432.c | 16 +- + sound/soc/codecs/inno_rk3036.c | 70 +- + sound/soc/codecs/isabelle.c | 57 +- + sound/soc/codecs/jz4740.c | 50 +- + sound/soc/codecs/lm49453.c | 65 +- + sound/soc/codecs/max9759.c | 207 ++++ + sound/soc/codecs/max98088.c | 314 +++--- + sound/soc/codecs/max98090.c | 319 +++--- + sound/soc/codecs/max98090.h | 4 +- + sound/soc/codecs/max98095.c | 448 ++++---- + sound/soc/codecs/max98095.h | 2 +- + sound/soc/codecs/max98357a.c | 29 +- + sound/soc/codecs/max98371.c | 43 +- + sound/soc/codecs/max98371.h | 1 - + sound/soc/codecs/max98373.c | 75 +- + sound/soc/codecs/max9850.c | 80 +- + sound/soc/codecs/max9860.c | 70 +- + sound/soc/codecs/max9867.c | 65 +- + sound/soc/codecs/max9867.h | 2 +- + sound/soc/codecs/max98925.c | 72 +- + sound/soc/codecs/max98925.h | 2 +- + sound/soc/codecs/max98926.c | 56 +- + sound/soc/codecs/max98926.h | 2 +- + sound/soc/codecs/max98927.c | 82 +- + sound/soc/codecs/max98927.h | 2 +- + sound/soc/codecs/mc13783.c | 68 +- + sound/soc/codecs/ml26124.c | 103 +- + sound/soc/codecs/msm8916-wcd-analog.c | 207 ++-- + sound/soc/codecs/msm8916-wcd-digital.c | 115 +- + sound/soc/codecs/nau8540.c | 79 +- + sound/soc/codecs/nau8810.c | 73 +- + sound/soc/codecs/nau8824.c | 113 +- + sound/soc/codecs/nau8824.h | 2 +- + sound/soc/codecs/nau8825.c | 107 +- + sound/soc/codecs/nau8825.h | 2 +- + sound/soc/codecs/pcm1681.c | 62 +- + sound/soc/codecs/pcm179x-i2c.c | 6 - + sound/soc/codecs/pcm179x-spi.c | 6 - + sound/soc/codecs/pcm179x.c | 45 +- + sound/soc/codecs/pcm179x.h | 1 - + sound/soc/codecs/pcm186x-i2c.c | 8 - + sound/soc/codecs/pcm186x-spi.c | 8 - + sound/soc/codecs/pcm186x.c | 143 ++- + sound/soc/codecs/pcm186x.h | 1 - + sound/soc/codecs/pcm3008.c | 36 +- + sound/soc/codecs/pcm3168a.c | 51 +- + sound/soc/codecs/pcm5102a.c | 16 +- + sound/soc/codecs/pcm512x.c | 162 ++- + sound/soc/codecs/rt274.c | 206 ++-- + sound/soc/codecs/rt286.c | 198 ++-- + sound/soc/codecs/rt286.h | 2 +- + sound/soc/codecs/rt298.c | 210 ++-- + sound/soc/codecs/rt298.h | 2 +- + sound/soc/codecs/rt5514-spi.c | 36 +- + sound/soc/codecs/rt5514.c | 124 +-- + sound/soc/codecs/rt5514.h | 2 +- + sound/soc/codecs/rt5616.c | 219 ++-- + sound/soc/codecs/rt5631.c | 324 +++--- + sound/soc/codecs/rt5640.c | 260 +++-- + sound/soc/codecs/rt5640.h | 6 +- + sound/soc/codecs/rt5645.c | 370 ++++--- + sound/soc/codecs/rt5645.h | 4 +- + sound/soc/codecs/rt5651.c | 221 ++-- + sound/soc/codecs/rt5651.h | 4 +- + sound/soc/codecs/rt5659.c | 430 +++++--- + sound/soc/codecs/rt5659.h | 7 +- + sound/soc/codecs/rt5660.c | 145 ++- + sound/soc/codecs/rt5660.h | 2 +- + sound/soc/codecs/rt5663.c | 600 ++++++----- + sound/soc/codecs/rt5663.h | 4 +- + sound/soc/codecs/rt5665.c | 350 +++---- + sound/soc/codecs/rt5665.h | 3 +- + sound/soc/codecs/rt5670.c | 295 +++--- + sound/soc/codecs/rt5670.h | 10 +- + sound/soc/codecs/rt5677.c | 205 ++-- + sound/soc/codecs/rt5677.h | 4 +- + sound/soc/codecs/sgtl5000.c | 295 ++++-- + sound/soc/codecs/sgtl5000.h | 7 + + sound/soc/codecs/si476x.c | 42 +- + sound/soc/codecs/sirf-audio-codec.c | 58 +- + sound/soc/codecs/spdif_receiver.c | 26 +- + sound/soc/codecs/spdif_transmitter.c | 26 +- + sound/soc/codecs/ssm2518.c | 57 +- + sound/soc/codecs/ssm2602-i2c.c | 7 - + sound/soc/codecs/ssm2602-spi.c | 7 - + sound/soc/codecs/ssm2602.c | 77 +- + sound/soc/codecs/ssm4567.c | 44 +- + sound/soc/codecs/sta32x.c | 134 ++- + sound/soc/codecs/sta350.c | 117 +-- + sound/soc/codecs/sta529.c | 69 +- + sound/soc/codecs/stac9766.c | 77 +- + sound/soc/codecs/sti-sas.c | 84 +- + sound/soc/codecs/tas2552.c | 178 ++-- + sound/soc/codecs/tas5086.c | 94 +- + sound/soc/codecs/tas571x.c | 55 +- + sound/soc/codecs/tas5720.c | 151 ++- + sound/soc/codecs/tas6424.c | 99 +- + sound/soc/codecs/tfa9879.c | 50 +- + sound/soc/codecs/tlv320aic23-i2c.c | 7 - + sound/soc/codecs/tlv320aic23-spi.c | 7 - + sound/soc/codecs/tlv320aic23.c | 120 +-- + sound/soc/codecs/tlv320aic26.c | 83 +- + sound/soc/codecs/tlv320aic31xx.c | 339 +++--- + sound/soc/codecs/tlv320aic31xx.h | 1 + + sound/soc/codecs/tlv320aic32x4.c | 207 ++-- + sound/soc/codecs/tlv320aic3x.c | 295 +++--- + sound/soc/codecs/tlv320dac33.c | 402 ++++--- + sound/soc/codecs/tscs42xx.c | 234 ++--- + sound/soc/codecs/twl4030.c | 383 ++++--- + sound/soc/codecs/twl6040.c | 269 +++-- + sound/soc/codecs/twl6040.h | 10 +- + sound/soc/codecs/uda134x.c | 78 +- + sound/soc/codecs/uda1380.c | 160 ++- + sound/soc/codecs/wl1273.c | 93 +- + sound/soc/codecs/wl1273.h | 2 +- + sound/soc/codecs/wm0010.c | 181 ++-- + sound/soc/codecs/wm1250-ev1.c | 27 +- + sound/soc/codecs/wm2000.c | 78 +- + sound/soc/codecs/wm2200.c | 157 ++- + sound/soc/codecs/wm5100.c | 260 +++-- + sound/soc/codecs/wm5100.h | 2 +- + sound/soc/codecs/wm5102.c | 154 ++- + sound/soc/codecs/wm5110.c | 222 ++-- + sound/soc/codecs/wm8350.c | 183 ++-- + sound/soc/codecs/wm8350.h | 4 +- + sound/soc/codecs/wm8400.c | 211 ++-- + sound/soc/codecs/wm8510.c | 149 ++- + sound/soc/codecs/wm8523.c | 98 +- + sound/soc/codecs/wm8524.c | 56 +- + sound/soc/codecs/wm8580.c | 150 ++- + sound/soc/codecs/wm8711.c | 116 +- + sound/soc/codecs/wm8727.c | 29 +- + sound/soc/codecs/wm8728.c | 82 +- + sound/soc/codecs/wm8731.c | 101 +- + sound/soc/codecs/wm8737.c | 109 +- + sound/soc/codecs/wm8741.c | 133 ++- + sound/soc/codecs/wm8750.c | 115 +- + sound/soc/codecs/wm8753.c | 289 +++-- + sound/soc/codecs/wm8770.c | 131 ++- + sound/soc/codecs/wm8776.c | 105 +- + sound/soc/codecs/wm8782.c | 27 +- + sound/soc/codecs/wm8804.c | 100 +- + sound/soc/codecs/wm8900.c | 251 +++-- + sound/soc/codecs/wm8903.c | 211 ++-- + sound/soc/codecs/wm8903.h | 2 +- + sound/soc/codecs/wm8904.c | 355 +++---- + sound/soc/codecs/wm8940.c | 159 ++- + sound/soc/codecs/wm8955.c | 189 ++-- + sound/soc/codecs/wm8958-dsp2.c | 278 ++--- + sound/soc/codecs/wm8960.c | 249 ++--- + sound/soc/codecs/wm8961.c | 241 +++-- + sound/soc/codecs/wm8962.c | 397 ++++--- + sound/soc/codecs/wm8962.h | 2 +- + sound/soc/codecs/wm8971.c | 108 +- + sound/soc/codecs/wm8974.c | 143 ++- + sound/soc/codecs/wm8978.c | 185 ++-- + sound/soc/codecs/wm8983.c | 170 ++- + sound/soc/codecs/wm8985.c | 201 ++-- + sound/soc/codecs/wm8988.c | 127 +-- + sound/soc/codecs/wm8990.c | 179 ++-- + sound/soc/codecs/wm8991.c | 167 ++- + sound/soc/codecs/wm8993.c | 237 ++--- + sound/soc/codecs/wm8994.c | 810 +++++++------- + sound/soc/codecs/wm8994.h | 8 +- + sound/soc/codecs/wm8995.c | 286 +++-- + sound/soc/codecs/wm8996.c | 401 ++++--- + sound/soc/codecs/wm8996.h | 4 +- + sound/soc/codecs/wm8997.c | 72 +- + sound/soc/codecs/wm8998.c | 115 +- + sound/soc/codecs/wm9081.c | 228 ++-- + sound/soc/codecs/wm9090.c | 109 +- + sound/soc/codecs/wm9705.c | 83 +- + sound/soc/codecs/wm9712.c | 111 +- + sound/soc/codecs/wm9713.c | 203 ++-- + sound/soc/codecs/wm_adsp.c | 71 +- + sound/soc/codecs/wm_adsp.h | 14 +- + sound/soc/codecs/wm_hubs.c | 254 ++--- + sound/soc/codecs/wm_hubs.h | 18 +- + sound/soc/codecs/zx_aud96p22.c | 35 +- + sound/soc/davinci/davinci-i2s.c | 13 +- + sound/soc/dwc/dwc-i2s.c | 4 + + sound/soc/dwc/dwc-pcm.c | 5 +- + sound/soc/fsl/fsl-asoc-card.c | 6 +- + sound/soc/fsl/fsl_asrc.c | 10 - + sound/soc/fsl/fsl_asrc.h | 3 +- + sound/soc/fsl/fsl_asrc_dma.c | 14 +- + sound/soc/fsl/fsl_dma.c | 27 +- + sound/soc/fsl/fsl_esai.c | 2 +- + sound/soc/fsl/fsl_ssi.c | 758 +++++++------- + sound/soc/fsl/fsl_ssi.h | 3 - + sound/soc/fsl/fsl_utils.c | 2 +- + sound/soc/fsl/imx-pcm-fiq.c | 6 +- + sound/soc/fsl/mpc5200_dma.c | 16 +- + sound/soc/fsl/wm1133-ev1.c | 6 +- + sound/soc/img/pistachio-internal-dac.c | 34 +- + sound/soc/intel/atom/sst-atom-controls.c | 36 +- + sound/soc/intel/atom/sst-mfld-platform-compress.c | 4 +- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 32 +- + sound/soc/intel/atom/sst-mfld-platform.h | 4 +- + sound/soc/intel/baytrail/sst-baytrail-pcm.c | 66 +- + sound/soc/intel/boards/Kconfig | 14 + + sound/soc/intel/boards/Makefile | 2 + + sound/soc/intel/boards/bdw-rt5677.c | 41 +- + sound/soc/intel/boards/broadwell.c | 17 +- + sound/soc/intel/boards/bxt_da7219_max98357a.c | 12 +- + sound/soc/intel/boards/bxt_rt298.c | 12 +- + sound/soc/intel/boards/byt-rt5640.c | 4 +- + sound/soc/intel/boards/bytcr_rt5640.c | 8 +- + sound/soc/intel/boards/bytcr_rt5651.c | 2 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 8 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 18 +- + sound/soc/intel/boards/haswell.c | 3 +- + sound/soc/intel/boards/kbl_da7219_max98357a.c | 613 +++++++++++ + sound/soc/intel/boards/kbl_rt5663_max98927.c | 14 +- + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 14 +- + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 12 +- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 12 +- + sound/soc/intel/boards/skl_rt286.c | 12 +- + sound/soc/intel/haswell/sst-haswell-ipc.h | 2 + + sound/soc/intel/haswell/sst-haswell-pcm.c | 118 +-- + sound/soc/intel/skylake/skl-debug.c | 2 +- + sound/soc/intel/skylake/skl-pcm.c | 52 +- + sound/soc/intel/skylake/skl-ssp-clk.c | 4 +- + sound/soc/intel/skylake/skl-topology.c | 26 +- + sound/soc/intel/skylake/skl-topology.h | 2 +- + sound/soc/intel/skylake/skl.c | 13 + + sound/soc/intel/skylake/skl.h | 2 +- + sound/soc/kirkwood/kirkwood-dma.c | 3 +- + sound/soc/kirkwood/kirkwood-i2s.c | 20 +- + sound/soc/kirkwood/kirkwood.h | 4 +- + sound/soc/mediatek/common/mtk-afe-fe-dai.c | 16 +- + .../soc/mediatek/common/mtk-afe-platform-driver.c | 9 +- + .../soc/mediatek/common/mtk-afe-platform-driver.h | 3 +- + sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 50 +- + sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 42 +- + sound/soc/mediatek/mt8173/mt8173-max98090.c | 4 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 6 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 12 +- + sound/soc/mediatek/mt8173/mt8173-rt5650.c | 12 +- + sound/soc/nuc900/nuc900-pcm.c | 5 +- + sound/soc/omap/ams-delta.c | 20 +- + sound/soc/omap/omap-abe-twl6040.c | 8 +- + sound/soc/omap/omap-pcm.c | 5 +- + sound/soc/pxa/mioa701_wm9713.c | 30 +- + sound/soc/pxa/mmp-pcm.c | 11 +- + sound/soc/pxa/pxa2xx-pcm.c | 5 +- + sound/soc/pxa/ttc-dkb.c | 6 +- + sound/soc/qcom/lpass-platform.c | 42 +- + sound/soc/rockchip/rk3399_gru_sound.c | 4 +- + sound/soc/rockchip/rockchip_rt5645.c | 8 +- + sound/soc/samsung/Makefile | 3 - + sound/soc/samsung/i2s-regs.h | 11 +- + sound/soc/samsung/i2s.c | 52 +- + sound/soc/samsung/i2s.h | 11 +- + sound/soc/samsung/idma.c | 5 +- + sound/soc/samsung/littlemill.c | 8 +- + sound/soc/samsung/lowland.c | 12 +- + sound/soc/samsung/speyside.c | 12 +- + sound/soc/samsung/tm2_wm5110.c | 206 +++- + sound/soc/samsung/tobermory.c | 6 +- + sound/soc/sh/dma-sh7760.c | 5 +- + sound/soc/sh/fsi.c | 24 +- + sound/soc/sh/rcar/core.c | 33 +- + sound/soc/sh/rcar/rsnd.h | 20 + + sound/soc/sh/rcar/src.c | 22 +- + sound/soc/sh/rcar/ssi.c | 16 +- + sound/soc/sh/siu.h | 2 +- + sound/soc/sh/siu_dai.c | 10 +- + sound/soc/sh/siu_pcm.c | 9 +- + sound/soc/soc-ac97.c | 84 +- + sound/soc/soc-core.c | 77 +- + sound/soc/soc-dapm.c | 4 +- + sound/soc/soc-generic-dmaengine-pcm.c | 58 +- + sound/soc/soc-utils.c | 28 +- + sound/soc/stm/stm32_adfsdm.c | 7 +- + sound/soc/stm/stm32_spdifrx.c | 7 +- + sound/soc/sunxi/sun4i-codec.c | 71 +- + sound/soc/sunxi/sun8i-codec.c | 23 +- + sound/soc/tegra/tegra_wm8903.c | 8 +- + sound/soc/txx9/txx9aclc.c | 26 +- + sound/soc/uniphier/Kconfig | 22 + + sound/soc/uniphier/Makefile | 6 + + sound/soc/uniphier/aio-compress.c | 439 ++++++++ + sound/soc/uniphier/aio-core.c | 1104 ++++++++++++++++++++ + sound/soc/uniphier/aio-cpu.c | 567 ++++++++++ + sound/soc/uniphier/aio-dma.c | 319 ++++++ + sound/soc/uniphier/aio-ld11.c | 431 ++++++++ + sound/soc/uniphier/aio-reg.h | 462 ++++++++ + sound/soc/uniphier/aio.h | 355 +++++++ + sound/soc/uniphier/evea.c | 91 +- + sound/soc/xtensa/xtfpga-i2s.c | 17 +- + 406 files changed, 22061 insertions(+), 16478 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/ak4458.txt + create mode 100644 Documentation/devicetree/bindings/sound/ak5558.txt + create mode 100644 Documentation/devicetree/bindings/sound/maxim,max9759.txt + create mode 100644 Documentation/devicetree/bindings/sound/uniphier,aio.txt + create mode 100644 sound/soc/amd/acp-da7219-max98357a.c + create mode 100644 sound/soc/codecs/ak4458.c + create mode 100644 sound/soc/codecs/ak4458.h + create mode 100644 sound/soc/codecs/ak5558.c + create mode 100644 sound/soc/codecs/ak5558.h + create mode 100644 sound/soc/codecs/max9759.c + create mode 100644 sound/soc/intel/boards/kbl_da7219_max98357a.c + create mode 100644 sound/soc/uniphier/aio-compress.c + create mode 100644 sound/soc/uniphier/aio-core.c + create mode 100644 sound/soc/uniphier/aio-cpu.c + create mode 100644 sound/soc/uniphier/aio-dma.c + create mode 100644 sound/soc/uniphier/aio-ld11.c + create mode 100644 sound/soc/uniphier/aio-reg.h + create mode 100644 sound/soc/uniphier/aio.h +Merging modules/modules-next (0cad61d7a3d5 modpost: Remove trailing semicolon) +$ git merge modules/modules-next +Already up to date. +Merging input/next (cdc2466df40f Input: synaptics - handle errors from input_mt_init_slots()) +$ git merge input/next +Merge made by the 'recursive' strategy. + drivers/input/mouse/synaptics.c | 82 ++++++++++++++++++++++++----------------- + 1 file changed, 48 insertions(+), 34 deletions(-) +Merging block/for-next (0ccfb3c0032b Merge branch 'for-4.16/block' into for-next) +$ git merge block/for-next +Merge made by the 'recursive' strategy. +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 (51a05338a6f8 dm: use blkdev_get rather than bdgrab when issuing pass-through ioctl) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + drivers/md/dm-bufio.c | 16 ++++++---------- + drivers/md/dm.c | 35 ++++++++++++++++++++--------------- + 2 files changed, 26 insertions(+), 25 deletions(-) +Merging mmc/next (80a7d9316496 Merge branch 'fixes' into next) +$ git merge mmc/next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 1 - + arch/sh/boards/mach-kfr2r09/setup.c | 2 +- + drivers/mmc/core/core.c | 2 +- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 12 +- + drivers/mmc/host/renesas_sdhi_sys_dmac.c | 20 +- + drivers/mmc/host/sdhci-iproc.c | 1 + + drivers/mmc/host/sdhci-omap.c | 378 ++++++++++++++++++++- + drivers/mmc/host/sh_mmcif.c | 8 - + drivers/mmc/host/tmio_mmc_core.c | 61 ++-- + include/linux/mfd/tmio.h | 1 - + 10 files changed, 428 insertions(+), 58 deletions(-) +Merging kgdb/kgdb-next (2cf2f0d5b91f kdb: use memmove instead of overlapping memcpy) +$ git merge kgdb/kgdb-next +Auto-merging kernel/debug/kdb/kdb_main.c +Merge made by the 'recursive' strategy. + drivers/misc/kgdbts.c | 8 +++- + include/linux/timekeeping.h | 1 + + kernel/debug/kdb/kdb_bp.c | 4 +- + kernel/debug/kdb/kdb_main.c | 89 +++++++++++++++++--------------------- + kernel/debug/kdb/kdb_support.c | 4 +- + kernel/time/timekeeping_internal.h | 2 - + 6 files changed, 51 insertions(+), 57 deletions(-) +Merging md/for-next (53b8d89ddbdb md: raid5: avoid string overflow warning) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + drivers/md/md-multipath.c | 2 +- + drivers/md/md.c | 40 +++++++++++++++++++++++++++++++++++----- + drivers/md/md.h | 2 ++ + drivers/md/raid1.c | 2 +- + drivers/md/raid1.h | 12 ++++++++++++ + drivers/md/raid10.c | 8 +++++--- + drivers/md/raid10.h | 13 +++++++++++++ + drivers/md/raid5-log.h | 3 ++- + drivers/md/raid5-ppl.c | 10 ++++++++++ + drivers/md/raid5.c | 11 +++++------ + drivers/md/raid5.h | 12 ++++++++++++ + 11 files changed, 98 insertions(+), 17 deletions(-) +Merging mfd/for-mfd-next (0f89ffefa4e1 mfd: lpc_ich: Do not touch SPI-NOR write protection bit on Apollo Lake) +$ git merge mfd/for-mfd-next +Already up to date. +Merging backlight/for-backlight-next (cfce992766ff Merge branch 'ib-backlight-drm-4.17' into ibs-for-backlight-merged) +$ git merge backlight/for-backlight-next +Merge made by the 'recursive' strategy. + drivers/video/backlight/backlight.c | 73 +++++++++++++++++++++++++++++++++++++ + include/linux/backlight.h | 58 +++++++++++++++++++++++++++++ + 2 files changed, 131 insertions(+) +Merging battery/for-next (416a1ae673db power: supply: gpio-charger: use helper variable to access device info) +$ git merge battery/for-next +Merge made by the 'recursive' strategy. + .../bindings/power/reset/ocelot-reset.txt | 14 ++++ + drivers/power/reset/Kconfig | 7 ++ + drivers/power/reset/Makefile | 1 + + drivers/power/reset/ocelot-reset.c | 88 ++++++++++++++++++++++ + drivers/power/supply/gpio-charger.c | 73 ++++++------------ + drivers/power/supply/ltc2941-battery-gauge.c | 59 ++++++++++++--- + 6 files changed, 181 insertions(+), 61 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/reset/ocelot-reset.txt + create mode 100644 drivers/power/reset/ocelot-reset.c +Merging regulator/for-next (076fe8483340 Merge remote-tracking branches 'regulator/topic/dt' and 'regulator/topic/gpio' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + .../bindings/regulator/fixed-regulator.txt | 1 + + .../bindings/regulator/gpio-regulator.txt | 2 ++ + drivers/regulator/core.c | 27 ++++++++++++++-------- + drivers/regulator/da9055-regulator.c | 4 ++-- + drivers/regulator/da9211-regulator.c | 23 +++++++++--------- + drivers/regulator/of_regulator.c | 1 + + drivers/regulator/stm32-vrefbuf.c | 2 +- + include/linux/mfd/da9055/pdata.h | 5 ++-- + include/linux/regulator/da9211.h | 4 +++- + include/linux/regulator/driver.h | 3 +++ + 10 files changed, 44 insertions(+), 28 deletions(-) +Merging security/next-testing (a58e3226e2e4 Merge tag 'v4.16-rc2' into next-testing) +$ git merge security/next-testing +Already up to date! +Merge made by the 'recursive' strategy. +Merging integrity/next-integrity (5f26b1bddb4a IMA: Support using new creds in appraisal policy) +$ git merge integrity/next-integrity +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/ima_policy | 2 +- + include/linux/lsm_hooks.h | 6 +++++ + include/linux/security.h | 1 + + security/integrity/iint.c | 2 ++ + security/integrity/ima/ima.h | 9 ++++---- + security/integrity/ima/ima_api.c | 9 +++++--- + security/integrity/ima/ima_appraise.c | 14 ++++++++++-- + security/integrity/ima/ima_main.c | 42 ++++++++++++++++++++++++++--------- + security/integrity/ima/ima_policy.c | 23 ++++++++++++------- + security/integrity/integrity.h | 9 ++++++-- + security/security.c | 7 ++++++ + security/selinux/hooks.c | 6 +++++ + security/smack/smack_lsm.c | 18 +++++++++++++++ + 13 files changed, 118 insertions(+), 30 deletions(-) +Merging keys/keys-next (1e684d3820d8 pkcs7: Set the module licence to prevent tainting) +$ git merge keys/keys-next +Already up to date. +Merging selinux/next (db97c9f9d312 selinux: Add SCTP support) +$ git merge selinux/next +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging net/sctp/ipv6.c +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Merge made by the 'recursive' strategy. + Documentation/security/LSM-sctp.rst | 175 ++++++++++++++++++++ + Documentation/security/SELinux-sctp.rst | 157 ++++++++++++++++++ + include/linux/lsm_hooks.h | 36 ++++ + include/linux/security.h | 25 +++ + include/net/sctp/sctp.h | 4 +- + include/net/sctp/structs.h | 12 ++ + include/uapi/linux/sctp.h | 1 + + net/netlabel/netlabel_unlabeled.c | 10 ++ + net/sctp/chunk.c | 10 +- + net/sctp/ipv6.c | 45 ++++- + net/sctp/output.c | 34 ++-- + net/sctp/protocol.c | 38 +++++ + net/sctp/sm_make_chunk.c | 12 ++ + net/sctp/sm_statefuns.c | 18 ++ + net/sctp/socket.c | 73 ++++++++- + security/security.c | 22 +++ + security/selinux/hooks.c | 280 +++++++++++++++++++++++++++++--- + security/selinux/include/classmap.h | 2 +- + security/selinux/include/netlabel.h | 21 ++- + security/selinux/include/objsec.h | 4 + + security/selinux/netlabel.c | 133 +++++++++++++-- + 21 files changed, 1052 insertions(+), 60 deletions(-) + create mode 100644 Documentation/security/LSM-sctp.rst + create mode 100644 Documentation/security/SELinux-sctp.rst +Merging tpmdd/next (c3211d722c61 tpm: fix potential buffer overruns caused by bit glitches on the bus) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + drivers/char/tpm/tpm-interface.c | 4 ++++ + drivers/char/tpm/tpm2-cmd.c | 4 ++++ + 2 files changed, 8 insertions(+) +Merging watchdog/master (a17f4f032b61 watchdog: sp5100_tco.c: fix potential build failure) +$ git merge watchdog/master +Merge made by the 'recursive' strategy. + drivers/watchdog/Kconfig | 4 ++++ + 1 file changed, 4 insertions(+) +Merging iommu/next (18b3c16e25fb Merge branches 'x86/amd', 'x86/vt-d', 'arm/mediatek', 'arm/exynos' and 'core' into next) +$ git merge iommu/next +Auto-merging drivers/irqchip/irq-gic-v3-its.c +Merge made by the 'recursive' strategy. + drivers/acpi/arm64/iort.c | 111 ++++++++++++++++++++++++++++++++++++- + drivers/iommu/amd_iommu.c | 65 +++++++++++++--------- + drivers/iommu/amd_iommu_init.c | 2 +- + drivers/iommu/amd_iommu_types.h | 4 +- + drivers/iommu/dma-iommu.c | 8 ++- + drivers/iommu/dmar.c | 2 +- + drivers/iommu/exynos-iommu.c | 13 +---- + drivers/iommu/io-pgtable-arm-v7s.c | 21 +++---- + drivers/iommu/io-pgtable-arm.c | 24 ++++---- + drivers/iommu/io-pgtable.h | 4 +- + drivers/iommu/iommu.c | 6 +- + drivers/iommu/mtk_iommu_v1.c | 54 +++++++----------- + drivers/irqchip/irq-gic-v3-its.c | 3 +- + include/linux/acpi_iort.h | 7 ++- + include/linux/intel-iommu.h | 12 ++-- + include/linux/iommu.h | 14 ++--- + 16 files changed, 229 insertions(+), 121 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 (46ed90f157f4 vfio: mdev: make a couple of functions and structure vfio_mdev_driver static) +$ git merge vfio/next +Already up to date. +Merging trivial/for-next (1972d6c0c86d MAINTAINERS: relinquish kconfig) +$ git merge trivial/for-next +Already up to date. +Merging audit/next (23138ead2700 audit: return on memory error to avoid null pointer dereference) +$ git merge audit/next +Auto-merging kernel/audit.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 - + kernel/audit.c | 5 ++++- + kernel/auditfilter.c | 5 ++--- + kernel/auditsc.c | 22 ++++++++++------------ + 4 files changed, 16 insertions(+), 17 deletions(-) +Merging devicetree/for-next (7ea5c83472d3 Merge branches 'dt/next' and 'dt/linus' into for-next) +$ git merge devicetree/for-next +Merge made by the 'recursive' strategy. + .../bindings/{misc => auxdisplay}/arm-charlcd.txt | 0 + .../devicetree/bindings/thermal/imx-thermal.txt | 25 +++ + drivers/gpio/gpiolib-of.c | 4 +- + drivers/of/base.c | 184 +++++++++++++++++++++ + drivers/of/unittest-data/tests-phandle.dtsi | 25 +++ + drivers/of/unittest.c | 120 ++++++++++++++ + include/linux/of.h | 12 ++ + 7 files changed, 368 insertions(+), 2 deletions(-) + rename Documentation/devicetree/bindings/{misc => auxdisplay}/arm-charlcd.txt (100%) +Merging mailbox/mailbox-for-next (0ae7d327a64b dt-bindings: mailbox: qcom: Document the APCS clock binding) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (a48478413035 Merge remote-tracking branches 'spi/topic/orion' and 'spi/topic/pxa2xx' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/spi/spi-gpio.txt | 24 +- + arch/arm/mach-pxa/cm-x300.c | 21 +- + arch/arm/mach-pxa/raumfeld.c | 26 +- + arch/arm/mach-s3c24xx/mach-jive.c | 55 +++-- + arch/arm/mach-s3c24xx/mach-qt2410.c | 26 +- + arch/arm/mach-s3c64xx/mach-smartq.c | 22 +- + arch/mips/alchemy/devboards/db1000.c | 24 +- + arch/mips/jz4740/board-qi_lb60.c | 26 +- + drivers/misc/eeprom/digsy_mtc_eeprom.c | 29 ++- + drivers/spi/Kconfig | 4 +- + drivers/spi/spi-bcm2835aux.c | 18 +- + drivers/spi/spi-dw-mid.c | 6 +- + drivers/spi/spi-dw.c | 26 +- + drivers/spi/spi-dw.h | 4 +- + drivers/spi/spi-gpio.c | 270 +++++++-------------- + drivers/spi/spi-orion.c | 65 ++++- + drivers/spi/spi-pxa2xx-dma.c | 4 +- + drivers/spi/spi-pxa2xx.c | 54 +++-- + drivers/spi/spi-pxa2xx.h | 2 +- + include/linux/spi/spi_gpio.h | 49 +--- + 20 files changed, 396 insertions(+), 359 deletions(-) +Merging tip/auto-latest (ecb8c06dc1c7 Merge branch 'ras/core') +$ git merge tip/auto-latest +Auto-merging tools/perf/Makefile.perf +Auto-merging scripts/Makefile.build +Auto-merging kernel/workqueue.c +Auto-merging include/linux/compiler-gcc.h +Auto-merging arch/x86/kernel/machine_kexec_64.c +Auto-merging Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 20 + + Documentation/features/list-arch.sh | 2 +- + Documentation/locking/lockdep-design.txt | 51 +- + Documentation/memory-barriers.txt | 8 +- + Documentation/trace/coresight.txt | 51 + + Documentation/x86/x86_64/5level-paging.txt | 9 +- + MAINTAINERS | 18 + + Makefile | 5 + + arch/alpha/include/asm/xchg.h | 15 +- + arch/x86/Kconfig | 14 +- + arch/x86/Makefile | 7 +- + arch/x86/boot/compressed/Makefile | 2 +- + arch/x86/boot/compressed/head_64.S | 178 +- + arch/x86/boot/compressed/kaslr.c | 14 + + .../boot/compressed/{pagetable.c => kaslr_64.c} | 0 + arch/x86/boot/compressed/misc.c | 16 - + arch/x86/boot/compressed/misc.h | 5 + + arch/x86/boot/compressed/pgtable.h | 18 + + arch/x86/boot/compressed/pgtable_64.c | 100 +- + arch/x86/entry/calling.h | 34 +- + arch/x86/entry/entry_32.S | 3 +- + arch/x86/entry/entry_64.S | 158 +- + arch/x86/entry/entry_64_compat.S | 71 +- + arch/x86/include/asm/acpi.h | 7 + + arch/x86/include/asm/apic.h | 2 +- + arch/x86/include/asm/apm.h | 6 + + arch/x86/include/asm/asm-prototypes.h | 3 - + arch/x86/include/asm/cpufeatures.h | 1 + + arch/x86/include/asm/efi.h | 17 +- + arch/x86/include/asm/io_apic.h | 10 +- + arch/x86/include/asm/kaslr.h | 4 - + arch/x86/include/asm/mce.h | 53 +- + arch/x86/include/asm/mem_encrypt.h | 1 + + arch/x86/include/asm/microcode.h | 9 +- + arch/x86/include/asm/mmu_context.h | 1 + + arch/x86/include/asm/nospec-branch.h | 138 +- + arch/x86/include/asm/page_64.h | 6 +- + arch/x86/include/asm/page_64_types.h | 20 +- + arch/x86/include/asm/paravirt.h | 38 +- + arch/x86/include/asm/paravirt_types.h | 5 +- + arch/x86/include/asm/pgalloc.h | 5 +- + arch/x86/include/asm/pgtable-3level_types.h | 1 + + arch/x86/include/asm/pgtable.h | 19 +- + arch/x86/include/asm/pgtable_32.h | 2 + + arch/x86/include/asm/pgtable_32_types.h | 2 + + arch/x86/include/asm/pgtable_64.h | 23 +- + arch/x86/include/asm/pgtable_64_types.h | 70 +- + arch/x86/include/asm/pgtable_types.h | 10 + + arch/x86/include/asm/processor.h | 1 + + arch/x86/include/asm/refcount.h | 4 +- + arch/x86/include/asm/required-features.h | 8 +- + arch/x86/include/asm/rmwcc.h | 16 +- + arch/x86/include/asm/sparsemem.h | 9 +- + arch/x86/include/asm/x86_init.h | 17 +- + arch/x86/include/uapi/asm/hyperv.h | 18 +- + arch/x86/kernel/apic/apic.c | 4 +- + arch/x86/kernel/apic/io_apic.c | 18 +- + arch/x86/kernel/apic/x2apic_phys.c | 2 +- + arch/x86/kernel/cpu/bugs.c | 12 +- + arch/x86/kernel/cpu/common.c | 30 + + arch/x86/kernel/cpu/mcheck/mce-internal.h | 59 +- + arch/x86/kernel/cpu/mcheck/mce.c | 52 +- + arch/x86/kernel/cpu/mcheck/mce_amd.c | 78 +- + arch/x86/kernel/cpu/microcode/amd.c | 10 +- + arch/x86/kernel/cpu/microcode/core.c | 39 +- + arch/x86/kernel/cpu/microcode/intel.c | 10 +- + arch/x86/kernel/crash.c | 3 +- + arch/x86/kernel/e820.c | 18 + + arch/x86/kernel/head64.c | 81 +- + arch/x86/kernel/head_64.S | 24 +- + arch/x86/kernel/irqinit.c | 9 +- + arch/x86/kernel/machine_kexec_32.c | 8 +- + arch/x86/kernel/machine_kexec_64.c | 8 +- + arch/x86/kernel/reboot.c | 3 +- + arch/x86/kernel/setup.c | 5 +- + arch/x86/kernel/unwind_orc.c | 3 +- + arch/x86/kernel/vmlinux.lds.S | 7 +- + arch/x86/kernel/x86_init.c | 19 +- + arch/x86/lib/Makefile | 1 - + arch/x86/lib/clear_page_64.S | 2 - + arch/x86/lib/retpoline.S | 56 - + arch/x86/mm/Makefile | 14 +- + arch/x86/mm/debug_pagetables.c | 32 + + arch/x86/mm/dump_pagetables.c | 33 +- + arch/x86/mm/fault.c | 8 +- + arch/x86/mm/ident_map.c | 2 +- + arch/x86/mm/init_64.c | 32 +- + arch/x86/mm/kasan_init_64.c | 20 +- + arch/x86/mm/kaslr.c | 29 +- + arch/x86/mm/mem_encrypt.c | 578 +----- + arch/x86/mm/mem_encrypt_boot.S | 2 + + arch/x86/mm/mem_encrypt_identity.c | 564 ++++++ + arch/x86/mm/tlb.c | 4 +- + arch/x86/oprofile/nmi_int.c | 2 +- + arch/x86/platform/atom/punit_atom_debug.c | 17 +- + arch/x86/platform/efi/efi_64.c | 10 +- + arch/x86/platform/intel-quark/imr.c | 24 +- + arch/x86/power/hibernate_64.c | 6 +- + arch/x86/realmode/rm/trampoline_64.S | 2 +- + arch/x86/xen/Kconfig | 5 - + arch/x86/xen/apic.c | 2 +- + arch/x86/xen/enlighten_pvh.c | 14 +- + arch/x86/xen/mmu_pv.c | 21 + + drivers/acpi/osl.c | 5 +- + drivers/edac/mce_amd.c | 11 +- + drivers/iommu/irq_remapping.c | 4 +- + include/asm-generic/5level-fixup.h | 1 + + include/asm-generic/pgtable-nop4d.h | 9 +- + include/linux/acpi.h | 7 + + include/linux/compiler-clang.h | 5 + + include/linux/compiler-gcc.h | 4 + + include/linux/init.h | 8 +- + include/linux/interrupt.h | 2 - + include/linux/jump_label.h | 3 + + include/linux/kasan.h | 2 +- + include/linux/kernel.h | 1 + + include/linux/mutex.h | 5 + + include/linux/nospec.h | 26 +- + include/linux/sched/isolation.h | 1 + + include/linux/sched/nohz.h | 4 - + include/linux/tick.h | 4 +- + include/linux/trace_events.h | 8 + + include/uapi/linux/perf_event.h | 4 + + init/main.c | 2 + + kernel/events/core.c | 188 +- + kernel/extable.c | 2 +- + kernel/irq/manage.c | 10 +- + kernel/jump_label.c | 27 +- + kernel/sched/core.c | 117 +- + kernel/sched/deadline.c | 8 + + kernel/sched/fair.c | 100 +- + kernel/sched/idle_task.c | 9 +- + kernel/sched/isolation.c | 7 +- + kernel/sched/rt.c | 8 + + kernel/sched/sched.h | 13 +- + kernel/sched/stop_task.c | 8 + + kernel/time/tick-sched.c | 15 +- + kernel/trace/trace_event_perf.c | 102 ++ + kernel/trace/trace_kprobe.c | 91 +- + kernel/trace/trace_probe.h | 11 + + kernel/trace/trace_uprobe.c | 86 +- + kernel/workqueue.c | 3 +- + lib/debugobjects.c | 140 +- + mm/kasan/kasan_init.c | 2 +- + mm/zsmalloc.c | 13 +- + scripts/Makefile.build | 8 + + tools/arch/powerpc/include/uapi/asm/unistd.h | 402 +++++ + tools/include/uapi/linux/perf_event.h | 4 + + tools/lib/api/fs/fs.c | 44 +- + tools/lib/api/fs/fs.h | 2 + + tools/lib/symbol/kallsyms.c | 4 + + tools/memory-model/Documentation/cheatsheet.txt | 29 + + tools/memory-model/Documentation/explanation.txt | 1845 ++++++++++++++++++++ + tools/memory-model/Documentation/recipes.txt | 570 ++++++ + tools/memory-model/Documentation/references.txt | 107 ++ + tools/memory-model/README | 221 +++ + tools/memory-model/linux-kernel.bell | 52 + + tools/memory-model/linux-kernel.cat | 121 ++ + tools/memory-model/linux-kernel.cfg | 21 + + tools/memory-model/linux-kernel.def | 106 ++ + .../litmus-tests/CoRR+poonceonce+Once.litmus | 26 + + .../litmus-tests/CoRW+poonceonce+Once.litmus | 25 + + .../litmus-tests/CoWR+poonceonce+Once.litmus | 25 + + .../litmus-tests/CoWW+poonceonce.litmus | 18 + + .../litmus-tests/IRIW+mbonceonces+OnceOnce.litmus | 45 + + .../litmus-tests/IRIW+poonceonces+OnceOnce.litmus | 43 + + .../ISA2+pooncelock+pooncelock+pombonce.litmus | 41 + + .../litmus-tests/ISA2+poonceonces.litmus | 37 + + ...cerelease+poacquirerelease+poacquireonce.litmus | 39 + + .../litmus-tests/LB+ctrlonceonce+mbonceonce.litmus | 34 + + .../LB+poacquireonce+pooncerelease.litmus | 29 + + .../litmus-tests/LB+poonceonces.litmus | 28 + + .../litmus-tests/MP+onceassign+derefonce.litmus | 34 + + tools/memory-model/litmus-tests/MP+polocks.litmus | 35 + + .../litmus-tests/MP+poonceonces.litmus | 27 + + .../MP+pooncerelease+poacquireonce.litmus | 28 + + .../memory-model/litmus-tests/MP+porevlocks.litmus | 35 + + .../litmus-tests/MP+wmbonceonce+rmbonceonce.litmus | 30 + + .../memory-model/litmus-tests/R+mbonceonces.litmus | 30 + + .../memory-model/litmus-tests/R+poonceonces.litmus | 27 + + tools/memory-model/litmus-tests/README | 125 ++ + .../memory-model/litmus-tests/S+poonceonces.litmus | 28 + + .../S+wmbonceonce+poacquireonce.litmus | 27 + + .../litmus-tests/SB+mbonceonces.litmus | 32 + + .../litmus-tests/SB+poonceonces.litmus | 29 + + .../litmus-tests/WRC+poonceonces+Once.litmus | 35 + + .../WRC+pooncerelease+rmbonceonce+Once.litmus | 36 + + .../Z6.0+pooncelock+poonceLock+pombonce.litmus | 42 + + .../Z6.0+pooncelock+pooncelock+pombonce.litmus | 40 + + ...ooncerelease+poacquirerelease+mbonceonce.litmus | 42 + + tools/memory-model/lock.cat | 99 ++ + tools/objtool/builtin-check.c | 6 +- + tools/objtool/builtin-orc.c | 6 +- + tools/objtool/builtin.h | 5 + + tools/objtool/check.c | 100 +- + tools/objtool/check.h | 3 +- + tools/perf/Documentation/perf-annotate.txt | 6 +- + tools/perf/Documentation/perf-kmem.txt | 6 +- + tools/perf/Documentation/perf-mem.txt | 4 + + tools/perf/Documentation/perf-report.txt | 5 +- + tools/perf/Documentation/perf-script.txt | 3 + + tools/perf/Documentation/perf-stat.txt | 10 + + tools/perf/Makefile.config | 25 +- + tools/perf/Makefile.perf | 4 +- + tools/perf/arch/arm/util/auxtrace.c | 2 +- + tools/perf/arch/arm/util/cs-etm.c | 51 +- + tools/perf/arch/powerpc/Makefile | 25 + + .../perf/arch/powerpc/entry/syscalls/mksyscalltbl | 37 + + tools/perf/arch/s390/annotate/instructions.c | 27 +- + tools/perf/arch/s390/util/header.c | 148 +- + tools/perf/builtin-ftrace.c | 18 +- + tools/perf/builtin-record.c | 2 +- + tools/perf/builtin-report.c | 7 +- + tools/perf/builtin-script.c | 17 + + tools/perf/builtin-stat.c | 53 +- + tools/perf/check-headers.sh | 1 + + tools/perf/python/twatch.py | 8 +- + .../perf/scripts/python/Perf-Trace-Util/Context.c | 34 +- + tools/perf/tests/code-reading.c | 33 +- + tools/perf/tests/dwarf-unwind.c | 46 +- + tools/perf/tests/shell/lib/probe_vfs_getname.sh | 2 +- + .../perf/tests/shell/trace+probe_libc_inet_pton.sh | 6 +- + tools/perf/tests/vmlinux-kallsyms.c | 4 +- + tools/perf/ui/browsers/annotate.c | 9 +- + tools/perf/util/build-id.c | 10 +- + tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 74 +- + tools/perf/util/cs-etm-decoder/cs-etm-decoder.h | 2 + + tools/perf/util/cs-etm.c | 478 ++++- + tools/perf/util/event.c | 16 +- + tools/perf/util/evlist.c | 21 +- + tools/perf/util/header.h | 1 + + tools/perf/util/hist.c | 4 +- + tools/perf/util/hist.h | 1 - + tools/perf/util/machine.c | 145 +- + tools/perf/util/machine.h | 6 +- + tools/perf/util/pmu.c | 47 +- + tools/perf/util/python.c | 95 +- + .../util/scripting-engines/trace-event-python.c | 147 +- + tools/perf/util/setup.py | 6 +- + tools/perf/util/sort.c | 7 +- + tools/perf/util/stat.h | 2 + + tools/perf/util/symbol.c | 13 +- + tools/perf/util/syscalltbl.c | 8 + + tools/perf/util/thread_map.c | 4 +- + tools/perf/util/thread_map.h | 2 +- + 245 files changed, 8991 insertions(+), 1901 deletions(-) + rename arch/x86/boot/compressed/{pagetable.c => kaslr_64.c} (100%) + create mode 100644 arch/x86/boot/compressed/pgtable.h + create mode 100644 arch/x86/mm/mem_encrypt_identity.c + create mode 100644 tools/arch/powerpc/include/uapi/asm/unistd.h + create mode 100644 tools/memory-model/Documentation/cheatsheet.txt + create mode 100644 tools/memory-model/Documentation/explanation.txt + create mode 100644 tools/memory-model/Documentation/recipes.txt + create mode 100644 tools/memory-model/Documentation/references.txt + create mode 100644 tools/memory-model/README + create mode 100644 tools/memory-model/linux-kernel.bell + create mode 100644 tools/memory-model/linux-kernel.cat + create mode 100644 tools/memory-model/linux-kernel.cfg + create mode 100644 tools/memory-model/linux-kernel.def + create mode 100644 tools/memory-model/litmus-tests/CoRR+poonceonce+Once.litmus + create mode 100644 tools/memory-model/litmus-tests/CoRW+poonceonce+Once.litmus + create mode 100644 tools/memory-model/litmus-tests/CoWR+poonceonce+Once.litmus + create mode 100644 tools/memory-model/litmus-tests/CoWW+poonceonce.litmus + create mode 100644 tools/memory-model/litmus-tests/IRIW+mbonceonces+OnceOnce.litmus + create mode 100644 tools/memory-model/litmus-tests/IRIW+poonceonces+OnceOnce.litmus + create mode 100644 tools/memory-model/litmus-tests/ISA2+pooncelock+pooncelock+pombonce.litmus + create mode 100644 tools/memory-model/litmus-tests/ISA2+poonceonces.litmus + create mode 100644 tools/memory-model/litmus-tests/ISA2+pooncerelease+poacquirerelease+poacquireonce.litmus + create mode 100644 tools/memory-model/litmus-tests/LB+ctrlonceonce+mbonceonce.litmus + create mode 100644 tools/memory-model/litmus-tests/LB+poacquireonce+pooncerelease.litmus + create mode 100644 tools/memory-model/litmus-tests/LB+poonceonces.litmus + create mode 100644 tools/memory-model/litmus-tests/MP+onceassign+derefonce.litmus + create mode 100644 tools/memory-model/litmus-tests/MP+polocks.litmus + create mode 100644 tools/memory-model/litmus-tests/MP+poonceonces.litmus + create mode 100644 tools/memory-model/litmus-tests/MP+pooncerelease+poacquireonce.litmus + create mode 100644 tools/memory-model/litmus-tests/MP+porevlocks.litmus + create mode 100644 tools/memory-model/litmus-tests/MP+wmbonceonce+rmbonceonce.litmus + create mode 100644 tools/memory-model/litmus-tests/R+mbonceonces.litmus + create mode 100644 tools/memory-model/litmus-tests/R+poonceonces.litmus + create mode 100644 tools/memory-model/litmus-tests/README + create mode 100644 tools/memory-model/litmus-tests/S+poonceonces.litmus + create mode 100644 tools/memory-model/litmus-tests/S+wmbonceonce+poacquireonce.litmus + create mode 100644 tools/memory-model/litmus-tests/SB+mbonceonces.litmus + create mode 100644 tools/memory-model/litmus-tests/SB+poonceonces.litmus + create mode 100644 tools/memory-model/litmus-tests/WRC+poonceonces+Once.litmus + create mode 100644 tools/memory-model/litmus-tests/WRC+pooncerelease+rmbonceonce+Once.litmus + create mode 100644 tools/memory-model/litmus-tests/Z6.0+pooncelock+poonceLock+pombonce.litmus + create mode 100644 tools/memory-model/litmus-tests/Z6.0+pooncelock+pooncelock+pombonce.litmus + create mode 100644 tools/memory-model/litmus-tests/Z6.0+pooncerelease+poacquirerelease+mbonceonce.litmus + create mode 100644 tools/memory-model/lock.cat + create mode 100755 tools/perf/arch/powerpc/entry/syscalls/mksyscalltbl +Merging clockevents/clockevents/next (322fd24f5e67 clocksource/drivers/stm32: Start the timer's counter sooner) +$ git merge clockevents/clockevents/next +Resolved 'drivers/clocksource/Kconfig' using previous resolution. +Resolved 'drivers/clocksource/timer-of.c' using previous resolution. +Resolved 'drivers/clocksource/timer-stm32.c' using previous resolution. +Auto-merging drivers/clocksource/timer-stm32.c +CONFLICT (content): Merge conflict in drivers/clocksource/timer-stm32.c +Auto-merging drivers/clocksource/timer-of.c +CONFLICT (content): Merge conflict in drivers/clocksource/timer-of.c +Auto-merging drivers/clocksource/Kconfig +CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9ce3fc3a9096] Merge remote-tracking branch 'clockevents/clockevents/next' +$ git diff -M --stat --summary HEAD^.. +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 (68fa24f9121c EDAC, mv64x60: Fix an error handling path) +$ git merge edac-amd/for-next +Already up to date. +Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1) +$ git merge irqchip/irqchip/for-next +Already up to date. +Merging ftrace/for-next (841a915d20c7 vsprintf: Do not have bprintf dereference pointers) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (4cad5591fc03 rcu: Create RCU-specific workqueues with rescuers) +$ git merge rcu/rcu/next +Auto-merging kernel/time/tick-sched.c +Merge made by the 'recursive' strategy. + Documentation/timers/NO_HZ.txt | 7 -- + include/linux/rcupdate.h | 10 +-- + include/linux/types.h | 2 +- + include/trace/events/rcu.h | 4 ++ + kernel/rcu/rcu.h | 38 +++++++---- + kernel/rcu/rcuperf.c | 21 +++++- + kernel/rcu/rcutorture.c | 72 ++++++++++++--------- + kernel/rcu/srcutree.c | 27 ++++---- + kernel/rcu/tree.c | 75 ++++++++-------------- + kernel/rcu/tree.h | 37 ++--------- + kernel/rcu/tree_exp.h | 36 ++++++++--- + kernel/rcu/tree_plugin.h | 66 +++++++++++++++---- + kernel/time/Kconfig | 10 --- + kernel/time/tick-sched.c | 22 +------ + .../testing/selftests/rcutorture/bin/functions.sh | 17 ++++- + .../rcutorture/bin/kvm-recheck-rcuperf-ftrace.sh | 11 ++-- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 4 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 22 +++++-- + .../selftests/rcutorture/configs/rcu/TASKS03 | 1 - + .../selftests/rcutorture/configs/rcu/TASKS03.boot | 2 +- + .../selftests/rcutorture/configs/rcu/TREE04 | 1 - + .../selftests/rcutorture/configs/rcu/TREE04.boot | 2 +- + .../selftests/rcutorture/configs/rcu/TREE07 | 1 - + .../rcutorture/configs/rcuperf/ver_functions.sh | 24 +------ + .../selftests/rcutorture/doc/rcu-test-image.txt | 2 +- + 25 files changed, 272 insertions(+), 242 deletions(-) +Merging kvm/linux-next (7928b2cbe55b Linux 4.16-rc1) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (7928b2cbe55b Linux 4.16-rc1) +$ 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 (7928b2cbe55b Linux 4.16-rc1) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (0e394a53c11e KVM: s390: implement CPU model only facilities) +$ git merge kvms390/next +Recorded preimage for 'drivers/video/console/Kconfig' +Auto-merging drivers/video/console/Kconfig +CONFLICT (content): Merge conflict in drivers/video/console/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/video/console/Kconfig'. +[master 91ecb9358ccd] Merge remote-tracking branch 'kvms390/next' +$ git diff -M --stat --summary HEAD^.. + arch/s390/kernel/setup.c | 2 ++ + arch/s390/kvm/kvm-s390.c | 53 ++++++++++++++++++++------------ + arch/s390/kvm/kvm-s390.h | 2 -- + arch/s390/tools/gen_facilities.c | 20 ++++++++++++ + drivers/s390/char/defkeymap.c | 66 +++++++++++++++++++++------------------- + drivers/s390/char/keyboard.c | 32 +++++++++---------- + drivers/s390/char/keyboard.h | 11 +++++++ + drivers/tty/Kconfig | 2 +- + drivers/video/Kconfig | 21 +++++++------ + drivers/video/console/Kconfig | 6 ++-- + 10 files changed, 132 insertions(+), 83 deletions(-) +Merging xen-tip/linux-next (d1a75e0896f5 pvcalls-front: wait for other operations to return when release passive sockets) +$ git merge xen-tip/linux-next +Already up to date. +Merging percpu/for-next (554fef1c39ee percpu: allow select gfp to be passed to underlying allocators) +$ git merge percpu/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + mm/percpu-km.c | 8 ++++---- + mm/percpu-vm.c | 18 +++++++++++------- + mm/percpu.c | 52 +++++++++++++++++++++++++++++++--------------------- + 4 files changed, 47 insertions(+), 32 deletions(-) +Merging workqueues/for-next (a10eb37ccf1d Merge branch 'for-4.15-fixes' into for-next) +$ git merge workqueues/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging drivers-x86/for-next (c8ba9db2a790 platform/x86: dell-laptop: Removed duplicates in DMI whitelist) +$ git merge drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (7928b2cbe55b Linux 4.16-rc1) +$ git merge chrome-platform/for-next +Already up to date. +Merging hsi/for-next (b6dc80dbe6cd HSI: cmt_speech: use timespec64 instead of timespec) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (2dd1ea5b8a49 leds: Add more product/board names for PC Engines APU2) +$ git merge leds/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/leds/Kconfig | 29 +++-- + drivers/leds/Makefile | 1 + + drivers/leds/leds-apu.c | 26 ++++- + drivers/leds/leds-mlxreg.c | 281 +++++++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 326 insertions(+), 12 deletions(-) + create mode 100644 drivers/leds/leds-mlxreg.c +Merging ipmi/for-next (09c0179286c7 ipmi: kcs_bmc: mark expected switch fall-through in kcs_bmc_handle_data) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ipmi/aspeed-kcs-bmc.txt | 25 ++ + drivers/char/ipmi/Kconfig | 15 + + drivers/char/ipmi/Makefile | 2 + + drivers/char/ipmi/kcs_bmc.c | 465 +++++++++++++++++++++ + drivers/char/ipmi/kcs_bmc.h | 106 +++++ + drivers/char/ipmi/kcs_bmc_aspeed.c | 319 ++++++++++++++ + include/uapi/linux/ipmi_bmc.h | 14 + + 7 files changed, 946 insertions(+) + create mode 100644 Documentation/devicetree/bindings/ipmi/aspeed-kcs-bmc.txt + create mode 100644 drivers/char/ipmi/kcs_bmc.c + create mode 100644 drivers/char/ipmi/kcs_bmc.h + create mode 100644 drivers/char/ipmi/kcs_bmc_aspeed.c + create mode 100644 include/uapi/linux/ipmi_bmc.h +Merging driver-core/driver-core-next (91ab883eb213 Linux 4.16-rc2) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (b382a5c3c592 USB: chaoskey: Use kasprintf() over strcpy()/strcat()) +$ git merge usb/usb-next +Merge made by the 'recursive' strategy. + drivers/usb/host/ehci-mem.c | 3 +-- + drivers/usb/host/ehci-sched.c | 6 ++---- + drivers/usb/misc/chaoskey.c | 8 ++------ + 3 files changed, 5 insertions(+), 12 deletions(-) +Merging usb-gadget/next (8ada211d0383 usb: renesas_usbhs: add extcon notifier to set mode for non-otg channel) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (d1c48227d7c4 USB: serial: f81534: fix tx error on some baud rate) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/ci-for-usb-next (ce4c1b820c52 usb: chipidea: imx: Fix ULPI on imx53) +$ git merge usb-chipidea-next/ci-for-usb-next +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/ci_hdrc_imx.c | 15 +++++++++++++-- + drivers/usb/chipidea/usbmisc_imx.c | 26 ++++++++++++++++---------- + 2 files changed, 29 insertions(+), 12 deletions(-) +Merging phy-next/next (2434c6789d8e phy: amlogic: phy-meson-gxl-usb2: rename some of the U2P_R2 registers) +$ git merge phy-next/next +Merge made by the 'recursive' strategy. + .../bindings/arm/hisilicon/hisilicon.txt | 23 + + .../devicetree/bindings/phy/meson-gxl-usb2-phy.txt | 4 + + .../bindings/phy/phy-hi3798cv200-combphy.txt | 59 ++ + .../devicetree/bindings/phy/qcom-qmp-phy.txt | 6 +- + .../devicetree/bindings/phy/qcom-qusb2-phy.txt | 5 +- + .../devicetree/bindings/phy/sun4i-usb-phy.txt | 1 + + drivers/phy/allwinner/phy-sun4i-usb.c | 12 + + drivers/phy/amlogic/Kconfig | 1 - + drivers/phy/amlogic/phy-meson-gxl-usb2.c | 78 ++- + drivers/phy/hisilicon/Kconfig | 9 + + drivers/phy/hisilicon/Makefile | 1 + + drivers/phy/hisilicon/phy-histb-combphy.c | 289 +++++++++ + drivers/phy/phy-core.c | 2 + + drivers/phy/qualcomm/phy-qcom-qmp.c | 647 ++++++++++++++------- + drivers/phy/qualcomm/phy-qcom-qmp.h | 280 +++++++++ + drivers/phy/qualcomm/phy-qcom-qusb2.c | 418 ++++++++++--- + drivers/phy/qualcomm/phy-qcom-ufs.c | 5 + + drivers/phy/rockchip/phy-rockchip-emmc.c | 60 +- + drivers/phy/samsung/Kconfig | 2 +- + drivers/phy/tegra/xusb.c | 2 +- + include/linux/phy/phy.h | 31 +- + 21 files changed, 1607 insertions(+), 328 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/phy-hi3798cv200-combphy.txt + create mode 100644 drivers/phy/hisilicon/phy-histb-combphy.c + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp.h +Merging tty/tty-next (91ab883eb213 Linux 4.16-rc2) +$ git merge tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (7928b2cbe55b Linux 4.16-rc1) +$ git merge char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (7928b2cbe55b Linux 4.16-rc1) +$ git merge extcon/extcon-next +Already up to date. +Merging staging/staging-next (7afe031c1a49 staging: fsl-mc: Move irqchip code out of staging) +$ git merge staging/staging-next +Recorded preimage for 'drivers/staging/fsl-mc/bus/Kconfig' +Auto-merging include/linux/kernel.h +Removing drivers/staging/vc04_services/interface/vchiq_arm/vchiq_version.c +Removing drivers/staging/vc04_services/interface/vchiq_arm/vchiq_memdrv.h +Removing drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c +Removing drivers/staging/vc04_services/interface/vchiq_arm/vchiq_build_info.h +Removing drivers/staging/unisys/visorinput/ultrainputreport.h +Removing drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c +Removing drivers/staging/lustre/lnet/libcfs/linux/linux-mem.c +Removing drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c +Auto-merging drivers/staging/iio/adc/ad7192.c +Auto-merging drivers/staging/fsl-mc/bus/Kconfig +CONFLICT (content): Merge conflict in drivers/staging/fsl-mc/bus/Kconfig +Removing drivers/staging/fsl-mc/TODO +Auto-merging drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c +Auto-merging drivers/irqchip/Makefile +Auto-merging drivers/bus/fsl-mc/mc-sys.c +Auto-merging drivers/bus/fsl-mc/mc-io.c +Auto-merging drivers/bus/fsl-mc/fsl-mc-private.h +Auto-merging drivers/bus/fsl-mc/fsl-mc-msi.c +Auto-merging drivers/bus/fsl-mc/fsl-mc-allocator.c +Auto-merging drivers/bus/fsl-mc/dprc.c +Auto-merging drivers/bus/fsl-mc/dprc-driver.c +Auto-merging drivers/bus/fsl-mc/dpmcp.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/staging/fsl-mc/bus/Kconfig'. +[master 703cdb4ed7f8] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-bus-iio-chemical-vz89x | 2 +- + .../ABI/testing/sysfs-bus-iio-proximity-as3935 | 4 +- + .../devicetree/bindings/iio/adc/axp20x_adc.txt | 48 + + .../bindings/iio/potentiometer/ad5272.txt | 27 + + .../bindings/iio/temperature/mlx90632.txt | 28 + + Documentation/networking/dpaa2/index.rst | 8 + + .../networking/dpaa2}/overview.rst | 0 + Documentation/networking/index.rst | 1 + + MAINTAINERS | 10 +- + drivers/bus/Kconfig | 2 + + drivers/bus/Makefile | 4 + + drivers/bus/fsl-mc/Kconfig | 16 + + drivers/bus/fsl-mc/Makefile | 16 + + drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp.c | 2 +- + .../fsl-mc/bus => bus/fsl-mc}/dprc-driver.c | 2 +- + drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc.c | 3 +- + .../fsl-mc/bus => bus/fsl-mc}/fsl-mc-allocator.c | 2 +- + .../fsl-mc/bus => bus/fsl-mc}/fsl-mc-bus.c | 0 + .../fsl-mc/bus => bus/fsl-mc}/fsl-mc-msi.c | 1 + + .../fsl-mc/bus => bus/fsl-mc}/fsl-mc-private.h | 2 +- + drivers/{staging/fsl-mc/bus => bus/fsl-mc}/mc-io.c | 2 +- + .../{staging/fsl-mc/bus => bus/fsl-mc}/mc-sys.c | 2 +- + drivers/iio/accel/st_accel_i2c.c | 3 +- + drivers/iio/adc/Kconfig | 3 +- + drivers/iio/adc/ad7476.c | 26 +- + drivers/iio/adc/axp20x_adc.c | 160 ++- + drivers/iio/adc/ep93xx_adc.c | 4 - + drivers/iio/adc/ti-adc161s626.c | 16 +- + drivers/iio/chemical/ams-iaq-core.c | 17 +- + drivers/iio/chemical/atlas-ph-sensor.c | 16 +- + drivers/iio/chemical/ccs811.c | 4 +- + drivers/iio/chemical/vz89x.c | 17 +- + drivers/iio/health/max30100.c | 16 +- + drivers/iio/humidity/Kconfig | 2 + + drivers/iio/humidity/dht11.c | 2 +- + drivers/iio/humidity/hdc100x.c | 16 +- + drivers/iio/humidity/hts221.h | 21 +- + drivers/iio/humidity/hts221_buffer.c | 39 +- + drivers/iio/humidity/hts221_core.c | 132 +-- + drivers/iio/humidity/hts221_i2c.c | 64 +- + drivers/iio/humidity/hts221_spi.c | 81 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 29 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 161 +-- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 104 +- + drivers/iio/light/apds9960.c | 16 +- + drivers/iio/potentiometer/Kconfig | 10 + + drivers/iio/potentiometer/Makefile | 1 + + drivers/iio/potentiometer/ad5272.c | 231 +++++ + drivers/iio/potentiometer/tpl0102.c | 16 +- + drivers/iio/potentiostat/lmp91000.c | 16 +- + drivers/iio/pressure/ms5611.h | 2 +- + drivers/iio/proximity/as3935.c | 17 +- + drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 16 +- + drivers/iio/temperature/Kconfig | 12 + + drivers/iio/temperature/Makefile | 1 + + drivers/iio/temperature/maxim_thermocouple.c | 16 +- + drivers/iio/temperature/mlx90632.c | 750 ++++++++++++++ + drivers/irqchip/Kconfig | 6 + + drivers/irqchip/Makefile | 1 + + .../bus => irqchip}/irq-gic-v3-its-fsl-mc-msi.c | 4 +- + drivers/staging/android/ion/ion.c | 26 +- + drivers/staging/android/ion/ion.h | 22 +- + drivers/staging/android/ion/ion_page_pool.c | 33 +- + drivers/staging/android/ion/ion_system_heap.c | 76 +- + drivers/staging/ccree/cc_aead.c | 13 +- + drivers/staging/ccree/cc_buffer_mgr.c | 2 +- + drivers/staging/ccree/cc_cipher.c | 3 +- + drivers/staging/ccree/cc_hash.c | 17 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 9 +- + drivers/staging/comedi/drivers/jr3_pci.c | 1 - + drivers/staging/comedi/drivers/ni_mio_common.c | 8 +- + drivers/staging/comedi/drivers/ni_stc.h | 2 +- + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 2 +- + drivers/staging/comedi/drivers/s626.c | 2 +- + drivers/staging/emxx_udc/emxx_udc.c | 2 +- + drivers/staging/fsl-dpaa2/ethernet/README | 2 +- + drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c | 3 +- + drivers/staging/fsl-dpaa2/ethernet/dpni.c | 2 +- + drivers/staging/fsl-mc/TODO | 18 - + drivers/staging/fsl-mc/bus/Kconfig | 10 - + drivers/staging/fsl-mc/bus/Makefile | 15 +- + drivers/staging/fsl-mc/bus/dpbp.c | 2 +- + drivers/staging/fsl-mc/bus/dpcon.c | 2 +- + drivers/staging/fsl-mc/bus/dpio/dpio-driver.c | 2 +- + drivers/staging/fsl-mc/bus/dpio/dpio-service.c | 2 +- + drivers/staging/fsl-mc/bus/dpio/dpio.c | 2 +- + drivers/staging/gdm724x/gdm_lte.c | 3 +- + drivers/staging/gdm724x/gdm_mux.c | 6 +- + drivers/staging/gdm724x/gdm_tty.c | 29 +- + drivers/staging/iio/adc/ad7192.c | 6 +- + drivers/staging/iio/meter/ade7758.h | 2 +- + drivers/staging/iio/meter/ade7758_core.c | 52 +- + drivers/staging/iio/meter/ade7759.c | 80 +- + drivers/staging/ks7010/ks7010_sdio.c | 46 +- + drivers/staging/ks7010/ks_hostif.c | 33 +- + drivers/staging/lustre/TODO | 310 +++++- + .../staging/lustre/include/linux/libcfs/curproc.h | 37 +- + .../staging/lustre/include/linux/libcfs/libcfs.h | 27 +- + .../lustre/include/linux/libcfs/libcfs_crypto.h | 11 +- + .../lustre/include/linux/libcfs/libcfs_debug.h | 4 +- + .../lustre/include/linux/libcfs/libcfs_time.h | 2 +- + .../lustre/include/linux/libcfs/linux/linux-time.h | 7 +- + drivers/staging/lustre/include/linux/lnet/api.h | 1 + + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 8 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 10 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 6 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 11 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 32 +- + .../lustre/lnet/klnds/socklnd/socklnd_lib.c | 2 +- + drivers/staging/lustre/lnet/libcfs/Makefile | 4 +- + drivers/staging/lustre/lnet/libcfs/debug.c | 2 +- + drivers/staging/lustre/lnet/libcfs/fail.c | 2 +- + .../staging/lustre/lnet/libcfs/linux/linux-cpu.c | 2 +- + .../lustre/lnet/libcfs/linux/linux-crypto.c | 29 +- + .../lustre/lnet/libcfs/linux/linux-curproc.c | 108 -- + .../staging/lustre/lnet/libcfs/linux/linux-mem.c | 51 - + .../staging/lustre/lnet/libcfs/linux/linux-prim.c | 113 --- + drivers/staging/lustre/lnet/libcfs/tracefile.c | 4 +- + drivers/staging/lustre/lnet/lnet/acceptor.c | 4 +- + drivers/staging/lustre/lnet/lnet/api-ni.c | 19 +- + drivers/staging/lustre/lnet/lnet/lib-eq.c | 10 +- + drivers/staging/lustre/lnet/lnet/lib-move.c | 4 +- + drivers/staging/lustre/lnet/lnet/net_fault.c | 14 +- + drivers/staging/lustre/lnet/lnet/peer.c | 2 +- + drivers/staging/lustre/lnet/lnet/router.c | 10 +- + drivers/staging/lustre/lnet/selftest/conctl.c | 12 +- + drivers/staging/lustre/lnet/selftest/conrpc.c | 4 +- + drivers/staging/lustre/lnet/selftest/framework.c | 2 +- + drivers/staging/lustre/lnet/selftest/rpc.c | 2 +- + drivers/staging/lustre/lnet/selftest/selftest.h | 2 +- + drivers/staging/lustre/lnet/selftest/timer.c | 4 +- + drivers/staging/lustre/lustre/fid/fid_request.c | 106 +- + drivers/staging/lustre/lustre/fid/lproc_fid.c | 44 +- + drivers/staging/lustre/lustre/include/lu_object.h | 7 - + drivers/staging/lustre/lustre/include/lustre_dlm.h | 2 +- + drivers/staging/lustre/lustre/include/lustre_fid.h | 2 +- + drivers/staging/lustre/lustre/include/lustre_lib.h | 296 +----- + drivers/staging/lustre/lustre/include/lustre_lmv.h | 2 +- + drivers/staging/lustre/lustre/include/lustre_mdc.h | 2 +- + drivers/staging/lustre/lustre/include/lustre_net.h | 8 +- + drivers/staging/lustre/lustre/include/lustre_sec.h | 3 - + drivers/staging/lustre/lustre/include/obd_class.h | 8 +- + .../staging/lustre/lustre/include/obd_support.h | 2 +- + drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 30 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 14 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 12 +- + drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 17 +- + drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 53 +- + drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 14 +- + drivers/staging/lustre/lustre/llite/dcache.c | 10 + + drivers/staging/lustre/lustre/llite/dir.c | 10 +- + drivers/staging/lustre/lustre/llite/file.c | 12 +- + drivers/staging/lustre/lustre/llite/llite_lib.c | 31 +- + drivers/staging/lustre/lustre/llite/llite_mmap.c | 8 +- + drivers/staging/lustre/lustre/llite/namei.c | 60 +- + drivers/staging/lustre/lustre/llite/statahead.c | 60 +- + drivers/staging/lustre/lustre/llite/xattr.c | 2 +- + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 4 +- + drivers/staging/lustre/lustre/lov/lov_ea.c | 2 +- + drivers/staging/lustre/lustre/lov/lov_io.c | 2 +- + drivers/staging/lustre/lustre/lov/lov_lock.c | 2 +- + drivers/staging/lustre/lustre/lov/lov_object.c | 10 +- + drivers/staging/lustre/lustre/lov/lov_pack.c | 2 +- + drivers/staging/lustre/lustre/lov/lov_request.c | 12 +- + drivers/staging/lustre/lustre/mdc/mdc_locks.c | 2 +- + drivers/staging/lustre/lustre/mdc/mdc_request.c | 16 +- + drivers/staging/lustre/lustre/mgc/mgc_request.c | 19 +- + drivers/staging/lustre/lustre/obdclass/cl_io.c | 23 +- + drivers/staging/lustre/lustre/obdclass/genops.c | 24 +- + drivers/staging/lustre/lustre/obdclass/linkea.c | 16 +- + .../lustre/lustre/obdclass/linux/linux-module.c | 4 +- + drivers/staging/lustre/lustre/obdclass/llog.c | 22 +- + drivers/staging/lustre/lustre/obdclass/llog_obd.c | 5 +- + drivers/staging/lustre/lustre/obdclass/lu_object.c | 70 -- + .../lustre/lustre/obdclass/lustre_handles.c | 4 +- + .../staging/lustre/lustre/obdecho/echo_client.c | 10 +- + drivers/staging/lustre/lustre/osc/osc_cache.c | 32 +- + drivers/staging/lustre/lustre/osc/osc_object.c | 6 +- + drivers/staging/lustre/lustre/osc/osc_page.c | 8 +- + drivers/staging/lustre/lustre/osc/osc_request.c | 8 +- + drivers/staging/lustre/lustre/ptlrpc/client.c | 194 ++-- + drivers/staging/lustre/lustre/ptlrpc/events.c | 7 +- + drivers/staging/lustre/lustre/ptlrpc/import.c | 85 +- + drivers/staging/lustre/lustre/ptlrpc/layout.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 15 +- + .../staging/lustre/lustre/ptlrpc/pack_generic.c | 9 +- + drivers/staging/lustre/lustre/ptlrpc/pinger.c | 36 +- + .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 2 +- + drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 33 +- + drivers/staging/lustre/lustre/ptlrpc/recover.c | 38 +- + drivers/staging/lustre/lustre/ptlrpc/sec.c | 38 +- + drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 4 +- + drivers/staging/lustre/lustre/ptlrpc/sec_gc.c | 23 +- + drivers/staging/lustre/lustre/ptlrpc/sec_null.c | 8 +- + drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 8 +- + drivers/staging/lustre/lustre/ptlrpc/service.c | 109 +- + drivers/staging/media/bcm2048/radio-bcm2048.c | 22 +- + drivers/staging/netlogic/xlr_net.c | 3 +- + drivers/staging/pi433/Documentation/pi433.txt | 8 +- + drivers/staging/pi433/pi433_if.c | 50 +- + drivers/staging/pi433/pi433_if.h | 8 +- + drivers/staging/pi433/rf69.c | 92 +- + drivers/staging/pi433/rf69.h | 12 +- + drivers/staging/pi433/rf69_enum.h | 12 +- + drivers/staging/rtl8188eu/Kconfig | 2 + + drivers/staging/rtl8188eu/core/rtw_recv.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_security.c | 80 +- + drivers/staging/rtl8188eu/core/rtw_xmit.c | 55 +- + drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 3 +- + drivers/staging/rtl8188eu/hal/usb_halinit.c | 2 +- + drivers/staging/rtl8188eu/include/rtw_security.h | 2 +- + drivers/staging/rtl8188eu/include/xmit_osdep.h | 13 - + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 2 +- + drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 37 - + drivers/staging/rtl8712/ieee80211.c | 11 +- + drivers/staging/rtl8712/ieee80211.h | 6 +- + drivers/staging/rtl8712/rtl871x_mlme.c | 3 +- + drivers/staging/rtl8712/rtl871x_xmit.c | 2 +- + drivers/staging/rtl8723bs/include/drv_types.h | 4 +- + drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 2 +- + drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 24 +- + drivers/staging/rtlwifi/wifi.h | 29 +- + drivers/staging/sm750fb/ddk750_chip.c | 4 +- + drivers/staging/sm750fb/ddk750_chip.h | 14 +- + drivers/staging/sm750fb/ddk750_mode.c | 2 +- + drivers/staging/sm750fb/ddk750_mode.h | 2 +- + drivers/staging/sm750fb/sm750_hw.c | 2 +- + drivers/staging/unisys/visorinput/Kconfig | 2 +- + drivers/staging/unisys/visorinput/Makefile | 1 - + .../staging/unisys/visorinput/ultrainputreport.h | 57 -- + drivers/staging/unisys/visorinput/visorinput.c | 169 ++-- + drivers/staging/vc04_services/Makefile | 1 - + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 369 +++++++ + .../interface/vchiq_arm/vchiq_build_info.h | 37 - + .../interface/vchiq_arm/vchiq_kern_lib.c | 431 -------- + .../interface/vchiq_arm/vchiq_memdrv.h | 59 -- + .../interface/vchiq_arm/vchiq_version.c | 59 -- + drivers/staging/vt6655/rxtx.c | 1 - + drivers/staging/vt6656/usbpipe.c | 3 - + drivers/staging/wilc1000/coreconfigurator.c | 4 +- + drivers/staging/wilc1000/host_interface.c | 1063 ++++++++++---------- + drivers/staging/wilc1000/host_interface.h | 2 +- + drivers/staging/wilc1000/linux_wlan.c | 13 +- + drivers/staging/wilc1000/wilc_sdio.c | 145 ++- + drivers/staging/wilc1000/wilc_spi.c | 551 +++++----- + drivers/staging/wilc1000/wilc_wlan.c | 70 +- + drivers/staging/wilc1000/wilc_wlan_cfg.c | 21 +- + drivers/staging/wlan-ng/prism2mgmt.c | 2 +- + .../fsl-mc/include => include/linux/fsl}/mc.h | 0 + include/linux/kernel.h | 9 + + include/linux/mfd/axp20x.h | 2 + + include/linux/wait.h | 114 +++ + lib/int_sqrt.c | 30 + + 253 files changed, 4820 insertions(+), 4271 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/adc/axp20x_adc.txt + create mode 100644 Documentation/devicetree/bindings/iio/potentiometer/ad5272.txt + create mode 100644 Documentation/devicetree/bindings/iio/temperature/mlx90632.txt + create mode 100644 Documentation/networking/dpaa2/index.rst + rename {drivers/staging/fsl-mc => Documentation/networking/dpaa2}/overview.rst (100%) + create mode 100644 drivers/bus/fsl-mc/Kconfig + create mode 100644 drivers/bus/fsl-mc/Makefile + rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp.c (98%) + rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc-driver.c (99%) + rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc.c (99%) + rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-allocator.c (99%) + rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-bus.c (100%) + rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-msi.c (99%) + rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-private.h (99%) + rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/mc-io.c (99%) + rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/mc-sys.c (99%) + create mode 100644 drivers/iio/potentiometer/ad5272.c + create mode 100644 drivers/iio/temperature/mlx90632.c + rename drivers/{staging/fsl-mc/bus => irqchip}/irq-gic-v3-its-fsl-mc-msi.c (97%) + delete mode 100644 drivers/staging/fsl-mc/TODO + delete mode 100644 drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c + delete mode 100644 drivers/staging/lustre/lnet/libcfs/linux/linux-mem.c + delete mode 100644 drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c + delete mode 100644 drivers/staging/unisys/visorinput/ultrainputreport.h + delete mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_build_info.h + delete mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c + delete mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_memdrv.h + delete mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_version.c + rename {drivers/staging/fsl-mc/include => include/linux/fsl}/mc.h (100%) +$ git am -3 ../patches/0001-staging-fsl-mc-merge-fix-for-CONFIG_FSL_MC_BUS-movin.patch +Applying: staging: fsl-mc: merge fix for CONFIG_FSL_MC_BUS moving +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/bus/fsl-mc/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master 98337c46fd82] Merge remote-tracking branch 'staging/staging-next' + Date: Fri Feb 23 13:24:19 2018 +1100 +Merging mux/for-next (6cd361c99ef2 mux: add SPDX identifiers to all mux source files) +$ git merge mux/for-next +Merge made by the 'recursive' strategy. +Merging slave-dma/next (5ec91512231a Merge branch 'topic/renesas' into next) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 1 + + drivers/dma/dmatest.c | 16 ++++++++++++---- + include/linux/dmaengine.h | 4 ++++ + 3 files changed, 17 insertions(+), 4 deletions(-) +Merging cgroup/for-next (d1897c9538ed cgroup: fix rule checking for threaded mode switching) +$ git merge cgroup/for-next +Auto-merging kernel/sched/core.c +Auto-merging kernel/cgroup/cgroup.c +Merge made by the 'recursive' strategy. + kernel/cgroup/cgroup.c | 10 ++++++++++ + kernel/sched/core.c | 15 ++++++++++----- + 2 files changed, 20 insertions(+), 5 deletions(-) +Merging scsi/for-next (0e6dbc33f387 Merge branch 'fixes' into for-next) +$ git merge scsi/for-next +Removing drivers/scsi/aic7xxx/aiclib.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-driver-ufs | 804 ++++++++++++++++++++++++++++ + drivers/message/fusion/mptctl.c | 2 + + drivers/scsi/Kconfig | 2 + + drivers/scsi/Makefile | 1 - + drivers/scsi/NCR53c406a.c | 2 +- + drivers/scsi/aacraid/aacraid.h | 5 + + drivers/scsi/aacraid/linit.c | 4 +- + drivers/scsi/aacraid/src.c | 205 ++++++- + drivers/scsi/aic7xxx/aiclib.c | 34 -- + drivers/scsi/bnx2fc/bnx2fc_io.c | 1 + + drivers/scsi/csiostor/csio_lnode.c | 2 +- + drivers/scsi/device_handler/scsi_dh_alua.c | 5 + + drivers/scsi/hosts.c | 12 +- + drivers/scsi/ibmvscsi/ibmvfc.h | 2 +- + drivers/scsi/ipr.c | 49 +- + drivers/scsi/ipr.h | 2 +- + drivers/scsi/isci/host.c | 2 +- + drivers/scsi/libfc/fc_disc.c | 2 +- + drivers/scsi/lpfc/lpfc.h | 3 +- + drivers/scsi/lpfc/lpfc_attr.c | 17 +- + drivers/scsi/lpfc/lpfc_crtn.h | 3 +- + drivers/scsi/lpfc/lpfc_els.c | 5 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 7 +- + drivers/scsi/lpfc/lpfc_hw4.h | 14 +- + drivers/scsi/lpfc/lpfc_init.c | 69 ++- + drivers/scsi/lpfc/lpfc_mbox.c | 6 +- + drivers/scsi/lpfc/lpfc_mem.c | 12 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 7 +- + drivers/scsi/lpfc/lpfc_nvme.c | 30 +- + drivers/scsi/lpfc/lpfc_nvmet.c | 162 +++++- + drivers/scsi/lpfc/lpfc_nvmet.h | 10 +- + drivers/scsi/lpfc/lpfc_scsi.c | 49 +- + drivers/scsi/lpfc/lpfc_sli.c | 36 +- + drivers/scsi/lpfc/lpfc_sli4.h | 12 +- + drivers/scsi/lpfc/lpfc_version.h | 8 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 42 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 13 +- + drivers/scsi/mpt3sas/mpt3sas_base.h | 3 + + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 21 +- + drivers/scsi/pmcraid.c | 51 +- + drivers/scsi/pmcraid.h | 3 +- + drivers/scsi/qedf/qedf_dbg.c | 2 +- + drivers/scsi/qedf/qedf_dbg.h | 17 +- + drivers/scsi/qedf/qedf_debugfs.c | 6 +- + drivers/scsi/qedf/qedf_io.c | 2 +- + drivers/scsi/qedf/qedf_main.c | 8 +- + drivers/scsi/qedi/qedi_dbg.h | 2 +- + drivers/scsi/qedi/qedi_debugfs.c | 4 +- + drivers/scsi/qedi/qedi_gbl.h | 4 +- + drivers/scsi/qedi/qedi_main.c | 59 +- + drivers/scsi/qla2xxx/qla_dbg.c | 4 +- + drivers/scsi/qla2xxx/qla_gs.c | 78 ++- + drivers/scsi/qla2xxx/qla_init.c | 60 +-- + drivers/scsi/qla2xxx/qla_inline.h | 1 + + drivers/scsi/qla2xxx/qla_iocb.c | 22 +- + drivers/scsi/qla2xxx/qla_isr.c | 29 +- + drivers/scsi/qla2xxx/qla_mbx.c | 5 +- + drivers/scsi/qla2xxx/qla_mr.c | 36 +- + drivers/scsi/qla2xxx/qla_nx.c | 7 +- + drivers/scsi/qla2xxx/qla_nx2.c | 19 +- + drivers/scsi/qla2xxx/qla_nx2.h | 4 - + drivers/scsi/qla2xxx/qla_os.c | 2 + + drivers/scsi/qla2xxx/qla_sup.c | 1 + + drivers/scsi/qla2xxx/qla_target.c | 9 +- + drivers/scsi/qla4xxx/ql4_def.h | 2 + + drivers/scsi/qla4xxx/ql4_nx.c | 2 + + drivers/scsi/qla4xxx/ql4_nx.h | 7 - + drivers/scsi/qla4xxx/ql4_os.c | 46 ++ + drivers/scsi/raid_class.c | 1 + + drivers/scsi/scsi_debug.c | 241 ++++++--- + drivers/scsi/scsi_error.c | 6 + + drivers/scsi/scsi_lib.c | 2 +- + drivers/scsi/scsi_sysfs.c | 11 + + drivers/scsi/scsi_transport_spi.c | 4 +- + drivers/scsi/storvsc_drv.c | 5 +- + drivers/scsi/sym53c416.c | 2 +- + drivers/scsi/sym53c8xx_2/sym_hipd.c | 2 +- + drivers/scsi/ufs/Makefile | 3 +- + drivers/scsi/ufs/ufs-sysfs.c | 739 +++++++++++++++++++++++++ + drivers/scsi/ufs/ufs-sysfs.h | 17 + + drivers/scsi/ufs/ufs.h | 115 +++- + drivers/scsi/ufs/ufshcd.c | 220 ++------ + drivers/scsi/ufs/ufshcd.h | 34 ++ + include/linux/raid_class.h | 1 + + include/scsi/scsi_host.h | 6 + + 85 files changed, 2789 insertions(+), 777 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-ufs + delete mode 100644 drivers/scsi/aic7xxx/aiclib.c + create mode 100644 drivers/scsi/ufs/ufs-sysfs.c + create mode 100644 drivers/scsi/ufs/ufs-sysfs.h +Merging scsi-mkp/for-next (cf8037f8d08a scsi: lpfc: Change Copyright of 12.0.0.0 modified files to 2018) +$ git merge scsi-mkp/for-next +Auto-merging drivers/scsi/qla4xxx/ql4_os.c +Auto-merging drivers/scsi/qla2xxx/qla_target.c +Auto-merging drivers/scsi/qla2xxx/qla_iocb.c +Merge made by the 'recursive' strategy. + drivers/scsi/lpfc/lpfc.h | 20 +- + drivers/scsi/lpfc/lpfc_attr.c | 86 +++++-- + drivers/scsi/lpfc/lpfc_bsg.c | 6 +- + drivers/scsi/lpfc/lpfc_ct.c | 7 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 22 +- + drivers/scsi/lpfc/lpfc_debugfs.h | 13 +- + drivers/scsi/lpfc/lpfc_els.c | 5 + + drivers/scsi/lpfc/lpfc_hbadisc.c | 1 + + drivers/scsi/lpfc/lpfc_hw.h | 15 +- + drivers/scsi/lpfc/lpfc_hw4.h | 115 ++++++++- + drivers/scsi/lpfc/lpfc_ids.h | 4 +- + drivers/scsi/lpfc/lpfc_init.c | 247 +++++++++++++++--- + drivers/scsi/lpfc/lpfc_mbox.c | 4 + + drivers/scsi/lpfc/lpfc_nvme.c | 69 +++-- + drivers/scsi/lpfc/lpfc_nvmet.c | 24 ++ + drivers/scsi/lpfc/lpfc_scsi.c | 8 +- + drivers/scsi/lpfc/lpfc_sli.c | 530 ++++++++++++++++++++++++++++---------- + drivers/scsi/lpfc/lpfc_sli4.h | 30 ++- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/qla2xxx/qla_bsg.c | 3 +- + drivers/scsi/qla2xxx/qla_iocb.c | 10 +- + drivers/scsi/qla2xxx/qla_target.c | 7 +- + drivers/scsi/qla4xxx/ql4_mbx.c | 6 +- + drivers/scsi/qla4xxx/ql4_os.c | 4 +- + 24 files changed, 965 insertions(+), 273 deletions(-) +Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker) +$ git merge target-updates/for-next +Already up to date. +Merging target-bva/for-next (4fbd8d194f06 Linux 4.15-rc1) +$ git merge target-bva/for-next +Already up to date. +Merging libata/for-next (6e627173fd12 Merge branch 'for-4.16-fixes' into for-next) +$ git merge libata/for-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-ata | 171 ++++++++++++++---------- + Documentation/ABI/testing/sysfs-block-device | 58 ++++++++ + Documentation/ABI/testing/sysfs-class-scsi_host | 89 ++++++++++++ + drivers/ata/libahci.c | 10 ++ + drivers/ata/libahci_platform.c | 2 +- + drivers/ata/libata-core.c | 11 +- + drivers/ata/libata-scsi.c | 12 +- + drivers/ata/pata_arasan_cf.c | 6 +- + drivers/ata/pata_it821x.c | 6 +- + drivers/ata/pata_macio.c | 12 +- + drivers/ata/pata_mpc52xx.c | 1 - + drivers/ata/pata_samsung_cf.c | 4 +- + drivers/ata/sata_dwc_460ex.c | 1 - + drivers/ata/sata_rcar.c | 62 +++++---- + 14 files changed, 326 insertions(+), 119 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-block-device +Merging vhost/linux-next (fa08a3b4eba5 virtio/s390: implement PM operations for virtio_ccw) +$ git merge vhost/linux-next +Already up to date. +Merging rpmsg/for-next (ec6e69036956 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Auto-merging drivers/gpu/drm/msm/adreno/a5xx_gpu.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 4 +- + drivers/media/platform/qcom/venus/firmware.c | 2 +- + drivers/remoteproc/Kconfig | 18 + + drivers/remoteproc/Makefile | 1 + + drivers/remoteproc/qcom_adsp_pil.c | 20 +- + drivers/remoteproc/qcom_common.c | 50 ++- + drivers/remoteproc/qcom_common.h | 23 + + drivers/remoteproc/qcom_q6v5_pil.c | 9 +- + drivers/remoteproc/qcom_sysmon.c | 579 +++++++++++++++++++++++++ + drivers/remoteproc/qcom_wcnss.c | 11 +- + drivers/remoteproc/remoteproc_core.c | 152 ++++++- + drivers/remoteproc/remoteproc_internal.h | 7 +- + drivers/soc/qcom/mdt_loader.c | 7 +- + include/linux/remoteproc.h | 27 +- + include/linux/soc/qcom/mdt_loader.h | 3 +- + samples/Kconfig | 9 + + samples/Makefile | 2 +- + samples/qmi/Makefile | 1 + + samples/qmi/qmi_sample_client.c | 622 +++++++++++++++++++++++++++ + 19 files changed, 1504 insertions(+), 43 deletions(-) + create mode 100644 drivers/remoteproc/qcom_sysmon.c + create mode 100644 samples/qmi/Makefile + create mode 100644 samples/qmi/qmi_sample_client.c +Merging gpio/for-next (3c87d7c874b2 gpio: davinci: add support for pinmux gpio ranges) +$ git merge gpio/for-next +Merge made by the 'recursive' strategy. + .../bindings/gpio/nintendo,hollywood-gpio.txt | 27 ++++++++++++++++++++++ + .../devicetree/bindings/powerpc/nintendo/wii.txt | 9 +------- + drivers/gpio/gpio-davinci.c | 6 +++++ + drivers/gpio/gpio-wm831x.c | 2 +- + 4 files changed, 35 insertions(+), 9 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/nintendo,hollywood-gpio.txt +Merging pinctrl/for-next (cfc09838477f Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/qcom,sdm845-pinctrl.txt | 176 +++ + drivers/pinctrl/core.c | 18 +- + drivers/pinctrl/meson/pinctrl-meson-axg.c | 4 +- + drivers/pinctrl/pinctrl-mcp23s08.c | 49 +- + drivers/pinctrl/qcom/Kconfig | 9 + + drivers/pinctrl/qcom/Makefile | 1 + + drivers/pinctrl/qcom/pinctrl-msm.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sdm845.c | 1323 ++++++++++++++++++++ + 8 files changed, 1565 insertions(+), 17 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sdm845-pinctrl.txt + create mode 100644 drivers/pinctrl/qcom/pinctrl-sdm845.c +Merging pinctrl-samsung/for-next (7928b2cbe55b Linux 4.16-rc1) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (bccaa3f917c9 pwm: meson: Add clock source configuration for Meson-AXG) +$ git merge pwm/for-next +Already up to date. +Merging userns/for-next (9eba1cd4b565 24 Jan 2018 Merge of my siginfo and userns trees for testing in linux-next) +$ git merge userns/for-next +Already up to date! +Merge made by the 'recursive' strategy. +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 (9e66317d3c92 Linux 4.14-rc3) +$ git merge random/dev +Already up to date. +Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and counting against aio-max-nr) +$ git merge aio/master +Already up to date. +Merging kselftest/next (7928b2cbe55b Linux 4.16-rc1) +$ git merge kselftest/next +Already up to date. +Merging y2038/y2038 (69973b830859 Linux 4.9) +$ git merge y2038/y2038 +Already up to date. +Merging livepatching/for-next (d13f5d84ca27 Merge branch 'for-4.16/signal-sysfs-force-v2' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (7928b2cbe55b Linux 4.16-rc1) +$ git merge coresight/next +Already up to date. +Merging rtc/rtc-next (556831d8a19b rtc: pcf85063: remove useless indirection) +$ git merge rtc/rtc-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-rtc | 4 +- + MAINTAINERS | 2 +- + drivers/char/rtc.c | 83 ------------ + drivers/rtc/Kconfig | 2 +- + drivers/rtc/class.c | 2 - + drivers/rtc/interface.c | 30 +++++ + drivers/rtc/nvmem.c | 29 +++-- + drivers/rtc/rtc-ab-b5ze-s3.c | 4 +- + drivers/rtc/rtc-ab3100.c | 2 +- + drivers/rtc/rtc-ab8500.c | 2 +- + drivers/rtc/rtc-abx80x.c | 6 +- + drivers/rtc/rtc-ac100.c | 2 +- + drivers/rtc/rtc-au1xxx.c | 2 +- + drivers/rtc/rtc-bq32k.c | 2 +- + drivers/rtc/rtc-cmos.c | 87 +++++-------- + drivers/rtc/rtc-coh901331.c | 2 +- + drivers/rtc/rtc-core.h | 8 -- + drivers/rtc/rtc-cpcap.c | 2 +- + drivers/rtc/rtc-da9052.c | 3 +- + drivers/rtc/rtc-da9055.c | 2 +- + drivers/rtc/rtc-da9063.c | 2 +- + drivers/rtc/rtc-ds1216.c | 2 +- + drivers/rtc/rtc-ds1286.c | 2 +- + drivers/rtc/rtc-ds1302.c | 7 +- + drivers/rtc/rtc-ds1305.c | 24 ++-- + drivers/rtc/rtc-ds1307.c | 32 ++--- + drivers/rtc/rtc-ds1343.c | 185 +++++---------------------- + drivers/rtc/rtc-ds1347.c | 2 +- + drivers/rtc/rtc-ds1390.c | 2 +- + drivers/rtc/rtc-ds1511.c | 26 ++-- + drivers/rtc/rtc-ds1553.c | 78 +++++------ + drivers/rtc/rtc-ds1685.c | 2 +- + drivers/rtc/rtc-ds1742.c | 75 +++++------ + drivers/rtc/rtc-ds2404.c | 2 +- + drivers/rtc/rtc-ds3232.c | 2 +- + drivers/rtc/rtc-efi.c | 2 +- + drivers/rtc/rtc-fm3130.c | 3 +- + drivers/rtc/rtc-goldfish.c | 2 + + drivers/rtc/rtc-isl12022.c | 18 +-- + drivers/rtc/rtc-isl1208.c | 5 + + drivers/rtc/rtc-jz4740.c | 2 +- + drivers/rtc/rtc-lib.c | 6 +- + drivers/rtc/rtc-lpc24xx.c | 2 +- + drivers/rtc/rtc-lpc32xx.c | 2 +- + drivers/rtc/rtc-ls1x.c | 2 +- + drivers/rtc/rtc-m41t80.c | 2 +- + drivers/rtc/rtc-m41t93.c | 2 +- + drivers/rtc/rtc-m41t94.c | 3 +- + drivers/rtc/rtc-m48t35.c | 2 +- + drivers/rtc/rtc-m48t59.c | 59 ++++----- + drivers/rtc/rtc-m48t86.c | 25 ++-- + drivers/rtc/rtc-max6900.c | 19 +-- + drivers/rtc/rtc-max6902.c | 2 +- + drivers/rtc/rtc-max6916.c | 2 +- + drivers/rtc/rtc-max77686.c | 4 +- + drivers/rtc/rtc-max8997.c | 2 +- + drivers/rtc/rtc-max8998.c | 2 +- + drivers/rtc/rtc-mc13xxx.c | 2 +- + drivers/rtc/rtc-mcp795.c | 2 +- + drivers/rtc/rtc-mpc5121.c | 2 +- + drivers/rtc/rtc-mrst.c | 2 +- + drivers/rtc/rtc-msm6242.c | 2 +- + drivers/rtc/rtc-mt7622.c | 2 +- + drivers/rtc/rtc-mv.c | 2 +- + drivers/rtc/rtc-mxc_v2.c | 2 +- + drivers/rtc/rtc-nuc900.c | 14 +- + drivers/rtc/rtc-omap.c | 6 +- + drivers/rtc/rtc-pcap.c | 2 +- + drivers/rtc/rtc-pcf2123.c | 2 +- + drivers/rtc/rtc-pcf2127.c | 2 +- + drivers/rtc/rtc-pcf50633.c | 2 +- + drivers/rtc/rtc-pcf85063.c | 18 +-- + drivers/rtc/rtc-pcf8523.c | 2 +- + drivers/rtc/rtc-pcf85363.c | 25 ++-- + drivers/rtc/rtc-pic32.c | 2 +- + drivers/rtc/rtc-pm8xxx.c | 6 - + drivers/rtc/rtc-ps3.c | 2 +- + drivers/rtc/rtc-r7301.c | 2 +- + drivers/rtc/rtc-r9701.c | 2 +- + drivers/rtc/rtc-rk808.c | 25 +--- + drivers/rtc/rtc-rp5c01.c | 65 +++++----- + drivers/rtc/rtc-rs5c348.c | 5 - + drivers/rtc/rtc-rs5c372.c | 24 +--- + drivers/rtc/rtc-rv8803.c | 33 ++--- + drivers/rtc/rtc-rx4581.c | 6 +- + drivers/rtc/rtc-rx6110.c | 2 +- + drivers/rtc/rtc-rx8010.c | 2 +- + drivers/rtc/rtc-rx8025.c | 2 +- + drivers/rtc/rtc-rx8581.c | 6 +- + drivers/rtc/rtc-s35390a.c | 38 ++---- + drivers/rtc/rtc-s3c.c | 2 +- + drivers/rtc/rtc-s5m.c | 2 +- + drivers/rtc/rtc-sc27xx.c | 2 +- + drivers/rtc/rtc-sh.c | 2 +- + drivers/rtc/rtc-sirfsoc.c | 18 --- + drivers/rtc/rtc-spear.c | 12 +- + drivers/rtc/rtc-starfire.c | 2 +- + drivers/rtc/rtc-stk17ta8.c | 74 +++++------ + drivers/rtc/rtc-sun6i.c | 2 +- + drivers/rtc/rtc-sunxi.c | 2 +- + drivers/rtc/rtc-tegra.c | 4 - + drivers/rtc/rtc-tile.c | 3 - + drivers/rtc/rtc-tps6586x.c | 2 +- + drivers/rtc/rtc-tx4939.c | 95 +++++++++----- + drivers/rtc/rtc-wm831x.c | 2 +- + drivers/rtc/rtc-xgene.c | 2 +- + drivers/rtc/rtc-zynqmp.c | 2 +- + include/linux/rtc.h | 18 ++- + include/trace/events/rtc.h | 206 ++++++++++++++++++++++++++++++ + 109 files changed, 755 insertions(+), 895 deletions(-) + create mode 100644 include/trace/events/rtc.h +Merging nvdimm/libnvdimm-for-next (ee95f4059a83 Merge branch 'for-4.16/nfit' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +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 at24/at24/for-next (7928b2cbe55b Linux 4.16-rc1) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (53c3677c56c7 ntb: intel: change references of skx to gen3) +$ git merge ntb/ntb-next +Auto-merging drivers/ntb/hw/intel/ntb_hw_gen1.c +Merge made by the 'recursive' strategy. + drivers/ntb/hw/intel/Makefile | 1 + + .../ntb/hw/intel/{ntb_hw_intel.c => ntb_hw_gen1.c} | 713 ++------------------- + drivers/ntb/hw/intel/ntb_hw_gen1.h | 182 ++++++ + drivers/ntb/hw/intel/ntb_hw_gen3.c | 597 +++++++++++++++++ + drivers/ntb/hw/intel/ntb_hw_gen3.h | 110 ++++ + drivers/ntb/hw/intel/ntb_hw_intel.h | 203 ++---- + 6 files changed, 997 insertions(+), 809 deletions(-) + rename drivers/ntb/hw/intel/{ntb_hw_intel.c => ntb_hw_gen1.c} (74%) + create mode 100644 drivers/ntb/hw/intel/ntb_hw_gen1.h + create mode 100644 drivers/ntb/hw/intel/ntb_hw_gen3.c + create mode 100644 drivers/ntb/hw/intel/ntb_hw_gen3.h +Merging kspp/for-next/kspp (2d00fcb32f71 Merge branch 'kspp/gcc-plugin/infrastructure' into for-next/kspp) +$ git merge kspp/for-next/kspp +Merge made by the 'recursive' strategy. +Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove) +$ git merge init_task/init_task +Already up to date. +Merging akpm-current/current (9ec53107cdd9 ipc: clamp msgmni and shmmni to the real IPC_MNI limit) +$ git merge --no-ff akpm-current/current +Auto-merging security/smack/smack_lsm.c +Auto-merging security/selinux/hooks.c +Auto-merging net/ipv4/route.c +Auto-merging net/core/sysctl_net_core.c +Auto-merging mm/zsmalloc.c +Auto-merging lib/vsprintf.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging include/linux/kernel.h +Auto-merging fs/notify/inotify/inotify_user.c +Auto-merging drivers/of/unittest.c +Auto-merging drivers/iommu/mtk_iommu_v1.c +Auto-merging drivers/iommu/exynos-iommu.c +Auto-merging arch/x86/mm/init_64.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-bdi | 8 + + Documentation/admin-guide/kernel-parameters.txt | 54 +-- + Documentation/cgroup-v2.txt | 74 ++++ + Documentation/sysctl/kernel.txt | 54 +-- + Documentation/sysctl/vm.txt | 5 +- + arch/alpha/include/uapi/asm/mman.h | 1 + + arch/arm/include/asm/page.h | 2 + + arch/arm/mm/dma-mapping.c | 16 +- + arch/arm/mm/mmap.c | 14 +- + arch/arm64/mm/mmap.c | 14 +- + arch/metag/kernel/process.c | 6 +- + arch/mips/include/uapi/asm/mman.h | 1 + + arch/mips/mm/mmap.c | 14 +- + arch/parisc/include/uapi/asm/mman.h | 1 + + arch/parisc/kernel/sys_parisc.c | 16 +- + arch/powerpc/mm/mmap.c | 28 +- + arch/powerpc/mm/mmu_context_iommu.c | 5 +- + arch/powerpc/sysdev/dart_iommu.c | 1 + + arch/powerpc/sysdev/msi_bitmap.c | 1 + + arch/s390/kernel/nmi.c | 2 +- + arch/s390/kernel/smp.c | 1 - + arch/s390/mm/mmap.c | 15 +- + arch/sparc/kernel/irq_64.c | 1 - + arch/sparc/kernel/sys_sparc_64.c | 4 +- + arch/tile/kernel/pci_gx.c | 2 +- + arch/tile/mm/mmap.c | 11 +- + arch/x86/kernel/pci-dma.c | 1 - + arch/x86/mm/init_64.c | 33 +- + arch/x86/mm/mmap.c | 18 +- + arch/xtensa/include/uapi/asm/mman.h | 1 + + block/genhd.c | 2 +- + drivers/base/memory.c | 38 ++- + drivers/base/node.c | 22 +- + drivers/iommu/exynos-iommu.c | 1 + + drivers/iommu/mtk_iommu_v1.c | 1 - + drivers/net/ethernet/ti/cpsw.c | 1 + + drivers/net/wireless/realtek/rtlwifi/pci.c | 1 - + .../wireless/realtek/rtlwifi/rtl8192c/fw_common.c | 1 - + drivers/of/unittest.c | 2 +- + drivers/staging/rtl8188eu/hal/fw.c | 2 +- + drivers/staging/rtlwifi/pci.c | 1 - + drivers/virtio/virtio_ring.c | 1 - + fs/Kconfig | 3 + + fs/binfmt_aout.c | 1 + + fs/binfmt_elf.c | 23 +- + fs/binfmt_elf_fdpic.c | 1 + + fs/binfmt_flat.c | 1 + + fs/dcache.c | 3 +- + fs/exec.c | 28 +- + fs/fcntl.c | 2 +- + fs/notify/dnotify/dnotify.c | 5 +- + fs/notify/fanotify/fanotify.c | 12 +- + fs/notify/fanotify/fanotify.h | 3 +- + fs/notify/fanotify/fanotify_user.c | 7 +- + fs/notify/group.c | 4 + + fs/notify/inotify/inotify_fsnotify.c | 2 +- + fs/notify/inotify/inotify_user.c | 5 +- + fs/notify/mark.c | 6 +- + fs/ocfs2/alloc.c | 2 +- + fs/ocfs2/aops.c | 4 +- + fs/ocfs2/aops.h | 2 +- + fs/ocfs2/dir.c | 2 +- + fs/ocfs2/dlm/dlmcommon.h | 3 - + fs/ocfs2/dlmglue.c | 23 +- + fs/ocfs2/file.c | 16 +- + fs/ocfs2/filecheck.c | 357 ++++++++----------- + fs/ocfs2/filecheck.h | 29 +- + fs/ocfs2/inode.c | 8 +- + fs/ocfs2/namei.c | 6 +- + fs/ocfs2/ocfs2.h | 8 + + fs/ocfs2/ocfs2_trace.h | 6 +- + fs/ocfs2/refcounttree.c | 10 +- + fs/ocfs2/stackglue.c | 6 - + fs/ocfs2/stackglue.h | 3 - + fs/ocfs2/suballoc.c | 4 +- + fs/ocfs2/super.c | 31 +- + fs/ocfs2/xattr.c | 2 +- + fs/proc/array.c | 39 +-- + fs/proc/base.c | 19 +- + fs/proc/inode.c | 63 ++-- + fs/proc/internal.h | 4 +- + fs/proc/meminfo.c | 15 +- + fs/proc/root.c | 6 +- + fs/proc/task_mmu.c | 153 ++++----- + fs/seq_file.c | 116 +++++-- + include/linux/binfmts.h | 3 + + include/linux/cgroup-defs.h | 5 + + include/linux/fsnotify_backend.h | 12 +- + include/linux/hugetlb.h | 27 +- + include/linux/kernel.h | 7 +- + include/linux/list_lru.h | 3 +- + include/linux/memblock.h | 13 +- + include/linux/memcontrol.h | 50 ++- + include/linux/memfd.h | 16 + + include/linux/memory_hotplug.h | 3 - + include/linux/migrate.h | 9 +- + include/linux/mm.h | 6 +- + include/linux/mmzone.h | 2 +- + include/linux/node.h | 4 +- + include/linux/oom.h | 12 +- + include/linux/page-flags.h | 22 +- + include/linux/page-isolation.h | 3 +- + include/linux/page_ref.h | 3 +- + include/linux/sched/mm.h | 6 +- + include/linux/sched/signal.h | 3 + + include/linux/seq_file.h | 5 + + include/linux/shmem_fs.h | 13 - + include/linux/shrinker.h | 2 +- + include/linux/slab.h | 87 ++++- + include/linux/swap.h | 51 +-- + include/linux/sysctl.h | 6 + + include/linux/thread_info.h | 6 +- + include/trace/events/migrate.h | 2 +- + include/uapi/asm-generic/mman-common.h | 3 + + include/uapi/linux/msg.h | 1 + + include/uapi/linux/prctl.h | 4 + + include/uapi/linux/sem.h | 1 + + include/uapi/linux/shm.h | 5 +- + ipc/ipc_sysctl.c | 10 +- + ipc/msg.c | 17 +- + ipc/sem.c | 17 +- + ipc/shm.c | 23 +- + ipc/util.c | 1 + + kernel/cgroup/cgroup.c | 13 +- + kernel/cred.c | 1 + + kernel/exit.c | 4 + + kernel/fork.c | 5 +- + kernel/panic.c | 63 ++-- + kernel/sys.c | 11 + + kernel/sysctl.c | 123 ++++++- + kernel/ucount.c | 1 + + lib/test_firmware.c | 1 + + lib/vsprintf.c | 18 +- + mm/Makefile | 5 +- + mm/backing-dev.c | 48 ++- + mm/cma.c | 84 ++++- + mm/compaction.c | 7 +- + mm/huge_memory.c | 42 +-- + mm/hugetlb.c | 2 +- + mm/internal.h | 5 +- + mm/kasan/kasan.c | 57 +++- + mm/kmemleak.c | 2 +- + mm/ksm.c | 8 +- + mm/list_lru.c | 74 ++-- + mm/memblock.c | 95 ++---- + mm/memcontrol.c | 293 +++++++++++++++- + mm/memfd.c | 342 +++++++++++++++++++ + mm/memory-failure.c | 18 +- + mm/memory.c | 37 +- + mm/memory_hotplug.c | 41 +-- + mm/mempolicy.c | 40 +-- + mm/migrate.c | 357 +++++++++---------- + mm/mmap.c | 25 +- + mm/oom_kill.c | 210 ++++++++---- + mm/page_alloc.c | 378 ++++++++++++++------- + mm/page_idle.c | 12 +- + mm/page_isolation.c | 3 +- + mm/page_owner.c | 6 +- + mm/page_poison.c | 2 +- + mm/percpu-stats.c | 13 +- + mm/shmem.c | 328 +----------------- + mm/slab.c | 107 +++++- + mm/slab.h | 6 +- + mm/slab_common.c | 41 ++- + mm/slob.c | 13 + + mm/slub.c | 140 ++++++-- + mm/sparse.c | 9 +- + mm/swap_slots.c | 4 - + mm/swap_state.c | 153 ++++++--- + mm/swapfile.c | 135 ++++++-- + mm/util.c | 2 +- + mm/vmscan.c | 18 +- + mm/z3fold.c | 35 +- + mm/zsmalloc.c | 15 +- + net/core/sysctl_net_core.c | 1 - + net/ipv4/route.c | 1 - + scripts/checkpatch.pl | 32 +- + security/apparmor/lsm.c | 2 +- + security/integrity/digsig.c | 1 + + security/selinux/hooks.c | 4 + + security/smack/smack_lsm.c | 3 + + 181 files changed, 3467 insertions(+), 2012 deletions(-) + create mode 100644 include/linux/memfd.h + create mode 100644 mm/memfd.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: ipc/mqueue: add missing error code in init_mqueue_fs() +Applying: treewide: fix double ;;s in code +Using index info to reconstruct a base tree... +M drivers/soc/imx/gpc.c +Falling back to patching base and 3-way merge... +Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow +Applying: sparc64: NG4 memset 32 bits overflow +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 07b76633b237...f3a3e1344948 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (f3a3e1344948 sparc64: NG4 memset 32 bits overflow) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + arch/arm/kernel/time.c | 2 +- + arch/arm64/kernel/ptrace.c | 2 +- + arch/powerpc/kvm/book3s_xive.c | 2 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 2 +- + arch/sparc/lib/NG4memset.S | 26 ++++++++++++------------ + arch/x86/boot/compressed/eboot.c | 4 ++-- + block/sed-opal.c | 2 +- + drivers/clocksource/mips-gic-timer.c | 4 ++-- + drivers/clocksource/timer-sun5i.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 2 +- + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 2 +- + drivers/gpu/drm/scheduler/gpu_scheduler.c | 2 +- + drivers/iommu/intel-svm.c | 2 +- + drivers/media/platform/sti/delta/delta-ipc.c | 4 ++-- + ipc/mqueue.c | 4 +++- + 15 files changed, 32 insertions(+), 30 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..293b1e8b2e1a --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing dmi based on 4.15 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..fc08fdf5c71e --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20180223 |