diff options
| -rw-r--r-- | Next/SHA1s | 260 | ||||
| -rw-r--r-- | Next/Trees | 262 | ||||
| -rw-r--r-- | Next/merge.log | 2593 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 3118 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..2e79370f2bb9 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,260 @@ +Name SHA1 +---- ---- +origin 87ef12027b9b1dd0e0b12cf311fbcb19f9d92539 +fixes 147a89bc71e7db40f011454a40add7ff2d10f8d8 +kbuild-current 28913ee8191adf4bbc01cbfb9ee18cca782ab141 +arc-current 661e50bc853209e41a5c14a290ca4decc43cbfd1 +arm-current fe680ca02c1e32d8b89ecac293a2ee10c3a9da36 +arm64-fixes b2d71b3cda19831ec67f49d7c6ba0214d9367b29 +m68k-current ecd685580c8feb9a91c758257a66355a673594d9 +powerpc-fixes 56376c5864f8ff4ba7c78a80ae857eee3b1d23d8 +sparc 17dec0a949153d9ac00760ba2f5b78cb583e995f +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net 1255fcb2a655f05e02f3a74675a6d6525f187afd +bpf 0a0a7e00a250c117f0c7ad8e1184abd98e7c098a +ipsec b48c05ab5d32af2af4bc63851c153782d1c6ba42 +netfilter d71efb599ad42ef1e564c652d8084252bdc85edf +ipvs 765cca91b895c8b747bca0b5fa54d1dc85c867a7 +wireless-drivers 77e30e10ee28a53c8af95809866ee8493583e29a +mac80211 83826469e36b9c8219f88c16713a755b2cea6ff5 +rdma-fixes 60cc43fc888428bb2f18f08997432d426a243338 +sound-current 8a56ef4f3ffba9ebf4967b61ef600b0a7ba10f11 +pci-current 60cc43fc888428bb2f18f08997432d426a243338 +driver-core.current ed4564babeeee4fb19fe4ec0beabe29754e380f9 +tty.current 60cc43fc888428bb2f18f08997432d426a243338 +usb.current 60cc43fc888428bb2f18f08997432d426a243338 +usb-gadget-fixes c6ba5084ce0d00d4a005b0577d9e764d39b638e1 +usb-serial-fixes 470b5d6f0cf4674be2d1ec94e54283a1770b6a1a +usb-chipidea-fixes 964728f9f407eca0b417fdf8e784b7a76979490c +phy 60cc43fc888428bb2f18f08997432d426a243338 +staging.current edf5c17d866eada03b8750368a12dc3def77d608 +char-misc.current 60cc43fc888428bb2f18f08997432d426a243338 +input-current 664b0bae0b87f69bc9deb098f5e0158b9cf18e04 +crypto-current f444ec106407d600f17fa1a4bd14f84577401dec +ide 8e44e6600caa7b96a5b71ae36c8829db753c2d70 +vfio-fixes 834814e80268c818f354c8f402e0c6604ed75589 +kselftest-fixes 8bf24e8319613bbe950d4188682b3a0d9441b76b +modules-fixes be71eda5383faa663efdba9ef54a6b8255e3c7f0 +backlight-fixes 8ff5cbc6e3c5c2855245c014f3ba572ddfc5ab0f +nand-fixes ee02f73e04c0e690600f621a3a1d2245834af7fe +spi-nor-fixes 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +mfd-fixes 107b7d9fa94c4692d9104243f0e793e2a4e1366e +v4l-dvb-fixes a95845ba184b854106972f5d8f50354c2d272c06 +reset-fixes f450f28e70a2378d9d6ded0932fe480055888cfa +mips-fixes b3d7e55c3f886493235bfee08e1e5a4a27cbcce8 +kvm-fixes c18bb396d3d261ebbb4efbc05129c5d354c541e4 +kvms390-fixes f07afa0462b76a5b9c4f3a43d5ac24fdb86a90c2 +drm-intel-fixes 60cc43fc888428bb2f18f08997432d426a243338 +drm-misc-fixes 7eb2c4dd54ff841f2fe509a84973eb25fa20bda2 +syscalls c9a211951c7c79cfb5de888d7d9550872868b086 +kbuild 60cc43fc888428bb2f18f08997432d426a243338 +leaks 9f84a0f7f1a613335a9aaf0abd5858906752bf93 +uuid c0020756315eebec58310aca42cf9fb73e1322eb +dma-mapping 9e7f06c8beee304ee21b791653fefcd713f48b9a +asm-generic a71e7c44ffb7baea0c0795824afc34cc0bc1a301 +arc 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +arm f592819553caee5625c5eac79eafbdf282908ab6 +arm-perf 44300aed5d28e61aae124c401170ac94c98d2127 +arm-soc cb799267bb65676277fb718cfb42239fe5c6e4fb +actions 61862a89e6acb61e1193c3ad6d4eeab966c470ed +alpine 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +amlogic b9b2e4f8f5fd65a882b9dd56afbde3457f1f2b1d +aspeed 6534b2d0de3693b8508375c2f01951d6eb5c69be +at91 20d3f36b0feaad5ab90ccff77e18c13939065cad +bcm2835 cf172af3be59ccd818960064b30722582a4c7fb5 +imx-mxs 9fa2e1a1fd60c804806470637b6126d014b2c308 +keystone dacf3785016797379dc4bc4ec05f87d746adcaee +mvebu 4c1b45a44e3508372da9dac9d3b701074baa66d5 +omap d1cc5c055f7a5bd996706e790932d8d9a8159189 +reset 0089313d8595b76422b189b44c55556cb1004190 +qcom 186d88395e05eb087d730ff7f8fc6b7f4dbd8d90 +realtek 2b6286eb7ab8b9a22f7238bdaad403badd4a93e9 +renesas 86fbd9bc1ab2e678228795646ee62b69e76f4532 +rockchip aaa7709c6703a271fdc79f0000e0e769b531840c +samsung bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +samsung-krzk 08944e878b7e7f14e311abb9426207923b28545e +sunxi d0715cb8113f7722e695fb56c02230626c4c550a +tegra 6b9b5116227d5841813ede01857e1962fb98bebd +arm64 24534b3511828c66215fdf1533d77a7bf2e1fdb2 +clk 3baba436e3a6fcb5e078df75552c55e6e9ba92bb +clk-samsung 182c084da5d1e4d7c02d913de154cf5167521580 +c6x 85fa2cc51104ee5b529ce85b12f4c8421888544f +m68k a5de04ccf0b553d001d1c1447dfd307f470986b9 +m68knommu 60cc43fc888428bb2f18f08997432d426a243338 +microblaze 70f6283a372bef685fd64564646a3b49a55be1ea +mips ea4d340cbea470247b19ee696e31f102bc64466a +mips-james 3539adf568f59d6f888ea36bea1f0380850d26e5 +nds32 a27fc14219f2e3c4a46ba9177b04d9b52c875532 +nios2 3d9644ef9a0f6c3ca0c1bd2aea1d82e7ea0a7f24 +openrisc d56f3af9e801970d21c57621de3b42bc17eac152 +parisc-hd 41dbee81c875300072f6154d6722f6e8e1353cca +powerpc 60cc43fc888428bb2f18f08997432d426a243338 +fsl c095ff93f901c1620b28dce4d813dd548bc5236b +risc-v 60cc43fc888428bb2f18f08997432d426a243338 +s390 fae764912153065ea55eda47f834e0764a54df94 +sparc-next 17dec0a949153d9ac00760ba2f5b78cb583e995f +sh bf9c7e3d7924f72225f8f9c28438b4a711192ad3 +uml e40238dedb484c8a19f8257e4ef5d77d038f9ad8 +xtensa ae6063c83634cbef7f73ec8a3ab7a6adf5294716 +fscrypt 0b1dfa4cc6c60052b2c30ead316fa84c46d3c43c +befs 55d945e2e4aa148ef38bdfabb9569af78183a539 +btrfs 7c9a09f56a91c4ee5636703d3a95c72710917718 +btrfs-kdave 19d3b4c4bad883271db586763b7d682cdb384059 +ceph e2311baa73a883eb8501c895cc817d3c96c3b896 +cifs 67e72b6a499600a8290e0ddddd156e78bd4f4682 +configfs 6ace4f6bbcfde70278a33c11443ecda3ed0ec1b6 +ecryptfs e86281e700cca8a773f9a572fa406adf2784ba5c +ext3 b1255ee6a289cd62730506246f599262a99ed5d8 +ext4 b025a674fc5d0f1b1d1c87bb85198541c9fc93e3 +f2fs 91bb86e196f605a6a9ece998e2ba7d768208d505 +fuse 5ba24197b94d4070d8c2a17fa4944a55cc39ef03 +jfs 86313903430d08739e391ad51b4865dc3a2bf522 +nfs 60cc43fc888428bb2f18f08997432d426a243338 +nfs-anna 98de9ce6f6660d02aa72d7b9b17696fa68a2ed9b +nfsd 36e000768550d3dc06e22417373be1bc2e262c9a +orangefs 8e9ba5c48ea690060a814fbac6a8c046ab935d79 +overlayfs 16149013f8391d3bd7bcbcbe3bfd2fd06ba110e4 +ubifs b5094b7f135be34630e3ea8a98fa215715d0f29d +xfs 8c81dd46ef3c416b3b95e3020fb90dbd44e6140b +file-locks fa28b25b62baa5e7744523cf6e1217d9f0607cd3 +vfs eb5e8befb894b3fd55037803a724d7bb7687e46e +vfs-miklos 0eb8af4916a540c362a2950e5ab54eca32eb7d58 +printk cdb7e52d960a59f30de853f5dd85574432d6bb50 +pci 60cc43fc888428bb2f18f08997432d426a243338 +pstore e698aaf37f9fac419ac6c1867137cce83c90c80b +hid 00ddd17446aa2ca9ac76b5185bb5ed4b86f23516 +i2c 1eace8344c02c625ee99cc3ffa50187ded2c87b5 +dmi 0a5f08c2f0c74d8f47c2e3bdf362f17622b7f560 +hwmon-staging 3449f321d6ae3bc0caf6f782324fe6374e50e476 +jc_docs 3b443955596e8f9965dbf11bd9bc0554c8b63781 +v4l-dvb 42a182282ea2426d56b2d63be634ee419194c45c +v4l-dvb-next 17dec0a949153d9ac00760ba2f5b78cb583e995f +fbdev 7c9b845e79eadd074820e36d426502a9c54cafcf +pm 1fe43114ea7355ec9f336c942aaf3e74d27483a0 +cpupower 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +idle 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f +opp 4a823c0be80fa996234ebb41c80d40458b1bec1e +thermal b907b408ca64482989cd95dacef804ce509a3673 +thermal-soc 629d835db5019451cdc8f5bafa5ebe93440ca94b +ieee1394 188775181bc05f29372b305ef96485840e351fde +dlm 9250e523592a8ced3ecd14abe29fbb1e036bd7eb +swiotlb 69369f52d28a34c84acb6f2a8a585e743441566a +rdma 60cc43fc888428bb2f18f08997432d426a243338 +net-next bda73d4ec943c4f7479603a59cad09a07c6c729a +bpf-next 97e19cce05e50055dafd1df71bdcbcdc3a7894c5 +ipsec-next cd027a5433d66734097adbd9d262c203471102a3 +netfilter-next 159f02977b2feb18a4bece5e586c838a6d26d44b +nfc-next 4d63adfe12dd9cb61ed8badb4d798955399048c2 +ipvs-next 9a17740e0ea1c9b1edd89836bb27c76272f54641 +wireless-drivers-next 5d1365940a68dd57b031b6e3c07d7d451cd69daf +bluetooth 24557b6607057d5d27d4ad041f5c27590b3370ef +mac80211-next 8db0c433692eda3a0358d72643bd0268b736767c +gfs2 9a38662ba4e2682f3f3e9f3ce02a243b837aa8c6 +mtd 87a73eb5b56fd6e07c8e499fe8608ef2d8912b82 +l2-mtd fe5f31a8010a0cb13e72cfb72905fefa2a41730c +nand 097ccca726ffedb277c104aba45c59d075969e51 +spi-nor e8de85d5a107352ff428f735b0afc8133bcbc3e5 +crypto f444ec106407d600f17fa1a4bd14f84577401dec +drm a10beabba213924d876f2d10ca9351aeab93f58a +drm-panel e4bac408b08437d190785ab1250cc676304ed171 +drm-intel b4615730530be85fc45ab4631c2ad6d8e2d0b97d +drm-tegra 27e92f1f1600c214bf649daddb9b88b68330a8d1 +drm-misc 3131f209468d1514af378dd46eb34123d0af84ff +drm-msm 789d4c300e10eb2096ee83c3497118e67ccc951e +hdlcd f73e8b82531573a198a4d0e5bff0d3256cbbd1d8 +mali-dp 6e810eb508f4b937bc2a718bd4e5cd74cca55500 +sunxi-drm 7dafb83edd3271917458de0ae70586ac63098e2f +imx-drm 22cd2b2b3151f56d9101d08a7eb34777aa469891 +etnaviv 4ed75c3e525598ff1aa6aed09c419c73a4efd2f2 +kconfig bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +regmap e241e3f2bf975788a1b70dff2eb5180ca395b28e +sound 91a8561d0eed710330956a06487f5c888f5ae743 +sound-asoc 9742eab30c26db635c61b402c719ca1aed8c6587 +modules c554b89868015d86cd330d9cc10656c3756352a5 +input 04bb1719c4de94700056241d4c0fe3c1413f5aff +block 667eea5d591b85501e7b36464cfa14bb125d0097 +lightnvm 1c6286f26301ad154a1c10fb6e68925493dd28ba +device-mapper a1c0a8e35b88070c247dc36c63de4549f8efa1b9 +mmc 924178333b63a360987ad64b6a46ca96cd34efdb +kgdb 2cf2f0d5b91fd1b06a6ae260462fc7945ea84add +md 50c35295db950dae16c9ecc59eb70e9c2b6fc167 +mfd b45bf45f1b827d05e8209e2adf35f777ada0c5d4 +backlight ea388d6cffd43d353f9c2b3d711953e7525c7d97 +battery fd73a3e618889877d32e338622a363d04d9be709 +regulator 1dced996ee702e6af82a57c7b6c56b0cceaa6425 +security 0c245cb58731da221e163968b2ea16d7620d5684 +apparmor 588558eb6d0e0b6edfa65a67e906c2ffeba63ff1 +integrity ab60368ab6a452466885ef4edf0cefd089465132 +keys 1e684d3820d8f72d877c0adb521ae17c6fc9bc88 +selinux d141136f523a3a6372d22981bdff7a8906f36fea +tpmdd 6fd6db01dfafe476e13b3343c62861ab86d02bc1 +watchdog 49d4d277ca54e04170d39484c8758a0ea9bca37d +iommu d4f96fd5c249defda290299f9646287dd3df0803 +dwmw2-iommu d8a5b80568a9cb66810e75b182018e9edb68e8ff +vfio da9147140fe3de5a3a3fe5fe7f69739d4f39bea1 +trivial 75a24b822d383489badd343cab4cb171d09f93ef +audit 60cc43fc888428bb2f18f08997432d426a243338 +devicetree 304a39b4bc94525b357083d44d766ff318f208e0 +mailbox 41c0e939d70ddb6860e340e7532df8984783f867 +spi 9d7e5766a8fd17b1f52aa5e1d8846b5fe92633e8 +tip 15a5848cfc2b9bf78dba23018b35d7f69eb7f280 +clockevents 0136c741ff40e03323419feec05fcd594f36a463 +edac 345fb0a9a6340ba0b3b714d62f877fde88c8a755 +edac-amd 6fd052665274b4e7570491ba272f2dbb09cbbcd5 +irqchip aa08192a254d362a4d5317647a81de6996961aef +ftrace 0b3dec05dbbce023f4f25aba975b5d253c313ebb +rcu 3b91e0ea77ce698fc223aeeee7c19ea309268718 +kvm c18bb396d3d261ebbb4efbc05129c5d354c541e4 +kvm-arm dc6ed61d2f824a595033744fc1f3bf4cb98768b5 +kvm-mips dc44abd6aad22411f7f9890e39fd4753dabf0d03 +kvm-ppc 31c8b0d0694a1f7e3b46df0d1341a874ecb5e0de +kvms390 ccc40c53c07ba22cfe711cd625f9f0c77f272ae6 +xen-tip ebf04f331fa15a966262341a7dc6b1a0efd633e4 +percpu b3a5d111994450909158929560906f2c1c6c1d85 +workqueues 1aa3798360db38d3131ac011b50c397a7cdb754e +drivers-x86 60cc43fc888428bb2f18f08997432d426a243338 +chrome-platform 60cc43fc888428bb2f18f08997432d426a243338 +hsi 70d52ba9e57eb93cfe916f7f4d14a09750890ffd +leds 9e50d5fb0d1874e7e8750e58b8ee7a27ed63f748 +ipmi 1211229399b3f9b8b0e337c898efb09695f71c91 +driver-core 60cc43fc888428bb2f18f08997432d426a243338 +usb 60cc43fc888428bb2f18f08997432d426a243338 +usb-gadget 60cc43fc888428bb2f18f08997432d426a243338 +usb-serial 60cc43fc888428bb2f18f08997432d426a243338 +usb-chipidea-next ce4c1b820c5269437ce2e7831f638159b3b83269 +phy-next 60cc43fc888428bb2f18f08997432d426a243338 +tty 60cc43fc888428bb2f18f08997432d426a243338 +char-misc 60cc43fc888428bb2f18f08997432d426a243338 +extcon 60cc43fc888428bb2f18f08997432d426a243338 +staging 60cc43fc888428bb2f18f08997432d426a243338 +mux fa934c06c0f40443566e7cb0d46eac6da65dce48 +slave-dma 72ef08bf651a9fab3b315b8e6d57d19926c77e4d +cgroup d1897c9538edafd4ae6bbd03cc075962ddde2c21 +scsi acc2587b8cf16d8d9fe568ebc0d99899e82c73b5 +scsi-mkp 69589c9bb9c24499ace5158e236bed5906009efa +target-updates 1c130ae00b769a2e2df41bad3d6051ee8234b636 +target-bva 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +libata fd17ed684b6e33312cdcd9270b1fece9df266103 +vhost 3af494dbae480847819e50e491c7b0eaae4de40a +rpmsg 47c4aebb693c85cbf0dbcbd7e81c29f2f5338600 +gpio 348f3cde84ab5b1f53cd3c0eaac1ca99a4dcb148 +pinctrl 4fc97ef94bbfa185d16b3e44199b7559d0668747 +pinctrl-samsung 938a10bb49131f08a0b30cb26648844ec748131e +pwm 6873842235d678a245a378669f35e145df2441b9 +userns 1f5781725dcbb026438e77091c91a94f678c3522 +ktest 6cd110a91f52197e3392809cd43466bfe2c524d0 +random 9e66317d3c92ddaab330c125dfe9d06eee268aff +aio 2a8a98673c13cb2a61a6476153acf8344adfa992 +kselftest 60cc43fc888428bb2f18f08997432d426a243338 +y2038 ad17d1754e88980a64b13af59fb16ad4b47182b0 +livepatching 3beed9bf1e3d1ca7a8c6a4f626dce447ab40d5d1 +coresight 53531a9947ed68868b43e72a93bc71e349b6fec9 +rtc 36d91a4d401c284ab21213622c85cd855725f10f +nvdimm e13e75b86ef2f88e3a47d672dd4c52a293efb95b +idr f0f3f2d0a3e0f7c48163fd8b45f5909d46e7f371 +at24 60cc43fc888428bb2f18f08997432d426a243338 +ntb 53c3677c56c76f90cacd3a1063272fc6d6bc8f76 +kspp 0adb32858b0bddf4ada5f364a84ed60b196dbcda +init_task e1e871aff3ded26348c631b1370e257d401cd22d +akpm-current fdb1a3b69d1b9ef528b8a728682499e3dcd7719d +akpm 6cceef4e4fbc74528beaeadf136dc6db726d0560 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..c0ad5926286b --- /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 +modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-linus +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 +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..42f7facf8ba9 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2593 @@ +$ date -R +Fri, 20 Apr 2018 08:15:29 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at a27fc14219f2 Merge branch 'parisc-4.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux +Merging origin/master (87ef12027b9b Merge tag 'ceph-for-4.17-rc2' of git://github.com/ceph/ceph-client) +$ git merge origin/master +Updating a27fc14219f2..87ef12027b9b +Fast-forward + drivers/block/rbd.c | 101 +++++++++++++++++++++++++++++++++++----------------- + fs/ceph/inode.c | 10 ++++-- + 2 files changed, 76 insertions(+), 35 deletions(-) +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 (fe680ca02c1e ARM: replace unnecessary perl with sed and the shell $(( )) operator) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/compressed/Makefile | 8 +++----- + arch/arm/boot/compressed/head.S | 20 ++++++++++---------- + arch/arm/kernel/machine_kexec.c | 36 +++++++++++++++++++++++------------- + 3 files changed, 36 insertions(+), 28 deletions(-) +$ git am -3 ../patches/0001-arm-check-for-A-as-well-as-B-type-sybols-when-calcul.patch +Applying: arm: check for A as well as B type sybols when calculating BSS size +$ git reset HEAD^ +Unstaged changes after reset: +M arch/arm/boot/compressed/Makefile +$ git add -A . +$ git commit -v -a --amend +[master 9cef4924677e] Merge remote-tracking branch 'arm-current/fixes' + Date: Fri Apr 20 08:26:07 2018 +1000 +Merging arm64-fixes/for-next/fixes (b2d71b3cda19 arm64: signal: don't force known signals to SIGKILL) +$ git merge arm64-fixes/for-next/fixes +Merge made by the 'recursive' strategy. + arch/arm64/kernel/traps.c | 2 +- + arch/arm64/mm/kasan_init.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) +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 (56376c5864f8 powerpc/kvm: Fix lockups when running KVM guests on Power8) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/kernel/eeh_pe.c | 3 ++- + arch/powerpc/kernel/idle_book3s.S | 4 ++-- + arch/powerpc/kernel/setup_64.c | 11 +++++++++++ + arch/powerpc/lib/feature-fixups.c | 2 +- + arch/powerpc/sysdev/xive/native.c | 4 ++++ + 5 files changed, 20 insertions(+), 4 deletions(-) +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 (1255fcb2a655 net/smc: fix shutdown in state SMC_LISTEN) +$ git merge net/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/core-api/kernel-api.rst | 13 ++ + Documentation/networking/filter.txt | 6 +- + Documentation/networking/ip-sysctl.txt | 8 +- + MAINTAINERS | 1 + + drivers/atm/iphase.c | 4 +- + drivers/isdn/mISDN/dsp_hwec.c | 8 +- + drivers/isdn/mISDN/l1oip_core.c | 14 +- + drivers/net/dsa/mv88e6xxx/hwtstamp.c | 12 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 49 +++--- + drivers/net/ethernet/broadcom/bnxt/bnxt_nvm_defs.h | 2 - + drivers/net/ethernet/hisilicon/hns/hnae.h | 2 +- + drivers/net/ethernet/ibm/ibmvnic.c | 85 ++++++---- + drivers/net/ethernet/ibm/ibmvnic.h | 1 - + drivers/net/ethernet/marvell/mvpp2.c | 14 +- + drivers/net/ethernet/netronome/nfp/flower/cmsg.c | 44 ++++- + drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 2 + + drivers/net/ethernet/netronome/nfp/flower/main.c | 6 +- + drivers/net/ethernet/netronome/nfp/flower/main.h | 8 +- + .../net/ethernet/netronome/nfp/nfpcore/nfp_mutex.c | 5 +- + .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c | 3 +- + drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 11 +- + drivers/net/ethernet/sfc/ef10.c | 7 +- + drivers/net/ethernet/sfc/farch.c | 2 +- + drivers/net/ethernet/sfc/net_driver.h | 25 +++ + drivers/net/ethernet/sfc/rx.c | 60 +++---- + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 7 - + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 +- + drivers/net/macsec.c | 5 +- + drivers/net/phy/microchip.c | 178 ++++++++++++++++++++- + drivers/net/team/team.c | 19 +++ + drivers/net/tun.c | 7 +- + drivers/net/usb/qmi_wwan.c | 1 + + drivers/net/virtio_net.c | 79 +++++---- + drivers/net/vmxnet3/vmxnet3_drv.c | 17 +- + drivers/net/vmxnet3/vmxnet3_int.h | 4 +- + include/linux/if_vlan.h | 7 +- + include/linux/microchipphy.h | 8 + + include/linux/textsearch.h | 4 +- + lib/textsearch.c | 40 +++-- + net/caif/chnl_net.c | 2 +- + net/core/dev.c | 2 +- + net/core/dev_addr_lists.c | 2 +- + net/core/neighbour.c | 40 +++-- + net/dns_resolver/dns_key.c | 12 +- + net/ipv4/ip_output.c | 8 +- + net/ipv4/tcp.c | 8 +- + net/l2tp/l2tp_core.c | 40 ++--- + net/l2tp/l2tp_core.h | 3 +- + net/l2tp/l2tp_debugfs.c | 15 +- + net/l2tp/l2tp_netlink.c | 11 +- + net/l2tp/l2tp_ppp.c | 24 ++- + net/llc/af_llc.c | 7 + + net/packet/af_packet.c | 23 +-- + net/qrtr/qrtr.c | 1 + + net/sctp/ipv6.c | 60 +++---- + net/smc/af_smc.c | 10 +- + net/strparser/strparser.c | 7 +- + net/tipc/monitor.c | 2 +- + net/tipc/name_table.c | 34 ++-- + net/tipc/name_table.h | 2 +- + net/tipc/net.c | 2 + + net/tipc/netlink.c | 5 +- + net/tipc/node.c | 11 +- + net/tipc/socket.c | 4 +- + net/tipc/subscr.c | 5 +- + net/tls/tls_sw.c | 10 +- + net/vmw_vsock/af_vsock.c | 6 + + tools/testing/selftests/net/Makefile | 2 +- + 69 files changed, 786 insertions(+), 349 deletions(-) +Merging bpf/master (0a0a7e00a250 tools/bpf: fix test_sock and test_sock_addr.sh failure) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + include/linux/bpf.h | 4 +-- + kernel/bpf/core.c | 45 +++++++++++++++++---------- + kernel/trace/bpf_trace.c | 25 ++++++++++++--- + tools/testing/selftests/bpf/.gitignore | 3 ++ + tools/testing/selftests/bpf/test_sock.c | 1 + + tools/testing/selftests/bpf/test_sock_addr.c | 1 + + tools/testing/selftests/bpf/test_sock_addr.sh | 4 +-- + 7 files changed, 59 insertions(+), 24 deletions(-) +Merging ipsec/master (b48c05ab5d32 xfrm: Fix warning in xfrm6_tunnel_net_exit.) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + include/net/xfrm.h | 1 + + net/ipv6/xfrm6_tunnel.c | 3 +++ + net/key/af_key.c | 45 +++++++++++++++++++++++++++++++++++---------- + net/xfrm/xfrm_state.c | 6 ++++++ + 4 files changed, 45 insertions(+), 10 deletions(-) +Merging netfilter/master (d71efb599ad4 netfilter: nf_tables: fix out-of-bounds in nft_chain_commit_update) +$ git merge netfilter/master +Merge made by the 'recursive' strategy. + net/bridge/netfilter/ebtables.c | 11 +-- + net/ipv6/netfilter/Kconfig | 55 ++++++------- + net/netfilter/Kconfig | 1 + + 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_extend.c | 2 + + net/netfilter/nf_conntrack_sip.c | 16 +++- + net/netfilter/nf_tables_api.c | 69 ++++++++-------- + net/netfilter/xt_connmark.c | 19 +++-- + 10 files changed, 182 insertions(+), 159 deletions(-) +Merging ipvs/master (765cca91b895 netfilter: conntrack: include kmemleak.h for kmemleak_not_leak()) +$ 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 (83826469e36b cfg80211: fix possible memory leak in regdb_query_country()) +$ git merge mac80211/master +Merge made by the 'recursive' strategy. + include/uapi/linux/nl80211.h | 2 ++ + net/mac80211/mlme.c | 2 +- + net/wireless/core.c | 3 +++ + net/wireless/reg.c | 1 + + 4 files changed, 7 insertions(+), 1 deletion(-) +Merging rdma-fixes/for-rc (60cc43fc8884 Linux 4.17-rc1) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (8a56ef4f3ffb ALSA: rawmidi: Fix missing input substream checks in compat ioctls) +$ git merge sound-current/for-linus +Auto-merging sound/pci/hda/hda_intel.c +Merge made by the 'recursive' strategy. + sound/core/rawmidi_compat.c | 18 ++++++++++++------ + sound/pci/hda/hda_intel.c | 3 ++- + sound/pci/hda/patch_realtek.c | 3 +++ + sound/usb/line6/midi.c | 2 +- + 4 files changed, 18 insertions(+), 8 deletions(-) +Merging pci-current/for-linus (60cc43fc8884 Linux 4.17-rc1) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (ed4564babeee drivers: change struct device_driver::coredump() return type to void) +$ git merge driver-core.current/driver-core-linus +Merge made by the 'recursive' strategy. + include/linux/device.h | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) +Merging tty.current/tty-linus (60cc43fc8884 Linux 4.17-rc1) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (60cc43fc8884 Linux 4.17-rc1) +$ 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 (470b5d6f0cf4 USB: serial: ftdi_sio: use jtag quirk for Arrow USB Blaster) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/Kconfig | 1 + + drivers/usb/serial/cp210x.c | 1 + + drivers/usb/serial/ftdi_sio.c | 3 ++- + drivers/usb/serial/usb-serial-simple.c | 7 +++++++ + 4 files changed, 11 insertions(+), 1 deletion(-) +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 (60cc43fc8884 Linux 4.17-rc1) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (edf5c17d866e staging: irda: remove remaining remants of irda code removal) +$ git merge staging.current/staging-linus +Auto-merging MAINTAINERS +Auto-merging Documentation/networking/ip-sysctl.txt +Merge made by the 'recursive' strategy. + Documentation/ioctl/ioctl-number.txt | 2 -- + Documentation/networking/ip-sysctl.txt | 15 --------------- + Documentation/process/magic-number.rst | 3 --- + MAINTAINERS | 10 ---------- + include/uapi/linux/sysctl.h | 18 ------------------ + kernel/sysctl_binary.c | 20 +------------------- + 6 files changed, 1 insertion(+), 67 deletions(-) +Merging char-misc.current/char-misc-linus (60cc43fc8884 Linux 4.17-rc1) +$ 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 (8bf24e831961 selftests/filesystems: Don't run dnotify_test by default) +$ git merge kselftest-fixes/fixes +Merge made by the 'recursive' strategy. + tools/testing/selftests/filesystems/Makefile | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) +Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address) +$ git merge modules-fixes/modules-linus +Merge made by the 'recursive' strategy. + kernel/module.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +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 +Already up to date. +Merging reset-fixes/reset/fixes (f450f28e70a2 reset: socfpga: fix for 64-bit compilation) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (b3d7e55c3f88 MIPS: uaccess: Add micromips clobbers to bzero invocation) +$ git merge mips-fixes/mips-fixes +Merge made by the 'recursive' strategy. + arch/mips/boot/dts/img/boston.dts | 6 ++++++ + arch/mips/include/asm/io.h | 4 +++- + arch/mips/include/asm/uaccess.h | 11 +++++++++-- + arch/mips/lib/memset.S | 11 ++++++++--- + 4 files changed, 26 insertions(+), 6 deletions(-) +Merging kvm-fixes/master (c18bb396d3d2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ 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 (60cc43fc8884 Linux 4.17-rc1) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (7eb2c4dd54ff drm/i915: Fix LSPCON TMDS output buffer enabling from low-power state) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_dp_dual_mode_helper.c | 39 ++++++++++++++++++++++++------ + drivers/gpu/drm/vc4/vc4_bo.c | 2 ++ + drivers/gpu/drm/vc4/vc4_validate_shaders.c | 1 + + include/drm/drm_hdcp.h | 2 +- + 4 files changed, 36 insertions(+), 8 deletions(-) +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 (60cc43fc8884 Linux 4.17-rc1) +$ git merge kbuild/for-next +Already up to date. +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 (9e7f06c8beee swiotlb: fix unexpected swiotlb_alloc_coherent failures) +$ git merge dma-mapping/for-next +Already up to date. +Merging asm-generic/master (a71e7c44ffb7 io: change writeX_relaxed() to remove barriers) +$ git merge asm-generic/master +Already up to date. +Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (f592819553ca Merge branches 'fixes' and 'sa1100-for-next' 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 (cb799267bb65 MAINTAINERS: Update ASPEED entry with details) +$ 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 (b9b2e4f8f5fd ARM64: dts: meson-axg: add tdm pins) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + .../bindings/clock/amlogic,gxbb-clkc.txt | 16 +- + arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 58 ++++ + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 348 ++++++++++++++++++++- + .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 4 + + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 5 +- + .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 12 + + .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 4 + + .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 4 + + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 68 +++- + .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 4 + + arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 17 + + 11 files changed, 524 insertions(+), 16 deletions(-) +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 (9fa2e1a1fd60 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/imx25-pdk.dts | 1 - + arch/arm/boot/dts/imx53-tx53.dtsi | 1 - + arch/arm/boot/dts/imx6dl-mamoj.dts | 224 ++++++++++ + arch/arm/boot/dts/imx6q-dhcom-pdk2.dts | 151 +++++++ + arch/arm/boot/dts/imx6q-dhcom-som.dtsi | 476 +++++++++++++++++++++ + arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 52 ++- + arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi | 47 +- + arch/arm/boot/dts/imx6qdl-wandboard-revb1.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-wandboard-revc1.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-wandboard-revd1.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 8 + + arch/arm/boot/dts/imx7d-pinfunc.h | 6 +- + arch/arm/boot/dts/imx7d-sdb.dts | 24 ++ + arch/arm/boot/dts/imx7s.dtsi | 36 +- + arch/arm/configs/imx_v6_v7_defconfig | 7 + + 17 files changed, 1003 insertions(+), 36 deletions(-) + create mode 100644 arch/arm/boot/dts/imx6dl-mamoj.dts + create mode 100644 arch/arm/boot/dts/imx6q-dhcom-pdk2.dts + create mode 100644 arch/arm/boot/dts/imx6q-dhcom-som.dtsi +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 +Auto-merging arch/arm/boot/dts/logicpd-torpedo-som.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/logicpd-torpedo-som.dtsi +Resolved 'arch/arm/boot/dts/logicpd-torpedo-som.dtsi' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master dbf9b755d71e] 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 (86fbd9bc1ab2 Merge branches 'arm64-dt-for-v4.18' and 'dt-for-v4.18' into next) +$ git merge renesas/next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/shmobile.txt | 8 + + .../bindings/power/renesas,rcar-sysc.txt | 1 + + .../devicetree/bindings/reset/renesas,rst.txt | 2 + + arch/arm/Kconfig.debug | 13 +- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/r7s72100.dtsi | 1018 +++++----- + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 4 +- + arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts | 35 + + arch/arm/boot/dts/r8a77470.dtsi | 154 ++ + arch/arm/boot/dts/r8a7792-wheat.dts | 11 +- + arch/arm/boot/dts/sh73a0.dtsi | 4 +- + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/configs/shmobile_defconfig | 1 + + arch/arm/mach-shmobile/Kconfig | 9 + + arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 + + arch/arm64/Kconfig.platforms | 6 + + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 2034 ++++++++++--------- + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 2104 ++++++++++---------- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 232 ++- + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 10 +- + drivers/soc/renesas/Kconfig | 8 +- + drivers/soc/renesas/Makefile | 1 + + drivers/soc/renesas/r8a77470-sysc.c | 29 + + drivers/soc/renesas/rcar-rst.c | 2 + + drivers/soc/renesas/rcar-sysc.c | 3 + + drivers/soc/renesas/rcar-sysc.h | 1 + + drivers/soc/renesas/renesas-soc.c | 16 + + include/dt-bindings/power/r8a77470-sysc.h | 22 + + include/dt-bindings/power/r8a77990-sysc.h | 26 + + 29 files changed, 3161 insertions(+), 2597 deletions(-) + create mode 100644 arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts + create mode 100644 arch/arm/boot/dts/r8a77470.dtsi + create mode 100644 drivers/soc/renesas/r8a77470-sysc.c + create mode 100644 include/dt-bindings/power/r8a77470-sysc.h + create mode 100644 include/dt-bindings/power/r8a77990-sysc.h +Merging rockchip/for-next (aaa7709c6703 Merge branch 'v4.18-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/rk3036.dtsi | 2 ++ + arch/arm/boot/dts/rk322x.dtsi | 8 +++++ + arch/arm/boot/dts/rk3288-phycore-som.dtsi | 1 + + arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 3 +- + arch/arm/boot/dts/rk3288-veyron-minnie.dts | 2 ++ + arch/arm/boot/dts/rk3288.dtsi | 20 +++++++++--- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 10 ++++++ + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 10 ++++++ + 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 +++ + .../dts/rockchip/rk3399-sapphire-excavator.dts | 12 ++++++++ + arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 23 +++++--------- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 36 ++++++++++++++++------ + 15 files changed, 119 insertions(+), 32 deletions(-) +Merging samsung/for-next (bebc6082da0a Linux 4.14) +$ git merge samsung/for-next +Already up to date. +Merging samsung-krzk/for-next (08944e878b7e Merge branch 'next/drivers' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/pd-samsung.txt | 20 +---- + arch/arm/boot/dts/exynos3250-rinato.dts | 4 + + arch/arm/boot/dts/exynos4210-origen.dts | 11 +++ + arch/arm/boot/dts/exynos5250.dtsi | 4 - + arch/arm/boot/dts/exynos5420.dtsi | 14 ---- + arch/arm/configs/exynos_defconfig | 1 + + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/mach-s3c24xx/mach-mini2440.c | 10 +-- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 2 +- + drivers/soc/samsung/pm_domains.c | 90 +--------------------- + 10 files changed, 28 insertions(+), 129 deletions(-) +Merging sunxi/sunxi/for-next (d0715cb8113f Merge branch 'sunxi/clk-for-4.17' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts | 3 +- + arch/arm/boot/dts/sun8i-a33.dtsi | 44 +++++++++++++++++++++++ + arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 10 ++++++ + drivers/clk/Makefile | 2 +- + drivers/clk/sunxi-ng/Makefile | 39 ++++++++------------ + 5 files changed, 71 insertions(+), 27 deletions(-) +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/soc/tegra/pmc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging arm64/for-next/core (24534b351182 arm64: assembler: add macros to conditionally yield the NEON under PREEMPT) +$ git merge arm64/for-next/core +Already up to date. +Merging clk/clk-next (3baba436e3a6 Merge branch 'clk-core' into clk-next) +$ git merge clk/clk-next +Auto-merging drivers/clk/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/actions,s900-cmu.txt | 47 + + .../bindings/clock/nuvoton,npcm750-clk.txt | 100 + + .../devicetree/bindings/clock/qcom,gcc.txt | 1 + + drivers/clk/Kconfig | 1 + + drivers/clk/Makefile | 2 + + drivers/clk/actions/Kconfig | 14 + + drivers/clk/actions/Makefile | 12 + + drivers/clk/actions/owl-common.c | 89 + + drivers/clk/actions/owl-common.h | 41 + + drivers/clk/actions/owl-composite.c | 199 ++ + drivers/clk/actions/owl-composite.h | 124 + + drivers/clk/actions/owl-divider.c | 94 + + drivers/clk/actions/owl-divider.h | 75 + + drivers/clk/actions/owl-factor.c | 222 ++ + drivers/clk/actions/owl-factor.h | 83 + + drivers/clk/actions/owl-fixed-factor.h | 28 + + drivers/clk/actions/owl-gate.c | 77 + + drivers/clk/actions/owl-gate.h | 73 + + drivers/clk/actions/owl-mux.c | 60 + + drivers/clk/actions/owl-mux.h | 61 + + drivers/clk/actions/owl-pll.c | 194 ++ + drivers/clk/actions/owl-pll.h | 92 + + drivers/clk/actions/owl-s900.c | 721 +++++ + drivers/clk/clk-cs2000-cp.c | 2 +- + drivers/clk/clk-mux.c | 10 +- + drivers/clk/clk-npcm7xx.c | 656 +++++ + drivers/clk/clk-stm32mp1.c | 54 +- + drivers/clk/clk.c | 28 +- + drivers/clk/meson/clk-regmap.c | 11 +- + drivers/clk/qcom/Kconfig | 8 + + drivers/clk/qcom/Makefile | 1 + + drivers/clk/qcom/clk-alpha-pll.c | 301 ++- + drivers/clk/qcom/clk-alpha-pll.h | 18 +- + drivers/clk/qcom/clk-rcg2.c | 5 +- + drivers/clk/qcom/gcc-msm8998.c | 2834 ++++++++++++++++++++ + drivers/clk/qcom/gdsc.c | 24 +- + drivers/clk/qcom/gdsc.h | 4 +- + drivers/clk/spear/spear6xx_clock.c | 2 +- + include/dt-bindings/clock/actions,s900-cmu.h | 129 + + include/dt-bindings/clock/nuvoton,npcm7xx-clock.h | 44 + + include/dt-bindings/clock/qcom,gcc-msm8998.h | 208 ++ + include/dt-bindings/clock/stm32mp1-clks.h | 4 +- + include/linux/clk-provider.h | 5 +- + 43 files changed, 6694 insertions(+), 64 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/actions,s900-cmu.txt + create mode 100644 Documentation/devicetree/bindings/clock/nuvoton,npcm750-clk.txt + create mode 100644 drivers/clk/actions/Kconfig + create mode 100644 drivers/clk/actions/Makefile + create mode 100644 drivers/clk/actions/owl-common.c + create mode 100644 drivers/clk/actions/owl-common.h + create mode 100644 drivers/clk/actions/owl-composite.c + create mode 100644 drivers/clk/actions/owl-composite.h + create mode 100644 drivers/clk/actions/owl-divider.c + create mode 100644 drivers/clk/actions/owl-divider.h + create mode 100644 drivers/clk/actions/owl-factor.c + create mode 100644 drivers/clk/actions/owl-factor.h + create mode 100644 drivers/clk/actions/owl-fixed-factor.h + create mode 100644 drivers/clk/actions/owl-gate.c + create mode 100644 drivers/clk/actions/owl-gate.h + create mode 100644 drivers/clk/actions/owl-mux.c + create mode 100644 drivers/clk/actions/owl-mux.h + create mode 100644 drivers/clk/actions/owl-pll.c + create mode 100644 drivers/clk/actions/owl-pll.h + create mode 100644 drivers/clk/actions/owl-s900.c + create mode 100644 drivers/clk/clk-npcm7xx.c + create mode 100644 drivers/clk/qcom/gcc-msm8998.c + create mode 100644 include/dt-bindings/clock/actions,s900-cmu.h + create mode 100644 include/dt-bindings/clock/nuvoton,npcm7xx-clock.h + create mode 100644 include/dt-bindings/clock/qcom,gcc-msm8998.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 (85fa2cc51104 c6x: pass endianness info to sparse) +$ git merge c6x/for-linux-next +Already up to date. +Merging m68k/for-next (a5de04ccf0b5 m68k: Fix style, spelling, and grammar in siginfo_build_tests()) +$ git merge m68k/for-next +Merge made by the 'recursive' strategy. + arch/m68k/kernel/signal.c | 23 ++++++++++++----------- + arch/m68k/mac/config.c | 2 +- + 2 files changed, 13 insertions(+), 12 deletions(-) +Merging m68knommu/for-next (60cc43fc8884 Linux 4.17-rc1) +$ git merge m68knommu/for-next +Already up to date. +Merging microblaze/next (70f6283a372b microblaze: Use generic pci_mmap_resource_range()) +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (ea4d340cbea4 Merge branches '4.15-fixes', '4.16-features' and 'octeon-3-net-mips-bits' into mips-next) +$ git merge mips/mips-next +Auto-merging drivers/staging/octeon/ethernet-tx.c +Auto-merging drivers/staging/octeon/ethernet-rx.c +Auto-merging drivers/staging/octeon/ethernet-defines.h +Auto-merging arch/mips/include/asm/mipsregs.h +Auto-merging arch/mips/cavium-octeon/Kconfig +Merge made by the 'recursive' strategy. + arch/mips/cavium-octeon/Kconfig | 27 +- + arch/mips/cavium-octeon/Makefile | 1 + + arch/mips/cavium-octeon/resource-mgr.c | 351 +++++++++++++++++++++ + arch/mips/cavium-octeon/setup.c | 22 +- + arch/mips/include/asm/barrier.h | 2 +- + .../asm/mach-cavium-octeon/kernel-entry-init.h | 20 +- + arch/mips/include/asm/mipsregs.h | 2 + + arch/mips/include/asm/octeon/octeon.h | 32 +- + arch/mips/include/asm/processor.h | 2 +- + arch/mips/kernel/octeon_switch.S | 2 - + arch/mips/mm/tlbex.c | 29 +- + drivers/staging/octeon/ethernet-defines.h | 6 - + drivers/staging/octeon/ethernet-rx.c | 25 +- + drivers/staging/octeon/ethernet-tx.c | 85 ++--- + 14 files changed, 473 insertions(+), 133 deletions(-) + create mode 100644 arch/mips/cavium-octeon/resource-mgr.c +Merging mips-james/mips-next (3539adf568f5 MIPS: Use generic GCC library routines from lib/) +$ git merge mips-james/mips-next +Removing arch/mips/lib/ucmpdi2.c +Removing arch/mips/lib/lshrdi3.c +Removing arch/mips/lib/cmpdi2.c +Removing arch/mips/lib/ashrdi3.c +Removing arch/mips/lib/ashldi3.c +Merge made by the 'recursive' strategy. + arch/mips/Kconfig | 5 ++++ + arch/mips/bcm47xx/board.c | 2 ++ + arch/mips/bcm47xx/buttons.c | 9 ++++++ + arch/mips/bcm47xx/leds.c | 9 ++++++ + arch/mips/boot/compressed/Makefile | 11 +++++--- + arch/mips/boot/dts/brcm/Makefile | 2 +- + arch/mips/boot/dts/cavium-octeon/Makefile | 2 +- + arch/mips/boot/dts/ingenic/Makefile | 2 +- + arch/mips/boot/dts/lantiq/Makefile | 2 +- + arch/mips/boot/dts/mscc/Makefile | 2 +- + arch/mips/boot/dts/mti/Makefile | 2 +- + arch/mips/boot/dts/netlogic/Makefile | 2 +- + arch/mips/boot/dts/pic32/Makefile | 2 +- + arch/mips/boot/dts/ralink/Makefile | 2 +- + arch/mips/boot/dts/xilfpga/Makefile | 2 +- + arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h | 1 + + arch/mips/lib/Makefile | 3 +- + arch/mips/lib/ashldi3.c | 30 -------------------- + arch/mips/lib/ashrdi3.c | 32 ---------------------- + arch/mips/lib/cmpdi2.c | 28 ------------------- + arch/mips/lib/lshrdi3.c | 30 -------------------- + arch/mips/lib/ucmpdi2.c | 22 --------------- + arch/riscv/Kconfig | 6 ++-- + drivers/firmware/broadcom/bcm47xx_nvram.c | 2 +- + lib/Kconfig | 12 ++++---- + lib/Makefile | 12 ++++---- + lib/ucmpdi2.c | 2 +- + 27 files changed, 61 insertions(+), 175 deletions(-) + delete mode 100644 arch/mips/lib/ashldi3.c + delete mode 100644 arch/mips/lib/ashrdi3.c + delete mode 100644 arch/mips/lib/cmpdi2.c + delete mode 100644 arch/mips/lib/lshrdi3.c + delete mode 100644 arch/mips/lib/ucmpdi2.c +Merging nds32/next (a27fc14219f2 Merge branch 'parisc-4.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux) +$ git merge nds32/next +Already up to date. +Merging nios2/for-next (3d9644ef9a0f nios2: Use read_persistent_clock64() instead of read_persistent_clock()) +$ 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 +Already up to date. +Merging parisc-hd/for-next (41dbee81c875 parisc: Document rules regarding checksum of HPMC handler) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/Makefile | 3 +++ + arch/parisc/kernel/traps.c | 11 +++++++++++ + 2 files changed, 14 insertions(+) +Merging powerpc/next (60cc43fc8884 Linux 4.17-rc1) +$ git merge powerpc/next +Already up to date. +Merging fsl/next (c095ff93f901 powerpc/sysdev: change CPM GPIO to platform_device) +$ git merge fsl/next +Already up to date. +Merging risc-v/for-next (60cc43fc8884 Linux 4.17-rc1) +$ git merge risc-v/for-next +Already up to date. +Merging s390/features (fae764912153 s390/signal: cleanup uapi struct sigaction) +$ git merge s390/features +Removing arch/s390/configs/gcov_defconfig +Auto-merging arch/s390/configs/debug_defconfig +Merge made by the 'recursive' strategy. + arch/s390/Kbuild | 1 + + arch/s390/Kconfig | 32 +- + arch/s390/boot/Makefile | 6 - + arch/s390/boot/compressed/.gitignore | 1 + + .../configs/{default_defconfig => debug_defconfig} | 30 +- + arch/s390/configs/gcov_defconfig | 661 --------------------- + arch/s390/configs/performance_defconfig | 20 +- + arch/s390/defconfig | 13 +- + arch/s390/include/asm/kexec.h | 23 + + arch/s390/include/asm/purgatory.h | 17 + + arch/s390/include/asm/setup.h | 40 +- + arch/s390/include/uapi/asm/signal.h | 23 +- + arch/s390/kernel/Makefile | 3 + + arch/s390/kernel/asm-offsets.c | 5 + + arch/s390/kernel/compat_wrapper.c | 1 + + arch/s390/kernel/kexec_elf.c | 147 +++++ + arch/s390/kernel/kexec_image.c | 76 +++ + arch/s390/kernel/machine_kexec_file.c | 245 ++++++++ + arch/s390/kernel/nospec-branch.c | 1 + + arch/s390/kernel/perf_cpum_cf_events.c | 1 + + arch/s390/kernel/setup.c | 1 + + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/s390/purgatory/.gitignore | 2 + + arch/s390/purgatory/Makefile | 37 ++ + arch/s390/purgatory/head.S | 279 +++++++++ + arch/s390/purgatory/purgatory.c | 42 ++ + drivers/s390/block/dasd_diag.c | 1 - + drivers/s390/char/sclp_early_core.c | 2 +- + drivers/s390/net/qeth_l2_main.c | 1 - + drivers/s390/net/smsgiucv.c | 2 +- + 30 files changed, 998 insertions(+), 716 deletions(-) + rename arch/s390/configs/{default_defconfig => debug_defconfig} (97%) + delete mode 100644 arch/s390/configs/gcov_defconfig + create mode 100644 arch/s390/include/asm/purgatory.h + create mode 100644 arch/s390/kernel/kexec_elf.c + create mode 100644 arch/s390/kernel/kexec_image.c + create mode 100644 arch/s390/kernel/machine_kexec_file.c + create mode 100644 arch/s390/purgatory/.gitignore + create mode 100644 arch/s390/purgatory/Makefile + create mode 100644 arch/s390/purgatory/head.S + create mode 100644 arch/s390/purgatory/purgatory.c +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 (bf9c7e3d7924 arch/sh: pcie-sh7786: handle non-zero DMA offset) +$ git merge sh/for-next +Already up to date. +Merging uml/linux-next (e40238dedb48 Fix vector raw inintialization logic) +$ git merge uml/linux-next +Already up to date. +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/ext2/inode.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 6e289bcc82b9] Merge remote-tracking branch 'btrfs/next' + Date: Fri Apr 20 09:02:51 2018 +1000 +Merging btrfs-kdave/for-next (19d3b4c4bad8 Merge branch 'for-next-next-v4.18-20180419' into for-next-20180419) +$ 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/disk-io.c +Merge made by the 'recursive' strategy. + fs/btrfs/compression.c | 21 ++- + fs/btrfs/ctree.h | 33 ++++- + fs/btrfs/delayed-inode.c | 20 ++- + fs/btrfs/delayed-ref.c | 61 ++++---- + fs/btrfs/delayed-ref.h | 6 +- + fs/btrfs/dev-replace.c | 3 - + fs/btrfs/disk-io.c | 61 +++++++- + fs/btrfs/extent-tree.c | 112 ++++++++++---- + fs/btrfs/extent_io.c | 62 ++------ + fs/btrfs/extent_io.h | 20 +-- + fs/btrfs/extent_map.c | 6 +- + fs/btrfs/extent_map.h | 3 +- + fs/btrfs/file.c | 43 +++--- + fs/btrfs/free-space-tree.c | 77 +++++----- + fs/btrfs/inode.c | 303 ++++++++++++++++++++++++++++++-------- + fs/btrfs/ioctl.c | 220 +++++---------------------- + fs/btrfs/print-tree.c | 25 ++-- + fs/btrfs/print-tree.h | 2 +- + fs/btrfs/props.c | 2 +- + fs/btrfs/qgroup.c | 43 +++++- + fs/btrfs/super.c | 3 +- + fs/btrfs/sysfs.c | 2 +- + fs/btrfs/tests/extent-map-tests.c | 60 +++++--- + fs/btrfs/transaction.c | 36 ++--- + fs/btrfs/transaction.h | 14 ++ + fs/btrfs/volumes.c | 148 ++++++++++++------- + fs/btrfs/volumes.h | 2 +- + fs/btrfs/zstd.c | 19 ++- + include/trace/events/btrfs.h | 225 ++++++++++++++-------------- + 29 files changed, 927 insertions(+), 705 deletions(-) +Merging ceph/master (e2311baa73a8 ceph: check if mds create snaprealm when setting quota) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + fs/ceph/xattr.c | 28 +++++++++++++++++++++++++--- + 1 file changed, 25 insertions(+), 3 deletions(-) +Merging cifs/for-next (67e72b6a4996 CIFS: fix typo in cifs_dbg) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifs_debug.h | 2 +- + fs/cifs/dir.c | 5 ++++- + fs/cifs/file.c | 2 +- + fs/cifs/smb2ops.c | 4 ++-- + fs/cifs/smbdirect.c | 8 +++++++- + 5 files changed, 15 insertions(+), 6 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 (e86281e700cc eCryptfs: don't pass up plaintext names when using filename encryption) +$ git merge ecryptfs/next +Merge made by the 'recursive' strategy. + fs/ecryptfs/crypto.c | 41 ++++++++++++++++++++++++++++------------- + fs/ecryptfs/file.c | 21 ++++++++++++++++----- + fs/ecryptfs/inode.c | 3 +-- + fs/ecryptfs/keystore.c | 2 +- + 4 files changed, 46 insertions(+), 21 deletions(-) +Merging ext3/for_next (b1255ee6a289 Pull UDF UTF-16 handling improvements.) +$ git merge ext3/for_next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 8 ++ + fs/ext2/file.c | 4 +- + fs/isofs/compress.c | 19 ++- + fs/isofs/inode.c | 3 + + fs/notify/fanotify/fanotify.c | 34 +++-- + fs/notify/fsnotify.c | 25 ++-- + fs/quota/dquot.c | 2 +- + fs/udf/Kconfig | 6 +- + fs/udf/super.c | 12 +- + fs/udf/udfdecl.h | 3 +- + fs/udf/unicode.c | 260 +++++++++++++++++++-------------------- + include/linux/fsnotify_backend.h | 6 +- + 12 files changed, 192 insertions(+), 190 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 (91bb86e196f6 f2fs: call unlock_new_inode() before d_instantiate()) +$ git merge f2fs/dev +Auto-merging fs/f2fs/super.c +Merge made by the 'recursive' strategy. + fs/crypto/bio.c | 35 +++++---- + fs/crypto/crypto.c | 8 +- + fs/crypto/fscrypt_private.h | 1 - + fs/ext4/readpage.c | 2 +- + fs/f2fs/data.c | 166 ++++++++++++++++++++++++++++++---------- + fs/f2fs/f2fs.h | 12 ++- + fs/f2fs/file.c | 4 +- + fs/f2fs/gc.c | 6 +- + fs/f2fs/inline.c | 2 +- + fs/f2fs/namei.c | 8 +- + fs/f2fs/super.c | 6 ++ + include/linux/fscrypt_notsupp.h | 13 +++- + include/linux/fscrypt_supp.h | 5 +- + 13 files changed, 195 insertions(+), 73 deletions(-) +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 (60cc43fc8884 Linux 4.17-rc1) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (98de9ce6f666 NFS: advance nfs_entry cookie only after decoding completes successfully) +$ git merge nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (36e000768550 nfsd: update obselete comment referencing the BKL) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/nfsd/cache.h | 5 ----- + fs/nfsd/nfs4state.c | 20 ++++++++++---------- + fs/nfsd/nfscache.c | 6 ++---- + 3 files changed, 12 insertions(+), 19 deletions(-) +Merging orangefs/for-next (8e9ba5c48ea6 Orangefs: documentation updates) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (16149013f839 ovl: update documentation w.r.t "xino" feature) +$ git merge overlayfs/overlayfs-next +Already up to date. +Merging ubifs/linux-next (b5094b7f135b ubi: Reject MLC NAND) +$ git merge ubifs/linux-next +Already up to date. +Merging xfs/for-next (8c81dd46ef3c Force log to disk before reading the AGF during a fstrim) +$ git merge xfs/for-next +Already up to date. +Merging file-locks/locks-next (fa28b25b62ba fasync: Fix deadlock between task-context and interrupt-context kill_fasync()) +$ git merge file-locks/locks-next +Auto-merging include/linux/fs.h +Merge made by the 'recursive' strategy. + fs/fcntl.c | 15 +++++++-------- + include/linux/fs.h | 2 +- + 2 files changed, 8 insertions(+), 9 deletions(-) +Merging vfs/for-next (eb5e8befb894 Merge tag 'afs-next-20180409-c' into for-next) +$ git merge vfs/for-next +Already up to date! +Merge made by the 'recursive' strategy. +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 (cdb7e52d960a vsprintf: Tweak pF/pf comment) +$ git merge printk/for-next +Auto-merging lib/vsprintf.c +Merge made by the 'recursive' strategy. + lib/test_printf.c | 2 +- + lib/vsprintf.c | 130 ++++++++++++++++++++++-------------------------------- + 2 files changed, 54 insertions(+), 78 deletions(-) +Merging pci/next (60cc43fc8884 Linux 4.17-rc1) +$ 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 (00ddd17446aa Merge branch 'for-4.17/upstream-fixes' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/Kconfig | 7 ++++ + drivers/hid/Makefile | 1 + + drivers/hid/hid-ids.h | 4 ++ + drivers/hid/hid-input.c | 57 +++++++++++++++++++++++----- + drivers/hid/hid-redragon.c | 86 +++++++++++++++++++++++++++++++++++++++++++ + drivers/hid/hidraw.c | 5 +++ + drivers/hid/i2c-hid/i2c-hid.c | 36 +++++++++++++++--- + drivers/hid/wacom_wac.c | 76 +++++++++++++++++++++++--------------- + include/linux/hid.h | 11 +++++- + 9 files changed, 237 insertions(+), 46 deletions(-) + create mode 100644 drivers/hid/hid-redragon.c +Merging i2c/i2c/for-next (1eace8344c02 i2c: add param sanity check to i2c_transfer()) +$ git merge i2c/i2c/for-next +Already up to date. +Merging dmi/master (0a5f08c2f0c7 firmware: dmi_scan: Use lowercase letters for UUID) +$ git merge dmi/master +Merge made by the 'recursive' strategy. +Merging hwmon-staging/hwmon-next (3449f321d6ae Merge tag 'ib-mfd-hwmon-v4.18' into hwmon-next) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + drivers/hwmon/mc13783-adc.c | 60 +++++++++++++++++++++++++++++++++++++++++++++ + drivers/hwmon/scmi-hwmon.c | 5 +++- + drivers/mfd/mc13xxx-core.c | 15 +++++++++++- + include/linux/mfd/mc13xxx.h | 2 ++ + 4 files changed, 80 insertions(+), 2 deletions(-) +Merging jc_docs/docs-next (3b443955596e Docs: tell maintainers to put [GIT PULL] in their subject lines) +$ git merge jc_docs/docs-next +Auto-merging arch/mips/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/vm/zswap.rst +Auto-merging Documentation/vm/zsmalloc.rst +Auto-merging Documentation/vm/z3fold.rst +Auto-merging Documentation/vm/userfaultfd.rst +Auto-merging Documentation/vm/unevictable-lru.rst +Auto-merging Documentation/vm/transhuge.rst +Auto-merging Documentation/vm/swap_numa.rst +Auto-merging Documentation/vm/split_page_table_lock.rst +Auto-merging Documentation/vm/soft-dirty.rst +Removing Documentation/vm/slub.txt +Auto-merging Documentation/vm/remap_file_pages.rst +Auto-merging Documentation/vm/pagemap.rst +Auto-merging Documentation/vm/page_owner.rst +Auto-merging Documentation/vm/page_migration.rst +Auto-merging Documentation/vm/page_frags.rst +Removing Documentation/vm/overcommit-accounting +Removing Documentation/vm/numa_memory_policy.txt +Auto-merging Documentation/vm/numa.rst +Removing Documentation/vm/mmu_notifier.txt +Removing Documentation/vm/ksm.txt +Auto-merging Documentation/vm/idle_page_tracking.rst +Auto-merging Documentation/vm/hwpoison.rst +Auto-merging Documentation/vm/hugetlbpage.rst +Auto-merging Documentation/vm/hugetlbfs_reserv.rst +Auto-merging Documentation/vm/hmm.rst +Auto-merging Documentation/vm/highmem.rst +Auto-merging Documentation/vm/frontswap.rst +Auto-merging Documentation/vm/cleancache.rst +Auto-merging Documentation/vm/balance.rst +Removing Documentation/vm/active_mm.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-devices-node | 2 +- + .../ABI/testing/sysfs-kernel-mm-hugepages | 2 +- + Documentation/ABI/testing/sysfs-kernel-mm-ksm | 2 +- + Documentation/ABI/testing/sysfs-kernel-slab | 4 +- + Documentation/admin-guide/kernel-parameters.txt | 12 +- + Documentation/dev-tools/kasan.rst | 2 +- + Documentation/driver-api/usb/typec.rst | 2 +- + Documentation/filesystems/proc.txt | 4 +- + Documentation/filesystems/tmpfs.txt | 2 +- + Documentation/index.rst | 3 +- + Documentation/process/maintainer-pgp-guide.rst | 39 +- + Documentation/process/submitting-patches.rst | 2 +- + Documentation/sound/alsa-configuration.rst | 4 +- + Documentation/sound/soc/codec.rst | 2 +- + Documentation/sound/soc/platform.rst | 2 +- + Documentation/sysctl/vm.txt | 6 +- + Documentation/trace/ftrace.rst | 7 +- + Documentation/vm/00-INDEX | 58 +-- + Documentation/vm/active_mm.rst | 91 ++++ + Documentation/vm/active_mm.txt | 83 ---- + Documentation/vm/{balance => balance.rst} | 15 +- + .../vm/{cleancache.txt => cleancache.rst} | 105 +++-- + Documentation/vm/conf.py | 10 + + Documentation/vm/{frontswap.txt => frontswap.rst} | 59 ++- + Documentation/vm/{highmem.txt => highmem.rst} | 87 ++-- + Documentation/vm/{hmm.txt => hmm.rst} | 78 ++-- + .../{hugetlbfs_reserv.txt => hugetlbfs_reserv.rst} | 212 +++++---- + .../vm/{hugetlbpage.txt => hugetlbpage.rst} | 243 ++++++----- + Documentation/vm/{hwpoison.txt => hwpoison.rst} | 141 +++--- + ...le_page_tracking.txt => idle_page_tracking.rst} | 55 ++- + Documentation/vm/index.rst | 56 +++ + Documentation/vm/ksm.rst | 183 ++++++++ + Documentation/vm/ksm.txt | 178 -------- + Documentation/vm/mmu_notifier.rst | 99 +++++ + Documentation/vm/mmu_notifier.txt | 93 ---- + Documentation/vm/{numa => numa.rst} | 6 +- + Documentation/vm/numa_memory_policy.rst | 485 +++++++++++++++++++++ + Documentation/vm/numa_memory_policy.txt | 452 ------------------- + Documentation/vm/overcommit-accounting | 80 ---- + Documentation/vm/overcommit-accounting.rst | 87 ++++ + Documentation/vm/{page_frags => page_frags.rst} | 5 +- + .../vm/{page_migration => page_migration.rst} | 149 ++++--- + .../vm/{page_owner.txt => page_owner.rst} | 34 +- + Documentation/vm/{pagemap.txt => pagemap.rst} | 170 ++++---- + .../{remap_file_pages.txt => remap_file_pages.rst} | 6 + + Documentation/vm/slub.rst | 361 +++++++++++++++ + Documentation/vm/slub.txt | 342 --------------- + .../vm/{soft-dirty.txt => soft-dirty.rst} | 20 +- + ...t_page_table_lock => split_page_table_lock.rst} | 12 +- + Documentation/vm/{swap_numa.txt => swap_numa.rst} | 55 ++- + Documentation/vm/{transhuge.txt => transhuge.rst} | 286 +++++++----- + .../{unevictable-lru.txt => unevictable-lru.rst} | 117 +++-- + .../vm/{userfaultfd.txt => userfaultfd.rst} | 66 +-- + Documentation/vm/{z3fold.txt => z3fold.rst} | 6 +- + Documentation/vm/{zsmalloc.txt => zsmalloc.rst} | 60 ++- + Documentation/vm/{zswap.txt => zswap.rst} | 71 +-- + MAINTAINERS | 2 +- + arch/alpha/Kconfig | 2 +- + arch/ia64/Kconfig | 2 +- + arch/mips/Kconfig | 2 +- + arch/powerpc/Kconfig | 2 +- + fs/Kconfig | 2 +- + fs/dax.c | 2 +- + fs/proc/task_mmu.c | 4 +- + include/linux/hmm.h | 2 +- + include/linux/memremap.h | 4 +- + include/linux/mmu_notifier.h | 2 +- + include/linux/sched/mm.h | 4 +- + include/linux/swap.h | 2 +- + mm/Kconfig | 6 +- + mm/cleancache.c | 2 +- + mm/frontswap.c | 2 +- + mm/hmm.c | 2 +- + mm/huge_memory.c | 4 +- + mm/hugetlb.c | 4 +- + mm/ksm.c | 4 +- + mm/mmap.c | 2 +- + mm/rmap.c | 6 +- + mm/util.c | 2 +- + 79 files changed, 2659 insertions(+), 2220 deletions(-) + create mode 100644 Documentation/vm/active_mm.rst + delete mode 100644 Documentation/vm/active_mm.txt + rename Documentation/vm/{balance => balance.rst} (96%) + rename Documentation/vm/{cleancache.txt => cleancache.rst} (83%) + create mode 100644 Documentation/vm/conf.py + rename Documentation/vm/{frontswap.txt => frontswap.rst} (91%) + rename Documentation/vm/{highmem.txt => highmem.rst} (64%) + rename Documentation/vm/{hmm.txt => hmm.rst} (91%) + rename Documentation/vm/{hugetlbfs_reserv.txt => hugetlbfs_reserv.rst} (87%) + rename Documentation/vm/{hugetlbpage.txt => hugetlbpage.rst} (64%) + rename Documentation/vm/{hwpoison.txt => hwpoison.rst} (60%) + rename Documentation/vm/{idle_page_tracking.txt => idle_page_tracking.rst} (72%) + create mode 100644 Documentation/vm/index.rst + create mode 100644 Documentation/vm/ksm.rst + delete mode 100644 Documentation/vm/ksm.txt + create mode 100644 Documentation/vm/mmu_notifier.rst + delete mode 100644 Documentation/vm/mmu_notifier.txt + rename Documentation/vm/{numa => numa.rst} (99%) + create mode 100644 Documentation/vm/numa_memory_policy.rst + delete mode 100644 Documentation/vm/numa_memory_policy.txt + delete mode 100644 Documentation/vm/overcommit-accounting + create mode 100644 Documentation/vm/overcommit-accounting.rst + rename Documentation/vm/{page_frags => page_frags.rst} (97%) + rename Documentation/vm/{page_migration => page_migration.rst} (63%) + rename Documentation/vm/{page_owner.txt => page_owner.rst} (86%) + rename Documentation/vm/{pagemap.txt => pagemap.rst} (60%) + rename Documentation/vm/{remap_file_pages.txt => remap_file_pages.rst} (92%) + create mode 100644 Documentation/vm/slub.rst + delete mode 100644 Documentation/vm/slub.txt + rename Documentation/vm/{soft-dirty.txt => soft-dirty.rst} (67%) + rename Documentation/vm/{split_page_table_lock => split_page_table_lock.rst} (95%) + rename Documentation/vm/{swap_numa.txt => swap_numa.rst} (74%) + rename Documentation/vm/{transhuge.txt => transhuge.rst} (74%) + rename Documentation/vm/{unevictable-lru.txt => unevictable-lru.rst} (92%) + rename Documentation/vm/{userfaultfd.txt => userfaultfd.rst} (89%) + rename Documentation/vm/{z3fold.txt => z3fold.rst} (97%) + rename Documentation/vm/{zsmalloc.txt => zsmalloc.rst} (71%) + rename Documentation/vm/{zswap.txt => zswap.rst} (74%) +Merging v4l-dvb/master (42a182282ea2 media: si470x: fix a typo at the Makefile causing build issues) +$ git merge v4l-dvb/master +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu_private.h +Merge made by the 'recursive' strategy. + drivers/media/cec/cec-pin-error-inj.c | 10 +- + drivers/media/dvb-core/dvb_frontend.c | 23 ++-- + drivers/media/pci/ddbridge/ddbridge-core.c | 85 +++++------- + drivers/media/pci/mantis/mantis_uart.c | 7 + + drivers/media/platform/Kconfig | 4 +- + drivers/media/platform/davinci/Kconfig | 6 +- + drivers/media/platform/davinci/isif.c | 4 +- + drivers/media/platform/davinci/vpbe.c | 38 +++--- + drivers/media/platform/davinci/vpbe_display.c | 33 ++--- + drivers/media/platform/davinci/vpbe_osd.c | 21 +-- + drivers/media/platform/davinci/vpbe_venc.c | 9 +- + drivers/media/platform/exynos4-is/Kconfig | 4 +- + drivers/media/platform/fsl-viu.c | 63 +++++---- + drivers/media/platform/marvell-ccic/Kconfig | 5 +- + drivers/media/platform/marvell-ccic/mmp-driver.c | 6 +- + drivers/media/platform/omap/Kconfig | 8 +- + drivers/media/platform/omap/omap_vout.c | 17 ++- + drivers/media/platform/omap/omap_vout_vrfb.c | 4 +- + drivers/media/platform/omap3isp/isp.c | 7 - + drivers/media/platform/omap3isp/ispccdc.c | 2 +- + drivers/media/platform/omap3isp/isppreview.c | 2 +- + drivers/media/platform/omap3isp/ispstat.c | 6 +- + drivers/media/radio/Kconfig | 4 - + drivers/media/radio/si470x/Kconfig | 16 ++- + drivers/media/radio/si470x/Makefile | 8 +- + drivers/media/radio/si470x/radio-si470x-common.c | 70 +++++++--- + drivers/media/radio/si470x/radio-si470x-i2c.c | 24 ++-- + drivers/media/radio/si470x/radio-si470x-usb.c | 18 ++- + drivers/media/radio/si470x/radio-si470x.h | 15 ++- + drivers/media/rc/st_rc.c | 16 ++- + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 2 +- + drivers/media/v4l2-core/v4l2-fwnode.c | 28 ++-- + .../media/atomisp/pci/atomisp2/atomisp_acc.c | 8 +- + .../media/atomisp/pci/atomisp2/atomisp_cmd.c | 9 +- + .../media/atomisp/pci/atomisp2/atomisp_compat.h | 2 +- + .../atomisp/pci/atomisp2/atomisp_compat_css20.c | 2 +- + .../atomisp/pci/atomisp2/atomisp_compat_ioctl32.c | 92 +++++-------- + .../media/atomisp/pci/atomisp2/atomisp_fops.c | 6 +- + .../media/atomisp/pci/atomisp2/atomisp_ioctl.c | 5 +- + .../css2400/hive_isp_css_common/host/mmu.c | 4 - + .../css2400/hive_isp_css_common/host/mmu_private.h | 44 ------- + .../css2400/hive_isp_css_include/host/mmu_public.h | 22 +++- + .../memory_access/memory_access.h | 2 +- + .../css2400/hive_isp_css_include/mmu_device.h | 8 -- + .../pci/atomisp2/css2400/ia_css_frame_public.h | 2 +- + .../pci/atomisp2/css2400/ia_css_memory_access.c | 4 +- + .../isp/kernels/eed1_8/ia_css_eed1_8.host.c | 16 ++- + .../pci/atomisp2/css2400/runtime/frame/src/frame.c | 2 +- + .../atomisp/pci/atomisp2/css2400/sh_css_frac.h | 2 +- + .../staging/media/atomisp/pci/atomisp2/hmm/hmm.c | 2 +- + .../media/atomisp/pci/atomisp2/hmm/hmm_bo.c | 6 +- + .../atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.c | 22 ++-- + .../atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.h | 11 +- + .../media/atomisp/pci/atomisp2/include/hmm/hmm.h | 2 +- + .../atomisp/pci/atomisp2/include/hmm/hmm_bo.h | 2 +- + .../platform/intel-mid/atomisp_gmin_platform.c | 6 - + drivers/staging/media/davinci_vpfe/Kconfig | 3 +- + drivers/staging/media/davinci_vpfe/Makefile | 5 + + drivers/staging/media/davinci_vpfe/TODO | 1 + + drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 143 ++++++++++----------- + .../staging/media/davinci_vpfe/dm365_ipipe_hw.c | 19 +-- + drivers/staging/media/davinci_vpfe/dm365_ipipeif.c | 14 +- + drivers/staging/media/davinci_vpfe/dm365_isif.c | 9 +- + drivers/staging/media/davinci_vpfe/dm365_resizer.c | 13 +- + .../staging/media/davinci_vpfe/vpfe_mc_capture.c | 2 +- + drivers/staging/media/davinci_vpfe/vpfe_video.c | 4 +- + drivers/staging/media/omap4iss/Kconfig | 3 +- + drivers/video/fbdev/omap2/Kconfig | 2 +- + include/linux/platform_data/media/mmp-camera.h | 19 +++ + 69 files changed, 534 insertions(+), 549 deletions(-) + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu_private.h +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 +Already up to date. +Merging pm/linux-next (1fe43114ea73 Merge tag 'pm-4.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) +$ git merge pm/linux-next +Already up to date. +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 (b907b408ca64 Merge branches 'thermal-core' and 'thermal-soc' into next) +$ git merge thermal/next +Already up to date. +Merging thermal-soc/next (629d835db501 thermal: imx: add i.MX7 thermal sensor support) +$ git merge thermal-soc/next +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 +- + drivers/thermal/imx_thermal.c | 295 ++++++++++++++++----- + drivers/thermal/mtk_thermal.c | 35 +++ + 6 files changed, 281 insertions(+), 98 deletions(-) +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 (60cc43fc8884 Linux 4.17-rc1) +$ git merge rdma/for-next +Already up to date. +Merging net-next/master (bda73d4ec943 Merge branch 'Amiga-xsurf100') +$ git merge net-next/master +Auto-merging tools/testing/selftests/net/Makefile +Auto-merging net/ipv4/tcp.c +Auto-merging net/core/dev.c +Removing include/linux/platform_data/mdio-gpio.h +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/net/tun.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/soc/ti/keystone-navigator-qmss.txt | 9 +- + MAINTAINERS | 1 - + drivers/net/ethernet/8390/Kconfig | 17 +- + drivers/net/ethernet/8390/Makefile | 1 + + drivers/net/ethernet/8390/ax88796.c | 228 +-- + drivers/net/ethernet/8390/xsurf100.c | 382 +++++ + drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 54 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 + + .../net/ethernet/cavium/liquidio/liquidio_common.h | 75 +- + drivers/net/ethernet/cavium/liquidio/octeon_iq.h | 4 +- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 16 + + drivers/net/ethernet/huawei/hinic/Kconfig | 2 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 33 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 3 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 3 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 38 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en.h | 4 + + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 37 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 42 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 152 +- + drivers/net/ethernet/realtek/r8169.c | 383 ++--- + drivers/net/ethernet/socionext/netsec.c | 27 +- + drivers/net/ethernet/stmicro/stmmac/chain_mode.c | 34 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 199 +-- + drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/dwmac5.c | 19 +- + drivers/net/ethernet/stmicro/stmmac/dwmac5.h | 6 +- + drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/hwif.h | 421 +++++ + drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/ring_mode.c | 39 +- + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 82 +- + .../net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 34 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 439 +++--- + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 18 +- + drivers/net/ethernet/ti/netcp.h | 3 + + drivers/net/ethernet/ti/netcp_core.c | 32 + + drivers/net/ethernet/ti/netcp_ethss.c | 181 ++- + drivers/net/hyperv/hyperv_net.h | 164 ++ + drivers/net/hyperv/netvsc.c | 3 +- + drivers/net/hyperv/rndis_filter.c | 28 + + drivers/net/phy/Kconfig | 6 + + drivers/net/phy/Makefile | 1 + + drivers/net/phy/asix.c | 63 + + drivers/net/phy/mdio-bitbang.c | 9 - + drivers/net/phy/mdio-gpio.c | 122 +- + drivers/net/tun.c | 60 +- + drivers/net/virtio_net.c | 67 +- + drivers/net/vrf.c | 25 +- + drivers/net/vxlan.c | 17 +- + drivers/soc/ti/knav_dma.c | 8 + + drivers/soc/ti/knav_qmss.h | 6 + + drivers/soc/ti/knav_qmss_queue.c | 98 +- + drivers/vhost/net.c | 7 +- + include/linux/filter.h | 24 +- + include/linux/if_tun.h | 4 +- + include/linux/mdio-bitbang.h | 2 - + include/linux/mdio-gpio.h | 9 + + include/linux/net.h | 1 + + include/linux/netdevice.h | 4 +- + include/linux/platform_data/mdio-gpio.h | 33 - + include/linux/skbuff.h | 5 +- + include/linux/soc/ti/knav_dma.h | 12 + + include/linux/soc/ti/knav_qmss.h | 1 + + include/linux/tcp.h | 1 + + include/net/addrconf.h | 14 + + include/net/ax88796.h | 14 + + include/net/if_inet6.h | 5 +- + include/net/ip.h | 3 + + include/net/ip6_fib.h | 169 +- + include/net/ip6_route.h | 59 +- + include/net/ip_tunnels.h | 11 + + include/net/ipv6.h | 2 - + include/net/netns/ipv6.h | 3 +- + include/net/page_pool.h | 143 ++ + include/net/tcp.h | 4 + + include/net/vxlan.h | 1 + + include/net/xdp.h | 83 + + include/trace/events/tcp.h | 47 - + include/uapi/linux/if_link.h | 1 + + include/uapi/linux/pci_regs.h | 2 + + include/uapi/linux/snmp.h | 2 + + include/uapi/linux/tcp.h | 5 + + kernel/bpf/cpumap.c | 132 +- + net/Kconfig | 3 + + net/core/Makefile | 1 + + net/core/dev.c | 1 + + net/core/dst.c | 1 + + net/core/filter.c | 25 +- + net/core/page_pool.c | 317 ++++ + net/core/rtnetlink.c | 8 +- + net/core/skbuff.c | 14 + + net/core/sock.c | 5 +- + net/core/xdp.c | 269 ++++ + net/ipv4/Makefile | 3 +- + net/ipv4/af_inet.c | 3 +- + net/ipv4/fib_semantics.c | 43 +- + net/ipv4/metrics.c | 53 + + net/ipv4/proc.c | 2 + + net/ipv4/tcp.c | 146 +- + net/ipv4/tcp_input.c | 55 +- + net/ipv6/addrconf.c | 167 +- + net/ipv6/af_inet6.c | 56 +- + net/ipv6/anycast.c | 33 +- + net/ipv6/exthdrs.c | 55 +- + net/ipv6/ip6_fib.c | 496 +++--- + net/ipv6/ip6_input.c | 2 +- + net/ipv6/ip6_output.c | 21 +- + net/ipv6/ndisc.c | 42 +- + net/ipv6/reassembly.c | 25 +- + net/ipv6/route.c | 1650 ++++++++++---------- + net/ipv6/xfrm6_policy.c | 2 - + net/ncsi/internal.h | 34 +- + net/ncsi/ncsi-manage.c | 226 +-- + net/ncsi/ncsi-netlink.c | 20 +- + net/ncsi/ncsi-rsp.c | 178 +-- + net/netfilter/ipvs/ip_vs_xmit.c | 5 +- + tools/testing/selftests/net/Makefile | 2 + + .../testing/selftests/net/forwarding/tc_flower.sh | 70 + + tools/testing/selftests/net/tcp_mmap.c | 437 ++++++ + .../tc-testing/tc-tests/actions/sample.json | 588 +++++++ + 123 files changed, 6339 insertions(+), 3236 deletions(-) + create mode 100644 drivers/net/ethernet/8390/xsurf100.c + create mode 100644 drivers/net/ethernet/stmicro/stmmac/hwif.h + create mode 100644 drivers/net/phy/asix.c + create mode 100644 include/linux/mdio-gpio.h + delete mode 100644 include/linux/platform_data/mdio-gpio.h + create mode 100644 include/net/page_pool.h + create mode 100644 net/core/page_pool.c + create mode 100644 net/ipv4/metrics.c + create mode 100644 tools/testing/selftests/net/tcp_mmap.c + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/actions/sample.json +Merging bpf-next/master (97e19cce05e5 bpf: reserve xdp_frame size in xdp headroom) +$ git merge bpf-next/master +Auto-merging net/core/dev.c +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/net/tun.c +Merge made by the 'recursive' strategy. + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 2 +- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 2 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 2 +- + drivers/net/tun.c | 3 +- + drivers/net/virtio_net.c | 7 +- + include/uapi/linux/bpf.h | 10 +- + net/bpf/test_run.c | 3 +- + net/core/dev.c | 10 +- + net/core/filter.c | 41 ++++-- + samples/bpf/Makefile | 4 + + samples/bpf/sock_example.c | 4 +- + samples/bpf/xdp_adjust_tail_kern.c | 152 +++++++++++++++++++++ + samples/bpf/xdp_adjust_tail_user.c | 142 +++++++++++++++++++ + samples/bpf/xdp_monitor_user.c | 2 +- + tools/bpf/bpftool/Documentation/bpftool-cgroup.rst | 11 +- + tools/bpf/bpftool/Documentation/bpftool-map.rst | 29 ++-- + tools/bpf/bpftool/bash-completion/bpftool | 14 +- + tools/bpf/bpftool/cgroup.c | 15 +- + tools/bpf/bpftool/map.c | 17 ++- + tools/bpf/bpftool/prog.c | 3 + + tools/include/uapi/linux/bpf.h | 10 +- + tools/lib/bpf/libbpf.c | 8 ++ + tools/lib/bpf/libbpf.h | 2 + + tools/testing/selftests/bpf/Makefile | 2 +- + tools/testing/selftests/bpf/bpf_helpers.h | 5 + + tools/testing/selftests/bpf/test_adjust_tail.c | 30 ++++ + tools/testing/selftests/bpf/test_progs.c | 32 +++++ + 28 files changed, 515 insertions(+), 49 deletions(-) + create mode 100644 samples/bpf/xdp_adjust_tail_kern.c + create mode 100644 samples/bpf/xdp_adjust_tail_user.c + create mode 100644 tools/testing/selftests/bpf/test_adjust_tail.c +Merging ipsec-next/master (cd027a5433d6 udp: enable UDP checksum offload for ESP) +$ git merge ipsec-next/master +Auto-merging net/ipv4/ip_output.c +Merge made by the 'recursive' strategy. + net/ipv4/ip_output.c | 2 +- + tools/testing/selftests/net/rtnetlink.sh | 103 +++++++++++++++++++++++++++++++ + 2 files changed, 104 insertions(+), 1 deletion(-) +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 (9a17740e0ea1 ipvs: fix multiplicative hashing in sh/dh/lblc/lblcr algorithms) +$ 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_dh.c | 3 +- + net/netfilter/ipvs/ip_vs_lblc.c | 3 +- + net/netfilter/ipvs/ip_vs_lblcr.c | 3 +- + net/netfilter/ipvs/ip_vs_mh.c | 540 +++++++++++++++++++++++++++++++++++ + net/netfilter/ipvs/ip_vs_proto_tcp.c | 4 +- + net/netfilter/ipvs/ip_vs_sh.c | 3 +- + 10 files changed, 593 insertions(+), 6 deletions(-) + create mode 100644 net/netfilter/ipvs/ip_vs_mh.c +Merging wireless-drivers-next/master (5d1365940a68 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge wireless-drivers-next/master +Already up to date. +Merging bluetooth/master (24557b660705 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 (8db0c433692e regulatory: Rename confusing 'country IE' in log output) +$ git merge mac80211-next/master +Auto-merging net/wireless/reg.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/mac80211_hwsim.c | 1 + + net/wireless/reg.c | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) +Merging gfs2/for-next (9a38662ba4e2 gfs2: Remove sdp->sd_jheightsize) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/bmap.c | 14 +------------- + fs/gfs2/incore.h | 2 -- + fs/gfs2/ops_fstype.c | 19 ------------------- + 3 files changed, 1 insertion(+), 34 deletions(-) +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 (a10beabba213 Merge branch 'drm-next-4.17' of git://people.freedesktop.org/~agd5f/linux 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 (b4615730530b drm/i915/audio: Fix audio detection issue on GLK) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/i915_drv.c +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/i915_drv.c | 27 +++++++++------- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- + drivers/gpu/drm/i915/i915_pmu.c | 37 +++++++++++++++------ + drivers/gpu/drm/i915/intel_audio.c | 2 +- + drivers/gpu/drm/i915/intel_bios.c | 13 +++++--- + drivers/gpu/drm/i915/intel_lrc.c | 9 ++++++ + 14 files changed, 131 insertions(+), 55 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 (3131f209468d drm/vc4: Fix leak of the file_priv that stored the perfmon.) +$ git merge drm-misc/for-linux-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/vc4/vc4_drv.c | 1 + + 1 file changed, 1 insertion(+) +Merging drm-msm/msm-next (789d4c300e10 drm/msm: don't deref error pointer in the msm_fbdev_create error path) +$ git merge drm-msm/msm-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 1 + + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 1 + + drivers/gpu/drm/msm/disp/mdp_format.c | 3 +- + drivers/gpu/drm/msm/disp/mdp_kms.h | 2 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 16 +++-- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 109 +++++++++++++++++++++++++++++ + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 2 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 28 -------- + drivers/gpu/drm/msm/msm_fb.c | 3 +- + drivers/gpu/drm/msm/msm_fbdev.c | 11 +-- + drivers/gpu/drm/msm/msm_gem.c | 20 +++--- + drivers/gpu/drm/msm/msm_kms.h | 5 +- + 12 files changed, 147 insertions(+), 54 deletions(-) +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 (22cd2b2b3151 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 (e241e3f2bf97 Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (91a8561d0eed ALSA: usb-audio: add implicit fb quirk for Axe-Fx III) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + include/sound/emu10k1.h | 4 +- + sound/core/pcm_compat.c | 10 +-- + sound/core/pcm_lib.c | 15 +--- + sound/core/pcm_local.h | 18 +++++ + sound/core/pcm_native.c | 176 ++++++++++++--------------------------------- + sound/pci/ad1889.c | 4 +- + sound/pci/cmipci.c | 2 +- + sound/pci/emu10k1/emufx.c | 9 +-- + sound/pci/emu10k1/emupcm.c | 2 +- + sound/usb/pcm.c | 56 +++++++-------- + 10 files changed, 99 insertions(+), 197 deletions(-) +Merging sound-asoc/for-next (9742eab30c26 Merge branch 'asoc-4.18' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging Documentation/sound/soc/codec.rst +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/rt5668.txt | 50 + + .../devicetree/bindings/sound/tscs42xx.txt | 6 + + Documentation/sound/soc/codec.rst | 8 +- + include/linux/mfd/wm8350/audio.h | 3 - + include/sound/rt5668.h | 40 + + include/trace/events/asoc.h | 1 - + include/uapi/sound/asoc.h | 29 +- + sound/soc/amd/acp-da7219-max98357a.c | 8 +- + sound/soc/amd/acp-pcm-dma.c | 259 +- + sound/soc/amd/acp.h | 22 +- + sound/soc/atmel/atmel_ssc_dai.c | 2 +- + sound/soc/bcm/Kconfig | 3 +- + sound/soc/codecs/Kconfig | 12 + + sound/soc/codecs/Makefile | 4 + + sound/soc/codecs/adau17x1.c | 35 +- + sound/soc/codecs/adau17x1.h | 3 +- + sound/soc/codecs/max9860.c | 44 +- + sound/soc/codecs/max9860.h | 10 +- + sound/soc/codecs/msm8916-wcd-analog.c | 9 +- + sound/soc/codecs/nau8824.c | 9 + + sound/soc/codecs/rt1305.c | 1191 +++++++++ + sound/soc/codecs/rt1305.h | 276 ++ + sound/soc/codecs/rt5514.c | 3 + + sound/soc/codecs/rt5668.c | 2639 ++++++++++++++++++++ + sound/soc/codecs/rt5668.h | 1318 ++++++++++ + sound/soc/codecs/tfa9879.c | 48 +- + sound/soc/codecs/tfa9879.h | 7 +- + sound/soc/codecs/tscs42xx.c | 203 +- + sound/soc/codecs/tscs42xx.h | 2 +- + sound/soc/fsl/fsl_esai.c | 13 + + sound/soc/fsl/fsl_ssi.c | 14 +- + sound/soc/intel/Kconfig | 24 +- + sound/soc/intel/boards/bxt_da7219_max98357a.c | 2 +- + sound/soc/intel/boards/bxt_rt298.c | 2 +- + sound/soc/intel/boards/bytcr_rt5640.c | 2 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 2 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 2 +- + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 2 +- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 2 +- + sound/soc/intel/boards/skl_rt286.c | 2 +- + sound/soc/intel/skylake/skl-messages.c | 2 +- + sound/soc/intel/skylake/skl-pcm.c | 36 +- + sound/soc/intel/skylake/skl-sst-dsp.h | 3 - + sound/soc/intel/skylake/skl-sst.c | 34 +- + sound/soc/intel/skylake/skl.c | 7 + + sound/soc/kirkwood/Kconfig | 1 - + sound/soc/omap/omap-dmic.c | 14 +- + sound/soc/pxa/Kconfig | 1 - + sound/soc/qcom/Kconfig | 7 +- + sound/soc/sh/rcar/cmd.c | 15 +- + sound/soc/sh/rcar/core.c | 53 +- + sound/soc/sh/rcar/dma.c | 11 +- + sound/soc/sh/rcar/gen.c | 3 +- + sound/soc/sh/rcar/rsnd.h | 4 +- + sound/soc/sh/rcar/ssi.c | 13 +- + sound/soc/soc-topology.c | 44 +- + 56 files changed, 6156 insertions(+), 403 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/rt5668.txt + create mode 100644 include/sound/rt5668.h + create mode 100644 sound/soc/codecs/rt1305.c + create mode 100644 sound/soc/codecs/rt1305.h + create mode 100644 sound/soc/codecs/rt5668.c + create mode 100644 sound/soc/codecs/rt5668.h +Merging modules/modules-next (c554b8986801 module: Allow to always show the status of modsign) +$ git merge modules/modules-next +Auto-merging kernel/module.c +Merge made by the 'recursive' strategy. + kernel/module.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) +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 (a1c0a8e35b88 dm bufio: fix buffer alignment) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + drivers/md/dm-bufio.c | 5 +++-- + drivers/md/dm-integrity.c | 2 +- + 2 files changed, 4 insertions(+), 3 deletions(-) +Merging mmc/next (924178333b63 mmc: mediatek: use of_device_get_match_data()) +$ git merge mmc/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/amlogic,meson-gx.txt | 1 + + Documentation/devicetree/bindings/mmc/jz4740.txt | 38 ++++ + Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 1 + + arch/mips/boot/dts/ingenic/ci20.dts | 34 ++++ + arch/mips/boot/dts/ingenic/jz4780.dtsi | 52 ++++++ + arch/mips/configs/ci20_defconfig | 4 + + drivers/mmc/core/block.c | 3 +- + drivers/mmc/core/card.h | 6 + + drivers/mmc/core/mmc.c | 8 + + drivers/mmc/core/pwrseq_simple.c | 14 +- + drivers/mmc/core/quirks.h | 3 + + drivers/mmc/core/sd.c | 8 + + drivers/mmc/core/sdio.c | 14 +- + drivers/mmc/host/Kconfig | 23 +-- + drivers/mmc/host/dw_mmc-rockchip.c | 5 +- + drivers/mmc/host/dw_mmc.c | 4 + + drivers/mmc/host/jz4740_mmc.c | 203 ++++++++++++++------- + drivers/mmc/host/meson-gx-mmc.c | 63 +++++-- + drivers/mmc/host/mtk-sd.c | 7 +- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 64 +++++-- + drivers/mmc/host/sdhci-cadence.c | 22 ++- + drivers/mmc/host/sdhci-of-arasan.c | 3 +- + drivers/mmc/host/sdhci-pci-core.c | 63 ++++++- + drivers/mmc/host/sdhci-pci.h | 1 + + drivers/mmc/host/sunxi-mmc.c | 185 ++++++++++++------- + include/dt-bindings/dma/jz4780-dma.h | 49 +++++ + include/linux/mmc/card.h | 1 + + include/linux/mmc/host.h | 1 + + include/linux/mmc/sdio_ids.h | 1 + + 29 files changed, 680 insertions(+), 201 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/jz4740.txt + create mode 100644 include/dt-bindings/dma/jz4780-dma.h +Merging kgdb/kgdb-next (2cf2f0d5b91f kdb: use memmove instead of overlapping memcpy) +$ git merge kgdb/kgdb-next +Already up to date. +Merging md/for-next (50c35295db95 MD: fix lock contention for flush bios) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + drivers/md/md.c | 194 +++++++++++++++++++++++++++++++++++++---------------- + drivers/md/md.h | 23 +++++-- + drivers/md/raid1.c | 25 +++++-- + 3 files changed, 173 insertions(+), 69 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 +Auto-merging include/linux/mfd/cros_ec.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 (1dced996ee70 regulator: pfuze100: update voltage setting for pfuze3000 sw1a) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + drivers/regulator/ab8500.c | 1779 ++++---------------------------- + drivers/regulator/lp87565-regulator.c | 17 +- + drivers/regulator/pfuze100-regulator.c | 9 +- + include/linux/regulator/ab8500.h | 157 +-- + 4 files changed, 207 insertions(+), 1755 deletions(-) +Merging security/next-testing (0c245cb58731 security: remove security_settime) +$ git merge security/next-testing +Auto-merging include/linux/security.h +Merge made by the 'recursive' strategy. + include/linux/security.h | 14 -------------- + 1 file changed, 14 deletions(-) +Merging apparmor/apparmor-next (588558eb6d0e apparmor: fix memory leak on buffer on error exit path) +$ git merge apparmor/apparmor-next +Already up to date. +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 (d141136f523a audit: normalize MAC_POLICY_LOAD record) +$ git merge selinux/next +Merge made by the 'recursive' strategy. + security/selinux/selinuxfs.c | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) +Merging tpmdd/next (6fd6db01dfaf tpm: fix intermittent failure with self tests) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. +Merging watchdog/master (49d4d277ca54 aspeed: watchdog: Set bootstatus during probe) +$ git merge watchdog/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/watchdog/aspeed_wdt.c | 7 +++++++ + drivers/watchdog/renesas_wdt.c | 6 ++++-- + drivers/watchdog/sch311x_wdt.c | 2 +- + drivers/watchdog/w83977f_wdt.c | 2 +- + drivers/watchdog/wafer5823wdt.c | 2 +- + 6 files changed, 15 insertions(+), 6 deletions(-) +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 +Already up to date. +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 (60cc43fc8884 Linux 4.17-rc1) +$ git merge audit/next +Already up to date. +Merging devicetree/for-next (304a39b4bc94 dt-bindings: more status property removal from examples) +$ git merge devicetree/for-next +Auto-merging Documentation/devicetree/bindings/mmc/tmio_mmc.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/dma/k3dma.txt | 1 - + Documentation/devicetree/bindings/dma/ti-edma.txt | 1 - + Documentation/devicetree/bindings/mips/lantiq/rcu.txt | 2 -- + Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 4 ---- + Documentation/devicetree/bindings/mtd/mtk-nand.txt | 4 ---- + Documentation/devicetree/bindings/pci/xgene-pci.txt | 7 ------- + Documentation/devicetree/bindings/pps/pps-gpio.txt | 1 - + drivers/of/of_numa.c | 1 - + 8 files changed, 21 deletions(-) +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 (9d7e5766a8fd Merge branch 'spi-4.18' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + drivers/spi/Kconfig | 12 +-- + drivers/spi/spi-cadence.c | 8 ++ + drivers/spi/spi-imx.c | 2 +- + drivers/spi/spi-pxa2xx-dma.c | 28 ++--- + drivers/spi/spi-pxa2xx.c | 239 +++++++++++++---------------------------- + drivers/spi/spi-pxa2xx.h | 17 +-- + drivers/spi/spi-s3c64xx.c | 146 +++++++++++++++---------- + drivers/spi/spi-sh-msiof.c | 66 ++++++------ + drivers/spi/spi-stm32.c | 2 +- + drivers/spi/spi-zynqmp-gqspi.c | 86 ++++++++++++--- + 10 files changed, 300 insertions(+), 306 deletions(-) +Merging tip/auto-latest (15a5848cfc2b Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Removing arch/x86/kernel/pci-nommu.c +Merge made by the 'recursive' strategy. + arch/Kconfig | 15 +++++ + arch/alpha/include/asm/Kbuild | 1 + + arch/arc/include/asm/Kbuild | 1 + + arch/arm/include/asm/Kbuild | 1 + + arch/arm64/include/asm/compat.h | 11 ---- + arch/arm64/include/asm/stat.h | 1 + + arch/arm64/kernel/hw_breakpoint.c | 1 - + arch/arm64/kernel/perf_regs.c | 2 +- + arch/c6x/include/asm/Kbuild | 1 + + arch/h8300/include/asm/Kbuild | 1 + + arch/hexagon/include/asm/Kbuild | 1 + + arch/ia64/include/asm/Kbuild | 1 + + arch/m68k/include/asm/Kbuild | 1 + + arch/microblaze/include/asm/Kbuild | 1 + + arch/mips/include/asm/compat.h | 11 ---- + arch/mips/kernel/signal32.c | 2 +- + arch/nds32/include/asm/Kbuild | 1 + + arch/nios2/include/asm/Kbuild | 1 + + arch/openrisc/include/asm/Kbuild | 1 + + arch/parisc/include/asm/compat.h | 11 ---- + arch/powerpc/include/asm/compat.h | 11 ---- + arch/powerpc/kernel/asm-offsets.c | 2 +- + arch/powerpc/oprofile/backtrace.c | 1 + + arch/s390/hypfs/hypfs_sprp.c | 1 - + arch/s390/include/asm/compat.h | 11 ---- + arch/s390/include/asm/elf.h | 4 +- + arch/s390/kvm/priv.c | 1 - + arch/s390/pci/pci_clp.c | 1 - + arch/sh/include/asm/Kbuild | 1 + + arch/sparc/include/asm/compat.h | 15 ++--- + arch/um/include/asm/Kbuild | 1 + + arch/unicore32/include/asm/Kbuild | 1 + + arch/x86/events/core.c | 2 +- + arch/x86/include/asm/asm.h | 2 - + arch/x86/include/asm/compat.h | 11 ---- + arch/x86/include/asm/ftrace.h | 2 +- + arch/x86/include/asm/processor.h | 2 - + arch/x86/kernel/acpi/boot.c | 4 ++ + arch/x86/kernel/pci-nommu.c | 90 ----------------------------- + arch/x86/kernel/smpboot.c | 45 +++++++++++++-- + arch/x86/kernel/sys_x86_64.c | 2 +- + arch/x86/kernel/tsc.c | 2 +- + arch/x86/mm/dump_pagetables.c | 11 ++-- + arch/xtensa/include/asm/Kbuild | 1 + + drivers/clocksource/timer-imx-tpm.c | 2 +- + drivers/s390/block/dasd_ioctl.c | 1 - + drivers/s390/char/fs3270.c | 1 - + drivers/s390/char/sclp_ctl.c | 1 - + drivers/s390/char/vmcp.c | 1 - + drivers/s390/cio/chsc_sch.c | 1 - + drivers/s390/net/qeth_core_main.c | 2 +- + include/asm-generic/compat.h | 3 + + include/linux/compat.h | 12 ++-- + include/linux/compat_time.h | 23 ++++++++ + include/linux/restart_block.h | 7 +-- + include/linux/syscalls.h | 13 +++-- + include/linux/time.h | 4 +- + include/linux/time64.h | 10 +++- + include/linux/timekeeping32.h | 3 - + include/linux/timer.h | 2 - + include/uapi/asm-generic/posix_types.h | 1 + + include/uapi/linux/time.h | 7 +++ + kernel/compat.c | 52 +++-------------- + kernel/time/hrtimer.c | 10 +++- + kernel/time/posix-cpu-timers.c | 4 +- + kernel/time/posix-stubs.c | 12 ++-- + kernel/time/posix-timers.c | 24 +++++--- + kernel/time/tick-oneshot.c | 11 ++-- + kernel/time/time.c | 58 +++++++++++++++++-- + kernel/time/timekeeping.c | 7 --- + kernel/trace/trace_kprobe.c | 2 - + tools/include/linux/compiler.h | 20 +++++-- + tools/objtool/Makefile | 4 +- + tools/perf/Documentation/perf-config.txt | 5 ++ + tools/perf/Documentation/perf-sched.txt | 4 +- + tools/perf/Documentation/perf-stat.txt | 2 +- + tools/perf/Makefile.config | 4 +- + tools/perf/arch/arm/include/arch-tests.h | 12 ++++ + tools/perf/arch/arm/tests/Build | 2 + + tools/perf/arch/arm/tests/arch-tests.c | 16 +++++ + tools/perf/arch/x86/annotate/instructions.c | 67 ++++++++++++++++++++- + tools/perf/builtin-help.c | 2 +- + tools/perf/builtin-script.c | 4 +- + tools/perf/builtin-stat.c | 14 +---- + tools/perf/builtin-version.c | 3 + + tools/perf/perf.c | 4 +- + tools/perf/tests/bpf-script-test-kbuild.c | 1 - + tools/perf/tests/builtin-test.c | 1 + + tools/perf/ui/browsers/annotate.c | 5 ++ + tools/perf/util/annotate.c | 26 +++++++-- + tools/perf/util/annotate.h | 9 +++ + tools/perf/util/generate-cmdlist.sh | 2 +- + tools/perf/util/header.c | 3 +- + tools/perf/util/symbol.c | 8 +-- + tools/perf/util/syscalltbl.c | 6 +- + tools/perf/util/trace-event-scripting.c | 4 +- + 96 files changed, 441 insertions(+), 351 deletions(-) + delete mode 100644 arch/x86/kernel/pci-nommu.c + create mode 100644 include/asm-generic/compat.h + create mode 100644 include/linux/compat_time.h + create mode 100644 tools/perf/arch/arm/include/arch-tests.h + create mode 100644 tools/perf/arch/arm/tests/arch-tests.c +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 (0b3dec05dbbc tracing: Enforce passing in filter=NULL to create_filter()) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (3b91e0ea77ce rcu: Exclude near-simultaneous RCU CPU stall warnings) +$ git merge rcu/rcu/next +Removing tools/testing/selftests/rcutorture/bin/parse-torture.sh +Merge made by the 'recursive' strategy. + drivers/nvme/host/core.c | 2 +- + include/linux/rcupdate.h | 4 +- + include/linux/rcutree.h | 1 + + include/linux/sched.h | 14 +- + include/linux/srcu.h | 36 +++- + kernel/rcu/rcu.h | 1 + + kernel/rcu/rcuperf.c | 2 +- + kernel/rcu/rcutorture.c | 7 +- + kernel/rcu/srcutiny.c | 9 +- + kernel/rcu/srcutree.c | 30 +-- + kernel/rcu/tree.c | 43 ++-- + kernel/rcu/tree.h | 18 +- + kernel/rcu/tree_exp.h | 235 ++++++++++++--------- + kernel/rcu/tree_plugin.h | 106 ++++++++-- + kernel/rcu/update.c | 50 +---- + kernel/sched/core.c | 14 -- + kernel/softirq.c | 3 +- + kernel/torture.c | 2 +- + kernel/trace/trace_benchmark.c | 4 +- + .../selftests/rcutorture/bin/kvm-find-errors.sh | 55 +++++ + .../selftests/rcutorture/bin/kvm-recheck.sh | 4 - + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 1 - + .../selftests/rcutorture/bin/parse-console.sh | 115 ++++++++-- + .../selftests/rcutorture/bin/parse-torture.sh | 105 --------- + 24 files changed, 504 insertions(+), 357 deletions(-) + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-find-errors.sh + delete mode 100755 tools/testing/selftests/rcutorture/bin/parse-torture.sh +Merging kvm/linux-next (c18bb396d3d2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ 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 (ebf04f331fa1 xen: xenbus_dev_frontend: Really return response string) +$ git merge xen-tip/linux-next +Merge made by the 'recursive' strategy. + drivers/xen/xen-pciback/conf_space_quirks.c | 2 +- + drivers/xen/xen-pciback/pci_stub.c | 8 +- + drivers/xen/xenbus/xenbus_dev_frontend.c | 3 +- + include/xen/interface/io/sndif.h | 322 ++++++++++++++++++++++++++-- + 4 files changed, 313 insertions(+), 22 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 (60cc43fc8884 Linux 4.17-rc1) +$ git merge drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (60cc43fc8884 Linux 4.17-rc1) +$ git merge chrome-platform/for-next +Already up to date. +Merging hsi/for-next (70d52ba9e57e hsi: clients: Change return type to vm_fault_t) +$ git merge hsi/for-next +Merge made by the 'recursive' strategy. + drivers/hsi/clients/cmt_speech.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging leds/for-next (9e50d5fb0d18 leds: add LED driver for CR0014114 board) +$ git merge leds/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-cr0014114.txt | 54 ++++ + .../devicetree/bindings/vendor-prefixes.txt | 1 + + drivers/leds/Kconfig | 13 + + drivers/leds/Makefile | 1 + + drivers/leds/leds-cr0014114.c | 315 +++++++++++++++++++++ + 5 files changed, 384 insertions(+) + create mode 100644 Documentation/devicetree/bindings/leds/leds-cr0014114.txt + create mode 100644 drivers/leds/leds-cr0014114.c +Merging ipmi/for-next (1211229399b3 ipmi_ssif: Fix uninitialized variable issue) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ipmi/npcm7xx-kcs-bmc.txt | 39 + + drivers/char/ipmi/Kconfig | 15 + + drivers/char/ipmi/Makefile | 1 + + drivers/char/ipmi/ipmi_devintf.c | 129 +- + drivers/char/ipmi/ipmi_msghandler.c | 1842 +++++++++++--------- + drivers/char/ipmi/ipmi_poweroff.c | 32 +- + drivers/char/ipmi/ipmi_si_intf.c | 73 +- + drivers/char/ipmi/ipmi_ssif.c | 94 +- + drivers/char/ipmi/ipmi_watchdog.c | 407 ++--- + drivers/char/ipmi/kcs_bmc_npcm7xx.c | 204 +++ + include/linux/ipmi.h | 153 +- + include/linux/ipmi_smi.h | 130 +- + 12 files changed, 1733 insertions(+), 1386 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ipmi/npcm7xx-kcs-bmc.txt + create mode 100644 drivers/char/ipmi/kcs_bmc_npcm7xx.c +Merging driver-core/driver-core-next (60cc43fc8884 Linux 4.17-rc1) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (60cc43fc8884 Linux 4.17-rc1) +$ git merge usb/usb-next +Already up to date. +Merging usb-gadget/next (60cc43fc8884 Linux 4.17-rc1) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (60cc43fc8884 Linux 4.17-rc1) +$ 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 (60cc43fc8884 Linux 4.17-rc1) +$ git merge phy-next/next +Already up to date. +Merging tty/tty-next (60cc43fc8884 Linux 4.17-rc1) +$ git merge tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (60cc43fc8884 Linux 4.17-rc1) +$ git merge char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (60cc43fc8884 Linux 4.17-rc1) +$ git merge extcon/extcon-next +Already up to date. +Merging staging/staging-next (60cc43fc8884 Linux 4.17-rc1) +$ 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 (72ef08bf651a dmaengine: dmatest: Remove use of VLAs) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. + drivers/dma/dmatest.c | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) +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 (acc2587b8cf1 Merge branch 'fixes' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/net/hyperv/netvsc.c +Auto-merging drivers/net/hyperv/hyperv_net.h +Merge made by the 'recursive' strategy. + drivers/ata/libata-scsi.c | 12 + + drivers/hv/ring_buffer.c | 2 + + drivers/message/fusion/lsi/mpi_cnfg.h | 4 +- + drivers/message/fusion/mptfc.c | 2 +- + drivers/message/fusion/mptsas.c | 1 + + drivers/net/hyperv/hyperv_net.h | 1 - + drivers/net/hyperv/netvsc.c | 18 +- + drivers/net/hyperv/netvsc_drv.c | 3 - + drivers/scsi/Kconfig | 14 + + drivers/scsi/Makefile | 1 + + drivers/scsi/cxlflash/Kconfig | 2 +- + drivers/scsi/cxlflash/Makefile | 2 +- + drivers/scsi/cxlflash/backend.h | 50 +- + drivers/scsi/cxlflash/common.h | 11 +- + drivers/scsi/cxlflash/cxl_hw.c | 13 + + drivers/scsi/cxlflash/main.c | 86 +- + drivers/scsi/cxlflash/main.h | 1 + + drivers/scsi/cxlflash/ocxl_hw.c | 1436 +++++++++++++++++++++++++++ + drivers/scsi/cxlflash/ocxl_hw.h | 77 ++ + drivers/scsi/cxlflash/sislite.h | 41 +- + drivers/scsi/cxlflash/superpipe.c | 14 + + drivers/scsi/fnic/fnic_trace.c | 2 +- + drivers/scsi/hisi_sas/hisi_sas.h | 3 - + drivers/scsi/hisi_sas/hisi_sas_main.c | 53 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 8 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 81 +- + drivers/scsi/iscsi_tcp.c | 1 - + drivers/scsi/libsas/sas_ata.c | 5 + + drivers/scsi/libsas/sas_discover.c | 1 + + drivers/scsi/lpfc/lpfc.h | 9 +- + drivers/scsi/lpfc/lpfc_attr.c | 112 ++- + drivers/scsi/lpfc/lpfc_ct.c | 10 + + drivers/scsi/lpfc/lpfc_debugfs.c | 93 +- + drivers/scsi/lpfc/lpfc_els.c | 1 - + drivers/scsi/lpfc/lpfc_hbadisc.c | 4 - + drivers/scsi/lpfc/lpfc_hw4.h | 12 + + drivers/scsi/lpfc/lpfc_init.c | 62 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 29 +- + drivers/scsi/lpfc/lpfc_nvme.c | 146 ++- + drivers/scsi/lpfc/lpfc_nvme.h | 14 + + drivers/scsi/lpfc/lpfc_nvmet.h | 6 +- + drivers/scsi/lpfc/lpfc_scsi.c | 31 +- + drivers/scsi/lpfc/lpfc_sli.c | 16 +- + drivers/scsi/lpfc/lpfc_sli4.h | 1 + + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/megaraid/megaraid_sas.h | 4 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 25 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 14 +- + drivers/scsi/scsi_debug.c | 33 +- + drivers/scsi/scsi_devinfo.c | 3 +- + drivers/scsi/scsi_dh.c | 5 +- + drivers/scsi/scsi_transport_iscsi.c | 29 +- + drivers/scsi/sd.c | 2 + + drivers/scsi/sd.h | 12 +- + drivers/scsi/sd_zbc.c | 150 +-- + drivers/scsi/sg.c | 2 +- + drivers/scsi/storvsc_drv.c | 3 - + drivers/scsi/ufs/ufshcd.c | 40 + + drivers/scsi/zorro_esp.c | 1172 ++++++++++++++++++++++ + drivers/target/target_core_configfs.c | 25 + + drivers/target/target_core_internal.h | 1 + + drivers/target/target_core_pscsi.c | 2 + + drivers/target/target_core_user.c | 2 +- + include/linux/blkdev.h | 5 + + include/linux/hyperv.h | 12 + + include/linux/libata.h | 2 + + include/scsi/scsi_dbg.h | 2 - + include/trace/events/ufs.h | 27 + + 68 files changed, 3642 insertions(+), 423 deletions(-) + create mode 100644 drivers/scsi/cxlflash/ocxl_hw.c + create mode 100644 drivers/scsi/cxlflash/ocxl_hw.h + create mode 100644 drivers/scsi/zorro_esp.c +Merging scsi-mkp/for-next (69589c9bb9c2 scsi: target: Change return type to vm_fault_t) +$ git merge scsi-mkp/for-next +Already up to date. +Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker) +$ git merge target-updates/for-next +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 (3af494dbae48 ACPI: disable extra P_LVLx access on KVM) +$ git merge vhost/linux-next +Merge made by the 'recursive' strategy. + drivers/acpi/processor_idle.c | 7 +- + drivers/virtio/virtio_balloon.c | 298 +++++++++++++++++++++++++++++++----- + include/linux/mm.h | 6 + + include/linux/ptr_ring.h | 79 +++++++++- + include/uapi/linux/virtio_balloon.h | 22 +++ + mm/page_alloc.c | 97 ++++++++++++ + mm/page_poison.c | 6 + + 7 files changed, 473 insertions(+), 42 deletions(-) +Merging rpmsg/for-next (47c4aebb693c Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Merge made by the 'recursive' strategy. + drivers/hwspinlock/hwspinlock_core.c | 67 +++++++++++++++++++++++++++--------- + drivers/remoteproc/qcom_q6v5_pil.c | 10 +++--- + include/linux/hwspinlock.h | 58 +++++++++++++++++++++++++++++++ + 3 files changed, 113 insertions(+), 22 deletions(-) +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 (938a10bb4913 pinctrl: samsung: Document required order of banks) +$ git merge pinctrl-samsung/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/samsung/pinctrl-exynos-arm.c | 30 ++++++++++++++++++++++++-- + drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 20 +++++++++++++++++ + 2 files changed, 48 insertions(+), 2 deletions(-) +Merging pwm/for-next (6873842235d6 pwm: rcar: Add suspend/resume support) +$ git merge pwm/for-next +Already up to date. +Merging userns/for-next (1f5781725dcb commoncap: Handle memory allocation failure.) +$ git merge userns/for-next +Merge made by the 'recursive' strategy. + security/commoncap.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging ktest/for-next (6cd110a91f52 ktest: Take submenu into account for grub2 menus) +$ git merge ktest/for-next +Already up to date. +Merging random/dev (9e66317d3c92 Linux 4.14-rc3) +$ git merge random/dev +Already up to date. +Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and counting against aio-max-nr) +$ git merge aio/master +Already up to date. +Merging kselftest/next (60cc43fc8884 Linux 4.17-rc1) +$ git merge kselftest/next +Already up to date. +Merging y2038/y2038 (ad17d1754e88 y2038: compat: Move common compat types to asm-generic/compat.h) +$ git merge y2038/y2038 +Removing arch/x86/include/uapi/asm/shmbuf.h +Removing arch/x86/include/uapi/asm/msgbuf.h +Removing arch/s390/include/uapi/asm/shmbuf.h +Removing arch/s390/include/uapi/asm/sembuf.h +Removing arch/s390/include/uapi/asm/msgbuf.h +Removing arch/ia64/include/uapi/asm/shmbuf.h +Removing arch/ia64/include/uapi/asm/sembuf.h +Removing arch/ia64/include/uapi/asm/msgbuf.h +Removing arch/ia64/include/uapi/asm/ipcbuf.h +Removing arch/alpha/include/uapi/asm/shmbuf.h +Removing arch/alpha/include/uapi/asm/sembuf.h +Removing arch/alpha/include/uapi/asm/msgbuf.h +Removing arch/alpha/include/uapi/asm/ipcbuf.h +Merge made by the 'recursive' strategy. + arch/alpha/include/uapi/asm/Kbuild | 4 ++ + arch/alpha/include/uapi/asm/ipcbuf.h | 2 - + arch/alpha/include/uapi/asm/msgbuf.h | 28 ----------- + arch/alpha/include/uapi/asm/sembuf.h | 23 --------- + arch/alpha/include/uapi/asm/shmbuf.h | 39 --------------- + arch/arm64/include/asm/compat.h | 52 +++++++------------- + arch/ia64/include/uapi/asm/Kbuild | 4 ++ + arch/ia64/include/uapi/asm/ipcbuf.h | 2 - + arch/ia64/include/uapi/asm/msgbuf.h | 28 ----------- + arch/ia64/include/uapi/asm/sembuf.h | 23 --------- + arch/ia64/include/uapi/asm/shmbuf.h | 39 --------------- + arch/mips/include/asm/compat.h | 58 +++++++++-------------- + arch/mips/include/uapi/asm/msgbuf.h | 57 ++++++++++++++-------- + arch/mips/include/uapi/asm/sembuf.h | 15 +++++- + arch/mips/include/uapi/asm/shmbuf.h | 23 ++++++++- + arch/parisc/include/asm/compat.h | 50 +++++++------------- + arch/parisc/include/uapi/asm/msgbuf.h | 33 +++++++------ + arch/parisc/include/uapi/asm/sembuf.h | 16 +++---- + arch/parisc/include/uapi/asm/shmbuf.h | 19 ++++---- + arch/powerpc/include/asm/compat.h | 50 +++++++------------- + arch/powerpc/include/uapi/asm/msgbuf.h | 18 +++---- + arch/powerpc/include/uapi/asm/sembuf.h | 14 +++--- + arch/powerpc/include/uapi/asm/shmbuf.h | 19 ++++---- + arch/s390/include/asm/compat.h | 50 +++++++------------- + arch/s390/include/uapi/asm/Kbuild | 3 ++ + arch/s390/include/uapi/asm/msgbuf.h | 38 --------------- + arch/s390/include/uapi/asm/sembuf.h | 30 ------------ + arch/s390/include/uapi/asm/shmbuf.h | 49 ------------------- + arch/sparc/include/asm/compat.h | 51 +++++++------------- + arch/sparc/include/uapi/asm/msgbuf.h | 22 ++++----- + arch/sparc/include/uapi/asm/sembuf.h | 16 +++---- + arch/sparc/include/uapi/asm/shmbuf.h | 21 ++++----- + arch/x86/include/asm/compat.h | 51 +++++++------------- + arch/x86/include/uapi/asm/Kbuild | 5 +- + arch/x86/include/uapi/asm/msgbuf.h | 1 - + arch/x86/include/uapi/asm/sembuf.h | 11 ++++- + arch/x86/include/uapi/asm/shmbuf.h | 1 - + arch/xtensa/include/uapi/asm/msgbuf.h | 25 +++++----- + arch/xtensa/include/uapi/asm/sembuf.h | 17 ++++--- + arch/xtensa/include/uapi/asm/shmbuf.h | 37 ++++----------- + include/asm-generic/compat.h | 24 +++++++++- + include/linux/compat.h | 2 - + include/linux/syscalls.h | 6 +-- + include/uapi/asm-generic/msgbuf.h | 17 ++++--- + include/uapi/asm-generic/sembuf.h | 26 ++++++---- + include/uapi/asm-generic/shmbuf.h | 17 ++++--- + ipc/mqueue.c | 86 +++++++++++++++++----------------- + ipc/msg.c | 20 +++++--- + ipc/sem.c | 27 +++++++---- + ipc/shm.c | 14 ++++-- + ipc/syscall.c | 13 +++-- + ipc/util.h | 4 +- + 52 files changed, 493 insertions(+), 807 deletions(-) + delete mode 100644 arch/alpha/include/uapi/asm/ipcbuf.h + delete mode 100644 arch/alpha/include/uapi/asm/msgbuf.h + delete mode 100644 arch/alpha/include/uapi/asm/sembuf.h + delete mode 100644 arch/alpha/include/uapi/asm/shmbuf.h + delete mode 100644 arch/ia64/include/uapi/asm/ipcbuf.h + delete mode 100644 arch/ia64/include/uapi/asm/msgbuf.h + delete mode 100644 arch/ia64/include/uapi/asm/sembuf.h + delete mode 100644 arch/ia64/include/uapi/asm/shmbuf.h + delete mode 100644 arch/s390/include/uapi/asm/msgbuf.h + delete mode 100644 arch/s390/include/uapi/asm/sembuf.h + delete mode 100644 arch/s390/include/uapi/asm/shmbuf.h + delete mode 100644 arch/x86/include/uapi/asm/msgbuf.h + delete mode 100644 arch/x86/include/uapi/asm/shmbuf.h +Merging livepatching/for-next (3beed9bf1e3d Merge branch 'for-4.17/upstream-fixes' into for-next) +$ git merge livepatching/for-next +Merge made by the 'recursive' strategy. + Documentation/livepatch/shadow-vars.txt | 41 ++++++++---- + include/linux/livepatch.h | 19 ++++-- + kernel/livepatch/shadow.c | 108 ++++++++++++++++++++---------- + samples/livepatch/livepatch-shadow-fix1.c | 43 +++++++++--- + samples/livepatch/livepatch-shadow-fix2.c | 33 ++++----- + 5 files changed, 163 insertions(+), 81 deletions(-) +Merging coresight/next (53531a9947ed coresight: Moving framework and drivers to SPDX identifier) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + Documentation/trace/coresight.txt | 103 +++++++++++++++------ + drivers/hwtracing/coresight/coresight-cpu-debug.c | 14 +-- + .../coresight/coresight-dynamic-replicator.c | 10 +- + drivers/hwtracing/coresight/coresight-etb10.c | 13 +-- + drivers/hwtracing/coresight/coresight-etm-cp14.c | 13 +-- + drivers/hwtracing/coresight/coresight-etm-perf.c | 13 +-- + drivers/hwtracing/coresight/coresight-etm-perf.h | 13 +-- + drivers/hwtracing/coresight/coresight-etm.h | 13 +-- + .../hwtracing/coresight/coresight-etm3x-sysfs.c | 13 +-- + drivers/hwtracing/coresight/coresight-etm3x.c | 13 +-- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 13 +-- + drivers/hwtracing/coresight/coresight-etm4x.c | 13 +-- + drivers/hwtracing/coresight/coresight-etm4x.h | 13 +-- + drivers/hwtracing/coresight/coresight-funnel.c | 13 +-- + drivers/hwtracing/coresight/coresight-priv.h | 13 +-- + drivers/hwtracing/coresight/coresight-replicator.c | 13 +-- + drivers/hwtracing/coresight/coresight-stm.c | 13 +-- + drivers/hwtracing/coresight/coresight-tmc-etf.c | 13 +-- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 13 +-- + drivers/hwtracing/coresight/coresight-tmc.c | 10 +- + drivers/hwtracing/coresight/coresight-tmc.h | 13 +-- + drivers/hwtracing/coresight/coresight-tpiu.c | 13 +-- + drivers/hwtracing/coresight/coresight.c | 21 ++--- + drivers/hwtracing/coresight/of_coresight.c | 13 +-- + drivers/hwtracing/stm/ftrace.c | 10 +- + include/linux/coresight.h | 13 +-- + 26 files changed, 132 insertions(+), 296 deletions(-) +Merging rtc/rtc-next (36d91a4d401c rtc: cmos: introduce quirks to enable use_acpi_alarm mode) +$ git merge rtc/rtc-next +Merge made by the 'recursive' strategy. + drivers/rtc/rtc-cmos.c | 155 +++++++++++++++++++++++++++++++++++++++---------- + 1 file changed, 124 insertions(+), 31 deletions(-) +Merging nvdimm/libnvdimm-for-next (e13e75b86ef2 Merge branch 'for-4.17/dax' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Already up to date. +Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too) +$ git merge idr/idr-4.11 +Already up to date. +Merging at24/at24/for-next (60cc43fc8884 Linux 4.17-rc1) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (53c3677c56c7 ntb: intel: change references of skx to gen3) +$ git merge ntb/ntb-next +Auto-merging drivers/ntb/hw/intel/ntb_hw_gen1.c +Merge made by the 'recursive' strategy. + drivers/ntb/hw/intel/Makefile | 1 + + .../ntb/hw/intel/{ntb_hw_intel.c => ntb_hw_gen1.c} | 713 ++------------------- + drivers/ntb/hw/intel/ntb_hw_gen1.h | 182 ++++++ + drivers/ntb/hw/intel/ntb_hw_gen3.c | 597 +++++++++++++++++ + drivers/ntb/hw/intel/ntb_hw_gen3.h | 110 ++++ + drivers/ntb/hw/intel/ntb_hw_intel.h | 203 ++---- + 6 files changed, 997 insertions(+), 809 deletions(-) + rename drivers/ntb/hw/intel/{ntb_hw_intel.c => ntb_hw_gen1.c} (74%) + create mode 100644 drivers/ntb/hw/intel/ntb_hw_gen1.h + create mode 100644 drivers/ntb/hw/intel/ntb_hw_gen3.c + create mode 100644 drivers/ntb/hw/intel/ntb_hw_gen3.h +Merging kspp/for-next/kspp (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 (fdb1a3b69d1b exofs: avoid VLA in structures) +$ git merge --no-ff akpm-current/current +Auto-merging security/apparmor/lsm.c +Auto-merging mm/rmap.c +Auto-merging mm/huge_memory.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging include/linux/swap.h +Auto-merging include/linux/backing-dev.h +Auto-merging fs/proc/task_mmu.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-bdi | 8 + + Documentation/cgroup-v2.txt | 74 ++++++++ + MAINTAINERS | 15 +- + arch/arm/include/asm/page.h | 2 + + arch/powerpc/platforms/cell/spufs/sched.c | 2 +- + block/genhd.c | 2 +- + drivers/rapidio/devices/rio_mport_cdev.c | 19 +- + fs/autofs4/root.c | 2 +- + fs/binfmt_elf.c | 16 +- + fs/dcache.c | 4 +- + fs/exec.c | 1 + + fs/exofs/ore.c | 84 +++++---- + fs/exofs/ore_raid.c | 73 ++++++-- + fs/exofs/super.c | 23 ++- + fs/fs-writeback.c | 7 +- + fs/ocfs2/cluster/heartbeat.c | 8 +- + fs/ocfs2/dlmglue.c | 2 +- + fs/ocfs2/journal.c | 51 ++++-- + fs/ocfs2/stackglue.c | 6 - + fs/ocfs2/stackglue.h | 3 - + fs/proc/base.c | 6 + + fs/proc/loadavg.c | 2 +- + fs/proc/task_mmu.c | 6 +- + fs/seq_file.c | 10 -- + include/linux/backing-dev-defs.h | 5 + + include/linux/backing-dev.h | 30 ++-- + include/linux/cgroup-defs.h | 5 + + include/linux/compiler-clang.h | 5 + + include/linux/memcontrol.h | 34 ++++ + include/linux/oom.h | 12 +- + include/linux/sched/signal.h | 3 + + include/linux/shrinker.h | 2 +- + include/linux/swap.h | 13 +- + include/linux/thread_info.h | 6 +- + include/uapi/linux/prctl.h | 4 + + kernel/cgroup/cgroup.c | 13 +- + kernel/cred.c | 1 + + kernel/exit.c | 4 + + kernel/fork.c | 5 +- + kernel/sys.c | 11 ++ + lib/reed_solomon/decode_rs.c | 7 +- + lib/reed_solomon/reed_solomon.c | 5 +- + mm/backing-dev.c | 35 ++++ + mm/huge_memory.c | 5 +- + mm/kasan/kasan.c | 57 +++++- + mm/list_lru.c | 7 + + mm/memcontrol.c | 279 +++++++++++++++++++++++++++++- + mm/memory.c | 4 +- + mm/migrate.c | 19 +- + mm/mincore.c | 12 +- + mm/oom_kill.c | 210 ++++++++++++++-------- + mm/page-writeback.c | 18 +- + mm/page_owner.c | 4 +- + mm/rmap.c | 3 - + mm/sparse-vmemmap.c | 1 - + mm/sparse.c | 29 +++- + mm/swap_state.c | 16 +- + mm/swapfile.c | 156 +++++++++++++---- + scripts/checkpatch.pl | 7 + + security/apparmor/lsm.c | 1 + + security/selinux/hooks.c | 1 + + 61 files changed, 1141 insertions(+), 314 deletions(-) +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: 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: 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: 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 + + c7fd486bf970...6cceef4e4fbc akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (6cceef4e4fbc sparc64: NG4 memset 32 bits overflow) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + arch/sparc/lib/NG4memset.S | 26 ++++++------ + drivers/media/platform/sti/delta/delta-ipc.c | 4 +- + 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 ++- + include/linux/fsnotify_backend.h | 12 ++++-- + include/linux/ioport.h | 3 ++ + include/linux/memcontrol.h | 7 ++++ + include/linux/sched.h | 3 ++ + include/linux/sched/mm.h | 24 +++++++++++ + include/linux/slab.h | 59 ++++++++++++++++++++++++++ + kernel/fork.c | 3 ++ + kernel/kexec_file.c | 2 + + kernel/resource.c | 63 ++++++++++++++++++++++++++++ + mm/memcontrol.c | 25 ++++++++--- + 18 files changed, 227 insertions(+), 31 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..6681142a327c --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing dmi based on 4.16 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..b004c5f8c4bd --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20180420 |