diff options
| -rw-r--r-- | Next/SHA1s | 260 | ||||
| -rw-r--r-- | Next/Trees | 262 | ||||
| -rw-r--r-- | Next/merge.log | 3408 | ||||
| -rw-r--r-- | Next/quilt-import.log | 15 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 3946 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..2414d6233249 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,260 @@ +Name SHA1 +---- ---- +origin fd3b36d275660c905da9900b078eea341847d5e4 +fixes 147a89bc71e7db40f011454a40add7ff2d10f8d8 +kbuild-current 28913ee8191adf4bbc01cbfb9ee18cca782ab141 +arc-current 661e50bc853209e41a5c14a290ca4decc43cbfd1 +arm-current 2a141cd0d83b0fe79be1125272c10a8b93888704 +arm64-fixes e21da1c992007594d391e7b301779cf30f438691 +m68k-current ecd685580c8feb9a91c758257a66355a673594d9 +powerpc-fixes 52396500f97c53860164debc7d4f759077853423 +sparc 17dec0a949153d9ac00760ba2f5b78cb583e995f +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net a2ac99905f1ea8b15997a6ec39af69aa28a3653b +bpf 33491588c1fb2c76ed114a211ad0ee76c16b5a0c +ipsec 4b66af2d6356a00e94bcdea3e7fea324e8b5c6f4 +netfilter 3f1e53abff84cf40b1adb3455d480dd295bf42e8 +ipvs f7fb77fc12352d15180dc3c08ffba10573d5167d +wireless-drivers 77e30e10ee28a53c8af95809866ee8493583e29a +mac80211 b5dbc28762fd3fd40ba76303be0c7f707826f982 +rdma-fixes 84652aefb347297aa08e91e283adf7b18f77c2d5 +sound-current e1a3a981e320a6916b30ff53571ba144274def0e +pci-current fc110ebdd014dd1368c98e7685b47789c31fab42 +driver-core.current 38c23685b273cfb4ccf31a199feccce3bdcb5d83 +tty.current 38c23685b273cfb4ccf31a199feccce3bdcb5d83 +usb.current 38c23685b273cfb4ccf31a199feccce3bdcb5d83 +usb-gadget-fixes c6ba5084ce0d00d4a005b0577d9e764d39b638e1 +usb-serial-fixes 86d71233b615e4c514eddf17914f0168a8b70db9 +usb-chipidea-fixes 964728f9f407eca0b417fdf8e784b7a76979490c +phy 59fba0869acae06ff594dd7e9808ed673f53538a +staging.current df34df483a97b1591a3e90a6941f99fe9f863508 +char-misc.current 38c23685b273cfb4ccf31a199feccce3bdcb5d83 +input-current 664b0bae0b87f69bc9deb098f5e0158b9cf18e04 +crypto-current f444ec106407d600f17fa1a4bd14f84577401dec +ide 8e44e6600caa7b96a5b71ae36c8829db753c2d70 +vfio-fixes 834814e80268c818f354c8f402e0c6604ed75589 +kselftest-fixes ba004a2955f759946d8c98ca1a9c8d09818b1223 +backlight-fixes 8ff5cbc6e3c5c2855245c014f3ba572ddfc5ab0f +nand-fixes ee02f73e04c0e690600f621a3a1d2245834af7fe +spi-nor-fixes 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +mfd-fixes 107b7d9fa94c4692d9104243f0e793e2a4e1366e +v4l-dvb-fixes a95845ba184b854106972f5d8f50354c2d272c06 +reset-fixes f450f28e70a2378d9d6ded0932fe480055888cfa +mips-fixes a63d706ea719190a79a6c769e898f70680044d3e +kvm-fixes 17a1079d9c63579d6e392a526405b8888e9ede37 +kvms390-fixes f07afa0462b76a5b9c4f3a43d5ac24fdb86a90c2 +drm-intel-fixes 3eb2ce825ea1ad89d20f7a3b5780df850e4be274 +drm-misc-fixes c0db1b677e1d584fab5d7ac76a32e1c0157542e0 +syscalls c9a211951c7c79cfb5de888d7d9550872868b086 +kbuild 061cd0bf665f5d1d85392a107cba89266fa0ddf5 +leaks 9f84a0f7f1a613335a9aaf0abd5858906752bf93 +uuid c0020756315eebec58310aca42cf9fb73e1322eb +dma-mapping 1f674e16f9ce6eb20ee2e81ae7514737376874de +asm-generic 8d14f31ec9ac3e27fd451c23c760b59559c2ad27 +arc 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +arm f261fd40ff071cfe7573698bda8b038b94f2d30c +arm-perf 44300aed5d28e61aae124c401170ac94c98d2127 +arm-soc 38c23685b273cfb4ccf31a199feccce3bdcb5d83 +actions 61862a89e6acb61e1193c3ad6d4eeab966c470ed +alpine 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +amlogic 059e40d9087632cda6a48c41a537a5789e8204c4 +aspeed 6534b2d0de3693b8508375c2f01951d6eb5c69be +at91 20d3f36b0feaad5ab90ccff77e18c13939065cad +bcm2835 cf172af3be59ccd818960064b30722582a4c7fb5 +imx-mxs 98f9530adda3b5929e2593e8e5b5681ff4b193b3 +keystone dacf3785016797379dc4bc4ec05f87d746adcaee +mvebu 4c1b45a44e3508372da9dac9d3b701074baa66d5 +omap d1cc5c055f7a5bd996706e790932d8d9a8159189 +reset 0089313d8595b76422b189b44c55556cb1004190 +qcom 186d88395e05eb087d730ff7f8fc6b7f4dbd8d90 +realtek 2b6286eb7ab8b9a22f7238bdaad403badd4a93e9 +renesas 58eb42a95b247359a3ce4badb69c732561781854 +rockchip f5a45eb9772809eb6b758043c7f30cd88026807b +samsung bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +samsung-krzk 0bc590a59ce6682d9792d7b59fb5f5283e2052a8 +sunxi 2d567752a056453f9767d0d26d1cc54aa38624a6 +tegra 6b9b5116227d5841813ede01857e1962fb98bebd +arm64 65896545b69ffaac947c12e11d3dcc57fd1fb772 +clk 246d61b7f685c92a4fb192e6815e0874a2e7417c +clk-samsung 182c084da5d1e4d7c02d913de154cf5167521580 +c6x 9d440f7a282433338207c4ffb13cafaccaa27818 +m68k ecd685580c8feb9a91c758257a66355a673594d9 +m68knommu f61e64310b75733d782e930d1fb404b84699eed6 +microblaze 70f6283a372bef685fd64564646a3b49a55be1ea +mips ea4d340cbea470247b19ee696e31f102bc64466a +mips-james a5075e6226c42a8e64ea1b862eec7747dc46cb32 +nds32 6fc61ee69433e7e0433cabd36f78bb5fb3b26524 +nios2 e0691ebb33c12084ef11b6b59228c004e19f59c8 +openrisc d56f3af9e801970d21c57621de3b42bc17eac152 +parisc-hd 186536608fd164fea56dab67f1927bf8e0d335d1 +powerpc c1b25a17d24925b0961c319cfc3fd7e1dc778914 +fsl c095ff93f901c1620b28dce4d813dd548bc5236b +risc-v 0adb32858b0bddf4ada5f364a84ed60b196dbcda +s390 92fa7a13c845c91f6a8177250474bbcab7fcf45e +sparc-next 17dec0a949153d9ac00760ba2f5b78cb583e995f +sh d67cbbb113b71b81166d54e4e4d92ee4ed7dd3e3 +uml e40238dedb484c8a19f8257e4ef5d77d038f9ad8 +xtensa ae6063c83634cbef7f73ec8a3ab7a6adf5294716 +fscrypt 0b1dfa4cc6c60052b2c30ead316fa84c46d3c43c +befs 55d945e2e4aa148ef38bdfabb9569af78183a539 +btrfs 7c9a09f56a91c4ee5636703d3a95c72710917718 +btrfs-kdave ed754f23c36335d305e9c9b8155c61bbbf461eb2 +ceph 50b37a1c3d59255b29287e7b6e17dc13d48cbacc +cifs 8687b2c17d3d9d52195fda37d3b7bc923ba3ca42 +configfs 6ace4f6bbcfde70278a33c11443ecda3ed0ec1b6 +ecryptfs f62fd7a77717350e850f3c4a5373fe8e64871025 +ext3 1aa3b3e0cbdb32439f04842e88fc7557a0777660 +ext4 b025a674fc5d0f1b1d1c87bb85198541c9fc93e3 +f2fs 214c2461a864a46b11856426b80dc7db453043c5 +fuse 5ba24197b94d4070d8c2a17fa4944a55cc39ef03 +jfs 86313903430d08739e391ad51b4865dc3a2bf522 +nfs 0adb32858b0bddf4ada5f364a84ed60b196dbcda +nfs-anna 0dea79bc353f1eff0ce9e40c0b501bde767b250d +nfsd 880a3a5325489a143269a8e172e7563ebf9897bc +orangefs 8e9ba5c48ea690060a814fbac6a8c046ab935d79 +overlayfs 3e277162a768bb98def8baf31bb3d981883fc908 +ubifs b5094b7f135be34630e3ea8a98fa215715d0f29d +xfs dc1baa715bbfbb1902da942d06497e79b40e7bc7 +file-locks 86f84779d8e92a690b2f281175ea06b884cb6fa4 +vfs fd70f4425f9b2f131d6a565f2df68d4f84447753 +vfs-miklos 0eb8af4916a540c362a2950e5ab54eca32eb7d58 +printk 23545acc2a0e121c3712a0ddc9d0b96eb4483bf3 +pci 5f764419098671cfffcfc44f8a5220afd3e37864 +pstore e698aaf37f9fac419ac6c1867137cce83c90c80b +hid e221c81efb0ca8f647380523ccd77a6fa4914f9b +i2c af43a578585364ddcbe4fea8de1d7596d6e70fc9 +dmi 1efd78fbd1375af2ce46597357cdc1bb152c2344 +hwmon-staging e3a2d2be510ec8a35ecd2a17a42467d417962bb7 +jc_docs 86afad7d87f535ebb1a0e978bc32a8c58ac99268 +v4l-dvb 17dec0a949153d9ac00760ba2f5b78cb583e995f +v4l-dvb-next 17dec0a949153d9ac00760ba2f5b78cb583e995f +fbdev 7c9b845e79eadd074820e36d426502a9c54cafcf +pm 7d2f6abb402ae38ec4bb7beabb3980bb834b1e0d +cpupower 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +idle 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f +opp 4a823c0be80fa996234ebb41c80d40458b1bec1e +thermal f8837aac36cdc7430422cd65f4466071b42654bb +thermal-soc 2db48884bb51f2ad26b1b716297ceaab624a2e68 +ieee1394 188775181bc05f29372b305ef96485840e351fde +dlm 9250e523592a8ced3ecd14abe29fbb1e036bd7eb +swiotlb 69369f52d28a34c84acb6f2a8a585e743441566a +rdma efc365e7290d040fbd43f60b0e97653489a739d4 +net-next 17dec0a949153d9ac00760ba2f5b78cb583e995f +bpf-next 4608f064532c28c0ea3c03fe26a3a5909852811a +ipsec-next 415a13296a1a49639cabf9d2fe92267810caa47a +netfilter-next 159f02977b2feb18a4bece5e586c838a6d26d44b +nfc-next 4d63adfe12dd9cb61ed8badb4d798955399048c2 +ipvs-next 30edf801d7ed4b5a59601265792d3256836dc127 +wireless-drivers-next 14c99949a3398a655c47b262ca8e2e83edfae7fd +bluetooth dd5caa5c058da904d73d930a93848517052658a3 +mac80211-next 159f02977b2feb18a4bece5e586c838a6d26d44b +gfs2 06dd3dfeea60e2a6457a6aedf97afc8e6d2ba497 +mtd 87a73eb5b56fd6e07c8e499fe8608ef2d8912b82 +l2-mtd fe5f31a8010a0cb13e72cfb72905fefa2a41730c +nand 097ccca726ffedb277c104aba45c59d075969e51 +spi-nor e8de85d5a107352ff428f735b0afc8133bcbc3e5 +crypto f444ec106407d600f17fa1a4bd14f84577401dec +drm 694f54f680f7fd8e9561928fbfc537d9afbc3d79 +drm-panel e4bac408b08437d190785ab1250cc676304ed171 +drm-intel 38057aa1639b74d5c1e0dc1ca7c22bc7a31de714 +drm-tegra 27e92f1f1600c214bf649daddb9b88b68330a8d1 +drm-misc 41613a1a7df27a0aa34bf77d51278bbe8e108a8f +drm-msm 288e5c8898c488298c39ff4bbf58928d30fbf99f +hdlcd f73e8b82531573a198a4d0e5bff0d3256cbbd1d8 +mali-dp 6e810eb508f4b937bc2a718bd4e5cd74cca55500 +sunxi-drm 7dafb83edd3271917458de0ae70586ac63098e2f +imx-drm 28e228073b070d843541daaf5d50705a9d747675 +etnaviv 4ed75c3e525598ff1aa6aed09c419c73a4efd2f2 +kconfig bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +regmap 2889312616aecf1a1153be0fab19206a6b1f768f +sound e1a3a981e320a6916b30ff53571ba144274def0e +sound-asoc 445bb423f6a3c50788529a33b82e45148001e855 +modules 3f553b308bb004eb730da8e00a28150c157c7724 +input 04bb1719c4de94700056241d4c0fe3c1413f5aff +block 667eea5d591b85501e7b36464cfa14bb125d0097 +lightnvm 1c6286f26301ad154a1c10fb6e68925493dd28ba +device-mapper 5bd5e8d891c1fd2d966a7e2c26f0452d22410683 +mmc fc167daff581c01ebce8695e9618231cae3561a1 +kgdb 2cf2f0d5b91fd1b06a6ae260462fc7945ea84add +md dba40d46ebf41e3f7ac9480609529bb6037a918d +mfd b45bf45f1b827d05e8209e2adf35f777ada0c5d4 +backlight ea388d6cffd43d353f9c2b3d711953e7525c7d97 +battery fd73a3e618889877d32e338622a363d04d9be709 +regulator 36fd679f45a25a7c634b3dbec35a2d7fdb832a65 +security df0ce17331e2501dbffc060041dfc6c5f85227b5 +apparmor 588558eb6d0e0b6edfa65a67e906c2ffeba63ff1 +efi-lock-down 89bcd5b02f125335f74289c5f4ae03e9b893ab7f +integrity ab60368ab6a452466885ef4edf0cefd089465132 +keys 1e684d3820d8f72d877c0adb521ae17c6fc9bc88 +selinux 6b6bc6205d98796361962ee282a063f18ba8dc57 +tpmdd 2be8ffed093b91536d52b5cd2c99b52f605c9ba6 +watchdog 1991a55dc87e8f2557bc90d7f0062b7110ab8437 +iommu d4f96fd5c249defda290299f9646287dd3df0803 +dwmw2-iommu d8a5b80568a9cb66810e75b182018e9edb68e8ff +vfio da9147140fe3de5a3a3fe5fe7f69739d4f39bea1 +trivial 75a24b822d383489badd343cab4cb171d09f93ef +audit ea841bafda3f7f9aa8b06a09f0f3e41c207af84f +devicetree 827473268ee492b30b576ef156ab524a2b9f3520 +mailbox 41c0e939d70ddb6860e340e7532df8984783f867 +spi 0930437e8f9d1f513ca7f130a650b608358f8805 +tip 87e1e2f51cc3159ba33f71b9b30ac04d0753227c +clockevents 0136c741ff40e03323419feec05fcd594f36a463 +edac 345fb0a9a6340ba0b3b714d62f877fde88c8a755 +edac-amd 6fd052665274b4e7570491ba272f2dbb09cbbcd5 +irqchip aa08192a254d362a4d5317647a81de6996961aef +ftrace b0dc52f15e7fe2b973ecfe4f3706f1b35ce3943a +rcu 338c46403f169dd76bff8ed58fd0be0d600e7aba +kvm e01bca2fc698d7f0626f0214001af523e18ad60b +kvm-arm dc6ed61d2f824a595033744fc1f3bf4cb98768b5 +kvm-mips dc44abd6aad22411f7f9890e39fd4753dabf0d03 +kvm-ppc 31c8b0d0694a1f7e3b46df0d1341a874ecb5e0de +kvms390 ccc40c53c07ba22cfe711cd625f9f0c77f272ae6 +xen-tip c37a3c94775855567b90f91775b9691e10bd2806 +percpu b3a5d111994450909158929560906f2c1c6c1d85 +workqueues 1aa3798360db38d3131ac011b50c397a7cdb754e +drivers-x86 a986c75a7df027d2c649a8f087be9417372cbfb3 +chrome-platform 3b7cedb4242034595cd268046f3cf2e6eb68e989 +hsi e3d7fbab062b877b96c09ffb43733502cdc1bd0a +leds 92d7ec1d71e351f11ba503369eb78225510cfcc7 +ipmi c6185e285c5c7cfeab739bae7f206ced695f09c7 +driver-core 38c23685b273cfb4ccf31a199feccce3bdcb5d83 +usb 38c23685b273cfb4ccf31a199feccce3bdcb5d83 +usb-gadget f8cf2f16a7c95acce497bfafa90e7c6d8397d653 +usb-serial 79a0b33165d8d8ec0840fcfc74fd0a8f219abeee +usb-chipidea-next ce4c1b820c5269437ce2e7831f638159b3b83269 +phy-next e7f4da4c44fe74e1c9277bac9b12ea1ef4eb70db +tty 38c23685b273cfb4ccf31a199feccce3bdcb5d83 +char-misc 38c23685b273cfb4ccf31a199feccce3bdcb5d83 +extcon eb7768e774d12eac1189984a62925bc3bb386e13 +staging df34df483a97b1591a3e90a6941f99fe9f863508 +mux fa934c06c0f40443566e7cb0d46eac6da65dce48 +slave-dma df0517c76e89d26e3c5ecbc5212c7a56d7ef5a00 +cgroup d1897c9538edafd4ae6bbd03cc075962ddde2c21 +scsi 2e1f44f6ad8008be353c7c99286f7a747b4b3cf4 +scsi-mkp e5ad169824033369bb41c133cc6e724bc2c2a2bd +target-updates 1c130ae00b769a2e2df41bad3d6051ee8234b636 +target-bva 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +libata fd17ed684b6e33312cdcd9270b1fece9df266103 +vhost dc32bb678e103afbcfa4d814489af0566307f528 +rpmsg 191d228609dab5659e89a1201a49a7dcff9e6cb5 +gpio 348f3cde84ab5b1f53cd3c0eaac1ca99a4dcb148 +pinctrl 4fc97ef94bbfa185d16b3e44199b7559d0668747 +pinctrl-samsung 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +pwm 6873842235d678a245a378669f35e145df2441b9 +userns 4be33329d46f80e87afe7db61271d1370607260a +ktest c2d84ddb338c829e3ee9d1af6a55325998fcdb82 +random 9e66317d3c92ddaab330c125dfe9d06eee268aff +aio 2a8a98673c13cb2a61a6476153acf8344adfa992 +kselftest 6aa69043d9f3f4adc5b3817ccfcac1fddfe10ded +y2038 ce380619fab99036f5e745c7a865b21c59f005f6 +livepatching d13f5d84ca2774e76f8461a383c222cbc75adad5 +coresight 7e7408725e0d96ef6dfbd2588a78f5001d949bd1 +rtc 1485991c024603b2fb4ae77beb7a0d741128a48e +nvdimm e13e75b86ef2f88e3a47d672dd4c52a293efb95b +idr f0f3f2d0a3e0f7c48163fd8b45f5909d46e7f371 +at24 84e10623c0b9c81557918804f309d66aec86a233 +ntb 53c3677c56c76f90cacd3a1063272fc6d6bc8f76 +kspp 0adb32858b0bddf4ada5f364a84ed60b196dbcda +init_task e1e871aff3ded26348c631b1370e257d401cd22d +akpm-current 56c7680f4bf2f6f422dac520a41e0b677e3117ef +akpm 05a8065fb6d7182ff4ef660305c8f534c71812d3 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..e9a8fe520a92 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,262 @@ +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 +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +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 +syscalls git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#syscalls-next +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +leaks git https://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git#leaks-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 +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 +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/ralf/upstream-sfr#mips-next +mips-james git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips.git#mips-next +nds32 git git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git#next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux.git#for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +sh git git://git.libc.org/linux-sh#for-next +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +fscrypt git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt.git#master +befs git git://git.kernel.org/pub/scm/linux/kernel/git/luisbg/linux-befs.git#for-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next +btrfs-kdave git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +vfs-miklos git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#next +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 +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-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 +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 +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +efi-lock-down git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#efi-lock-down +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.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-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..34929943a40b --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3408 @@ +$ date -R +Tue, 10 Apr 2018 09:47:11 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at f8cf2f16a7c9 Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security +Merging origin/master (fd3b36d27566 Merge branch 'work.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge origin/master +Updating f8cf2f16a7c9..fd3b36d27566 +Fast-forward + Documentation/admin-guide/kernel-parameters.txt | 3 + + Documentation/arm64/memory.txt | 9 +- + Documentation/filesystems/orangefs.txt | 137 +- + Documentation/s390/vfio-ccw.txt | 79 +- + Documentation/virtual/kvm/00-INDEX | 10 +- + Documentation/virtual/kvm/api.txt | 135 +- + Documentation/virtual/kvm/cpuid.txt | 15 +- + MAINTAINERS | 2 +- + arch/alpha/Kconfig | 1 + + arch/alpha/include/asm/io.h | 14 +- + arch/alpha/kernel/Makefile | 2 +- + arch/alpha/kernel/bugs.c | 45 + + arch/alpha/kernel/rtc.c | 101 +- + arch/arm/Kconfig | 1 + + arch/arm/boot/compressed/decompress.c | 5 +- + arch/arm/boot/compressed/misc.c | 7 +- + arch/arm/boot/compressed/misc.h | 10 + + arch/arm/include/asm/kvm_asm.h | 5 +- + arch/arm/include/asm/kvm_emulate.h | 21 +- + arch/arm/include/asm/kvm_host.h | 6 +- + arch/arm/include/asm/kvm_hyp.h | 4 + + arch/arm/include/asm/kvm_mmu.h | 16 +- + arch/arm/include/uapi/asm/kvm.h | 9 + + arch/arm/kernel/vmlinux-xip.lds.S | 166 +- + arch/arm/kernel/vmlinux.lds.S | 172 +- + arch/arm/kernel/vmlinux.lds.h | 135 ++ + arch/arm/kvm/coproc.c | 61 + + arch/arm/kvm/emulate.c | 4 +- + arch/arm/kvm/hyp/Makefile | 1 - + arch/arm/kvm/hyp/switch.c | 16 +- + arch/arm/mach-sa1100/Kconfig | 4 + + arch/arm/mach-sa1100/assabet.c | 39 +- + arch/arm/mach-sa1100/cerf.c | 18 +- + arch/arm/mach-sa1100/clock.c | 2 + + arch/arm/mach-sa1100/generic.c | 44 +- + arch/arm/mach-sa1100/generic.h | 8 + + arch/arm/mach-sa1100/h3xxx.c | 17 + + arch/arm/mach-sa1100/include/mach/assabet.h | 6 - + arch/arm/mach-sa1100/nanoengine.c | 23 + + arch/arm/mach-sa1100/shannon.c | 38 + + arch/arm/mach-sa1100/simpad.c | 11 + + arch/arm/mm/init.c | 11 - + arch/arm/mm/proc-v7.S | 11 + + arch/arm64/Kconfig | 16 + + arch/arm64/include/asm/alternative.h | 41 +- + arch/arm64/include/asm/cpucaps.h | 2 +- + arch/arm64/include/asm/insn.h | 16 + + arch/arm64/include/asm/kvm_arm.h | 6 +- + arch/arm64/include/asm/kvm_asm.h | 19 +- + arch/arm64/include/asm/kvm_emulate.h | 78 +- + arch/arm64/include/asm/kvm_host.h | 53 +- + arch/arm64/include/asm/kvm_hyp.h | 29 +- + arch/arm64/include/asm/kvm_mmu.h | 165 +- + arch/arm64/include/asm/mmu.h | 8 +- + arch/arm64/include/asm/sysreg.h | 6 + + arch/arm64/kernel/Makefile | 4 +- + arch/arm64/kernel/alternative.c | 43 +- + arch/arm64/kernel/asm-offsets.c | 1 + + arch/arm64/kernel/bpi.S | 67 +- + arch/arm64/kernel/cpu_errata.c | 25 +- + arch/arm64/kernel/cpufeature.c | 19 - + arch/arm64/kernel/head.S | 7 + + arch/arm64/kernel/insn.c | 190 +- + arch/arm64/kvm/Kconfig | 3 + + arch/arm64/kvm/Makefile | 2 +- + arch/arm64/kvm/debug.c | 29 +- + arch/arm64/kvm/hyp-init.S | 1 - + arch/arm64/kvm/hyp/Makefile | 2 +- + arch/arm64/kvm/hyp/debug-sr.c | 88 +- + arch/arm64/kvm/hyp/entry.S | 6 +- + arch/arm64/kvm/hyp/hyp-entry.S | 86 +- + arch/arm64/kvm/hyp/switch.c | 382 ++-- + arch/arm64/kvm/hyp/sysreg-sr.c | 172 +- + arch/arm64/kvm/hyp/vgic-v2-cpuif-proxy.c | 78 + + arch/arm64/kvm/inject_fault.c | 24 +- + arch/arm64/kvm/regmap.c | 67 +- + arch/arm64/kvm/sys_regs.c | 199 +- + arch/arm64/kvm/sys_regs.h | 4 +- + arch/arm64/kvm/sys_regs_generic_v8.c | 4 +- + arch/arm64/kvm/va_layout.c | 227 +++ + arch/m68k/coldfire/device.c | 12 +- + arch/mips/include/asm/kvm_para.h | 5 + + arch/powerpc/include/asm/kvm_host.h | 1 - + arch/powerpc/include/asm/kvm_para.h | 5 + + arch/powerpc/include/asm/kvm_ppc.h | 1 - + arch/powerpc/kvm/book3s.c | 6 - + arch/powerpc/kvm/book3s.h | 1 - + arch/powerpc/kvm/book3s_64_mmu_hv.c | 9 - + arch/powerpc/kvm/book3s_64_mmu_radix.c | 333 ++-- + arch/powerpc/kvm/book3s_64_vio_hv.c | 2 +- + arch/powerpc/kvm/book3s_hv.c | 1 - + arch/powerpc/kvm/book3s_pr.c | 10 - + arch/powerpc/kvm/e500_mmu_host.c | 2 +- + arch/powerpc/kvm/trace_pr.h | 15 - + arch/s390/Kconfig | 3 +- + arch/s390/Makefile | 8 +- + arch/s390/boot/compressed/Makefile | 16 +- + arch/s390/boot/compressed/head.S | 6 +- + arch/s390/boot/compressed/misc.c | 10 +- + arch/s390/boot/compressed/vmlinux.lds.S | 1 + + arch/s390/crypto/aes_s390.c | 5 +- + arch/s390/include/asm/alternative-asm.h | 108 + + arch/s390/include/asm/ccwdev.h | 2 +- + arch/s390/include/asm/chpid.h | 2 +- + arch/s390/include/asm/cio.h | 2 +- + arch/s390/include/asm/cpu_mf.h | 4 +- + arch/s390/include/asm/css_chars.h | 6 +- + arch/s390/include/asm/kvm_host.h | 28 +- + arch/s390/include/asm/kvm_para.h | 5 + + arch/s390/include/asm/mmu.h | 4 +- + arch/s390/include/asm/mmu_context.h | 2 +- + arch/s390/include/asm/nospec-branch.h | 6 +- + arch/s390/include/asm/pgalloc.h | 3 + + arch/s390/include/asm/scsw.h | 4 +- + arch/s390/include/asm/setup.h | 2 - + arch/s390/include/uapi/asm/dasd.h | 38 +- + arch/s390/kernel/Makefile | 4 +- + arch/s390/kernel/alternative.c | 24 +- + arch/s390/kernel/asm-offsets.c | 1 + + arch/s390/kernel/early.c | 4 +- + arch/s390/kernel/entry.S | 96 +- + arch/s390/kernel/module.c | 11 +- + arch/s390/kernel/nospec-branch.c | 120 +- + arch/s390/kernel/setup.c | 22 +- + arch/s390/kernel/suspend.c | 4 +- + arch/s390/kvm/gaccess.c | 9 +- + arch/s390/kvm/intercept.c | 17 +- + arch/s390/kvm/interrupt.c | 26 +- + arch/s390/kvm/kvm-s390.c | 102 +- + arch/s390/kvm/kvm-s390.h | 2 - + arch/s390/kvm/priv.c | 4 +- + arch/s390/mm/dump_pagetables.c | 4 +- + arch/s390/mm/pgalloc.c | 293 ++- + arch/s390/tools/gen_facilities.c | 20 + + arch/x86/hyperv/hv_init.c | 45 +- + .../{uapi/asm/hyperv.h => asm/hyperv-tlfs.h} | 299 ++- + arch/x86/include/asm/kvm_host.h | 54 +- + arch/x86/include/asm/kvm_para.h | 6 + + arch/x86/include/asm/mshyperv.h | 94 +- + arch/x86/include/asm/msr-index.h | 14 + + arch/x86/include/asm/processor.h | 10 + + arch/x86/include/asm/svm.h | 3 +- + arch/x86/include/uapi/asm/kvm.h | 19 +- + arch/x86/include/uapi/asm/kvm_para.h | 9 +- + arch/x86/kernel/cpu/common.c | 3 +- + arch/x86/kernel/cpu/mshyperv.c | 22 +- + arch/x86/kernel/kvm.c | 18 + + arch/x86/kernel/process_64.c | 14 + + arch/x86/kvm/cpuid.c | 7 +- + arch/x86/kvm/emulate.c | 27 +- + arch/x86/kvm/hyperv.c | 192 +- + arch/x86/kvm/hyperv.h | 4 + + arch/x86/kvm/irq.c | 26 +- + arch/x86/kvm/kvm_cache_regs.h | 7 +- + arch/x86/kvm/lapic.c | 10 +- + arch/x86/kvm/lapic.h | 2 +- + arch/x86/kvm/mmu.c | 2 +- + arch/x86/kvm/paging_tmpl.h | 11 +- + arch/x86/kvm/pmu.c | 37 + + arch/x86/kvm/pmu.h | 6 + + arch/x86/kvm/pmu_amd.c | 142 +- + arch/x86/kvm/svm.c | 312 ++- + arch/x86/kvm/vmx.c | 1091 ++++++---- + arch/x86/kvm/vmx_evmcs.h | 324 +++ + arch/x86/kvm/x86.c | 374 +++- + arch/x86/kvm/x86.h | 86 +- + drivers/hv/connection.c | 1 - + drivers/hv/hv.c | 1 - + drivers/hv/hyperv_vmbus.h | 1 + + drivers/hv/vmbus_drv.c | 1 - + drivers/pcmcia/Makefile | 4 - + drivers/pcmcia/sa1100_assabet.c | 100 - + drivers/pcmcia/sa1100_cerf.c | 86 - + drivers/pcmcia/sa1100_generic.c | 115 +- + drivers/pcmcia/sa1100_generic.h | 4 - + drivers/pcmcia/sa1100_h3600.c | 16 +- + drivers/pcmcia/sa1100_nanoengine.c | 133 -- + drivers/pcmcia/sa1100_shannon.c | 104 - + drivers/pcmcia/sa1100_simpad.c | 12 +- + drivers/s390/block/dasd.c | 9 +- + drivers/s390/block/dasd_3990_erp.c | 17 +- + drivers/s390/block/dasd_devmap.c | 43 +- + drivers/s390/block/dasd_eckd.c | 27 +- + drivers/s390/char/Makefile | 2 +- + drivers/s390/char/defkeymap.c | 66 +- + drivers/s390/char/keyboard.c | 32 +- + drivers/s390/char/keyboard.h | 11 + + drivers/s390/char/sclp.c | 58 +- + drivers/s390/char/sclp.h | 61 +- + drivers/s390/char/sclp_early.c | 2 +- + drivers/s390/char/sclp_early_core.c | 38 +- + drivers/s390/char/sclp_sd.c | 569 ++++++ + drivers/s390/char/sclp_tty.c | 5 +- + drivers/s390/cio/chp.c | 34 +- + drivers/s390/cio/chp.h | 5 +- + drivers/s390/cio/chsc.c | 59 +- + drivers/s390/cio/chsc.h | 11 +- + drivers/s390/cio/device.c | 16 +- + drivers/s390/cio/device_ops.c | 4 +- + drivers/s390/cio/qdio_main.c | 131 +- + drivers/s390/cio/vfio_ccw_fsm.c | 5 + + drivers/s390/net/qeth_core_main.c | 2 +- + drivers/tty/Kconfig | 2 +- + drivers/video/Kconfig | 5 +- + drivers/video/console/Kconfig | 6 +- + fs/namei.c | 124 +- + fs/orangefs/devorangefs-req.c | 55 +- + fs/orangefs/file.c | 125 +- + fs/orangefs/inode.c | 4 +- + fs/orangefs/orangefs-bufmap.c | 4 +- + fs/orangefs/orangefs-debug.h | 6 - + fs/orangefs/orangefs-kernel.h | 80 - + fs/orangefs/protocol.h | 45 - + fs/pstore/platform.c | 4 +- + include/asm-generic/kvm_para.h | 5 + + include/kvm/arm_vgic.h | 14 +- + include/linux/hyperv.h | 1 - + include/linux/kernel.h | 17 +- + include/linux/kvm_para.h | 5 + + include/uapi/linux/kvm.h | 23 +- + security/selinux/selinuxfs.c | 1 + + tools/include/uapi/linux/kvm.h | 2 +- + tools/kvm/kvm_stat/kvm_stat | 11 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/kvm/Makefile | 39 + + tools/testing/selftests/kvm/include/kvm_util.h | 142 ++ + tools/testing/selftests/kvm/include/sparsebit.h | 75 + + tools/testing/selftests/kvm/include/test_util.h | 45 + + tools/testing/selftests/kvm/include/x86.h | 1043 ++++++++++ + tools/testing/selftests/kvm/lib/assert.c | 87 + + tools/testing/selftests/kvm/lib/elf.c | 197 ++ + tools/testing/selftests/kvm/lib/io.c | 158 ++ + tools/testing/selftests/kvm/lib/kvm_util.c | 1480 ++++++++++++++ + .../testing/selftests/kvm/lib/kvm_util_internal.h | 67 + + tools/testing/selftests/kvm/lib/sparsebit.c | 2087 ++++++++++++++++++++ + tools/testing/selftests/kvm/lib/x86.c | 700 +++++++ + tools/testing/selftests/kvm/set_sregs_test.c | 54 + + tools/testing/selftests/kvm/sync_regs_test.c | 232 +++ + virt/kvm/arm/aarch32.c | 2 +- + virt/kvm/arm/arch_timer.c | 10 +- + virt/kvm/arm/arm.c | 48 +- + virt/kvm/arm/hyp/timer-sr.c | 44 +- + virt/kvm/arm/hyp/vgic-v2-sr.c | 159 -- + virt/kvm/arm/hyp/vgic-v3-sr.c | 247 ++- + virt/kvm/arm/mmu.c | 176 +- + virt/kvm/arm/pmu.c | 36 +- + virt/kvm/arm/vgic/vgic-init.c | 17 - + virt/kvm/arm/vgic/vgic-its.c | 15 +- + virt/kvm/arm/vgic/vgic-v2.c | 152 +- + virt/kvm/arm/vgic/vgic-v3.c | 66 +- + virt/kvm/arm/vgic/vgic.c | 33 + + virt/kvm/arm/vgic/vgic.h | 3 + + virt/kvm/kvm_main.c | 36 +- + 253 files changed, 14349 insertions(+), 3720 deletions(-) + create mode 100644 arch/alpha/kernel/bugs.c + create mode 100644 arch/arm/boot/compressed/misc.h + create mode 100644 arch/arm/kernel/vmlinux.lds.h + create mode 100644 arch/arm64/kvm/hyp/vgic-v2-cpuif-proxy.c + create mode 100644 arch/arm64/kvm/va_layout.c + create mode 100644 arch/s390/include/asm/alternative-asm.h + rename arch/x86/include/{uapi/asm/hyperv.h => asm/hyperv-tlfs.h} (64%) + create mode 100644 arch/x86/kvm/vmx_evmcs.h + delete mode 100644 drivers/pcmcia/sa1100_assabet.c + delete mode 100644 drivers/pcmcia/sa1100_cerf.c + delete mode 100644 drivers/pcmcia/sa1100_nanoengine.c + delete mode 100644 drivers/pcmcia/sa1100_shannon.c + create mode 100644 drivers/s390/char/sclp_sd.c + create mode 100644 tools/testing/selftests/kvm/Makefile + create mode 100644 tools/testing/selftests/kvm/include/kvm_util.h + create mode 100644 tools/testing/selftests/kvm/include/sparsebit.h + create mode 100644 tools/testing/selftests/kvm/include/test_util.h + create mode 100644 tools/testing/selftests/kvm/include/x86.h + create mode 100644 tools/testing/selftests/kvm/lib/assert.c + create mode 100644 tools/testing/selftests/kvm/lib/elf.c + create mode 100644 tools/testing/selftests/kvm/lib/io.c + create mode 100644 tools/testing/selftests/kvm/lib/kvm_util.c + create mode 100644 tools/testing/selftests/kvm/lib/kvm_util_internal.h + create mode 100644 tools/testing/selftests/kvm/lib/sparsebit.c + create mode 100644 tools/testing/selftests/kvm/lib/x86.c + create mode 100644 tools/testing/selftests/kvm/set_sregs_test.c + create mode 100644 tools/testing/selftests/kvm/sync_regs_test.c + delete mode 100644 virt/kvm/arm/hyp/vgic-v2-sr.c +Merging fixes/master (147a89bc71e7 Merge tag 'kconfig-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) +$ git merge fixes/master +Already up to date. +Merging kbuild-current/fixes (28913ee8191a netfilter: nf_nat_snmp_basic: add correct dependency to Makefile) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (661e50bc8532 Linux 4.16-rc4) +$ git merge arc-current/for-curr +Already up to date. +Merging arm-current/fixes (2a141cd0d83b ARM: 8758/1: decompressor: restore r1 and r2 just before jumping to the kernel) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/compressed/head.S | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) +Merging arm64-fixes/for-next/fixes (e21da1c99200 arm64: Relax ARM_SMCCC_ARCH_WORKAROUND_1 discovery) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging m68k-current/for-linus (ecd685580c8f m68k/mac: Remove bogus "FIXME" comment) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (52396500f97c powerpc/64s: Fix i-side SLB miss bad address handler saving nonvolatile GPRs) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging sparc/master (17dec0a94915 Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace) +$ 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 (a2ac99905f1e vhost-net: set packet weight of tx polling to 2 * vq size) +$ git merge net/master +Auto-merging net/sctp/socket.c +Auto-merging net/sctp/ipv6.c +Auto-merging net/ipv4/route.c +Auto-merging arch/arm/boot/dts/ls1021a.dtsi +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/fsl-tsec-phy.txt | 6 +- + arch/arm/boot/dts/ls1021a.dtsi | 3 +- + crypto/af_alg.c | 8 +- + drivers/net/ethernet/cavium/thunder/nic.h | 7 +- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 28 ++-- + drivers/net/ethernet/freescale/fsl_pq_mdio.c | 50 ++++--- + drivers/net/ethernet/ibm/ibmvnic.c | 146 ++++++++++++++------- + drivers/net/ethernet/ibm/ibmvnic.h | 1 + + drivers/net/ethernet/intel/ice/ice_common.c | 4 +- + drivers/net/ethernet/intel/ice/ice_ethtool.c | 4 +- + drivers/net/ethernet/marvell/mvpp2.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 24 +--- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 1 - + .../net/ethernet/mellanox/mlxsw/spectrum_kvdl.c | 67 ++++++---- + drivers/net/hyperv/netvsc.c | 60 ++++++--- + drivers/net/netdevsim/devlink.c | 65 +++++---- + drivers/net/phy/dp83640.c | 18 +++ + drivers/net/phy/marvell.c | 20 ++- + drivers/vhost/net.c | 8 +- + include/net/bluetooth/hci_core.h | 2 +- + include/net/devlink.h | 40 ++++-- + include/net/inet_timewait_sock.h | 1 + + include/net/nexthop.h | 2 +- + kernel/bpf/sockmap.c | 12 +- + kernel/bpf/syscall.c | 24 ++-- + net/bluetooth/hci_conn.c | 29 ++-- + net/bluetooth/hci_event.c | 15 ++- + net/bluetooth/l2cap_core.c | 2 +- + net/core/dev.c | 2 +- + net/core/dev_addr_lists.c | 4 +- + net/core/devlink.c | 74 +++++++++-- + net/core/skbuff.c | 1 + + net/dccp/ipv4.c | 1 + + net/dccp/ipv6.c | 1 + + net/dsa/dsa_priv.h | 8 +- + net/ipv4/arp.c | 2 +- + net/ipv4/inet_timewait_sock.c | 1 + + net/ipv4/inetpeer.c | 1 + + net/ipv4/ip_tunnel.c | 11 +- + net/ipv4/route.c | 11 +- + net/ipv6/ip6_gre.c | 8 +- + net/ipv6/ip6_output.c | 7 +- + net/ipv6/ip6_tunnel.c | 11 +- + net/ipv6/ip6_vti.c | 7 +- + net/ipv6/sit.c | 8 +- + net/netlink/af_netlink.c | 2 + + net/sched/act_bpf.c | 12 +- + net/sched/cls_u32.c | 1 + + net/sctp/ipv6.c | 4 +- + net/sctp/socket.c | 13 +- + net/tipc/diag.c | 2 +- + net/tipc/socket.c | 6 +- + net/tipc/socket.h | 4 +- + 53 files changed, 553 insertions(+), 298 deletions(-) +Merging bpf/master (33491588c1fb kernel/bpf/syscall: fix warning defined but not used) +$ git merge bpf/master +Already up to date. +Merging ipsec/master (4b66af2d6356 af_key: Always verify length of provided sadb_key) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/key/af_key.c | 45 +++++++++++++++++++++++++++++++++++---------- + 1 file changed, 35 insertions(+), 10 deletions(-) +Merging netfilter/master (3f1e53abff84 netfilter: ebtables: don't attempt to allocate 0-sized compat array) +$ git merge netfilter/master +Merge made by the 'recursive' strategy. + net/bridge/netfilter/ebtables.c | 11 +-- + net/netfilter/ipvs/ip_vs_ctl.c | 8 -- + net/netfilter/ipvs/ip_vs_sync.c | 155 +++++++++++++++++++----------------- + net/netfilter/nf_conntrack_expect.c | 5 +- + net/netfilter/nf_conntrack_sip.c | 16 +++- + 5 files changed, 102 insertions(+), 93 deletions(-) +Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (77e30e10ee28 iwlwifi: mvm: query regdb for wmm rule if needed) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + .../broadcom/brcm80211/brcmfmac/firmware.c | 36 ++++--- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 111 ++++++++++++++++++--- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 3 +- + 4 files changed, 121 insertions(+), 35 deletions(-) +Merging mac80211/master (b5dbc28762fd Merge tag 'kbuild-fixes-v4.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (84652aefb347 RDMA/ucma: Introduce safer rdma_addr_size() variants) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (e1a3a981e320 ALSA: pcm: Remove WARN_ON() at snd_pcm_hw_params() error) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/core/oss/pcm_oss.c | 5 +- + sound/core/pcm_native.c | 2 +- + sound/usb/clock.c | 128 ++++++++++++++++++++--------------------------- + 3 files changed, 58 insertions(+), 77 deletions(-) +Merging pci-current/for-linus (fc110ebdd014 PCI: dwc: Fix enumeration end when reaching root subordinate) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (38c23685b273 Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (38c23685b273 Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (38c23685b273 Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (c6ba5084ce0d usb: gadget: udc: renesas_usb3: add binging for r8a77965) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (86d71233b615 USB: serial: ftdi_sio: add support for Harman FirmwareHubEmulator) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. +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 (59fba0869aca phy: qcom-ufs: add MODULE_LICENSE tag) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (df34df483a97 Merge tag 'staging-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (38c23685b273 Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging input-current/for-linus (664b0bae0b87 Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up to date. +Merging crypto-current/master (f444ec106407 crypto: ccree - remove unused enums) +$ 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 (834814e80268 Revert: "vfio-pci: Mask INTx if a device is not capabable of enabling it") +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (ba004a2955f7 selftests: memory-hotplug: fix emit_tests regression) +$ 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 (7928b2cbe55b Linux 4.16-rc1) +$ git merge spi-nor-fixes/spi-nor/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (107b7d9fa94c mfd: rtsx: Release IRQ during shutdown) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (a95845ba184b media: v4l2-core: fix size of devnode_nums[] bitarray) +$ git merge v4l-dvb-fixes/fixes +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf_default.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf_default.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8_default.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8_default.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2_default.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2_default.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_default.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_default.host.c +Merge made by the 'recursive' strategy. + Documentation/media/kapi/v4l2-dev.rst | 2 +- + .../uapi/mediactl/media-ioc-enum-entities.rst | 2 +- + .../media/uapi/mediactl/media-ioc-g-topology.rst | 8 +- + Documentation/media/uapi/mediactl/media-types.rst | 4 +- + Documentation/media/uapi/v4l/extended-controls.rst | 2 +- + .../media/uapi/v4l/pixfmt-v4l2-mplane.rst | 36 ++-- + Documentation/media/uapi/v4l/pixfmt-v4l2.rst | 36 ++-- + drivers/media/cec/cec-pin.c | 6 +- + drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 2 +- + drivers/media/dvb-core/dvb_frontend.c | 2 +- + drivers/media/i2c/adv748x/adv748x-afe.c | 3 +- + drivers/media/i2c/dw9714.c | 14 +- + drivers/media/i2c/imx274.c | 2 +- + drivers/media/i2c/ov13858.c | 19 +- + drivers/media/i2c/ov2685.c | 1 - + drivers/media/i2c/ov5640.c | 38 +++- + drivers/media/i2c/ov5645.c | 29 +-- + drivers/media/i2c/ov5670.c | 19 +- + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 4 +- + drivers/media/platform/qcom/venus/vdec.c | 13 +- + drivers/media/platform/qcom/venus/venc.c | 13 +- + drivers/media/platform/vivid/vivid-vid-cap.c | 5 +- + drivers/media/platform/vsp1/vsp1_wpf.c | 2 +- + drivers/media/tuners/r820t.c | 4 +- + drivers/media/usb/cx231xx/cx231xx-dvb.c | 2 +- + drivers/media/usb/gspca/Kconfig | 2 +- + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 4 +- + drivers/media/v4l2-core/v4l2-dev.c | 8 +- + drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 2 +- + .../staging/media/atomisp/i2c/atomisp-mt9m114.c | 25 +-- + drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 18 +- + drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 18 +- + drivers/staging/media/atomisp/i2c/gc0310.h | 3 +- + drivers/staging/media/atomisp/i2c/ov2722.h | 2 +- + .../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 28 +-- + drivers/staging/media/atomisp/i2c/ov5693/ov5693.h | 2 +- + .../media/atomisp/include/linux/atomisp_platform.h | 4 + + .../staging/media/atomisp/pci/atomisp2/Makefile | 4 - + .../media/atomisp/pci/atomisp2/atomisp_cmd.c | 42 ++--- + .../media/atomisp/pci/atomisp2/atomisp_cmd.h | 2 +- + .../media/atomisp/pci/atomisp2/atomisp_compat.h | 20 +-- + .../atomisp/pci/atomisp2/atomisp_compat_css20.c | 58 ++---- + .../atomisp/pci/atomisp2/atomisp_compat_css20.h | 3 +- + .../media/atomisp/pci/atomisp2/atomisp_drvfs.c | 1 + + .../media/atomisp/pci/atomisp2/atomisp_fops.c | 14 +- + .../media/atomisp/pci/atomisp2/atomisp_ioctl.c | 10 +- + .../media/atomisp/pci/atomisp2/atomisp_subdev.c | 14 +- + .../media/atomisp/pci/atomisp2/atomisp_subdev.h | 8 +- + .../css2400/camera/util/interface/ia_css_util.h | 6 +- + .../pci/atomisp2/css2400/camera/util/src/util.c | 72 ++++---- + .../css2400/css_2401_csi2p_system/system_global.h | 4 +- + .../css2400/hive_isp_css_common/host/debug.c | 2 +- + .../css2400/hive_isp_css_common/host/gp_timer.c | 2 +- + .../hive_isp_css_common/host/input_formatter.c | 5 +- + .../hive_isp_css_common/host/input_system.c | 24 +-- + .../hive_isp_css_common/host/input_system_local.h | 2 +- + .../host/input_system_private.h | 4 +- + .../css2400/hive_isp_css_common/system_global.h | 4 +- + .../host/input_system_public.h | 14 +- + .../pci/atomisp2/css2400/ia_css_input_port.h | 20 +-- + .../atomisp/pci/atomisp2/css2400/ia_css_irq.h | 4 +- + .../atomisp/pci/atomisp2/css2400/ia_css_metadata.h | 4 +- + .../atomisp/pci/atomisp2/css2400/ia_css_mipi.h | 4 +- + .../pci/atomisp2/css2400/ia_css_stream_format.h | 71 +------- + .../pci/atomisp2/css2400/ia_css_stream_public.h | 8 +- + .../css2400/isp/kernels/bnlm/ia_css_bnlm.host.h | 1 - + .../isp/kernels/bnlm/ia_css_bnlm_default.host.c | 71 -------- + .../isp/kernels/bnlm/ia_css_bnlm_default.host.h | 22 --- + .../css2400/isp/kernels/dpc2/ia_css_dpc2.host.h | 1 - + .../isp/kernels/dpc2/ia_css_dpc2_default.host.c | 26 --- + .../isp/kernels/dpc2/ia_css_dpc2_default.host.h | 23 --- + .../isp/kernels/eed1_8/ia_css_eed1_8.host.h | 1 - + .../kernels/eed1_8/ia_css_eed1_8_default.host.c | 94 ---------- + .../kernels/eed1_8/ia_css_eed1_8_default.host.h | 22 --- + .../kernels/output/output_1.0/ia_css_output.host.c | 2 +- + .../isp/kernels/raw/raw_1.0/ia_css_raw.host.c | 42 ++--- + .../isp/kernels/raw/raw_1.0/ia_css_raw_types.h | 2 +- + .../isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.c | 2 +- + .../isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.h | 1 - + .../kernels/tdf/tdf_1.0/ia_css_tdf_default.host.c | 36 ---- + .../kernels/tdf/tdf_1.0/ia_css_tdf_default.host.h | 23 --- + .../css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.c | 10 +- + .../runtime/binary/interface/ia_css_binary.h | 8 +- + .../atomisp2/css2400/runtime/binary/src/binary.c | 6 +- + .../pci/atomisp2/css2400/runtime/bufq/src/bufq.c | 9 +- + .../css2400/runtime/debug/src/ia_css_debug.c | 111 ++++++------ + .../pci/atomisp2/css2400/runtime/ifmtr/src/ifmtr.c | 96 +++++----- + .../runtime/inputfifo/interface/ia_css_inputfifo.h | 6 +- + .../css2400/runtime/inputfifo/src/inputfifo.c | 22 +-- + .../css2400/runtime/isys/interface/ia_css_isys.h | 20 +-- + .../css2400/runtime/isys/src/csi_rx_rmgr.c | 4 +- + .../atomisp2/css2400/runtime/isys/src/isys_init.c | 4 +- + .../pci/atomisp2/css2400/runtime/isys/src/rx.c | 146 ++++++++-------- + .../css2400/runtime/isys/src/virtual_isys.c | 12 +- + .../css2400/runtime/pipeline/src/pipeline.c | 6 +- + .../atomisp2/css2400/runtime/rmgr/src/rmgr_vbuf.c | 8 +- + .../media/atomisp/pci/atomisp2/css2400/sh_css.c | 194 ++++++++++----------- + .../atomisp/pci/atomisp2/css2400/sh_css_mipi.c | 58 +++--- + .../atomisp/pci/atomisp2/css2400/sh_css_params.c | 9 +- + .../media/atomisp/pci/atomisp2/css2400/sh_css_sp.c | 25 +-- + .../media/atomisp/pci/atomisp2/css2400/sh_css_sp.h | 2 +- + .../pci/atomisp2/css2400/sh_css_stream_format.c | 58 +++--- + .../pci/atomisp2/css2400/sh_css_stream_format.h | 2 +- + .../atomisp/pci/atomisp2/include/mmu/isp_mmu.h | 4 +- + .../media/atomisp/pci/atomisp2/mmu/isp_mmu.c | 13 +- + .../media/atomisp/pci/atomisp2/mmu/sh_mmu_mrfld.c | 16 +- + .../platform/intel-mid/atomisp_gmin_platform.c | 8 +- + drivers/staging/media/davinci_vpfe/dm365_resizer.c | 4 +- + drivers/staging/media/imx/imx-media-csi.c | 7 +- + include/media/v4l2-common.h | 5 +- + include/media/v4l2-dev.h | 12 +- + 111 files changed, 815 insertions(+), 1249 deletions(-) + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_default.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_default.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2_default.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2_default.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8_default.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8_default.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf_default.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf_default.host.h +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 (a63d706ea719 MIPS: ralink: Fix booting on MT7621) +$ git merge mips-fixes/mips-fixes +Already up to date. +Merging kvm-fixes/master (17a1079d9c63 KVM: x86: Fix pv tlb flush dependencies) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (f07afa0462b7 KVM: s390: fix memory overwrites when not using SCA entries) +$ git merge kvms390-fixes/master +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (3eb2ce825ea1 Linux 4.16-rc7) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (c0db1b677e1d drm/vc4: Fix memory leak during BO teardown) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/vc4/vc4_bo.c | 2 ++ + drivers/gpu/drm/vc4/vc4_validate_shaders.c | 1 + + 2 files changed, 3 insertions(+) +Merging syscalls/syscalls-next (c9a211951c7c bpf: whitelist all syscalls for error injection) +$ git merge syscalls/syscalls-next +Already up to date. +Merging kbuild/for-next (061cd0bf665f Kbuild: fix # escaping in .cmd files for future Make) +$ git merge kbuild/for-next +Removing scripts/genksyms/parse.tab.h_shipped +Removing scripts/genksyms/parse.tab.c_shipped +Removing scripts/genksyms/lex.lex.c_shipped +Removing drivers/crypto/qat/qat_common/.gitignore +Removing crypto/asymmetric_keys/.gitignore +Removing crypto/.gitignore +Merge made by the 'recursive' strategy. + .gitignore | 7 +- + Makefile | 5 + + arch/arc/boot/dts/Makefile | 2 - + arch/arm/crypto/Makefile | 2 +- + arch/arm64/crypto/Makefile | 2 +- + arch/sparc/vdso/Makefile | 4 +- + arch/x86/entry/vdso/Makefile | 4 +- + crypto/.gitignore | 1 - + crypto/Makefile | 14 +- + crypto/asymmetric_keys/.gitignore | 1 - + crypto/asymmetric_keys/Makefile | 31 +- + crypto/asymmetric_keys/mscode_parser.c | 2 +- + crypto/asymmetric_keys/pkcs7_parser.c | 2 +- + crypto/asymmetric_keys/x509_cert_parser.c | 4 +- + crypto/rsa_helper.c | 4 +- + drivers/crypto/qat/qat_common/.gitignore | 1 - + drivers/of/unittest-data/Makefile | 6 - + net/ipv4/netfilter/Makefile | 5 +- + net/ipv4/netfilter/nf_nat_snmp_basic_main.c | 2 +- + scripts/Kbuild.include | 5 +- + scripts/Makefile.build | 23 +- + scripts/Makefile.host | 2 +- + scripts/Makefile.lib | 31 +- + scripts/asn1_compiler.c | 2 +- + scripts/dtc/.gitignore | 3 - + scripts/dtc/Makefile | 5 - + scripts/genksyms/.gitignore | 3 - + scripts/genksyms/Makefile | 27 +- + scripts/genksyms/lex.lex.c_shipped | 2291 ------------------------- + scripts/genksyms/parse.tab.c_shipped | 2394 --------------------------- + scripts/genksyms/parse.tab.h_shipped | 119 -- + scripts/kconfig/.gitignore | 3 - + scripts/kconfig/Makefile | 4 +- + scripts/package/Makefile | 34 +- + scripts/package/builddeb | 221 +-- + scripts/package/mkdebian | 189 +++ + tools/build/Build.include | 5 +- + tools/objtool/Makefile | 2 +- + tools/scripts/Makefile.include | 2 + + 39 files changed, 302 insertions(+), 5162 deletions(-) + delete mode 100644 crypto/.gitignore + delete mode 100644 crypto/asymmetric_keys/.gitignore + delete mode 100644 drivers/crypto/qat/qat_common/.gitignore + delete mode 100644 scripts/genksyms/lex.lex.c_shipped + delete mode 100644 scripts/genksyms/parse.tab.c_shipped + delete mode 100644 scripts/genksyms/parse.tab.h_shipped + create mode 100755 scripts/package/mkdebian +Merging leaks/leaks-next (9f84a0f7f1a6 leaking_addresses: check if file name contains address) +$ git merge leaks/leaks-next +Merge made by the 'recursive' strategy. +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 (1f674e16f9ce usb: gadget: Add NO_DMA dummies for DMA mapping API) +$ git merge dma-mapping/for-next +Already up to date. +Merging asm-generic/master (8d14f31ec9ac dts: remove cris & metag dts hard link file) +$ git merge asm-generic/master +Removing scripts/dtc/include-prefixes/metag +Removing scripts/dtc/include-prefixes/cris +Auto-merging include/asm-generic/io.h +Merge made by the 'recursive' strategy. + include/asm-generic/io.h | 113 +++++++++++++++++++++++++++++++++---- + scripts/dtc/include-prefixes/cris | 1 - + scripts/dtc/include-prefixes/metag | 1 - + 3 files changed, 103 insertions(+), 12 deletions(-) + delete mode 120000 scripts/dtc/include-prefixes/cris + delete mode 120000 scripts/dtc/include-prefixes/metag +Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (f261fd40ff07 Merge branch 'fixes' into for-next) +$ git merge arm/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging arm-perf/for-next/perf (44300aed5d28 perf: arm_spe: include linux/vmalloc.h for vmap()) +$ git merge arm-perf/for-next/perf +Merge made by the 'recursive' strategy. +Merging arm-soc/for-next (38c23685b273 Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) +$ git merge arm-soc/for-next +Already up to date. +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 (7928b2cbe55b Linux 4.16-rc1) +$ git merge alpine/alpine/for-next +Already up to date. +Merging amlogic/for-next (059e40d90876 Merge branch 'v4.17/drivers' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging aspeed/for-next (6534b2d0de36 Merge branch 'dt-for-v4.17' into for-next) +$ git merge aspeed/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging at91/at91-next (20d3f36b0fea Merge tag 'at91-ab-4.17-dt2' into at91-next) +$ git merge at91/at91-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging bcm2835/for-next (cf172af3be59 Merge branch anholt/bcm2835-defconfig-next into for-next) +$ git merge bcm2835/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (98f9530adda3 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Merge made by the 'recursive' strategy. + drivers/clk/imx/clk-imx6sx.c | 14 ++++---- + drivers/clk/imx/clk-imx6ul.c | 5 ++- + drivers/clk/imx/clk-imx7d.c | 84 +++++++++++++++++++++++--------------------- + 3 files changed, 55 insertions(+), 48 deletions(-) +Merging keystone/next (dacf37850167 Merge branch 'for_4.17/soc-drivers' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (4c1b45a44e35 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 (d1cc5c055f7a Merge branch 'omap-for-v4.17/defconfig' into for-next) +$ git merge omap/for-next +Resolved 'arch/arm/boot/dts/logicpd-torpedo-som.dtsi' using previous resolution. +Auto-merging arch/arm/boot/dts/logicpd-torpedo-som.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/logicpd-torpedo-som.dtsi +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master cbbcf32407e1] Merge remote-tracking branch 'omap/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 1 + + 1 file changed, 1 insertion(+) +Merging reset/reset/next (0089313d8595 Merge branch 'reset/lookup' into reset/next) +$ git merge reset/reset/next +Already up to date. +Merging qcom/for-next (186d88395e05 Merge tag 'qcom-arm64-defconfig-for-4.17' into all-for-4.17-final) +$ 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 (58eb42a95b24 Merge branches 'arm64-defconfig-for-v4.17', 'arm64-dt-for-v4.17', 'defconfig-for-v4.17', 'dt-bindings-for-v4.17', 'dt-for-v4.17' and 'soc-for-v4.17' into next) +$ git merge renesas/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging rockchip/for-next (f5a45eb97728 Merge branch 'v4.17-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + .../bindings/clock/rockchip,rk3328-cru.txt | 1 + + arch/arm/boot/dts/rk3288.dtsi | 8 +-- + arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 8 +++ + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 8 ++- + .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 4 ++ + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 4 ++ + arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 8 +++ + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 14 ++-- + drivers/clk/rockchip/clk-mmc-phase.c | 78 +++++++++++++++++++- + drivers/clk/rockchip/clk-rk3228.c | 2 +- + drivers/clk/rockchip/clk-rk3328.c | 83 +++++++++++++--------- + drivers/clk/rockchip/clk-rk3399.c | 5 +- + drivers/clk/rockchip/clk.c | 22 ++++-- + include/dt-bindings/clock/rk3328-cru.h | 1 - + 14 files changed, 194 insertions(+), 52 deletions(-) +Merging samsung/for-next (bebc6082da0a Linux 4.14) +$ git merge samsung/for-next +Already up to date. +Merging samsung-krzk/for-next (0bc590a59ce6 Merge branch 'next/soc' into for-next) +$ git merge samsung-krzk/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging sunxi/sunxi/for-next (2d567752a056 Merge branch 'sunxi/clk-for-4.17' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/sunxi-ccu.txt | 4 + + drivers/clk/sunxi-ng/Kconfig | 12 +- + drivers/clk/sunxi-ng/Makefile | 1 + + drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 1211 ++++++++++++++++++++ + drivers/clk/sunxi-ng/ccu-sun50i-h6.h | 56 + + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 32 +- + drivers/clk/sunxi-ng/ccu-sun8i-h3.h | 4 +- + drivers/clk/sunxi-ng/ccu_nkmp.c | 58 +- + drivers/clk/sunxi-ng/ccu_nkmp.h | 2 + + drivers/clk/sunxi-ng/ccu_nm.c | 7 + + drivers/clk/sunxi-ng/ccu_nm.h | 27 + + include/dt-bindings/clock/sun50i-h6-ccu.h | 125 ++ + include/dt-bindings/clock/sun8i-h3-ccu.h | 2 + + include/dt-bindings/reset/sun50i-h6-ccu.h | 73 ++ + 14 files changed, 1579 insertions(+), 35 deletions(-) + create mode 100644 drivers/clk/sunxi-ng/ccu-sun50i-h6.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun50i-h6.h + create mode 100644 include/dt-bindings/clock/sun50i-h6-ccu.h + create mode 100644 include/dt-bindings/reset/sun50i-h6-ccu.h +Merging tegra/for-next (6b9b5116227d Merge branch for-4.17/clk into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + drivers/clk/tegra/clk-emc.c | 2 +- + drivers/clk/tegra/clk-pll.c | 2 + + drivers/clk/tegra/clk-tegra-periph.c | 2 +- + drivers/clk/tegra/clk-tegra-super-gen4.c | 8 +- + drivers/clk/tegra/clk-tegra114.c | 4 +- + drivers/clk/tegra/clk-tegra124.c | 9 +- + drivers/clk/tegra/clk-tegra20.c | 24 +- + drivers/clk/tegra/clk-tegra210.c | 361 ++++++++++++++++++++++++++++++- + drivers/clk/tegra/clk-tegra30.c | 15 +- + drivers/clk/tegra/clk.h | 7 + + drivers/soc/tegra/pmc.c | 2 +- + include/dt-bindings/clock/tegra210-car.h | 2 +- + include/linux/clk/tegra.h | 1 + + 13 files changed, 398 insertions(+), 41 deletions(-) +Merging arm64/for-next/core (65896545b69f arm64: uaccess: Fix omissions from usercopy whitelist) +$ git merge arm64/for-next/core +Already up to date. +Merging clk/clk-next (246d61b7f685 Merge branch 'clk-davinci' into clk-next) +$ git merge clk/clk-next +Auto-merging include/linux/clk/ti.h +Removing drivers/clk/ux500/u9540_clk.c +Removing drivers/clk/ux500/u8540_clk.c +Removing drivers/clk/meson/gxbb-aoclk-regmap.c +Removing drivers/clk/meson/clk-cpu.c +Auto-merging drivers/clk/Makefile +Auto-merging drivers/clk/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/clk.txt | 16 +- + .../bindings/arm/mediatek/mediatek,audsys.txt | 20 +- + .../devicetree/bindings/clock/imx6sll-clock.txt | 36 + + .../devicetree/bindings/clock/intc_stratix10.txt | 20 + + .../devicetree/bindings/clock/renesas,cpg-mssr.txt | 6 +- + .../devicetree/bindings/clock/silabs,si544.txt | 25 + + .../devicetree/bindings/clock/st,stm32mp1-rcc.txt | 60 + + .../bindings/clock/ti/davinci/da8xx-cfgchip.txt | 93 + + .../devicetree/bindings/clock/ti/davinci/pll.txt | 96 + + .../devicetree/bindings/clock/ti/davinci/psc.txt | 71 + + .../devicetree/bindings/clock/ti/divider.txt | 3 + + Documentation/devicetree/bindings/clock/ti/mux.txt | 3 + + MAINTAINERS | 8 + + drivers/clk/Kconfig | 35 +- + drivers/clk/Makefile | 8 +- + drivers/clk/bcm/clk-bcm2835.c | 8 +- + drivers/clk/clk-cs2000-cp.c | 2 +- + drivers/clk/clk-divider.c | 58 +- + drivers/clk/clk-gpio.c | 4 +- + drivers/clk/clk-mux.c | 75 +- + drivers/clk/clk-si544.c | 411 ++++ + drivers/clk/clk-stm32f4.c | 14 +- + drivers/clk/clk-stm32mp1.c | 2117 ++++++++++++++++++++ + drivers/clk/clk.c | 85 +- + drivers/clk/davinci/Makefile | 21 + + drivers/clk/davinci/da8xx-cfgchip.c | 790 ++++++++ + drivers/clk/davinci/pll-da830.c | 70 + + drivers/clk/davinci/pll-da850.c | 212 ++ + drivers/clk/davinci/pll-dm355.c | 79 + + drivers/clk/davinci/pll-dm365.c | 145 ++ + drivers/clk/davinci/pll-dm644x.c | 80 + + drivers/clk/davinci/pll-dm646x.c | 84 + + drivers/clk/davinci/pll.c | 899 +++++++++ + drivers/clk/davinci/pll.h | 141 ++ + drivers/clk/davinci/psc-da830.c | 116 ++ + drivers/clk/davinci/psc-da850.c | 156 ++ + drivers/clk/davinci/psc-dm355.c | 88 + + drivers/clk/davinci/psc-dm365.c | 96 + + drivers/clk/davinci/psc-dm644x.c | 83 + + drivers/clk/davinci/psc-dm646x.c | 80 + + drivers/clk/davinci/psc.c | 551 +++++ + drivers/clk/davinci/psc.h | 108 + + drivers/clk/hisilicon/Makefile | 2 +- + drivers/clk/hisilicon/clk-hisi-phase.c | 121 ++ + drivers/clk/hisilicon/clk.c | 26 + + drivers/clk/hisilicon/clk.h | 19 + + drivers/clk/hisilicon/crg-hi3516cv300.c | 2 +- + drivers/clk/hisilicon/crg-hi3798cv200.c | 100 +- + drivers/clk/imx/Makefile | 1 + + drivers/clk/imx/clk-busy.c | 4 +- + drivers/clk/imx/clk-imx6sll.c | 340 ++++ + drivers/clk/imx/clk-imx7d.c | 29 +- + drivers/clk/imx/clk-pllv2.c | 6 +- + drivers/clk/imx/clk.h | 14 + + drivers/clk/keystone/sci-clk.c | 380 +--- + drivers/clk/mediatek/Kconfig | 6 + + drivers/clk/mediatek/Makefile | 1 + + drivers/clk/mediatek/clk-mt2701-aud.c | 186 ++ + drivers/clk/mediatek/clk-mt2701.c | 15 +- + drivers/clk/mediatek/clk-mt2712.c | 69 +- + drivers/clk/mediatek/clk-mt7622-aud.c | 15 +- + drivers/clk/meson/Kconfig | 9 + + drivers/clk/meson/Makefile | 5 +- + drivers/clk/meson/axg.c | 955 +++++---- + drivers/clk/meson/axg.h | 12 +- + drivers/clk/meson/clk-audio-divider.c | 63 +- + drivers/clk/meson/clk-cpu.c | 178 -- + drivers/clk/meson/clk-mpll.c | 125 +- + drivers/clk/meson/clk-pll.c | 306 +-- + drivers/clk/meson/clk-regmap.c | 166 ++ + drivers/clk/meson/clk-regmap.h | 111 + + drivers/clk/meson/clkc.h | 107 +- + drivers/clk/meson/gxbb-aoclk-regmap.c | 46 - + drivers/clk/meson/gxbb-aoclk.c | 20 +- + drivers/clk/meson/gxbb-aoclk.h | 11 - + drivers/clk/meson/gxbb.c | 1591 ++++++++------- + drivers/clk/meson/gxbb.h | 14 +- + drivers/clk/meson/meson8b.c | 705 ++++--- + drivers/clk/meson/meson8b.h | 17 +- + drivers/clk/mvebu/armada-38x.c | 14 +- + drivers/clk/mvebu/cp110-system-controller.c | 94 +- + drivers/clk/nxp/clk-lpc32xx.c | 1 + + drivers/clk/qcom/clk-regmap-divider.c | 20 +- + drivers/clk/qcom/clk-rpm.c | 79 +- + drivers/clk/qcom/clk-smd-rpm.c | 9 +- + drivers/clk/qcom/gcc-msm8996.c | 8 +- + drivers/clk/renesas/Kconfig | 13 +- + drivers/clk/renesas/Makefile | 2 + + drivers/clk/renesas/clk-div6.c | 22 +- + drivers/clk/renesas/clk-mstp.c | 4 +- + drivers/clk/renesas/clk-r8a73a4.c | 11 +- + drivers/clk/renesas/clk-r8a7740.c | 8 +- + drivers/clk/renesas/clk-rcar-gen2.c | 17 +- + drivers/clk/renesas/clk-rz.c | 4 +- + drivers/clk/renesas/clk-sh73a0.c | 20 +- + drivers/clk/renesas/r8a7743-cpg-mssr.c | 2 + + drivers/clk/renesas/r8a7745-cpg-mssr.c | 2 + + drivers/clk/renesas/r8a7790-cpg-mssr.c | 2 + + drivers/clk/renesas/r8a7791-cpg-mssr.c | 2 + + drivers/clk/renesas/r8a7792-cpg-mssr.c | 2 + + drivers/clk/renesas/r8a7794-cpg-mssr.c | 2 + + drivers/clk/renesas/r8a7795-cpg-mssr.c | 2 + + drivers/clk/renesas/r8a7796-cpg-mssr.c | 2 + + drivers/clk/renesas/r8a77965-cpg-mssr.c | 334 +++ + drivers/clk/renesas/r8a77980-cpg-mssr.c | 227 +++ + drivers/clk/renesas/rcar-gen3-cpg.c | 143 ++ + drivers/clk/renesas/rcar-gen3-cpg.h | 2 + + drivers/clk/renesas/renesas-cpg-mssr.c | 12 + + drivers/clk/renesas/renesas-cpg-mssr.h | 2 + + drivers/clk/samsung/Makefile | 2 + + drivers/clk/samsung/clk-exynos-audss.c | 4 +- + drivers/clk/samsung/clk-exynos3250.c | 114 +- + drivers/clk/samsung/clk-exynos4.c | 103 +- + drivers/clk/samsung/clk-exynos5-subcmu.c | 189 ++ + drivers/clk/samsung/clk-exynos5-subcmu.h | 26 + + drivers/clk/samsung/clk-exynos5250.c | 111 +- + drivers/clk/samsung/clk-exynos5260.c | 90 +- + drivers/clk/samsung/clk-exynos5410.c | 20 +- + drivers/clk/samsung/clk-exynos5420.c | 189 +- + drivers/clk/samsung/clk-exynos5433.c | 121 +- + drivers/clk/samsung/clk-exynos7.c | 2 +- + drivers/clk/samsung/clk-pll.h | 48 +- + drivers/clk/samsung/clk-s3c2410.c | 148 +- + drivers/clk/samsung/clk-s3c2412.c | 25 +- + drivers/clk/samsung/clk-s3c2443.c | 55 +- + drivers/clk/samsung/clk-s3c64xx.c | 17 +- + drivers/clk/socfpga/Makefile | 9 +- + drivers/clk/socfpga/clk-gate-s10.c | 125 ++ + drivers/clk/socfpga/clk-periph-s10.c | 149 ++ + drivers/clk/socfpga/clk-pll-s10.c | 146 ++ + drivers/clk/socfpga/clk-s10.c | 345 ++++ + drivers/clk/socfpga/clk.h | 4 + + drivers/clk/socfpga/stratix10-clk.h | 80 + + drivers/clk/sprd/sc9860-clk.c | 76 + + drivers/clk/ti/clk.c | 38 + + drivers/clk/ti/clock.h | 13 +- + drivers/clk/ti/divider.c | 26 +- + drivers/clk/ti/mux.c | 13 +- + drivers/clk/uniphier/clk-uniphier-sys.c | 25 + + drivers/clk/ux500/Makefile | 2 - + drivers/clk/ux500/abx500-clk.c | 16 - + drivers/clk/ux500/u8540_clk.c | 597 ------ + drivers/clk/ux500/u9540_clk.c | 18 - + drivers/clk/versatile/clk-vexpress-osc.c | 5 +- + drivers/soc/samsung/pm_domains.c | 11 + + include/dt-bindings/clock/axg-clkc.h | 1 + + include/dt-bindings/clock/histb-clock.h | 55 +- + include/dt-bindings/clock/imx6sll-clock.h | 202 ++ + include/dt-bindings/clock/mt2701-clk.h | 3 +- + include/dt-bindings/clock/mt2712-clk.h | 12 +- + include/dt-bindings/clock/mt7622-clk.h | 3 +- + include/dt-bindings/clock/qcom,rpmcc.h | 5 + + include/dt-bindings/clock/r8a77965-cpg-mssr.h | 62 + + include/dt-bindings/clock/r8a77980-cpg-mssr.h | 51 + + include/dt-bindings/clock/sprd,sc9860-clk.h | 21 +- + include/dt-bindings/clock/stm32fx-clock.h | 7 +- + include/dt-bindings/clock/stm32mp1-clks.h | 254 +++ + include/dt-bindings/clock/stratix10-clock.h | 84 + + include/linux/clk-provider.h | 23 +- + include/linux/clk.h | 16 +- + include/linux/clk/ti.h | 2 + + include/linux/platform_data/clk-da8xx-cfgchip.h | 21 + + include/linux/platform_data/clk-davinci-pll.h | 21 + + 163 files changed, 13932 insertions(+), 3785 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/imx6sll-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/intc_stratix10.txt + create mode 100644 Documentation/devicetree/bindings/clock/silabs,si544.txt + create mode 100644 Documentation/devicetree/bindings/clock/st,stm32mp1-rcc.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti/davinci/da8xx-cfgchip.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti/davinci/pll.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti/davinci/psc.txt + create mode 100644 drivers/clk/clk-si544.c + create mode 100644 drivers/clk/clk-stm32mp1.c + create mode 100644 drivers/clk/davinci/Makefile + create mode 100644 drivers/clk/davinci/da8xx-cfgchip.c + create mode 100644 drivers/clk/davinci/pll-da830.c + create mode 100644 drivers/clk/davinci/pll-da850.c + create mode 100644 drivers/clk/davinci/pll-dm355.c + create mode 100644 drivers/clk/davinci/pll-dm365.c + create mode 100644 drivers/clk/davinci/pll-dm644x.c + create mode 100644 drivers/clk/davinci/pll-dm646x.c + create mode 100644 drivers/clk/davinci/pll.c + create mode 100644 drivers/clk/davinci/pll.h + create mode 100644 drivers/clk/davinci/psc-da830.c + create mode 100644 drivers/clk/davinci/psc-da850.c + create mode 100644 drivers/clk/davinci/psc-dm355.c + create mode 100644 drivers/clk/davinci/psc-dm365.c + create mode 100644 drivers/clk/davinci/psc-dm644x.c + create mode 100644 drivers/clk/davinci/psc-dm646x.c + create mode 100644 drivers/clk/davinci/psc.c + create mode 100644 drivers/clk/davinci/psc.h + create mode 100644 drivers/clk/hisilicon/clk-hisi-phase.c + create mode 100644 drivers/clk/imx/clk-imx6sll.c + create mode 100644 drivers/clk/mediatek/clk-mt2701-aud.c + delete mode 100644 drivers/clk/meson/clk-cpu.c + create mode 100644 drivers/clk/meson/clk-regmap.c + create mode 100644 drivers/clk/meson/clk-regmap.h + delete mode 100644 drivers/clk/meson/gxbb-aoclk-regmap.c + create mode 100644 drivers/clk/renesas/r8a77965-cpg-mssr.c + create mode 100644 drivers/clk/renesas/r8a77980-cpg-mssr.c + create mode 100644 drivers/clk/samsung/clk-exynos5-subcmu.c + create mode 100644 drivers/clk/samsung/clk-exynos5-subcmu.h + create mode 100644 drivers/clk/socfpga/clk-gate-s10.c + create mode 100644 drivers/clk/socfpga/clk-periph-s10.c + create mode 100644 drivers/clk/socfpga/clk-pll-s10.c + create mode 100644 drivers/clk/socfpga/clk-s10.c + create mode 100644 drivers/clk/socfpga/stratix10-clk.h + delete mode 100644 drivers/clk/ux500/u8540_clk.c + delete mode 100644 drivers/clk/ux500/u9540_clk.c + create mode 100644 include/dt-bindings/clock/imx6sll-clock.h + create mode 100644 include/dt-bindings/clock/r8a77965-cpg-mssr.h + create mode 100644 include/dt-bindings/clock/r8a77980-cpg-mssr.h + create mode 100644 include/dt-bindings/clock/stm32mp1-clks.h + create mode 100644 include/dt-bindings/clock/stratix10-clock.h + create mode 100644 include/linux/platform_data/clk-da8xx-cfgchip.h + create mode 100644 include/linux/platform_data/clk-davinci-pll.h +Merging clk-samsung/for-next (182c084da5d1 clk: samsung: Add fout=196608001 Hz EPLL rate entry for exynos4412) +$ git merge clk-samsung/for-next +Already up to date. +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 m68k/for-next (ecd685580c8f m68k/mac: Remove bogus "FIXME" comment) +$ git merge m68k/for-next +Already up to date. +Merging m68knommu/for-next (f61e64310b75 m68k: set dma and coherent masks for platform FEC ethernets) +$ git merge m68knommu/for-next +Already up to date. +Merging microblaze/next (70f6283a372b microblaze: Use generic pci_mmap_resource_range()) +$ git merge microblaze/next +Merge made by the 'recursive' strategy. + arch/microblaze/include/asm/pci.h | 7 +-- + arch/microblaze/include/asm/pgtable.h | 2 + + arch/microblaze/pci/pci-common.c | 99 ++++------------------------------- + 3 files changed, 15 insertions(+), 93 deletions(-) +Merging mips/mips-next (ea4d340cbea4 Merge branches '4.15-fixes', '4.16-features' and 'octeon-3-net-mips-bits' into mips-next) +$ git merge mips/mips-next +Auto-merging drivers/staging/octeon/ethernet-tx.c +Auto-merging drivers/staging/octeon/ethernet-rx.c +Auto-merging drivers/staging/octeon/ethernet-defines.h +Auto-merging arch/mips/include/asm/mipsregs.h +Auto-merging arch/mips/cavium-octeon/Kconfig +Merge made by the 'recursive' strategy. + arch/mips/cavium-octeon/Kconfig | 27 +- + arch/mips/cavium-octeon/Makefile | 1 + + arch/mips/cavium-octeon/resource-mgr.c | 351 +++++++++++++++++++++ + arch/mips/cavium-octeon/setup.c | 22 +- + arch/mips/include/asm/barrier.h | 2 +- + .../asm/mach-cavium-octeon/kernel-entry-init.h | 20 +- + arch/mips/include/asm/mipsregs.h | 2 + + arch/mips/include/asm/octeon/octeon.h | 32 +- + arch/mips/include/asm/processor.h | 2 +- + arch/mips/kernel/octeon_switch.S | 2 - + arch/mips/mm/tlbex.c | 29 +- + drivers/staging/octeon/ethernet-defines.h | 6 - + drivers/staging/octeon/ethernet-rx.c | 25 +- + drivers/staging/octeon/ethernet-tx.c | 85 ++--- + 14 files changed, 473 insertions(+), 133 deletions(-) + create mode 100644 arch/mips/cavium-octeon/resource-mgr.c +Merging mips-james/mips-next (a5075e6226c4 MIPS: BCM47XX: Use standard reset button for Luxul XWR-1750) +$ git merge mips-james/mips-next +Auto-merging crypto/Kconfig +Auto-merging arch/mips/include/asm/mipsregs.h +Auto-merging arch/mips/cavium-octeon/octeon-irq.c +Auto-merging arch/mips/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mips/mscc.txt | 43 +++ + .../devicetree/bindings/vendor-prefixes.txt | 1 + + MAINTAINERS | 9 + + arch/mips/Kconfig | 7 +- + arch/mips/Makefile | 64 ++-- + arch/mips/alchemy/board-gpr.c | 2 +- + arch/mips/alchemy/board-mtx1.c | 2 +- + arch/mips/ar7/platform.c | 14 +- + arch/mips/bcm47xx/buttons.c | 2 +- + arch/mips/bcm47xx/leds.c | 21 ++ + arch/mips/boot/dts/Makefile | 1 + + arch/mips/boot/dts/brcm/bcm7125.dtsi | 7 + + arch/mips/boot/dts/brcm/bcm7346.dtsi | 62 ++++ + arch/mips/boot/dts/brcm/bcm7358.dtsi | 17 + + arch/mips/boot/dts/brcm/bcm7360.dtsi | 62 ++++ + arch/mips/boot/dts/brcm/bcm7362.dtsi | 62 ++++ + arch/mips/boot/dts/brcm/bcm7420.dtsi | 7 + + arch/mips/boot/dts/brcm/bcm7425.dtsi | 89 ++++++ + arch/mips/boot/dts/brcm/bcm7435.dtsi | 89 ++++++ + arch/mips/boot/dts/brcm/bcm97125cbmb.dts | 4 + + arch/mips/boot/dts/brcm/bcm97346dbsmb.dts | 8 + + arch/mips/boot/dts/brcm/bcm97358svmb.dts | 8 + + arch/mips/boot/dts/brcm/bcm97360svmb.dts | 8 + + arch/mips/boot/dts/brcm/bcm97362svmb.dts | 8 + + arch/mips/boot/dts/brcm/bcm97420c.dts | 4 + + arch/mips/boot/dts/brcm/bcm97425svmb.dts | 8 + + arch/mips/boot/dts/brcm/bcm97435svmb.dts | 8 + + arch/mips/boot/dts/img/boston.dts | 2 +- + arch/mips/boot/dts/ingenic/ci20.dts | 8 +- + arch/mips/boot/dts/mscc/Makefile | 3 + + arch/mips/boot/dts/mscc/ocelot.dtsi | 117 +++++++ + arch/mips/boot/dts/mscc/ocelot_pcb123.dts | 27 ++ + arch/mips/cavium-octeon/octeon-irq.c | 10 +- + arch/mips/configs/bmips_stb_defconfig | 1 + + arch/mips/configs/generic/32r6.config | 2 + + arch/mips/configs/generic/64r6.config | 2 + + arch/mips/configs/generic/board-ocelot.config | 35 +++ + arch/mips/crypto/Makefile | 6 + + arch/mips/crypto/crc32-mips.c | 348 +++++++++++++++++++++ + arch/mips/generic/Kconfig | 16 + + arch/mips/generic/Makefile | 1 + + arch/mips/generic/board-ocelot.c | 78 +++++ + arch/mips/include/asm/cpu-features.h | 5 +- + arch/mips/include/asm/isa-rev.h | 24 ++ + arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 2 +- + arch/mips/include/asm/mipsregs.h | 1 + + arch/mips/include/uapi/asm/hwcap.h | 1 + + arch/mips/kernel/cpu-probe.c | 3 + + arch/mips/kernel/pm-cps.c | 31 ++ + arch/mips/kernel/reset.c | 68 +++- + arch/mips/kernel/setup.c | 5 +- + arch/mips/mm/init.c | 2 - + arch/mips/net/bpf_jit_asm.S | 9 +- + arch/mips/pci/pci-mt7620.c | 1 + + arch/mips/txx9/rbtx4927/setup.c | 2 +- + arch/mips/vdso/elf.S | 10 +- + crypto/Kconfig | 9 + + drivers/firmware/broadcom/Kconfig | 1 + + drivers/firmware/broadcom/bcm47xx_sprom.c | 18 +- + 59 files changed, 1381 insertions(+), 84 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mips/mscc.txt + create mode 100644 arch/mips/boot/dts/mscc/Makefile + create mode 100644 arch/mips/boot/dts/mscc/ocelot.dtsi + create mode 100644 arch/mips/boot/dts/mscc/ocelot_pcb123.dts + create mode 100644 arch/mips/configs/generic/board-ocelot.config + create mode 100644 arch/mips/crypto/Makefile + create mode 100644 arch/mips/crypto/crc32-mips.c + create mode 100644 arch/mips/generic/board-ocelot.c + create mode 100644 arch/mips/include/asm/isa-rev.h +Merging nds32/next (6fc61ee69433 nds32: To use the generic dump_stack()) +$ git merge nds32/next +Already up to date. +Merging nios2/for-next (e0691ebb33c1 nios2: defconfig: Cleanup from old Kconfig options) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (d56f3af9e801 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 (186536608fd1 parisc/signal: Add FPE_CONDTRAP for conditional trap handling) +$ git merge parisc-hd/for-next +Auto-merging include/uapi/asm-generic/siginfo.h +Merge made by the 'recursive' strategy. + arch/parisc/include/uapi/asm/siginfo.h | 7 ------- + arch/parisc/kernel/time.c | 2 +- + arch/parisc/kernel/traps.c | 7 ++++--- + include/uapi/asm-generic/siginfo.h | 3 ++- + 4 files changed, 7 insertions(+), 12 deletions(-) +$ git am -3 ../patches/0001-parisc-signal-Add-FPE_CONDTRAP-for-conditional-trap-.patch +Applying: parisc/signal: Add FPE_CONDTRAP for conditional trap handling fix +$ git reset HEAD^ +Unstaged changes after reset: +M arch/x86/kernel/signal_compat.c +$ git add -A . +$ git commit -v -a --amend +[master e1fe71f7d7a0] Merge remote-tracking branch 'parisc-hd/for-next' + Date: Tue Apr 10 10:33:44 2018 +1000 +Merging powerpc/next (c1b25a17d249 powerpc/64s/idle: Fix restore of AMOR on POWER9 after deep sleep) +$ 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 (0adb32858b0b Linux 4.16) +$ git merge risc-v/for-next +Already up to date. +Merging s390/features (92fa7a13c845 s390/kvm: improve stack frame constants in entry.S) +$ git merge s390/features +Already up to date. +Merging sparc-next/master (17dec0a94915 Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace) +$ git merge sparc-next/master +Already up to date. +Merging sh/for-next (d67cbbb113b7 arch/sh: pcie-sh7786: handle non-zero DMA offset) +$ git merge sh/for-next +Merge made by the 'recursive' strategy. + arch/sh/boards/of-generic.c | 6 --- + arch/sh/drivers/pci/pci.c | 5 +++ + arch/sh/drivers/pci/pcie-sh7786.c | 78 +++++++++++++++++++++++++----------- + arch/sh/include/asm/futex.h | 5 +-- + arch/sh/include/cpu-sh4/cpu/sh7786.h | 7 ++++ + arch/sh/kernel/dma-nommu.c | 7 +++- + arch/sh/kernel/entry-common.S | 2 +- + arch/sh/kernel/setup.c | 8 ++++ + arch/sh/mm/consistent.c | 4 +- + 9 files changed, 84 insertions(+), 38 deletions(-) +Merging uml/linux-next (e40238dedb48 Fix vector raw inintialization logic) +$ git merge uml/linux-next +Merge made by the 'recursive' strategy. + arch/um/Kconfig.net | 11 + + arch/um/drivers/Makefile | 4 +- + arch/um/drivers/chan_kern.c | 53 +- + arch/um/drivers/line.c | 2 +- + arch/um/drivers/net_kern.c | 4 +- + arch/um/drivers/random.c | 11 +- + arch/um/drivers/ubd_kern.c | 4 +- + arch/um/drivers/vector_kern.c | 1633 ++++++++++++++++++++++++++++++++++ + arch/um/drivers/vector_kern.h | 130 +++ + arch/um/drivers/vector_transports.c | 458 ++++++++++ + arch/um/drivers/vector_user.c | 590 ++++++++++++ + arch/um/drivers/vector_user.h | 100 +++ + 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/file.c | 1 + + arch/um/os-Linux/irq.c | 202 +++-- + arch/um/os-Linux/signal.c | 3 +- + arch/x86/um/stub_segv.c | 3 +- + 23 files changed, 3395 insertions(+), 325 deletions(-) + create mode 100644 arch/um/drivers/vector_kern.c + create mode 100644 arch/um/drivers/vector_kern.h + create mode 100644 arch/um/drivers/vector_transports.c + create mode 100644 arch/um/drivers/vector_user.c + create mode 100644 arch/um/drivers/vector_user.h + create mode 100644 arch/um/include/asm/asm-prototypes.h +Merging xtensa/xtensa-for-next (ae6063c83634 Merge branch 'xtensa-fixes' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Merge made by the 'recursive' strategy. + arch/xtensa/kernel/pci-dma.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) +Merging fscrypt/master (0b1dfa4cc6c6 fscrypt: fix build with pre-4.6 gcc versions) +$ git merge fscrypt/master +Already up to date. +Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard issues) +$ git merge befs/for-next +Merge made by the 'recursive' strategy. + fs/befs/btree.c | 97 ++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 51 insertions(+), 46 deletions(-) +Merging btrfs/next (7c9a09f56a91 btrfs: don't use async helpers for crcs when under IO limits) +$ git merge btrfs/next +Auto-merging kernel/cgroup/cgroup.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/buffer_head.h +Auto-merging include/linux/backing-dev.h +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext2/super.c +Auto-merging fs/buffer.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/check-integrity.c +Auto-merging fs/block_dev.c +Auto-merging block/blk-cgroup.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 60041913314e] Merge remote-tracking branch 'btrfs/next' + Date: Tue Apr 10 10:49:56 2018 +1000 +Merging btrfs-kdave/for-next (ed754f23c363 Merge branch 'for-next-next-v4.17-20180405' into for-next-20180405) +$ git merge btrfs-kdave/for-next +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/extent-tree.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/check-integrity.c +Merge made by the 'recursive' strategy. + fs/btrfs/Kconfig | 2 ++ + fs/btrfs/acl.c | 15 +--------- + fs/btrfs/async-thread.c | 15 +--------- + fs/btrfs/async-thread.h | 21 ++++---------- + fs/btrfs/backref.c | 15 +--------- + fs/btrfs/backref.h | 19 ++----------- + fs/btrfs/btrfs_inode.h | 19 ++----------- + fs/btrfs/check-integrity.c | 15 +--------- + fs/btrfs/check-integrity.h | 19 ++----------- + fs/btrfs/compression.c | 36 ++++++++++++------------ + fs/btrfs/compression.h | 19 ++----------- + fs/btrfs/ctree.c | 15 +--------- + fs/btrfs/ctree.h | 22 +++------------ + fs/btrfs/dedupe.h | 20 +++----------- + fs/btrfs/delayed-inode.c | 15 +--------- + fs/btrfs/delayed-inode.h | 19 ++----------- + fs/btrfs/delayed-ref.c | 24 +++------------- + fs/btrfs/delayed-ref.h | 25 ++++------------- + fs/btrfs/dev-replace.c | 16 ++--------- + fs/btrfs/dev-replace.h | 20 +++----------- + fs/btrfs/dir-item.c | 15 +--------- + fs/btrfs/disk-io.c | 18 ++---------- + fs/btrfs/disk-io.h | 20 +++----------- + fs/btrfs/export.c | 1 + + fs/btrfs/export.h | 1 + + fs/btrfs/extent-tree.c | 39 ++++++++++++-------------- + fs/btrfs/extent_io.c | 1 + + fs/btrfs/extent_io.h | 6 ++-- + fs/btrfs/extent_map.c | 1 + + fs/btrfs/extent_map.h | 6 ++-- + fs/btrfs/file-item.c | 15 +--------- + fs/btrfs/file.c | 15 +--------- + fs/btrfs/free-space-cache.c | 15 +--------- + fs/btrfs/free-space-cache.h | 19 ++----------- + fs/btrfs/free-space-tree.c | 15 +--------- + fs/btrfs/free-space-tree.h | 19 ++----------- + fs/btrfs/inode-item.c | 15 +--------- + fs/btrfs/inode-map.c | 15 +--------- + fs/btrfs/inode-map.h | 5 ++-- + fs/btrfs/inode.c | 15 +--------- + fs/btrfs/ioctl.c | 50 ++++++++++++++++++++++------------ + fs/btrfs/locking.c | 16 ++--------- + fs/btrfs/locking.h | 19 ++----------- + fs/btrfs/lzo.c | 15 +--------- + fs/btrfs/math.h | 20 ++------------ + fs/btrfs/ordered-data.c | 15 +--------- + fs/btrfs/ordered-data.h | 20 +++----------- + fs/btrfs/orphan.c | 15 +--------- + fs/btrfs/print-tree.c | 15 +--------- + fs/btrfs/print-tree.h | 21 ++++---------- + fs/btrfs/props.c | 17 ++---------- + fs/btrfs/props.h | 19 ++----------- + fs/btrfs/qgroup.c | 15 +--------- + fs/btrfs/qgroup.h | 22 ++++----------- + fs/btrfs/raid56.c | 16 ++--------- + fs/btrfs/raid56.h | 21 ++++---------- + fs/btrfs/rcu-string.h | 20 ++++---------- + fs/btrfs/reada.c | 15 +--------- + fs/btrfs/ref-verify.c | 15 +--------- + fs/btrfs/ref-verify.h | 23 ++++------------ + fs/btrfs/relocation.c | 15 +--------- + fs/btrfs/root-tree.c | 15 +--------- + fs/btrfs/scrub.c | 15 +--------- + fs/btrfs/send.c | 15 +--------- + fs/btrfs/send.h | 20 ++++---------- + fs/btrfs/struct-funcs.c | 15 +--------- + fs/btrfs/super.c | 18 ++---------- + fs/btrfs/sysfs.c | 15 +--------- + fs/btrfs/sysfs.h | 7 +++-- + fs/btrfs/tests/btrfs-tests.c | 15 +--------- + fs/btrfs/tests/btrfs-tests.h | 19 ++----------- + fs/btrfs/tests/extent-buffer-tests.c | 15 +--------- + fs/btrfs/tests/extent-io-tests.c | 15 +--------- + fs/btrfs/tests/extent-map-tests.c | 15 +--------- + fs/btrfs/tests/free-space-tests.c | 15 +--------- + fs/btrfs/tests/free-space-tree-tests.c | 15 +--------- + fs/btrfs/tests/inode-tests.c | 15 +--------- + fs/btrfs/tests/qgroup-tests.c | 15 +--------- + fs/btrfs/transaction.c | 15 +--------- + fs/btrfs/transaction.h | 20 +++----------- + fs/btrfs/tree-checker.c | 13 +-------- + fs/btrfs/tree-checker.h | 17 ++---------- + fs/btrfs/tree-defrag.c | 15 +--------- + fs/btrfs/tree-log.c | 26 ++++++------------ + fs/btrfs/tree-log.h | 20 +++----------- + fs/btrfs/ulist.c | 2 +- + fs/btrfs/ulist.h | 7 ++--- + fs/btrfs/uuid-tree.c | 16 ++--------- + fs/btrfs/volumes.c | 16 ++--------- + fs/btrfs/volumes.h | 19 ++----------- + fs/btrfs/xattr.c | 16 +---------- + fs/btrfs/xattr.h | 21 +++----------- + fs/btrfs/zlib.c | 15 +--------- + fs/btrfs/zstd.c | 29 +++++++++++--------- + 94 files changed, 293 insertions(+), 1264 deletions(-) +Merging ceph/master (50b37a1c3d59 rbd: avoid Wreturn-type warnings) +$ git merge ceph/master +Auto-merging net/ceph/ceph_common.c +Auto-merging fs/ceph/dir.c +Auto-merging fs/ceph/cache.c +Auto-merging drivers/block/rbd.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/ceph.txt | 16 + + drivers/block/rbd.c | 2452 ++++++++++++++---------------------- + fs/ceph/Makefile | 2 +- + fs/ceph/addr.c | 63 +- + fs/ceph/cache.c | 4 +- + fs/ceph/caps.c | 128 +- + fs/ceph/debugfs.c | 8 +- + fs/ceph/dir.c | 204 +-- + fs/ceph/file.c | 117 +- + fs/ceph/inode.c | 26 +- + fs/ceph/ioctl.c | 13 +- + fs/ceph/locks.c | 20 +- + fs/ceph/mds_client.c | 87 +- + fs/ceph/mds_client.h | 4 + + fs/ceph/quota.c | 361 ++++++ + fs/ceph/snap.c | 2 + + fs/ceph/super.c | 50 +- + fs/ceph/super.h | 42 + + fs/ceph/xattr.c | 44 + + include/linux/ceph/ceph_features.h | 1 + + include/linux/ceph/ceph_fs.h | 17 + + include/linux/ceph/libceph.h | 1 + + include/linux/ceph/messenger.h | 101 +- + include/linux/ceph/osd_client.h | 19 +- + include/linux/ceph/osdmap.h | 6 - + include/linux/ceph/striper.h | 69 + + net/ceph/Makefile | 1 + + net/ceph/ceph_common.c | 8 +- + net/ceph/crypto.c | 6 +- + net/ceph/debugfs.c | 17 +- + net/ceph/messenger.c | 188 ++- + net/ceph/mon_client.c | 2 +- + net/ceph/osd_client.c | 67 +- + net/ceph/osdmap.c | 71 -- + net/ceph/striper.c | 261 ++++ + 35 files changed, 2558 insertions(+), 1920 deletions(-) + create mode 100644 fs/ceph/quota.c + create mode 100644 include/linux/ceph/striper.h + create mode 100644 net/ceph/striper.c +Merging cifs/for-next (8687b2c17d3d SMB311: Improve checking of negotiate security contexts) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifsglob.h | 1 + + fs/cifs/cifssmb.c | 4 +- + fs/cifs/inode.c | 2 +- + fs/cifs/smb2misc.c | 39 +++++++++++++++++++ + fs/cifs/smb2pdu.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++- + fs/cifs/smb2pdu.h | 10 +++++ + 6 files changed, 163 insertions(+), 4 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 (f62fd7a77717 ecryptfs: fix spelling mistake: "cadidate" -> "candidate") +$ git merge ecryptfs/next +Merge made by the 'recursive' strategy. + fs/ecryptfs/inode.c | 3 +-- + fs/ecryptfs/keystore.c | 2 +- + 2 files changed, 2 insertions(+), 3 deletions(-) +Merging ext3/for_next (1aa3b3e0cbdb fs: quota: Replace GFP_ATOMIC with GFP_KERNEL in dquot_init) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/notify/fanotify/fanotify.c | 34 +++++++++++++++------------------- + fs/quota/dquot.c | 2 +- + 2 files changed, 16 insertions(+), 20 deletions(-) +Merging ext4/dev (b025a674fc5d ext4: force revalidation of directory pointer after seekdir(2)) +$ git merge ext4/dev +Merge made by the 'recursive' strategy. +Merging f2fs/dev (214c2461a864 f2fs: remain written times to update inode during fsync) +$ git merge f2fs/dev +Already up to date. +Merging fuse/for-next (5ba24197b94d fuse: add writeback documentation) +$ git merge fuse/for-next +Auto-merging fs/fuse/inode.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/fuse-io.txt | 38 +++++++++++++++++++++++++++++ + fs/fuse/acl.c | 4 ++-- + fs/fuse/control.c | 2 +- + fs/fuse/cuse.c | 11 ++++++--- + fs/fuse/dev.c | 40 +++++++++++++++---------------- + fs/fuse/dir.c | 45 +++++++++++++++++++++++++---------- + fs/fuse/fuse_i.h | 14 +++++++++-- + fs/fuse/inode.c | 40 +++++++++++++++++++------------ + include/uapi/linux/fuse.h | 7 +++++- + kernel/user_namespace.c | 1 + + 10 files changed, 145 insertions(+), 57 deletions(-) + create mode 100644 Documentation/filesystems/fuse-io.txt +Merging jfs/jfs-next (86313903430d MAINTAINERS: fix jfs tree location) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (0adb32858b0b Linux 4.16) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (0dea79bc353f NFS: advance nfs_entry cookie only after decoding completes successfully) +$ git merge nfs-anna/linux-next +Auto-merging net/sunrpc/xprtsock.c +Auto-merging net/sunrpc/clnt.c +Auto-merging include/trace/events/sunrpc.h +Auto-merging fs/nfs/write.c +Auto-merging fs/nfs/nfs4xdr.c +Auto-merging fs/nfs/inode.c +Merge made by the 'recursive' strategy. + fs/nfs/callback_xdr.c | 37 ++---- + fs/nfs/delegation.c | 52 ++++++-- + fs/nfs/delegation.h | 7 +- + fs/nfs/dir.c | 15 +-- + fs/nfs/inode.c | 138 +++++++++++---------- + fs/nfs/nfs3proc.c | 24 ++-- + fs/nfs/nfs3xdr.c | 7 +- + fs/nfs/nfs4proc.c | 168 ++++++++++++++++++-------- + fs/nfs/nfs4state.c | 22 ++-- + fs/nfs/nfs4xdr.c | 245 ++++++++++++++++++-------------------- + fs/nfs/proc.c | 19 ++- + fs/nfs/unlink.c | 7 +- + fs/nfs/write.c | 8 +- + include/linux/nfs_fs.h | 35 ++++-- + include/linux/nfs_xdr.h | 9 +- + include/linux/sunrpc/clnt.h | 7 ++ + include/linux/sunrpc/xdr.h | 94 +++++++++++++++ + include/linux/sunrpc/xprt.h | 3 +- + include/trace/events/sunrpc.h | 106 ++++++++++++++--- + net/sunrpc/clnt.c | 8 +- + net/sunrpc/sched.c | 10 +- + net/sunrpc/stats.c | 16 ++- + net/sunrpc/sunrpc.h | 6 - + net/sunrpc/xdr.c | 82 +++++++++++++ + net/sunrpc/xprt.c | 34 +++--- + net/sunrpc/xprtrdma/backchannel.c | 7 -- + net/sunrpc/xprtrdma/fmr_ops.c | 13 +- + net/sunrpc/xprtrdma/frwr_ops.c | 53 ++++++--- + net/sunrpc/xprtrdma/rpc_rdma.c | 32 +++-- + net/sunrpc/xprtrdma/transport.c | 43 ++----- + net/sunrpc/xprtrdma/verbs.c | 44 ++++--- + net/sunrpc/xprtrdma/xprt_rdma.h | 4 +- + net/sunrpc/xprtsock.c | 4 + + 33 files changed, 866 insertions(+), 493 deletions(-) +Merging nfsd/nfsd-next (880a3a532548 nfsd: fix incorrect umasks) +$ git merge nfsd/nfsd-next +Already up to date. +Merging orangefs/for-next (8e9ba5c48ea6 Orangefs: documentation updates) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (3e277162a768 ovl: update documentation w.r.t "xino" feature) +$ git merge overlayfs/overlayfs-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/overlayfs.txt | 39 +++++-- + fs/exportfs/expfs.c | 9 ++ + fs/overlayfs/Kconfig | 17 +++ + fs/overlayfs/copy_up.c | 6 +- + fs/overlayfs/export.c | 75 +++++++------- + fs/overlayfs/inode.c | 176 +++++++++++++++++++++----------- + fs/overlayfs/namei.c | 67 ++++++++---- + fs/overlayfs/overlayfs.h | 19 +++- + fs/overlayfs/ovl_entry.h | 21 +++- + fs/overlayfs/readdir.c | 45 ++++++-- + fs/overlayfs/super.c | 157 ++++++++++++++++++++++++---- + fs/overlayfs/util.c | 39 ++++++- + 12 files changed, 503 insertions(+), 167 deletions(-) +Merging ubifs/linux-next (b5094b7f135b ubi: Reject MLC NAND) +$ git merge ubifs/linux-next +Merge made by the 'recursive' strategy. + drivers/mtd/ubi/block.c | 2 +- + drivers/mtd/ubi/build.c | 11 +++++++++++ + drivers/mtd/ubi/fastmap-wl.c | 1 - + fs/ubifs/find.c | 2 +- + fs/ubifs/lprops.c | 4 +--- + fs/ubifs/scan.c | 1 - + fs/ubifs/super.c | 14 ++++++++++---- + 7 files changed, 24 insertions(+), 11 deletions(-) +Merging xfs/for-next (dc1baa715bbf xfs: do not log/recover swapext extent owner changes for deleted inodes) +$ git merge xfs/for-next +Already up to date. +Merging file-locks/locks-next (86f84779d8e9 Merge branch 'siginfo-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace) +$ git merge file-locks/locks-next +Already up to date. +Merging vfs/for-next (fd70f4425f9b Merge branches 'work.dcache', 'old.dcache', 'work.misc', 'work.thaw', 'misc.compat' and 'misc.sparc' into for-next) +$ git merge vfs/for-next +Auto-merging include/linux/fs.h +Auto-merging fs/buffer.c +Merge made by the 'recursive' strategy. + fs/buffer.c | 25 +------------ + fs/super.c | 105 +++++++++++++++++++++++++++++++++++++++-------------- + include/linux/fs.h | 6 +++ + 3 files changed, 85 insertions(+), 51 deletions(-) +Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync()) +$ git merge vfs-miklos/next +Already up to date. +Merging printk/for-next (23545acc2a0e Merge branch 'for-4.17' into for-next) +$ git merge printk/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging pci/next (5f7644190986 Merge remote-tracking branch 'lorenzo/pci/cadence' into next) +$ git merge pci/next +Already up to date. +Merging pstore/for-next/pstore (e698aaf37f9f pstore: fix crypto dependencies without compression) +$ git merge pstore/for-next/pstore +Already up to date. +Merging hid/for-next (e221c81efb0c Merge branch 'for-4.17/google-hammer' into for-next) +$ git merge hid/for-next +Resolved 'drivers/hid/hid-multitouch.c' using previous resolution. +Auto-merging drivers/hid/hid-multitouch.c +CONFLICT (content): Merge conflict in drivers/hid/hid-multitouch.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ff833f87be01] Merge remote-tracking branch 'hid/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging i2c/i2c/for-next (af43a5785853 Merge branch 'i2c/for-4.17' into i2c/for-next) +$ git merge i2c/i2c/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging dmi/master (1efd78fbd137 firmware: dmi_scan: Use lowercase letters for UUID) +$ git merge dmi/master +Auto-merging drivers/firmware/dmi_scan.c +Merge made by the 'recursive' strategy. + drivers/firmware/dmi_scan.c | 16 ++++++++++++---- + include/linux/mod_devicetable.h | 1 + + 2 files changed, 13 insertions(+), 4 deletions(-) +Merging hwmon-staging/hwmon-next (e3a2d2be510e hwmon: (via-cputemp) support new centaur CPUs) +$ git merge hwmon-staging/hwmon-next +Auto-merging drivers/hwmon/Kconfig +Merge made by the 'recursive' strategy. + Documentation/hwmon/adm1275 | 20 ++- + Documentation/hwmon/lm92 | 6 +- + Documentation/hwmon/nct6775 | 56 ++++--- + Documentation/hwmon/sht21 | 6 +- + Documentation/hwmon/sht3x | 2 +- + drivers/hwmon/Kconfig | 5 +- + drivers/hwmon/g762.c | 53 ++----- + drivers/hwmon/lm92.c | 63 +------- + drivers/hwmon/nct6775.c | 231 ++++++++++++++++++---------- + drivers/hwmon/pmbus/Kconfig | 4 +- + drivers/hwmon/pmbus/adm1275.c | 71 ++++++++- + drivers/hwmon/pmbus/max8688.c | 2 +- + drivers/hwmon/pmbus/ucd9000.c | 350 +++++++++++++++++++++++++++++++++++++++++- + drivers/hwmon/sht21.c | 3 +- + drivers/hwmon/via-cputemp.c | 31 ++-- + 15 files changed, 662 insertions(+), 241 deletions(-) +Merging jc_docs/docs-next (86afad7d87f5 Documentation/process: update FUSE project website) +$ git merge jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (17dec0a94915 Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace) +$ git merge v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (17dec0a94915 Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace) +$ git merge v4l-dvb-next/master +Already up to date. +Merging fbdev/fbdev-for-next (7c9b845e79ea video: fbdev: s3c-fb: remove dead platform code for Exynos and S5PV210 platforms) +$ git merge fbdev/fbdev-for-next +Resolved 'drivers/video/console/Kconfig' using previous resolution. +Auto-merging drivers/video/fbdev/stifb.c +Auto-merging drivers/video/fbdev/Kconfig +Auto-merging drivers/video/console/Kconfig +CONFLICT (content): Merge conflict in drivers/video/console/Kconfig +Auto-merging drivers/video/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1489f7210994] Merge remote-tracking branch 'fbdev/fbdev-for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/video/Kconfig | 3 - + drivers/video/console/sticore.c | 4 +- + drivers/video/fbdev/Kconfig | 8 +- + drivers/video/fbdev/amba-clcd.c | 3 +- + drivers/video/fbdev/atmel_lcdfb.c | 31 +-- + drivers/video/fbdev/aty/aty128fb.c | 2 +- + drivers/video/fbdev/aty/mach64_ct.c | 2 +- + drivers/video/fbdev/aty/radeon_base.c | 21 ++ + drivers/video/fbdev/au1100fb.c | 9 +- + drivers/video/fbdev/fsl-diu-fb.c | 6 +- + drivers/video/fbdev/matrox/matroxfb_crtc2.c | 5 +- + drivers/video/fbdev/offb.c | 2 + + drivers/video/fbdev/s3c-fb.c | 168 +------------- + drivers/video/fbdev/sis/init.h | 76 ------- + drivers/video/fbdev/sis/init301.c | 326 ++++++++++++++++++++++++++++ + drivers/video/fbdev/sis/init301.h | 320 --------------------------- + drivers/video/fbdev/sis/sis.h | 131 +++++++++++ + drivers/video/fbdev/sis/sis_main.c | 51 +++++ + drivers/video/fbdev/sis/sis_main.h | 117 ---------- + drivers/video/fbdev/smscufx.c | 59 ++--- + drivers/video/fbdev/ssd1307fb.c | 3 +- + drivers/video/fbdev/stifb.c | 6 +- + drivers/video/fbdev/udlfb.c | 39 ++-- + drivers/video/fbdev/vermilion/vermilion.c | 2 +- + drivers/video/fbdev/via/via_aux_sii164.c | 2 +- + drivers/video/fbdev/via/via_aux_vt1631.c | 2 +- + drivers/video/fbdev/via/via_aux_vt1632.c | 2 +- + drivers/video/fbdev/via/via_aux_vt1636.c | 2 +- + drivers/video/of_display_timing.c | 20 -- + include/video/of_display_timing.h | 5 - + 30 files changed, 609 insertions(+), 818 deletions(-) +Merging pm/linux-next (7d2f6abb402a time: hrtimer: Use timerqueue_iterate_next() to get to the next timer) +$ git merge pm/linux-next +Auto-merging kernel/time/tick-sched.c +Auto-merging kernel/time/hrtimer.c +Auto-merging include/linux/hrtimer.h +Merge made by the 'recursive' strategy. + arch/x86/xen/smp_pv.c | 1 + + drivers/cpuidle/cpuidle.c | 10 +- + drivers/cpuidle/governors/ladder.c | 3 +- + drivers/cpuidle/governors/menu.c | 113 ++++++++++++++--- + drivers/net/ethernet/sfc/mcdi.c | 2 +- + include/linux/cpuidle.h | 8 +- + include/linux/hrtimer.h | 1 + + include/linux/jiffies.h | 7 +- + include/linux/tick.h | 25 +++- + kernel/sched/idle.c | 34 +++++- + kernel/time/hrtimer.c | 53 +++++++- + kernel/time/ntp.c | 2 +- + kernel/time/tick-sched.c | 243 ++++++++++++++++++++++++++----------- + kernel/time/tick-sched.h | 18 ++- + 14 files changed, 402 insertions(+), 118 deletions(-) +Merging cpupower/cpupower (7928b2cbe55b Linux 4.16-rc1) +$ git merge cpupower/cpupower +Already up to date. +Merging idle/next (8a5776a5f498 Linux 4.14-rc4) +$ git merge idle/next +Already up to date. +Merging opp/opp/linux-next (4a823c0be80f opp: cpu: Replace GFP_ATOMIC with GFP_KERNEL in dev_pm_opp_init_cpufreq_table) +$ git merge opp/opp/linux-next +Already up to date. +Merging thermal/next (f8837aac36cd Merge branches 'thermal-core' and 'thermal-soc' into next) +$ git merge thermal/next +Removing drivers/thermal/samsung/exynos_tmu.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/thermal/exynos-thermal.txt | 23 +- + .../devicetree/bindings/thermal/imx-thermal.txt | 9 +- + .../bindings/thermal/mediatek-thermal.txt | 1 + + .../devicetree/bindings/thermal/thermal.txt | 16 +- + Documentation/thermal/sysfs-api.txt | 31 +++ + drivers/thermal/Kconfig | 7 + + drivers/thermal/imx_thermal.c | 301 ++++++++++++++++----- + drivers/thermal/mtk_thermal.c | 35 +++ + drivers/thermal/samsung/exynos_tmu.c | 268 +++++++++--------- + drivers/thermal/samsung/exynos_tmu.h | 75 ----- + drivers/thermal/thermal_core.c | 3 +- + drivers/thermal/thermal_core.h | 10 + + drivers/thermal/thermal_helpers.c | 5 +- + drivers/thermal/thermal_sysfs.c | 225 +++++++++++++++ + include/linux/thermal.h | 1 + + 15 files changed, 706 insertions(+), 304 deletions(-) + delete mode 100644 drivers/thermal/samsung/exynos_tmu.h +Merging thermal-soc/next (2db48884bb51 dt-bindings: thermal: Remove "cooling-{min|max}-level" properties) +$ 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 rdma/for-next (efc365e7290d IB/rxe: Fix for oops in rxe_register_device on ppc64le arch) +$ git merge rdma/for-next +Already up to date. +Merging net-next/master (17dec0a94915 Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace) +$ git merge net-next/master +Already up to date. +Merging bpf-next/master (4608f064532c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next) +$ git merge bpf-next/master +Already up to date. +Merging ipsec-next/master (415a13296a1a xfrm_policy: use true and false for boolean values) +$ git merge ipsec-next/master +Already up to date. +Merging netfilter-next/master (159f02977b2f Merge branch 'net-mvneta-improve-suspend-resume') +$ 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 (30edf801d7ed netfilter: ipvs: Add configurations of Maglev hashing) +$ git merge ipvs-next/master +Auto-merging net/netfilter/ipvs/ip_vs_ctl.c +Merge made by the 'recursive' strategy. + include/net/ip_vs.h | 1 + + net/netfilter/ipvs/Kconfig | 37 +++ + net/netfilter/ipvs/Makefile | 1 + + net/netfilter/ipvs/ip_vs_ctl.c | 4 + + net/netfilter/ipvs/ip_vs_mh.c | 540 +++++++++++++++++++++++++++++++++++ + net/netfilter/ipvs/ip_vs_proto_tcp.c | 4 +- + 6 files changed, 585 insertions(+), 2 deletions(-) + create mode 100644 net/netfilter/ipvs/ip_vs_mh.c +Merging wireless-drivers-next/master (14c99949a339 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) +$ git merge wireless-drivers-next/master +Already up to date. +Merging bluetooth/master (dd5caa5c058d Bluetooth: btqcomsmd: Fix rx/tx stats) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/btqcomsmd.c | 10 ++++++++++ + drivers/bluetooth/hci_bcm.c | 33 ++++++++++++++++++--------------- + 2 files changed, 28 insertions(+), 15 deletions(-) +Merging mac80211-next/master (159f02977b2f Merge branch 'net-mvneta-improve-suspend-resume') +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (06dd3dfeea60 Merge tag 'char-misc-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc) +$ git merge gfs2/for-next +Already up to date. +Merging mtd/master (87a73eb5b56f mtd: jedec_probe: Fix crash in jedec_read_mfr()) +$ git merge mtd/master +Already up to date. +Merging l2-mtd/mtd/next (fe5f31a8010a Merge tag 'v4.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mtd/next) +$ git merge l2-mtd/mtd/next +Already up to date. +Merging nand/nand/next (097ccca726ff mtd: nand: Fix some function description mismatches in core.c) +$ git merge nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (e8de85d5a107 dt-bindings: fsl-quadspi: Add the example of two SPI NOR) +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (f444ec106407 crypto: ccree - remove unused enums) +$ git merge crypto/master +Already up to date. +Merging drm/drm-next (694f54f680f7 Merge branch 'drm-misc-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) +$ git merge drm/drm-next +Already up to date. +Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD) +$ git merge drm-panel/drm/panel/for-next +Already up to date. +Merging drm-intel/for-linux-next (38057aa1639b drm/i915/execlists: Clear user-active flag on preemption completion) +$ git merge drm-intel/for-linux-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/gvt/cmd_parser.c | 1 + + drivers/gpu/drm/i915/gvt/display.c | 10 +++++++ + drivers/gpu/drm/i915/gvt/dmabuf.c | 1 + + drivers/gpu/drm/i915/gvt/fb_decoder.c | 27 ++++++------------ + drivers/gpu/drm/i915/gvt/gtt.c | 52 ++++++++++++++++++++++++++++++----- + drivers/gpu/drm/i915/gvt/gtt.h | 2 +- + drivers/gpu/drm/i915/gvt/handlers.c | 1 + + drivers/gpu/drm/i915/gvt/kvmgt.c | 2 +- + drivers/gpu/drm/i915/intel_lrc.c | 9 ++++++ + 9 files changed, 78 insertions(+), 27 deletions(-) +Merging drm-tegra/drm/tegra/for-next (27e92f1f1600 drm/tegra: prime: Implement ->{begin,end}_cpu_access()) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (41613a1a7df2 drm/omap: fix crash if there's no video PLL) +$ git merge drm-misc/for-linux-next +Auto-merging sound/pci/hda/hda_intel.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/omapdrm/dss/dpi.c | 15 ++++++++------- + sound/pci/hda/hda_intel.c | 4 +--- + 2 files changed, 9 insertions(+), 10 deletions(-) +Merging drm-msm/msm-next (288e5c8898c4 drm/msm: fix building without debugfs) +$ git merge drm-msm/msm-next +Already up to date. +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 (6e810eb508f4 drm: mali-dp: Add YUV->RGB conversion support for video layers) +$ 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 (28e228073b07 drm/imx: Remove last traces of struct imx_drm_crtc) +$ git merge imx-drm/imx-drm/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/imx-drm.h | 1 - + drivers/gpu/drm/imx/ipuv3-crtc.c | 1 - + 2 files changed, 2 deletions(-) +Merging etnaviv/etnaviv/next (4ed75c3e5255 drm/etnaviv: bump HW job limit to 4) +$ git merge etnaviv/etnaviv/next +Already up to date. +Merging kconfig/for-next (bebc6082da0a Linux 4.14) +$ git merge kconfig/for-next +Already up to date. +Merging regmap/for-next (2889312616ae Merge remote-tracking branches 'regmap/topic/debugfs' and 'regmap/topic/mmio-clk' into regmap-next) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (e1a3a981e320 ALSA: pcm: Remove WARN_ON() at snd_pcm_hw_params() error) +$ git merge sound/for-next +Already up to date. +Merging sound-asoc/for-next (445bb423f6a3 Merge remote-tracking branch 'asoc/topic/zx_aud96p22' into asoc-next) +$ git merge sound-asoc/for-next +Already up to date. +Merging modules/modules-next (3f553b308bb0 module: propagate error in modules_open()) +$ git merge modules/modules-next +Already up to date. +Merging input/next (04bb1719c4de Input: i8042 - enable MUX on Sony VAIO VGN-CS series to fix touchpad) +$ git merge input/next +Already up to date. +Merging block/for-next (667eea5d591b Merge branch 'for-4.17/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 (5bd5e8d891c1 dm: remove fmode_t argument from .prepare_ioctl hook) +$ git merge device-mapper/for-next +Already up to date. +Merging mmc/next (fc167daff581 mmc: tmio: Fix error handling when issuing CMD23) +$ git merge mmc/next +Auto-merging drivers/mmc/core/block.c +Merge made by the 'recursive' strategy. + drivers/mmc/core/block.c | 1 + + drivers/mmc/host/jz4740_mmc.c | 2 +- + drivers/mmc/host/tmio_mmc_core.c | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) +Merging kgdb/kgdb-next (2cf2f0d5b91f kdb: use memmove instead of overlapping memcpy) +$ git merge kgdb/kgdb-next +Auto-merging kernel/debug/kdb/kdb_main.c +Auto-merging include/linux/timekeeping.h +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 (dba40d46ebf4 raid1: copy write hint from master bio to behind bio) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + drivers/md/md.c | 6 ++++-- + drivers/md/raid1.c | 25 ++++++++++++++++++++----- + 2 files changed, 24 insertions(+), 7 deletions(-) +Merging mfd/for-mfd-next (b45bf45f1b82 mfd: arizona: Update reset pin to use GPIOD) +$ git merge mfd/for-mfd-next +Removing include/linux/mfd/syscon/exynos5-pmu.h +Removing include/linux/mfd/syscon/exynos4-pmu.h +Removing drivers/mfd/cros_ec_acpi_gpe.c +Merge made by the 'recursive' strategy. + drivers/mfd/Makefile | 1 - + drivers/mfd/ab8500-debugfs.c | 3 +- + drivers/mfd/abx500-core.c | 25 ++++---- + drivers/mfd/arizona-core.c | 53 ++++++++++------ + drivers/mfd/axp20x.c | 13 +++- + drivers/mfd/cros_ec.c | 15 +---- + drivers/mfd/cros_ec_acpi_gpe.c | 103 ------------------------------- + drivers/mfd/htc-i2cpld.c | 4 +- + drivers/mfd/janz-cmodio.c | 4 +- + drivers/mfd/jz4740-adc.c | 4 +- + drivers/mfd/max8997.c | 4 +- + drivers/mfd/omap-usb-tll.c | 60 ++++++++---------- + drivers/mfd/pcf50633-core.c | 7 ++- + drivers/mfd/rave-sp.c | 107 +++++++++++++++++++++++++++++++-- + drivers/mfd/rc5t583.c | 6 +- + drivers/mfd/si476x-i2c.c | 6 +- + drivers/mfd/sm501.c | 32 ++++------ + drivers/mfd/smsc-ece1099.c | 7 +-- + drivers/mfd/sprd-sc27xx-spi.c | 3 + + drivers/mfd/syscon.c | 2 + + drivers/mfd/ti_am335x_tscadc.c | 5 +- + drivers/mfd/tps65090.c | 4 +- + drivers/mfd/tps6586x.c | 4 +- + drivers/mfd/tps65910.c | 18 +++--- + drivers/mfd/tps68470.c | 10 +-- + drivers/mfd/tps80031.c | 4 +- + drivers/mfd/twl6030-irq.c | 4 +- + drivers/mfd/viperboard.c | 4 +- + include/linux/mfd/arizona/pdata.h | 3 +- + include/linux/mfd/cros_ec.h | 18 ------ + include/linux/mfd/syscon/exynos4-pmu.h | 21 ------- + include/linux/mfd/syscon/exynos5-pmu.h | 19 ------ + include/linux/mfd/tps65218.h | 4 +- + include/linux/mfd/tps68470.h | 17 +----- + 34 files changed, 243 insertions(+), 351 deletions(-) + delete mode 100644 drivers/mfd/cros_ec_acpi_gpe.c + delete mode 100644 include/linux/mfd/syscon/exynos4-pmu.h + delete mode 100644 include/linux/mfd/syscon/exynos5-pmu.h +Merging backlight/for-backlight-next (ea388d6cffd4 pwm-backlight: Add support for PWM delays proprieties.) +$ git merge backlight/for-backlight-next +Merge made by the 'recursive' strategy. + .../bindings/leds/backlight/pwm-backlight.txt | 6 ++ + .../leds/backlight/zii,rave-sp-backlight.txt | 23 ++++++ + drivers/video/backlight/Kconfig | 6 ++ + drivers/video/backlight/Makefile | 1 + + drivers/video/backlight/pwm_bl.c | 28 ++++++-- + drivers/video/backlight/rave-sp-backlight.c | 82 ++++++++++++++++++++++ + include/linux/mfd/rave-sp.h | 1 + + include/linux/pwm_backlight.h | 2 + + 8 files changed, 145 insertions(+), 4 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/backlight/zii,rave-sp-backlight.txt + create mode 100644 drivers/video/backlight/rave-sp-backlight.c +Merging battery/for-next (fd73a3e61888 power: reset: at91-reset: Switch from the pr_*() to the dev_*() logging functions) +$ git merge battery/for-next +Already up to date. +Merging regulator/for-next (36fd679f45a2 Merge remote-tracking branches 'regulator/topic/88pg86x', 'regulator/topic/dt', 'regulator/topic/formatting' and 'regulator/topic/gpio' into regulator-next) +$ git merge regulator/for-next +Already up to date. +Merging security/next-testing (df0ce17331e2 security: convert security hooks to use hlist) +$ git merge security/next-testing +Already up to date. +Merging apparmor/apparmor-next (588558eb6d0e apparmor: fix memory leak on buffer on error exit path) +$ git merge apparmor/apparmor-next +Auto-merging security/apparmor/task.c +Auto-merging security/apparmor/lsm.c +Auto-merging security/apparmor/include/cred.h +Auto-merging security/apparmor/apparmorfs.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 +- + security/apparmor/.gitignore | 1 + + security/apparmor/Makefile | 45 ++- + security/apparmor/apparmorfs.c | 203 ++++++---- + security/apparmor/capability.c | 2 +- + security/apparmor/domain.c | 355 +++++++++++++----- + security/apparmor/file.c | 32 +- + security/apparmor/include/apparmor.h | 3 +- + security/apparmor/include/audit.h | 19 +- + security/apparmor/include/{context.h => cred.h} | 63 +--- + security/apparmor/include/label.h | 28 ++ + security/apparmor/include/match.h | 28 ++ + security/apparmor/include/net.h | 106 ++++++ + security/apparmor/include/perms.h | 5 +- + security/apparmor/include/policy.h | 23 +- + security/apparmor/include/policy_unpack.h | 2 +- + security/apparmor/include/sig_names.h | 5 +- + security/apparmor/include/task.h | 94 +++++ + security/apparmor/ipc.c | 52 +-- + security/apparmor/label.c | 42 ++- + security/apparmor/lib.c | 5 +- + security/apparmor/lsm.c | 467 ++++++++++++++++++++++-- + security/apparmor/match.c | 423 +++++++++++++++++---- + security/apparmor/mount.c | 2 +- + security/apparmor/net.c | 187 ++++++++++ + security/apparmor/nulldfa.in | 108 +++++- + security/apparmor/policy.c | 11 +- + security/apparmor/policy_ns.c | 2 +- + security/apparmor/policy_unpack.c | 70 +++- + security/apparmor/procattr.c | 2 +- + security/apparmor/resource.c | 2 +- + security/apparmor/stacksplitdfa.in | 114 ++++++ + security/apparmor/{context.c => task.c} | 139 +++---- + 33 files changed, 2119 insertions(+), 525 deletions(-) + rename security/apparmor/include/{context.h => cred.h} (70%) + create mode 100644 security/apparmor/include/net.h + create mode 100644 security/apparmor/include/task.h + create mode 100644 security/apparmor/net.c + create mode 100644 security/apparmor/stacksplitdfa.in + rename security/apparmor/{context.c => task.c} (53%) +Merging efi-lock-down/efi-lock-down (89bcd5b02f12 lockdown: Print current->comm in restriction messages) +$ git merge efi-lock-down/efi-lock-down +Auto-merging security/integrity/ima/ima_policy.c +Auto-merging kernel/power/user.c +Auto-merging kernel/power/hibernate.c +Auto-merging kernel/module.c +Auto-merging kernel/kexec.c +Auto-merging kernel/events/core.c +Auto-merging kernel/debug/kdb/kdb_main.c +Auto-merging kernel/bpf/syscall.c +Auto-merging include/linux/security.h +Auto-merging include/linux/kexec.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/efi.h +Auto-merging fs/debugfs/inode.c +Auto-merging drivers/tty/sysrq.c +Auto-merging drivers/tty/serial/serial_core.c +CONFLICT (modify/delete): drivers/scsi/eata.c deleted in HEAD and modified in efi-lock-down/efi-lock-down. Version efi-lock-down/efi-lock-down of drivers/scsi/eata.c left in tree. +Auto-merging drivers/pci/syscall.c +Auto-merging drivers/pci/proc.c +Auto-merging drivers/pci/pci-sysfs.c +Auto-merging drivers/char/mem.c +Auto-merging drivers/acpi/tables.c +Auto-merging drivers/acpi/osl.c +Auto-merging drivers/acpi/custom_method.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/kernel/machine_kexec_64.c +Auto-merging arch/x86/kernel/ioport.c +Auto-merging arch/x86/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/scsi/eata.c +drivers/scsi/eata.c: needs merge +rm 'drivers/scsi/eata.c' +$ git commit -v -a +[master 4eacedaab8c6] Merge remote-tracking branch 'efi-lock-down/efi-lock-down' +$ git diff -M --stat --summary HEAD^.. + arch/x86/Kconfig | 20 ++++-- + arch/x86/include/asm/setup.h | 2 + + arch/x86/kernel/ioport.c | 6 +- + arch/x86/kernel/kexec-bzimage64.c | 1 + + arch/x86/kernel/machine_kexec_64.c | 2 +- + arch/x86/kernel/msr.c | 10 +++ + arch/x86/kernel/setup.c | 18 ++---- + arch/x86/mm/testmmiotrace.c | 3 + + crypto/asymmetric_keys/verify_pefile.c | 4 +- + drivers/acpi/apei/einj.c | 3 + + drivers/acpi/custom_method.c | 3 + + drivers/acpi/osl.c | 2 +- + drivers/acpi/tables.c | 5 ++ + drivers/char/mem.c | 2 + + drivers/firmware/efi/Makefile | 1 + + drivers/firmware/efi/secureboot.c | 38 ++++++++++++ + drivers/input/misc/uinput.c | 1 + + drivers/pci/pci-sysfs.c | 9 +++ + drivers/pci/proc.c | 9 ++- + drivers/pci/syscall.c | 3 +- + drivers/pcmcia/cistpl.c | 3 + + drivers/tty/serial/serial_core.c | 6 ++ + drivers/tty/sysrq.c | 19 ++++-- + fs/debugfs/file.c | 28 +++++++++ + fs/debugfs/inode.c | 30 ++++++++- + fs/proc/kcore.c | 2 + + include/linux/efi.h | 16 +++-- + include/linux/input.h | 5 ++ + include/linux/kernel.h | 17 ++++++ + include/linux/kexec.h | 4 +- + include/linux/security.h | 8 +++ + include/linux/sysrq.h | 8 ++- + kernel/bpf/syscall.c | 3 + + kernel/debug/kdb/kdb_main.c | 2 +- + kernel/events/core.c | 5 ++ + kernel/kexec.c | 7 +++ + kernel/kexec_file.c | 56 ++++++++++++++--- + kernel/kprobes.c | 3 + + kernel/module.c | 56 +++++++++++++---- + kernel/params.c | 26 ++++++-- + kernel/power/hibernate.c | 2 +- + kernel/power/user.c | 3 + + security/Kconfig | 32 ++++++++++ + security/Makefile | 3 + + security/integrity/ima/ima_policy.c | 39 +++++++++--- + security/lock_down.c | 108 +++++++++++++++++++++++++++++++++ + 46 files changed, 553 insertions(+), 80 deletions(-) + create mode 100644 drivers/firmware/efi/secureboot.c + create mode 100644 security/lock_down.c +Merging integrity/next-integrity (ab60368ab6a4 ima: Fallback to the builtin hash algorithm) +$ git merge integrity/next-integrity +Already up to date. +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 (6b6bc6205d98 selinux: wrap AVC state) +$ git merge selinux/next +Already up to date. +Merging tpmdd/next (2be8ffed093b tpm: fix intermittent failure with self tests) +$ git merge tpmdd/next +Already up to date. +Merging watchdog/master (1991a55dc87e Merge branch 'v4.17-rc1') +$ git merge watchdog/master +Auto-merging drivers/watchdog/Makefile +Auto-merging drivers/watchdog/Kconfig +Auto-merging Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/watchdog/fsl-imx-wdt.txt | 2 + + .../devicetree/bindings/watchdog/meson-wdt.txt | 4 + + .../devicetree/bindings/watchdog/mtk-wdt.txt | 4 + + .../bindings/watchdog/nuvoton,npcm-wdt.txt | 28 ++ + .../devicetree/bindings/watchdog/sirfsoc_wdt.txt | 4 + + .../devicetree/bindings/watchdog/sunxi-wdt.txt | 4 + + drivers/watchdog/Kconfig | 12 + + drivers/watchdog/Makefile | 1 + + drivers/watchdog/ar7_wdt.c | 14 +- + drivers/watchdog/asm9260_wdt.c | 8 +- + drivers/watchdog/aspeed_wdt.c | 13 +- + drivers/watchdog/at91rm9200_wdt.c | 5 +- + drivers/watchdog/at91sam9_wdt.c | 5 +- + drivers/watchdog/at91sam9_wdt.h | 5 +- + drivers/watchdog/bcm2835_wdt.c | 5 +- + drivers/watchdog/bcm47xx_wdt.c | 5 +- + drivers/watchdog/bcm63xx_wdt.c | 5 +- + drivers/watchdog/bcm7038_wdt.c | 12 +- + drivers/watchdog/bcm_kona_wdt.c | 9 +- + drivers/watchdog/cadence_wdt.c | 5 +- + drivers/watchdog/coh901327_wdt.c | 18 +- + drivers/watchdog/da9052_wdt.c | 6 +- + drivers/watchdog/da9055_wdt.c | 6 +- + drivers/watchdog/da9062_wdt.c | 10 +- + drivers/watchdog/da9063_wdt.c | 5 +- + drivers/watchdog/davinci_wdt.c | 15 +- + drivers/watchdog/digicolor_wdt.c | 5 +- + drivers/watchdog/dw_wdt.c | 32 ++- + drivers/watchdog/ebc-c384_wdt.c | 1 + + drivers/watchdog/f71808e_wdt.c | 2 +- + drivers/watchdog/gpio_wdt.c | 4 +- + drivers/watchdog/hpwdt.c | 312 ++++++++------------- + drivers/watchdog/imx2_wdt.c | 8 +- + drivers/watchdog/lpc18xx_wdt.c | 2 +- + drivers/watchdog/mei_wdt.c | 12 +- + drivers/watchdog/mena21_wdt.c | 4 +- + drivers/watchdog/meson_gxbb_wdt.c | 50 +--- + drivers/watchdog/meson_wdt.c | 2 +- + drivers/watchdog/mtk_wdt.c | 13 +- + drivers/watchdog/mtx-1_wdt.c | 11 +- + drivers/watchdog/npcm_wdt.c | 254 +++++++++++++++++ + drivers/watchdog/of_xilinx_wdt.c | 8 +- + drivers/watchdog/omap_wdt.c | 4 +- + drivers/watchdog/pnx4008_wdt.c | 2 +- + drivers/watchdog/renesas_wdt.c | 87 +++++- + drivers/watchdog/sama5d4_wdt.c | 6 +- + drivers/watchdog/sirfsoc_wdt.c | 2 +- + drivers/watchdog/sprd_wdt.c | 4 +- + drivers/watchdog/st_lpc_wdt.c | 6 +- + drivers/watchdog/sunxi_wdt.c | 2 +- + drivers/watchdog/tangox_wdt.c | 6 +- + drivers/watchdog/tegra_wdt.c | 10 +- + drivers/watchdog/uniphier_wdt.c | 15 +- + drivers/watchdog/wm831x_wdt.c | 5 +- + drivers/watchdog/wm8350_wdt.c | 5 +- + 55 files changed, 628 insertions(+), 456 deletions(-) + create mode 100644 Documentation/devicetree/bindings/watchdog/nuvoton,npcm-wdt.txt + create mode 100644 drivers/watchdog/npcm_wdt.c +Merging iommu/next (d4f96fd5c249 Merge branches 'x86/amd', 'x86/vt-d', 'arm/rockchip', 'arm/omap', 'arm/mediatek', 'arm/exynos', 'arm/renesas', 'arm/smmu' and 'core' into next) +$ git merge iommu/next +Auto-merging drivers/irqchip/irq-gic-v3-its.c +Auto-merging drivers/iommu/mtk_iommu_v1.c +Auto-merging drivers/iommu/intel-iommu.c +Auto-merging drivers/iommu/exynos-iommu.c +Auto-merging drivers/iommu/amd_iommu.c +Auto-merging drivers/acpi/arm64/iort.c +Merge made by the 'recursive' strategy. + .../bindings/iommu/renesas,ipmmu-vmsa.txt | 5 +- + .../devicetree/bindings/iommu/rockchip,iommu.txt | 7 + + drivers/acpi/arm64/iort.c | 111 +++- + drivers/iommu/amd_iommu.c | 320 ++++++----- + drivers/iommu/amd_iommu_init.c | 2 +- + drivers/iommu/amd_iommu_types.h | 6 +- + drivers/iommu/arm-smmu-v3.c | 542 +++++++++---------- + drivers/iommu/dma-iommu.c | 8 +- + drivers/iommu/dmar.c | 2 +- + drivers/iommu/exynos-iommu.c | 13 +- + drivers/iommu/intel-iommu.c | 6 +- + drivers/iommu/intel-svm.c | 17 +- + drivers/iommu/io-pgtable-arm-v7s.c | 21 +- + drivers/iommu/io-pgtable-arm.c | 91 ++-- + drivers/iommu/io-pgtable.h | 4 +- + drivers/iommu/iommu.c | 6 +- + drivers/iommu/mtk_iommu.c | 15 +- + drivers/iommu/mtk_iommu.h | 1 + + drivers/iommu/mtk_iommu_v1.c | 54 +- + drivers/iommu/omap-iommu.c | 2 +- + drivers/iommu/rockchip-iommu.c | 592 +++++++++++---------- + drivers/irqchip/irq-gic-v3-its.c | 3 +- + include/linux/acpi_iort.h | 7 +- + include/linux/intel-iommu.h | 12 +- + include/linux/iommu.h | 14 +- + 25 files changed, 1008 insertions(+), 853 deletions(-) +Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15) +$ git merge dwmw2-iommu/master +Already up to date. +Merging vfio/next (da9147140fe3 MAINTAINERS: vfio/platform: Update sub-maintainer) +$ git merge vfio/next +Already up to date. +Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment) +$ git merge trivial/for-next +Already up to date. +Merging audit/next (ea841bafda3f audit: add refused symlink to audit_names) +$ git merge audit/next +Already up to date. +Merging devicetree/for-next (827473268ee4 of: unittest: fix an error code in of_unittest_apply_overlay()) +$ git merge devicetree/for-next +Already up to date. +Merging mailbox/mailbox-for-next (41c0e939d70d mailbox: Add support for Hi3660 mailbox) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (0930437e8f9d Merge remote-tracking branches 'spi/topic/sh-msiof', 'spi/topic/sprd' and 'spi/topic/tegra20-slink' into spi-next) +$ git merge spi/for-next +Already up to date. +Merging tip/auto-latest (87e1e2f51cc3 Merge branch 'x86/pti') +$ git merge tip/auto-latest +Resolved 'drivers/irqchip/Makefile' using previous resolution. +Auto-merging kernel/sched/core.c +Auto-merging kernel/events/core.c +Auto-merging init/Kconfig +Auto-merging include/linux/compat.h +Auto-merging drivers/irqchip/Makefile +CONFLICT (content): Merge conflict in drivers/irqchip/Makefile +Auto-merging drivers/clocksource/Makefile +Auto-merging drivers/clocksource/Kconfig +Auto-merging arch/x86/mm/init_64.c +Auto-merging arch/x86/entry/entry_64.S +Auto-merging arch/x86/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ffd005a17da2] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + .../bindings/timer/nuvoton,npcm7xx-timer.txt | 21 + + .../devicetree/bindings/timer/nxp,tpm-timer.txt | 2 +- + Documentation/process/adding-syscalls.rst | 4 +- + Documentation/x86/x86_64/mm.txt | 2 +- + arch/x86/Kconfig | 5 +- + arch/x86/boot/compressed/kaslr.c | 3 + + arch/x86/entry/calling.h | 2 + + arch/x86/entry/common.c | 20 +- + arch/x86/entry/entry_64.S | 7 +- + arch/x86/entry/entry_64_compat.S | 6 + + arch/x86/entry/syscall_32.c | 15 +- + arch/x86/entry/syscall_64.c | 6 +- + arch/x86/entry/syscalls/syscall_32.tbl | 723 +++++++++++---------- + arch/x86/entry/syscalls/syscall_64.tbl | 712 ++++++++++---------- + arch/x86/entry/syscalls/syscalltbl.sh | 14 +- + arch/x86/entry/vsyscall/vsyscall_64.c | 18 +- + arch/x86/events/intel/ds.c | 34 +- + arch/x86/include/asm/pgtable.h | 27 +- + arch/x86/include/asm/pgtable_types.h | 29 +- + arch/x86/include/asm/pti.h | 2 + + arch/x86/include/asm/syscall.h | 4 + + arch/x86/include/asm/syscall_wrapper.h | 209 ++++++ + arch/x86/include/asm/syscalls.h | 17 +- + arch/x86/include/asm/tlbflush.h | 7 +- + arch/x86/include/uapi/asm/bootparam.h | 18 +- + arch/x86/kernel/cpu/cpuid-deps.c | 2 +- + arch/x86/kernel/espfix_64.c | 4 + + arch/x86/kernel/head64.c | 2 + + arch/x86/kernel/head_64.S | 11 +- + arch/x86/kernel/ldt.c | 6 +- + arch/x86/mm/cpu_entry_area.c | 14 +- + arch/x86/mm/ident_map.c | 3 + + arch/x86/mm/init.c | 14 +- + arch/x86/mm/init_32.c | 8 +- + arch/x86/mm/init_64.c | 11 + + arch/x86/mm/iomap_32.c | 6 + + arch/x86/mm/ioremap.c | 3 + + arch/x86/mm/kasan_init_64.c | 14 +- + arch/x86/mm/pageattr.c | 97 ++- + arch/x86/mm/pgtable.c | 3 + + arch/x86/mm/pti.c | 126 +++- + arch/x86/power/hibernate_64.c | 20 +- + drivers/clocksource/Kconfig | 8 + + drivers/clocksource/Makefile | 1 + + drivers/clocksource/timer-imx-tpm.c | 43 +- + drivers/clocksource/timer-npcm7xx.c | 215 ++++++ + include/linux/compat.h | 51 +- + include/linux/sched.h | 6 +- + include/linux/syscalls.h | 42 +- + init/Kconfig | 10 + + kernel/events/core.c | 6 + + kernel/irq/affinity.c | 162 +++-- + kernel/sched/core.c | 2 +- + kernel/sched/cpufreq_schedutil.c | 3 +- + kernel/sched/deadline.c | 2 +- + kernel/sched/fair.c | 2 +- + kernel/sched/rt.c | 4 +- + kernel/sched/sched.h | 17 +- + kernel/sys_ni.c | 10 + + kernel/time/posix-stubs.c | 10 + + lib/swiotlb.c | 2 +- + scripts/bloat-o-meter | 4 +- + tools/arch/x86/include/asm/cpufeatures.h | 2 + + tools/include/tools/config.h | 34 + + tools/include/uapi/drm/i915_drm.h | 112 +++- + tools/perf/Documentation/perf-report.txt | 1 + + tools/perf/Documentation/perf-trace.txt | 3 + + tools/perf/Documentation/perf-version.txt | 24 + + tools/perf/Makefile.config | 8 +- + tools/perf/builtin-trace.c | 11 +- + tools/perf/builtin-version.c | 82 ++- + tools/perf/perf.c | 6 + + tools/perf/perf.h | 1 + + tools/perf/ui/browser.c | 12 +- + tools/perf/ui/browser.h | 2 + + tools/perf/ui/browsers/annotate.c | 33 +- + tools/perf/ui/browsers/hists.c | 125 +--- + tools/perf/util/annotate.c | 51 +- + tools/perf/util/annotate.h | 12 + + tools/perf/util/auxtrace.c | 54 +- + tools/perf/util/dwarf-aux.c | 2 +- + tools/perf/util/hist.c | 81 +++ + tools/perf/util/hist.h | 7 + + tools/perf/util/map.h | 4 + + tools/perf/util/session.c | 2 +- + tools/perf/util/sort.c | 41 ++ + tools/perf/util/sort.h | 1 + + 87 files changed, 2434 insertions(+), 1128 deletions(-) + create mode 100644 Documentation/devicetree/bindings/timer/nuvoton,npcm7xx-timer.txt + create mode 100644 arch/x86/include/asm/syscall_wrapper.h + create mode 100644 drivers/clocksource/timer-npcm7xx.c + create mode 100644 tools/include/tools/config.h + create mode 100644 tools/perf/Documentation/perf-version.txt +Merging clockevents/clockevents/next (0136c741ff40 clocksource/drivers/imx-tpm: Add different counter width support) +$ git merge clockevents/clockevents/next +Already up to date. +Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp) +$ git merge edac/linux_next +Already up to date. +Merging edac-amd/for-next (6fd052665274 EDAC, sb_edac: Remove variable length array usage) +$ git merge edac-amd/for-next +Already up to date. +Merging irqchip/irq/irqchip-next (aa08192a254d irqchip/gic: Take lock when updating irq type) +$ git merge irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (b0dc52f15e7f init: Have initcall_debug still work without CONFIG_TRACEPOINTS) +$ git merge ftrace/for-next +Resolved 'Documentation/trace/events.rst' using previous resolution. +Auto-merging security/security.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/printk/printk.c +Auto-merging kernel/panic.c +Auto-merging init/main.c +Auto-merging include/linux/trace_events.h +CONFLICT (modify/delete): Documentation/trace/ftrace.txt deleted in HEAD and modified in ftrace/for-next. Version ftrace/for-next of Documentation/trace/ftrace.txt left in tree. +Auto-merging Documentation/trace/events.rst +CONFLICT (content): Merge conflict in Documentation/trace/events.rst +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f Documentation/trace/ftrace.txt +Documentation/trace/ftrace.txt: needs merge +rm 'Documentation/trace/ftrace.txt' +$ git commit -v -a +[master b39f7f8b047e] Merge remote-tracking branch 'ftrace/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/trace/events.rst | 1548 +------ + Documentation/trace/histogram.txt | 1995 ++++++++ + include/linux/ring_buffer.h | 17 +- + include/linux/trace_events.h | 14 +- + include/trace/events/initcall.h | 66 + + init/main.c | 84 +- + kernel/panic.c | 2 + + kernel/printk/printk.c | 7 +- + kernel/trace/Kconfig | 5 +- + kernel/trace/ftrace.c | 7 +- + kernel/trace/ring_buffer.c | 226 +- + kernel/trace/trace.c | 116 +- + kernel/trace/trace.h | 33 +- + kernel/trace/trace_clock.c | 4 +- + kernel/trace/trace_events_filter.c | 2501 +++++----- + kernel/trace/trace_events_hist.c | 4782 ++++++++++++++++++-- + kernel/trace/trace_events_trigger.c | 53 +- + kernel/trace/tracing_map.c | 232 +- + kernel/trace/tracing_map.h | 18 +- + lib/vsprintf.c | 4 + + security/security.c | 8 +- + tools/testing/selftests/ftrace/test.d/functions | 7 + + .../inter-event/trigger-extended-error-support.tc | 39 + + .../inter-event/trigger-field-variable-support.tc | 54 + + .../trigger-inter-event-combined-hist.tc | 58 + + .../inter-event/trigger-onmatch-action-hist.tc | 50 + + .../trigger-onmatch-onmax-action-hist.tc | 50 + + .../inter-event/trigger-onmax-action-hist.tc | 48 + + .../trigger-synthetic-event-createremove.tc | 54 + + 29 files changed, 8581 insertions(+), 3501 deletions(-) + create mode 100644 Documentation/trace/histogram.txt + create mode 100644 include/trace/events/initcall.h + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-extended-error-support.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-field-variable-support.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-inter-event-combined-hist.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-action-hist.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-onmax-action-hist.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmax-action-hist.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-createremove.tc +$ git am -3 ../patches/0001-trace-doc-merge-fix-for-rst-conversion-of-ftrace.txt.patch +Applying: trace doc: merge fix for rst conversion of ftrace.txt +$ git reset HEAD^ +Unstaged changes after reset: +M Documentation/trace/ftrace.rst +$ git add -A . +$ git commit -v -a --amend +[master 5d116084a7c0] Merge remote-tracking branch 'ftrace/for-next' + Date: Tue Apr 10 13:05:39 2018 +1000 +Merging rcu/rcu/next (338c46403f16 Merge branches 'fixes.2018.02.23a', 'srcu.2018.02.20a' and 'torture.2018.02.20a' into HEAD) +$ git merge rcu/rcu/next +Already up to date. +Merging kvm/linux-next (e01bca2fc698 kvm: x86: fix a prototype warning) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (dc6ed61d2f82 arm64: Add temporary ERRATA_MIDR_ALL_VERSIONS compatibility macro) +$ 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 (31c8b0d0694a KVM: PPC: Book3S HV: Use __gfn_to_pfn_memslot() in page fault handler) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (ccc40c53c07b KVM: s390: provide counters for all interrupt injects/delivery) +$ git merge kvms390/next +Already up to date. +Merging xen-tip/linux-next (c37a3c947758 xen/acpi: off by one in read_acpi_id()) +$ git merge xen-tip/linux-next +Merge made by the 'recursive' strategy. + arch/x86/xen/enlighten_pv.c | 8 ++++---- + drivers/acpi/processor_perflib.c | 11 +++++------ + drivers/xen/xen-acpi-processor.c | 30 +++++++++++++++++++++++++++--- + drivers/xen/xenbus/xenbus_dev_frontend.c | 16 ++++++++++++---- + drivers/xen/xenbus/xenbus_xs.c | 4 +++- + include/acpi/processor.h | 2 ++ + 6 files changed, 53 insertions(+), 18 deletions(-) +Merging percpu/for-next (b3a5d1119944 percpu_ref: Update doc to dissuade users from depending on internal RCU grace periods) +$ git merge percpu/for-next +Already up to date. +Merging workqueues/for-next (1aa3798360db Merge branch 'for-4.17' into for-next) +$ git merge workqueues/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging drivers-x86/for-next (a986c75a7df0 platform/x86: thinkpad_acpi: Add 2nd Fan Support for Thinkpad P50) +$ git merge drivers-x86/for-next +Auto-merging drivers/platform/x86/wmi.c +Auto-merging drivers/platform/x86/thinkpad_acpi.c +Auto-merging drivers/platform/x86/intel-hid.c +Auto-merging drivers/platform/x86/dell-smbios-base.c +Auto-merging drivers/platform/x86/Kconfig +Merge made by the 'recursive' strategy. + drivers/platform/mellanox/mlxreg-hotplug.c | 31 ++- + drivers/platform/x86/Kconfig | 3 + + drivers/platform/x86/dell-smbios-base.c | 4 +- + drivers/platform/x86/fujitsu-laptop.c | 199 ++++++++-------- + drivers/platform/x86/gpd-pocket-fan.c | 4 +- + drivers/platform/x86/intel-hid.c | 14 +- + drivers/platform/x86/intel_turbo_max_3.c | 3 - + drivers/platform/x86/mlx-platform.c | 68 +++++- + drivers/platform/x86/silead_dmi.c | 17 ++ + drivers/platform/x86/thinkpad_acpi.c | 8 + + drivers/platform/x86/topstar-laptop.c | 363 +++++++++++++++++++++++------ + drivers/platform/x86/wmi.c | 23 +- + include/linux/platform_data/mlxreg.h | 4 + + 13 files changed, 529 insertions(+), 212 deletions(-) +Merging chrome-platform/for-next (3b7cedb42420 platform/chrome: cros_ec_lpc: Add support for Google devices using custom coreboot firmware) +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. + drivers/platform/chrome/cros_ec_lpc.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) +Merging hsi/for-next (e3d7fbab062b HSI: hsi_char: Delete an error message for a failed memory allocation in hsc_probe()) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (92d7ec1d71e3 leds: Fix wrong dmi_match on PC Engines APU LEDs) +$ git merge leds/for-next +Already up to date. +Merging ipmi/for-next (c6185e285c5c ipmi/parisc: Add IPMI chassis poweroff for certain HP PA-RISC and IA-64 servers) +$ git merge ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (38c23685b273 Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (38c23685b273 Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) +$ git merge usb/usb-next +Already up to date. +Merging usb-gadget/next (f8cf2f16a7c9 Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (79a0b33165d8 USB: serial: ftdi_sio: add Id for Physik Instrumente E-870) +$ 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. +Merging phy-next/next (e7f4da4c44fe phy: tegra: xusb: Uncomment register write) +$ git merge phy-next/next +Already up to date. +Merging tty/tty-next (38c23685b273 Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) +$ git merge tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (38c23685b273 Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) +$ git merge char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (eb7768e774d1 Merge branch 'ib-extcon-drm-dt-v4.17' into extcon-next) +$ git merge extcon/extcon-next +Already up to date. +Merging staging/staging-next (df34df483a97 Merge tag 'staging-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging) +$ git merge staging/staging-next +Already up to date. +Merging mux/for-next (fa934c06c0f4 mux: add mux_control_get_optional() API) +$ git merge mux/for-next +Merge made by the 'recursive' strategy. + Documentation/driver-model/devres.txt | 1 + + drivers/mux/core.c | 104 +++++++++++++++++++++++++++------- + include/linux/mux/consumer.h | 4 ++ + 3 files changed, 89 insertions(+), 20 deletions(-) +Merging slave-dma/next (df0517c76e89 Merge branch 'topic/stm' into next) +$ git merge slave-dma/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/dma/mtk-hsdma.txt | 33 + + .../devicetree/bindings/dma/qcom_bam_dma.txt | 4 + + .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 2 + + .../devicetree/bindings/dma/renesas,usb-dmac.txt | 1 + + .../devicetree/bindings/dma/snps,dw-axi-dmac.txt | 41 + + .../devicetree/bindings/dma/stm32-dma.txt | 6 +- + MAINTAINERS | 15 + + drivers/dma/Kconfig | 12 + + drivers/dma/Makefile | 2 + + drivers/dma/at_xdmac.c | 4 +- + drivers/dma/dmatest.c | 16 +- + drivers/dma/dw-axi-dmac/Makefile | 1 + + drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 1008 +++++++++++++++++++ + drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 334 +++++++ + drivers/dma/edma.c | 6 + + drivers/dma/imx-sdma.c | 21 + + drivers/dma/mediatek/Kconfig | 13 + + drivers/dma/mediatek/Makefile | 1 + + drivers/dma/mediatek/mtk-hsdma.c | 1056 ++++++++++++++++++++ + drivers/dma/pl330.c | 6 +- + drivers/dma/qcom/bam_dma.c | 59 +- + drivers/dma/sh/rcar-dmac.c | 13 +- + drivers/dma/stm32-dma.c | 287 +++++- + include/linux/dmaengine.h | 4 + + 24 files changed, 2871 insertions(+), 74 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/mtk-hsdma.txt + create mode 100644 Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.txt + create mode 100644 drivers/dma/dw-axi-dmac/Makefile + create mode 100644 drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c + create mode 100644 drivers/dma/dw-axi-dmac/dw-axi-dmac.h + create mode 100644 drivers/dma/mediatek/Kconfig + create mode 100644 drivers/dma/mediatek/Makefile + create mode 100644 drivers/dma/mediatek/mtk-hsdma.c +Merging cgroup/for-next (d1897c9538ed cgroup: fix rule checking for threaded mode switching) +$ git merge cgroup/for-next +Already up to date. +Merging scsi/for-next (2e1f44f6ad80 Merge branch 'fixes' into misc) +$ git merge scsi/for-next +Already up to date. +$ git am -3 ../patches/0001-scsi-qla2xxx-merge-fix-in-qla_gs.c.patch +Applying: scsi: qla2xxx: merge fix in qla_gs.c +Using index info to reconstruct a base tree... +M drivers/scsi/qla2xxx/qla_gs.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging scsi-mkp/for-next (e5ad16982403 scsi: fnic: fix spelling mistake: "abord" -> "abort") +$ git merge scsi-mkp/for-next +Auto-merging drivers/scsi/ufs/ufshcd.c +Merge made by the 'recursive' strategy. + drivers/scsi/fnic/fnic_trace.c | 2 +- + drivers/scsi/ufs/ufshcd.c | 40 ++++++++++++++++++++++++++++++++++++++++ + include/scsi/scsi_dbg.h | 2 -- + include/trace/events/ufs.h | 27 +++++++++++++++++++++++++++ + 4 files changed, 68 insertions(+), 3 deletions(-) +Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker) +$ git merge target-updates/for-next +Already up to date. +Merging target-bva/for-next (4fbd8d194f06 Linux 4.15-rc1) +$ git merge target-bva/for-next +Already up to date. +Merging libata/for-next (fd17ed684b6e Revert "ata: ahci-platform: add reset control support") +$ git merge libata/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ata/ahci-platform.txt | 1 - + drivers/ata/ahci.h | 1 - + drivers/ata/libahci_platform.c | 24 +++------------------- + 3 files changed, 3 insertions(+), 23 deletions(-) +Merging vhost/linux-next (dc32bb678e10 vhost: add vsock compat ioctl) +$ git merge vhost/linux-next +Already up to date. +Merging rpmsg/for-next (191d228609da Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Resolved 'samples/Makefile' using previous resolution. +Auto-merging samples/Makefile +CONFLICT (content): Merge conflict in samples/Makefile +Auto-merging samples/Kconfig +Auto-merging drivers/soc/qcom/Kconfig +Auto-merging drivers/gpu/drm/msm/adreno/a5xx_gpu.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5ba446e2e3ca] Merge remote-tracking branch 'rpmsg/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 4 +- + drivers/media/platform/qcom/venus/firmware.c | 2 +- + drivers/remoteproc/Kconfig | 19 + + drivers/remoteproc/Makefile | 1 + + drivers/remoteproc/imx_rproc.c | 23 +- + drivers/remoteproc/qcom_adsp_pil.c | 20 +- + drivers/remoteproc/qcom_common.c | 56 ++- + drivers/remoteproc/qcom_common.h | 23 + + drivers/remoteproc/qcom_q6v5_pil.c | 9 +- + drivers/remoteproc/qcom_sysmon.c | 579 +++++++++++++++++++++++++ + drivers/remoteproc/qcom_wcnss.c | 11 +- + drivers/remoteproc/remoteproc_core.c | 152 ++++++- + drivers/remoteproc/remoteproc_internal.h | 7 +- + drivers/rpmsg/qcom_glink_native.c | 18 +- + drivers/rpmsg/qcom_glink_smem.c | 3 +- + drivers/rpmsg/qcom_smd.c | 51 ++- + drivers/rpmsg/rpmsg_core.c | 2 +- + drivers/soc/qcom/Kconfig | 2 +- + drivers/soc/qcom/mdt_loader.c | 7 +- + include/linux/remoteproc.h | 27 +- + include/linux/soc/qcom/mdt_loader.h | 3 +- + samples/Kconfig | 10 + + samples/Makefile | 2 +- + samples/qmi/Makefile | 1 + + samples/qmi/qmi_sample_client.c | 622 +++++++++++++++++++++++++++ + 25 files changed, 1576 insertions(+), 78 deletions(-) + create mode 100644 drivers/remoteproc/qcom_sysmon.c + create mode 100644 samples/qmi/Makefile + create mode 100644 samples/qmi/qmi_sample_client.c +Merging gpio/for-next (348f3cde84ab gpio: Add Spreadtrum PMIC EIC driver support) +$ git merge gpio/for-next +Already up to date. +Merging pinctrl/for-next (4fc97ef94bbf pinctrl: uniphier: add UART hardware flow control pin-mux settings) +$ git merge pinctrl/for-next +Already up to date. +Merging pinctrl-samsung/for-next (7928b2cbe55b Linux 4.16-rc1) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (6873842235d6 pwm: rcar: Add suspend/resume support) +$ git merge pwm/for-next +Auto-merging drivers/pwm/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pwm/ingenic,jz47xx-pwm.txt | 25 ++++++++++ + .../devicetree/bindings/pwm/pwm-stm32-lp.txt | 3 ++ + .../devicetree/bindings/pwm/pwm-sun4i.txt | 2 + + .../devicetree/bindings/pwm/renesas,pwm-rcar.txt | 11 ++-- + .../devicetree/bindings/pwm/renesas,tpu-pwm.txt | 10 ++-- + drivers/pwm/Kconfig | 6 +-- + drivers/pwm/pwm-atmel-tcb.c | 1 - + drivers/pwm/pwm-imx.c | 3 +- + drivers/pwm/pwm-jz4740.c | 41 ++++++++++++++- + drivers/pwm/pwm-mediatek.c | 36 +++++++++++--- + drivers/pwm/pwm-puv3.c | 4 +- + drivers/pwm/pwm-rcar.c | 58 +++++++++++++++++++--- + drivers/pwm/pwm-stm32-lp.c | 5 +- + drivers/pwm/pwm-stm32.c | 22 ++++++-- + drivers/pwm/pwm-sun4i.c | 38 +++++--------- + drivers/pwm/sysfs.c | 3 +- + 16 files changed, 205 insertions(+), 63 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pwm/ingenic,jz47xx-pwm.txt +Merging userns/for-next (4be33329d46f m68k: Verify the offsets in struct siginfo never change.) +$ git merge userns/for-next +Already up to date. +Merging ktest/for-next (c2d84ddb338c ktest.pl: Add MAIL_COMMAND option to define how to send email) +$ git merge ktest/for-next +Auto-merging tools/testing/ktest/ktest.pl +Merge made by the 'recursive' strategy. + tools/testing/ktest/config-bisect.pl | 770 +++++++++++++++++++++++++++++++++++ + tools/testing/ktest/ktest.pl | 531 ++++++++++++------------ + tools/testing/ktest/sample.conf | 60 +++ + 3 files changed, 1090 insertions(+), 271 deletions(-) + create mode 100755 tools/testing/ktest/config-bisect.pl +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 (6aa69043d9f3 selftests/intel_pstate: Fix build rule for x86) +$ git merge kselftest/next +Already up to date. +Merging y2038/y2038 (ce380619fab9 Merge tag 'please-pull-ia64_misc' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux) +$ 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 (7e7408725e0d coresight: use put_device() instead of kfree()) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging rtc/rtc-next (1485991c0246 rtc: snvs: Fix usage of snvs_rtc_enable) +$ git merge rtc/rtc-next +Auto-merging drivers/rtc/rtc-cmos.c +Auto-merging drivers/rtc/rtc-ab-b5ze-s3.c +Auto-merging drivers/rtc/Makefile +Auto-merging drivers/rtc/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-rtc | 16 +- + .../devicetree/bindings/rtc/isil,isl12026.txt | 28 ++ + MAINTAINERS | 2 +- + drivers/char/rtc.c | 83 ---- + drivers/rtc/Kconfig | 13 +- + drivers/rtc/Makefile | 1 + + drivers/rtc/class.c | 77 +++- + drivers/rtc/hctosys.c | 5 + + drivers/rtc/interface.c | 107 +++++ + drivers/rtc/nvmem.c | 29 +- + drivers/rtc/rtc-88pm80x.c | 4 +- + drivers/rtc/rtc-88pm860x.c | 4 +- + drivers/rtc/rtc-ab-b5ze-s3.c | 4 +- + drivers/rtc/rtc-ab3100.c | 2 +- + drivers/rtc/rtc-ab8500.c | 57 +-- + drivers/rtc/rtc-abx80x.c | 6 +- + drivers/rtc/rtc-ac100.c | 26 +- + drivers/rtc/rtc-at91sam9.c | 1 + + drivers/rtc/rtc-au1xxx.c | 2 +- + drivers/rtc/rtc-bq32k.c | 8 +- + drivers/rtc/rtc-brcmstb-waketimer.c | 3 + + drivers/rtc/rtc-cmos.c | 87 ++-- + drivers/rtc/rtc-coh901331.c | 2 +- + drivers/rtc/rtc-core.h | 8 - + drivers/rtc/rtc-cpcap.c | 2 +- + drivers/rtc/rtc-cros-ec.c | 8 +- + drivers/rtc/rtc-da9052.c | 3 +- + drivers/rtc/rtc-da9055.c | 2 +- + drivers/rtc/rtc-da9063.c | 2 +- + drivers/rtc/rtc-ds1216.c | 2 +- + drivers/rtc/rtc-ds1286.c | 2 +- + drivers/rtc/rtc-ds1302.c | 7 +- + drivers/rtc/rtc-ds1305.c | 24 +- + drivers/rtc/rtc-ds1307.c | 32 +- + drivers/rtc/rtc-ds1343.c | 185 ++------ + drivers/rtc/rtc-ds1347.c | 2 +- + drivers/rtc/rtc-ds1390.c | 2 +- + drivers/rtc/rtc-ds1511.c | 26 +- + drivers/rtc/rtc-ds1553.c | 78 ++-- + drivers/rtc/rtc-ds1685.c | 2 +- + drivers/rtc/rtc-ds1742.c | 75 ++- + drivers/rtc/rtc-ds2404.c | 2 +- + drivers/rtc/rtc-ds3232.c | 2 +- + drivers/rtc/rtc-efi.c | 2 +- + drivers/rtc/rtc-fm3130.c | 3 +- + drivers/rtc/rtc-goldfish.c | 2 + + drivers/rtc/rtc-isl12022.c | 20 +- + drivers/rtc/rtc-isl12026.c | 501 +++++++++++++++++++++ + drivers/rtc/rtc-isl1208.c | 47 +- + drivers/rtc/rtc-jz4740.c | 2 +- + drivers/rtc/rtc-lib.c | 8 +- + drivers/rtc/rtc-lpc24xx.c | 2 +- + drivers/rtc/rtc-lpc32xx.c | 2 +- + drivers/rtc/rtc-ls1x.c | 2 +- + drivers/rtc/rtc-m41t80.c | 42 +- + drivers/rtc/rtc-m41t93.c | 2 +- + drivers/rtc/rtc-m41t94.c | 3 +- + drivers/rtc/rtc-m48t35.c | 2 +- + drivers/rtc/rtc-m48t59.c | 61 ++- + drivers/rtc/rtc-m48t86.c | 25 +- + drivers/rtc/rtc-max6900.c | 19 +- + drivers/rtc/rtc-max6902.c | 2 +- + drivers/rtc/rtc-max6916.c | 2 +- + drivers/rtc/rtc-max77686.c | 4 +- + drivers/rtc/rtc-max8997.c | 2 +- + drivers/rtc/rtc-max8998.c | 2 +- + drivers/rtc/rtc-mc13xxx.c | 2 +- + drivers/rtc/rtc-mcp795.c | 4 +- + drivers/rtc/rtc-mpc5121.c | 2 +- + drivers/rtc/rtc-mrst.c | 4 +- + drivers/rtc/rtc-msm6242.c | 2 +- + drivers/rtc/rtc-mt7622.c | 3 +- + drivers/rtc/rtc-mv.c | 14 +- + drivers/rtc/rtc-mxc_v2.c | 2 +- + drivers/rtc/rtc-nuc900.c | 14 +- + drivers/rtc/rtc-omap.c | 6 +- + drivers/rtc/rtc-pcap.c | 2 +- + drivers/rtc/rtc-pcf2123.c | 2 +- + drivers/rtc/rtc-pcf2127.c | 2 +- + drivers/rtc/rtc-pcf50633.c | 2 +- + drivers/rtc/rtc-pcf85063.c | 20 +- + drivers/rtc/rtc-pcf8523.c | 2 +- + drivers/rtc/rtc-pcf85363.c | 205 ++++++++- + drivers/rtc/rtc-pic32.c | 2 +- + drivers/rtc/rtc-pm8xxx.c | 55 ++- + drivers/rtc/rtc-ps3.c | 2 +- + drivers/rtc/rtc-r7301.c | 2 +- + drivers/rtc/rtc-r9701.c | 2 +- + drivers/rtc/rtc-rk808.c | 25 +- + drivers/rtc/rtc-rp5c01.c | 67 ++- + drivers/rtc/rtc-rs5c348.c | 5 - + drivers/rtc/rtc-rs5c372.c | 24 +- + drivers/rtc/rtc-rv8803.c | 33 +- + drivers/rtc/rtc-rx4581.c | 6 +- + drivers/rtc/rtc-rx6110.c | 2 +- + drivers/rtc/rtc-rx8010.c | 2 +- + drivers/rtc/rtc-rx8025.c | 2 +- + drivers/rtc/rtc-rx8581.c | 6 +- + drivers/rtc/rtc-s35390a.c | 38 +- + drivers/rtc/rtc-s3c.c | 2 +- + drivers/rtc/rtc-s5m.c | 27 +- + drivers/rtc/rtc-sc27xx.c | 2 +- + drivers/rtc/rtc-sh.c | 2 +- + drivers/rtc/rtc-sirfsoc.c | 18 - + drivers/rtc/rtc-snvs.c | 15 +- + drivers/rtc/rtc-spear.c | 12 +- + drivers/rtc/rtc-st-lpc.c | 16 - + drivers/rtc/rtc-starfire.c | 2 +- + drivers/rtc/rtc-stk17ta8.c | 74 ++- + drivers/rtc/rtc-sun6i.c | 2 +- + drivers/rtc/rtc-sunxi.c | 2 +- + drivers/rtc/rtc-sysfs.c | 12 + + drivers/rtc/rtc-tegra.c | 4 - + drivers/rtc/rtc-tps6586x.c | 2 +- + drivers/rtc/rtc-tx4939.c | 95 ++-- + drivers/rtc/rtc-wm831x.c | 2 +- + drivers/rtc/rtc-xgene.c | 2 +- + drivers/rtc/rtc-zynqmp.c | 2 +- + drivers/rtc/systohc.c | 2 +- + include/linux/mfd/samsung/rtc.h | 11 - + include/linux/rtc.h | 29 +- + include/trace/events/rtc.h | 206 +++++++++ + 122 files changed, 1809 insertions(+), 1083 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/isil,isl12026.txt + create mode 100644 drivers/rtc/rtc-isl12026.c + create mode 100644 include/trace/events/rtc.h +Merging nvdimm/libnvdimm-for-next (e13e75b86ef2 Merge branch 'for-4.17/dax' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Auto-merging include/linux/fs.h +Auto-merging fs/xfs/xfs_iops.c +Auto-merging fs/xfs/xfs_aops.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext2/inode.c +Auto-merging fs/block_dev.c +Auto-merging drivers/nvdimm/pmem.c +Auto-merging drivers/nvdimm/nd.h +Auto-merging drivers/md/dm.c +Auto-merging drivers/md/dm-stripe.c +Auto-merging drivers/md/dm-log-writes.c +Auto-merging drivers/md/dm-linear.c +Auto-merging drivers/dax/device.c +Auto-merging drivers/acpi/nfit/core.c +Auto-merging arch/powerpc/platforms/powernv/opal.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pmem/pmem-region.txt | 65 ++ + MAINTAINERS | 8 + + arch/powerpc/platforms/powernv/opal.c | 3 + + drivers/acpi/nfit/core.c | 679 ++++++++++----------- + drivers/acpi/nfit/mce.c | 5 +- + drivers/acpi/nfit/nfit.h | 22 +- + drivers/dax/Kconfig | 5 +- + drivers/dax/device.c | 38 +- + drivers/dax/pmem.c | 18 +- + drivers/dax/super.c | 15 +- + drivers/md/Kconfig | 2 +- + drivers/md/dm-linear.c | 6 + + drivers/md/dm-log-writes.c | 95 +-- + drivers/md/dm-stripe.c | 6 + + drivers/md/dm.c | 10 +- + drivers/nvdimm/Kconfig | 13 +- + drivers/nvdimm/Makefile | 1 + + drivers/nvdimm/btt_devs.c | 21 +- + drivers/nvdimm/bus.c | 14 +- + drivers/nvdimm/claim.c | 2 +- + drivers/nvdimm/core.c | 6 +- + drivers/nvdimm/dax_devs.c | 5 +- + drivers/nvdimm/dimm.c | 8 +- + drivers/nvdimm/dimm_devs.c | 7 +- + drivers/nvdimm/label.c | 85 +-- + drivers/nvdimm/label.h | 2 +- + drivers/nvdimm/namespace_devs.c | 42 +- + drivers/nvdimm/nd.h | 1 - + drivers/nvdimm/of_pmem.c | 119 ++++ + drivers/nvdimm/pfn_devs.c | 25 +- + drivers/nvdimm/pmem.c | 14 +- + drivers/nvdimm/region.c | 4 +- + drivers/nvdimm/region_devs.c | 9 + + drivers/s390/block/Kconfig | 2 +- + fs/block_dev.c | 5 - + fs/dax.c | 146 +++-- + fs/ext2/ext2.h | 1 + + fs/ext2/inode.c | 46 +- + fs/ext2/namei.c | 18 +- + fs/ext4/inode.c | 42 +- + fs/libfs.c | 39 ++ + fs/xfs/xfs_aops.c | 34 +- + fs/xfs/xfs_aops.h | 1 + + fs/xfs/xfs_iops.c | 5 +- + include/linux/dax.h | 42 +- + include/linux/fs.h | 4 + + include/linux/libnvdimm.h | 4 + + include/linux/nd.h | 6 + + tools/testing/nvdimm/test/nfit.c | 239 +++++--- + tools/testing/nvdimm/test/nfit_test.h | 16 + + 50 files changed, 1217 insertions(+), 788 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pmem/pmem-region.txt + create mode 100644 drivers/nvdimm/of_pmem.c +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 (84e10623c0b9 dt-bindings: at24: add Renesas R1EX24128) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (53c3677c56c7 ntb: intel: change references of skx to gen3) +$ git merge ntb/ntb-next +Auto-merging drivers/ntb/hw/intel/ntb_hw_gen1.c +Merge made by the 'recursive' strategy. + drivers/ntb/hw/intel/Makefile | 1 + + .../ntb/hw/intel/{ntb_hw_intel.c => ntb_hw_gen1.c} | 713 ++------------------- + drivers/ntb/hw/intel/ntb_hw_gen1.h | 182 ++++++ + drivers/ntb/hw/intel/ntb_hw_gen3.c | 597 +++++++++++++++++ + drivers/ntb/hw/intel/ntb_hw_gen3.h | 110 ++++ + drivers/ntb/hw/intel/ntb_hw_intel.h | 203 ++---- + 6 files changed, 997 insertions(+), 809 deletions(-) + rename drivers/ntb/hw/intel/{ntb_hw_intel.c => ntb_hw_gen1.c} (74%) + create mode 100644 drivers/ntb/hw/intel/ntb_hw_gen1.h + create mode 100644 drivers/ntb/hw/intel/ntb_hw_gen3.c + create mode 100644 drivers/ntb/hw/intel/ntb_hw_gen3.h +Merging kspp/for-next/kspp (0adb32858b0b Linux 4.16) +$ git merge kspp/for-next/kspp +Already up to date. +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 (56c7680f4bf2 ipc/shm.c: shm_split(): remove unneeded test for NULL shm_file_data.vm_ops) +$ git merge --no-ff akpm-current/current +Auto-merging tools/testing/selftests/Makefile +Auto-merging security/smack/smack_lsm.c +Auto-merging security/selinux/hooks.c +Auto-merging security/apparmor/lsm.c +Auto-merging mm/backing-dev.c +Auto-merging lib/vsprintf.c +Auto-merging lib/Makefile +Auto-merging kernel/params.c +Auto-merging kernel/panic.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging init/main.c +Auto-merging include/linux/sched/signal.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/backing-dev.h +Auto-merging fs/ocfs2/dlmglue.c +Auto-merging fs/exec.c +Auto-merging fs/btrfs/tree-checker.c +Auto-merging drivers/of/unittest.c +Auto-merging arch/sparc/kernel/sys_sparc_64.c +Auto-merging MAINTAINERS +Auto-merging .gitignore +Merge made by the 'recursive' strategy. + .clang-format | 429 +++++++++++++++ + .gitignore | 1 + + Documentation/ABI/testing/sysfs-class-bdi | 8 + + Documentation/cgroup-v2.txt | 74 +++ + Documentation/process/4.Coding.rst | 8 + + Documentation/process/clang-format.rst | 185 +++++++ + Documentation/process/coding-style.rst | 8 + + Documentation/sysctl/kernel.txt | 54 +- + Documentation/sysctl/vm.txt | 5 +- + Documentation/vm/hmm.txt | 360 ++++++------- + MAINTAINERS | 3 +- + arch/arm/include/asm/page.h | 2 + + arch/arm/mm/dma-mapping.c | 16 +- + arch/arm/mm/mmap.c | 14 +- + arch/arm64/mm/mmap.c | 14 +- + arch/mips/mm/mmap.c | 14 +- + arch/parisc/kernel/sys_parisc.c | 16 +- + arch/powerpc/mm/mmap.c | 28 +- + arch/powerpc/mm/mmu_context_iommu.c | 3 +- + arch/s390/mm/mmap.c | 15 +- + arch/sparc/kernel/sys_sparc_64.c | 4 +- + arch/x86/mm/mmap.c | 18 +- + block/genhd.c | 2 +- + drivers/base/memory.c | 7 +- + drivers/input/touchscreen/cyttsp4_core.c | 2 +- + drivers/of/unittest.c | 2 +- + drivers/rapidio/rio-scan.c | 6 +- + fs/Kconfig | 3 + + fs/autofs4/waitq.c | 29 +- + fs/binfmt_aout.c | 1 + + fs/binfmt_elf.c | 1 + + fs/binfmt_elf_fdpic.c | 1 + + fs/binfmt_flat.c | 1 + + fs/btrfs/tree-checker.c | 3 +- + fs/dcache.c | 42 +- + fs/exec.c | 28 +- + fs/exofs/ore.c | 84 +-- + fs/exofs/ore_raid.c | 73 ++- + fs/exofs/super.c | 23 +- + fs/fcntl.c | 2 +- + fs/ocfs2/dlmglue.c | 2 +- + fs/ocfs2/journal.c | 51 +- + fs/ocfs2/stackglue.c | 6 - + fs/ocfs2/stackglue.h | 3 - + fs/proc/array.c | 39 +- + fs/proc/base.c | 21 +- + fs/proc/cmdline.c | 3 +- + fs/proc/generic.c | 109 ++-- + fs/proc/inode.c | 67 ++- + fs/proc/internal.h | 22 +- + fs/proc/meminfo.c | 15 +- + fs/proc/proc_net.c | 9 +- + fs/proc/proc_sysctl.c | 14 +- + fs/proc/root.c | 21 +- + fs/proc/task_mmu.c | 153 +++--- + fs/reiserfs/journal.c | 2 +- + fs/seq_file.c | 134 +++-- + include/linux/backing-dev.h | 2 +- + include/linux/binfmts.h | 3 + + include/linux/cgroup-defs.h | 5 + + include/linux/compiler-clang.h | 3 - + include/linux/compiler-gcc.h | 12 +- + include/linux/hmm.h | 222 ++++---- + include/linux/hugetlb.h | 27 +- + include/linux/kernel.h | 26 +- + include/linux/memcontrol.h | 71 ++- + include/linux/memfd.h | 16 + + include/linux/memory_hotplug.h | 3 - + include/linux/migrate.h | 7 +- + include/linux/mm.h | 1 + + include/linux/mmzone.h | 3 +- + include/linux/oom.h | 12 +- + include/linux/page-isolation.h | 3 +- + include/linux/sched/mm.h | 6 +- + include/linux/sched/signal.h | 3 + + include/linux/seq_file.h | 6 + + include/linux/shmem_fs.h | 13 - + include/linux/shrinker.h | 2 +- + include/linux/swap.h | 13 +- + include/linux/thread_info.h | 6 +- + include/linux/utsname.h | 6 + + include/linux/vmstat.h | 11 + + include/trace/events/vmscan.h | 24 +- + include/uapi/linux/msg.h | 1 + + include/uapi/linux/prctl.h | 4 + + include/uapi/linux/sem.h | 1 + + include/uapi/linux/shm.h | 5 +- + init/do_mounts_rd.c | 4 +- + init/main.c | 3 + + ipc/msg.c | 17 +- + ipc/sem.c | 17 +- + ipc/shm.c | 25 +- + ipc/util.c | 1 + + kernel/cgroup/cgroup.c | 13 +- + kernel/cred.c | 1 + + kernel/exit.c | 4 + + kernel/fork.c | 5 +- + kernel/panic.c | 63 +-- + kernel/params.c | 4 +- + kernel/sys.c | 11 + + kernel/sysctl.c | 24 +- + kernel/utsname.c | 20 +- + lib/Kconfig.debug | 48 +- + lib/Kconfig.ubsan | 7 + + lib/Makefile | 3 + + lib/list_debug.c | 14 +- + lib/reed_solomon/decode_rs.c | 7 +- + lib/reed_solomon/reed_solomon.c | 5 +- + lib/test_bitmap.c | 10 +- + lib/test_kasan.c | 8 + + lib/test_ubsan.c | 144 ++++++ + lib/vsprintf.c | 22 +- + mm/Makefile | 1 + + mm/backing-dev.c | 54 +- + mm/cma.c | 83 ++- + mm/compaction.c | 7 +- + mm/hmm.c | 573 +++++++++++++-------- + mm/huge_memory.c | 11 +- + mm/internal.h | 5 +- + mm/kasan/kasan.c | 57 +- + mm/khugepaged.c | 18 +- + mm/ksm.c | 7 + + mm/list_lru.c | 7 + + mm/memcontrol.c | 294 ++++++++++- + mm/memfd.c | 342 ++++++++++++ + mm/memory-failure.c | 2 +- + mm/memory.c | 4 +- + mm/memory_hotplug.c | 5 +- + mm/mempolicy.c | 40 +- + mm/migrate.c | 369 ++++++------- + mm/mincore.c | 12 +- + mm/mprotect.c | 9 + + mm/oom_kill.c | 210 +++++--- + mm/page_alloc.c | 115 +++-- + mm/page_isolation.c | 3 +- + mm/page_owner.c | 4 +- + mm/shmem.c | 323 ------------ + mm/slub.c | 57 +- + mm/sparse-vmemmap.c | 1 - + mm/sparse.c | 29 +- + mm/swap_state.c | 16 +- + mm/swapfile.c | 158 ++++-- + mm/util.c | 9 +- + mm/vmscan.c | 186 ++++--- + mm/vmstat.c | 1 + + mm/z3fold.c | 9 +- + net/ipv4/proc.c | 8 +- + net/ipv6/proc.c | 10 +- + scripts/checkpatch.pl | 177 ++++--- + security/apparmor/lsm.c | 1 + + security/selinux/hooks.c | 4 + + security/smack/smack_lsm.c | 3 + + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/proc/.gitignore | 8 + + tools/testing/selftests/proc/Makefile | 13 + + tools/testing/selftests/proc/config | 1 + + tools/testing/selftests/proc/proc-loadavg-001.c | 83 +++ + .../selftests/proc/proc-self-map-files-001.c | 82 +++ + .../selftests/proc/proc-self-map-files-002.c | 85 +++ + tools/testing/selftests/proc/proc-self-syscall.c | 45 ++ + tools/testing/selftests/proc/proc-self-wchan.c | 25 + + tools/testing/selftests/proc/proc-uptime-001.c | 45 ++ + tools/testing/selftests/proc/proc-uptime-002.c | 79 +++ + tools/testing/selftests/proc/proc-uptime.h | 74 +++ + tools/testing/selftests/proc/read.c | 147 ++++++ + 165 files changed, 5048 insertions(+), 2121 deletions(-) + create mode 100644 .clang-format + create mode 100644 Documentation/process/clang-format.rst + create mode 100644 include/linux/memfd.h + create mode 100644 lib/test_ubsan.c + create mode 100644 mm/memfd.c + create mode 100644 tools/testing/selftests/proc/.gitignore + create mode 100644 tools/testing/selftests/proc/Makefile + create mode 100644 tools/testing/selftests/proc/config + create mode 100644 tools/testing/selftests/proc/proc-loadavg-001.c + create mode 100644 tools/testing/selftests/proc/proc-self-map-files-001.c + create mode 100644 tools/testing/selftests/proc/proc-self-map-files-002.c + create mode 100644 tools/testing/selftests/proc/proc-self-syscall.c + create mode 100644 tools/testing/selftests/proc/proc-self-wchan.c + create mode 100644 tools/testing/selftests/proc/proc-uptime-001.c + create mode 100644 tools/testing/selftests/proc/proc-uptime-002.c + create mode 100644 tools/testing/selftests/proc/proc-uptime.h + create mode 100644 tools/testing/selftests/proc/read.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: include/linux/kfifo.h: fix comment +Applying: fs/dcache.c: add cond_resched() in shrink_dentry_list() +Applying: MAINTAINERS: update bouncing aacraid@adaptec.com addresses +Applying: kexec_file: make use of purgatory optional +Applying: kexec_file-make-an-use-of-purgatory-optional-fix +Applying: kexec_file,x86,powerpc: factor out kexec_file_ops functions +Applying: x86: kexec_file: purge system-ram walking from prepare_elf64_headers() +Applying: x86: kexec_file: remove X86_64 dependency from prepare_elf64_headers() +Applying: x86: kexec_file: lift CRASH_MAX_RANGES limit on crash_mem buffer +Applying: x86: kexec_file: clean up prepare_elf64_headers() +Applying: kexec_file, x86: move re-factored code to generic side +Applying: include/linux/kexec.h: silence compile warnings +Applying: kernel/kexec_file.c: remove checks in kexec_purgatory_load +Applying: kernel/kexec_file.c: make purgatory_info->ehdr const +Applying: kernel/kexec_file.c: search symbols in read-only kexec_purgatory +Applying: kernel/kexec_file.c: use read-only sections in arch_kexec_apply_relocations* +Applying: kernel/kexec_file.c: split up __kexec_load_puragory +Applying: kernel/kexec_file.c: remove unneeded for-loop in kexec_purgatory_setup_sechdrs +Applying: kernel/kexec_file.c: remove unneeded variables in kexec_purgatory_setup_sechdrs +Applying: kernel/kexec_file.c: remove mis-use of sh_offset field during purgatory load +Applying: kernel/kexec_file.c: allow archs to set purgatory load address +Applying: kernel/kexec_file.c: move purgatories sha256 to common code +Applying: kernel/kexec_file.c: add walk_system_ram_res_rev() +Applying: kernel/kexec_file.c: load kernel at top of system RAM if required +Applying: mm: introduce MAP_FIXED_NOREPLACE +Applying: fs, elf: drop MAP_FIXED usage from elf_map +Applying: elf: enforce MAP_FIXED on overlaying elf segments +Applying: xen, mm: allow deferred page initialization for xen pv domains +Applying: linux/const.h: prefix include guard of uapi/linux/const.h with _UAPI +Applying: linux/const.h: move UL() macro to include/linux/const.h +Applying: linux/const.h: refactor _BITUL and _BITULL a bit +Applying: mm: memcg: remote memcg charging for kmem allocations +Applying: mm: memcg: remote memcg charging for kmem allocations fix +Applying: fs: fsnotify: account fsnotify metadata to kmemcg +Applying: fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix +Applying: radix tree: use GFP_ZONEMASK bits of gfp_t for flags +Applying: mac80211_hwsim: use DEFINE_IDA +Applying: arm64: turn flush_dcache_mmap_lock into a no-op +Applying: unicore32: turn flush_dcache_mmap_lock into a no-op +Applying: export __set_page_dirty +Applying: fscache: use appropriate radix tree accessors +Applying: xarray: add the xa_lock to the radix_tree_root +Applying: page cache: use xa_lock +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 + + b08b6766a4a1...05a8065fb6d7 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (05a8065fb6d7 sparc64: NG4 memset 32 bits overflow) +$ git merge --no-ff akpm/master +Auto-merging lib/sha256.c +Auto-merging include/linux/sha256.h +Merge made by the 'recursive' strategy. + Documentation/cgroup-v1/memory.txt | 2 +- + Documentation/vm/page_migration | 14 +- + MAINTAINERS | 4 +- + arch/alpha/include/uapi/asm/mman.h | 1 + + arch/arm/include/asm/cacheflush.h | 6 +- + arch/arm/include/asm/memory.h | 6 - + arch/arm64/include/asm/cacheflush.h | 6 +- + arch/arm64/include/asm/memory.h | 6 - + arch/mips/include/uapi/asm/mman.h | 1 + + arch/nios2/include/asm/cacheflush.h | 6 +- + arch/parisc/include/asm/cacheflush.h | 6 +- + arch/parisc/include/uapi/asm/mman.h | 1 + + arch/powerpc/Kconfig | 3 + + arch/powerpc/include/asm/kexec.h | 2 +- + arch/powerpc/kernel/kexec_elf_64.c | 11 +- + arch/powerpc/kernel/machine_kexec_file_64.c | 39 +- + arch/sparc/lib/NG4memset.S | 26 +- + arch/unicore32/include/asm/cacheflush.h | 6 +- + arch/unicore32/include/asm/memory.h | 6 - + arch/x86/Kconfig | 3 + + arch/x86/include/asm/kexec-bzimage64.h | 2 +- + arch/x86/include/asm/x86_init.h | 2 + + arch/x86/kernel/crash.c | 334 +++---------- + arch/x86/kernel/kexec-bzimage64.c | 10 +- + arch/x86/kernel/machine_kexec_64.c | 111 ++--- + arch/x86/kernel/x86_init.c | 1 + + arch/x86/mm/init_32.c | 1 + + arch/x86/mm/init_64.c | 1 + + arch/x86/purgatory/Makefile | 3 + + arch/x86/purgatory/purgatory.c | 2 +- + arch/x86/purgatory/string.c | 12 + + arch/x86/xen/mmu_pv.c | 38 +- + arch/xtensa/include/uapi/asm/mman.h | 1 + + drivers/media/platform/sti/delta/delta-ipc.c | 4 +- + drivers/net/wireless/mac80211_hwsim.c | 2 +- + drivers/staging/lustre/lustre/llite/glimpse.c | 2 +- + drivers/staging/lustre/lustre/mdc/mdc_request.c | 8 +- + fs/afs/write.c | 9 +- + fs/binfmt_elf.c | 22 +- + fs/btrfs/compression.c | 2 +- + fs/btrfs/extent_io.c | 16 +- + fs/buffer.c | 16 +- + fs/cifs/file.c | 9 +- + fs/dax.c | 124 +++-- + fs/dcache.c | 5 +- + fs/f2fs/data.c | 6 +- + fs/f2fs/dir.c | 6 +- + fs/f2fs/gc.c | 2 +- + fs/f2fs/inline.c | 6 +- + fs/f2fs/node.c | 8 +- + fs/fs-writeback.c | 22 +- + fs/fscache/cookie.c | 2 +- + fs/fscache/object.c | 2 +- + fs/inode.c | 11 +- + fs/nilfs2/btnode.c | 20 +- + fs/nilfs2/page.c | 22 +- + fs/notify/dnotify/dnotify.c | 5 +- + fs/notify/fanotify/fanotify.c | 6 +- + fs/notify/fanotify/fanotify_user.c | 5 +- + fs/notify/group.c | 4 + + fs/notify/inotify/inotify_fsnotify.c | 2 +- + fs/notify/inotify/inotify_user.c | 5 +- + fs/xfs/xfs_aops.c | 15 +- + include/linux/backing-dev.h | 14 +- + include/linux/const.h | 9 + + include/linux/fs.h | 8 +- + include/linux/fsnotify_backend.h | 12 +- + include/linux/idr.h | 22 +- + include/linux/ioport.h | 3 + + include/linux/kexec.h | 81 ++-- + include/linux/kfifo.h | 8 +- + include/linux/memcontrol.h | 7 + + include/linux/mm.h | 3 +- + include/linux/pagemap.h | 4 +- + include/linux/radix-tree.h | 14 +- + include/linux/sched.h | 3 + + include/linux/sched/mm.h | 24 + + {arch/x86/purgatory => include/linux}/sha256.h | 11 +- + include/linux/slab.h | 59 +++ + include/linux/xarray.h | 24 + + include/uapi/asm-generic/mman-common.h | 3 + + include/uapi/linux/const.h | 13 +- + kernel/fork.c | 3 + + kernel/kexec_file.c | 621 ++++++++++++++++-------- + kernel/pid.c | 2 +- + kernel/resource.c | 63 +++ + lib/radix-tree.c | 3 +- + {arch/x86/purgatory => lib}/sha256.c | 4 +- + mm/filemap.c | 84 ++-- + mm/huge_memory.c | 10 +- + mm/khugepaged.c | 49 +- + mm/memcontrol.c | 29 +- + mm/memfd.c | 18 +- + mm/migrate.c | 32 +- + mm/mmap.c | 11 + + mm/page-writeback.c | 43 +- + mm/page_alloc.c | 4 - + mm/readahead.c | 2 +- + mm/rmap.c | 4 +- + mm/shmem.c | 42 +- + mm/swap_state.c | 17 +- + mm/truncate.c | 22 +- + mm/vmscan.c | 12 +- + mm/workingset.c | 22 +- + tools/include/linux/spinlock.h | 1 + + tools/testing/radix-tree/linux/gfp.h | 1 + + 106 files changed, 1329 insertions(+), 1133 deletions(-) + create mode 100644 include/linux/const.h + rename {arch/x86/purgatory => include/linux}/sha256.h (62%) + create mode 100644 include/linux/xarray.h + rename {arch/x86/purgatory => lib}/sha256.c (99%) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..7d7774a9451e --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,15 @@ +Importing dmi based on 4.16 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 0adb32858b0bddf4ada5f364a84ed60b196dbcda +HEAD is now at 0adb32858b0b Linux 4.16 +$ git am -s --patch-format=mbox ../quilt/dmi/firmware-dmi_scan-fix-uuid-length-check.patch +Applying: firmware: dmi_scan: Fix UUID length safety check +$ git am -s --patch-format=mbox ../quilt/dmi/firmware-dmi_scan-add-dmi_oem_string-support-to-dmi_matches.patch +Applying: firmware: dmi_scan: add DMI_OEM_STRING support to dmi_matches +$ git am -s --patch-format=mbox ../quilt/dmi/firmware-dmi_scan-uuid-lowercase.patch +Applying: firmware: dmi_scan: Use lowercase letters for UUID +$ cd /home/sfr/kernels/next/next +$ git fetch -f ../quilt-tmp master:dmi/master +From ../quilt-tmp + + eb693e35e850...1efd78fbd137 master -> dmi/master (forced update) diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..fa3e667d0e86 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20180410 |