diff options
| -rw-r--r-- | Next/SHA1s | 258 | ||||
| -rw-r--r-- | Next/Trees | 260 | ||||
| -rw-r--r-- | Next/merge.log | 2881 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 3402 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..cb6f68b4855b --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,258 @@ +Name SHA1 +---- ---- +origin ffefb181728f7b97df49ceba18cacfb6c5ee19f2 +fixes b46dc8ae17a427c50c00241898832807576fd28a +kbuild-current 36c1681678b507346e7397a235a7303dad665fc3 +arc-current 05382333595612204d6c91820bd77be20119cb9b +arm-current 091f02483df7b56615b524491f404e574c5e0668 +m68k-current 2334b1ac1235934fc196f2d25bae7f348d3bf42e +metag-fixes b884a190afcecdbef34ca508ea5ee88bb7c77861 +powerpc-fixes 1b689a95ce7427075f9ac9fb4aea1af530742b7f +sparc aebb48f5e465772576359c1705c4a84abea92027 +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net 4d80ecdb80a7aab7652a206a1d948ef0d1df89b1 +bpf 41b0530eca69740f0c69eb5a867c41b01ec2e551 +ipsec 545d8ae7affff7fb4f8bfd327c7c7790056535c4 +netfilter 0ff90b6c20340e57616a51ae1a1bf18156d6638a +ipvs f7fb77fc12352d15180dc3c08ffba10573d5167d +wireless-drivers a9e6d44ddeccd3522670e641f1ed9b068e746ff7 +mac80211 c4de37ee2b55deac7d6aeac33e02e3d6be243898 +rdma-fixes ae59c3f0b6cfd472fed96e50548a799b8971d876 +sound-current 61fcf8ece9b6b09450250c4ca40cc3b81a96a68d +pci-current 838cda3697073982acd276ac43387b2a0aed04b4 +driver-core.current 35277995e17919ab838beae765f440674e8576eb +tty.current 4bf772b14675411a69b3c807f73006de0fe4b649 +usb.current 4bf772b14675411a69b3c807f73006de0fe4b649 +usb-gadget-fixes b2cd1df66037e7c4697c7e40496bf7e4a5e16a2d +usb-serial-fixes d14ac576d10f865970bb1324d337e5e24d79aaf4 +usb-chipidea-fixes 964728f9f407eca0b417fdf8e784b7a76979490c +phy 2b88212c4cc67ff33dec5bb4d690044b97a5f979 +staging.current 35277995e17919ab838beae765f440674e8576eb +char-misc.current 35277995e17919ab838beae765f440674e8576eb +input-current 0004520af32fca8b40abe78c11654be4e9e20fdf +crypto-current 2d55807b7f7bf62bb05a8b91247c5eb7cd19ac04 +ide 8e44e6600caa7b96a5b71ae36c8829db753c2d70 +vfio-fixes 563b5cbe334e9503ab2b234e279d500fc4f76018 +kselftest-fixes ae64f9bd1d3621b5e60d7363bc20afb46aede215 +backlight-fixes 8ff5cbc6e3c5c2855245c014f3ba572ddfc5ab0f +nand-fixes ee02f73e04c0e690600f621a3a1d2245834af7fe +spi-nor-fixes 10a6a6975691775bbcc677a04c6fd3120b5c1160 +mfd-fixes 107b7d9fa94c4692d9104243f0e793e2a4e1366e +v4l-dvb-fixes 781b045baefdabf7e0bc9f33672ca830d3db9f27 +reset-fixes f450f28e70a2378d9d6ded0932fe480055888cfa +mips-fixes 0cde5b44a30f1daaef1c34e08191239dc63271c4 +kvm-fixes d8a5b80568a9cb66810e75b182018e9edb68e8ff +kvms390-fixes 1de1ea7efeb9e8543212210e34518b4049ccd285 +drm-intel-fixes d8a5b80568a9cb66810e75b182018e9edb68e8ff +drm-misc-fixes 54f809cfbd6b4a43959039f5d33596ed3297ce16 +kbuild 0a5f41767444cc3b4fc5573921ab914b4f78baaa +uuid c0020756315eebec58310aca42cf9fb73e1322eb +dma-mapping 04f56534786c885f578c24461bcd782fe9a787cf +asm-generic a351e9b9fc24e982ec2f0e76379a49826036da12 +arc 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +arm 3a175cdf439275c3da347b6b42c4e9b652a12904 +arm-perf 7520fa99246dade7ab6dde1573a146beed632abd +arm-soc 2aa127e4d579def8ff77fbaadf53a4034e43158f +actions 61862a89e6acb61e1193c3ad6d4eeab966c470ed +alpine a1144b2b1ec47f50951a83eb2bd847c74415b567 +amlogic ea879b13a92ba2c5cd1ac56353198bfe21066bf3 +aspeed 8203ca9789bc48f14cf18d261dc62ecd6839b684 +at91 fa4cf68ab4b1972161d38bce2859850da4236994 +bcm2835 a6189bcc00123f47a256d5a6a46d93c9a2cab52e +imx-mxs 824162aa14541985f85a3ed1f2b80dfe73014c84 +keystone a29b8b93e1582aaff0b13b84679b3dda935186d9 +mvebu 91cbd0893d7dc783b86b1b9130a6b04ea2e69a63 +omap e38c387289510c00e7d7be44aad4d8d4ec1ca6ec +reset 70d2f16a6289a9ef13c56e408acd3aad6a6415c2 +qcom f5788d2f292935cb841cb57a61868360fd726de6 +realtek 2b6286eb7ab8b9a22f7238bdaad403badd4a93e9 +renesas b214f9f550fd0a23144381e9199fbcdff5e36b1e +rockchip 5432915256e7b01c0b5134c15effd2b85941bf70 +samsung bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +samsung-krzk 3b6327365aba56a5b11ff0d77da79ac544c42080 +sunxi d7ec2c507677136c4ad09adf59746694a01f014f +tegra 983371acdeda5fd76cab580f66438c02d633d512 +arm64 3a0a397ff5ff8b56ca9f7908b75dee6bf0b5fabb +clk c43a52cfd27b20292d19d924eddfa5ff8dce87e5 +clk-samsung 7685570f2ae2abfff8a46f8a89dcf0d26f2130bf +c6x 9d440f7a282433338207c4ffb13cafaccaa27818 +cris fd989db807a00d552ebf29d8ffb20c2ef04742da +m68k 2334b1ac1235934fc196f2d25bae7f348d3bf42e +m68knommu 0d665e7b109d512b7cae3ccef6e8654714887844 +metag e3cd7f013bac3105d44b8bd5a90359989d45b5a5 +microblaze 7b6ce52be3f86520524711a6f33f3866f9339694 +mips ea4d340cbea470247b19ee696e31f102bc64466a +mips-james 8f2256d8eaf5acef3b49ea27edf79cc1069c4de9 +nios2 65d1e3ddeae117f6a224535e10a09145f0f96508 +openrisc 0fedb7653af7a8cac606c3eff213ac92693035b9 +parisc-hd bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +powerpc 015eb1b89e959c9349f0a01803fb8ed1ced36f09 +fsl c095ff93f901c1620b28dce4d813dd548bc5236b +risc-v 4889dec6c87d90619cc1e8436327b91f4bb0e467 +s390 b175210bd231d502a299138864c89f9099a5b652 +sparc-next 8e44e6600caa7b96a5b71ae36c8829db753c2d70 +sh 6e2fbfdd585f46128ce8879738bca09719a65138 +uml 02eb0b11eab56b47bcc36aa04dd522786c8faab9 +xtensa 73b37067623c682edd4153640d09728a7c581a33 +fscrypt 0b1dfa4cc6c60052b2c30ead316fa84c46d3c43c +befs 55d945e2e4aa148ef38bdfabb9569af78183a539 +btrfs 7c9a09f56a91c4ee5636703d3a95c72710917718 +btrfs-kdave d69a3372bba20c49d631c13708ec672a6f746c88 +ceph 16515a6d54183349b858b9c05e483afc55fa7948 +cifs 5f60a56494ea5518376b274dd93b3ceee9a783fb +configfs 6ace4f6bbcfde70278a33c11443ecda3ed0ec1b6 +ecryptfs 4670269faba728683f7250319a65390946c028e3 +ext3 f463589a7cd2d156e3b6b64ee26588c0cdcce08a +ext4 5dc397113d195a004899ee672c5a8a19809495ba +f2fs 1c1d35df71104c76a4a2e25862926f22c334c9d6 +fuse c6cdd51404b7ac12dd95173ddfc548c59ecf037f +jfs 86313903430d08739e391ad51b4865dc3a2bf522 +nfs e231c6879cfd44e4fffd384bb6dd7d313249a523 +nfs-anna c54c14ba000d769b7f5e4a33f915f0171b378437 +nfsd 3ac71a649c3d88c9587497455b6ee2d0a7e0c45e +orangefs 74e938c22705c7b80d4422e84eea927fc78e60a8 +overlayfs 9b6faee074702bbbc207e7027b9416c2d8fea9fe +ubifs 7f29ae9f977bcdc3654e68bc36d170223c52fd48 +xfs 76883f7988e6d06a97232e979bc7aaa7846a134b +file-locks 1deab8ce2c91e3b16563b7a7ea150f82334262ec +vfs 27f005e635c62d7e4f6b170aabeea8e6e00ff1aa +vfs-miklos 0eb8af4916a540c362a2950e5ab54eca32eb7d58 +iversion c472c07bfed9c87d7e0b2c052d7e77fedd7109a9 +printk bb4f552a598d40624343bc0815e594efd4d6ec3d +pci ab8c609356fbe8dbcd44df11e884ce8cddf3739e +pstore a99f41a1b4412a0f27cc0b287ea34b168da750f1 +hid 494622678bc9c4f4f45495a635780383c9c0606d +i2c a2cdd4be7a2c9e5f6b1633ae49ca4e6db38574d1 +dmi 36a840c73dc6e70a440d05da3b6ee72f7187a5d3 +hwmon-staging 6fbc4232a5ac944531bda397f3644d1cf66bdd13 +jc_docs 54e36a2dc554685463af54b4ac97a5ec022bd09c +v4l-dvb 273caa260035c03d89ad63d72d8cd3d9e5c5e3f1 +v4l-dvb-next a1dfb4c48cc1e64eeb7800a27c66a6f7e88d075a +fbdev 5865889fe4319415e439095391dda52f23030d60 +pm e4e30a1114b8a1b2bf194b5ee144007bd59ab048 +cpupower 0e96a0c83f0842d5cfd83b0a896bc82ff61f9849 +idle 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f +opp e856f078bcf120e1627c750014d2612974ed81a2 +thermal 134f4010799a30acd969e603985c27b9f3e6f58d +thermal-soc d0ecbbbe518e1b256fcda1770ec06a5a1a058567 +ieee1394 188775181bc05f29372b305ef96485840e351fde +dlm 9250e523592a8ced3ecd14abe29fbb1e036bd7eb +swiotlb 69369f52d28a34c84acb6f2a8a585e743441566a +net-next 617aebe6a97efa539cc4b8a52adccd89596e6be0 +bpf-next 617aebe6a97efa539cc4b8a52adccd89596e6be0 +ipsec-next 255442c93843f52b6891b21d0b485bf2c97f93c3 +netfilter-next c746fc0e8b2d144e2ee9122e4efd72326ff3cd1b +nfc-next 4d63adfe12dd9cb61ed8badb4d798955399048c2 +ipvs-next a910d20aa007b94cf1799df59341f5e27ca60e6f +wireless-drivers-next c713fb071edc0efc01a955f65a006b0e1795d2eb +bluetooth 617aebe6a97efa539cc4b8a52adccd89596e6be0 +mac80211-next ff84e7bfe1763982e1ada390386dbe4739cee1e2 +rdma 03ecdd2dcf39834ff2b012a8b29168d7076da84a +gfs2 35277995e17919ab838beae765f440674e8576eb +mtd fee4380f368e84ed216b62ccd2fbc4126f2bf40b +l2-mtd 571cb17b23eccc22f18c4fc0a0fc34cf0abca7ef +nand f4c6cd1a7f2275d5bc0e494b21fff26f8dde80f0 +spi-nor 23bae78e8a57f0249ed9e3f9c3f40fc1499ce0d4 +crypto 2d55807b7f7bf62bb05a8b91247c5eb7cd19ac04 +drm 94fc27ac487a80daf42f97b1a0503d029f3c1325 +drm-panel e4bac408b08437d190785ab1250cc676304ed171 +drm-intel 6dd3104e78943685d5183efe883d83a5f2361bf1 +drm-tegra 8f62142e490d761ceb92b55a7c05bb79294d6c6c +drm-misc 761e05a702f5d537ffcca1ba933f9f0a968aa022 +drm-msm 51f55992d13b0c6d60baa832453403d736091166 +hdlcd f73e8b82531573a198a4d0e5bff0d3256cbbd1d8 +mali-dp 54243016ae35a0912a680f884835237fd6176820 +sunxi-drm 7dafb83edd3271917458de0ae70586ac63098e2f +imx-drm 4cfea3c1f2718d945ca44c1aaac47d8d513c4478 +etnaviv a181196c86e1166fdacf2435f4fe7345558613f0 +kconfig bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +regmap a75de77211842a7e120ce95ad156e4b3704dcde7 +sound 61fcf8ece9b6b09450250c4ca40cc3b81a96a68d +sound-asoc 8639e3c4986935577c58e006e90bc6fc06cc462d +modules 0cad61d7a3d51e0237a7e421c75b04ebbb5062d0 +input 10a558374f3751cf4eb55143008975641dfc2cf4 +block 0ccfb3c0032b20a7f137976e9e783c896d55301e +lightnvm 1c6286f26301ad154a1c10fb6e68925493dd28ba +device-mapper de6ff5c58656d69f5a58c1e7353532bcf1ebe0d6 +mmc 56174d9a21496fce64fcc6ba2f475734c20c12e4 +kgdb 2cf2f0d5b91fd1b06a6ae260462fc7945ea84add +md 1532d9e87e8b2377f12929f9e40724d5fbe6ecc5 +mfd 0f89ffefa4e122e7e9bc1c2d716c6052b4601b76 +backlight 2023b0524a6310e9ea80daf085f51c71bff9289f +battery 8be4c3667cf117b8f8a2b0b73a34258d45992867 +regulator c8f64f281824d238a36ef948236649c56c9e6926 +security 400f428062af7e9200ff15dce2ef3c01ff007d96 +integrity b79f5f38d87f66576deb49e18f2175a295db24de +keys 1e684d3820d8f72d877c0adb521ae17c6fc9bc88 +selinux 4b14752ec4e0d87126e636384cf37c8dd9df157c +tpmdd 68021bf4734d15c9a9ed1c1072b9ebcfda3e39cc +watchdog 592a547adf686dbec7687e816ecdf9101fe227f5 +iommu fedbd940d1c2e37e6b11cf84f67b30dfcbf6fba5 +dwmw2-iommu 910170442944e1f8674fd5ddbeeb8ccd1877ea98 +vfio 46ed90f157f42d956ffed17c003f089a59b76e3e +trivial 1972d6c0c86dd8620ff9f2811ce875135ffb5405 +audit d8a5b80568a9cb66810e75b182018e9edb68e8ff +devicetree 3a6fbcb2e2e4b263df1cc8647ce1858c57ddc805 +mailbox 0ae7d327a64b262443b7d3ebee5831e4dde47b89 +spi d0cb047a0edb3871a41c5261c6b0083c9a436b97 +tip 5fbd7b8262bc8ecd8aea363ac0ff23931016ec5f +clockevents 322fd24f5e67c396f04bef01ed33ac6bfca46bcd +edac 345fb0a9a6340ba0b3b714d62f877fde88c8a755 +edac-amd 68fa24f9121c04ef146b5158f538c8b32f285be5 +irqchip c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201 +ftrace 841a915d20c7b22fc4f36f12368daf94d9f8cb10 +rcu 1dfa55e01987288d847220b8c027204871440ed1 +kvm 8dbfb2bf1bb3848a8069164e205635b2675c24fe +kvm-arm cd15d2050c044ca9525ba165e9073ac8e036b8d0 +kvm-mips dc44abd6aad22411f7f9890e39fd4753dabf0d03 +kvm-ppc 9b9b13a6d1537ddc4caccd6f1c41b78edbc08437 +kvms390 4b9f952577fb40875a2a163d80515a8daa0d6bef +xen-tip 761191258839b7d922b83064c4251b8bd4e2e7c2 +percpu 85dcbba3b8b15c17d3237695440d09d12825184d +workqueues a10eb37ccf1d47f9d97269ede326aa949816be87 +drivers-x86 9a7c551ba7aae3648473179f234e960cfd46eaf4 +chrome-platform d48b8c58c57f6edbe2965f0a5f62c5cf9593ca96 +hsi b6dc80dbe6cdf4effd5a07bcd37f34cbf25eb07a +leds 6a836631e303cec7fd9469ae53a4d97d0360eb38 +ipmi e45af3d372f1d4339663dcbef28665f5b15d448c +driver-core 35277995e17919ab838beae765f440674e8576eb +usb 4bf772b14675411a69b3c807f73006de0fe4b649 +usb-gadget 8ada211d0383b72878582bd312b984a9eae62b30 +usb-serial d1c48227d7c45fbb35c81f846a62ec92a74f4701 +usb-chipidea-next ce4c1b820c5269437ce2e7831f638159b3b83269 +phy-next e4b227c1ca70ae779c39e5284742555b9e1cdf9f +tty 4bf772b14675411a69b3c807f73006de0fe4b649 +char-misc 35277995e17919ab838beae765f440674e8576eb +extcon ca90a64dc671f4a18958078a4bf2e31e2ef57db9 +staging 35277995e17919ab838beae765f440674e8576eb +mux 6cd361c99ef2bbe23edd554079c4187321a21219 +slave-dma 6c773ba2c8438e2c5325497da9fadff33ec49503 +cgroup 5ecf66c9dc2b707aea22f73c0e1882ffbd238bb9 +scsi 7aa28b43b8ffe1b75f220a41c234e4a18d67ecb1 +scsi-mkp 16a628faa63c8149d9a8f433e5c6548f6cff98e4 +target-updates 1c130ae00b769a2e2df41bad3d6051ee8234b636 +target-bva 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +libata 83ab14e6cacc7ed2c340dd5408295b32cf06c620 +vhost d25cc43c6775bff6b8e3dad97c747954b805e421 +rpmsg 163c558b84fe180bf91e4129c28fe2791e278b01 +gpio d58f2bf261fdf3a3fc916c9999a686f959dcf6b6 +pinctrl 02e389e63e3523828fc3832f27e0341885f60f6f +pinctrl-samsung 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +pwm bccaa3f917c90917a758020dfbdd9027290a7c4e +userns 9eba1cd4b565f66456e0705475f66bf32cd75ee1 +ktest f7c6401ff84ab8ffffc281a29aa0a787f7eb346e +random 9e66317d3c92ddaab330c125dfe9d06eee268aff +aio 2a8a98673c13cb2a61a6476153acf8344adfa992 +kselftest 0e9e327d1622c332e5b1db272d5c97af82164f68 +y2038 69973b830859bc6529a7a0468ba0d80ee5117826 +livepatching d13f5d84ca2774e76f8461a383c222cbc75adad5 +coresight d8a5b80568a9cb66810e75b182018e9edb68e8ff +rtc 4402be2b4ca7f53b6213a9e6b3abe9cdcc683e9b +nvdimm ee95f4059a833839bf52972191b2d4c3d3cec552 +idr f0f3f2d0a3e0f7c48163fd8b45f5909d46e7f371 +at24 0f30aca72c3b68f4b6a443193b574f14106cd61e +ntb 3b28c987fb9547ca9aac73241d0e281cf646387c +kspp 531d5f7f5d137694a69e101c7cfb44103564c500 +init_task e1e871aff3ded26348c631b1370e257d401cd22d +akpm-current 0f2ac581fd9bc0f7f8a7545be68ce2c22ee102b6 +akpm 52c01169fde73e52104c0241c0ae76e06879aa55 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..f00c42932e78 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2881 @@ +$ date -R +Thu, 08 Feb 2018 09:22:55 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at b46dc8ae17a4 media: videobuf2: fix up for "media: annotate ->poll() instances" +Merging origin/master (ffefb181728f Merge tag 'regulator-fix-v4.16-suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator) +$ git merge origin/master +Updating b46dc8ae17a4..ffefb181728f +Fast-forward + .../ABI/testing/sysfs-driver-samsung-laptop | 2 +- + Documentation/admin-guide/thunderbolt.rst | 66 +- + Documentation/bpf/bpf_devel_QA.txt | 31 + + .../devicetree/bindings/thermal/armada-thermal.txt | 37 +- + .../devicetree/bindings/thermal/rcar-thermal.txt | 1 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + .../bindings/watchdog/cortina,gemini-watchdog.txt | 17 - + ...ina,gemin-watchdog.txt => faraday,ftwdt010.txt} | 11 +- + .../bindings/watchdog/ingenic,jz4740-wdt.txt | 4 +- + .../bindings/watchdog/realtek,rtd119x.txt | 17 + + .../devicetree/bindings/watchdog/renesas-wdt.txt | 3 +- + .../devicetree/bindings/watchdog/sprd-wdt.txt | 19 + + Documentation/mips/AU1xxx_IDE.README | 7 - + Documentation/networking/ip-sysctl.txt | 4 +- + Documentation/process/index.rst | 1 + + Documentation/process/kernel-docs.rst | 2 +- + Documentation/process/maintainer-pgp-guide.rst | 929 ++++++++++++++++++++ + Documentation/sysctl/user.txt | 2 +- + Documentation/watchdog/watchdog-parameters.txt | 23 - + MAINTAINERS | 77 +- + Makefile | 54 +- + arch/Kconfig | 16 +- + arch/arm/include/asm/bitops.h | 1 + + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/kasan.h | 17 +- + arch/arm64/include/asm/memory.h | 3 +- + arch/arm64/kernel/entry.S | 4 + + arch/arm64/kernel/perf_event.c | 5 +- + arch/arm64/mm/kasan_init.c | 3 +- + arch/ia64/kernel/perfmon.c | 13 +- + arch/m68k/include/asm/bitops.h | 3 +- + arch/mips/Kconfig | 23 +- + arch/mips/Makefile | 8 +- + arch/mips/bcm47xx/Platform | 1 + + arch/mips/boot/compressed/Makefile | 6 +- + arch/mips/boot/dts/ingenic/Makefile | 1 + + arch/mips/boot/dts/ingenic/gcw0.dts | 62 ++ + arch/mips/boot/dts/ingenic/jz4770.dtsi | 212 +++++ + arch/mips/configs/bigsur_defconfig | 1 - + arch/mips/configs/gcw0_defconfig | 27 + + arch/mips/configs/generic/board-ranchu.config | 30 + + arch/mips/configs/ip27_defconfig | 1 - + arch/mips/configs/ip32_defconfig | 1 - + arch/mips/configs/malta_defconfig | 5 +- + arch/mips/configs/malta_kvm_defconfig | 4 +- + arch/mips/configs/malta_kvm_guest_defconfig | 4 +- + arch/mips/configs/malta_qemu_32r6_defconfig | 1 + + arch/mips/configs/maltaaprp_defconfig | 1 + + arch/mips/configs/maltasmvp_defconfig | 1 + + arch/mips/configs/maltasmvp_eva_defconfig | 1 + + arch/mips/configs/maltaup_defconfig | 1 + + arch/mips/configs/maltaup_xpa_defconfig | 5 +- + arch/mips/configs/nlm_xlp_defconfig | 1 - + arch/mips/configs/nlm_xlr_defconfig | 1 - + arch/mips/configs/pnx8335_stb225_defconfig | 1 - + arch/mips/configs/sb1250_swarm_defconfig | 1 - + arch/mips/generic/Kconfig | 10 + + arch/mips/generic/Makefile | 1 + + arch/mips/generic/board-ranchu.c | 93 ++ + arch/mips/generic/irq.c | 18 +- + arch/mips/include/asm/bootinfo.h | 2 + + arch/mips/include/asm/checksum.h | 2 +- + arch/mips/include/asm/mach-loongson64/boot_param.h | 2 +- + arch/mips/include/asm/machine.h | 2 +- + arch/mips/include/asm/mipsregs.h | 702 +++++++-------- + arch/mips/include/asm/msa.h | 63 +- + arch/mips/jz4740/Kconfig | 10 + + arch/mips/jz4740/prom.c | 25 +- + arch/mips/jz4740/setup.c | 22 +- + arch/mips/jz4740/time.c | 2 +- + arch/mips/kernel/branch.c | 2 +- + arch/mips/kernel/cps-vec.S | 17 +- + arch/mips/kernel/ftrace.c | 2 +- + arch/mips/kernel/setup.c | 39 +- + arch/mips/kernel/smp-cps.c | 2 - + arch/mips/kernel/watch.c | 31 +- + arch/mips/loongson64/Kconfig | 2 - + arch/mips/loongson64/common/mem.c | 2 +- + arch/mips/loongson64/loongson-3/numa.c | 2 +- + arch/mips/math-emu/cp1emu.c | 28 +- + arch/mips/math-emu/dp_add.c | 3 +- + arch/mips/math-emu/dp_div.c | 1 + + arch/mips/math-emu/dp_fmax.c | 2 + + arch/mips/math-emu/dp_fmin.c | 2 + + arch/mips/math-emu/dp_maddf.c | 8 +- + arch/mips/math-emu/dp_mul.c | 4 +- + arch/mips/math-emu/dp_sqrt.c | 8 +- + arch/mips/math-emu/dp_sub.c | 2 +- + arch/mips/math-emu/ieee754dp.h | 3 + + arch/mips/math-emu/sp_add.c | 3 +- + arch/mips/math-emu/sp_div.c | 1 + + arch/mips/math-emu/sp_fdp.c | 3 +- + arch/mips/math-emu/sp_fmax.c | 2 + + arch/mips/math-emu/sp_fmin.c | 2 + + arch/mips/math-emu/sp_maddf.c | 3 +- + arch/mips/math-emu/sp_mul.c | 1 + + arch/mips/math-emu/sp_sqrt.c | 3 +- + arch/mips/math-emu/sp_sub.c | 1 + + arch/mips/math-emu/sp_tlong.c | 1 - + arch/mips/mm/dma-default.c | 6 - + arch/mips/mm/sc-mips.c | 9 + + arch/mips/txx9/rbtx4939/setup.c | 4 +- + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/membarrier.h | 27 + + arch/powerpc/mm/mmu_context.c | 7 + + arch/riscv/Kconfig | 10 + + arch/riscv/include/asm/Kbuild | 1 - + arch/riscv/include/asm/csr.h | 14 +- + arch/riscv/include/asm/ftrace.h | 10 + + arch/riscv/include/asm/mmu_context.h | 17 +- + arch/riscv/include/asm/tlbflush.h | 20 +- + arch/riscv/include/asm/unistd.h | 1 - + arch/riscv/kernel/Makefile | 7 + + arch/riscv/kernel/entry.S | 9 +- + arch/riscv/kernel/ftrace.c | 41 + + arch/riscv/kernel/head.S | 6 +- + arch/riscv/kernel/mcount.S | 126 +++ + arch/riscv/kernel/setup.c | 44 +- + arch/riscv/kernel/vdso.c | 2 +- + arch/riscv/mm/fault.c | 4 + + arch/riscv/mm/init.c | 12 +- + arch/score/kernel/setup.c | 4 +- + arch/unicore32/include/asm/bitops.h | 2 + + arch/x86/Kconfig | 4 +- + arch/x86/entry/entry_32.S | 5 + + arch/x86/entry/entry_64.S | 4 + + arch/x86/events/perf_event.h | 3 +- + arch/x86/include/asm/intel-family.h | 6 + + arch/x86/include/asm/intel_pmc_ipc.h | 6 + + arch/x86/include/asm/kasan.h | 12 +- + arch/x86/include/asm/pmc_core.h | 27 - + arch/x86/include/asm/sync_core.h | 28 + + arch/x86/mm/tlb.c | 6 + + drivers/acpi/acpi_lpit.c | 1 + + drivers/clk/ingenic/Makefile | 1 + + drivers/clk/ingenic/cgu.c | 94 +- + drivers/clk/ingenic/cgu.h | 4 +- + drivers/clk/ingenic/jz4770-cgu.c | 483 +++++++++++ + drivers/clk/ingenic/jz4780-cgu.c | 2 +- + drivers/mfd/ab8500-debugfs.c | 14 - + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 2 +- + drivers/net/ethernet/emulex/benet/be.h | 7 +- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 1 + + drivers/net/ethernet/emulex/benet/be_hw.h | 1 + + drivers/net/ethernet/emulex/benet/be_main.c | 113 ++- + drivers/net/ethernet/ibm/ibmvnic.c | 14 +- + drivers/net/ethernet/netronome/nfp/bpf/main.h | 24 +- + .../ethernet/netronome/nfp/flower/tunnel_conf.c | 10 +- + drivers/net/ethernet/netronome/nfp/nfp_net.h | 6 +- + .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h | 43 +- + .../ethernet/netronome/nfp/nfpcore/nfp_resource.c | 21 +- + drivers/net/netdevsim/bpf.c | 5 +- + drivers/net/phy/mdio_bus.c | 3 +- + drivers/perf/arm_dsu_pmu.c | 6 +- + drivers/platform/Kconfig | 2 + + drivers/platform/Makefile | 1 + + drivers/platform/mellanox/Kconfig | 26 + + drivers/platform/mellanox/Makefile | 6 + + drivers/platform/mellanox/mlxreg-hotplug.c | 638 ++++++++++++++ + drivers/platform/x86/Kconfig | 56 +- + drivers/platform/x86/Makefile | 4 +- + drivers/platform/x86/acer-wireless.c | 71 ++ + drivers/platform/x86/alienware-wmi.c | 17 + + drivers/platform/x86/apple-gmux.c | 48 +- + drivers/platform/x86/asus-nb-wmi.c | 13 +- + drivers/platform/x86/dell-laptop.c | 274 +++--- + drivers/platform/x86/dell-smbios.c | 8 +- + drivers/platform/x86/dell-wmi.c | 3 + + drivers/platform/x86/gpd-pocket-fan.c | 216 +++++ + drivers/platform/x86/ideapad-laptop.c | 56 +- + drivers/platform/x86/intel-hid.c | 41 +- + drivers/platform/x86/intel-vbtn.c | 65 +- + drivers/platform/x86/intel_chtdc_ti_pwrbtn.c | 93 ++ + drivers/platform/x86/intel_int0002_vgpio.c | 2 +- + drivers/platform/x86/intel_pmc_core.c | 280 +++--- + drivers/platform/x86/intel_pmc_core.h | 29 +- + drivers/platform/x86/intel_pmc_ipc.c | 33 +- + drivers/platform/x86/intel_telemetry_debugfs.c | 83 +- + drivers/platform/x86/mlx-platform.c | 324 +++++-- + drivers/platform/x86/mlxcpld-hotplug.c | 515 ----------- + drivers/platform/x86/pmc_atom.c | 42 +- + drivers/platform/x86/samsung-laptop.c | 18 +- + drivers/platform/x86/silead_dmi.c | 175 ++++ + drivers/platform/x86/thinkpad_acpi.c | 18 +- + drivers/pps/generators/pps_gen_parport.c | 40 +- + drivers/rapidio/devices/tsi721_dma.c | 17 +- + drivers/rapidio/rio.c | 110 ++- + drivers/regulator/core.c | 2 +- + drivers/thermal/Kconfig | 4 +- + drivers/thermal/armada_thermal.c | 253 ++++-- + drivers/thermal/hisi_thermal.c | 2 +- + drivers/thermal/imx_thermal.c | 74 +- + drivers/thermal/int340x_thermal/int3400_thermal.c | 12 +- + drivers/thermal/mtk_thermal.c | 9 +- + drivers/thermal/of-thermal.c | 1 - + drivers/thermal/power_allocator.c | 2 + + drivers/thermal/tegra/soctherm.c | 103 +-- + drivers/thermal/thermal_hwmon.c | 20 +- + drivers/thermal/x86_pkg_temp_thermal.c | 4 +- + drivers/video/console/dummycon.c | 1 - + drivers/video/fbdev/Kconfig | 2 +- + drivers/video/fbdev/atmel_lcdfb.c | 8 +- + drivers/video/fbdev/aty/radeon_base.c | 18 +- + drivers/video/fbdev/au1200fb.h | 286 ------- + drivers/video/fbdev/auo_k190x.c | 3 +- + drivers/video/fbdev/mmp/core.c | 5 + + drivers/video/fbdev/mxsfb.c | 45 +- + drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 39 +- + drivers/video/fbdev/omap2/omapfb/dss/dss.c | 45 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 5 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c | 31 +- + drivers/video/fbdev/pxa3xx-gcu.c | 16 +- + drivers/video/fbdev/smscufx.c | 5 +- + drivers/video/fbdev/udlfb.c | 655 +++++++------- + drivers/video/fbdev/vfb.c | 17 + + drivers/video/fbdev/vga16fb.c | 1 - + drivers/video/fbdev/vt8500lcdfb.c | 4 +- + drivers/video/fbdev/wm8505fb.c | 4 +- + drivers/watchdog/Kconfig | 41 +- + drivers/watchdog/Makefile | 7 +- + drivers/watchdog/advantechwdt.c | 2 +- + drivers/watchdog/alim1535_wdt.c | 2 +- + drivers/watchdog/aspeed_wdt.c | 21 +- + drivers/watchdog/at32ap700x_wdt.c | 433 ---------- + drivers/watchdog/da9062_wdt.c | 48 +- + drivers/watchdog/davinci_wdt.c | 38 + + drivers/watchdog/dw_wdt.c | 18 +- + drivers/watchdog/eurotechwdt.c | 2 +- + drivers/watchdog/f71808e_wdt.c | 4 +- + drivers/watchdog/ftwdt010_wdt.c | 236 ++++++ + drivers/watchdog/gemini_wdt.c | 229 ----- + drivers/watchdog/gpio_wdt.c | 58 +- + drivers/watchdog/hpwdt.c | 12 +- + drivers/watchdog/i6300esb.c | 377 +++----- + drivers/watchdog/ib700wdt.c | 2 +- + drivers/watchdog/imx2_wdt.c | 20 +- + drivers/watchdog/jz4740_wdt.c | 1 + + drivers/watchdog/mei_wdt.c | 7 +- + drivers/watchdog/mpc8xxx_wdt.c | 83 +- + drivers/watchdog/mt7621_wdt.c | 34 +- + drivers/watchdog/orion_wdt.c | 2 +- + drivers/watchdog/pcwd_pci.c | 2 +- + drivers/watchdog/pcwd_usb.c | 5 +- + drivers/watchdog/rtd119x_wdt.c | 168 ++++ + drivers/watchdog/sp5100_tco.c | 710 +++++++--------- + drivers/watchdog/sp5100_tco.h | 57 +- + drivers/watchdog/sprd_wdt.c | 399 +++++++++ + drivers/watchdog/stm32_iwdg.c | 6 +- + drivers/watchdog/sunxi_wdt.c | 7 +- + drivers/watchdog/watchdog_core.c | 1 + + drivers/watchdog/watchdog_dev.c | 125 +-- + drivers/watchdog/wdt_pci.c | 2 +- + drivers/watchdog/xen_wdt.c | 255 ++---- + fs/binfmt_elf.c | 2 + + fs/hfsplus/dir.c | 4 +- + fs/hfsplus/hfsplus_fs.h | 3 +- + fs/hfsplus/inode.c | 7 +- + fs/hfsplus/super.c | 2 +- + fs/inode.c | 1 - + fs/nilfs2/segbuf.c | 2 +- + fs/nilfs2/segbuf.h | 4 +- + fs/nilfs2/segment.c | 2 +- + fs/nilfs2/segment.h | 2 +- + fs/nilfs2/sufile.c | 2 +- + fs/nilfs2/sufile.h | 2 +- + fs/nilfs2/super.c | 4 +- + fs/nilfs2/sysfs.c | 21 +- + fs/nilfs2/the_nilfs.h | 8 +- + fs/pipe.c | 57 +- + fs/proc/array.c | 8 +- + fs/proc/base.c | 70 +- + fs/proc/consoles.c | 3 +- + fs/proc/fd.c | 2 +- + fs/proc/generic.c | 18 +- + fs/proc/inode.c | 11 +- + fs/proc/internal.h | 29 +- + fs/proc/kcore.c | 18 +- + fs/proc/proc_net.c | 4 +- + fs/proc/self.c | 9 +- + fs/proc/thread_self.c | 8 +- + fs/proc/vmcore.c | 6 +- + include/asm-generic/audit_dir_write.h | 2 + + include/asm-generic/bitops/find.h | 20 + + include/asm-generic/qrwlock_types.h | 1 + + include/dt-bindings/clock/jz4770-cgu.h | 58 ++ + include/linux/bitmap.h | 63 +- + include/linux/build_bug.h | 2 - + include/linux/compiler-clang.h | 8 + + include/linux/cpumask.h | 2 +- + include/linux/cpuset.h | 6 +- + include/linux/crash_dump.h | 12 +- + include/linux/fb.h | 5 +- + include/linux/genl_magic_func.h | 12 +- + include/linux/ioport.h | 2 +- + include/linux/jump_label.h | 4 +- + include/linux/kallsyms.h | 2 +- + include/linux/kasan.h | 15 +- + include/linux/lockref.h | 2 +- + include/linux/memblock.h | 4 +- + include/linux/module.h | 2 +- + include/linux/mutex.h | 4 +- + include/linux/netdevice.h | 6 + + include/linux/pipe_fs_i.h | 5 +- + include/linux/platform_data/mlxcpld-hotplug.h | 99 --- + include/linux/platform_data/mlxreg.h | 144 ++++ + include/linux/sched.h | 13 + + include/linux/sched/mm.h | 35 +- + include/linux/seq_file.h | 14 + + include/linux/sync_core.h | 21 + + include/linux/sysctl.h | 3 - + include/linux/uuid.h | 1 + + include/net/erspan.h | 26 +- + include/sound/soc.h | 2 +- + include/uapi/asm-generic/siginfo.h | 4 +- + include/uapi/linux/input-event-codes.h | 1 + + include/uapi/linux/membarrier.h | 74 +- + include/uapi/linux/uuid.h | 1 - + include/video/udlfb.h | 3 +- + init/Kconfig | 9 + + ipc/mqueue.c | 2 +- + ipc/msg.c | 20 +- + ipc/sem.c | 10 + + ipc/shm.c | 20 +- + ipc/util.c | 5 +- + kernel/async.c | 20 +- + kernel/bpf/core.c | 32 +- + kernel/cgroup/cpuset.c | 4 +- + kernel/compat.c | 2 +- + kernel/configs/tiny.config | 4 + + kernel/fork.c | 60 +- + kernel/futex.c | 20 +- + kernel/irq/spurious.c | 1 - + kernel/kcov.c | 4 +- + kernel/pid.c | 13 + + kernel/ptrace.c | 27 +- + kernel/relay.c | 1 - + kernel/resource.c | 10 +- + kernel/sched/core.c | 76 +- + kernel/sched/fair.c | 101 ++- + kernel/sched/membarrier.c | 177 +++- + kernel/sched/rt.c | 29 +- + kernel/sched/sched.h | 2 + + kernel/sched/stats.h | 6 + + kernel/sched/topology.c | 13 + + kernel/sysctl.c | 33 +- + kernel/taskstats.c | 6 +- + kernel/time/hrtimer.c | 1 - + lib/Kconfig.debug | 11 +- + lib/Kconfig.kasan | 11 + + lib/Makefile | 2 +- + lib/bitmap.c | 137 ++- + lib/cpumask.c | 9 +- + lib/find_bit.c | 59 +- + lib/{test_find_bit.c => find_bit_benchmark.c} | 70 +- + lib/stackdepot.c | 19 +- + lib/test_bitmap.c | 295 +++---- + lib/test_kasan.c | 107 ++- + lib/test_sort.c | 6 + + lib/ubsan.c | 64 +- + lib/ubsan.h | 17 +- + mm/bootmem.c | 2 +- + mm/kasan/kasan.c | 108 ++- + mm/kasan/kasan.h | 55 +- + mm/kasan/report.c | 11 +- + mm/ksm.c | 2 +- + mm/maccess.c | 2 +- + mm/memblock.c | 6 +- + mm/memcontrol.c | 6 +- + mm/memory.c | 4 - + mm/mempool.c | 6 +- + mm/mlock.c | 2 +- + mm/nommu.c | 2 +- + mm/pagewalk.c | 1 + + mm/process_vm_access.c | 10 +- + mm/slab.c | 6 +- + mm/slub.c | 10 +- + mm/swap.c | 4 +- + mm/userfaultfd.c | 1 - + mm/vmscan.c | 1 + + mm/z3fold.c | 4 +- + mm/zbud.c | 4 +- + mm/zpool.c | 46 +- + net/bluetooth/hci_debugfs.c | 13 - + net/bpf/test_run.c | 4 + + net/core/ethtool.c | 53 +- + net/ipv4/ip_gre.c | 14 +- + net/ipv6/ip6_gre.c | 15 +- + net/ipv6/mcast.c | 8 +- + net/rds/ib.c | 3 +- + net/sched/cls_u32.c | 21 +- + net/sctp/ipv6.c | 10 +- + net/sctp/protocol.c | 10 +- + samples/bpf/Makefile | 2 +- + samples/bpf/bpf_load.c | 102 --- + samples/bpf/bpf_load.h | 2 +- + samples/bpf/tcbpf2_kern.c | 41 +- + samples/bpf/test_tunnel_bpf.sh | 4 +- + samples/bpf/xdp1_user.c | 4 +- + samples/bpf/xdp_redirect_cpu_user.c | 6 +- + samples/bpf/xdp_redirect_map_user.c | 8 +- + samples/bpf/xdp_redirect_user.c | 8 +- + samples/bpf/xdp_router_ipv4_user.c | 10 +- + samples/bpf/xdp_rxq_info_user.c | 4 +- + samples/bpf/xdp_tx_iptunnel_user.c | 6 +- + scripts/Makefile.kasan | 35 +- + scripts/Makefile.lib | 2 +- + scripts/Makefile.ubsan | 1 - + scripts/checkpatch.pl | 144 +++- + security/yama/yama_lsm.c | 11 +- + sound/soc/atmel/sam9g20_wm8731.c | 17 +- + sound/soc/atmel/sam9x5_wm8731.c | 12 +- + sound/soc/codecs/ak4613.c | 78 ++ + sound/soc/codecs/dmic.c | 2 +- + sound/soc/codecs/max98373.c | 4 +- + sound/soc/codecs/max98373.h | 5 +- + sound/soc/codecs/sgtl5000.c | 2 +- + sound/soc/codecs/twl4030.c | 2 + + sound/soc/codecs/twl6040.c | 2 + + sound/soc/intel/Kconfig | 3 + + sound/soc/intel/boards/Kconfig | 1 + + sound/soc/intel/boards/kbl_rt5663_max98927.c | 95 ++- + sound/soc/intel/skylake/Makefile | 5 + + sound/soc/intel/skylake/skl-i2s.h | 31 + + sound/soc/intel/skylake/skl-messages.c | 1 + + sound/soc/intel/skylake/skl-nhlt.c | 41 +- + sound/soc/intel/skylake/skl-ssp-clk.c | 429 ++++++++++ + sound/soc/intel/skylake/skl-ssp-clk.h | 38 + + sound/soc/intel/skylake/skl.h | 6 + + sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 32 +- + sound/soc/mediatek/mt8173/mt8173-rt5650.c | 11 +- + sound/soc/rockchip/rk3399_gru_sound.c | 19 +- + sound/soc/soc-compress.c | 79 +- + sound/soc/soc-core.c | 12 +- + sound/soc/soc-dapm.c | 2 +- + sound/soc/soc-pcm.c | 7 +- + sound/soc/stm/Kconfig | 6 +- + sound/soc/sunxi/sun8i-codec.c | 82 +- + tools/arch/powerpc/include/uapi/asm/kvm.h | 25 + + tools/arch/s390/include/uapi/asm/kvm.h | 5 +- + tools/arch/x86/include/asm/cpufeatures.h | 24 +- + tools/arch/x86/include/asm/disabled-features.h | 3 +- + tools/arch/x86/include/asm/required-features.h | 3 +- + tools/include/asm-generic/bitops/find.h | 16 + + tools/include/uapi/linux/if_link.h | 943 +++++++++++++++++++++ + tools/include/uapi/linux/kvm.h | 4 + + tools/include/uapi/linux/netlink.h | 251 ++++++ + tools/include/uapi/linux/sched.h | 5 + + tools/include/uapi/sound/asound.h | 9 + + tools/lib/bpf/Build | 2 +- + tools/lib/bpf/Makefile | 6 + + tools/lib/bpf/bpf.c | 135 +++ + tools/lib/bpf/bpf.h | 2 + + tools/lib/bpf/libbpf.c | 4 + + tools/lib/bpf/libbpf.h | 6 + + tools/lib/bpf/nlattr.c | 187 ++++ + tools/lib/bpf/nlattr.h | 72 ++ + tools/lib/find_bit.c | 39 +- + tools/lib/subcmd/pager.c | 5 +- + tools/perf/.gitignore | 1 + + tools/perf/builtin-record.c | 3 +- + tools/perf/builtin-trace.c | 5 +- + tools/perf/perf.h | 1 + + tools/perf/util/evsel.c | 13 +- + tools/testing/selftests/bpf/.gitignore | 1 + + tools/testing/selftests/bpf/Makefile | 4 +- + tools/testing/selftests/bpf/test_verifier.c | 14 + + .../testing/selftests/membarrier/membarrier_test.c | 237 +++++- + 467 files changed, 12730 insertions(+), 6317 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/watchdog/cortina,gemini-watchdog.txt + rename Documentation/devicetree/bindings/watchdog/{cortina,gemin-watchdog.txt => faraday,ftwdt010.txt} (55%) + create mode 100644 Documentation/devicetree/bindings/watchdog/realtek,rtd119x.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/sprd-wdt.txt + create mode 100644 Documentation/process/maintainer-pgp-guide.rst + create mode 100644 arch/mips/boot/dts/ingenic/gcw0.dts + create mode 100644 arch/mips/boot/dts/ingenic/jz4770.dtsi + create mode 100644 arch/mips/configs/gcw0_defconfig + create mode 100644 arch/mips/configs/generic/board-ranchu.config + create mode 100644 arch/mips/generic/board-ranchu.c + create mode 100644 arch/powerpc/include/asm/membarrier.h + create mode 100644 arch/riscv/include/asm/ftrace.h + create mode 100644 arch/riscv/kernel/ftrace.c + create mode 100644 arch/riscv/kernel/mcount.S + delete mode 100644 arch/x86/include/asm/pmc_core.h + create mode 100644 arch/x86/include/asm/sync_core.h + create mode 100644 drivers/clk/ingenic/jz4770-cgu.c + create mode 100644 drivers/platform/mellanox/Kconfig + create mode 100644 drivers/platform/mellanox/Makefile + create mode 100644 drivers/platform/mellanox/mlxreg-hotplug.c + create mode 100644 drivers/platform/x86/acer-wireless.c + create mode 100644 drivers/platform/x86/gpd-pocket-fan.c + create mode 100644 drivers/platform/x86/intel_chtdc_ti_pwrbtn.c + delete mode 100644 drivers/platform/x86/mlxcpld-hotplug.c + delete mode 100644 drivers/watchdog/at32ap700x_wdt.c + create mode 100644 drivers/watchdog/ftwdt010_wdt.c + delete mode 100644 drivers/watchdog/gemini_wdt.c + create mode 100644 drivers/watchdog/rtd119x_wdt.c + create mode 100644 drivers/watchdog/sprd_wdt.c + create mode 100644 include/dt-bindings/clock/jz4770-cgu.h + delete mode 100644 include/linux/platform_data/mlxcpld-hotplug.h + create mode 100644 include/linux/platform_data/mlxreg.h + create mode 100644 include/linux/sync_core.h + rename lib/{test_find_bit.c => find_bit_benchmark.c} (69%) + create mode 100644 sound/soc/intel/skylake/skl-ssp-clk.c + create mode 100644 tools/include/uapi/linux/if_link.h + create mode 100644 tools/include/uapi/linux/netlink.h + create mode 100644 tools/lib/bpf/nlattr.c + create mode 100644 tools/lib/bpf/nlattr.h +Merging fixes/master (b46dc8ae17a4 media: videobuf2: fix up for "media: annotate ->poll() instances") +$ 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 (1b689a95ce74 powerpc/pseries: include linux/types.h in asm/hvcall.h) +$ 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 (4d80ecdb80a7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf) +$ git merge net/master +Merge made by the 'recursive' strategy. + include/net/netfilter/nf_conntrack.h | 5 --- + include/net/netfilter/nf_flow_table.h | 6 ++- + net/ipv4/netfilter/Kconfig | 3 +- + net/ipv4/netfilter/nf_flow_table_ipv4.c | 1 + + net/ipv6/netfilter/Kconfig | 3 +- + net/ipv6/netfilter/nf_conntrack_reasm.c | 1 + + net/ipv6/netfilter/nf_flow_table_ipv6.c | 1 + + net/netfilter/Kconfig | 8 ++-- + net/netfilter/nf_flow_table.c | 76 ++++++++++++++++++++++----------- + net/netfilter/nf_flow_table_inet.c | 1 + + net/netfilter/nf_tables_api.c | 17 +++----- + net/netfilter/nft_flow_offload.c | 24 +---------- + net/netfilter/x_tables.c | 7 ++- + net/netfilter/xt_RATEEST.c | 22 +++++++--- + net/netfilter/xt_cgroup.c | 1 + + 15 files changed, 97 insertions(+), 79 deletions(-) +Merging bpf/master (41b0530eca69 Merge branch 'bpf-sockmap-fixes') +$ git merge bpf/master +Merge made by the 'recursive' strategy. + include/net/tcp.h | 8 + + kernel/bpf/sockmap.c | 187 ++++++++++++++--------- + lib/test_bpf.c | 31 +++- + net/ipv4/tcp_ulp.c | 59 ++++++- + net/tls/tls_main.c | 2 + + tools/testing/selftests/bpf/test_xdp_meta.sh | 1 + + tools/testing/selftests/bpf/test_xdp_redirect.sh | 2 + + 7 files changed, 208 insertions(+), 82 deletions(-) +Merging ipsec/master (545d8ae7afff xfrm: fix boolean assignment in xfrm_get_type_offload) +$ git merge ipsec/master +Already up to date. +Merging netfilter/master (0ff90b6c2034 netfilter: nf_flow_offload: fix use-after-free and a resource leak) +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (a9e6d44ddecc ssb: Do not disable PCI host on non-Mips) +$ git merge wireless-drivers/master +Auto-merging drivers/ssb/Kconfig +Merge made by the 'recursive' strategy. + drivers/ssb/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (ae59c3f0b6cf RDMA/mlx5: Fix out-of-bound access while querying AH) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (61fcf8ece9b6 ALSA: hda/realtek - Enable Thinkpad Dock device for ALC298 platform) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/hda/patch_realtek.c | 53 +++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 53 insertions(+) +Merging pci-current/for-linus (838cda369707 x86/PCI: Enable AMD 64-bit window on resume) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (35277995e179 Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (4bf772b14675 Merge tag 'drm-for-v4.16' of git://people.freedesktop.org/~airlied/linux) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (4bf772b14675 Merge tag 'drm-for-v4.16' of git://people.freedesktop.org/~airlied/linux) +$ 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 (2b88212c4cc6 phy: rcar-gen3-usb2: select USB_COMMON) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (35277995e179 Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (35277995e179 Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging input-current/for-linus (0004520af32f Input: mms114 - add SPDX identifier) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/touchscreen/mms114.c | 15 ++++++--------- + 1 file changed, 6 insertions(+), 9 deletions(-) +Merging crypto-current/master (2d55807b7f7b crypto: picoxcell - Fix error handling in spacc_probe()) +$ 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 (ae64f9bd1d36 Linux 4.15-rc2) +$ git merge kselftest-fixes/fixes +Already up to date. +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 (0cde5b44a30f MIPS: TXx9: use IS_BUILTIN() for CONFIG_LEDS_CLASS) +$ git merge mips-fixes/mips-fixes +Already up to date. +Merging kvm-fixes/master (d8a5b80568a9 Linux 4.15) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (1de1ea7efeb9 KVM: s390: add proper locking for CMMA migration bitmap) +$ git merge kvms390-fixes/master +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (d8a5b80568a9 Linux 4.15) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +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 (0a5f41767444 kbuild: clang: disable unused variable warnings only when constant) +$ git merge kbuild/for-next +Auto-merging lib/Kconfig.debug +Auto-merging drivers/video/fbdev/Kconfig +Auto-merging drivers/mmc/host/Kconfig +Auto-merging arch/mips/Kconfig +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 3 +-- + arch/arm/mach-vt8500/Kconfig | 1 - + arch/mips/Kconfig | 1 - + arch/mips/bcm63xx/boards/Kconfig | 1 - + arch/nios2/Kconfig | 1 - + drivers/mmc/host/Kconfig | 1 - + drivers/staging/rtl8192e/rtl8192e/Kconfig | 1 - + drivers/staging/rtl8192u/Kconfig | 1 - + drivers/video/fbdev/Kconfig | 1 - + lib/Kconfig.debug | 1 - + scripts/kconfig/zconf.y | 6 ++++++ + 11 files changed, 7 insertions(+), 11 deletions(-) +Merging uuid/for-next (c0020756315e efi: switch to use new generic UUID API) +$ git merge uuid/for-next +Already up to date. +Merging dma-mapping/for-next (04f56534786c MAINTAINERS: add the iommu list for swiotlb and xen-swiotlb) +$ git merge dma-mapping/for-next +Already up to date. +Merging asm-generic/master (a351e9b9fc24 Linux 4.11) +$ git merge asm-generic/master +Already up to date. +Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (3a175cdf4392 Merge branches 'fixes', 'misc', 'sa1111' and 'sa1100-for-next' into for-next) +$ git merge arm/for-next +Already up to date. +Merging arm-perf/for-next/perf (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 (ea879b13a92b Merge branch 'v4.16/dt64' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 4 ++-- + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 10 +++++----- + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 1 + + 3 files changed, 8 insertions(+), 7 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 (824162aa1454 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Already up to date! +Merge made by the 'recursive' strategy. +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 (91cbd0893d7d Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (e38c38728951 Merge branch 'omap-for-v4.16/ti-sysc' into for-next) +$ git merge omap/for-next +Resolved 'arch/arm/boot/dts/dra7.dtsi' using previous resolution. +Auto-merging arch/arm/mach-omap2/omap_hwmod.c +Auto-merging arch/arm/boot/dts/dra7.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/dra7.dtsi +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 92678066660c] Merge remote-tracking branch 'omap/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-omap2/omap_hwmod.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +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 (b214f9f550fd Merge branches 'fixes-for-v4.15' and 'dt-for-v4.16' into next) +$ git merge renesas/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging rockchip/for-next (5432915256e7 Merge branch 'v4.16-armsoc/dts64fixes' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/usb/rockchip,dwc3.txt | 4 +++- + arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 9 ++++++++ + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 16 +++++++++---- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 27 ++++++++++++++++++++++ + 4 files changed, 51 insertions(+), 5 deletions(-) +Merging samsung/for-next (bebc6082da0a Linux 4.14) +$ git merge samsung/for-next +Already up to date. +Merging samsung-krzk/for-next (3b6327365aba Merge branch 'next/dt' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. +Merging sunxi/sunxi/for-next (d7ec2c507677 Merge branch 'sunxi/fixes-for-4.15' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Already up to date! +Merge made by the 'recursive' strategy. +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 +Resolved 'arch/arm64/include/asm/assembler.h' using previous resolution. +Resolved 'arch/arm64/kvm/handle_exit.c' using previous resolution. +Auto-merging virt/kvm/arm/arm.c +Auto-merging arch/arm64/mm/mmu.c +Auto-merging arch/arm64/mm/fault.c +Auto-merging arch/arm64/kvm/hyp-init.S +Auto-merging arch/arm64/kvm/handle_exit.c +CONFLICT (content): Merge conflict in arch/arm64/kvm/handle_exit.c +Auto-merging arch/arm64/kernel/head.S +Auto-merging arch/arm64/kernel/entry.S +Auto-merging arch/arm64/kernel/cpufeature.c +Auto-merging arch/arm64/kernel/cpu-reset.S +Auto-merging arch/arm64/include/asm/processor.h +Removing arch/arm64/include/asm/kvm_psci.h +Auto-merging arch/arm64/include/asm/assembler.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/assembler.h +Removing arch/arm/include/asm/kvm_psci.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 22e9ebb64e68b902d255f086827e21a8f4bcde87] Merge remote-tracking branch 'arm64/for-next/core' +$ git diff -M --stat --summary HEAD^.. + arch/arm/include/asm/kvm_host.h | 7 ++ + arch/arm/include/asm/kvm_psci.h | 27 ---- + arch/arm/kvm/handle_exit.c | 17 ++- + arch/arm64/include/asm/assembler.h | 43 ++++++- + arch/arm64/include/asm/barrier.h | 22 ++++ + arch/arm64/include/asm/futex.h | 9 +- + arch/arm64/include/asm/kernel-pgtable.h | 12 +- + arch/arm64/include/asm/kvm_host.h | 6 + + arch/arm64/include/asm/kvm_psci.h | 27 ---- + arch/arm64/include/asm/pgtable-prot.h | 30 +++-- + arch/arm64/include/asm/processor.h | 3 + + arch/arm64/include/asm/spinlock.h | 4 +- + arch/arm64/include/asm/uaccess.h | 155 +++++++++++++++-------- + arch/arm64/kernel/arm64ksyms.c | 4 +- + arch/arm64/kernel/bpi.S | 44 +++---- + arch/arm64/kernel/cpu-reset.S | 2 +- + arch/arm64/kernel/cpu_errata.c | 77 +++++++++--- + arch/arm64/kernel/cpufeature.c | 42 ++++++- + arch/arm64/kernel/entry.S | 29 +++-- + arch/arm64/kernel/head.S | 30 +---- + arch/arm64/kernel/hibernate-asm.S | 4 +- + arch/arm64/kernel/sleep.S | 2 +- + arch/arm64/kvm/handle_exit.c | 14 ++- + arch/arm64/kvm/hyp-init.S | 2 +- + arch/arm64/kvm/hyp/hyp-entry.S | 20 ++- + arch/arm64/kvm/hyp/switch.c | 14 +-- + arch/arm64/lib/clear_user.S | 6 +- + arch/arm64/lib/copy_in_user.S | 5 +- + arch/arm64/mm/fault.c | 19 ++- + arch/arm64/mm/mmu.c | 4 + + arch/arm64/mm/proc.S | 212 ++++++++++++++++++++++++++++++-- + drivers/firmware/psci.c | 55 ++++++++- + include/kvm/arm_psci.h | 51 ++++++++ + include/linux/arm-smccc.h | 165 ++++++++++++++++++++++++- + include/linux/psci.h | 13 ++ + include/uapi/linux/psci.h | 3 + + virt/kvm/arm/arm.c | 2 +- + virt/kvm/arm/psci.c | 143 +++++++++++++++++---- + 38 files changed, 1032 insertions(+), 292 deletions(-) + delete mode 100644 arch/arm/include/asm/kvm_psci.h + delete mode 100644 arch/arm64/include/asm/kvm_psci.h + create mode 100644 include/kvm/arm_psci.h +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 (7685570f2ae2 clk: samsung: s3c: Remove unneeded enumeration) +$ git merge clk-samsung/for-next +Merge made by the 'recursive' strategy. + drivers/clk/samsung/clk-s3c2412.c | 11 ++--------- + drivers/clk/samsung/clk-s3c2443.c | 17 ++++------------- + drivers/clk/samsung/clk-s3c64xx.c | 17 ++++++----------- + 3 files changed, 12 insertions(+), 33 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 +Merge made by the 'recursive' strategy. + arch/cris/kernel/setup.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (7b6ce52be3f8 microblaze: Setup proper dependency for optimized lib functions) +$ 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 (8f2256d8eaf5 MIPS: Malta: Sanitize mouse and keyboard configuration.) +$ git merge mips-james/mips-next +Already up to date. +Merging nios2/for-next (65d1e3ddeae1 nios2: time: Read timer in get_cycles only if initialized) +$ 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 (bebc6082da0a Linux 4.14) +$ git merge parisc-hd/for-next +Already up to date. +Merging powerpc/next (015eb1b89e95 powerpc/mm/radix: Fix build error when RADIX_MMU=n) +$ 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 (4889dec6c87d riscv: inline set_pgdir into its only caller) +$ git merge risc-v/for-next +Already up to date. +Merging s390/features (b175210bd231 s390/kconfig: Remove ARCH_WANTS_PROT_NUMA_PROT_NONE select) +$ git merge s390/features +Merge made by the 'recursive' strategy. + Documentation/driver-api/s390-drivers.rst | 32 +++- + arch/s390/Kconfig | 46 +++++- + arch/s390/Makefile | 10 ++ + arch/s390/include/asm/barrier.h | 24 +++ + arch/s390/include/asm/eadm.h | 2 +- + arch/s390/include/asm/facility.h | 18 +++ + arch/s390/include/asm/lowcore.h | 9 +- + arch/s390/include/asm/nospec-branch.h | 18 +++ + arch/s390/include/asm/processor.h | 4 + + arch/s390/include/asm/runtime_instr.h | 67 +------- + arch/s390/include/asm/sysinfo.h | 3 +- + arch/s390/include/asm/thread_info.h | 4 + + arch/s390/include/uapi/asm/runtime_instr.h | 74 +++++++++ + arch/s390/kernel/Makefile | 4 + + arch/s390/kernel/alternative.c | 26 ++- + arch/s390/kernel/early.c | 5 + + arch/s390/kernel/entry.S | 249 ++++++++++++++++++++++++++--- + arch/s390/kernel/ipl.c | 1 + + arch/s390/kernel/kprobes.c | 2 +- + arch/s390/kernel/module.c | 62 +++++-- + arch/s390/kernel/nospec-branch.c | 100 ++++++++++++ + arch/s390/kernel/perf_cpum_cf_events.c | 2 +- + arch/s390/kernel/processor.c | 18 +++ + arch/s390/kernel/runtime_instr.c | 10 +- + arch/s390/kernel/setup.c | 8 +- + arch/s390/kernel/smp.c | 7 +- + arch/s390/kernel/sysinfo.c | 2 + + arch/s390/kernel/vmlinux.lds.S | 14 ++ + drivers/s390/char/Makefile | 2 + + drivers/s390/cio/chp.c | 10 +- + drivers/s390/cio/cio.c | 2 +- + drivers/s390/cio/cmf.c | 15 +- + drivers/s390/cio/itcw.c | 2 +- + drivers/s390/cio/qdio_main.c | 4 +- + drivers/s390/cio/vfio_ccw_cp.c | 2 +- + 35 files changed, 725 insertions(+), 133 deletions(-) + create mode 100644 arch/s390/include/asm/nospec-branch.h + create mode 100644 arch/s390/include/uapi/asm/runtime_instr.h + create mode 100644 arch/s390/kernel/nospec-branch.c +Merging sparc-next/master (8e44e6600caa Merge branch 'KASAN-read_word_at_a_time') +$ git merge sparc-next/master +Already up to date. +Merging sh/for-next (6e2fbfdd585f sh: fix futex FUTEX_OP_SET op on userspace addresses) +$ git merge sh/for-next +Auto-merging arch/sh/include/asm/futex.h +Merge made by the 'recursive' strategy. + arch/sh/include/asm/futex.h | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) +Merging uml/linux-next (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 (73b37067623c xtensa: fix futex_atomic_cmpxchg_inatomic) +$ git merge xtensa/xtensa-for-next +Merge made by the 'recursive' strategy. +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 0a96d53f029b60e0c01203f07e4538787f1e0bab] Merge remote-tracking branch 'btrfs/next' + Date: Thu Feb 8 10:01:39 2018 +1100 +Merging btrfs-kdave/for-next (4fe231871443 Merge branch 'for-next-next-v4.16-20180206' into for-next-20180206) +$ 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.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 a042639f9c23] 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 | 35 +++- + fs/btrfs/delayed-inode.c | 50 ++++-- + fs/btrfs/delayed-ref.c | 3 +- + fs/btrfs/dir-item.c | 1 - + fs/btrfs/disk-io.c | 31 ++-- + fs/btrfs/extent-tree.c | 119 ++++++------- + fs/btrfs/extent_io.c | 4 +- + 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 | 165 ++++++++++------- + fs/btrfs/ioctl.c | 125 +++---------- + fs/btrfs/ordered-data.c | 2 +- + fs/btrfs/props.c | 4 +- + fs/btrfs/qgroup.c | 360 ++++++++++++++++++++++++++++---------- + fs/btrfs/qgroup.h | 102 ++++++++++- + fs/btrfs/relocation.c | 9 +- + fs/btrfs/send.c | 4 +- + fs/btrfs/super.c | 17 +- + fs/btrfs/tests/btrfs-tests.c | 3 +- + fs/btrfs/tests/extent-map-tests.c | 2 +- + fs/btrfs/transaction.c | 52 ++---- + fs/btrfs/transaction.h | 9 +- + fs/btrfs/tree-checker.c | 147 ++++++++-------- + fs/btrfs/tree-checker.h | 7 +- + fs/btrfs/tree-log.c | 34 +++- + fs/btrfs/volumes.c | 59 +++++-- + fs/btrfs/volumes.h | 22 +++ + fs/btrfs/zstd.c | 19 +- + include/linux/crc32c.h | 1 + + include/trace/events/btrfs.h | 108 +++++++++++- + lib/libcrc32c.c | 6 + + 43 files changed, 1012 insertions(+), 664 deletions(-) + delete mode 100644 fs/btrfs/hash.c + delete mode 100644 fs/btrfs/hash.h +$ git reset --hard HEAD^ +HEAD is now at 0a96d53f029b Merge remote-tracking branch 'btrfs/next' +Merging next-20180206 version of btrfs-kdave +$ git merge -m next-20180206/btrfs-kdave d69a3372bba20c49d631c13708ec672a6f746c88 +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/free-space-cache.c +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/delayed-inode.c +Auto-merging fs/btrfs/compression.c +Merge made by the 'recursive' strategy. + fs/btrfs/compression.c | 21 ++- + fs/btrfs/ctree.h | 15 +- + fs/btrfs/delayed-inode.c | 50 ++++-- + fs/btrfs/disk-io.c | 12 +- + fs/btrfs/extent-tree.c | 49 +++--- + fs/btrfs/extent_map.c | 3 + + fs/btrfs/file.c | 15 +- + fs/btrfs/free-space-cache.c | 2 +- + fs/btrfs/inode-map.c | 4 +- + fs/btrfs/inode.c | 27 ++-- + fs/btrfs/ioctl.c | 30 +++- + fs/btrfs/ordered-data.c | 2 +- + fs/btrfs/props.c | 2 +- + fs/btrfs/qgroup.c | 351 ++++++++++++++++++++++++++++++++----------- + fs/btrfs/qgroup.h | 102 ++++++++++++- + fs/btrfs/relocation.c | 9 +- + fs/btrfs/super.c | 3 +- + fs/btrfs/transaction.c | 8 +- + fs/btrfs/tree-checker.c | 149 +++++++++--------- + fs/btrfs/tree-checker.h | 7 +- + fs/btrfs/zstd.c | 19 ++- + include/trace/events/btrfs.h | 108 ++++++++++++- + 22 files changed, 713 insertions(+), 275 deletions(-) +Merging ceph/master (16515a6d5418 ceph: improving efficiency of syncfs) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + drivers/block/rbd.c | 22 ++----- + fs/ceph/addr.c | 28 +++++--- + fs/ceph/caps.c | 170 ++++++++++++++++++++++++++++++++++--------------- + fs/ceph/dir.c | 79 +++++++++++++---------- + fs/ceph/file.c | 12 +++- + fs/ceph/inode.c | 56 ++++++++++++---- + fs/ceph/mds_client.c | 33 +++++++--- + fs/ceph/mds_client.h | 3 + + fs/ceph/snap.c | 8 ++- + fs/ceph/super.h | 53 ++++++++++++++- + net/ceph/ceph_common.c | 4 ++ + 11 files changed, 323 insertions(+), 145 deletions(-) +Merging cifs/for-next (5f60a56494ea Add missing structs and defines from recent SMB3.1.1 documentation) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifs_debug.c | 9 +++- + fs/cifs/cifssmb.c | 4 +- + fs/cifs/smb2pdu.h | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++- + fs/cifs/smbdirect.c | 16 ++++---- + 4 files changed, 130 insertions(+), 13 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 (f463589a7cd2 ext2: drop unneeded newline) +$ git merge ext3/for_next +Auto-merging fs/ext2/super.c +Merge made by the 'recursive' strategy. + fs/ext2/super.c | 2 +- + fs/udf/udftime.c | 5 +++++ + 2 files changed, 6 insertions(+), 1 deletion(-) +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 (e231c6879cfd NFS: Fix a race between mmap() and O_DIRECT) +$ 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 f01e928990fc] Merge remote-tracking branch 'nfs-anna/linux-next' +$ git diff -M --stat --summary HEAD^.. +Merging nfsd/nfsd-next (3ac71a649c3d nfsd: store stat times in fill_pre_wcc() instead of inode times) +$ git merge nfsd/nfsd-next +Resolved 'fs/nfsd/nfsfh.h' using previous resolution. +Auto-merging net/sunrpc/svcsock.c +Auto-merging fs/nfsd/nfsfh.h +CONFLICT (content): Merge conflict in fs/nfsd/nfsfh.h +Auto-merging fs/locks.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 905edca83979] Merge remote-tracking branch 'nfsd/nfsd-next' +$ git diff -M --stat --summary HEAD^.. + fs/locks.c | 6 +- + fs/nfsd/nfs3proc.c | 18 ++++- + fs/nfsd/nfs3xdr.c | 98 ++++++++++++-------------- + fs/nfsd/nfs4proc.c | 46 +++++------- + fs/nfsd/nfs4state.c | 6 +- + fs/nfsd/nfs4xdr.c | 24 +++++-- + fs/nfsd/nfsfh.h | 28 ++------ + fs/nfsd/nfsproc.c | 23 +++--- + fs/nfsd/nfsxdr.c | 64 ++++++++--------- + fs/nfsd/xdr.h | 3 +- + fs/nfsd/xdr3.h | 3 +- + fs/nfsd/xdr4.h | 3 +- + include/linux/sunrpc/svc.h | 4 ++ + include/linux/sunrpc/svc_rdma.h | 2 - + net/sunrpc/svc.c | 109 +++++++++++++++++++++++++++++ + net/sunrpc/svcsock.c | 14 ---- + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 5 -- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 9 +-- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 6 -- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 25 ++----- + 20 files changed, 282 insertions(+), 214 deletions(-) +Merging orangefs/for-next (74e938c22705 orangefs: reverse sense of is-inode-stale test in d_revalidate) +$ git merge orangefs/for-next +Auto-merging fs/orangefs/super.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 +- + fs/orangefs/dcache.c | 19 ++++----- + fs/orangefs/namei.c | 16 ++++---- + fs/orangefs/orangefs-debugfs.c | 4 +- + fs/orangefs/orangefs-debugfs.h | 1 - + fs/orangefs/orangefs-kernel.h | 10 +---- + fs/orangefs/orangefs-utils.c | 93 +++++++++++++++++++++++------------------- + fs/orangefs/protocol.h | 15 ------- + fs/orangefs/super.c | 8 ++-- + 9 files changed, 76 insertions(+), 93 deletions(-) +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 (27f005e635c6 Merge branch 'misc.netdrv' into for-next) +$ git merge vfs/for-next +Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c +Auto-merging drivers/net/ethernet/broadcom/tg3.c +Auto-merging drivers/net/ethernet/broadcom/genet/bcmgenet.c +Auto-merging drivers/net/ethernet/broadcom/bnx2.c +Auto-merging drivers/net/ethernet/broadcom/bcmsysport.c +Merge made by the 'recursive' strategy. + arch/um/drivers/mconsole_kern.c | 3 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 2 +- + drivers/net/ethernet/broadcom/bgmac.h | 6 +- + drivers/net/ethernet/broadcom/bnx2.c | 6 +- + drivers/net/ethernet/broadcom/cnic_if.h | 8 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 +- + drivers/net/ethernet/broadcom/tg3.c | 2 +- + drivers/net/ethernet/brocade/bna/bfa_ioc.c | 26 +++--- + drivers/net/ethernet/brocade/bna/bfa_ioc.h | 4 +- + drivers/net/ethernet/brocade/bna/bfi.h | 94 ++++++++++----------- + drivers/net/ethernet/brocade/bna/bfi_enet.h | 96 +++++++++++----------- + drivers/net/ethernet/brocade/bna/bna.h | 2 +- + drivers/net/ethernet/brocade/bna/bna_enet.c | 6 +- + drivers/net/ethernet/brocade/bna/bna_hw_defs.h | 34 ++++---- + drivers/net/ethernet/brocade/bna/bna_tx_rx.c | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac-anarion.c | 10 +-- + drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 9 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- + drivers/net/ethernet/via/via-rhine.c | 2 +- + drivers/net/ethernet/via/via-velocity.c | 15 ++-- + drivers/net/wireless/cisco/airo.c | 4 +- + fs/kernfs/file.c | 2 +- + fs/seq_file.c | 5 +- + 23 files changed, 175 insertions(+), 169 deletions(-) +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 (c472c07bfed9 iversion: Rename make inode_cmp_iversion{+raw} to inode_eq_iversion{+raw}) +$ git merge iversion/iversion-next +Auto-merging fs/ext4/inline.c +Merge made by the 'recursive' strategy. + fs/affs/dir.c | 2 +- + fs/exofs/dir.c | 2 +- + fs/ext2/dir.c | 2 +- + fs/ext4/dir.c | 4 ++-- + fs/ext4/inline.c | 2 +- + fs/fat/namei_vfat.c | 2 +- + fs/nfs/inode.c | 6 +++--- + fs/ocfs2/dir.c | 4 ++-- + fs/ufs/dir.c | 2 +- + include/linux/iversion.h | 22 +++++++++++----------- + security/integrity/ima/ima_main.c | 2 +- + 11 files changed, 25 insertions(+), 25 deletions(-) +Merging printk/for-next (bb4f552a598d Merge branch 'for-4.16-console-waiter-logic' into for-4.16) +$ git merge printk/for-next +Already up to date. +Merging pci/next (ab8c609356fb Merge branch 'pci/spdx' into next) +$ 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 34d4d7776692] 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 (6fbc4232a5ac hwmon: (dell-smm) Disable fan support for Dell Vostro 3360) +$ git merge hwmon-staging/hwmon-next +Already up to date. +Merging jc_docs/docs-next (54e36a2dc554 Documentation/admin-guide: fixes for thunderbolt.rst) +$ git merge jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (273caa260035 media: v4l2-compat-ioctl32.c: make ctrl_is_pointer work for subdevs) +$ git merge v4l-dvb/master +Already up to date. +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 (e4e30a1114b8 Merge branches 'pm-cpufreq', 'pm-domains' and 'pm-sleep' into linux-next) +$ git merge pm/linux-next +Auto-merging include/linux/serial_core.h +Auto-merging include/linux/acpi.h +Auto-merging drivers/pci/hotplug/acpiphp_ibm.c +Removing drivers/cpufreq/at32ap-cpufreq.c +Auto-merging drivers/acpi/processor_idle.c +Auto-merging drivers/acpi/bus.c +Auto-merging drivers/acpi/Kconfig +Auto-merging arch/x86/kernel/apm_32.c +Auto-merging arch/arm64/kernel/acpi.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 9 +- + Documentation/cpu-freq/cpu-drivers.txt | 4 + + arch/arm64/kernel/acpi.c | 4 +- + arch/x86/kernel/acpi/boot.c | 3 + + arch/x86/kernel/apm_32.c | 1 + + drivers/acpi/Kconfig | 7 +- + drivers/acpi/acpi_video.c | 2 +- + drivers/acpi/acpica/acapps.h | 4 +- + drivers/acpi/acpica/accommon.h | 2 +- + drivers/acpi/acpica/acconvert.h | 2 +- + drivers/acpi/acpica/acdebug.h | 2 +- + drivers/acpi/acpica/acdispat.h | 2 +- + drivers/acpi/acpica/acevents.h | 2 +- + drivers/acpi/acpica/acglobal.h | 2 +- + drivers/acpi/acpica/achware.h | 2 +- + drivers/acpi/acpica/acinterp.h | 2 +- + drivers/acpi/acpica/aclocal.h | 2 +- + drivers/acpi/acpica/acmacros.h | 2 +- + drivers/acpi/acpica/acnamesp.h | 2 +- + drivers/acpi/acpica/acobject.h | 2 +- + drivers/acpi/acpica/acopcode.h | 2 +- + drivers/acpi/acpica/acparser.h | 2 +- + drivers/acpi/acpica/acpredef.h | 2 +- + drivers/acpi/acpica/acresrc.h | 2 +- + drivers/acpi/acpica/acstruct.h | 2 +- + drivers/acpi/acpica/actables.h | 2 +- + drivers/acpi/acpica/acutils.h | 2 +- + drivers/acpi/acpica/amlcode.h | 2 +- + drivers/acpi/acpica/amlresrc.h | 2 +- + drivers/acpi/acpica/dbcmds.c | 2 +- + drivers/acpi/acpica/dbconvert.c | 2 +- + drivers/acpi/acpica/dbdisply.c | 2 +- + drivers/acpi/acpica/dbexec.c | 2 +- + drivers/acpi/acpica/dbfileio.c | 2 +- + drivers/acpi/acpica/dbhistry.c | 2 +- + drivers/acpi/acpica/dbinput.c | 2 +- + drivers/acpi/acpica/dbmethod.c | 2 +- + drivers/acpi/acpica/dbnames.c | 2 +- + drivers/acpi/acpica/dbobject.c | 2 +- + drivers/acpi/acpica/dbstats.c | 2 +- + drivers/acpi/acpica/dbtest.c | 2 +- + drivers/acpi/acpica/dbutils.c | 2 +- + drivers/acpi/acpica/dbxface.c | 2 +- + drivers/acpi/acpica/dsargs.c | 2 +- + drivers/acpi/acpica/dscontrol.c | 2 +- + drivers/acpi/acpica/dsdebug.c | 2 +- + drivers/acpi/acpica/dsfield.c | 2 +- + drivers/acpi/acpica/dsinit.c | 2 +- + drivers/acpi/acpica/dsmethod.c | 2 +- + drivers/acpi/acpica/dsmthdat.c | 2 +- + drivers/acpi/acpica/dsobject.c | 2 +- + drivers/acpi/acpica/dsopcode.c | 2 +- + drivers/acpi/acpica/dspkginit.c | 2 +- + drivers/acpi/acpica/dsutils.c | 2 +- + drivers/acpi/acpica/dswexec.c | 2 +- + drivers/acpi/acpica/dswload.c | 2 +- + drivers/acpi/acpica/dswload2.c | 2 +- + drivers/acpi/acpica/dswscope.c | 2 +- + drivers/acpi/acpica/dswstate.c | 2 +- + drivers/acpi/acpica/evevent.c | 2 +- + drivers/acpi/acpica/evglock.c | 2 +- + drivers/acpi/acpica/evgpe.c | 2 +- + drivers/acpi/acpica/evgpeblk.c | 2 +- + drivers/acpi/acpica/evgpeinit.c | 2 +- + drivers/acpi/acpica/evgpeutil.c | 2 +- + drivers/acpi/acpica/evhandler.c | 2 +- + drivers/acpi/acpica/evmisc.c | 2 +- + drivers/acpi/acpica/evregion.c | 2 +- + drivers/acpi/acpica/evrgnini.c | 2 +- + drivers/acpi/acpica/evsci.c | 2 +- + drivers/acpi/acpica/evxface.c | 2 +- + drivers/acpi/acpica/evxfevnt.c | 2 +- + drivers/acpi/acpica/evxfgpe.c | 2 +- + drivers/acpi/acpica/evxfregn.c | 2 +- + drivers/acpi/acpica/exconcat.c | 2 +- + drivers/acpi/acpica/exconfig.c | 2 +- + drivers/acpi/acpica/exconvrt.c | 2 +- + drivers/acpi/acpica/excreate.c | 2 +- + drivers/acpi/acpica/exdebug.c | 2 +- + drivers/acpi/acpica/exdump.c | 2 +- + drivers/acpi/acpica/exfield.c | 2 +- + drivers/acpi/acpica/exfldio.c | 2 +- + drivers/acpi/acpica/exmisc.c | 2 +- + drivers/acpi/acpica/exmutex.c | 2 +- + drivers/acpi/acpica/exnames.c | 2 +- + drivers/acpi/acpica/exoparg1.c | 2 +- + drivers/acpi/acpica/exoparg2.c | 2 +- + drivers/acpi/acpica/exoparg3.c | 2 +- + drivers/acpi/acpica/exoparg6.c | 2 +- + drivers/acpi/acpica/exprep.c | 2 +- + drivers/acpi/acpica/exregion.c | 2 +- + drivers/acpi/acpica/exresnte.c | 2 +- + drivers/acpi/acpica/exresolv.c | 2 +- + drivers/acpi/acpica/exresop.c | 2 +- + drivers/acpi/acpica/exstore.c | 2 +- + drivers/acpi/acpica/exstoren.c | 2 +- + drivers/acpi/acpica/exstorob.c | 2 +- + drivers/acpi/acpica/exsystem.c | 2 +- + drivers/acpi/acpica/extrace.c | 2 +- + drivers/acpi/acpica/exutils.c | 2 +- + drivers/acpi/acpica/hwacpi.c | 2 +- + drivers/acpi/acpica/hwesleep.c | 2 +- + drivers/acpi/acpica/hwgpe.c | 2 +- + drivers/acpi/acpica/hwpci.c | 2 +- + drivers/acpi/acpica/hwregs.c | 2 +- + drivers/acpi/acpica/hwsleep.c | 2 +- + drivers/acpi/acpica/hwtimer.c | 2 +- + drivers/acpi/acpica/hwvalid.c | 2 +- + drivers/acpi/acpica/hwxface.c | 2 +- + drivers/acpi/acpica/hwxfsleep.c | 2 +- + drivers/acpi/acpica/nsaccess.c | 2 +- + drivers/acpi/acpica/nsalloc.c | 2 +- + drivers/acpi/acpica/nsarguments.c | 2 +- + drivers/acpi/acpica/nsconvert.c | 2 +- + drivers/acpi/acpica/nsdump.c | 2 +- + drivers/acpi/acpica/nsdumpdv.c | 2 +- + drivers/acpi/acpica/nseval.c | 2 +- + drivers/acpi/acpica/nsinit.c | 2 +- + drivers/acpi/acpica/nsload.c | 2 +- + drivers/acpi/acpica/nsnames.c | 2 +- + drivers/acpi/acpica/nsobject.c | 2 +- + drivers/acpi/acpica/nsparse.c | 2 +- + drivers/acpi/acpica/nspredef.c | 2 +- + drivers/acpi/acpica/nsprepkg.c | 2 +- + drivers/acpi/acpica/nsrepair.c | 2 +- + drivers/acpi/acpica/nsrepair2.c | 2 +- + drivers/acpi/acpica/nssearch.c | 2 +- + drivers/acpi/acpica/nsutils.c | 2 +- + drivers/acpi/acpica/nswalk.c | 2 +- + drivers/acpi/acpica/nsxfeval.c | 2 +- + drivers/acpi/acpica/nsxfname.c | 2 +- + drivers/acpi/acpica/nsxfobj.c | 2 +- + drivers/acpi/acpica/psargs.c | 2 +- + drivers/acpi/acpica/psloop.c | 2 +- + drivers/acpi/acpica/psobject.c | 2 +- + drivers/acpi/acpica/psopcode.c | 2 +- + drivers/acpi/acpica/psopinfo.c | 2 +- + drivers/acpi/acpica/psparse.c | 2 +- + drivers/acpi/acpica/psscope.c | 2 +- + drivers/acpi/acpica/pstree.c | 2 +- + drivers/acpi/acpica/psutils.c | 2 +- + drivers/acpi/acpica/pswalk.c | 2 +- + drivers/acpi/acpica/psxface.c | 2 +- + drivers/acpi/acpica/rsaddr.c | 2 +- + drivers/acpi/acpica/rscalc.c | 2 +- + drivers/acpi/acpica/rscreate.c | 2 +- + drivers/acpi/acpica/rsdump.c | 2 +- + drivers/acpi/acpica/rsdumpinfo.c | 2 +- + drivers/acpi/acpica/rsinfo.c | 2 +- + drivers/acpi/acpica/rsio.c | 2 +- + drivers/acpi/acpica/rsirq.c | 2 +- + drivers/acpi/acpica/rslist.c | 2 +- + drivers/acpi/acpica/rsmemory.c | 2 +- + drivers/acpi/acpica/rsmisc.c | 2 +- + drivers/acpi/acpica/rsserial.c | 2 +- + drivers/acpi/acpica/rsutils.c | 2 +- + drivers/acpi/acpica/rsxface.c | 2 +- + drivers/acpi/acpica/tbdata.c | 2 +- + drivers/acpi/acpica/tbfadt.c | 2 +- + drivers/acpi/acpica/tbfind.c | 2 +- + drivers/acpi/acpica/tbinstal.c | 2 +- + drivers/acpi/acpica/tbprint.c | 2 +- + drivers/acpi/acpica/tbutils.c | 2 +- + drivers/acpi/acpica/tbxface.c | 2 +- + drivers/acpi/acpica/tbxfload.c | 2 +- + drivers/acpi/acpica/tbxfroot.c | 2 +- + drivers/acpi/acpica/utaddress.c | 2 +- + drivers/acpi/acpica/utalloc.c | 2 +- + drivers/acpi/acpica/utascii.c | 2 +- + drivers/acpi/acpica/utbuffer.c | 2 +- + drivers/acpi/acpica/utcache.c | 2 +- + drivers/acpi/acpica/utcopy.c | 2 +- + drivers/acpi/acpica/utdebug.c | 2 +- + drivers/acpi/acpica/utdecode.c | 2 +- + drivers/acpi/acpica/utdelete.c | 2 +- + drivers/acpi/acpica/uterror.c | 2 +- + drivers/acpi/acpica/uteval.c | 2 +- + drivers/acpi/acpica/utexcep.c | 2 +- + drivers/acpi/acpica/utglobal.c | 2 +- + drivers/acpi/acpica/uthex.c | 2 +- + drivers/acpi/acpica/utids.c | 2 +- + drivers/acpi/acpica/utinit.c | 2 +- + drivers/acpi/acpica/utlock.c | 2 +- + drivers/acpi/acpica/utmath.c | 2 +- + drivers/acpi/acpica/utmisc.c | 2 +- + drivers/acpi/acpica/utmutex.c | 2 +- + drivers/acpi/acpica/utnonansi.c | 2 +- + drivers/acpi/acpica/utobject.c | 2 +- + drivers/acpi/acpica/utosi.c | 2 +- + drivers/acpi/acpica/utownerid.c | 2 +- + drivers/acpi/acpica/utpredef.c | 2 +- + drivers/acpi/acpica/utprint.c | 2 +- + drivers/acpi/acpica/utresdecode.c | 2 +- + drivers/acpi/acpica/utresrc.c | 2 +- + drivers/acpi/acpica/utstate.c | 2 +- + drivers/acpi/acpica/utstring.c | 2 +- + drivers/acpi/acpica/utstrsuppt.c | 2 +- + drivers/acpi/acpica/utstrtoul64.c | 2 +- + drivers/acpi/acpica/uttrack.c | 2 +- + drivers/acpi/acpica/utuuid.c | 2 +- + drivers/acpi/acpica/utxface.c | 2 +- + drivers/acpi/acpica/utxferror.c | 2 +- + drivers/acpi/acpica/utxfinit.c | 2 +- + drivers/acpi/acpica/utxfmutex.c | 2 +- + drivers/acpi/battery.c | 16 +++ + drivers/acpi/bus.c | 45 ++++++-- + drivers/acpi/cppc_acpi.c | 2 +- + drivers/acpi/osl.c | 2 +- + drivers/acpi/processor_idle.c | 3 + + drivers/acpi/processor_perflib.c | 2 +- + drivers/acpi/sbshc.c | 4 +- + drivers/acpi/scan.c | 20 +++- + drivers/acpi/spcr.c | 29 ++--- + drivers/acpi/tables.c | 3 +- + drivers/base/power/domain.c | 76 +++++++----- + drivers/cpufreq/Kconfig | 10 -- + drivers/cpufreq/Makefile | 1 - + drivers/cpufreq/amd_freq_sensitivity.c | 11 +- + drivers/cpufreq/at32ap-cpufreq.c | 127 --------------------- + drivers/cpufreq/cpufreq.c | 3 + + drivers/cpufreq/exynos5440-cpufreq.c | 7 +- + drivers/cpufreq/freq_table.c | 8 +- + drivers/cpufreq/imx6q-cpufreq.c | 1 + + drivers/cpufreq/intel_pstate.c | 5 + + drivers/cpufreq/longhaul.c | 4 +- + drivers/cpufreq/pasemi-cpufreq.c | 6 +- + drivers/cpufreq/scpi-cpufreq.c | 6 +- + drivers/pci/hotplug/acpiphp_ibm.c | 5 +- + drivers/sh/clk/core.c | 5 +- + drivers/staging/irda/drivers/sh_sir.c | 4 +- + drivers/tty/serial/earlycon.c | 15 +-- + include/acpi/acbuffer.h | 2 +- + include/acpi/acconfig.h | 2 +- + include/acpi/acexcep.h | 2 +- + include/acpi/acnames.h | 2 +- + include/acpi/acoutput.h | 2 +- + include/acpi/acpi.h | 2 +- + include/acpi/acpiosxf.h | 2 +- + include/acpi/acpixf.h | 4 +- + include/acpi/acrestyp.h | 2 +- + include/acpi/actbl.h | 2 +- + include/acpi/actbl1.h | 2 +- + include/acpi/actbl2.h | 2 +- + include/acpi/actbl3.h | 2 +- + include/acpi/actypes.h | 12 +- + include/acpi/acuuid.h | 2 +- + include/acpi/platform/acenv.h | 2 +- + include/acpi/platform/acenvex.h | 2 +- + include/acpi/platform/acgcc.h | 2 +- + include/acpi/platform/acgccex.h | 2 +- + include/acpi/platform/acintel.h | 2 +- + include/acpi/platform/aclinux.h | 4 +- + include/acpi/platform/aclinuxex.h | 2 +- + include/linux/acpi.h | 7 +- + include/linux/cpufreq.h | 125 ++++++++++++-------- + include/linux/serial_core.h | 4 +- + tools/power/acpi/common/cmfsize.c | 2 +- + tools/power/acpi/common/getopt.c | 2 +- + .../acpi/os_specific/service_layers/oslinuxtbl.c | 2 +- + .../acpi/os_specific/service_layers/osunixdir.c | 2 +- + .../acpi/os_specific/service_layers/osunixmap.c | 2 +- + .../acpi/os_specific/service_layers/osunixxf.c | 2 +- + tools/power/acpi/tools/acpidump/acpidump.h | 2 +- + tools/power/acpi/tools/acpidump/apdump.c | 2 +- + tools/power/acpi/tools/acpidump/apfiles.c | 2 +- + tools/power/acpi/tools/acpidump/apmain.c | 2 +- + 266 files changed, 533 insertions(+), 527 deletions(-) + delete mode 100644 drivers/cpufreq/at32ap-cpufreq.c +Merging cpupower/cpupower (0e96a0c83f08 cpupower: Remove FSF address) +$ 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 (e856f078bcf1 OPP: Introduce "required-opp" property) +$ 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 (617aebe6a97e Merge tag 'usercopy-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux) +$ git merge net-next/master +Already up to date. +Merging bpf-next/master (617aebe6a97e Merge tag 'usercopy-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux) +$ git merge bpf-next/master +Already up to date. +Merging ipsec-next/master (255442c93843 Merge tag 'docs-4.16' of git://git.lwn.net/linux) +$ git merge ipsec-next/master +Already up to date. +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 (c713fb071edc rtlwifi: rtl8821ae: Fix connection lost problem correctly) +$ git merge wireless-drivers-next/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/mediatek/mt76/agg-rx.c | 40 ++++++++++++++++- + drivers/net/wireless/mediatek/mt76/mac80211.c | 52 +++++++++++++++++++++- + drivers/net/wireless/mediatek/mt76/mt76.h | 10 +++++ + drivers/net/wireless/mediatek/mt76/mt76x2.h | 2 + + drivers/net/wireless/mediatek/mt76/mt76x2_init.c | 1 + + drivers/net/wireless/mediatek/mt76/mt76x2_mac.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x2_main.c | 28 ++++++------ + .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 5 ++- + drivers/net/wireless/realtek/rtlwifi/wifi.h | 1 + + 9 files changed, 121 insertions(+), 20 deletions(-) +Merging bluetooth/master (617aebe6a97e Merge tag 'usercopy-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux) +$ git merge bluetooth/master +Already up to date. +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 (03ecdd2dcf39 net/mlx5: increase async EQ to avoid EQ overrun) +$ git merge rdma/for-next +Already up to date. +Merging gfs2/for-next (35277995e179 Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge gfs2/for-next +Already up to date. +Merging mtd/master (fee4380f368e mtd: nand: pxa3xx: Fix READOOB implementation) +$ git merge mtd/master +Already up to date. +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 (f4c6cd1a7f22 mtd: nand: sunxi: Fix ECC strength choice) +$ git merge nand/nand/next +Already up to date. +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 +Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/device/base.c +Auto-merging drivers/gpu/drm/i915/gvt/kvmgt.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 32 +- + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 6 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 1 - + drivers/gpu/drm/i915/gvt/cfg_space.c | 15 +- + drivers/gpu/drm/i915/gvt/dmabuf.c | 1 - + drivers/gpu/drm/i915/gvt/execlist.c | 22 +- + drivers/gpu/drm/i915/gvt/gtt.c | 24 +- + drivers/gpu/drm/i915/gvt/gvt.h | 6 +- + drivers/gpu/drm/i915/gvt/handlers.c | 10 +- + drivers/gpu/drm/i915/gvt/hypercall.h | 1 + + drivers/gpu/drm/i915/gvt/kvmgt.c | 52 +- + drivers/gpu/drm/i915/gvt/mmio.c | 42 - + drivers/gpu/drm/i915/gvt/mmio_context.c | 10 +- + drivers/gpu/drm/i915/gvt/mpt.h | 17 + + drivers/gpu/drm/i915/gvt/opregion.c | 98 +- + drivers/gpu/drm/i915/gvt/sched_policy.c | 21 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 19 +- + drivers/gpu/drm/i915/gvt/scheduler.h | 1 + + drivers/gpu/drm/i915/gvt/vgpu.c | 5 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 10 +- + drivers/gpu/drm/i915/i915_drv.c | 2 + + drivers/gpu/drm/i915/i915_drv.h | 6 +- + drivers/gpu/drm/i915/i915_gem.c | 9 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 61 +- + drivers/gpu/drm/i915/i915_gem_request.c | 2 + + drivers/gpu/drm/i915/i915_gem_shrinker.c | 4 +- + drivers/gpu/drm/i915/i915_pci.c | 94 +- + drivers/gpu/drm/i915/i915_reg.h | 2 + + drivers/gpu/drm/i915/intel_audio.c | 2 +- + drivers/gpu/drm/i915/intel_bios.c | 20 +- + drivers/gpu/drm/i915/intel_breadcrumbs.c | 11 - + drivers/gpu/drm/i915/intel_cdclk.c | 22 +- + drivers/gpu/drm/i915/intel_display.c | 6 +- + drivers/gpu/drm/i915/intel_dp_link_training.c | 26 +- + drivers/gpu/drm/i915/intel_engine_cs.c | 16 +- + drivers/gpu/drm/i915/intel_guc_fw.c | 9 - + drivers/gpu/drm/i915/intel_hangcheck.c | 7 +- + drivers/gpu/drm/i915/intel_hdmi.c | 14 +- + drivers/gpu/drm/i915/intel_huc.c | 11 - + drivers/gpu/drm/i915/intel_pm.c | 6 +- + drivers/gpu/drm/i915/intel_uc.c | 2 - + drivers/gpu/drm/i915/intel_vbt_defs.h | 2 + + drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h | 1 + + .../gpu/drm/nouveau/include/nvkm/subdev/secboot.h | 1 + + .../gpu/drm/nouveau/include/nvkm/subdev/therm.h | 17 + + drivers/gpu/drm/nouveau/nouveau_bo.h | 28 + + drivers/gpu/drm/nouveau/nouveau_crtc.h | 1 - + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 22 +- + drivers/gpu/drm/nouveau/nv50_display.c | 189 ++-- + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 30 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c | 207 ++++ + drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.h | 55 ++ + drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c | 155 +++ + drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/falcon/msgqueue.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c | 9 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.c | 6 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.c | 47 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.h | 35 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk110.c | 71 ++ + drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h | 2 + + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c | 2 +- + .../drm/nouveau/nvkm/subdev/pmu/fuc/gf100.fuc3.h | 746 +++++++-------- + .../drm/nouveau/nvkm/subdev/pmu/fuc/gk208.fuc5.h | 802 ++++++++-------- + .../drm/nouveau/nvkm/subdev/pmu/fuc/gt215.fuc3.h | 1006 ++++++++++---------- + .../gpu/drm/nouveau/nvkm/subdev/pmu/fuc/memx.fuc | 30 +- + drivers/gpu/drm/nouveau/nvkm/subdev/secboot/Kbuild | 2 + + drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr.h | 1 + + .../gpu/drm/nouveau/nvkm/subdev/secboot/acr_r370.c | 144 +++ + .../gpu/drm/nouveau/nvkm/subdev/secboot/acr_r370.h | 49 + + .../gpu/drm/nouveau/nvkm/subdev/secboot/acr_r375.c | 93 +- + .../gpu/drm/nouveau/nvkm/subdev/secboot/gp102.c | 2 +- + .../gpu/drm/nouveau/nvkm/subdev/secboot/gp108.c | 67 ++ + drivers/gpu/drm/nouveau/nvkm/subdev/secboot/priv.h | 2 + + drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild | 2 + + drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c | 70 +- + drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf100.c | 58 ++ + drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf100.h | 35 + + drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf119.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.c | 136 +++ + drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.h | 48 + + drivers/gpu/drm/nouveau/nvkm/subdev/therm/gt215.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/therm/priv.h | 21 +- + drivers/gpu/drm/radeon/radeon_uvd.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 3 +- + 90 files changed, 3168 insertions(+), 1788 deletions(-) + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk110.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r370.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r370.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gp108.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf100.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf100.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.h +Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD) +$ git merge drm-panel/drm/panel/for-next +Already up to date. +Merging drm-intel/for-linux-next (6dd3104e7894 drm/i915/bios: add DP max link rate to VBT child device struct) +$ git merge drm-intel/for-linux-next +Already up to date. +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 (51f55992d13b drm/msm/adreno: Use generic function to load firmware to a buffer object) +$ git merge drm-msm/msm-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/display/msm/dsi.txt | 26 +- + drivers/gpu/drm/msm/Kconfig | 20 + + drivers/gpu/drm/msm/Makefile | 4 + + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 8 +- + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 8 +- + drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 185 +++++ + 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 | 52 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 14 +- + drivers/gpu/drm/msm/dsi/dsi.c | 22 +- + 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 | 38 +- + 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/mdp/mdp4/mdp4_crtc.c | 6 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 2 +- + drivers/gpu/drm/msm/msm_debugfs.c | 5 +- + drivers/gpu/drm/msm/msm_drv.c | 8 +- + drivers/gpu/drm/msm/msm_fb.c | 6 +- + drivers/gpu/drm/msm/msm_gem.c | 12 +- + 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 + + 41 files changed, 1791 insertions(+), 154 deletions(-) + create mode 100644 drivers/gpu/drm/msm/adreno/a5xx_debugfs.c + 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 (a181196c86e1 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 (a75de7721184 Merge remote-tracking branches 'regmap/topic/soundwire' and 'regmap/topic/zero' into regmap-next) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (61fcf8ece9b6 ALSA: hda/realtek - Enable Thinkpad Dock device for ALC298 platform) +$ git merge sound/for-next +Already up to date. +Merging sound-asoc/for-next (8639e3c49869 Merge tag 'asoc-v4.16-3' into asoc-next) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. +Merging modules/modules-next (0cad61d7a3d5 modpost: Remove trailing semicolon) +$ git merge modules/modules-next +Auto-merging scripts/mod/modpost.c +Auto-merging kernel/module.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 -- + kernel/module.c | 7 +------ + scripts/mod/modpost.c | 2 +- + 3 files changed, 2 insertions(+), 9 deletions(-) +Merging input/next (10a558374f37 Merge tag 'v4.15' into next) +$ git merge input/next +Already up to date! +Merge made by the 'recursive' strategy. +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 ebba430e1ccc] Merge remote-tracking branch 'device-mapper/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging mmc/next (56174d9a2149 mmc: MMC_SDHI_{SYS,INTERNAL}_DMAC should depend on HAS_DMA) +$ git merge mmc/next +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 (8be4c3667cf1 MAINTAINERS: Add AXP288 PMIC entry) +$ git merge battery/for-next +Already up to date. +Merging regulator/for-next (c8f64f281824 Merge remote-tracking branch 'regulator/fix/suspend' into regulator-linus) +$ git merge regulator/for-next +Already up to date! +Merge made by the 'recursive' strategy. +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 +Recorded preimage for 'security/integrity/ima/ima_main.c' +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 +Recorded resolution for 'security/integrity/ima/ima_main.c'. +[master bf818c4d5491] 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 (4b14752ec4e0 selinux: skip bounded transition processing if the policy isn't loaded) +$ git merge selinux/next +Already up to date. +Merging tpmdd/next (68021bf4734d tpm: remove unused variables) +$ git merge tpmdd/next +Already up to date. +Merging watchdog/master (592a547adf68 documentation: watchdog: remove documentation of w83697hf_wdt/w83697ug_wdt) +$ 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 +Auto-merging drivers/iommu/intel-svm.c +Auto-merging drivers/iommu/intel-iommu.c +Auto-merging drivers/iommu/amd_iommu.c +Merge made by the 'recursive' strategy. + .../bindings/iommu/renesas,ipmmu-vmsa.txt | 3 ++ + drivers/iommu/amd_iommu.c | 24 ++++++++++++---- + drivers/iommu/amd_iommu_types.h | 2 ++ + drivers/iommu/arm-smmu-v3.c | 2 +- + drivers/iommu/arm-smmu.c | 12 ++++---- + drivers/iommu/exynos-iommu.c | 9 +++++- + drivers/iommu/intel-iommu.c | 5 ++-- + drivers/iommu/intel-svm.c | 32 ++++++++++++++++++---- + drivers/iommu/iommu.c | 5 ++++ + drivers/iommu/ipmmu-vmsa.c | 14 ++-------- + drivers/iommu/msm_iommu.c | 16 ++--------- + drivers/iommu/of_iommu.c | 16 ----------- + drivers/iommu/omap-iommu-debug.c | 4 +-- + drivers/iommu/qcom_iommu.c | 2 +- + include/linux/intel-iommu.h | 2 ++ + include/linux/of_iommu.h | 5 +--- + 16 files changed, 83 insertions(+), 70 deletions(-) +Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation) +$ git merge dwmw2-iommu/master +Already up to date. +Merging vfio/next (46ed90f157f4 vfio: mdev: make a couple of functions and structure vfio_mdev_driver static) +$ git merge vfio/next +Already up to date. +Merging trivial/for-next (1972d6c0c86d MAINTAINERS: relinquish kconfig) +$ git merge trivial/for-next +Already up to date. +Merging audit/next (d8a5b80568a9 Linux 4.15) +$ git merge audit/next +Already up to date. +Merging devicetree/for-next (3a6fbcb2e2e4 xtensa: remove arch specific early DT functions) +$ git merge devicetree/for-next +Already up to date. +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 (d0cb047a0edb Merge tag 'spi-v4.16' into spi-next) +$ git merge spi/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging tip/auto-latest (5fbd7b8262bc Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Merge made by the 'recursive' strategy. + arch/x86/entry/calling.h | 19 + + arch/x86/entry/entry_32.S | 3 + + arch/x86/entry/entry_64.S | 22 +- + arch/x86/entry/entry_64_compat.S | 30 + + arch/x86/hyperv/hv_init.c | 123 +- + arch/x86/include/asm/cpufeature.h | 79 +- + arch/x86/include/asm/hardirq.h | 3 + + arch/x86/include/asm/irq_vectors.h | 7 +- + arch/x86/include/asm/mshyperv.h | 32 +- + arch/x86/include/uapi/asm/hyperv.h | 27 + + arch/x86/kernel/cpu/mshyperv.c | 6 + + arch/x86/kernel/irq.c | 9 + + arch/x86/kvm/x86.c | 138 +- + include/linux/trace_events.h | 8 + + include/uapi/linux/perf_event.h | 4 + + kernel/events/core.c | 188 +- + 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 +- + 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 ++ + 61 files changed, 4842 insertions(+), 123 deletions(-) + 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 +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 c1f0004c16f4] 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 (1dfa55e01987 Merge branches 'cond_resched.2017.12.04a', 'dyntick.2017.11.28a', 'fixes.2017.12.11a', 'srbd.2017.12.05a' and 'torture.2017.12.11a' into HEAD) +$ git merge rcu/rcu/next +Already up to date. +Merging kvm/linux-next (8dbfb2bf1bb3 KVM: x86: don't forget vcpu_put() in kvm_arch_vcpu_ioctl_set_sregs()) +$ git merge kvm/linux-next +Resolved 'arch/arm64/include/asm/pgtable-prot.h' using previous resolution. +Resolved 'arch/x86/kvm/svm.c' using previous resolution. +Resolved 'arch/x86/kvm/vmx.c' using previous resolution. +Auto-merging virt/kvm/kvm_main.c +Auto-merging virt/kvm/arm/mmu.c +Auto-merging virt/kvm/arm/arm.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx.c +CONFLICT (content): Merge conflict in arch/x86/kvm/vmx.c +Auto-merging arch/x86/kvm/svm.c +CONFLICT (content): Merge conflict in arch/x86/kvm/svm.c +Auto-merging arch/x86/kvm/cpuid.c +Auto-merging arch/powerpc/kvm/book3s_xive.c +Auto-merging arch/powerpc/kvm/book3s_hv_rmhandlers.S +Auto-merging arch/powerpc/kvm/book3s_hv.c +Auto-merging arch/powerpc/kernel/asm-offsets.c +Auto-merging arch/powerpc/include/asm/xive.h +Auto-merging arch/powerpc/include/asm/opal-api.h +Auto-merging arch/arm64/mm/cache.S +Auto-merging arch/arm64/kvm/hyp/switch.c +Auto-merging arch/arm64/include/asm/pgtable-prot.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/pgtable-prot.h +Auto-merging arch/arm64/include/asm/pgtable-hwdef.h +Auto-merging arch/arm64/include/asm/kvm_mmu.h +Auto-merging arch/arm64/include/asm/kvm_host.h +Auto-merging arch/arm64/include/asm/assembler.h +Auto-merging arch/arm/include/asm/kvm_mmu.h +Auto-merging arch/arm/include/asm/kvm_host.h +Auto-merging MAINTAINERS +Removing Documentation/virtual/kvm/arm/vgic-mapped-irqs.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b0eb07d276b3] Merge remote-tracking branch 'kvm/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/virtual/kvm/00-INDEX | 3 + + .../virtual/kvm/amd-memory-encryption.rst | 247 ++++ + Documentation/virtual/kvm/api.txt | 54 +- + Documentation/virtual/kvm/arm/vgic-mapped-irqs.txt | 187 --- + Documentation/virtual/kvm/cpuid.txt | 4 + + MAINTAINERS | 5 +- + arch/arm/include/asm/kvm_emulate.h | 2 +- + arch/arm/include/asm/kvm_host.h | 2 + + arch/arm/include/asm/kvm_hyp.h | 3 +- + arch/arm/include/asm/kvm_mmu.h | 99 +- + arch/arm/include/asm/pgtable.h | 4 +- + arch/arm/kvm/hyp/switch.c | 1 + + arch/arm/kvm/hyp/tlb.c | 1 + + arch/arm64/include/asm/assembler.h | 21 + + arch/arm64/include/asm/cacheflush.h | 7 + + arch/arm64/include/asm/kvm_host.h | 2 + + arch/arm64/include/asm/kvm_hyp.h | 1 - + arch/arm64/include/asm/kvm_mmu.h | 36 +- + arch/arm64/include/asm/pgtable-hwdef.h | 2 + + arch/arm64/include/asm/pgtable-prot.h | 4 +- + arch/arm64/kvm/guest.c | 15 +- + arch/arm64/kvm/hyp/debug-sr.c | 1 + + arch/arm64/kvm/hyp/switch.c | 1 + + arch/arm64/kvm/hyp/tlb.c | 1 + + arch/arm64/mm/cache.S | 32 +- + arch/mips/kvm/Kconfig | 1 + + arch/mips/kvm/mips.c | 67 +- + arch/powerpc/include/asm/kvm_book3s_64.h | 14 +- + arch/powerpc/include/asm/kvm_host.h | 6 +- + arch/powerpc/include/asm/opal-api.h | 1 + + arch/powerpc/include/asm/xive.h | 3 +- + arch/powerpc/include/uapi/asm/kvm.h | 2 + + arch/powerpc/kernel/asm-offsets.c | 4 + + arch/powerpc/kvm/Kconfig | 1 + + arch/powerpc/kvm/book3s.c | 24 +- + arch/powerpc/kvm/book3s_64_mmu_radix.c | 2 +- + arch/powerpc/kvm/book3s_hv.c | 54 +- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 228 ++-- + arch/powerpc/kvm/book3s_xive.c | 109 +- + arch/powerpc/kvm/book3s_xive.h | 15 +- + arch/powerpc/kvm/booke.c | 51 +- + arch/powerpc/kvm/powerpc.c | 47 +- + arch/powerpc/kvm/timing.c | 3 +- + arch/powerpc/sysdev/xive/native.c | 18 +- + arch/s390/include/asm/bitops.h | 5 + + arch/s390/include/asm/css_chars.h | 4 +- + arch/s390/include/asm/kvm_host.h | 126 +- + arch/s390/include/asm/sclp.h | 1 + + arch/s390/kvm/Kconfig | 1 + + arch/s390/kvm/diag.c | 1 + + arch/s390/kvm/interrupt.c | 288 ++++- + arch/s390/kvm/kvm-s390.c | 209 +++- + arch/s390/kvm/kvm-s390.h | 22 +- + arch/s390/kvm/priv.c | 38 +- + arch/s390/kvm/sigp.c | 18 +- + arch/s390/kvm/vsie.c | 91 +- + arch/s390/mm/gmap.c | 44 +- + arch/x86/include/asm/cpufeatures.h | 1 + + arch/x86/include/asm/kvm_host.h | 22 +- + arch/x86/include/asm/msr-index.h | 2 + + arch/x86/include/asm/pat.h | 2 + + arch/x86/include/asm/svm.h | 3 + + arch/x86/include/uapi/asm/kvm_para.h | 4 + + arch/x86/kernel/cpu/amd.c | 66 +- + arch/x86/kernel/cpu/scattered.c | 1 + + arch/x86/kernel/kvm.c | 49 +- + arch/x86/kvm/Kconfig | 8 + + arch/x86/kvm/cpuid.c | 22 +- + arch/x86/kvm/emulate.c | 62 +- + arch/x86/kvm/irq.c | 2 +- + arch/x86/kvm/lapic.c | 25 +- + arch/x86/kvm/lapic.h | 4 +- + arch/x86/kvm/mmu.c | 26 +- + arch/x86/kvm/mmu_audit.c | 2 +- + arch/x86/kvm/svm.c | 1199 +++++++++++++++++++- + arch/x86/kvm/vmx.c | 767 +++++++------ + arch/x86/kvm/vmx_shadow_fields.h | 77 ++ + arch/x86/kvm/x86.c | 200 +++- + arch/x86/kvm/x86.h | 33 +- + arch/x86/mm/pat.c | 19 + + drivers/crypto/ccp/Kconfig | 12 + + drivers/crypto/ccp/Makefile | 1 + + drivers/crypto/ccp/psp-dev.c | 805 +++++++++++++ + drivers/crypto/ccp/psp-dev.h | 83 ++ + drivers/crypto/ccp/sp-dev.c | 35 + + drivers/crypto/ccp/sp-dev.h | 28 +- + drivers/crypto/ccp/sp-pci.c | 52 + + drivers/s390/char/sclp_early.c | 3 +- + include/kvm/arm_arch_timer.h | 2 + + include/kvm/arm_vgic.h | 13 +- + include/linux/kvm_host.h | 14 +- + include/linux/psp-sev.h | 606 ++++++++++ + include/uapi/linux/kvm.h | 90 ++ + include/uapi/linux/psp-sev.h | 142 +++ + kernel/configs/kvm_guest.config | 1 + + virt/kvm/Kconfig | 3 + + virt/kvm/arm/arch_timer.c | 138 ++- + virt/kvm/arm/arm.c | 153 ++- + virt/kvm/arm/hyp/vgic-v2-sr.c | 1 + + virt/kvm/arm/mmu.c | 64 +- + virt/kvm/arm/vgic/vgic-its.c | 4 +- + virt/kvm/arm/vgic/vgic-mmio.c | 115 +- + virt/kvm/arm/vgic/vgic-v2.c | 29 + + virt/kvm/arm/vgic/vgic-v3.c | 29 + + virt/kvm/arm/vgic/vgic.c | 41 +- + virt/kvm/arm/vgic/vgic.h | 8 + + virt/kvm/kvm_main.c | 62 +- + 107 files changed, 6019 insertions(+), 1344 deletions(-) + create mode 100644 Documentation/virtual/kvm/amd-memory-encryption.rst + delete mode 100644 Documentation/virtual/kvm/arm/vgic-mapped-irqs.txt + create mode 100644 arch/x86/kvm/vmx_shadow_fields.h + create mode 100644 drivers/crypto/ccp/psp-dev.c + create mode 100644 drivers/crypto/ccp/psp-dev.h + create mode 100644 include/linux/psp-sev.h + create mode 100644 include/uapi/linux/psp-sev.h +Merging kvm-arm/next (cd15d2050c04 KVM: arm/arm64: Fixup userspace irqchip static key optimization) +$ 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 (9b9b13a6d153 KVM: PPC: Book3S HV: Keep XIVE escalation interrupt masked unless ceded) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (4b9f952577fb KVM: s390: introduce the format-1 GISA) +$ git merge kvms390/next +Already up to date. +Merging xen-tip/linux-next (761191258839 pvcalls-back: do not return error on inet_accept EAGAIN) +$ git merge xen-tip/linux-next +Merge made by the 'recursive' strategy. + arch/x86/xen/xen-head.S | 16 ++++++++++++++++ + drivers/net/xen-netfront.c | 46 ++++++++++++++++++++++++---------------------- + drivers/xen/grant-table.c | 4 ++-- + drivers/xen/pvcalls-back.c | 2 +- + 4 files changed, 43 insertions(+), 25 deletions(-) +Merging percpu/for-next (85dcbba3b8b1 percpu: percpu_counter_initialized can be boolean) +$ git merge percpu/for-next +Already up to date. +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 (9a7c551ba7aa platform/x86: samsung-laptop: Re-use DEFINE_SHOW_ATTRIBUTE() macro) +$ git merge drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (d48b8c58c57f platform/chrome: Use proper protocol transfer function) +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. + drivers/platform/chrome/chromeos_laptop.c | 22 ++++++++-------- + drivers/platform/chrome/cros_ec_lpc.c | 44 ++++++++++++++++++++++++++++--- + drivers/platform/chrome/cros_ec_proto.c | 8 +++--- + drivers/platform/chrome/cros_ec_sysfs.c | 2 +- + 4 files changed, 57 insertions(+), 19 deletions(-) +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 (6a836631e303 leds: ledtrig-transient: Add SPDX license identifiers) +$ git merge leds/for-next +Already up to date. +Merging ipmi/for-next (e45af3d372f1 ipmi_ssif: Remove duplicate NULL check) +$ git merge ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (35277995e179 Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (4bf772b14675 Merge tag 'drm-for-v4.16' of git://people.freedesktop.org/~airlied/linux) +$ 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 (e4b227c1ca70 phy: phy-mtk-tphy: use of_device_get_match_data()) +$ git merge phy-next/next +Already up to date. +Merging tty/tty-next (4bf772b14675 Merge tag 'drm-for-v4.16' of git://people.freedesktop.org/~airlied/linux) +$ git merge tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (35277995e179 Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (ca90a64dc671 extcon: axp288: Handle reserved charger-type values better) +$ git merge extcon/extcon-next +Already up to date. +Merging staging/staging-next (35277995e179 Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ 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 (6c773ba2c843 Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging cgroup/for-next (5ecf66c9dc2b Merge branch 'for-4.16' into for-next) +$ git merge cgroup/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging scsi/for-next (7aa28b43b8ff Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/storvsc_drv.c +Removing drivers/scsi/aic7xxx/aiclib.c +Merge made by the 'recursive' strategy. + drivers/message/fusion/mptctl.c | 2 ++ + drivers/scsi/Makefile | 1 - + 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/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/storvsc_drv.c | 5 +++-- + drivers/scsi/sym53c8xx_2/sym_hipd.c | 2 +- + drivers/scsi/ufs/ufshcd.c | 2 ++ + 16 files changed, 32 insertions(+), 69 deletions(-) + delete mode 100644 drivers/scsi/aic7xxx/aiclib.c +Merging scsi-mkp/for-next (16a628faa63c scsi: qla2xxx: Fix incorrect handle for abort IOCB) +$ git merge scsi-mkp/for-next +Already up to date. +Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker) +$ git merge target-updates/for-next +Auto-merging drivers/target/target_core_transport.c +Merge made by the 'recursive' strategy. + drivers/target/iscsi/cxgbit/cxgbit_cm.c | 3 + + drivers/target/iscsi/iscsi_target_auth.c | 3 +- + drivers/target/iscsi/iscsi_target_nego.c | 3 + + drivers/target/loopback/tcm_loop.c | 145 ++--- + drivers/target/sbp/sbp_target.c | 13 +- + drivers/target/target_core_configfs.c | 6 + + drivers/target/target_core_device.c | 4 +- + drivers/target/target_core_fabric_lib.c | 6 +- + drivers/target/target_core_internal.h | 3 +- + drivers/target/target_core_pr.c | 4 +- + drivers/target/target_core_sbc.c | 8 +- + drivers/target/target_core_transport.c | 3 + + drivers/target/target_core_user.c | 983 ++++++++++++++++++++++--------- + include/target/target_core_backend.h | 1 + + include/target/target_core_base.h | 2 + + 15 files changed, 798 insertions(+), 389 deletions(-) +Merging target-bva/for-next (4fbd8d194f06 Linux 4.15-rc1) +$ git merge target-bva/for-next +Already up to date. +Merging libata/for-next (83ab14e6cacc Merge branch 'for-4.16' into for-next) +$ git merge libata/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging vhost/linux-next (96bcd04462b9 virtio-balloon: VIRTIO_BALLOON_F_FREE_PAGE_HINT) +$ git merge vhost/linux-next +Auto-merging mm/page_alloc.c +Auto-merging include/linux/mm.h +Auto-merging drivers/vhost/vhost.h +Auto-merging drivers/vhost/vhost.c +Auto-merging drivers/vhost/net.c +Auto-merging drivers/block/virtio_blk.c +Merge made by the 'recursive' strategy. + drivers/block/virtio_blk.c | 32 ++-- + drivers/firmware/qemu_fw_cfg.c | 4 +- + drivers/misc/mic/vop/vop_main.c | 20 ++- + drivers/vhost/net.c | 2 +- + drivers/vhost/scsi.c | 11 +- + drivers/vhost/test.c | 2 +- + drivers/vhost/vhost.c | 68 ++------- + drivers/vhost/vhost.h | 9 +- + drivers/vhost/vsock.c | 2 +- + drivers/virtio/Kconfig | 8 +- + drivers/virtio/virtio.c | 18 ++- + drivers/virtio/virtio_balloon.c | 259 +++++++++++++++++++++++++++----- + drivers/virtio/virtio_mmio.c | 6 +- + drivers/virtio/virtio_pci_common.c | 8 +- + include/linux/mm.h | 6 + + include/uapi/linux/virtio_balloon.h | 10 +- + mm/page_alloc.c | 96 ++++++++++++ + tools/virtio/ringtest/ring.c | 30 ++-- + tools/virtio/ringtest/virtio_ring_0_9.c | 24 +-- + 19 files changed, 448 insertions(+), 167 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at e8d33446f3e1 Merge remote-tracking branch 'libata/for-next' +Merging next-20180206 version of vhost +$ git merge -m next-20180206/vhost d25cc43c6775bff6b8e3dad97c747954b805e421 +Auto-merging drivers/vhost/vhost.h +Auto-merging drivers/vhost/vhost.c +Auto-merging drivers/vhost/net.c +Auto-merging drivers/block/virtio_blk.c +Merge made by the 'recursive' strategy. + drivers/block/virtio_blk.c | 32 ++++++++-------- + drivers/firmware/qemu_fw_cfg.c | 4 +- + drivers/misc/mic/vop/vop_main.c | 20 ++++++---- + drivers/vhost/net.c | 2 +- + drivers/vhost/scsi.c | 11 +++--- + drivers/vhost/test.c | 2 +- + drivers/vhost/vhost.c | 68 ++++++++------------------------- + drivers/vhost/vhost.h | 9 +---- + drivers/vhost/vsock.c | 2 +- + drivers/virtio/Kconfig | 8 +++- + drivers/virtio/virtio.c | 18 +++++++-- + drivers/virtio/virtio_balloon.c | 4 ++ + drivers/virtio/virtio_mmio.c | 6 +-- + drivers/virtio/virtio_pci_common.c | 8 +++- + include/uapi/linux/virtio_balloon.h | 3 +- + tools/virtio/ringtest/ring.c | 30 ++++++++------- + tools/virtio/ringtest/virtio_ring_0_9.c | 24 +++++++----- + 17 files changed, 120 insertions(+), 131 deletions(-) +Merging rpmsg/for-next (163c558b84fe Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging gpio/for-next (d58f2bf261fd gpio: Timestamp events in hardirq handler) +$ git merge gpio/for-next +Already up to date. +Merging pinctrl/for-next (02e389e63e35 pinctrl: mcp23s08: fix irq setup order) +$ git merge pinctrl/for-next +Already up to date. +Merging pinctrl-samsung/for-next (4fbd8d194f06 Linux 4.15-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 (0e9e327d1622 selftests: vm: update .gitignore with missing generated file) +$ 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 (d8a5b80568a9 Linux 4.15) +$ git merge coresight/next +Already up to date. +Merging rtc/rtc-next (4402be2b4ca7 rtc: remove rtc-at32ap700x) +$ git merge rtc/rtc-next +Already up to date. +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 (0f30aca72c3b eeprom: at24: extend the list of chips supported in DT) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (3b28c987fb95 NTB: ntb_perf: fix cast to restricted __le32) +$ git merge ntb/ntb-next +Already up to date. +Merging kspp/for-next/kspp (531d5f7f5d13 socket: Provide put_cmsg_whitelist() for constant size copies) +$ git merge kspp/for-next/kspp +Auto-merging net/socket.c +Auto-merging net/netlink/af_netlink.c +Auto-merging net/iucv/af_iucv.c +Auto-merging net/core/sock.c +Merge made by the 'recursive' strategy. + include/linux/socket.h | 8 ++++++++ + net/core/sock.c | 4 +--- + net/iucv/af_iucv.c | 5 ++--- + net/netlink/af_netlink.c | 4 ++-- + net/socket.c | 4 ++-- + 5 files changed, 15 insertions(+), 10 deletions(-) +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 (0f2ac581fd9b uapi: fix linux/sysctl.h userspace compilation errors) +$ git merge --no-ff akpm-current/current +Resolved 'kernel/fork.c' using previous resolution. +Auto-merging mm/page_alloc.c +Auto-merging mm/memory_hotplug.c +Auto-merging mm/memory.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 fs/seq_file.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b925067da7bf] 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 | 13 +- + 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, 1567 insertions(+), 839 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: net/netfilter/x_tables.c: remove size check +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 + + 9df46ec25430...52c01169fde7 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (52c01169fde7 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 +++- + net/netfilter/x_tables.c | 4 ---- + 4 files changed, 18 insertions(+), 20 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..f1883a4123fa --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20180208 |