diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-02-15 14:32:26 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-02-15 14:32:26 +1100 |
| commit | e1825f3e512e2fc9fdc9f8679cca2b78aaf13912 (patch) | |
| tree | 237cfa23faad514a7a1a2139bd2579ebc47f142f | |
| parent | cc88d0f7d33872783698859d9a5474529e97358f (diff) | |
| download | linux-next-next-20180215.tar.gz | |
Add linux-next specific files for 20180215next-20180215
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 258 | ||||
| -rw-r--r-- | Next/Trees | 260 | ||||
| -rw-r--r-- | Next/merge.log | 3929 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 4450 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..2fbebc13d774 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,258 @@ +Name SHA1 +---- ---- +origin 6556677a80400ca5744340d8ff6fbed22621293e +fixes 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +kbuild-current 36c1681678b507346e7397a235a7303dad665fc3 +arc-current 05382333595612204d6c91820bd77be20119cb9b +arm-current 091f02483df7b56615b524491f404e574c5e0668 +m68k-current 2334b1ac1235934fc196f2d25bae7f348d3bf42e +metag-fixes b884a190afcecdbef34ca508ea5ee88bb7c77861 +powerpc-fixes ecdf06e1ea5376bba03c155751f6869d3dfaa210 +sparc aebb48f5e465772576359c1705c4a84abea92027 +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net c410c1966fe6fcfb23bcac0924aaa6a6e7449829 +bpf 9c481b908b011398b1491752271cd1e2c9ad5758 +ipsec d97ca5d714a5334aecadadf696875da40f1fbf3e +netfilter b3e456fce9f51d6276e576d00271e2813c1b8b67 +ipvs f7fb77fc12352d15180dc3c08ffba10573d5167d +wireless-drivers 7ac8ff95f48cbfa609a060fd6a1e361dd62feeb3 +mac80211 c4de37ee2b55deac7d6aeac33e02e3d6be243898 +rdma-fixes 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +sound-current fdcc968a3b290407bcba9d4c90e2fba6d8d928f1 +pci-current 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +driver-core.current 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +tty.current 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +usb.current 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +usb-gadget-fixes b2cd1df66037e7c4697c7e40496bf7e4a5e16a2d +usb-serial-fixes d14ac576d10f865970bb1324d337e5e24d79aaf4 +usb-chipidea-fixes 964728f9f407eca0b417fdf8e784b7a76979490c +phy 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +staging.current f1517df8701c9f12dae9ce7f43a5d300a6917619 +char-misc.current 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +input-current ea4f7bd2aca9f68470e9aac0fc9432fd180b1fe7 +crypto-current 2e7d1d61ea6c0f1c4da5eb82cafac750d55637a7 +ide 8e44e6600caa7b96a5b71ae36c8829db753c2d70 +vfio-fixes 563b5cbe334e9503ab2b234e279d500fc4f76018 +kselftest-fixes 91234d53aca7976b3ebf7755e392b512a88db62d +backlight-fixes 8ff5cbc6e3c5c2855245c014f3ba572ddfc5ab0f +nand-fixes ee02f73e04c0e690600f621a3a1d2245834af7fe +spi-nor-fixes 10a6a6975691775bbcc677a04c6fd3120b5c1160 +mfd-fixes 107b7d9fa94c4692d9104243f0e793e2a4e1366e +v4l-dvb-fixes 781b045baefdabf7e0bc9f33672ca830d3db9f27 +reset-fixes f450f28e70a2378d9d6ded0932fe480055888cfa +mips-fixes 67a3ba25aa955198196f40b76b329b3ab9ad415a +kvm-fixes 722c2cd7b7c99d5731689e61f674abeb8f2da537 +kvms390-fixes baabee67f4135e3de87bc874929ac50637aacb0d +drm-intel-fixes ee622fe757f6de612dad0f01805eea815a5b3025 +drm-misc-fixes 54f809cfbd6b4a43959039f5d33596ed3297ce16 +kbuild 9a61df9e5f7471fe5be3e02bd0bed726b2761a54 +uuid c0020756315eebec58310aca42cf9fb73e1322eb +dma-mapping 04f56534786c885f578c24461bcd782fe9a787cf +asm-generic a351e9b9fc24e982ec2f0e76379a49826036da12 +arc 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +arm 3a175cdf439275c3da347b6b42c4e9b652a12904 +arm-perf 7520fa99246dade7ab6dde1573a146beed632abd +arm-soc 2aa127e4d579def8ff77fbaadf53a4034e43158f +actions 61862a89e6acb61e1193c3ad6d4eeab966c470ed +alpine a1144b2b1ec47f50951a83eb2bd847c74415b567 +amlogic b1303f3fa73b71b0121990405a137c8c8d946735 +aspeed 8203ca9789bc48f14cf18d261dc62ecd6839b684 +at91 fa4cf68ab4b1972161d38bce2859850da4236994 +bcm2835 a6189bcc00123f47a256d5a6a46d93c9a2cab52e +imx-mxs 914867289762b2776be4418099590d7e78e17f95 +keystone a29b8b93e1582aaff0b13b84679b3dda935186d9 +mvebu b4e369232fa8da87fead8fb04e19f7c15cc385c4 +omap e11373dead2f52b08b91acc82dfc432aad3b1979 +reset 70d2f16a6289a9ef13c56e408acd3aad6a6415c2 +qcom f5788d2f292935cb841cb57a61868360fd726de6 +realtek 2b6286eb7ab8b9a22f7238bdaad403badd4a93e9 +renesas 5db5cdc451b2e69fdca2d728c6691a8352857d8b +rockchip 003b7fe5f23b48d1b87269f4829801664a26fc1b +samsung bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +samsung-krzk 6d2667f1bdfbd69998fa7c21fb93cdf49d1da7cb +sunxi 3559505a934af49411de47be719af84223c9105b +tegra 983371acdeda5fd76cab580f66438c02d633d512 +arm64 3a0a397ff5ff8b56ca9f7908b75dee6bf0b5fabb +clk c43a52cfd27b20292d19d924eddfa5ff8dce87e5 +clk-samsung 83942bdd992ff347442ec72d86c2d77fe51a0270 +c6x 9d440f7a282433338207c4ffb13cafaccaa27818 +cris fd989db807a00d552ebf29d8ffb20c2ef04742da +m68k 2334b1ac1235934fc196f2d25bae7f348d3bf42e +m68knommu 0d665e7b109d512b7cae3ccef6e8654714887844 +metag e3cd7f013bac3105d44b8bd5a90359989d45b5a5 +microblaze f1517df8701c9f12dae9ce7f43a5d300a6917619 +mips ea4d340cbea470247b19ee696e31f102bc64466a +mips-james 791412dafbbfd860e78983d45cf71db603a82f67 +nios2 e0691ebb33c12084ef11b6b59228c004e19f59c8 +openrisc 0fedb7653af7a8cac606c3eff213ac92693035b9 +parisc-hd fc22c2fd1b345463612de7655682f5f59e1535a1 +powerpc 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +fsl c095ff93f901c1620b28dce4d813dd548bc5236b +risc-v 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +s390 48973df8c9c51612acc870ad1a885b0cf27c3356 +sparc-next 8e44e6600caa7b96a5b71ae36c8829db753c2d70 +sh 6e2fbfdd585f46128ce8879738bca09719a65138 +uml 02eb0b11eab56b47bcc36aa04dd522786c8faab9 +xtensa e3b59e2add9ae7c82413db9a9bf4e65cc2dde54c +fscrypt 0b1dfa4cc6c60052b2c30ead316fa84c46d3c43c +befs 55d945e2e4aa148ef38bdfabb9569af78183a539 +btrfs 7c9a09f56a91c4ee5636703d3a95c72710917718 +btrfs-kdave 6537ffbd6382c25a2cbd26f5b5abf28ccf89bc87 +ceph 16515a6d54183349b858b9c05e483afc55fa7948 +cifs 0bf0cccbaba3d7a348cae568090736294b6bc87c +configfs 6ace4f6bbcfde70278a33c11443ecda3ed0ec1b6 +ecryptfs 4670269faba728683f7250319a65390946c028e3 +ext3 7d0d7178752be7cb54782d596a01954246cf18b3 +ext4 5dc397113d195a004899ee672c5a8a19809495ba +f2fs 1c1d35df71104c76a4a2e25862926f22c334c9d6 +fuse c6cdd51404b7ac12dd95173ddfc548c59ecf037f +jfs 86313903430d08739e391ad51b4865dc3a2bf522 +nfs 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +nfs-anna c54c14ba000d769b7f5e4a33f915f0171b378437 +nfsd 175e03101d36c3034f3c80038d4c28838351a7f2 +orangefs 74e938c22705c7b80d4422e84eea927fc78e60a8 +overlayfs 9b6faee074702bbbc207e7027b9416c2d8fea9fe +ubifs 7f29ae9f977bcdc3654e68bc36d170223c52fd48 +xfs 76883f7988e6d06a97232e979bc7aaa7846a134b +file-locks 1deab8ce2c91e3b16563b7a7ea150f82334262ec +vfs d85e2aa2e34dac793e70b900d865f48c69ecbc27 +vfs-miklos 0eb8af4916a540c362a2950e5ab54eca32eb7d58 +iversion 581e400ff935d34d95811258586128bf11baef15 +printk 02fffdcaed199d4bf13fc57ccedbd1e80463b717 +pci 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +pstore a99f41a1b4412a0f27cc0b287ea34b168da750f1 +hid 494622678bc9c4f4f45495a635780383c9c0606d +i2c a2cdd4be7a2c9e5f6b1633ae49ca4e6db38574d1 +dmi 36a840c73dc6e70a440d05da3b6ee72f7187a5d3 +hwmon-staging e464243586cbd061928f7fb6075f42bb34e50897 +jc_docs 46347502b099d9cff0b635a2eb33c27de9b80b80 +v4l-dvb 29422737017b866d4a51014cc7522fa3a99e8852 +v4l-dvb-next a1dfb4c48cc1e64eeb7800a27c66a6f7e88d075a +fbdev 5865889fe4319415e439095391dda52f23030d60 +pm edf2b9fda0df098042c382101c0f5f103b737479 +cpupower 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +idle 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f +opp 4a823c0be80fa996234ebb41c80d40458b1bec1e +thermal 134f4010799a30acd969e603985c27b9f3e6f58d +thermal-soc d0ecbbbe518e1b256fcda1770ec06a5a1a058567 +ieee1394 188775181bc05f29372b305ef96485840e351fde +dlm 9250e523592a8ced3ecd14abe29fbb1e036bd7eb +swiotlb 69369f52d28a34c84acb6f2a8a585e743441566a +net-next bdc8587ad75d9a42a8165f932c2dfff4d5b877e4 +bpf-next 615a9474985799c8b48645b8e95a9b9f0691f56a +ipsec-next 60aa80460da115216070082b4ab686b9e37c86ef +netfilter-next c746fc0e8b2d144e2ee9122e4efd72326ff3cd1b +nfc-next 4d63adfe12dd9cb61ed8badb4d798955399048c2 +ipvs-next a910d20aa007b94cf1799df59341f5e27ca60e6f +wireless-drivers-next cf19e5e2054f5172c07a152f9e04eb3bae3d86dd +bluetooth 907f84990924bf3a8d248c040dabeb5127ae6938 +mac80211-next ff84e7bfe1763982e1ada390386dbe4739cee1e2 +rdma 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +gfs2 6556677a80400ca5744340d8ff6fbed22621293e +mtd f23def8038611fa362de345c540107c78edaa085 +l2-mtd 571cb17b23eccc22f18c4fc0a0fc34cf0abca7ef +nand fb3bff5b407e58493fa6bc44f24217f649aecd25 +spi-nor 23bae78e8a57f0249ed9e3f9c3f40fc1499ce0d4 +crypto 2d55807b7f7bf62bb05a8b91247c5eb7cd19ac04 +drm 94fc27ac487a80daf42f97b1a0503d029f3c1325 +drm-panel e4bac408b08437d190785ab1250cc676304ed171 +drm-intel b6a88e4a804cf5a71159906e16df2c1fc7196f92 +drm-tegra 8f62142e490d761ceb92b55a7c05bb79294d6c6c +drm-misc 761e05a702f5d537ffcca1ba933f9f0a968aa022 +drm-msm 8fe2938c9bac4cb130093b85abdfdb99bba0c986 +hdlcd f73e8b82531573a198a4d0e5bff0d3256cbbd1d8 +mali-dp 54243016ae35a0912a680f884835237fd6176820 +sunxi-drm 7dafb83edd3271917458de0ae70586ac63098e2f +imx-drm 4cfea3c1f2718d945ca44c1aaac47d8d513c4478 +etnaviv 246774d17fc05a9b33c769c937003cc73d258674 +kconfig bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +regmap b7f717a560dca3f2784232c1bb1b338cae72c128 +sound 04f8773a3e980f60953e7aeb36ec6c2631e11f10 +sound-asoc 2188f73a2a44d0746afb0f0f6cf2139cf5a77ac0 +modules 0cad61d7a3d51e0237a7e421c75b04ebbb5062d0 +input cdc2466df40f26af60f6b18123069bd52336a80c +block 0ccfb3c0032b20a7f137976e9e783c896d55301e +lightnvm 1c6286f26301ad154a1c10fb6e68925493dd28ba +device-mapper de6ff5c58656d69f5a58c1e7353532bcf1ebe0d6 +mmc 56174d9a21496fce64fcc6ba2f475734c20c12e4 +kgdb 2cf2f0d5b91fd1b06a6ae260462fc7945ea84add +md 1532d9e87e8b2377f12929f9e40724d5fbe6ecc5 +mfd 0f89ffefa4e122e7e9bc1c2d716c6052b4601b76 +backlight 2023b0524a6310e9ea80daf085f51c71bff9289f +battery 416a1ae673db0918fbe6707c7d6f4459598e2c65 +regulator 06ed437706fbb761af39166fcfe097249a4687f2 +security 400f428062af7e9200ff15dce2ef3c01ff007d96 +integrity b79f5f38d87f66576deb49e18f2175a295db24de +keys 1e684d3820d8f72d877c0adb521ae17c6fc9bc88 +selinux 213d7f94775322ba44e0bbb55ec6946e9de88cea +tpmdd c3211d722c614bfa0e2f728a1a0598f099f7adb0 +watchdog 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +iommu fedbd940d1c2e37e6b11cf84f67b30dfcbf6fba5 +dwmw2-iommu 910170442944e1f8674fd5ddbeeb8ccd1877ea98 +vfio 46ed90f157f42d956ffed17c003f089a59b76e3e +trivial 1972d6c0c86dd8620ff9f2811ce875135ffb5405 +audit 6387440e15db1c9ee58028433cd87291cae488e7 +devicetree 7ea5c83472d39ec6065d98606f058c8fd9916616 +mailbox 0ae7d327a64b262443b7d3ebee5831e4dde47b89 +spi 67ca606a4f72eddb5cfff8e2efbac291d4d935e7 +tip 8949057908ac006e7440fccf8e1d589e53bc8eb7 +clockevents 322fd24f5e67c396f04bef01ed33ac6bfca46bcd +edac 345fb0a9a6340ba0b3b714d62f877fde88c8a755 +edac-amd 68fa24f9121c04ef146b5158f538c8b32f285be5 +irqchip c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201 +ftrace 841a915d20c7b22fc4f36f12368daf94d9f8cb10 +rcu f95af50cb73d453874639c3250f4019717dd774e +kvm 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +kvm-arm 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +kvm-mips dc44abd6aad22411f7f9890e39fd4753dabf0d03 +kvm-ppc 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +kvms390 959b9da6c367750589881a71a82be921e5270458 +xen-tip 156ba2a2561451953519a2569f1bf3e594c08af6 +percpu 685469e5bf9d31ccd9212be86f861a18fc213d05 +workqueues a10eb37ccf1d47f9d97269ede326aa949816be87 +drivers-x86 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +chrome-platform 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +hsi b6dc80dbe6cdf4effd5a07bcd37f34cbf25eb07a +leds 6204f03d3f5428254ecb6c6e813a7244c8707346 +ipmi 09c0179286c76c2feeafd752c7aae961b9b11d35 +driver-core 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +usb 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +usb-gadget 8ada211d0383b72878582bd312b984a9eae62b30 +usb-serial d1c48227d7c45fbb35c81f846a62ec92a74f4701 +usb-chipidea-next ce4c1b820c5269437ce2e7831f638159b3b83269 +phy-next 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +tty 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +char-misc 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +extcon 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +staging f1517df8701c9f12dae9ce7f43a5d300a6917619 +mux 6cd361c99ef2bbe23edd554079c4187321a21219 +slave-dma 5ec91512231afbca3b98cd9e49c56bc345f4a4e0 +cgroup c53593e5cb693d59d9e8b64fb3a79436bf99c3b3 +scsi 1bc5ad3a6acdcf56f83272f2de1cd2389ea9e9e2 +scsi-mkp f9ba7af8105f792d2204742810f9647aa32699cd +target-updates 1c130ae00b769a2e2df41bad3d6051ee8234b636 +target-bva 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +libata 0a65e125150c227314dcd561a202a84228398449 +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 264d1d49b43749efce2c9754361e694b4d5cc05f +nvdimm ee95f4059a833839bf52972191b2d4c3d3cec552 +idr f0f3f2d0a3e0f7c48163fd8b45f5909d46e7f371 +at24 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +ntb 53c3677c56c76f90cacd3a1063272fc6d6bc8f76 +kspp 2d00fcb32f71904a789d285c1ae335d5f42a38d2 +init_task e1e871aff3ded26348c631b1370e257d401cd22d +akpm-current 5682fa508060179aa2039afa6d7adb74147c7ca3 +akpm 4d5e2d42d01290dcb9f420f614ee906c0bfb87c3 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..89cd025c56b4 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,260 @@ +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 +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..20f515838391 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3929 @@ +$ date -R +Thu, 15 Feb 2018 09:35:58 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 61f14c015f5b Merge tag 'mips_4.16_2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips +Merging origin/master (6556677a8040 Merge tag 'gfs2-4.16.rc1.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2) +$ git merge origin/master +Updating 61f14c015f5b..6556677a8040 +Fast-forward + arch/powerpc/include/asm/book3s/32/pgtable.h | 1 + + arch/powerpc/include/asm/book3s/64/hash-4k.h | 3 +- + arch/powerpc/include/asm/book3s/64/hash-64k.h | 16 ++- + arch/powerpc/include/asm/book3s/64/hash.h | 13 ++- + arch/powerpc/include/asm/book3s/64/pgalloc.h | 16 ++- + arch/powerpc/include/asm/book3s/64/pgtable.h | 4 +- + arch/powerpc/include/asm/exception-64s.h | 2 +- + arch/powerpc/include/asm/hw_irq.h | 12 ++- + arch/powerpc/include/asm/kexec.h | 6 ++ + arch/powerpc/include/asm/nohash/32/pgtable.h | 1 + + arch/powerpc/include/asm/nohash/64/pgtable.h | 1 + + arch/powerpc/include/asm/topology.h | 10 ++ + arch/powerpc/kernel/exceptions-64e.S | 2 + + arch/powerpc/kernel/exceptions-64s.S | 6 +- + arch/powerpc/mm/hash64_4k.c | 4 +- + arch/powerpc/mm/hash64_64k.c | 8 +- + arch/powerpc/mm/hash_utils_64.c | 1 + + arch/powerpc/mm/hugetlbpage-hash64.c | 10 +- + arch/powerpc/mm/init-common.c | 4 +- + arch/powerpc/mm/numa.c | 5 - + arch/powerpc/mm/pgtable-radix.c | 117 +++++++++++++++++---- + arch/powerpc/mm/pgtable_64.c | 4 + + arch/powerpc/mm/tlb_hash64.c | 9 +- + arch/powerpc/platforms/powernv/vas-window.c | 16 +-- + arch/powerpc/platforms/pseries/hotplug-cpu.c | 4 +- + arch/powerpc/platforms/pseries/ras.c | 31 ++++-- + drivers/misc/ocxl/file.c | 2 +- + fs/gfs2/bmap.c | 43 ++++---- + .../powerpc/alignment/alignment_handler.c | 2 +- + 29 files changed, 254 insertions(+), 99 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 (ecdf06e1ea53 selftests/powerpc: Fix to use ucontext_t instead of struct ucontext) +$ git merge powerpc-fixes/fixes +Already up to date. +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 (c410c1966fe6 tls: getsockopt return record sequence number) +$ git merge net/master +Merge made by the 'recursive' strategy. + Documentation/networking/segmentation-offloads.txt | 38 ++++++- + drivers/net/ethernet/cavium/common/cavium_ptp.c | 2 + + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 110 +++++---------------- + drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 11 +-- + drivers/net/ethernet/cavium/thunder/nicvf_queues.h | 4 - + drivers/net/ethernet/ibm/ibmvnic.c | 54 +++++++++- + drivers/net/ethernet/marvell/mvpp2.c | 11 ++- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 32 +++--- + drivers/net/ethernet/renesas/ravb_main.c | 6 -- + drivers/net/ethernet/renesas/sh_eth.c | 18 +--- + drivers/net/phy/phy_device.c | 2 +- + drivers/net/thunderbolt.c | 19 +++- + include/linux/ptr_ring.h | 2 +- + include/uapi/linux/if_ether.h | 6 +- + include/uapi/linux/libc-compat.h | 6 -- + net/bridge/br_sysfs_if.c | 3 + + net/core/dev.c | 11 ++- + net/ipv4/tcp_output.c | 25 +++++ + net/rds/connection.c | 2 +- + net/sched/cls_api.c | 26 +++-- + net/sched/cls_u32.c | 24 ++++- + net/sctp/debug.c | 6 ++ + net/sctp/input.c | 5 +- + net/sctp/stream.c | 2 +- + net/sctp/stream_interleave.c | 11 +-- + net/tipc/bearer.c | 82 +++++++++------ + net/tipc/bearer.h | 4 + + net/tipc/net.c | 15 ++- + net/tipc/net.h | 1 + + net/tipc/netlink_compat.c | 43 ++++---- + net/tls/tls_main.c | 7 +- + net/unix/af_unix.c | 2 +- + 32 files changed, 347 insertions(+), 243 deletions(-) +Merging bpf/master (9c481b908b01 bpf: fix bpf_prog_array_copy_to_user warning from perf event prog query) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + 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 ++ + 5 files changed, 13 insertions(+), 7 deletions(-) +Merging ipsec/master (d97ca5d714a5 xfrm_user: uncoditionally validate esn replay attribute struct) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/xfrm/xfrm_policy.c | 2 +- + net/xfrm/xfrm_state.c | 5 +++++ + net/xfrm/xfrm_user.c | 21 ++++++++------------- + 3 files changed, 14 insertions(+), 14 deletions(-) +Merging netfilter/master (b3e456fce9f5 netfilter: ipt_CLUSTERIP: fix a race condition of proc file creation) +$ git merge netfilter/master +Merge made by the 'recursive' strategy. + net/ipv4/netfilter/ipt_CLUSTERIP.c | 12 ++++++------ + net/netfilter/x_tables.c | 4 ---- + 2 files changed, 6 insertions(+), 10 deletions(-) +Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (7ac8ff95f48c mvpp2: fix multicast address filter) +$ git merge wireless-drivers/master +Already up to date. +Merging mac80211/master (c4de37ee2b55 mac80211: mesh: fix wrong mesh TTL offset calculation) +$ git merge mac80211/master +Auto-merging net/mac80211/mesh.c +Auto-merging net/mac80211/ieee80211_i.h +Merge made by the 'recursive' strategy. + net/mac80211/ieee80211_i.h | 2 +- + net/mac80211/mesh.c | 17 ++++++----------- + net/wireless/mesh.c | 25 ++++++++++++++++++++++--- + 3 files changed, 29 insertions(+), 15 deletions(-) +Merging rdma-fixes/for-rc (7928b2cbe55b Linux 4.16-rc1) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (fdcc968a3b29 ALSA: hda/realtek: PCI quirk for Fujitsu U7x7) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + include/sound/ac97/regs.h | 2 +- + sound/ac97/Kconfig | 1 - + sound/core/seq/seq_clientmgr.c | 8 +++-- + sound/pci/hda/patch_realtek.c | 72 ++++++++++++++++++++++++++++++++++++++++++ + sound/usb/mixer.c | 18 +++++++---- + sound/usb/pcm.c | 9 ++++++ + sound/usb/quirks.c | 7 ++-- + 7 files changed, 104 insertions(+), 13 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 (7928b2cbe55b Linux 4.16-rc1) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (7928b2cbe55b Linux 4.16-rc1) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (7928b2cbe55b Linux 4.16-rc1) +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (b2cd1df66037 Linux 4.15-rc7) +$ 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 (f1517df8701c Merge tag 'nfsd-4.16' of git://linux-nfs.org/~bfields/linux) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (7928b2cbe55b Linux 4.16-rc1) +$ 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 (2e7d1d61ea6c crypto: sun4i_ss_prng - convert lock to _bh in sun4i_ss_prng_generate) +$ git merge crypto-current/master +Already up to date. +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 (91234d53aca7 selftests/futex: Fix line continuation in Makefile) +$ git merge kselftest-fixes/fixes +Merge made by the 'recursive' strategy. + tools/testing/selftests/android/Makefile | 8 ++++---- + tools/testing/selftests/futex/Makefile | 6 +++--- + tools/testing/selftests/memfd/config | 1 + + tools/testing/selftests/pstore/config | 1 + + tools/testing/selftests/sync/Makefile | 2 +- + tools/testing/selftests/vDSO/Makefile | 14 +++++++------- + tools/testing/selftests/x86/Makefile | 2 +- + 7 files changed, 18 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 (10a6a6975691 Revert "dt-bindings: mtd: add sst25wf040b and en25s64 to sip-nor list") +$ 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 (67a3ba25aa95 MIPS: Fix incorrect mem=X@Y handling) +$ git merge mips-fixes/mips-fixes +Merge made by the 'recursive' strategy. + arch/mips/kernel/setup.c | 16 ++++++++++++---- + arch/mips/kernel/smp-bmips.c | 2 +- + 2 files changed, 13 insertions(+), 5 deletions(-) +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 (baabee67f413 KVM: s390: use switch vs jump table in interrupt.c) +$ git merge kvms390-fixes/master +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (ee622fe757f6 drm/i915: Fix DSI panels with v1 MIPI sequences without a DEASSERT sequence v3) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/gvt/kvmgt.c | 51 ++++++- + drivers/gpu/drm/i915/gvt/mmio_context.c | 1 + + drivers/gpu/drm/i915/gvt/trace.h | 2 +- + drivers/gpu/drm/i915/i915_drv.c | 14 +- + drivers/gpu/drm/i915/i915_drv.h | 2 + + drivers/gpu/drm/i915/i915_gem_context.c | 2 +- + drivers/gpu/drm/i915/i915_oa_cflgt3.c | 4 +- + drivers/gpu/drm/i915/i915_oa_cnl.c | 4 +- + drivers/gpu/drm/i915/i915_pmu.c | 231 +++++++++++++++++++------------ + drivers/gpu/drm/i915/i915_pmu.h | 6 + + drivers/gpu/drm/i915/intel_bios.c | 105 ++++++++++++++ + drivers/gpu/drm/i915/intel_breadcrumbs.c | 29 ++-- + drivers/gpu/drm/i915/intel_cdclk.c | 8 ++ + drivers/gpu/drm/i915/intel_engine_cs.c | 24 ++-- + drivers/gpu/drm/i915/intel_ringbuffer.h | 14 -- + 15 files changed, 346 insertions(+), 151 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (54f809cfbd6b drm/atomic: Fix memleak on ERESTARTSYS during non-blocking commits) +$ git merge drm-misc-fixes/for-linux-next-fixes +Auto-merging include/drm/drm_atomic.h +Auto-merging drivers/gpu/drm/drm_atomic_helper.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/cirrus/cirrus_mode.c | 40 +++++++++++++++++++++--------------- + drivers/gpu/drm/drm_atomic_helper.c | 15 ++++++++++++++ + include/drm/drm_atomic.h | 9 ++++++++ + 3 files changed, 47 insertions(+), 17 deletions(-) +Merging kbuild/for-next (9a61df9e5f74 Merge tag 'kbuild-v4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) +$ git merge kbuild/for-next +Already up to date. +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 (7520fa99246d perf: ARM DynamIQ Shared Unit PMU support) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (2aa127e4d579 Merge branches 'next/dt' and 'next/drivers' into for-next) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 239 +++++++++++++++++++++++++++++++++ + 1 file changed, 239 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +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 | 268 ++++++++++++++++++++- + .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 1 + + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 10 +- + .../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 + + arch/arm64/boot/dts/amlogic/meson-gxl.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 +- + 24 files changed, 381 insertions(+), 16 deletions(-) +Merging aspeed/for-next (8203ca9789bc Merge branch 'dt-for-v4.16' into for-next) +$ git merge aspeed/for-next +Already up to date! +Merge made by the 'recursive' strategy. +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 (914867289762 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. + 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 | 2 +- + 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/soc/imx/gpc.c | 10 +- + drivers/soc/imx/gpcv2.c | 13 +- + 197 files changed, 3250 insertions(+), 1321 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 +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 +- + 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/arm/mach-mvebu/Kconfig | 4 +- + 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 +++++++++++++++++--- + 29 files changed, 106 insertions(+), 843 deletions(-) +Merging omap/for-next (e11373dead2f Merge branch 'omap-for-v4.17/soc' into for-next) +$ git merge omap/for-next +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/logicpd-som-lv.dtsi | 9 +- + arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 8 + + 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-uevm.dts | 2 +- + arch/arm/boot/dts/omap5.dtsi | 2 - + arch/arm/mach-omap1/clock.c | 6 +- + 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-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-wakeupgen.c | 4 +- + arch/arm/mach-omap2/omap_hwmod.c | 6 +- + 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/pm.c | 4 +- + arch/arm/mach-omap2/timer.c | 19 +- + arch/arm/plat-omap/include/plat/dmtimer.h | 4 - + include/linux/platform_data/asoc-ti-mcbsp.h | 12 - + include/linux/platform_data/gpio-omap.h | 5 - + include/linux/platform_data/spi-omap2-mcspi.h | 8 - + 41 files changed, 659 insertions(+), 557 deletions(-) + create mode 100644 arch/arm/boot/dts/am335x-pdu001.dts + rename arch/arm/{plat-omap/include/plat => mach-omap1}/i2c.h (90%) +Merging reset/reset/next (70d2f16a6289 reset: meson: enable level reset support on Meson8b) +$ git merge reset/reset/next +Merge made by the 'recursive' strategy. + drivers/reset/reset-meson.c | 22 +++++----------------- + 1 file changed, 5 insertions(+), 17 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 (5db5cdc451b2 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 +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/shmobile.txt | 4 + + .../devicetree/bindings/reset/renesas,rst.txt | 1 + + 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.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/arm64/Kconfig.platforms | 6 + + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 117 +- + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 106 +- + arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 10 + + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 27 +- + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 190 ++ + arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 28 + + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 99 +- + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 7 + + arch/arm64/configs/defconfig | 1 + + drivers/soc/renesas/Kconfig | 2 +- + drivers/soc/renesas/rcar-rst.c | 1 + + drivers/soc/renesas/rcar-sysc.c | 2 +- + drivers/soc/renesas/renesas-soc.c | 8 + + include/dt-bindings/power/r8a77980-sysc.h | 43 + + 36 files changed, 9237 insertions(+), 7868 deletions(-) + create mode 100644 arch/arm64/boot/dts/renesas/r8a77980.dtsi + create mode 100644 include/dt-bindings/power/r8a77980-sysc.h +Merging rockchip/for-next (003b7fe5f23b 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 | 4 + + .../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 | 25 +- + arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 1 - + arch/arm64/boot/dts/rockchip/Makefile | 1 + + arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 267 +++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 7 +- + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 7 +- + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 6 + + arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 77 +++++- + drivers/clk/rockchip/clk-rk3328.c | 67 ++++-- + drivers/soc/rockchip/grf.c | 14 ++ + include/dt-bindings/clock/rk3328-cru.h | 1 - + 16 files changed, 429 insertions(+), 59 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts +Merging samsung/for-next (bebc6082da0a Linux 4.14) +$ git merge samsung/for-next +Already up to date. +Merging samsung-krzk/for-next (6d2667f1bdfb Merge branch 'next/dt' into for-next) +$ git merge samsung-krzk/for-next +Removing arch/arm/boot/dts/samsung_k3pe0e000b.dtsi +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/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/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-itop-elite.dts | 16 +- + 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 | 80 +- + 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 +- + 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 +- + 36 files changed, 3894 insertions(+), 3969 deletions(-) + delete mode 100644 arch/arm/boot/dts/samsung_k3pe0e000b.dtsi +Merging sunxi/sunxi/for-next (3559505a934a Merge branches 'sunxi/dt-for-4.17', 'sunxi/dt64-for-4.17', 'sunxi/h3-h5-for-4.17' and 'sunxi/clk-for-4.17' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 3 + + 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 | 3 +- + .../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 | 3 +- + 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 | 6 +- + 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 | 4 +- + 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 | 17 +- + arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts | 3 +- + .../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/sunxi-h3-h5.dtsi | 14 +- + .../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 | 2 - + drivers/clk/sunxi-ng/Kconfig | 7 - + 111 files changed, 817 insertions(+), 268 deletions(-) + 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 +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 (c43a52cfd27b Merge branches 'clk-aspeed', 'clk-lock-UP', 'clk-mediatek' and 'clk-allwinner' into clk-next) +$ 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 (0d665e7b109d mm, page_vma_mapped: Drop faulty pointer arithmetics in check_pte()) +$ 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 (f1517df8701c Merge tag 'nfsd-4.16' of git://linux-nfs.org/~bfields/linux) +$ git merge microblaze/next +Already up to date. +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 (791412dafbbf MIPS: CPC: Map registers using DT in mips_cpc_default_phys_base()) +$ git merge mips-james/mips-next +Already up to date. +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 (fc22c2fd1b34 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 | 46 +++++++++++++++++++++--------------- + 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, 82 insertions(+), 32 deletions(-) +Merging powerpc/next (7928b2cbe55b Linux 4.16-rc1) +$ 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 (7928b2cbe55b Linux 4.16-rc1) +$ git merge risc-v/for-next +Already up to date. +Merging s390/features (48973df8c9c5 s390/kconfig: Remove ARCH_WANTS_PROT_NUMA_PROT_NONE select) +$ git merge s390/features +Already up to date. +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 (02eb0b11eab5 um: Add missing EXPORT for free_irq_by_fd()) +$ git merge uml/linux-next +Auto-merging arch/um/drivers/net_kern.c +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 | 1630 ++++++++++++++++++++++++++++++++++ + 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, 3383 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 (e3b59e2add9a Merge branch 'xtensa-fixes' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Merge made by the 'recursive' strategy. + arch/xtensa/mm/init.c | 70 +++++++++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 63 insertions(+), 7 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 b6fcfb783c8e] Merge remote-tracking branch 'btrfs/next' + Date: Thu Feb 15 10:19:52 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 23008ba74ecf] Merge remote-tracking branch 'btrfs-kdave/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/Kconfig | 3 +- + fs/btrfs/Makefile | 2 +- + fs/btrfs/backref.c | 11 +- + 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/delayed-ref.c | 3 +- + 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 | 163 +++++++--------- + 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 | 183 +++++++++++------- + 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 | 395 +++++++++++++++++++++++++++----------- + 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 | 46 +++-- + fs/btrfs/volumes.c | 80 +++++--- + 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 + + 49 files changed, 1269 insertions(+), 936 deletions(-) + delete mode 100644 fs/btrfs/hash.c + delete mode 100644 fs/btrfs/hash.h +Merging ceph/master (16515a6d5418 ceph: improving efficiency of syncfs) +$ git merge ceph/master +Already up to date. +Merging cifs/for-next (0bf0cccbaba3 [SMB3] Update README file for cifs.ko) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/cifs/README | 29 +++++++++++++---------------- + Documentation/filesystems/cifs/TODO | 25 ++++++++++++++----------- + fs/cifs/smb2pdu.c | 8 ++++++-- + fs/cifs/smbdirect.c | 4 ++-- + 4 files changed, 35 insertions(+), 31 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 (7d0d7178752b 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 (7928b2cbe55b Linux 4.16-rc1) +$ git merge nfs/linux-next +Already up to date. +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 38ca72d19bd6] Merge remote-tracking branch 'nfs-anna/linux-next' +$ git diff -M --stat --summary HEAD^.. +Merging nfsd/nfsd-next (175e03101d36 svcrdma: Fix Read chunk round-up) +$ git merge nfsd/nfsd-next +Already up to date. +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 (9b6faee07470 ovl: check ERR_PTR() return value from ovl_encode_fh()) +$ git merge overlayfs/overlayfs-next +Already up to date. +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 (7928b2cbe55b Linux 4.16-rc1) +$ git merge pci/next +Already up to date. +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 (494622678bc9 Merge branch 'for-4.16/hid-quirks-cleanup/toshiba' into for-next) +$ git merge hid/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging i2c/i2c/for-next (a2cdd4be7a2c Merge branch 'i2c/for-4.16' into i2c/for-next) +$ git merge i2c/i2c/for-next +Resolved 'drivers/i2c/i2c-core-smbus.c' using previous resolution. +Auto-merging drivers/i2c/i2c-core-smbus.c +CONFLICT (content): Merge conflict in drivers/i2c/i2c-core-smbus.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 55f3e9065fe6] Merge remote-tracking branch 'i2c/i2c/for-next' +$ git diff -M --stat --summary HEAD^.. +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/k10temp.c | 5 ++++- + drivers/hwmon/sht21.c | 3 +-- + 4 files changed, 9 insertions(+), 7 deletions(-) +Merging jc_docs/docs-next (46347502b099 Restructure kernel-doc.rst) +$ git merge jc_docs/docs-next +Merge made by the 'recursive' strategy. + Documentation/doc-guide/kernel-doc.rst | 539 +++++++++++++++------------------ + Documentation/process/5.Posting.rst | 2 +- + Documentation/trace/events.txt | 2 +- + scripts/split-man.pl | 28 ++ + 4 files changed, 278 insertions(+), 293 deletions(-) + create mode 100755 scripts/split-man.pl +Merging v4l-dvb/master (29422737017b media: rc: get start time just before calling driver tx) +$ git merge v4l-dvb/master +Merge made by the 'recursive' strategy. + 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/ad9389b.c | 14 +- + drivers/media/i2c/adv7511.c | 14 +- + drivers/media/i2c/adv7604.c | 14 +- + drivers/media/i2c/adv7842.c | 15 +- + drivers/media/i2c/tc358743.c | 15 +- + drivers/media/i2c/tc358743_regs.h | 15 +- + 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/cec-gpio/cec-gpio.c | 14 +- + 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/v4l2-core/v4l2-dv-timings.c | 15 +- + 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/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-dv-timings.h | 15 +- + include/media/v4l2-rect.h | 14 +- + include/uapi/linux/cec-funcs.h | 29 ---- + include/uapi/linux/cec.h | 29 ---- + 113 files changed, 463 insertions(+), 1477 deletions(-) +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 (edf2b9fda0df Merge branch 'acpi-doc' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-devices-platform-dock | 39 +++++++++++ + Documentation/ABI/testing/sysfs-devices-system-cpu | 77 +++++++++++++++++++++- + Documentation/ABI/testing/sysfs-platform-dptf | 40 +++++++++++ + drivers/acpi/bus.c | 75 +++++++++++---------- + drivers/acpi/ec.c | 6 ++ + drivers/acpi/property.c | 4 +- + drivers/acpi/spcr.c | 1 + + drivers/base/core.c | 3 + + drivers/base/power/wakeirq.c | 6 +- + drivers/base/property.c | 5 +- + drivers/of/property.c | 4 +- + drivers/opp/cpu.c | 2 +- + include/linux/acpi.h | 4 +- + include/linux/cpuidle.h | 2 +- + include/linux/fwnode.h | 4 +- + include/linux/property.h | 2 +- + 16 files changed, 222 insertions(+), 52 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-devices-platform-dock + create mode 100644 Documentation/ABI/testing/sysfs-platform-dptf +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 (bdc8587ad75d Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue) +$ git merge net-next/master +Auto-merging net/xfrm/xfrm_policy.c +Auto-merging net/unix/af_unix.c +Auto-merging net/tipc/bearer.c +Auto-merging net/sctp/diag.c +Auto-merging net/core/dev.c +Auto-merging drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/ti,dp83867.txt | 2 + + drivers/infiniband/hw/usnic/usnic_transport.c | 5 +- + drivers/isdn/mISDN/socket.c | 5 +- + drivers/net/dsa/mv88e6xxx/Kconfig | 10 + + drivers/net/dsa/mv88e6xxx/Makefile | 4 + + drivers/net/dsa/mv88e6xxx/chip.c | 67 ++ + drivers/net/dsa/mv88e6xxx/chip.h | 103 ++ + drivers/net/dsa/mv88e6xxx/global2.c | 9 +- + drivers/net/dsa/mv88e6xxx/global2.h | 85 +- + drivers/net/dsa/mv88e6xxx/global2_avb.c | 193 ++++ + drivers/net/dsa/mv88e6xxx/global2_scratch.c | 240 +++++ + drivers/net/dsa/mv88e6xxx/hwtstamp.c | 584 ++++++++++++ + drivers/net/dsa/mv88e6xxx/hwtstamp.h | 172 ++++ + drivers/net/dsa/mv88e6xxx/ptp.c | 381 ++++++++ + drivers/net/dsa/mv88e6xxx/ptp.h | 108 +++ + 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/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/mlxsw/Makefile | 2 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 350 +------ + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 30 +- + .../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_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/loopback.c | 1 + + drivers/net/phy/dp83867.c | 19 + + drivers/net/ppp/pppoe.c | 6 +- + drivers/net/ppp/pptp.c | 6 +- + 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/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/net.h | 8 +- + include/linux/netdevice.h | 6 + + include/linux/ptp_classify.h | 4 + + include/linux/rtnetlink.h | 1 + + include/net/ax25.h | 2 + + include/net/dsa.h | 20 + + include/net/inet_common.h | 2 +- + include/net/ipv6.h | 2 +- + include/net/lwtunnel.h | 15 + + include/net/net_namespace.h | 6 + + include/net/sock.h | 2 +- + include/net/tcp.h | 3 +- + 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_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/fib_notifier.c | 1 + + net/core/fib_rules.c | 1 + + net/core/net-procfs.c | 2 + + net/core/net_namespace.c | 95 +- + net/core/rtnetlink.c | 5 +- + net/core/sock.c | 7 +- + 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/ipmr.c | 1 + + net/ipv4/ping.c | 1 + + net/ipv4/proc.c | 1 + + net/ipv4/raw.c | 1 + + net/ipv4/route.c | 22 +- + net/ipv4/sysctl_net_ipv4.c | 1 + + net/ipv4/tcp_input.c | 4 +- + net/ipv4/tcp_ipv4.c | 15 +- + net/ipv4/tcp_metrics.c | 1 + + net/ipv4/tcp_minisocks.c | 3 +- + net/ipv4/udp.c | 1 + + net/ipv4/udplite.c | 1 + + net/ipv4/xfrm4_policy.c | 1 + + net/ipv6/addrconf.c | 1 + + net/ipv6/af_inet6.c | 5 +- + net/ipv6/route.c | 9 +- + net/ipv6/tcp_ipv6.c | 13 +- + 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/netfilter/core.c | 1 + + net/netfilter/nf_log.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 | 5 +- + net/rds/tcp.c | 7 +- + net/rose/af_rose.c | 5 +- + net/sched/act_api.c | 1 + + 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 | 36 +- + net/sunrpc/clnt.c | 6 +- + net/sunrpc/svcsock.c | 13 +- + net/sunrpc/xprtsock.c | 3 +- + net/sysctl_net.c | 1 + + net/tipc/bearer.c | 8 +- + net/tipc/link.c | 3 +- + net/tipc/node.c | 24 + + net/tipc/node.h | 1 + + net/tipc/socket.c | 5 +- + net/unix/af_unix.c | 11 +- + net/vmw_vsock/af_vsock.c | 4 +- + net/wireless/wext-core.c | 1 + + net/x25/af_x25.c | 4 +- + 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 +++++----- + 163 files changed, 6981 insertions(+), 1765 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/mellanox/mlxsw/spectrum_span.c + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_span.h + rename net/sctp/{sctp_diag.c => diag.c} (92%) + create mode 100755 tools/testing/selftests/net/fib-onlink-tests.sh +Merging bpf-next/master (615a94749857 tools/bpf: adjust rlimit RLIMIT_MEMLOCK for test_tcpbpf_user) +$ git merge bpf-next/master +Merge made by the 'recursive' strategy. + include/linux/filter.h | 2 +- + 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 ++++++ + 6 files changed, 19 insertions(+), 3 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 (907f84990924 Bluetooth: btrtl: Add RTL8723D and RTL8821C devices) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + 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 +- + net/bluetooth/hci_request.c | 6 +- + 7 files changed, 118 insertions(+), 53 deletions(-) +Merging mac80211-next/master (ff84e7bfe176 mac80211: Add support to notify ht/vht opmode modification.) +$ git merge mac80211-next/master +Auto-merging net/wireless/nl80211.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/mac80211_hwsim.c | 81 +++++++++++++---- + drivers/net/wireless/mac80211_hwsim.h | 9 +- + include/net/cfg80211.h | 97 +++++++++++++++++++- + include/uapi/linux/nl80211.h | 87 +++++++++++++++++- + net/mac80211/debugfs_sta.c | 10 +- + net/mac80211/rx.c | 14 +++ + net/mac80211/vht.c | 9 ++ + net/wireless/nl80211.c | 167 +++++++++++++++++++++++++++++++++- + net/wireless/rdev-ops.h | 15 +++ + net/wireless/trace.h | 23 +++++ + 10 files changed, 482 insertions(+), 30 deletions(-) +Merging rdma/for-next (7928b2cbe55b Linux 4.16-rc1) +$ git merge rdma/for-next +Already up to date. +Merging gfs2/for-next (6556677a8040 Merge tag 'gfs2-4.16.rc1.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2) +$ git merge gfs2/for-next +Already up to date. +Merging mtd/master (f23def803861 mtd: nand: MTD_NAND_MARVELL should depend on HAS_DMA) +$ git merge mtd/master +Merge made by the 'recursive' strategy. + drivers/mtd/nand/Kconfig | 2 +- + drivers/mtd/nand/vf610_nfc.c | 6 ++---- + 2 files changed, 3 insertions(+), 5 deletions(-) +Merging l2-mtd/mtd/next (571cb17b23ec Merge tag 'nand/for-4.16' of git://git.infradead.org/linux-mtd into mtd/next) +$ git merge l2-mtd/mtd/next +Already up to date. +Merging nand/nand/next (fb3bff5b407e mtd: nand: toshiba: Retrieve ECC requirements from extended ID) +$ git merge nand/nand/next +Auto-merging drivers/mtd/nand/vf610_nfc.c +Merge made by the 'recursive' strategy. + drivers/mtd/nand/marvell_nand.c | 39 ++- + drivers/mtd/nand/mxc_nand.c | 509 ++++++++++++++++++++++++---------------- + drivers/mtd/nand/nand_toshiba.c | 26 ++ + drivers/mtd/nand/vf610_nfc.c | 44 ++-- + 4 files changed, 382 insertions(+), 236 deletions(-) +Merging spi-nor/spi-nor/next (23bae78e8a57 mtd: mtk-nor: modify functions' name more generally) +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (2d55807b7f7b crypto: picoxcell - Fix error handling in spacc_probe()) +$ git merge crypto/master +Already up to date. +Merging drm/drm-next (94fc27ac487a Merge tag 'drm-intel-next-fixes-2018-02-07' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) +$ git merge drm/drm-next +Already up to date. +Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD) +$ git merge drm-panel/drm/panel/for-next +Already up to date. +Merging drm-intel/for-linux-next (b6a88e4a804c drm/i915: Fix rsvd2 mask when out-fence is returned) +$ git merge drm-intel/for-linux-next +Resolved 'drivers/gpu/drm/i915/i915_drv.h' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_gem.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_gem_gtt.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_pci.c' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/i915/i915_pmu.c' +Recorded preimage for 'drivers/gpu/drm/i915/i915_pmu.h' +Recorded preimage for 'drivers/gpu/drm/i915/intel_breadcrumbs.c' +Resolved 'drivers/gpu/drm/i915/intel_cdclk.c' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/i915/intel_engine_cs.c' +Resolved 'drivers/gpu/drm/i915/intel_pm.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_uc.c' using previous resolution. +Auto-merging drivers/gpu/drm/i915/intel_vbt_defs.h +Auto-merging drivers/gpu/drm/i915/intel_uc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_uc.c +Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.h +Auto-merging drivers/gpu/drm/i915/intel_pm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_huc.c +Auto-merging drivers/gpu/drm/i915/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/intel_hangcheck.c +Auto-merging drivers/gpu/drm/i915/intel_engine_cs.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_engine_cs.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/intel_cdclk.c +CONFLICT (content): Merge conflict in 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/intel_audio.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_pci.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_pci.c +Auto-merging drivers/gpu/drm/i915/i915_gem_request.c +Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_gtt.c +Auto-merging drivers/gpu/drm/i915/i915_gem_context.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/i915_pmu.c'. +Recorded resolution for 'drivers/gpu/drm/i915/i915_pmu.h'. +Recorded resolution for 'drivers/gpu/drm/i915/intel_breadcrumbs.c'. +Recorded resolution for 'drivers/gpu/drm/i915/intel_engine_cs.c'. +[master 4950f2032140afd78f343146dc658266daf76ec2] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/i915/Makefile | 2 + + drivers/gpu/drm/i915/dvo_ivch.c | 28 +-- + drivers/gpu/drm/i915/i915_debugfs.c | 131 ++++++---- + drivers/gpu/drm/i915/i915_drv.c | 282 +++++++++++---------- + drivers/gpu/drm/i915/i915_drv.h | 81 +++--- + drivers/gpu/drm/i915/i915_gem.c | 176 ++++++++++--- + drivers/gpu/drm/i915/i915_gem_context.c | 38 ++- + drivers/gpu/drm/i915/i915_gem_context.h | 3 + + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 12 +- + drivers/gpu/drm/i915/i915_gem_fence_reg.c | 10 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 92 +++---- + drivers/gpu/drm/i915/i915_gem_internal.c | 4 + + drivers/gpu/drm/i915/i915_gem_request.c | 70 +++++- + drivers/gpu/drm/i915/i915_gem_request.h | 33 ++- + drivers/gpu/drm/i915/i915_gem_stolen.c | 2 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 6 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 111 ++++---- + 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 | 230 ++++++++++++++--- + drivers/gpu/drm/i915/i915_sw_fence.c | 56 +++-- + drivers/gpu/drm/i915/i915_syncmap.c | 16 +- + 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 | 32 ++- + drivers/gpu/drm/i915/intel_breadcrumbs.c | 143 ++++++----- + drivers/gpu/drm/i915/intel_cdclk.c | 307 +++++++++++++++++++++-- + drivers/gpu/drm/i915/intel_crt.c | 13 +- + drivers/gpu/drm/i915/intel_csr.c | 5 +- + drivers/gpu/drm/i915/intel_ddi.c | 48 +++- + drivers/gpu/drm/i915/intel_device_info.c | 7 + + drivers/gpu/drm/i915/intel_device_info.h | 9 + + drivers/gpu/drm/i915/intel_display.c | 145 +++++++---- + drivers/gpu/drm/i915/intel_display.h | 4 + + drivers/gpu/drm/i915/intel_dp.c | 267 ++++++++++++-------- + drivers/gpu/drm/i915/intel_drv.h | 19 +- + drivers/gpu/drm/i915/intel_dvo.c | 28 ++- + drivers/gpu/drm/i915/intel_engine_cs.c | 180 +++++++------ + drivers/gpu/drm/i915/intel_fbc.c | 27 +- + 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 | 185 +++----------- + drivers/gpu/drm/i915/intel_hangcheck.c | 2 +- + drivers/gpu/drm/i915/intel_hdmi.c | 43 +++- + drivers/gpu/drm/i915/intel_hotplug.c | 19 +- + drivers/gpu/drm/i915/intel_huc.c | 3 +- + drivers/gpu/drm/i915/intel_i2c.c | 17 +- + drivers/gpu/drm/i915/intel_lpe_audio.c | 14 +- + drivers/gpu/drm/i915/intel_lrc.c | 264 +++++++++++-------- + 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_lvds.c | 44 ++-- + drivers/gpu/drm/i915/intel_mocs.c | 2 +- + drivers/gpu/drm/i915/intel_modes.c | 17 -- + drivers/gpu/drm/i915/intel_panel.c | 20 +- + drivers/gpu/drm/i915/intel_pm.c | 188 +++++++++++--- + drivers/gpu/drm/i915/intel_psr.c | 58 ++--- + drivers/gpu/drm/i915/intel_ringbuffer.c | 30 +-- + drivers/gpu/drm/i915/intel_ringbuffer.h | 11 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 192 +++++++++++++- + drivers/gpu/drm/i915/intel_sdvo.c | 82 +++--- + drivers/gpu/drm/i915/intel_sprite.c | 119 ++++++--- + drivers/gpu/drm/i915/intel_tv.c | 28 +-- + drivers/gpu/drm/i915/intel_uc.c | 92 ++++++- + drivers/gpu/drm/i915/intel_uc.h | 4 +- + drivers/gpu/drm/i915/intel_uc_fw.c | 5 +- + drivers/gpu/drm/i915/intel_uncore.c | 28 ++- + 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_gem_object.c | 18 +- + 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_guc.c | 20 +- + 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/i915/selftests/mock_gem_device.c | 6 - + include/drm/i915_component.h | 3 +- + include/drm/i915_pciids.h | 18 +- + include/uapi/drm/i915_drm.h | 4 +- + 89 files changed, 3905 insertions(+), 1663 deletions(-) + 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_lrc_reg.h +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 (8fe2938c9bac drm/msm: Trigger fence completion from GPU) +$ git merge drm-msm/msm-next +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_crtc.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 | 0 + drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_crtc.c | 2 +- + drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_ctl.c | 0 + drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_ctl.h | 0 + .../gpu/drm/msm/{mdp => disp}/mdp5/mdp5_encoder.c | 0 + 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 | 2 +- + 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 | 0 + 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, 1839 insertions(+), 206 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 (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_crtc.c (99%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_ctl.c (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_ctl.h (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_encoder.c (100%) + 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 (99%) + 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 (100%) + 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 (4cfea3c1f271 gpu: ipu-v3: allow to build with COMPILE_TEST) +$ git merge imx-drm/imx-drm/next +Already up to date. +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 (b7f717a560dc Merge remote-tracking branch 'regmap/topic/bulk' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-i2c.c | 4 --- + drivers/base/regmap/regmap.c | 63 +++++++++++++++++----------------------- + 2 files changed, 27 insertions(+), 40 deletions(-) +Merging sound/for-next (04f8773a3e98 ALSA: emu10k1: add a IOMMU workaround) +$ 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_codec.c | 28 +---------- + sound/pci/hda/hda_local.h | 6 ++- + 8 files changed, 186 insertions(+), 71 deletions(-) +Merging sound-asoc/for-next (546c610baa5f Merge remote-tracking branches '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/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 | 1 + + 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/acp-pcm-dma.c | 29 +- + sound/soc/amd/acp-rt5645.c | 4 +- + 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/Makefile | 1 - + 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 | 20 +- + 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/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/alc5623.c | 147 ++- + sound/soc/codecs/alc5632.c | 138 ++- + sound/soc/codecs/arizona.c | 208 ++-- + 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 | 120 +-- + 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 | 33 +- + 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 | 47 +- + sound/soc/codecs/hdac_hdmi.h | 2 +- + sound/soc/codecs/hdmi-codec.c | 23 +- + 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/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 | 220 ++-- + 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 | 186 ++-- + 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 | 313 +++--- + sound/soc/codecs/tlv320aic32x4.c | 207 ++-- + sound/soc/codecs/tlv320aic3x.c | 295 +++--- + sound/soc/codecs/tlv320dac33.c | 402 ++++--- + sound/soc/codecs/tscs42xx.c | 222 ++-- + 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 | 140 ++- + sound/soc/codecs/wm5110.c | 174 ++- + 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 | 62 +- + sound/soc/codecs/wm8998.c | 88 +- + 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 | 6 +- + 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-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 | 2 +- + 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/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_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.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 | 85 +- + sound/soc/soc-dapm.c | 4 +- + sound/soc/soc-generic-dmaengine-pcm.c | 55 +- + 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 | 570 ++++++++++ + 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 | 67 +- + sound/soc/xtensa/xtfpga-i2s.c | 17 +- + 384 files changed, 18879 insertions(+), 15870 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/uniphier,aio.txt + 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 +$ git reset --hard HEAD^ +HEAD is now at 5ae3bced662c Merge remote-tracking branch 'sound/for-next' +Merging next-20180214 version of sound-asoc +$ git merge -m next-20180214/sound-asoc 2188f73a2a44d0746afb0f0f6cf2139cf5a77ac0 +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/rt5665.txt | 4 +- + .../devicetree/bindings/sound/uniphier,aio.txt | 36 + + MAINTAINERS | 1 + + 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/acp-pcm-dma.c | 29 +- + sound/soc/amd/acp-rt5645.c | 4 +- + 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/Makefile | 1 - + 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 | 67 +- + 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 | 20 +- + 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/ak4535.c | 78 +- + sound/soc/codecs/ak4554.c | 27 +- + sound/soc/codecs/ak4613.c | 73 +- + sound/soc/codecs/ak4641.c | 91 +- + sound/soc/codecs/ak4642.c | 105 +- + sound/soc/codecs/ak4671.c | 67 +- + sound/soc/codecs/ak5386.c | 62 +- + sound/soc/codecs/alc5623.c | 147 ++- + sound/soc/codecs/alc5632.c | 138 ++- + 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 | 42 +- + 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 | 33 +- + 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 | 47 +- + sound/soc/codecs/hdac_hdmi.h | 2 +- + sound/soc/codecs/hdmi-codec.c | 23 +- + 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/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 | 220 ++-- + 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 | 173 ++- + 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 | 240 ++--- + sound/soc/codecs/tlv320aic32x4.c | 207 ++-- + sound/soc/codecs/tlv320aic3x.c | 293 +++--- + sound/soc/codecs/tlv320dac33.c | 402 ++++--- + sound/soc/codecs/tscs42xx.c | 222 ++-- + 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 | 42 +- + sound/soc/codecs/wm5110.c | 42 +- + 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/wm9081.c | 228 ++-- + sound/soc/codecs/wm9090.c | 109 +- + sound/soc/codecs/wm9705.c | 83 +- + sound/soc/codecs/wm9712.c | 109 +- + sound/soc/codecs/wm9713.c | 201 ++-- + sound/soc/codecs/wm_adsp.c | 13 +- + 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-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 | 2 +- + 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/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_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.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.c | 13 +- + 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/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 | 9 +- + sound/soc/soc-generic-dmaengine-pcm.c | 55 +- + 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 | 440 ++++++++ + sound/soc/uniphier/aio-core.c | 1104 ++++++++++++++++++++ + sound/soc/uniphier/aio-cpu.c | 570 ++++++++++ + 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 | 67 +- + sound/soc/xtensa/xtfpga-i2s.c | 17 +- + 373 files changed, 18194 insertions(+), 15327 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/uniphier,aio.txt + 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 (de6ff5c58656 Merge branch 'dm-4.16' into block-4.16_dm-4.16) +$ git merge device-mapper/for-next +Resolved 'block/blk-core.c' using previous resolution. +Resolved 'block/blk-mq.c' using previous resolution. +Resolved 'include/linux/blk_types.h' using previous resolution. +Auto-merging include/linux/blk_types.h +CONFLICT (content): Merge conflict in include/linux/blk_types.h +Auto-merging block/blk-mq.c +CONFLICT (content): Merge conflict in block/blk-mq.c +Auto-merging block/blk-core.c +CONFLICT (content): Merge conflict in block/blk-core.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9f8e761cd492] Merge remote-tracking branch 'device-mapper/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging mmc/next (779e209cefc2 mmc: tmio: move TMIO_MASK_{READOP, WRITEOP} handling to correct place) +$ 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/bcm2835.c | 3 +- + drivers/mmc/host/meson-gx-mmc.c | 19 +- + 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 | 377 ++++++++++++++++++++- + drivers/mmc/host/sh_mmcif.c | 8 - + drivers/mmc/host/tmio_mmc_core.c | 61 ++-- + include/linux/mfd/tmio.h | 1 - + 12 files changed, 430 insertions(+), 77 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 9f8e761cd492 Merge remote-tracking branch 'device-mapper/for-next' +Merging next-20180214 version of mmc +$ git merge -m next-20180214/mmc 56174d9a21496fce64fcc6ba2f475734c20c12e4 +Already up to date. +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 (1532d9e87e8b raid5-ppl: PPL support for disks with write-back cache enabled) +$ git merge md/for-next +Already up to date. +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 (2023b0524a63 backlight: tdo24m: Fix the SPI CS between transfers) +$ git merge backlight/for-backlight-next +Already up to date. +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 (06ed437706fb Merge remote-tracking branch 'regulator/topic/dt' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/regulator/fixed-regulator.txt | 1 + + Documentation/devicetree/bindings/regulator/gpio-regulator.txt | 2 ++ + drivers/regulator/of_regulator.c | 1 + + drivers/regulator/stm32-vrefbuf.c | 2 +- + 4 files changed, 5 insertions(+), 1 deletion(-) +Merging security/next-testing (400f428062af Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next-testing) +$ git merge security/next-testing +Already up to date! +Merge made by the 'recursive' strategy. +Merging integrity/next-integrity (b79f5f38d87f fuse: introduce new fs_type flag FS_IMA_NO_CACHE) +$ git merge integrity/next-integrity +Resolved 'security/integrity/ima/ima_main.c' using previous resolution. +Auto-merging security/integrity/ima/ima_main.c +CONFLICT (content): Merge conflict in security/integrity/ima/ima_main.c +Auto-merging include/linux/fs.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0f6f7d95bcb7] Merge remote-tracking branch 'integrity/next-integrity' +$ git diff -M --stat --summary HEAD^.. + fs/fuse/inode.c | 2 +- + include/linux/fs.h | 1 + + security/integrity/ima/ima_main.c | 15 +++++++++++++-- + 3 files changed, 15 insertions(+), 3 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 (213d7f947753 netlabel: If PF_INET6, check sk_buff ip header version) +$ git merge selinux/next +Merge made by the 'recursive' strategy. + net/netlabel/netlabel_unlabeled.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) +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 (7928b2cbe55b Linux 4.16-rc1) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (fedbd940d1c2 Merge branches 'arm/renesas', 'arm/omap', 'arm/exynos', 'x86/amd', 'x86/vt-d' and 'core' into next) +$ git merge iommu/next +Already up to date. +Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation) +$ git merge dwmw2-iommu/master +Already up to date. +Merging vfio/next (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 (6387440e15db audit: session ID should not set arch quick field pointer) +$ git merge audit/next +Auto-merging kernel/audit.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 - + kernel/audit.c | 3 ++- + kernel/auditfilter.c | 1 - + 3 files changed, 2 insertions(+), 3 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 (67ca606a4f72 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 | 47 +++- + 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, 385 insertions(+), 352 deletions(-) +Merging tip/auto-latest (8949057908ac Merge branch 'x86/urgent') +$ git merge tip/auto-latest +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 +Auto-merging drivers/hwmon/k10temp.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master aa41c26faf483541290ac70d0ccc5d82d7c8a4a5] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 9 + + Documentation/atomic_bitops.txt | 7 +- + Documentation/features/list-arch.sh | 2 +- + .../sched/membarrier-sync-core/arch-support.txt | 62 + + Documentation/locking/lockdep-design.txt | 51 +- + Documentation/locking/mutex-design.txt | 49 +- + MAINTAINERS | 1 + + arch/x86/.gitignore | 1 + + arch/x86/Kconfig | 84 +- + arch/x86/boot/compressed/Makefile | 2 +- + arch/x86/boot/compressed/head_64.S | 178 +- + arch/x86/boot/compressed/kaslr.c | 6 + + .../boot/compressed/{pagetable.c => kaslr_64.c} | 0 + arch/x86/boot/compressed/pgtable.h | 18 + + arch/x86/boot/compressed/pgtable_64.c | 100 +- + arch/x86/entry/calling.h | 107 +- + arch/x86/entry/entry_64.S | 104 +- + arch/x86/entry/entry_64_compat.S | 30 + + arch/x86/events/intel/core.c | 2 +- + arch/x86/events/intel/lbr.c | 2 +- + arch/x86/events/intel/p6.c | 2 +- + arch/x86/include/asm/acpi.h | 2 +- + arch/x86/include/asm/apic.h | 1 + + arch/x86/include/asm/barrier.h | 2 +- + arch/x86/include/asm/bug.h | 19 +- + arch/x86/include/asm/cpufeature.h | 79 +- + arch/x86/include/asm/io.h | 8 +- + arch/x86/include/asm/kaslr.h | 4 - + arch/x86/include/asm/mem_encrypt.h | 1 + + arch/x86/include/asm/nospec-branch.h | 14 +- + arch/x86/include/asm/page_64.h | 10 +- + arch/x86/include/asm/page_64_types.h | 11 +- + arch/x86/include/asm/paravirt.h | 4 +- + arch/x86/include/asm/paravirt_types.h | 2 +- + arch/x86/include/asm/pgtable-3level_types.h | 1 + + arch/x86/include/asm/pgtable_32.h | 4 +- + arch/x86/include/asm/pgtable_32_types.h | 2 + + arch/x86/include/asm/pgtable_64_types.h | 42 +- + arch/x86/include/asm/processor.h | 7 +- + arch/x86/include/asm/sparsemem.h | 9 +- + arch/x86/include/asm/tlbflush.h | 27 +- + arch/x86/kernel/amd_nb.c | 2 +- + arch/x86/kernel/apic/apic.c | 6 +- + arch/x86/kernel/apic/x2apic_phys.c | 2 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 15 +- + arch/x86/kernel/asm-offsets_32.c | 2 +- + arch/x86/kernel/cpu/amd.c | 28 +- + arch/x86/kernel/cpu/bugs.c | 34 +- + arch/x86/kernel/cpu/centaur.c | 4 +- + arch/x86/kernel/cpu/common.c | 10 +- + arch/x86/kernel/cpu/cyrix.c | 2 +- + arch/x86/kernel/cpu/intel.c | 31 +- + arch/x86/kernel/cpu/intel_rdt.c | 2 +- + arch/x86/kernel/cpu/mcheck/mce-internal.h | 15 + + arch/x86/kernel/cpu/mcheck/mce.c | 37 +- + arch/x86/kernel/cpu/microcode/intel.c | 6 +- + arch/x86/kernel/cpu/mtrr/generic.c | 2 +- + arch/x86/kernel/cpu/mtrr/main.c | 4 +- + arch/x86/kernel/cpu/proc.c | 8 +- + arch/x86/kernel/e820.c | 18 + + arch/x86/kernel/head64.c | 20 +- + arch/x86/kernel/head_32.S | 4 +- + arch/x86/kernel/irqinit.c | 9 +- + arch/x86/kernel/mpparse.c | 2 +- + arch/x86/kernel/paravirt.c | 6 +- + arch/x86/kernel/setup.c | 5 +- + arch/x86/kernel/smpboot.c | 1 - + arch/x86/kernel/traps.c | 2 +- + arch/x86/kernel/vmlinux.lds.S | 7 +- + arch/x86/kvm/mmu.c | 10 +- + arch/x86/kvm/vmx.c | 9 +- + arch/x86/lib/clear_page_64.S | 2 - + arch/x86/lib/cpu.c | 2 +- + arch/x86/lib/error-inject.c | 1 + + arch/x86/mm/Makefile | 14 +- + arch/x86/mm/debug_pagetables.c | 32 + + arch/x86/mm/dump_pagetables.c | 29 +- + arch/x86/mm/init_64.c | 8 +- + arch/x86/mm/ioremap.c | 2 +- + arch/x86/mm/kasan_init_64.c | 2 +- + arch/x86/mm/kaslr.c | 12 +- + arch/x86/mm/kmmio.c | 2 +- + arch/x86/mm/mem_encrypt.c | 578 +----- + arch/x86/mm/mem_encrypt_identity.c | 564 ++++++ + arch/x86/mm/pgtable_32.c | 2 +- + arch/x86/mm/tlb.c | 8 +- + arch/x86/platform/efi/efi_64.c | 8 +- + arch/x86/platform/uv/tlb_uv.c | 2 +- + arch/x86/xen/mmu_pv.c | 6 +- + drivers/char/hw_random/via-rng.c | 2 +- + drivers/cpufreq/acpi-cpufreq.c | 2 +- + drivers/cpufreq/longhaul.c | 6 +- + drivers/cpufreq/p4-clockmod.c | 2 +- + drivers/cpufreq/powernow-k7.c | 2 +- + drivers/cpufreq/speedstep-centrino.c | 4 +- + drivers/cpufreq/speedstep-lib.c | 6 +- + drivers/crypto/padlock-aes.c | 2 +- + drivers/edac/amd64_edac.c | 2 +- + drivers/hwmon/coretemp.c | 6 +- + drivers/hwmon/hwmon-vid.c | 2 +- + drivers/hwmon/k10temp.c | 2 +- + drivers/hwmon/k8temp.c | 2 +- + drivers/video/fbdev/geode/video_gx.c | 2 +- + fs/proc/kcore.c | 4 + + include/asm-generic/5level-fixup.h | 1 + + include/asm-generic/bitops/lock.h | 3 +- + include/asm-generic/pgtable-nop4d.h | 9 +- + include/linux/kasan.h | 2 +- + include/linux/kcore.h | 1 + + include/linux/mm_inline.h | 6 - + include/linux/nospec.h | 36 +- + include/linux/semaphore.h | 2 +- + include/linux/trace_events.h | 8 + + include/trace/events/xen.h | 2 +- + include/uapi/linux/perf_event.h | 4 + + kernel/events/core.c | 188 +- + kernel/kprobes.c | 178 +- + kernel/locking/qspinlock.c | 21 +- + kernel/sched/core.c | 27 +- + kernel/sched/cpufreq_schedutil.c | 2 - + kernel/sched/deadline.c | 6 +- + kernel/sched/fair.c | 4 +- + kernel/sched/rt.c | 3 +- + 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 +- + lib/debugobjects.c | 140 +- + mm/kasan/kasan_init.c | 2 +- + mm/memory-failure.c | 2 - + mm/zsmalloc.c | 13 +- + tools/arch/powerpc/include/uapi/asm/kvm.h | 2 + + tools/arch/x86/include/asm/cpufeatures.h | 1 + + tools/include/uapi/drm/i915_drm.h | 77 + + tools/include/uapi/linux/if_link.h | 1 + + tools/include/uapi/linux/kvm.h | 90 + + tools/include/uapi/linux/perf_event.h | 4 + + tools/memory-model/Documentation/cheatsheet.txt | 30 + + tools/memory-model/Documentation/explanation.txt | 1840 ++++++++++++++++++++ + tools/memory-model/Documentation/recipes.txt | 570 ++++++ + tools/memory-model/Documentation/references.txt | 107 ++ + tools/memory-model/MAINTAINERS | 15 + + tools/memory-model/README | 220 +++ + tools/memory-model/linux-kernel.bell | 53 + + tools/memory-model/linux-kernel.cat | 124 ++ + tools/memory-model/linux-kernel.cfg | 21 + + tools/memory-model/linux-kernel.def | 108 ++ + .../litmus-tests/CoRR+poonceonce+Once.litmus | 19 + + .../litmus-tests/CoRW+poonceonce+Once.litmus | 18 + + .../litmus-tests/CoWR+poonceonce+Once.litmus | 18 + + .../litmus-tests/CoWW+poonceonce.litmus | 11 + + .../litmus-tests/IRIW+mbonceonces+OnceOnce.litmus | 35 + + .../litmus-tests/IRIW+poonceonces+OnceOnce.litmus | 33 + + .../litmus-tests/ISA2+poonceonces.litmus | 28 + + ...cerelease+poacquirerelease+poacquireonce.litmus | 28 + + .../litmus-tests/LB+ctrlonceonce+mbonceonce.litmus | 23 + + .../LB+poacquireonce+pooncerelease.litmus | 21 + + .../litmus-tests/LB+poonceonces.litmus | 21 + + .../litmus-tests/MP+onceassign+derefonce.litmus | 25 + + tools/memory-model/litmus-tests/MP+polocks.litmus | 24 + + .../litmus-tests/MP+poonceonces.litmus | 20 + + .../MP+pooncerelease+poacquireonce.litmus | 20 + + .../memory-model/litmus-tests/MP+porevlocks.litmus | 24 + + .../litmus-tests/MP+wmbonceonce+rmbonceonce.litmus | 22 + + .../memory-model/litmus-tests/R+mbonceonces.litmus | 21 + + .../memory-model/litmus-tests/R+poonceonces.litmus | 19 + + tools/memory-model/litmus-tests/README | 125 ++ + .../memory-model/litmus-tests/S+poonceonces.litmus | 19 + + .../S+wmbonceonce+poacquireonce.litmus | 20 + + .../litmus-tests/SB+mbonceonces.litmus | 23 + + .../litmus-tests/SB+poonceonces.litmus | 21 + + .../litmus-tests/WRC+poonceonces+Once.litmus | 27 + + .../WRC+pooncerelease+rmbonceonce+Once.litmus | 28 + + .../Z6.0+pooncelock+poonceLock+pombonce.litmus | 33 + + .../Z6.0+pooncelock+pooncelock+pombonce.litmus | 32 + + ...ooncerelease+poacquirerelease+mbonceonce.litmus | 28 + + tools/memory-model/lock.cat | 99 ++ + tools/objtool/check.c | 53 +- + tools/objtool/check.h | 1 + + tools/perf/Documentation/perf-data.txt | 4 + + tools/perf/builtin-c2c.c | 4 +- + tools/perf/builtin-report.c | 3 +- + tools/perf/builtin-top.c | 150 +- + .../pmu-events/arch/arm64/cortex-a53/branch.json | 27 + + .../perf/pmu-events/arch/arm64/cortex-a53/bus.json | 22 + + .../pmu-events/arch/arm64/cortex-a53/cache.json | 27 + + .../pmu-events/arch/arm64/cortex-a53/memory.json | 22 + + .../pmu-events/arch/arm64/cortex-a53/other.json | 32 + + .../pmu-events/arch/arm64/cortex-a53/pipeline.json | 52 + + tools/perf/pmu-events/arch/arm64/mapfile.csv | 1 + + tools/perf/tests/backward-ring-buffer.c | 7 +- + .../perf/tests/shell/trace+probe_libc_inet_pton.sh | 23 +- + tools/perf/ui/browsers/hists.c | 38 +- + tools/perf/ui/browsers/hists.h | 3 +- + tools/perf/util/evlist.c | 17 - + tools/perf/util/evlist.h | 4 - + tools/perf/util/evsel.c | 12 +- + tools/perf/util/evsel.h | 14 + + tools/perf/util/hist.h | 6 +- + tools/perf/util/mmap.c | 141 +- + tools/perf/util/mmap.h | 10 +- + tools/perf/util/util.c | 24 +- + tools/testing/selftests/x86/Makefile | 22 +- + tools/testing/selftests/x86/mpx-mini-test.c | 32 +- + tools/testing/selftests/x86/protection_keys.c | 28 - + tools/testing/selftests/x86/single_step_syscall.c | 5 +- + tools/testing/selftests/x86/test_mremap_vdso.c | 4 + + tools/testing/selftests/x86/test_vdso.c | 55 +- + tools/testing/selftests/x86/test_vsyscall.c | 11 +- + 209 files changed, 7091 insertions(+), 1550 deletions(-) + create mode 100644 Documentation/features/sched/membarrier-sync-core/arch-support.txt + 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/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/MAINTAINERS + 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+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 100644 tools/perf/pmu-events/arch/arm64/cortex-a53/branch.json + create mode 100644 tools/perf/pmu-events/arch/arm64/cortex-a53/bus.json + create mode 100644 tools/perf/pmu-events/arch/arm64/cortex-a53/cache.json + create mode 100644 tools/perf/pmu-events/arch/arm64/cortex-a53/memory.json + create mode 100644 tools/perf/pmu-events/arch/arm64/cortex-a53/other.json + create mode 100644 tools/perf/pmu-events/arch/arm64/cortex-a53/pipeline.json +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 f2c063261eee] 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 (f95af50cb73d rcu: Remove SRCU throttling) +$ git merge rcu/rcu/next +Auto-merging kernel/time/tick-sched.c +Auto-merging kernel/time/Kconfig +Merge made by the 'recursive' strategy. + Documentation/memory-barriers.txt | 26 +++++--- + 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 | 37 +++++++---- + kernel/rcu/rcuperf.c | 21 ++++++- + kernel/rcu/rcutorture.c | 72 ++++++++++++---------- + kernel/rcu/srcutree.c | 21 ++++--- + kernel/rcu/tree.c | 69 +++++++-------------- + kernel/rcu/tree.h | 37 ++--------- + kernel/rcu/tree_exp.h | 34 +++++++--- + 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 +- + 26 files changed, 279 insertions(+), 246 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 (959b9da6c367 s390/setup : enable display support for KVM guest) +$ git merge kvms390/next +Merge made by the 'recursive' strategy. + arch/s390/kernel/setup.c | 2 ++ + 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 | 1 - + drivers/video/console/Kconfig | 2 +- + drivers/video/fbdev/Kconfig | 2 +- + 8 files changed, 66 insertions(+), 52 deletions(-) +Merging xen-tip/linux-next (156ba2a25614 x86/xen: Calculate __max_logical_packages on PV domains) +$ git merge xen-tip/linux-next +Auto-merging arch/x86/kernel/smpboot.c +Merge made by the 'recursive' strategy. + arch/x86/include/asm/smp.h | 1 + + arch/x86/kernel/smpboot.c | 10 ++++++++-- + arch/x86/xen/smp.c | 2 ++ + drivers/xen/xenbus/xenbus.h | 1 + + drivers/xen/xenbus/xenbus_comms.c | 1 + + drivers/xen/xenbus/xenbus_xs.c | 3 +++ + 6 files changed, 16 insertions(+), 2 deletions(-) +Merging percpu/for-next (685469e5bf9d percpu: add Dennis Zhou as a percpu co-maintainer) +$ git merge percpu/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + 1 file changed, 1 insertion(+) +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 (7928b2cbe55b Linux 4.16-rc1) +$ 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 (6204f03d3f54 leds: Clarify supported chips by LM355x driver) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + drivers/leds/Kconfig | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) +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 (7928b2cbe55b Linux 4.16-rc1) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (7928b2cbe55b Linux 4.16-rc1) +$ git merge usb/usb-next +Already up to date. +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 (7928b2cbe55b Linux 4.16-rc1) +$ git merge phy-next/next +Already up to date. +Merging tty/tty-next (7928b2cbe55b Linux 4.16-rc1) +$ 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 (f1517df8701c Merge tag 'nfsd-4.16' of git://linux-nfs.org/~bfields/linux) +$ git merge staging/staging-next +Already up to date. +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 (c53593e5cb69 sched, cgroup: Don't reject lower cpu.max on ancestors) +$ git merge cgroup/for-next +Auto-merging kernel/sched/core.c +Merge made by the 'recursive' strategy. + kernel/sched/core.c | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) +Merging scsi/for-next (1bc5ad3a6acd scsi: qla4xxx: skip error recovery in case of register disconnect.) +$ git merge scsi/for-next +Auto-merging drivers/scsi/ufs/ufshcd.c +Auto-merging drivers/scsi/storvsc_drv.c +Auto-merging drivers/scsi/qedi/qedi_main.c +Removing drivers/scsi/aic7xxx/aiclib.c +Auto-merging drivers/scsi/aacraid/linit.c +Merge made by the 'recursive' strategy. + drivers/message/fusion/mptctl.c | 2 ++ + drivers/scsi/Makefile | 1 - + drivers/scsi/aacraid/linit.c | 4 ++- + 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/ibmvscsi/ibmvfc.h | 2 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 5 ++- + drivers/scsi/qedi/qedi_main.c | 55 ++++++++++++++---------------- + drivers/scsi/qla2xxx/qla_init.c | 23 ++----------- + drivers/scsi/qla2xxx/qla_iocb.c | 7 ++-- + drivers/scsi/qla2xxx/qla_isr.c | 6 ++-- + drivers/scsi/qla2xxx/qla_os.c | 2 ++ + drivers/scsi/qla2xxx/qla_target.c | 2 -- + drivers/scsi/qla4xxx/ql4_def.h | 2 ++ + drivers/scsi/qla4xxx/ql4_os.c | 46 +++++++++++++++++++++++++ + drivers/scsi/storvsc_drv.c | 2 +- + drivers/scsi/sym53c8xx_2/sym_hipd.c | 2 +- + drivers/scsi/ufs/ufshcd.c | 2 ++ + 20 files changed, 107 insertions(+), 98 deletions(-) + delete mode 100644 drivers/scsi/aic7xxx/aiclib.c +Merging scsi-mkp/for-next (f9ba7af8105f scsi: scsi_debug: reset injection flags for every_nth > 0) +$ git merge scsi-mkp/for-next +Auto-merging drivers/scsi/qla2xxx/qla_target.c +Auto-merging drivers/scsi/qla2xxx/qla_isr.c +Auto-merging drivers/scsi/qla2xxx/qla_iocb.c +Auto-merging drivers/scsi/qla2xxx/qla_init.c +Auto-merging drivers/scsi/qedi/qedi_main.c +Merge made by the 'recursive' strategy. + drivers/scsi/Kconfig | 2 + + drivers/scsi/NCR53c406a.c | 2 +- + drivers/scsi/aacraid/aacraid.h | 5 + + drivers/scsi/aacraid/src.c | 205 ++++++++++++++++++++++++++++++++++--- + drivers/scsi/hosts.c | 12 +-- + 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/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 | 4 +- + drivers/scsi/qla2xxx/qla_dbg.c | 4 +- + drivers/scsi/qla2xxx/qla_gs.c | 78 +++++++------- + drivers/scsi/qla2xxx/qla_init.c | 37 +++---- + drivers/scsi/qla2xxx/qla_inline.h | 1 + + drivers/scsi/qla2xxx/qla_iocb.c | 15 ++- + drivers/scsi/qla2xxx/qla_isr.c | 23 +++-- + 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_sup.c | 1 + + drivers/scsi/qla2xxx/qla_target.c | 7 +- + drivers/scsi/qla4xxx/ql4_nx.c | 2 + + drivers/scsi/qla4xxx/ql4_nx.h | 7 -- + drivers/scsi/raid_class.c | 1 + + drivers/scsi/scsi_debug.c | 202 ++++++++++++++++++++++-------------- + drivers/scsi/scsi_error.c | 6 ++ + drivers/scsi/scsi_lib.c | 2 +- + drivers/scsi/sym53c416.c | 2 +- + include/linux/raid_class.h | 1 + + 58 files changed, 859 insertions(+), 435 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 (0a65e125150c libata: update documentation for sysfs interfaces) +$ 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 | 3 +- + drivers/ata/libata-scsi.c | 12 +- + drivers/ata/sata_rcar.c | 62 +++++---- + 8 files changed, 308 insertions(+), 99 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 +Merge made by the 'recursive' strategy. + drivers/s390/virtio/virtio_ccw.c | 29 +++++++++++++++++++++++++++++ + net/9p/trans_virtio.c | 3 ++- + 2 files changed, 31 insertions(+), 1 deletion(-) +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 (264d1d49b437 rtc: mxc_v2: Fix _iomem pointer notation) +$ git merge rtc/rtc-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-rtc | 4 +- + drivers/rtc/Kconfig | 2 +- + drivers/rtc/class.c | 2 - + drivers/rtc/interface.c | 30 +++++ + drivers/rtc/nvmem.c | 29 +++-- + drivers/rtc/rtc-cmos.c | 75 +++++------ + drivers/rtc/rtc-core.h | 8 -- + drivers/rtc/rtc-ds1302.c | 4 +- + drivers/rtc/rtc-ds1305.c | 21 ++- + drivers/rtc/rtc-ds1307.c | 29 +++-- + drivers/rtc/rtc-ds1343.c | 183 +++++--------------------- + drivers/rtc/rtc-ds1511.c | 22 ++-- + drivers/rtc/rtc-ds1553.c | 74 +++++------ + drivers/rtc/rtc-ds1742.c | 73 +++++------ + drivers/rtc/rtc-goldfish.c | 2 + + drivers/rtc/rtc-isl1208.c | 5 + + drivers/rtc/rtc-lib.c | 6 +- + drivers/rtc/rtc-m48t59.c | 57 ++++----- + drivers/rtc/rtc-m48t86.c | 23 ++-- + drivers/rtc/rtc-mxc_v2.c | 2 +- + drivers/rtc/rtc-omap.c | 3 +- + drivers/rtc/rtc-pcf85363.c | 25 ++-- + drivers/rtc/rtc-rp5c01.c | 63 ++++----- + drivers/rtc/rtc-rv8803.c | 33 ++--- + drivers/rtc/rtc-sirfsoc.c | 18 --- + drivers/rtc/rtc-stk17ta8.c | 70 +++++----- + drivers/rtc/rtc-tx4939.c | 87 ++++++++----- + include/linux/rtc.h | 14 +- + include/trace/events/rtc.h | 206 ++++++++++++++++++++++++++++++ + 29 files changed, 628 insertions(+), 542 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 (5682fa508060 elf: enforce MAP_FIXED on overlaying elf segments) +$ git merge --no-ff akpm-current/current +Resolved 'kernel/fork.c' using previous resolution. +Auto-merging mm/swapfile.c +Auto-merging mm/page_alloc.c +Auto-merging mm/memory_hotplug.c +Auto-merging mm/memory.c +Auto-merging mm/memory-failure.c +Auto-merging mm/memcontrol.c +Auto-merging lib/radix-tree.c +Auto-merging lib/idr.c +Auto-merging kernel/relay.c +Auto-merging kernel/fork.c +CONFLICT (content): Merge conflict in kernel/fork.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging include/linux/seq_file.h +Auto-merging include/linux/sched/mm.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/memory_hotplug.h +Auto-merging include/linux/compiler.h +Auto-merging include/linux/compiler-gcc.h +Auto-merging fs/seq_file.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1666bf3621d755f2781fef7d36527efe9cb9c465] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-bdi | 8 + + Documentation/cgroup-v2.txt | 74 +++++++ + Documentation/sysctl/vm.txt | 5 +- + arch/alpha/include/uapi/asm/mman.h | 1 + + arch/arc/include/asm/bug.h | 3 +- + arch/arm/include/asm/page.h | 2 + + arch/arm/mm/dma-mapping.c | 16 +- + arch/cris/include/arch-v10/arch/bug.h | 11 +- + arch/ia64/include/asm/bug.h | 6 +- + arch/m68k/include/asm/bug.h | 3 + + arch/metag/kernel/process.c | 6 +- + arch/mips/include/uapi/asm/mman.h | 1 + + arch/parisc/include/uapi/asm/mman.h | 1 + + arch/powerpc/mm/mmu_context_iommu.c | 3 +- + arch/sparc/include/asm/bug.h | 6 +- + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/xtensa/include/uapi/asm/mman.h | 1 + + block/genhd.c | 2 +- + certs/blacklist_nohashes.c | 2 +- + fs/binfmt_elf.c | 22 +- + fs/dcache.c | 3 +- + fs/exec.c | 1 + + fs/ocfs2/dlmglue.c | 2 +- + fs/ocfs2/filecheck.c | 357 ++++++++++++------------------ + fs/ocfs2/filecheck.h | 29 ++- + fs/ocfs2/ocfs2.h | 8 + + fs/ocfs2/stackglue.c | 6 - + fs/ocfs2/stackglue.h | 3 - + fs/ocfs2/super.c | 27 ++- + fs/proc/task_mmu.c | 21 +- + fs/seq_file.c | 65 +++++- + include/asm-generic/bug.h | 1 + + include/linux/cgroup-defs.h | 5 + + include/linux/compiler-gcc.h | 15 +- + include/linux/compiler.h | 5 + + include/linux/crash_core.h | 2 + + include/linux/kconfig.h | 6 + + include/linux/list_lru.h | 3 +- + include/linux/memcontrol.h | 58 ++++- + include/linux/memory_hotplug.h | 3 - + include/linux/migrate.h | 7 +- + include/linux/mm.h | 2 + + include/linux/mmzone.h | 2 +- + include/linux/oom.h | 12 +- + include/linux/page-isolation.h | 3 +- + include/linux/sched/mm.h | 8 +- + include/linux/sched/signal.h | 3 + + include/linux/seq_file.h | 3 + + include/linux/shrinker.h | 2 +- + include/linux/swap.h | 2 - + include/uapi/asm-generic/mman-common.h | 3 + + include/uapi/linux/prctl.h | 4 + + include/uapi/linux/sysctl.h | 4 + + kernel/cgroup/cgroup.c | 13 +- + kernel/cred.c | 1 + + kernel/exit.c | 4 + + kernel/fork.c | 17 +- + kernel/relay.c | 2 +- + kernel/sys.c | 11 + + lib/idr.c | 2 - + lib/radix-tree.c | 2 +- + mm/backing-dev.c | 35 +++ + mm/cma.c | 83 ++++++- + mm/compaction.c | 7 +- + mm/huge_memory.c | 6 + + mm/internal.h | 5 +- + mm/kasan/kasan.c | 57 ++++- + mm/ksm.c | 8 +- + mm/list_lru.c | 74 +++++-- + mm/memcontrol.c | 264 +++++++++++++++++++++- + mm/memory-failure.c | 18 +- + mm/memory.c | 2 +- + mm/memory_hotplug.c | 9 +- + mm/mempolicy.c | 40 +--- + mm/migrate.c | 357 +++++++++++++----------------- + mm/mlock.c | 6 + + mm/mmap.c | 11 + + mm/oom_kill.c | 210 ++++++++++++------ + mm/page_alloc.c | 108 +++++---- + mm/page_io.c | 2 +- + mm/page_isolation.c | 3 +- + mm/page_owner.c | 4 +- + mm/swap.c | 82 ++++--- + mm/swapfile.c | 6 +- + mm/vmscan.c | 75 ++----- + security/apparmor/lsm.c | 1 + + security/selinux/hooks.c | 1 + + 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/usb/Makefile | 1 - + tools/vm/Makefile | 1 - + tools/wmi/Makefile | 1 - + 100 files changed, 1575 insertions(+), 840 deletions(-) +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: ipc/mqueue: add missing error code in init_mqueue_fs() +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 + + 48f19eee3e82...4d5e2d42d012 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (4d5e2d42d012 sparc64: NG4 memset 32 bits overflow) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + arch/sparc/lib/NG4memset.S | 26 +++++++++++++------------- + drivers/media/platform/sti/delta/delta-ipc.c | 4 ++-- + ipc/mqueue.c | 4 +++- + 3 files changed, 18 insertions(+), 16 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..9b5584735f85 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20180215 |