diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-06-28 16:18:39 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-06-28 16:18:39 +1000 |
| commit | 4379975bae049fface22d7806870a64fe67d7d3c (patch) | |
| tree | b72153ff710ca0180bc2772318612d97c83c08f5 | |
| parent | 3d6ef111007396288affd9eec1644d12bcf9f02b (diff) | |
| download | linux-next-4379975bae049fface22d7806870a64fe67d7d3c.tar.gz | |
Add linux-next specific files for 20180628next-20180628
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 282 | ||||
| -rw-r--r-- | Next/Trees | 284 | ||||
| -rw-r--r-- | Next/merge.log | 4589 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 5158 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..27e58d59c95e --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,282 @@ +Name SHA1 +---- ---- +origin f57494321cbf5b1e7769b6135407d2995a369e28 +fixes 147a89bc71e7db40f011454a40add7ff2d10f8d8 +kbuild-current bcb3726a6034ba10eb9f31c2406d6fcf7a48afd6 +arc-current 6ddb19a32e7915f2b63b5658c39d80eaeb7a33b8 +arm-current 92d44a42af81e850a038c38278ff4f434b2871df +arm64-fixes 7838306f5ace5183086ad507c58f5988913690e4 +m68k-current b12c8a70643ffe2598c572cd206e4f68c524eb6f +powerpc-fixes 22db552b50fa11d8c1d171de908a1f9ef62172b7 +sparc 1aaccb5fa0eac996adde53538ca4b87a0b229ab7 +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net 2d2595719a97c876f35b1e60e5768e58753b268c +bpf dd349c3ffd93d15d01f4f5ace73870ca45ea249d +ipsec 7284fdf39a912322ce97de2d30def3c6068a418c +netfilter b36e4523d4d56e2595e28f16f6ccf1cd6a9fc452 +ipvs 312564269535892cc082bc80592150cd1f5e8ec3 +wireless-drivers 92963318a255fd5df94159767cd4750e55d98cb0 +mac80211 bf2b61a6838f19cbc33f6732715012c483fa3795 +rdma-fixes b697d7d8c741f27b728a878fc55852b06d0f6f5e +sound-current 4fb88a15f5ddd5801e99789e926dc8805e8f8ba0 +sound-asoc-fixes cf6c692c746cc64e58892be837b9faa1539360d7 +regmap-fixes 7daf201d7fe8334e2d2364d4e8ed3394ec9af819 +regulator-fixes bd4929a3ac1e55a8edd9f993df5e1a829461cf3c +spi-fixes 58c2ec73d53514db77a36823ac307e67c5fdd39e +pci-current 925d31668d5b6c9849c50167f31f9b5cf9eec892 +driver-core.current 7daf201d7fe8334e2d2364d4e8ed3394ec9af819 +tty.current ce397d215ccd07b8ae3f71db689aedb85d56ab40 +usb.current 90f26cc6bb90b35040f4da0347f480ea9df6e2fc +usb-gadget-fixes 1d8e5c00275825fc42aaa5597dab1d0b5b26bb64 +usb-serial-fixes 24160628a34af962ac99f2f58e547ac3c4cbd26f +usb-chipidea-fixes 90f26cc6bb90b35040f4da0347f480ea9df6e2fc +phy ce397d215ccd07b8ae3f71db689aedb85d56ab40 +staging.current ebc2dc5f9b231c1b64047c6717cd464104f086f4 +char-misc.current 7daf201d7fe8334e2d2364d4e8ed3394ec9af819 +input-current 03ae3a9caf4a59edd32b65c89c375a98ce3ea1ef +crypto-current 837bf7cc3b7504385ae0e829c72e470dfc27cf6c +ide 1aaccb5fa0eac996adde53538ca4b87a0b229ab7 +vfio-fixes 7733e05b34f5d855c5590d816b41ddfee972d188 +kselftest-fixes ce397d215ccd07b8ae3f71db689aedb85d56ab40 +modules-fixes be71eda5383faa663efdba9ef54a6b8255e3c7f0 +slave-dma-fixes 356073bcf6dbcc15cd8fb22d10cf8f35f4525271 +backlight-fixes 8ff5cbc6e3c5c2855245c014f3ba572ddfc5ab0f +mtd-fixes 3f6e6986045d47f87bd982910821b7ab9758487e +nand-fixes ee02f73e04c0e690600f621a3a1d2245834af7fe +spi-nor-fixes 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +mfd-fixes 11799564fc7eedff50801950090773928f867996 +v4l-dvb-fixes 0ca54b29054151b7a52cbb8904732280afe5a302 +reset-fixes e6914365fd280fce303a89b8a8d4529af5a2e0f9 +mips-fixes 662d855c66c0a7400f9117b6ac02047942cd1d22 +omap-fixes 41bd6adf3c5d3990d7a67639aff53d54483744fa +kvm-fixes 2ddc649810133fcf8e5282eea898ee7ececf161e +kvms390-fixes f4a551b72358facbbe5714248dff78404272feee +hwmon-fixes 7daf201d7fe8334e2d2364d4e8ed3394ec9af819 +nvdimm-fixes 75bc37fefc4471e718ba8e651aa74673d4e0a9eb +btrfs-fixes 03a4f726ad37052cfa42d541cdc2259ad1f4cdfc +vfs-fixes b1b94fcbd39936d4e544792fb6fd13e6a5b2efc0 +dma-mapping-fixes cf65a0f6f6ff7631ba0ac0513a14ca5b65320d80 +drivers-x86-fixes ce397d215ccd07b8ae3f71db689aedb85d56ab40 +samsung-krzk-fixes ce397d215ccd07b8ae3f71db689aedb85d56ab40 +pinctrl-samsung-fixes ce397d215ccd07b8ae3f71db689aedb85d56ab40 +devicetree-fixes a47c9b3943164453d4f580ea174a6ddcb37554c3 +scsi-fixes 26b5b874aff5659a7e26e5b1997e3df2c41fa7fd +drm-fixes f3294568bbb19cbfc53451de192df6daae80f9b3 +drm-intel-fixes 7daf201d7fe8334e2d2364d4e8ed3394ec9af819 +mmc-fixes ce397d215ccd07b8ae3f71db689aedb85d56ab40 +rtc-fixes ca95ef7c98674a8eb5d411fc0835783051c0662b +drm-misc-fixes 01a9e9493fb3f65c07077d59cf8ba8b6d2e0463e +kbuild 6ab0a18be8905b04d96b080c959f1472705d6b24 +leaks 9f84a0f7f1a613335a9aaf0abd5858906752bf93 +uuid c0020756315eebec58310aca42cf9fb73e1322eb +dma-mapping 2550bbfd495227945e17ed1fa1c05bce4753b86b +asm-generic a71e7c44ffb7baea0c0795824afc34cc0bc1a301 +arc 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +arm 0ac000e86703dedea1000513dbb8a64d02930668 +arm-perf ce397d215ccd07b8ae3f71db689aedb85d56ab40 +arm-soc 366cd9cde1d73ce5289b54d320a0bef930b81206 +actions 35afadd11222dcec0f3c6b25be89195ccc582116 +alpine 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +amlogic e3a900fa843e8e0a92b2452a8eb05fbaefbfd652 +aspeed 6534b2d0de3693b8508375c2f01951d6eb5c69be +at91 59ef2671a84732c96cb08a5060b7fcceaa44f4d9 +bcm2835 5997adb149859fffd1c2fe9a583471e02548a6d8 +imx-mxs 9a403db14975b1610abad0a53488ffdca6d88b4a +keystone 6511bb383f45b6d7f38503d703a1287fbf11d0b6 +mediatek 9378b342734132ddf6d95ed035e1124eacf762a1 +mvebu f5b691b04382afec9ec6b9cfca4d5b104ea386c6 +omap 1b7e42c1dfe837642cfcc426776a3f98c6fb2d3e +reset d7bab65b1f57cdf2d81fc469cea6b2160a50e917 +qcom 38b0d99412273bff89e8af74e95c9983f49aad38 +realtek 2b6286eb7ab8b9a22f7238bdaad403badd4a93e9 +renesas 5da09acf28808a829707be39e965a65b231b4afa +rockchip b12b0bd0db32d7f4884f54a34e5330a44cb5e0ce +samsung bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +samsung-krzk 29de814e31dd35987f5176664c330307304f3f34 +sunxi 25363671c0b71275a88407e8bd981db198624eca +tegra 6de9ae597a799a1f753385a08ef0d48c6c683917 +arm64 0fe42512b2f03f9e5a20b9f55ef1013a68b4cd48 +clk 003cfd706bb14c90e809eff02d6e2a5673c32889 +clk-samsung e8cf870f253bdeadd4ce8a10e34655ef89ad57b1 +c6x 85fa2cc51104ee5b529ce85b12f4c8421888544f +m68k b12c8a70643ffe2598c572cd206e4f68c524eb6f +m68knommu 7114171afb0756c00d37099abb7889fb0fe46b0e +microblaze 45df561a7ae2ca5080708cc2cf84a236f4d930ef +mips 829caee7e38273ef27d64207578d4653979c525e +nds32 a78945c357f58665d6a5da8a69e085898e831c70 +nios2 3d9644ef9a0f6c3ca0c1bd2aea1d82e7ea0a7f24 +openrisc 560b423dd9af4272a1f3685c2d6b073fdc4af7c7 +parisc-hd 8d40c754fbacc2432e53ab2b2a98b86beba251c0 +powerpc ff5bc793e47b537bf3e904fada585e102c54dd8b +fsl c095ff93f901c1620b28dce4d813dd548bc5236b +risc-v 7daf201d7fe8334e2d2364d4e8ed3394ec9af819 +s390 c879f71c746c655ae03e1b828296c461b77ac8b6 +sparc-next 1aaccb5fa0eac996adde53538ca4b87a0b229ab7 +sh ac21fc2dcb405cf250ad3f1228f64f64930d9211 +uml 5ec9121195a4f1cecd0fa592636c5f81eb03dc8c +xtensa ae6063c83634cbef7f73ec8a3ab7a6adf5294716 +fscrypt e1cc40e5d42acb1d99652babb17e6a5ee4247409 +befs 55d945e2e4aa148ef38bdfabb9569af78183a539 +btrfs 29dcea88779c856c7dc92040a0c01233263101d4 +btrfs-kdave 5ad83924179c12cb9fe39ed966059a10bde371d1 +ceph 8b8f53af1ed9df88a4c0fbfdf3db58f62060edf3 +cifs 06d1affe32864c3ff3b08255e72e2c0270fe9aed +configfs 707c62352909a9be2453ae073e160de59d2d4a1f +ecryptfs e86281e700cca8a773f9a572fa406adf2784ba5c +ext3 6aee47d7f61e576a4c8f39758b5c7e50fcb2b287 +ext4 0238a85e379f0edecaf13c60ae90c841ad66ae29 +f2fs f57494321cbf5b1e7769b6135407d2995a369e28 +fuse 44ce5c2e921fe267685195f760ebc65850b3c772 +jfs bd646104ac5a6bf8bdddaeaf4e441f5d439ded96 +nfs 7b0df92ac12148098391bf53f3494af17812f264 +nfs-anna ffbfa2ce88f169aa4b5cc90065cdc1c3c8003c27 +nfsd 8163496e78db100a6b5cfbdaece385686ae50129 +orangefs b1116bc03c00255b7e5feaed561e8bb2fc38c0f8 +overlayfs 46311f3ec53c10912f88c79ce81e16d49e3a47e4 +ubifs f5a926dd529870de4bd19199ce7b36985f130d70 +xfs d8cb5e42378918e00eda58792f3ab86dd1e7d214 +file-locks 1cf8e5de4055f85383405a21a0a7c3c4348bf2ed +vfs 6c06e521993d05761e6eec43b6ba8b490ffd5d78 +vfs-miklos 0eb8af4916a540c362a2950e5ab54eca32eb7d58 +printk ce041c43f22298485122bab15c14d062383fbc67 +pci ce397d215ccd07b8ae3f71db689aedb85d56ab40 +pstore e698aaf37f9fac419ac6c1867137cce83c90c80b +hid 5686cd09f441d0dd9f83b57a6ce2ef86263cd917 +i2c 5a219b6a75831e5cfbcdf23928fae34af00c31c7 +dmi 7f73745fec52c402cac71e212d996545c20d2ef6 +hwmon-staging 24489aed183628643dab38886abb5c79db9da025 +jc_docs 37912da4387f24368f4c91c5fd9685d0bf3ea4dc +v4l-dvb f6f630327de95c251741c1f682a94243c48f2b13 +v4l-dvb-next f10379aad39e9da8bc7d1822e251b5f0673067ef +fbdev 85ebd164de56c5146e0f65cebee7fcc4babe52e3 +pm b1d2b5b3bc244e39de87df8b62f0612f87dad2ba +cpupower ce397d215ccd07b8ae3f71db689aedb85d56ab40 +idle 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f +opp c5c2a97b3ac7d1ec19e7cff9e38caca6afefc3de +thermal e9ed3ee61aa62ce280aadeeea1ec959f0c66a290 +thermal-soc 6d7c70d1cd6526dc79e3d3b3faae1c40c1681168 +ieee1394 188775181bc05f29372b305ef96485840e351fde +dlm da3627c30d229fea1e070e984366f80a1c4d9166 +swiotlb 4855c92dbb7b3b85c23e88ab7ca04f99b9677b41 +rdma 5e62d5ff1b9a6573d0d6b411893b1c17ccc21ce7 +net-next b1a5046b2497e39cea9eb585358f3749442fb3f7 +bpf-next a7f7547f5e2b90554b0f3d1604899a4f26dba92d +ipsec-next e4db5b61c572475bbbcf63e3c8a2606bfccf2c9d +mlx5-next b30408d7a38356e4d6b4f913686b25401fae386c +netfilter-next c37979958e0828e2b690fe1d545b9fe02b97a97c +nfc-next 1f008cfec5d529b30ca8da1a1f5fbbd457c10382 +ipvs-next e523452ac0e046d38fcfb7c16748ab8090bf98cd +wireless-drivers-next c3ae2103e06953b1521a96c3e6934136b835e027 +bluetooth 0ef8b4567d08a557b5226a4926ffd689ef0298ad +mac80211-next 8ba6731ad4c7e9f612b2f7dae1b5ed6bfc884b67 +gfs2 ffc84e55cbf5cbee9df04e8a50e3aebc874ef683 +mtd 02361bc7788852f33dd0a05235a52b9ccf097916 +nand 11e9e7667e9862d2e506b06bc829236f924d48fb +spi-nor 9882b5375df532acb2c2399a90d882461112e612 +crypto 38641b83ebc54635151810eeef00b61da3097952 +drm 3c8daa7db46dd50c95778b4fbca5c7da6edaac9b +drm-panel e4bac408b08437d190785ab1250cc676304ed171 +drm-intel 3160422251b214c7a7a8ef91bb76da012bb44b57 +drm-tegra 6134534ca24f42043cacdd7108026803577f6c59 +drm-misc 57e23de02f4878061818fd118129a6b0e1516b11 +drm-msm 4dd454c371fdc85c91cdf6625d5e0e16f57f8d1a +hdlcd f73e8b82531573a198a4d0e5bff0d3256cbbd1d8 +mali-dp 6e810eb508f4b937bc2a718bd4e5cd74cca55500 +sunxi-drm 7dafb83edd3271917458de0ae70586ac63098e2f +imx-drm 518665524272e4e993e9579bd8c4aba9d8bc7343 +etnaviv f6ffbd4fc1a1caafe2ab840993b917fba5324598 +kconfig bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +regmap 7daf201d7fe8334e2d2364d4e8ed3394ec9af819 +sound c288248f5b26cd5563112fcdc077bf44964a942d +sound-asoc 665a698c2b73453a99cfebad6e3433b2330cbd53 +modules 996302c5e85650722f1e5aeaeaaac12f9f362bf8 +input 3a658f23fb689107d9dd4801f3042978723b0e8c +block 28313cee1d4f8b5f012677802e8cb6c5de21b490 +lightnvm 1c6286f26301ad154a1c10fb6e68925493dd28ba +device-mapper 4cd7e9d2455d493b0eaa300b3fca144c453de78b +pcmcia c3a5307873d4a47efd4373f4a50f450a17b5d9c1 +mmc ce397d215ccd07b8ae3f71db689aedb85d56ab40 +kgdb 2cf2f0d5b91fd1b06a6ae260462fc7945ea84add +md bfc9dfdcb6e9493de5d4fe0d3ed3ce57672f8d07 +mfd 556c242045f0c1613aac2e64dc5b2ff0e4bc89e1 +backlight 980d7812fdb483ba055c842d566aa08e76bf795a +battery ce397d215ccd07b8ae3f71db689aedb85d56ab40 +regulator aca94d6bb60c48f18eeef090fd25c7a1de07a6be +security 12aaa9cfc57847f0dfcaf106309042d43a01f89c +apparmor 338d0be437ef10e247a35aed83dbab182cf406a2 +integrity b5c90a7526fe39164c2204f0404ce8f8ff21e522 +keys 1e684d3820d8f72d877c0adb521ae17c6fc9bc88 +selinux 67b0b4e4988f296ecc69fc8d09a2ce2741653ee0 +tpmdd e9234540d1fe8f7519bb1547e0246fe60ece29e5 +watchdog 16a7eec2fcd020c73cf0ca38bf774775167d22eb +iommu 1f568357117cafb48aafb10413cbd1567dc015b1 +dwmw2-iommu d8a5b80568a9cb66810e75b182018e9edb68e8ff +vfio c1abca96b252a9627f99f39215b84e5de92bf1e3 +trivial 75a24b822d383489badd343cab4cb171d09f93ef +audit f7859590d97614815b35a755c8213dfb8f2766bd +devicetree f1f517b8f555e48127ea3fa2e1df73f7020c6eba +mailbox f83d1cfc8bcddf93bb6f55940fd59f5b047863e5 +spi e1e4cb274b8d265a141928c64e341d684dc283c0 +tip 72d1fd086cbfdd279643b4dd2bffccfd2a74d9e3 +clockevents 6bd9549d8a7dd06087a06fa7a6df651b02d6f21e +edac 345fb0a9a6340ba0b3b714d62f877fde88c8a755 +edac-amd 6c974d4dfafe5e9ee754f2a6fba0eb1864f1649e +irqchip 6a88c221acbaaa0460d190f99093ab8114f23c09 +ftrace a9235b544a0ae95fbd56443bdbd251358c7df4c5 +rcu bd917f682b457d326fba6931f5370142861abcd1 +kvm ce397d215ccd07b8ae3f71db689aedb85d56ab40 +kvm-arm e25028c8ded011d19f9a11164807507c94febc01 +kvm-mips dc44abd6aad22411f7f9890e39fd4753dabf0d03 +kvm-ppc ce397d215ccd07b8ae3f71db689aedb85d56ab40 +kvms390 2c8180e885c1b2844a24dcaf4a675972b8ce8edc +xen-tip eef04c7b3786ff0c9cb1019278b6c6c2ea0ad4ff +percpu b3a5d111994450909158929560906f2c1c6c1d85 +workqueues 66448bc274cadedb71fda7d914e7c29d8dead217 +drivers-x86 f193f7985f48a40885ce2e270c4cea9697650cc1 +chrome-platform c474e9f2be9992861d926eea3e5d4fb393cd6e2a +hsi ce397d215ccd07b8ae3f71db689aedb85d56ab40 +leds dfa32216711f1e4e1e0da0b84f34d9b4a945f1e5 +ipmi 46f2277e45feb2b2b22016b465f279a9b67270c0 +driver-core 7daf201d7fe8334e2d2364d4e8ed3394ec9af819 +usb dc748b66dbfbbfa187044f007d42d9cc01e5ab11 +usb-gadget 47265c067c0d129f3a0e94bc221293a780af9d78 +usb-serial 1d1de580a3e0b1cfacd63b4093573d8f327b0a1a +usb-chipidea-next ba0ab35a81de1da15e1691142834eefd34e34a0e +phy-next ce397d215ccd07b8ae3f71db689aedb85d56ab40 +tty ce397d215ccd07b8ae3f71db689aedb85d56ab40 +char-misc 7daf201d7fe8334e2d2364d4e8ed3394ec9af819 +extcon 441492c2256cc3d7c1d666c30c812e9a8382f165 +staging 71e9bd3ff847afae91b9f66f9217921e98c25b0b +mux 6a3d4baac84a624d7f4ae602254d022fea1eb5f2 +slave-dma f8ccde4a31d304519fd0c22a0581678a18dcc885 +cgroup d8742e22902186e30c346b1ba881cb52942ae3e4 +scsi dc047dc7c64f9330a01a1264af41dadb4f2b1fa4 +scsi-mkp 0c218e16a8501cfda30f498217b434976cb62fc5 +target-updates 1c130ae00b769a2e2df41bad3d6051ee8234b636 +target-bva 60cc43fc888428bb2f18f08997432d426a243338 +libata 313c1b5a6bef940b132282665e9a802a298ce719 +vhost 2eb98105f8c7f4b867f7f714a998f5b8c1bb009b +rpmsg b039e1ccb07f68d2a6dbe625e80391bb0cd24e55 +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 7daf201d7fe8334e2d2364d4e8ed3394ec9af819 +at24 ce397d215ccd07b8ae3f71db689aedb85d56ab40 +ntb b1ce023ae8a2137ac8a1413791ddf86e1b2675a7 +kspp fcd21109bba15d6c68b07dd914dee3a3ac1b6132 +init_task e1e871aff3ded26348c631b1370e257d401cd22d +cisco ce397d215ccd07b8ae3f71db689aedb85d56ab40 +xarray 1886ca9f6ee4c9146ca3cd41833568edd9067089 +fsi 6b293258cded9c8ee44cce4081d9170d6d1b5f5d +akpm-current 43b4ee660206f034cad3e79e7477f8a8db724920 +akpm d3d095fd03af98ceb236e8e9f4bd36a90f64590d diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..17f69ab99fb1 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,284 @@ +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-fixes git git://git.freedesktop.org/git/drm/drm.git#drm-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..a61d198023e6 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4589 @@ +$ date -R +Thu, 28 Jun 2018 07:48:59 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 813835028e9a Merge branch 'fixes-v4.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security +Merging origin/master (f57494321cbf Merge tag 'xfs-4.18-fixes-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge origin/master +Updating 813835028e9a..f57494321cbf +Fast-forward + .../bindings/input/sprd,sc27xx-vibra.txt | 23 ++ + MAINTAINERS | 16 +- + arch/arm/boot/dts/armada-385-synology-ds116.dts | 2 +- + arch/arm/boot/dts/bcm-cygnus.dtsi | 24 +- + arch/arm/boot/dts/bcm-hr2.dtsi | 24 +- + arch/arm/boot/dts/bcm-nsp.dtsi | 32 +- + arch/arm/boot/dts/bcm5301x.dtsi | 2 +- + arch/arm/boot/dts/imx6q.dtsi | 2 +- + arch/arm/boot/dts/imx6sx.dtsi | 2 +- + arch/arm/boot/dts/socfpga.dtsi | 4 +- + arch/arm/boot/dts/socfpga_arria10.dtsi | 5 +- + arch/arm/common/Makefile | 2 +- + arch/arm/configs/multi_v7_defconfig | 378 +++++++++------------ + arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 6 +- + arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 8 +- + .../boot/dts/broadcom/stingray/bcm958742k.dts | 4 + + .../boot/dts/broadcom/stingray/bcm958742t.dts | 4 + + .../arm64/boot/dts/broadcom/stingray/stingray.dtsi | 4 +- + arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 2 +- + arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 2 +- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 4 +- + .../boot/dts/socionext/uniphier-ld11-global.dts | 2 +- + .../boot/dts/socionext/uniphier-ld20-global.dts | 2 +- + arch/arm64/configs/defconfig | 102 +++--- + 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 - + arch/mips/kernel/signal.c | 4 +- + certs/blacklist.h | 2 +- + drivers/input/input-mt.c | 12 +- + drivers/input/joystick/xpad.c | 2 +- + 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/mouse/elan_i2c.h | 2 + + drivers/input/mouse/elan_i2c_core.c | 3 +- + drivers/input/mouse/elan_i2c_smbus.c | 10 +- + drivers/input/mouse/elantech.c | 11 +- + drivers/input/mouse/psmouse-base.c | 12 +- + 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 + + drivers/scsi/ipr.c | 2 - + drivers/scsi/qla2xxx/qla_target.c | 7 +- + drivers/scsi/scsi_debug.c | 2 +- + drivers/soc/imx/gpcv2.c | 13 +- + drivers/soc/qcom/Kconfig | 3 +- + drivers/soc/renesas/rcar-sysc.c | 35 +- + drivers/target/target_core_user.c | 44 ++- + fs/xfs/libxfs/xfs_ag_resv.c | 31 +- + fs/xfs/libxfs/xfs_bmap.c | 26 ++ + fs/xfs/libxfs/xfs_bmap.h | 2 + + fs/xfs/libxfs/xfs_format.h | 5 + + fs/xfs/libxfs/xfs_inode_buf.c | 76 +++-- + fs/xfs/libxfs/xfs_rtbitmap.c | 4 +- + fs/xfs/xfs_bmap_util.c | 106 +++--- + fs/xfs/xfs_fsmap.c | 4 +- + fs/xfs/xfs_fsops.c | 2 +- + fs/xfs/xfs_inode.c | 57 ++-- + fs/xfs/xfs_iomap.c | 15 +- + fs/xfs/xfs_trans.c | 7 +- + include/linux/input/mt.h | 2 +- + include/linux/rmi.h | 2 + + include/uapi/linux/target_core_user.h | 4 +- + scripts/checkpatch.pl | 6 - + security/keys/dh.c | 6 +- + 84 files changed, 948 insertions(+), 779 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/sprd,sc27xx-vibra.txt + delete mode 100644 arch/microblaze/kernel/heartbeat.c + delete mode 100644 arch/microblaze/kernel/platform.c + create mode 100644 drivers/input/misc/sc27xx-vibra.c +Merging fixes/master (147a89bc71e7 Merge tag 'kconfig-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) +$ git merge fixes/master +Already up to date. +Merging kbuild-current/fixes (bcb3726a6034 kbuild: reword help of LD_DEAD_CODE_DATA_ELIMINATION) +$ git merge kbuild-current/fixes +Auto-merging init/Kconfig +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/kbuild/kconfig-language.txt | 6 ++++++ + Makefile | 25 +++++++++++++++++++------ + arch/powerpc/kernel/pci_32.c | 4 ---- + arch/powerpc/kernel/pci_64.c | 4 ---- + arch/powerpc/kernel/rtas.c | 4 ---- + arch/powerpc/kernel/signal_32.c | 8 -------- + arch/powerpc/kernel/signal_64.c | 4 ---- + arch/powerpc/kernel/syscalls.c | 4 ---- + arch/powerpc/mm/subpage-prot.c | 4 ---- + include/linux/compat.h | 8 +++++++- + include/linux/compiler-gcc.h | 25 +++++++++++++++++++++++++ + include/linux/compiler_types.h | 18 ++++++++++++++++++ + include/linux/syscalls.h | 4 ++++ + init/Kconfig | 7 +++---- + scripts/gcc-x86_64-has-stack-protector.sh | 2 +- + scripts/kconfig/expr.h | 3 +++ + scripts/kconfig/preprocess.c | 2 +- + scripts/kconfig/zconf.y | 8 ++++++-- + 18 files changed, 93 insertions(+), 47 deletions(-) +Merging arc-current/for-curr (6ddb19a32e79 ARC: Improve cmpxchg syscall implementation) +$ 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/kernel/process.c | 47 ++++++++++++++++++++++++++++++---------- + arch/arc/plat-hsdk/Kconfig | 1 + + 5 files changed, 39 insertions(+), 28 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 (7838306f5ace Merge branch 'perf/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux) +$ git merge arm64-fixes/for-next/fixes +Merge made by the 'recursive' strategy. + drivers/perf/xgene_pmu.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (22db552b50fa powerpc/powermac: Fix rtc read/write functions) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/book3s/32/pgalloc.h | 1 - + arch/powerpc/include/asm/nohash/32/pgalloc.h | 1 - + arch/powerpc/include/asm/systbl.h | 1 + + arch/powerpc/include/asm/unistd.h | 2 +- + arch/powerpc/include/uapi/asm/unistd.h | 1 + + arch/powerpc/platforms/powermac/time.c | 29 +++++++++++++++++++--------- + 6 files changed, 23 insertions(+), 12 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 (2d2595719a97 nfp: cast sizeof() to int when comparing with error code) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/netronome/nfp/bpf/main.c | 3 ++ + drivers/net/ethernet/netronome/nfp/flower/match.c | 14 ++++++ + .../net/ethernet/netronome/nfp/flower/offload.c | 11 +++++ + .../net/ethernet/netronome/nfp/nfpcore/nfp_nffw.c | 2 +- + drivers/net/usb/lan78xx.c | 37 ++++++++++++-- + drivers/net/usb/r8152.c | 3 +- + include/net/pkt_cls.h | 5 ++ + net/core/fib_rules.c | 8 ++++ + net/rds/connection.c | 11 ++++- + net/rds/loop.c | 56 ++++++++++++++++++++++ + net/rds/loop.h | 2 + + 11 files changed, 146 insertions(+), 6 deletions(-) +Merging bpf/master (dd349c3ffd93 selftests: bpf: notification about privilege required to run test_lwt_seg6local.sh testing script) +$ git merge bpf/master +Auto-merging drivers/net/ethernet/netronome/nfp/bpf/main.c +Merge made by the 'recursive' strategy. + drivers/media/rc/bpf-lirc.c | 14 +--- + drivers/net/ethernet/netronome/nfp/bpf/main.c | 6 +- + include/linux/bpf-cgroup.h | 26 ++++++ + include/linux/bpf.h | 8 ++ + include/linux/bpf_lirc.h | 5 +- + kernel/bpf/cgroup.c | 54 +++++++++++++ + kernel/bpf/sockmap.c | 18 +++++ + kernel/bpf/syscall.c | 99 +++++------------------ + tools/bpf/bpftool/prog.c | 12 ++- + tools/testing/selftests/bpf/config | 1 + + tools/testing/selftests/bpf/test_kmod.sh | 9 +++ + tools/testing/selftests/bpf/test_lirc_mode2.sh | 9 +++ + tools/testing/selftests/bpf/test_lwt_seg6local.sh | 9 +++ + tools/testing/selftests/bpf/test_sockmap.c | 6 -- + 14 files changed, 171 insertions(+), 105 deletions(-) +Merging ipsec/master (7284fdf39a91 esp6: fix memleak on error path in esp6_input) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/ipv6/esp6.c | 4 +++- + net/ipv6/ip6_vti.c | 11 ++++++----- + net/xfrm/xfrm_policy.c | 3 +++ + net/xfrm/xfrm_user.c | 18 +++++++++++------- + 4 files changed, 23 insertions(+), 13 deletions(-) +Merging netfilter/master (b36e4523d4d5 netfilter: nf_conncount: fix garbage collection confirm race) +$ 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_conncount.c | 52 +++++++++++++++++++++++++++++---- + net/netfilter/nf_conntrack_helper.c | 5 ++++ + net/netfilter/nf_log.c | 13 +++++++-- + net/netfilter/nfnetlink_queue.c | 3 ++ + 7 files changed, 69 insertions(+), 12 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 (92963318a255 mt7601u: remove warning when avg_rssi is zero) +$ git merge wireless-drivers/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 7 +++++++ + drivers/net/wireless/marvell/mwifiex/usb.c | 7 ++----- + drivers/net/wireless/mediatek/mt7601u/phy.c | 6 ++++-- + drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 3 +-- + drivers/net/wireless/realtek/rtlwifi/base.c | 17 ++++++++++------- + drivers/net/wireless/realtek/rtlwifi/base.h | 2 +- + drivers/net/wireless/realtek/rtlwifi/core.c | 2 +- + drivers/net/wireless/realtek/rtlwifi/pci.c | 2 +- + drivers/net/wireless/realtek/rtlwifi/ps.c | 4 ++-- + drivers/net/wireless/realtek/rtlwifi/usb.c | 2 +- + 11 files changed, 31 insertions(+), 23 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 (b697d7d8c741 IB/hfi1: Fix incorrect mixing of ERR_PTR and NULL return values) +$ git merge rdma-fixes/for-rc +Merge made by the 'recursive' strategy. + drivers/infiniband/core/uverbs_cmd.c | 28 +++++++++++++++++----------- + drivers/infiniband/hw/cxgb4/mem.c | 2 +- + drivers/infiniband/hw/hfi1/rc.c | 2 +- + drivers/infiniband/hw/hfi1/uc.c | 4 ++-- + drivers/infiniband/hw/hfi1/ud.c | 4 ++-- + drivers/infiniband/hw/hfi1/verbs_txreq.c | 4 ++-- + drivers/infiniband/hw/hfi1/verbs_txreq.h | 4 ++-- + 7 files changed, 27 insertions(+), 21 deletions(-) +Merging sound-current/for-linus (4fb88a15f5dd ALSA: hda - Handle pm failure during hotplug) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/core/seq/seq_clientmgr.c | 3 +- + sound/core/timer.c | 2 +- + 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 | 9 ++++-- + sound/pci/hda/patch_realtek.c | 20 +++++++++++-- + sound/pci/lx6464es/lx6464es.c | 1 + + 8 files changed, 55 insertions(+), 50 deletions(-) +Merging sound-asoc-fixes/for-linus (cf6c692c746c 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 +++++++ + sound/soc/soc-utils.c | 2 +- + 8 files changed, 64 insertions(+), 15 deletions(-) +Merging regmap-fixes/for-linus (7daf201d7fe8 Linux 4.18-rc2) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (bd4929a3ac1e 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 (58c2ec73d535 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 (925d31668d5b PCI: controller: Move PCI_DOMAINS selection to arch Kconfig) +$ git merge pci-current/for-linus +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 8 +++++++- + arch/arm/mach-bcm/Kconfig | 1 + + arch/arm/mach-socfpga/Kconfig | 1 + + drivers/pci/Makefile | 6 +++--- + drivers/pci/controller/Kconfig | 3 --- + drivers/pci/hotplug/acpi_pcihp.c | 10 +++++++++- + 6 files changed, 21 insertions(+), 8 deletions(-) +Merging driver-core.current/driver-core-linus (7daf201d7fe8 Linux 4.18-rc2) +$ 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 (90f26cc6bb90 usb: chipidea: host: fix disconnection detect issue) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + Documentation/usb/gadget_configfs.txt | 2 +- + drivers/acpi/osl.c | 72 +++++++++++++++++++++++++++ + drivers/nfc/pn533/usb.c | 4 +- + drivers/staging/typec/Kconfig | 1 + + drivers/usb/chipidea/host.c | 5 +- + drivers/usb/class/cdc-acm.c | 3 ++ + 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 +++++++--- + drivers/usb/host/xhci-mem.c | 4 +- + drivers/usb/host/xhci-tegra.c | 6 +-- + drivers/usb/host/xhci-trace.h | 36 ++++++++++++-- + drivers/usb/host/xhci.c | 47 ++++++++++++++++-- + drivers/usb/host/xhci.h | 4 ++ + drivers/usb/typec/tcpm.c | 10 ++-- + drivers/usb/typec/ucsi/ucsi.c | 13 +++++ + drivers/usb/typec/ucsi/ucsi_acpi.c | 5 ++ + include/linux/acpi.h | 3 ++ + 27 files changed, 359 insertions(+), 66 deletions(-) +Merging usb-gadget-fixes/fixes (1d8e5c002758 dwc2: gadget: Fix ISOC IN DDMA PID bitfield value calculation) +$ git merge usb-gadget-fixes/fixes +Already up to date. +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 (90f26cc6bb90 usb: chipidea: host: fix disconnection detect issue) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Already up to date. +Merging phy/fixes (ce397d215ccd Linux 4.18-rc1) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (ebc2dc5f9b23 Merge tag 'iio-fixes-4.18a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/iio/accel/mma8452.c | 2 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 2 ++ + drivers/iio/light/tsl2772.c | 2 ++ + drivers/iio/pressure/bmp280-core.c | 5 ++--- + drivers/staging/android/ion/ion_heap.c | 2 +- + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 2 +- + include/linux/iio/buffer-dma.h | 2 +- + 7 files changed, 10 insertions(+), 7 deletions(-) +Merging char-misc.current/char-misc-linus (7daf201d7fe8 Linux 4.18-rc2) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging input-current/for-linus (03ae3a9caf4a Input: psmouse - fix button reporting for basic protocols) +$ git merge input-current/for-linus +Already up to date. +Merging crypto-current/master (837bf7cc3b75 hwrng: core - Always drop the RNG in hwrng_unregister()) +$ git merge crypto-current/master +Already up to date. +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 (7733e05b34f5 sample/mdev/mbochs: add mbochs_kunmap_dmabuf) +$ git merge vfio-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/vfio/pci/Kconfig | 12 ++++++++++-- + samples/vfio-mdev/mbochs.c | 15 ++++++--------- + 2 files changed, 16 insertions(+), 11 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 (3f6e6986045d mtd: rawnand: denali_dt: set clk_x_rate to 200 MHz unconditionally) +$ git merge mtd-fixes/master +Merge made by the 'recursive' strategy. + drivers/mtd/chips/cfi_cmdset_0002.c | 19 ++++++++------ + drivers/mtd/devices/mtd_dataflash.c | 4 +-- + drivers/mtd/nand/raw/denali_dt.c | 6 ++++- + drivers/mtd/nand/raw/mxc_nand.c | 5 +++- + drivers/mtd/nand/raw/nand_base.c | 2 +- + drivers/mtd/nand/raw/nand_macronix.c | 48 +++++++++++++++++++++++++++--------- + drivers/mtd/nand/raw/nand_micron.c | 2 ++ + 7 files changed, 61 insertions(+), 25 deletions(-) +Merging nand-fixes/nand/fixes (ee02f73e04c0 mtd: nand: atmel: Fix EDO mode check) +$ git merge nand-fixes/nand/fixes +Already up to date. +Merging spi-nor-fixes/spi-nor/fixes (7928b2cbe55b Linux 4.16-rc1) +$ git merge spi-nor-fixes/spi-nor/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (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 (0ca54b290541 media: rc: be less noisy when driver misbehaves) +$ git merge v4l-dvb-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/media/rc/rc-ir-raw.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +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 (662d855c66c0 MIPS: Add ksig argument to rseq_{signal_deliver,handle_notify_resume}) +$ git merge mips-fixes/mips-fixes +Already up to date. +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 (2ddc64981013 KVM: fix KVM_CAP_HYPERV_TLBFLUSH paragraph number) +$ 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 (7daf201d7fe8 Linux 4.18-rc2) +$ 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 (03a4f726ad37 Merge branch 'misc-4.18' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Already up to date! +Merge made by the 'recursive' strategy. +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 (a47c9b394316 dt-bindings: Fix unbalanced quotation marks) +$ git merge devicetree-fixes/dt/linus +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt | 2 +- + Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt | 2 +- + Documentation/devicetree/bindings/gpio/nintendo,hollywood-gpio.txt | 2 +- + Documentation/devicetree/bindings/input/touchscreen/hideep.txt | 2 +- + .../devicetree/bindings/interrupt-controller/nvidia,tegra20-ictlr.txt | 2 +- + .../devicetree/bindings/interrupt-controller/st,stm32-exti.txt | 2 +- + Documentation/devicetree/bindings/mips/brcm/soc.txt | 2 +- + Documentation/devicetree/bindings/net/fsl-fman.txt | 2 +- + Documentation/devicetree/bindings/power/power_domain.txt | 2 +- + Documentation/devicetree/bindings/regulator/tps65090.txt | 2 +- + Documentation/devicetree/bindings/reset/st,sti-softreset.txt | 2 +- + Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.txt | 2 +- + Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt | 2 +- + Documentation/devicetree/bindings/sound/qcom,apq8096.txt | 2 +- + Documentation/devicetree/bindings/w1/w1-gpio.txt | 2 +- + 15 files changed, 15 insertions(+), 15 deletions(-) +Merging scsi-fixes/fixes (26b5b874aff5 scsi: sg: mitigate read/write abuse) +$ git merge scsi-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/scsi/aacraid/aachba.c | 15 +++++++-------- + drivers/scsi/sg.c | 42 +++++++++++++++++++++++++++++++++++++++-- + drivers/target/target_core_pr.c | 15 ++++++++++----- + 3 files changed, 57 insertions(+), 15 deletions(-) +Merging drm-fixes/drm-fixes (f3294568bbb1 Merge tag 'drm-misc-fixes-2018-06-21' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes) +$ git merge drm-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (7daf201d7fe8 Linux 4.18-rc2) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +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 (01a9e9493fb3 drm/meson: Fix an un-handled error path in 'meson_drv_bind_master()') +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/meson/meson_drv.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) +Merging kbuild/for-next (6ab0a18be890 Merge branch 'fixes' into for-next) +$ git merge kbuild/for-next +Merge made by the 'recursive' strategy. + scripts/coccinelle/api/atomic_as_refcounter.cocci | 129 ++++++++++++++++++++++ + 1 file changed, 129 insertions(+) + create mode 100644 scripts/coccinelle/api/atomic_as_refcounter.cocci +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 (366cd9cde1d7 Merge branch 'fixes' into for-next) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 28 ++++++++++++++++++++++++++++ + 1 file changed, 28 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 (e3a900fa843e Merge branch 'v4.18/fixes' 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 (59ef2671a847 ARM: dts: fix PMC compatible) +$ git merge at91/at91-next +Removing Documentation/devicetree/bindings/arm/atmel-pmc.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/atmel-pmc.txt | 14 -------------- + Documentation/devicetree/bindings/clock/at91-clock.txt | 9 ++++----- + arch/arm/boot/dts/at91sam9261.dtsi | 2 +- + arch/arm/boot/dts/at91sam9263.dtsi | 2 +- + arch/arm/boot/dts/at91sam9rl.dtsi | 2 +- + arch/arm/boot/dts/sama5d4.dtsi | 2 +- + arch/arm/mach-at91/pm.c | 5 +++++ + 7 files changed, 13 insertions(+), 23 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/atmel-pmc.txt +Merging bcm2835/for-next (5997adb14985 Merge branch anholt/bcm2835-defconfig-64-next into for-next) +$ git merge bcm2835/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. + Documentation/hwmon/raspberrypi-hwmon | 22 ++++ + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts | 88 +++++++++++++++ + arch/arm/boot/dts/bcm2835-rpi-cm1.dtsi | 34 ++++++ + arch/arm/boot/dts/bcm2837.dtsi | 6 ++ + arch/arm/configs/bcm2835_defconfig | 2 +- + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm64/configs/defconfig | 1 + + drivers/firmware/raspberrypi.c | 19 ++++ + drivers/hwmon/Kconfig | 10 ++ + drivers/hwmon/Makefile | 1 + + drivers/hwmon/raspberrypi-hwmon.c | 166 +++++++++++++++++++++++++++++ + include/soc/bcm2835/raspberrypi-firmware.h | 1 + + 13 files changed, 351 insertions(+), 1 deletion(-) + create mode 100644 Documentation/hwmon/raspberrypi-hwmon + create mode 100644 arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts + create mode 100644 arch/arm/boot/dts/bcm2835-rpi-cm1.dtsi + create mode 100644 drivers/hwmon/raspberrypi-hwmon.c +Merging imx-mxs/for-next (9a403db14975 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm/boot/dts/Makefile +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/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/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 +- + 66 files changed, 2655 insertions(+), 953 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 (6511bb383f45 Merge branch 'for_4.19/drivers-soc' into next) +$ git merge keystone/next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/keystone-k2e-netcp.dtsi | 20 ++++ + arch/arm/boot/dts/keystone-k2g-evm.dts | 53 +++++++++++ + arch/arm/boot/dts/keystone-k2g-ice.dts | 59 ++++++++++++ + arch/arm/boot/dts/keystone-k2g-netcp.dtsi | 147 +++++++++++++++++++++++++++++ + arch/arm/boot/dts/keystone-k2g.dtsi | 13 +++ + arch/arm/boot/dts/keystone-k2hk-netcp.dtsi | 20 ++++ + arch/arm/boot/dts/keystone-k2l-netcp.dtsi | 20 ++++ + arch/arm/configs/keystone_defconfig | 2 + + drivers/memory/ti-emif-pm.c | 33 +++++++ + 9 files changed, 367 insertions(+) + create mode 100644 arch/arm/boot/dts/keystone-k2g-netcp.dtsi +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 (f5b691b04382 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/armada-388-helios4.dts | 313 ++++++++++++++++++++++ + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/mach-mvebu/platsmp.c | 49 ++-- + arch/arm/mach-mvebu/pmsu.c | 6 +- + arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 2 +- + include/linux/cpuhotplug.h | 1 + + 7 files changed, 343 insertions(+), 30 deletions(-) + create mode 100644 arch/arm/boot/dts/armada-388-helios4.dts +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 (38b0d9941227 arm64: dts: sdm845: Add rpmh-clk node) +$ git merge qcom/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/msm/qcom,llcc.txt | 26 + + .../devicetree/bindings/soc/qcom/rpmh-rsc.txt | 137 ++++ + arch/arm64/boot/dts/qcom/pm8005.dtsi | 33 + + arch/arm64/boot/dts/qcom/pm8998.dtsi | 55 ++ + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 45 ++ + arch/arm64/boot/dts/qcom/sdm845.dtsi | 763 +++++++++++++++++++++ + drivers/soc/qcom/Kconfig | 27 + + drivers/soc/qcom/Makefile | 6 + + drivers/soc/qcom/llcc-sdm845.c | 94 +++ + drivers/soc/qcom/llcc-slice.c | 335 +++++++++ + drivers/soc/qcom/rpmh-internal.h | 114 +++ + drivers/soc/qcom/rpmh-rsc.c | 695 +++++++++++++++++++ + drivers/soc/qcom/rpmh.c | 513 ++++++++++++++ + drivers/soc/qcom/smem.c | 10 +- + drivers/soc/qcom/trace-rpmh.h | 82 +++ + include/dt-bindings/soc/qcom,rpmh-rsc.h | 14 + + include/linux/soc/qcom/llcc-qcom.h | 180 +++++ + include/soc/qcom/rpmh.h | 51 ++ + include/soc/qcom/tcs.h | 56 ++ + 19 files changed, 3231 insertions(+), 5 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,llcc.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/rpmh-rsc.txt + create mode 100644 arch/arm64/boot/dts/qcom/pm8005.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm8998.dtsi + create mode 100644 drivers/soc/qcom/llcc-sdm845.c + create mode 100644 drivers/soc/qcom/llcc-slice.c + create mode 100644 drivers/soc/qcom/rpmh-internal.h + create mode 100644 drivers/soc/qcom/rpmh-rsc.c + create mode 100644 drivers/soc/qcom/rpmh.c + create mode 100644 drivers/soc/qcom/trace-rpmh.h + create mode 100644 include/dt-bindings/soc/qcom,rpmh-rsc.h + create mode 100644 include/linux/soc/qcom/llcc-qcom.h + create mode 100644 include/soc/qcom/rpmh.h + create mode 100644 include/soc/qcom/tcs.h +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 (5da09acf2880 Merge branches 'fixes-for-v4.18', 'arm-defconfig-for-v4.19', 'arm-soc-for-v4.19', 'arm-dt-for-v4.19', 'arm64-defconfig-for-v4.19', 'arm64-dt-for-v4.19' and 'dt-bindings-for-v4.19' into next) +$ git merge renesas/next +Auto-merging arch/arm64/configs/defconfig +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 | 133 +++++++-- + 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 | 64 ++-- + include/linux/soc/renesas/rcar-sysc.h | 13 +- + 106 files changed, 1275 insertions(+), 1171 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 (29de814e31dd Merge branch 'next/soc' 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 arch/arm/boot/dts/exynos5420-tmu-sensor-conf.dtsi +Removing arch/arm/boot/dts/exynos4412-tmu-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 | 18 +++++++++++++++- + arch/arm/boot/dts/exynos4.dtsi | 2 +- + arch/arm/boot/dts/exynos4210.dtsi | 13 +++++++++++ + arch/arm/boot/dts/exynos4412-tmu-sensor-conf.dtsi | 20 ----------------- + arch/arm/boot/dts/exynos4412.dtsi | 9 ++++++++ + arch/arm/boot/dts/exynos5250.dtsi | 25 +++++++++++++++++++++- + arch/arm/boot/dts/exynos5410.dtsi | 8 +++---- + arch/arm/boot/dts/exynos5420-cpus.dtsi | 6 ++++++ + arch/arm/boot/dts/exynos5420-tmu-sensor-conf.dtsi | 21 ------------------ + arch/arm/boot/dts/exynos5420.dtsi | 10 ++++----- + 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 +- + 18 files changed, 95 insertions(+), 131 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/insignal-boards.txt + delete mode 100644 arch/arm/boot/dts/exynos4412-tmu-sensor-conf.dtsi + delete mode 100644 arch/arm/boot/dts/exynos5420-tmu-sensor-conf.dtsi + 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 (5c5d30fd542e Merge branches 'sunxi/clk-for-4.19', 'sunxi/drivers-for-4.19', 'sunxi/dt-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/bus/sun50i-de2-bus.txt | 37 +++ + .../devicetree/bindings/clock/sun8i-de2.txt | 1 + + .../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/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts | 45 ++++ + arch/arm/boot/dts/sun8i-r40.dtsi | 269 +++++++++++++++++++ + arch/arm64/boot/dts/allwinner/Makefile | 2 + + .../dts/allwinner/sun50i-a64-amarula-relic.dts | 219 ++++++++++++++++ + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 4 + + .../boot/dts/allwinner/sun50i-a64-nanopi-a64.dts | 4 + + .../boot/dts/allwinner/sun50i-a64-olinuxino.dts | 4 + + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 4 + + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 4 + + .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 285 +++++++++++++++++++++ + .../dts/allwinner/sun50i-a64-sopine-baseboard.dts | 4 + + .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 15 ++ + .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 7 +- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 111 +++++++- + .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 12 + + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 19 ++ + drivers/bus/Kconfig | 10 + + drivers/bus/Makefile | 1 + + drivers/bus/sun50i-de2.c | 48 ++++ + drivers/clk/sunxi-ng/ccu-sun8i-de2.c | 11 +- + drivers/clk/sunxi-ng/ccu-sun8i-r40.c | 58 +++-- + drivers/clk/sunxi-ng/ccu-sun8i-r40.h | 8 +- + drivers/soc/sunxi/sunxi_sram.c | 61 ++++- + include/dt-bindings/clock/sun8i-r40-ccu.h | 4 + + 31 files changed, 1264 insertions(+), 47 deletions(-) + create mode 100644 Documentation/devicetree/bindings/bus/sun50i-de2-bus.txt + 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 + create mode 100644 drivers/bus/sun50i-de2.c +$ git reset --hard HEAD^ +HEAD is now at b6dc18d4316e Merge remote-tracking branch 'samsung-krzk/for-next' +Merging next-20180627 version of sunxi +$ git merge -m next-20180627/sunxi 25363671c0b71275a88407e8bd981db198624eca +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 | 281 +++++++++++++++++++++ + .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 15 ++ + .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 3 +- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 72 +++++- + .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 12 + + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 19 ++ + drivers/soc/sunxi/sunxi_sram.c | 61 ++++- + 14 files changed, 742 insertions(+), 6 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 (7114171afb07 m68knommu: Fix typos in Coldfire 5272 DMA debug code) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/coldfire/clk.c | 29 +++++++++++++++++++++++++++++ + arch/m68k/include/asm/dma.h | 4 ++-- + arch/m68k/include/asm/mcf_pgalloc.h | 4 +++- + 3 files changed, 34 insertions(+), 3 deletions(-) +Merging microblaze/next (45df561a7ae2 microblaze: consolidate GPIO reset handling) +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (829caee7e382 arch: mips: mm: page: Remove unused function) +$ git merge mips/mips-next +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 +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 (560b423dd9af openrisc: Call destructor during __pte_free_tlb) +$ git merge openrisc/for-next +Merge made by the 'recursive' strategy. + arch/openrisc/include/asm/pgalloc.h | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) +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 (7daf201d7fe8 Linux 4.18-rc2) +$ git merge risc-v/for-next +Already up to date. +Merging s390/features (c879f71c746c Merge branch 'zcrypt' into features) +$ git merge s390/features +Auto-merging init/Kconfig +Removing drivers/s390/crypto/ap_asm.h +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/ap.h | 284 +++++++++++++++++++-- + 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.S | 4 +- + 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 +- + drivers/s390/crypto/ap_asm.h | 236 ----------------- + drivers/s390/crypto/ap_bus.c | 21 +- + drivers/s390/crypto/ap_bus.h | 1 + + drivers/s390/crypto/ap_card.c | 1 - + drivers/s390/crypto/ap_queue.c | 20 -- + drivers/s390/crypto/zcrypt_card.c | 12 + + drivers/s390/crypto/zcrypt_queue.c | 12 + + init/Kconfig | 15 +- + 37 files changed, 438 insertions(+), 451 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 + delete mode 100644 drivers/s390/crypto/ap_asm.h +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 (34ebbfa8958b Merge branch 'for-next-next-v4.19-20180626' into for-next-20180626) +$ git merge btrfs-kdave/for-next +Merge made by the 'recursive' strategy. + fs/btrfs/btrfs_inode.h | 2 +- + fs/btrfs/check-integrity.c | 7 +- + fs/btrfs/compression.c | 21 +- + fs/btrfs/ctree.c | 53 +--- + fs/btrfs/ctree.h | 61 ++-- + fs/btrfs/delayed-ref.c | 43 ++- + fs/btrfs/delayed-ref.h | 6 +- + fs/btrfs/dev-replace.c | 8 +- + fs/btrfs/disk-io.c | 26 +- + fs/btrfs/extent-tree.c | 709 ++++++++++++++++++++----------------------- + fs/btrfs/extent_io.c | 146 ++++++++- + fs/btrfs/file-item.c | 2 +- + fs/btrfs/file.c | 104 +++---- + fs/btrfs/free-space-cache.c | 22 +- + fs/btrfs/free-space-cache.h | 3 +- + fs/btrfs/inode-map.c | 11 +- + fs/btrfs/inode.c | 112 +++---- + fs/btrfs/ioctl.c | 81 ++++- + fs/btrfs/ordered-data.c | 123 -------- + fs/btrfs/ordered-data.h | 20 +- + fs/btrfs/print-tree.c | 39 +-- + fs/btrfs/props.c | 2 +- + fs/btrfs/reada.c | 2 +- + fs/btrfs/relocation.c | 177 ++--------- + fs/btrfs/scrub.c | 367 +--------------------- + fs/btrfs/send.c | 17 +- + fs/btrfs/super.c | 49 +-- + fs/btrfs/transaction.c | 2 +- + fs/btrfs/transaction.h | 2 +- + fs/btrfs/tree-log.c | 185 ++--------- + fs/btrfs/volumes.c | 28 +- + fs/btrfs/volumes.h | 3 +- + fs/btrfs/zstd.c | 19 +- + include/trace/events/btrfs.h | 3 +- + include/uapi/linux/btrfs.h | 26 ++ + 35 files changed, 875 insertions(+), 1606 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at f2b48ad3b659 Merge remote-tracking branch 'befs/for-next' +Merging next-20180626 version of btrfs-kdave +$ git merge -m next-20180626/btrfs-kdave 5ad83924179c12cb9fe39ed966059a10bde371d1 +Merge made by the 'recursive' strategy. + fs/btrfs/btrfs_inode.h | 2 +- + fs/btrfs/check-integrity.c | 7 +- + fs/btrfs/compression.c | 21 +- + fs/btrfs/ctree.c | 53 +--- + fs/btrfs/ctree.h | 54 +--- + fs/btrfs/delayed-ref.c | 43 ++- + fs/btrfs/delayed-ref.h | 6 +- + fs/btrfs/dev-replace.c | 8 +- + fs/btrfs/disk-io.c | 26 +- + fs/btrfs/extent-tree.c | 676 ++++++++++++++++++------------------------- + fs/btrfs/extent_io.c | 146 +++++++++- + fs/btrfs/file-item.c | 2 +- + fs/btrfs/file.c | 59 +--- + fs/btrfs/free-space-cache.c | 22 +- + fs/btrfs/free-space-cache.h | 3 +- + fs/btrfs/inode-map.c | 11 +- + fs/btrfs/inode.c | 42 +-- + fs/btrfs/ioctl.c | 81 +++++- + fs/btrfs/ordered-data.c | 123 -------- + fs/btrfs/ordered-data.h | 20 +- + fs/btrfs/print-tree.c | 34 +-- + fs/btrfs/props.c | 2 +- + fs/btrfs/reada.c | 2 +- + fs/btrfs/relocation.c | 156 +--------- + fs/btrfs/scrub.c | 367 +---------------------- + fs/btrfs/send.c | 17 +- + fs/btrfs/super.c | 49 ++-- + fs/btrfs/transaction.c | 2 +- + fs/btrfs/transaction.h | 2 +- + fs/btrfs/tree-log.c | 185 ++---------- + fs/btrfs/volumes.c | 28 +- + fs/btrfs/volumes.h | 3 +- + fs/btrfs/zstd.c | 19 +- + include/trace/events/btrfs.h | 3 +- + include/uapi/linux/btrfs.h | 26 ++ + 35 files changed, 728 insertions(+), 1572 deletions(-) +Merging ceph/master (8b8f53af1ed9 ceph: fix dentry leak in splice_dentry()) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + fs/ceph/inode.c | 1 + + 1 file changed, 1 insertion(+) +Merging cifs/for-next (06d1affe3286 cifs: Fix use after free of a mid_q_entry) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifsglob.h | 1 + + fs/cifs/cifsproto.h | 1 + + fs/cifs/connect.c | 8 +++++++- + fs/cifs/smb1ops.c | 1 + + fs/cifs/smb2ops.c | 1 + + fs/cifs/smb2transport.c | 1 + + fs/cifs/transport.c | 18 +++++++++++++++++- + 7 files changed, 29 insertions(+), 2 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 (6aee47d7f61e Pull in fsnotify cleanups from Amir and new inotify IN_MASK_CREATE flag support.) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/ext2/inode.c | 2 +- + fs/ext2/super.c | 7 +-- + fs/notify/fanotify/fanotify_user.c | 99 +++++++++++++---------------------- + fs/notify/fdinfo.c | 8 +-- + fs/notify/fsnotify.h | 16 +++++- + fs/notify/inotify/inotify_user.c | 9 +++- + fs/notify/mark.c | 103 ++++++++++++++++++++----------------- + fs/udf/ialloc.c | 2 +- + fs/udf/inode.c | 45 ++++++---------- + fs/udf/super.c | 8 +-- + fs/udf/udf_i.h | 2 +- + fs/udf/udf_sb.h | 2 +- + fs/udf/udfdecl.h | 4 +- + fs/udf/udftime.c | 6 +-- + include/linux/fsnotify_backend.h | 40 +++++++++----- + include/linux/inotify.h | 2 +- + include/uapi/linux/inotify.h | 1 + + kernel/audit_tree.c | 17 +++--- + 18 files changed, 190 insertions(+), 183 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 (f57494321cbf Merge tag 'xfs-4.18-fixes-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge f2fs/dev +Already up to date. +Merging fuse/for-next (44ce5c2e921f fs: fuse: Adding new return type vm_fault_t) +$ git merge fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/file.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (d8cb5e423789 xfs: fix fdblocks accounting w/ RMAPBT per-AG reservation) +$ 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 (6c06e521993d Merge branch 'fixes' into for-next) +$ git merge vfs/for-next +Auto-merging security/smack/smack_lsm.c +Auto-merging kernel/trace/trace.c +Auto-merging init/Kconfig +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/fs.h +CONFLICT (content): Merge conflict in include/linux/fs.h +Auto-merging include/linux/dcache.h +Auto-merging fs/udf/super.c +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 drivers/gpu/drm/drm_drv.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 bebd44da751a] 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.h | 24 + + arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 151 ++++--- + 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/scsi/cxlflash/ocxl_hw.c | 2 +- + 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 | 536 ++++++++++++++-------- + 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/dcache.c | 27 -- + 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/generic.c | 11 +- + 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/dcache.h | 2 - + 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 | 302 ++++++------- + kernel/cgroup/cgroup.c | 226 +++++---- + kernel/cgroup/cpuset.c | 67 ++- + 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 +- + 174 files changed, 7046 insertions(+), 1779 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 +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 (5686cd09f441 Merge branch 'for-4.18/upstream-fixes_v2' into for-next) +$ git merge hid/for-next +Auto-merging drivers/hid/hid-core.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/hid-over-i2c.txt | 3 +- + drivers/hid/hid-core.c | 5 +- + drivers/hid/hid-ntrig.c | 2 + + drivers/hid/hid-redragon.c | 26 +- + drivers/hid/hid-wiimote-core.c | 14 + + drivers/hid/hid-wiimote-modules.c | 440 +++++++++++++++++++++ + drivers/hid/hid-wiimote.h | 3 + + drivers/hid/i2c-hid/i2c-hid.c | 57 ++- + drivers/hid/usbhid/hid-core.c | 7 +- + include/linux/hid.h | 3 +- + include/linux/platform_data/i2c-hid.h | 7 +- + 11 files changed, 502 insertions(+), 65 deletions(-) +Merging i2c/i2c/for-next (5a219b6a7583 Merge branch 'i2c/precise-locking-names' into i2c/for-next) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + drivers/char/tpm/tpm_i2c_infineon.c | 8 +++---- + drivers/i2c/algos/i2c-algo-bit.c | 8 +++---- + drivers/i2c/busses/i2c-brcmstb.c | 8 +++---- + drivers/i2c/busses/i2c-davinci.c | 4 ++-- + drivers/i2c/busses/i2c-gpio.c | 40 ++++++++++++++++---------------- + drivers/i2c/busses/i2c-s3c2410.c | 4 ++-- + drivers/i2c/busses/i2c-sprd.c | 8 +++---- + drivers/i2c/i2c-core-slave.c | 8 +++---- + drivers/i2c/i2c-core-smbus.c | 14 +++++++---- + drivers/i2c/muxes/i2c-mux-pca9541.c | 6 ++--- + drivers/iio/temperature/mlx90614.c | 4 ++-- + drivers/input/touchscreen/rohm_bu21023.c | 4 ++-- + drivers/media/dvb-frontends/af9013.c | 8 +++---- + drivers/media/dvb-frontends/drxk_hard.c | 4 ++-- + drivers/media/dvb-frontends/rtl2830.c | 12 +++++----- + drivers/media/dvb-frontends/tda1004x.c | 6 ++--- + drivers/media/tuners/tda18271-common.c | 8 +++---- + drivers/mfd/88pm860x-i2c.c | 8 +++---- + include/linux/i2c.h | 12 ---------- + 19 files changed, 83 insertions(+), 91 deletions(-) +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 (24489aed1836 hwmon: (nct6775) Fix comment in the description of pwm_mode) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + drivers/hwmon/nct6775.c | 4 +-- + drivers/hwmon/nct7904.c | 68 ++++++++++++++++++++++++------------------------- + 2 files changed, 36 insertions(+), 36 deletions(-) +Merging jc_docs/docs-next (37912da4387f doc:it_IT: translation for doc-guide) +$ git merge jc_docs/docs-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/doc-guide/parse-headers.rst | 4 +- + Documentation/doc-guide/sphinx.rst | 2 +- + Documentation/index.rst | 26 +- + Documentation/kernel-hacking/index.rst | 2 + + Documentation/nommu-mmap.txt | 2 +- + Documentation/process/2.Process.rst | 2 +- + Documentation/sphinx/parse-headers.pl | 2 +- + Documentation/sysctl/vm.txt | 13 + + Documentation/translations/index.rst | 13 + + .../translations/it_IT/disclaimer-ita.rst | 13 + + .../translations/it_IT/doc-guide/index.rst | 24 + + .../translations/it_IT/doc-guide/kernel-doc.rst | 554 +++++++++++++++++++++ + .../translations/it_IT/doc-guide/parse-headers.rst | 196 ++++++++ + .../translations/it_IT/doc-guide/sphinx.rst | 457 +++++++++++++++++ + Documentation/translations/it_IT/index.rst | 117 +++++ + MAINTAINERS | 6 + + 16 files changed, 1407 insertions(+), 26 deletions(-) + create mode 100644 Documentation/translations/index.rst + create mode 100644 Documentation/translations/it_IT/disclaimer-ita.rst + create mode 100644 Documentation/translations/it_IT/doc-guide/index.rst + create mode 100644 Documentation/translations/it_IT/doc-guide/kernel-doc.rst + create mode 100644 Documentation/translations/it_IT/doc-guide/parse-headers.rst + create mode 100644 Documentation/translations/it_IT/doc-guide/sphinx.rst + create mode 100644 Documentation/translations/it_IT/index.rst +Merging v4l-dvb/master (f6f630327de9 media: v4l: cadence: add VIDEO_V4L2 dependency) +$ git merge v4l-dvb/master +Merge made by the 'recursive' strategy. + drivers/media/i2c/imx258.c | 8 ++++++++ + drivers/media/platform/cadence/Kconfig | 2 ++ + drivers/media/platform/cadence/cdns-csi2rx.c | 1 + + drivers/media/platform/cadence/cdns-csi2tx.c | 1 + + 4 files changed, 12 insertions(+) +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 (b1d2b5b3bc24 Merge branch 'pm-cpufreq' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + Documentation/admin-guide/pm/intel_pstate.rst | 14 ++++++++++++-- + drivers/base/power/domain.c | 7 +++---- + drivers/cpufreq/qcom-cpufreq-kryo.c | 8 ++++---- + drivers/cpuidle/cpuidle-arm.c | 3 ++- + include/linux/pm_domain.h | 6 +++--- + 5 files changed, 24 insertions(+), 14 deletions(-) +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 (5e62d5ff1b9a IB/mlx4: Create slave AH's directly) +$ 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/hw/hfi1/rc.c +Auto-merging drivers/infiniband/core/verbs.c +Auto-merging drivers/infiniband/core/uverbs_main.c +Auto-merging drivers/infiniband/core/uverbs_cmd.c +CONFLICT (content): Merge conflict in drivers/infiniband/core/uverbs_cmd.c +Auto-merging MAINTAINERS +Resolved 'drivers/infiniband/core/uverbs_cmd.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 185c3f5e9c59] Merge remote-tracking branch 'rdma/for-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 12 +- + drivers/infiniband/core/cache.c | 748 +++++++++------ + drivers/infiniband/core/cm.c | 128 +-- + drivers/infiniband/core/cma.c | 142 +-- + drivers/infiniband/core/device.c | 21 +- + drivers/infiniband/core/mad.c | 99 +- + drivers/infiniband/core/mad_priv.h | 7 +- + drivers/infiniband/core/multicast.c | 40 +- + drivers/infiniband/core/nldev.c | 16 +- + drivers/infiniband/core/rdma_core.c | 42 +- + drivers/infiniband/core/rdma_core.h | 10 +- + drivers/infiniband/core/sa_query.c | 80 +- + drivers/infiniband/core/sysfs.c | 66 +- + drivers/infiniband/core/umem.c | 2 +- + drivers/infiniband/core/user_mad.c | 1 + + drivers/infiniband/core/uverbs_cmd.c | 37 +- + drivers/infiniband/core/uverbs_ioctl.c | 109 ++- + drivers/infiniband/core/uverbs_main.c | 6 + + drivers/infiniband/core/uverbs_marshall.c | 2 - + drivers/infiniband/core/uverbs_std_types.c | 13 +- + drivers/infiniband/core/verbs.c | 509 ++++++++--- + 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 | 175 ++-- + drivers/infiniband/hw/hfi1/chip.h | 30 + + drivers/infiniband/hw/hfi1/driver.c | 63 +- + drivers/infiniband/hw/hfi1/file_ops.c | 6 +- + drivers/infiniband/hw/hfi1/hfi.h | 243 +++-- + drivers/infiniband/hw/hfi1/init.c | 43 +- + drivers/infiniband/hw/hfi1/pcie.c | 19 +- + drivers/infiniband/hw/hfi1/pio.c | 14 +- + 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/sdma.c | 10 +- + drivers/infiniband/hw/hfi1/verbs.c | 7 +- + drivers/infiniband/hw/hfi1/vnic_main.c | 12 +- + 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 | 70 +- + drivers/infiniband/hw/mlx4/mad.c | 22 +- + drivers/infiniband/hw/mlx4/main.c | 38 +- + drivers/infiniband/hw/mlx4/mlx4_ib.h | 8 +- + drivers/infiniband/hw/mlx4/qp.c | 184 +++- + drivers/infiniband/hw/mlx5/Makefile | 1 + + drivers/infiniband/hw/mlx5/ah.c | 11 +- + drivers/infiniband/hw/mlx5/cmd.c | 12 + + drivers/infiniband/hw/mlx5/cmd.h | 1 + + drivers/infiniband/hw/mlx5/devx.c | 1107 +++++++++++++++++++++++ + drivers/infiniband/hw/mlx5/main.c | 151 +++- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 28 +- + drivers/infiniband/hw/mlx5/qp.c | 172 +++- + 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/usnic/usnic_ib_verbs.c | 2 +- + drivers/infiniband/hw/usnic/usnic_uiom.c | 40 +- + drivers/infiniband/hw/usnic/usnic_uiom.h | 5 +- + 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 | 8 +- + 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 | 82 +- + include/rdma/ib_addr.h | 2 + + include/rdma/ib_cache.h | 58 +- + include/rdma/ib_cm.h | 3 + + include/rdma/ib_sa.h | 49 +- + include/rdma/ib_verbs.h | 48 +- + include/rdma/rdmavt_qp.h | 30 +- + include/rdma/uverbs_ioctl.h | 42 +- + 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 +- + 115 files changed, 3918 insertions(+), 1780 deletions(-) + create mode 100644 drivers/infiniband/hw/mlx5/devx.c +Merging net-next/master (b1a5046b2497 Merge branch 'Multipath-tests-for-tunnel-devices') +$ git merge net-next/master +Auto-merging include/net/pkt_cls.h +Auto-merging drivers/net/usb/r8152.c +Auto-merging drivers/net/usb/lan78xx.c +Removing drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_api.h +Removing drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_api.c +Auto-merging drivers/net/ethernet/netronome/nfp/flower/offload.c +Auto-merging drivers/net/ethernet/netronome/nfp/bpf/main.c +Auto-merging arch/arm64/boot/dts/freescale/qoriq-fman3-0.dtsi +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/net/fsl-fman.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/net/fsl-fman.txt | 25 +- + .../devicetree/bindings/ptp/ptp-qoriq.txt | 15 +- + MAINTAINERS | 2 + + arch/arm64/boot/dts/freescale/qoriq-fman3-0.dtsi | 14 +- + arch/powerpc/boot/dts/fsl/qoriq-fman-0.dtsi | 14 +- + arch/powerpc/boot/dts/fsl/qoriq-fman-1.dtsi | 14 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-0.dtsi | 14 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-1.dtsi | 14 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3l-0.dtsi | 14 +- + drivers/isdn/gigaset/bas-gigaset.c | 26 +- + drivers/isdn/hardware/mISDN/hfcsusb.c | 36 ++- + drivers/isdn/hisax/hfc_usb.c | 10 +- + drivers/isdn/hisax/st5481_usb.c | 11 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 16 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 2 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 5 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 1 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +- + drivers/net/ethernet/cortina/gemini.c | 2 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 88 ++++- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.h | 3 + + drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 39 +++ + drivers/net/ethernet/freescale/fman/fman.c | 3 +- + drivers/net/ethernet/freescale/fman/fman.h | 1 + + drivers/net/ethernet/freescale/fman/fman_dtsec.c | 27 ++ + drivers/net/ethernet/freescale/fman/fman_dtsec.h | 1 + + drivers/net/ethernet/freescale/fman/fman_memac.c | 5 + + drivers/net/ethernet/freescale/fman/fman_memac.h | 1 + + drivers/net/ethernet/freescale/fman/fman_port.c | 12 + + drivers/net/ethernet/freescale/fman/fman_port.h | 2 + + drivers/net/ethernet/freescale/fman/fman_tgec.c | 21 ++ + drivers/net/ethernet/freescale/fman/fman_tgec.h | 1 + + drivers/net/ethernet/freescale/fman/mac.c | 3 + + drivers/net/ethernet/freescale/fman/mac.h | 1 + + drivers/net/ethernet/freescale/ucc_geth.c | 9 +- + drivers/net/ethernet/hisilicon/hip04_eth.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 6 +- + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 4 +- + drivers/net/ethernet/intel/igb/igb_main.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 14 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 42 ++- + .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 3 + + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 47 ++- + drivers/net/ethernet/microchip/lan743x_main.c | 2 +- + drivers/net/ethernet/netronome/nfp/bpf/main.c | 2 +- + .../net/ethernet/netronome/nfp/flower/offload.c | 6 +- + drivers/net/ethernet/oki-semi/pch_gbe/Makefile | 2 +- + drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h | 40 --- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_api.c | 262 --------------- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_api.h | 35 -- + .../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c | 19 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 193 ++++------- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.c | 2 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.h | 2 - + .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 2 +- + drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c | 2 +- + drivers/net/ethernet/realtek/r8169.c | 133 ++++---- + drivers/net/ethernet/renesas/sh_eth.c | 8 +- + drivers/net/ethernet/renesas/sh_eth.h | 4 +- + drivers/net/ethernet/sfc/ef10_sriov.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- + drivers/net/ethernet/ti/cpsw.c | 2 +- + drivers/net/ethernet/ti/netcp_core.c | 4 +- + drivers/net/geneve.c | 11 +- + drivers/net/netdevsim/netdev.c | 2 +- + drivers/net/ntb_netdev.c | 2 +- + drivers/net/phy/Kconfig | 3 +- + drivers/net/phy/fixed_phy.c | 7 +- + drivers/net/phy/mdio-mux-gpio.c | 22 +- + drivers/net/usb/cdc-phonet.c | 5 +- + drivers/net/usb/hso.c | 35 +- + drivers/net/usb/kaweth.c | 8 +- + drivers/net/usb/lan78xx.c | 2 +- + drivers/net/usb/r8152.c | 10 +- + drivers/net/usb/rtl8150.c | 5 +- + drivers/net/vxlan.c | 11 +- + drivers/net/wireless/ath/ath9k/hw.c | 2 +- + drivers/ptp/Kconfig | 2 +- + drivers/ptp/ptp_qoriq.c | 104 +++--- + include/linux/etherdevice.h | 3 +- + include/linux/fsl/ptp_qoriq.h | 38 ++- + include/linux/ipc.h | 2 +- + include/linux/ipc_namespace.h | 2 +- + include/linux/mroute_base.h | 2 +- + include/linux/netdevice.h | 33 +- + include/linux/rhashtable-types.h | 137 ++++++++ + include/linux/rhashtable.h | 164 +--------- + include/linux/skbuff.h | 3 +- + include/linux/tcp.h | 1 + + include/linux/udp.h | 4 +- + include/net/act_api.h | 3 - + include/net/inet_common.h | 2 +- + include/net/inet_frag.h | 2 +- + include/net/netfilter/nf_flow_table.h | 2 +- + include/net/netns/hash.h | 7 +- + include/net/pkt_cls.h | 17 +- + include/net/sch_generic.h | 21 ++ + include/net/sctp/structs.h | 2 +- + include/net/seg6.h | 2 +- + include/net/seg6_hmac.h | 2 +- + include/net/tcp.h | 13 +- + include/net/udp.h | 4 +- + include/net/udp_tunnel.h | 6 +- + include/uapi/linux/snmp.h | 1 + + ipc/msg.c | 1 + + ipc/sem.c | 1 + + ipc/shm.c | 1 + + ipc/util.c | 1 + + lib/rhashtable.c | 58 +--- + lib/test_rhashtable.c | 8 +- + net/8021q/vlan.c | 13 +- + net/batman-adv/bridge_loop_avoidance.c | 2 +- + net/core/dev.c | 139 +++++--- + net/core/skbuff.c | 4 +- + net/core/xdp.c | 4 +- + net/dsa/slave.c | 2 +- + net/ethernet/eth.c | 12 +- + net/ipv4/af_inet.c | 12 +- + net/ipv4/esp4_offload.c | 4 +- + net/ipv4/fou.c | 20 +- + net/ipv4/gre_offload.c | 8 +- + net/ipv4/inet_fragment.c | 1 + + net/ipv4/ipmr.c | 1 + + net/ipv4/ipmr_base.c | 1 + + net/ipv4/proc.c | 1 + + net/ipv4/tcp.c | 1 + + net/ipv4/tcp_bbr.c | 6 +- + net/ipv4/tcp_input.c | 22 +- + net/ipv4/tcp_offload.c | 14 +- + net/ipv4/tcp_output.c | 14 - + net/ipv4/udp_offload.c | 13 +- + net/ipv6/esp6_offload.c | 4 +- + net/ipv6/ip6_offload.c | 16 +- + net/ipv6/ip6mr.c | 1 + + net/ipv6/seg6.c | 1 + + net/ipv6/seg6_hmac.c | 1 + + net/ipv6/tcpv6_offload.c | 4 +- + net/ipv6/udp_offload.c | 4 +- + net/l2tp/l2tp_core.c | 15 +- + net/l2tp/l2tp_core.h | 12 - + net/l2tp/l2tp_debugfs.c | 3 - + net/l2tp/l2tp_ppp.c | 7 - + net/netfilter/nf_tables_api.c | 1 + + net/sched/cls_api.c | 79 ++++- + net/sched/cls_bpf.c | 39 +++ + net/sched/cls_flower.c | 44 +++ + net/sched/cls_matchall.c | 32 ++ + net/sched/cls_u32.c | 111 +++++++ + net/sched/sch_htb.c | 13 - + net/sctp/input.c | 1 + + net/sctp/socket.c | 1 + + net/tls/tls_sw.c | 13 +- + tools/testing/selftests/net/forwarding/README | 2 + + .../selftests/net/forwarding/gre_multipath.sh | 354 +++++++++++++++++++++ + tools/testing/selftests/net/forwarding/lib.sh | 80 ++++- + .../net/forwarding/mirror_gre_vlan_bridge_1q.sh | 9 + + .../selftests/net/forwarding/router_bridge.sh | 113 +++++++ + .../selftests/net/forwarding/router_bridge_vlan.sh | 132 ++++++++ + .../selftests/net/forwarding/router_multipath.sh | 39 --- + tools/testing/selftests/net/ip6_gre_headroom.sh | 65 ++++ + tools/testing/selftests/net/rtnetlink.sh | 11 +- + 165 files changed, 2233 insertions(+), 1350 deletions(-) + delete mode 100644 drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_api.c + delete mode 100644 drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_api.h + create mode 100644 include/linux/rhashtable-types.h + create mode 100755 tools/testing/selftests/net/forwarding/gre_multipath.sh + create mode 100755 tools/testing/selftests/net/forwarding/router_bridge.sh + create mode 100755 tools/testing/selftests/net/forwarding/router_bridge_vlan.sh + create mode 100755 tools/testing/selftests/net/ip6_gre_headroom.sh +Merging bpf-next/master (a7f7547f5e2b selftests/bpf: Test sys_connect BPF hooks with TFO) +$ git merge bpf-next/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/netronome/nfp/bpf/jit.c | 5 +- + samples/bpf/Makefile | 4 + + samples/bpf/xdp_sample_pkts_kern.c | 66 +++++++++++ + samples/bpf/xdp_sample_pkts_user.c | 169 +++++++++++++++++++++++++++ + tools/testing/selftests/bpf/test_sock_addr.c | 37 +++++- + tools/testing/selftests/bpf/trace_helpers.c | 48 +++++++- + tools/testing/selftests/bpf/trace_helpers.h | 4 + + 7 files changed, 323 insertions(+), 10 deletions(-) + create mode 100644 samples/bpf/xdp_sample_pkts_kern.c + create mode 100644 samples/bpf/xdp_sample_pkts_user.c +Merging ipsec-next/master (e4db5b61c572 xfrm: policy: remove pcpu policy cache) +$ git merge ipsec-next/master +Auto-merging net/xfrm/xfrm_user.c +Auto-merging net/xfrm/xfrm_policy.c +Merge made by the 'recursive' strategy. + include/net/flow.h | 9 + + include/net/xfrm.h | 55 ++- + include/uapi/linux/if_link.h | 10 + + include/uapi/linux/xfrm.h | 5 +- + net/core/pktgen.c | 2 +- + net/key/af_key.c | 6 +- + net/xfrm/Kconfig | 8 + + net/xfrm/Makefile | 1 + + net/xfrm/xfrm_device.c | 13 +- + net/xfrm/xfrm_input.c | 5 + + net/xfrm/xfrm_interface.c | 972 +++++++++++++++++++++++++++++++++++++++++++ + net/xfrm/xfrm_output.c | 3 +- + net/xfrm/xfrm_policy.c | 205 +++------ + net/xfrm/xfrm_state.c | 24 +- + net/xfrm/xfrm_user.c | 94 ++++- + 15 files changed, 1222 insertions(+), 190 deletions(-) + create mode 100644 net/xfrm/xfrm_interface.c +Merging mlx5-next/mlx5-next (b30408d7a383 net/mlx5: Rate limit errors in command interface) +$ git merge mlx5-next/mlx5-next +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/cmd.c +Merge made by the 'recursive' strategy. + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 11 ++++------- + drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h | 6 ++++++ + 2 files changed, 10 insertions(+), 7 deletions(-) +Merging netfilter-next/master (c37979958e08 openvswitch: use nf_ct_get_tuplepr, invert_tuplepr) +$ git merge netfilter-next/master +Merge made by the 'recursive' strategy. + include/linux/netfilter_ipv4.h | 11 --- + include/linux/netfilter_ipv6.h | 5 -- + include/net/netfilter/nf_conntrack_core.h | 7 -- + include/net/netfilter/nf_tproxy.h | 8 ++ + net/bridge/netfilter/nft_reject_bridge.c | 3 +- + net/ipv4/netfilter.c | 53 ------------ + net/ipv6/netfilter.c | 62 -------------- + net/netfilter/nf_conntrack_core.c | 3 +- + net/netfilter/nf_flow_table_core.c | 13 ++- + net/netfilter/utils.c | 131 +++++++++++++++++++++++++++--- + net/netfilter/xt_TPROXY.c | 9 -- + net/openvswitch/conntrack.c | 17 +--- + 12 files changed, 138 insertions(+), 184 deletions(-) +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 (c3ae2103e069 mt76: improve gain adjustment in noisy environments) +$ git merge wireless-drivers-next/master +Auto-merging lib/Makefile +Auto-merging drivers/net/wireless/quantenna/qtnfmac/cfg80211.c +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 | 7 +- + 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 | 17 +- + 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 + + drivers/net/wireless/ath/wil6210/cfg80211.c | 18 +- + drivers/net/wireless/atmel/atmel.c | 11 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 40 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_cmn.c | 2 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_n.c | 2 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_qmath.c | 2 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 18 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.h | 12 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 6 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.h | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 6 +- + drivers/net/wireless/marvell/libertas/cfg.c | 12 +- + drivers/net/wireless/marvell/libertas/if_usb.c | 7 +- + drivers/net/wireless/marvell/libertas_tf/if_usb.c | 8 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 14 +- + drivers/net/wireless/marvell/mwifiex/uap_txrx.c | 52 +- + drivers/net/wireless/mediatek/mt76/mt76x2.h | 16 +- + .../net/wireless/mediatek/mt76/mt76x2_debugfs.c | 14 + + drivers/net/wireless/mediatek/mt76/mt76x2_mac.c | 39 +- + drivers/net/wireless/mediatek/mt76/mt76x2_main.c | 7 +- + drivers/net/wireless/mediatek/mt76/mt76x2_phy.c | 107 ++++- + drivers/net/wireless/mediatek/mt76/mt76x2_tx.c | 33 ++ + drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 3 + + drivers/net/wireless/quantenna/qtnfmac/commands.c | 57 ++- + drivers/net/wireless/quantenna/qtnfmac/core.c | 25 + + drivers/net/wireless/quantenna/qtnfmac/qlink.h | 20 + + drivers/net/wireless/rndis_wlan.c | 6 +- + drivers/net/wireless/ti/wl18xx/debugfs.c | 29 +- + drivers/net/wireless/ti/wlcore/acx.c | 1 - + drivers/net/wireless/ti/wlcore/cmd.c | 10 + + drivers/net/wireless/ti/wlcore/debugfs.c | 90 ++-- + drivers/net/wireless/ti/wlcore/main.c | 528 ++++++++++++++------- + drivers/net/wireless/ti/wlcore/ps.c | 146 ------ + drivers/net/wireless/ti/wlcore/ps.h | 3 - + drivers/net/wireless/ti/wlcore/scan.c | 13 +- + drivers/net/wireless/ti/wlcore/sysfs.c | 13 +- + drivers/net/wireless/ti/wlcore/testmode.c | 20 +- + drivers/net/wireless/ti/wlcore/tx.c | 10 +- + drivers/net/wireless/ti/wlcore/vendor_cmd.c | 30 +- + drivers/net/wireless/ti/wlcore/wlcore.h | 1 - + drivers/net/wireless/ti/wlcore/wlcore_i.h | 1 - + drivers/net/wireless/zydas/zd1211rw/zd_chip.c | 2 +- + drivers/net/wireless/zydas/zd1211rw/zd_usb.c | 21 +- + include/linux/bitfield.h | 7 +- + lib/Kconfig.debug | 7 + + lib/Makefile | 1 + + lib/test_bitfield.c | 168 +++++++ + 68 files changed, 1213 insertions(+), 687 deletions(-) + create mode 100644 lib/test_bitfield.c +Merging bluetooth/master (0ef8b4567d08 tls: Removed unused variable) +$ 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 drivers/net/wireless/realtek/rtlwifi/base.c +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 2fca072a49eb] 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 (ffc84e55cbf5 gfs2: using posix_acl_xattr_size instead of posix_acl_to_xattr) +$ 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/acl.c | 6 ++--- + 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 ++++--- + 12 files changed, 138 insertions(+), 72 deletions(-) +Merging mtd/mtd/next (02361bc77888 lib/bch: Remove VLA usage) +$ git merge mtd/mtd/next +Auto-merging lib/Makefile +Merge made by the 'recursive' strategy. + lib/Makefile | 1 + + lib/bch.c | 23 +++++++++++++++-------- + 2 files changed, 16 insertions(+), 8 deletions(-) +Merging nand/nand/next (11e9e7667e98 mtd: rawnand: micron: detect forced on-die ECC) +$ git merge nand/nand/next +Auto-merging drivers/mtd/nand/raw/nand_micron.c +Auto-merging drivers/mtd/nand/raw/nand_base.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mtd/nand.txt | 6 +- + .../bindings/mtd/nvidia-tegra20-nand.txt | 64 + + MAINTAINERS | 7 + + drivers/mtd/nand/raw/Kconfig | 10 + + drivers/mtd/nand/raw/Makefile | 1 + + drivers/mtd/nand/raw/atmel/nand-controller.c | 7 +- + drivers/mtd/nand/raw/marvell_nand.c | 1 + + drivers/mtd/nand/raw/nand_base.c | 18 +- + drivers/mtd/nand/raw/nand_hynix.c | 13 + + drivers/mtd/nand/raw/nand_micron.c | 128 +- + drivers/mtd/nand/raw/tegra_nand.c | 1230 ++++++++++++++++++++ + include/linux/mtd/rawnand.h | 22 + + 12 files changed, 1479 insertions(+), 28 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/nvidia-tegra20-nand.txt + create mode 100644 drivers/mtd/nand/raw/tegra_nand.c +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 (38641b83ebc5 crypto: atmel-ecc - remove overly verbose dev_info) +$ git merge crypto/master +Merge made by the 'recursive' strategy. + crypto/aegis128l.c | 2 +- + crypto/sha512_generic.c | 22 ++ + drivers/crypto/atmel-ecc.c | 35 ++- + drivers/crypto/cavium/cpt/cptvf_algs.c | 2 +- + drivers/crypto/inside-secure/safexcel.c | 14 +- + drivers/crypto/inside-secure/safexcel.h | 23 +- + drivers/crypto/inside-secure/safexcel_cipher.c | 89 +++++- + drivers/crypto/inside-secure/safexcel_hash.c | 381 ++++++++++++++++++++++--- + include/crypto/sha.h | 4 + + 9 files changed, 497 insertions(+), 75 deletions(-) +Merging drm/drm-next (3c8daa7db46d drm/omap: remove now unused functions) +$ git merge drm/drm-next +Auto-merging drivers/gpu/drm/i915/intel_tv.c +Auto-merging drivers/gpu/drm/i915/intel_sdvo.c +Auto-merging drivers/gpu/drm/i915/intel_lvds.c +Auto-merging drivers/gpu/drm/i915/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/intel_hdmi.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_dp.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging 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 +Auto-merging drivers/gpu/drm/i915/i915_gem_context.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c +Removing drivers/gpu/drm/amd/powerplay/inc/pp_power_source.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Merge made by the 'recursive' strategy. + .../bindings/display/panel/auo,g070vvn01.txt | 29 ++ + .../bindings/display/panel/innolux,tv123wam.txt | 20 + + Documentation/gpu/amdgpu.rst | 117 +++++ + Documentation/gpu/drivers.rst | 1 + + Documentation/gpu/drm-kms.rst | 15 + + Documentation/gpu/drm-mm.rst | 20 + + Documentation/gpu/kms-properties.csv | 1 + + drivers/dma-buf/dma-buf.c | 56 +- + drivers/gpu/drm/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/ObjectID.h | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 12 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 15 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 202 +++++--- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 34 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 204 +++++--- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 311 ++++++++++- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 66 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | 124 ++++- + drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c | 7 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 61 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 128 +++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 274 ++++++++-- + drivers/gpu/drm/amd/amdgpu/atom.c | 2 +- + drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 12 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 8 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 217 +++++++- + drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/si_dpm.c | 4 +- + drivers/gpu/drm/amd/amdgpu/soc15d.h | 23 + + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 457 +++++++++++++++++ + drivers/gpu/drm/amd/display/Kconfig | 11 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 15 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 5 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 28 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 8 - + .../gpu/drm/amd/display/dc/basics/log_helpers.c | 2 + + drivers/gpu/drm/amd/display/dc/basics/logger.c | 83 +-- + drivers/gpu/drm/amd/display/dc/core/dc.c | 19 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 40 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 34 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 422 ++++++++++----- + drivers/gpu/drm/amd/display/dc/core/dc_sink.c | 4 + + drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 11 + + drivers/gpu/drm/amd/display/dc/dc.h | 19 +- + drivers/gpu/drm/amd/display/dc/dc_ddc_types.h | 61 ++- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 5 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 34 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 8 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 21 +- + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 5 - + .../drm/amd/display/dc/dce110/dce110_compressor.c | 4 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 291 ++++++----- + .../amd/display/dc/dce110/dce110_hw_sequencer.h | 4 + + .../drm/amd/display/dc/dce110/dce110_resource.c | 7 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 26 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 32 ++ + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 4 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 4 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 88 ++-- + drivers/gpu/drm/amd/display/dc/dm_services.h | 5 +- + drivers/gpu/drm/amd/display/dc/i2caux/aux_engine.c | 16 + + drivers/gpu/drm/amd/display/dc/i2caux/aux_engine.h | 41 +- + .../display/dc/i2caux/dce110/aux_engine_dce110.c | 56 +- + drivers/gpu/drm/amd/display/dc/i2caux/engine.h | 18 +- + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 1 + + .../drm/amd/display/dc/inc/hw/timing_generator.h | 3 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 8 +- + drivers/gpu/drm/amd/display/dc/inc/resource.h | 1 + + .../drm/amd/display/include/ddc_service_types.h | 3 +- + drivers/gpu/drm/amd/display/include/fixed31_32.h | 7 + + .../gpu/drm/amd/display/include/logger_interface.h | 2 + + .../drm/amd/display/modules/color/color_gamma.c | 137 +++++ + drivers/gpu/drm/amd/display/modules/stats/stats.c | 4 +- + .../drm/amd/include/asic_reg/vcn/vcn_1_0_offset.h | 20 + + drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 6 +- + .../amd/powerplay/hwmgr/smu7_clockpowergating.c | 54 -- + .../amd/powerplay/hwmgr/smu7_clockpowergating.h | 1 - + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 133 ++--- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.h | 1 - + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 84 +-- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h | 1 - + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 2 - + .../gpu/drm/amd/powerplay/inc/pp_power_source.h | 36 -- + drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 2 - + drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 119 +++-- + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 74 --- + .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 10 - + .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 86 ---- + .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 80 --- + .../gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 85 --- + drivers/gpu/drm/arc/arcpgu_crtc.c | 3 - + drivers/gpu/drm/armada/armada_fb.c | 23 +- + drivers/gpu/drm/armada/armada_fb.h | 3 +- + drivers/gpu/drm/armada/armada_gem.c | 2 - + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 1 + + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 19 +- + drivers/gpu/drm/bridge/Kconfig | 4 +- + drivers/gpu/drm/bridge/cdns-dsi.c | 4 +- + drivers/gpu/drm/cirrus/cirrus_drv.h | 10 +- + drivers/gpu/drm/cirrus/cirrus_fbdev.c | 20 +- + drivers/gpu/drm/cirrus/cirrus_main.c | 43 +- + drivers/gpu/drm/cirrus/cirrus_mode.c | 12 +- + drivers/gpu/drm/drm_atomic.c | 391 ++++++++++---- + drivers/gpu/drm/drm_atomic_helper.c | 40 +- + drivers/gpu/drm/drm_connector.c | 121 ++++- + drivers/gpu/drm/drm_crtc.c | 35 +- + drivers/gpu/drm/drm_crtc_internal.h | 3 + + drivers/gpu/drm/drm_edid.c | 279 +++++----- + drivers/gpu/drm/drm_fb_helper.c | 9 +- + drivers/gpu/drm/drm_framebuffer.c | 5 - + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 2 +- + drivers/gpu/drm/drm_ioctl.c | 7 + + drivers/gpu/drm/drm_mm.c | 91 +++- + drivers/gpu/drm/drm_mode_config.c | 5 + + drivers/gpu/drm/drm_modes.c | 2 +- + drivers/gpu/drm/drm_panel.c | 16 + + drivers/gpu/drm/drm_plane.c | 41 +- + drivers/gpu/drm/drm_plane_helper.c | 4 +- + drivers/gpu/drm/drm_prime.c | 34 +- + drivers/gpu/drm/drm_vm.c | 10 +- + drivers/gpu/drm/drm_writeback.c | 350 +++++++++++++ + drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 - + drivers/gpu/drm/gma500/accel_2d.c | 2 +- + drivers/gpu/drm/gma500/framebuffer.c | 62 +-- + drivers/gpu/drm/gma500/framebuffer.h | 1 - + drivers/gpu/drm/gma500/gma_display.c | 10 +- + drivers/gpu/drm/gma500/gtt.h | 2 + + drivers/gpu/drm/gma500/mdfld_intel_display.c | 2 +- + drivers/gpu/drm/gma500/oaktrail_crtc.c | 3 +- + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 11 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 13 +- + drivers/gpu/drm/i915/gvt/aperture_gm.c | 2 +- + drivers/gpu/drm/i915/gvt/display.c | 4 +- + drivers/gpu/drm/i915/gvt/fb_decoder.c | 12 +- + drivers/gpu/drm/i915/gvt/gvt.h | 4 +- + drivers/gpu/drm/i915/gvt/mmio_context.c | 6 +- + drivers/gpu/drm/i915/gvt/mmio_context.h | 2 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 179 +++---- + drivers/gpu/drm/i915/gvt/scheduler.h | 1 - + drivers/gpu/drm/i915/i915_debugfs.c | 96 ++-- + drivers/gpu/drm/i915/i915_drv.c | 83 +-- + drivers/gpu/drm/i915/i915_drv.h | 21 +- + drivers/gpu/drm/i915/i915_gem.c | 321 +++++++----- + drivers/gpu/drm/i915/i915_gem.h | 16 + + drivers/gpu/drm/i915/i915_gem_context.c | 157 ++++-- + drivers/gpu/drm/i915/i915_gem_context.h | 28 +- + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 11 - + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 16 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 464 ++++++++--------- + drivers/gpu/drm/i915/i915_gem_gtt.h | 8 +- + 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 | 41 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 2 +- + drivers/gpu/drm/i915/i915_irq.c | 5 +- + drivers/gpu/drm/i915/i915_params.c | 3 - + drivers/gpu/drm/i915/i915_params.h | 1 - + drivers/gpu/drm/i915/i915_pci.c | 2 - + drivers/gpu/drm/i915/i915_perf.c | 136 +++-- + drivers/gpu/drm/i915/i915_pmu.c | 67 ++- + drivers/gpu/drm/i915/i915_pmu.h | 8 + + drivers/gpu/drm/i915/i915_pvinfo.h | 1 + + drivers/gpu/drm/i915/i915_reg.h | 150 +++--- + drivers/gpu/drm/i915/i915_request.c | 45 +- + drivers/gpu/drm/i915/i915_request.h | 4 +- + drivers/gpu/drm/i915/i915_trace.h | 131 +++-- + drivers/gpu/drm/i915/i915_vgpu.c | 8 +- + drivers/gpu/drm/i915/i915_vgpu.h | 6 + + drivers/gpu/drm/i915/i915_vma.c | 18 +- + drivers/gpu/drm/i915/intel_atomic.c | 1 + + drivers/gpu/drm/i915/intel_atomic_plane.c | 12 - + drivers/gpu/drm/i915/intel_bios.c | 121 ++++- + drivers/gpu/drm/i915/intel_breadcrumbs.c | 5 +- + drivers/gpu/drm/i915/intel_crt.c | 40 +- + drivers/gpu/drm/i915/intel_ddi.c | 84 +-- + drivers/gpu/drm/i915/intel_display.c | 571 ++++++++++++--------- + drivers/gpu/drm/i915/intel_display.h | 11 + + drivers/gpu/drm/i915/intel_dp.c | 219 ++++---- + drivers/gpu/drm/i915/intel_dpll_mgr.c | 70 +++ + drivers/gpu/drm/i915/intel_dpll_mgr.h | 2 + + drivers/gpu/drm/i915/intel_drv.h | 27 +- + drivers/gpu/drm/i915/intel_dsi.c | 8 +- + drivers/gpu/drm/i915/intel_dvo.c | 13 +- + drivers/gpu/drm/i915/intel_engine_cs.c | 176 +++++-- + drivers/gpu/drm/i915/intel_fbdev.c | 9 +- + drivers/gpu/drm/i915/intel_frontbuffer.c | 2 - + drivers/gpu/drm/i915/intel_guc.c | 8 +- + drivers/gpu/drm/i915/intel_guc_submission.c | 76 ++- + drivers/gpu/drm/i915/intel_hdmi.c | 42 +- + drivers/gpu/drm/i915/intel_lrc.c | 389 +++++++++----- + drivers/gpu/drm/i915/intel_lrc.h | 7 - + drivers/gpu/drm/i915/intel_lvds.c | 66 +-- + drivers/gpu/drm/i915/intel_psr.c | 381 +++----------- + drivers/gpu/drm/i915/intel_ringbuffer.c | 172 ++++--- + drivers/gpu/drm/i915/intel_ringbuffer.h | 22 +- + drivers/gpu/drm/i915/intel_sdvo.c | 38 +- + drivers/gpu/drm/i915/intel_sprite.c | 207 ++++++-- + drivers/gpu/drm/i915/intel_tv.c | 20 +- + drivers/gpu/drm/i915/intel_uc.c | 129 +++-- + drivers/gpu/drm/i915/intel_uncore.c | 12 +- + drivers/gpu/drm/i915/intel_vbt_defs.h | 8 +- + drivers/gpu/drm/i915/intel_workarounds.c | 94 ++++ + drivers/gpu/drm/i915/selftests/huge_pages.c | 50 +- + drivers/gpu/drm/i915/selftests/i915_gem_context.c | 150 +++++- + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 34 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 110 ++-- + 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 | 5 +- + drivers/gpu/drm/i915/selftests/i915_vma.c | 31 +- + drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 53 +- + drivers/gpu/drm/i915/selftests/intel_lrc.c | 2 +- + drivers/gpu/drm/i915/selftests/intel_workarounds.c | 2 +- + drivers/gpu/drm/i915/selftests/mock_context.c | 7 + + drivers/gpu/drm/i915/selftests/mock_dmabuf.c | 14 - + 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 | 66 +-- + drivers/gpu/drm/mediatek/mtk_drm_fb.c | 76 +-- + drivers/gpu/drm/mediatek/mtk_drm_fb.h | 1 - + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 7 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 3 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 2 - + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 1 - + drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 4 +- + drivers/gpu/drm/msm/msm_fb.c | 54 +- + drivers/gpu/drm/omapdrm/omap_fb.c | 109 +--- + drivers/gpu/drm/omapdrm/omap_fb.h | 2 - + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 19 - + drivers/gpu/drm/panel/panel-innolux-p079zca.c | 1 - + drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 1 - + drivers/gpu/drm/panel/panel-lvds.c | 1 - + drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 58 ++- + .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 1 - + drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 1 - + drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c | 1 - + drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 1 - + drivers/gpu/drm/panel/panel-simple.c | 65 ++- + drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 1 - + drivers/gpu/drm/radeon/radeon_ttm.c | 8 +- + drivers/gpu/drm/rockchip/cdn-dp-reg.c | 16 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 86 +--- + drivers/gpu/drm/rockchip/rockchip_drm_fb.h | 3 - + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 73 ++- + drivers/gpu/drm/rockchip/rockchip_lvds.c | 6 +- + drivers/gpu/drm/scheduler/gpu_scheduler.c | 281 +++++++--- + drivers/gpu/drm/selftests/drm_mm_selftests.h | 2 + + drivers/gpu/drm/selftests/test-drm_mm.c | 71 +++ + drivers/gpu/drm/sti/sti_gdp.c | 6 +- + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 4 +- + drivers/gpu/drm/tegra/gem.c | 14 - + drivers/gpu/drm/ttm/ttm_bo_vm.c | 45 +- + drivers/gpu/drm/udl/udl_dmabuf.c | 18 - + drivers/gpu/drm/udl/udl_drv.h | 3 +- + drivers/gpu/drm/udl/udl_gem.c | 15 +- + drivers/gpu/drm/v3d/v3d_sched.c | 4 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 3 - + drivers/gpu/drm/vc4/vc4_plane.c | 96 +++- + drivers/gpu/drm/vc4/vc4_regs.h | 6 + + drivers/gpu/drm/vgem/vgem_drv.c | 5 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 32 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 1 - + drivers/gpu/drm/virtio/virtgpu_fb.c | 8 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 25 - + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 20 +- + drivers/gpu/drm/vmwgfx/vmwgfx_prime.c | 14 - + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 2 - + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 5 +- + drivers/gpu/drm/xen/xen_drm_front.c | 2 +- + drivers/gpu/drm/xen/xen_drm_front.h | 4 +- + drivers/gpu/drm/xen/xen_drm_front_shbuf.c | 2 +- + .../media/common/videobuf2/videobuf2-dma-contig.c | 3 +- + drivers/media/common/videobuf2/videobuf2-dma-sg.c | 3 +- + drivers/media/common/videobuf2/videobuf2-vmalloc.c | 3 +- + drivers/staging/android/ion/ion.c | 6 +- + drivers/tee/tee_shm.c | 6 - + include/drm/drm_atomic.h | 14 +- + include/drm/drm_bridge.h | 26 +- + include/drm/drm_connector.h | 30 ++ + include/drm/drm_crtc.h | 15 +- + include/drm/drm_file.h | 7 + + include/drm/drm_mm.h | 34 +- + include/drm/drm_mode_config.h | 28 + + include/drm/drm_modeset_helper_vtables.h | 11 + + include/drm/drm_panel.h | 1 + + include/drm/drm_plane.h | 9 +- + include/drm/drm_prime.h | 6 +- + include/drm/drm_writeback.h | 130 +++++ + include/drm/gpu_scheduler.h | 158 ++++-- + include/linux/dma-buf.h | 21 +- + include/uapi/drm/amdgpu_drm.h | 26 +- + include/uapi/drm/drm.h | 9 + + include/uapi/drm/drm_fourcc.h | 59 +++ + include/uapi/drm/drm_mode.h | 8 + + 307 files changed, 9148 insertions(+), 5053 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/panel/auo,g070vvn01.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/innolux,tv123wam.txt + create mode 100644 Documentation/gpu/amdgpu.rst + delete mode 100644 drivers/gpu/drm/amd/powerplay/inc/pp_power_source.h + create mode 100644 drivers/gpu/drm/drm_writeback.c + create mode 100644 include/drm/drm_writeback.h +Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD) +$ git merge drm-panel/drm/panel/for-next +Already up to date. +Merging drm-intel/for-linux-next (3160422251b2 drm/i915/icp: Add Interrupt Support) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/intel_sprite.c +Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.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_dvo.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_crt.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_crt.c +Auto-merging drivers/gpu/drm/i915/intel_atomic_plane.c +Auto-merging drivers/gpu/drm/i915/intel_atomic.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_gtt.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. +Resolved 'drivers/gpu/drm/i915/i915_gem_execbuffer.c' using previous resolution. +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 +[master e64ec16ee233] 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/cmd_parser.c | 43 +- + drivers/gpu/drm/i915/gvt/display.c | 58 +- + 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 | 15 +- + 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 | 16 + + 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 | 16 +- + 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 | 25 +- + drivers/gpu/drm/i915/gvt/vgpu.c | 56 +- + drivers/gpu/drm/i915/i915_debugfs.c | 36 +- + drivers/gpu/drm/i915/i915_drv.c | 62 +- + drivers/gpu/drm/i915/i915_drv.h | 53 +- + drivers/gpu/drm/i915/i915_gem.c | 145 +- + drivers/gpu/drm/i915/i915_gem_context.c | 9 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 16 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 704 ++-- + drivers/gpu/drm/i915/i915_gem_gtt.h | 57 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 3 + + drivers/gpu/drm/i915/i915_irq.c | 304 +- + drivers/gpu/drm/i915/i915_pci.c | 5 +- + drivers/gpu/drm/i915/i915_perf.c | 18 +- + drivers/gpu/drm/i915/i915_pvinfo.h | 5 +- + drivers/gpu/drm/i915/i915_reg.h | 3436 ++++++++++---------- + drivers/gpu/drm/i915/i915_request.c | 20 +- + drivers/gpu/drm/i915/i915_request.h | 7 +- + drivers/gpu/drm/i915/i915_trace.h | 33 - + drivers/gpu/drm/i915/i915_vma.c | 107 +- + 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 | 12 +- + drivers/gpu/drm/i915/intel_cdclk.c | 56 +- + drivers/gpu/drm/i915/intel_crt.c | 15 +- + drivers/gpu/drm/i915/intel_ddi.c | 93 +- + drivers/gpu/drm/i915/intel_display.c | 160 +- + drivers/gpu/drm/i915/intel_display.h | 7 +- + drivers/gpu/drm/i915/intel_dp.c | 68 +- + 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 | 126 +- + drivers/gpu/drm/i915/intel_dpll_mgr.h | 16 +- + drivers/gpu/drm/i915/intel_drv.h | 12 +- + drivers/gpu/drm/i915/intel_dvo.c | 2 +- + drivers/gpu/drm/i915/intel_engine_cs.c | 77 +- + drivers/gpu/drm/i915/intel_guc.c | 112 +- + 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_gvt.c | 2 + + drivers/gpu/drm/i915/intel_hangcheck.c | 17 +- + drivers/gpu/drm/i915/intel_hdmi.c | 98 +- + drivers/gpu/drm/i915/intel_i2c.c | 14 +- + drivers/gpu/drm/i915/intel_lrc.c | 102 +- + drivers/gpu/drm/i915/intel_lspcon.c | 2 +- + 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 | 219 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 246 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 39 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 332 +- + drivers/gpu/drm/i915/intel_sprite.c | 64 +- + drivers/gpu/drm/i915/intel_uc.c | 2 +- + drivers/gpu/drm/i915/intel_uncore.c | 16 +- + drivers/gpu/drm/i915/intel_uncore.h | 22 +- + drivers/gpu/drm/i915/intel_vbt_defs.h | 6 +- + drivers/gpu/drm/i915/intel_workarounds.c | 76 +- + drivers/gpu/drm/i915/selftests/huge_pages.c | 2 +- + .../gpu/drm/i915/selftests/i915_gem_coherency.c | 4 +- + drivers/gpu/drm/i915/selftests/i915_gem_context.c | 8 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 18 +- + drivers/gpu/drm/i915/selftests/i915_request.c | 6 +- + drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 16 +- + drivers/gpu/drm/i915/selftests/intel_lrc.c | 2 +- + drivers/gpu/drm/i915/selftests/intel_workarounds.c | 2 +- + drivers/gpu/drm/i915/selftests/mock_gtt.c | 18 +- + include/drm/i915_pciids.h | 37 +- + 95 files changed, 5180 insertions(+), 3216 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 (57e23de02f48 drm/sun4i: DW HDMI: Expand algorithm for possible crtcs) +$ git merge drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/sun4i/sun4i_tcon.c +Auto-merging drivers/gpu/drm/drm_dumb_buffers.c +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Recorded preimage for 'MAINTAINERS' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'MAINTAINERS'. +[master 22afa9f238cb] Merge remote-tracking branch 'drm-misc/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/display/ilitek,ili9341.txt | 27 ++ + .../bindings/display/panel/ilitek,ili9881c.txt | 20 + + .../bindings/display/sunxi/sun4i-drm.txt | 60 ++- + .../devicetree/bindings/vendor-prefixes.txt | 1 + + MAINTAINERS | 6 + + drivers/gpu/drm/drm_crtc_internal.h | 19 +- + drivers/gpu/drm/drm_dumb_buffers.c | 29 +- + drivers/gpu/drm/drm_file.c | 303 +++++++------ + drivers/gpu/drm/drm_framebuffer.c | 42 +- + drivers/gpu/drm/drm_internal.h | 2 + + drivers/gpu/drm/drm_ioctl.c | 4 +- + drivers/gpu/drm/drm_of.c | 9 +- + drivers/gpu/drm/gma500/framebuffer.c | 2 +- + drivers/gpu/drm/gma500/gem.c | 2 +- + drivers/gpu/drm/gma500/gma_display.c | 10 +- + drivers/gpu/drm/gma500/mdfld_intel_display.c | 1 - + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 1 - + drivers/gpu/drm/panel/Kconfig | 9 + + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 503 +++++++++++++++++++++ + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 23 +- + drivers/gpu/drm/sun4i/Makefile | 2 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 121 +++-- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 66 ++- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 46 +- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h | 8 +- + drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 54 ++- + drivers/gpu/drm/sun4i/sun8i_hdmi_phy_clk.c | 90 +++- + drivers/gpu/drm/sun4i/sun8i_mixer.c | 24 + + drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 300 ++++++++++++ + drivers/gpu/drm/sun4i/sun8i_tcon_top.h | 40 ++ + drivers/gpu/drm/tinydrm/Kconfig | 10 + + drivers/gpu/drm/tinydrm/Makefile | 1 + + drivers/gpu/drm/tinydrm/ili9341.c | 233 ++++++++++ + drivers/gpu/drm/v3d/v3d_drv.h | 6 +- + drivers/gpu/drm/v3d/v3d_fence.c | 13 +- + drivers/gpu/drm/v3d/v3d_gem.c | 11 +- + drivers/gpu/drm/v3d/v3d_irq.c | 3 - + drivers/gpu/drm/vc4/vc4_bo.c | 2 +- + drivers/gpu/drm/vc4/vc4_drv.h | 3 +- + include/drm/drmP.h | 23 +- + include/drm/drm_bridge.h | 22 +- + include/drm/drm_mode_config.h | 8 +- + include/drm/drm_of.h | 8 + + include/dt-bindings/clock/sun8i-tcon-top.h | 11 + + 46 files changed, 1860 insertions(+), 321 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/ilitek,ili9341.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/ilitek,ili9881c.txt + create mode 100644 drivers/gpu/drm/panel/panel-ilitek-ili9881c.c + create mode 100644 drivers/gpu/drm/sun4i/sun8i_tcon_top.c + create mode 100644 drivers/gpu/drm/sun4i/sun8i_tcon_top.h + create mode 100644 drivers/gpu/drm/tinydrm/ili9341.c + create mode 100644 include/dt-bindings/clock/sun8i-tcon-top.h +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 (7daf201d7fe8 Linux 4.18-rc2) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (c288248f5b26 ALSA: intel_hdmi: Use strlcpy() instead of strncpy()) +$ git merge sound/for-next +Auto-merging sound/pci/hda/patch_realtek.c +Auto-merging sound/pci/hda/hda_codec.h +Auto-merging sound/pci/hda/hda_codec.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/ac97-bus.txt | 32 + + Documentation/sound/alsa-configuration.rst | 2 +- + Documentation/sound/cards/multisound.sh | 1139 ++++++++++++++++++++ + Documentation/sound/hd-audio/models.rst | 264 ++++- + sound/ac97/bus.c | 26 + + 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/isa/Kconfig | 2 +- + sound/pci/ctxfi/ctmixer.c | 15 +- + sound/pci/hda/dell_wmi_helper.c | 116 +- + sound/pci/hda/hda_codec.c | 4 +- + sound/pci/hda/hda_codec.h | 3 - + sound/pci/hda/hda_generic.c | 144 ++- + sound/pci/hda/hda_generic.h | 16 + + sound/pci/hda/patch_analog.c | 4 +- + sound/pci/hda/patch_cirrus.c | 29 +- + sound/pci/hda/patch_conexant.c | 100 +- + sound/pci/hda/patch_realtek.c | 852 ++++++++------- + sound/pci/hda/patch_sigmatel.c | 31 +- + sound/pci/hda/patch_via.c | 294 +++-- + sound/pci/hda/thinkpad_helper.c | 27 +- + sound/pci/ice1712/prodigy_hifi.c | 21 +- + sound/usb/line6/toneport.c | 5 +- + sound/x86/intel_hdmi_audio.c | 2 +- + 26 files changed, 2374 insertions(+), 861 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/ac97-bus.txt + create mode 100755 Documentation/sound/cards/multisound.sh +Merging sound-asoc/for-next (665a698c2b73 Merge remote-tracking branches 'asoc/topic/doc' and 'asoc/topic/trace' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging sound/soc/codecs/simple-amplifier.c +Auto-merging drivers/mtd/nand/raw/marvell_nand.c +Removing Documentation/devicetree/bindings/sound/dioo,dio2125.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/audio-graph-card.txt | 2 + + .../devicetree/bindings/sound/dioo,dio2125.txt | 12 - + .../bindings/sound/marvell,pxa2xx-ac97.txt | 27 + + .../devicetree/bindings/sound/qcom,q6adm.txt | 6 + + .../devicetree/bindings/sound/qcom,q6afe.txt | 6 + + .../devicetree/bindings/sound/qcom,q6asm.txt | 6 + + Documentation/devicetree/bindings/sound/rt5682.txt | 50 + + .../devicetree/bindings/sound/simple-amplifier.txt | 12 + + .../devicetree/bindings/sound/tas571x.txt | 1 + + arch/arm/mach-pxa/devices.c | 148 +- + arch/arm/mach-pxa/devices.h | 6 +- + arch/arm/mach-pxa/pxa25x.c | 38 +- + arch/arm/mach-pxa/pxa27x.c | 39 +- + arch/arm/mach-pxa/pxa3xx.c | 41 +- + arch/arm/plat-pxa/ssp.c | 47 - + drivers/ata/pata_pxa.c | 10 +- + drivers/dma/pxa_dma.c | 15 +- + drivers/media/platform/pxa_camera.c | 22 +- + drivers/mmc/host/pxamci.c | 29 +- + drivers/mtd/nand/raw/marvell_nand.c | 17 +- + include/linux/dma/pxa-dma.h | 9 + + include/linux/platform_data/mmp_dma.h | 4 + + include/linux/pxa2xx_ssp.h | 2 - + 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 +- + include/sound/soc.h | 2 + + sound/arm/pxa2xx-ac97-lib.c | 12 + + sound/soc/amd/acp-da7219-max98357a.c | 66 +- + sound/soc/amd/acp-pcm-dma.c | 71 +- + sound/soc/amd/acp.h | 4 + + sound/soc/codecs/Kconfig | 21 +- + sound/soc/codecs/Makefile | 6 +- + sound/soc/codecs/ak4458.c | 2 +- + sound/soc/codecs/ak5558.c | 4 +- + sound/soc/codecs/cx20442.c | 23 +- + sound/soc/codecs/pcm1789.c | 3 +- + sound/soc/codecs/rt1305.c | 15 +- + sound/soc/codecs/rt5682.c | 2675 ++++++++++++++++++++ + sound/soc/codecs/rt5682.h | 1324 ++++++++++ + sound/soc/codecs/{dio2125.c => simple-amplifier.c} | 42 +- + sound/soc/codecs/tas571x.c | 110 + + sound/soc/codecs/tas571x.h | 16 + + 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/bytcr_rt5651.c | 128 +- + 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 | 56 +- + 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/pxa-ssp.c | 5 +- + sound/soc/pxa/pxa2xx-ac97.c | 12 + + sound/soc/qcom/apq8096.c | 2 +- + sound/soc/qcom/qdsp6/q6adm.c | 16 +- + sound/soc/qcom/qdsp6/q6afe-dai.c | 7 + + sound/soc/qcom/qdsp6/q6afe.c | 16 +- + sound/soc/qcom/qdsp6/q6asm-dai.c | 7 + + sound/soc/qcom/qdsp6/q6asm.c | 17 +- + sound/soc/qcom/qdsp6/q6routing.c | 9 +- + 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 | 162 +- + 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 +- + sound/soc/uniphier/aio-cpu.c | 5 - + 110 files changed, 5842 insertions(+), 1140 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/sound/dioo,dio2125.txt + create mode 100644 Documentation/devicetree/bindings/sound/marvell,pxa2xx-ac97.txt + create mode 100644 Documentation/devicetree/bindings/sound/rt5682.txt + create mode 100644 Documentation/devicetree/bindings/sound/simple-amplifier.txt + create mode 100644 include/sound/rt5682.h + create mode 100644 sound/soc/codecs/rt5682.c + create mode 100644 sound/soc/codecs/rt5682.h + rename sound/soc/codecs/{dio2125.c => simple-amplifier.c} (68%) + 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 (996302c5e856 module: replace VMLINUX_SYMBOL_STR() with __stringify() or string literal) +$ git merge modules/modules-next +Auto-merging include/linux/module.h +Merge made by the 'recursive' strategy. + include/linux/module.h | 4 +- + kernel/module.c | 119 +++++++++++++++++++++++++++---------------------- + 2 files changed, 67 insertions(+), 56 deletions(-) +Merging input/next (3a658f23fb68 Input: add bu21029 touch driver) +$ git merge input/next +Auto-merging include/xen/interface/io/kbdif.h +Merge made by the 'recursive' strategy. + .../bindings/input/touchscreen/bu21029.txt | 35 ++ + drivers/input/keyboard/cros_ec_keyb.c | 66 +-- + drivers/input/keyboard/imx_keypad.c | 12 +- + drivers/input/keyboard/snvs_pwrkey.c | 15 +- + drivers/input/misc/xen-kbdfront.c | 183 ++++---- + drivers/input/serio/i8042.c | 3 + + drivers/input/touchscreen/Kconfig | 12 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/bu21029_ts.c | 484 +++++++++++++++++++++ + drivers/input/touchscreen/fsl-imx25-tcq.c | 21 +- + drivers/input/touchscreen/imx6ul_tsc.c | 14 +- + include/xen/interface/io/displif.h | 8 + + include/xen/interface/io/kbdif.h | 78 +++- + include/xen/interface/io/sndif.h | 10 +- + 14 files changed, 760 insertions(+), 182 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/bu21029.txt + create mode 100644 drivers/input/touchscreen/bu21029_ts.c +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 (4cd7e9d2455d dm: prevent DAX mounts if not supported) +$ git merge device-mapper/for-next +Auto-merging drivers/dax/super.c +Merge made by the 'recursive' strategy. + drivers/dax/super.c | 8 ++++++++ + drivers/md/dm-raid.c | 2 +- + drivers/md/dm-table.c | 7 ++++--- + drivers/md/dm-thin-metadata.c | 9 --------- + drivers/md/dm-thin.c | 11 +++++++++-- + drivers/md/dm-writecache.c | 10 +++++----- + drivers/md/dm-zoned-target.c | 2 +- + drivers/md/dm.c | 8 +++----- + drivers/nvdimm/pmem.c | 3 ++- + 9 files changed, 33 insertions(+), 27 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 (aca94d6bb60c 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/bd71837-regulator.c | 14 ++-- + drivers/regulator/pfuze100-regulator.c | 78 ++++++++++++++++++++-- + include/linux/regulator/driver.h | 2 +- + include/linux/regulator/pfuze100.h | 11 +++ + 6 files changed, 166 insertions(+), 20 deletions(-) +Merging security/next-testing (12aaa9cfc578 Merge branch 'next-general' into next-testing) +$ git merge security/next-testing +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 5 ----- + 1 file changed, 5 deletions(-) +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 +Merge made by the 'recursive' strategy. + drivers/char/tpm/tpm.h | 19 +-- + drivers/char/tpm/tpm2-cmd.c | 258 +++++++++++++++++------------------------ + drivers/char/tpm/tpm_tis_spi.c | 9 +- + 3 files changed, 124 insertions(+), 162 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 +Auto-merging include/net/xfrm.h +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 (f1f517b8f555 dt-bindings: gpio: pca953x: Document interrupts, update example) +$ git merge devicetree/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Auto-merging Documentation/devicetree/bindings/gpio/gpio-pca953x.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/gpio/gpio-pca953x.txt | 3 +++ + Documentation/devicetree/bindings/vendor-prefixes.txt | 1 + + drivers/of/address.c | 6 ++++-- + 3 files changed, 8 insertions(+), 2 deletions(-) +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 (e1e4cb274b8d 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 (72d1fd086cbf Merge branch 'x86/hyperv') +$ git merge tip/auto-latest +Auto-merging lib/Kconfig.debug +Auto-merging kernel/bpf/syscall.c +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/compat.h +Auto-merging drivers/infiniband/core/rdma_core.c +Auto-merging arch/x86/kernel/cpu/intel_rdt_rdtgroup.c +Auto-merging arch/x86/kernel/cpu/intel_rdt.h +Removing arch/ia64/kernel/jprobes.S +Removing arch/arm64/lib/bitops.S +Merge made by the 'recursive' strategy. + Documentation/kprobes.txt | 35 +- + Documentation/x86/intel_rdt_ui.txt | 377 +++++- + Documentation/x86/x86_64/boot-options.txt | 4 + + arch/alpha/include/asm/atomic.h | 56 +- + arch/arc/include/asm/atomic.h | 86 +- + arch/arc/include/asm/kprobes.h | 2 - + arch/arc/kernel/kprobes.c | 50 +- + arch/arm/include/asm/atomic.h | 55 +- + arch/arm/include/asm/kprobes.h | 2 - + arch/arm/include/asm/probes.h | 1 - + arch/arm/probes/kprobes/core.c | 139 +- + arch/arm/probes/kprobes/test-core.c | 1 - + arch/arm64/include/asm/atomic.h | 47 +- + arch/arm64/include/asm/bitops.h | 21 +- + arch/arm64/include/asm/kprobes.h | 1 - + arch/arm64/kernel/probes/kprobes.c | 88 +- + arch/arm64/lib/Makefile | 2 +- + arch/arm64/lib/bitops.S | 76 -- + arch/h8300/include/asm/atomic.h | 19 +- + arch/hexagon/include/asm/atomic.h | 18 +- + arch/ia64/include/asm/atomic.h | 81 -- + 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/atomic.h | 24 +- + arch/m68k/include/asm/bitops.h | 6 +- + arch/mips/include/asm/atomic.h | 172 --- + arch/mips/include/asm/kprobes.h | 13 - + arch/mips/kernel/kprobes.c | 70 +- + arch/mips/kvm/mips.c | 4 +- + arch/openrisc/include/asm/atomic.h | 4 +- + arch/openrisc/include/asm/cmpxchg.h | 3 +- + arch/parisc/include/asm/atomic.h | 107 -- + arch/powerpc/include/asm/atomic.h | 52 +- + 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/riscv/include/asm/atomic.h | 149 +- + arch/s390/include/asm/atomic.h | 65 - + arch/s390/include/asm/kprobes.h | 2 - + arch/s390/kernel/kprobes.c | 86 +- + arch/s390/kvm/interrupt.c | 2 +- + arch/sh/include/asm/atomic.h | 35 - + 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/atomic_32.h | 24 +- + arch/sparc/include/asm/atomic_64.h | 65 +- + arch/sparc/include/asm/kprobes.h | 1 - + arch/sparc/kernel/kprobes.c | 65 +- + arch/sparc/lib/atomic32.c | 4 +- + arch/x86/Kconfig | 2 +- + arch/x86/entry/entry_64.S | 1 + + arch/x86/events/intel/lbr.c | 56 +- + arch/x86/events/perf_event.h | 5 + + arch/x86/hyperv/mmu.c | 73 +- + arch/x86/include/asm/atomic.h | 30 +- + arch/x86/include/asm/atomic64_32.h | 61 +- + arch/x86/include/asm/atomic64_64.h | 48 +- + arch/x86/include/asm/kprobes.h | 5 +- + arch/x86/include/asm/orc_types.h | 2 + + arch/x86/include/asm/percpu.h | 7 +- + arch/x86/include/asm/refcount.h | 1 + + arch/x86/include/asm/unwind_hints.h | 16 +- + arch/x86/kernel/apic/vector.c | 17 +- + arch/x86/kernel/cpu/Makefile | 4 +- + arch/x86/kernel/cpu/intel_rdt.c | 11 + + arch/x86/kernel/cpu/intel_rdt.h | 151 ++- + arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c | 129 +- + arch/x86/kernel/cpu/intel_rdt_pseudo_lock.c | 1508 +++++++++++++++++++++ + arch/x86/kernel/cpu/intel_rdt_pseudo_lock_event.h | 43 + + arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 788 ++++++++++- + arch/x86/kernel/cpu/mcheck/mce.c | 202 +-- + arch/x86/kernel/kprobes/common.h | 10 - + arch/x86/kernel/kprobes/core.c | 124 +- + arch/x86/kernel/kprobes/ftrace.c | 49 +- + arch/x86/kernel/kprobes/opt.c | 1 - + arch/x86/kernel/kvm.c | 4 +- + arch/x86/kernel/stacktrace.c | 42 +- + arch/x86/kernel/unwind_orc.c | 52 +- + arch/x86/kvm/lapic.c | 2 +- + arch/x86/mm/numa_emulation.c | 98 +- + arch/xtensa/include/asm/atomic.h | 98 -- + drivers/block/rbd.c | 2 +- + drivers/infiniband/core/rdma_core.c | 2 +- + fs/afs/rxrpc.c | 2 +- + fs/timerfd.c | 8 +- + include/asm-generic/atomic-instrumented.h | 71 +- + include/asm-generic/atomic.h | 33 - + include/asm-generic/atomic64.h | 15 +- + include/asm-generic/bitops/atomic.h | 188 +-- + include/asm-generic/bitops/lock.h | 68 +- + include/linux/atomic.h | 415 ++++-- + include/linux/bitops.h | 22 +- + include/linux/bits.h | 26 + + include/linux/compat.h | 9 - + include/linux/compat_time.h | 9 + + include/linux/kprobes.h | 53 - + include/linux/refcount.h | 7 +- + include/linux/swait.h | 36 +- + include/linux/syscalls.h | 10 +- + include/linux/time.h | 4 +- + include/linux/time64.h | 1 + + include/uapi/linux/time.h | 7 + + kernel/bpf/syscall.c | 4 +- + kernel/compat.c | 29 - + kernel/events/core.c | 4 +- + kernel/fail_function.c | 3 - + kernel/irq/irqdesc.c | 13 +- + kernel/irq/manage.c | 44 +- + kernel/irq/proc.c | 22 +- + kernel/kprobes.c | 167 +-- + 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/debug.c | 31 +- + kernel/sched/fair.c | 1 - + kernel/sched/swait.c | 32 +- + kernel/sys.c | 4 +- + kernel/test_kprobes.c | 94 -- + kernel/time/ntp.c | 6 +- + kernel/time/posix-stubs.c | 2 +- + kernel/time/posix-timers.c | 22 +- + kernel/time/time.c | 31 +- + kernel/time/timekeeping.c | 2 +- + kernel/trace/trace_kprobe.c | 11 +- + lib/Kconfig.debug | 2 +- + lib/atomic64.c | 14 +- + lib/refcount.c | 2 + + net/atm/pppoatm.c | 2 +- + net/rxrpc/call_object.c | 2 +- + net/rxrpc/conn_object.c | 4 +- + net/rxrpc/local_object.c | 2 +- + net/rxrpc/peer_object.c | 2 +- + tools/objtool/arch/x86/include/asm/orc_types.h | 2 + + tools/objtool/check.c | 1 + + tools/objtool/check.h | 2 +- + tools/objtool/orc_dump.c | 3 +- + tools/objtool/orc_gen.c | 2 + + virt/kvm/arm/arm.c | 4 +- + virt/kvm/arm/psci.c | 2 +- + virt/kvm/async_pf.c | 2 +- + virt/kvm/kvm_main.c | 4 +- + 149 files changed, 4311 insertions(+), 3525 deletions(-) + 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 +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 (bd917f682b45 Merge branches 'fixes1.2018.06.26a' and 'torture1.2018.06.26a' into HEAD) +$ 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 MAINTAINERS +Resolved 'kernel/rcu/tree_plugin.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e6462c5532a9] 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 | 18 +- + Documentation/admin-guide/kernel-parameters.txt | 4 +- + MAINTAINERS | 9 +- + include/linux/rculist.h | 19 +- + 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 | 126 ++- + kernel/rcu/rcuperf.c | 57 +- + kernel/rcu/rcutorture.c | 462 ++++++--- + kernel/rcu/srcutree.c | 39 +- + kernel/rcu/tiny.c | 4 +- + kernel/rcu/tree.c | 1017 +++++++++++--------- + kernel/rcu/tree.h | 71 +- + kernel/rcu/tree_exp.h | 14 +- + kernel/rcu/tree_plugin.h | 176 ++-- + 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, 1695 insertions(+), 1209 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 (eef04c7b3786 xen: Remove unnecessary BUG_ON from __unbind_from_irq()) +$ git merge xen-tip/linux-next +Already up to date. +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 (dfa32216711f can: mark led trigger as broken) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/leds/common.txt | 2 +- + .../devicetree/bindings/leds/leds-lt3593.txt | 34 ++++ + drivers/leds/Kconfig | 5 +- + drivers/leds/leds-apu.c | 44 ++++- + drivers/leds/leds-lt3593.c | 194 ++++++++++++--------- + drivers/leds/trigger/Kconfig | 15 +- + drivers/leds/trigger/ledtrig-activity.c | 5 +- + drivers/net/can/Kconfig | 6 + + 8 files changed, 198 insertions(+), 107 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/leds-lt3593.txt +Merging ipmi/for-next (46f2277e45fe 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/char/ipmi/kcs_bmc.c | 31 ++++++---------- + 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 +++ + 23 files changed, 248 insertions(+), 273 deletions(-) +Merging driver-core/driver-core-next (7daf201d7fe8 Linux 4.18-rc2) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (dc748b66dbfb dt-bindings: usb: new ehci-npcm7xx dt) +$ git merge usb/usb-next +Auto-merging drivers/usb/host/xhci.h +Auto-merging drivers/usb/host/xhci.c +Auto-merging drivers/usb/class/cdc-acm.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/usb/npcm7xx-usb.txt | 18 ++ + drivers/usb/class/cdc-acm.c | 35 ++-- + drivers/usb/core/hub.c | 42 ++++ + drivers/usb/host/Kconfig | 8 + + drivers/usb/host/Makefile | 1 + + drivers/usb/host/ehci-hcd.c | 1 + + drivers/usb/host/ehci-hub.c | 8 + + drivers/usb/host/ehci-npcm7xx.c | 212 +++++++++++++++++++++ + drivers/usb/host/xhci-hub.c | 11 ++ + drivers/usb/host/xhci.c | 1 + + drivers/usb/host/xhci.h | 2 + + drivers/usb/mon/mon_bin.c | 8 +- + include/linux/usb/hcd.h | 1 + + 13 files changed, 326 insertions(+), 22 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/npcm7xx-usb.txt + create mode 100644 drivers/usb/host/ehci-npcm7xx.c +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 (1d1de580a3e0 USB: serial: digi_acceleport: rename tty flag variable) +$ git merge usb-serial/usb-next +Merge made by the 'recursive' strategy. + drivers/usb/serial/cyberjack.c | 17 ++++++++++------- + drivers/usb/serial/digi_acceleport.c | 35 +++++++++++++++++++---------------- + drivers/usb/serial/io_edgeport.c | 17 +++++++++++------ + drivers/usb/serial/io_ti.c | 5 +++-- + drivers/usb/serial/ir-usb.c | 2 +- + drivers/usb/serial/mos7720.c | 5 +++-- + drivers/usb/serial/mos7840.c | 5 +++-- + drivers/usb/serial/quatech2.c | 7 ++++--- + drivers/usb/serial/sierra.c | 13 +++++++------ + drivers/usb/serial/ssu100.c | 2 +- + drivers/usb/serial/symbolserial.c | 5 +++-- + drivers/usb/serial/ti_usb_3410_5052.c | 9 +++++---- + drivers/usb/serial/usb_wwan.c | 5 +++-- + 13 files changed, 73 insertions(+), 54 deletions(-) +Merging usb-chipidea-next/ci-for-usb-next (ba0ab35a81de usb: chipidea: tegra: Use aligned DMA on Tegra114/124) +$ git merge usb-chipidea-next/ci-for-usb-next +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/ci_hdrc_tegra.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging phy-next/next (ce397d215ccd Linux 4.18-rc1) +$ 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 (7daf201d7fe8 Linux 4.18-rc2) +$ 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 (71e9bd3ff847 staging: rtl8188eu: add SPDX identifiers) +$ git merge staging/staging-next +Auto-merging drivers/staging/rtl8188eu/include/wifi.h +Removing drivers/staging/iio/gyro/adis16060_core.c +Removing drivers/staging/iio/gyro/Makefile +Removing drivers/staging/iio/gyro/Kconfig +Auto-merging drivers/input/touchscreen/Makefile +Auto-merging drivers/input/touchscreen/Kconfig +Auto-merging drivers/iio/imu/inv_mpu6050/inv_mpu_core.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-iio | 12 + + .../bindings/iio/adc/at91-sama5d2_adc.txt | 9 + + .../input/touchscreen/resistive-adc-touch.txt | 30 + + .../bindings/input/touchscreen/touchscreen.txt | 3 + + MAINTAINERS | 13 + + drivers/iio/adc/Kconfig | 3 +- + drivers/iio/adc/at91-sama5d2_adc.c | 780 +++++++++++++++++++-- + drivers/iio/counter/104-quad-8.c | 87 ++- + drivers/iio/dac/ad5686.c | 7 + + drivers/iio/dac/ad5686.h | 1 + + drivers/iio/dac/ad5696-i2c.c | 1 + + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 31 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 36 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c | 143 ++-- + drivers/iio/industrialio-core.c | 27 +- + drivers/input/touchscreen/Kconfig | 13 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/resistive-adc-touch.c | 204 ++++++ + drivers/staging/clocking-wizard/Kconfig | 2 +- + drivers/staging/comedi/comedi.h | 2 +- + drivers/staging/comedi/comedi_compat32.h | 2 +- + drivers/staging/comedi/comedi_fops.c | 2 +- + drivers/staging/comedi/comedi_pci.h | 2 +- + drivers/staging/comedi/comedi_pcmcia.h | 2 +- + drivers/staging/comedi/comedidev.h | 4 +- + drivers/staging/comedi/comedilib.h | 2 +- + 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 | 64 +- + drivers/staging/iio/Kconfig | 1 - + drivers/staging/iio/Makefile | 1 - + drivers/staging/iio/accel/adis16203.c | 6 +- + drivers/staging/iio/accel/adis16240.c | 11 +- + drivers/staging/iio/adc/ad7606.h | 2 +- + drivers/staging/iio/gyro/Kconfig | 16 - + drivers/staging/iio/gyro/Makefile | 6 - + drivers/staging/iio/gyro/adis16060_core.c | 234 ------- + 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/rtl8188eu/core/rtw_ap.c | 10 +- + drivers/staging/rtl8188eu/core/rtw_cmd.c | 12 +- + drivers/staging/rtl8188eu/core/rtw_debug.c | 10 +- + drivers/staging/rtl8188eu/core/rtw_efuse.c | 10 +- + drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 10 +- + drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 10 +- + drivers/staging/rtl8188eu/core/rtw_iol.c | 11 +- + drivers/staging/rtl8188eu/core/rtw_led.c | 11 +- + drivers/staging/rtl8188eu/core/rtw_mlme.c | 10 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 10 +- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 10 +- + drivers/staging/rtl8188eu/core/rtw_recv.c | 10 +- + drivers/staging/rtl8188eu/core/rtw_rf.c | 10 +- + drivers/staging/rtl8188eu/core/rtw_security.c | 10 +- + drivers/staging/rtl8188eu/core/rtw_sreset.c | 10 +- + drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 10 +- + drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 10 +- + drivers/staging/rtl8188eu/core/rtw_xmit.c | 10 +- + drivers/staging/rtl8188eu/hal/bb_cfg.c | 10 +- + drivers/staging/rtl8188eu/hal/fw.c | 13 +- + drivers/staging/rtl8188eu/hal/hal_com.c | 10 +- + drivers/staging/rtl8188eu/hal/hal_intf.c | 10 +- + drivers/staging/rtl8188eu/hal/mac_cfg.c | 18 +- + drivers/staging/rtl8188eu/hal/odm.c | 10 +- + drivers/staging/rtl8188eu/hal/odm_HWConfig.c | 10 +- + drivers/staging/rtl8188eu/hal/odm_RTL8188E.c | 10 +- + drivers/staging/rtl8188eu/hal/phy.c | 10 +- + drivers/staging/rtl8188eu/hal/pwrseq.c | 10 +- + drivers/staging/rtl8188eu/hal/pwrseqcmd.c | 10 +- + drivers/staging/rtl8188eu/hal/rf.c | 10 +- + drivers/staging/rtl8188eu/hal/rf_cfg.c | 18 +- + drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 10 +- + drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 10 +- + drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 10 +- + drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c | 10 +- + drivers/staging/rtl8188eu/hal/rtl8188e_xmit.c | 10 +- + drivers/staging/rtl8188eu/hal/rtl8188eu_led.c | 10 +- + drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 10 +- + drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 10 +- + drivers/staging/rtl8188eu/hal/usb_halinit.c | 10 +- + drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h | 10 +- + drivers/staging/rtl8188eu/include/Hal8188EPhyReg.h | 10 +- + drivers/staging/rtl8188eu/include/HalVerDef.h | 10 +- + drivers/staging/rtl8188eu/include/basic_types.h | 12 +- + drivers/staging/rtl8188eu/include/drv_types.h | 10 +- + drivers/staging/rtl8188eu/include/fw.h | 13 +- + drivers/staging/rtl8188eu/include/hal_com.h | 10 +- + drivers/staging/rtl8188eu/include/hal_intf.h | 10 +- + drivers/staging/rtl8188eu/include/ieee80211.h | 10 +- + drivers/staging/rtl8188eu/include/mlme_osdep.h | 10 +- + drivers/staging/rtl8188eu/include/mon.h | 10 +- + drivers/staging/rtl8188eu/include/mp_custom_oid.h | 10 +- + drivers/staging/rtl8188eu/include/odm.h | 10 +- + drivers/staging/rtl8188eu/include/odm_HWConfig.h | 11 +- + drivers/staging/rtl8188eu/include/odm_RTL8188E.h | 10 +- + .../staging/rtl8188eu/include/odm_RegDefine11N.h | 10 +- + drivers/staging/rtl8188eu/include/odm_debug.h | 10 +- + drivers/staging/rtl8188eu/include/odm_precomp.h | 10 +- + drivers/staging/rtl8188eu/include/odm_reg.h | 10 +- + drivers/staging/rtl8188eu/include/odm_types.h | 10 +- + drivers/staging/rtl8188eu/include/osdep_intf.h | 10 +- + drivers/staging/rtl8188eu/include/osdep_service.h | 10 +- + drivers/staging/rtl8188eu/include/pwrseq.h | 11 +- + drivers/staging/rtl8188eu/include/pwrseqcmd.h | 10 +- + drivers/staging/rtl8188eu/include/recv_osdep.h | 10 +- + drivers/staging/rtl8188eu/include/rtl8188e_cmd.h | 10 +- + drivers/staging/rtl8188eu/include/rtl8188e_dm.h | 10 +- + drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 10 +- + drivers/staging/rtl8188eu/include/rtl8188e_led.h | 10 +- + drivers/staging/rtl8188eu/include/rtl8188e_recv.h | 10 +- + drivers/staging/rtl8188eu/include/rtl8188e_spec.h | 10 +- + drivers/staging/rtl8188eu/include/rtl8188e_xmit.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_android.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_ap.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_cmd.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_debug.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_eeprom.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_efuse.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_event.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_ht.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_ioctl.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_ioctl_rtl.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_ioctl_set.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_iol.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_led.h | 11 +- + drivers/staging/rtl8188eu/include/rtw_mlme.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 10 +- + .../staging/rtl8188eu/include/rtw_mp_phy_regdef.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_pwrctrl.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_qos.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_recv.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_rf.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_security.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_sreset.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_xmit.h | 10 +- + drivers/staging/rtl8188eu/include/sta_info.h | 10 +- + drivers/staging/rtl8188eu/include/usb_ops_linux.h | 10 +- + drivers/staging/rtl8188eu/include/wifi.h | 10 +- + drivers/staging/rtl8188eu/include/wlan_bssdef.h | 10 +- + drivers/staging/rtl8188eu/include/xmit_osdep.h | 10 +- + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 10 +- + drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 10 +- + drivers/staging/rtl8188eu/os_dep/mon.c | 10 +- + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 10 +- + drivers/staging/rtl8188eu/os_dep/osdep_service.c | 10 +- + drivers/staging/rtl8188eu/os_dep/recv_linux.c | 10 +- + drivers/staging/rtl8188eu/os_dep/rtw_android.c | 10 +- + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 10 +- + drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 10 +- + drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 10 +- + drivers/staging/rtl8192e/rtl819x_BAProc.c | 22 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 2 - + .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 71 +- + .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 610 ++++++++-------- + drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h | 94 +-- + 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 +- + include/dt-bindings/iio/adc/at91-sama5d2_adc.h | 16 + + include/uapi/linux/iio/types.h | 1 + + tools/iio/iio_event_monitor.c | 2 + + 184 files changed, 2108 insertions(+), 2230 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/resistive-adc-touch.txt + create mode 100644 drivers/input/touchscreen/resistive-adc-touch.c + delete mode 100644 drivers/staging/iio/gyro/Kconfig + delete mode 100644 drivers/staging/iio/gyro/Makefile + delete mode 100644 drivers/staging/iio/gyro/adis16060_core.c + create mode 100644 include/dt-bindings/iio/adc/at91-sama5d2_adc.h +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 (f8ccde4a31d3 Merge branch 'topic/renesas' into next) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt | 1 + + crypto/async_tx/async_pq.c | 10 ++++++---- + crypto/async_tx/raid6test.c | 4 +++- + drivers/dma/ioat/dma.c | 6 ++++++ + 4 files changed, 16 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 (dc047dc7c64f 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 +Auto-merging drivers/scsi/scsi_transport_fc.c +Auto-merging drivers/scsi/cxlflash/ocxl_hw.c +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/aacraid/rx.c | 2 +- + drivers/scsi/aacraid/sa.c | 2 +- + drivers/scsi/aacraid/src.c | 6 +- + drivers/scsi/advansys.c | 10 +- + 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/ch.c | 2 +- + drivers/scsi/cxlflash/ocxl_hw.c | 5 +- + drivers/scsi/cxlflash/superpipe.c | 6 +- + drivers/scsi/dc395x.c | 5 +- + 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/hosts.c | 32 ++ + drivers/scsi/ibmvscsi/ibmvfc.c | 2 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 2 +- + drivers/scsi/imm.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/libsas/sas_scsi_host.c | 4 +- + drivers/scsi/lpfc/lpfc_attr.c | 10 +- + drivers/scsi/lpfc/lpfc_sli.c | 4 +- + drivers/scsi/lpfc/lpfc_sli.h | 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 | 61 ++-- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 36 ++- + drivers/scsi/mesh.c | 4 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 437 ++++++++++++-------------- + drivers/scsi/mpt3sas/mpt3sas_base.h | 30 +- + drivers/scsi/mpt3sas/mpt3sas_config.c | 81 +++-- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 395 +++++++++++++----------- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 459 ++++++++++------------------ + drivers/scsi/mpt3sas/mpt3sas_transport.c | 62 ++-- + drivers/scsi/mpt3sas/mpt3sas_trigger_diag.c | 18 +- + drivers/scsi/mpt3sas/mpt3sas_warpdrive.c | 3 - + drivers/scsi/nsp32_debug.c | 2 +- + drivers/scsi/qedi/qedi_fw_api.c | 30 +- + drivers/scsi/qla2xxx/qla_inline.h | 4 +- + drivers/scsi/qla2xxx/qla_target.c | 14 +- + drivers/scsi/qlogicpti.c | 2 +- + drivers/scsi/scsi.c | 4 +- + drivers/scsi/scsi.h | 3 - + drivers/scsi/scsi_error.c | 6 +- + drivers/scsi/scsi_ioctl.c | 4 +- + drivers/scsi/scsi_lib.c | 405 +++++++++++++----------- + drivers/scsi/scsi_scan.c | 2 +- + drivers/scsi/scsi_sysfs.c | 2 +- + drivers/scsi/scsi_transport_fc.c | 4 +- + drivers/scsi/scsi_transport_spi.c | 2 +- + drivers/scsi/scsi_typedefs.h | 2 - + drivers/scsi/sd.c | 15 +- + drivers/scsi/sg.c | 7 +- + drivers/scsi/smartpqi/smartpqi.h | 12 +- + drivers/scsi/smartpqi/smartpqi_init.c | 160 ++++++---- + drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +- + drivers/scsi/sym53c8xx_2/sym_glue.h | 2 +- + drivers/scsi/ufs/ufs-qcom.c | 21 +- + drivers/scsi/ufs/ufshcd.c | 37 ++- + 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_device.c | 24 -- + drivers/target/target_core_transport.c | 5 +- + drivers/target/target_core_user.c | 218 +++++++++---- + 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/scsi/scsi_host.h | 1 + + include/target/iscsi/iscsi_target_core.h | 1 + + include/target/target_core_backend.h | 2 - + include/target/target_core_base.h | 10 +- + lib/Makefile | 2 +- + lib/percpu_ida.c | 370 ---------------------- + 96 files changed, 1808 insertions(+), 2055 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 (0c218e16a850 scsi: tcmu: Don't pass KERN_ERR to pr_err) +$ git merge scsi-mkp/for-next +Already up to date. +Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker) +$ git merge target-updates/for-next +Already up to date. +Merging target-bva/for-next (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 (b039e1ccb07f Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 7 +- + drivers/hwspinlock/hwspinlock_core.c | 223 +++++++- + drivers/remoteproc/Kconfig | 22 + + drivers/remoteproc/Makefile | 2 + + drivers/remoteproc/qcom_adsp_pil.c | 156 +----- + drivers/remoteproc/qcom_common.c | 26 +- + drivers/remoteproc/qcom_q6v5.c | 243 +++++++++ + drivers/remoteproc/qcom_q6v5.h | 46 ++ + drivers/remoteproc/qcom_q6v5_pil.c | 157 +----- + drivers/remoteproc/qcom_q6v5_wcss.c | 601 +++++++++++++++++++++ + drivers/remoteproc/qcom_sysmon.c | 5 +- + drivers/remoteproc/remoteproc_core.c | 110 +++- + drivers/soc/qcom/mdt_loader.c | 87 ++- + drivers/spi/spi-sprd-adi.c | 11 +- + include/linux/hwspinlock.h | 37 +- + include/linux/remoteproc.h | 19 +- + include/linux/soc/qcom/mdt_loader.h | 4 + + 17 files changed, 1399 insertions(+), 357 deletions(-) + create mode 100644 drivers/remoteproc/qcom_q6v5.c + create mode 100644 drivers/remoteproc/qcom_q6v5.h + create mode 100644 drivers/remoteproc/qcom_q6v5_wcss.c +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 937f61365d85] 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 +Already up to date. +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 (7daf201d7fe8 Linux 4.18-rc2) +$ git merge nvdimm/libnvdimm-for-next +Already up to date. +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 +Auto-merging drivers/net/ntb_netdev.c +Merge made by the 'recursive' strategy. + drivers/net/ntb_netdev.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging kspp/for-next/kspp (fcd21109bba1 doc: self-protection: Add information about STACKLEAK feature) +$ git merge kspp/for-next/kspp +Auto-merging fs/proc/base.c +Auto-merging arch/x86/entry/entry_64.S +Auto-merging arch/x86/Kconfig +Merge made by the 'recursive' strategy. + Documentation/security/self-protection.rst | 23 +- + Documentation/x86/x86_64/mm.txt | 2 + + arch/Kconfig | 53 ++++ + arch/x86/Kconfig | 1 + + arch/x86/entry/calling.h | 14 + + arch/x86/entry/entry_32.S | 7 + + arch/x86/entry/entry_64.S | 3 + + arch/x86/entry/entry_64_compat.S | 5 + + arch/x86/kernel/dumpstack.c | 31 ++ + drivers/misc/lkdtm/Makefile | 2 + + drivers/misc/lkdtm/core.c | 3 + + drivers/misc/lkdtm/lkdtm.h | 5 + + drivers/misc/lkdtm/stackleak.c | 146 +++++++++ + fs/proc/base.c | 18 ++ + include/linux/sched.h | 5 + + include/linux/stackleak.h | 27 ++ + kernel/Makefile | 4 + + kernel/fork.c | 3 + + kernel/stackleak.c | 96 ++++++ + scripts/Makefile.gcc-plugins | 3 + + scripts/gcc-plugins/gcc-common.h | 26 +- + scripts/gcc-plugins/stackleak_plugin.c | 480 +++++++++++++++++++++++++++++ + 22 files changed, 938 insertions(+), 19 deletions(-) + create mode 100644 drivers/misc/lkdtm/stackleak.c + create mode 100644 include/linux/stackleak.h + create mode 100644 kernel/stackleak.c + create mode 100644 scripts/gcc-plugins/stackleak_plugin.c +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 lib/Makefile +Auto-merging lib/Kconfig.debug +CONFLICT (content): Merge conflict in lib/Kconfig.debug +Auto-merging include/linux/fs.h +Auto-merging fs/inode.c +Auto-merging fs/ext4/inode.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 +Recorded preimage for 'lib/Kconfig.debug' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'lib/Kconfig.debug'. +[master 05fe13b28ecf] Merge remote-tracking branch 'xarray/xarray' +$ git diff -M --stat --summary HEAD^.. + .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 +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 scripts/checkpatch.pl +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 +Auto-merging mm/backing-dev.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 ipc/sem.c +CONFLICT (content): Merge conflict in ipc/sem.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/dcache.c +Auto-merging fs/bfs/inode.c +Resolved 'ipc/sem.c' using previous resolution. +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 9fefcef83bea] 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 + + 857015ea60f8...d3d095fd03af akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (d3d095fd03af 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..431d2ccf3dae --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20180628 |