diff options
| -rw-r--r-- | Next/SHA1s | 281 | ||||
| -rw-r--r-- | Next/Trees | 283 | ||||
| -rw-r--r-- | Next/merge.log | 3211 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 3778 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..356bf766c98b --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,281 @@ +Name SHA1 +---- ---- +origin 27db64f65f1be2f2ee741a1bf20d8d13d62c167f +fixes 147a89bc71e7db40f011454a40add7ff2d10f8d8 +kbuild-current ce397d215ccd07b8ae3f71db689aedb85d56ab40 +arc-current 76053854f7d10ca4fa492495f65798e3d48a64c4 +arm-current 92d44a42af81e850a038c38278ff4f434b2871df +arm64-fixes b154886f7892499d0d3054026e19dfb9a731df61 +m68k-current b12c8a70643ffe2598c572cd206e4f68c524eb6f +powerpc-fixes bc41650b6c98f547f9f4ffedd177574b6f56ebee +sparc 1aaccb5fa0eac996adde53538ca4b87a0b229ab7 +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net 962c661f14ad08d524f4870eeaa2d0856b830840 +bpf 3e1a61b30c6a3a31314570c0c418a6bf84b056b1 +ipsec 45c180bc29babbedd6b8c01b975780ef44d9d09c +netfilter ad9852af97587b8abe8102f9ddcb05c9769656f6 +ipvs 312564269535892cc082bc80592150cd1f5e8ec3 +wireless-drivers 755abd247a3da273af3b90d1dd31bc61794ae7d7 +mac80211 bf2b61a6838f19cbc33f6732715012c483fa3795 +rdma-fixes 375dc53d032fc11e98036b5f228ad13f7c5933f5 +sound-current 9c4a665ed83462039461dd34282e22160fb447ca +sound-asoc-fixes 84a84311eb326a323a3c925fefdcf10d13babf52 +regmap-fixes ce397d215ccd07b8ae3f71db689aedb85d56ab40 +regulator-fixes 4f687fb1244b40af84ed38c0230c301507737ebb +spi-fixes 068d7ea6ba3a44205545e69ed6b146b4dde5a46b +pci-current ce397d215ccd07b8ae3f71db689aedb85d56ab40 +driver-core.current ce397d215ccd07b8ae3f71db689aedb85d56ab40 +tty.current ce397d215ccd07b8ae3f71db689aedb85d56ab40 +usb.current ce397d215ccd07b8ae3f71db689aedb85d56ab40 +usb-gadget-fixes 1d8e5c00275825fc42aaa5597dab1d0b5b26bb64 +usb-serial-fixes 24160628a34af962ac99f2f58e547ac3c4cbd26f +usb-chipidea-fixes 964728f9f407eca0b417fdf8e784b7a76979490c +phy 60cc43fc888428bb2f18f08997432d426a243338 +staging.current ce397d215ccd07b8ae3f71db689aedb85d56ab40 +char-misc.current ce397d215ccd07b8ae3f71db689aedb85d56ab40 +input-current 01f7e67a053f7f5696fbdefe2b066303469b6db5 +crypto-current 837bf7cc3b7504385ae0e829c72e470dfc27cf6c +ide 1aaccb5fa0eac996adde53538ca4b87a0b229ab7 +vfio-fixes 08ca1b52f69b4dfa8703d54e26e2c6e11aa453eb +kselftest-fixes ce397d215ccd07b8ae3f71db689aedb85d56ab40 +modules-fixes be71eda5383faa663efdba9ef54a6b8255e3c7f0 +slave-dma-fixes 356073bcf6dbcc15cd8fb22d10cf8f35f4525271 +backlight-fixes 8ff5cbc6e3c5c2855245c014f3ba572ddfc5ab0f +mtd-fixes 3f77f244d8ec28e3a0a81240ffac7d626390060c +nand-fixes ee02f73e04c0e690600f621a3a1d2245834af7fe +spi-nor-fixes 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +mfd-fixes 11799564fc7eedff50801950090773928f867996 +v4l-dvb-fixes e88f5e9ebd54bdf75c9833e3d9add7c2c0d39b0b +reset-fixes e6914365fd280fce303a89b8a8d4529af5a2e0f9 +mips-fixes 4337aac1e1c97cfda56fbec4077fbc0e37b867c0 +omap-fixes 41bd6adf3c5d3990d7a67639aff53d54483744fa +kvm-fixes ce397d215ccd07b8ae3f71db689aedb85d56ab40 +kvms390-fixes f4a551b72358facbbe5714248dff78404272feee +hwmon-fixes 91bb8f45f73f19a0150c233c0f11cdeb6d71d1e9 +nvdimm-fixes 75bc37fefc4471e718ba8e651aa74673d4e0a9eb +btrfs-fixes 7b0aeeea43095dd5778231184350467896221eef +vfs-fixes b1b94fcbd39936d4e544792fb6fd13e6a5b2efc0 +dma-mapping-fixes cf65a0f6f6ff7631ba0ac0513a14ca5b65320d80 +drivers-x86-fixes ce397d215ccd07b8ae3f71db689aedb85d56ab40 +samsung-krzk-fixes ce397d215ccd07b8ae3f71db689aedb85d56ab40 +pinctrl-samsung-fixes ce397d215ccd07b8ae3f71db689aedb85d56ab40 +devicetree-fixes 737dd8e1a4c4789ac37723f4e80d0387c06f2a05 +scsi-fixes 63ce3c384db26494615e3c8972bcd419ed71f4c4 +drm-intel-fixes 7a3727f385dc64773db1c144f6b15c1e9d4735bb +mmc-fixes ce397d215ccd07b8ae3f71db689aedb85d56ab40 +rtc-fixes ca95ef7c98674a8eb5d411fc0835783051c0662b +drm-misc-fixes e8b92efa629dac0e70ea4145c5e70616de5f89c8 +kbuild ce397d215ccd07b8ae3f71db689aedb85d56ab40 +leaks 9f84a0f7f1a613335a9aaf0abd5858906752bf93 +uuid c0020756315eebec58310aca42cf9fb73e1322eb +dma-mapping 2550bbfd495227945e17ed1fa1c05bce4753b86b +asm-generic a71e7c44ffb7baea0c0795824afc34cc0bc1a301 +arc 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +arm 0ac000e86703dedea1000513dbb8a64d02930668 +arm-perf ce397d215ccd07b8ae3f71db689aedb85d56ab40 +arm-soc c7953e19db50de6a3f62cb09a5712341c9b43920 +actions 35afadd11222dcec0f3c6b25be89195ccc582116 +alpine 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +amlogic 793d8ab66802999cdb57404373676477a1086248 +aspeed 6534b2d0de3693b8508375c2f01951d6eb5c69be +at91 20d3f36b0feaad5ab90ccff77e18c13939065cad +bcm2835 5c483a0c319cdc7fa46676939da59df1fa8abb5a +imx-mxs 9a403db14975b1610abad0a53488ffdca6d88b4a +keystone fb5d812c3cb33d0410cb6d3beebca670b3af097d +mediatek 9378b342734132ddf6d95ed035e1124eacf762a1 +mvebu 78e5d8c26c70bf14e1b4d918e8d65209ffe12123 +omap 1b7e42c1dfe837642cfcc426776a3f98c6fb2d3e +reset d7bab65b1f57cdf2d81fc469cea6b2160a50e917 +qcom 509d20563e5d72c2b3a85cc6d05bee30006b8127 +realtek 2b6286eb7ab8b9a22f7238bdaad403badd4a93e9 +renesas e0ac98d75a444f51203fbe976f27fcfd81c8d240 +rockchip b12b0bd0db32d7f4884f54a34e5330a44cb5e0ce +samsung bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +samsung-krzk 200b93071654ae57270078d9d062f116acb33c28 +sunxi 9c2cc863c256f0b4dbe3ae65532dcf03e2e768bb +tegra 6de9ae597a799a1f753385a08ef0d48c6c683917 +arm64 0fe42512b2f03f9e5a20b9f55ef1013a68b4cd48 +clk 003cfd706bb14c90e809eff02d6e2a5673c32889 +clk-samsung e8cf870f253bdeadd4ce8a10e34655ef89ad57b1 +c6x 85fa2cc51104ee5b529ce85b12f4c8421888544f +m68k b12c8a70643ffe2598c572cd206e4f68c524eb6f +m68knommu f39a4d363335c006465dca24da7c34b12ec33958 +microblaze 45df561a7ae2ca5080708cc2cf84a236f4d930ef +mips e37439376c070ebe2e023f01466f964c3d5c49ba +nds32 a78945c357f58665d6a5da8a69e085898e831c70 +nios2 3d9644ef9a0f6c3ca0c1bd2aea1d82e7ea0a7f24 +openrisc d56f3af9e801970d21c57621de3b42bc17eac152 +parisc-hd 8d40c754fbacc2432e53ab2b2a98b86beba251c0 +powerpc ff5bc793e47b537bf3e904fada585e102c54dd8b +fsl c095ff93f901c1620b28dce4d813dd548bc5236b +risc-v ce397d215ccd07b8ae3f71db689aedb85d56ab40 +s390 777c5c1c6084b5fe2a0b783e4e995a3d008f8d26 +sparc-next 1aaccb5fa0eac996adde53538ca4b87a0b229ab7 +sh ac21fc2dcb405cf250ad3f1228f64f64930d9211 +uml 5ec9121195a4f1cecd0fa592636c5f81eb03dc8c +xtensa ae6063c83634cbef7f73ec8a3ab7a6adf5294716 +fscrypt e1cc40e5d42acb1d99652babb17e6a5ee4247409 +befs 55d945e2e4aa148ef38bdfabb9569af78183a539 +btrfs 29dcea88779c856c7dc92040a0c01233263101d4 +btrfs-kdave a8c65bd24e2e76a286b61703c385d2b95ae556dd +ceph 23edca864951250af845a11da86bb3ea63522ed2 +cifs 5539e9b24a388c34b4ffee2b0d41748f151b862a +configfs 707c62352909a9be2453ae073e160de59d2d4a1f +ecryptfs e86281e700cca8a773f9a572fa406adf2784ba5c +ext3 6c1e4d06a3808dc67dbce2d631f4c12574567dd5 +ext4 0238a85e379f0edecaf13c60ae90c841ad66ae29 +f2fs d54d35c501bcbd57b9722a6b371c0608b5d34199 +fuse 543b8f8662fe6d21f19958b666ab0051af9db21a +jfs bd646104ac5a6bf8bdddaeaf4e441f5d439ded96 +nfs 7b0df92ac12148098391bf53f3494af17812f264 +nfs-anna ffbfa2ce88f169aa4b5cc90065cdc1c3c8003c27 +nfsd 8163496e78db100a6b5cfbdaece385686ae50129 +orangefs b1116bc03c00255b7e5feaed561e8bb2fc38c0f8 +overlayfs 46311f3ec53c10912f88c79ce81e16d49e3a47e4 +ubifs f5a926dd529870de4bd19199ce7b36985f130d70 +xfs 89e9b5c0915aaeaf673a14e794c559768eda5534 +file-locks 1cf8e5de4055f85383405a21a0a7c3c4348bf2ed +vfs 1f15c298fa297ab66f3920f161146e39432c625b +vfs-miklos 0eb8af4916a540c362a2950e5ab54eca32eb7d58 +printk ce041c43f22298485122bab15c14d062383fbc67 +pci ce397d215ccd07b8ae3f71db689aedb85d56ab40 +pstore e698aaf37f9fac419ac6c1867137cce83c90c80b +hid f1b6ae6701a772bba1150b5f1b8d43803f039be4 +i2c ce397d215ccd07b8ae3f71db689aedb85d56ab40 +dmi 7f73745fec52c402cac71e212d996545c20d2ef6 +hwmon-staging 06399c39510859cd967579bf4653f7d99618b804 +jc_docs a49d9c0ae46e149a22aefa8251d07dddd5611851 +v4l-dvb f2809d20b9250c675fca8268a0f6274277cca7ff +v4l-dvb-next f10379aad39e9da8bc7d1822e251b5f0673067ef +fbdev 85ebd164de56c5146e0f65cebee7fcc4babe52e3 +pm de3e0f659e0db20f0984e80e5487b6320d72cfe8 +cpupower ce397d215ccd07b8ae3f71db689aedb85d56ab40 +idle 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f +opp c5c2a97b3ac7d1ec19e7cff9e38caca6afefc3de +thermal e9ed3ee61aa62ce280aadeeea1ec959f0c66a290 +thermal-soc 6d7c70d1cd6526dc79e3d3b3faae1c40c1681168 +ieee1394 188775181bc05f29372b305ef96485840e351fde +dlm da3627c30d229fea1e070e984366f80a1c4d9166 +swiotlb 4855c92dbb7b3b85c23e88ab7ca04f99b9677b41 +rdma cfdeb8934b6f85f235071e9d3700756a0a12758d +net-next f0dc7f9c6dd99891611fca5849cbc4c6965b690e +bpf-next f0dc7f9c6dd99891611fca5849cbc4c6965b690e +ipsec-next f0dc7f9c6dd99891611fca5849cbc4c6965b690e +mlx5-next 0af5107cd0640ee3424e337b492e4b11b450ce28 +netfilter-next f0dc7f9c6dd99891611fca5849cbc4c6965b690e +nfc-next 1f008cfec5d529b30ca8da1a1f5fbbd457c10382 +ipvs-next e523452ac0e046d38fcfb7c16748ab8090bf98cd +wireless-drivers-next 4cf44d525548eaa49a65eeda2b87dfa76984fffb +bluetooth f0dc7f9c6dd99891611fca5849cbc4c6965b690e +mac80211-next 8ba6731ad4c7e9f612b2f7dae1b5ed6bfc884b67 +gfs2 f1b5f8dc1b69c5134323dc957a8bd2c5882a23ad +mtd ce397d215ccd07b8ae3f71db689aedb85d56ab40 +nand ce397d215ccd07b8ae3f71db689aedb85d56ab40 +spi-nor 9882b5375df532acb2c2399a90d882461112e612 +crypto b268b3506d9910ca8238e92cb1dc51340574b2f2 +drm ce397d215ccd07b8ae3f71db689aedb85d56ab40 +drm-panel e4bac408b08437d190785ab1250cc676304ed171 +drm-intel e16a375086337af3fcf21dbd512e1573049ba6cb +drm-tegra 6134534ca24f42043cacdd7108026803577f6c59 +drm-misc 069035c5db3459b9b5f12caf3bffed9a863fa5c4 +drm-msm 4dd454c371fdc85c91cdf6625d5e0e16f57f8d1a +hdlcd f73e8b82531573a198a4d0e5bff0d3256cbbd1d8 +mali-dp 6e810eb508f4b937bc2a718bd4e5cd74cca55500 +sunxi-drm 7dafb83edd3271917458de0ae70586ac63098e2f +imx-drm 518665524272e4e993e9579bd8c4aba9d8bc7343 +etnaviv f6ffbd4fc1a1caafe2ab840993b917fba5324598 +kconfig bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +regmap ce397d215ccd07b8ae3f71db689aedb85d56ab40 +sound 69b2c6d7c0204e68185b694f9cfcb8f2636fed5d +sound-asoc 2b241b571b0942511dc1edadfc706b14a221bb96 +modules 9f2d1e68cf4d641def734adaccfc3823d3575e6c +input 5aff29efbec020f0997e5cdbefce0ff383518986 +block 28313cee1d4f8b5f012677802e8cb6c5de21b490 +lightnvm 1c6286f26301ad154a1c10fb6e68925493dd28ba +device-mapper eaa87d09d34ee5a92c4ec2cf219da9bf3f6c9d1f +pcmcia c3a5307873d4a47efd4373f4a50f450a17b5d9c1 +mmc ce397d215ccd07b8ae3f71db689aedb85d56ab40 +kgdb 2cf2f0d5b91fd1b06a6ae260462fc7945ea84add +md bfc9dfdcb6e9493de5d4fe0d3ed3ce57672f8d07 +mfd 556c242045f0c1613aac2e64dc5b2ff0e4bc89e1 +backlight 980d7812fdb483ba055c842d566aa08e76bf795a +battery ce397d215ccd07b8ae3f71db689aedb85d56ab40 +regulator 3d6f3106e0d856b1883e87f3b872bbc26436919a +security d19289133b1d3d7b11ab52216ea4ac4a7c86942b +apparmor 338d0be437ef10e247a35aed83dbab182cf406a2 +integrity b5c90a7526fe39164c2204f0404ce8f8ff21e522 +keys 1e684d3820d8f72d877c0adb521ae17c6fc9bc88 +selinux 67b0b4e4988f296ecc69fc8d09a2ce2741653ee0 +tpmdd e9234540d1fe8f7519bb1547e0246fe60ece29e5 +watchdog 16a7eec2fcd020c73cf0ca38bf774775167d22eb +iommu 1f568357117cafb48aafb10413cbd1567dc015b1 +dwmw2-iommu d8a5b80568a9cb66810e75b182018e9edb68e8ff +vfio c1abca96b252a9627f99f39215b84e5de92bf1e3 +trivial 75a24b822d383489badd343cab4cb171d09f93ef +audit f7859590d97614815b35a755c8213dfb8f2766bd +devicetree ac840f898808d78e2e7dbc38eae04d88063ead7e +mailbox f83d1cfc8bcddf93bb6f55940fd59f5b047863e5 +spi 05157939e8cd4dc0c4e63bcb0d2af4a2620d5ff0 +tip 5559747e17c996b45e9fdeea44f05132106e98ca +clockevents 6bd9549d8a7dd06087a06fa7a6df651b02d6f21e +edac 345fb0a9a6340ba0b3b714d62f877fde88c8a755 +edac-amd 6c974d4dfafe5e9ee754f2a6fba0eb1864f1649e +irqchip 6a88c221acbaaa0460d190f99093ab8114f23c09 +ftrace a9235b544a0ae95fbd56443bdbd251358c7df4c5 +rcu 443da8397d9ffe612a20beceb41c477d638d96ff +kvm ce397d215ccd07b8ae3f71db689aedb85d56ab40 +kvm-arm e25028c8ded011d19f9a11164807507c94febc01 +kvm-mips dc44abd6aad22411f7f9890e39fd4753dabf0d03 +kvm-ppc ce397d215ccd07b8ae3f71db689aedb85d56ab40 +kvms390 2c8180e885c1b2844a24dcaf4a675972b8ce8edc +xen-tip 7c63ca24c878e0051c91904b72174029320ef4bd +percpu b3a5d111994450909158929560906f2c1c6c1d85 +workqueues 66448bc274cadedb71fda7d914e7c29d8dead217 +drivers-x86 f193f7985f48a40885ce2e270c4cea9697650cc1 +chrome-platform c474e9f2be9992861d926eea3e5d4fb393cd6e2a +hsi ce397d215ccd07b8ae3f71db689aedb85d56ab40 +leds d30c8d2031259d6dc360f8c96d362bb36665c99c +ipmi 0cd5e837f57a4aad852cf8b23cfb4c5ae66ef3ae +driver-core ce397d215ccd07b8ae3f71db689aedb85d56ab40 +usb ce397d215ccd07b8ae3f71db689aedb85d56ab40 +usb-gadget 47265c067c0d129f3a0e94bc221293a780af9d78 +usb-serial ce397d215ccd07b8ae3f71db689aedb85d56ab40 +usb-chipidea-next 8bcf4c0bd7fbff64ec3fc70b5ecb0d1285e71eca +phy-next c1eb8f83845b6ca9e53c41c26a4dff57597d4969 +tty ce397d215ccd07b8ae3f71db689aedb85d56ab40 +char-misc ce397d215ccd07b8ae3f71db689aedb85d56ab40 +extcon 441492c2256cc3d7c1d666c30c812e9a8382f165 +staging 3053339b17f8f3bf0e4f5350adb7097266cd6f1a +mux 6a3d4baac84a624d7f4ae602254d022fea1eb5f2 +slave-dma 047e55436f89e3b476a7ecd100a6735ed1c3cb57 +cgroup d8742e22902186e30c346b1ba881cb52942ae3e4 +scsi 4795364a49593d44aaf6de96a28635efab192fca +scsi-mkp 4ae5e9d159f83392c98c4ed88dfc63f19745be38 +target-updates 1c130ae00b769a2e2df41bad3d6051ee8234b636 +target-bva 60cc43fc888428bb2f18f08997432d426a243338 +libata 313c1b5a6bef940b132282665e9a802a298ce719 +vhost 2eb98105f8c7f4b867f7f714a998f5b8c1bb009b +rpmsg ce397d215ccd07b8ae3f71db689aedb85d56ab40 +gpio 8968e4ced9b11f6cdcaf9f17dbaf451de1b5037e +pinctrl 1fd2a5dce0dc7623b28a70bcf790d0474d482dac +pinctrl-samsung ce397d215ccd07b8ae3f71db689aedb85d56ab40 +pwm 414c52b7899aa9097c2fa8444654a866e1df4a0c +userns 04035aa33a1258ca3c30f58138897ca3e97485f1 +ktest 6cd110a91f52197e3392809cd43466bfe2c524d0 +random bfe80ed3d7c7697878c88d8e3cf6a23113690ab1 +aio 2a8a98673c13cb2a61a6476153acf8344adfa992 +kselftest eb83d5f7d07ed913d62ca4ad1e14fb6ca4937bab +y2038 e264abeaf9daa3cde9aed8013a6f82b0370425e5 +livepatching d7ab8e67aa52e27837aefdc0d67af93ae0931abc +coresight dd2e68bb385e3b62b5b4e12b6de6f31e6c60d752 +rtc 3cd7de001fb4bc9488681318f9273db7e373c62b +nvdimm d95363c957059e87e012597cc756c1a97b537738 +at24 ce397d215ccd07b8ae3f71db689aedb85d56ab40 +ntb b1ce023ae8a2137ac8a1413791ddf86e1b2675a7 +kspp 45888b40d2a6221d46bb69959e2600ddba71cc1f +init_task e1e871aff3ded26348c631b1370e257d401cd22d +cisco ce397d215ccd07b8ae3f71db689aedb85d56ab40 +xarray 1886ca9f6ee4c9146ca3cd41833568edd9067089 +fsi 6b293258cded9c8ee44cce4081d9170d6d1b5f5d +akpm-current 43b4ee660206f034cad3e79e7477f8a8db724920 +akpm 5b74b00598451f2f9c10231fedd67c6a7a36c0d4 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..b8f172e9cf65 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,283 @@ +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 +sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.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 +slave-dma-fixes git git://git.infradead.org/users/vkoul/slave-dma.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes git git://git.infradead.org/linux-mtd.git#master +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/mips/linux.git#mips-fixes +omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#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 +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus +drivers-x86-fixes git git://git.infradead.org/linux-platform-drivers-x86.git#fixes +samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#pinctrl-fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +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 +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-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.kernel.org/pub/scm/linux/kernel/git/mips/linux.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.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 +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +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/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://git.freedesktop.org/git/drm/drm.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 +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-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 git://git.infradead.org/linux-platform-drivers-x86.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 +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 +cisco git https://github.com/daniel-walker/cisco-linux.git#for-next +xarray git git://git.infradead.org/users/willy/linux-dax.git#xarray +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/benh/linux-fsi.git#master +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..7436a949d728 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3211 @@ +$ date -R +Fri, 22 Jun 2018 09:14:40 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 1abd8a8f39cd Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma +Merging origin/master (27db64f65f1b Merge tag 'nfs-for-4.18-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs) +$ git merge origin/master +Updating 1abd8a8f39cd..27db64f65f1b +Fast-forward + Documentation/admin-guide/pm/intel_pstate.rst | 2 +- + drivers/acpi/acpi_lpss.c | 18 +- + drivers/acpi/ec.c | 20 +++ + drivers/base/core.c | 15 +- + drivers/cpufreq/intel_pstate.c | 27 ++- + drivers/cpufreq/qcom-cpufreq-kryo.c | 25 ++- + drivers/hwmon/dell-smm-hwmon.c | 7 + + drivers/hwmon/nct6775.c | 2 +- + drivers/opp/core.c | 2 +- + drivers/pinctrl/actions/pinctrl-owl.c | 2 +- + drivers/pinctrl/devicetree.c | 7 +- + drivers/pinctrl/mediatek/pinctrl-mt7622.c | 6 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 5 - + drivers/pinctrl/pinctrl-single.c | 14 +- + fs/nfs/delegation.c | 4 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 21 ++- + fs/nfs/nfs4proc.c | 33 +++- + fs/nfs/pnfs.h | 5 + + include/acpi/processor.h | 3 +- + include/linux/nfs_xdr.h | 2 + + net/sunrpc/xprt.c | 10 +- + tools/power/x86/turbostat/turbostat.8 | 2 +- + tools/power/x86/turbostat/turbostat.c | 240 ++++++++++++++++++-------- + 23 files changed, 345 insertions(+), 127 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 (ce397d215ccd Linux 4.18-rc1) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (76053854f7d1 ARC: [plat-hsdk] Add PCIe support) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/Makefile | 15 +-------------- + arch/arc/include/asm/mach_desc.h | 2 -- + arch/arc/kernel/irq.c | 2 +- + arch/arc/plat-hsdk/Kconfig | 1 + + 4 files changed, 3 insertions(+), 17 deletions(-) +Merging arm-current/fixes (92d44a42af81 ARM: fix kill( ,SIGFPE) breakage) +$ git merge arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (b154886f7892 arm64: make secondary_start_kernel() notrace) +$ git merge arm64-fixes/for-next/fixes +Merge made by the 'recursive' strategy. + arch/arm64/kernel/smp.c | 2 +- + arch/arm64/mm/dma-mapping.c | 9 +++++---- + 2 files changed, 6 insertions(+), 5 deletions(-) +Merging m68k-current/for-linus (b12c8a70643f m68k: Set default dma mask for platform devices) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (bc41650b6c98 powerpc: Wire up io_pgetevents) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/Makefile | 1 + + arch/powerpc/include/asm/book3s/32/pgalloc.h | 1 + + arch/powerpc/include/asm/book3s/64/pgtable-4k.h | 21 +++++ + arch/powerpc/include/asm/book3s/64/pgtable-64k.h | 9 ++ + arch/powerpc/include/asm/book3s/64/pgtable.h | 5 ++ + arch/powerpc/include/asm/nmi.h | 2 +- + arch/powerpc/include/asm/nohash/32/pgalloc.h | 1 + + arch/powerpc/include/asm/nohash/64/pgalloc.h | 1 + + arch/powerpc/include/asm/pkeys.h | 29 +++++-- + arch/powerpc/include/asm/systbl.h | 1 + + arch/powerpc/include/asm/unistd.h | 2 +- + arch/powerpc/include/uapi/asm/unistd.h | 1 + + arch/powerpc/kernel/dt_cpu_ftrs.c | 3 +- + arch/powerpc/kernel/process.c | 1 + + arch/powerpc/kernel/setup-common.c | 12 ++- + arch/powerpc/kernel/setup_64.c | 8 ++ + arch/powerpc/kernel/smp.c | 6 -- + arch/powerpc/kernel/stacktrace.c | 4 +- + arch/powerpc/mm/hugetlbpage.c | 3 +- + arch/powerpc/mm/pgtable-book3s64.c | 12 +++ + arch/powerpc/mm/pkeys.c | 102 ++++++++--------------- + arch/powerpc/mm/tlb-radix.c | 98 +++++++++++++++++----- + 22 files changed, 213 insertions(+), 110 deletions(-) +Merging sparc/master (1aaccb5fa0ea Merge tag 'rtc-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) +$ 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 (962c661f14ad Merge branch 'xen-netfront-fixes') +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/cadence/macb_ptp.c | 5 +---- + drivers/net/ethernet/mscc/ocelot.c | 10 +++++----- + drivers/net/ethernet/realtek/r8169.c | 2 +- + drivers/net/ethernet/ti/davinci_emac.c | 4 ++++ + drivers/net/ipvlan/ipvlan_main.c | 3 ++- + drivers/net/xen-netfront.c | 11 ++++++----- + include/linux/filter.h | 4 +++- + net/bpfilter/Makefile | 2 +- + net/packet/af_packet.c | 16 +++++++--------- + net/sched/cls_flower.c | 21 +++++++++++++++++---- + net/sctp/chunk.c | 4 +++- + net/strparser/strparser.c | 5 +---- + tools/testing/selftests/net/.gitignore | 1 + + tools/testing/selftests/net/config | 2 ++ + 14 files changed, 54 insertions(+), 36 deletions(-) +Merging bpf/master (3e1a61b30c6a tools/bpf: fix test_sockmap failure) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + tools/bpf/bpftool/prog.c | 12 ++++++++---- + tools/testing/selftests/bpf/test_kmod.sh | 9 +++++++++ + tools/testing/selftests/bpf/test_sockmap.c | 6 ------ + 3 files changed, 17 insertions(+), 10 deletions(-) +Merging ipsec/master (45c180bc29ba xfrm_user: prevent leaking 2 bytes of kernel memory) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/ipv6/ip6_vti.c | 11 ++++++----- + net/xfrm/xfrm_user.c | 8 +++++--- + 2 files changed, 11 insertions(+), 8 deletions(-) +Merging netfilter/master (ad9852af9758 netfilter: nf_ct_helper: Fix possible panic after nf_conntrack_helper_unregister) +$ git merge netfilter/master +Merge made by the 'recursive' strategy. + include/net/net_namespace.h | 1 + + include/net/netns/ipv6.h | 1 - + net/ipv6/netfilter/nf_conntrack_reasm.c | 6 +++--- + net/netfilter/nf_conntrack_helper.c | 5 +++++ + net/netfilter/nfnetlink_queue.c | 3 +++ + 5 files changed, 12 insertions(+), 4 deletions(-) +Merging ipvs/master (312564269535 net: netsec: reduce DMA mask to 40 bits) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (755abd247a3d MAINTAINERS: update Xinming's email address) +$ git merge wireless-drivers/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 3 +-- + 2 files changed, 2 insertions(+), 3 deletions(-) +Merging mac80211/master (bf2b61a6838f cfg80211: fix rcu in cfg80211_unregister_wdev) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (375dc53d032f IB/rxe: Fix missing completion for mem_reg work requests) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (9c4a665ed834 ALSA: hda/ca0132: make array ca0132_alt_chmaps static) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/hda/hda_codec.c | 5 ++-- + sound/pci/hda/hda_codec.h | 1 + + sound/pci/hda/patch_ca0132.c | 64 ++++++++++++++++--------------------------- + sound/pci/hda/patch_hdmi.c | 5 ++++ + sound/pci/hda/patch_realtek.c | 10 +++++-- + sound/pci/lx6464es/lx6464es.c | 1 + + 6 files changed, 41 insertions(+), 45 deletions(-) +Merging sound-asoc-fixes/for-linus (84a84311eb32 Merge branch 'asoc-4.18' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + sound/soc/amd/acp-pcm-dma.c | 3 ++- + sound/soc/codecs/cs47l24.c | 8 ++++++++ + sound/soc/codecs/wm5102.c | 8 ++++++++ + sound/soc/codecs/wm5110.c | 8 ++++++++ + sound/soc/sh/rcar/core.c | 6 ++++++ + sound/soc/sh/rcar/ssi.c | 37 ++++++++++++++++++++++++------------- + sound/soc/soc-dapm.c | 7 +++++++ + 7 files changed, 63 insertions(+), 14 deletions(-) +Merging regmap-fixes/for-linus (ce397d215ccd Linux 4.18-rc1) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (4f687fb1244b Merge branch 'regulator-4.18' into regulator-linus) +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/regulator/arizona-ldo1.c | 27 ++++++++++++++++++++++++--- + 1 file changed, 24 insertions(+), 3 deletions(-) +Merging spi-fixes/for-linus (068d7ea6ba3a Merge branch 'spi-4.18' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/spi/spi-cadence.c | 2 +- + drivers/spi/spi-fsl-dspi.c | 12 ++++++++ + drivers/spi/spi-orion.c | 77 ++++++++++++++++++++++++---------------------- + drivers/spi/spi-sh-msiof.c | 53 ++++++++++++++++--------------- + 4 files changed, 82 insertions(+), 62 deletions(-) +Merging pci-current/for-linus (ce397d215ccd Linux 4.18-rc1) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (ce397d215ccd Linux 4.18-rc1) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (ce397d215ccd Linux 4.18-rc1) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (ce397d215ccd Linux 4.18-rc1) +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (1d8e5c002758 dwc2: gadget: Fix ISOC IN DDMA PID bitfield value calculation) +$ git merge usb-gadget-fixes/fixes +Merge made by the 'recursive' strategy. + Documentation/usb/gadget_configfs.txt | 2 +- + drivers/usb/dwc2/core.h | 3 ++ + drivers/usb/dwc2/gadget.c | 20 +++++--- + drivers/usb/dwc2/hcd.c | 93 ++++++++++++++++++++++++++++++++--- + drivers/usb/dwc2/hcd.h | 8 +++ + drivers/usb/dwc2/hcd_intr.c | 11 ++++- + drivers/usb/dwc2/hcd_queue.c | 5 +- + drivers/usb/dwc3/core.c | 23 +++++---- + drivers/usb/dwc3/dwc3-of-simple.c | 3 +- + drivers/usb/dwc3/dwc3-pci.c | 2 + + drivers/usb/dwc3/dwc3-qcom.c | 13 ++--- + drivers/usb/gadget/composite.c | 3 ++ + drivers/usb/gadget/function/f_fs.c | 26 +++++++--- + 13 files changed, 167 insertions(+), 45 deletions(-) +Merging usb-serial-fixes/usb-linus (24160628a34a USB: serial: cp210x: add CESINEL device ids) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/cp210x.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) +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 (ce397d215ccd Linux 4.18-rc1) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (ce397d215ccd Linux 4.18-rc1) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging input-current/for-linus (01f7e67a053f Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Auto-merging drivers/input/rmi4/rmi_f54.c +Auto-merging drivers/input/rmi4/rmi_f12.c +Auto-merging drivers/input/rmi4/rmi_f11.c +Auto-merging drivers/input/rmi4/rmi_driver.c +Auto-merging drivers/input/misc/Kconfig +Auto-merging drivers/input/input-mt.c +Merge made by the 'recursive' strategy. + .../bindings/input/sprd,sc27xx-vibra.txt | 23 +++ + drivers/input/input-mt.c | 12 +- + drivers/input/keyboard/goldfish_events.c | 9 +- + drivers/input/misc/Kconfig | 10 ++ + drivers/input/misc/Makefile | 1 + + drivers/input/misc/sc27xx-vibra.c | 154 +++++++++++++++++++++ + drivers/input/rmi4/Kconfig | 1 + + drivers/input/rmi4/rmi_2d_sensor.c | 34 +++-- + drivers/input/rmi4/rmi_bus.c | 50 ++++++- + drivers/input/rmi4/rmi_bus.h | 10 +- + drivers/input/rmi4/rmi_driver.c | 52 +++---- + drivers/input/rmi4/rmi_f01.c | 10 +- + drivers/input/rmi4/rmi_f03.c | 9 +- + drivers/input/rmi4/rmi_f11.c | 42 +++--- + drivers/input/rmi4/rmi_f12.c | 8 +- + drivers/input/rmi4/rmi_f30.c | 9 +- + drivers/input/rmi4/rmi_f34.c | 5 +- + drivers/input/rmi4/rmi_f54.c | 6 - + drivers/input/touchscreen/silead.c | 1 + + include/linux/input/mt.h | 2 +- + include/linux/rmi.h | 2 + + 21 files changed, 338 insertions(+), 112 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/sprd,sc27xx-vibra.txt + create mode 100644 drivers/input/misc/sc27xx-vibra.c +Merging crypto-current/master (837bf7cc3b75 hwrng: core - Always drop the RNG in hwrng_unregister()) +$ git merge crypto-current/master +Auto-merging drivers/crypto/chelsio/chtls/chtls_io.c +Merge made by the 'recursive' strategy. + arch/arm64/crypto/aes-glue.c | 2 +- + crypto/morus640.c | 3 ++- + crypto/sha3_generic.c | 2 +- + drivers/char/hw_random/core.c | 11 +++++++++-- + drivers/crypto/chelsio/chtls/chtls_io.c | 5 ++--- + 5 files changed, 15 insertions(+), 8 deletions(-) +Merging ide/master (1aaccb5fa0ea Merge tag 'rtc-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) +$ git merge ide/master +Already up to date. +Merging vfio-fixes/for-linus (08ca1b52f69b vfio/pci: Make IGD support a configurable option) +$ git merge vfio-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/vfio/pci/Kconfig | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) +Merging kselftest-fixes/fixes (ce397d215ccd Linux 4.18-rc1) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging slave-dma-fixes/fixes (356073bcf6db MAINTAINERS: Update email-id of Sinan Kaya) +$ git merge slave-dma-fixes/fixes +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/dma/ti/omap-dma.c | 6 +++++- + 2 files changed, 6 insertions(+), 2 deletions(-) +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. +Merging mtd-fixes/master (3f77f244d8ec mtd: rawnand: mxc: set spare area size register explicitly) +$ git merge mtd-fixes/master +Merge made by the 'recursive' strategy. + drivers/mtd/nand/raw/mxc_nand.c | 5 ++++- + drivers/mtd/nand/raw/nand_micron.c | 2 ++ + 2 files changed, 6 insertions(+), 1 deletion(-) +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 (11799564fc7e mfd: cros_ec: Retry commands when EC is known to be busy) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (e88f5e9ebd54 media: uvcvideo: Prevent setting unavailable flags) +$ git merge v4l-dvb-fixes/fixes +Merge made by the 'recursive' strategy. +Merging reset-fixes/reset/fixes (e6914365fd28 reset: uniphier: fix USB clock line for LD20) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (4337aac1e1c9 MIPS: Wire up io_pgetevents syscall) +$ git merge mips-fixes/mips-fixes +Merge made by the 'recursive' strategy. + arch/mips/Kconfig | 1 + + arch/mips/ath79/mach-pb44.c | 2 +- + arch/mips/bcm47xx/setup.c | 6 + + arch/mips/include/asm/io.h | 2 + + arch/mips/include/asm/mipsregs.h | 3 + + arch/mips/include/uapi/asm/unistd.h | 18 +- + arch/mips/kernel/entry.S | 8 + + arch/mips/kernel/mcount.S | 27 +- + arch/mips/kernel/scall32-o32.S | 2 + + arch/mips/kernel/scall64-64.S | 2 + + arch/mips/kernel/scall64-n32.S | 2 + + arch/mips/kernel/scall64-o32.S | 2 + + arch/mips/kernel/signal.c | 3 + + tools/testing/selftests/rseq/param_test.c | 24 + + tools/testing/selftests/rseq/rseq-mips.h | 725 ++++++++++++++++++++++++++++++ + tools/testing/selftests/rseq/rseq.h | 2 + + 16 files changed, 807 insertions(+), 22 deletions(-) + create mode 100644 tools/testing/selftests/rseq/rseq-mips.h +Merging omap-fixes/fixes (41bd6adf3c5d Revert "ARM: dts: logicpd-som-lv: Fix pinmux controller references") +$ git merge omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (ce397d215ccd Linux 4.18-rc1) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (f4a551b72358 KVM: s390: vsie: fix < 8k check for the itdba) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (91bb8f45f73f hwmon: (nct6775) Fix loop limit) +$ git merge hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (75bc37fefc44 Linux 4.17-rc4) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging btrfs-fixes/next-fixes (7b0aeeea4309 Merge branch 'misc-4.18' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Merge made by the 'recursive' strategy. + fs/btrfs/extent_io.c | 1 + + fs/btrfs/inode.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++------ + fs/btrfs/tree-log.c | 48 ++++++++++++++++++++++++---- + fs/btrfs/tree-log.h | 10 +++++- + 4 files changed, 132 insertions(+), 17 deletions(-) +Merging vfs-fixes/fixes (b1b94fcbd399 Revert "fs: fold open_check_o_direct into do_dentry_open") +$ git merge vfs-fixes/fixes +Merge made by the 'recursive' strategy. +Merging dma-mapping-fixes/for-linus (cf65a0f6f6ff dma-mapping: move all DMA mapping code to kernel/dma) +$ git merge dma-mapping-fixes/for-linus +Already up to date. +Merging drivers-x86-fixes/fixes (ce397d215ccd Linux 4.18-rc1) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (ce397d215ccd Linux 4.18-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/pinctrl-fixes (ce397d215ccd Linux 4.18-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (737dd8e1a4c4 Documentation: devicetree: tilcdc: fix spelling mistake "suppors" -> "supports") +$ git merge devicetree-fixes/dt/linus +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging scsi-fixes/fixes (63ce3c384db2 scsi: target: Fix truncated PR-in ReadKeys response) +$ git merge scsi-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/scsi/ipr.c | 2 -- + drivers/scsi/qla2xxx/qla_target.c | 7 +++--- + drivers/scsi/scsi_debug.c | 2 +- + drivers/target/target_core_pr.c | 15 ++++++++---- + drivers/target/target_core_user.c | 44 ++++++++++++++++++++++++++++------- + include/uapi/linux/target_core_user.h | 4 +++- + 6 files changed, 53 insertions(+), 21 deletions(-) +Merging drm-intel-fixes/for-linux-next-fixes (7a3727f385dc drm/i915: Enable provoking vertex fix on Gen9 systems.) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_drv.h | 21 +++++++---- + drivers/gpu/drm/i915/i915_gem.c | 57 +++++++++++++++++++++--------- + drivers/gpu/drm/i915/i915_gem_context.c | 2 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 49 +++++++++++++------------ + drivers/gpu/drm/i915/i915_irq.c | 12 +++++-- + drivers/gpu/drm/i915/i915_reg.h | 5 +++ + drivers/gpu/drm/i915/intel_crt.c | 20 +++++++++++ + drivers/gpu/drm/i915/intel_display.c | 16 +++++++-- + drivers/gpu/drm/i915/intel_dp.c | 34 +++++++++--------- + drivers/gpu/drm/i915/intel_dp_mst.c | 6 ++++ + drivers/gpu/drm/i915/intel_dsi.c | 6 ++++ + drivers/gpu/drm/i915/intel_dvo.c | 6 ++++ + drivers/gpu/drm/i915/intel_hdmi.c | 6 ++++ + drivers/gpu/drm/i915/intel_lrc.c | 18 +++++++--- + drivers/gpu/drm/i915/intel_lvds.c | 5 +++ + drivers/gpu/drm/i915/intel_sdvo.c | 6 ++++ + drivers/gpu/drm/i915/intel_tv.c | 12 +++++-- + 17 files changed, 204 insertions(+), 77 deletions(-) +Merging mmc-fixes/fixes (ce397d215ccd Linux 4.18-rc1) +$ git merge mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (ca95ef7c9867 rtc: mrst: fix error code in probe()) +$ git merge rtc-fixes/rtc-fixes +Merge made by the 'recursive' strategy. + drivers/rtc/rtc-mrst.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (e8b92efa629d drm/bridge/sii8620: fix display of packed pixel modes in MHL2) +$ git merge drm-misc-fixes/for-linux-next-fixes +Auto-merging drivers/gpu/drm/sun4i/sun4i_tcon.c +Auto-merging drivers/gpu/drm/qxl/qxl_display.c +Auto-merging drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 2 +- + drivers/gpu/drm/bridge/sil-sii8620.c | 309 +++++++++--------------- + drivers/gpu/drm/qxl/qxl_display.c | 7 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 25 -- + 4 files changed, 123 insertions(+), 220 deletions(-) +Merging kbuild/for-next (ce397d215ccd Linux 4.18-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 (2550bbfd4952 dma-direct: don't crash on device without dma_mask) +$ 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 (0ac000e86703 Merge branches 'fixes', 'misc' and 'spectre' into for-linus) +$ git merge arm/for-next +Already up to date. +Merging arm-perf/for-next/perf (ce397d215ccd Linux 4.18-rc1) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (c7953e19db50 ARM: Document merges) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 211 +++++++++++++++++++++++++++++++++ + 1 file changed, 211 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging actions/for-next (35afadd11222 Merge branch 'v4.19/drivers' into next) +$ git merge actions/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 +++ + arch/arm/boot/dts/owl-s500-cubieboard6.dts | 3 +-- + arch/arm/boot/dts/owl-s500-guitar-bb-rev-b.dts | 3 +-- + arch/arm/boot/dts/owl-s500-guitar.dtsi | 3 +-- + arch/arm/boot/dts/owl-s500.dtsi | 3 +-- + arch/arm64/boot/dts/actions/Makefile | 2 ++ + arch/arm64/boot/dts/actions/s900-bubblegum-96.dts | 11 ++--------- + arch/arm64/boot/dts/actions/s900.dtsi | 23 +++++++++++++++++++++-- + drivers/soc/actions/Makefile | 2 ++ + drivers/soc/actions/owl-sps-helper.c | 6 +----- + drivers/soc/actions/owl-sps.c | 6 +----- + 11 files changed, 36 insertions(+), 29 deletions(-) +Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1) +$ git merge alpine/alpine/for-next +Already up to date. +Merging amlogic/for-next (793d8ab66802 Merge branch 'v4.18/defconfig' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 4 ++-- + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 12 +++++++++--- + arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 3 --- + arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 7 +++++++ + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 8 -------- + 5 files changed, 18 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 (5c483a0c319c Merge branch anholt/bcm2835-defconfig-64-next into for-next) +$ git merge bcm2835/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (9a403db14975 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/fsl.txt | 4 + + arch/arm/boot/dts/Makefile | 5 + + arch/arm/boot/dts/imx51-zii-rdu1.dts | 36 + + arch/arm/boot/dts/imx53-kp-ddc.dts | 146 ++++ + arch/arm/boot/dts/imx53-kp-hsc.dts | 52 ++ + arch/arm/boot/dts/imx53-kp.dtsi | 189 +++++ + arch/arm/boot/dts/imx6dl-icore-mipi.dts | 25 + + arch/arm/boot/dts/imx6dl-riotboard.dts | 54 +- + arch/arm/boot/dts/imx6q-icore-mipi.dts | 8 + + arch/arm/boot/dts/imx6q-var-dt6customboard.dts | 1 + + arch/arm/boot/dts/imx6q.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-icore.dtsi | 49 +- + arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 21 + + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 59 +- + arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 4 +- + arch/arm/boot/dts/imx6sll-evk.dts | 315 ++++++++ + arch/arm/boot/dts/imx6sll-pinfunc.h | 880 +++++++++++++++++++++ + arch/arm/boot/dts/imx6sll.dtsi | 780 ++++++++++++++++++ + arch/arm/boot/dts/imx6sx.dtsi | 2 +- + arch/arm/boot/dts/imx7d-sdb.dts | 8 - + arch/arm/configs/imx_v6_v7_defconfig | 2 + + arch/arm/mach-imx/Makefile | 4 +- + arch/arm/mach-imx/common.h | 2 +- + arch/arm/mach-imx/cpuidle-imx6sl.c | 7 +- + arch/arm/mach-imx/cpuidle-imx6sx.c | 1 + + arch/arm/mach-imx/gpc.c | 14 + + arch/arm/mach-imx/mach-imx6sl.c | 5 +- + arch/arm/mach-imx/pm-imx6.c | 26 +- + arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts | 38 +- + arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts | 38 +- + arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts | 38 +- + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 38 +- + arch/arm64/boot/dts/freescale/fsl-ls1043-post.dtsi | 3 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts | 39 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts | 39 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 39 +- + arch/arm64/boot/dts/freescale/fsl-ls1046-post.dtsi | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts | 39 +- + arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 39 +- + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 39 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts | 38 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts | 38 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 38 +- + arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts | 38 +- + arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts | 38 +- + arch/arm64/boot/dts/freescale/fsl-ls2080a-simu.dts | 38 +- + arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 38 +- + arch/arm64/boot/dts/freescale/fsl-ls2088a-qds.dts | 38 +- + arch/arm64/boot/dts/freescale/fsl-ls2088a-rdb.dts | 38 +- + arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi | 38 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi | 38 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi | 38 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 38 +- + .../boot/dts/freescale/qoriq-bman-portals.dtsi | 2 +- + .../boot/dts/freescale/qoriq-fman3-0-10g-0.dtsi | 2 +- + .../boot/dts/freescale/qoriq-fman3-0-10g-1.dtsi | 2 +- + .../boot/dts/freescale/qoriq-fman3-0-1g-0.dtsi | 2 +- + .../boot/dts/freescale/qoriq-fman3-0-1g-1.dtsi | 2 +- + .../boot/dts/freescale/qoriq-fman3-0-1g-2.dtsi | 2 +- + .../boot/dts/freescale/qoriq-fman3-0-1g-3.dtsi | 2 +- + .../boot/dts/freescale/qoriq-fman3-0-1g-4.dtsi | 2 +- + .../boot/dts/freescale/qoriq-fman3-0-1g-5.dtsi | 2 +- + arch/arm64/boot/dts/freescale/qoriq-fman3-0.dtsi | 2 +- + .../boot/dts/freescale/qoriq-qman-portals.dtsi | 2 +- + drivers/soc/imx/gpcv2.c | 13 +- + 69 files changed, 2666 insertions(+), 959 deletions(-) + create mode 100644 arch/arm/boot/dts/imx53-kp-ddc.dts + create mode 100644 arch/arm/boot/dts/imx53-kp-hsc.dts + create mode 100644 arch/arm/boot/dts/imx53-kp.dtsi + create mode 100644 arch/arm/boot/dts/imx6dl-icore-mipi.dts + create mode 100644 arch/arm/boot/dts/imx6sll-evk.dts + create mode 100644 arch/arm/boot/dts/imx6sll-pinfunc.h + create mode 100644 arch/arm/boot/dts/imx6sll.dtsi +Merging keystone/next (fb5d812c3cb3 Merge branch 'for_4.18/keystone-dts' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (9378b3427341 Merge branch 'v4.17-next/soc' into for-next) +$ git merge mediatek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (78e5d8c26c70 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/armada-385-synology-ds116.dts | 2 +- + arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging omap/for-next (1b7e42c1dfe8 Merge branch 'omap-for-v4.18/soc' into for-next) +$ git merge omap/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/dra7.dtsi | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging reset/reset/next (d7bab65b1f57 reset: uniphier: add LD11/LD20 stream demux system reset control) +$ git merge reset/reset/next +Already up to date. +Merging qcom/for-next (509d20563e5d firmware: qcom: scm: Fix crash in qcom_scm_call_atomic1()) +$ git merge qcom/for-next +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 (e0ac98d75a44 Merge branch 'arm64-dt-for-v4.19' into next) +$ git merge renesas/next +Removing arch/arm/mach-shmobile/smp-r8a7791.c +Removing arch/arm/mach-shmobile/smp-r8a7790.c +Removing arch/arm/mach-shmobile/setup-r8a7791.c +Removing arch/arm/mach-shmobile/setup-r8a7790.c +Removing arch/arm/mach-shmobile/r8a7791.h +Removing arch/arm/mach-shmobile/r8a7790.h +Removing arch/arm/mach-shmobile/pm-r8a7779.c +Removing arch/arm/mach-shmobile/platsmp-apmu.h +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/shmobile.txt | 5 +- + arch/arm/boot/dts/emev2-kzm9d.dts | 5 +- + arch/arm/boot/dts/emev2.dtsi | 5 +- + arch/arm/boot/dts/iwg20d-q7-common.dtsi | 5 +- + arch/arm/boot/dts/iwg20d-q7-dbcm-ca.dtsi | 5 +- + arch/arm/boot/dts/r7s72100-genmai.dts | 5 +- + arch/arm/boot/dts/r7s72100-gr-peach.dts | 5 +- + arch/arm/boot/dts/r7s72100-rskrza1.dts | 5 +- + arch/arm/boot/dts/r7s72100.dtsi | 5 +- + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 5 +- + arch/arm/boot/dts/r8a73a4.dtsi | 5 +- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 5 +- + arch/arm/boot/dts/r8a7740.dtsi | 5 +- + arch/arm/boot/dts/r8a7743-iwg20d-q7-dbcm-ca.dts | 5 +- + arch/arm/boot/dts/r8a7743-iwg20d-q7.dts | 5 +- + arch/arm/boot/dts/r8a7743-iwg20m.dtsi | 5 +- + arch/arm/boot/dts/r8a7743-sk-rzg1m.dts | 5 +- + arch/arm/boot/dts/r8a7743.dtsi | 14 +- + .../arm/boot/dts/r8a7745-iwg22d-sodimm-dbhd-ca.dts | 5 +- + arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts | 5 +- + arch/arm/boot/dts/r8a7745-iwg22m.dtsi | 5 +- + arch/arm/boot/dts/r8a7745-sk-rzg1e.dts | 5 +- + arch/arm/boot/dts/r8a7745.dtsi | 5 +- + arch/arm/boot/dts/r8a7778-bockw.dts | 5 +- + arch/arm/boot/dts/r8a7778.dtsi | 5 +- + arch/arm/boot/dts/r8a7779-marzen.dts | 5 +- + arch/arm/boot/dts/r8a7779.dtsi | 5 +- + arch/arm/boot/dts/r8a7790-lager.dts | 26 +- + arch/arm/boot/dts/r8a7790-stout.dts | 26 -- + arch/arm/boot/dts/r8a7790.dtsi | 39 ++- + arch/arm/boot/dts/r8a7791-koelsch.dts | 26 +- + arch/arm/boot/dts/r8a7791-porter.dts | 59 ++-- + arch/arm/boot/dts/r8a7791.dtsi | 19 +- + arch/arm/boot/dts/r8a7792-blanche.dts | 5 +- + arch/arm/boot/dts/r8a7792-wheat.dts | 26 +- + arch/arm/boot/dts/r8a7792.dtsi | 5 +- + arch/arm/boot/dts/r8a7793-gose.dts | 26 +- + arch/arm/boot/dts/r8a7793.dtsi | 20 +- + arch/arm/boot/dts/r8a7794-alt.dts | 26 +- + arch/arm/boot/dts/r8a7794-silk.dts | 26 +- + arch/arm/boot/dts/r8a7794.dtsi | 5 +- + arch/arm/boot/dts/r8a77xx-aa104xd12-panel.dtsi | 5 +- + arch/arm/boot/dts/r8a77xx-aa121td01-panel.dtsi | 5 +- + arch/arm/boot/dts/sh73a0-kzm9g.dts | 5 +- + arch/arm/boot/dts/sh73a0.dtsi | 5 +- + arch/arm/configs/shmobile_defconfig | 1 + + arch/arm/include/debug/renesas-scif.S | 5 +- + arch/arm/mach-shmobile/Makefile | 6 +- + arch/arm/mach-shmobile/common.h | 1 - + arch/arm/mach-shmobile/headsmp-apmu.S | 5 +- + arch/arm/mach-shmobile/platsmp-apmu.c | 245 +++++++--------- + arch/arm/mach-shmobile/platsmp-apmu.h | 32 -- + arch/arm/mach-shmobile/platsmp.c | 9 - + arch/arm/mach-shmobile/pm-r8a7779.c | 41 --- + arch/arm/mach-shmobile/pm-rcar-gen2.c | 25 -- + arch/arm/mach-shmobile/r8a7779.h | 2 - + arch/arm/mach-shmobile/r8a7790.h | 7 - + arch/arm/mach-shmobile/r8a7791.h | 7 - + arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 10 +- + arch/arm/mach-shmobile/setup-emev2.c | 10 +- + arch/arm/mach-shmobile/setup-r7s72100.c | 10 +- + arch/arm/mach-shmobile/setup-r8a73a4.c | 10 +- + arch/arm/mach-shmobile/setup-r8a7740.c | 10 +- + arch/arm/mach-shmobile/setup-r8a7778.c | 10 +- + arch/arm/mach-shmobile/setup-r8a7779.c | 10 +- + arch/arm/mach-shmobile/setup-r8a7790.c | 38 --- + arch/arm/mach-shmobile/setup-r8a7791.c | 39 --- + arch/arm/mach-shmobile/setup-rcar-gen2.c | 16 +- + arch/arm/mach-shmobile/setup-sh73a0.c | 10 +- + arch/arm/mach-shmobile/smp-emev2.c | 10 +- + arch/arm/mach-shmobile/smp-r8a7779.c | 64 +--- + arch/arm/mach-shmobile/smp-r8a7790.c | 71 ----- + arch/arm/mach-shmobile/smp-r8a7791.c | 53 ---- + .../boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dts | 5 +- + arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts | 5 +- + .../boot/dts/renesas/r8a7795-es1-salvator-x.dts | 5 +- + arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 7 +- + arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts | 5 +- + arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts | 5 +- + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 5 +- + .../arm64/boot/dts/renesas/r8a7795-salvator-xs.dts | 5 +- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 20 +- + arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts | 5 +- + arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts | 5 +- + arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 5 +- + .../arm64/boot/dts/renesas/r8a7796-salvator-xs.dts | 5 +- + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 61 +++- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 159 +++++++++- + arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 5 +- + arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 5 +- + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 7 +- + arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 29 ++ + arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts | 23 ++ + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 324 ++++++++++++++++++++- + arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 25 ++ + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 74 ++++- + arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 133 ++++++++- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 71 +++-- + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 24 +- + arch/arm64/boot/dts/renesas/salvator-x.dtsi | 7 +- + arch/arm64/boot/dts/renesas/salvator-xs.dtsi | 7 +- + arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 5 +- + arch/arm64/boot/dts/renesas/ulcb.dtsi | 9 +- + arch/arm64/configs/defconfig | 2 + + drivers/soc/renesas/rcar-sysc.c | 99 +++++-- + include/linux/soc/renesas/rcar-sysc.h | 13 +- + 106 files changed, 1242 insertions(+), 1177 deletions(-) + delete mode 100644 arch/arm/mach-shmobile/platsmp-apmu.h + delete mode 100644 arch/arm/mach-shmobile/pm-r8a7779.c + delete mode 100644 arch/arm/mach-shmobile/r8a7790.h + delete mode 100644 arch/arm/mach-shmobile/r8a7791.h + delete mode 100644 arch/arm/mach-shmobile/setup-r8a7790.c + delete mode 100644 arch/arm/mach-shmobile/setup-r8a7791.c + delete mode 100644 arch/arm/mach-shmobile/smp-r8a7790.c + delete mode 100644 arch/arm/mach-shmobile/smp-r8a7791.c +Merging rockchip/for-next (b12b0bd0db32 Merge branch 'v4.18-armsoc/dts32-fixes' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/rk3036-evb.dts | 40 +------ + arch/arm/boot/dts/rk3036-kylin.dts | 40 +------ + arch/arm/boot/dts/rk3036.dtsi | 40 +------ + arch/arm/boot/dts/rk3066a-bqcurie2.dts | 39 +------ + arch/arm/boot/dts/rk3066a-marsboard.dts | 39 +------ + arch/arm/boot/dts/rk3066a-mk808.dts | 39 +------ + arch/arm/boot/dts/rk3066a-rayeager.dts | 39 +------ + arch/arm/boot/dts/rk3066a.dtsi | 39 +------ + arch/arm/boot/dts/rk3188-px3-evb.dts | 39 +------ + arch/arm/boot/dts/rk3188-radxarock.dts | 39 +------ + arch/arm/boot/dts/rk3188.dtsi | 39 +------ + arch/arm/boot/dts/rk3228-evb.dts | 40 +------ + arch/arm/boot/dts/rk3229-evb.dts | 40 +------ + arch/arm/boot/dts/rk3229.dtsi | 39 +------ + arch/arm/boot/dts/rk322x.dtsi | 43 +------- + arch/arm/boot/dts/rk3288-evb-act8846.dts | 40 +------ + arch/arm/boot/dts/rk3288-evb-rk808.dts | 40 +------ + arch/arm/boot/dts/rk3288-evb.dtsi | 42 +------ + arch/arm/boot/dts/rk3288-fennec.dts | 40 +------ + arch/arm/boot/dts/rk3288-firefly-beta.dts | 39 +------ + arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 39 +------ + arch/arm/boot/dts/rk3288-firefly-reload.dts | 39 +------ + arch/arm/boot/dts/rk3288-firefly.dts | 39 +------ + arch/arm/boot/dts/rk3288-firefly.dtsi | 39 +------ + arch/arm/boot/dts/rk3288-miqi.dts | 39 +------ + arch/arm/boot/dts/rk3288-phycore-rdk.dts | 39 +------ + arch/arm/boot/dts/rk3288-phycore-som.dtsi | 39 +------ + arch/arm/boot/dts/rk3288-popmetal.dts | 39 +------ + arch/arm/boot/dts/rk3288-r89.dts | 39 +------ + arch/arm/boot/dts/rk3288-rock2-som.dtsi | 40 +------ + arch/arm/boot/dts/rk3288-rock2-square.dts | 40 +------ + arch/arm/boot/dts/rk3288-tinker.dts | 39 +------ + arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi | 5 +- + arch/arm/boot/dts/rk3288-veyron-brain.dts | 39 +------ + arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 41 +------ + arch/arm/boot/dts/rk3288-veyron-jaq.dts | 39 +------ + arch/arm/boot/dts/rk3288-veyron-jerry.dts | 39 +------ + arch/arm/boot/dts/rk3288-veyron-mickey.dts | 39 +------ + arch/arm/boot/dts/rk3288-veyron-minnie.dts | 39 +------ + arch/arm/boot/dts/rk3288-veyron-pinky.dts | 39 +------ + arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi | 39 +------ + arch/arm/boot/dts/rk3288-veyron-speedy.dts | 39 +------ + arch/arm/boot/dts/rk3288-veyron.dtsi | 75 ++++--------- + arch/arm/boot/dts/rk3288-vyasa.dts | 39 +------ + arch/arm/boot/dts/rk3288.dtsi | 122 ++++++++++++--------- + arch/arm/boot/dts/rk3xxx.dtsi | 39 +------ + arch/arm/boot/dts/rv1108-evb.dts | 40 +------ + arch/arm/boot/dts/rv1108.dtsi | 40 +------ + arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 39 +------ + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 39 +------ + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 42 +------ + .../arm64/boot/dts/rockchip/rk3368-evb-act8846.dts | 39 +------ + arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi | 39 +------ + arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts | 39 +------ + .../boot/dts/rockchip/rk3368-orion-r68-meta.dts | 39 +------ + arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts | 39 +------ + arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 39 +------ + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 47 ++------ + arch/arm64/boot/dts/rockchip/rk3399-evb.dts | 39 +------ + arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 42 +------ + arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts | 39 +------ + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 39 +------ + arch/arm64/boot/dts/rockchip/rk3399-op1-opp.dtsi | 39 +------ + arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi | 39 +------ + .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 39 +------ + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 40 +------ + .../dts/rockchip/rk3399-sapphire-excavator.dts | 41 +------ + arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 44 +------- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 67 +++++------ + 69 files changed, 200 insertions(+), 2647 deletions(-) +Merging samsung/for-next (bebc6082da0a Linux 4.14) +$ git merge samsung/for-next +Already up to date. +Merging samsung-krzk/for-next (200b93071654 Merge branch 'next/dt64-on-rc1' into for-next) +$ git merge samsung-krzk/for-next +Removing arch/arm64/boot/dts/exynos/exynos7-tmu-sensor-conf.dtsi +Removing arch/arm64/boot/dts/exynos/exynos5433-tmu-sensor-conf.dtsi +Removing arch/arm64/boot/dts/exynos/exynos5433-tmu-g3d-sensor-conf.dtsi +Removing Documentation/devicetree/bindings/arm/insignal-boards.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/insignal-boards.txt | 8 -------- + arch/arm/boot/dts/exynos3250.dtsi | 16 +++++++++++++++ + arch/arm/boot/dts/exynos4210.dtsi | 13 ++++++++++++ + arch/arm/boot/dts/exynos4412.dtsi | 9 +++++++++ + arch/arm/boot/dts/exynos5250.dtsi | 23 ++++++++++++++++++++++ + arch/arm/boot/dts/exynos5420-cpus.dtsi | 6 ++++++ + arch/arm/boot/dts/exynos5422-cpus.dtsi | 8 +++++++- + arch/arm/mach-s3c24xx/include/mach/s3c2412.h | 2 +- + .../dts/exynos/exynos5433-tmu-g3d-sensor-conf.dtsi | 20 ------------------- + .../dts/exynos/exynos5433-tmu-sensor-conf.dtsi | 19 ------------------ + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 14 ++++++------- + .../boot/dts/exynos/exynos7-tmu-sensor-conf.dtsi | 21 -------------------- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 2 +- + 13 files changed, 83 insertions(+), 78 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/insignal-boards.txt + delete mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tmu-g3d-sensor-conf.dtsi + delete mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tmu-sensor-conf.dtsi + delete mode 100644 arch/arm64/boot/dts/exynos/exynos7-tmu-sensor-conf.dtsi +Merging sunxi/sunxi/for-next (9c2cc863c256 Merge branches 'sunxi/drivers-for-4.19' and 'sunxi/dt64-for-4.19' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sram/sunxi-sram.txt | 3 +- + arch/arm/boot/dts/sun6i-a31.dtsi | 30 +++ + arch/arm/boot/dts/sun7i-a20.dtsi | 13 + + arch/arm/boot/dts/sun8i-a33.dtsi | 9 + + arch/arm/boot/dts/sun8i-h3.dtsi | 9 + + arch/arm64/boot/dts/allwinner/Makefile | 2 + + .../dts/allwinner/sun50i-a64-amarula-relic.dts | 219 ++++++++++++++++ + .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 280 +++++++++++++++++++++ + .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 12 + + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 72 +++++- + .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 12 + + drivers/soc/sunxi/sunxi_sram.c | 61 ++++- + 12 files changed, 717 insertions(+), 5 deletions(-) + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts +Merging tegra/for-next (6de9ae597a79 Merge branch for-4.18/clk into for-next) +$ git merge tegra/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (0fe42512b2f0 arm64: Fix syscall restarting around signal suppressed by tracer) +$ git merge arm64/for-next/core +Already up to date. +Merging clk/clk-next (003cfd706bb1 Merge branch 'clk-fixes' into clk-next) +$ git merge clk/clk-next +Merge made by the 'recursive' strategy. + drivers/clk/Makefile | 2 +- + drivers/clk/clk.c | 215 +++++++++++++++++++++++++++++++++++++++-- + drivers/clk/qcom/gcc-ipq806x.c | 3 - + drivers/clk/qcom/gcc-mdm9615.c | 2 - + drivers/clk/qcom/gcc-msm8660.c | 5 - + drivers/clk/qcom/gcc-msm8960.c | 5 - + drivers/clk/sunxi-ng/Makefile | 39 +++----- + include/linux/clk-provider.h | 26 +++++ + include/linux/clk.h | 33 +++++++ + include/trace/events/clk.h | 36 +++++++ + 10 files changed, 318 insertions(+), 48 deletions(-) +Merging clk-samsung/for-next (e8cf870f253b clk: samsung: simplify getting .drvdata) +$ git merge clk-samsung/for-next +Merge made by the 'recursive' strategy. +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 (b12c8a70643f m68k: Set default dma mask for platform devices) +$ git merge m68k/for-next +Already up to date. +Merging m68knommu/for-next (f39a4d363335 m68k: fix "bad page state" oops on ColdFire boot) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/coldfire/clk.c | 29 +++++++++++++++++++++++++++++ + arch/m68k/include/asm/mcf_pgalloc.h | 4 +++- + 2 files changed, 32 insertions(+), 1 deletion(-) +Merging microblaze/next (45df561a7ae2 microblaze: consolidate GPIO reset handling) +$ git merge microblaze/next +Removing arch/microblaze/kernel/platform.c +Removing arch/microblaze/kernel/heartbeat.c +Merge made by the 'recursive' strategy. + arch/microblaze/Kconfig.debug | 7 --- + arch/microblaze/include/asm/setup.h | 5 --- + arch/microblaze/include/asm/unistd.h | 2 +- + arch/microblaze/include/uapi/asm/unistd.h | 2 + + arch/microblaze/kernel/Makefile | 4 +- + arch/microblaze/kernel/heartbeat.c | 72 ------------------------------- + arch/microblaze/kernel/platform.c | 29 ------------- + arch/microblaze/kernel/reset.c | 11 ++--- + arch/microblaze/kernel/syscall_table.S | 2 + + arch/microblaze/kernel/timer.c | 7 --- + 10 files changed, 12 insertions(+), 129 deletions(-) + delete mode 100644 arch/microblaze/kernel/heartbeat.c + delete mode 100644 arch/microblaze/kernel/platform.c +Merging mips/mips-next (e37439376c07 arch: mips: mm: page: Remove unused function) +$ git merge mips/mips-next +Auto-merging kernel/dma/noncoherent.c +Removing arch/mips/mti-malta/malta-reset.c +Removing arch/mips/mti-malta/malta-pm.c +Removing arch/mips/mm/dma-default.c +Removing arch/mips/loongson64/common/dma-swiotlb.c +Removing arch/mips/include/asm/mach-loongson64/dma-coherence.h +Removing arch/mips/include/asm/mach-jazz/dma-coherence.h +Removing arch/mips/include/asm/mach-ip32/dma-coherence.h +Removing arch/mips/include/asm/mach-ip27/dma-coherence.h +Removing arch/mips/include/asm/mach-generic/dma-coherence.h +Removing arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h +Removing arch/mips/include/asm/mach-bmips/dma-coherence.h +Removing arch/mips/include/asm/mach-ath25/dma-coherence.h +Auto-merging arch/mips/include/asm/io.h +Auto-merging arch/mips/Kconfig +Merge made by the 'recursive' strategy. + arch/mips/Kconfig | 35 +- + arch/mips/ath25/Kconfig | 1 + + arch/mips/bmips/dma.c | 32 +- + arch/mips/bmips/setup.c | 7 - + arch/mips/boot/Makefile | 52 ++- + arch/mips/boot/ecoff.h | 61 ++-- + arch/mips/boot/elf2ecoff.c | 31 +- + arch/mips/cavium-octeon/dma-octeon.c | 191 +++------- + arch/mips/cavium-octeon/octeon-irq.c | 2 +- + arch/mips/cavium-octeon/octeon-platform.c | 2 +- + arch/mips/configs/malta_defconfig | 1 + + arch/mips/configs/malta_kvm_defconfig | 1 + + arch/mips/configs/malta_kvm_guest_defconfig | 1 + + arch/mips/configs/malta_qemu_32r6_defconfig | 1 + + arch/mips/configs/maltaaprp_defconfig | 1 + + arch/mips/configs/maltasmvp_defconfig | 1 + + arch/mips/configs/maltasmvp_eva_defconfig | 1 + + arch/mips/configs/maltaup_defconfig | 1 + + arch/mips/configs/maltaup_xpa_defconfig | 1 + + arch/mips/generic/init.c | 13 - + arch/mips/include/asm/bmips.h | 16 - + arch/mips/include/asm/dma-coherence.h | 6 +- + arch/mips/include/asm/dma-direct.h | 17 +- + arch/mips/include/asm/dma-mapping.h | 21 +- + arch/mips/include/asm/io.h | 4 +- + arch/mips/include/asm/mach-ath25/dma-coherence.h | 76 ---- + arch/mips/include/asm/mach-bmips/dma-coherence.h | 54 --- + .../include/asm/mach-cavium-octeon/dma-coherence.h | 79 ---- + arch/mips/include/asm/mach-generic/dma-coherence.h | 73 ---- + arch/mips/include/asm/mach-generic/kmalloc.h | 3 +- + arch/mips/include/asm/mach-ip27/dma-coherence.h | 70 ---- + arch/mips/include/asm/mach-ip32/dma-coherence.h | 92 ----- + arch/mips/include/asm/mach-jazz/dma-coherence.h | 60 --- + .../include/asm/mach-loongson64/dma-coherence.h | 93 ----- + arch/mips/include/asm/mmu_context.h | 2 - + arch/mips/include/asm/octeon/pci-octeon.h | 3 + + arch/mips/jazz/jazzdma.c | 141 ++++++- + arch/mips/kernel/genex.S | 46 +++ + arch/mips/kernel/process.c | 80 ++-- + arch/mips/kernel/relocate_kernel.S | 4 +- + arch/mips/kernel/setup.c | 24 ++ + arch/mips/kernel/traps.c | 7 - + arch/mips/lantiq/prom.c | 8 - + arch/mips/loongson64/Kconfig | 5 - + arch/mips/loongson64/common/Makefile | 6 +- + arch/mips/loongson64/common/dma-swiotlb.c | 109 ------ + arch/mips/loongson64/common/dma.c | 18 + + arch/mips/loongson64/loongson-3/Makefile | 2 +- + arch/mips/loongson64/loongson-3/dma.c | 25 ++ + arch/mips/mm/Makefile | 4 +- + arch/mips/mm/c-r4k.c | 12 +- + arch/mips/mm/cache.c | 4 +- + arch/mips/mm/dma-default.c | 404 --------------------- + arch/mips/mm/dma-noncoherent.c | 208 +++++++++++ + arch/mips/mm/dma-swiotlb.c | 61 ++++ + arch/mips/mm/page.c | 15 - + arch/mips/mti-malta/Makefile | 2 - + arch/mips/mti-malta/malta-pm.c | 96 ----- + arch/mips/mti-malta/malta-reset.c | 30 -- + arch/mips/mti-malta/malta-setup.c | 39 +- + arch/mips/netlogic/xlp/dt.c | 14 - + arch/mips/pci/ops-bridge.c | 4 +- + arch/mips/pci/pci-ar2315.c | 24 ++ + arch/mips/pci/pci-ip27.c | 25 +- + arch/mips/pci/pci-octeon.c | 4 - + arch/mips/pci/pcie-octeon.c | 2 - + arch/mips/sgi-ip32/Makefile | 2 +- + arch/mips/sgi-ip32/ip32-dma.c | 37 ++ + arch/mips/sibyte/Kconfig | 1 - + include/linux/dma-noncoherent.h | 8 + + kernel/dma/noncoherent.c | 8 +- + 71 files changed, 882 insertions(+), 1702 deletions(-) + delete mode 100644 arch/mips/include/asm/mach-ath25/dma-coherence.h + delete mode 100644 arch/mips/include/asm/mach-bmips/dma-coherence.h + delete mode 100644 arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h + delete mode 100644 arch/mips/include/asm/mach-generic/dma-coherence.h + delete mode 100644 arch/mips/include/asm/mach-ip27/dma-coherence.h + delete mode 100644 arch/mips/include/asm/mach-ip32/dma-coherence.h + delete mode 100644 arch/mips/include/asm/mach-jazz/dma-coherence.h + delete mode 100644 arch/mips/include/asm/mach-loongson64/dma-coherence.h + delete mode 100644 arch/mips/loongson64/common/dma-swiotlb.c + create mode 100644 arch/mips/loongson64/common/dma.c + create mode 100644 arch/mips/loongson64/loongson-3/dma.c + delete mode 100644 arch/mips/mm/dma-default.c + create mode 100644 arch/mips/mm/dma-noncoherent.c + create mode 100644 arch/mips/mm/dma-swiotlb.c + delete mode 100644 arch/mips/mti-malta/malta-pm.c + delete mode 100644 arch/mips/mti-malta/malta-reset.c + create mode 100644 arch/mips/sgi-ip32/ip32-dma.c +Merging nds32/next (a78945c357f5 nds32: Fix build error caused by configuration flag rename) +$ git merge nds32/next +Merge made by the 'recursive' strategy. + arch/nds32/Kconfig | 12 ++++++------ + arch/nds32/Makefile | 2 ++ + 2 files changed, 8 insertions(+), 6 deletions(-) +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 (8d40c754fbac parisc: Drop struct sigaction from not exported header file) +$ git merge parisc-hd/for-next +Auto-merging arch/parisc/Makefile +Merge made by the 'recursive' strategy. + arch/parisc/Makefile | 4 ---- + arch/parisc/include/asm/signal.h | 8 -------- + 2 files changed, 12 deletions(-) +Merging powerpc/next (ff5bc793e47b powerpc/64s/radix: Fix missing ptesync in flush_cache_vmap) +$ 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 (ce397d215ccd Linux 4.18-rc1) +$ git merge risc-v/for-next +Already up to date. +Merging s390/features (777c5c1c6084 s390: hypfs: use ktime_get_seconds() instead of get_seconds()) +$ git merge s390/features +Auto-merging init/Kconfig +Auto-merging arch/s390/boot/head.S +Auto-merging arch/s390/boot/compressed/vmlinux.scr.lds.S +Auto-merging arch/s390/boot/als.c +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 1 + + arch/s390/Makefile | 38 ++++++++++-------- + arch/s390/boot/Makefile | 45 +++++++++++++++++++--- + arch/s390/{kernel => boot}/als.c | 20 +++++----- + arch/s390/boot/compressed/.gitignore | 1 + + arch/s390/boot/compressed/Makefile | 42 ++++++++++---------- + arch/s390/boot/compressed/head.S | 8 ++-- + arch/s390/boot/compressed/misc.c | 37 ------------------ + arch/s390/boot/compressed/vmlinux.lds.S | 12 ++++-- + .../compressed/{vmlinux.scr => vmlinux.scr.lds.S} | 4 ++ + arch/s390/boot/ebcdic.c | 2 + + arch/s390/{kernel => boot}/head.S | 7 ++-- + arch/s390/{kernel => boot}/head_kdump.S | 0 + arch/s390/boot/mem.S | 2 + + arch/s390/boot/sclp_early_core.c | 2 + + arch/s390/hypfs/inode.c | 6 +-- + arch/s390/include/asm/nospec-insn.h | 4 +- + arch/s390/include/asm/qdio.h | 1 - + arch/s390/include/asm/setup.h | 1 + + arch/s390/kernel/Makefile | 24 ++---------- + arch/s390/kernel/entry.h | 1 - + arch/s390/kernel/head64.S | 2 +- + arch/s390/kernel/setup.c | 4 +- + arch/s390/kernel/vmlinux.lds.S | 2 +- + arch/s390/scripts/Makefile.chkbss | 7 +++- + drivers/s390/char/Makefile | 5 --- + drivers/s390/cio/qdio_main.c | 5 +-- + init/Kconfig | 15 +++++++- + 28 files changed, 153 insertions(+), 145 deletions(-) + rename arch/s390/{kernel => boot}/als.c (83%) + rename arch/s390/boot/compressed/{vmlinux.scr => vmlinux.scr.lds.S} (70%) + create mode 100644 arch/s390/boot/ebcdic.c + rename arch/s390/{kernel => boot}/head.S (98%) + rename arch/s390/{kernel => boot}/head_kdump.S (100%) + create mode 100644 arch/s390/boot/mem.S + create mode 100644 arch/s390/boot/sclp_early_core.c +Merging sparc-next/master (1aaccb5fa0ea Merge tag 'rtc-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) +$ git merge sparc-next/master +Already up to date. +Merging sh/for-next (ac21fc2dcb40 sh: switch to NO_BOOTMEM) +$ git merge sh/for-next +Already up to date. +Merging uml/linux-next (5ec9121195a4 um: Fix raw interface options) +$ 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 +Auto-merging arch/xtensa/kernel/pci-dma.c +Merge made by the 'recursive' strategy. + arch/xtensa/kernel/pci-dma.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) +Merging fscrypt/master (e1cc40e5d42a fscrypt: log the crypto algorithm implementations) +$ 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 (29dcea88779c Linux 4.17) +$ git merge btrfs/next +Already up to date. +Merging btrfs-kdave/for-next (a8c65bd24e2e Merge branch 'for-next-next-v4.19-20180619' into for-next-20180619) +$ git merge btrfs-kdave/for-next +Merge made by the 'recursive' strategy. + fs/btrfs/compression.c | 21 ++- + fs/btrfs/ctree.h | 9 +- + fs/btrfs/dev-replace.c | 8 +- + fs/btrfs/disk-io.c | 4 +- + fs/btrfs/extent-tree.c | 170 +++++++++++++++++--- + fs/btrfs/extent_io.c | 147 +++++++++++++++-- + fs/btrfs/file.c | 56 +------ + fs/btrfs/free-space-cache.c | 22 +-- + fs/btrfs/free-space-cache.h | 3 +- + fs/btrfs/inode.c | 26 --- + fs/btrfs/ioctl.c | 69 ++++++++ + fs/btrfs/ordered-data.c | 123 --------------- + fs/btrfs/ordered-data.h | 20 +-- + fs/btrfs/props.c | 2 +- + fs/btrfs/relocation.c | 30 +--- + fs/btrfs/scrub.c | 365 ------------------------------------------- + fs/btrfs/super.c | 4 +- + fs/btrfs/transaction.c | 2 +- + fs/btrfs/transaction.h | 2 +- + fs/btrfs/tree-log.c | 166 ++------------------ + fs/btrfs/volumes.c | 150 +++++++++++++++++- + fs/btrfs/volumes.h | 1 + + fs/btrfs/zstd.c | 19 ++- + include/trace/events/btrfs.h | 1 - + include/uapi/linux/btrfs.h | 26 +++ + 25 files changed, 608 insertions(+), 838 deletions(-) +Merging ceph/master (23edca864951 rbd: flush rbd_dev->watch_dwork after watch is unregistered) +$ git merge ceph/master +Already up to date. +Merging cifs/for-next (5539e9b24a38 CIFS: fix memory leak and remove dead code) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/Kconfig | 17 ++++++++- + fs/cifs/cache.c | 6 ++- + fs/cifs/cifsencrypt.c | 4 +- + fs/cifs/cifsglob.h | 7 ++-- + fs/cifs/cifsproto.h | 7 ++-- + fs/cifs/cifssmb.c | 12 +++--- + fs/cifs/connect.c | 24 ++++++++++-- + fs/cifs/fscache.c | 12 ++++-- + fs/cifs/fscache.h | 8 ++-- + fs/cifs/inode.c | 34 ++++++++--------- + fs/cifs/netmisc.c | 19 +++++----- + fs/cifs/smb1ops.c | 1 + + fs/cifs/smb2ops.c | 4 +- + fs/cifs/smb2pdu.c | 99 ++++++++++++++++++++++++------------------------- + fs/cifs/smb2transport.c | 1 + + fs/cifs/transport.c | 18 ++++++++- + 16 files changed, 167 insertions(+), 106 deletions(-) +Merging configfs/for-next (707c62352909 configfs: use kvasprintf() instead of open-coding it) +$ git merge configfs/for-next +Merge made by the 'recursive' strategy. + fs/configfs/item.c | 24 ++++-------------------- + 1 file changed, 4 insertions(+), 20 deletions(-) +Merging ecryptfs/next (e86281e700cc eCryptfs: don't pass up plaintext names when using filename encryption) +$ git merge ecryptfs/next +Already up to date. +Merging ext3/for_next (6c1e4d06a380 udf: Drop unused arguments of udf_delete_aext()) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/ext2/ext2.h | 2 -- + fs/ext2/super.c | 6 +++--- + fs/quota/dquot.c | 7 ++----- + fs/udf/balloc.c | 5 ++--- + fs/udf/directory.c | 8 ++++---- + fs/udf/inode.c | 8 ++++---- + fs/udf/namei.c | 14 +++----------- + fs/udf/udfdecl.h | 9 +++++++-- + 8 files changed, 25 insertions(+), 34 deletions(-) +Merging ext4/dev (0238a85e379f ext4: add more mount time checks of the superblock) +$ git merge ext4/dev +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/mballoc.c +Auto-merging fs/ext4/inline.c +Auto-merging fs/ext4/ialloc.c +Auto-merging fs/ext4/extents.c +Auto-merging fs/ext4/ext4.h +Merge made by the 'recursive' strategy. + fs/ext4/balloc.c | 21 +++++++----- + fs/ext4/ext4.h | 9 +---- + fs/ext4/ext4_extents.h | 1 + + fs/ext4/extents.c | 6 ++++ + fs/ext4/ialloc.c | 14 ++++++-- + fs/ext4/inline.c | 39 ++-------------------- + fs/ext4/inode.c | 7 ++-- + fs/ext4/mballoc.c | 6 ++-- + fs/ext4/super.c | 91 ++++++++++++++++++++++++++++++++++++++++++-------- + fs/ext4/xattr.c | 40 ++++++++++------------ + fs/jbd2/transaction.c | 9 ++++- + 11 files changed, 147 insertions(+), 96 deletions(-) +Merging f2fs/dev (d54d35c501bc Merge tag 'f2fs-for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) +$ git merge f2fs/dev +Already up to date. +Merging fuse/for-next (543b8f8662fe fuse: don't keep dead fuse_conn at fuse_fill_super().) +$ git merge fuse/for-next +Already up to date. +Merging jfs/jfs-next (bd646104ac5a jfs: use time64_t for otime) +$ git merge jfs/jfs-next +Merge made by the 'recursive' strategy. + fs/jfs/jfs_incore.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging nfs/linux-next (7b0df92ac121 pNFS/flexfiles: Process writeback resends from nfsiod context as well) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (ffbfa2ce88f1 sunrpc: Fix latency trace point crashes) +$ git merge nfs-anna/linux-next +Merge made by the 'recursive' strategy. +Merging nfsd/nfsd-next (8163496e78db nfsd: don't advertise a SCSI layout for an unsupported request_queue) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/nfsd/netns.h | 1 + + fs/nfsd/nfs4layouts.c | 11 ++--------- + fs/nfsd/nfs4proc.c | 18 ++++++++++++++---- + fs/nfsd/nfs4state.c | 51 ++++++++++++++++++++++++++++++++++++++++----------- + fs/nfsd/nfs4xdr.c | 39 ++++++++++++++++++++++++++++++++++++--- + fs/nfsd/nfsctl.c | 5 +++-- + fs/nfsd/nfsd.h | 1 + + include/linux/nfs4.h | 8 ++++++++ + 8 files changed, 105 insertions(+), 29 deletions(-) +Merging orangefs/for-next (b1116bc03c00 orangefs: use sparse annotations for holding locks across function calls.) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (46311f3ec53c ovl: Enable metadata only feature) +$ git merge overlayfs/overlayfs-next +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/ctree.h +Merge made by the 'recursive' strategy. + Documentation/filesystems/Locking | 3 +- + Documentation/filesystems/overlayfs.txt | 90 ++++-- + Documentation/filesystems/vfs.txt | 16 +- + fs/btrfs/ctree.h | 5 +- + fs/btrfs/ioctl.c | 11 +- + fs/file_table.c | 13 +- + fs/inode.c | 52 +--- + fs/internal.h | 17 +- + fs/ioctl.c | 1 + + fs/locks.c | 20 +- + fs/namei.c | 2 +- + fs/namespace.c | 69 +---- + fs/ocfs2/file.c | 17 +- + fs/open.c | 85 +++--- + fs/overlayfs/Kconfig | 19 ++ + fs/overlayfs/Makefile | 4 +- + fs/overlayfs/copy_up.c | 190 ++++++++---- + fs/overlayfs/dir.c | 105 +++++-- + fs/overlayfs/export.c | 3 + + fs/overlayfs/file.c | 511 ++++++++++++++++++++++++++++++++ + fs/overlayfs/inode.c | 175 +++++++---- + fs/overlayfs/namei.c | 195 +++++++----- + fs/overlayfs/overlayfs.h | 47 ++- + fs/overlayfs/ovl_entry.h | 6 +- + fs/overlayfs/super.c | 103 ++++--- + fs/overlayfs/util.c | 252 +++++++++++++++- + fs/read_write.c | 94 +++--- + fs/xattr.c | 9 +- + fs/xfs/xfs_file.c | 29 +- + include/linux/dcache.h | 15 +- + include/linux/fs.h | 29 +- + include/linux/fsnotify.h | 14 +- + 32 files changed, 1603 insertions(+), 598 deletions(-) + create mode 100644 fs/overlayfs/file.c +Merging ubifs/linux-next (f5a926dd5298 mtd: ubi: Update ubi-media.h to dual license) +$ git merge ubifs/linux-next +Already up to date. +Merging xfs/for-next (89e9b5c0915a xfs: update incore per-AG inode count) +$ git merge xfs/for-next +Already up to date. +Merging file-locks/locks-next (1cf8e5de4055 fs/lock: show locks taken by processes from another pidns) +$ git merge file-locks/locks-next +Auto-merging fs/locks.c +Merge made by the 'recursive' strategy. + fs/locks.c | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) +Merging vfs/for-next (1f15c298fa29 Merge branch 'work.mount' into for-next) +$ git merge vfs/for-next +Auto-merging init/Kconfig +Auto-merging include/linux/fs.h +CONFLICT (content): Merge conflict in include/linux/fs.h +Auto-merging fs/overlayfs/super.c +Auto-merging fs/nfsd/nfsctl.c +Auto-merging fs/namespace.c +Auto-merging fs/internal.h +Auto-merging fs/file_table.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ext2/super.c +Auto-merging fs/btrfs/super.c +Auto-merging drivers/usb/gadget/function/f_fs.c +Auto-merging arch/s390/hypfs/inode.c +Resolved 'include/linux/fs.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 678de2677dd0] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/mount_api.txt | 439 ++++++++++++++++++ + arch/arc/kernel/setup.c | 1 + + arch/arm/kernel/atags_parse.c | 1 + + arch/ia64/kernel/perfmon.c | 3 +- + arch/powerpc/platforms/cell/spufs/inode.c | 6 +- + arch/s390/hypfs/inode.c | 7 +- + arch/sh/kernel/setup.c | 1 + + arch/sparc/kernel/setup_32.c | 1 + + arch/sparc/kernel/setup_64.c | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 6 + + arch/x86/entry/syscalls/syscall_64.tbl | 6 + + arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 157 ++++--- + arch/x86/kernel/setup.c | 1 + + drivers/base/devtmpfs.c | 7 +- + drivers/dax/super.c | 2 +- + drivers/gpu/drm/drm_drv.c | 3 +- + drivers/gpu/drm/i915/i915_gemfs.c | 2 +- + drivers/infiniband/hw/qib/qib_fs.c | 7 +- + drivers/misc/cxl/api.c | 3 +- + drivers/misc/ibmasm/ibmasmfs.c | 11 +- + drivers/mtd/mtdsuper.c | 26 +- + drivers/oprofile/oprofilefs.c | 8 +- + drivers/usb/gadget/function/f_fs.c | 7 +- + drivers/usb/gadget/legacy/inode.c | 7 +- + drivers/virtio/virtio_balloon.c | 2 +- + drivers/xen/xenfs/super.c | 7 +- + fs/9p/vfs_super.c | 2 +- + fs/Makefile | 5 +- + fs/adfs/super.c | 9 +- + fs/affs/super.c | 13 +- + fs/afs/internal.h | 9 +- + fs/afs/mntpt.c | 147 +++--- + fs/afs/super.c | 534 ++++++++++++++-------- + fs/afs/volume.c | 4 +- + fs/aio.c | 3 +- + fs/anon_inodes.c | 3 +- + fs/autofs/autofs_i.h | 2 +- + fs/autofs/init.c | 4 +- + fs/autofs/inode.c | 3 +- + fs/befs/linuxvfs.c | 11 +- + fs/bfs/inode.c | 8 +- + fs/binfmt_misc.c | 7 +- + fs/block_dev.c | 2 +- + fs/btrfs/super.c | 30 +- + fs/btrfs/tests/btrfs-tests.c | 2 +- + fs/ceph/super.c | 3 +- + fs/cifs/cifs_dfs_ref.c | 3 +- + fs/cifs/cifsfs.c | 18 +- + fs/coda/inode.c | 11 +- + fs/configfs/mount.c | 7 +- + fs/cramfs/inode.c | 17 +- + fs/debugfs/inode.c | 14 +- + fs/devpts/inode.c | 10 +- + fs/ecryptfs/main.c | 2 +- + fs/efivarfs/super.c | 9 +- + fs/efs/super.c | 14 +- + fs/exofs/super.c | 7 +- + fs/ext2/super.c | 14 +- + fs/ext4/super.c | 16 +- + fs/f2fs/super.c | 13 +- + fs/fat/inode.c | 3 +- + fs/fat/namei_msdos.c | 8 +- + fs/fat/namei_vfat.c | 8 +- + fs/file_table.c | 9 +- + fs/freevxfs/vxfs_super.c | 12 +- + fs/fs_context.c | 691 ++++++++++++++++++++++++++++ + fs/fsopen.c | 332 ++++++++++++++ + fs/fuse/control.c | 9 +- + fs/fuse/inode.c | 16 +- + fs/gfs2/ops_fstype.c | 6 +- + fs/gfs2/super.c | 4 +- + fs/hfs/super.c | 12 +- + fs/hfsplus/super.c | 12 +- + fs/hostfs/hostfs_kern.c | 7 +- + fs/hpfs/super.c | 11 +- + fs/hugetlbfs/inode.c | 339 ++++++++------ + fs/internal.h | 6 +- + fs/isofs/inode.c | 11 +- + fs/jffs2/super.c | 10 +- + fs/jfs/super.c | 11 +- + fs/kernfs/mount.c | 88 ++-- + fs/libfs.c | 17 +- + fs/minix/inode.c | 14 +- + fs/namespace.c | 729 +++++++++++++++++++++++------- + fs/nfs/internal.h | 4 +- + fs/nfs/namespace.c | 3 +- + fs/nfs/nfs4namespace.c | 3 +- + fs/nfs/nfs4super.c | 27 +- + fs/nfs/super.c | 22 +- + fs/nfsd/nfsctl.c | 8 +- + fs/nilfs2/super.c | 10 +- + fs/nsfs.c | 3 +- + fs/ntfs/super.c | 13 +- + fs/ocfs2/dlmfs/dlmfs.c | 5 +- + fs/ocfs2/super.c | 14 +- + fs/omfs/inode.c | 9 +- + fs/openpromfs/inode.c | 11 +- + fs/orangefs/orangefs-kernel.h | 2 +- + fs/orangefs/super.c | 5 +- + fs/overlayfs/super.c | 11 +- + fs/pipe.c | 3 +- + fs/pnode.c | 1 + + fs/proc/inode.c | 50 +- + fs/proc/internal.h | 6 +- + fs/proc/root.c | 212 ++++++--- + fs/pstore/inode.c | 10 +- + fs/qnx4/inode.c | 14 +- + fs/qnx6/inode.c | 14 +- + fs/ramfs/inode.c | 6 +- + fs/reiserfs/super.c | 14 +- + fs/romfs/super.c | 13 +- + fs/squashfs/super.c | 12 +- + fs/statfs.c | 470 +++++++++++++++++++ + fs/super.c | 402 ++++++++++++---- + fs/sysfs/mount.c | 64 ++- + fs/sysv/inode.c | 3 +- + fs/sysv/super.c | 16 +- + fs/tracefs/inode.c | 10 +- + fs/ubifs/super.c | 5 +- + fs/udf/super.c | 16 +- + fs/ufs/super.c | 11 +- + fs/xfs/xfs_super.c | 10 +- + include/linux/cgroup.h | 3 +- + include/linux/debugfs.h | 8 +- + include/linux/fs.h | 49 +- + include/linux/fs_context.h | 178 ++++++++ + include/linux/fsinfo.h | 40 ++ + include/linux/kernfs.h | 39 +- + include/linux/lsm_hooks.h | 88 +++- + include/linux/module.h | 6 + + include/linux/mount.h | 8 +- + include/linux/mtd/super.h | 4 +- + include/linux/ramfs.h | 4 +- + include/linux/security.h | 74 ++- + include/linux/shmem_fs.h | 3 +- + include/linux/syscalls.h | 11 + + include/uapi/linux/fcntl.h | 2 + + include/uapi/linux/fs.h | 68 +-- + include/uapi/linux/fsinfo.h | 237 ++++++++++ + include/uapi/linux/mount.h | 75 +++ + init/Kconfig | 10 - + init/do_mounts.c | 5 +- + init/do_mounts_initrd.c | 1 + + ipc/mqueue.c | 120 ++++- + kernel/bpf/inode.c | 7 +- + kernel/cgroup/cgroup-internal.h | 49 +- + kernel/cgroup/cgroup-v1.c | 300 ++++++------ + kernel/cgroup/cgroup.c | 226 +++++---- + kernel/cgroup/cpuset.c | 65 ++- + kernel/trace/trace.c | 7 +- + mm/shmem.c | 10 +- + mm/zsmalloc.c | 3 +- + net/socket.c | 3 +- + net/sunrpc/rpc_pipe.c | 7 +- + samples/statx/Makefile | 5 +- + samples/statx/test-fsinfo.c | 539 ++++++++++++++++++++++ + security/apparmor/apparmorfs.c | 8 +- + security/apparmor/include/mount.h | 11 +- + security/apparmor/lsm.c | 84 +++- + security/apparmor/mount.c | 47 ++ + security/inode.c | 7 +- + security/security.c | 70 ++- + security/selinux/hooks.c | 294 +++++++++++- + security/selinux/selinuxfs.c | 8 +- + security/smack/smack_lsm.c | 344 ++++++++++++-- + security/smack/smackfs.c | 9 +- + security/tomoyo/common.h | 3 + + security/tomoyo/mount.c | 46 ++ + security/tomoyo/tomoyo.c | 19 +- + 169 files changed, 7012 insertions(+), 1747 deletions(-) + create mode 100644 Documentation/filesystems/mount_api.txt + create mode 100644 fs/fs_context.c + create mode 100644 fs/fsopen.c + create mode 100644 include/linux/fs_context.h + create mode 100644 include/linux/fsinfo.h + create mode 100644 include/uapi/linux/fsinfo.h + create mode 100644 include/uapi/linux/mount.h + create mode 100644 samples/statx/test-fsinfo.c +$ git am -3 ../patches/0001-scsi-cxlflash-update-for-fs_type-mount-API-change.patch +Applying: scsi: cxlflash: update for fs_type->mount API change +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/scsi/cxlflash/ocxl_hw.c +$ git add -A . +$ git commit -v -a --amend +[master 85373297f6ec] Merge remote-tracking branch 'vfs/for-next' + Date: Fri Jun 22 10:32:36 2018 +1000 +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 (ce041c43f222 lib/test_printf.c: accept "ptrval" as valid result for plain 'p' tests) +$ git merge printk/for-next +Auto-merging lib/test_printf.c +Merge made by the 'recursive' strategy. + lib/test_printf.c | 24 ++++++++++++++++++++++-- + 1 file changed, 22 insertions(+), 2 deletions(-) +Merging pci/next (ce397d215ccd Linux 4.18-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 (f1b6ae6701a7 Merge branch 'for-4.18/rmi' into for-next) +$ git merge hid/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging i2c/i2c/for-next (ce397d215ccd Linux 4.18-rc1) +$ git merge i2c/i2c/for-next +Already up to date. +Merging dmi/master (7f73745fec52 firmware: dmi: Add access to the SKU ID string) +$ git merge dmi/master +Merge made by the 'recursive' strategy. +Merging hwmon-staging/hwmon-next (06399c395108 hwmon: (nct7904) Fix UNSPECIFIED_INT warning) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + drivers/hwmon/nct7904.c | 68 ++++++++++++++++++++++++------------------------- + 1 file changed, 34 insertions(+), 34 deletions(-) +Merging jc_docs/docs-next (a49d9c0ae46e Documentation: document hung_task_panic kernel parameter) +$ git merge jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (f2809d20b925 media: omap2: fix compile-testing with FB_OMAP2=m) +$ git merge v4l-dvb/master +Merge made by the 'recursive' strategy. +Merging v4l-dvb-next/master (f10379aad39e media: include/video/omapfb_dss.h: use IS_ENABLED()) +$ git merge v4l-dvb-next/master +Already up to date. +Merging fbdev/fbdev-for-next (85ebd164de56 fb_omap2: add gpiolib dependency) +$ git merge fbdev/fbdev-for-next +Already up to date. +Merging pm/linux-next (de3e0f659e0d Merge branch 'pm-tools' into linux-next) +$ git merge pm/linux-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging cpupower/cpupower (ce397d215ccd Linux 4.18-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 (c5c2a97b3ac7 PM / OPP: Update voltage in case freq == old_freq) +$ git merge opp/opp/linux-next +Already up to date. +Merging thermal/next (e9ed3ee61aa6 Merge branches 'thermal-core' and 'thermal-intel' into next) +$ git merge thermal/next +Already up to date. +Merging thermal-soc/next (6d7c70d1cd65 thermal: qcom: tsens: Allow number of sensors to come from DT) +$ git merge thermal-soc/next +Already up to date. +Merging ieee1394/for-next (188775181bc0 firewire-ohci: work around oversized DMA reads on JMicron controllers) +$ git merge ieee1394/for-next +Already up to date. +Merging dlm/next (da3627c30d22 dlm: remove O_NONBLOCK flag in sctp_connect_to_sock) +$ git merge dlm/next +Already up to date. +Merging swiotlb/linux-next (4855c92dbb7b xen-swiotlb: fix the check condition for xen_swiotlb_free_coherent) +$ git merge swiotlb/linux-next +Already up to date. +Merging rdma/for-next (cfdeb8934b6f RDMA/mlx5: Refactor transport domain checks) +$ git merge rdma/for-next +Auto-merging include/rdma/ib_verbs.h +Auto-merging fs/cifs/smbdirect.c +Auto-merging drivers/infiniband/hw/qedr/verbs.c +Auto-merging drivers/infiniband/hw/mlx5/main.c +Auto-merging drivers/infiniband/core/verbs.c +Auto-merging drivers/infiniband/core/uverbs_main.c +Merge made by the 'recursive' strategy. + drivers/infiniband/core/cache.c | 720 ++++++++++----- + drivers/infiniband/core/cm.c | 13 +- + drivers/infiniband/core/cma.c | 6 +- + drivers/infiniband/core/device.c | 21 +- + drivers/infiniband/core/mad.c | 99 +- + drivers/infiniband/core/mad_priv.h | 7 +- + drivers/infiniband/core/nldev.c | 16 +- + drivers/infiniband/core/rdma_core.c | 42 +- + drivers/infiniband/core/rdma_core.h | 10 +- + drivers/infiniband/core/sysfs.c | 66 +- + drivers/infiniband/core/uverbs_cmd.c | 21 +- + drivers/infiniband/core/uverbs_ioctl.c | 103 ++- + drivers/infiniband/core/uverbs_main.c | 6 + + drivers/infiniband/core/uverbs_std_types.c | 4 +- + drivers/infiniband/core/verbs.c | 374 +++++++- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 102 +-- + drivers/infiniband/hw/bnxt_re/ib_verbs.h | 3 +- + drivers/infiniband/hw/cxgb3/iwch_provider.c | 3 +- + drivers/infiniband/hw/cxgb4/cm.c | 3 - + drivers/infiniband/hw/cxgb4/provider.c | 3 +- + drivers/infiniband/hw/hfi1/chip.c | 7 - + drivers/infiniband/hw/hfi1/driver.c | 63 +- + drivers/infiniband/hw/hfi1/hfi.h | 25 +- + drivers/infiniband/hw/hfi1/init.c | 23 +- + drivers/infiniband/hw/hfi1/pio.c | 6 +- + drivers/infiniband/hw/hfi1/qp.c | 6 +- + drivers/infiniband/hw/hfi1/qp.h | 24 +- + drivers/infiniband/hw/hfi1/rc.c | 6 +- + drivers/infiniband/hw/hfi1/ruc.c | 14 +- + drivers/infiniband/hw/hfi1/verbs.c | 7 +- + drivers/infiniband/hw/hns/hns_roce_ah.c | 19 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 2 +- + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 9 +- + drivers/infiniband/hw/i40iw/i40iw_hw.c | 83 +- + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 3 +- + drivers/infiniband/hw/mlx4/ah.c | 20 +- + drivers/infiniband/hw/mlx4/main.c | 36 +- + drivers/infiniband/hw/mlx4/mlx4_ib.h | 2 +- + drivers/infiniband/hw/mlx4/qp.c | 30 +- + drivers/infiniband/hw/mlx5/Makefile | 1 + + drivers/infiniband/hw/mlx5/ah.c | 11 +- + drivers/infiniband/hw/mlx5/devx.c | 1107 +++++++++++++++++++++++ + drivers/infiniband/hw/mlx5/main.c | 87 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 25 +- + drivers/infiniband/hw/mlx5/qp.c | 19 +- + drivers/infiniband/hw/mthca/mthca_av.c | 5 +- + drivers/infiniband/hw/mthca/mthca_provider.c | 5 +- + drivers/infiniband/hw/nes/nes_verbs.c | 3 +- + drivers/infiniband/hw/ocrdma/ocrdma_ah.c | 24 +- + drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 21 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 3 +- + drivers/infiniband/hw/qedr/qedr_roce_cm.c | 25 +- + drivers/infiniband/hw/qedr/verbs.c | 28 +- + drivers/infiniband/hw/qib/qib_verbs.c | 3 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 10 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c | 3 +- + drivers/infiniband/sw/rdmavt/ah.c | 4 +- + drivers/infiniband/sw/rdmavt/qp.c | 11 +- + drivers/infiniband/sw/rxe/rxe.c | 3 +- + drivers/infiniband/sw/rxe/rxe_av.c | 30 +- + drivers/infiniband/sw/rxe/rxe_loc.h | 5 +- + drivers/infiniband/sw/rxe/rxe_net.c | 50 +- + drivers/infiniband/sw/rxe/rxe_param.h | 2 +- + drivers/infiniband/sw/rxe/rxe_qp.c | 31 +- + drivers/infiniband/sw/rxe/rxe_recv.c | 15 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 5 + + drivers/infiniband/sw/rxe/rxe_verbs.c | 31 +- + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 4 +- + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 3 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 4 +- + drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 2 +- + drivers/infiniband/ulp/isert/ib_isert.c | 5 +- + drivers/infiniband/ulp/srp/ib_srp.c | 2 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 24 +- + drivers/nvme/target/rdma.c | 2 +- + fs/cifs/smbdirect.c | 13 +- + include/linux/idr.h | 11 + + include/linux/mlx5/device.h | 3 + + include/linux/mlx5/mlx5_ifc.h | 71 +- + include/rdma/ib_cache.h | 21 + + include/rdma/ib_verbs.h | 37 +- + include/rdma/rdmavt_qp.h | 30 +- + include/rdma/uverbs_ioctl.h | 38 +- + include/rdma/uverbs_named_ioctl.h | 4 + + include/rdma/uverbs_std_types.h | 2 - + include/uapi/rdma/mlx5-abi.h | 3 + + include/uapi/rdma/mlx5_user_ioctl_cmds.h | 73 ++ + net/rds/ib.c | 2 +- + net/smc/smc_core.c | 20 +- + net/smc/smc_ib.c | 25 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 2 +- + net/sunrpc/xprtrdma/verbs.c | 2 +- + 95 files changed, 2924 insertions(+), 1066 deletions(-) + create mode 100644 drivers/infiniband/hw/mlx5/devx.c +Merging net-next/master (f0dc7f9c6dd9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge net-next/master +Already up to date. +Merging bpf-next/master (f0dc7f9c6dd9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge bpf-next/master +Already up to date. +Merging ipsec-next/master (f0dc7f9c6dd9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (0af5107cd064 net/mlx5: Add RoCE RX ICRC encapsulated counter) +$ git merge mlx5-next/mlx5-next +Auto-merging include/linux/mlx5/mlx5_ifc.h +Merge made by the 'recursive' strategy. + include/linux/mlx5/mlx5_ifc.h | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) +Merging netfilter-next/master (f0dc7f9c6dd9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge netfilter-next/master +Already up to date. +Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings) +$ git merge nfc-next/master +Auto-merging drivers/nfc/fdp/i2c.c +Merge made by the 'recursive' strategy. + drivers/nfc/fdp/fdp.c | 35 +++++------------------------------ + drivers/nfc/fdp/i2c.c | 26 +++++++++++++------------- + drivers/nfc/st21nfca/dep.c | 3 ++- + drivers/nfc/st21nfca/se.c | 5 +++-- + drivers/nfc/st95hf/core.c | 7 ++----- + net/nfc/hci/core.c | 10 ++++++++++ + net/nfc/netlink.c | 6 ++++-- + 7 files changed, 39 insertions(+), 53 deletions(-) +Merging ipvs-next/master (e523452ac0e0 netfilter: nf_tables: remove unused variables) +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (4cf44d525548 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) +$ git merge wireless-drivers-next/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath10k/Kconfig | 24 +++++++-------- + drivers/net/wireless/ath/ath10k/ce.c | 2 +- + drivers/net/wireless/ath/ath10k/ce.h | 42 ++++++++++++++++++++++++++ + drivers/net/wireless/ath/ath10k/core.c | 19 +++++++++--- + drivers/net/wireless/ath/ath10k/core.h | 3 +- + drivers/net/wireless/ath/ath10k/debug.c | 21 ++++++++----- + drivers/net/wireless/ath/ath10k/htt_tx.c | 4 +-- + drivers/net/wireless/ath/ath10k/hw.h | 3 ++ + drivers/net/wireless/ath/ath10k/mac.c | 3 ++ + drivers/net/wireless/ath/ath10k/pci.h | 42 -------------------------- + drivers/net/wireless/ath/ath10k/snoc.c | 47 +++++++++-------------------- + drivers/net/wireless/ath/ath10k/snoc.h | 1 - + drivers/net/wireless/ath/ath10k/spectral.c | 2 +- + drivers/net/wireless/ath/ath10k/wmi.c | 14 ++++----- + drivers/net/wireless/ath/ath5k/pcu.c | 1 + + drivers/net/wireless/ath/ath6kl/cfg80211.c | 3 ++ + drivers/net/wireless/ath/ath6kl/sdio.c | 1 + + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 2 ++ + drivers/net/wireless/ath/ath9k/ar9002_phy.c | 1 + + drivers/net/wireless/ath/ath9k/debug.c | 2 +- + drivers/net/wireless/ath/ath9k/main.c | 1 + + 21 files changed, 126 insertions(+), 112 deletions(-) +Merging bluetooth/master (f0dc7f9c6dd9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge bluetooth/master +Already up to date. +Merging mac80211-next/master (8ba6731ad4c7 rfkill: add header files to MAINTAINERS) +$ git merge mac80211-next/master +Auto-merging net/wireless/util.c +Auto-merging net/wireless/nl80211.c +Auto-merging net/wireless/core.c +Auto-merging net/mac80211/util.c +Auto-merging net/mac80211/scan.c +CONFLICT (content): Merge conflict in net/mac80211/scan.c +Auto-merging net/mac80211/main.c +Auto-merging include/uapi/linux/nl80211.h +Auto-merging MAINTAINERS +Resolved 'net/mac80211/scan.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 196809e48321] Merge remote-tracking branch 'mac80211-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/stable/sysfs-class-rfkill | 6 +- + Documentation/rfkill.txt | 18 +- + MAINTAINERS | 2 + + drivers/net/wireless/realtek/rtlwifi/base.c | 2 +- + drivers/staging/rtl8188eu/include/wifi.h | 1 - + drivers/staging/rtl8712/wifi.h | 1 - + drivers/staging/rtl8723bs/include/wifi.h | 1 - + drivers/staging/rtlwifi/base.c | 2 +- + include/linux/ieee80211.h | 437 +++++++++++++++++++++++++++- + include/linux/rfkill.h | 20 +- + include/net/cfg80211.h | 106 ++++++- + include/net/ieee80211_radiotap.h | 123 ++++++++ + include/net/mac80211.h | 64 +++- + include/uapi/linux/nl80211.h | 102 ++++++- + net/mac80211/Makefile | 1 + + net/mac80211/agg-rx.c | 10 +- + net/mac80211/agg-tx.c | 19 +- + net/mac80211/cfg.c | 7 +- + net/mac80211/he.c | 55 ++++ + net/mac80211/ht.c | 2 +- + net/mac80211/ieee80211_i.h | 47 ++- + net/mac80211/main.c | 36 ++- + net/mac80211/mlme.c | 311 ++++++++++++++++++-- + net/mac80211/offchannel.c | 2 +- + net/mac80211/rx.c | 129 +++++++- + net/mac80211/scan.c | 56 +++- + net/mac80211/sta_info.c | 17 +- + net/mac80211/sta_info.h | 20 +- + net/mac80211/trace.h | 2 +- + net/mac80211/tx.c | 21 +- + net/mac80211/util.c | 159 ++++++++-- + net/wireless/core.c | 21 +- + net/wireless/nl80211.c | 168 +++++++++-- + net/wireless/util.c | 87 +++++- + 34 files changed, 1872 insertions(+), 183 deletions(-) + create mode 100644 net/mac80211/he.c +Merging gfs2/for-next (f1b5f8dc1b69 GFS2: Submit all ordered writes in bulk, wait after that) +$ git merge gfs2/for-next +Auto-merging fs/gfs2/super.c +Auto-merging fs/gfs2/rgrp.c +Merge made by the 'recursive' strategy. + fs/gfs2/bmap.c | 10 +++---- + fs/gfs2/incore.h | 2 -- + fs/gfs2/log.c | 55 +++++++++++++++++++++++++++------------ + fs/gfs2/lops.c | 2 +- + fs/gfs2/meta_io.c | 4 +-- + fs/gfs2/rgrp.c | 73 ++++++++++++++++++++++++++++++++++++++++------------ + fs/gfs2/super.c | 1 - + fs/gfs2/trace_gfs2.h | 3 ++- + fs/gfs2/trans.h | 6 +++-- + fs/gfs2/util.c | 38 ++++++++++++++------------- + fs/gfs2/util.h | 10 ++++--- + 11 files changed, 136 insertions(+), 68 deletions(-) +Merging mtd/mtd/next (ce397d215ccd Linux 4.18-rc1) +$ git merge mtd/mtd/next +Already up to date. +Merging nand/nand/next (ce397d215ccd Linux 4.18-rc1) +$ git merge nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (9882b5375df5 mtd: m25p80: Use SPI_MEM_OP_NO_DUMMY instead of SPI_MEM_OP_DUMMY(0, x)) +$ git merge spi-nor/spi-nor/next +Merge made by the 'recursive' strategy. + drivers/mtd/devices/m25p80.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) +Merging crypto/master (b268b3506d99 crypto: chtls - free beyond end rspq_skb_cache) +$ git merge crypto/master +Already up to date. +Merging drm/drm-next (ce397d215ccd Linux 4.18-rc1) +$ 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 (e16a37508633 drm/i915: Enable hw workaround to bypass alpha) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/intel_tv.c +Auto-merging drivers/gpu/drm/i915/intel_sprite.c +Auto-merging drivers/gpu/drm/i915/intel_sdvo.c +Auto-merging drivers/gpu/drm/i915/intel_panel.c +Auto-merging drivers/gpu/drm/i915/intel_lvds.c +Auto-merging drivers/gpu/drm/i915/intel_lrc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/intel_engine_cs.c +Auto-merging drivers/gpu/drm/i915/intel_dvo.c +Auto-merging drivers/gpu/drm/i915/intel_dsi.c +Auto-merging drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/gpu/drm/i915/intel_dp.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/intel_crt.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_crt.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_irq.c +Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/i915_gem_context.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/gvt/vgpu.c +Auto-merging drivers/gpu/drm/i915/gvt/mmio.c +Auto-merging drivers/gpu/drm/i915/gvt/handlers.c +Auto-merging drivers/gpu/drm/i915/gvt/gtt.c +Auto-merging drivers/gpu/drm/i915/gvt/cmd_parser.c +Resolved 'drivers/gpu/drm/i915/i915_gem.c' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/i915/i915_gem_execbuffer.c' +Resolved 'drivers/gpu/drm/i915/intel_crt.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_display.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_lrc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/i915_gem_execbuffer.c'. +[master 314dc5bfb390] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/i915/dvo_ch7017.c | 20 +- + drivers/gpu/drm/i915/dvo_ch7xxx.c | 22 +- + drivers/gpu/drm/i915/dvo_ivch.c | 26 +- + drivers/gpu/drm/i915/dvo_ns2501.c | 44 +- + drivers/gpu/drm/i915/dvo_sil164.c | 10 +- + drivers/gpu/drm/i915/dvo_tfp410.c | 16 +- + drivers/gpu/drm/i915/gvt/aperture_gm.c | 2 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 43 +- + drivers/gpu/drm/i915/gvt/display.c | 62 +- + drivers/gpu/drm/i915/gvt/dmabuf.c | 26 +- + drivers/gpu/drm/i915/gvt/edid.c | 20 +- + drivers/gpu/drm/i915/gvt/execlist.h | 13 +- + drivers/gpu/drm/i915/gvt/fb_decoder.c | 27 +- + drivers/gpu/drm/i915/gvt/firmware.c | 2 +- + drivers/gpu/drm/i915/gvt/gtt.c | 11 +- + drivers/gpu/drm/i915/gvt/gvt.c | 27 +- + drivers/gpu/drm/i915/gvt/gvt.h | 20 +- + drivers/gpu/drm/i915/gvt/handlers.c | 399 ++- + drivers/gpu/drm/i915/gvt/interrupt.c | 17 +- + drivers/gpu/drm/i915/gvt/mmio.c | 12 +- + drivers/gpu/drm/i915/gvt/mmio.h | 11 +- + drivers/gpu/drm/i915/gvt/mmio_context.c | 22 +- + drivers/gpu/drm/i915/gvt/mmio_context.h | 2 +- + drivers/gpu/drm/i915/gvt/page_track.c | 5 +- + drivers/gpu/drm/i915/gvt/sched_policy.c | 36 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 202 +- + drivers/gpu/drm/i915/gvt/scheduler.h | 1 - + drivers/gpu/drm/i915/gvt/vgpu.c | 56 +- + drivers/gpu/drm/i915/i915_debugfs.c | 132 +- + drivers/gpu/drm/i915/i915_drv.c | 137 +- + drivers/gpu/drm/i915/i915_drv.h | 62 +- + drivers/gpu/drm/i915/i915_gem.c | 443 +-- + drivers/gpu/drm/i915/i915_gem.h | 16 + + drivers/gpu/drm/i915/i915_gem_context.c | 166 +- + drivers/gpu/drm/i915/i915_gem_context.h | 28 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 32 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 979 +++--- + drivers/gpu/drm/i915/i915_gem_gtt.h | 65 +- + drivers/gpu/drm/i915/i915_gem_render_state.c | 2 +- + drivers/gpu/drm/i915/i915_gem_shrinker.c | 2 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 6 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 44 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 2 +- + drivers/gpu/drm/i915/i915_irq.c | 175 +- + drivers/gpu/drm/i915/i915_params.c | 3 - + drivers/gpu/drm/i915/i915_params.h | 1 - + drivers/gpu/drm/i915/i915_pci.c | 7 +- + drivers/gpu/drm/i915/i915_perf.c | 140 +- + drivers/gpu/drm/i915/i915_pmu.c | 67 +- + drivers/gpu/drm/i915/i915_pmu.h | 8 + + drivers/gpu/drm/i915/i915_pvinfo.h | 6 +- + drivers/gpu/drm/i915/i915_reg.h | 3450 ++++++++++---------- + drivers/gpu/drm/i915/i915_request.c | 65 +- + drivers/gpu/drm/i915/i915_request.h | 11 +- + drivers/gpu/drm/i915/i915_trace.h | 148 +- + drivers/gpu/drm/i915/i915_vgpu.c | 8 +- + drivers/gpu/drm/i915/i915_vgpu.h | 6 + + drivers/gpu/drm/i915/i915_vma.c | 121 +- + drivers/gpu/drm/i915/i915_vma.h | 10 +- + drivers/gpu/drm/i915/intel_acpi.c | 27 +- + drivers/gpu/drm/i915/intel_atomic.c | 6 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 6 +- + drivers/gpu/drm/i915/intel_audio.c | 48 +- + drivers/gpu/drm/i915/intel_bios.c | 129 +- + drivers/gpu/drm/i915/intel_breadcrumbs.c | 5 +- + drivers/gpu/drm/i915/intel_cdclk.c | 56 +- + drivers/gpu/drm/i915/intel_crt.c | 55 +- + drivers/gpu/drm/i915/intel_ddi.c | 123 +- + drivers/gpu/drm/i915/intel_display.c | 560 ++-- + drivers/gpu/drm/i915/intel_display.h | 14 +- + drivers/gpu/drm/i915/intel_dp.c | 285 +- + drivers/gpu/drm/i915/intel_dp_aux_backlight.c | 12 +- + drivers/gpu/drm/i915/intel_dp_link_training.c | 39 +- + drivers/gpu/drm/i915/intel_dpll_mgr.c | 196 +- + drivers/gpu/drm/i915/intel_dpll_mgr.h | 18 +- + drivers/gpu/drm/i915/intel_drv.h | 34 +- + drivers/gpu/drm/i915/intel_dsi.c | 8 +- + drivers/gpu/drm/i915/intel_dvo.c | 15 +- + drivers/gpu/drm/i915/intel_engine_cs.c | 247 +- + drivers/gpu/drm/i915/intel_fbdev.c | 9 +- + drivers/gpu/drm/i915/intel_frontbuffer.c | 2 - + drivers/gpu/drm/i915/intel_guc.c | 123 +- + drivers/gpu/drm/i915/intel_guc_fwif.h | 20 +- + drivers/gpu/drm/i915/intel_guc_log.c | 70 +- + drivers/gpu/drm/i915/intel_guc_log.h | 26 +- + drivers/gpu/drm/i915/intel_guc_submission.c | 76 +- + drivers/gpu/drm/i915/intel_gvt.c | 2 + + drivers/gpu/drm/i915/intel_hangcheck.c | 17 +- + drivers/gpu/drm/i915/intel_hdmi.c | 123 +- + drivers/gpu/drm/i915/intel_i2c.c | 14 +- + drivers/gpu/drm/i915/intel_lrc.c | 471 ++- + drivers/gpu/drm/i915/intel_lrc.h | 7 - + drivers/gpu/drm/i915/intel_lspcon.c | 2 +- + drivers/gpu/drm/i915/intel_lvds.c | 66 +- + drivers/gpu/drm/i915/intel_opregion.c | 31 +- + drivers/gpu/drm/i915/intel_opregion.h | 1 + + drivers/gpu/drm/i915/intel_panel.c | 8 +- + drivers/gpu/drm/i915/intel_psr.c | 413 +-- + drivers/gpu/drm/i915/intel_ringbuffer.c | 389 ++- + drivers/gpu/drm/i915/intel_ringbuffer.h | 61 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 2 + + drivers/gpu/drm/i915/intel_sdvo.c | 38 +- + drivers/gpu/drm/i915/intel_sprite.c | 150 +- + drivers/gpu/drm/i915/intel_tv.c | 20 +- + drivers/gpu/drm/i915/intel_uc.c | 131 +- + drivers/gpu/drm/i915/intel_uncore.c | 28 +- + drivers/gpu/drm/i915/intel_uncore.h | 22 +- + drivers/gpu/drm/i915/intel_vbt_defs.h | 14 +- + drivers/gpu/drm/i915/intel_workarounds.c | 170 +- + drivers/gpu/drm/i915/selftests/huge_pages.c | 52 +- + .../gpu/drm/i915/selftests/i915_gem_coherency.c | 4 +- + drivers/gpu/drm/i915/selftests/i915_gem_context.c | 154 +- + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 34 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 128 +- + drivers/gpu/drm/i915/selftests/i915_gem_object.c | 6 +- + .../gpu/drm/i915/selftests/i915_mock_selftests.h | 1 + + drivers/gpu/drm/i915/selftests/i915_request.c | 11 +- + drivers/gpu/drm/i915/selftests/i915_vma.c | 31 +- + drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 69 +- + drivers/gpu/drm/i915/selftests/intel_lrc.c | 4 +- + drivers/gpu/drm/i915/selftests/intel_workarounds.c | 4 +- + drivers/gpu/drm/i915/selftests/mock_context.c | 7 + + drivers/gpu/drm/i915/selftests/mock_engine.c | 47 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 17 +- + drivers/gpu/drm/i915/selftests/mock_gtt.c | 68 +- + include/drm/i915_pciids.h | 37 +- + 126 files changed, 7414 insertions(+), 5145 deletions(-) +Merging drm-tegra/drm/tegra/for-next (6134534ca24f drm/tegra: Add kerneldoc for UAPI) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (069035c5db34 drm: Fix possible race conditions while unplugging DRM device) +$ git merge drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/drm_drv.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_drv.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) +Merging drm-msm/msm-next (4dd454c371fd drm/msm/gpu: Increase the pm runtime autosuspend for 5xx) +$ git merge drm-msm/msm-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/msm/adreno/adreno_device.c | 14 +++++++++++++- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 3 ++- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 1 + + drivers/gpu/drm/msm/msm_drv.c | 9 +++++++++ + drivers/gpu/drm/msm/msm_drv.h | 1 + + 5 files changed, 26 insertions(+), 2 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 (518665524272 gpu: ipu-csi: Check for field type alternate) +$ 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/imx-ldb.c | 9 ++++++--- + drivers/gpu/drm/imx/ipuv3-crtc.c | 1 - + drivers/gpu/ipu-v3/ipu-csi.c | 37 ++++++++++++++++++++++++++++++------- + 4 files changed, 36 insertions(+), 12 deletions(-) +Merging etnaviv/etnaviv/next (f6ffbd4fc1a1 drm/etnaviv: replace license text with SPDX tags) +$ 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 (ce397d215ccd Linux 4.18-rc1) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (69b2c6d7c020 ALSA: hda - Use the common helper for thinkpad_acpi mic mute LED handling) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + sound/firewire/motu/motu-protocol-v2.c | 64 +++++++++++---- + sound/firewire/motu/motu-protocol-v3.c | 19 +++-- + sound/firewire/motu/motu.c | 19 +++++ + sound/firewire/motu/motu.h | 5 +- + sound/pci/ctxfi/ctmixer.c | 15 ++-- + sound/pci/hda/dell_wmi_helper.c | 116 ++------------------------- + sound/pci/hda/hda_generic.c | 140 +++++++++++++++++++++++++++++++++ + sound/pci/hda/hda_generic.h | 16 ++++ + sound/pci/hda/thinkpad_helper.c | 27 ++----- + sound/pci/ice1712/prodigy_hifi.c | 21 +---- + sound/usb/line6/toneport.c | 5 +- + 11 files changed, 269 insertions(+), 178 deletions(-) +Merging sound-asoc/for-next (2b241b571b09 Merge branch 'asoc-4.19' into asoc-next) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + .../bindings/sound/marvell,pxa2xx-ac97.txt | 27 + + Documentation/devicetree/bindings/sound/rt5682.txt | 50 + + include/sound/rt5682.h | 40 + + include/sound/simple_card_utils.h | 15 + + include/sound/soc-acpi-intel-match.h | 5 + + include/sound/soc-topology.h | 30 +- + sound/arm/pxa2xx-ac97-lib.c | 12 + + sound/soc/codecs/Kconfig | 6 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/ak4458.c | 2 +- + sound/soc/codecs/ak5558.c | 4 +- + sound/soc/codecs/pcm1789.c | 3 +- + sound/soc/codecs/rt1305.c | 4 +- + sound/soc/codecs/rt5682.c | 2682 ++++++++++++++++++++ + sound/soc/codecs/rt5682.h | 1324 ++++++++++ + sound/soc/codecs/tscs42xx.c | 37 +- + sound/soc/codecs/tscs42xx.h | 8 + + sound/soc/codecs/wm_adsp.c | 29 +- + sound/soc/generic/audio-graph-card.c | 20 +- + sound/soc/generic/simple-card-utils.c | 59 + + sound/soc/generic/simple-card.c | 89 +- + sound/soc/intel/boards/bxt_da7219_max98357a.c | 4 +- + sound/soc/intel/boards/bytcr_rt5640.c | 32 +- + sound/soc/intel/boards/kbl_da7219_max98357a.c | 1 + + sound/soc/intel/common/Makefile | 6 +- + sound/soc/intel/common/soc-acpi-intel-bxt-match.c | 59 + + sound/soc/intel/common/soc-acpi-intel-byt-match.c | 40 +- + sound/soc/intel/common/soc-acpi-intel-cht-match.c | 52 +- + sound/soc/intel/common/soc-acpi-intel-cnl-match.c | 32 + + sound/soc/intel/common/soc-acpi-intel-glk-match.c | 41 + + .../intel/common/soc-acpi-intel-hsw-bdw-match.c | 16 +- + sound/soc/intel/common/soc-acpi-intel-kbl-match.c | 91 + + sound/soc/intel/common/soc-acpi-intel-skl-match.c | 47 + + sound/soc/intel/skylake/skl-pcm.c | 7 +- + sound/soc/intel/skylake/skl-topology.c | 5 +- + sound/soc/intel/skylake/skl-topology.h | 5 +- + sound/soc/intel/skylake/skl.c | 170 +- + sound/soc/omap/omap-abe-twl6040.c | 2 +- + sound/soc/pxa/pxa2xx-ac97.c | 12 + + sound/soc/qcom/apq8096.c | 1 + + sound/soc/rockchip/Makefile | 3 +- + sound/soc/rockchip/rockchip_i2s.c | 3 +- + sound/soc/rockchip/rockchip_pcm.c | 45 + + sound/soc/rockchip/rockchip_pcm.h | 14 + + sound/soc/rockchip/rockchip_rt5645.c | 27 +- + sound/soc/sh/dma-sh7760.c | 26 +- + sound/soc/sh/fsi.c | 22 +- + sound/soc/sh/hac.c | 20 +- + sound/soc/sh/migor.c | 14 +- + sound/soc/sh/rcar/Makefile | 1 + + sound/soc/sh/rcar/adg.c | 15 +- + sound/soc/sh/rcar/cmd.c | 17 +- + sound/soc/sh/rcar/core.c | 35 +- + sound/soc/sh/rcar/ctu.c | 15 +- + sound/soc/sh/rcar/dma.c | 17 +- + sound/soc/sh/rcar/dvc.c | 16 +- + sound/soc/sh/rcar/gen.c | 16 +- + sound/soc/sh/rcar/mix.c | 14 +- + sound/soc/sh/rcar/rsnd.h | 17 +- + sound/soc/sh/rcar/src.c | 16 +- + sound/soc/sh/rcar/ssi.c | 22 +- + sound/soc/sh/rcar/ssiu.c | 15 +- + sound/soc/sh/sh7760-ac97.c | 14 +- + sound/soc/sh/siu.h | 26 +- + sound/soc/sh/siu_dai.c | 26 +- + sound/soc/sh/siu_pcm.c | 27 +- + sound/soc/sh/ssi.c | 21 +- + sound/soc/soc-pcm.c | 116 +- + sound/soc/soc-topology.c | 44 +- + sound/soc/stm/Kconfig | 1 + + sound/soc/stm/stm32_sai_sub.c | 139 +- + sound/soc/tegra/tegra_rt5677.c | 17 +- + 72 files changed, 5217 insertions(+), 675 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/marvell,pxa2xx-ac97.txt + create mode 100644 Documentation/devicetree/bindings/sound/rt5682.txt + create mode 100644 include/sound/rt5682.h + create mode 100644 sound/soc/codecs/rt5682.c + create mode 100644 sound/soc/codecs/rt5682.h + create mode 100644 sound/soc/intel/common/soc-acpi-intel-bxt-match.c + create mode 100644 sound/soc/intel/common/soc-acpi-intel-cnl-match.c + create mode 100644 sound/soc/intel/common/soc-acpi-intel-glk-match.c + create mode 100644 sound/soc/intel/common/soc-acpi-intel-kbl-match.c + create mode 100644 sound/soc/intel/common/soc-acpi-intel-skl-match.c + create mode 100644 sound/soc/rockchip/rockchip_pcm.c + create mode 100644 sound/soc/rockchip/rockchip_pcm.h +Merging modules/modules-next (9f2d1e68cf4d module: exclude SHN_UNDEF symbols from kallsyms api) +$ git merge modules/modules-next +Merge made by the 'recursive' strategy. + kernel/module.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) +Merging input/next (5aff29efbec0 Merge branch 'ib/4.17-xen-kbdfront-runtime-config' into next) +$ git merge input/next +Auto-merging include/xen/interface/io/kbdif.h +Merge made by the 'recursive' strategy. + drivers/input/keyboard/cros_ec_keyb.c | 66 +++++------- + drivers/input/misc/xen-kbdfront.c | 183 ++++++++++++++++++++-------------- + drivers/input/serio/i8042.c | 3 + + include/xen/interface/io/displif.h | 8 ++ + include/xen/interface/io/kbdif.h | 78 +++++++++++---- + include/xen/interface/io/sndif.h | 10 +- + 6 files changed, 207 insertions(+), 141 deletions(-) +Merging block/for-next (28313cee1d4f Merge branch 'for-4.18/block' into for-next) +$ git merge block/for-next +Already up to date! +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 (eaa87d09d34e dm thin metadata: remove needless work from __commit_transaction) +$ git merge device-mapper/for-next +Auto-merging drivers/md/dm.c +Merge made by the 'recursive' strategy. + drivers/md/dm-thin-metadata.c | 9 --------- + drivers/md/dm.c | 5 ++--- + 2 files changed, 2 insertions(+), 12 deletions(-) +Merging pcmcia/pcmcia-next (c3a5307873d4 pcmcia: Use module_pcmcia_driver for scsi drivers) +$ git merge pcmcia/pcmcia-next +Merge made by the 'recursive' strategy. + drivers/char/pcmcia/cm4040_cs.c | 2 +- + drivers/scsi/pcmcia/aha152x_stub.c | 14 +------------- + drivers/scsi/pcmcia/nsp_cs.c | 15 +-------------- + drivers/scsi/pcmcia/nsp_cs.h | 4 ---- + drivers/scsi/pcmcia/qlogic_stub.c | 13 +------------ + drivers/scsi/pcmcia/sym53c500_cs.c | 16 +--------------- + 6 files changed, 5 insertions(+), 59 deletions(-) +Merging mmc/next (ce397d215ccd Linux 4.18-rc1) +$ git merge mmc/next +Already up to date. +Merging kgdb/kgdb-next (2cf2f0d5b91f kdb: use memmove instead of overlapping memcpy) +$ git merge kgdb/kgdb-next +Already up to date. +Merging md/for-next (bfc9dfdcb6e9 MD: cleanup resources in failure) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + drivers/md/md.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) +Merging mfd/for-mfd-next (556c242045f0 mfd: cros_ec: Remove unused __remove function) +$ git merge mfd/for-mfd-next +Already up to date. +Merging backlight/for-backlight-next (980d7812fdb4 dt-bindings: pwm-backlight: Move brightness-levels to optional.) +$ git merge backlight/for-backlight-next +Merge made by the 'recursive' strategy. + .../bindings/leds/backlight/pwm-backlight.txt | 34 ++- + drivers/video/backlight/pwm_bl.c | 232 +++++++++++++++++++-- + 2 files changed, 246 insertions(+), 20 deletions(-) +Merging battery/for-next (ce397d215ccd Linux 4.18-rc1) +$ git merge battery/for-next +Already up to date. +Merging regulator/for-next (3d6f3106e0d8 Merge branch 'regulator-4.19' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regulator/pfuze100.txt | 77 ++++++++++++++++++++- + drivers/regulator/Kconfig | 4 +- + drivers/regulator/pfuze100-regulator.c | 78 ++++++++++++++++++++-- + include/linux/regulator/driver.h | 2 +- + include/linux/regulator/pfuze100.h | 11 +++ + 5 files changed, 161 insertions(+), 11 deletions(-) +Merging security/next-testing (d19289133b1d Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next-testing) +$ git merge security/next-testing +Already up to date! +Merge made by the 'recursive' strategy. +Merging apparmor/apparmor-next (338d0be437ef apparmor: fix ptrace read check) +$ git merge apparmor/apparmor-next +Already up to date. +Merging integrity/next-integrity (b5c90a7526fe EVM: unlock on error path in evm_read_xattrs()) +$ 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 (67b0b4e4988f selinux: Cleanup printk logging in netnode) +$ git merge selinux/next +Auto-merging security/selinux/selinuxfs.c +Auto-merging security/selinux/hooks.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + security/selinux/avc.c | 2 +- + security/selinux/hooks.c | 68 ++++++++++++++--------------- + security/selinux/netif.c | 11 ++--- + security/selinux/netlink.c | 2 +- + security/selinux/netnode.c | 5 +-- + security/selinux/netport.c | 5 +-- + security/selinux/selinuxfs.c | 10 ++--- + security/selinux/ss/avtab.c | 51 +++++++++++----------- + security/selinux/ss/conditional.c | 16 +++---- + security/selinux/ss/ebitmap.c | 15 +++---- + security/selinux/ss/policydb.c | 91 ++++++++++++++++++++------------------- + security/selinux/ss/services.c | 71 +++++++++++++++--------------- + security/selinux/ss/sidtab.c | 5 +-- + 14 files changed, 173 insertions(+), 180 deletions(-) +Merging tpmdd/next (e9234540d1fe tpm_tis_spi: Pass the SPI IRQ down to the driver) +$ git merge tpmdd/next +Auto-merging drivers/char/tpm/tpm2-cmd.c +Auto-merging drivers/char/tpm/tpm.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 5 - + drivers/char/tpm/tpm.h | 19 +-- + drivers/char/tpm/tpm2-cmd.c | 258 +++++++++++++++++------------------------ + drivers/char/tpm/tpm_tis_spi.c | 9 +- + 4 files changed, 124 insertions(+), 167 deletions(-) +Merging watchdog/master (16a7eec2fcd0 watchdog: da9063: remove duplicated timeout_to_sel calls) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (1f568357117c Merge branches 'arm/io-pgtable', 'arm/qcom', 'arm/tegra', 'x86/vt-d', 'x86/amd' 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 (c1abca96b252 samples: mbochs: add DMA_SHARED_BUFFER dependency) +$ 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 (f7859590d976 audit: eliminate audit_enabled magic number comparison) +$ git merge audit/next +Merge made by the 'recursive' strategy. + drivers/tty/tty_audit.c | 2 +- + include/linux/audit.h | 5 ++++- + include/net/xfrm.h | 2 +- + include/uapi/linux/audit.h | 3 ++- + kernel/audit.c | 5 +---- + kernel/auditfilter.c | 17 ++++++++++------- + kernel/auditsc.c | 12 ++++++------ + net/netfilter/xt_AUDIT.c | 2 +- + net/netlabel/netlabel_user.c | 2 +- + 9 files changed, 27 insertions(+), 23 deletions(-) +Merging devicetree/for-next (ac840f898808 dt-bindings: Add bitmain vendor prefix) +$ git merge devicetree/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/vendor-prefixes.txt | 1 + + 1 file changed, 1 insertion(+) +Merging mailbox/mailbox-for-next (f83d1cfc8bcd mailbox/drivers/hisi: Consolidate the Kconfig for the MAILBOX) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (05157939e8cd Merge branch 'spi-4.19' into spi-next) +$ git merge spi/for-next +Removing include/linux/spi/adi_spi3.h +Merge made by the 'recursive' strategy. + drivers/spi/spi-fsl-dspi.c | 446 +++++++++++++++++++++++-------------------- + include/linux/spi/adi_spi3.h | 254 ------------------------ + 2 files changed, 238 insertions(+), 462 deletions(-) + delete mode 100644 include/linux/spi/adi_spi3.h +Merging tip/auto-latest (5559747e17c9 Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Auto-merging arch/x86/kernel/cpu/intel_rdt_rdtgroup.c +CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/intel_rdt_rdtgroup.c +Removing arch/ia64/kernel/jprobes.S +Removing arch/arm64/lib/bitops.S +Removing arch/alpha/lib/dec_and_lock.c +Resolved 'arch/x86/kernel/cpu/intel_rdt_rdtgroup.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c61d3dfe9381] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/kprobes.txt | 35 +- + Documentation/x86/intel_rdt_ui.txt | 377 +++++- + arch/alpha/Kconfig | 5 - + arch/alpha/lib/Makefile | 2 - + arch/alpha/lib/dec_and_lock.c | 44 - + arch/arc/include/asm/kprobes.h | 2 - + arch/arc/kernel/kprobes.c | 50 +- + arch/arm/include/asm/kprobes.h | 2 - + arch/arm/include/asm/probes.h | 1 - + arch/arm/probes/kprobes/core.c | 135 +- + arch/arm64/include/asm/bitops.h | 21 +- + arch/arm64/include/asm/kprobes.h | 1 - + arch/arm64/kernel/probes/kprobes.c | 86 +- + arch/arm64/lib/Makefile | 2 +- + arch/arm64/lib/bitops.S | 76 -- + arch/h8300/include/asm/atomic.h | 4 +- + arch/ia64/include/asm/kprobes.h | 2 - + arch/ia64/include/uapi/asm/break.h | 1 - + arch/ia64/kernel/Makefile | 2 +- + arch/ia64/kernel/jprobes.S | 90 -- + arch/ia64/kernel/kprobes.c | 93 +- + arch/m68k/include/asm/bitops.h | 6 +- + arch/mips/include/asm/kprobes.h | 13 - + arch/mips/kernel/kprobes.c | 70 +- + arch/mips/kvm/mips.c | 4 +- + arch/openrisc/include/asm/cmpxchg.h | 3 +- + arch/powerpc/include/asm/kprobes.h | 12 - + arch/powerpc/kernel/kprobes-ftrace.c | 72 +- + arch/powerpc/kernel/kprobes.c | 92 +- + arch/powerpc/kernel/trace/ftrace_64_mprofile.S | 39 +- + arch/powerpc/kvm/book3s_hv.c | 6 +- + arch/s390/include/asm/kprobes.h | 2 - + arch/s390/kernel/kprobes.c | 86 +- + arch/s390/kvm/interrupt.c | 2 +- + arch/sh/include/asm/cmpxchg-xchg.h | 3 +- + arch/sh/include/asm/kprobes.h | 4 - + arch/sh/kernel/kprobes.c | 72 +- + arch/sparc/include/asm/kprobes.h | 1 - + arch/sparc/kernel/kprobes.c | 65 +- + arch/x86/Makefile | 6 - + arch/x86/include/asm/kprobes.h | 5 +- + arch/x86/kernel/apic/vector.c | 17 +- + arch/x86/kernel/cpu/Makefile | 4 +- + arch/x86/kernel/cpu/bugs.c | 5 + + arch/x86/kernel/cpu/intel_rdt.c | 11 + + arch/x86/kernel/cpu/intel_rdt.h | 142 +- + arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c | 129 +- + arch/x86/kernel/cpu/intel_rdt_pseudo_lock.c | 1505 +++++++++++++++++++++ + arch/x86/kernel/cpu/intel_rdt_pseudo_lock_event.h | 43 + + arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 796 ++++++++++- + arch/x86/kernel/cpu/mcheck/mce-severity.c | 5 + + arch/x86/kernel/kprobes/common.h | 10 - + arch/x86/kernel/kprobes/core.c | 119 +- + arch/x86/kernel/kprobes/ftrace.c | 49 +- + arch/x86/kernel/kprobes/opt.c | 1 - + arch/x86/kernel/kvm.c | 4 +- + arch/x86/kernel/quirks.c | 11 +- + arch/x86/kernel/traps.c | 14 +- + arch/x86/kvm/lapic.c | 2 +- + arch/x86/xen/smp_pv.c | 5 + + drivers/clocksource/timer-stm32.c | 4 +- + include/asm-generic/bitops/atomic.h | 188 +-- + include/asm-generic/bitops/lock.h | 68 +- + include/linux/bitops.h | 22 +- + include/linux/bits.h | 26 + + include/linux/kprobes.h | 53 - + include/linux/refcount.h | 4 +- + include/linux/sched.h | 5 +- + include/linux/spinlock.h | 5 + + include/linux/swait.h | 36 +- + kernel/fail_function.c | 3 - + kernel/irq/irqdesc.c | 13 +- + kernel/irq/manage.c | 2 +- + kernel/kprobes.c | 115 +- + kernel/locking/rwsem.c | 1 + + kernel/power/suspend.c | 4 +- + kernel/rcu/srcutiny.c | 4 +- + kernel/rcu/tree.c | 8 +- + kernel/rcu/tree_exp.h | 4 +- + kernel/rcu/tree_plugin.h | 12 +- + kernel/sched/swait.c | 32 +- + kernel/sys.c | 4 +- + kernel/test_kprobes.c | 94 -- + kernel/time/hrtimer.c | 2 +- + kernel/time/ntp.c | 6 +- + kernel/time/posix-cpu-timers.c | 2 - + kernel/time/posix-stubs.c | 2 +- + kernel/time/posix-timers.c | 10 +- + kernel/time/time.c | 6 +- + kernel/time/timekeeping.c | 2 +- + kernel/trace/trace_kprobe.c | 11 +- + lib/Kconfig.debug | 2 +- + lib/Makefile | 6 +- + lib/dec_and_lock.c | 16 + + lib/refcount.c | 28 + + tools/objtool/check.c | 1 + + tools/perf/Documentation/perf-stat.txt | 3 + + tools/perf/builtin-c2c.c | 10 +- + tools/perf/builtin-script.c | 12 + + tools/perf/builtin-stat.c | 48 +- + tools/perf/ui/gtk/hists.c | 2 +- + tools/perf/util/hist.c | 12 +- + tools/perf/util/hist.h | 4 +- + tools/perf/util/parse-events.y | 5 + + tools/perf/util/sort.h | 4 +- + tools/testing/selftests/rseq/rseq-arm.h | 1 + + tools/testing/selftests/rseq/run_param_test.sh | 0 + virt/kvm/arm/arm.c | 4 +- + virt/kvm/arm/psci.c | 2 +- + virt/kvm/async_pf.c | 2 +- + virt/kvm/kvm_main.c | 4 +- + 111 files changed, 3461 insertions(+), 1919 deletions(-) + delete mode 100644 arch/alpha/lib/dec_and_lock.c + delete mode 100644 arch/arm64/lib/bitops.S + delete mode 100644 arch/ia64/kernel/jprobes.S + create mode 100644 arch/x86/kernel/cpu/intel_rdt_pseudo_lock.c + create mode 100644 arch/x86/kernel/cpu/intel_rdt_pseudo_lock_event.h + create mode 100644 include/linux/bits.h + mode change 100644 => 100755 tools/testing/selftests/rseq/run_param_test.sh +Merging clockevents/clockevents/next (6bd9549d8a7d clocksource/drivers/arc_timer: Add comments about locking while read GFRC) +$ 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 (6c974d4dfafe EDAC, i7core: Fix memleaks and use-after-free on probe and remove) +$ git merge edac-amd/for-next +Merge made by the 'recursive' strategy. + drivers/edac/altera_edac.c | 3 ++- + drivers/edac/edac_mc_sysfs.c | 6 +++--- + drivers/edac/i7core_edac.c | 22 +++++++++++++++------- + 3 files changed, 20 insertions(+), 11 deletions(-) +Merging irqchip/irq/irqchip-next (6a88c221acba ARM: dts: stm32: Add exti support to stm32mp157 pinctrl) +$ git merge irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (a9235b544a0a ring-buffer: Fix typo in comment) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (443da8397d9f rcu: Make rcu_seq_diff() more exact) +$ git merge rcu/rcu/next +Removing tools/testing/selftests/rcutorture/configs/rcu/TREE08-T.boot +Auto-merging kernel/rcu/tree_plugin.h +CONFLICT (content): Merge conflict in kernel/rcu/tree_plugin.h +Auto-merging kernel/rcu/tree_exp.h +Auto-merging kernel/rcu/tree.c +Auto-merging kernel/rcu/rcutorture.c +Auto-merging kernel/locking/locktorture.c +Auto-merging include/linux/rcupdate.h +Auto-merging drivers/iommu/amd_iommu.c +CONFLICT (content): Merge conflict in drivers/iommu/amd_iommu.c +Auto-merging Documentation/core-api/atomic_ops.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'drivers/iommu/amd_iommu.c' using previous resolution. +Recorded preimage for 'kernel/rcu/tree_plugin.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'kernel/rcu/tree_plugin.h'. +[master 234242e7aff3] Merge remote-tracking branch 'rcu/rcu/next' +$ git diff -M --stat --summary HEAD^.. + .../Design/Data-Structures/Data-Structures.html | 118 +-- + .../Memory-Ordering/Tree-RCU-Memory-Ordering.html | 22 +- + .../Design/Memory-Ordering/TreeRCU-gp-cleanup.svg | 123 +-- + .../Design/Memory-Ordering/TreeRCU-gp-init-1.svg | 16 +- + .../Design/Memory-Ordering/TreeRCU-gp-init-3.svg | 56 +- + .../RCU/Design/Memory-Ordering/TreeRCU-gp.svg | 237 ++--- + .../RCU/Design/Memory-Ordering/TreeRCU-qs.svg | 12 +- + Documentation/RCU/stallwarn.txt | 24 +- + Documentation/RCU/whatisRCU.txt | 16 +- + Documentation/admin-guide/kernel-parameters.txt | 4 +- + Documentation/core-api/atomic_ops.rst | 2 +- + drivers/iommu/amd_iommu.c | 6 + + include/linux/rcupdate.h | 20 +- + include/linux/rcutiny.h | 2 +- + include/linux/srcu.h | 17 + + include/linux/torture.h | 4 +- + include/trace/events/rcu.h | 112 ++- + kernel/locking/locktorture.c | 5 +- + kernel/rcu/rcu.h | 124 ++- + kernel/rcu/rcuperf.c | 57 +- + kernel/rcu/rcutorture.c | 341 ++++--- + kernel/rcu/srcutree.c | 36 +- + kernel/rcu/tiny.c | 4 +- + kernel/rcu/tree.c | 1004 ++++++++++---------- + kernel/rcu/tree.h | 71 +- + kernel/rcu/tree_exp.h | 5 +- + kernel/rcu/tree_plugin.h | 174 ++-- + kernel/rcu/update.c | 45 +- + kernel/torture.c | 15 +- + .../testing/selftests/rcutorture/bin/configinit.sh | 26 +- + .../testing/selftests/rcutorture/bin/kvm-build.sh | 11 +- + .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 1 + + .../selftests/rcutorture/bin/kvm-recheck.sh | 1 + + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 5 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 2 +- + .../selftests/rcutorture/bin/parse-console.sh | 7 + + .../selftests/rcutorture/configs/rcu/TREE03.boot | 4 +- + .../selftests/rcutorture/configs/rcu/TREE08-T.boot | 1 - + .../rcutorture/configs/rcu/ver_functions.sh | 2 +- + 39 files changed, 1545 insertions(+), 1187 deletions(-) + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE08-T.boot +Merging kvm/linux-next (ce397d215ccd Linux 4.18-rc1) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (e25028c8ded0 KVM: arm/arm64: Bump VGIC_V3_MAX_CPUS to 512) +$ 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 (ce397d215ccd Linux 4.18-rc1) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (2c8180e885c1 KVM: s390: vsie: simplify < 8k address checks) +$ git merge kvms390/next +Already up to date. +Merging xen-tip/linux-next (7c63ca24c878 xen/scsiback: add error handling for xenbus_printf) +$ git merge xen-tip/linux-next +Auto-merging drivers/xen/grant-table.c +Merge made by the 'recursive' strategy. + arch/arm/xen/enlighten.c | 7 ++++--- + arch/x86/xen/enlighten.c | 7 +++++++ + arch/x86/xen/enlighten_pv.c | 1 + + arch/x86/xen/enlighten_pvh.c | 1 + + drivers/scsi/xen-scsifront.c | 33 ++++++++++++++++++++++++++------- + drivers/xen/grant-table.c | 4 ++-- + drivers/xen/manage.c | 18 +++++++++++++++--- + drivers/xen/xen-scsiback.c | 16 +++++++++++++--- + include/xen/xen.h | 6 +++++- + 9 files changed, 74 insertions(+), 19 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 (66448bc274ca workqueue: move function definitions within CONFIG_SMP block) +$ git merge workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (f193f7985f48 Documentation/ABI: Add documentation mlxreg-io sysfs interfaces) +$ git merge drivers-x86/for-next +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-driver-mlxreg-io | 77 ++++++++ + drivers/platform/mellanox/Kconfig | 11 ++ + drivers/platform/mellanox/Makefile | 1 + + drivers/platform/mellanox/mlxreg-io.c | 245 ++++++++++++++++++++++++ + drivers/platform/x86/mlx-platform.c | 175 ++++++++++++++++- + 5 files changed, 507 insertions(+), 2 deletions(-) + create mode 100644 Documentation/ABI/stable/sysfs-driver-mlxreg-io + create mode 100644 drivers/platform/mellanox/mlxreg-io.c +Merging chrome-platform/for-next (c474e9f2be99 platform/chrome: chromeos_tbmc - fix SPDX identifier) +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. + drivers/platform/chrome/chromeos_tbmc.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) +Merging hsi/for-next (ce397d215ccd Linux 4.18-rc1) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (d30c8d203125 leds: ledtrig-activity: use ktime_get_boot_ns()) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + drivers/leds/trigger/ledtrig-activity.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) +Merging ipmi/for-next (0cd5e837f57a ipmi:dmi: Ignore IPMI SMBIOS entries with a zero base address) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/acpi/acpi_ipmi.c | 4 +-- + drivers/char/ipmi/ipmi_bt_sm.c | 64 ++++++++++++++++----------------- + drivers/char/ipmi/ipmi_devintf.c | 11 +++--- + drivers/char/ipmi/ipmi_dmi.c | 23 +++++++----- + drivers/char/ipmi/ipmi_kcs_sm.c | 4 +-- + drivers/char/ipmi/ipmi_msghandler.c | 51 +++++++++++++------------- + drivers/char/ipmi/ipmi_powernv.c | 4 +-- + drivers/char/ipmi/ipmi_poweroff.c | 67 ++++++++++++++++------------------ + drivers/char/ipmi/ipmi_si_hardcode.c | 9 ++--- + drivers/char/ipmi/ipmi_si_hotmod.c | 17 ++++----- + drivers/char/ipmi/ipmi_si_intf.c | 34 +++++++++--------- + drivers/char/ipmi/ipmi_si_mem_io.c | 2 +- + drivers/char/ipmi/ipmi_si_pci.c | 21 +++++------ + drivers/char/ipmi/ipmi_si_platform.c | 20 ++++++----- + drivers/char/ipmi/ipmi_smic_sm.c | 26 ++++++-------- + drivers/char/ipmi/ipmi_ssif.c | 69 +++++++++++++++++------------------- + drivers/char/ipmi/ipmi_watchdog.c | 52 +++++++++++++-------------- + drivers/hwmon/ibmaem.c | 2 +- + drivers/hwmon/ibmpex.c | 2 +- + include/linux/ipmi.h | 2 +- + include/linux/ipmi_smi.h | 2 +- + include/linux/pci_ids.h | 4 +++ + 22 files changed, 238 insertions(+), 252 deletions(-) +Merging driver-core/driver-core-next (ce397d215ccd Linux 4.18-rc1) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (ce397d215ccd Linux 4.18-rc1) +$ git merge usb/usb-next +Already up to date. +Merging usb-gadget/next (47265c067c0d usb: dwc2: gadget: Fix coverity issue) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (ce397d215ccd Linux 4.18-rc1) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/ci-for-usb-next (8bcf4c0bd7fb usb: chipidea: properly handle host or gadget initialization failure) +$ git merge usb-chipidea-next/ci-for-usb-next +Merge made by the 'recursive' strategy. +Merging phy-next/next (c1eb8f83845b phy: mediatek: add XS-PHY driver) +$ git merge phy-next/next +Already up to date. +Merging tty/tty-next (ce397d215ccd Linux 4.18-rc1) +$ git merge tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (ce397d215ccd Linux 4.18-rc1) +$ git merge char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (441492c2256c extcon: Release locking when sending the notification of connector state) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-intel-int3496.c | 2 +- + drivers/extcon/extcon-usbc-cros-ec.c | 22 ++++++---------------- + drivers/extcon/extcon.c | 3 ++- + 3 files changed, 9 insertions(+), 18 deletions(-) +Merging staging/staging-next (3053339b17f8 staging: goldfish: Clear audio read buffer status after each read) +$ git merge staging/staging-next +Merge made by the 'recursive' strategy. + drivers/staging/clocking-wizard/Kconfig | 2 +- + drivers/staging/comedi/comedi_fops.c | 2 +- + drivers/staging/comedi/comedidev.h | 4 +- + drivers/staging/comedi/drivers.c | 26 +-- + drivers/staging/comedi/drivers/amplc_dio200.h | 6 +- + .../staging/comedi/drivers/amplc_dio200_common.c | 2 +- + drivers/staging/comedi/drivers/amplc_pci230.c | 12 +- + drivers/staging/comedi/drivers/cb_pcimdda.c | 4 +- + drivers/staging/comedi/drivers/daqboard2000.c | 2 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 2 +- + drivers/staging/gdm724x/gdm_tty.c | 18 +- + drivers/staging/goldfish/goldfish_audio.c | 61 ++++-- + drivers/staging/mt7621-dts/gbpc1.dts | 12 +- + drivers/staging/mt7621-dts/mt7621.dtsi | 4 +- + drivers/staging/mt7621-pci/pci-mt7621.c | 67 ++++--- + drivers/staging/mt7621-spi/spi-mt7621.c | 206 ++++++++++++--------- + drivers/staging/pi433/pi433_if.c | 7 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 2 - + .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 134 +++++--------- + drivers/staging/rtl8192u/r8192U_core.c | 7 +- + drivers/staging/rtl8192u/r8192U_dm.c | 3 +- + drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 5 +- + drivers/staging/rtlwifi/phydm/phydm.c | 2 +- + drivers/staging/rtlwifi/rtl8822be/fw.c | 2 +- + drivers/staging/rtlwifi/rtl8822be/sw.c | 2 +- + drivers/staging/rts5208/rtsx.c | 38 ++-- + drivers/staging/speakup/spk_types.h | 2 + + drivers/staging/speakup/synth.c | 40 ++-- + drivers/staging/vboxvideo/TODO | 1 - + drivers/staging/vboxvideo/vbox_drv.c | 34 +++- + drivers/staging/vboxvideo/vbox_drv.h | 2 +- + drivers/staging/vboxvideo/vbox_main.c | 2 +- + .../interface/vchiq_arm/vchiq_debugfs.c | 4 +- + drivers/staging/wilc1000/linux_wlan.c | 2 + + drivers/staging/wilc1000/wilc_wfi_netdevice.h | 9 +- + drivers/staging/wilc1000/wilc_wlan.c | 101 ++++------ + drivers/staging/wilc1000/wilc_wlan.h | 5 +- + 37 files changed, 409 insertions(+), 425 deletions(-) +Merging mux/for-next (6a3d4baac84a 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 (047e55436f89 Merge branch 'topic/ioat' into next) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. + crypto/async_tx/async_pq.c | 10 ++++++---- + crypto/async_tx/raid6test.c | 4 +++- + drivers/dma/ioat/dma.c | 6 ++++++ + 3 files changed, 15 insertions(+), 5 deletions(-) +Merging cgroup/for-next (d8742e229021 cgroup: css_set_lock should nest inside tasklist_lock) +$ git merge cgroup/for-next +Already up to date. +Merging scsi/for-next (4795364a4959 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Removing lib/percpu_ida.c +Auto-merging lib/Makefile +Removing include/linux/percpu_ida.h +Auto-merging drivers/xen/xen-scsiback.c +Removing drivers/scsi/scsi_typedefs.h +Merge made by the 'recursive' strategy. + drivers/ata/libata-core.c | 3 + + drivers/ata/libata.h | 2 - + drivers/scsi/3w-xxxx.c | 2 +- + drivers/scsi/advansys.c | 2 +- + drivers/scsi/aha152x.c | 71 +++--- + drivers/scsi/aha1740.c | 9 +- + drivers/scsi/aha1740.h | 4 +- + drivers/scsi/be2iscsi/be_cmds.c | 2 +- + drivers/scsi/be2iscsi/be_iscsi.c | 15 +- + drivers/scsi/be2iscsi/be_main.c | 23 +- + drivers/scsi/be2iscsi/be_mgmt.c | 23 +- + drivers/scsi/bnx2i/bnx2i_hwi.c | 2 + + drivers/scsi/gdth.c | 67 ++--- + drivers/scsi/gdth.h | 10 +- + drivers/scsi/gdth_proc.c | 2 +- + drivers/scsi/hisi_sas/hisi_sas.h | 10 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 214 ++++++++-------- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 3 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 3 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 16 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 2 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 2 +- + drivers/scsi/ipr.c | 25 ++ + drivers/scsi/ipr.h | 7 + + drivers/scsi/libiscsi_tcp.c | 2 +- + drivers/scsi/libsas/sas_ata.c | 47 ++-- + drivers/scsi/libsas/sas_discover.c | 2 + + drivers/scsi/megaraid.c | 29 +-- + drivers/scsi/megaraid.h | 14 +- + drivers/scsi/megaraid/megaraid_sas.h | 33 ++- + drivers/scsi/megaraid/megaraid_sas_base.c | 59 +++-- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 36 ++- + drivers/scsi/mpt3sas/mpt3sas_base.c | 67 +++-- + drivers/scsi/mpt3sas/mpt3sas_base.h | 7 +- + drivers/scsi/mpt3sas/mpt3sas_config.c | 7 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 38 ++- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 31 +-- + drivers/scsi/nsp32_debug.c | 2 +- + drivers/scsi/qla2xxx/qla_inline.h | 4 +- + drivers/scsi/qla2xxx/qla_target.c | 14 +- + drivers/scsi/scsi.h | 3 - + drivers/scsi/scsi_typedefs.h | 2 - + drivers/scsi/sg.c | 7 +- + drivers/scsi/ufs/ufs-qcom.c | 21 +- + drivers/scsi/ufs/ufshcd.c | 35 ++- + drivers/scsi/ufs/ufshcd.h | 3 + + drivers/target/iscsi/iscsi_target_util.c | 35 ++- + drivers/target/sbp/sbp_target.c | 7 +- + drivers/target/target_core_transport.c | 5 +- + drivers/target/target_core_user.c | 8 +- + drivers/target/tcm_fc/tfc_cmd.c | 10 +- + drivers/usb/gadget/function/f_tcm.c | 7 +- + drivers/vhost/scsi.c | 8 +- + drivers/xen/xen-scsiback.c | 9 +- + include/linux/libata.h | 2 + + include/linux/percpu_ida.h | 83 ------- + include/scsi/libsas.h | 2 +- + include/target/iscsi/iscsi_target_core.h | 1 + + include/target/target_core_base.h | 10 +- + lib/Makefile | 2 +- + lib/percpu_ida.c | 370 ---------------------------- + 61 files changed, 646 insertions(+), 895 deletions(-) + delete mode 100644 drivers/scsi/scsi_typedefs.h + delete mode 100644 include/linux/percpu_ida.h + delete mode 100644 lib/percpu_ida.c +Merging scsi-mkp/for-next (4ae5e9d159f8 scsi: smartpqi: bump driver version to 1.1.4-130) +$ git merge scsi-mkp/for-next +Merge made by the 'recursive' strategy. + drivers/scsi/mpt3sas/mpt3sas_base.c | 366 +++++++++--------------- + drivers/scsi/mpt3sas/mpt3sas_base.h | 23 +- + drivers/scsi/mpt3sas/mpt3sas_config.c | 74 ++--- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 357 +++++++++++++---------- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 428 ++++++++++------------------ + drivers/scsi/mpt3sas/mpt3sas_transport.c | 62 ++-- + drivers/scsi/mpt3sas/mpt3sas_trigger_diag.c | 18 +- + drivers/scsi/mpt3sas/mpt3sas_warpdrive.c | 3 - + drivers/scsi/smartpqi/smartpqi.h | 12 +- + drivers/scsi/smartpqi/smartpqi_init.c | 160 +++++++---- + 10 files changed, 672 insertions(+), 831 deletions(-) +Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker) +$ git merge target-updates/for-next +Already up to date. +Merging target-bva/for-next (60cc43fc8884 Linux 4.17-rc1) +$ git merge target-bva/for-next +Already up to date. +Merging libata/for-next (313c1b5a6bef Merge branch 'for-4.18-fixes' into for-next) +$ git merge libata/for-next +Auto-merging include/linux/libata.h +Merge made by the 'recursive' strategy. + drivers/ata/ahci_mvebu.c | 2 +- + drivers/ata/ahci_platform.c | 11 ++++-- + drivers/ata/libahci.c | 9 +++-- + drivers/ata/libahci_platform.c | 82 +++++++++++++++++++++++++++++++++--------- + drivers/ata/libata-eh.c | 41 +++++++++------------ + drivers/ata/sata_fsl.c | 9 +---- + include/linux/ahci_platform.h | 2 ++ + include/linux/libata.h | 23 ++++++++++++ + 8 files changed, 124 insertions(+), 55 deletions(-) +Merging vhost/linux-next (2eb98105f8c7 virtio: update the comments for transport features) +$ git merge vhost/linux-next +Already up to date. +Merging rpmsg/for-next (ce397d215ccd Linux 4.18-rc1) +$ git merge rpmsg/for-next +Already up to date. +Merging gpio/for-next (8968e4ced9b1 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/renesas,gpio-rcar.txt | 1 + + drivers/gpio/gpio-davinci.c | 70 +++++++++++++--------- + drivers/gpio/gpio-max732x.c | 12 ++++ + drivers/gpio/gpio-menz127.c | 4 +- + drivers/gpio/gpio-uniphier.c | 6 +- + drivers/gpio/gpiolib-of.c | 3 +- + drivers/gpio/gpiolib.c | 13 ++++ + include/linux/gpio/consumer.h | 7 +++ + include/linux/platform_data/gpio-davinci.h | 3 +- + 9 files changed, 86 insertions(+), 33 deletions(-) +Merging pinctrl/for-next (1fd2a5dce0dc Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pinctrl/qcom,pmic-gpio.txt | 6 ++-- + drivers/pinctrl/Kconfig | 8 ++--- + drivers/pinctrl/core.c | 1 - + drivers/pinctrl/pinctrl-mcp23s08.c | 2 +- + drivers/pinctrl/pinctrl-single.c | 36 +++++++++++----------- + drivers/pinctrl/pinmux.c | 1 - + 6 files changed, 27 insertions(+), 27 deletions(-) +Merging pinctrl-samsung/for-next (ce397d215ccd Linux 4.18-rc1) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (414c52b7899a pwm: stm32: Fix build warning with CONFIG_DMA_ENGINE disabled) +$ git merge pwm/for-next +Already up to date. +Merging userns/for-next (04035aa33a12 proc: Don't change mount options on remount failure.) +$ git merge userns/for-next +Auto-merging fs/proc/root.c +CONFLICT (content): Merge conflict in fs/proc/root.c +Auto-merging fs/proc/internal.h +CONFLICT (content): Merge conflict in fs/proc/internal.h +Auto-merging fs/proc/inode.c +CONFLICT (content): Merge conflict in fs/proc/inode.c +Auto-merging fs/proc/base.c +Resolved 'fs/proc/inode.c' using previous resolution. +Resolved 'fs/proc/internal.h' using previous resolution. +Resolved 'fs/proc/root.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c29edd5fc8ba] Merge remote-tracking branch 'userns/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/um/drivers/mconsole_kern.c | 4 ++-- + fs/proc/base.c | 36 +++++++++++++++++++++++++------- + fs/proc/root.c | 46 +++++++++++++---------------------------- + include/linux/pid_namespace.h | 3 +-- + include/linux/proc_ns.h | 7 ++----- + kernel/pid.c | 8 ------- + kernel/pid_namespace.c | 7 ------- + kernel/sysctl_binary.c | 5 ++--- + 8 files changed, 50 insertions(+), 66 deletions(-) +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 (bfe80ed3d7c7 vsprintf: add command line option debug_boot_weak_hash) +$ git merge random/dev +Auto-merging lib/vsprintf.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 9 ++++++++ + drivers/char/random.c | 23 +++++++++++-------- + include/linux/random.h | 2 +- + lib/vsprintf.c | 30 ++++++++++++++++++++++++- + 4 files changed, 53 insertions(+), 11 deletions(-) +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 (eb83d5f7d07e selftests: sparc64: Add missing SPDX License Identifiers) +$ git merge kselftest/next +Merge made by the 'recursive' strategy. + .../selftests/pstore/pstore_post_reboot_tests | 5 ++++- + tools/testing/selftests/sparc64/Makefile | 20 ++++++++++++-------- + tools/testing/selftests/sparc64/drivers/Makefile | 2 +- + .../selftests/static_keys/test_static_keys.sh | 13 +++++++++++++ + tools/testing/selftests/sync/config | 4 ++++ + tools/testing/selftests/sysctl/sysctl.sh | 20 +++++++++++++------- + tools/testing/selftests/user/test_user_copy.sh | 7 +++++++ + tools/testing/selftests/vm/compaction_test.c | 4 +++- + tools/testing/selftests/vm/mlock2-tests.c | 12 +++++++----- + tools/testing/selftests/vm/run_vmtests | 5 ++++- + tools/testing/selftests/vm/userfaultfd.c | 4 +++- + tools/testing/selftests/zram/zram.sh | 5 ++++- + tools/testing/selftests/zram/zram_lib.sh | 5 ++++- + 13 files changed, 79 insertions(+), 27 deletions(-) + create mode 100644 tools/testing/selftests/sync/config +Merging y2038/y2038 (e264abeaf9da pstore: Remove bogus format string definition) +$ git merge y2038/y2038 +Already up to date. +Merging livepatching/for-next (d7ab8e67aa52 Merge branch 'for-4.18/upstream' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (dd2e68bb385e coresight: Handle errors in finding input/output ports) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-bus-coresight-devices-tmc | 8 + + .../devicetree/bindings/arm/coresight.txt | 5 +- + drivers/hwtracing/coresight/coresight-etb10.c | 12 +- + drivers/hwtracing/coresight/coresight-etm.h | 3 - + .../hwtracing/coresight/coresight-etm3x-sysfs.c | 43 +- + drivers/hwtracing/coresight/coresight-etm3x.c | 4 +- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 47 +- + drivers/hwtracing/coresight/coresight-etm4x.c | 31 +- + drivers/hwtracing/coresight/coresight-etm4x.h | 3 - + drivers/hwtracing/coresight/coresight-priv.h | 10 +- + drivers/hwtracing/coresight/coresight-tmc-etf.c | 45 +- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 1011 ++++++++++++++++++-- + drivers/hwtracing/coresight/coresight-tmc.c | 83 +- + drivers/hwtracing/coresight/coresight-tmc.h | 110 ++- + drivers/hwtracing/coresight/coresight.c | 10 +- + include/linux/coresight.h | 22 - + 16 files changed, 1225 insertions(+), 222 deletions(-) +Merging rtc/rtc-next (3cd7de001fb4 rtc: rtc-bq4802: add error handling for devm_ioremap) +$ git merge rtc/rtc-next +Merge made by the 'recursive' strategy. + drivers/rtc/Kconfig | 12 - + drivers/rtc/rtc-bq4802.c | 4 + + drivers/rtc/rtc-ds1685.c | 590 --------------------------------------------- + drivers/rtc/rtc-stmp3xxx.c | 20 +- + 4 files changed, 20 insertions(+), 606 deletions(-) +Merging nvdimm/libnvdimm-for-next (d95363c95705 Merge branch 'for-4.18/dax-memory-failure' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Auto-merging mm/huge_memory.c +Auto-merging include/linux/mm.h +Auto-merging include/linux/dax.h +Auto-merging fs/dax.c +Auto-merging drivers/dax/device.c +Auto-merging arch/x86/kernel/cpu/mcheck/mce.c +Merge made by the 'recursive' strategy. + arch/x86/include/asm/set_memory.h | 42 +++++++++ + arch/x86/kernel/cpu/mcheck/mce-internal.h | 15 ---- + arch/x86/kernel/cpu/mcheck/mce.c | 38 +------- + arch/x86/mm/pat.c | 16 ++++ + drivers/dax/device.c | 97 ++++++++++++-------- + drivers/nvdimm/pmem.c | 26 ++++++ + drivers/nvdimm/pmem.h | 13 +++ + fs/dax.c | 92 ++++++++++++++++++- + include/linux/dax.h | 16 +++- + include/linux/huge_mm.h | 5 +- + include/linux/mm.h | 1 + + include/linux/set_memory.h | 14 +++ + mm/huge_memory.c | 4 +- + mm/madvise.c | 18 +++- + mm/memory-failure.c | 143 ++++++++++++++++++++++++++++-- + 15 files changed, 434 insertions(+), 106 deletions(-) +Merging at24/at24/for-next (ce397d215ccd Linux 4.18-rc1) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (b1ce023ae8a2 ntb_netdev: fix sleep time mismatch) +$ git merge ntb/ntb-next +Merge made by the 'recursive' strategy. + drivers/net/ntb_netdev.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging kspp/for-next/kspp (45888b40d2a6 rslib: Allocate decoder buffers to avoid VLAs) +$ 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 cisco/for-next (ce397d215ccd Linux 4.18-rc1) +$ git merge cisco/for-next +Already up to date. +Merging xarray/xarray (1886ca9f6ee4 Fix filemap_range_has_page conversion to XArray) +$ git merge xarray/xarray +Auto-merging mm/shmem.c +Auto-merging mm/madvise.c +Auto-merging mm/huge_memory.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging include/linux/fs.h +Auto-merging fs/inode.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/dax.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/compression.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging arch/powerpc/include/asm/book3s/64/pgtable.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .clang-format | 1 - + .mailmap | 7 + + Documentation/core-api/index.rst | 1 + + Documentation/core-api/xarray.rst | 395 ++++++ + MAINTAINERS | 17 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 4 +- + arch/powerpc/include/asm/nohash/64/pgtable.h | 4 +- + drivers/gpu/drm/i915/i915_gem.c | 17 +- + fs/btrfs/compression.c | 6 +- + fs/btrfs/extent_io.c | 12 +- + fs/buffer.c | 14 +- + fs/dax.c | 803 +++++------ + fs/ext4/inode.c | 2 +- + fs/f2fs/data.c | 6 +- + fs/f2fs/dir.c | 2 +- + fs/f2fs/f2fs.h | 2 +- + fs/f2fs/inline.c | 2 +- + fs/f2fs/node.c | 6 +- + fs/fs-writeback.c | 25 +- + fs/gfs2/aops.c | 2 +- + fs/inode.c | 2 +- + fs/nfs/blocklayout/blocklayout.c | 2 +- + fs/nilfs2/btnode.c | 26 +- + fs/nilfs2/page.c | 29 +- + fs/proc/task_mmu.c | 2 +- + include/linux/fs.h | 63 +- + include/linux/pagemap.h | 10 +- + include/linux/pagevec.h | 8 +- + include/linux/radix-tree.h | 136 +- + include/linux/swap.h | 22 +- + include/linux/swapops.h | 19 +- + include/linux/xarray.h | 1047 ++++++++++++++- + lib/Kconfig.debug | 3 + + lib/Makefile | 3 +- + lib/idr.c | 66 +- + lib/radix-tree.c | 575 ++------ + lib/test_xarray.c | 678 ++++++++++ + lib/xarray.c | 1753 +++++++++++++++++++++++++ + mm/filemap.c | 724 +++++----- + mm/huge_memory.c | 17 +- + mm/khugepaged.c | 177 +-- + mm/madvise.c | 2 +- + mm/memcontrol.c | 2 +- + mm/memfd.c | 105 +- + mm/migrate.c | 48 +- + mm/mincore.c | 2 +- + mm/page-writeback.c | 72 +- + mm/readahead.c | 10 +- + mm/shmem.c | 201 ++- + mm/swap.c | 6 +- + mm/swap_state.c | 119 +- + mm/truncate.c | 27 +- + mm/vmscan.c | 10 +- + mm/workingset.c | 69 +- + tools/include/asm-generic/bitops.h | 1 + + tools/include/asm-generic/bitops/atomic.h | 9 - + tools/include/asm-generic/bitops/non-atomic.h | 109 ++ + tools/include/linux/bitmap.h | 1 + + tools/include/linux/kernel.h | 1 + + tools/include/linux/spinlock.h | 12 +- + tools/testing/radix-tree/.gitignore | 1 + + tools/testing/radix-tree/Makefile | 16 +- + tools/testing/radix-tree/benchmark.c | 91 -- + tools/testing/radix-tree/bitmap.c | 23 + + tools/testing/radix-tree/idr-test.c | 6 +- + tools/testing/radix-tree/linux/bug.h | 1 + + tools/testing/radix-tree/linux/kconfig.h | 1 + + tools/testing/radix-tree/linux/kernel.h | 5 + + tools/testing/radix-tree/linux/lockdep.h | 11 + + tools/testing/radix-tree/linux/radix-tree.h | 1 - + tools/testing/radix-tree/linux/rcupdate.h | 2 + + tools/testing/radix-tree/linux/xarray.h | 2 + + tools/testing/radix-tree/main.c | 21 +- + tools/testing/radix-tree/multiorder.c | 272 +--- + tools/testing/radix-tree/regression1.c | 58 +- + tools/testing/radix-tree/regression3.c | 23 - + tools/testing/radix-tree/tag_check.c | 29 - + tools/testing/radix-tree/test.c | 8 +- + tools/testing/radix-tree/test.h | 1 + + tools/testing/radix-tree/xarray.c | 35 + + 80 files changed, 5433 insertions(+), 2670 deletions(-) + create mode 100644 Documentation/core-api/xarray.rst + create mode 100644 lib/test_xarray.c + create mode 100644 lib/xarray.c + create mode 100644 tools/include/asm-generic/bitops/non-atomic.h + create mode 100644 tools/testing/radix-tree/bitmap.c + create mode 100644 tools/testing/radix-tree/linux/kconfig.h + create mode 100644 tools/testing/radix-tree/linux/lockdep.h + create mode 100644 tools/testing/radix-tree/linux/xarray.h + create mode 100644 tools/testing/radix-tree/xarray.c +$ git am -3 ../patches/0001-filesystem-dax-fixups-for-xaarray-changes.patch +Applying: filesystem-dax: fixups for xaarray changes +$ git reset HEAD^ +Unstaged changes after reset: +M fs/dax.c +$ git add -A . +$ git commit -v -a --amend +[master 1aa90eab1a14] Merge remote-tracking branch 'xarray/xarray' + Date: Fri Jun 22 13:42:06 2018 +1000 +Merging fsi/master (6b293258cded fsi: scom: Major overhaul) +$ git merge fsi/master +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 1 + + arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 1 + + arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 1 + + drivers/fsi/Kconfig | 7 + + drivers/fsi/Makefile | 1 + + drivers/fsi/fsi-core.c | 23 +- + drivers/fsi/fsi-master-gpio.c | 349 ++++++-- + drivers/fsi/fsi-master-hub.c | 5 +- + drivers/fsi/fsi-sbefifo.c | 1006 ++++++++++++++++++++++ + drivers/fsi/fsi-scom.c | 441 +++++++++- + include/linux/fsi-sbefifo.h | 33 + + include/trace/events/fsi_master_gpio.h | 43 + + include/uapi/linux/fsi.h | 58 ++ + 13 files changed, 1849 insertions(+), 120 deletions(-) + create mode 100644 drivers/fsi/fsi-sbefifo.c + create mode 100644 include/linux/fsi-sbefifo.h + create mode 100644 include/uapi/linux/fsi.h +Merging akpm-current/current (43b4ee660206 bfs: add sanity check at bfs_fill_super()) +$ git merge --no-ff akpm-current/current +Auto-merging security/selinux/hooks.c +Auto-merging security/apparmor/lsm.c +Auto-merging mm/swapfile.c +Auto-merging mm/swap_state.c +Auto-merging mm/page_owner.c +Auto-merging mm/page_alloc.c +Auto-merging mm/oom_kill.c +Auto-merging mm/mincore.c +Auto-merging mm/memcontrol.c +CONFLICT (modify/delete): lib/percpu_ida.c deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of lib/percpu_ida.c left in tree. +Auto-merging kernel/sys.c +Auto-merging kernel/fork.c +Auto-merging kernel/cgroup/cgroup.c +CONFLICT (content): Merge conflict in kernel/cgroup/cgroup.c +Auto-merging include/uapi/linux/prctl.h +Auto-merging include/linux/swap.h +Auto-merging include/linux/memcontrol.h +Auto-merging include/linux/fs.h +Auto-merging fs/ocfs2/file.c +Auto-merging fs/ocfs2/dlmglue.c +Auto-merging fs/namei.c +Auto-merging fs/bfs/inode.c +Resolved 'kernel/cgroup/cgroup.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f lib/percpu_ida.c +lib/percpu_ida.c: needs merge +rm 'lib/percpu_ida.c' +$ git commit -v -a +[master e4233b6889f5] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-bdi | 8 + + Documentation/admin-guide/cgroup-v2.rst | 74 ++++++++ + Documentation/sysctl/fs.txt | 36 ++++ + Documentation/vm/hmm.rst | 1 - + arch/arm/include/asm/page.h | 2 + + block/genhd.c | 2 +- + fs/bfs/inode.c | 9 +- + fs/dcache.c | 3 +- + fs/exec.c | 1 + + fs/namei.c | 53 +++++- + fs/ocfs2/buffer_head_io.c | 77 ++++++-- + fs/ocfs2/dir.c | 3 +- + fs/ocfs2/dlmglue.c | 2 +- + fs/ocfs2/file.c | 4 +- + fs/ocfs2/journal.c | 51 +++-- + fs/ocfs2/stackglue.c | 6 - + fs/ocfs2/stackglue.h | 3 - + include/linux/cgroup-defs.h | 5 + + include/linux/fs.h | 2 + + include/linux/hmm.h | 4 +- + include/linux/memblock.h | 16 -- + include/linux/memcontrol.h | 34 ++++ + include/linux/memremap.h | 1 + + include/linux/oom.h | 12 +- + include/linux/sched/signal.h | 3 + + include/linux/swap.h | 13 +- + include/uapi/linux/prctl.h | 4 + + kernel/cgroup/cgroup.c | 21 ++- + kernel/cred.c | 1 + + kernel/exit.c | 4 + + kernel/fork.c | 2 + + kernel/memremap.c | 39 +++- + kernel/sys.c | 11 ++ + kernel/sysctl.c | 18 ++ + mm/backing-dev.c | 35 ++++ + mm/hmm.c | 297 +++++------------------------- + mm/list_lru.c | 7 + + mm/memcontrol.c | 279 +++++++++++++++++++++++++++- + mm/memory.c | 4 +- + mm/mincore.c | 12 +- + mm/oom_kill.c | 210 ++++++++++++++------- + mm/page_alloc.c | 33 +++- + mm/page_owner.c | 4 +- + mm/sparse-vmemmap.c | 1 - + mm/sparse.c | 29 ++- + mm/swap_state.c | 16 +- + mm/swapfile.c | 156 ++++++++++++---- + scripts/checkpatch.pl | 30 ++- + security/apparmor/lsm.c | 1 + + security/selinux/hooks.c | 1 + + 50 files changed, 1152 insertions(+), 488 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: 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 + + ab1dc45f84a5...5b74b0059845 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (5b74b0059845 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 +- + include/linux/ioport.h | 3 ++ + kernel/kexec_file.c | 2 + + kernel/resource.c | 63 ++++++++++++++++++++++++++++ + 5 files changed, 83 insertions(+), 15 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..68999a69ea47 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing dmi based on 4.17 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..c7a0c2eed75b --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20180622 |