diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-05-11 15:56:33 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-05-11 15:56:33 +1000 |
| commit | e931f0eb5d4f8ceec7d3d644860a6d7ef340e95b (patch) | |
| tree | a4959a35658ebe95e85aea838839c2637902ae21 | |
| parent | 5a0af41b862383fc2b62829bcf67ed5ed21ebb53 (diff) | |
| download | linux-next-e931f0eb5d4f8ceec7d3d644860a6d7ef340e95b.tar.gz | |
Add linux-next specific files for 20180511next-20180511
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 269 | ||||
| -rw-r--r-- | Next/Trees | 271 | ||||
| -rw-r--r-- | Next/merge.log | 7506 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 8049 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..08503653176a --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,269 @@ +Name SHA1 +---- ---- +origin 94d7dbf108813ea45a91e27e9a8bd231d5a23fa7 +fixes 147a89bc71e7db40f011454a40add7ff2d10f8d8 +kbuild-current 0da7e43261142b93307b70da455376ad84414d0a +arc-current 661e50bc853209e41a5c14a290ca4decc43cbfd1 +arm-current 30cfae461581035e9063ced8c8f002fcd6673a25 +arm64-fixes 3789c122d0a016b947ce5c05d3f1fbafa5db8f26 +m68k-current ecd685580c8feb9a91c758257a66355a673594d9 +powerpc-fixes 6c0a8f6b5a45ac892a763b6299bd3c5324fc5e02 +sparc fff75eb2a08c2ac96404a2d79685668f3cf5a7a3 +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net ca3943c4aaff083bc25419f04e549e293590258e +bpf 26aeb9daa02cd37178321cf915efd3d5eb8b0511 +ipsec 2c5d5b13c6eb79f5677e206b8aad59b3a2097f60 +netfilter bb7b40aecbf778c0c83a5bd62b0f03ca9f49a618 +ipvs 2f99aa31cd7a5d667f17dd2924c884c3d2c621ac +wireless-drivers a8d7aa17bbc970971ccdf71988ea19230ab368b1 +mac80211 914eac248d876f9c00cd1792ffec3d182c863f13 +rdma-fixes 9aa169213d1166d30ae357a44abbeae93459339d +sound-current f13876e2c33a657a71bcbb10f767c0951b165020 +sound-asoc-fixes 4506b923fac40b5c570b97ee0a0d30a4247317a1 +regmap-fixes e37563bb6c59a6948aa09beb77ba263600d19792 +regulator-fixes e37563bb6c59a6948aa09beb77ba263600d19792 +spi-fixes 19fe64cdd0bea8ec87f628d0d8b71bf188b1b7e7 +pci-current 0cf22d6b317ce0103b7d5a47878aa5ef94240433 +driver-core.current 6da6c0db5316275015e8cc2959f12a17584aeb64 +tty.current 6da6c0db5316275015e8cc2959f12a17584aeb64 +usb.current 75bc37fefc4471e718ba8e651aa74673d4e0a9eb +usb-gadget-fixes ed769520727edbf526e0f510e6c501fc6ba3824a +usb-serial-fixes 4842ed5bfcb9daf6660537d70503c18d38dbdbb8 +usb-chipidea-fixes 964728f9f407eca0b417fdf8e784b7a76979490c +phy 60cc43fc888428bb2f18f08997432d426a243338 +staging.current 9d569b1cf7a2a385770835df15f77dde587b58a3 +char-misc.current 6da6c0db5316275015e8cc2959f12a17584aeb64 +input-current f6eeb9e548572c0e64632672dbd04363cbdd4eed +crypto-current eea0d3ea7546961f69f55b26714ac8fd71c7c020 +ide 8e44e6600caa7b96a5b71ae36c8829db753c2d70 +vfio-fixes 834814e80268c818f354c8f402e0c6604ed75589 +kselftest-fixes c28077035ef30cc2e9c4781afc90c45d4f687623 +modules-fixes be71eda5383faa663efdba9ef54a6b8255e3c7f0 +slave-dma-fixes 613e0bb622e77c8f7501c42c4e17cd544184f67d +backlight-fixes 8ff5cbc6e3c5c2855245c014f3ba572ddfc5ab0f +mtd-fixes 3057fcef385348fe85173f1b0c824d89f1176f72 +nand-fixes ee02f73e04c0e690600f621a3a1d2245834af7fe +spi-nor-fixes 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +mfd-fixes 107b7d9fa94c4692d9104243f0e793e2a4e1366e +v4l-dvb-fixes b84c8fdf8e6c318ecdb3fdbdd4953d83113283ea +reset-fixes e6914365fd280fce303a89b8a8d4529af5a2e0f9 +mips-fixes b3d7e55c3f886493235bfee08e1e5a4a27cbcce8 +omap-fixes 41bd6adf3c5d3990d7a67639aff53d54483744fa +kvm-fixes ecf08dad723d3e000aecff6c396f54772d124733 +kvms390-fixes f07afa0462b76a5b9c4f3a43d5ac24fdb86a90c2 +hwmon-fixes 40626a1bf657eef557fcee9e1b8ef5b4f5b56dcd +nvdimm-fixes ce376ed6b70693dc2eec64d8dff994eff92dcac9 +drm-intel-fixes e8f48f96db7e482995743f461b3e8a5c1a102533 +drm-misc-fixes 9a0e9802217291e54c4dd1fc5462f189a4be14ec +kbuild 8b31e5b1000610bbb860dc64044edfff0208b36e +leaks 9f84a0f7f1a613335a9aaf0abd5858906752bf93 +uuid c0020756315eebec58310aca42cf9fb73e1322eb +dma-mapping d0c8ba40c6cc0fee18b0c458904e07817d6138e5 +asm-generic a71e7c44ffb7baea0c0795824afc34cc0bc1a301 +arc 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +arm 6dc8c9d147dd0ca8538466c8d7ed14c1d977986c +arm-perf 44300aed5d28e61aae124c401170ac94c98d2127 +arm-soc c12d7e9fe9af142bce24f723191c4806da9fecc6 +actions 61862a89e6acb61e1193c3ad6d4eeab966c470ed +alpine 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +amlogic ce650ad1cde762a8b2f7ddff313a28223143ad76 +aspeed 6534b2d0de3693b8508375c2f01951d6eb5c69be +at91 20d3f36b0feaad5ab90ccff77e18c13939065cad +bcm2835 5c483a0c319cdc7fa46676939da59df1fa8abb5a +imx-mxs 75ed360763f2dc5776a372c3303d1bae501769ad +keystone fb5d812c3cb33d0410cb6d3beebca670b3af097d +mediatek 2916ebd42a4199def278c5e5063bef37dff63af7 +mvebu e76bec8e643a7e4162c0bfab0d5315f7037129aa +omap 82ce9553c47fbcc4129ae3e0e207280e01acaa95 +reset d7bab65b1f57cdf2d81fc469cea6b2160a50e917 +qcom c9fe09a7937186ab46c793fcb897f18570b98877 +realtek 2b6286eb7ab8b9a22f7238bdaad403badd4a93e9 +renesas 6480b1624fdda66150f7d0568a97c825ba1c6ac3 +rockchip d736f2a5e6bc0992149fcccf6ffe2d1b66ace1d4 +samsung bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +samsung-krzk cc4b07f8156c271505ae5634091a46d5fee31b7e +sunxi 2b32dbbf4334e22460a6e94186239da74a21142f +tegra 0331f709c1b53ca15d313a800d59394fa8a6f225 +arm64 24534b3511828c66215fdf1533d77a7bf2e1fdb2 +clk 96695741a6462840f09a9a7db15e6793ee5fb82d +clk-samsung e8cf870f253bdeadd4ce8a10e34655ef89ad57b1 +c6x 85fa2cc51104ee5b529ce85b12f4c8421888544f +m68k f245ff73dbe9ff30368da344e1283649f2ca7ebe +m68knommu 262afd3d980b7dbee769e3fc87e356eb59290671 +microblaze a7a9e2f0410ddf9ec7491fca0c91fcb4c5c30cbb +mips ea4d340cbea470247b19ee696e31f102bc64466a +mips-james 23f8adc497b7cf1d21845f2bedca354f955f3a8e +nds32 4b5b05725cf279f28f4849d164399c970f59f9ba +nios2 3d9644ef9a0f6c3ca0c1bd2aea1d82e7ea0a7f24 +openrisc d56f3af9e801970d21c57621de3b42bc17eac152 +parisc-hd 07943d6329dc32c8dcd12cf2c5efd26ca7df0ae6 +powerpc 53da14d0833a663cb98ef111ed91c575f2da9236 +powerpc-pkey d86a4ba02fc6bea4670b2f59b208152a4a34c3c0 +fsl c095ff93f901c1620b28dce4d813dd548bc5236b +risc-v 6d08b06e67cd117f6992c46611dfb4ce267cd71e +s390 b7e7f5051bf860dd2a39b581caa10ea3e503da56 +sparc-next 17dec0a949153d9ac00760ba2f5b78cb583e995f +sh bf9c7e3d7924f72225f8f9c28438b4a711192ad3 +uml e40238dedb484c8a19f8257e4ef5d77d038f9ad8 +xtensa ae6063c83634cbef7f73ec8a3ab7a6adf5294716 +fscrypt 6da6c0db5316275015e8cc2959f12a17584aeb64 +befs 55d945e2e4aa148ef38bdfabb9569af78183a539 +btrfs 7c9a09f56a91c4ee5636703d3a95c72710917718 +btrfs-kdave b8111316f384d54af1e6908098dcce7390bb8c4d +ceph fc218544fbc800d1c91348ec834cacfb257348f7 +cifs c3d5c2a93abfc181d9f274dd5e4b18749dc0643f +configfs 6ace4f6bbcfde70278a33c11443ecda3ed0ec1b6 +ecryptfs e86281e700cca8a773f9a572fa406adf2784ba5c +ext3 b1255ee6a289cd62730506246f599262a99ed5d8 +ext4 7ef79ad52136712172eb0525bf0b462516bf2f93 +f2fs 5b19d284f5195a925dd015a6397bfce184097378 +fuse 5ba24197b94d4070d8c2a17fa4944a55cc39ef03 +jfs 86313903430d08739e391ad51b4865dc3a2bf522 +nfs 036db8bd96374c66424f270f3370ddaf0adf7506 +nfs-anna ffbfa2ce88f169aa4b5cc90065cdc1c3c8003c27 +nfsd 5e90394d7f7cbb94885ed0e04dfd26e69874cfb6 +orangefs 8e9ba5c48ea690060a814fbac6a8c046ab935d79 +overlayfs 16149013f8391d3bd7bcbcbe3bfd2fd06ba110e4 +ubifs b5094b7f135be34630e3ea8a98fa215715d0f29d +xfs 9d93388b0afe1b582fdfd590b754108b03bd5f69 +file-locks 7a107c0f55a3b4c6f84a4323df5610360bde1684 +vfs d944db1fd238774c03851f8965f112442ae82d6b +vfs-miklos 0eb8af4916a540c362a2950e5ab54eca32eb7d58 +printk f8521c77fcd4207516e98427cb14b4b6064386d3 +pci 03cdfc72ee0200dcaeb107c3f3416ed012e57b7d +pstore e698aaf37f9fac419ac6c1867137cce83c90c80b +hid 4153e8aad37704ca97184ccc52ea74a99e6e9893 +i2c 5c1718af7c4bc217e6ef244f1c0ff34d07005589 +dmi 5cb06cfce4a8a15bda8c7bcf8012f6ce301cad0e +hwmon-staging 6153ff637b26132a63b07ad3c142e0a2481163e0 +jc_docs b971a90f7dd3c3acb5967d1cf1a465d82a368d47 +v4l-dvb 901b9dd5e31e8c58e30bf81ea4ab12641fb3ea76 +v4l-dvb-next f10379aad39e9da8bc7d1822e251b5f0673067ef +fbdev 85d108dee574c038423f573b6ae93d43d12e971e +pm 6c1f315f566e22e627fe5130195080574afedac7 +cpupower 9fd0c40451468754754271ba0cbb63b6927911df +idle 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f +opp 28fa4aca262ce0865d27788ebc480e643117d7ab +thermal f9cd6a904e6e97e02f98502c01a79fd1f0dabe60 +thermal-soc 9efc58dfa14a200efd5c005dd25ca95c686c1d8a +ieee1394 188775181bc05f29372b305ef96485840e351fde +dlm f706d830154b6c8405c6b77595a60d135182c97e +swiotlb 69369f52d28a34c84acb6f2a8a585e743441566a +rdma 056f9c7f39bf517d58f32797f1eb1465bb6f6ef2 +net-next ec9efb523cb8daf7b9d2e5c9cb80b255b716a777 +bpf-next a84880ef4352c61896028448d809e32f8646628d +ipsec-next 724e47a149f504cbc9c799804bb46ea81a911909 +netfilter-next 90278871d4b0da39c84fc9aa4929b0809dc7cf3c +nfc-next 4d63adfe12dd9cb61ed8badb4d798955399048c2 +ipvs-next 90278871d4b0da39c84fc9aa4929b0809dc7cf3c +wireless-drivers-next 4f9fb990013c03c5d56266fb4c439816cd84e1a6 +bluetooth 7f98779fd9b3433a0bbfe563c6b04b31de945510 +mac80211-next 57c6cb81717f957fb741f2e4c79bd0e2f4f55910 +gfs2 9a38662ba4e2682f3f3e9f3ce02a243b837aa8c6 +mtd 5ac67ce36cfe38b4c104a42ce52c5c8d526f1c95 +nand a676688032e819c4bb1999a422553a1a1f52ce45 +spi-nor f134fbbb4ff813dd227c9ce40b5c0b2078a77b07 +crypto 158b52ff1436cf794778774e8510cd42e773849c +drm 8eb008c80841e3410ef2c043093478ea36bb5ff1 +drm-panel e4bac408b08437d190785ab1250cc676304ed171 +drm-intel 2bdd045e3a30f7ddda1604f835df9c8d14d6d048 +drm-tegra 5cb02b3dbbe912310d511e4e9c5299bfcebed28e +drm-misc 3131f209468d1514af378dd46eb34123d0af84ff +drm-msm 64cb96587ba652878019c02ee5f6c9a341466c52 +hdlcd f73e8b82531573a198a4d0e5bff0d3256cbbd1d8 +mali-dp 6e810eb508f4b937bc2a718bd4e5cd74cca55500 +sunxi-drm 7dafb83edd3271917458de0ae70586ac63098e2f +imx-drm 22cd2b2b3151f56d9101d08a7eb34777aa469891 +etnaviv 0b50dffa736b266d16a9e2c96e98045d6e8458ad +kconfig bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +regmap 76f721867da6064a87677d53816c1603f2f8d081 +sound 10aa7cad37d330dbff6a285af56dc4a7153a8f00 +sound-asoc b617f1eae1d25a4cb92903390aee354be792d2db +modules c554b89868015d86cd330d9cc10656c3756352a5 +input e7330fa032bb5e5dd393db35ab544ac8e52e9e62 +block 61445b56d031bc12feafb477848cf4ef9a725fc9 +lightnvm 1c6286f26301ad154a1c10fb6e68925493dd28ba +device-mapper 28700a36232ba61fb6ac59466821546cb25aec69 +pcmcia c3a5307873d4a47efd4373f4a50f450a17b5d9c1 +mmc cf56c819c851a542a43b3b9d4330ed6821a62da1 +kgdb 2cf2f0d5b91fd1b06a6ae260462fc7945ea84add +md 643369299cfe9d05166e9c4700d818dd283be7c2 +mfd ae0280fe1689d8990f91759fbfcdcb520e9d64a4 +backlight 840d40d941bf669669088732ef68606adb19feeb +battery 1f140ff467081212562327da6561edb6b3b3ed10 +regulator 1fd083554fa0ab91de96bf647bfe19a92c5df873 +security 5859cdf55063943192f316b3d6c673fd6fcbee46 +apparmor 938df83529970b2e43dc1719ebfa679d46b4d9b8 +integrity 3dea0d93d257872a571cb5accf3f1a798942630b +keys 1e684d3820d8f72d877c0adb521ae17c6fc9bc88 +selinux d141136f523a3a6372d22981bdff7a8906f36fea +tpmdd 1fbad3028664e114d210dc65d768947a3a553eaa +watchdog 6d08b06e67cd117f6992c46611dfb4ce267cd71e +iommu 00dcb938d482ba4dcf9422d4cdddc326fcdf1832 +dwmw2-iommu d8a5b80568a9cb66810e75b182018e9edb68e8ff +vfio da9147140fe3de5a3a3fe5fe7f69739d4f39bea1 +trivial 75a24b822d383489badd343cab4cb171d09f93ef +audit 326bee0286d7f6b0d780f5b75a35ea9fe489a802 +devicetree ca3923bd91d0a0edf256059187dcd144636c0d6e +mailbox dfbc9c5841fc455f9b284319fdc01cb0ca5e6b2e +spi 7b4a87faf4cf1abbb055c5229be950e3daabeb71 +tip a9b6b3b055ea5f8a35809dd0521b65b0ca73176d +clockevents 0136c741ff40e03323419feec05fcd594f36a463 +edac 345fb0a9a6340ba0b3b714d62f877fde88c8a755 +edac-amd 83e548bea4e7ffd8321072c760aaae2e758ef104 +irqchip aa08192a254d362a4d5317647a81de6996961aef +ftrace 0c5a9acc8b4e878e761f735e144d4a7e4477d4e6 +rcu b92e1e16d7cabd4fb28ca14e7971e75be2a0536e +kvm c18bb396d3d261ebbb4efbc05129c5d354c541e4 +kvm-arm dc6ed61d2f824a595033744fc1f3bf4cb98768b5 +kvm-mips dc44abd6aad22411f7f9890e39fd4753dabf0d03 +kvm-ppc 31c8b0d0694a1f7e3b46df0d1341a874ecb5e0de +kvms390 911eeef91b48b5f5a2aa0d5e95f6bf1cfc247b4b +xen-tip d1ecfa9d1f402366b1776fbf84e635678a51414f +percpu b3a5d111994450909158929560906f2c1c6c1d85 +workqueues 1aa3798360db38d3131ac011b50c397a7cdb754e +drivers-x86 6ed66c3ce095ae65bbc976b5817c318653745736 +chrome-platform 60cc43fc888428bb2f18f08997432d426a243338 +hsi 70d52ba9e57eb93cfe916f7f4d14a09750890ffd +leds d54e5b522202b287132b9f24569b9c107f6af36d +ipmi 163475ebf9f3d1b516c1f8ee4f59eb8ff8e97ee8 +driver-core cd4846c5a68da77705164924f47001af3b499dec +usb 58318cd4df415aaeaad1a7306cf1d35dad9a21c3 +usb-gadget 60cc43fc888428bb2f18f08997432d426a243338 +usb-serial 4d304a6fe93538ce356b4593dc43476b50c023e7 +usb-chipidea-next ce4c1b820c5269437ce2e7831f638159b3b83269 +phy-next cd3bf368aa7a352a577be7b9540c6b5b2681bf17 +tty 7b6c81f46c5dd7af316bf09aa1991ceed7e53dcd +char-misc 720d690e3680d8ae5fcf86f8614c1a10b4ee7605 +extcon 60cc43fc888428bb2f18f08997432d426a243338 +staging 26a5e9b834a647b9d4dfbeef8b42f201cb3293ae +mux fa934c06c0f40443566e7cb0d46eac6da65dce48 +slave-dma 95c1e4acb0c4a1b69ad66729354dced614c5ea30 +cgroup 28610df5c5857648cab840fe662ed50b3ff111f3 +scsi 5d2e147b49636e927876fe5d5c31feb8d25e172a +scsi-mkp 33d065ccb3b21e38412cd8c7d6f2704e3b341f63 +target-updates 1c130ae00b769a2e2df41bad3d6051ee8234b636 +target-bva 60cc43fc888428bb2f18f08997432d426a243338 +libata 6c86b268a93505f5028d742d47777f6a9d5a7db7 +vhost cfcde40e8ce3aab6f61b4998945ab19985ea852c +rpmsg ff5cf749a5e59518b13b0bd6648ffe37ec714b9a +gpio 22bd82b645bc681bc03980de07784f213f074447 +pinctrl 8e12867fb27d61854b1ad2b2317cca1edbe7c343 +pinctrl-samsung 0ca0557e3727951bdc44ea47bc6135b37f90338c +pwm 692099cdcf275df272936b31c8409f2a5a1f7239 +userns 530621b79f9e884db5ae4fa44cab020da76b0d0c +ktest 6cd110a91f52197e3392809cd43466bfe2c524d0 +random 9e66317d3c92ddaab330c125dfe9d06eee268aff +aio 2a8a98673c13cb2a61a6476153acf8344adfa992 +kselftest dec77e8543187437e098436837e3a93ec8d79f25 +y2038 5dc0b1529d21b54aad4098874e334a52027fd16d +livepatching 3beed9bf1e3d1ca7a8c6a4f626dce447ab40d5d1 +coresight 659d7e66340e33fe5e8a085f2a86100c14c3d1a9 +rtc 22cb47c1ea2040c0424073c9d67dd0e644334a7c +nvdimm 638a8e3f28dc1500e9412ad321faf3971a76813a +at24 22e06c32b936083028f2571c5cacbfc6bffe5585 +ntb 9b42913698a1354a37d41115cd7d2f2b34a24127 +kspp bd80928a6e0a1f814e01d0772211507e0f7e875e +init_task e1e871aff3ded26348c631b1370e257d401cd22d +akpm-current 6175f090fa51cbb12e66ecfc2ecdade72f93f202 +akpm 8e03975b1258970f09ba64c6491c890df27e7a85 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..83a610557e9a --- /dev/null +++ b/Next/Trees @@ -0,0 +1,271 @@ +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/jhogan/mips.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 +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +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.linux-mips.org/pub/scm/ralf/upstream-sfr#mips-next +mips-james git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips.git#mips-next +nds32 git git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git#next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +powerpc-pkey git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#topic/pkey +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux.git#for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +sh git git://git.libc.org/linux-sh#for-next +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +fscrypt git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt.git#master +befs git git://git.kernel.org/pub/scm/linux/kernel/git/luisbg/linux-befs.git#for-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next +btrfs-kdave git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +vfs-miklos git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +dmi quilt http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +fbdev git git://github.com/bzolnier/linux.git#fbdev-for-next +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next +thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#master +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +nfc-next git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +mtd git git://git.infradead.org/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 https://github.com/dvhart/linux-pdx86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git#for-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-next +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git#next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next +target-bva git git://git.kernel.org/pub/scm/linux/kernel/git/bvanassche/linux.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://github.com/andersson/remoteproc.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +aio git git://git.kvack.org/~bcrl/aio-next.git#master +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +y2038 git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038 +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching#for-next +coresight git git://git.linaro.org/kernel/coresight.git#next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +init_task git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#init_task +akpm-current mmotm http://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm http://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..7c91dfa5cda3 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,7506 @@ +$ date -R +Fri, 11 May 2018 08:12:16 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 008464a9360e Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid +Merging origin/master (94d7dbf10881 Merge tag 'for-4.17/dm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge origin/master +Updating 008464a9360e..94d7dbf10881 +Fast-forward + Documentation/device-mapper/thin-provisioning.txt | 5 ++++- + drivers/md/dm-bufio.c | 5 +++-- + drivers/md/dm-cache-background-tracker.c | 2 +- + drivers/md/dm-integrity.c | 2 +- + drivers/md/dm-raid1.c | 10 ++++++---- + drivers/md/dm.c | 7 ++++--- + 6 files changed, 19 insertions(+), 12 deletions(-) +Merging fixes/master (147a89bc71e7 Merge tag 'kconfig-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) +$ git merge fixes/master +Already up to date. +Merging kbuild-current/fixes (0da7e4326114 genksyms: fix typo in parse.tab.{c,h} generation rules) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (661e50bc8532 Linux 4.16-rc4) +$ git merge arc-current/for-curr +Already up to date. +Merging arm-current/fixes (30cfae461581 ARM: replace unnecessary perl with sed and the shell $(( )) operator) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/compressed/Makefile | 8 +++----- + arch/arm/boot/compressed/head.S | 20 ++++++++++---------- + arch/arm/kernel/machine_kexec.c | 36 +++++++++++++++++++++++------------- + 3 files changed, 36 insertions(+), 28 deletions(-) +Merging arm64-fixes/for-next/fixes (3789c122d0a0 arm64: avoid instrumenting atomic_ll_sc.o) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging m68k-current/for-linus (ecd685580c8f m68k/mac: Remove bogus "FIXME" comment) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (6c0a8f6b5a45 powerpc/pseries: Fix CONFIG_NUMA=n build) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/ftrace.h | 29 +++++++++++++++++++++-------- + arch/powerpc/include/asm/paca.h | 1 - + arch/powerpc/include/asm/topology.h | 13 +++++-------- + 3 files changed, 26 insertions(+), 17 deletions(-) +Merging sparc/master (fff75eb2a08c Merge tag 'errseq-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/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 (ca3943c4aaff Merge tag 'linux-can-fixes-for-4.17-20180510' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can) +$ git merge net/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/can/rcar_canfd.txt | 4 +- + MAINTAINERS | 4 +- + arch/arm/boot/dts/imx35.dtsi | 4 +- + arch/arm/boot/dts/imx53.dtsi | 4 +- + drivers/atm/firestream.c | 2 +- + drivers/atm/zatm.c | 3 + + drivers/bluetooth/btusb.c | 19 ++++- + drivers/net/can/dev.c | 2 +- + drivers/net/can/flexcan.c | 26 ++++--- + drivers/net/can/spi/hi311x.c | 11 ++- + drivers/net/can/usb/kvaser_usb.c | 2 +- + drivers/net/dsa/mv88e6xxx/chip.c | 26 +++++++ + drivers/net/dsa/mv88e6xxx/chip.h | 1 + + drivers/net/dsa/mv88e6xxx/global2.c | 2 +- + drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 3 + + drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 1 + + .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 20 ++--- + drivers/net/ethernet/broadcom/tg3.c | 9 ++- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 7 +- + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 16 ++++ + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 8 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 7 +- + drivers/net/ethernet/netronome/nfp/flower/main.c | 19 ----- + drivers/net/ethernet/ni/nixge.c | 10 ++- + drivers/net/ethernet/qlogic/qed/qed_l2.c | 6 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 2 +- + drivers/net/ethernet/qlogic/qede/qede_rdma.c | 2 +- + drivers/net/ethernet/realtek/r8169.c | 3 + + drivers/net/ethernet/sun/niu.c | 5 +- + drivers/net/hyperv/netvsc_drv.c | 3 +- + drivers/net/hyperv/rndis_filter.c | 2 +- + drivers/net/ieee802154/atusb.c | 2 +- + drivers/net/ieee802154/mcr20a.c | 15 ++-- + drivers/net/phy/broadcom.c | 10 +++ + drivers/net/phy/sfp-bus.c | 2 +- + drivers/net/wireless/mac80211_hwsim.c | 1 + + include/linux/brcmphy.h | 1 + + include/net/flow_dissector.h | 2 +- + include/net/mac80211.h | 2 +- + include/net/xfrm.h | 1 + + include/uapi/linux/nl80211.h | 2 + + kernel/bpf/syscall.c | 19 +++-- + net/9p/trans_common.c | 2 +- + net/9p/trans_fd.c | 4 +- + net/9p/trans_rdma.c | 4 +- + net/9p/trans_virtio.c | 5 +- + net/9p/trans_xen.c | 2 +- + net/atm/lec.c | 9 ++- + net/ieee802154/6lowpan/6lowpan_i.h | 4 +- + net/ieee802154/6lowpan/reassembly.c | 14 ++-- + net/ipv4/route.c | 1 + + net/ipv4/udp.c | 4 +- + net/ipv6/Kconfig | 9 +-- + net/ipv6/ip6_vti.c | 4 +- + net/ipv6/udp.c | 4 +- + net/ipv6/xfrm6_tunnel.c | 3 + + net/key/af_key.c | 45 ++++++++--- + net/llc/af_llc.c | 3 + + net/mac80211/agg-tx.c | 4 + + net/mac80211/mlme.c | 27 +++++-- + net/mac80211/tx.c | 3 +- + net/netlink/af_netlink.c | 6 +- + net/nsh/nsh.c | 4 + + net/openvswitch/flow_netlink.c | 9 +-- + net/rfkill/rfkill-gpio.c | 7 +- + net/sctp/associola.c | 30 +++++++- + net/sctp/sm_make_chunk.c | 2 +- + net/sctp/sm_statefuns.c | 86 ++++++++++++---------- + net/sctp/ulpevent.c | 1 - + net/tipc/node.c | 15 +++- + net/tipc/socket.c | 3 +- + net/tls/tls_main.c | 12 ++- + net/wireless/core.c | 3 + + net/wireless/nl80211.c | 1 + + net/wireless/reg.c | 1 + + net/xfrm/xfrm_state.c | 6 ++ + tools/testing/selftests/net/Makefile | 2 +- + .../selftests/tc-testing/tc-tests/actions/bpf.json | 11 ++- + 78 files changed, 416 insertions(+), 224 deletions(-) +Merging bpf/master (26aeb9daa02c nfp: bpf: allow zero-length capabilities) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/netronome/nfp/bpf/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging ipsec/master (2c5d5b13c6eb llc: better deal with too small mtu) +$ git merge ipsec/master +Already up to date. +Merging netfilter/master (bb7b40aecbf7 netfilter: nf_tables: bogus EBUSY in chain deletions) +$ git merge netfilter/master +Merge made by the 'recursive' strategy. + include/net/netfilter/nf_tables.h | 5 + + include/uapi/linux/netfilter/nf_conntrack_tcp.h | 3 + + net/bridge/netfilter/ebt_stp.c | 4 +- + net/ipv4/netfilter/ip_tables.c | 1 + + net/ipv6/netfilter/ip6_tables.c | 1 + + net/netfilter/core.c | 3 +- + net/netfilter/ipvs/ip_vs_conn.c | 17 +- + net/netfilter/ipvs/ip_vs_core.c | 12 ++ + net/netfilter/nf_conntrack_proto_tcp.c | 11 ++ + net/netfilter/nf_tables_api.c | 71 +++++++-- + net/netfilter/nf_tables_core.c | 21 ++- + net/netfilter/nfnetlink_acct.c | 2 +- + net/netfilter/nfnetlink_cthelper.c | 7 +- + net/netfilter/nft_compat.c | 201 ++++++++++++++++++------ + net/netfilter/nft_immediate.c | 15 +- + net/netfilter/x_tables.c | 6 + + 16 files changed, 295 insertions(+), 85 deletions(-) +Merging ipvs/master (2f99aa31cd7a netfilter: nf_tables: skip synchronize_rcu if transaction log is empty) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (a8d7aa17bbc9 dccp: fix tasklet usage) +$ git merge wireless-drivers/master +Already up to date. +Merging mac80211/master (914eac248d87 mac80211: use timeout from the AddBA response instead of the request) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (9aa169213d11 RDMA/cma: Do not query GID during QP state transition to RTR) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (f13876e2c33a ALSA: pcm: Check PCM state at xfern compat ioctl) +$ git merge sound-current/for-linus +Already up to date. +Merging sound-asoc-fixes/for-linus (4506b923fac4 Merge branch 'asoc-4.17' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .mailmap | 3 ++ + MAINTAINERS | 2 +- + include/sound/soc-dai.h | 4 +- + sound/soc/cirrus/edb93xx.c | 2 +- + sound/soc/cirrus/ep93xx-i2s.c | 26 ++++++----- + sound/soc/cirrus/snappercl15.c | 2 +- + sound/soc/codecs/cs35l35.c | 1 + + sound/soc/intel/boards/bytcr_rt5651.c | 5 ++- + .../soc/mediatek/common/mtk-afe-platform-driver.c | 4 +- + sound/soc/omap/n810.c | 10 ++--- + sound/soc/soc-compress.c | 52 ++++++++++++---------- + 11 files changed, 61 insertions(+), 50 deletions(-) +Merging regmap-fixes/for-linus (e37563bb6c59 Merge tag 'for-4.17-part2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (e37563bb6c59 Merge tag 'for-4.17-part2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux) +$ git merge regulator-fixes/for-linus +Already up to date. +Merging spi-fixes/for-linus (19fe64cdd0be Merge branch 'spi-4.17' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/spi/spi-bcm-qspi.c | 28 ++++++++++++++++++---------- + drivers/spi/spi-bcm2835aux.c | 5 +++++ + drivers/spi/spi-cadence.c | 8 ++++++++ + drivers/spi/spi-imx.c | 2 +- + drivers/spi/spi-pxa2xx.h | 2 +- + drivers/spi/spi-sh-msiof.c | 1 + + 6 files changed, 34 insertions(+), 12 deletions(-) +Merging pci-current/for-linus (0cf22d6b317c PCI: Add "PCIe" to pcie_print_link_status() messages) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (6da6c0db5316 Linux v4.17-rc3) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (6da6c0db5316 Linux v4.17-rc3) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (75bc37fefc44 Linux 4.17-rc4) +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (ed769520727e usb: gadget: composite Allow for larger configuration descriptors) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (4842ed5bfcb9 USB: serial: visor: handle potential invalid device configuration) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/ci-for-usb-stable (964728f9f407 USB: chipidea: msm: fix ulpi-node lookup) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Already up to date. +Merging phy/fixes (60cc43fc8884 Linux 4.17-rc1) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (9d569b1cf7a2 Merge tag 'iio-fixes-for-4.17a' 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/adc/Kconfig | 1 + + drivers/iio/adc/ad7793.c | 75 +++++++--------------- + drivers/iio/adc/at91-sama5d2_adc.c | 41 ++++++++++-- + drivers/iio/adc/stm32-dfsdm-adc.c | 17 ++++- + drivers/iio/buffer/industrialio-buffer-dma.c | 2 +- + drivers/iio/buffer/kfifo_buf.c | 11 +++- + .../iio/common/hid-sensors/hid-sensor-trigger.c | 8 +-- + include/linux/iio/buffer_impl.h | 6 +- + 8 files changed, 93 insertions(+), 68 deletions(-) +Merging char-misc.current/char-misc-linus (6da6c0db5316 Linux v4.17-rc3) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging input-current/for-linus (f6eeb9e54857 Input: atmel_mxt_ts - add missing compatible strings to OF device table) +$ git merge input-current/for-linus +Already up to date. +Merging crypto-current/master (eea0d3ea7546 crypto: drbg - set freed buffers to NULL) +$ git merge crypto-current/master +Already up to date. +Merging ide/master (8e44e6600caa Merge branch 'KASAN-read_word_at_a_time') +$ git merge ide/master +Already up to date. +Merging vfio-fixes/for-linus (834814e80268 Revert: "vfio-pci: Mask INTx if a device is not capabable of enabling it") +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (c28077035ef3 tools/testing/selftests/x86: fix error: conflicting types for 'pkey_get|pkey_set') +$ git merge kselftest-fixes/fixes +Merge made by the 'recursive' strategy. + tools/testing/selftests/intel_pstate/run.sh | 24 +++++++--------- + tools/testing/selftests/x86/protection_keys.c | 40 ++++++++++++++++----------- + 2 files changed, 34 insertions(+), 30 deletions(-) +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 (613e0bb622e7 Revert "dmaengine: pl330: add DMA_PAUSE feature") +$ git merge slave-dma-fixes/fixes +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/dma/pl330.c | 28 ---------------------------- + 2 files changed, 1 insertion(+), 29 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. + drivers/video/backlight/as3711_bl.c | 45 ++++++++++++++++++++++------------- + drivers/video/backlight/max8925_bl.c | 4 +++- + drivers/video/backlight/tps65217_bl.c | 4 ++-- + include/linux/mfd/as3711.h | 4 ++-- + 4 files changed, 36 insertions(+), 21 deletions(-) +Merging mtd-fixes/master (3057fcef3853 mtd: rawnand: Make sure we wait tWB before polling the STATUS reg) +$ git merge mtd-fixes/master +Merge made by the 'recursive' strategy. + drivers/mtd/nand/onenand/omap2.c | 105 +++++++++++++----------------------- + drivers/mtd/nand/raw/marvell_nand.c | 12 +++-- + drivers/mtd/nand/raw/nand_base.c | 5 ++ + 3 files changed, 52 insertions(+), 70 deletions(-) +Merging nand-fixes/nand/fixes (ee02f73e04c0 mtd: nand: atmel: Fix EDO mode check) +$ git merge nand-fixes/nand/fixes +Already up to date. +Merging spi-nor-fixes/spi-nor/fixes (7928b2cbe55b Linux 4.16-rc1) +$ git merge spi-nor-fixes/spi-nor/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (107b7d9fa94c mfd: rtsx: Release IRQ during shutdown) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (b84c8fdf8e6c media: uvcvideo: Prevent setting unavailable flags) +$ git merge v4l-dvb-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/media/usb/uvc/uvc_ctrl.c | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) +Merging reset-fixes/reset/fixes (e6914365fd28 reset: uniphier: fix USB clock line for LD20) +$ git merge reset-fixes/reset/fixes +Merge made by the 'recursive' strategy. + drivers/reset/reset-uniphier.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging mips-fixes/mips-fixes (b3d7e55c3f88 MIPS: uaccess: Add micromips clobbers to bzero invocation) +$ 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 +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/dm8148-evm.dts | 2 +- + arch/arm/boot/dts/dm8148-t410.dts | 2 +- + arch/arm/boot/dts/dm8168-evm.dts | 2 +- + arch/arm/boot/dts/dra62x-j5eco-evm.dts | 2 +- + arch/arm/boot/dts/logicpd-som-lv.dtsi | 11 +++++++++-- + arch/arm/mach-omap1/ams-delta-fiq.c | 28 +++++++++++++++------------- + arch/arm/mach-omap2/powerdomain.c | 4 ++-- + 7 files changed, 30 insertions(+), 21 deletions(-) +Merging kvm-fixes/master (ecf08dad723d KVM: x86: remove APIC Timer periodic/oneshot spikes) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (f07afa0462b7 KVM: s390: fix memory overwrites when not using SCA entries) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (40626a1bf657 hwmon: (k10temp) Fix reading critical temperature register) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + drivers/hwmon/k10temp.c | 40 ++++++++++++++++++++++++++++++---------- + 1 file changed, 30 insertions(+), 10 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (ce376ed6b706 radix tree: fix multi-order iteration race) +$ git merge nvdimm-fixes/libnvdimm-fixes +Merge made by the 'recursive' strategy. + lib/radix-tree.c | 6 ++-- + tools/include/linux/spinlock.h | 3 +- + tools/testing/radix-tree/Makefile | 6 ++-- + tools/testing/radix-tree/multiorder.c | 63 +++++++++++++++++++++++++++++++++++ + tools/testing/radix-tree/test.c | 19 +++++++++++ + tools/testing/radix-tree/test.h | 3 ++ + 6 files changed, 91 insertions(+), 9 deletions(-) +Merging drm-intel-fixes/for-linux-next-fixes (e8f48f96db7e drm/i915: Fix drm:intel_enable_lvds ERROR message in kernel log) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/intel_cdclk.c | 41 ++++++++++++++++++++++++++++++++---- + drivers/gpu/drm/i915/intel_display.c | 2 ++ + drivers/gpu/drm/i915/intel_dp.c | 20 ------------------ + drivers/gpu/drm/i915/intel_lvds.c | 3 ++- + 4 files changed, 41 insertions(+), 25 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (9a0e98022172 drm/vc4: Fix scaling of uni-planar formats) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/bridge/Kconfig | 1 + + drivers/gpu/drm/drm_atomic.c | 8 ++++++++ + drivers/gpu/drm/omapdrm/dss/dispc.c | 20 +++++++++++++------- + drivers/gpu/drm/omapdrm/dss/hdmi4.c | 2 +- + drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 7 ++++++- + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 2 +- + drivers/gpu/drm/omapdrm/omap_connector.c | 10 ++++++++++ + drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 6 +++++- + drivers/gpu/drm/omapdrm/tcm-sita.c | 2 +- + drivers/gpu/drm/vc4/vc4_dpi.c | 25 ++++++++++++++++++++++--- + drivers/gpu/drm/vc4/vc4_plane.c | 2 +- + 11 files changed, 69 insertions(+), 16 deletions(-) +Merging kbuild/for-next (8b31e5b10006 kbuild: deb-pkg improve maintainer address generation) +$ git merge kbuild/for-next +Merge made by the 'recursive' strategy. + Makefile | 8 ++++--- + arch/Kconfig | 15 ------------ + arch/powerpc/Kconfig | 1 + + arch/powerpc/kernel/vmlinux.lds.S | 22 +++++++++--------- + include/asm-generic/vmlinux.lds.h | 49 +++++++++++++++++++++++---------------- + init/Kconfig | 27 +++++++++++++++++++++ + scripts/basic/fixdep.c | 6 +++-- + scripts/package/mkdebian | 27 +++++++++++---------- + 8 files changed, 90 insertions(+), 65 deletions(-) +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 (d0c8ba40c6cc swiotlb: update comments to refer to physical instead of virtual addresses) +$ git merge dma-mapping/for-next +Auto-merging drivers/parisc/ccio-dma.c +Auto-merging arch/sparc/kernel/iommu-common.c +Removing arch/sparc/kernel/dma.c +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/Kconfig +Removing Documentation/features/io/dma-api-debug/arch-support.txt +Merge made by the 'recursive' strategy. + .../features/io/dma-api-debug/arch-support.txt | 31 ------------------ + arch/Kconfig | 3 -- + arch/alpha/Kconfig | 14 ++------ + arch/alpha/include/asm/pci.h | 5 --- + arch/arc/Kconfig | 7 +--- + arch/arc/include/asm/pci.h | 6 ---- + arch/arm/Kconfig | 15 ++------- + arch/arm/include/asm/pci.h | 7 ---- + arch/arm/kernel/setup.c | 2 +- + arch/arm/mach-axxia/Kconfig | 1 - + arch/arm/mach-bcm/Kconfig | 1 - + arch/arm/mach-exynos/Kconfig | 1 - + arch/arm/mach-highbank/Kconfig | 1 - + arch/arm/mach-rockchip/Kconfig | 1 - + arch/arm/mach-shmobile/Kconfig | 1 - + arch/arm/mach-tegra/Kconfig | 1 - + arch/arm/mm/Kconfig | 7 +--- + arch/arm/mm/dma-mapping-nommu.c | 9 ------ + arch/arm/mm/dma-mapping.c | 9 ------ + arch/arm64/Kconfig | 22 ++----------- + arch/arm64/include/asm/pci.h | 5 --- + arch/arm64/mm/dma-mapping.c | 10 ------ + arch/c6x/Kconfig | 1 - + arch/c6x/kernel/dma.c | 11 ------- + arch/h8300/include/asm/pci.h | 2 -- + arch/hexagon/Kconfig | 4 +-- + arch/hexagon/kernel/dma.c | 1 - + arch/ia64/Kconfig | 23 ++------------ + arch/ia64/hp/common/sba_iommu.c | 3 -- + arch/ia64/include/asm/pci.h | 17 ---------- + arch/ia64/kernel/dma-mapping.c | 10 ------ + arch/ia64/kernel/setup.c | 12 ------- + arch/ia64/sn/kernel/io_common.c | 5 --- + arch/m68k/include/asm/pci.h | 6 ---- + arch/microblaze/Kconfig | 1 - + arch/microblaze/include/asm/pci.h | 6 ---- + arch/microblaze/kernel/dma.c | 11 ------- + arch/mips/Kconfig | 22 ++++--------- + arch/mips/cavium-octeon/Kconfig | 12 ------- + arch/mips/include/asm/pci.h | 7 ---- + arch/mips/loongson64/Kconfig | 15 --------- + arch/mips/mm/dma-default.c | 10 ------ + arch/mips/netlogic/Kconfig | 6 ---- + arch/openrisc/kernel/dma.c | 11 ------- + arch/parisc/Kconfig | 8 ++--- + arch/parisc/include/asm/pci.h | 23 -------------- + arch/parisc/kernel/setup.c | 5 --- + arch/powerpc/Kconfig | 25 ++------------- + arch/powerpc/include/asm/pci.h | 18 ----------- + arch/powerpc/kernel/dma.c | 3 -- + arch/powerpc/platforms/Kconfig.cputype | 1 + + arch/riscv/Kconfig | 10 ++---- + arch/riscv/include/asm/pci.h | 3 -- + arch/s390/Kconfig | 17 +++------- + arch/s390/include/asm/pci.h | 2 -- + arch/s390/pci/pci_dma.c | 11 ------- + arch/sh/Kconfig | 10 ++---- + arch/sh/include/asm/pci.h | 6 ---- + arch/sh/kernel/dma-nommu.c | 1 - + arch/sh/mm/consistent.c | 9 ------ + arch/sparc/Kconfig | 18 ++--------- + .../sparc/include/asm}/iommu-common.h | 0 + arch/sparc/include/asm/iommu_64.h | 2 +- + arch/sparc/include/asm/pci_32.h | 4 --- + arch/sparc/include/asm/pci_64.h | 6 ---- + arch/sparc/kernel/Makefile | 4 +-- + arch/sparc/kernel/dma.c | 13 -------- + {lib => arch/sparc/kernel}/iommu-common.c | 5 +-- + arch/sparc/kernel/iommu.c | 2 +- + arch/sparc/kernel/ldc.c | 2 +- + arch/sparc/kernel/pci_sun4v.c | 2 +- + arch/unicore32/Kconfig | 5 ++- + arch/unicore32/mm/Kconfig | 11 ------- + arch/x86/Kconfig | 36 ++++----------------- + arch/x86/include/asm/pci.h | 3 -- + arch/x86/kernel/pci-dma.c | 4 --- + arch/xtensa/Kconfig | 1 - + arch/xtensa/include/asm/pci.h | 2 -- + arch/xtensa/kernel/pci-dma.c | 9 ------ + drivers/amba/bus.c | 5 ++- + drivers/base/dma-mapping.c | 31 +++--------------- + drivers/base/platform.c | 18 ++++++++++- + drivers/bcma/main.c | 2 +- + drivers/dma/qcom/hidma_mgmt.c | 2 +- + drivers/gpu/host1x/bus.c | 9 ++++-- + drivers/ide/ide-dma.c | 2 -- + drivers/ide/ide-lib.c | 26 --------------- + drivers/ide/ide-probe.c | 6 +--- + drivers/iommu/Kconfig | 1 + + drivers/of/device.c | 6 ++-- + drivers/of/of_reserved_mem.c | 2 +- + drivers/parisc/Kconfig | 5 --- + drivers/parisc/ccio-dma.c | 2 -- + drivers/parisc/sba_iommu.c | 2 -- + drivers/pci/Kconfig | 4 --- + drivers/pci/bus.c | 4 +-- + drivers/pci/pci-driver.c | 33 ++++++++++++++++++- + drivers/scsi/scsi_lib.c | 24 ++------------ + include/asm-generic/pci.h | 8 ----- + include/linux/device.h | 8 ++--- + include/linux/dma-debug.h | 6 ---- + include/linux/dma-mapping.h | 3 +- + include/linux/ide.h | 2 -- + include/linux/iommu-helper.h | 13 ++++++-- + include/linux/of_device.h | 8 +++-- + include/linux/pci.h | 2 +- + include/linux/platform_device.h | 2 ++ + lib/Kconfig | 17 ++++++++++ + lib/Kconfig.debug | 2 +- + lib/Makefile | 2 +- + lib/dma-debug.c | 37 +++++++++------------- + lib/dma-direct.c | 8 ++++- + lib/iommu-helper.c | 14 +------- + lib/swiotlb.c | 11 ++----- + mm/Kconfig | 2 +- + net/core/dev.c | 20 +----------- + tools/virtio/linux/dma-mapping.h | 2 -- + 117 files changed, 199 insertions(+), 788 deletions(-) + delete mode 100644 Documentation/features/io/dma-api-debug/arch-support.txt + rename {include/linux => arch/sparc/include/asm}/iommu-common.h (100%) + delete mode 100644 arch/sparc/kernel/dma.c + rename {lib => arch/sparc/kernel}/iommu-common.c (98%) +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 (6dc8c9d147dd Merge branches 'fixes' and 'sa1100-for-next' into for-next) +$ git merge arm/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging arm-perf/for-next/perf (44300aed5d28 perf: arm_spe: include linux/vmalloc.h for vmap()) +$ git merge arm-perf/for-next/perf +Merge made by the 'recursive' strategy. +Merging arm-soc/for-next (c12d7e9fe9af ARM: defconfig: Update Gemini defconfig) +$ git merge arm-soc/for-next +Already up to date. +Merging actions/for-next (61862a89e6ac Merge branch 'v4.16/drivers' into next) +$ git merge actions/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1) +$ git merge alpine/alpine/for-next +Already up to date. +Merging amlogic/for-next (ce650ad1cde7 Merge branch 'v4.18/defconfig' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/amlogic.txt | 6 + + .../bindings/clock/amlogic,gxbb-clkc.txt | 16 +- + arch/arm/boot/dts/meson8.dtsi | 17 +- + arch/arm/boot/dts/meson8b-odroidc1.dts | 68 ++-- + arch/arm/boot/dts/meson8b.dtsi | 24 +- + arch/arm/configs/multi_v7_defconfig | 2 + + arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 100 ++++++ + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 358 ++++++++++++++++++++- + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 8 +- + .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 3 - + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 12 +- + 11 files changed, 555 insertions(+), 59 deletions(-) +Merging aspeed/for-next (6534b2d0de36 Merge branch 'dt-for-v4.17' into for-next) +$ git merge aspeed/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging at91/at91-next (20d3f36b0fea Merge tag 'at91-ab-4.17-dt2' into at91-next) +$ git merge at91/at91-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging bcm2835/for-next (5c483a0c319c Merge branch anholt/bcm2835-defconfig-64-next into for-next) +$ git merge bcm2835/for-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/bcm/brcm,bcm2835.txt | 4 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 6 ++ + arch/arm/boot/dts/bcm2835-rpi-a.dts | 6 ++ + arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 6 ++ + arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 6 ++ + arch/arm/boot/dts/bcm2835-rpi-b.dts | 6 ++ + arch/arm/boot/dts/bcm2835-rpi.dtsi | 6 -- + arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 6 ++ + arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 108 +++++++++++++++++++++ + arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 26 ++++- + arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi | 27 ++++++ + arch/arm/configs/bcm2835_defconfig | 2 + + arch/arm/configs/multi_v7_defconfig | 4 + + arch/arm64/boot/dts/broadcom/Makefile | 3 +- + .../boot/dts/broadcom/bcm2837-rpi-3-b-plus.dts | 2 + + arch/arm64/configs/defconfig | 2 + + 17 files changed, 213 insertions(+), 8 deletions(-) + create mode 100644 arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts + create mode 100644 arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi + create mode 100644 arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b-plus.dts +Merging imx-mxs/for-next (75ed360763f2 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm/boot/dts/imx53.dtsi +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/boot/dts/Makefile | 4 + + arch/arm/boot/dts/imx1-ads.dts | 11 - + arch/arm/boot/dts/imx1.dtsi | 8 + + arch/arm/boot/dts/imx25-pdk.dts | 1 - + arch/arm/boot/dts/imx25.dtsi | 3 - + arch/arm/boot/dts/imx27-apf27.dts | 13 +- + arch/arm/boot/dts/imx27.dtsi | 5 +- + arch/arm/boot/dts/imx28-tx28.dts | 13 +- + arch/arm/boot/dts/imx50.dtsi | 3 - + arch/arm/boot/dts/imx51-zii-rdu1.dts | 2 - + arch/arm/boot/dts/imx51.dtsi | 3 - + arch/arm/boot/dts/imx53-m53.dtsi | 2 - + arch/arm/boot/dts/imx53-ppd.dts | 10 +- + arch/arm/boot/dts/imx53-tx53.dtsi | 14 +- + arch/arm/boot/dts/imx53.dtsi | 3 - + arch/arm/boot/dts/imx6dl-aristainetos2_4.dts | 2 - + arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 15 +- + arch/arm/boot/dts/imx6dl-mamoj.dts | 224 ++++++++++ + arch/arm/boot/dts/imx6dl-udoo.dts | 6 +- + arch/arm/boot/dts/imx6dl-wandboard-revb1.dts | 6 +- + arch/arm/boot/dts/imx6dl-wandboard-revd1.dts | 6 +- + arch/arm/boot/dts/imx6dl-wandboard.dts | 6 +- + arch/arm/boot/dts/imx6q-b850v3.dts | 4 - + arch/arm/boot/dts/imx6q-ba16.dtsi | 7 +- + arch/arm/boot/dts/imx6q-bx50v3.dtsi | 13 +- + arch/arm/boot/dts/imx6q-dhcom-pdk2.dts | 151 +++++++ + arch/arm/boot/dts/imx6q-dhcom-som.dtsi | 476 +++++++++++++++++++++ + arch/arm/boot/dts/imx6q-icore-mipi.dts | 25 ++ + arch/arm/boot/dts/imx6q-icore-ofcap12.dts | 31 +- + arch/arm/boot/dts/imx6q-kp-tpc.dts | 22 + + arch/arm/boot/dts/imx6q-kp.dtsi | 432 +++++++++++++++++++ + arch/arm/boot/dts/imx6q-novena.dts | 2 - + arch/arm/boot/dts/imx6q-pistachio.dts | 2 +- + arch/arm/boot/dts/imx6q-udoo.dts | 6 +- + arch/arm/boot/dts/imx6q-utilite-pro.dts | 2 - + arch/arm/boot/dts/imx6q-var-dt6customboard.dts | 2 - + arch/arm/boot/dts/imx6q-wandboard-revb1.dts | 6 +- + arch/arm/boot/dts/imx6q-wandboard-revd1.dts | 6 +- + arch/arm/boot/dts/imx6q-wandboard.dts | 6 +- + arch/arm/boot/dts/imx6q.dtsi | 4 - + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-colibri.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-gw5904.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 52 ++- + arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi | 47 +- + arch/arm/boot/dts/imx6qdl-icore.dtsi | 25 +- + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 3 - + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 3 - + arch/arm/boot/dts/imx6qdl-tx6-lcd.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-tx6-mb7.dtsi | 3 - + arch/arm/boot/dts/imx6qdl-tx6.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-udoo.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-wandboard-revb1.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-wandboard-revc1.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-wandboard-revd1.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 14 +- + arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 24 +- + arch/arm/boot/dts/imx6qdl.dtsi | 9 - + arch/arm/boot/dts/imx6qp-wandboard-revd1.dts | 6 +- + arch/arm/boot/dts/imx6qp-zii-rdu2.dts | 5 + + arch/arm/boot/dts/imx6sl.dtsi | 3 - + arch/arm/boot/dts/imx6sx-nitrogen6sx.dts | 4 +- + arch/arm/boot/dts/imx6sx-sabreauto.dts | 417 ++++++++++++++---- + arch/arm/boot/dts/imx6sx.dtsi | 71 +-- + arch/arm/boot/dts/imx6ul-isiot.dtsi | 2 - + arch/arm/boot/dts/imx6ul-tx6ul-mainboard.dts | 2 +- + arch/arm/boot/dts/imx6ul-tx6ul.dtsi | 6 +- + arch/arm/boot/dts/imx6ul.dtsi | 30 ++ + arch/arm/boot/dts/imx6ull-pinfunc.h | 9 + + arch/arm/boot/dts/imx6ull.dtsi | 2 + + arch/arm/boot/dts/imx7d-nitrogen7.dts | 4 +- + arch/arm/boot/dts/imx7d-pinfunc.h | 6 +- + arch/arm/boot/dts/imx7d-sdb.dts | 24 ++ + arch/arm/boot/dts/imx7s.dtsi | 37 +- + arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 6 - + arch/arm/boot/dts/vf610-zii-dev-rev-c.dts | 4 - + arch/arm/configs/imx_v6_v7_defconfig | 9 + + arch/arm/mach-imx/Kconfig | 1 + + arch/arm/mach-imx/mach-mx31_3ds.c | 18 +- + arch/arm/mach-imx/mach-mx31lilly.c | 12 +- + arch/arm/mach-imx/mach-mx31lite.c | 16 +- + arch/arm/mach-imx/mach-mx31moboard.c | 17 +- + arch/arm/mach-imx/mach-pca100.c | 13 +- + arch/arm/mach-imx/mach-pcm037.c | 13 +- + arch/arm/mach-imx/mach-pcm037_eet.c | 5 +- + arch/arm/mach-imx/mach-pcm043.c | 13 +- + arch/arm/mach-imx/mach-vpr200.c | 9 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi | 2 +- + drivers/soc/imx/gpc.c | 18 +- + drivers/soc/imx/gpcv2.c | 22 +- + include/linux/platform_data/spi-imx.h | 29 +- + 92 files changed, 2113 insertions(+), 482 deletions(-) + create mode 100644 arch/arm/boot/dts/imx6dl-mamoj.dts + create mode 100644 arch/arm/boot/dts/imx6q-dhcom-pdk2.dts + create mode 100644 arch/arm/boot/dts/imx6q-dhcom-som.dtsi + create mode 100644 arch/arm/boot/dts/imx6q-icore-mipi.dts + create mode 100644 arch/arm/boot/dts/imx6q-kp-tpc.dts + create mode 100644 arch/arm/boot/dts/imx6q-kp.dtsi +Merging keystone/next (fb5d812c3cb3 Merge branch 'for_4.18/keystone-dts' into next) +$ git merge keystone/next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/keystone-k2g-evm.dts | 26 +++++++++++++++ + drivers/firmware/ti_sci.c | 10 +----- + drivers/firmware/ti_sci.h | 30 +---------------- + drivers/memory/ti-aemif.c | 60 ++++++++++++++++++++++------------ + drivers/soc/ti/knav_qmss.h | 14 ++++---- + drivers/soc/ti/knav_qmss_queue.c | 60 ++++++++++++++++++++++------------ + include/linux/platform_data/ti-aemif.h | 25 ++++++++++++++ + include/linux/soc/ti/ti_sci_protocol.h | 10 +----- + 8 files changed, 141 insertions(+), 94 deletions(-) +Merging mediatek/for-next (2916ebd42a41 Merge branch 'v4.17-next/soc' into for-next) +$ git merge mediatek/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/mt2701-evb.dts | 9 +- + arch/arm/boot/dts/mt2701.dtsi | 197 ++--- + arch/arm/boot/dts/mt6323.dtsi | 8 +- + arch/arm/boot/dts/mt6580-evbp1.dts | 9 +- + arch/arm/boot/dts/mt6580.dtsi | 9 +- + arch/arm/boot/dts/mt6589-aquaris5.dts | 10 +- + arch/arm/boot/dts/mt6589.dtsi | 12 +- + arch/arm/boot/dts/mt6592-evb.dts | 9 +- + arch/arm/boot/dts/mt6592.dtsi | 9 +- + arch/arm/boot/dts/mt7623.dtsi | 199 ++--- + arch/arm/boot/dts/mt7623n-rfb-nand.dts | 9 +- + arch/arm/boot/dts/mt7623n-rfb.dtsi | 9 +- + arch/arm/boot/dts/mt8127-moose.dts | 9 +- + arch/arm/boot/dts/mt8127.dtsi | 9 +- + arch/arm/boot/dts/mt8135-evbp1.dts | 9 +- + arch/arm/boot/dts/mt8135.dtsi | 9 +- + arch/arm64/boot/dts/mediatek/mt2712-pinfunc.h | 1123 +++++++++++++++++++++++++ + arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 46 + + arch/arm64/configs/defconfig | 1 + + drivers/soc/mediatek/mtk-infracfg.c | 46 +- + drivers/soc/mediatek/mtk-pmic-wrap.c | 13 +- + drivers/soc/mediatek/mtk-scpsys.c | 169 ++-- + include/linux/regmap.h | 1 + + 23 files changed, 1453 insertions(+), 471 deletions(-) + create mode 100644 arch/arm64/boot/dts/mediatek/mt2712-pinfunc.h +Merging mvebu/for-next (e76bec8e643a Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/marvell-pp2.txt | 9 +- + arch/arm/boot/dts/armada-370-db.dts | 57 ++-- + arch/arm/boot/dts/armada-370-dlink-dns327l.dts | 120 +++---- + arch/arm/boot/dts/armada-370-mirabox.dts | 51 +-- + arch/arm/boot/dts/armada-370-netgear-rn102.dts | 90 +++--- + arch/arm/boot/dts/armada-370-netgear-rn104.dts | 90 +++--- + arch/arm/boot/dts/armada-370-rd.dts | 52 +-- + arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi | 64 ++-- + arch/arm/boot/dts/armada-370-xp.dtsi | 6 +- + arch/arm/boot/dts/armada-375-db.dts | 50 +-- + arch/arm/boot/dts/armada-375.dtsi | 6 +- + arch/arm/boot/dts/armada-385-db-ap.dts | 69 ++-- + arch/arm/boot/dts/armada-385-linksys-caiman.dts | 129 ++++---- + arch/arm/boot/dts/armada-385-linksys-cobra.dts | 129 ++++---- + arch/arm/boot/dts/armada-385-linksys-rango.dts | 141 ++++---- + arch/arm/boot/dts/armada-385-linksys-shelby.dts | 129 ++++---- + arch/arm/boot/dts/armada-385-linksys.dtsi | 16 +- + arch/arm/boot/dts/armada-388-db.dts | 55 ++-- + arch/arm/boot/dts/armada-38x.dtsi | 6 +- + arch/arm/boot/dts/armada-390-db.dts | 66 ++-- + arch/arm/boot/dts/armada-395-gp.dts | 74 +++-- + arch/arm/boot/dts/armada-398-db.dts | 60 ++-- + arch/arm/boot/dts/armada-39x.dtsi | 6 +- + arch/arm/boot/dts/armada-xp-db-dxbc2.dts | 2 +- + arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts | 2 +- + arch/arm/boot/dts/armada-xp-db.dts | 2 +- + arch/arm/boot/dts/armada-xp-gp.dts | 2 +- + arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 2 +- + arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 156 ++++----- + arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 90 +++--- + .../boot/dts/marvell/armada-3720-espressobin.dts | 27 ++ + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 13 + + arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 8 +- + arch/arm64/configs/defconfig | 1 + + drivers/watchdog/Kconfig | 11 + + drivers/watchdog/Makefile | 1 + + drivers/watchdog/armada_37xx_wdt.c | 356 +++++++++++++++++++++ + 37 files changed, 1355 insertions(+), 793 deletions(-) + create mode 100644 drivers/watchdog/armada_37xx_wdt.c +Merging omap/for-next (82ce9553c47f Merge branch 'omap-for-v4.17/fixes' into for-next) +$ git merge omap/for-next +Removing include/linux/platform_data/media/ir-rx51.h +Removing arch/arm/mach-omap2/omap-pm.h +Removing arch/arm/mach-omap2/omap-pm-noop.c +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/arm/OMAP/README | 4 + + Documentation/devicetree/bindings/bus/ti-sysc.txt | 6 +- + .../devicetree/bindings/mmc/sdhci-omap.txt | 7 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/am335x-bone-common.dtsi | 9 +- + arch/arm/boot/dts/am335x-evm.dts | 9 +- + arch/arm/boot/dts/am335x-evmsk.dts | 9 +- + arch/arm/boot/dts/am335x-osd335x-common.dtsi | 124 +++++++ + arch/arm/boot/dts/am335x-pocketbeagle.dts | 237 +++++++++++++ + arch/arm/boot/dts/am437x-cm-t43.dts | 2 +- + arch/arm/boot/dts/am437x-gp-evm.dts | 2 +- + arch/arm/boot/dts/am437x-sk-evm.dts | 2 +- + arch/arm/boot/dts/am43x-epos-evm.dts | 2 +- + arch/arm/boot/dts/am571x-idk.dts | 5 +- + arch/arm/boot/dts/am572x-idk.dts | 5 +- + arch/arm/boot/dts/am574x-idk.dts | 20 ++ + arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 4 +- + arch/arm/boot/dts/am57xx-beagle-x15.dts | 3 +- + arch/arm/boot/dts/am57xx-idk-common.dtsi | 14 +- + arch/arm/boot/dts/dm8148-t410.dts | 2 +- + arch/arm/boot/dts/dra7-evm-common.dtsi | 15 + + arch/arm/boot/dts/dra7-evm.dts | 68 ++++ + arch/arm/boot/dts/dra7-mmc-iodelay.dtsi | 19 + + arch/arm/boot/dts/dra7.dtsi | 32 +- + arch/arm/boot/dts/dra71-evm.dts | 17 +- + arch/arm/boot/dts/dra72-evm-common.dtsi | 71 ++-- + arch/arm/boot/dts/dra72x-mmc-iodelay.dtsi | 11 + + arch/arm/boot/dts/dra76-evm.dts | 34 +- + arch/arm/boot/dts/logicpd-som-lv.dtsi | 25 ++ + arch/arm/boot/dts/omap2420-n810.dts | 63 +++- + arch/arm/boot/dts/omap3-beagle-xm.dts | 10 + + arch/arm/boot/dts/omap3-gta04.dtsi | 10 + + arch/arm/boot/dts/omap3-pandora-common.dtsi | 10 + + arch/arm/mach-omap1/board-osk.c | 10 +- + arch/arm/mach-omap2/Makefile | 1 - + arch/arm/mach-omap2/board-generic.c | 2 - + arch/arm/mach-omap2/common.h | 18 +- + arch/arm/mach-omap2/display.c | 10 +- + arch/arm/mach-omap2/hsmmc.c | 1 - + arch/arm/mach-omap2/i2c.c | 1 - + arch/arm/mach-omap2/io.c | 70 +--- + arch/arm/mach-omap2/omap-pm-noop.c | 176 ---------- + arch/arm/mach-omap2/omap-pm.h | 161 --------- + arch/arm/mach-omap2/omap_device.c | 22 +- + arch/arm/mach-omap2/omap_hwmod.c | 21 +- + arch/arm/mach-omap2/omap_hwmod.h | 6 +- + .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 1 + + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 4 + + arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 1 + + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 4 + + arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 3 + + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 6 + + arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 1 + + arch/arm/mach-omap2/pdata-quirks.c | 15 - + arch/arm/mach-omap2/pm-debug.c | 5 - + arch/arm/mach-omap2/pm.c | 21 +- + arch/arm/mach-omap2/pm33xx-core.c | 4 +- + arch/arm/mach-omap2/timer.c | 68 +++- + arch/arm/plat-omap/Kconfig | 10 - + drivers/bus/ti-sysc.c | 388 ++++++++++++++++++--- + drivers/media/rc/ir-rx51.c | 17 +- + drivers/mmc/host/sdhci-omap.c | 92 ++++- + drivers/mmc/host/sdhci.c | 148 ++++++-- + drivers/mmc/host/sdhci.h | 15 + + include/linux/mmc/host.h | 4 + + include/linux/platform_data/media/ir-rx51.h | 9 - + include/linux/platform_data/ti-sysc.h | 1 + + 67 files changed, 1475 insertions(+), 693 deletions(-) + create mode 100644 arch/arm/boot/dts/am335x-osd335x-common.dtsi + create mode 100644 arch/arm/boot/dts/am335x-pocketbeagle.dts + create mode 100644 arch/arm/boot/dts/dra7-mmc-iodelay.dtsi + delete mode 100644 arch/arm/mach-omap2/omap-pm-noop.c + delete mode 100644 arch/arm/mach-omap2/omap-pm.h + delete mode 100644 include/linux/platform_data/media/ir-rx51.h +Merging reset/reset/next (d7bab65b1f57 reset: uniphier: add LD11/LD20 stream demux system reset control) +$ git merge reset/reset/next +Merge made by the 'recursive' strategy. + drivers/reset/reset-uniphier.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) +Merging qcom/for-next (c9fe09a79371 soc: Unconditionally include qcom Makefile) +$ git merge qcom/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/firmware/qcom,scm.txt | 3 +- + .../devicetree/bindings/net/qualcomm-bluetooth.txt | 30 + + .../bindings/reserved-memory/qcom,cmd-db.txt | 37 + + .../devicetree/bindings/soc/qcom/qcom,geni-se.txt | 119 ++++ + .../devicetree/bindings/soc/qcom/qcom,smd-rpm.txt | 1 + + arch/arm64/boot/dts/qcom/Makefile | 1 + + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 17 +- + arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi | 26 + + .../boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi | 32 + + arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 69 +- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 18 +- + .../boot/dts/qcom/msm8992-bullhead-rev-101.dts | 17 + + arch/arm64/boot/dts/qcom/msm8992-pins.dtsi | 60 ++ + arch/arm64/boot/dts/qcom/msm8992.dtsi | 87 ++- + arch/arm64/boot/dts/qcom/msm8994-smd-rpm.dtsi | 276 ++++++++ + arch/arm64/boot/dts/qcom/msm8996.dtsi | 16 +- + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 75 +++ + arch/arm64/boot/dts/qcom/sdm845.dtsi | 342 ++++++++++ + drivers/firmware/qcom_scm-32.c | 8 +- + drivers/firmware/qcom_scm.c | 3 + + drivers/of/platform.c | 1 + + drivers/soc/Makefile | 2 +- + drivers/soc/qcom/Kconfig | 18 + + drivers/soc/qcom/Makefile | 2 + + drivers/soc/qcom/cmd-db.c | 317 +++++++++ + drivers/soc/qcom/qcom-geni-se.c | 748 +++++++++++++++++++++ + drivers/soc/qcom/smd-rpm.c | 1 + + drivers/soc/qcom/smem.c | 50 +- + include/linux/qcom-geni-se.h | 425 ++++++++++++ + include/soc/qcom/cmd-db.h | 45 ++ + 30 files changed, 2797 insertions(+), 49 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt + create mode 100644 Documentation/devicetree/bindings/reserved-memory/qcom,cmd-db.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.txt + create mode 100644 arch/arm64/boot/dts/qcom/msm8994-smd-rpm.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-mtp.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm845.dtsi + create mode 100644 drivers/soc/qcom/cmd-db.c + create mode 100644 drivers/soc/qcom/qcom-geni-se.c + create mode 100644 include/linux/qcom-geni-se.h + create mode 100644 include/soc/qcom/cmd-db.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 (6480b1624fdd Merge branches 'arm64-dt-for-v4.18' and 'dt-for-v4.18' into next) +$ git merge renesas/next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/mach-shmobile/Kconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/shmobile.txt | 10 +- + .../bindings/power/renesas,rcar-sysc.txt | 1 + + .../devicetree/bindings/reset/renesas,rst.txt | 2 + + arch/arm/Kconfig | 2 +- + arch/arm/Kconfig.debug | 13 +- + arch/arm/Makefile | 2 +- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/emev2-kzm9d.dts | 3 - + arch/arm/boot/dts/emev2.dtsi | 5 +- + arch/arm/boot/dts/r7s72100.dtsi | 1038 ++++----- + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 4 +- + arch/arm/boot/dts/r8a73a4.dtsi | 10 +- + arch/arm/boot/dts/r8a7740.dtsi | 10 + + arch/arm/boot/dts/r8a7743-iwg20m.dtsi | 5 + + arch/arm/boot/dts/r8a7743.dtsi | 19 +- + arch/arm/boot/dts/r8a7745-iwg22m.dtsi | 5 + + arch/arm/boot/dts/r8a7745.dtsi | 19 +- + arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts | 48 + + arch/arm/boot/dts/r8a77470.dtsi | 336 +++ + arch/arm/boot/dts/r8a7790-lager.dts | 30 +- + arch/arm/boot/dts/r8a7790.dtsi | 132 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 23 +- + arch/arm/boot/dts/r8a7791-porter.dts | 24 +- + arch/arm/boot/dts/r8a7791.dtsi | 73 +- + arch/arm/boot/dts/r8a7792-blanche.dts | 5 + + arch/arm/boot/dts/r8a7792-wheat.dts | 16 +- + arch/arm/boot/dts/r8a7792.dtsi | 19 +- + arch/arm/boot/dts/r8a7793-gose.dts | 21 +- + arch/arm/boot/dts/r8a7793.dtsi | 74 +- + arch/arm/boot/dts/r8a7794-alt.dts | 14 +- + arch/arm/boot/dts/r8a7794-silk.dts | 8 +- + arch/arm/boot/dts/r8a7794.dtsi | 28 +- + arch/arm/boot/dts/sh73a0.dtsi | 9 +- + arch/arm/configs/multi_v7_defconfig | 2 +- + arch/arm/configs/shmobile_defconfig | 3 +- + arch/arm/mach-shmobile/Kconfig | 13 + + arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 + + arch/arm64/Kconfig.platforms | 6 + + arch/arm64/boot/dts/renesas/Makefile | 1 + + .../boot/dts/renesas/r8a7795-es1-salvator-x.dts | 46 + + arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 1 - + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 46 + + .../arm64/boot/dts/renesas/r8a7795-salvator-xs.dts | 85 + + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 2048 ++++++++--------- + arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 28 + + .../arm64/boot/dts/renesas/r8a7796-salvator-xs.dts | 28 + + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 2348 ++++++++++---------- + .../arm64/boot/dts/renesas/r8a77965-salvator-x.dts | 28 + + .../boot/dts/renesas/r8a77965-salvator-xs.dts | 28 + + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 1082 ++++++--- + arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 116 + + arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 137 ++ + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 508 +++-- + arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 81 + + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 98 +- + arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 37 + + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 126 ++ + arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 721 +++--- + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 52 +- + arch/arm64/boot/dts/renesas/ulcb.dtsi | 37 +- + arch/arm64/configs/defconfig | 4 +- + drivers/soc/renesas/Kconfig | 8 +- + drivers/soc/renesas/Makefile | 1 + + drivers/soc/renesas/r8a77470-sysc.c | 29 + + drivers/soc/renesas/r8a77995-sysc.c | 3 +- + drivers/soc/renesas/rcar-rst.c | 2 + + drivers/soc/renesas/rcar-sysc.c | 3 + + drivers/soc/renesas/rcar-sysc.h | 1 + + drivers/soc/renesas/renesas-soc.c | 16 + + include/dt-bindings/power/r8a77470-sysc.h | 22 + + include/dt-bindings/power/r8a77990-sysc.h | 26 + + 72 files changed, 6103 insertions(+), 3731 deletions(-) + create mode 100644 arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts + create mode 100644 arch/arm/boot/dts/r8a77470.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a77990.dtsi + create mode 100644 drivers/soc/renesas/r8a77470-sysc.c + create mode 100644 include/dt-bindings/power/r8a77470-sysc.h + create mode 100644 include/dt-bindings/power/r8a77990-sysc.h +Merging rockchip/for-next (d736f2a5e6bc Merge branch 'v4.18-armsoc/defconfig64' into for-next) +$ git merge rockchip/for-next +Auto-merging arch/arm64/configs/defconfig +CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig +Resolved 'arch/arm64/configs/defconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 69c74acc18cf] Merge remote-tracking branch 'rockchip/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/boot/dts/rk3036.dtsi | 2 ++ + arch/arm/boot/dts/rk322x.dtsi | 8 +++++ + arch/arm/boot/dts/rk3288-phycore-som.dtsi | 1 + + arch/arm/boot/dts/rk3288-tinker.dts | 4 +++ + arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 3 +- + arch/arm/boot/dts/rk3288-veyron-minnie.dts | 2 ++ + arch/arm/boot/dts/rk3288.dtsi | 20 +++++++++--- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 10 ++++++ + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 10 ++++++ + arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 8 +++++ + arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts | 4 +-- + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 8 +++-- + .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 25 +++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 4 +++ + .../dts/rockchip/rk3399-sapphire-excavator.dts | 12 ++++++++ + arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 23 +++++--------- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 36 ++++++++++++++++------ + arch/arm64/configs/defconfig | 17 ++++++++++ + 18 files changed, 163 insertions(+), 34 deletions(-) +Merging samsung/for-next (bebc6082da0a Linux 4.14) +$ git merge samsung/for-next +Already up to date. +Merging samsung-krzk/for-next (cc4b07f8156c Merge branch 'next/dt' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging arch/arm/mach-exynos/Kconfig +CONFLICT (content): Merge conflict in arch/arm/mach-exynos/Kconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Removing arch/arm/boot/dts/exynos5440.dtsi +Removing arch/arm/boot/dts/exynos5440-trip-points.dtsi +Removing arch/arm/boot/dts/exynos5440-tmu-sensor-conf.dtsi +Removing arch/arm/boot/dts/exynos5440-ssdk5440.dts +Removing arch/arm/boot/dts/exynos5440-sd5v1.dts +Auto-merging arch/arm/boot/dts/Makefile +Resolved 'arch/arm/mach-exynos/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b4a1ddf0134a] Merge remote-tracking branch 'samsung-krzk/for-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/arm/samsung/samsung-boards.txt | 2 - + .../devicetree/bindings/power/pd-samsung.txt | 20 +- + arch/arm/boot/dts/Makefile | 2 - + arch/arm/boot/dts/exynos-syscon-restart.dtsi | 28 +- + arch/arm/boot/dts/exynos3250-rinato.dts | 4 + + arch/arm/boot/dts/exynos3250.dtsi | 2 +- + arch/arm/boot/dts/exynos4.dtsi | 3 +- + arch/arm/boot/dts/exynos4210-origen.dts | 34 +- + arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 32 +- + arch/arm/boot/dts/exynos4412-midas.dtsi | 86 +++-- + arch/arm/boot/dts/exynos4412-n710x.dts | 16 +- + arch/arm/boot/dts/exynos4412-origen.dts | 2 +- + arch/arm/boot/dts/exynos4412.dtsi | 2 +- + arch/arm/boot/dts/exynos5.dtsi | 3 - + arch/arm/boot/dts/exynos5250.dtsi | 7 +- + arch/arm/boot/dts/exynos5410.dtsi | 1 + + arch/arm/boot/dts/exynos5420-peach-pit.dts | 4 +- + arch/arm/boot/dts/exynos5420.dtsi | 51 ++- + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 2 +- + arch/arm/boot/dts/exynos5440-sd5v1.dts | 42 --- + arch/arm/boot/dts/exynos5440-ssdk5440.dts | 81 ----- + arch/arm/boot/dts/exynos5440-tmu-sensor-conf.dtsi | 20 -- + arch/arm/boot/dts/exynos5440-trip-points.dtsi | 21 -- + arch/arm/boot/dts/exynos5440.dtsi | 355 --------------------- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 4 +- + arch/arm/boot/dts/s3c2416-smdk2416.dts | 5 +- + arch/arm/boot/dts/s3c2416.dtsi | 11 +- + arch/arm/boot/dts/s3c24xx.dtsi | 4 +- + arch/arm/boot/dts/s3c6410-mini6410.dts | 3 +- + arch/arm/boot/dts/s3c6410-smdk6410.dts | 3 +- + arch/arm/boot/dts/s3c64xx.dtsi | 4 +- + arch/arm/configs/exynos_defconfig | 1 + + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/mach-exynos/Kconfig | 12 - + arch/arm/mach-exynos/common.h | 8 - + arch/arm/mach-exynos/exynos.c | 15 +- + arch/arm/mach-s3c24xx/h1940-bluetooth.c | 2 +- + arch/arm/mach-s3c24xx/mach-mini2440.c | 10 +- + arch/arm/plat-samsung/adc.c | 3 +- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 22 +- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 18 +- + drivers/soc/samsung/pm_domains.c | 90 +----- + 42 files changed, 179 insertions(+), 857 deletions(-) + delete mode 100644 arch/arm/boot/dts/exynos5440-sd5v1.dts + delete mode 100644 arch/arm/boot/dts/exynos5440-ssdk5440.dts + delete mode 100644 arch/arm/boot/dts/exynos5440-tmu-sensor-conf.dtsi + delete mode 100644 arch/arm/boot/dts/exynos5440-trip-points.dtsi + delete mode 100644 arch/arm/boot/dts/exynos5440.dtsi +Merging sunxi/sunxi/for-next (2b32dbbf4334 Merge branch 'sunxi/dt-for-4.18' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm/mach-shmobile/setup-rcar-gen2.c +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/sunxi-ccu.txt | 3 +- + .../bindings/nvmem/allwinner,sunxi-sid.txt | 1 + + arch/arm/boot/dts/Makefile | 5 +- + arch/arm/boot/dts/sun4i-a10.dtsi | 6 +- + arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts | 3 +- + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 33 +++ + arch/arm/boot/dts/sun8i-a33.dtsi | 44 ++++ + arch/arm/boot/dts/sun8i-a83t.dtsi | 64 ++++++ + .../boot/dts/sun8i-h2-plus-libretech-all-h3-cc.dts | 13 ++ + arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 21 ++ + arch/arm/boot/dts/sun8i-h3-libretech-all-h3-cc.dts | 206 +----------------- + arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 22 ++ + arch/arm/boot/dts/sun8i-h3.dtsi | 32 ++- + .../boot/dts/sun8i-r16-nintendo-nes-classic.dts | 56 +++++ + .../dts/sun8i-r16-nintendo-super-nes-classic.dts | 11 + + arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 10 + + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 18 ++ + arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi | 215 ++++++++++++++++++ + arch/arm/common/Makefile | 1 + + arch/arm/common/secure_cntvoff.S | 32 +++ + arch/arm/include/asm/cputype.h | 10 +- + arch/arm/include/asm/secure_cntvoff.h | 8 + + arch/arm/mach-shmobile/common.h | 1 - + arch/arm/mach-shmobile/headsmp-apmu.S | 22 +- + arch/arm/mach-shmobile/setup-rcar-gen2.c | 3 +- + arch/arm/mach-sunxi/Kconfig | 2 +- + arch/arm/mach-sunxi/Makefile | 2 +- + arch/arm/mach-sunxi/headsmp.S | 81 +++++++ + arch/arm/mach-sunxi/mc_smp.c | 239 +++++++++++++-------- + arch/arm/mach-sunxi/sunxi.c | 20 +- + arch/arm64/boot/dts/allwinner/Makefile | 5 +- + arch/arm64/boot/dts/allwinner/axp803.dtsi | 5 + + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 21 ++ + .../allwinner/sun50i-h5-libretech-all-h3-cc.dts | 14 ++ + arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 2 +- + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 10 + + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 70 +++++- + drivers/clk/Makefile | 2 +- + drivers/clk/sunxi-ng/Kconfig | 5 + + drivers/clk/sunxi-ng/Makefile | 40 ++-- + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 207 ++++++++++++++++++ + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.h | 19 ++ + include/dt-bindings/clock/sun50i-h6-r-ccu.h | 24 +++ + include/dt-bindings/reset/sun50i-h6-r-ccu.h | 17 ++ + 44 files changed, 1252 insertions(+), 373 deletions(-) + create mode 100644 arch/arm/boot/dts/sun8i-h2-plus-libretech-all-h3-cc.dts + create mode 100644 arch/arm/boot/dts/sun8i-r16-nintendo-nes-classic.dts + create mode 100644 arch/arm/boot/dts/sun8i-r16-nintendo-super-nes-classic.dts + create mode 100644 arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi + create mode 100644 arch/arm/common/secure_cntvoff.S + create mode 100644 arch/arm/include/asm/secure_cntvoff.h + create mode 100644 arch/arm/mach-sunxi/headsmp.S + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-libretech-all-h3-cc.dts + create mode 100644 drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun50i-h6-r.h + create mode 100644 include/dt-bindings/clock/sun50i-h6-r-ccu.h + create mode 100644 include/dt-bindings/reset/sun50i-h6-r-ccu.h +Merging tegra/for-next (0331f709c1b5 Merge branch for-4.18/arm64/dt into for-next) +$ git merge tegra/for-next +Removing drivers/memory/tegra20-mc.c +Auto-merging Documentation/devicetree/bindings/memory-controllers/nvidia,tegra20-mc.txt +Removing Documentation/devicetree/bindings/arm/tegra/nvidia,tegra30-mc.txt +Merge made by the 'recursive' strategy. + .../bindings/arm/tegra/nvidia,tegra30-mc.txt | 18 -- + .../nvidia,tegra20-mc.txt | 12 +- + .../memory-controllers/nvidia,tegra30-mc.txt | 5 + + arch/arm/boot/dts/tegra114.dtsi | 5 + + arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 6 +- + arch/arm/boot/dts/tegra124-apalis.dtsi | 6 +- + arch/arm/boot/dts/tegra30.dtsi | 14 + + arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 2 +- + drivers/memory/Kconfig | 10 - + drivers/memory/Makefile | 1 - + drivers/memory/tegra/Makefile | 1 + + drivers/memory/tegra/mc.c | 350 +++++++++++++++++++-- + drivers/memory/tegra/mc.h | 22 ++ + drivers/memory/tegra/tegra114.c | 35 +++ + drivers/memory/tegra/tegra124.c | 48 +++ + drivers/memory/tegra/tegra20.c | 296 +++++++++++++++++ + drivers/memory/tegra/tegra210.c | 53 +++- + drivers/memory/tegra/tegra30.c | 35 +++ + drivers/memory/tegra20-mc.c | 254 --------------- + include/dt-bindings/memory/tegra114-mc.h | 19 ++ + include/dt-bindings/memory/tegra124-mc.h | 25 ++ + include/dt-bindings/memory/tegra20-mc.h | 21 ++ + include/dt-bindings/memory/tegra210-mc.h | 31 ++ + include/dt-bindings/memory/tegra30-mc.h | 19 ++ + include/soc/tegra/mc.h | 37 ++- + 25 files changed, 996 insertions(+), 329 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra30-mc.txt + rename Documentation/devicetree/bindings/{arm/tegra => memory-controllers}/nvidia,tegra20-mc.txt (57%) + create mode 100644 drivers/memory/tegra/tegra20.c + delete mode 100644 drivers/memory/tegra20-mc.c + create mode 100644 include/dt-bindings/memory/tegra20-mc.h +Merging arm64/for-next/core (24534b351182 arm64: assembler: add macros to conditionally yield the NEON under PREEMPT) +$ git merge arm64/for-next/core +Already up to date. +Merging clk/clk-next (96695741a646 Merge branch 'clk-qcom-sdm845' into clk-next) +$ git merge clk/clk-next +Auto-merging drivers/clk/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/actions,s900-cmu.txt | 47 + + .../bindings/clock/nuvoton,npcm750-clk.txt | 100 + + .../devicetree/bindings/clock/qcom,gcc.txt | 2 + + .../devicetree/bindings/clock/qcom,rpmh-clk.txt | 22 + + MAINTAINERS | 1 + + drivers/clk/Kconfig | 1 + + drivers/clk/Makefile | 2 + + drivers/clk/actions/Kconfig | 14 + + drivers/clk/actions/Makefile | 12 + + drivers/clk/actions/owl-common.c | 89 + + drivers/clk/actions/owl-common.h | 41 + + drivers/clk/actions/owl-composite.c | 199 ++ + drivers/clk/actions/owl-composite.h | 124 + + drivers/clk/actions/owl-divider.c | 94 + + drivers/clk/actions/owl-divider.h | 75 + + drivers/clk/actions/owl-factor.c | 222 ++ + drivers/clk/actions/owl-factor.h | 83 + + drivers/clk/actions/owl-fixed-factor.h | 28 + + drivers/clk/actions/owl-gate.c | 77 + + drivers/clk/actions/owl-gate.h | 73 + + drivers/clk/actions/owl-mux.c | 60 + + drivers/clk/actions/owl-mux.h | 61 + + drivers/clk/actions/owl-pll.c | 194 ++ + drivers/clk/actions/owl-pll.h | 92 + + drivers/clk/actions/owl-s900.c | 721 ++++ + drivers/clk/clk-npcm7xx.c | 656 ++++ + drivers/clk/clk.c | 21 +- + drivers/clk/imx/clk-imx6sx.c | 10 +- + drivers/clk/imx/clk-imx6ul.c | 2 +- + drivers/clk/qcom/Kconfig | 17 + + drivers/clk/qcom/Makefile | 2 + + drivers/clk/qcom/clk-alpha-pll.c | 301 +- + drivers/clk/qcom/clk-alpha-pll.h | 18 +- + drivers/clk/qcom/clk-branch.c | 7 +- + drivers/clk/qcom/clk-branch.h | 1 + + drivers/clk/qcom/clk-rcg.h | 17 +- + drivers/clk/qcom/clk-rcg2.c | 167 +- + drivers/clk/qcom/gcc-msm8998.c | 2834 ++++++++++++++++ + drivers/clk/qcom/gcc-sdm845.c | 3465 ++++++++++++++++++++ + drivers/clk/qcom/gdsc.c | 94 +- + drivers/clk/qcom/gdsc.h | 5 +- + drivers/clk/spear/spear6xx_clock.c | 2 +- + drivers/clocksource/timer-sp804.c | 3 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 4 +- + drivers/soc/rockchip/pm_domains.c | 4 +- + drivers/soc/tegra/pmc.c | 3 +- + include/dt-bindings/clock/actions,s900-cmu.h | 129 + + include/dt-bindings/clock/imx6sx-clock.h | 6 +- + include/dt-bindings/clock/nuvoton,npcm7xx-clock.h | 44 + + include/dt-bindings/clock/qcom,gcc-msm8998.h | 208 ++ + include/dt-bindings/clock/qcom,gcc-sdm845.h | 239 ++ + include/dt-bindings/clock/qcom,rpmh.h | 24 + + include/linux/clk-provider.h | 16 +- + include/linux/of_clk.h | 30 + + 54 files changed, 10667 insertions(+), 96 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/actions,s900-cmu.txt + create mode 100644 Documentation/devicetree/bindings/clock/nuvoton,npcm750-clk.txt + create mode 100644 Documentation/devicetree/bindings/clock/qcom,rpmh-clk.txt + create mode 100644 drivers/clk/actions/Kconfig + create mode 100644 drivers/clk/actions/Makefile + create mode 100644 drivers/clk/actions/owl-common.c + create mode 100644 drivers/clk/actions/owl-common.h + create mode 100644 drivers/clk/actions/owl-composite.c + create mode 100644 drivers/clk/actions/owl-composite.h + create mode 100644 drivers/clk/actions/owl-divider.c + create mode 100644 drivers/clk/actions/owl-divider.h + create mode 100644 drivers/clk/actions/owl-factor.c + create mode 100644 drivers/clk/actions/owl-factor.h + create mode 100644 drivers/clk/actions/owl-fixed-factor.h + create mode 100644 drivers/clk/actions/owl-gate.c + create mode 100644 drivers/clk/actions/owl-gate.h + create mode 100644 drivers/clk/actions/owl-mux.c + create mode 100644 drivers/clk/actions/owl-mux.h + create mode 100644 drivers/clk/actions/owl-pll.c + create mode 100644 drivers/clk/actions/owl-pll.h + create mode 100644 drivers/clk/actions/owl-s900.c + create mode 100644 drivers/clk/clk-npcm7xx.c + create mode 100644 drivers/clk/qcom/gcc-msm8998.c + create mode 100644 drivers/clk/qcom/gcc-sdm845.c + create mode 100644 include/dt-bindings/clock/actions,s900-cmu.h + create mode 100644 include/dt-bindings/clock/nuvoton,npcm7xx-clock.h + create mode 100644 include/dt-bindings/clock/qcom,gcc-msm8998.h + create mode 100644 include/dt-bindings/clock/qcom,gcc-sdm845.h + create mode 100644 include/dt-bindings/clock/qcom,rpmh.h + create mode 100644 include/linux/of_clk.h +Merging clk-samsung/for-next (e8cf870f253b clk: samsung: simplify getting .drvdata) +$ git merge clk-samsung/for-next +Merge made by the 'recursive' strategy. + drivers/clk/samsung/clk-s3c2410-dclk.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) +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 (f245ff73dbe9 m68k: Use read_persistent_clock64() consistently) +$ git merge m68k/for-next +Merge made by the 'recursive' strategy. + arch/m68k/68000/timers.c | 4 +++- + arch/m68k/apollo/config.c | 8 +++++--- + arch/m68k/configs/amiga_defconfig | 14 +++++++++----- + arch/m68k/configs/apollo_defconfig | 14 +++++++++----- + arch/m68k/configs/atari_defconfig | 14 +++++++++----- + arch/m68k/configs/bvme6000_defconfig | 14 +++++++++----- + arch/m68k/configs/hp300_defconfig | 14 +++++++++----- + arch/m68k/configs/mac_defconfig | 14 +++++++++----- + arch/m68k/configs/multi_defconfig | 14 +++++++++----- + arch/m68k/configs/mvme147_defconfig | 14 +++++++++----- + arch/m68k/configs/mvme16x_defconfig | 14 +++++++++----- + arch/m68k/configs/q40_defconfig | 14 +++++++++----- + arch/m68k/configs/sun3_defconfig | 14 +++++++++----- + arch/m68k/configs/sun3x_defconfig | 14 +++++++++----- + arch/m68k/kernel/signal.c | 23 ++++++++++++----------- + arch/m68k/kernel/time.c | 25 ++++++++++++++----------- + arch/m68k/mac/config.c | 2 +- + arch/m68k/mvme147/config.c | 4 +++- + arch/m68k/mvme16x/config.c | 4 +++- + arch/m68k/sun3/intersil.c | 8 +++++--- + arch/m68k/sun3x/time.c | 8 +++++--- + 21 files changed, 159 insertions(+), 95 deletions(-) +Merging m68knommu/for-next (262afd3d980b m68k: fix ColdFire PCI config reads and writes) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/Kconfig.bus | 8 +- + arch/m68k/coldfire/pci.c | 114 +--------------- + arch/m68k/include/asm/atarihw.h | 1 + + arch/m68k/include/asm/io.h | 10 +- + arch/m68k/include/asm/io_mm.h | 98 ++------------ + arch/m68k/include/asm/io_no.h | 253 +++++++++++++++--------------------- + arch/m68k/include/asm/kmap.h | 80 ++++++++++++ + arch/m68k/include/asm/nubus.h | 1 + + arch/m68k/include/asm/q40_master.h | 2 +- + arch/m68k/include/asm/raw_io.h | 14 -- + arch/m68k/include/asm/vga.h | 9 ++ + arch/m68k/include/asm/virtconvert.h | 2 + + arch/m68k/include/asm/zorro.h | 1 + + arch/m68k/mm/kmap.c | 8 ++ + 14 files changed, 230 insertions(+), 371 deletions(-) + create mode 100644 arch/m68k/include/asm/kmap.h +Merging microblaze/next (a7a9e2f0410d microblaze: dts: replace 'linux,stdout-path' with 'stdout-path') +$ git merge microblaze/next +Removing arch/microblaze/kernel/early_printk.c +Removing arch/microblaze/include/asm/prom.h +Auto-merging arch/microblaze/include/asm/pci.h +Merge made by the 'recursive' strategy. + arch/microblaze/Kconfig.debug | 8 -- + arch/microblaze/boot/Makefile | 10 +- + arch/microblaze/boot/dts/system.dts | 2 +- + arch/microblaze/include/asm/cpuinfo.h | 2 +- + arch/microblaze/include/asm/pci.h | 1 - + arch/microblaze/include/asm/prom.h | 27 ----- + arch/microblaze/include/asm/setup.h | 5 - + arch/microblaze/kernel/Makefile | 1 - + arch/microblaze/kernel/early_printk.c | 184 ---------------------------------- + arch/microblaze/kernel/misc.S | 35 ------- + arch/microblaze/kernel/platform.c | 1 - + arch/microblaze/kernel/prom.c | 82 --------------- + arch/microblaze/kernel/setup.c | 17 +--- + arch/microblaze/pci/indirect_pci.c | 1 - + 14 files changed, 12 insertions(+), 364 deletions(-) + delete mode 100644 arch/microblaze/include/asm/prom.h + delete mode 100644 arch/microblaze/kernel/early_printk.c +Merging mips/mips-next (ea4d340cbea4 Merge branches '4.15-fixes', '4.16-features' and 'octeon-3-net-mips-bits' into mips-next) +$ git merge mips/mips-next +Auto-merging drivers/staging/octeon/ethernet-tx.c +Auto-merging drivers/staging/octeon/ethernet-rx.c +Auto-merging drivers/staging/octeon/ethernet-defines.h +Auto-merging arch/mips/include/asm/mipsregs.h +Auto-merging arch/mips/cavium-octeon/Kconfig +Merge made by the 'recursive' strategy. + arch/mips/cavium-octeon/Kconfig | 27 +- + arch/mips/cavium-octeon/Makefile | 1 + + arch/mips/cavium-octeon/resource-mgr.c | 351 +++++++++++++++++++++ + arch/mips/cavium-octeon/setup.c | 22 +- + arch/mips/include/asm/barrier.h | 2 +- + .../asm/mach-cavium-octeon/kernel-entry-init.h | 20 +- + arch/mips/include/asm/mipsregs.h | 2 + + arch/mips/include/asm/octeon/octeon.h | 32 +- + arch/mips/include/asm/processor.h | 2 +- + arch/mips/kernel/octeon_switch.S | 2 - + arch/mips/mm/tlbex.c | 29 +- + drivers/staging/octeon/ethernet-defines.h | 6 - + drivers/staging/octeon/ethernet-rx.c | 25 +- + drivers/staging/octeon/ethernet-tx.c | 85 ++--- + 14 files changed, 473 insertions(+), 133 deletions(-) + create mode 100644 arch/mips/cavium-octeon/resource-mgr.c +Merging mips-james/mips-next (23f8adc497b7 MIPS: BCM47XX: Use __initdata for the bcm47xx_leds_pdata) +$ git merge mips-james/mips-next +Auto-merging lib/Makefile +Auto-merging lib/Kconfig +Auto-merging arch/riscv/Kconfig +Removing arch/mips/lib/ucmpdi2.c +Removing arch/mips/lib/lshrdi3.c +Removing arch/mips/lib/cmpdi2.c +Removing arch/mips/lib/ashrdi3.c +Removing arch/mips/lib/ashldi3.c +Auto-merging arch/mips/Kconfig +Merge made by the 'recursive' strategy. + arch/mips/Kconfig | 5 ++++ + arch/mips/bcm47xx/board.c | 2 ++ + arch/mips/bcm47xx/buttons.c | 9 ++++++ + arch/mips/bcm47xx/leds.c | 11 +++++++- + arch/mips/boot/compressed/Makefile | 11 +++++--- + arch/mips/boot/dts/brcm/Makefile | 2 +- + arch/mips/boot/dts/cavium-octeon/Makefile | 2 +- + arch/mips/boot/dts/ingenic/Makefile | 2 +- + arch/mips/boot/dts/lantiq/Makefile | 2 +- + arch/mips/boot/dts/mscc/Makefile | 2 +- + arch/mips/boot/dts/mti/Makefile | 2 +- + arch/mips/boot/dts/netlogic/Makefile | 2 +- + arch/mips/boot/dts/pic32/Makefile | 2 +- + arch/mips/boot/dts/ralink/Makefile | 2 +- + arch/mips/boot/dts/xilfpga/Makefile | 2 +- + arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h | 1 + + arch/mips/lib/Makefile | 3 +- + arch/mips/lib/ashldi3.c | 30 -------------------- + arch/mips/lib/ashrdi3.c | 32 ---------------------- + arch/mips/lib/cmpdi2.c | 28 ------------------- + arch/mips/lib/lshrdi3.c | 30 -------------------- + arch/mips/lib/ucmpdi2.c | 22 --------------- + arch/riscv/Kconfig | 6 ++-- + drivers/firmware/broadcom/bcm47xx_nvram.c | 2 +- + lib/Kconfig | 12 ++++---- + lib/Makefile | 12 ++++---- + lib/ucmpdi2.c | 2 +- + 27 files changed, 62 insertions(+), 176 deletions(-) + delete mode 100644 arch/mips/lib/ashldi3.c + delete mode 100644 arch/mips/lib/ashrdi3.c + delete mode 100644 arch/mips/lib/cmpdi2.c + delete mode 100644 arch/mips/lib/lshrdi3.c + delete mode 100644 arch/mips/lib/ucmpdi2.c +Merging nds32/next (4b5b05725cf2 Merge branch 'next' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/greentime/linux into gt-mainline-next) +$ git merge nds32/next +Merge made by the 'recursive' strategy. + arch/nds32/Kconfig | 7 +++++++ + arch/nds32/Kconfig.cpu | 5 +++-- + arch/nds32/Makefile | 7 ++++--- + arch/nds32/include/asm/Kbuild | 2 ++ + arch/nds32/include/asm/bitfield.h | 3 ++- + arch/nds32/include/asm/cacheflush.h | 2 ++ + arch/nds32/include/asm/io.h | 2 ++ + arch/nds32/include/asm/page.h | 3 +++ + arch/nds32/include/asm/pgtable.h | 1 + + arch/nds32/kernel/ex-entry.S | 2 +- + arch/nds32/kernel/head.S | 28 +++++++++++++++++++++----- + arch/nds32/kernel/setup.c | 3 +++ + arch/nds32/kernel/stacktrace.c | 2 ++ + arch/nds32/lib/copy_page.S | 3 +++ + arch/nds32/mm/alignment.c | 9 ++++++--- + arch/nds32/mm/cacheflush.c | 40 +++++++++++++++++++++++++++++++++++++ + arch/nds32/mm/init.c | 1 + + 17 files changed, 105 insertions(+), 15 deletions(-) +Merging nios2/for-next (3d9644ef9a0f nios2: Use read_persistent_clock64() instead of read_persistent_clock()) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (d56f3af9e801 openrisc: remove unused __ARCH_HAVE_MMU define) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (07943d6329dc parisc: Build kernel without -ffunction-sections) +$ git merge parisc-hd/for-next +Auto-merging arch/parisc/Makefile +Merge made by the 'recursive' strategy. + arch/parisc/Makefile | 4 ---- + 1 file changed, 4 deletions(-) +Merging powerpc/next (53da14d0833a powerpc: Make it clearer that systbl check errors are errors) +$ git merge powerpc/next +Removing arch/powerpc/platforms/83xx/sbc834x.c +Auto-merging arch/powerpc/include/asm/paca.h +Auto-merging arch/powerpc/include/asm/ftrace.h +CONFLICT (content): Merge conflict in arch/powerpc/include/asm/ftrace.h +Removing arch/powerpc/configs/83xx/sbc834x_defconfig +Removing arch/powerpc/boot/dts/sbc8349.dts +Auto-merging arch/powerpc/Kconfig +Resolved 'arch/powerpc/include/asm/ftrace.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9ab2e51923a1] Merge remote-tracking branch 'powerpc/next' +$ git diff -M --stat --summary HEAD^.. + arch/powerpc/Kconfig | 2 + + arch/powerpc/boot/dts/sbc8349.dts | 331 ------------------------- + arch/powerpc/configs/83xx/sbc834x_defconfig | 74 ------ + arch/powerpc/configs/powernv_defconfig | 108 ++++---- + arch/powerpc/configs/wii_defconfig | 14 ++ + arch/powerpc/include/asm/asm-prototypes.h | 17 +- + arch/powerpc/include/asm/ftrace.h | 31 ++- + arch/powerpc/include/asm/module.h | 3 + + arch/powerpc/include/asm/nohash/32/pgtable.h | 34 +-- + arch/powerpc/include/asm/nohash/64/pgtable.h | 31 +-- + arch/powerpc/include/asm/nohash/pgtable.h | 58 +---- + arch/powerpc/include/asm/nohash/pte-book3e.h | 6 - + arch/powerpc/include/asm/paca.h | 1 + + arch/powerpc/include/asm/page.h | 1 + + arch/powerpc/include/asm/syscalls.h | 2 +- + arch/powerpc/include/asm/systbl.h | 6 +- + arch/powerpc/include/asm/trace.h | 7 +- + arch/powerpc/kernel/asm-offsets.c | 1 + + arch/powerpc/kernel/fadump.c | 40 ++- + arch/powerpc/kernel/machine_kexec.c | 2 + + arch/powerpc/kernel/machine_kexec_64.c | 8 +- + arch/powerpc/kernel/module_64.c | 43 +++- + arch/powerpc/kernel/pci_32.c | 6 +- + arch/powerpc/kernel/pci_64.c | 4 +- + arch/powerpc/kernel/rtas.c | 3 +- + arch/powerpc/kernel/setup_64.c | 7 + + arch/powerpc/kernel/signal.h | 6 +- + arch/powerpc/kernel/signal_32.c | 40 +-- + arch/powerpc/kernel/signal_64.c | 15 +- + arch/powerpc/kernel/smp.c | 12 + + arch/powerpc/kernel/stacktrace.c | 119 ++++++++- + arch/powerpc/kernel/sys_ppc32.c | 9 - + arch/powerpc/kernel/systbl.S | 2 +- + arch/powerpc/kernel/systbl_chk.c | 2 +- + arch/powerpc/kernel/systbl_chk.sh | 4 +- + arch/powerpc/kernel/trace/ftrace.c | 212 ++++++++++++---- + arch/powerpc/kernel/trace/ftrace_32.S | 20 -- + arch/powerpc/kernel/trace/ftrace_64.S | 29 --- + arch/powerpc/kernel/trace/ftrace_64_mprofile.S | 88 ++++++- + arch/powerpc/kernel/trace/ftrace_64_pg.S | 6 +- + arch/powerpc/kernel/watchdog.c | 32 ++- + arch/powerpc/kvm/book3s_hv.c | 4 + + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 3 + + arch/powerpc/mm/hash_utils_64.c | 6 +- + arch/powerpc/mm/hugetlbpage.c | 7 + + arch/powerpc/mm/subpage-prot.c | 4 +- + arch/powerpc/platforms/83xx/Kconfig | 7 - + arch/powerpc/platforms/83xx/Makefile | 1 - + arch/powerpc/platforms/83xx/sbc834x.c | 73 ------ + arch/powerpc/platforms/cell/spu_callbacks.c | 2 +- + arch/powerpc/platforms/cell/spu_syscalls.c | 3 +- + arch/powerpc/platforms/powernv/setup.c | 10 +- + arch/powerpc/platforms/pseries/hvCall_inst.c | 2 +- + arch/powerpc/platforms/pseries/kexec.c | 7 +- + arch/powerpc/platforms/pseries/lpar.c | 3 +- + arch/powerpc/sysdev/xive/spapr.c | 88 ++++++- + kernel/sys_ni.c | 2 +- + kernel/trace/Kconfig | 6 +- + 58 files changed, 786 insertions(+), 878 deletions(-) + delete mode 100644 arch/powerpc/boot/dts/sbc8349.dts + delete mode 100644 arch/powerpc/configs/83xx/sbc834x_defconfig + delete mode 100644 arch/powerpc/platforms/83xx/sbc834x.c +Merging powerpc-pkey/topic/pkey (d86a4ba02fc6 powerpc/pkeys: Drop private VM_PKEY definitions) +$ git merge powerpc-pkey/topic/pkey +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/mmu_context.h | 5 ----- + arch/powerpc/include/asm/pkeys.h | 13 ------------- + arch/x86/include/asm/mmu_context.h | 15 --------------- + arch/x86/include/asm/pkeys.h | 13 +++++++++++++ + arch/x86/kernel/setup.c | 8 -------- + fs/proc/task_mmu.c | 13 +++++++------ + include/linux/mm.h | 14 ++++++++++---- + include/linux/pkeys.h | 13 +++++++++++-- + 8 files changed, 41 insertions(+), 53 deletions(-) +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 (6d08b06e67cd Linux 4.17-rc2) +$ git merge risc-v/for-next +Already up to date. +Merging s390/features (b7e7f5051bf8 s390: remove closung punctuation from spectre messages) +$ git merge s390/features +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + arch/s390/configs/debug_defconfig | 9 +- + arch/s390/configs/performance_defconfig | 8 +- + arch/s390/crypto/crc32be-vx.S | 5 +- + arch/s390/crypto/crc32le-vx.S | 4 +- + arch/s390/include/asm/cpu_mf.h | 6 +- + arch/s390/include/asm/nospec-insn.h | 196 ++++++++++++++++++++++++++++++++ + arch/s390/include/asm/purgatory.h | 6 + + arch/s390/kernel/Makefile | 28 +++-- + arch/s390/kernel/asm-offsets.c | 1 + + arch/s390/kernel/base.S | 24 ++-- + arch/s390/kernel/early.c | 80 ------------- + arch/s390/kernel/early_nobss.c | 65 +++++++++++ + arch/s390/kernel/entry.S | 105 ++++------------- + arch/s390/kernel/entry.h | 1 + + arch/s390/kernel/head64.S | 8 +- + arch/s390/kernel/irq.c | 5 +- + arch/s390/kernel/mcount.S | 14 ++- + arch/s390/kernel/nospec-branch.c | 48 ++++---- + arch/s390/kernel/nospec-sysfs.c | 21 ++++ + arch/s390/kernel/perf_cpum_sf.c | 4 + + arch/s390/kernel/reipl.S | 7 +- + arch/s390/kernel/swsusp.S | 10 +- + arch/s390/lib/Makefile | 3 + + arch/s390/lib/mem.S | 19 ++-- + arch/s390/net/bpf_jit.S | 16 ++- + arch/s390/net/bpf_jit_comp.c | 63 +++++++++- + arch/s390/scripts/Makefile.chkbss | 14 +++ + drivers/s390/char/Makefile | 3 + + drivers/s390/cio/vfio_ccw_cp.c | 13 ++- + 30 files changed, 534 insertions(+), 254 deletions(-) + create mode 100644 arch/s390/include/asm/nospec-insn.h + create mode 100644 arch/s390/kernel/early_nobss.c + create mode 100644 arch/s390/kernel/nospec-sysfs.c + create mode 100644 arch/s390/scripts/Makefile.chkbss +Merging sparc-next/master (17dec0a94915 Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace) +$ git merge sparc-next/master +Already up to date. +Merging sh/for-next (bf9c7e3d7924 arch/sh: pcie-sh7786: handle non-zero DMA offset) +$ git merge sh/for-next +Already up to date. +Merging uml/linux-next (e40238dedb48 Fix vector raw inintialization logic) +$ git merge uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (ae6063c83634 Merge branch 'xtensa-fixes' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +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 (6da6c0db5316 Linux v4.17-rc3) +$ git merge fscrypt/master +Already up to date. +Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard issues) +$ git merge befs/for-next +Merge made by the 'recursive' strategy. + fs/befs/btree.c | 97 ++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 51 insertions(+), 46 deletions(-) +Merging btrfs/next (7c9a09f56a91 btrfs: don't use async helpers for crcs when under IO limits) +$ git merge btrfs/next +Auto-merging kernel/cgroup/cgroup.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/buffer_head.h +Auto-merging include/linux/backing-dev.h +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext2/super.c +Auto-merging fs/ext2/inode.c +Auto-merging fs/buffer.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/check-integrity.c +Auto-merging fs/block_dev.c +Auto-merging block/blk-cgroup.c +Merge made by the 'recursive' strategy. + block/blk-cgroup.c | 1 + + fs/block_dev.c | 3 +-- + fs/btrfs/check-integrity.c | 2 +- + fs/btrfs/disk-io.c | 4 ++++ + fs/btrfs/inode.c | 15 ++++++++++++--- + fs/btrfs/ioctl.c | 8 +++++++- + fs/btrfs/super.c | 1 - + fs/buffer.c | 42 ++++++++++++++++++++++++++++++++++-------- + fs/ext2/inode.c | 3 ++- + fs/ext2/super.c | 1 - + fs/ext4/inode.c | 4 +++- + fs/ext4/super.c | 2 -- + include/linux/backing-dev.h | 2 +- + include/linux/buffer_head.h | 3 +++ + include/linux/fs.h | 3 ++- + kernel/cgroup/cgroup.c | 1 + + 16 files changed, 72 insertions(+), 23 deletions(-) +$ git am -3 ../patches/0001-f2fs-fixup-for-cgroup-writeback-change.patch +Applying: f2fs: fixup for cgroup/writeback change +$ git reset HEAD^ +Unstaged changes after reset: +M fs/f2fs/inode.c +M fs/f2fs/super.c +$ git add -A . +$ git commit -v -a --amend +[master 6d6aa5ef686b] Merge remote-tracking branch 'btrfs/next' + Date: Fri May 11 09:32:26 2018 +1000 +Merging btrfs-kdave/for-next (b8111316f384 Merge branch 'for-next-next-v4.18-20180509' into for-next-20180509) +$ git merge btrfs-kdave/for-next +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/disk-io.c +Merge made by the 'recursive' strategy. + fs/btrfs/compression.c | 21 +- + fs/btrfs/ctree.h | 42 ++- + fs/btrfs/delayed-ref.c | 264 +++++++++-------- + fs/btrfs/delayed-ref.h | 5 +- + fs/btrfs/dev-replace.c | 140 +++++++-- + fs/btrfs/disk-io.c | 26 +- + fs/btrfs/extent-tree.c | 208 ++++++++++---- + fs/btrfs/extent_io.c | 213 +++++++++----- + fs/btrfs/extent_io.h | 20 +- + fs/btrfs/extent_map.c | 6 +- + fs/btrfs/extent_map.h | 3 +- + fs/btrfs/file.c | 41 +-- + fs/btrfs/free-space-cache.c | 22 +- + fs/btrfs/free-space-cache.h | 3 +- + fs/btrfs/free-space-tree.c | 77 ++--- + fs/btrfs/inode.c | 466 +++++++++++++++++++++--------- + fs/btrfs/ioctl.c | 581 ++++++++++++++++++++------------------ + fs/btrfs/print-tree.c | 21 ++ + fs/btrfs/props.c | 2 +- + fs/btrfs/qgroup.c | 61 ++-- + fs/btrfs/relocation.c | 6 +- + fs/btrfs/scrub.c | 1 + + fs/btrfs/send.c | 46 +-- + fs/btrfs/super.c | 7 +- + fs/btrfs/sysfs.c | 2 +- + fs/btrfs/tests/extent-map-tests.c | 60 ++-- + fs/btrfs/transaction.c | 35 +-- + fs/btrfs/volumes.c | 476 +++++++++++++------------------ + fs/btrfs/volumes.h | 24 +- + fs/btrfs/zstd.c | 19 +- + include/trace/events/btrfs.h | 323 ++++++++++++--------- + include/uapi/linux/btrfs.h | 26 ++ + 32 files changed, 1884 insertions(+), 1363 deletions(-) +Merging ceph/master (fc218544fbc8 ceph: fix iov_iter issues in ceph_direct_read_write()) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + drivers/block/rbd.c | 4 +- + fs/ceph/file.c | 205 ++++++++++++++++++++++++---------------- + include/linux/ceph/osd_client.h | 12 ++- + net/ceph/osd_client.c | 27 +++++- + 4 files changed, 158 insertions(+), 90 deletions(-) +Merging cifs/for-next (c3d5c2a93abf smb3: directory sync should not return an error) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifs_debug.c | 7 +-- + fs/cifs/cifs_debug.h | 2 +- + fs/cifs/cifs_fs_sb.h | 1 + + fs/cifs/cifsfs.c | 15 ++++++ + fs/cifs/cifsfs.h | 2 +- + fs/cifs/cifsglob.h | 11 +++-- + fs/cifs/cifsproto.h | 2 +- + fs/cifs/cifssmb.c | 6 +++ + fs/cifs/connect.c | 23 +++++---- + fs/cifs/misc.c | 5 +- + fs/cifs/netmisc.c | 2 +- + fs/cifs/readdir.c | 6 ++- + fs/cifs/smb2inode.c | 43 ++++++++++------ + fs/cifs/smb2misc.c | 14 +++--- + fs/cifs/smb2ops.c | 65 ++++++++++++++++++++++--- + fs/cifs/smb2pdu.c | 135 ++++++++++++++++++++++++++++----------------------- + fs/cifs/smb2proto.h | 6 ++- + 17 files changed, 232 insertions(+), 113 deletions(-) +Merging configfs/for-next (6ace4f6bbcfd RDMA/cma: make config_item_type const) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (e86281e700cc eCryptfs: don't pass up plaintext names when using filename encryption) +$ git merge ecryptfs/next +Already up to date. +Merging ext3/for_next (b1255ee6a289 Pull UDF UTF-16 handling improvements.) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/udf/Kconfig | 6 +- + fs/udf/super.c | 12 +-- + fs/udf/udfdecl.h | 3 +- + fs/udf/unicode.c | 260 +++++++++++++++++++++++++++---------------------------- + 4 files changed, 131 insertions(+), 150 deletions(-) +Merging ext4/dev (7ef79ad52136 ext4: add MODULE_SOFTDEP to ensure crc32c is included in the initramfs) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (5b19d284f519 f2fs: avoid fsync() failure caused by EAGAIN in writepage()) +$ git merge f2fs/dev +Auto-merging fs/f2fs/super.c +Merge made by the 'recursive' strategy. + fs/crypto/bio.c | 35 ++++--- + fs/crypto/crypto.c | 8 +- + fs/crypto/fscrypt_private.h | 1 - + fs/ext4/readpage.c | 2 +- + fs/f2fs/checkpoint.c | 2 +- + fs/f2fs/data.c | 209 ++++++++++++++++++++++++++-------------- + fs/f2fs/f2fs.h | 21 ++-- + fs/f2fs/file.c | 4 +- + fs/f2fs/gc.c | 7 +- + fs/f2fs/inline.c | 3 +- + fs/f2fs/namei.c | 8 +- + fs/f2fs/node.c | 3 +- + fs/f2fs/segment.c | 1 + + fs/f2fs/super.c | 6 ++ + include/linux/fscrypt_notsupp.h | 13 ++- + include/linux/fscrypt_supp.h | 5 +- + 16 files changed, 215 insertions(+), 113 deletions(-) +Merging fuse/for-next (5ba24197b94d fuse: add writeback documentation) +$ git merge fuse/for-next +Auto-merging fs/fuse/inode.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/fuse-io.txt | 38 +++++++++++++++++++++++++++++ + fs/fuse/acl.c | 4 ++-- + fs/fuse/control.c | 2 +- + fs/fuse/cuse.c | 11 ++++++--- + fs/fuse/dev.c | 40 +++++++++++++++---------------- + fs/fuse/dir.c | 45 +++++++++++++++++++++++++---------- + fs/fuse/fuse_i.h | 14 +++++++++-- + fs/fuse/inode.c | 40 +++++++++++++++++++------------ + include/uapi/linux/fuse.h | 7 +++++- + kernel/user_namespace.c | 1 + + 10 files changed, 145 insertions(+), 57 deletions(-) + create mode 100644 Documentation/filesystems/fuse-io.txt +Merging jfs/jfs-next (86313903430d MAINTAINERS: fix jfs tree location) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (036db8bd9637 Merge branch 'for-4.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata) +$ 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. + include/trace/events/sunrpc.h | 16 ++++++---------- + net/sunrpc/xprtrdma/fmr_ops.c | 5 +---- + net/sunrpc/xprtrdma/frwr_ops.c | 9 +++------ + net/sunrpc/xprtrdma/verbs.c | 5 +++++ + net/sunrpc/xprtrdma/xprt_rdma.h | 2 +- + 5 files changed, 16 insertions(+), 21 deletions(-) +Merging nfsd/nfsd-next (5e90394d7f7c nfsd: update obselete comment referencing the BKL) +$ git merge nfsd/nfsd-next +Auto-merging net/sunrpc/xprtrdma/xprt_rdma.h +Auto-merging net/sunrpc/xprtrdma/verbs.c +Auto-merging net/sunrpc/xprtrdma/frwr_ops.c +Auto-merging net/sunrpc/xprtrdma/fmr_ops.c +Merge made by the 'recursive' strategy. + fs/nfsd/blocklayout.c | 18 +- + fs/nfsd/cache.h | 5 - + fs/nfsd/nfs4state.c | 25 +- + fs/nfsd/nfs4xdr.c | 45 ++- + fs/nfsd/nfscache.c | 6 +- + fs/nfsd/nfsd.h | 1 + + include/linux/nfs4.h | 8 + + include/linux/sunrpc/svc_rdma.h | 95 ++--- + include/trace/events/rpcrdma.h | 584 ++++++++++++++++++++++++++++- + net/sunrpc/xprtrdma/backchannel.c | 2 + + net/sunrpc/xprtrdma/fmr_ops.c | 3 + + net/sunrpc/xprtrdma/frwr_ops.c | 2 + + net/sunrpc/xprtrdma/module.c | 4 +- + net/sunrpc/xprtrdma/rpc_rdma.c | 7 +- + net/sunrpc/xprtrdma/svc_rdma.c | 3 +- + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 54 ++- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 439 ++++++++++++++++------ + net/sunrpc/xprtrdma/svc_rdma_rw.c | 133 +++---- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 510 ++++++++++++++++--------- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 481 ++++-------------------- + net/sunrpc/xprtrdma/transport.c | 4 + + net/sunrpc/xprtrdma/verbs.c | 1 + + net/sunrpc/xprtrdma/xprt_rdma.h | 2 - + 23 files changed, 1537 insertions(+), 895 deletions(-) +Merging orangefs/for-next (8e9ba5c48ea6 Orangefs: documentation updates) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (16149013f839 ovl: update documentation w.r.t "xino" feature) +$ git merge overlayfs/overlayfs-next +Already up to date. +Merging ubifs/linux-next (b5094b7f135b ubi: Reject MLC NAND) +$ git merge ubifs/linux-next +Already up to date. +Merging xfs/for-next (9d93388b0afe iomap: add a swapfile activation function) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/iomap.c | 232 +++++++++++- + fs/xfs/libxfs/xfs_alloc.c | 92 ++++- + fs/xfs/libxfs/xfs_alloc.h | 29 +- + fs/xfs/libxfs/xfs_alloc_btree.c | 9 + + fs/xfs/libxfs/xfs_alloc_btree.h | 2 + + fs/xfs/libxfs/xfs_attr.c | 4 +- + fs/xfs/libxfs/xfs_attr_remote.c | 2 +- + fs/xfs/libxfs/xfs_bmap.c | 61 +-- + fs/xfs/libxfs/xfs_bmap.h | 37 +- + fs/xfs/libxfs/xfs_bmap_btree.c | 9 + + fs/xfs/libxfs/xfs_bmap_btree.h | 3 + + fs/xfs/libxfs/xfs_btree.c | 25 +- + fs/xfs/libxfs/xfs_btree.h | 3 +- + fs/xfs/libxfs/xfs_defer.c | 24 +- + fs/xfs/libxfs/xfs_defer.h | 1 + + fs/xfs/libxfs/xfs_dquot_buf.c | 94 +++-- + fs/xfs/libxfs/xfs_ialloc.c | 2 +- + fs/xfs/libxfs/xfs_ialloc.h | 3 + + fs/xfs/libxfs/xfs_ialloc_btree.c | 9 + + fs/xfs/libxfs/xfs_ialloc_btree.h | 2 + + fs/xfs/libxfs/xfs_quota_defs.h | 9 +- + fs/xfs/libxfs/xfs_refcount.c | 21 +- + fs/xfs/libxfs/xfs_refcount.h | 7 + + fs/xfs/libxfs/xfs_rmap.c | 83 +++++ + fs/xfs/libxfs/xfs_rmap.h | 4 + + fs/xfs/libxfs/xfs_shared.h | 15 - + fs/xfs/scrub/agheader.c | 3 +- + fs/xfs/scrub/bmap.c | 3 +- + fs/xfs/scrub/btree.c | 42 ++- + fs/xfs/scrub/common.c | 16 +- + fs/xfs/scrub/common.h | 14 +- + fs/xfs/scrub/inode.c | 5 +- + fs/xfs/scrub/quota.c | 110 +++--- + fs/xfs/scrub/refcount.c | 2 +- + fs/xfs/scrub/scrub.c | 4 + + fs/xfs/scrub/scrub.h | 1 + + fs/xfs/xfs_aops.c | 12 + + fs/xfs/xfs_bmap_item.c | 4 +- + fs/xfs/xfs_bmap_util.c | 10 +- + fs/xfs/xfs_buf.c | 100 +++-- + fs/xfs/xfs_buf.h | 17 +- + fs/xfs/xfs_buf_item.c | 10 +- + fs/xfs/xfs_dquot.c | 780 ++++++++++++++++++++++++--------------- + fs/xfs/xfs_dquot.h | 22 +- + fs/xfs/xfs_dquot_item.c | 7 +- + fs/xfs/xfs_extfree_item.c | 6 +- + fs/xfs/xfs_file.c | 43 ++- + fs/xfs/xfs_icache.c | 94 +++-- + fs/xfs/xfs_icache.h | 3 + + fs/xfs/xfs_icreate_item.c | 4 +- + fs/xfs/xfs_inode.c | 50 ++- + fs/xfs/xfs_inode.h | 24 +- + fs/xfs/xfs_inode_item.c | 8 +- + fs/xfs/xfs_iomap.c | 186 ++++++---- + fs/xfs/xfs_iops.c | 2 +- + fs/xfs/xfs_log.c | 12 +- + fs/xfs/xfs_log_cil.c | 22 +- + fs/xfs/xfs_log_recover.c | 4 +- + fs/xfs/xfs_mount.c | 4 +- + fs/xfs/xfs_qm.c | 132 +++---- + fs/xfs/xfs_qm.h | 6 +- + fs/xfs/xfs_qm_bhv.c | 2 +- + fs/xfs/xfs_qm_syscalls.c | 97 +++-- + fs/xfs/xfs_quota.h | 6 +- + fs/xfs/xfs_quotaops.c | 8 +- + fs/xfs/xfs_refcount_item.c | 4 +- + fs/xfs/xfs_reflink.c | 18 +- + fs/xfs/xfs_rmap_item.c | 4 +- + fs/xfs/xfs_super.c | 28 +- + fs/xfs/xfs_symlink.c | 10 +- + fs/xfs/xfs_trace.h | 72 +++- + fs/xfs/xfs_trans.c | 89 +++-- + fs/xfs/xfs_trans.h | 29 +- + fs/xfs/xfs_trans_ail.c | 50 ++- + fs/xfs/xfs_trans_bmap.c | 4 +- + fs/xfs/xfs_trans_buf.c | 24 +- + fs/xfs/xfs_trans_dquot.c | 4 +- + fs/xfs/xfs_trans_extfree.c | 87 ++++- + fs/xfs/xfs_trans_inode.c | 3 +- + fs/xfs/xfs_trans_priv.h | 11 +- + fs/xfs/xfs_trans_refcount.c | 4 +- + fs/xfs/xfs_trans_rmap.c | 4 +- + include/linux/iomap.h | 11 + + 83 files changed, 2103 insertions(+), 1010 deletions(-) +Merging file-locks/locks-next (7a107c0f55a3 fasync: Fix deadlock between task-context and interrupt-context kill_fasync()) +$ git merge file-locks/locks-next +Auto-merging include/linux/fs.h +Merge made by the 'recursive' strategy. + fs/fcntl.c | 15 +++++++-------- + include/linux/fs.h | 2 +- + 2 files changed, 8 insertions(+), 9 deletions(-) +Merging vfs/for-next (d944db1fd238 Merge branches 'work.dcache' and 'work.misc' into for-next) +$ git merge vfs/for-next +Merge made by the 'recursive' strategy. + fs/dcache.c | 122 +++++++++++++------------------------ + fs/fat/namei_msdos.c | 4 -- + fs/read_write.c | 6 +- + include/linux/sunrpc/rpc_pipe_fs.h | 2 - + net/sunrpc/rpc_pipe.c | 16 ----- + 5 files changed, 46 insertions(+), 104 deletions(-) +Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync()) +$ git merge vfs-miklos/next +Already up to date. +Merging printk/for-next (f8521c77fcd4 Merge branch 'for-4.18-vsprintf-cleanup' into for-4.18) +$ git merge printk/for-next +Auto-merging lib/vsprintf.c +Auto-merging kernel/printk/printk.c +Merge made by the 'recursive' strategy. + kernel/printk/printk.c | 14 +----- + lib/test_printf.c | 2 +- + lib/vsprintf.c | 130 ++++++++++++++++++++----------------------------- + 3 files changed, 56 insertions(+), 90 deletions(-) +Merging pci/next (03cdfc72ee02 Merge branch 'pci/virtualization') +$ git merge pci/next +Auto-merging include/linux/pci.h +Removing drivers/pci/pcie/portdrv_acpi.c +Auto-merging drivers/pci/Kconfig +Auto-merging drivers/infiniband/hw/hfi1/pcie.c +Auto-merging arch/microblaze/include/asm/pci.h +CONFLICT (content): Merge conflict in arch/microblaze/include/asm/pci.h +Resolved 'arch/microblaze/include/asm/pci.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ce843738a76b] Merge remote-tracking branch 'pci/next' +$ git diff -M --stat --summary HEAD^.. + arch/microblaze/include/asm/pci.h | 4 - + arch/microblaze/pci/pci-common.c | 61 -- + arch/x86/pci/early.c | 19 +- + drivers/acpi/pci_root.c | 7 + + drivers/infiniband/hw/hfi1/pcie.c | 24 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 28 +- + drivers/nvme/host/pci.c | 20 +- + drivers/pci/Kconfig | 12 + + drivers/pci/Makefile | 1 + + drivers/pci/hotplug/ibmphp_core.c | 2 +- + drivers/pci/hotplug/pciehp_hpc.c | 51 +- + drivers/pci/iov.c | 36 + + drivers/pci/pci-pf-stub.c | 54 ++ + drivers/pci/pcie/aer/aerdrv_errprint.c | 20 +- + drivers/pci/pcie/aspm.c | 9 + + drivers/pci/pcie/portdrv_acpi.c | 57 -- + drivers/pci/probe.c | 57 ++ + drivers/pci/quirks.c | 1002 +++++++++++++------------- + include/linux/acpi.h | 3 +- + include/linux/pci.h | 7 + + include/linux/pci_ids.h | 4 + + include/ras/ras_event.h | 22 +- + include/uapi/linux/pci_regs.h | 5 + + 23 files changed, 785 insertions(+), 720 deletions(-) + create mode 100644 drivers/pci/pci-pf-stub.c + delete mode 100644 drivers/pci/pcie/portdrv_acpi.c +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 (4153e8aad377 Merge branch 'for-4.17/upstream-fixes' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/Kconfig | 7 ++ + drivers/hid/Makefile | 1 + + drivers/hid/hid-alps.c | 30 +++++- + drivers/hid/hid-core.c | 19 ++-- + drivers/hid/hid-generic.c | 15 +++ + drivers/hid/hid-gfrm.c | 2 +- + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-input.c | 123 +++++++++++++++++++++-- + drivers/hid/hid-magicmouse.c | 6 +- + drivers/hid/hid-multitouch.c | 227 ++++++++++++++++++++++-------------------- + drivers/hid/hid-redragon.c | 86 ++++++++++++++++ + drivers/hid/i2c-hid/i2c-hid.c | 23 +++-- + include/linux/hid.h | 18 +++- + 13 files changed, 414 insertions(+), 144 deletions(-) + create mode 100644 drivers/hid/hid-redragon.c +Merging i2c/i2c/for-next (5c1718af7c4b Merge branch 'i2c/for-4.18' into i2c/for-next) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/i2c-davinci.txt | 2 +- + .../devicetree/bindings/i2c/i2c-s3c2410.txt | 4 +- + Documentation/i2c/busses/i2c-mlxcpld | 4 + + drivers/i2c/busses/Kconfig | 1 + + drivers/i2c/busses/Makefile | 3 +- + drivers/i2c/busses/i2c-at91.c | 12 +- + drivers/i2c/busses/i2c-axxia.c | 26 +- + drivers/i2c/busses/i2c-designware-common.c | 20 +- + drivers/i2c/busses/i2c-designware-core.h | 14 +- + drivers/i2c/busses/i2c-designware-master.c | 11 +- + drivers/i2c/busses/i2c-designware-slave.c | 6 +- + drivers/i2c/busses/i2c-hix5hd2.c | 1 - + drivers/i2c/busses/i2c-i801.c | 3 +- + drivers/i2c/busses/i2c-mlxcpld.c | 68 +- + drivers/i2c/busses/i2c-mt65xx.c | 8 +- + drivers/i2c/busses/i2c-nomadik.c | 2 - + drivers/i2c/busses/i2c-rcar.c | 2 + + drivers/i2c/busses/i2c-s3c2410.c | 2 - + drivers/i2c/busses/i2c-sh_mobile.c | 11 - + drivers/i2c/busses/i2c-stm32.c | 153 +++ + drivers/i2c/busses/i2c-stm32.h | 37 + + drivers/i2c/busses/i2c-stm32f7.c | 1040 +++++++++++++++++++- + drivers/i2c/i2c-core-acpi.c | 13 +- + drivers/i2c/i2c-core-base.c | 4 - + drivers/i2c/i2c-core-of.c | 2 - + drivers/i2c/i2c-core-smbus.c | 2 + + drivers/misc/eeprom/at24.c | 2 +- + include/linux/i2c.h | 2 - + 28 files changed, 1345 insertions(+), 110 deletions(-) + create mode 100644 drivers/i2c/busses/i2c-stm32.c +Merging dmi/master (5cb06cfce4a8 firmware: dmi: Add access to the SKU ID string) +$ git merge dmi/master +Merge made by the 'recursive' strategy. + drivers/firmware/dmi-id.c | 2 ++ + drivers/firmware/dmi_scan.c | 1 + + include/linux/mod_devicetable.h | 1 + + 3 files changed, 4 insertions(+) +Merging hwmon-staging/hwmon-next (6153ff637b26 hwmon: (ltc2990) support all measurement modes) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwmon/ltc2990.txt | 36 ++++ + Documentation/hwmon/hwmon-kernel-api.txt | 3 +- + Documentation/hwmon/ltc2990 | 24 ++- + drivers/hwmon/Kconfig | 7 +- + drivers/hwmon/fschmd.c | 2 +- + drivers/hwmon/hwmon.c | 3 + + drivers/hwmon/k10temp.c | 60 +++++- + drivers/hwmon/ltc2990.c | 212 +++++++++++++++++---- + drivers/hwmon/mc13783-adc.c | 60 ++++++ + drivers/mfd/mc13xxx-core.c | 15 +- + include/linux/mfd/mc13xxx.h | 2 + + 11 files changed, 359 insertions(+), 65 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/ltc2990.txt +Merging jc_docs/docs-next (b971a90f7dd3 docs: ranoops.rst: fix location of ramoops.txt) +$ git merge jc_docs/docs-next +Auto-merging mm/mmap.c +Auto-merging mm/Kconfig +Auto-merging fs/proc/task_mmu.c +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/mips/Kconfig +Auto-merging arch/ia64/Kconfig +Auto-merging arch/alpha/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/vm/zswap.rst +Auto-merging Documentation/vm/zsmalloc.rst +Auto-merging Documentation/vm/z3fold.rst +Auto-merging Documentation/vm/unevictable-lru.rst +Auto-merging Documentation/vm/transhuge.rst +Auto-merging Documentation/vm/swap_numa.rst +Auto-merging Documentation/vm/split_page_table_lock.rst +Removing Documentation/vm/slub.txt +Auto-merging Documentation/vm/remap_file_pages.rst +Auto-merging Documentation/vm/page_owner.rst +Auto-merging Documentation/vm/page_migration.rst +Auto-merging Documentation/vm/page_frags.rst +Removing Documentation/vm/overcommit-accounting +Removing Documentation/vm/numa_memory_policy.txt +Auto-merging Documentation/vm/numa.rst +Removing Documentation/vm/mmu_notifier.txt +Removing Documentation/vm/ksm.txt +Auto-merging Documentation/vm/hwpoison.rst +Auto-merging Documentation/vm/hugetlbfs_reserv.rst +Auto-merging Documentation/vm/hmm.rst +Auto-merging Documentation/vm/highmem.rst +Auto-merging Documentation/vm/frontswap.rst +Auto-merging Documentation/vm/cleancache.rst +Auto-merging Documentation/vm/balance.rst +Removing Documentation/vm/active_mm.txt +Auto-merging Documentation/trace/ftrace.rst +CONFLICT (modify/delete): Documentation/features/io/dma-api-debug/arch-support.txt deleted in HEAD and modified in jc_docs/docs-next. Version jc_docs/docs-next of Documentation/features/io/dma-api-debug/arch-support.txt left in tree. +Auto-merging Documentation/features/core/eBPF-JIT/arch-support.txt +Auto-merging Documentation/features/core/cBPF-JIT/arch-support.txt +Auto-merging Documentation/admin-guide/mm/userfaultfd.rst +Auto-merging Documentation/admin-guide/mm/soft-dirty.rst +Auto-merging Documentation/admin-guide/mm/pagemap.rst +Auto-merging Documentation/admin-guide/mm/idle_page_tracking.rst +Auto-merging Documentation/admin-guide/mm/hugetlbpage.rst +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f Documentation/features/io/dma-api-debug/arch-support.txt +Documentation/features/io/dma-api-debug/arch-support.txt: needs merge +rm 'Documentation/features/io/dma-api-debug/arch-support.txt' +$ git commit -v -a +[master 166304736f29] Merge remote-tracking branch 'jc_docs/docs-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/00-INDEX | 10 - + Documentation/ABI/stable/sysfs-devices-node | 2 +- + .../ABI/testing/sysfs-kernel-mm-hugepages | 2 +- + Documentation/ABI/testing/sysfs-kernel-mm-ksm | 2 +- + Documentation/ABI/testing/sysfs-kernel-slab | 4 +- + .../{bcache.txt => admin-guide/bcache.rst} | 0 + .../{cgroup-v2.txt => admin-guide/cgroup-v2.rst} | 0 + Documentation/admin-guide/index.rst | 3 + + Documentation/admin-guide/kernel-parameters.txt | 150 +++---- + .../mm/hugetlbpage.rst} | 263 ++++++----- + .../mm/idle_page_tracking.rst} | 56 ++- + Documentation/admin-guide/mm/index.rst | 30 ++ + Documentation/admin-guide/mm/ksm.rst | 189 ++++++++ + .../admin-guide/mm/numa_memory_policy.rst | 495 +++++++++++++++++++++ + .../{vm/pagemap.txt => admin-guide/mm/pagemap.rst} | 184 ++++---- + .../mm/soft-dirty.rst} | 20 +- + .../mm/userfaultfd.rst} | 66 +-- + Documentation/admin-guide/ramoops.rst | 2 +- + Documentation/block/cmdline-partition.txt | 21 +- + .../{cachetlb.txt => core-api/cachetlb.rst} | 0 + .../circular-buffers.rst} | 0 + Documentation/core-api/index.rst | 2 + + Documentation/core-api/kernel-api.rst | 60 +-- + Documentation/core-api/refcount-vs-atomic.rst | 2 +- + Documentation/crypto/index.rst | 1 + + Documentation/dev-tools/kasan.rst | 2 +- + Documentation/dev-tools/kselftest.rst | 5 + + Documentation/{clk.txt => driver-api/clk.rst} | 0 + Documentation/driver-api/device_connection.rst | 2 +- + Documentation/driver-api/index.rst | 2 + + Documentation/driver-api/uio-howto.rst | 3 +- + .../strncasecmp => core/cBPF-JIT}/arch-support.txt | 14 +- + .../core/{BPF-JIT => eBPF-JIT}/arch-support.txt | 8 +- + .../core/generic-idle-thread/arch-support.txt | 4 +- + .../features/core/jump-labels/arch-support.txt | 2 + + .../features/core/tracehook/arch-support.txt | 2 + + .../features/debug/KASAN/arch-support.txt | 4 +- + .../debug/gcov-profile-all/arch-support.txt | 2 + + Documentation/features/debug/kgdb/arch-support.txt | 4 +- + .../debug/kprobes-on-ftrace/arch-support.txt | 2 + + .../features/debug/kprobes/arch-support.txt | 4 +- + .../features/debug/kretprobes/arch-support.txt | 4 +- + .../features/debug/optprobes/arch-support.txt | 4 +- + .../features/debug/stackprotector/arch-support.txt | 2 + + .../features/debug/uprobes/arch-support.txt | 6 +- + .../debug/user-ret-profiler/arch-support.txt | 2 + + .../features/io/dma-contiguous/arch-support.txt | 4 +- + .../features/io/sg-chain/arch-support.txt | 2 + + .../locking/cmpxchg-local/arch-support.txt | 4 +- + .../features/locking/lockdep/arch-support.txt | 4 +- + .../locking/queued-rwlocks/arch-support.txt | 10 +- + .../locking/queued-spinlocks/arch-support.txt | 8 +- + .../locking/rwsem-optimized/arch-support.txt | 10 +- + .../features/perf/kprobes-event/arch-support.txt | 6 +- + .../features/perf/perf-regs/arch-support.txt | 4 +- + .../features/perf/perf-stackdump/arch-support.txt | 4 +- + .../sched/membarrier-sync-core/arch-support.txt | 2 + + .../features/sched/numa-balancing/arch-support.txt | 6 +- + Documentation/features/scripts/features-refresh.sh | 98 ++++ + .../seccomp/seccomp-filter/arch-support.txt | 6 +- + .../time/arch-tick-broadcast/arch-support.txt | 4 +- + .../features/time/clockevents/arch-support.txt | 4 +- + .../time/context-tracking/arch-support.txt | 2 + + .../features/time/irq-time-acct/arch-support.txt | 4 +- + .../time/modern-timekeeping/arch-support.txt | 2 + + .../features/time/virt-cpuacct/arch-support.txt | 2 + + .../features/vm/ELF-ASLR/arch-support.txt | 4 +- + .../features/vm/PG_uncached/arch-support.txt | 2 + + Documentation/features/vm/THP/arch-support.txt | 2 + + Documentation/features/vm/TLB/arch-support.txt | 2 + + .../features/vm/huge-vmap/arch-support.txt | 2 + + .../features/vm/ioremap_prot/arch-support.txt | 2 + + .../features/vm/numa-memblock/arch-support.txt | 4 +- + .../features/vm/pte_special/arch-support.txt | 2 + + Documentation/filesystems/proc.txt | 8 +- + Documentation/filesystems/tmpfs.txt | 5 +- + Documentation/index.rst | 3 +- + Documentation/ioctl/botching-up-ioctls.txt | 4 +- + Documentation/memory-barriers.txt | 4 +- + Documentation/process/5.Posting.rst | 16 +- + Documentation/process/index.rst | 1 + + Documentation/process/maintainer-pgp-guide.rst | 39 +- + Documentation/process/submitting-patches.rst | 2 +- + Documentation/security/index.rst | 2 + + Documentation/sound/alsa-configuration.rst | 4 +- + Documentation/sound/soc/codec.rst | 2 +- + Documentation/sound/soc/platform.rst | 2 +- + Documentation/sysctl/vm.txt | 6 +- + Documentation/trace/coresight.txt | 103 +++-- + Documentation/trace/ftrace-uses.rst | 4 +- + Documentation/trace/ftrace.rst | 7 +- + .../translations/ko_KR/memory-barriers.txt | 4 +- + Documentation/vfio.txt | 5 +- + Documentation/vm/00-INDEX | 58 +-- + Documentation/vm/active_mm.rst | 91 ++++ + Documentation/vm/active_mm.txt | 83 ---- + Documentation/vm/{balance => balance.rst} | 15 +- + .../vm/{cleancache.txt => cleancache.rst} | 105 +++-- + Documentation/vm/conf.py | 10 + + Documentation/vm/{frontswap.txt => frontswap.rst} | 59 ++- + Documentation/vm/{highmem.txt => highmem.rst} | 87 ++-- + Documentation/vm/{hmm.txt => hmm.rst} | 78 ++-- + .../{hugetlbfs_reserv.txt => hugetlbfs_reserv.rst} | 220 +++++---- + Documentation/vm/{hwpoison.txt => hwpoison.rst} | 141 +++--- + Documentation/vm/index.rst | 50 +++ + Documentation/vm/ksm.rst | 87 ++++ + Documentation/vm/ksm.txt | 178 -------- + Documentation/vm/mmu_notifier.rst | 99 +++++ + Documentation/vm/mmu_notifier.txt | 93 ---- + Documentation/vm/{numa => numa.rst} | 6 +- + Documentation/vm/numa_memory_policy.txt | 452 ------------------- + Documentation/vm/overcommit-accounting | 80 ---- + Documentation/vm/overcommit-accounting.rst | 87 ++++ + Documentation/vm/{page_frags => page_frags.rst} | 5 +- + .../vm/{page_migration => page_migration.rst} | 149 ++++--- + .../vm/{page_owner.txt => page_owner.rst} | 34 +- + .../{remap_file_pages.txt => remap_file_pages.rst} | 6 + + Documentation/vm/slub.rst | 361 +++++++++++++++ + Documentation/vm/slub.txt | 342 -------------- + ...t_page_table_lock => split_page_table_lock.rst} | 12 +- + Documentation/vm/{swap_numa.txt => swap_numa.rst} | 55 ++- + Documentation/vm/{transhuge.txt => transhuge.rst} | 295 +++++++----- + .../{unevictable-lru.txt => unevictable-lru.rst} | 117 ++--- + Documentation/vm/{z3fold.txt => z3fold.rst} | 6 +- + Documentation/vm/{zsmalloc.txt => zsmalloc.rst} | 60 ++- + Documentation/vm/{zswap.txt => zswap.rst} | 71 +-- + LICENSES/exceptions/Linux-syscall-note | 2 +- + LICENSES/other/Apache-2.0 | 183 ++++++++ + LICENSES/other/CC-BY-SA-4.0 | 397 +++++++++++++++++ + LICENSES/other/CDDL-1.0 | 364 +++++++++++++++ + LICENSES/other/Linux-OpenIB | 26 ++ + LICENSES/other/X11 | 37 ++ + LICENSES/preferred/GPL-2.0 | 6 + + MAINTAINERS | 2 +- + arch/alpha/Kconfig | 2 +- + arch/ia64/Kconfig | 2 +- + arch/mips/Kconfig | 2 +- + arch/powerpc/Kconfig | 2 +- + drivers/w1/w1_io.c | 1 + + fs/Kconfig | 2 +- + fs/dax.c | 2 +- + fs/proc/task_mmu.c | 4 +- + include/linux/hmm.h | 2 +- + include/linux/memremap.h | 4 +- + include/linux/mmu_notifier.h | 2 +- + include/linux/sched/mm.h | 4 +- + include/linux/swap.h | 2 +- + mm/Kconfig | 7 +- + mm/cleancache.c | 2 +- + mm/frontswap.c | 2 +- + mm/hmm.c | 2 +- + mm/huge_memory.c | 4 +- + mm/hugetlb.c | 4 +- + mm/ksm.c | 23 +- + mm/mmap.c | 2 +- + mm/rmap.c | 6 +- + mm/util.c | 2 +- + scripts/documentation-file-ref-check | 125 +++++- + scripts/spdxcheck.py | 284 ++++++++++++ + 159 files changed, 4704 insertions(+), 2468 deletions(-) + rename Documentation/{bcache.txt => admin-guide/bcache.rst} (100%) + rename Documentation/{cgroup-v2.txt => admin-guide/cgroup-v2.rst} (100%) + rename Documentation/{vm/hugetlbpage.txt => admin-guide/mm/hugetlbpage.rst} (61%) + rename Documentation/{vm/idle_page_tracking.txt => admin-guide/mm/idle_page_tracking.rst} (72%) + create mode 100644 Documentation/admin-guide/mm/index.rst + create mode 100644 Documentation/admin-guide/mm/ksm.rst + create mode 100644 Documentation/admin-guide/mm/numa_memory_policy.rst + rename Documentation/{vm/pagemap.txt => admin-guide/mm/pagemap.rst} (53%) + rename Documentation/{vm/soft-dirty.txt => admin-guide/mm/soft-dirty.rst} (67%) + rename Documentation/{vm/userfaultfd.txt => admin-guide/mm/userfaultfd.rst} (89%) + rename Documentation/{cachetlb.txt => core-api/cachetlb.rst} (100%) + rename Documentation/{circular-buffers.txt => core-api/circular-buffers.rst} (100%) + rename Documentation/{clk.txt => driver-api/clk.rst} (100%) + rename Documentation/features/{lib/strncasecmp => core/cBPF-JIT}/arch-support.txt (70%) + rename Documentation/features/core/{BPF-JIT => eBPF-JIT}/arch-support.txt (79%) + create mode 100755 Documentation/features/scripts/features-refresh.sh + create mode 100644 Documentation/vm/active_mm.rst + delete mode 100644 Documentation/vm/active_mm.txt + rename Documentation/vm/{balance => balance.rst} (96%) + rename Documentation/vm/{cleancache.txt => cleancache.rst} (83%) + create mode 100644 Documentation/vm/conf.py + rename Documentation/vm/{frontswap.txt => frontswap.rst} (91%) + rename Documentation/vm/{highmem.txt => highmem.rst} (64%) + rename Documentation/vm/{hmm.txt => hmm.rst} (91%) + rename Documentation/vm/{hugetlbfs_reserv.txt => hugetlbfs_reserv.rst} (86%) + rename Documentation/vm/{hwpoison.txt => hwpoison.rst} (60%) + create mode 100644 Documentation/vm/index.rst + create mode 100644 Documentation/vm/ksm.rst + delete mode 100644 Documentation/vm/ksm.txt + create mode 100644 Documentation/vm/mmu_notifier.rst + delete mode 100644 Documentation/vm/mmu_notifier.txt + rename Documentation/vm/{numa => numa.rst} (98%) + delete mode 100644 Documentation/vm/numa_memory_policy.txt + delete mode 100644 Documentation/vm/overcommit-accounting + create mode 100644 Documentation/vm/overcommit-accounting.rst + rename Documentation/vm/{page_frags => page_frags.rst} (97%) + rename Documentation/vm/{page_migration => page_migration.rst} (63%) + rename Documentation/vm/{page_owner.txt => page_owner.rst} (86%) + rename Documentation/vm/{remap_file_pages.txt => remap_file_pages.rst} (92%) + create mode 100644 Documentation/vm/slub.rst + delete mode 100644 Documentation/vm/slub.txt + rename Documentation/vm/{split_page_table_lock => split_page_table_lock.rst} (95%) + rename Documentation/vm/{swap_numa.txt => swap_numa.rst} (74%) + rename Documentation/vm/{transhuge.txt => transhuge.rst} (73%) + rename Documentation/vm/{unevictable-lru.txt => unevictable-lru.rst} (92%) + rename Documentation/vm/{z3fold.txt => z3fold.rst} (97%) + rename Documentation/vm/{zsmalloc.txt => zsmalloc.rst} (71%) + rename Documentation/vm/{zswap.txt => zswap.rst} (74%) + create mode 100644 LICENSES/other/Apache-2.0 + create mode 100644 LICENSES/other/CC-BY-SA-4.0 + create mode 100644 LICENSES/other/CDDL-1.0 + create mode 100644 LICENSES/other/Linux-OpenIB + create mode 100644 LICENSES/other/X11 + create mode 100755 scripts/spdxcheck.py +Merging v4l-dvb/master (901b9dd5e31e media: update/fix my e-mail on some places) +$ git merge v4l-dvb/master +Removing include/media/videobuf-dvb.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu_private.h +Removing drivers/media/v4l2-core/videobuf-dvb.c +Auto-merging drivers/media/platform/vsp1/vsp1_brx.h +Auto-merging drivers/media/platform/vsp1/vsp1_brx.c +Removing drivers/media/pci/pt1/va1j5jf8007t.h +Removing drivers/media/pci/pt1/va1j5jf8007t.c +Removing drivers/media/pci/pt1/va1j5jf8007s.h +Removing drivers/media/pci/pt1/va1j5jf8007s.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-rc | 16 +- + Documentation/ABI/testing/sysfs-class-rc-nuvoton | 2 +- + Documentation/ABI/testing/sysfs-devices-edac | 14 +- + .../bindings/media/i2c/panasonic,amg88xx.txt | 19 + + .../devicetree/bindings/media/rcar_vin.txt | 138 ++- + Documentation/media/uapi/dvb/dvbapi.rst | 2 +- + Documentation/media/uapi/rc/lirc-dev-intro.rst | 2 +- + Documentation/media/uapi/rc/lirc-func.rst | 1 + + .../media/uapi/rc/lirc-set-rec-timeout.rst | 14 +- + Documentation/media/uapi/v4l/v4l2.rst | 2 +- + .../media/v4l-drivers/cx23885-cardlist.rst | 18 +- + .../media/v4l-drivers/em28xx-cardlist.rst | 10 +- + MAINTAINERS | 6 + + drivers/media/Kconfig | 12 +- + drivers/media/cec/cec-core.c | 2 +- + drivers/media/cec/cec-pin-error-inj.c | 10 +- + drivers/media/cec/cec-pin.c | 2 +- + drivers/media/common/b2c2/flexcop-fe-tuner.c | 4 +- + drivers/media/common/b2c2/flexcop-i2c.c | 47 +- + drivers/media/common/b2c2/flexcop.c | 2 +- + drivers/media/common/b2c2/flexcop.h | 1 + + drivers/media/common/siano/smscoreapi.c | 10 +- + drivers/media/common/siano/smsendian.c | 14 +- + drivers/media/dvb-core/dmxdev.c | 2 +- + drivers/media/dvb-core/dvb_frontend.c | 25 +- + drivers/media/dvb-core/dvb_net.c | 2 +- + drivers/media/dvb-frontends/Kconfig | 2 +- + drivers/media/dvb-frontends/as102_fe.h | 2 +- + drivers/media/dvb-frontends/cx24116.c | 2 +- + drivers/media/dvb-frontends/cx24117.c | 2 +- + drivers/media/dvb-frontends/cx24120.c | 2 +- + drivers/media/dvb-frontends/cx24123.c | 2 +- + drivers/media/dvb-frontends/cxd2099.c | 4 +- + drivers/media/dvb-frontends/cxd2099.h | 2 +- + drivers/media/dvb-frontends/cxd2820r_core.c | 2 +- + .../cxd2880/cxd2880_tnrdmd_driver_version.h | 4 +- + drivers/media/dvb-frontends/cxd2880/cxd2880_top.c | 14 +- + drivers/media/dvb-frontends/dvb-pll.c | 110 +++ + drivers/media/dvb-frontends/dvb-pll.h | 6 + + drivers/media/dvb-frontends/lgdt3306a.c | 2 +- + drivers/media/dvb-frontends/lgdt330x.c | 874 +++++++++++-------- + drivers/media/dvb-frontends/lgdt330x.h | 41 +- + drivers/media/dvb-frontends/mb86a20s.c | 2 +- + drivers/media/dvb-frontends/mxl5xx.c | 2 +- + drivers/media/dvb-frontends/s921.c | 2 +- + drivers/media/dvb-frontends/stv0910.c | 10 +- + drivers/media/dvb-frontends/tc90522.c | 15 +- + drivers/media/dvb-frontends/tc90522.h | 11 +- + drivers/media/i2c/Kconfig | 13 + + drivers/media/i2c/Makefile | 1 + + drivers/media/i2c/ir-kbd-i2c.c | 4 +- + drivers/media/i2c/ov13858.c | 1 - + drivers/media/i2c/ov5695.c | 1 - + drivers/media/i2c/ov7740.c | 22 +- + drivers/media/i2c/tda1997x.c | 2 +- + drivers/media/i2c/tvp5150.c | 159 ++-- + drivers/media/i2c/video-i2c.c | 564 ++++++++++++ + drivers/media/media-device.c | 21 +- + drivers/media/pci/bt8xx/bttv-risc.c | 17 +- + drivers/media/pci/bt8xx/dst.c | 2 +- + drivers/media/pci/bt8xx/dvb-bt8xx.c | 4 +- + drivers/media/pci/cx23885/cx23885-dvb.c | 6 +- + drivers/media/pci/cx88/cx88-dvb.c | 7 +- + drivers/media/pci/cx88/cx88-input.c | 11 +- + drivers/media/pci/cx88/cx88-vbi.c | 1 - + drivers/media/pci/ddbridge/Kconfig | 1 + + drivers/media/pci/ddbridge/Makefile | 2 +- + drivers/media/pci/ddbridge/ddbridge-ci.c | 2 +- + drivers/media/pci/ddbridge/ddbridge-core.c | 384 ++++++--- + drivers/media/pci/ddbridge/ddbridge-hw.c | 11 + + drivers/media/pci/ddbridge/ddbridge-i2c.c | 5 +- + drivers/media/pci/ddbridge/ddbridge-main.c | 91 +- + drivers/media/pci/ddbridge/ddbridge-max.c | 42 + + drivers/media/pci/ddbridge/ddbridge-max.h | 1 + + drivers/media/pci/ddbridge/ddbridge-mci.c | 550 ++++++++++++ + drivers/media/pci/ddbridge/ddbridge-mci.h | 152 ++++ + drivers/media/pci/ddbridge/ddbridge-regs.h | 4 + + drivers/media/pci/ddbridge/ddbridge.h | 50 +- + drivers/media/pci/intel/ipu3/Kconfig | 15 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.c | 32 +- + drivers/media/pci/mantis/mantis_uart.c | 7 + + drivers/media/pci/meye/Kconfig | 3 +- + drivers/media/pci/ngene/ngene-cards.c | 17 +- + drivers/media/pci/ngene/ngene-dvb.c | 2 +- + drivers/media/pci/pt1/Kconfig | 3 + + drivers/media/pci/pt1/Makefile | 3 +- + drivers/media/pci/pt1/pt1.c | 471 +++++++--- + drivers/media/pci/pt1/va1j5jf8007s.c | 732 ---------------- + drivers/media/pci/pt1/va1j5jf8007s.h | 42 - + drivers/media/pci/pt1/va1j5jf8007t.c | 532 ------------ + drivers/media/pci/pt1/va1j5jf8007t.h | 42 - + drivers/media/pci/pt3/pt3.c | 70 +- + drivers/media/pci/pt3/pt3.h | 11 +- + drivers/media/pci/pt3/pt3_dma.c | 11 +- + drivers/media/pci/pt3/pt3_i2c.c | 11 +- + drivers/media/pci/saa7164/saa7164-fw.c | 3 +- + drivers/media/pci/sta2x11/Kconfig | 2 +- + drivers/media/pci/sta2x11/sta2x11_vip.c | 31 +- + drivers/media/platform/Kconfig | 11 +- + drivers/media/platform/am437x/am437x-vpfe.c | 6 +- + drivers/media/platform/cec-gpio/cec-gpio.c | 2 +- + drivers/media/platform/coda/coda-common.c | 45 +- + drivers/media/platform/davinci/Kconfig | 6 +- + drivers/media/platform/davinci/isif.c | 4 +- + drivers/media/platform/davinci/vpbe.c | 38 +- + drivers/media/platform/davinci/vpbe_display.c | 33 +- + drivers/media/platform/davinci/vpbe_osd.c | 21 +- + drivers/media/platform/davinci/vpbe_venc.c | 11 +- + drivers/media/platform/davinci/vpfe_capture.c | 2 +- + drivers/media/platform/exynos4-is/Kconfig | 4 +- + drivers/media/platform/exynos4-is/fimc-lite-reg.c | 2 +- + drivers/media/platform/fsl-viu.c | 63 +- + drivers/media/platform/marvell-ccic/Kconfig | 5 +- + drivers/media/platform/marvell-ccic/mmp-driver.c | 6 +- + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 5 +- + drivers/media/platform/omap/Kconfig | 7 +- + drivers/media/platform/omap/omap_vout.c | 17 +- + drivers/media/platform/omap/omap_vout_vrfb.c | 4 +- + drivers/media/platform/omap3isp/isp.c | 22 +- + drivers/media/platform/omap3isp/ispccdc.c | 2 +- + drivers/media/platform/omap3isp/isph3a_aewb.c | 2 + + drivers/media/platform/omap3isp/isph3a_af.c | 2 + + drivers/media/platform/omap3isp/isphist.c | 2 + + drivers/media/platform/omap3isp/isppreview.c | 6 +- + drivers/media/platform/omap3isp/ispstat.c | 37 +- + drivers/media/platform/omap3isp/ispstat.h | 4 +- + drivers/media/platform/omap3isp/ispvideo.c | 2 +- + drivers/media/platform/rcar-vin/Kconfig | 2 +- + drivers/media/platform/rcar-vin/rcar-core.c | 959 +++++++++++++++++++-- + drivers/media/platform/rcar-vin/rcar-dma.c | 798 ++++++++++------- + drivers/media/platform/rcar-vin/rcar-v4l2.c | 484 ++++++----- + drivers/media/platform/rcar-vin/rcar-vin.h | 146 +++- + drivers/media/platform/renesas-ceu.c | 20 +- + .../media/platform/s5p-jpeg/jpeg-hw-exynos3250.c | 4 +- + drivers/media/platform/via-camera.c | 2 +- + drivers/media/platform/video-mux.c | 16 +- + drivers/media/platform/vsp1/Makefile | 2 +- + drivers/media/platform/vsp1/vsp1.h | 6 +- + .../media/platform/vsp1/{vsp1_bru.c => vsp1_brx.c} | 202 ++--- + .../media/platform/vsp1/{vsp1_bru.h => vsp1_brx.h} | 18 +- + drivers/media/platform/vsp1/vsp1_dl.c | 45 +- + drivers/media/platform/vsp1/vsp1_dl.h | 7 +- + drivers/media/platform/vsp1/vsp1_drm.c | 828 ++++++++++-------- + drivers/media/platform/vsp1/vsp1_drm.h | 16 +- + drivers/media/platform/vsp1/vsp1_drv.c | 8 +- + drivers/media/platform/vsp1/vsp1_entity.h | 2 + + drivers/media/platform/vsp1/vsp1_histo.c | 2 +- + drivers/media/platform/vsp1/vsp1_histo.h | 3 - + drivers/media/platform/vsp1/vsp1_pipe.c | 53 +- + drivers/media/platform/vsp1/vsp1_pipe.h | 6 +- + drivers/media/platform/vsp1/vsp1_rpf.c | 12 +- + drivers/media/platform/vsp1/vsp1_rwpf.h | 4 +- + drivers/media/platform/vsp1/vsp1_video.c | 39 +- + drivers/media/platform/vsp1/vsp1_wpf.c | 8 +- + drivers/media/radio/Kconfig | 45 +- + drivers/media/radio/si470x/Kconfig | 16 +- + drivers/media/radio/si470x/Makefile | 8 +- + drivers/media/radio/si470x/radio-si470x-common.c | 70 +- + drivers/media/radio/si470x/radio-si470x-i2c.c | 24 +- + drivers/media/radio/si470x/radio-si470x-usb.c | 18 +- + drivers/media/radio/si470x/radio-si470x.h | 15 +- + drivers/media/rc/Kconfig | 10 +- + drivers/media/rc/ir-imon-decoder.c | 136 ++- + drivers/media/rc/ir-jvc-decoder.c | 1 + + drivers/media/rc/ir-mce_kbd-decoder.c | 58 +- + drivers/media/rc/ir-nec-decoder.c | 1 + + drivers/media/rc/ir-rc5-decoder.c | 1 + + drivers/media/rc/ir-rc6-decoder.c | 1 + + drivers/media/rc/ir-sanyo-decoder.c | 1 + + drivers/media/rc/ir-sharp-decoder.c | 1 + + drivers/media/rc/ir-sony-decoder.c | 1 + + drivers/media/rc/ir-spi.c | 4 +- + drivers/media/rc/ir-xmp-decoder.c | 1 + + drivers/media/rc/lirc_dev.c | 31 +- + drivers/media/rc/mceusb.c | 29 +- + drivers/media/rc/mtk-cir.c | 4 +- + drivers/media/rc/rc-core-priv.h | 6 + + drivers/media/rc/rc-ir-raw.c | 61 +- + drivers/media/rc/rc-main.c | 68 +- + drivers/media/rc/st_rc.c | 16 +- + drivers/media/spi/cxd2880-spi.c | 32 +- + drivers/media/tuners/Kconfig | 7 + + drivers/media/tuners/Makefile | 1 + + drivers/media/tuners/mxl301rf.c | 11 +- + drivers/media/tuners/mxl301rf.h | 11 +- + drivers/media/tuners/qm1d1b0004.c | 266 ++++++ + drivers/media/tuners/qm1d1b0004.h | 24 + + drivers/media/tuners/qm1d1c0042.c | 11 +- + drivers/media/tuners/qm1d1c0042.h | 11 +- + drivers/media/usb/cx231xx/Kconfig | 5 +- + drivers/media/usb/cx231xx/cx231xx-cards.c | 9 +- + drivers/media/usb/cx231xx/cx231xx-dvb.c | 382 +++----- + drivers/media/usb/cx231xx/cx231xx.h | 3 - + drivers/media/usb/dvb-usb-v2/dvbsky.c | 425 +++------ + drivers/media/usb/dvb-usb-v2/gl861.c | 22 +- + drivers/media/usb/dvb-usb-v2/usb_urb.c | 17 +- + drivers/media/usb/dvb-usb/cxusb.c | 9 +- + drivers/media/usb/dvb-usb/usb-urb.c | 6 +- + drivers/media/usb/em28xx/em28xx-cards.c | 46 +- + drivers/media/usb/em28xx/em28xx-core.c | 5 +- + drivers/media/usb/em28xx/em28xx-dvb.c | 8 +- + drivers/media/usb/em28xx/em28xx-v4l.h | 2 +- + drivers/media/usb/em28xx/em28xx.h | 1 + + drivers/media/usb/gspca/jl2005bcd.c | 2 +- + drivers/media/usb/gspca/sq905.c | 2 +- + drivers/media/usb/gspca/sq905c.c | 2 +- + drivers/media/usb/gspca/vicam.c | 2 +- + drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.c | 1 - + drivers/media/usb/pvrusb2/pvrusb2-devattr.c | 4 +- + drivers/media/usb/usbtv/usbtv-video.c | 115 ++- + drivers/media/usb/usbtv/usbtv.h | 2 +- + drivers/media/usb/usbvision/usbvision-core.c | 2 +- + drivers/media/v4l2-core/Kconfig | 4 - + drivers/media/v4l2-core/Makefile | 1 - + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 807 ++++++++++------- + drivers/media/v4l2-core/v4l2-dev.c | 67 +- + drivers/media/v4l2-core/v4l2-fwnode.c | 28 +- + drivers/media/v4l2-core/videobuf-dma-sg.c | 6 +- + drivers/media/v4l2-core/videobuf-dvb.c | 398 --------- + drivers/pnp/isapnp/Kconfig | 2 +- + .../media/atomisp/pci/atomisp2/atomisp_acc.c | 8 +- + .../media/atomisp/pci/atomisp2/atomisp_cmd.c | 9 +- + .../media/atomisp/pci/atomisp2/atomisp_compat.h | 2 +- + .../atomisp/pci/atomisp2/atomisp_compat_css20.c | 2 +- + .../atomisp/pci/atomisp2/atomisp_compat_ioctl32.c | 92 +- + .../media/atomisp/pci/atomisp2/atomisp_fops.c | 6 +- + .../media/atomisp/pci/atomisp2/atomisp_ioctl.c | 5 +- + .../css2400/hive_isp_css_common/host/mmu.c | 4 - + .../css2400/hive_isp_css_common/host/mmu_private.h | 44 - + .../css2400/hive_isp_css_include/host/mmu_public.h | 22 +- + .../memory_access/memory_access.h | 2 +- + .../css2400/hive_isp_css_include/mmu_device.h | 8 - + .../pci/atomisp2/css2400/ia_css_frame_public.h | 2 +- + .../pci/atomisp2/css2400/ia_css_memory_access.c | 4 +- + .../isp/kernels/eed1_8/ia_css_eed1_8.host.c | 16 +- + .../pci/atomisp2/css2400/runtime/frame/src/frame.c | 2 +- + .../atomisp/pci/atomisp2/css2400/sh_css_frac.h | 2 +- + .../staging/media/atomisp/pci/atomisp2/hmm/hmm.c | 2 +- + .../media/atomisp/pci/atomisp2/hmm/hmm_bo.c | 6 +- + .../atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.c | 22 +- + .../atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.h | 11 +- + .../media/atomisp/pci/atomisp2/include/hmm/hmm.h | 2 +- + .../atomisp/pci/atomisp2/include/hmm/hmm_bo.h | 2 +- + .../platform/intel-mid/atomisp_gmin_platform.c | 6 - + drivers/staging/media/davinci_vpfe/Kconfig | 3 +- + drivers/staging/media/davinci_vpfe/Makefile | 5 + + drivers/staging/media/davinci_vpfe/TODO | 1 + + drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 143 ++- + .../staging/media/davinci_vpfe/dm365_ipipe_hw.c | 19 +- + drivers/staging/media/davinci_vpfe/dm365_ipipeif.c | 14 +- + drivers/staging/media/davinci_vpfe/dm365_isif.c | 9 +- + drivers/staging/media/davinci_vpfe/dm365_resizer.c | 13 +- + .../staging/media/davinci_vpfe/vpfe_mc_capture.c | 2 +- + drivers/staging/media/davinci_vpfe/vpfe_video.c | 4 +- + drivers/staging/media/imx/imx-media-csi.c | 3 +- + drivers/staging/media/imx/imx-media-utils.c | 9 + + drivers/staging/media/omap4iss/Kconfig | 3 +- + drivers/staging/media/tegra-vde/tegra-vde.c | 63 +- + drivers/video/fbdev/omap2/Kconfig | 2 +- + include/linux/omap-iommu.h | 5 + + include/linux/platform_data/media/mmp-camera.h | 19 + + include/linux/sony-laptop.h | 4 + + include/media/dvb-usb-ids.h | 1 + + include/media/media-entity.h | 2 +- + include/media/v4l2-dev.h | 1 + + include/media/v4l2-fwnode.h | 2 +- + include/media/videobuf-dvb.h | 59 -- + include/uapi/linux/lirc.h | 6 + + include/uapi/linux/omap3isp.h | 22 + + include/video/omapfb_dss.h | 54 +- + sound/isa/Kconfig | 3 +- + 271 files changed, 8089 insertions(+), 5773 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/i2c/panasonic,amg88xx.txt + create mode 100644 drivers/media/i2c/video-i2c.c + create mode 100644 drivers/media/pci/ddbridge/ddbridge-mci.c + create mode 100644 drivers/media/pci/ddbridge/ddbridge-mci.h + delete mode 100644 drivers/media/pci/pt1/va1j5jf8007s.c + delete mode 100644 drivers/media/pci/pt1/va1j5jf8007s.h + delete mode 100644 drivers/media/pci/pt1/va1j5jf8007t.c + delete mode 100644 drivers/media/pci/pt1/va1j5jf8007t.h + rename drivers/media/platform/vsp1/{vsp1_bru.c => vsp1_brx.c} (63%) + rename drivers/media/platform/vsp1/{vsp1_bru.h => vsp1_brx.h} (66%) + create mode 100644 drivers/media/tuners/qm1d1b0004.c + create mode 100644 drivers/media/tuners/qm1d1b0004.h + delete mode 100644 drivers/media/v4l2-core/videobuf-dvb.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu_private.h + delete mode 100644 include/media/videobuf-dvb.h +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 (85d108dee574 video: omap: Improve a size determination in omapfb_do_probe()) +$ git merge fbdev/fbdev-for-next +Merge made by the 'recursive' strategy. + drivers/video/fbdev/Kconfig | 2 +- + drivers/video/fbdev/aty/aty128fb.c | 2 +- + drivers/video/fbdev/aty/radeon_pm.c | 8 ++++---- + drivers/video/fbdev/auo_k190x.c | 13 ++++--------- + drivers/video/fbdev/core/fb_defio.c | 4 ++-- + drivers/video/fbdev/mmp/fb/mmpfb.c | 5 ++--- + drivers/video/fbdev/mmp/hw/mmp_ctrl.c | 8 +++----- + drivers/video/fbdev/omap/omapfb_main.c | 2 +- + .../video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 18 ++++++------------ + drivers/video/fbdev/savage/savagefb_driver.c | 8 ++++---- + drivers/video/fbdev/sh_mobile_lcdcfb.c | 14 ++++---------- + drivers/video/fbdev/sh_mobile_meram.c | 10 +++------- + drivers/video/fbdev/sm501fb.c | 3 +-- + 13 files changed, 36 insertions(+), 61 deletions(-) +Merging pm/linux-next (6c1f315f566e Merge branch 'pm-pci' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + Documentation/acpi/cppc_sysfs.txt | 69 ++++++++++++++++ + Documentation/admin-guide/pm/intel_pstate.rst | 2 +- + Documentation/admin-guide/pm/sleep-states.rst | 2 +- + drivers/acpi/ac.c | 2 +- + drivers/acpi/battery.c | 39 ++++++++- + drivers/acpi/cppc_acpi.c | 111 ++++++++++++++++++++------ + drivers/acpi/reboot.c | 4 +- + drivers/base/base.h | 3 + + drivers/base/core.c | 20 +++++ + drivers/base/dd.c | 4 +- + drivers/cpufreq/cppc_cpufreq.c | 80 ++++++++++++++++--- + drivers/pci/pci.c | 37 ++++++--- + include/acpi/cppc_acpi.h | 14 +++- + kernel/sched/cpufreq_schedutil.c | 16 +--- + 14 files changed, 327 insertions(+), 76 deletions(-) + create mode 100644 Documentation/acpi/cppc_sysfs.txt +Merging cpupower/cpupower (9fd0c4045146 cpupower: fix spelling mistake: "logilename" -> "logfilename") +$ git merge cpupower/cpupower +Merge made by the 'recursive' strategy. + tools/power/cpupower/bench/parse.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging idle/next (8a5776a5f498 Linux 4.14-rc4) +$ git merge idle/next +Already up to date. +Merging opp/opp/linux-next (28fa4aca262c PM / OPP: Remove dev_pm_opp_{un}register_get_pstate_helper()) +$ git merge opp/opp/linux-next +Auto-merging drivers/soc/tegra/pmc.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/opp/opp.txt | 7 +- + .../devicetree/bindings/power/power_domain.txt | 6 +- + drivers/base/power/domain.c | 127 +++++++++++++-- + drivers/opp/core.c | 174 +++++++-------------- + drivers/opp/debugfs.c | 15 +- + drivers/opp/of.c | 169 +++++++++++++++++--- + drivers/opp/opp.h | 6 +- + drivers/soc/tegra/pmc.c | 20 ++- + include/linux/pm_domain.h | 13 ++ + include/linux/pm_opp.h | 27 ++-- + 10 files changed, 388 insertions(+), 176 deletions(-) +Merging thermal/next (f9cd6a904e6e thermal: exynos: Propagate error value from tmu_read()) +$ git merge thermal/next +Merge made by the 'recursive' strategy. + drivers/thermal/int340x_thermal/int3403_thermal.c | 3 +-- + drivers/thermal/samsung/exynos_tmu.c | 14 +++++++++++--- + 2 files changed, 12 insertions(+), 5 deletions(-) +Merging thermal-soc/next (9efc58dfa14a thermal: mediatek: use of_device_get_match_data()) +$ git merge thermal-soc/next +Removing drivers/thermal/samsung/exynos_tmu.h +Auto-merging drivers/thermal/samsung/exynos_tmu.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/thermal/exynos-thermal.txt | 14 +- + .../devicetree/bindings/thermal/imx-thermal.txt | 9 +- + .../bindings/thermal/mediatek-thermal.txt | 1 + + .../bindings/thermal/rcar-gen3-thermal.txt | 3 +- + .../bindings/thermal/uniphier-thermal.txt | 1 + + drivers/thermal/imx_thermal.c | 295 +++++-- + drivers/thermal/mtk_thermal.c | 40 +- + drivers/thermal/rcar_gen3_thermal.c | 17 +- + drivers/thermal/samsung/exynos_tmu.c | 953 +++++++-------------- + drivers/thermal/samsung/exynos_tmu.h | 75 -- + drivers/thermal/tegra/soctherm.c | 29 +- + drivers/thermal/uniphier_thermal.c | 4 + + 12 files changed, 628 insertions(+), 813 deletions(-) + delete mode 100644 drivers/thermal/samsung/exynos_tmu.h +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 (f706d830154b dlm: make sctp_connect_to_sock() return in specified time) +$ git merge dlm/next +Merge made by the 'recursive' strategy. + fs/dlm/lowcomms.c | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) +Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback) +$ git merge swiotlb/linux-next +Already up to date. +Merging rdma/for-next (056f9c7f39bf iw_cxgb4: dump detailed driver-specific QP information) +$ git merge rdma/for-next +Auto-merging drivers/infiniband/sw/rxe/rxe_resp.c +CONFLICT (content): Merge conflict in drivers/infiniband/sw/rxe/rxe_resp.c +Auto-merging drivers/infiniband/sw/rxe/rxe_req.c +Auto-merging drivers/infiniband/hw/cxgb4/qp.c +Auto-merging drivers/infiniband/hw/cxgb4/iw_cxgb4.h +Auto-merging drivers/infiniband/core/cma.c +Resolved 'drivers/infiniband/sw/rxe/rxe_resp.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 68c5b9c58426] Merge remote-tracking branch 'rdma/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/infiniband/core/Makefile | 3 +- + drivers/infiniband/core/addr.c | 172 ++++++++------------- + drivers/infiniband/core/cma.c | 6 +- + drivers/infiniband/core/nldev.c | 121 +++++++++++++-- + drivers/infiniband/core/restrack.c | 7 + + drivers/infiniband/core/security.c | 4 - + drivers/infiniband/hw/cxgb4/Makefile | 3 +- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 5 + + drivers/infiniband/hw/cxgb4/provider.c | 8 + + drivers/infiniband/hw/cxgb4/qp.c | 9 +- + drivers/infiniband/hw/cxgb4/restrack.c | 248 +++++++++++++++++++++++++++++++ + drivers/infiniband/hw/hfi1/file_ops.c | 4 +- + drivers/infiniband/hw/i40iw/i40iw_cm.c | 4 +- + drivers/infiniband/hw/i40iw/i40iw_main.c | 2 +- + drivers/infiniband/hw/qedr/verbs.c | 2 +- + drivers/infiniband/hw/qib/qib_file_ops.c | 2 +- + drivers/infiniband/sw/rxe/rxe.c | 11 +- + drivers/infiniband/sw/rxe/rxe.h | 4 +- + drivers/infiniband/sw/rxe/rxe_comp.c | 6 +- + drivers/infiniband/sw/rxe/rxe_loc.h | 13 +- + drivers/infiniband/sw/rxe/rxe_mr.c | 13 +- + drivers/infiniband/sw/rxe/rxe_net.c | 17 ++- + drivers/infiniband/sw/rxe/rxe_net.h | 3 - + drivers/infiniband/sw/rxe/rxe_recv.c | 7 +- + drivers/infiniband/sw/rxe/rxe_req.c | 2 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 20 +-- + drivers/infiniband/sw/rxe/rxe_verbs.c | 6 +- + include/rdma/ib_addr.h | 20 +-- + include/rdma/restrack.h | 20 +++ + include/uapi/rdma/rdma_netlink.h | 26 ++++ + 30 files changed, 538 insertions(+), 230 deletions(-) + create mode 100644 drivers/infiniband/hw/cxgb4/restrack.c +Merging net-next/master (ec9efb523cb8 rocker: Postpone filtering of !added_by_user FDB) +$ git merge net-next/master +Auto-merging tools/testing/selftests/net/Makefile +CONFLICT (content): Merge conflict in tools/testing/selftests/net/Makefile +Auto-merging tools/testing/selftests/bpf/test_tunnel_kern.c +Auto-merging tools/testing/selftests/bpf/test_sockmap_kern.c +Auto-merging tools/testing/selftests/bpf/test_sockmap.c +Removing samples/sockmap/sockmap_test.sh +Removing samples/sockmap/Makefile +Removing samples/bpf/test_tunnel_bpf.sh +Auto-merging net/xfrm/xfrm_state.c +Auto-merging net/tls/tls_main.c +CONFLICT (content): Merge conflict in net/tls/tls_main.c +Auto-merging net/tipc/socket.c +Auto-merging net/tipc/node.c +Auto-merging net/sctp/sm_make_chunk.c +Auto-merging net/sctp/associola.c +Auto-merging net/netfilter/nf_tables_core.c +Auto-merging net/netfilter/nf_tables_api.c +Auto-merging net/netfilter/nf_flow_table_core.c +Auto-merging net/ipv6/udp.c +Auto-merging net/ipv6/netfilter/ip6_tables.c +Auto-merging net/ipv6/ip6_vti.c +Auto-merging net/ipv4/udp.c +Auto-merging net/ipv4/netfilter/ip_tables.c +Auto-merging net/core/dev.c +Removing net/bridge/netfilter/nft_meta_bridge.c +Auto-merging kernel/bpf/syscall.c +CONFLICT (content): Merge conflict in kernel/bpf/syscall.c +Auto-merging include/uapi/linux/pci_regs.h +Removing include/trace/events/bpf.h +Removing include/net/netfilter/nft_meta.h +Auto-merging include/net/netfilter/nf_tables.h +Auto-merging include/net/flow_dissector.h +Removing include/linux/platform_data/mdio-gpio.h +Auto-merging drivers/soc/ti/knav_qmss_queue.c +Auto-merging drivers/soc/ti/knav_qmss.h +Auto-merging drivers/net/phy/sfp-bus.c +Auto-merging drivers/net/hyperv/rndis_filter.c +Auto-merging drivers/net/ethernet/realtek/r8169.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/realtek/r8169.c +Auto-merging drivers/net/ethernet/qlogic/qed/qed_main.c +Auto-merging drivers/net/ethernet/qlogic/qed/qed_l2.c +Auto-merging drivers/net/ethernet/netronome/nfp/bpf/main.c +Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +Auto-merging drivers/net/dsa/mv88e6xxx/global2.c +Auto-merging drivers/net/dsa/mv88e6xxx/chip.h +Auto-merging drivers/net/dsa/mv88e6xxx/chip.c +Removing arch/x86/net/bpf_jit.S +Auto-merging arch/x86/Kconfig +Removing arch/sparc/net/bpf_jit_asm_64.S +Auto-merging arch/s390/net/bpf_jit_comp.c +CONFLICT (modify/delete): arch/s390/net/bpf_jit.S deleted in net-next/master and modified in HEAD. Version HEAD of arch/s390/net/bpf_jit.S left in tree. +Removing arch/powerpc/net/bpf_jit_asm64.S +Auto-merging MAINTAINERS +Resolved 'drivers/net/ethernet/realtek/r8169.c' using previous resolution. +Resolved 'kernel/bpf/syscall.c' using previous resolution. +Resolved 'net/tls/tls_main.c' using previous resolution. +Resolved 'tools/testing/selftests/net/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/s390/net/bpf_jit.S +arch/s390/net/bpf_jit.S: needs merge +rm 'arch/s390/net/bpf_jit.S' +$ git commit -v -a +[master 3a5195151043] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/net/dsa/dsa.txt | 6 - + .../devicetree/bindings/net/meson-dwmac.txt | 1 + + .../devicetree/bindings/net/microchip,lan78xx.txt | 54 + + .../bindings/net/socionext,uniphier-ave4.txt | 19 +- + .../bindings/soc/ti/keystone-navigator-qmss.txt | 9 +- + Documentation/filesystems/nfs/nfsroot.txt | 70 +- + Documentation/networking/af_xdp.rst | 297 +++ + Documentation/networking/filter.txt | 6 + + Documentation/networking/index.rst | 1 + + Documentation/networking/ip-sysctl.txt | 13 + + Documentation/networking/netdev-features.txt | 7 + + Documentation/sysctl/net.txt | 1 + + MAINTAINERS | 31 +- + arch/arm/net/bpf_jit_32.c | 77 - + arch/arm64/net/bpf_jit_comp.c | 65 - + arch/mips/net/ebpf_jit.c | 104 - + arch/powerpc/net/Makefile | 2 +- + arch/powerpc/net/bpf_jit64.h | 37 +- + arch/powerpc/net/bpf_jit_asm64.S | 180 -- + arch/powerpc/net/bpf_jit_comp64.c | 109 +- + arch/s390/net/Makefile | 2 +- + arch/s390/net/bpf_jit.S | 120 - + arch/s390/net/bpf_jit.h | 20 +- + arch/s390/net/bpf_jit_comp.c | 127 +- + arch/sparc/net/Makefile | 5 +- + arch/sparc/net/bpf_jit_64.h | 29 - + arch/sparc/net/bpf_jit_asm_64.S | 162 -- + arch/sparc/net/bpf_jit_comp_64.c | 79 +- + arch/x86/Kconfig | 2 +- + arch/x86/include/asm/nospec-branch.h | 30 +- + arch/x86/net/Makefile | 7 +- + arch/x86/net/bpf_jit.S | 154 -- + arch/x86/net/bpf_jit_comp.c | 343 +-- + arch/x86/net/bpf_jit_comp32.c | 2419 ++++++++++++++++++++ + drivers/connector/cn_proc.c | 4 + + drivers/dca/dca-core.c | 2 +- + drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.c | 21 +- + .../infiniband/ulp/opa_vnic/opa_vnic_internal.h | 2 +- + drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c | 2 +- + drivers/net/Kconfig | 1 + + drivers/net/dsa/b53/b53_common.c | 81 +- + drivers/net/dsa/b53/b53_priv.h | 6 +- + drivers/net/dsa/bcm_sf2.c | 1 + + drivers/net/dsa/dsa_loop.c | 12 +- + drivers/net/dsa/lan9303-core.c | 11 +- + drivers/net/dsa/microchip/ksz_common.c | 11 +- + drivers/net/dsa/mt7530.c | 11 +- + drivers/net/dsa/mv88e6xxx/chip.c | 110 +- + drivers/net/dsa/mv88e6xxx/chip.h | 13 +- + drivers/net/dsa/mv88e6xxx/global1.c | 48 + + drivers/net/dsa/mv88e6xxx/global1.h | 30 +- + drivers/net/dsa/mv88e6xxx/global2.c | 62 +- + drivers/net/dsa/mv88e6xxx/global2.h | 25 +- + drivers/net/dsa/mv88e6xxx/serdes.c | 20 + + drivers/net/dsa/mv88e6xxx/serdes.h | 3 + + drivers/net/dsa/qca8k.c | 10 +- + drivers/net/ethernet/3com/3c59x.c | 62 +- + drivers/net/ethernet/8390/Kconfig | 17 +- + drivers/net/ethernet/8390/Makefile | 1 + + drivers/net/ethernet/8390/ax88796.c | 228 +- + drivers/net/ethernet/8390/xsurf100.c | 382 ++++ + drivers/net/ethernet/amd/amd8111e.c | 16 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 6 +- + drivers/net/ethernet/broadcom/bnxt/Makefile | 1 + + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 164 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 19 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c | 166 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.c | 124 + + drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.h | 23 + + drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c | 8 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 60 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 22 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h | 17 + + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 2 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 6 +- + .../ethernet/cavium/liquidio/cn23xx_pf_device.c | 60 +- + .../ethernet/cavium/liquidio/cn23xx_pf_device.h | 14 + + drivers/net/ethernet/cavium/liquidio/lio_core.c | 510 ++++- + drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 727 ++++-- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 370 ++- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 259 +-- + drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c | 15 +- + .../net/ethernet/cavium/liquidio/liquidio_common.h | 87 +- + .../net/ethernet/cavium/liquidio/octeon_device.c | 12 +- + .../net/ethernet/cavium/liquidio/octeon_device.h | 16 +- + drivers/net/ethernet/cavium/liquidio/octeon_iq.h | 4 +- + .../net/ethernet/cavium/liquidio/octeon_mailbox.c | 52 + + .../net/ethernet/cavium/liquidio/octeon_mailbox.h | 7 + + .../net/ethernet/cavium/liquidio/octeon_network.h | 79 +- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 3 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 6 +- + drivers/net/ethernet/chelsio/cxgb4/srq.c | 3 +- + drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h | 3 + + drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h | 12 +- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 16 + + drivers/net/ethernet/chelsio/libcxgb/libcxgb_cm.h | 15 +- + drivers/net/ethernet/freescale/fman/fman_port.c | 8 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 7 - + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 141 +- + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 21 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 19 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 237 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 21 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 12 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 7 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 5 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 12 + + drivers/net/ethernet/huawei/hinic/Kconfig | 2 +- + drivers/net/ethernet/huawei/hinic/hinic_main.c | 8 +- + drivers/net/ethernet/intel/e100.c | 28 +- + drivers/net/ethernet/intel/e1000/Makefile | 26 - + drivers/net/ethernet/intel/e1000/e1000.h | 29 +- + drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 23 +- + drivers/net/ethernet/intel/e1000/e1000_hw.c | 28 +- + drivers/net/ethernet/intel/e1000/e1000_hw.h | 28 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 28 +- + drivers/net/ethernet/intel/e1000/e1000_osdep.h | 29 +- + drivers/net/ethernet/intel/e1000/e1000_param.c | 28 +- + drivers/net/ethernet/intel/e1000e/80003es2lan.c | 21 +- + drivers/net/ethernet/intel/e1000e/80003es2lan.h | 21 +- + drivers/net/ethernet/intel/e1000e/82571.c | 21 +- + drivers/net/ethernet/intel/e1000e/82571.h | 21 +- + drivers/net/ethernet/intel/e1000e/Makefile | 27 +- + drivers/net/ethernet/intel/e1000e/defines.h | 21 +- + drivers/net/ethernet/intel/e1000e/e1000.h | 21 +- + drivers/net/ethernet/intel/e1000e/ethtool.c | 21 +- + drivers/net/ethernet/intel/e1000e/hw.h | 21 +- + drivers/net/ethernet/intel/e1000e/ich8lan.c | 21 +- + drivers/net/ethernet/intel/e1000e/ich8lan.h | 21 +- + drivers/net/ethernet/intel/e1000e/mac.c | 21 +- + drivers/net/ethernet/intel/e1000e/mac.h | 21 +- + drivers/net/ethernet/intel/e1000e/manage.c | 21 +- + drivers/net/ethernet/intel/e1000e/manage.h | 21 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 21 +- + drivers/net/ethernet/intel/e1000e/nvm.c | 21 +- + drivers/net/ethernet/intel/e1000e/nvm.h | 21 +- + drivers/net/ethernet/intel/e1000e/param.c | 21 +- + drivers/net/ethernet/intel/e1000e/phy.c | 21 +- + drivers/net/ethernet/intel/e1000e/phy.h | 21 +- + drivers/net/ethernet/intel/e1000e/ptp.c | 21 +- + drivers/net/ethernet/intel/e1000e/regs.h | 21 +- + drivers/net/ethernet/intel/fm10k/Makefile | 23 +- + drivers/net/ethernet/intel/fm10k/fm10k.h | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k_common.c | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k_common.h | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 136 +- + drivers/net/ethernet/intel/fm10k/fm10k_iov.c | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 27 +- + drivers/net/ethernet/intel/fm10k/fm10k_mbx.c | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k_mbx.h | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 94 +- + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k_pf.h | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k_tlv.c | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k_tlv.h | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k_type.h | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k_vf.c | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k_vf.h | 20 +- + drivers/net/ethernet/intel/i40e/Makefile | 26 +- + drivers/net/ethernet/intel/i40e/i40e.h | 33 +- + drivers/net/ethernet/intel/i40e/i40e_adminq.c | 26 +- + drivers/net/ethernet/intel/i40e/i40e_adminq.h | 26 +- + drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 26 +- + drivers/net/ethernet/intel/i40e/i40e_alloc.h | 26 +- + drivers/net/ethernet/intel/i40e/i40e_client.c | 32 +- + drivers/net/ethernet/intel/i40e/i40e_client.h | 26 +- + drivers/net/ethernet/intel/i40e/i40e_common.c | 63 +- + drivers/net/ethernet/intel/i40e/i40e_dcb.c | 117 +- + drivers/net/ethernet/intel/i40e/i40e_dcb.h | 26 +- + drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c | 37 +- + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 34 +- + drivers/net/ethernet/intel/i40e/i40e_devids.h | 26 +- + drivers/net/ethernet/intel/i40e/i40e_diag.c | 26 +- + drivers/net/ethernet/intel/i40e/i40e_diag.h | 26 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 54 +- + drivers/net/ethernet/intel/i40e/i40e_hmc.c | 27 +- + drivers/net/ethernet/intel/i40e/i40e_hmc.h | 26 +- + drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | 26 +- + drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h | 26 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 160 +- + drivers/net/ethernet/intel/i40e/i40e_nvm.c | 27 +- + drivers/net/ethernet/intel/i40e/i40e_osdep.h | 26 +- + drivers/net/ethernet/intel/i40e/i40e_prototype.h | 26 +- + drivers/net/ethernet/intel/i40e/i40e_ptp.c | 71 +- + drivers/net/ethernet/intel/i40e/i40e_register.h | 26 +- + drivers/net/ethernet/intel/i40e/i40e_status.h | 26 +- + drivers/net/ethernet/intel/i40e/i40e_trace.h | 23 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 65 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 29 +- + drivers/net/ethernet/intel/i40e/i40e_type.h | 34 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 111 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 26 +- + drivers/net/ethernet/intel/i40evf/Makefile | 26 +- + drivers/net/ethernet/intel/i40evf/i40e_adminq.c | 26 +- + drivers/net/ethernet/intel/i40evf/i40e_adminq.h | 26 +- + .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 26 +- + drivers/net/ethernet/intel/i40evf/i40e_alloc.h | 26 +- + drivers/net/ethernet/intel/i40evf/i40e_common.c | 27 +- + drivers/net/ethernet/intel/i40evf/i40e_devids.h | 26 +- + drivers/net/ethernet/intel/i40evf/i40e_hmc.h | 26 +- + drivers/net/ethernet/intel/i40evf/i40e_lan_hmc.h | 26 +- + drivers/net/ethernet/intel/i40evf/i40e_osdep.h | 26 +- + drivers/net/ethernet/intel/i40evf/i40e_prototype.h | 26 +- + drivers/net/ethernet/intel/i40evf/i40e_register.h | 26 +- + drivers/net/ethernet/intel/i40evf/i40e_status.h | 26 +- + drivers/net/ethernet/intel/i40evf/i40e_trace.h | 23 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 30 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 26 +- + drivers/net/ethernet/intel/i40evf/i40e_type.h | 36 +- + drivers/net/ethernet/intel/i40evf/i40evf.h | 26 +- + drivers/net/ethernet/intel/i40evf/i40evf_client.c | 6 +- + drivers/net/ethernet/intel/i40evf/i40evf_client.h | 2 + + drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 33 +- + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 51 +- + .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 37 +- + drivers/net/ethernet/intel/igb/Makefile | 28 +- + drivers/net/ethernet/intel/igb/e1000_82575.c | 23 +- + drivers/net/ethernet/intel/igb/e1000_82575.h | 23 +- + drivers/net/ethernet/intel/igb/e1000_defines.h | 25 +- + drivers/net/ethernet/intel/igb/e1000_hw.h | 22 +- + drivers/net/ethernet/intel/igb/e1000_i210.c | 23 +- + drivers/net/ethernet/intel/igb/e1000_i210.h | 23 +- + drivers/net/ethernet/intel/igb/e1000_mac.c | 23 +- + drivers/net/ethernet/intel/igb/e1000_mac.h | 23 +- + drivers/net/ethernet/intel/igb/e1000_mbx.c | 23 +- + drivers/net/ethernet/intel/igb/e1000_mbx.h | 23 +- + drivers/net/ethernet/intel/igb/e1000_nvm.c | 22 +- + drivers/net/ethernet/intel/igb/e1000_nvm.h | 23 +- + drivers/net/ethernet/intel/igb/e1000_phy.c | 23 +- + drivers/net/ethernet/intel/igb/e1000_phy.h | 23 +- + drivers/net/ethernet/intel/igb/e1000_regs.h | 23 +- + drivers/net/ethernet/intel/igb/igb.h | 36 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 96 +- + drivers/net/ethernet/intel/igb/igb_hwmon.c | 23 +- + drivers/net/ethernet/intel/igb/igb_main.c | 389 +++- + drivers/net/ethernet/intel/igb/igb_ptp.c | 19 +- + drivers/net/ethernet/intel/igbvf/Makefile | 28 +- + drivers/net/ethernet/intel/igbvf/defines.h | 26 +- + drivers/net/ethernet/intel/igbvf/ethtool.c | 26 +- + drivers/net/ethernet/intel/igbvf/igbvf.h | 26 +- + drivers/net/ethernet/intel/igbvf/mbx.c | 26 +- + drivers/net/ethernet/intel/igbvf/mbx.h | 26 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 26 +- + drivers/net/ethernet/intel/igbvf/regs.h | 26 +- + drivers/net/ethernet/intel/igbvf/vf.c | 26 +- + drivers/net/ethernet/intel/igbvf/vf.h | 26 +- + drivers/net/ethernet/intel/ixgb/Makefile | 27 - + drivers/net/ethernet/intel/ixgb/ixgb.h | 28 +- + drivers/net/ethernet/intel/ixgb/ixgb_ee.c | 29 +- + drivers/net/ethernet/intel/ixgb/ixgb_ee.h | 28 +- + drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c | 29 +- + drivers/net/ethernet/intel/ixgb/ixgb_hw.c | 29 +- + drivers/net/ethernet/intel/ixgb/ixgb_hw.h | 28 +- + drivers/net/ethernet/intel/ixgb/ixgb_ids.h | 28 +- + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 29 +- + drivers/net/ethernet/intel/ixgb/ixgb_osdep.h | 28 +- + drivers/net/ethernet/intel/ixgb/ixgb_param.c | 29 +- + drivers/net/ethernet/intel/ixgbe/Makefile | 29 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 32 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 28 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 28 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 28 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_common.h | 28 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c | 30 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h | 28 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c | 28 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.h | 28 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c | 29 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h | 28 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c | 29 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c | 28 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 29 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 29 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h | 28 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 28 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.h | 27 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 29 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 373 +-- + drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c | 29 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h | 28 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_model.h | 26 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 29 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 28 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 28 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 34 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h | 28 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c | 29 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 28 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 29 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_x540.h | 24 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 26 +- + drivers/net/ethernet/intel/ixgbevf/Makefile | 28 +- + drivers/net/ethernet/intel/ixgbevf/defines.h | 26 +- + drivers/net/ethernet/intel/ixgbevf/ethtool.c | 27 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 26 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 27 +- + drivers/net/ethernet/intel/ixgbevf/mbx.c | 27 +- + drivers/net/ethernet/intel/ixgbevf/mbx.h | 26 +- + drivers/net/ethernet/intel/ixgbevf/regs.h | 26 +- + drivers/net/ethernet/intel/ixgbevf/vf.c | 27 +- + drivers/net/ethernet/intel/ixgbevf/vf.h | 26 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 23 +- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/fw.c | 12 + + drivers/net/ethernet/mellanox/mlx4/main.c | 56 +- + drivers/net/ethernet/mellanox/mlx4/mlx4.h | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 12 + + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 6 +- + .../net/ethernet/mellanox/mlx5/core/accel/tls.c | 71 + + .../net/ethernet/mellanox/mlx5/core/accel/tls.h | 86 + + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 28 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 29 + + .../mellanox/mlx5/core/en_accel/en_accel.h | 72 + + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.h | 3 - + .../net/ethernet/mellanox/mlx5/core/en_accel/tls.c | 197 ++ + .../net/ethernet/mellanox/mlx5/core/en_accel/tls.h | 87 + + .../mellanox/mlx5/core/en_accel/tls_rxtx.c | 278 +++ + .../mellanox/mlx5/core/en_accel/tls_rxtx.h | 50 + + .../mellanox/mlx5/core/en_accel/tls_stats.c | 89 + + drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_dim.c | 28 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 35 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 126 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 42 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 32 + + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 9 + + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 37 +- + drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 37 +- + .../net/ethernet/mellanox/mlx5/core/fpga/core.h | 1 + + .../net/ethernet/mellanox/mlx5/core/fpga/ipsec.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/fpga/sdk.h | 2 + + drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c | 562 +++++ + drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.h | 68 + + drivers/net/ethernet/mellanox/mlx5/core/main.c | 11 + + drivers/net/ethernet/mellanox/mlx5/core/mr.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/qp.c | 18 +- + drivers/net/ethernet/mellanox/mlx5/core/wq.h | 1 - + drivers/net/ethernet/mellanox/mlxsw/cmd.h | 31 +- + drivers/net/ethernet/mellanox/mlxsw/pci.c | 148 +- + drivers/net/ethernet/mellanox/mlxsw/pci_hw.h | 74 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 6 + + drivers/net/ethernet/mellanox/mlxsw/resources.h | 6 + + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 50 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 1 + + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 173 +- + .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 170 +- + .../net/ethernet/mellanox/mlxsw/spectrum_span.h | 1 + + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 76 +- + .../ethernet/mellanox/mlxsw/spectrum_switchdev.h | 43 + + drivers/net/ethernet/netronome/nfp/bpf/cmsg.c | 16 +- + drivers/net/ethernet/netronome/nfp/bpf/fw.h | 20 +- + drivers/net/ethernet/netronome/nfp/bpf/jit.c | 307 ++- + drivers/net/ethernet/netronome/nfp/bpf/main.c | 28 +- + drivers/net/ethernet/netronome/nfp/bpf/main.h | 30 +- + drivers/net/ethernet/netronome/nfp/bpf/offload.c | 172 +- + drivers/net/ethernet/netronome/nfp/bpf/verifier.c | 78 +- + drivers/net/ethernet/netronome/nfp/flower/main.h | 9 +- + .../net/ethernet/netronome/nfp/flower/metadata.c | 20 +- + .../net/ethernet/netronome/nfp/flower/offload.c | 50 +- + drivers/net/ethernet/netronome/nfp/nfp_app.c | 2 +- + drivers/net/ethernet/netronome/nfp/nfp_main.c | 5 + + .../net/ethernet/netronome/nfp/nfp_net_common.c | 2 +- + drivers/net/ethernet/netronome/nfp/nfpcore/nfp.h | 2 + + .../ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c | 1 + + .../net/ethernet/netronome/nfp/nfpcore/nfp_cpp.h | 2 + + .../net/ethernet/netronome/nfp/nfpcore/nfp_mutex.c | 45 + + .../ethernet/netronome/nfp/nfpcore/nfp_resource.c | 59 + + drivers/net/ethernet/qlogic/qed/qed.h | 61 +- + drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 14 +- + drivers/net/ethernet/qlogic/qed/qed_debug.c | 118 +- + drivers/net/ethernet/qlogic/qed/qed_dev.c | 113 +- + drivers/net/ethernet/qlogic/qed/qed_fcoe.c | 3 + + drivers/net/ethernet/qlogic/qed/qed_hsi.h | 28 + + drivers/net/ethernet/qlogic/qed/qed_l2.c | 19 + + drivers/net/ethernet/qlogic/qed/qed_ll2.c | 46 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 13 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 96 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 24 +- + drivers/net/ethernet/qlogic/qed/qed_sp.h | 12 +- + drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 76 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 247 +- + drivers/net/ethernet/qlogic/qed/qed_vf.c | 29 + + drivers/net/ethernet/qlogic/qed/qed_vf.h | 21 + + drivers/net/ethernet/qlogic/qede/qede_filter.c | 7 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 4 +- + drivers/net/ethernet/realtek/r8169.c | 1139 +++------ + drivers/net/ethernet/renesas/sh_eth.c | 34 +- + drivers/net/ethernet/rocker/rocker_main.c | 4 + + drivers/net/ethernet/sfc/efx.c | 36 + + drivers/net/ethernet/socionext/Kconfig | 2 + + drivers/net/ethernet/socionext/netsec.c | 27 +- + drivers/net/ethernet/socionext/sni_ave.c | 252 +- + drivers/net/ethernet/stmicro/stmmac/Makefile | 3 +- + drivers/net/ethernet/stmicro/stmmac/chain_mode.c | 34 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 234 +- + .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 120 +- + drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 1 - + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 29 +- + .../net/ethernet/stmicro/stmmac/dwmac100_core.c | 23 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 5 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 42 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 3 + + drivers/net/ethernet/stmicro/stmmac/dwmac5.c | 214 +- + drivers/net/ethernet/stmicro/stmmac/dwmac5.h | 19 +- + drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/hwif.c | 228 ++ + drivers/net/ethernet/stmicro/stmmac/hwif.h | 459 ++++ + drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/ring_mode.c | 39 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 30 + + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 82 +- + .../net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 34 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 581 +++-- + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 18 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 295 +++ + drivers/net/ethernet/ti/davinci_mdio.c | 15 +- + drivers/net/ethernet/ti/netcp.h | 3 + + drivers/net/ethernet/ti/netcp_core.c | 32 + + drivers/net/ethernet/ti/netcp_ethss.c | 181 +- + drivers/net/geneve.c | 72 +- + drivers/net/hamradio/mkiss.c | 2 +- + drivers/net/hyperv/Kconfig | 1 + + drivers/net/hyperv/hyperv_net.h | 166 +- + drivers/net/hyperv/netvsc.c | 61 +- + drivers/net/hyperv/rndis_filter.c | 32 +- + drivers/net/macvlan.c | 68 +- + drivers/net/phy/Kconfig | 11 + + drivers/net/phy/Makefile | 2 + + drivers/net/phy/asix.c | 63 + + drivers/net/phy/bcm-phy-lib.c | 6 +- + drivers/net/phy/marvell.c | 5 +- + drivers/net/phy/mdio-bitbang.c | 9 - + drivers/net/phy/mdio-boardinfo.c | 5 +- + drivers/net/phy/mdio-gpio.c | 122 +- + drivers/net/phy/micrel.c | 5 +- + drivers/net/phy/microchip.c | 25 + + drivers/net/phy/microchip_t1.c | 74 + + drivers/net/phy/sfp-bus.c | 7 + + drivers/net/phy/smsc.c | 5 +- + drivers/net/team/team.c | 2 +- + drivers/net/tun.c | 96 +- + drivers/net/usb/Kconfig | 1 + + drivers/net/usb/lan78xx.c | 238 +- + drivers/net/virtio_net.c | 74 +- + drivers/net/vrf.c | 25 +- + drivers/net/vxlan.c | 17 +- + drivers/ptp/ptp_pch.c | 7 +- + drivers/s390/net/lcs.c | 3 + + drivers/s390/net/qeth_core.h | 61 +- + drivers/s390/net/qeth_core_main.c | 148 +- + drivers/s390/net/qeth_core_mpc.h | 2 + + drivers/s390/net/qeth_core_sys.c | 2 + + drivers/s390/net/qeth_l2_main.c | 98 +- + drivers/s390/net/qeth_l3_main.c | 207 +- + drivers/scsi/qedf/qedf_fip.c | 7 +- + drivers/scsi/qedf/qedf_main.c | 2 +- + drivers/scsi/qedi/qedi_iscsi.c | 2 +- + drivers/soc/ti/knav_dma.c | 8 + + drivers/soc/ti/knav_qmss.h | 6 + + drivers/soc/ti/knav_qmss_queue.c | 98 +- + drivers/vhost/net.c | 19 +- + include/dt-bindings/net/microchip-lan78xx.h | 21 + + include/linux/bpf.h | 55 +- + include/linux/bpf_trace.h | 1 - + include/linux/bpf_types.h | 3 + + include/linux/bpf_verifier.h | 9 +- + include/linux/btf.h | 48 + + include/linux/ethtool.h | 5 + + include/linux/filter.h | 33 +- + include/linux/if_bridge.h | 28 + + include/linux/if_macvlan.h | 29 +- + include/linux/if_tun.h | 4 +- + include/linux/mdio-bitbang.h | 2 - + include/linux/mdio-gpio.h | 9 + + include/linux/microchipphy.h | 3 + + include/linux/mlx4/device.h | 1 + + include/linux/mlx5/mlx5_ifc.h | 16 - + include/linux/mlx5/mlx5_ifc_fpga.h | 77 + + include/linux/net.h | 1 + + include/linux/net_dim.h | 69 +- + include/linux/netdev_features.h | 7 +- + include/linux/netdevice.h | 43 +- + include/linux/netfilter/nf_osf.h | 27 + + include/linux/netfilter_bridge/ebtables.h | 4 - + include/linux/phy.h | 46 + + include/linux/platform_data/mdio-gpio.h | 33 - + include/linux/qed/qed_eth_if.h | 1 + + include/linux/qed/qed_if.h | 6 +- + include/linux/qed/qed_ll2_if.h | 10 +- + include/linux/rhashtable.h | 38 +- + include/linux/skbuff.h | 26 +- + include/linux/soc/ti/knav_dma.h | 12 + + include/linux/soc/ti/knav_qmss.h | 1 + + include/linux/socket.h | 5 +- + include/linux/tcp.h | 3 +- + include/linux/tnum.h | 4 +- + include/linux/u64_stats_sync.h | 14 - + include/linux/udp.h | 3 + + include/net/addrconf.h | 14 + + include/net/ax88796.h | 14 + + include/net/dsa.h | 12 +- + include/net/fib_rules.h | 3 +- + include/net/flow_dissector.h | 7 +- + include/net/if_inet6.h | 5 +- + include/net/inet_connection_sock.h | 24 +- + include/net/inet_sock.h | 1 + + include/net/inet_timewait_sock.h | 1 + + include/net/ip.h | 6 +- + include/net/ip6_fib.h | 184 +- + include/net/ip6_route.h | 80 +- + include/net/ip_tunnels.h | 15 +- + include/net/ip_vs.h | 1 + + include/net/ipv6.h | 6 +- + include/net/neighbour.h | 19 +- + include/net/netfilter/ipv4/nf_nat_masquerade.h | 2 +- + include/net/netfilter/ipv6/nf_nat_masquerade.h | 2 +- + include/net/netfilter/nf_flow_table.h | 24 +- + include/net/netfilter/nf_nat.h | 2 +- + include/net/netfilter/nf_nat_l3proto.h | 28 +- + include/net/netfilter/nf_nat_l4proto.h | 8 +- + include/net/netfilter/nf_nat_redirect.h | 2 +- + include/net/netfilter/nf_tables.h | 53 +- + include/net/netfilter/nf_tables_core.h | 3 + + include/net/netfilter/nfnetlink_log.h | 17 - + include/net/netfilter/nft_meta.h | 44 - + include/net/netns/ipv6.h | 4 +- + include/net/page_pool.h | 143 ++ + include/net/sctp/constants.h | 5 +- + include/net/sctp/sctp.h | 52 +- + include/net/sctp/sm.h | 4 +- + include/net/sctp/structs.h | 6 +- + include/net/sock.h | 25 +- + include/net/switchdev.h | 1 + + include/net/tcp.h | 12 + + include/net/tipc.h | 4 +- + include/net/tls.h | 120 +- + include/net/udp.h | 4 + + include/net/vxlan.h | 1 + + include/net/xdp.h | 84 + + include/net/xdp_sock.h | 66 + + include/trace/events/bpf.h | 355 --- + include/trace/events/tcp.h | 69 +- + include/uapi/linux/bpf.h | 1862 +++++++++++---- + include/uapi/linux/btf.h | 128 ++ + include/uapi/linux/cn_proc.h | 4 + + include/uapi/linux/if_link.h | 1 + + include/uapi/linux/if_xdp.h | 87 + + include/uapi/linux/netfilter/nf_nat.h | 12 +- + include/uapi/linux/netfilter/nf_osf.h | 90 + + include/uapi/linux/netfilter/nf_tables.h | 8 + + include/uapi/linux/netfilter/nfnetlink_conntrack.h | 1 + + include/uapi/linux/netfilter/xt_osf.h | 106 +- + include/uapi/linux/netfilter_bridge/ebtables.h | 6 + + include/uapi/linux/netfilter_ipv6/ip6t_srh.h | 43 +- + include/uapi/linux/pci_regs.h | 2 + + include/uapi/linux/snmp.h | 2 + + include/uapi/linux/tcp.h | 16 + + include/uapi/linux/tipc.h | 12 +- + include/uapi/linux/tipc_config.h | 5 + + include/uapi/linux/tipc_netlink.h | 1 + + include/uapi/linux/udp.h | 1 + + kernel/bpf/Makefile | 4 + + kernel/bpf/arraymap.c | 50 + + kernel/bpf/btf.c | 2064 +++++++++++++++++ + kernel/bpf/core.c | 108 +- + kernel/bpf/cpumap.c | 132 +- + kernel/bpf/inode.c | 172 +- + kernel/bpf/offload.c | 6 +- + kernel/bpf/stackmap.c | 80 +- + kernel/bpf/syscall.c | 68 +- + kernel/bpf/tnum.c | 10 + + kernel/bpf/verifier.c | 271 ++- + kernel/bpf/xskmap.c | 241 ++ + kernel/trace/bpf_trace.c | 52 +- + lib/kobject_uevent.c | 178 +- + lib/rhashtable.c | 51 +- + lib/test_bpf.c | 570 +++-- + net/8021q/vlan_dev.c | 4 +- + net/9p/mod.c | 2 +- + net/Kconfig | 7 + + net/Makefile | 1 + + net/bpf/test_run.c | 3 +- + net/bridge/br.c | 16 +- + net/bridge/br_fdb.c | 69 +- + net/bridge/br_forward.c | 3 +- + net/bridge/br_if.c | 11 +- + net/bridge/br_private.h | 19 +- + net/bridge/br_switchdev.c | 12 +- + net/bridge/br_vlan.c | 41 + + net/bridge/netfilter/Kconfig | 7 - + net/bridge/netfilter/Makefile | 1 - + net/bridge/netfilter/ebtables.c | 63 +- + net/bridge/netfilter/nft_meta_bridge.c | 135 -- + net/core/Makefile | 1 + + net/core/dev.c | 146 +- + net/core/dst.c | 1 + + net/core/ethtool.c | 63 +- + net/core/fib_rules.c | 495 ++-- + net/core/filter.c | 445 +++- + net/core/flow_dissector.c | 17 +- + net/core/neighbour.c | 8 +- + net/core/page_pool.c | 317 +++ + net/core/rtnetlink.c | 8 +- + net/core/skbuff.c | 25 +- + net/core/sock.c | 25 +- + net/core/xdp.c | 278 +++ + net/decnet/dn_rules.c | 7 +- + net/dsa/master.c | 62 +- + net/dsa/port.c | 90 +- + net/dsa/slave.c | 14 +- + net/ethernet/eth.c | 6 +- + net/ipv4/Makefile | 3 +- + net/ipv4/af_inet.c | 5 +- + net/ipv4/fib_rules.c | 7 +- + net/ipv4/fib_semantics.c | 43 +- + net/ipv4/inet_connection_sock.c | 5 - + net/ipv4/ip_gre.c | 6 + + net/ipv4/ip_output.c | 45 +- + net/ipv4/ip_tunnel_core.c | 6 +- + net/ipv4/ipconfig.c | 151 +- + net/ipv4/ipmr.c | 3 +- + net/ipv4/metrics.c | 53 + + net/ipv4/netfilter/ip_tables.c | 2 +- + net/ipv4/netfilter/ipt_MASQUERADE.c | 2 +- + net/ipv4/netfilter/iptable_nat.c | 3 +- + net/ipv4/netfilter/nf_flow_table_ipv4.c | 255 +-- + net/ipv4/netfilter/nf_nat_h323.c | 4 +- + net/ipv4/netfilter/nf_nat_l3proto_ipv4.c | 18 +- + net/ipv4/netfilter/nf_nat_masquerade_ipv4.c | 4 +- + net/ipv4/netfilter/nf_nat_pptp.c | 2 +- + net/ipv4/netfilter/nf_nat_proto_gre.c | 2 +- + net/ipv4/netfilter/nf_nat_proto_icmp.c | 2 +- + net/ipv4/netfilter/nft_chain_nat_ipv4.c | 3 +- + net/ipv4/netfilter/nft_masq_ipv4.c | 2 +- + net/ipv4/proc.c | 2 + + net/ipv4/tcp.c | 203 +- + net/ipv4/tcp_input.c | 82 +- + net/ipv4/tcp_ipv4.c | 16 +- + net/ipv4/tcp_minisocks.c | 1 + + net/ipv4/tcp_output.c | 34 +- + net/ipv4/udp.c | 95 +- + net/ipv4/udp_offload.c | 93 +- + net/ipv6/addrconf.c | 190 +- + net/ipv6/af_inet6.c | 58 +- + net/ipv6/anycast.c | 33 +- + net/ipv6/exthdrs.c | 55 +- + net/ipv6/exthdrs_core.c | 2 +- + net/ipv6/fib6_rules.c | 7 +- + net/ipv6/ip6_fib.c | 515 +++-- + net/ipv6/ip6_gre.c | 45 +- + net/ipv6/ip6_input.c | 2 +- + net/ipv6/ip6_offload.c | 6 +- + net/ipv6/ip6_output.c | 93 +- + net/ipv6/ip6_vti.c | 2 +- + net/ipv6/ip6mr.c | 3 +- + net/ipv6/ndisc.c | 42 +- + net/ipv6/netfilter/ip6_tables.c | 1 - + net/ipv6/netfilter/ip6t_MASQUERADE.c | 2 +- + net/ipv6/netfilter/ip6t_srh.c | 173 +- + net/ipv6/netfilter/ip6table_nat.c | 3 +- + net/ipv6/netfilter/nf_flow_table_ipv6.c | 246 +- + net/ipv6/netfilter/nf_nat_l3proto_ipv6.c | 18 +- + net/ipv6/netfilter/nf_nat_masquerade_ipv6.c | 4 +- + net/ipv6/netfilter/nf_nat_proto_icmpv6.c | 2 +- + net/ipv6/netfilter/nft_chain_nat_ipv6.c | 3 +- + net/ipv6/netfilter/nft_masq_ipv6.c | 2 +- + net/ipv6/netfilter/nft_redir_ipv6.c | 2 +- + net/ipv6/reassembly.c | 25 +- + net/ipv6/route.c | 1748 +++++++------- + net/ipv6/seg6_iptunnel.c | 24 +- + net/ipv6/sysctl_net_ipv6.c | 8 + + net/ipv6/tcp_ipv6.c | 6 +- + net/ipv6/udp.c | 43 +- + net/ipv6/udp_offload.c | 5 +- + net/ipv6/xfrm6_policy.c | 2 - + net/ipv6/xfrm6_state.c | 6 +- + net/l2tp/l2tp_debugfs.c | 20 +- + net/l2tp/l2tp_ppp.c | 21 +- + net/ncsi/internal.h | 34 +- + net/ncsi/ncsi-manage.c | 226 +- + net/ncsi/ncsi-netlink.c | 20 +- + net/ncsi/ncsi-rsp.c | 178 +- + net/netfilter/Kconfig | 25 +- + net/netfilter/Makefile | 8 +- + net/netfilter/ipvs/Kconfig | 37 + + net/netfilter/ipvs/Makefile | 1 + + net/netfilter/ipvs/ip_vs_ctl.c | 4 + + net/netfilter/ipvs/ip_vs_dh.c | 3 +- + net/netfilter/ipvs/ip_vs_lblc.c | 4 +- + net/netfilter/ipvs/ip_vs_lblcr.c | 4 +- + net/netfilter/ipvs/ip_vs_mh.c | 540 +++++ + net/netfilter/ipvs/ip_vs_proto_tcp.c | 4 +- + net/netfilter/ipvs/ip_vs_sh.c | 3 +- + net/netfilter/ipvs/ip_vs_xmit.c | 5 +- + net/netfilter/nf_conntrack_core.c | 1 + + net/netfilter/nf_conntrack_ftp.c | 3 +- + net/netfilter/nf_conntrack_irc.c | 6 +- + net/netfilter/nf_conntrack_netlink.c | 3 + + net/netfilter/nf_conntrack_sane.c | 3 +- + net/netfilter/nf_conntrack_sip.c | 2 +- + net/netfilter/nf_conntrack_tftp.c | 2 +- + .../{nf_flow_table.c => nf_flow_table_core.c} | 309 ++- + net/netfilter/nf_flow_table_inet.c | 3 +- + net/netfilter/nf_flow_table_ip.c | 487 ++++ + net/netfilter/nf_nat_core.c | 27 +- + net/netfilter/nf_nat_helper.c | 2 +- + net/netfilter/nf_nat_proto_common.c | 9 +- + net/netfilter/nf_nat_proto_dccp.c | 2 +- + net/netfilter/nf_nat_proto_sctp.c | 2 +- + net/netfilter/nf_nat_proto_tcp.c | 2 +- + net/netfilter/nf_nat_proto_udp.c | 4 +- + net/netfilter/nf_nat_proto_unknown.c | 2 +- + net/netfilter/nf_nat_redirect.c | 6 +- + net/netfilter/nf_nat_sip.c | 2 +- + net/netfilter/nf_osf.c | 218 ++ + net/netfilter/nf_tables_api.c | 624 ++--- + net/netfilter/nf_tables_core.c | 3 + + net/netfilter/nfnetlink_log.c | 8 +- + net/netfilter/nft_dynset.c | 7 +- + net/netfilter/nft_exthdr.c | 23 +- + net/netfilter/nft_flow_offload.c | 5 +- + net/netfilter/nft_hash.c | 2 +- + net/netfilter/nft_meta.c | 112 +- + net/netfilter/nft_nat.c | 2 +- + net/netfilter/nft_numgen.c | 85 +- + net/netfilter/nft_objref.c | 4 +- + net/netfilter/nft_rt.c | 22 +- + net/netfilter/nft_set_bitmap.c | 34 +- + net/netfilter/nft_set_hash.c | 153 +- + net/netfilter/nft_set_rbtree.c | 36 +- + net/netfilter/xt_NETMAP.c | 8 +- + net/netfilter/xt_NFLOG.c | 15 +- + net/netfilter/xt_REDIRECT.c | 2 +- + net/netfilter/xt_nat.c | 72 +- + net/netfilter/xt_osf.c | 202 +- + net/openvswitch/conntrack.c | 4 +- + net/packet/af_packet.c | 42 +- + net/qrtr/Kconfig | 7 + + net/qrtr/Makefile | 2 + + net/qrtr/tun.c | 161 ++ + net/sched/act_csum.c | 6 + + net/sched/cls_flower.c | 275 ++- + net/sctp/associola.c | 85 +- + net/sctp/chunk.c | 12 +- + net/sctp/output.c | 28 +- + net/sctp/outqueue.c | 48 +- + net/sctp/sm_make_chunk.c | 143 +- + net/sctp/socket.c | 43 +- + net/sctp/transport.c | 37 +- + net/smc/af_smc.c | 175 +- + net/smc/smc.h | 7 + + net/smc/smc_cdc.c | 2 +- + net/smc/smc_cdc.h | 2 +- + net/smc/smc_core.c | 46 +- + net/smc/smc_core.h | 5 + + net/smc/smc_diag.c | 39 +- + net/smc/smc_llc.c | 62 +- + net/smc/smc_llc.h | 3 + + net/smc/smc_rx.c | 200 +- + net/smc/smc_rx.h | 11 +- + net/smc/smc_tx.c | 24 +- + net/smc/smc_wr.c | 1 + + net/tipc/bearer.c | 29 +- + net/tipc/bearer.h | 3 + + net/tipc/name_table.c | 103 +- + net/tipc/node.c | 33 +- + net/tipc/node.h | 3 +- + net/tipc/socket.c | 13 +- + net/tipc/udp_media.c | 4 +- + net/tipc/udp_media.h | 14 + + net/tls/Kconfig | 10 + + net/tls/Makefile | 2 + + net/tls/tls_device.c | 766 +++++++ + net/tls/tls_device_fallback.c | 450 ++++ + net/tls/tls_main.c | 139 +- + net/tls/tls_sw.c | 141 +- + net/xdp/Kconfig | 7 + + net/xdp/Makefile | 2 + + net/xdp/xdp_umem.c | 260 +++ + net/xdp/xdp_umem.h | 67 + + net/xdp/xdp_umem_props.h | 23 + + net/xdp/xsk.c | 656 ++++++ + net/xdp/xsk_queue.c | 73 + + net/xdp/xsk_queue.h | 247 ++ + net/xfrm/xfrm_state.c | 9 +- + samples/bpf/Makefile | 20 +- + samples/bpf/bpf_load.c | 99 +- + samples/bpf/bpf_load.h | 7 - + samples/bpf/offwaketime_user.c | 1 + + samples/bpf/sampleip_user.c | 1 + + samples/bpf/sock_example.c | 4 +- + samples/bpf/spintest_user.c | 1 + + samples/bpf/test_tunnel_bpf.sh | 319 --- + samples/bpf/trace_event_user.c | 1 + + samples/bpf/trace_output_user.c | 110 +- + samples/bpf/xdp_adjust_tail_kern.c | 152 ++ + samples/bpf/xdp_adjust_tail_user.c | 142 ++ + samples/bpf/xdp_monitor_user.c | 2 +- + samples/bpf/xdpsock.h | 11 + + samples/bpf/xdpsock_kern.c | 56 + + samples/bpf/xdpsock_user.c | 948 ++++++++ + samples/sockmap/Makefile | 78 - + samples/sockmap/sockmap_test.sh | 488 ---- + scripts/bpf_helpers_doc.py | 421 ++++ + security/selinux/hooks.c | 4 +- + security/selinux/include/classmap.h | 4 +- + tools/bpf/bpftool/Documentation/bpftool-cgroup.rst | 11 +- + tools/bpf/bpftool/Documentation/bpftool-map.rst | 53 +- + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 3 +- + tools/bpf/bpftool/Documentation/bpftool.rst | 2 +- + tools/bpf/bpftool/Makefile | 7 +- + tools/bpf/bpftool/bash-completion/bpftool | 50 +- + tools/bpf/bpftool/cgroup.c | 15 +- + tools/bpf/bpftool/common.c | 77 +- + tools/bpf/bpftool/main.h | 7 +- + tools/bpf/bpftool/map.c | 89 +- + tools/bpf/bpftool/map_perf_ring.c | 347 +++ + tools/bpf/bpftool/prog.c | 14 +- + tools/include/uapi/linux/bpf.h | 1861 +++++++++++---- + tools/include/uapi/linux/btf.h | 128 ++ + tools/include/uapi/linux/erspan.h | 52 + + tools/lib/bpf/Build | 2 +- + tools/lib/bpf/bpf.c | 92 +- + tools/lib/bpf/bpf.h | 17 + + tools/lib/bpf/btf.c | 374 +++ + tools/lib/bpf/btf.h | 22 + + tools/lib/bpf/libbpf.c | 160 +- + tools/lib/bpf/libbpf.h | 7 + + tools/testing/selftests/bpf/.gitignore | 1 + + tools/testing/selftests/bpf/Makefile | 34 +- + tools/testing/selftests/bpf/bpf_helpers.h | 9 + + tools/testing/selftests/bpf/test_adjust_tail.c | 30 + + tools/testing/selftests/bpf/test_btf.c | 1669 ++++++++++++++ + tools/testing/selftests/bpf/test_btf_haskv.c | 48 + + tools/testing/selftests/bpf/test_btf_nokv.c | 43 + + tools/testing/selftests/bpf/test_get_stack_rawtp.c | 102 + + tools/testing/selftests/bpf/test_progs.c | 274 ++- + .../testing/selftests/bpf/test_sockmap.c | 880 +++++-- + .../testing/selftests/bpf/test_sockmap_kern.c | 35 +- + .../selftests/bpf/test_stacktrace_build_id.c | 20 +- + tools/testing/selftests/bpf/test_stacktrace_map.c | 19 +- + tools/testing/selftests/bpf/test_tunnel.sh | 729 ++++++ + .../testing/selftests/bpf/test_tunnel_kern.c | 263 ++- + tools/testing/selftests/bpf/test_verifier.c | 577 ++++- + tools/testing/selftests/bpf/trace_helpers.c | 180 ++ + tools/testing/selftests/bpf/trace_helpers.h | 23 + + tools/testing/selftests/net/.gitignore | 4 + + tools/testing/selftests/net/Makefile | 7 +- + .../selftests/net/forwarding/bridge_vlan_aware.sh | 26 +- + .../net/forwarding/bridge_vlan_unaware.sh | 26 +- + tools/testing/selftests/net/forwarding/lib.sh | 133 +- + .../testing/selftests/net/forwarding/mirror_gre.sh | 161 ++ + .../selftests/net/forwarding/mirror_gre_bound.sh | 226 ++ + .../selftests/net/forwarding/mirror_gre_changes.sh | 212 ++ + .../selftests/net/forwarding/mirror_gre_flower.sh | 129 ++ + .../selftests/net/forwarding/mirror_gre_lib.sh | 85 + + .../selftests/net/forwarding/mirror_gre_neigh.sh | 115 + + .../selftests/net/forwarding/mirror_gre_nh.sh | 127 + + .../net/forwarding/mirror_gre_topo_lib.sh | 129 ++ + .../testing/selftests/net/forwarding/mirror_lib.sh | 40 + + tools/testing/selftests/net/forwarding/router.sh | 14 +- + .../selftests/net/forwarding/router_multipath.sh | 29 +- + .../testing/selftests/net/forwarding/tc_actions.sh | 25 +- + .../testing/selftests/net/forwarding/tc_chains.sh | 7 +- + .../testing/selftests/net/forwarding/tc_flower.sh | 80 +- + .../selftests/net/forwarding/tc_shblocks.sh | 5 +- + tools/testing/selftests/net/pmtu.sh | 4 +- + tools/testing/selftests/net/rtnetlink.sh | 103 + + tools/testing/selftests/net/tcp_inq.c | 189 ++ + tools/testing/selftests/net/tcp_mmap.c | 447 ++++ + tools/testing/selftests/net/udpgso.c | 620 +++++ + tools/testing/selftests/net/udpgso.sh | 29 + + tools/testing/selftests/net/udpgso_bench.sh | 74 + + tools/testing/selftests/net/udpgso_bench_rx.c | 265 +++ + tools/testing/selftests/net/udpgso_bench_tx.c | 420 ++++ + .../tc-testing/tc-tests/actions/csum.json | 74 +- + .../selftests/tc-testing/tc-tests/actions/ife.json | 1036 ++++++++- + .../tc-testing/tc-tests/actions/sample.json | 588 +++++ + 884 files changed, 47388 insertions(+), 19379 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/microchip,lan78xx.txt + create mode 100644 Documentation/networking/af_xdp.rst + delete mode 100644 arch/powerpc/net/bpf_jit_asm64.S + delete mode 100644 arch/s390/net/bpf_jit.S + delete mode 100644 arch/sparc/net/bpf_jit_asm_64.S + delete mode 100644 arch/x86/net/bpf_jit.S + create mode 100644 arch/x86/net/bpf_jit_comp32.c + create mode 100644 drivers/net/ethernet/8390/xsurf100.c + create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.c + create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/accel/tls.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/accel/tls.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/en_accel.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_stats.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.h + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.h + create mode 100644 drivers/net/ethernet/stmicro/stmmac/hwif.c + create mode 100644 drivers/net/ethernet/stmicro/stmmac/hwif.h + create mode 100644 drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c + create mode 100644 drivers/net/phy/asix.c + create mode 100644 drivers/net/phy/microchip_t1.c + create mode 100644 include/dt-bindings/net/microchip-lan78xx.h + create mode 100644 include/linux/btf.h + create mode 100644 include/linux/mdio-gpio.h + create mode 100644 include/linux/netfilter/nf_osf.h + delete mode 100644 include/linux/platform_data/mdio-gpio.h + delete mode 100644 include/net/netfilter/nft_meta.h + create mode 100644 include/net/page_pool.h + create mode 100644 include/net/xdp_sock.h + delete mode 100644 include/trace/events/bpf.h + create mode 100644 include/uapi/linux/btf.h + create mode 100644 include/uapi/linux/if_xdp.h + create mode 100644 include/uapi/linux/netfilter/nf_osf.h + create mode 100644 kernel/bpf/btf.c + create mode 100644 kernel/bpf/xskmap.c + delete mode 100644 net/bridge/netfilter/nft_meta_bridge.c + create mode 100644 net/core/page_pool.c + create mode 100644 net/ipv4/metrics.c + create mode 100644 net/netfilter/ipvs/ip_vs_mh.c + rename net/netfilter/{nf_flow_table.c => nf_flow_table_core.c} (67%) + create mode 100644 net/netfilter/nf_flow_table_ip.c + create mode 100644 net/netfilter/nf_osf.c + create mode 100644 net/qrtr/tun.c + create mode 100644 net/tls/tls_device.c + create mode 100644 net/tls/tls_device_fallback.c + create mode 100644 net/xdp/Kconfig + create mode 100644 net/xdp/Makefile + create mode 100644 net/xdp/xdp_umem.c + create mode 100644 net/xdp/xdp_umem.h + create mode 100644 net/xdp/xdp_umem_props.h + create mode 100644 net/xdp/xsk.c + create mode 100644 net/xdp/xsk_queue.c + create mode 100644 net/xdp/xsk_queue.h + delete mode 100755 samples/bpf/test_tunnel_bpf.sh + create mode 100644 samples/bpf/xdp_adjust_tail_kern.c + create mode 100644 samples/bpf/xdp_adjust_tail_user.c + create mode 100644 samples/bpf/xdpsock.h + create mode 100644 samples/bpf/xdpsock_kern.c + create mode 100644 samples/bpf/xdpsock_user.c + delete mode 100644 samples/sockmap/Makefile + delete mode 100755 samples/sockmap/sockmap_test.sh + create mode 100755 scripts/bpf_helpers_doc.py + create mode 100644 tools/bpf/bpftool/map_perf_ring.c + create mode 100644 tools/include/uapi/linux/btf.h + create mode 100644 tools/include/uapi/linux/erspan.h + create mode 100644 tools/lib/bpf/btf.c + create mode 100644 tools/lib/bpf/btf.h + create mode 100644 tools/testing/selftests/bpf/test_adjust_tail.c + create mode 100644 tools/testing/selftests/bpf/test_btf.c + create mode 100644 tools/testing/selftests/bpf/test_btf_haskv.c + create mode 100644 tools/testing/selftests/bpf/test_btf_nokv.c + create mode 100644 tools/testing/selftests/bpf/test_get_stack_rawtp.c + rename samples/sockmap/sockmap_user.c => tools/testing/selftests/bpf/test_sockmap.c (57%) + rename samples/sockmap/sockmap_kern.c => tools/testing/selftests/bpf/test_sockmap_kern.c (91%) + create mode 100755 tools/testing/selftests/bpf/test_tunnel.sh + rename samples/bpf/tcbpf2_kern.c => tools/testing/selftests/bpf/test_tunnel_kern.c (68%) + create mode 100644 tools/testing/selftests/bpf/trace_helpers.c + create mode 100644 tools/testing/selftests/bpf/trace_helpers.h + create mode 100755 tools/testing/selftests/net/forwarding/mirror_gre.sh + create mode 100755 tools/testing/selftests/net/forwarding/mirror_gre_bound.sh + create mode 100755 tools/testing/selftests/net/forwarding/mirror_gre_changes.sh + create mode 100755 tools/testing/selftests/net/forwarding/mirror_gre_flower.sh + create mode 100644 tools/testing/selftests/net/forwarding/mirror_gre_lib.sh + create mode 100755 tools/testing/selftests/net/forwarding/mirror_gre_neigh.sh + create mode 100755 tools/testing/selftests/net/forwarding/mirror_gre_nh.sh + create mode 100644 tools/testing/selftests/net/forwarding/mirror_gre_topo_lib.sh + create mode 100644 tools/testing/selftests/net/forwarding/mirror_lib.sh + create mode 100644 tools/testing/selftests/net/tcp_inq.c + create mode 100644 tools/testing/selftests/net/tcp_mmap.c + create mode 100644 tools/testing/selftests/net/udpgso.c + create mode 100755 tools/testing/selftests/net/udpgso.sh + create mode 100755 tools/testing/selftests/net/udpgso_bench.sh + create mode 100644 tools/testing/selftests/net/udpgso_bench_rx.c + create mode 100644 tools/testing/selftests/net/udpgso_bench_tx.c + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/actions/sample.json +Merging bpf-next/master (a84880ef4352 Merge branch 'bpf-perf-rb-libbpf') +$ git merge bpf-next/master +Auto-merging net/ipv6/route.c +Auto-merging kernel/bpf/syscall.c +Auto-merging drivers/net/ethernet/netronome/nfp/bpf/main.c +Merge made by the 'recursive' strategy. + Documentation/networking/filter.txt | 15 +- + drivers/net/ethernet/netronome/nfp/bpf/fw.h | 1 + + drivers/net/ethernet/netronome/nfp/bpf/jit.c | 47 +++ + drivers/net/ethernet/netronome/nfp/bpf/main.c | 11 + + drivers/net/ethernet/netronome/nfp/bpf/main.h | 8 + + drivers/net/ethernet/netronome/nfp/bpf/verifier.c | 28 +- + drivers/net/ethernet/netronome/nfp/nfp_asm.h | 22 +- + include/linux/bpf.h | 2 +- + include/linux/btf.h | 2 + + include/net/addrconf.h | 14 + + include/net/ip6_fib.h | 21 +- + include/trace/events/fib6.h | 14 +- + include/uapi/linux/bpf.h | 92 ++++- + kernel/bpf/btf.c | 136 +++++- + kernel/bpf/syscall.c | 41 +- + kernel/bpf/verifier.c | 2 +- + net/core/filter.c | 276 ++++++++++++- + net/ipv6/addrconf_core.c | 33 +- + net/ipv6/af_inet6.c | 6 +- + net/ipv6/fib6_rules.c | 138 +++++-- + net/ipv6/ip6_fib.c | 21 +- + net/ipv6/route.c | 76 ++-- + net/xdp/xdp_umem.c | 2 +- + samples/bpf/Makefile | 41 +- + samples/bpf/bpf_load.c | 10 +- + samples/bpf/bpf_load.h | 4 +- + samples/bpf/trace_output_user.c | 6 +- + samples/bpf/xdp1_user.c | 31 +- + samples/bpf/xdp_adjust_tail_user.c | 36 +- + samples/bpf/xdp_fwd_kern.c | 115 ++++++ + samples/bpf/xdp_fwd_user.c | 136 ++++++ + samples/bpf/xdp_rxq_info_user.c | 46 ++- + tools/bpf/bpftool/.gitignore | 3 + + tools/bpf/bpftool/map_perf_ring.c | 83 +--- + tools/include/uapi/asm/bitsperlong.h | 18 + + tools/include/uapi/asm/errno.h | 18 + + tools/include/uapi/linux/bpf.h | 93 ++++- + tools/lib/bpf/Makefile | 2 +- + tools/lib/bpf/bpf.c | 10 + + tools/lib/bpf/bpf.h | 1 + + tools/lib/bpf/libbpf.c | 107 ++++- + tools/lib/bpf/libbpf.h | 61 +-- + tools/testing/selftests/bpf/.gitignore | 1 + + tools/testing/selftests/bpf/Makefile | 8 +- + tools/testing/selftests/bpf/bpf_helpers.h | 3 + + tools/testing/selftests/bpf/test_btf.c | 478 +++++++++++++++++----- + tools/testing/selftests/bpf/test_progs.c | 6 +- + tools/testing/selftests/bpf/trace_helpers.c | 87 ++-- + tools/testing/selftests/bpf/trace_helpers.h | 11 +- + 49 files changed, 1973 insertions(+), 450 deletions(-) + create mode 100644 samples/bpf/xdp_fwd_kern.c + create mode 100644 samples/bpf/xdp_fwd_user.c + create mode 100644 tools/bpf/bpftool/.gitignore + create mode 100644 tools/include/uapi/asm/bitsperlong.h + create mode 100644 tools/include/uapi/asm/errno.h +Merging ipsec-next/master (724e47a149f5 net-next/hinic: add pci device ids for 25ge and 100ge card) +$ git merge ipsec-next/master +Already up to date. +Merging netfilter-next/master (90278871d4b0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next) +$ git merge netfilter-next/master +Already up to date. +Merging nfc-next/master (4d63adfe12dd NFC: Add NFC_CMD_DEACTIVATE_TARGET support) +$ git merge nfc-next/master +Already up to date. +Merging ipvs-next/master (90278871d4b0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next) +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (4f9fb990013c mwifiex: increase TX threashold to avoid TX timeout during ED MAC test) +$ git merge wireless-drivers-next/master +Removing drivers/net/wireless/intel/iwlwifi/fw/nvm.c +Merge made by the 'recursive' strategy. + .../bindings/net/wireless/qcom,ath10k.txt | 31 + + drivers/net/wireless/ath/ath10k/Kconfig | 12 + + drivers/net/wireless/ath/ath10k/Makefile | 7 +- + drivers/net/wireless/ath/ath10k/ce.c | 269 +++- + drivers/net/wireless/ath/ath10k/ce.h | 24 +- + drivers/net/wireless/ath/ath10k/core.c | 183 ++- + drivers/net/wireless/ath/ath10k/core.h | 2 + + drivers/net/wireless/ath/ath10k/hif.h | 15 +- + drivers/net/wireless/ath/ath10k/htc.c | 6 + + drivers/net/wireless/ath/ath10k/htc.h | 4 + + drivers/net/wireless/ath/ath10k/htt.c | 4 +- + drivers/net/wireless/ath/ath10k/htt.h | 111 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 24 +- + drivers/net/wireless/ath/ath10k/htt_tx.c | 19 +- + drivers/net/wireless/ath/ath10k/hw.c | 9 +- + drivers/net/wireless/ath/ath10k/hw.h | 22 +- + drivers/net/wireless/ath/ath10k/mac.c | 26 +- + drivers/net/wireless/ath/ath10k/pci.c | 8 +- + drivers/net/wireless/ath/ath10k/sdio.c | 24 +- + drivers/net/wireless/ath/ath10k/snoc.c | 1414 ++++++++++++++++++++ + drivers/net/wireless/ath/ath10k/snoc.h | 95 ++ + drivers/net/wireless/ath/ath10k/txrx.c | 8 + + drivers/net/wireless/ath/ath10k/wmi-ops.h | 46 + + drivers/net/wireless/ath/ath10k/wmi-tlv.c | 63 + + drivers/net/wireless/ath/ath10k/wmi-tlv.h | 357 ++++- + drivers/net/wireless/ath/ath10k/wmi.c | 34 +- + drivers/net/wireless/ath/ath10k/wmi.h | 28 + + drivers/net/wireless/ath/ath10k/wow.c | 138 +- + drivers/net/wireless/ath/ath6kl/debug.c | 2 +- + drivers/net/wireless/ath/ath9k/dfs.c | 6 +- + drivers/net/wireless/ath/wcn36xx/dxe.c | 36 +- + drivers/net/wireless/ath/wcn36xx/dxe.h | 1 - + drivers/net/wireless/ath/wcn36xx/hal.h | 8 +- + drivers/net/wireless/ath/wcn36xx/main.c | 40 +- + drivers/net/wireless/ath/wcn36xx/smd.c | 33 +- + drivers/net/wireless/ath/wcn36xx/smd.h | 2 + + drivers/net/wireless/ath/wcn36xx/txrx.c | 15 +- + drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 7 +- + drivers/net/wireless/ath/wil6210/main.c | 3 +- + drivers/net/wireless/broadcom/b43legacy/dma.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 1 + + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 34 +- + .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 1 + + .../broadcom/brcm80211/brcmfmac/firmware.c | 2 +- + .../broadcom/brcm80211/brcmfmac/firmware.h | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.h | 6 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 7 + + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 40 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 2 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 2 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 9 +- + .../broadcom/brcm80211/include/brcm_hw_ids.h | 1 + + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 2 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.h | 2 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 2 +- + drivers/net/wireless/intel/iwlwifi/Makefile | 2 +- + drivers/net/wireless/intel/iwlwifi/cfg/1000.c | 8 +- + drivers/net/wireless/intel/iwlwifi/cfg/2000.c | 13 +- + drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 11 +- + drivers/net/wireless/intel/iwlwifi/cfg/5000.c | 8 +- + drivers/net/wireless/intel/iwlwifi/cfg/6000.c | 19 +- + drivers/net/wireless/intel/iwlwifi/cfg/7000.c | 12 +- + drivers/net/wireless/intel/iwlwifi/cfg/8000.c | 10 +- + drivers/net/wireless/intel/iwlwifi/cfg/9000.c | 6 +- + drivers/net/wireless/intel/iwlwifi/dvm/main.c | 8 +- + .../net/wireless/intel/iwlwifi/fw/api/datapath.h | 5 - + .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 42 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rs.h | 156 +-- + drivers/net/wireless/intel/iwlwifi/fw/api/txq.h | 2 + + drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 36 + + drivers/net/wireless/intel/iwlwifi/fw/debugfs.c | 1 + + drivers/net/wireless/intel/iwlwifi/fw/debugfs.h | 31 - + drivers/net/wireless/intel/iwlwifi/fw/file.h | 3 + + drivers/net/wireless/intel/iwlwifi/fw/img.h | 6 + + drivers/net/wireless/intel/iwlwifi/fw/nvm.c | 162 --- + drivers/net/wireless/intel/iwlwifi/fw/paging.c | 78 +- + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 1 - + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 92 +- + drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 28 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 14 + + .../net/wireless/intel/iwlwifi/iwl-eeprom-parse.c | 4 +- + .../net/wireless/intel/iwlwifi/iwl-eeprom-parse.h | 5 +- + .../net/wireless/intel/iwlwifi/iwl-eeprom-read.c | 8 +- + drivers/net/wireless/intel/iwlwifi/iwl-modparams.h | 2 + + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 353 ++++- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h | 56 +- + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 13 +- + drivers/net/wireless/intel/iwlwifi/mvm/coex.c | 37 + + drivers/net/wireless/intel/iwlwifi/mvm/constants.h | 7 + + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 22 +- + .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 2 + + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 25 + + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 10 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 33 + + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 101 +- + drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 208 +-- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 18 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 117 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 15 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.h | 3 +- + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 103 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 33 +- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 194 ++- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 28 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 7 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 56 +- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 438 +++++- + .../net/wireless/intel/iwlwifi/pcie/ctxt-info.c | 2 +- + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 8 +- + drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 3 +- + .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 15 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 139 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 55 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 52 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 7 +- + drivers/net/wireless/marvell/mwifiex/cmdevt.c | 1 - + drivers/net/wireless/marvell/mwifiex/ie.c | 1 + + drivers/net/wireless/marvell/mwifiex/main.c | 43 +- + drivers/net/wireless/marvell/mwifiex/main.h | 7 +- + drivers/net/wireless/marvell/mwifiex/pcie.c | 3 +- + drivers/net/wireless/mediatek/mt76/agg-rx.c | 16 +- + drivers/net/wireless/mediatek/mt76/mac80211.c | 13 +- + drivers/net/wireless/mediatek/mt76/mt76.h | 1 + + drivers/net/wireless/mediatek/mt76/mt76x2.h | 3 +- + drivers/net/wireless/mediatek/mt76/mt76x2_dma.h | 7 +- + drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.c | 6 +- + drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.h | 6 + + drivers/net/wireless/mediatek/mt76/mt76x2_init.c | 3 +- + drivers/net/wireless/mediatek/mt76/mt76x2_mac.c | 1 - + drivers/net/wireless/mediatek/mt76/mt76x2_mac.h | 1 - + drivers/net/wireless/mediatek/mt76/mt76x2_main.c | 1 + + drivers/net/wireless/mediatek/mt76/mt76x2_phy.c | 84 +- + drivers/net/wireless/mediatek/mt76/tx.c | 6 + + drivers/net/wireless/mediatek/mt7601u/mac.c | 4 +- + drivers/net/wireless/mediatek/mt7601u/main.c | 6 + + drivers/net/wireless/mediatek/mt7601u/mt7601u.h | 5 +- + drivers/net/wireless/mediatek/mt7601u/phy.c | 11 +- + drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 9 + + drivers/net/wireless/quantenna/qtnfmac/core.c | 2 +- + drivers/net/wireless/quantenna/qtnfmac/event.c | 11 + + .../net/wireless/quantenna/qtnfmac/pearl/pcie.c | 4 + + drivers/net/wireless/quantenna/qtnfmac/qlink.h | 7 +- + drivers/net/wireless/ralink/rt2x00/rt2800.h | 17 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 20 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.h | 5 +- + drivers/net/wireless/ralink/rt2x00/rt2800mmio.c | 1 + + drivers/net/wireless/ralink/rt2x00/rt2800pci.c | 6 +- + drivers/net/wireless/ralink/rt2x00/rt2800soc.c | 6 +- + drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 6 +- + drivers/net/wireless/ralink/rt2x00/rt2x00.h | 4 - + drivers/net/wireless/ralink/rt2x00/rt2x00mac.c | 3 +- + drivers/net/wireless/ralink/rt2x00/rt2x00queue.c | 2 + + .../realtek/rtlwifi/btcoexist/halbtc8192e2ant.c | 2 +- + .../realtek/rtlwifi/btcoexist/halbtc8723b2ant.c | 2 +- + .../realtek/rtlwifi/btcoexist/halbtc8821a1ant.c | 19 +- + .../realtek/rtlwifi/btcoexist/halbtc8821a2ant.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.c | 4 +- + drivers/net/wireless/realtek/rtlwifi/wifi.h | 5 - + drivers/net/wireless/rsi/rsi_91x_core.c | 31 +- + drivers/net/wireless/rsi/rsi_91x_hal.c | 108 +- + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 63 +- + drivers/net/wireless/rsi/rsi_91x_mgmt.c | 34 +- + drivers/net/wireless/rsi/rsi_91x_sdio.c | 27 +- + drivers/net/wireless/rsi/rsi_91x_usb.c | 8 + + drivers/net/wireless/rsi/rsi_boot_params.h | 3 +- + drivers/net/wireless/rsi/rsi_hal.h | 3 + + drivers/net/wireless/rsi/rsi_main.h | 7 +- + drivers/net/wireless/rsi/rsi_mgmt.h | 19 +- + drivers/net/wireless/rsi/rsi_sdio.h | 2 +- + drivers/net/wireless/rsi/rsi_usb.h | 1 + + drivers/net/wireless/st/cw1200/txrx.c | 2 +- + drivers/net/wireless/ti/wlcore/sdio.c | 27 +- + include/linux/mmc/sdio_ids.h | 1 + + 173 files changed, 5468 insertions(+), 1418 deletions(-) + create mode 100644 drivers/net/wireless/ath/ath10k/snoc.c + create mode 100644 drivers/net/wireless/ath/ath10k/snoc.h + delete mode 100644 drivers/net/wireless/intel/iwlwifi/fw/nvm.c +Merging bluetooth/master (7f98779fd9b3 Bluetooth: Add a new 13d3:3496 QCA_ROME device) +$ git merge bluetooth/master +Auto-merging drivers/bluetooth/btusb.c +Auto-merging arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi +Resolved 'arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c527f1c61d9c] Merge remote-tracking branch 'bluetooth/master' +$ git diff -M --stat --summary HEAD^.. + drivers/bluetooth/Kconfig | 1 + + drivers/bluetooth/btbcm.c | 201 ++++++++++++--------------------------- + drivers/bluetooth/btbcm.h | 5 +- + drivers/bluetooth/btqca.c | 104 ++++++++++---------- + drivers/bluetooth/btqca.h | 11 ++- + drivers/bluetooth/btqcomsmd.c | 10 ++ + drivers/bluetooth/btusb.c | 2 + + drivers/bluetooth/hci_bcm.c | 35 +++---- + drivers/bluetooth/hci_ldisc.c | 2 + + drivers/bluetooth/hci_qca.c | 116 +++++++++++++++++++++- + include/net/bluetooth/hci_core.h | 2 + + net/bluetooth/hci_core.c | 31 ++++++ + net/bluetooth/hci_event.c | 12 ++- + net/bluetooth/hci_request.c | 30 ++---- + 14 files changed, 321 insertions(+), 241 deletions(-) +Merging mac80211-next/master (57c6cb81717f mac80211: ethtool: avoid 32 bit multiplication overflow) +$ git merge mac80211-next/master +Auto-merging net/wireless/reg.c +Auto-merging net/wireless/nl80211.c +Auto-merging net/mac80211/tx.c +Auto-merging include/uapi/linux/nl80211.h +Auto-merging include/net/mac80211.h +Auto-merging drivers/net/wireless/mac80211_hwsim.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/mac80211_hwsim.c | 1 + + include/net/cfg80211.h | 53 +++++++ + include/net/mac80211.h | 13 ++ + include/uapi/linux/nl80211.h | 93 ++++++++++++ + net/mac80211/cfg.c | 99 +++++++++++++ + net/mac80211/ethtool.c | 37 +++-- + net/mac80211/ieee80211_i.h | 3 + + net/mac80211/main.c | 3 + + net/mac80211/rx.c | 40 +++--- + net/mac80211/sta_info.c | 24 +++- + net/mac80211/sta_info.h | 2 + + net/mac80211/status.c | 2 + + net/mac80211/tx.c | 45 ++++++ + net/mac80211/util.c | 6 +- + net/wireless/nl80211.c | 262 ++++++++++++++++++++++++++++++---- + net/wireless/rdev-ops.h | 12 ++ + net/wireless/reg.c | 37 ++++- + net/wireless/trace.h | 14 ++ + net/wireless/wext-compat.c | 23 +-- + 19 files changed, 683 insertions(+), 86 deletions(-) +Merging gfs2/for-next (9a38662ba4e2 gfs2: Remove sdp->sd_jheightsize) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/bmap.c | 14 +------------- + fs/gfs2/incore.h | 2 -- + fs/gfs2/ops_fstype.c | 19 ------------------- + 3 files changed, 1 insertion(+), 34 deletions(-) +Merging mtd/mtd/next (5ac67ce36cfe mtd: move code adding (registering) partitions to the parse_mtd_partitions()) +$ git merge mtd/mtd/next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-mtd | 8 ++++++ + drivers/mtd/chips/cfi_probe.c | 42 +++++++++++++++++++++++++++++ + drivers/mtd/devices/docg3.c | 3 +-- + drivers/mtd/devices/mtd_dataflash.c | 2 +- + drivers/mtd/inftlmount.c | 23 +++++++++++----- + drivers/mtd/maps/pismo.c | 1 - + drivers/mtd/mtdcore.c | 24 ++++++++++------- + drivers/mtd/mtdcore.h | 1 - + drivers/mtd/mtdpart.c | 44 +++++++++++-------------------- + drivers/mtd/nand/raw/Kconfig | 8 ++---- + drivers/mtd/nftlmount.c | 23 +++++++++++----- + drivers/mtd/spi-nor/Kconfig | 2 +- + 12 files changed, 117 insertions(+), 64 deletions(-) +Merging nand/nand/next (a676688032e8 mtd: rawnand.h: use nested union kernel-doc markups) +$ git merge nand/nand/next +Auto-merging drivers/mtd/nand/raw/nand_base.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/gpmi-nand.txt | 5 + + Documentation/devicetree/bindings/mtd/mtk-nand.txt | 24 ++- + .../devicetree/bindings/mtd/sunxi-nand.txt | 2 - + MAINTAINERS | 8 + + drivers/mtd/nand/onenand/samsung.c | 6 +- + drivers/mtd/nand/raw/davinci_nand.c | 25 +-- + drivers/mtd/nand/raw/diskonchip.c | 4 +- + drivers/mtd/nand/raw/fsl_elbc_nand.c | 13 +- + drivers/mtd/nand/raw/fsl_ifc_nand.c | 29 ++-- + drivers/mtd/nand/raw/fsmc_nand.c | 27 +-- + drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c | 54 +++--- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 188 +++++++-------------- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h | 25 +-- + drivers/mtd/nand/raw/hisi504_nand.c | 35 ++-- + drivers/mtd/nand/raw/lpc32xx_mlc.c | 38 +++-- + drivers/mtd/nand/raw/lpc32xx_slc.c | 26 +-- + drivers/mtd/nand/raw/mtk_ecc.c | 7 +- + drivers/mtd/nand/raw/mtk_nand.c | 10 +- + drivers/mtd/nand/raw/nand_base.c | 10 +- + drivers/mtd/nand/raw/sunxi_nand.c | 91 ++-------- + include/linux/mtd/rawnand.h | 35 +++- + 21 files changed, 269 insertions(+), 393 deletions(-) +Merging spi-nor/spi-nor/next (f134fbbb4ff8 mtd: spi-nor: clear Winbond Extended Address Reg on switch to 3-byte addressing.) +$ git merge spi-nor/spi-nor/next +Auto-merging drivers/mtd/spi-nor/cadence-quadspi.c +Merge made by the 'recursive' strategy. + drivers/mtd/spi-nor/cadence-quadspi.c | 96 ++++++++++++++++++++++++++++++++++- + drivers/mtd/spi-nor/hisi-sfc.c | 12 ++--- + drivers/mtd/spi-nor/spi-nor.c | 21 ++++++++ + include/linux/mtd/spi-nor.h | 2 + + 4 files changed, 123 insertions(+), 8 deletions(-) +Merging crypto/master (158b52ff1436 crypto: ghash-clmulni - fix spelling mistake: "acclerated" -> "accelerated") +$ git merge crypto/master +Merge made by the 'recursive' strategy. + arch/arm64/crypto/Kconfig | 6 + + arch/arm64/crypto/Makefile | 3 + + arch/arm64/crypto/sm4-ce-core.S | 36 +++ + arch/arm64/crypto/sm4-ce-glue.c | 73 ++++++ + arch/x86/crypto/ghash-clmulni-intel_glue.c | 2 +- + crypto/Kconfig | 9 + + crypto/Makefile | 1 + + crypto/algapi.c | 10 + + crypto/authenc.c | 1 + + crypto/authencesn.c | 1 + + crypto/cfb.c | 7 +- + crypto/cipher.c | 3 +- + crypto/ctr.c | 4 +- + crypto/cts.c | 5 +- + crypto/ecc.c | 66 +++--- + crypto/ecc.h | 4 +- + crypto/ecdh.c | 4 +- + crypto/pcbc.c | 5 +- + crypto/rsa.c | 1 - + crypto/sm4_generic.c | 10 +- + crypto/tcrypt.c | 118 ++++++---- + crypto/testmgr.c | 103 +++++++-- + crypto/testmgr.h | 71 ++++++ + crypto/zstd.c | 265 ++++++++++++++++++++++ + drivers/char/hw_random/Kconfig | 1 + + drivers/char/hw_random/stm32-rng.c | 9 +- + drivers/char/hw_random/via-rng.c | 2 +- + drivers/crypto/Kconfig | 15 +- + drivers/crypto/amcc/crypto4xx_alg.c | 231 +++++++++++++------ + drivers/crypto/amcc/crypto4xx_core.c | 317 ++++++++++++++------------ + drivers/crypto/amcc/crypto4xx_core.h | 35 ++- + drivers/crypto/caam/caamalg.c | 231 +++++++++---------- + drivers/crypto/caam/caamalg_qi.c | 227 ++++++++++--------- + drivers/crypto/caam/caampkc.c | 71 +++++- + drivers/crypto/caam/caampkc.h | 8 + + drivers/crypto/caam/ctrl.c | 57 ++++- + drivers/crypto/caam/ctrl.h | 2 - + drivers/crypto/caam/regs.h | 6 + + drivers/crypto/cavium/zip/common.h | 21 ++ + drivers/crypto/cavium/zip/zip_crypto.c | 22 +- + drivers/crypto/cavium/zip/zip_deflate.c | 4 +- + drivers/crypto/cavium/zip/zip_device.c | 4 +- + drivers/crypto/cavium/zip/zip_inflate.c | 4 +- + drivers/crypto/cavium/zip/zip_main.c | 24 +- + drivers/crypto/cavium/zip/zip_main.h | 1 - + drivers/crypto/cavium/zip/zip_regs.h | 42 ++-- + drivers/crypto/ccree/cc_cipher.c | 350 +++++++++++++++++++++++++---- + drivers/crypto/ccree/cc_cipher.h | 30 +-- + drivers/crypto/ccree/cc_driver.c | 2 +- + drivers/crypto/chelsio/chtls/chtls_cm.c | 16 ++ + drivers/crypto/chelsio/chtls/chtls_main.c | 3 +- + drivers/crypto/exynos-rng.c | 6 +- + drivers/crypto/omap-sham.c | 2 +- + drivers/crypto/picoxcell_crypto.c | 6 +- + include/crypto/algapi.h | 8 + + include/crypto/sm4.h | 3 + + 56 files changed, 1836 insertions(+), 732 deletions(-) + create mode 100644 arch/arm64/crypto/sm4-ce-core.S + create mode 100644 arch/arm64/crypto/sm4-ce-glue.c + create mode 100644 crypto/zstd.c +Merging drm/drm-next (8eb008c80841 Merge tag 'drm-intel-next-2018-04-13' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) +$ git merge drm/drm-next +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +Auto-merging drivers/gpu/drm/vc4/vc4_plane.c +Auto-merging drivers/gpu/drm/vc4/vc4_crtc.c +Auto-merging drivers/gpu/drm/i915/intel_dp.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/drm_atomic.c +Auto-merging drivers/gpu/drm/bridge/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/display/bridge/adi,adv7511.txt | 18 +- + .../bindings/display/bridge/cdns,dsi.txt | 133 ++ + .../bindings/display/bridge/thine,thc63lvd1024.txt | 60 + + .../bindings/display/sunxi/sun6i-dsi.txt | 93 ++ + Documentation/gpu/drivers.rst | 1 + + Documentation/gpu/i915.rst | 141 +- + Documentation/gpu/kms-properties.csv | 1 - + Documentation/gpu/todo.rst | 18 + + Documentation/gpu/xen-front.rst | 31 + + MAINTAINERS | 9 + + drivers/gpu/drm/Kconfig | 2 + + drivers/gpu/drm/Makefile | 1 + + drivers/gpu/drm/ast/ast_mode.c | 2 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 13 - + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 89 +- + drivers/gpu/drm/bochs/bochs_kms.c | 2 +- + drivers/gpu/drm/bridge/Kconfig | 16 + + drivers/gpu/drm/bridge/Makefile | 2 + + drivers/gpu/drm/bridge/adv7511/adv7511.h | 6 + + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 44 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 331 ++-- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 5 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 236 +-- + drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h | 7 + + drivers/gpu/drm/bridge/cdns-dsi.c | 1623 ++++++++++++++++++++ + .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 1 - + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 18 +- + drivers/gpu/drm/bridge/tc358767.c | 2 +- + drivers/gpu/drm/bridge/thc63lvd1024.c | 206 +++ + drivers/gpu/drm/drm_atomic.c | 12 + + drivers/gpu/drm/drm_atomic_helper.c | 107 +- + drivers/gpu/drm/drm_blend.c | 39 + + drivers/gpu/drm/drm_crtc.c | 45 +- + drivers/gpu/drm/drm_crtc_internal.h | 2 + + drivers/gpu/drm/drm_dp_mst_topology.c | 9 +- + drivers/gpu/drm/drm_drv.c | 54 +- + drivers/gpu/drm/drm_edid.c | 2 - + drivers/gpu/drm/drm_framebuffer.c | 34 +- + drivers/gpu/drm/drm_gem.c | 9 +- + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 19 + + drivers/gpu/drm/drm_lease.c | 2 +- + drivers/gpu/drm/drm_panel_orientation_quirks.c | 22 +- + drivers/gpu/drm/drm_plane.c | 54 +- + drivers/gpu/drm/drm_prime.c | 13 + + drivers/gpu/drm/drm_scdc_helper.c | 10 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 4 +- + drivers/gpu/drm/exynos/exynos_dp.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 20 - + drivers/gpu/drm/exynos/exynos_drm_drv.h | 1 - + drivers/gpu/drm/exynos/exynos_drm_fb.c | 4 +- + drivers/gpu/drm/gma500/cdv_intel_crt.c | 2 +- + drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +- + drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 2 +- + drivers/gpu/drm/gma500/cdv_intel_lvds.c | 2 +- + drivers/gpu/drm/gma500/mdfld_dsi_output.c | 2 +- + drivers/gpu/drm/gma500/oaktrail_hdmi.c | 2 +- + drivers/gpu/drm/gma500/psb_intel_drv.h | 2 +- + drivers/gpu/drm/gma500/psb_intel_lvds.c | 2 +- + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 2 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 2 +- + drivers/gpu/drm/i915/Kconfig.debug | 13 + + drivers/gpu/drm/i915/Makefile | 11 +- + drivers/gpu/drm/i915/gvt/debugfs.c | 13 +- + drivers/gpu/drm/i915/i915_debugfs.c | 318 ++-- + drivers/gpu/drm/i915/i915_drv.c | 66 +- + drivers/gpu/drm/i915/i915_drv.h | 389 +---- + drivers/gpu/drm/i915/i915_gem.c | 237 ++- + drivers/gpu/drm/i915/i915_gem.h | 7 + + drivers/gpu/drm/i915/i915_gem_batch_pool.c | 30 +- + drivers/gpu/drm/i915/i915_gem_batch_pool.h | 29 +- + drivers/gpu/drm/i915/i915_gem_context.c | 11 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 29 + + drivers/gpu/drm/i915/i915_gem_stolen.c | 163 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 1 + + drivers/gpu/drm/i915/i915_gpu_error.h | 362 +++++ + drivers/gpu/drm/i915/i915_irq.c | 366 +++-- + drivers/gpu/drm/i915/i915_oa_icl.c | 118 ++ + drivers/gpu/drm/i915/i915_oa_icl.h | 34 + + drivers/gpu/drm/i915/i915_params.h | 2 +- + drivers/gpu/drm/i915/i915_pci.c | 1 + + drivers/gpu/drm/i915/i915_perf.c | 69 +- + drivers/gpu/drm/i915/i915_pmu.c | 27 +- + drivers/gpu/drm/i915/i915_pmu.h | 30 +- + drivers/gpu/drm/i915/i915_reg.h | 644 ++++---- + drivers/gpu/drm/i915/i915_request.c | 125 +- + drivers/gpu/drm/i915/i915_utils.h | 4 +- + drivers/gpu/drm/i915/intel_atomic.c | 19 +- + drivers/gpu/drm/i915/intel_bios.c | 17 +- + drivers/gpu/drm/i915/intel_breadcrumbs.c | 21 +- + drivers/gpu/drm/i915/intel_crt.c | 8 +- + drivers/gpu/drm/i915/intel_ddi.c | 154 +- + drivers/gpu/drm/i915/intel_device_info.c | 169 +- + drivers/gpu/drm/i915/intel_device_info.h | 4 +- + drivers/gpu/drm/i915/intel_display.c | 255 ++- + drivers/gpu/drm/i915/intel_dp.c | 21 +- + drivers/gpu/drm/i915/intel_dp_mst.c | 8 +- + drivers/gpu/drm/i915/intel_dpio_phy.c | 11 +- + drivers/gpu/drm/i915/intel_dpll_mgr.c | 253 +-- + drivers/gpu/drm/i915/intel_dpll_mgr.h | 56 +- + drivers/gpu/drm/i915/intel_drv.h | 58 +- + drivers/gpu/drm/i915/intel_engine_cs.c | 796 ++-------- + drivers/gpu/drm/i915/intel_fbc.c | 28 + + drivers/gpu/drm/i915/intel_fbdev.c | 7 +- + drivers/gpu/drm/i915/intel_frontbuffer.c | 2 +- + drivers/gpu/drm/i915/intel_gpu_commands.h | 274 ++++ + drivers/gpu/drm/i915/intel_guc.c | 211 ++- + drivers/gpu/drm/i915/intel_guc.h | 82 +- + drivers/gpu/drm/i915/intel_guc_ads.c | 8 +- + drivers/gpu/drm/i915/intel_guc_ct.c | 545 ++++++- + drivers/gpu/drm/i915/intel_guc_ct.h | 18 +- + drivers/gpu/drm/i915/intel_guc_fw.c | 7 +- + drivers/gpu/drm/i915/intel_guc_fwif.h | 157 +- + drivers/gpu/drm/i915/intel_guc_log.c | 544 +++---- + drivers/gpu/drm/i915/intel_guc_log.h | 59 +- + drivers/gpu/drm/i915/intel_guc_reg.h | 14 +- + drivers/gpu/drm/i915/intel_guc_submission.c | 47 +- + drivers/gpu/drm/i915/intel_hangcheck.c | 13 +- + drivers/gpu/drm/i915/intel_hdcp.c | 185 ++- + drivers/gpu/drm/i915/intel_hdmi.c | 40 +- + drivers/gpu/drm/i915/intel_hotplug.c | 3 + + drivers/gpu/drm/i915/intel_huc.c | 30 +- + drivers/gpu/drm/i915/intel_huc.h | 7 + + drivers/gpu/drm/i915/intel_huc_fw.c | 8 +- + drivers/gpu/drm/i915/intel_lrc.c | 254 ++- + drivers/gpu/drm/i915/intel_overlay.c | 1 + + drivers/gpu/drm/i915/intel_pipe_crc.c | 53 +- + drivers/gpu/drm/i915/intel_pm.c | 474 +++--- + drivers/gpu/drm/i915/intel_psr.c | 327 ++-- + drivers/gpu/drm/i915/intel_ringbuffer.c | 22 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 43 +- + drivers/gpu/drm/i915/intel_sprite.c | 7 +- + drivers/gpu/drm/i915/intel_uc.c | 132 +- + drivers/gpu/drm/i915/intel_uc.h | 5 +- + drivers/gpu/drm/i915/intel_uc_fw.c | 13 +- + drivers/gpu/drm/i915/intel_uc_fw.h | 22 + + drivers/gpu/drm/i915/intel_uncore.c | 168 +- + drivers/gpu/drm/i915/intel_uncore.h | 1 + + drivers/gpu/drm/i915/intel_wopcm.c | 275 ++++ + drivers/gpu/drm/i915/intel_wopcm.h | 31 + + drivers/gpu/drm/i915/intel_workarounds.c | 856 +++++++++++ + drivers/gpu/drm/i915/intel_workarounds.h | 17 + + .../gpu/drm/i915/selftests/i915_live_selftests.h | 1 + + .../gpu/drm/i915/selftests/i915_mock_selftests.h | 1 + + drivers/gpu/drm/i915/selftests/intel_engine_cs.c | 58 + + drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 314 ++-- + drivers/gpu/drm/i915/selftests/intel_lrc.c | 507 ++++++ + drivers/gpu/drm/mgag200/mgag200_mode.c | 2 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 11 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c | 2 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 3 + + drivers/gpu/drm/omapdrm/omap_plane.c | 2 +- + drivers/gpu/drm/pl111/pl111_display.c | 11 +- + drivers/gpu/drm/qxl/qxl_display.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.h | 1 - + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 16 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 15 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.h | 2 - + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 42 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.h | 3 - + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 37 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 1 + + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 61 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 4 +- + drivers/gpu/drm/rockchip/rockchip_drm_psr.c | 158 +- + drivers/gpu/drm/rockchip/rockchip_drm_psr.h | 7 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 15 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 1 + + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 1 + + drivers/gpu/drm/sti/Kconfig | 3 +- + drivers/gpu/drm/sti/sti_drv.c | 24 +- + drivers/gpu/drm/sti/sti_plane.c | 9 +- + drivers/gpu/drm/stm/drv.c | 2 - + drivers/gpu/drm/stm/ltdc.c | 35 +- + drivers/gpu/drm/stm/ltdc.h | 10 +- + drivers/gpu/drm/sun4i/Kconfig | 10 + + drivers/gpu/drm/sun4i/Makefile | 4 + + drivers/gpu/drm/sun4i/sun4i_backend.c | 16 +- + drivers/gpu/drm/sun4i/sun4i_backend.h | 3 + + drivers/gpu/drm/sun4i/sun4i_layer.c | 2 + + drivers/gpu/drm/sun4i/sun4i_tcon.c | 86 +- + drivers/gpu/drm/sun4i/sun4i_tcon.h | 46 + + drivers/gpu/drm/sun4i/sun6i_mipi_dphy.c | 292 ++++ + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 1107 +++++++++++++ + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h | 63 + + drivers/gpu/drm/tegra/drm.c | 21 +- + drivers/gpu/drm/tinydrm/core/tinydrm-core.c | 2 +- + drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c | 30 + + drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c | 22 +- + drivers/gpu/drm/tinydrm/ili9225.c | 28 +- + drivers/gpu/drm/tinydrm/mi0283qt.c | 8 +- + drivers/gpu/drm/tinydrm/mipi-dbi.c | 30 +- + drivers/gpu/drm/tinydrm/repaper.c | 33 +- + drivers/gpu/drm/tinydrm/st7586.c | 28 +- + drivers/gpu/drm/tinydrm/st7735r.c | 7 +- + drivers/gpu/drm/tve200/tve200_display.c | 11 +- + drivers/gpu/drm/udl/udl_connector.c | 2 +- + drivers/gpu/drm/udl/udl_dmabuf.c | 5 +- + drivers/gpu/drm/udl/udl_drv.c | 2 +- + drivers/gpu/drm/udl/udl_drv.h | 2 + + drivers/gpu/drm/udl/udl_gem.c | 5 +- + drivers/gpu/drm/udl/udl_main.c | 2 + + drivers/gpu/drm/vc4/vc4_crtc.c | 75 +- + drivers/gpu/drm/vc4/vc4_drv.c | 6 +- + drivers/gpu/drm/vc4/vc4_drv.h | 37 + + drivers/gpu/drm/vc4/vc4_hvs.c | 4 + + drivers/gpu/drm/vc4/vc4_kms.c | 224 ++- + drivers/gpu/drm/vc4/vc4_plane.c | 152 +- + drivers/gpu/drm/vc4/vc4_regs.h | 97 ++ + drivers/gpu/drm/virtio/virtgpu_display.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 35 - + drivers/gpu/drm/xen/Kconfig | 17 + + drivers/gpu/drm/xen/Makefile | 11 + + drivers/gpu/drm/xen/xen_drm_front.c | 840 ++++++++++ + drivers/gpu/drm/xen/xen_drm_front.h | 158 ++ + drivers/gpu/drm/xen/xen_drm_front_cfg.c | 77 + + drivers/gpu/drm/xen/xen_drm_front_cfg.h | 37 + + drivers/gpu/drm/xen/xen_drm_front_conn.c | 115 ++ + drivers/gpu/drm/xen/xen_drm_front_conn.h | 27 + + drivers/gpu/drm/xen/xen_drm_front_evtchnl.c | 387 +++++ + drivers/gpu/drm/xen/xen_drm_front_evtchnl.h | 81 + + drivers/gpu/drm/xen/xen_drm_front_gem.c | 308 ++++ + drivers/gpu/drm/xen/xen_drm_front_gem.h | 40 + + drivers/gpu/drm/xen/xen_drm_front_kms.c | 366 +++++ + drivers/gpu/drm/xen/xen_drm_front_kms.h | 26 + + drivers/gpu/drm/xen/xen_drm_front_shbuf.c | 414 +++++ + drivers/gpu/drm/xen/xen_drm_front_shbuf.h | 64 + + drivers/gpu/drm/zte/zx_plane.c | 2 +- + drivers/gpu/drm/zte/zx_vou.c | 5 +- + drivers/gpu/drm/zte/zx_vou.h | 3 +- + drivers/staging/vboxvideo/vbox_drv.c | 2 +- + include/drm/bridge/analogix_dp.h | 3 +- + include/drm/drmP.h | 28 +- + include/drm/drm_blend.h | 3 + + include/drm/drm_device.h | 9 +- + include/drm/drm_dp_helper.h | 10 + + include/drm/drm_drv.h | 15 +- + include/drm/drm_edid.h | 2 - + include/drm/drm_gem_framebuffer_helper.h | 3 + + include/drm/drm_legacy.h | 4 +- + include/drm/drm_mode_config.h | 8 + + include/drm/drm_modeset_helper_vtables.h | 5 +- + include/drm/drm_plane.h | 21 +- + include/drm/drm_property.h | 26 - + include/drm/drm_simple_kms_helper.h | 6 +- + include/drm/tinydrm/mipi-dbi.h | 4 +- + include/drm/tinydrm/tinydrm-helpers.h | 5 + + include/drm/tinydrm/tinydrm.h | 8 +- + scripts/coccinelle/api/drm-get-put.cocci | 10 - + 250 files changed, 15745 insertions(+), 4807 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/cdns,dsi.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/thine,thc63lvd1024.txt + create mode 100644 Documentation/devicetree/bindings/display/sunxi/sun6i-dsi.txt + create mode 100644 Documentation/gpu/xen-front.rst + create mode 100644 drivers/gpu/drm/bridge/cdns-dsi.c + create mode 100644 drivers/gpu/drm/bridge/thc63lvd1024.c + create mode 100644 drivers/gpu/drm/i915/i915_gpu_error.h + create mode 100644 drivers/gpu/drm/i915/i915_oa_icl.c + create mode 100644 drivers/gpu/drm/i915/i915_oa_icl.h + create mode 100644 drivers/gpu/drm/i915/intel_gpu_commands.h + create mode 100644 drivers/gpu/drm/i915/intel_wopcm.c + create mode 100644 drivers/gpu/drm/i915/intel_wopcm.h + create mode 100644 drivers/gpu/drm/i915/intel_workarounds.c + create mode 100644 drivers/gpu/drm/i915/intel_workarounds.h + create mode 100644 drivers/gpu/drm/i915/selftests/intel_engine_cs.c + create mode 100644 drivers/gpu/drm/i915/selftests/intel_lrc.c + create mode 100644 drivers/gpu/drm/sun4i/sun6i_mipi_dphy.c + create mode 100644 drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c + create mode 100644 drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h + create mode 100644 drivers/gpu/drm/xen/Kconfig + create mode 100644 drivers/gpu/drm/xen/Makefile + create mode 100644 drivers/gpu/drm/xen/xen_drm_front.c + create mode 100644 drivers/gpu/drm/xen/xen_drm_front.h + create mode 100644 drivers/gpu/drm/xen/xen_drm_front_cfg.c + create mode 100644 drivers/gpu/drm/xen/xen_drm_front_cfg.h + create mode 100644 drivers/gpu/drm/xen/xen_drm_front_conn.c + create mode 100644 drivers/gpu/drm/xen/xen_drm_front_conn.h + create mode 100644 drivers/gpu/drm/xen/xen_drm_front_evtchnl.c + create mode 100644 drivers/gpu/drm/xen/xen_drm_front_evtchnl.h + create mode 100644 drivers/gpu/drm/xen/xen_drm_front_gem.c + create mode 100644 drivers/gpu/drm/xen/xen_drm_front_gem.h + create mode 100644 drivers/gpu/drm/xen/xen_drm_front_kms.c + create mode 100644 drivers/gpu/drm/xen/xen_drm_front_kms.h + create mode 100644 drivers/gpu/drm/xen/xen_drm_front_shbuf.c + create mode 100644 drivers/gpu/drm/xen/xen_drm_front_shbuf.h +$ git am -3 ../patches/0001-drm-xen-front-merge-fix-for-drivers-remove-force-dma.patch +Applying: drm/xen-front: merge fix for "drivers: remove force dma flag from buses" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/xen/xen_drm_front.c +$ git add -A . +$ git commit -v -a --amend +[master 9d77df326c00] Merge remote-tracking branch 'drm/drm-next' + Date: Fri May 11 11:27:57 2018 +1000 +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 (2bdd045e3a30 drm/i915/psr: Check if VBT says PSR can be enabled.) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/selftests/i915_timeline.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_dp.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_dp.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/intel_csr.c +Auto-merging drivers/gpu/drm/i915/intel_bios.c +Auto-merging drivers/gpu/drm/i915/i915_timeline.h +Removing drivers/gpu/drm/i915/i915_gem_timeline.c +Auto-merging drivers/gpu/drm/drm_atomic.c +Resolved 'drivers/gpu/drm/i915/intel_dp.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 928667bba11a] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/drm_atomic.c | 10 +- + drivers/gpu/drm/i915/Makefile | 9 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 55 +- + drivers/gpu/drm/i915/gvt/debugfs.c | 67 +++ + drivers/gpu/drm/i915/gvt/gvt.h | 1 + + drivers/gpu/drm/i915/gvt/mmio_context.c | 2 +- + drivers/gpu/drm/i915/gvt/sched_policy.c | 31 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 88 +-- + drivers/gpu/drm/i915/gvt/scheduler.h | 1 + + drivers/gpu/drm/i915/gvt/trace.h | 24 +- + drivers/gpu/drm/i915/i915_debugfs.c | 248 ++++---- + drivers/gpu/drm/i915/i915_drv.c | 15 +- + drivers/gpu/drm/i915/i915_drv.h | 26 +- + drivers/gpu/drm/i915/i915_gem.c | 161 +++-- + drivers/gpu/drm/i915/i915_gem.h | 6 + + drivers/gpu/drm/i915/i915_gem_context.c | 51 +- + drivers/gpu/drm/i915/i915_gem_context.h | 43 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 3 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 25 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 4 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 15 +- + drivers/gpu/drm/i915/i915_gem_timeline.c | 154 ----- + drivers/gpu/drm/i915/i915_gem_userptr.c | 3 + + drivers/gpu/drm/i915/i915_gpu_error.c | 65 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 8 +- + drivers/gpu/drm/i915/i915_irq.c | 50 +- + drivers/gpu/drm/i915/i915_params.c | 3 + + drivers/gpu/drm/i915/i915_params.h | 1 + + drivers/gpu/drm/i915/i915_perf.c | 19 +- + drivers/gpu/drm/i915/i915_reg.h | 190 +++++- + drivers/gpu/drm/i915/i915_request.c | 339 ++++++----- + drivers/gpu/drm/i915/i915_request.h | 49 +- + drivers/gpu/drm/i915/i915_scheduler.h | 72 +++ + drivers/gpu/drm/i915/i915_timeline.c | 105 ++++ + .../i915/{i915_gem_timeline.h => i915_timeline.h} | 71 +-- + drivers/gpu/drm/i915/i915_trace.h | 129 ++-- + drivers/gpu/drm/i915/i915_utils.h | 6 + + drivers/gpu/drm/i915/i915_vma.c | 73 ++- + drivers/gpu/drm/i915/i915_vma.h | 6 + + drivers/gpu/drm/i915/intel_bios.c | 1 + + drivers/gpu/drm/i915/intel_breadcrumbs.c | 31 +- + drivers/gpu/drm/i915/intel_csr.c | 9 +- + drivers/gpu/drm/i915/intel_ddi.c | 297 +++++++++- + drivers/gpu/drm/i915/intel_device_info.c | 2 +- + drivers/gpu/drm/i915/intel_display.c | 95 ++- + drivers/gpu/drm/i915/intel_display.h | 4 + + drivers/gpu/drm/i915/intel_dp.c | 277 +++++---- + drivers/gpu/drm/i915/intel_dp_link_training.c | 5 + + drivers/gpu/drm/i915/intel_dpll_mgr.c | 656 ++++++++++++++++++++- + drivers/gpu/drm/i915/intel_dpll_mgr.h | 41 ++ + drivers/gpu/drm/i915/intel_drv.h | 23 +- + drivers/gpu/drm/i915/intel_dsi_vbt.c | 34 +- + drivers/gpu/drm/i915/intel_engine_cs.c | 138 +++-- + drivers/gpu/drm/i915/intel_guc.c | 24 - + drivers/gpu/drm/i915/intel_guc_ads.c | 3 +- + drivers/gpu/drm/i915/intel_guc_fwif.h | 5 - + drivers/gpu/drm/i915/intel_guc_submission.c | 69 ++- + drivers/gpu/drm/i915/intel_hangcheck.c | 3 +- + drivers/gpu/drm/i915/intel_lrc.c | 337 ++++++----- + drivers/gpu/drm/i915/intel_lrc.h | 2 +- + drivers/gpu/drm/i915/intel_mocs.c | 5 +- + drivers/gpu/drm/i915/intel_pipe_crc.c | 22 +- + drivers/gpu/drm/i915/intel_pm.c | 103 +++- + drivers/gpu/drm/i915/intel_psr.c | 123 +++- + drivers/gpu/drm/i915/intel_ringbuffer.c | 62 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 28 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 101 +++- + drivers/gpu/drm/i915/intel_sprite.c | 2 +- + drivers/gpu/drm/i915/intel_uc_fw.h | 2 +- + drivers/gpu/drm/i915/intel_workarounds.c | 206 +++---- + drivers/gpu/drm/i915/intel_workarounds.h | 2 +- + drivers/gpu/drm/i915/selftests/huge_pages.c | 2 +- + drivers/gpu/drm/i915/selftests/i915_gem_context.c | 3 + + .../gpu/drm/i915/selftests/i915_live_selftests.h | 1 + + .../{i915_gem_timeline.c => i915_timeline.c} | 94 +-- + drivers/gpu/drm/i915/selftests/i915_vma.c | 2 +- + drivers/gpu/drm/i915/selftests/igt_flush_test.c | 70 +++ + drivers/gpu/drm/i915/selftests/igt_flush_test.h | 14 + + drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c | 5 +- + drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 120 ++-- + drivers/gpu/drm/i915/selftests/intel_lrc.c | 80 +-- + drivers/gpu/drm/i915/selftests/intel_workarounds.c | 291 +++++++++ + drivers/gpu/drm/i915/selftests/mock_engine.c | 67 ++- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 21 +- + drivers/gpu/drm/i915/selftests/mock_gtt.c | 1 - + drivers/gpu/drm/i915/selftests/mock_timeline.c | 45 +- + drivers/gpu/drm/i915/selftests/mock_timeline.h | 28 +- + include/drm/i915_pciids.h | 1 + + 88 files changed, 4005 insertions(+), 1780 deletions(-) + delete mode 100644 drivers/gpu/drm/i915/i915_gem_timeline.c + create mode 100644 drivers/gpu/drm/i915/i915_scheduler.h + create mode 100644 drivers/gpu/drm/i915/i915_timeline.c + rename drivers/gpu/drm/i915/{i915_gem_timeline.h => i915_timeline.h} (68%) + rename drivers/gpu/drm/i915/selftests/{i915_gem_timeline.c => i915_timeline.c} (70%) + create mode 100644 drivers/gpu/drm/i915/selftests/igt_flush_test.c + create mode 100644 drivers/gpu/drm/i915/selftests/igt_flush_test.h + create mode 100644 drivers/gpu/drm/i915/selftests/intel_workarounds.c +Merging drm-tegra/drm/tegra/for-next (5cb02b3dbbe9 drm/tegra: dc: Rename supports_blending to has_legacy_blending) +$ git merge drm-tegra/drm/tegra/for-next +Auto-merging drivers/gpu/drm/tegra/drm.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/dc.c | 278 +++++++++++++++++++++++++++++------------- + drivers/gpu/drm/tegra/dc.h | 11 +- + drivers/gpu/drm/tegra/drm.c | 42 +++++++ + drivers/gpu/drm/tegra/drm.h | 4 + + drivers/gpu/drm/tegra/gr2d.c | 35 +++++- + drivers/gpu/drm/tegra/gr3d.c | 31 ++++- + drivers/gpu/drm/tegra/hub.c | 2 +- + drivers/gpu/drm/tegra/plane.c | 193 +++++++++++++++++++++-------- + drivers/gpu/drm/tegra/plane.h | 13 +- + 9 files changed, 458 insertions(+), 151 deletions(-) +Merging drm-misc/for-linux-next (3131f209468d drm/vc4: Fix leak of the file_priv that stored the perfmon.) +$ git merge drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/vc4/vc4_drv.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/vc4/vc4_drv.c | 1 + + 1 file changed, 1 insertion(+) +Merging drm-msm/msm-next (64cb96587ba6 drm/msm: Switch to atomic_helper_commit()) +$ git merge drm-msm/msm-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 17 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 9 + + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 105 ++++++++---- + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.h | 27 +-- + drivers/gpu/drm/msm/disp/mdp5/mdp5_mixer.c | 12 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_pipe.c | 20 ++- + drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 16 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c | 17 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 4 +- + drivers/gpu/drm/msm/msm_atomic.c | 258 +++-------------------------- + drivers/gpu/drm/msm/msm_drv.c | 11 +- + drivers/gpu/drm/msm/msm_drv.h | 9 +- + drivers/gpu/drm/msm/msm_kms.h | 14 -- + 13 files changed, 167 insertions(+), 352 deletions(-) +Merging hdlcd/for-upstream/hdlcd (f73e8b825315 drm/arm: Replace instances of drm_dev_unref with drm_dev_put.) +$ git merge hdlcd/for-upstream/hdlcd +Already up to date. +Merging mali-dp/for-upstream/mali-dp (6e810eb508f4 drm: mali-dp: Add YUV->RGB conversion support for video layers) +$ git merge mali-dp/for-upstream/mali-dp +Already up to date. +Merging sunxi-drm/sunxi-drm/for-next (7dafb83edd32 Merge branches 'sunxi/drm-fixes-for-4.13' and 'sunxi/drm-for-4.14' into sunxi-drm/for-next) +$ git merge sunxi-drm/sunxi-drm/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging imx-drm/imx-drm/next (22cd2b2b3151 drm/imx: Remove last traces of struct imx_drm_crtc) +$ git merge imx-drm/imx-drm/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/imx-drm.h | 1 - + drivers/gpu/drm/imx/ipuv3-crtc.c | 1 - + 2 files changed, 2 deletions(-) +Merging etnaviv/etnaviv/next (0b50dffa736b drm/etnaviv: remove register logging) +$ git merge etnaviv/etnaviv/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/etnaviv/Kconfig | 8 ------ + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 51 ----------------------------------- + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 30 ++++++++++++--------- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 4 ++- + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 4 +-- + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 16 +---------- + drivers/gpu/drm/etnaviv/etnaviv_mmu.h | 1 - + 7 files changed, 23 insertions(+), 91 deletions(-) +Merging kconfig/for-next (bebc6082da0a Linux 4.14) +$ git merge kconfig/for-next +Already up to date. +Merging regmap/for-next (76f721867da6 Merge branch 'regmap-4.18' into regmap-next) +$ git merge regmap/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging sound/for-next (10aa7cad37d3 ALSA: pcm: Hide local_irq_disable/enable() and local_irqsave/restore()) +$ git merge sound/for-next +Auto-merging sound/pci/hda/patch_realtek.c +Auto-merging sound/firewire/dice/dice-stream.c +Auto-merging sound/core/pcm_compat.c +Merge made by the 'recursive' strategy. + include/linux/usb/audio-v3.h | 26 ++ + include/sound/emu10k1.h | 4 +- + include/sound/hdaudio.h | 5 + + sound/core/pcm_compat.c | 10 +- + sound/core/pcm_lib.c | 15 +- + sound/core/pcm_local.h | 18 + + sound/core/pcm_native.c | 261 ++++++-------- + sound/firewire/dice/Makefile | 3 +- + sound/firewire/dice/dice-alesis.c | 52 +++ + sound/firewire/dice/dice-extension.c | 172 +++++++++ + sound/firewire/dice/dice-interface.h | 9 +- + sound/firewire/dice/dice-midi.c | 23 +- + sound/firewire/dice/dice-pcm.c | 233 ++++++++---- + sound/firewire/dice/dice-proc.c | 80 +++- + sound/firewire/dice/dice-stream.c | 283 +++++++++++---- + sound/firewire/dice/dice-tcelectronic.c | 100 +++++ + sound/firewire/dice/dice-transaction.c | 49 +-- + sound/firewire/dice/dice.c | 139 ++++--- + sound/firewire/dice/dice.h | 24 +- + sound/hda/hdac_regmap.c | 4 +- + sound/isa/cmi8328.c | 4 +- + sound/isa/sc6000.c | 4 +- + sound/pci/ad1889.c | 4 +- + sound/pci/cmipci.c | 2 +- + sound/pci/cs46xx/cs46xx.c | 2 +- + sound/pci/emu10k1/emufx.c | 9 +- + sound/pci/emu10k1/emupcm.c | 2 +- + sound/pci/hda/Kconfig | 4 + + sound/pci/hda/hda_auto_parser.c | 10 +- + sound/pci/hda/hda_codec.c | 48 ++- + sound/pci/hda/hda_generic.c | 27 +- + sound/pci/hda/hda_sysfs.c | 20 +- + sound/pci/hda/patch_ca0132.c | 8 +- + sound/pci/hda/patch_conexant.c | 5 +- + sound/pci/hda/patch_realtek.c | 4 +- + sound/sparc/dbri.c | 2 +- + sound/usb/card.c | 185 ++++++---- + sound/usb/mixer.c | 97 +++-- + sound/usb/mixer.h | 6 + + sound/usb/mixer_quirks.c | 36 +- + sound/usb/mixer_quirks.h | 4 + + sound/usb/mixer_scarlett.c | 6 +- + sound/usb/pcm.c | 84 ++--- + sound/usb/quirks-table.h | 10 + + sound/usb/quirks.c | 27 ++ + sound/usb/stream.c | 622 +++++++++++++++++--------------- + sound/usb/usbaudio.h | 4 + + 47 files changed, 1819 insertions(+), 927 deletions(-) + create mode 100644 sound/firewire/dice/dice-alesis.c + create mode 100644 sound/firewire/dice/dice-extension.c + create mode 100644 sound/firewire/dice/dice-tcelectronic.c +Merging sound-asoc/for-next (b617f1eae1d2 Merge remote-tracking branches 'asoc/topic/doc' and 'asoc/topic/trace' into asoc-next) +$ git merge sound-asoc/for-next +Removing sound/soc/soc-cache.c +Auto-merging drivers/media/i2c/tda1997x.c +Auto-merging Documentation/sound/soc/platform.rst +Auto-merging Documentation/sound/soc/codec.rst +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/cs42xx8.txt | 2 +- + .../devicetree/bindings/sound/mt2701-afe-pcm.txt | 4 +- + Documentation/devicetree/bindings/sound/mt6351.txt | 16 + + .../devicetree/bindings/sound/mt6797-afe-pcm.txt | 42 + + .../devicetree/bindings/sound/mt6797-mt6351.txt | 14 + + Documentation/devicetree/bindings/sound/rt5668.txt | 50 + + .../devicetree/bindings/sound/sgtl5000.txt | 2 +- + .../devicetree/bindings/sound/ti,tas6424.txt | 2 + + .../devicetree/bindings/sound/tscs42xx.txt | 6 + + Documentation/devicetree/bindings/sound/wm8960.txt | 2 +- + Documentation/devicetree/bindings/sound/wm8962.txt | 2 +- + Documentation/sound/soc/codec.rst | 8 +- + Documentation/sound/soc/platform.rst | 30 +- + drivers/media/i2c/tda1997x.c | 25 +- + include/linux/mfd/wm8350/audio.h | 3 - + include/sound/rt5668.h | 40 + + include/sound/soc-dai.h | 1 - + include/sound/soc.h | 392 +-- + include/trace/events/asoc.h | 1 - + include/uapi/sound/asoc.h | 29 +- + sound/soc/Makefile | 2 +- + sound/soc/amd/acp-da7219-max98357a.c | 6 + + sound/soc/amd/acp-pcm-dma.c | 271 +- + sound/soc/amd/acp.h | 22 +- + sound/soc/atmel/atmel_ssc_dai.c | 8 +- + sound/soc/bcm/Kconfig | 3 +- + sound/soc/codecs/Kconfig | 16 + + sound/soc/codecs/Makefile | 6 + + sound/soc/codecs/adau17x1.c | 9 + + sound/soc/codecs/max9860.c | 44 +- + sound/soc/codecs/max9860.h | 10 +- + sound/soc/codecs/mt6351.c | 1505 +++++++++++ + sound/soc/codecs/mt6351.h | 105 + + sound/soc/codecs/nau8810.c | 19 +- + sound/soc/codecs/nau8824.c | 13 +- + sound/soc/codecs/rt1305.c | 1191 +++++++++ + sound/soc/codecs/rt1305.h | 276 ++ + sound/soc/codecs/rt5663.c | 48 +- + sound/soc/codecs/rt5668.c | 2639 ++++++++++++++++++++ + sound/soc/codecs/rt5668.h | 1318 ++++++++++ + sound/soc/codecs/sgtl5000.c | 18 +- + sound/soc/codecs/sgtl5000.h | 5 +- + sound/soc/codecs/tas6424.c | 72 +- + sound/soc/codecs/tas6424.h | 4 + + sound/soc/codecs/tfa9879.c | 48 +- + sound/soc/codecs/tfa9879.h | 7 +- + sound/soc/codecs/tscs42xx.c | 203 +- + sound/soc/codecs/tscs42xx.h | 2 +- + sound/soc/codecs/wm_adsp.c | 8 +- + sound/soc/fsl/fsl_esai.c | 20 +- + sound/soc/fsl/fsl_esai.h | 5 +- + sound/soc/fsl/fsl_sai.c | 16 +- + sound/soc/fsl/fsl_sai.h | 5 +- + sound/soc/fsl/fsl_spdif.c | 24 +- + sound/soc/fsl/fsl_spdif.h | 5 +- + sound/soc/fsl/fsl_ssi.c | 60 +- + sound/soc/fsl/fsl_ssi.h | 6 +- + sound/soc/fsl/fsl_ssi_dbg.c | 18 +- + sound/soc/intel/Kconfig | 2 +- + sound/soc/intel/boards/bxt_da7219_max98357a.c | 2 +- + sound/soc/intel/boards/bxt_rt298.c | 2 +- + sound/soc/intel/boards/byt-max98090.c | 2 +- + sound/soc/intel/boards/bytcht_es8316.c | 2 +- + sound/soc/intel/boards/bytcr_rt5640.c | 2 +- + sound/soc/intel/boards/bytcr_rt5651.c | 2 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 2 +- + sound/soc/intel/boards/cht_bsw_nau8824.c | 2 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 2 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 30 +- + sound/soc/intel/boards/kbl_da7219_max98357a.c | 2 +- + sound/soc/intel/boards/kbl_rt5663_max98927.c | 2 +- + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 +- + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 2 +- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 2 +- + sound/soc/intel/boards/skl_rt286.c | 2 +- + sound/soc/intel/skylake/skl-messages.c | 2 +- + sound/soc/intel/skylake/skl-pcm.c | 36 +- + sound/soc/intel/skylake/skl-sst-dsp.h | 3 - + sound/soc/intel/skylake/skl-sst.c | 34 +- + sound/soc/intel/skylake/skl.c | 7 + + sound/soc/kirkwood/Kconfig | 1 - + sound/soc/mediatek/Kconfig | 20 + + sound/soc/mediatek/Makefile | 2 + + sound/soc/mediatek/common/Makefile | 14 +- + sound/soc/mediatek/common/mtk-afe-fe-dai.c | 30 +- + sound/soc/mediatek/common/mtk-afe-fe-dai.h | 10 +- + .../soc/mediatek/common/mtk-afe-platform-driver.c | 12 +- + .../soc/mediatek/common/mtk-afe-platform-driver.h | 10 +- + sound/soc/mediatek/common/mtk-base-afe.h | 12 +- + sound/soc/mediatek/mt2701/Makefile | 14 +- + sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.c | 66 +- + sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.h | 23 +- + sound/soc/mediatek/mt2701/mt2701-afe-common.h | 38 +- + sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 349 +-- + sound/soc/mediatek/mt2701/mt2701-cs42448.c | 13 +- + sound/soc/mediatek/mt2701/mt2701-reg.h | 11 +- + sound/soc/mediatek/mt2701/mt2701-wm8960.c | 10 +- + sound/soc/mediatek/mt6797/Makefile | 8 + + sound/soc/mediatek/mt6797/mt6797-afe-clk.c | 123 + + sound/soc/mediatek/mt6797/mt6797-afe-clk.h | 17 + + sound/soc/mediatek/mt6797/mt6797-afe-common.h | 49 + + sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 1232 +++++++++ + sound/soc/mediatek/mt6797/mt6797-interconnection.h | 33 + + sound/soc/mediatek/mt6797/mt6797-mt6351.c | 177 ++ + sound/soc/mediatek/mt6797/mt6797-reg.h | 838 +++++++ + sound/soc/mediatek/mt8173/mt8173-afe-common.h | 10 +- + sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 38 +- + sound/soc/mediatek/mt8173/mt8173-max98090.c | 10 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 10 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 10 +- + sound/soc/mediatek/mt8173/mt8173-rt5650.c | 10 +- + sound/soc/omap/Kconfig | 25 +- + sound/soc/omap/Makefile | 2 + + sound/soc/omap/n810.c | 11 +- + sound/soc/omap/omap-dmic.c | 4 +- + sound/soc/omap/omap-hdmi-audio.c | 5 +- + sound/soc/omap/omap-mcbsp.c | 4 +- + sound/soc/omap/omap-mcpdm.c | 4 +- + sound/soc/omap/sdma-pcm.c | 68 + + sound/soc/omap/sdma-pcm.h | 21 + + sound/soc/pxa/Kconfig | 1 - + sound/soc/qcom/Kconfig | 7 +- + sound/soc/sh/Kconfig | 6 +- + sound/soc/sh/rcar/cmd.c | 15 +- + sound/soc/sh/rcar/core.c | 49 +- + sound/soc/sh/rcar/dma.c | 11 +- + sound/soc/sh/rcar/gen.c | 3 +- + sound/soc/sh/rcar/rsnd.h | 4 +- + sound/soc/sh/rcar/ssi.c | 13 +- + sound/soc/soc-cache.c | 53 - + sound/soc/soc-compress.c | 362 +-- + sound/soc/soc-core.c | 794 +----- + sound/soc/soc-devres.c | 35 - + sound/soc/soc-io.c | 83 - + sound/soc/soc-jack.c | 22 - + sound/soc/soc-pcm.c | 132 +- + sound/soc/soc-topology.c | 30 +- + sound/soc/uniphier/aio-compress.c | 13 - + sound/soc/uniphier/aio-core.c | 71 +- + sound/soc/uniphier/aio-cpu.c | 153 +- + sound/soc/uniphier/aio-dma.c | 13 - + sound/soc/uniphier/aio-ld11.c | 13 - + sound/soc/uniphier/aio-reg.h | 46 +- + sound/soc/uniphier/aio.h | 20 +- + sound/soc/uniphier/evea.c | 55 +- + 145 files changed, 11242 insertions(+), 2958 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/mt6351.txt + create mode 100644 Documentation/devicetree/bindings/sound/mt6797-afe-pcm.txt + create mode 100644 Documentation/devicetree/bindings/sound/mt6797-mt6351.txt + create mode 100644 Documentation/devicetree/bindings/sound/rt5668.txt + create mode 100644 include/sound/rt5668.h + create mode 100644 sound/soc/codecs/mt6351.c + create mode 100644 sound/soc/codecs/mt6351.h + create mode 100644 sound/soc/codecs/rt1305.c + create mode 100644 sound/soc/codecs/rt1305.h + create mode 100644 sound/soc/codecs/rt5668.c + create mode 100644 sound/soc/codecs/rt5668.h + create mode 100644 sound/soc/mediatek/mt6797/Makefile + create mode 100644 sound/soc/mediatek/mt6797/mt6797-afe-clk.c + create mode 100644 sound/soc/mediatek/mt6797/mt6797-afe-clk.h + create mode 100644 sound/soc/mediatek/mt6797/mt6797-afe-common.h + create mode 100644 sound/soc/mediatek/mt6797/mt6797-afe-pcm.c + create mode 100644 sound/soc/mediatek/mt6797/mt6797-interconnection.h + create mode 100644 sound/soc/mediatek/mt6797/mt6797-mt6351.c + create mode 100644 sound/soc/mediatek/mt6797/mt6797-reg.h + create mode 100644 sound/soc/omap/sdma-pcm.c + create mode 100644 sound/soc/omap/sdma-pcm.h + delete mode 100644 sound/soc/soc-cache.c +Merging modules/modules-next (c554b8986801 module: Allow to always show the status of modsign) +$ git merge modules/modules-next +Auto-merging kernel/module.c +Merge made by the 'recursive' strategy. + kernel/module.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) +Merging input/next (e7330fa032bb Input: add support for ChipOne icn8505 based touchscreens) +$ git merge input/next +Auto-merging drivers/input/touchscreen/Kconfig +Auto-merging drivers/input/mouse/alps.c +Auto-merging drivers/input/joystick/xpad.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 + + drivers/input/joystick/as5011.c | 4 +- + drivers/input/joystick/gamecon.c | 27 +- + drivers/input/joystick/xpad.c | 33 +- + drivers/input/mouse/alps.c | 80 +++-- + drivers/input/touchscreen/Kconfig | 11 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/chipone_icn8505.c | 520 ++++++++++++++++++++++++++++ + 8 files changed, 621 insertions(+), 61 deletions(-) + create mode 100644 drivers/input/touchscreen/chipone_icn8505.c +Merging block/for-next (61445b56d031 sbitmap: warn if using smaller shallow depth than was setup) +$ git merge block/for-next +Merge made by the 'recursive' strategy. + block/bfq-cgroup.c | 40 ++++---- + block/bfq-iosched.c | 203 ++++++++++++++++++++++---------------- + block/bfq-iosched.h | 16 +-- + block/blk-core.c | 45 ++++----- + block/blk-lib.c | 12 ++- + block/blk-merge.c | 11 +-- + block/blk-mq.c | 39 +++++--- + block/blk-stat.c | 10 +- + block/blk-stat.h | 45 +-------- + block/blk-throttle.c | 22 ++--- + block/blk-wbt.c | 129 +++++++++++++++--------- + block/blk-wbt.h | 55 ++++------- + block/blk.h | 2 +- + block/bounce.c | 3 - + block/cfq-iosched.c | 64 ++++++------ + block/kyber-iosched.c | 9 +- + drivers/block/brd.c | 4 + + drivers/block/loop.c | 11 ++- + drivers/block/loop.h | 1 + + drivers/block/mtip32xx/mtip32xx.c | 2 +- + drivers/md/dm-rq.c | 2 +- + include/linux/blk_types.h | 49 ++++++++- + include/linux/blkdev.h | 61 +++--------- + include/linux/sbitmap.h | 29 ++++++ + lib/sbitmap.c | 51 ++++++++-- + 25 files changed, 493 insertions(+), 422 deletions(-) +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 (28700a36232b dm thin: update Documentation to clarify when "read_only" is valid) +$ git merge device-mapper/for-next +Already up to date. +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 (cf56c819c851 mmc: tegra: remove redundant return statement) +$ git merge mmc/next +Auto-merging include/linux/mmc/sdio_ids.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/amlogic,meson-gx.txt | 1 + + Documentation/devicetree/bindings/mmc/jz4740.txt | 38 ++++ + Documentation/devicetree/bindings/mmc/mmc.txt | 2 + + Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 1 + + arch/mips/boot/dts/ingenic/ci20.dts | 34 ++++ + arch/mips/boot/dts/ingenic/jz4780.dtsi | 52 ++++++ + arch/mips/configs/ci20_defconfig | 4 + + drivers/mmc/core/block.c | 3 +- + drivers/mmc/core/card.h | 6 + + drivers/mmc/core/core.c | 52 ++++-- + drivers/mmc/core/core.h | 4 +- + drivers/mmc/core/host.c | 9 +- + drivers/mmc/core/mmc.c | 12 +- + drivers/mmc/core/pwrseq_simple.c | 14 +- + drivers/mmc/core/quirks.h | 3 + + drivers/mmc/core/sd.c | 12 +- + drivers/mmc/core/sdio.c | 70 ++++--- + drivers/mmc/core/slot-gpio.c | 7 +- + drivers/mmc/host/Kconfig | 23 +-- + drivers/mmc/host/davinci_mmc.c | 6 +- + drivers/mmc/host/dw_mmc-rockchip.c | 5 +- + drivers/mmc/host/dw_mmc.c | 4 + + drivers/mmc/host/jz4740_mmc.c | 203 ++++++++++++++------- + drivers/mmc/host/meson-gx-mmc.c | 63 +++++-- + drivers/mmc/host/mmci.c | 5 - + drivers/mmc/host/mtk-sd.c | 63 +++++-- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 30 +-- + drivers/mmc/host/rtsx_usb_sdmmc.c | 19 +- + drivers/mmc/host/sdhci-cadence.c | 22 ++- + drivers/mmc/host/sdhci-esdhc-imx.c | 22 +++ + drivers/mmc/host/sdhci-msm.c | 84 ++++++++- + drivers/mmc/host/sdhci-of-arasan.c | 9 +- + drivers/mmc/host/sdhci-pci-core.c | 38 +++- + drivers/mmc/host/sdhci-pci.h | 1 + + drivers/mmc/host/sdhci-tegra.c | 2 +- + drivers/mmc/host/sunxi-mmc.c | 185 ++++++++++++------- + drivers/mmc/host/wmt-sdmmc.c | 6 +- + include/dt-bindings/dma/jz4780-dma.h | 49 +++++ + include/linux/mmc/card.h | 1 + + include/linux/mmc/core.h | 1 + + include/linux/mmc/host.h | 1 + + include/linux/mmc/sdio_ids.h | 1 + + 42 files changed, 886 insertions(+), 281 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/jz4740.txt + create mode 100644 include/dt-bindings/dma/jz4780-dma.h +Merging kgdb/kgdb-next (2cf2f0d5b91f kdb: use memmove instead of overlapping memcpy) +$ git merge kgdb/kgdb-next +Already up to date. +Merging md/for-next (643369299cfe raid5: copy write hint from origin bio to stripe) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + drivers/md/md.c | 192 +++++++++++++++++++++++++++++++++++++--------------- + drivers/md/md.h | 23 +++++-- + drivers/md/raid1.c | 2 - + drivers/md/raid10.c | 10 +-- + drivers/md/raid5.c | 6 ++ + drivers/md/raid5.h | 1 + + 6 files changed, 165 insertions(+), 69 deletions(-) +Merging mfd/for-mfd-next (ae0280fe1689 mfd: tps65911-comparator: Fix a build error) +$ git merge mfd/for-mfd-next +Removing include/linux/mfd/syscon/exynos5-pmu.h +Removing include/linux/mfd/syscon/exynos4-pmu.h +Removing drivers/mfd/cros_ec_acpi_gpe.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mfd/motorola-cpcap.txt | 42 ++ + drivers/mfd/Makefile | 1 - + drivers/mfd/ab8500-debugfs.c | 3 +- + drivers/mfd/abx500-core.c | 25 +- + drivers/mfd/arizona-core.c | 53 ++- + drivers/mfd/axp20x.c | 252 +++-------- + drivers/mfd/cros_ec.c | 15 +- + drivers/mfd/cros_ec_acpi_gpe.c | 103 ----- + drivers/mfd/da9062-core.c | 462 +++++---------------- + drivers/mfd/htc-i2cpld.c | 4 +- + drivers/mfd/janz-cmodio.c | 4 +- + drivers/mfd/jz4740-adc.c | 4 +- + drivers/mfd/max8997.c | 4 +- + drivers/mfd/omap-usb-tll.c | 60 ++- + drivers/mfd/pcf50633-core.c | 7 +- + drivers/mfd/rave-sp.c | 107 ++++- + drivers/mfd/rc5t583.c | 6 +- + drivers/mfd/si476x-i2c.c | 6 +- + drivers/mfd/sm501.c | 32 +- + drivers/mfd/smsc-ece1099.c | 7 +- + drivers/mfd/sprd-sc27xx-spi.c | 3 + + drivers/mfd/syscon.c | 2 + + drivers/mfd/ti_am335x_tscadc.c | 5 +- + drivers/mfd/tps65090.c | 4 +- + drivers/mfd/tps6586x.c | 4 +- + drivers/mfd/tps65910.c | 18 +- + drivers/mfd/tps65911-comparator.c | 6 +- + drivers/mfd/tps68470.c | 10 +- + drivers/mfd/tps80031.c | 4 +- + drivers/mfd/twl-core.c | 2 +- + drivers/mfd/twl6030-irq.c | 4 +- + drivers/mfd/viperboard.c | 4 +- + include/linux/mfd/arizona/pdata.h | 3 +- + include/linux/mfd/axp20x.h | 10 +- + include/linux/mfd/cros_ec.h | 18 - + include/linux/mfd/syscon/exynos4-pmu.h | 21 - + include/linux/mfd/syscon/exynos5-pmu.h | 19 - + include/linux/mfd/tps65218.h | 4 +- + include/linux/mfd/tps68470.h | 17 +- + 39 files changed, 464 insertions(+), 891 deletions(-) + delete mode 100644 drivers/mfd/cros_ec_acpi_gpe.c + delete mode 100644 include/linux/mfd/syscon/exynos4-pmu.h + delete mode 100644 include/linux/mfd/syscon/exynos5-pmu.h +Merging backlight/for-backlight-next (840d40d941bf MAINTAINERS: Add dri-devel for backlight subsystem patches) +$ git merge backlight/for-backlight-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/leds/backlight/pwm-backlight.txt | 6 + + .../leds/backlight/zii,rave-sp-backlight.txt | 23 ++ + MAINTAINERS | 1 + + drivers/staging/fbtft/fbtft-core.c | 4 +- + drivers/staging/fbtft/fbtft.h | 1 + + drivers/video/backlight/Kconfig | 13 ++ + drivers/video/backlight/Makefile | 2 + + drivers/video/backlight/generic_bl.c | 5 - + drivers/video/backlight/otm3225a.c | 252 +++++++++++++++++++++ + drivers/video/backlight/pandora_bl.c | 25 +- + drivers/video/backlight/pwm_bl.c | 34 ++- + drivers/video/backlight/rave-sp-backlight.c | 82 +++++++ + include/linux/backlight.h | 4 - + include/linux/mfd/rave-sp.h | 1 + + include/linux/pwm_backlight.h | 2 + + 15 files changed, 430 insertions(+), 25 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/backlight/zii,rave-sp-backlight.txt + create mode 100644 drivers/video/backlight/otm3225a.c + create mode 100644 drivers/video/backlight/rave-sp-backlight.c +Merging battery/for-next (1f140ff46708 Merge tag 'tags/tcpm-pps-4.18' into psy-next) +$ git merge battery/for-next +Auto-merging drivers/usb/typec/tcpm.c +Auto-merging drivers/usb/core/hub.c +Auto-merging drivers/usb/core/hcd.c +CONFLICT (content): Merge conflict in drivers/usb/core/hcd.c +Auto-merging MAINTAINERS +Resolved 'drivers/usb/core/hcd.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 41a81f967027] Merge remote-tracking branch 'battery/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-usb | 18 + + Documentation/ABI/testing/sysfs-class-power | 455 +++++++++ + .../devicetree/bindings/power/supply/bq27xxx.txt | 1 + + .../devicetree/bindings/usb/ci-hdrc-usb2.txt | 6 + + .../devicetree/bindings/usb/fcs,fusb302.txt | 6 - + .../devicetree/bindings/usb/richtek,rt1711h.txt | 17 + + MAINTAINERS | 1 + + drivers/power/reset/gpio-poweroff.c | 4 +- + drivers/power/supply/ab8500_bmdata.c | 63 -- + drivers/power/supply/ab8500_btemp.c | 93 +- + drivers/power/supply/ab8500_charger.c | 131 +-- + drivers/power/supply/ab8500_fg.c | 14 +- + drivers/power/supply/abx500_chargalg.c | 62 -- + drivers/power/supply/axp288_charger.c | 26 +- + drivers/power/supply/axp288_fuel_gauge.c | 27 +- + drivers/power/supply/bq27xxx_battery.c | 9 + + drivers/power/supply/bq27xxx_battery_i2c.c | 2 + + drivers/power/supply/charger-manager.c | 5 +- + drivers/power/supply/gpio-charger.c | 3 +- + drivers/power/supply/power_supply_core.c | 11 +- + drivers/power/supply/power_supply_sysfs.c | 123 ++- + drivers/power/supply/s3c_adc_battery.c | 8 +- + drivers/staging/typec/Kconfig | 8 + + drivers/staging/typec/Makefile | 1 + + drivers/staging/typec/tcpci.h | 1 + + drivers/staging/typec/tcpci_rt1711h.c | 312 ++++++ + drivers/usb/core/hcd.c | 49 +- + drivers/usb/core/hub.c | 23 +- + drivers/usb/core/sysfs.c | 22 + + drivers/usb/gadget/udc/Kconfig | 4 +- + drivers/usb/host/Kconfig | 4 +- + drivers/usb/host/ehci-omap.c | 5 +- + drivers/usb/host/ehci-tegra.c | 87 +- + drivers/usb/isp1760/isp1760-core.c | 2 +- + drivers/usb/isp1760/isp1760-hcd.c | 2 +- + drivers/usb/mon/mon_bin.c | 2 +- + drivers/usb/mtu3/Kconfig | 2 +- + drivers/usb/mtu3/mtu3_plat.c | 6 +- + drivers/usb/musb/omap2430.c | 95 +- + drivers/usb/phy/Kconfig | 9 + + drivers/usb/phy/Makefile | 2 +- + drivers/usb/phy/phy-am335x.c | 6 +- + drivers/usb/phy/phy-tegra-usb.c | 140 ++- + drivers/usb/phy/phy.c | 133 +-- + drivers/usb/renesas_usbhs/common.h | 1 - + drivers/usb/renesas_usbhs/rcar2.c | 29 - + drivers/usb/roles/intel-xhci-usb-role-switch.c | 2 + + drivers/usb/storage/freecom.c | 4 +- + drivers/usb/typec/Kconfig | 1 + + drivers/usb/typec/fusb302/Kconfig | 2 +- + drivers/usb/typec/fusb302/fusb302.c | 105 +- + drivers/usb/typec/tcpm.c | 1059 ++++++++++++++++++-- + drivers/usb/typec/typec_wcove.c | 4 +- + drivers/usb/usbip/stub_dev.c | 4 +- + include/linux/mfd/abx500.h | 1 - + include/linux/mfd/abx500/ab8500-bm.h | 2 - + include/linux/mfd/abx500/ux500_chargalg.h | 4 - + include/linux/power/bq27xxx_battery.h | 3 +- + include/linux/power_supply.h | 16 + + include/linux/usb.h | 4 + + include/linux/usb/audio-v2.h | 2 +- + include/linux/usb/hcd.h | 2 +- + include/linux/usb/pd.h | 4 +- + include/linux/usb/phy.h | 36 - + include/linux/usb/tcpm.h | 10 +- + include/linux/usb/tegra_usb_phy.h | 2 + + include/uapi/linux/usb/ch11.h | 5 + + 67 files changed, 2347 insertions(+), 955 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/richtek,rt1711h.txt + create mode 100644 drivers/staging/typec/tcpci_rt1711h.c +Merging regulator/for-next (1fd083554fa0 Merge branch 'regulator-4.18' into regulator-next) +$ git merge regulator/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/axp20x.txt | 3 +- + .../devicetree/bindings/mfd/bd9571mwv.txt | 21 + + .../devicetree/bindings/regulator/pfuze100.txt | 6 +- + .../bindings/regulator/sy8106a-regulator.txt | 23 + + MAINTAINERS | 6 + + drivers/mfd/bd9571mwv.c | 2 + + drivers/regulator/Kconfig | 7 + + drivers/regulator/Makefile | 2 +- + drivers/regulator/ab8500.c | 1779 ++------------------ + drivers/regulator/axp20x-regulator.c | 2 + + drivers/regulator/bd9571mwv-regulator.c | 127 +- + drivers/regulator/cpcap-regulator.c | 2 +- + drivers/regulator/internal.h | 9 +- + drivers/regulator/lp87565-regulator.c | 17 +- + drivers/regulator/ltc3676.c | 20 +- + drivers/regulator/of_regulator.c | 13 +- + drivers/regulator/pfuze100-regulator.c | 9 +- + drivers/regulator/sy8106a-regulator.c | 167 ++ + drivers/regulator/tps6586x-regulator.c | 1 + + drivers/regulator/twl-regulator.c | 2 +- + drivers/regulator/wm8350-regulator.c | 1 + + include/linux/mfd/bd9571mwv.h | 5 + + include/linux/mfd/tps6586x.h | 1 + + include/linux/regulator/ab8500.h | 157 +- + include/linux/regulator/consumer.h | 1 + + 25 files changed, 611 insertions(+), 1772 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/sy8106a-regulator.txt + create mode 100644 drivers/regulator/sy8106a-regulator.c +Merging security/next-testing (5859cdf55063 smack: provide socketpair callback) +$ git merge security/next-testing +Auto-merging security/selinux/hooks.c +Merge made by the 'recursive' strategy. + include/linux/lsm_hooks.h | 7 +++++++ + include/linux/security.h | 21 +++++++-------------- + net/socket.c | 7 +++++++ + security/security.c | 6 ++++++ + security/selinux/hooks.c | 13 +++++++++++++ + security/smack/smack_lsm.c | 22 ++++++++++++++++++++++ + 6 files changed, 62 insertions(+), 14 deletions(-) +Merging apparmor/apparmor-next (938df8352997 apparmor: update git and wiki locations in AppArmor docs) +$ git merge apparmor/apparmor-next +Merge made by the 'recursive' strategy. + Documentation/admin-guide/LSM/apparmor.rst | 6 +- + security/apparmor/domain.c | 2 +- + security/apparmor/include/label.h | 2 +- + security/apparmor/include/path.h | 32 ++--- + security/apparmor/include/secid.h | 15 +- + security/apparmor/label.c | 14 +- + security/apparmor/lib.c | 2 +- + security/apparmor/lsm.c | 37 +++-- + security/apparmor/match.c | 2 +- + security/apparmor/mount.c | 2 +- + security/apparmor/policy.c | 4 +- + security/apparmor/secid.c | 221 ++++++++++++++++++++++++++--- + 12 files changed, 271 insertions(+), 68 deletions(-) +Merging integrity/next-integrity (3dea0d93d257 ima: Unify logging) +$ git merge integrity/next-integrity +Merge made by the 'recursive' strategy. + security/integrity/ima/ima_fs.c | 9 +++++++-- + security/integrity/ima/ima_kexec.c | 2 ++ + security/integrity/ima/ima_template_lib.c | 2 ++ + 3 files changed, 11 insertions(+), 2 deletions(-) +Merging keys/keys-next (1e684d3820d8 pkcs7: Set the module licence to prevent tainting) +$ git merge keys/keys-next +Already up to date. +Merging selinux/next (d141136f523a audit: normalize MAC_POLICY_LOAD record) +$ git merge selinux/next +Merge made by the 'recursive' strategy. + security/selinux/selinuxfs.c | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) +Merging tpmdd/next (1fbad3028664 tpm: tpm_crb: relinquish locality on error path.) +$ git merge tpmdd/next +Auto-merging drivers/char/tpm/eventlog/tpm2.c +Auto-merging drivers/char/tpm/eventlog/tpm1.c +Auto-merging drivers/char/tpm/eventlog/of.c +Auto-merging drivers/char/tpm/eventlog/efi.c +Auto-merging drivers/char/tpm/eventlog/acpi.c +Merge made by the 'recursive' strategy. + drivers/char/tpm/Makefile | 10 +- + .../tpm/{tpm_eventlog_acpi.c => eventlog/acpi.c} | 3 +- + drivers/char/tpm/eventlog/common.c | 195 ++++++++++++++++++++ + drivers/char/tpm/eventlog/common.h | 35 ++++ + .../tpm/{tpm_eventlog_efi.c => eventlog/efi.c} | 3 +- + .../char/tpm/{tpm_eventlog_of.c => eventlog/of.c} | 7 +- + .../char/tpm/{tpm1_eventlog.c => eventlog/tpm1.c} | 200 ++------------------- + .../char/tpm/{tpm2_eventlog.c => eventlog/tpm2.c} | 3 +- + drivers/char/tpm/st33zp24/spi.c | 4 +- + drivers/char/tpm/st33zp24/st33zp24.c | 2 - + drivers/char/tpm/tpm-interface.c | 3 +- + drivers/char/tpm/tpm.h | 27 --- + drivers/char/tpm/tpm_crb.c | 10 +- + 13 files changed, 273 insertions(+), 229 deletions(-) + rename drivers/char/tpm/{tpm_eventlog_acpi.c => eventlog/acpi.c} (98%) + create mode 100644 drivers/char/tpm/eventlog/common.c + create mode 100644 drivers/char/tpm/eventlog/common.h + rename drivers/char/tpm/{tpm_eventlog_efi.c => eventlog/efi.c} (97%) + rename drivers/char/tpm/{tpm_eventlog_of.c => eventlog/of.c} (94%) + rename drivers/char/tpm/{tpm1_eventlog.c => eventlog/tpm1.c} (58%) + rename drivers/char/tpm/{tpm2_eventlog.c => eventlog/tpm2.c} (99%) +Merging watchdog/master (6d08b06e67cd Linux 4.17-rc2) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (00dcb938d482 Merge branches 'iommu/fixes', 'arm/io-pgtable', 'arm/qcom', 'arm/tegra', 'x86/vt-d', 'x86/amd' and 'core' into next) +$ git merge iommu/next +Auto-merging drivers/iommu/Kconfig +Merge made by the 'recursive' strategy. + drivers/iommu/Kconfig | 5 ++--- + drivers/iommu/amd_iommu.c | 39 ++++++++++++++++++++------------------ + drivers/iommu/amd_iommu_types.h | 1 + + drivers/iommu/dmar.c | 8 +++----- + drivers/iommu/io-pgtable-arm-v7s.c | 5 +---- + drivers/iommu/io-pgtable-arm.c | 5 +---- + drivers/iommu/qcom_iommu.c | 6 ++---- + drivers/iommu/tegra-gart.c | 15 ++++++++++++++- + 8 files changed, 45 insertions(+), 39 deletions(-) +Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15) +$ git merge dwmw2-iommu/master +Already up to date. +Merging vfio/next (da9147140fe3 MAINTAINERS: vfio/platform: Update sub-maintainer) +$ git merge vfio/next +Already up to date. +Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment) +$ git merge trivial/for-next +Already up to date. +Merging audit/next (326bee0286d7 seccomp: Don't special case audited processes when logging) +$ git merge audit/next +Merge made by the 'recursive' strategy. + Documentation/userspace-api/seccomp_filter.rst | 7 -- + include/linux/audit.h | 15 ++- + kernel/audit.c | 4 +- + kernel/auditfilter.c | 2 +- + kernel/auditsc.c | 36 ++++++- + kernel/seccomp.c | 126 ++++++++++++++++++------- + 6 files changed, 134 insertions(+), 56 deletions(-) +Merging devicetree/for-next (ca3923bd91d0 Merge branch 'dt/linus' into for-next) +$ git merge devicetree/for-next +Auto-merging scripts/Makefile.lib +Auto-merging drivers/of/platform.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Auto-merging Documentation/devicetree/bindings/thermal/rcar-gen3-thermal.txt +Auto-merging Documentation/devicetree/bindings/mtd/mtk-nand.txt +Auto-merging Documentation/devicetree/bindings/mmc/tmio_mmc.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/ux500/boards.txt | 2 +- + Documentation/devicetree/bindings/dma/k3dma.txt | 1 - + Documentation/devicetree/bindings/dma/ti-edma.txt | 1 - + .../adc/samsung,exynos-adc.txt} | 0 + .../devicetree/bindings/mips/lantiq/rcu.txt | 2 - + Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 4 - + .../{powerpc/4xx/ndfc.txt => mtd/ibm,ndfc.txt} | 0 + Documentation/devicetree/bindings/mtd/mtk-nand.txt | 4 - + .../{powerpc/4xx/emac.txt => net/ibm,emac.txt} | 0 + .../devicetree/bindings/pci/xgene-pci.txt | 7 - + Documentation/devicetree/bindings/pps/pps-gpio.txt | 1 - + .../devicetree/bindings/pwm/pwm-omap-dmtimer.txt | 2 +- + .../samsung,exynos4-rng.txt} | 0 + .../bindings/{ => rng}/sparc_sun_oracle_rng.txt | 0 + .../bindings/thermal/rcar-gen3-thermal.txt | 6 +- + .../{nios2/timer.txt => timer/altr,timer-1.0.txt} | 0 + .../arch_timer.txt => timer/arm,arch_timer.txt} | 0 + .../arm,armv7m-systick.txt} | 0 + .../arm,global_timer.txt} | 0 + .../bindings/{arm/twd.txt => timer/arm,twd.txt} | 0 + .../{powerpc/fsl/gtm.txt => timer/fsl,gtm.txt} | 0 + .../mrvl/timer.txt => timer/mrvl,mmp-timer.txt} | 0 + .../msm/timer.txt => timer/qcom,msm-timer.txt} | 0 + .../spear-timer.txt => timer/st,spear-timer.txt} | 0 + .../{c6x/timer64.txt => timer/ti,c64x+timer64.txt} | 0 + .../{arm/omap/timer.txt => timer/ti,timer.txt} | 0 + .../{arm/vt8500 => timer}/via,vt8500-timer.txt | 0 + .../devicetree/bindings/vendor-prefixes.txt | 4 + + drivers/of/of_numa.c | 1 - + drivers/of/platform.c | 11 ++ + scripts/Makefile.lib | 3 + + scripts/dtc/checks.c | 199 ++++++++++++++++++++- + scripts/dtc/dtc-lexer.l | 7 + + scripts/dtc/dtc-parser.y | 39 ++-- + scripts/dtc/dtc.h | 4 + + scripts/dtc/livetree.c | 26 ++- + scripts/dtc/version_gen.h | 2 +- + 37 files changed, 284 insertions(+), 42 deletions(-) + rename Documentation/devicetree/bindings/{arm/samsung/exynos-adc.txt => iio/adc/samsung,exynos-adc.txt} (100%) + rename Documentation/devicetree/bindings/{powerpc/4xx/ndfc.txt => mtd/ibm,ndfc.txt} (100%) + rename Documentation/devicetree/bindings/{powerpc/4xx/emac.txt => net/ibm,emac.txt} (100%) + rename Documentation/devicetree/bindings/{crypto/samsung,exynos-rng4.txt => rng/samsung,exynos4-rng.txt} (100%) + rename Documentation/devicetree/bindings/{ => rng}/sparc_sun_oracle_rng.txt (100%) + rename Documentation/devicetree/bindings/{nios2/timer.txt => timer/altr,timer-1.0.txt} (100%) + rename Documentation/devicetree/bindings/{arm/arch_timer.txt => timer/arm,arch_timer.txt} (100%) + rename Documentation/devicetree/bindings/{arm/armv7m_systick.txt => timer/arm,armv7m-systick.txt} (100%) + rename Documentation/devicetree/bindings/{arm/global_timer.txt => timer/arm,global_timer.txt} (100%) + rename Documentation/devicetree/bindings/{arm/twd.txt => timer/arm,twd.txt} (100%) + rename Documentation/devicetree/bindings/{powerpc/fsl/gtm.txt => timer/fsl,gtm.txt} (100%) + rename Documentation/devicetree/bindings/{arm/mrvl/timer.txt => timer/mrvl,mmp-timer.txt} (100%) + rename Documentation/devicetree/bindings/{arm/msm/timer.txt => timer/qcom,msm-timer.txt} (100%) + rename Documentation/devicetree/bindings/{arm/spear-timer.txt => timer/st,spear-timer.txt} (100%) + rename Documentation/devicetree/bindings/{c6x/timer64.txt => timer/ti,c64x+timer64.txt} (100%) + rename Documentation/devicetree/bindings/{arm/omap/timer.txt => timer/ti,timer.txt} (100%) + rename Documentation/devicetree/bindings/{arm/vt8500 => timer}/via,vt8500-timer.txt (100%) +Merging mailbox/mailbox-for-next (dfbc9c5841fc mailbox: Remove depends on HAS_DMA in case of platform dependency) +$ git merge mailbox/mailbox-for-next +Merge made by the 'recursive' strategy. + drivers/mailbox/Kconfig | 2 -- + 1 file changed, 2 deletions(-) +Merging spi/for-next (7b4a87faf4cf ASoC: omap-mcpdm: Convert to use the sdma-pcm instead of omap-pcm) +$ git merge spi/for-next +Removing drivers/spi/spi-bcm53xx.h +Removing drivers/spi/spi-bcm53xx.c +Merge made by the 'recursive' strategy. + drivers/spi/Kconfig | 12 +- + drivers/spi/internals.h | 43 +++++ + drivers/spi/spi-bcm53xx.c | 360 ---------------------------------------- + drivers/spi/spi-bcm53xx.h | 73 -------- + drivers/spi/spi-bcm63xx-hsspi.c | 25 ++- + drivers/spi/spi-cadence.c | 6 +- + drivers/spi/spi-fsl-lpspi.c | 21 +-- + drivers/spi/spi-imx.c | 22 +-- + drivers/spi/spi-meson-spicc.c | 11 +- + drivers/spi/spi-mpc52xx.c | 2 +- + drivers/spi/spi-mxs.c | 48 +++--- + drivers/spi/spi-omap2-mcspi.c | 127 ++++++++------ + drivers/spi/spi-pxa2xx-dma.c | 28 ++-- + drivers/spi/spi-pxa2xx.c | 257 ++++++++++------------------ + drivers/spi/spi-pxa2xx.h | 17 +- + drivers/spi/spi-s3c64xx.c | 158 ++++++++++-------- + drivers/spi/spi-sh-msiof.c | 67 ++++---- + drivers/spi/spi-stm32.c | 2 +- + drivers/spi/spi-zynqmp-gqspi.c | 92 +++++++--- + drivers/spi/spi.c | 62 +++++-- + 20 files changed, 523 insertions(+), 910 deletions(-) + create mode 100644 drivers/spi/internals.h + delete mode 100644 drivers/spi/spi-bcm53xx.c + delete mode 100644 drivers/spi/spi-bcm53xx.h +Merging tip/auto-latest (a9b6b3b055ea Merge branch 'x86/vdso') +$ git merge tip/auto-latest +Auto-merging drivers/s390/net/qeth_core_main.c +Auto-merging arch/x86/net/bpf_jit_comp.c +CONFLICT (content): Merge conflict in arch/x86/net/bpf_jit_comp.c +Removing arch/x86/entry/vdso/vdso32/vdso-fakesections.c +Removing arch/s390/include/uapi/asm/shmbuf.h +Removing arch/s390/include/uapi/asm/sembuf.h +Removing arch/s390/include/uapi/asm/msgbuf.h +Auto-merging arch/powerpc/kernel/asm-offsets.c +Auto-merging arch/nds32/include/asm/Kbuild +Removing arch/ia64/include/uapi/asm/shmbuf.h +Removing arch/ia64/include/uapi/asm/sembuf.h +Removing arch/ia64/include/uapi/asm/msgbuf.h +Removing arch/ia64/include/uapi/asm/ipcbuf.h +Removing arch/alpha/include/uapi/asm/shmbuf.h +Removing arch/alpha/include/uapi/asm/sembuf.h +Removing arch/alpha/include/uapi/asm/msgbuf.h +Removing arch/alpha/include/uapi/asm/ipcbuf.h +Auto-merging arch/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'arch/x86/net/bpf_jit_comp.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a28dbd5e0e1d] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 5 - + MAINTAINERS | 1 + + arch/Kconfig | 15 ++ + arch/alpha/include/asm/Kbuild | 1 + + arch/alpha/include/uapi/asm/Kbuild | 4 + + arch/alpha/include/uapi/asm/ipcbuf.h | 2 - + arch/alpha/include/uapi/asm/msgbuf.h | 28 --- + arch/alpha/include/uapi/asm/sembuf.h | 23 -- + arch/alpha/include/uapi/asm/shmbuf.h | 39 --- + arch/arc/include/asm/Kbuild | 1 + + arch/arm/include/asm/Kbuild | 1 + + arch/arm64/include/asm/compat.h | 43 ++-- + arch/arm64/include/asm/stat.h | 1 + + arch/arm64/kernel/hw_breakpoint.c | 1 - + arch/arm64/kernel/perf_regs.c | 2 +- + arch/c6x/include/asm/Kbuild | 1 + + arch/h8300/include/asm/Kbuild | 1 + + arch/hexagon/include/asm/Kbuild | 1 + + arch/ia64/include/asm/Kbuild | 1 + + arch/ia64/include/uapi/asm/Kbuild | 4 + + arch/ia64/include/uapi/asm/ipcbuf.h | 2 - + arch/ia64/include/uapi/asm/msgbuf.h | 28 --- + arch/ia64/include/uapi/asm/sembuf.h | 23 -- + arch/ia64/include/uapi/asm/shmbuf.h | 39 --- + arch/m68k/include/asm/Kbuild | 1 + + arch/microblaze/include/asm/Kbuild | 1 + + arch/mips/include/asm/compat.h | 51 ++-- + arch/mips/include/uapi/asm/msgbuf.h | 57 +++-- + arch/mips/include/uapi/asm/sembuf.h | 15 +- + arch/mips/include/uapi/asm/shmbuf.h | 23 +- + arch/mips/kernel/signal32.c | 2 +- + arch/nds32/include/asm/Kbuild | 1 + + arch/nios2/include/asm/Kbuild | 1 + + arch/openrisc/include/asm/Kbuild | 1 + + arch/parisc/include/asm/compat.h | 43 ++-- + arch/parisc/include/uapi/asm/msgbuf.h | 33 ++- + arch/parisc/include/uapi/asm/sembuf.h | 16 +- + arch/parisc/include/uapi/asm/shmbuf.h | 19 +- + arch/powerpc/include/asm/compat.h | 43 ++-- + arch/powerpc/include/uapi/asm/msgbuf.h | 18 +- + arch/powerpc/include/uapi/asm/sembuf.h | 14 +- + arch/powerpc/include/uapi/asm/shmbuf.h | 19 +- + arch/powerpc/kernel/asm-offsets.c | 2 +- + arch/powerpc/oprofile/backtrace.c | 1 + + arch/s390/hypfs/hypfs_sprp.c | 1 - + arch/s390/include/asm/compat.h | 43 ++-- + arch/s390/include/asm/elf.h | 4 +- + arch/s390/include/uapi/asm/Kbuild | 3 + + arch/s390/include/uapi/asm/msgbuf.h | 38 --- + arch/s390/include/uapi/asm/sembuf.h | 30 --- + arch/s390/include/uapi/asm/shmbuf.h | 49 ---- + arch/s390/kvm/priv.c | 1 - + arch/s390/pci/pci_clp.c | 1 - + arch/sh/include/asm/Kbuild | 1 + + arch/sparc/include/asm/compat.h | 47 ++-- + arch/sparc/include/uapi/asm/msgbuf.h | 22 +- + arch/sparc/include/uapi/asm/sembuf.h | 16 +- + arch/sparc/include/uapi/asm/shmbuf.h | 21 +- + arch/um/include/asm/Kbuild | 1 + + arch/unicore32/include/asm/Kbuild | 1 + + arch/x86/entry/vdso/vdso32/vdso-fakesections.c | 1 - + arch/x86/events/core.c | 10 +- + arch/x86/events/intel/cstate.c | 2 + + arch/x86/events/msr.c | 9 +- + arch/x86/include/asm/compat.h | 43 ++-- + arch/x86/include/asm/ftrace.h | 2 +- + arch/x86/include/asm/qspinlock.h | 21 +- + arch/x86/include/asm/qspinlock_paravirt.h | 3 +- + arch/x86/include/asm/stacktrace.h | 2 + + arch/x86/include/asm/x86_init.h | 1 + + arch/x86/include/uapi/asm/sembuf.h | 11 +- + arch/x86/kernel/cpu/centaur.c | 48 ++++ + arch/x86/kernel/cpu/mcheck/mce-inject.c | 2 +- + arch/x86/kernel/cpu/mcheck/mce.c | 18 ++ + arch/x86/kernel/dumpstack.c | 144 ++++++----- + arch/x86/kernel/i8237.c | 25 ++ + arch/x86/kernel/platform-quirks.c | 7 +- + arch/x86/kernel/process_32.c | 8 +- + arch/x86/kernel/sys_x86_64.c | 2 +- + arch/x86/mm/fault.c | 7 +- + arch/xtensa/include/asm/Kbuild | 1 + + arch/xtensa/include/uapi/asm/msgbuf.h | 25 +- + arch/xtensa/include/uapi/asm/sembuf.h | 17 +- + arch/xtensa/include/uapi/asm/shmbuf.h | 37 +-- + drivers/s390/block/dasd_ioctl.c | 1 - + drivers/s390/char/fs3270.c | 1 - + drivers/s390/char/sclp_ctl.c | 1 - + drivers/s390/char/vmcp.c | 1 - + drivers/s390/cio/chsc_sch.c | 1 - + drivers/s390/net/qeth_core_main.c | 2 +- + include/asm-generic/atomic-long.h | 19 ++ + include/asm-generic/barrier.h | 27 +- + include/asm-generic/compat.h | 3 + + include/asm-generic/qspinlock.h | 2 +- + include/asm-generic/qspinlock_types.h | 32 ++- + include/linux/atomic.h | 2 + + include/linux/compat.h | 12 +- + include/linux/compat_time.h | 23 ++ + include/linux/delayacct.h | 2 +- + include/linux/irq_sim.h | 13 +- + include/linux/kthread.h | 1 + + include/linux/restart_block.h | 7 +- + include/linux/sched.h | 50 +++- + include/linux/sched/signal.h | 2 +- + include/linux/syscalls.h | 19 +- + include/linux/time.h | 4 +- + include/linux/time64.h | 10 +- + include/uapi/asm-generic/msgbuf.h | 27 +- + include/uapi/asm-generic/posix_types.h | 1 + + include/uapi/asm-generic/sembuf.h | 26 +- + include/uapi/asm-generic/shmbuf.h | 41 ++- + include/uapi/linux/time.h | 7 + + ipc/mqueue.c | 86 +++---- + ipc/msg.c | 20 +- + ipc/sem.c | 27 +- + ipc/shm.c | 14 +- + ipc/syscall.c | 13 +- + ipc/util.h | 4 +- + kernel/compat.c | 52 +--- + kernel/delayacct.c | 17 +- + kernel/events/ring_buffer.c | 7 +- + kernel/irq/irq_sim.c | 7 +- + kernel/kthread.c | 50 ++-- + kernel/locking/mcs_spinlock.h | 10 +- + kernel/locking/mutex.c | 3 +- + kernel/locking/qspinlock.c | 247 +++++++++--------- + kernel/locking/qspinlock_paravirt.h | 49 +--- + kernel/locking/qspinlock_stat.h | 9 +- + kernel/sched/autogroup.c | 7 +- + kernel/sched/core.c | 59 ++--- + kernel/sched/fair.c | 49 ++-- + kernel/signal.c | 17 +- + kernel/stop_machine.c | 43 ++-- + kernel/time/clocksource.c | 31 +-- + kernel/time/hrtimer.c | 10 +- + kernel/time/posix-stubs.c | 12 +- + kernel/time/posix-timers.c | 24 +- + kernel/time/time.c | 58 ++++- + tools/lib/symbol/kallsyms.c | 6 + + tools/lib/symbol/kallsyms.h | 2 + + tools/perf/Documentation/Makefile | 29 ++- + tools/perf/Documentation/asciidoctor-extensions.rb | 29 +++ + tools/perf/Documentation/perf-buildid-cache.txt | 7 +- + tools/perf/Documentation/perf-stat.txt | 16 ++ + tools/perf/arch/arm/tests/dwarf-unwind.c | 2 +- + tools/perf/arch/arm64/tests/dwarf-unwind.c | 2 +- + tools/perf/arch/powerpc/tests/dwarf-unwind.c | 2 +- + tools/perf/arch/powerpc/util/skip-callchain-idx.c | 3 +- + tools/perf/arch/x86/tests/dwarf-unwind.c | 2 +- + tools/perf/builtin-annotate.c | 2 +- + tools/perf/builtin-buildid-cache.c | 77 +++++- + tools/perf/builtin-inject.c | 4 +- + tools/perf/builtin-kallsyms.c | 2 +- + tools/perf/builtin-kmem.c | 6 +- + tools/perf/builtin-report.c | 14 +- + tools/perf/builtin-script.c | 30 +-- + tools/perf/builtin-stat.c | 92 ++++++- + tools/perf/builtin-timechart.c | 8 +- + tools/perf/builtin-top.c | 7 +- + tools/perf/builtin-trace.c | 9 +- + tools/perf/check-headers.sh | 30 ++- + tools/perf/tests/builtin-test.c | 9 + + tools/perf/tests/code-reading.c | 5 +- + tools/perf/tests/hists_common.c | 6 +- + tools/perf/tests/mmap-thread-lookup.c | 7 +- + tools/perf/tests/vmlinux-kallsyms.c | 20 +- + tools/perf/ui/browsers/map.c | 2 +- + tools/perf/ui/stdio/hist.c | 3 +- + tools/perf/util/auxtrace.c | 12 +- + tools/perf/util/build-id.c | 4 +- + tools/perf/util/cs-etm.c | 4 +- + tools/perf/util/db-export.c | 7 +- + tools/perf/util/dso.c | 34 +-- + tools/perf/util/dso.h | 37 +-- + tools/perf/util/event.c | 37 ++- + tools/perf/util/genelf.c | 2 +- + tools/perf/util/intel-bts.c | 3 +- + tools/perf/util/intel-pt.c | 8 +- + tools/perf/util/machine.c | 162 +++++------- + tools/perf/util/machine.h | 47 ++-- + tools/perf/util/map.c | 99 +++----- + tools/perf/util/map.h | 59 ++--- + tools/perf/util/probe-event.c | 29 +-- + tools/perf/util/session.c | 13 +- + tools/perf/util/sort.c | 6 +- + tools/perf/util/srcline.c | 1 + + tools/perf/util/stat.h | 3 +- + tools/perf/util/symbol-elf.c | 275 ++++++++++----------- + tools/perf/util/symbol-minimal.c | 3 +- + tools/perf/util/symbol.c | 205 +++++++-------- + tools/perf/util/symbol.h | 24 +- + tools/perf/util/symbol_fprintf.c | 4 +- + tools/perf/util/thread.c | 35 ++- + tools/perf/util/thread.h | 13 +- + tools/perf/util/unwind-libdw.c | 23 +- + tools/perf/util/unwind-libunwind-local.c | 19 +- + tools/perf/util/vdso.c | 6 +- + 197 files changed, 2087 insertions(+), 2135 deletions(-) + delete mode 100644 arch/alpha/include/uapi/asm/ipcbuf.h + delete mode 100644 arch/alpha/include/uapi/asm/msgbuf.h + delete mode 100644 arch/alpha/include/uapi/asm/sembuf.h + delete mode 100644 arch/alpha/include/uapi/asm/shmbuf.h + delete mode 100644 arch/ia64/include/uapi/asm/ipcbuf.h + delete mode 100644 arch/ia64/include/uapi/asm/msgbuf.h + delete mode 100644 arch/ia64/include/uapi/asm/sembuf.h + delete mode 100644 arch/ia64/include/uapi/asm/shmbuf.h + delete mode 100644 arch/s390/include/uapi/asm/msgbuf.h + delete mode 100644 arch/s390/include/uapi/asm/sembuf.h + delete mode 100644 arch/s390/include/uapi/asm/shmbuf.h + delete mode 100644 arch/x86/entry/vdso/vdso32/vdso-fakesections.c + create mode 100644 include/asm-generic/compat.h + create mode 100644 include/linux/compat_time.h + create mode 100644 tools/perf/Documentation/asciidoctor-extensions.rb +Merging clockevents/clockevents/next (0136c741ff40 clocksource/drivers/imx-tpm: Add different counter width support) +$ git merge clockevents/clockevents/next +Already up to date. +Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp) +$ git merge edac/linux_next +Already up to date. +Merging edac-amd/for-next (83e548bea4e7 EDAC, i7core: Fix spelling mistake: "redundacy" -> "redundancy") +$ git merge edac-amd/for-next +Merge made by the 'recursive' strategy. + drivers/acpi/apei/ghes.c | 14 ++++++-------- + drivers/edac/ghes_edac.c | 9 +++++---- + drivers/edac/i7core_edac.c | 2 +- + include/acpi/ghes.h | 2 +- + 4 files changed, 13 insertions(+), 14 deletions(-) +Merging irqchip/irq/irqchip-next (aa08192a254d irqchip/gic: Take lock when updating irq type) +$ git merge irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (0c5a9acc8b4e tracing: Fix the file mode of stack tracer) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (b92e1e16d7ca torture: Make online/offline messages appear only for verbose=2) +$ git merge rcu/rcu/next +Removing tools/testing/selftests/rcutorture/configs/rcu/TREE08-T.boot +Removing tools/testing/selftests/rcutorture/bin/parse-torture.sh +Auto-merging kernel/sched/core.c +Auto-merging include/linux/sched.h +Auto-merging drivers/nvme/host/core.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + .../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 | 2 + + Documentation/admin-guide/kernel-parameters.txt | 4 +- + drivers/nvme/host/core.c | 2 +- + include/linux/rcupdate.h | 5 +- + include/linux/rcutree.h | 1 + + include/linux/sched.h | 8 - + include/linux/srcu.h | 53 +- + include/linux/torture.h | 2 +- + include/trace/events/rcu.h | 118 ++- + kernel/locking/locktorture.c | 2 +- + kernel/rcu/rcu.h | 67 +- + kernel/rcu/rcu_segcblist.c | 18 - + kernel/rcu/rcu_segcblist.h | 2 - + kernel/rcu/rcuperf.c | 30 +- + kernel/rcu/rcutorture.c | 81 +- + kernel/rcu/srcutiny.c | 9 +- + kernel/rcu/srcutree.c | 46 +- + kernel/rcu/tree.c | 964 +++++++++------------ + kernel/rcu/tree.h | 55 +- + kernel/rcu/tree_exp.h | 236 +++-- + kernel/rcu/tree_plugin.h | 218 +++-- + kernel/rcu/update.c | 50 +- + kernel/sched/core.c | 14 - + kernel/softirq.c | 3 +- + kernel/torture.c | 14 +- + kernel/trace/trace_benchmark.c | 4 +- + .../testing/selftests/rcutorture/bin/configinit.sh | 26 +- + .../testing/selftests/rcutorture/bin/kvm-build.sh | 11 +- + .../selftests/rcutorture/bin/kvm-find-errors.sh | 56 ++ + .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 13 +- + .../selftests/rcutorture/bin/kvm-recheck.sh | 5 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 6 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 2 +- + .../selftests/rcutorture/bin/parse-console.sh | 122 ++- + .../selftests/rcutorture/bin/parse-torture.sh | 105 --- + .../selftests/rcutorture/configs/rcu/TREE03.boot | 4 +- + .../selftests/rcutorture/configs/rcu/TREE08-T.boot | 1 - + .../rcutorture/configs/rcu/ver_functions.sh | 2 +- + 46 files changed, 1521 insertions(+), 1448 deletions(-) + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-find-errors.sh + delete mode 100755 tools/testing/selftests/rcutorture/bin/parse-torture.sh + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE08-T.boot +Merging kvm/linux-next (c18bb396d3d2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (dc6ed61d2f82 arm64: Add temporary ERRATA_MIDR_ALL_VERSIONS compatibility macro) +$ git merge kvm-arm/next +Already up to date. +Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E) +$ git merge kvm-mips/next +Already up to date. +Merging kvm-ppc/kvm-ppc-next (31c8b0d0694a KVM: PPC: Book3S HV: Use __gfn_to_pfn_memslot() in page fault handler) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (911eeef91b48 KVM: s390: generalize kvm_s390_get_tod_clock_ext()) +$ git merge kvms390/next +Auto-merging arch/s390/kvm/priv.c +Merge made by the 'recursive' strategy. + arch/s390/include/asm/ctl_reg.h | 12 ++++++++ + arch/s390/include/asm/kvm_host.h | 1 + + arch/s390/include/asm/mmu.h | 2 +- + arch/s390/include/asm/mmu_context.h | 2 +- + arch/s390/include/asm/pgtable.h | 4 +-- + arch/s390/kvm/guestdbg.c | 2 +- + arch/s390/kvm/interrupt.c | 20 ++++++------- + arch/s390/kvm/kvm-s390.c | 59 +++++++++++++++++++------------------ + arch/s390/kvm/kvm-s390.h | 13 ++++++++ + arch/s390/kvm/priv.c | 28 ++++++++++-------- + arch/s390/mm/gmap.c | 6 ++-- + arch/s390/mm/pgtable.c | 4 +-- + 12 files changed, 93 insertions(+), 60 deletions(-) +Merging xen-tip/linux-next (d1ecfa9d1f40 x86/xen: Reset VCPU0 info pointer after shared_info remap) +$ git merge xen-tip/linux-next +Merge made by the 'recursive' strategy. + arch/x86/xen/enlighten_hvm.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) +Merging percpu/for-next (b3a5d1119944 percpu_ref: Update doc to dissuade users from depending on internal RCU grace periods) +$ git merge percpu/for-next +Already up to date. +Merging workqueues/for-next (1aa3798360db Merge branch 'for-4.17' into for-next) +$ git merge workqueues/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging drivers-x86/for-next (6ed66c3ce095 platform/x86: Kconfig: Fix dell-laptop dependency chain.) +$ git merge drivers-x86/for-next +Merge made by the 'recursive' strategy. + drivers/platform/x86/asus-laptop.c | 3 +-- + drivers/platform/x86/asus-wmi.c | 3 +-- + drivers/platform/x86/dell-smbios-base.c | 5 ++-- + drivers/platform/x86/fujitsu-laptop.c | 47 +++++++++++++++++---------------- + drivers/platform/x86/intel_scu_ipc.c | 4 +-- + drivers/platform/x86/samsung-laptop.c | 3 +-- + 6 files changed, 31 insertions(+), 34 deletions(-) +Merging chrome-platform/for-next (60cc43fc8884 Linux 4.17-rc1) +$ git merge chrome-platform/for-next +Already up to date. +Merging hsi/for-next (70d52ba9e57e hsi: clients: Change return type to vm_fault_t) +$ git merge hsi/for-next +Merge made by the 'recursive' strategy. + drivers/hsi/clients/cmt_speech.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging leds/for-next (d54e5b522202 leds: wm831x-status: Use sysfs_match_string() helper) +$ git merge leds/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-cr0014114.txt | 54 ++++ + .../devicetree/bindings/vendor-prefixes.txt | 1 + + drivers/leds/Kconfig | 13 + + drivers/leds/Makefile | 1 + + drivers/leds/leds-cr0014114.c | 315 +++++++++++++++++++++ + drivers/leds/leds-wm831x-status.c | 22 +- + 6 files changed, 390 insertions(+), 16 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/leds-cr0014114.txt + create mode 100644 drivers/leds/leds-cr0014114.c +Merging ipmi/for-next (163475ebf9f3 ipmi: Remove the proc interface) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ipmi/npcm7xx-kcs-bmc.txt | 39 + + drivers/char/ipmi/Kconfig | 23 +- + drivers/char/ipmi/Makefile | 1 + + drivers/char/ipmi/ipmi_devintf.c | 129 +- + drivers/char/ipmi/ipmi_msghandler.c | 2088 +++++++++----------- + drivers/char/ipmi/ipmi_poweroff.c | 32 +- + drivers/char/ipmi/ipmi_si_intf.c | 198 +- + drivers/char/ipmi/ipmi_ssif.c | 183 +- + drivers/char/ipmi/ipmi_watchdog.c | 407 ++-- + drivers/char/ipmi/kcs_bmc_npcm7xx.c | 204 ++ + include/linux/ipmi.h | 153 +- + include/linux/ipmi_smi.h | 129 +- + 12 files changed, 1718 insertions(+), 1868 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ipmi/npcm7xx-kcs-bmc.txt + create mode 100644 drivers/char/ipmi/kcs_bmc_npcm7xx.c +Merging driver-core/driver-core-next (cd4846c5a68d Merge 4.17-rc3 into driver-core-next) +$ git merge driver-core/driver-core-next +Merge made by the 'recursive' strategy. + fs/kernfs/file.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging usb/usb-next (58318cd4df41 Merge 4.17-rc4 into usb-next) +$ git merge usb/usb-next +Merge made by the 'recursive' strategy. + drivers/usb/misc/sisusbvga/sisusb.c | 2 +- + drivers/usb/typec/tcpm.c | 2 +- + drivers/usb/usbip/stub_dev.c | 6 +--- + drivers/usb/usbip/stub_main.c | 66 ++++++++++++++++++++++++++++++++----- + 4 files changed, 60 insertions(+), 16 deletions(-) +Merging usb-gadget/next (60cc43fc8884 Linux 4.17-rc1) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (4d304a6fe935 USB: serial: option: blacklist unused dwm-158 interfaces) +$ git merge usb-serial/usb-next +Auto-merging drivers/usb/serial/option.c +Merge made by the 'recursive' strategy. + drivers/usb/serial/option.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging usb-chipidea-next/ci-for-usb-next (ce4c1b820c52 usb: chipidea: imx: Fix ULPI on imx53) +$ git merge usb-chipidea-next/ci-for-usb-next +Merge made by the 'recursive' strategy. +Merging phy-next/next (cd3bf368aa7a phy: Add a driver for the ATH79 USB phy) +$ git merge phy-next/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 8 +++ + drivers/phy/phy-core.c | 18 +++++ + drivers/phy/qualcomm/Kconfig | 11 ++- + drivers/phy/qualcomm/Makefile | 1 + + drivers/phy/qualcomm/phy-ath79-usb.c | 108 ++++++++++++++++++++++++++++ + drivers/phy/samsung/phy-exynos-mipi-video.c | 34 ++++----- + 6 files changed, 159 insertions(+), 21 deletions(-) + create mode 100644 drivers/phy/qualcomm/phy-ath79-usb.c +Merging tty/tty-next (7b6c81f46c5d Merge 4.17-rc3 into tty-next) +$ git merge tty/tty-next +Auto-merging arch/arm/boot/dts/armada-38x.dtsi +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/armada-38x.dtsi | 4 +- + drivers/tty/ipwireless/network.c | 2 +- + drivers/tty/n_gsm.c | 2 +- + drivers/tty/nozomi.c | 104 +++++++++++------------ + drivers/tty/serial/8250/8250_aspeed_vuart.c | 124 ++++++++++++++++++++++++++++ + drivers/tty/serial/8250/8250_dw.c | 31 ++++++- + drivers/tty/serial/8250/8250_early.c | 2 +- + drivers/tty/serial/8250/8250_of.c | 1 + + drivers/tty/serial/8250/8250_omap.c | 11 +++ + drivers/tty/serial/8250/8250_port.c | 3 +- + drivers/tty/serial/Kconfig | 6 +- + drivers/tty/serial/earlycon.c | 4 + + drivers/tty/serial/imx.c | 18 ++-- + drivers/tty/serial/msm_serial.c | 25 ++++++ + drivers/tty/serial/mvebu-uart.c | 64 ++++++++++++++ + drivers/tty/serial/qcom_geni_serial.c | 6 +- + drivers/tty/serial/sc16is7xx.c | 5 +- + drivers/tty/serial/serial_core.c | 4 +- + drivers/tty/serial/sh-sci.c | 73 ++++++++++------ + drivers/tty/serial/sh-sci.h | 4 + + drivers/tty/serial/st-asc.c | 6 +- + drivers/tty/serial/xilinx_uartps.c | 108 ++++++++++-------------- + include/linux/serial_8250.h | 1 + + include/linux/serial_core.h | 4 +- + 24 files changed, 433 insertions(+), 179 deletions(-) +Merging char-misc/char-misc-next (720d690e3680 Merge 4.17-rc3 into char-misc-next) +$ git merge char-misc/char-misc-next +Merge made by the 'recursive' strategy. + .../bindings/fpga/lattice-machxo2-spi.txt | 29 ++ + drivers/android/binder.c | 4 +- + drivers/char/mspec.c | 11 +- + drivers/firmware/google/Kconfig | 8 + + drivers/firmware/google/Makefile | 1 + + drivers/firmware/google/coreboot_table-acpi.c | 2 +- + drivers/firmware/google/coreboot_table-of.c | 2 +- + drivers/firmware/google/coreboot_table.c | 130 +++++-- + drivers/firmware/google/coreboot_table.h | 72 +++- + drivers/firmware/google/framebuffer-coreboot.c | 115 ++++++ + drivers/firmware/google/memconsole-coreboot.c | 49 +-- + drivers/firmware/google/vpd.c | 43 +-- + drivers/fpga/Kconfig | 8 +- + drivers/fpga/Makefile | 1 + + drivers/fpga/fpga-region.c | 5 + + drivers/fpga/machxo2-spi.c | 403 +++++++++++++++++++++ + drivers/misc/cxl/context.c | 7 +- + drivers/misc/sgi-xp/xpnet.c | 2 +- + drivers/misc/ti-st/st_kim.c | 2 +- + drivers/misc/tifm_7xx1.c | 6 +- + drivers/mux/adg792a.c | 5 +- + drivers/uio/uio.c | 2 +- + drivers/uio/uio_fsl_elbc_gpcm.c | 1 - + 23 files changed, 776 insertions(+), 132 deletions(-) + create mode 100644 Documentation/devicetree/bindings/fpga/lattice-machxo2-spi.txt + create mode 100644 drivers/firmware/google/framebuffer-coreboot.c + create mode 100644 drivers/fpga/machxo2-spi.c +Merging extcon/extcon-next (60cc43fc8884 Linux 4.17-rc1) +$ git merge extcon/extcon-next +Already up to date. +Merging staging/staging-next (26a5e9b834a6 staging: mt7621-eth: Alignment should match open parenthesis) +$ git merge staging/staging-next +Removing drivers/staging/most/dim2/dim2.h +Removing drivers/staging/lustre/lnet/libcfs/linux/linux-module.c +Removing drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c +Removing drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h +Removing drivers/staging/lustre/include/linux/libcfs/linux/linux-cpu.h +Removing drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h +Removing drivers/staging/lustre/include/linux/libcfs/libcfs_time.h +Removing drivers/staging/ks7010/ks7010_sdio.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 + + drivers/staging/android/Kconfig | 11 +- + drivers/staging/android/Makefile | 1 + + drivers/staging/android/TODO | 9 + + drivers/staging/android/ashmem.h | 6 +- + drivers/staging/android/ion/Kconfig | 2 +- + drivers/staging/android/ion/ion.c | 7 +- + drivers/staging/android/ion/ion.h | 2 +- + drivers/staging/android/ion/ion_page_pool.c | 5 + + drivers/staging/android/uapi/ashmem.h | 6 +- + drivers/staging/android/uapi/ion.h | 2 +- + drivers/staging/android/uapi/vsoc_shm.h | 295 ++ + drivers/staging/android/vsoc.c | 1152 +++++ + drivers/staging/board/armadillo800eva.c | 10 +- + drivers/staging/board/board.c | 5 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 6 +- + drivers/staging/emxx_udc/Kconfig | 2 +- + drivers/staging/emxx_udc/TODO | 2 + + drivers/staging/fbtft/TODO | 4 + + drivers/staging/fbtft/fbtft-bus.c | 13 +- + drivers/staging/fsl-dpaa2/Kconfig | 8 + + drivers/staging/fsl-dpaa2/Makefile | 5 +- + drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c | 111 +- + drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h | 49 +- + drivers/staging/fsl-dpaa2/ethernet/dpaa2-ethtool.c | 23 + + drivers/staging/fsl-dpaa2/ethsw/dpsw-cmd.h | 13 + + drivers/staging/fsl-dpaa2/ethsw/dpsw.c | 42 + + drivers/staging/fsl-dpaa2/ethsw/dpsw.h | 6 + + drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 39 +- + drivers/staging/fsl-dpaa2/rtc/Makefile | 7 + + drivers/staging/fsl-dpaa2/rtc/dprtc-cmd.h | 137 + + drivers/staging/fsl-dpaa2/rtc/dprtc.c | 701 +++ + drivers/staging/fsl-dpaa2/rtc/dprtc.h | 164 + + drivers/staging/fsl-dpaa2/rtc/rtc.c | 229 + + drivers/staging/fsl-dpaa2/rtc/rtc.h | 14 + + drivers/staging/fsl-mc/bus/dpio/dpio-driver.c | 28 +- + drivers/staging/fsl-mc/bus/dpio/qbman-portal.h | 4 +- + drivers/staging/fsl-mc/include/dpaa2-io.h | 2 +- + drivers/staging/gdm724x/gdm_endian.c | 14 +- + drivers/staging/gdm724x/gdm_endian.h | 14 +- + drivers/staging/gdm724x/gdm_lte.c | 16 +- + drivers/staging/gdm724x/gdm_lte.h | 14 +- + drivers/staging/gdm724x/gdm_mux.c | 14 +- + drivers/staging/gdm724x/gdm_mux.h | 14 +- + drivers/staging/gdm724x/gdm_tty.c | 14 +- + drivers/staging/gdm724x/gdm_tty.h | 14 +- + drivers/staging/gdm724x/gdm_usb.c | 14 +- + drivers/staging/gdm724x/gdm_usb.h | 14 +- + drivers/staging/gdm724x/hci.h | 14 +- + drivers/staging/gdm724x/hci_packet.h | 14 +- + drivers/staging/gdm724x/netlink_k.c | 14 +- + drivers/staging/gdm724x/netlink_k.h | 14 +- + drivers/staging/greybus/TODO | 5 + + drivers/staging/greybus/arche-platform.c | 9 +- + drivers/staging/greybus/audio_codec.h | 5 +- + drivers/staging/greybus/svc.c | 3 - + drivers/staging/iio/TODO | 9 +- + drivers/staging/ks7010/eap_packet.h | 74 +- + drivers/staging/ks7010/ks7010_sdio.c | 623 +-- + drivers/staging/ks7010/ks7010_sdio.h | 164 - + drivers/staging/ks7010/ks_hostif.c | 970 ++--- + drivers/staging/ks7010/ks_hostif.h | 465 +- + drivers/staging/ks7010/ks_wlan.h | 275 +- + drivers/staging/ks7010/ks_wlan_ioctl.h | 7 +- + drivers/staging/ks7010/ks_wlan_net.c | 1118 ++--- + drivers/staging/ks7010/michael_mic.c | 28 +- + drivers/staging/ks7010/michael_mic.h | 11 +- + .../staging/lustre/include/linux/libcfs/curproc.h | 2 - + .../staging/lustre/include/linux/libcfs/libcfs.h | 65 +- + .../lustre/include/linux/libcfs/libcfs_cpu.h | 206 +- + .../lustre/include/linux/libcfs/libcfs_debug.h | 32 + + .../lustre/include/linux/libcfs/libcfs_time.h | 79 - + .../lustre/include/linux/libcfs/linux/libcfs.h | 133 - + .../lustre/include/linux/libcfs/linux/linux-cpu.h | 78 - + .../lustre/include/linux/libcfs/linux/linux-time.h | 103 - + .../lustre/include/uapi/linux/lnet/lnet-dlc.h | 3 +- + .../lustre/include/uapi/linux/lnet/lnetctl.h | 11 - + .../include/uapi/linux/lustre/lustre_ioctl.h | 2 - + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 34 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 23 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 72 +- + .../lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c | 9 + + .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 15 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 87 +- + drivers/staging/lustre/lnet/libcfs/Makefile | 2 - + drivers/staging/lustre/lnet/libcfs/debug.c | 2 +- + drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c | 961 ++++- + .../staging/lustre/lnet/libcfs/linux/linux-cpu.c | 1079 ----- + .../staging/lustre/lnet/libcfs/linux/linux-debug.c | 1 - + .../lustre/lnet/libcfs/linux/linux-module.c | 197 - + drivers/staging/lustre/lnet/libcfs/module.c | 162 +- + drivers/staging/lustre/lnet/libcfs/tracefile.c | 12 +- + drivers/staging/lustre/lnet/lnet/lib-move.c | 14 +- + drivers/staging/lustre/lnet/lnet/net_fault.c | 40 +- + drivers/staging/lustre/lnet/lnet/peer.c | 2 +- + drivers/staging/lustre/lnet/lnet/router.c | 17 +- + drivers/staging/lustre/lnet/lnet/router_proc.c | 13 +- + drivers/staging/lustre/lnet/selftest/conrpc.c | 14 +- + drivers/staging/lustre/lnet/selftest/console.c | 4 +- + drivers/staging/lustre/lnet/selftest/framework.c | 2 +- + drivers/staging/lustre/lnet/selftest/timer.c | 4 +- + drivers/staging/lustre/lustre/include/cl_object.h | 10 +- + drivers/staging/lustre/lustre/include/lu_object.h | 42 +- + drivers/staging/lustre/lustre/include/lustre_dlm.h | 18 +- + .../staging/lustre/lustre/include/lustre_export.h | 9 +- + drivers/staging/lustre/lustre/include/lustre_net.h | 11 +- + drivers/staging/lustre/lustre/include/obd.h | 24 +- + drivers/staging/lustre/lustre/include/obd_class.h | 13 +- + .../staging/lustre/lustre/include/obd_support.h | 27 - + drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 11 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 22 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 5 +- + drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 66 +- + drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 30 +- + drivers/staging/lustre/lustre/llite/dir.c | 2 + + drivers/staging/lustre/lustre/llite/file.c | 16 +- + drivers/staging/lustre/lustre/llite/lcommon_cl.c | 8 +- + .../staging/lustre/lustre/llite/llite_internal.h | 2 +- + drivers/staging/lustre/lustre/llite/llite_lib.c | 4 +- + drivers/staging/lustre/lustre/llite/llite_nfs.c | 2 +- + drivers/staging/lustre/lustre/llite/lproc_llite.c | 12 +- + drivers/staging/lustre/lustre/llite/namei.c | 9 +- + drivers/staging/lustre/lustre/llite/statahead.c | 4 +- + drivers/staging/lustre/lustre/llite/vvp_dev.c | 166 +- + drivers/staging/lustre/lustre/llite/vvp_internal.h | 8 +- + drivers/staging/lustre/lustre/llite/xattr.c | 227 +- + drivers/staging/lustre/lustre/llite/xattr_cache.c | 83 +- + drivers/staging/lustre/lustre/lmv/lmv_intent.c | 12 +- + drivers/staging/lustre/lustre/lmv/lmv_internal.h | 2 +- + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 16 +- + .../staging/lustre/lustre/lov/lov_cl_internal.h | 18 +- + drivers/staging/lustre/lustre/lov/lov_internal.h | 13 +- + drivers/staging/lustre/lustre/lov/lov_obd.c | 14 +- + drivers/staging/lustre/lustre/lov/lov_object.c | 8 +- + drivers/staging/lustre/lustre/lov/lov_pool.c | 159 +- + drivers/staging/lustre/lustre/lov/lov_request.c | 4 +- + drivers/staging/lustre/lustre/mdc/mdc_internal.h | 4 +- + drivers/staging/lustre/lustre/mdc/mdc_locks.c | 68 +- + drivers/staging/lustre/lustre/mdc/mdc_request.c | 2 +- + drivers/staging/lustre/lustre/obdclass/cl_io.c | 1 - + drivers/staging/lustre/lustre/obdclass/cl_object.c | 1 - + drivers/staging/lustre/lustre/obdclass/class_obd.c | 6 +- + drivers/staging/lustre/lustre/obdclass/genops.c | 36 +- + .../lustre/lustre/obdclass/linux/linux-module.c | 3 +- + .../lustre/lustre/obdclass/lprocfs_status.c | 12 +- + drivers/staging/lustre/lustre/obdclass/lu_object.c | 253 +- + .../staging/lustre/lustre/obdclass/obd_config.c | 163 +- + .../staging/lustre/lustre/obdecho/echo_client.c | 2 +- + drivers/staging/lustre/lustre/osc/osc_cache.c | 2 +- + .../staging/lustre/lustre/osc/osc_cl_internal.h | 10 +- + drivers/staging/lustre/lustre/osc/osc_internal.h | 7 +- + drivers/staging/lustre/lustre/osc/osc_io.c | 2 +- + drivers/staging/lustre/lustre/osc/osc_object.c | 11 +- + drivers/staging/lustre/lustre/osc/osc_page.c | 4 +- + drivers/staging/lustre/lustre/osc/osc_quota.c | 136 +- + drivers/staging/lustre/lustre/osc/osc_request.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/client.c | 4 +- + drivers/staging/lustre/lustre/ptlrpc/connection.c | 164 +- + drivers/staging/lustre/lustre/ptlrpc/import.c | 10 +- + drivers/staging/lustre/lustre/ptlrpc/pinger.c | 23 +- + drivers/staging/lustre/lustre/ptlrpc/service.c | 6 +- + drivers/staging/media/atomisp/TODO | 5 + + drivers/staging/most/cdev/cdev.c | 16 +- + drivers/staging/most/core.c | 68 +- + drivers/staging/most/core.h | 4 + + drivers/staging/most/dim2/Kconfig | 2 +- + drivers/staging/most/dim2/dim2.c | 397 +- + drivers/staging/most/dim2/dim2.h | 21 - + drivers/staging/most/dim2/hal.c | 9 +- + drivers/staging/most/dim2/reg.h | 84 +- + drivers/staging/most/i2c/i2c.c | 140 +- + drivers/staging/most/sound/sound.c | 123 +- + drivers/staging/most/usb/usb.c | 55 +- + drivers/staging/mt7621-dts/gbpc1.dts | 3 +- + drivers/staging/mt7621-dts/mt7621.dtsi | 9 +- + drivers/staging/mt7621-eth/ethtool.c | 2 +- + drivers/staging/mt7621-eth/gsw_mt7621.c | 3 +- + drivers/staging/mt7621-eth/mdio.c | 3 + + drivers/staging/mt7621-eth/mtk_eth_soc.c | 27 +- + drivers/staging/mt7621-eth/soc_mt7621.c | 1 - + drivers/staging/mt7621-gpio/gpio-mt7621.c | 14 +- + drivers/staging/mt7621-mmc/board.h | 82 +- + drivers/staging/mt7621-mmc/dbg.c | 397 +- + drivers/staging/mt7621-mmc/dbg.h | 97 +- + drivers/staging/mt7621-mmc/mt6575_sd.h | 1087 +++-- + drivers/staging/mt7621-mmc/sd.c | 4456 +++++++++----------- + drivers/staging/mt7621-pci/pci-mt7621.c | 478 +-- + drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c | 1 - + drivers/staging/mt7621-spi/spi-mt7621.c | 4 - + drivers/staging/nvec/nvec.c | 81 +- + drivers/staging/nvec/nvec.h | 2 +- + drivers/staging/olpc_dcon/TODO | 4 + + .../pi433/Documentation/devicetree/pi433.txt | 6 +- + drivers/staging/pi433/Documentation/pi433.txt | 10 +- + drivers/staging/pi433/Kconfig | 2 +- + drivers/staging/pi433/pi433_if.c | 39 +- + drivers/staging/pi433/rf69.c | 182 +- + drivers/staging/pi433/rf69.h | 28 +- + drivers/staging/rtl8192e/dot11d.c | 2 +- + .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 2 +- + .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 2 +- + .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 2 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 2 +- + drivers/staging/rtl8192u/r8192U_core.c | 2 +- + drivers/staging/rtl8192u/r8192U_dm.c | 4 +- + drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 2 +- + drivers/staging/rtl8723bs/include/wifi.h | 12 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 2 +- + drivers/staging/rtlwifi/base.c | 13 +- + drivers/staging/rtlwifi/base.h | 13 +- + drivers/staging/rtlwifi/btcoexist/halbt_precomp.h | 13 +- + .../staging/rtlwifi/btcoexist/halbtc8822b1ant.c | 13 +- + .../staging/rtlwifi/btcoexist/halbtc8822b1ant.h | 13 +- + .../staging/rtlwifi/btcoexist/halbtc8822b2ant.c | 13 +- + .../staging/rtlwifi/btcoexist/halbtc8822b2ant.h | 13 +- + .../rtlwifi/btcoexist/halbtc8822bwifionly.c | 13 +- + .../rtlwifi/btcoexist/halbtc8822bwifionly.h | 13 +- + drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c | 13 +- + drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.h | 13 +- + drivers/staging/rtlwifi/btcoexist/rtl_btc.c | 13 +- + drivers/staging/rtlwifi/btcoexist/rtl_btc.h | 13 +- + drivers/staging/rtlwifi/cam.c | 13 +- + drivers/staging/rtlwifi/cam.h | 13 +- + drivers/staging/rtlwifi/core.c | 13 +- + drivers/staging/rtlwifi/core.h | 13 +- + drivers/staging/rtlwifi/debug.c | 13 +- + drivers/staging/rtlwifi/debug.h | 13 +- + drivers/staging/rtlwifi/efuse.c | 13 +- + drivers/staging/rtlwifi/efuse.h | 13 +- + drivers/staging/rtlwifi/halmac/halmac_2_platform.h | 13 +- + .../halmac_88xx/halmac_8822b/halmac_8822b_cfg.h | 13 +- + .../halmac_88xx/halmac_8822b/halmac_8822b_phy.c | 13 +- + .../halmac_8822b/halmac_8822b_pwr_seq.c | 13 +- + .../halmac_8822b/halmac_8822b_pwr_seq.h | 13 +- + .../halmac_88xx/halmac_8822b/halmac_api_8822b.c | 13 +- + .../halmac_88xx/halmac_8822b/halmac_api_8822b.h | 13 +- + .../halmac_8822b/halmac_api_8822b_pcie.c | 13 +- + .../halmac_8822b/halmac_api_8822b_pcie.h | 13 +- + .../halmac_8822b/halmac_api_8822b_sdio.c | 13 +- + .../halmac_8822b/halmac_api_8822b_sdio.h | 13 +- + .../halmac_8822b/halmac_api_8822b_usb.c | 13 +- + .../halmac_8822b/halmac_api_8822b_usb.h | 13 +- + .../halmac_88xx/halmac_8822b/halmac_func_8822b.c | 13 +- + .../halmac_88xx/halmac_8822b/halmac_func_8822b.h | 13 +- + .../rtlwifi/halmac/halmac_88xx/halmac_88xx_cfg.h | 13 +- + .../rtlwifi/halmac/halmac_88xx/halmac_api_88xx.c | 13 +- + .../rtlwifi/halmac/halmac_88xx/halmac_api_88xx.h | 13 +- + .../halmac/halmac_88xx/halmac_api_88xx_pcie.c | 13 +- + .../halmac/halmac_88xx/halmac_api_88xx_pcie.h | 13 +- + .../halmac/halmac_88xx/halmac_api_88xx_sdio.c | 13 +- + .../halmac/halmac_88xx/halmac_api_88xx_sdio.h | 13 +- + .../halmac/halmac_88xx/halmac_api_88xx_usb.c | 13 +- + .../halmac/halmac_88xx/halmac_api_88xx_usb.h | 13 +- + .../rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c | 13 +- + .../rtlwifi/halmac/halmac_88xx/halmac_func_88xx.h | 13 +- + drivers/staging/rtlwifi/halmac/halmac_api.c | 13 +- + drivers/staging/rtlwifi/halmac/halmac_api.h | 13 +- + drivers/staging/rtlwifi/halmac/halmac_bit2.h | 13 +- + drivers/staging/rtlwifi/halmac/halmac_bit_8822b.h | 13 +- + drivers/staging/rtlwifi/halmac/halmac_fw_info.h | 13 +- + .../rtlwifi/halmac/halmac_fw_offload_c2h_nic.h | 13 +- + .../rtlwifi/halmac/halmac_fw_offload_h2c_nic.h | 13 +- + .../rtlwifi/halmac/halmac_h2c_extra_info_nic.h | 13 +- + .../staging/rtlwifi/halmac/halmac_intf_phy_cmd.h | 13 +- + .../rtlwifi/halmac/halmac_original_c2h_nic.h | 13 +- + .../rtlwifi/halmac/halmac_original_h2c_nic.h | 13 +- + drivers/staging/rtlwifi/halmac/halmac_pcie_reg.h | 13 +- + .../staging/rtlwifi/halmac/halmac_pwr_seq_cmd.h | 13 +- + drivers/staging/rtlwifi/halmac/halmac_reg2.h | 13 +- + drivers/staging/rtlwifi/halmac/halmac_reg_8822b.h | 13 +- + drivers/staging/rtlwifi/halmac/halmac_rx_bd_chip.h | 13 +- + drivers/staging/rtlwifi/halmac/halmac_rx_bd_nic.h | 13 +- + .../staging/rtlwifi/halmac/halmac_rx_desc_chip.h | 13 +- + .../staging/rtlwifi/halmac/halmac_rx_desc_nic.h | 13 +- + drivers/staging/rtlwifi/halmac/halmac_sdio_reg.h | 13 +- + drivers/staging/rtlwifi/halmac/halmac_tx_bd_chip.h | 13 +- + drivers/staging/rtlwifi/halmac/halmac_tx_bd_nic.h | 13 +- + .../staging/rtlwifi/halmac/halmac_tx_desc_chip.h | 13 +- + .../staging/rtlwifi/halmac/halmac_tx_desc_nic.h | 13 +- + drivers/staging/rtlwifi/halmac/halmac_type.h | 13 +- + drivers/staging/rtlwifi/halmac/halmac_usb_reg.h | 13 +- + drivers/staging/rtlwifi/halmac/rtl_halmac.c | 13 +- + drivers/staging/rtlwifi/halmac/rtl_halmac.h | 13 +- + drivers/staging/rtlwifi/pci.c | 13 +- + drivers/staging/rtlwifi/pci.h | 13 +- + drivers/staging/rtlwifi/phydm/halphyrf_ce.c | 13 +- + drivers/staging/rtlwifi/phydm/halphyrf_ce.h | 13 +- + drivers/staging/rtlwifi/phydm/mp_precomp.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm.c | 13 +- + drivers/staging/rtlwifi/phydm/phydm.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_acs.c | 13 +- + drivers/staging/rtlwifi/phydm/phydm_acs.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_adaptivity.c | 13 +- + drivers/staging/rtlwifi/phydm/phydm_adaptivity.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c | 13 +- + drivers/staging/rtlwifi/phydm/phydm_adc_sampling.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_antdiv.c | 13 +- + drivers/staging/rtlwifi/phydm/phydm_antdiv.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_beamforming.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_ccx.c | 13 +- + drivers/staging/rtlwifi/phydm/phydm_ccx.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_cfotracking.c | 13 +- + drivers/staging/rtlwifi/phydm/phydm_cfotracking.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_debug.c | 13 +- + drivers/staging/rtlwifi/phydm/phydm_debug.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_dfs.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_dig.c | 13 +- + drivers/staging/rtlwifi/phydm/phydm_dig.h | 13 +- + .../staging/rtlwifi/phydm/phydm_dynamic_rx_path.h | 13 +- + .../rtlwifi/phydm/phydm_dynamicbbpowersaving.c | 13 +- + .../rtlwifi/phydm/phydm_dynamicbbpowersaving.h | 13 +- + .../staging/rtlwifi/phydm/phydm_dynamictxpower.c | 13 +- + .../staging/rtlwifi/phydm/phydm_dynamictxpower.h | 13 +- + .../staging/rtlwifi/phydm/phydm_edcaturbocheck.c | 13 +- + .../staging/rtlwifi/phydm/phydm_edcaturbocheck.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_features.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_hwconfig.c | 13 +- + drivers/staging/rtlwifi/phydm/phydm_hwconfig.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_interface.c | 13 +- + drivers/staging/rtlwifi/phydm/phydm_interface.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_iqk.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_kfree.c | 13 +- + drivers/staging/rtlwifi/phydm/phydm_kfree.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_noisemonitor.c | 13 +- + drivers/staging/rtlwifi/phydm/phydm_noisemonitor.h | 13 +- + .../staging/rtlwifi/phydm/phydm_powertracking_ce.c | 13 +- + .../staging/rtlwifi/phydm/phydm_powertracking_ce.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_pre_define.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_precomp.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_psd.c | 13 +- + drivers/staging/rtlwifi/phydm/phydm_psd.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_rainfo.c | 13 +- + drivers/staging/rtlwifi/phydm/phydm_rainfo.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_reg.h | 13 +- + .../staging/rtlwifi/phydm/phydm_regdefine11ac.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_regdefine11n.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_types.h | 13 +- + .../rtlwifi/phydm/rtl8822b/halhwimg8822b_bb.c | 13 +- + .../rtlwifi/phydm/rtl8822b/halhwimg8822b_bb.h | 13 +- + .../rtlwifi/phydm/rtl8822b/halhwimg8822b_mac.c | 13 +- + .../rtlwifi/phydm/rtl8822b/halhwimg8822b_mac.h | 13 +- + .../rtlwifi/phydm/rtl8822b/halhwimg8822b_rf.c | 13 +- + .../rtlwifi/phydm/rtl8822b/halhwimg8822b_rf.h | 13 +- + .../rtlwifi/phydm/rtl8822b/halphyrf_8822b.c | 47 +- + .../rtlwifi/phydm/rtl8822b/halphyrf_8822b.h | 13 +- + .../rtlwifi/phydm/rtl8822b/phydm_hal_api8822b.c | 13 +- + .../rtlwifi/phydm/rtl8822b/phydm_hal_api8822b.h | 13 +- + .../rtlwifi/phydm/rtl8822b/phydm_iqk_8822b.c | 13 +- + .../rtlwifi/phydm/rtl8822b/phydm_iqk_8822b.h | 13 +- + .../rtlwifi/phydm/rtl8822b/phydm_regconfig8822b.c | 13 +- + .../rtlwifi/phydm/rtl8822b/phydm_regconfig8822b.h | 13 +- + .../rtlwifi/phydm/rtl8822b/phydm_rtl8822b.c | 13 +- + .../rtlwifi/phydm/rtl8822b/phydm_rtl8822b.h | 13 +- + .../rtlwifi/phydm/rtl8822b/version_rtl8822b.h | 13 +- + drivers/staging/rtlwifi/phydm/rtl_phydm.c | 13 +- + drivers/staging/rtlwifi/phydm/rtl_phydm.h | 13 +- + drivers/staging/rtlwifi/phydm/txbf/halcomtxbf.h | 13 +- + drivers/staging/rtlwifi/phydm/txbf/haltxbf8822b.h | 13 +- + .../staging/rtlwifi/phydm/txbf/haltxbfinterface.h | 13 +- + drivers/staging/rtlwifi/phydm/txbf/haltxbfjaguar.h | 13 +- + .../rtlwifi/phydm/txbf/phydm_hal_txbf_api.h | 13 +- + drivers/staging/rtlwifi/ps.c | 13 +- + drivers/staging/rtlwifi/ps.h | 13 +- + drivers/staging/rtlwifi/pwrseqcmd.h | 13 +- + drivers/staging/rtlwifi/rc.c | 13 +- + drivers/staging/rtlwifi/rc.h | 13 +- + drivers/staging/rtlwifi/regd.c | 13 +- + drivers/staging/rtlwifi/regd.h | 13 +- + drivers/staging/rtlwifi/rtl8822be/def.h | 13 +- + drivers/staging/rtlwifi/rtl8822be/fw.c | 13 +- + drivers/staging/rtlwifi/rtl8822be/fw.h | 13 +- + drivers/staging/rtlwifi/rtl8822be/hw.c | 13 +- + drivers/staging/rtlwifi/rtl8822be/hw.h | 13 +- + drivers/staging/rtlwifi/rtl8822be/led.c | 13 +- + drivers/staging/rtlwifi/rtl8822be/led.h | 13 +- + drivers/staging/rtlwifi/rtl8822be/phy.c | 13 +- + drivers/staging/rtlwifi/rtl8822be/phy.h | 13 +- + drivers/staging/rtlwifi/rtl8822be/reg.h | 13 +- + drivers/staging/rtlwifi/rtl8822be/sw.c | 13 +- + drivers/staging/rtlwifi/rtl8822be/sw.h | 13 +- + drivers/staging/rtlwifi/rtl8822be/trx.c | 13 +- + drivers/staging/rtlwifi/rtl8822be/trx.h | 13 +- + drivers/staging/rtlwifi/stats.c | 13 +- + drivers/staging/rtlwifi/stats.h | 13 +- + drivers/staging/rtlwifi/wifi.h | 13 +- + drivers/staging/sm750fb/TODO | 5 +- + drivers/staging/speakup/buffers.c | 3 + + drivers/staging/speakup/main.c | 7 + + drivers/staging/speakup/speakup.h | 3 +- + drivers/staging/speakup/speakup_dummy.c | 1 + + drivers/staging/speakup/speakup_soft.c | 3 +- + drivers/staging/speakup/spk_types.h | 2 +- + drivers/staging/speakup/varhandlers.c | 1 + + drivers/staging/unisys/visornic/visornic_main.c | 2 +- + drivers/staging/vboxvideo/vbox_main.c | 3 +- + drivers/staging/vboxvideo/vbox_mode.c | 2 +- + drivers/staging/vc04_services/Kconfig | 1 - + drivers/staging/vc04_services/Makefile | 2 +- + .../vc04_services/bcm2835-audio/bcm2835-vchiq.c | 64 +- + .../staging/vc04_services/bcm2835-audio/bcm2835.c | 43 +- + .../staging/vc04_services/bcm2835-audio/bcm2835.h | 12 + + drivers/staging/vc04_services/interface/vchi/TODO | 9 +- + .../vc04_services/interface/vchi/vchi_common.h | 2 - + .../interface/vchiq_arm/vchiq_2835_arm.c | 6 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 77 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 55 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 1 - + .../vc04_services/interface/vchiq_arm/vchiq_shim.c | 1 - + drivers/staging/vt6655/card.c | 5 +- + drivers/staging/vt6655/device_main.c | 150 +- + drivers/staging/wilc1000/TODO | 12 +- + drivers/staging/wilc1000/coreconfigurator.c | 89 +- + drivers/staging/wilc1000/coreconfigurator.h | 27 - + drivers/staging/wilc1000/host_interface.c | 147 +- + drivers/staging/wilc1000/host_interface.h | 4 +- + drivers/staging/wilc1000/linux_mon.c | 65 +- + drivers/staging/wilc1000/linux_wlan.c | 363 +- + drivers/staging/wilc1000/wilc_debugfs.c | 2 - + drivers/staging/wilc1000/wilc_sdio.c | 106 +- + drivers/staging/wilc1000/wilc_spi.c | 99 +- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 899 ++-- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.h | 15 +- + drivers/staging/wilc1000/wilc_wfi_netdevice.h | 75 +- + drivers/staging/wilc1000/wilc_wlan.c | 19 +- + drivers/staging/wilc1000/wilc_wlan.h | 37 +- + drivers/staging/wilc1000/wilc_wlan_cfg.c | 1 - + drivers/staging/wilc1000/wilc_wlan_if.h | 15 +- + drivers/staging/wlan-ng/hfa384x.h | 2 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 5 +- + drivers/staging/wlan-ng/p80211conv.h | 2 +- + drivers/staging/wlan-ng/p80211hdr.h | 2 +- + drivers/staging/wlan-ng/p80211ioctl.h | 2 +- + drivers/staging/wlan-ng/p80211metadef.h | 2 +- + drivers/staging/wlan-ng/p80211metastruct.h | 2 +- + drivers/staging/wlan-ng/p80211mgmt.h | 2 +- + drivers/staging/wlan-ng/p80211msg.h | 2 +- + drivers/staging/wlan-ng/p80211netdev.c | 4 +- + drivers/staging/wlan-ng/p80211netdev.h | 2 +- + drivers/staging/wlan-ng/p80211req.h | 2 +- + drivers/staging/wlan-ng/p80211types.h | 2 +- + drivers/staging/wlan-ng/prism2mgmt.h | 2 +- + drivers/staging/wlan-ng/prism2sta.c | 52 +- + include/linux/kernel.h | 16 + + 443 files changed, 12173 insertions(+), 13257 deletions(-) + create mode 100644 drivers/staging/android/uapi/vsoc_shm.h + create mode 100644 drivers/staging/android/vsoc.c + create mode 100644 drivers/staging/fbtft/TODO + create mode 100644 drivers/staging/fsl-dpaa2/rtc/Makefile + create mode 100644 drivers/staging/fsl-dpaa2/rtc/dprtc-cmd.h + create mode 100644 drivers/staging/fsl-dpaa2/rtc/dprtc.c + create mode 100644 drivers/staging/fsl-dpaa2/rtc/dprtc.h + create mode 100644 drivers/staging/fsl-dpaa2/rtc/rtc.c + create mode 100644 drivers/staging/fsl-dpaa2/rtc/rtc.h + create mode 100644 drivers/staging/greybus/TODO + delete mode 100644 drivers/staging/ks7010/ks7010_sdio.h + delete mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_time.h + delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h + delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-cpu.h + delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h + delete mode 100644 drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c + delete mode 100644 drivers/staging/lustre/lnet/libcfs/linux/linux-module.c + delete mode 100644 drivers/staging/most/dim2/dim2.h +Merging mux/for-next (fa934c06c0f4 mux: add mux_control_get_optional() API) +$ git merge mux/for-next +Merge made by the 'recursive' strategy. + Documentation/driver-model/devres.txt | 1 + + drivers/mux/core.c | 104 +++++++++++++++++++++++++++------- + include/linux/mux/consumer.h | 4 ++ + 3 files changed, 89 insertions(+), 20 deletions(-) +Merging slave-dma/next (95c1e4acb0c4 Merge branch 'topic/sprd' into next) +$ git merge slave-dma/next +Auto-merging drivers/dma/ti/omap-dma.c +Auto-merging drivers/dma/ti/edma.c +Auto-merging drivers/dma/ti/cppi41.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 1 + + MAINTAINERS | 8 + + drivers/dma/Kconfig | 31 +-- + drivers/dma/Makefile | 5 +- + drivers/dma/at_hdmac.c | 9 +- + drivers/dma/at_xdmac.c | 9 +- + drivers/dma/dma-axi-dmac.c | 2 +- + drivers/dma/dmatest.c | 16 +- + drivers/dma/dw/platform.c | 6 +- + drivers/dma/fsldma.c | 6 +- + drivers/dma/idma64.c | 6 +- + drivers/dma/pl330.c | 209 ++++++++++++++++----- + drivers/dma/qcom/hidma.c | 3 +- + drivers/dma/qcom/hidma_mgmt_sys.c | 6 +- + drivers/dma/sh/shdmac.c | 50 +++-- + drivers/dma/sprd-dma.c | 84 +++------ + drivers/dma/ste_dma40.c | 12 +- + drivers/dma/stm32-mdma.c | 100 ++++++---- + drivers/dma/ti/Kconfig | 37 ++++ + drivers/dma/ti/Makefile | 5 + + drivers/dma/{ => ti}/cppi41.c | 2 +- + .../dma/{ti-dma-crossbar.c => ti/dma-crossbar.c} | 0 + drivers/dma/{ => ti}/edma.c | 4 +- + drivers/dma/{ => ti}/omap-dma.c | 2 +- + drivers/dma/txx9dmac.c | 8 +- + include/linux/dma/sprd-dma.h | 57 ++++++ + 26 files changed, 414 insertions(+), 264 deletions(-) + create mode 100644 drivers/dma/ti/Kconfig + create mode 100644 drivers/dma/ti/Makefile + rename drivers/dma/{ => ti}/cppi41.c (99%) + rename drivers/dma/{ti-dma-crossbar.c => ti/dma-crossbar.c} (100%) + rename drivers/dma/{ => ti}/edma.c (99%) + rename drivers/dma/{ => ti}/omap-dma.c (99%) + create mode 100644 include/linux/dma/sprd-dma.h +Merging cgroup/for-next (28610df5c585 selftests/cgroup: memory controller self-tests) +$ git merge cgroup/for-next +Removing kernel/cgroup/stat.c +Auto-merging kernel/cgroup/cgroup.c +Merge made by the 'recursive' strategy. + include/linux/cgroup-defs.h | 52 +- + include/linux/cgroup.h | 12 +- + kernel/cgroup/Makefile | 2 +- + kernel/cgroup/cgroup-internal.h | 11 +- + kernel/cgroup/cgroup.c | 89 ++- + kernel/cgroup/rdma.c | 35 +- + kernel/cgroup/rstat.c | 416 +++++++++++++ + kernel/cgroup/stat.c | 338 ----------- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/cgroup/Makefile | 10 + + tools/testing/selftests/cgroup/cgroup_util.c | 317 ++++++++++ + tools/testing/selftests/cgroup/cgroup_util.h | 40 ++ + tools/testing/selftests/cgroup/test_memcontrol.c | 741 +++++++++++++++++++++++ + 13 files changed, 1655 insertions(+), 409 deletions(-) + create mode 100644 kernel/cgroup/rstat.c + delete mode 100644 kernel/cgroup/stat.c + create mode 100644 tools/testing/selftests/cgroup/Makefile + create mode 100644 tools/testing/selftests/cgroup/cgroup_util.c + create mode 100644 tools/testing/selftests/cgroup/cgroup_util.h + create mode 100644 tools/testing/selftests/cgroup/test_memcontrol.c +Merging scsi/for-next (5d2e147b4963 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/net/hyperv/netvsc_drv.c +Auto-merging drivers/net/hyperv/netvsc.c +Auto-merging drivers/net/hyperv/hyperv_net.h +Auto-merging Documentation/driver-api/index.rst +Merge made by the 'recursive' strategy. + Documentation/driver-api/index.rst | 1 + + Documentation/driver-api/scsi.rst | 2 +- + Documentation/driver-api/target.rst | 64 ++ + drivers/ata/libata-scsi.c | 12 + + drivers/hv/ring_buffer.c | 2 + + drivers/message/fusion/lsi/mpi_cnfg.h | 4 +- + drivers/message/fusion/mptfc.c | 2 +- + drivers/net/hyperv/hyperv_net.h | 1 - + drivers/net/hyperv/netvsc.c | 18 +- + drivers/net/hyperv/netvsc_drv.c | 3 - + drivers/scsi/Kconfig | 14 + + drivers/scsi/Makefile | 3 +- + drivers/scsi/a100u2w.c | 13 +- + drivers/scsi/aacraid/commsup.c | 8 +- + drivers/scsi/am53c974.c | 13 +- + drivers/scsi/cxlflash/Kconfig | 2 +- + drivers/scsi/cxlflash/Makefile | 2 +- + drivers/scsi/cxlflash/backend.h | 50 +- + drivers/scsi/cxlflash/common.h | 11 +- + drivers/scsi/cxlflash/cxl_hw.c | 13 + + drivers/scsi/cxlflash/main.c | 86 +- + drivers/scsi/cxlflash/main.h | 1 + + drivers/scsi/cxlflash/ocxl_hw.c | 1436 +++++++++++++++++++++++++++ + drivers/scsi/cxlflash/ocxl_hw.h | 77 ++ + drivers/scsi/cxlflash/sislite.h | 41 +- + drivers/scsi/cxlflash/superpipe.c | 14 + + drivers/scsi/esas2r/esas2r_init.c | 5 +- + drivers/scsi/esas2r/esas2r_main.c | 2 +- + drivers/scsi/hisi_sas/hisi_sas.h | 3 - + drivers/scsi/hisi_sas/hisi_sas_main.c | 53 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 8 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 81 +- + drivers/scsi/ips.c | 78 +- + drivers/scsi/ips.h | 11 +- + drivers/scsi/isci/init.c | 3 - + drivers/scsi/iscsi_tcp.c | 1 - + drivers/scsi/libsas/sas_ata.c | 5 + + drivers/scsi/libsas/sas_discover.c | 1 + + drivers/scsi/lpfc/lpfc.h | 9 +- + drivers/scsi/lpfc/lpfc_attr.c | 112 ++- + drivers/scsi/lpfc/lpfc_ct.c | 10 + + drivers/scsi/lpfc/lpfc_debugfs.c | 93 +- + drivers/scsi/lpfc/lpfc_els.c | 1 - + drivers/scsi/lpfc/lpfc_hbadisc.c | 4 - + drivers/scsi/lpfc/lpfc_hw4.h | 12 + + drivers/scsi/lpfc/lpfc_init.c | 62 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 29 +- + drivers/scsi/lpfc/lpfc_nvme.c | 146 ++- + drivers/scsi/lpfc/lpfc_nvme.h | 14 + + drivers/scsi/lpfc/lpfc_nvmet.h | 6 +- + drivers/scsi/lpfc/lpfc_scsi.c | 31 +- + drivers/scsi/lpfc/lpfc_sli.c | 16 +- + drivers/scsi/lpfc/lpfc_sli4.h | 1 + + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/megaraid/megaraid_sas.h | 4 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 27 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 8 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 2 +- + drivers/scsi/mvumi.c | 20 +- + drivers/scsi/scsi_debugfs.c | 2 +- + drivers/scsi/scsi_devinfo.c | 31 +- + drivers/scsi/scsi_dh.c | 5 +- + drivers/scsi/scsi_error.c | 7 + + drivers/scsi/scsi_sysfs.c | 2 +- + drivers/scsi/scsi_transport_sas.c | 4 - + drivers/scsi/sd.h | 12 +- + drivers/scsi/sd_zbc.c | 10 - + drivers/scsi/sg.c | 2 +- + drivers/scsi/st.c | 6 +- + drivers/scsi/storvsc_drv.c | 93 +- + drivers/scsi/vmw_pvscsi.c | 2 +- + drivers/scsi/wd719x.c | 13 +- + drivers/scsi/zorro_esp.c | 1172 ++++++++++++++++++++++ + drivers/target/target_core_configfs.c | 25 + + drivers/target/target_core_internal.h | 1 + + drivers/target/target_core_transport.c | 19 +- + drivers/target/target_core_user.c | 10 +- + include/linux/hyperv.h | 12 + + include/linux/libata.h | 2 + + include/linux/log2.h | 35 +- + include/scsi/scsi_device.h | 2 +- + include/scsi/scsi_devinfo.h | 75 +- + include/uapi/linux/target_core_user.h | 11 +- + 83 files changed, 3739 insertions(+), 567 deletions(-) + create mode 100644 Documentation/driver-api/target.rst + create mode 100644 drivers/scsi/cxlflash/ocxl_hw.c + create mode 100644 drivers/scsi/cxlflash/ocxl_hw.h + create mode 100644 drivers/scsi/zorro_esp.c +Merging scsi-mkp/for-next (33d065ccb3b2 scsi: tcmu: refactor nl wr_cache attr with new helpers) +$ git merge scsi-mkp/for-next +Auto-merging drivers/scsi/qedf/qedf_main.c +Auto-merging drivers/scsi/qedf/qedf_fip.c +Auto-merging drivers/message/fusion/mptsas.c +Auto-merging MAINTAINERS +Auto-merging Documentation/ioctl/ioctl-number.txt +Merge made by the 'recursive' strategy. + Documentation/ioctl/ioctl-number.txt | 2 +- + MAINTAINERS | 1 - + drivers/message/fusion/mptbase.c | 2 +- + drivers/message/fusion/mptsas.c | 2 +- + drivers/scsi/3w-9xxx.c | 5 + + drivers/scsi/3w-xxxx.c | 3 + + drivers/scsi/hisi_sas/hisi_sas.h | 4 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 37 ++- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 70 +++-- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 142 +++++---- + drivers/scsi/lpfc/lpfc_attr.c | 5 +- + drivers/scsi/lpfc/lpfc_bsg.c | 20 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 5 +- + drivers/scsi/lpfc/lpfc_hw4.h | 6 +- + drivers/scsi/lpfc/lpfc_init.c | 77 +++-- + drivers/scsi/lpfc/lpfc_nvme.c | 64 ++-- + drivers/scsi/lpfc/lpfc_nvme.h | 3 +- + drivers/scsi/lpfc/lpfc_scsi.c | 2 +- + drivers/scsi/lpfc/lpfc_scsi.h | 2 +- + drivers/scsi/lpfc/lpfc_sli.c | 81 +++-- + drivers/scsi/lpfc/lpfc_version.h | 4 +- + drivers/scsi/megaraid.c | 3 + + drivers/scsi/mpt3sas/mpi/mpi2.h | 9 +- + drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 30 +- + drivers/scsi/mpt3sas/mpi/mpi2_init.h | 2 +- + drivers/scsi/mpt3sas/mpi/mpi2_ioc.h | 7 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 475 +++++++++++++++++++++++------- + drivers/scsi/mpt3sas/mpt3sas_base.h | 60 +++- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 33 ++- + drivers/scsi/mpt3sas/mpt3sas_ctl.h | 2 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 491 +++++++++++++++++++++---------- + drivers/scsi/mpt3sas/mpt3sas_warpdrive.c | 3 +- + drivers/scsi/qedf/drv_fcoe_fw_funcs.c | 2 +- + drivers/scsi/qedf/drv_fcoe_fw_funcs.h | 2 +- + drivers/scsi/qedf/drv_scsi_fw_funcs.c | 2 +- + drivers/scsi/qedf/drv_scsi_fw_funcs.h | 2 +- + drivers/scsi/qedf/qedf.h | 6 +- + drivers/scsi/qedf/qedf_attr.c | 2 +- + drivers/scsi/qedf/qedf_dbg.c | 4 +- + drivers/scsi/qedf/qedf_dbg.h | 2 +- + drivers/scsi/qedf/qedf_debugfs.c | 2 +- + drivers/scsi/qedf/qedf_els.c | 35 ++- + drivers/scsi/qedf/qedf_fip.c | 5 +- + drivers/scsi/qedf/qedf_hsi.h | 2 +- + drivers/scsi/qedf/qedf_io.c | 87 +++++- + drivers/scsi/qedf/qedf_main.c | 130 ++++++-- + drivers/scsi/qedf/qedf_version.h | 6 +- + drivers/scsi/qla2xxx/qla_def.h | 4 +- + drivers/scsi/qla2xxx/qla_gbl.h | 3 +- + drivers/scsi/qla2xxx/qla_gs.c | 41 ++- + drivers/scsi/qla2xxx/qla_init.c | 105 +++---- + drivers/scsi/qla2xxx/qla_os.c | 4 + + drivers/scsi/qla2xxx/qla_target.c | 192 ++++++++---- + drivers/scsi/qla2xxx/qla_target.h | 4 +- + drivers/scsi/qla2xxx/qla_version.h | 2 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 37 ++- + drivers/target/target_core_user.c | 150 +++++++--- + 57 files changed, 1787 insertions(+), 696 deletions(-) +Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker) +$ git merge target-updates/for-next +Already up to date. +Merging target-bva/for-next (60cc43fc8884 Linux 4.17-rc1) +$ git merge target-bva/for-next +Already up to date. +Merging libata/for-next (6c86b268a935 Merge branch 'for-4.18' into for-next) +$ git merge libata/for-next +Auto-merging drivers/ata/libata-scsi.c +Merge made by the 'recursive' strategy. + drivers/ata/libata-core.c | 12 ++++++--- + drivers/ata/libata-eh.c | 46 +++++++++++++++++++++++++++++------ + drivers/ata/libata-scsi.c | 3 +++ + drivers/ata/pata_hpt37x.c | 13 ++++------ + drivers/ata/sata_nv.c | 62 ++++++++++++++++++----------------------------- + 5 files changed, 80 insertions(+), 56 deletions(-) +Merging vhost/linux-next (cfcde40e8ce3 ACPI: disable extra P_LVLx access on KVM) +$ git merge vhost/linux-next +Auto-merging include/linux/mm.h +Merge made by the 'recursive' strategy. + drivers/acpi/processor_idle.c | 7 +- + drivers/virtio/virtio_balloon.c | 298 +++++++++++++++++++++++++++++++----- + include/linux/mm.h | 6 + + include/linux/ptr_ring.h | 79 +++++++++- + include/linux/virtio_ring.h | 4 +- + include/uapi/linux/virtio_balloon.h | 7 + + mm/page_alloc.c | 97 ++++++++++++ + mm/page_poison.c | 6 + + 8 files changed, 460 insertions(+), 44 deletions(-) +Merging rpmsg/for-next (ff5cf749a5e5 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Removing include/linux/ste_modem_shm.h +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-rpmsg | 20 +++++++ + .../devicetree/bindings/soc/qcom/qcom,smd.txt | 8 ++- + drivers/hwspinlock/hwspinlock_core.c | 67 ++++++++++++++++----- + drivers/remoteproc/Kconfig | 1 - + drivers/remoteproc/da8xx_remoteproc.c | 12 +++- + drivers/remoteproc/qcom_q6v5_pil.c | 10 ++-- + drivers/rpmsg/Kconfig | 1 + + drivers/rpmsg/qcom_smd.c | 68 ++++++++++++++++------ + drivers/rpmsg/rpmsg_core.c | 39 +++++++++++++ + include/linux/hwspinlock.h | 58 ++++++++++++++++++ + include/linux/ste_modem_shm.h | 56 ------------------ + 11 files changed, 238 insertions(+), 102 deletions(-) + delete mode 100644 include/linux/ste_modem_shm.h +Merging gpio/for-next (22bd82b645bc Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/actions,owl-gpio.txt | 87 ++++++++++ + .../devicetree/bindings/gpio/renesas,gpio-rcar.txt | 2 + + .../devicetree/bindings/gpio/snps-dwapb-gpio.txt | 9 +- + Documentation/driver-api/gpio/board.rst | 16 ++ + Documentation/driver-api/gpio/drivers-on-gpio.rst | 4 + + drivers/gpio/Kconfig | 8 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-104-dio-48e.c | 2 +- + drivers/gpio/gpio-104-idi-48.c | 2 +- + drivers/gpio/gpio-74xx-mmio.c | 9 +- + drivers/gpio/gpio-dwapb.c | 54 ++++-- + drivers/gpio/gpio-eic-sprd.c | 73 ++++++++ + drivers/gpio/gpio-ge.c | 4 +- + drivers/gpio/gpio-gpio-mm.c | 2 +- + drivers/gpio/gpio-ingenic.c | 4 +- + drivers/gpio/gpio-loongson.c | 116 +++++++------ + drivers/gpio/gpio-lp3943.c | 2 +- + drivers/gpio/gpio-lp873x.c | 2 +- + drivers/gpio/gpio-lpc32xx.c | 3 +- + drivers/gpio/gpio-lynxpoint.c | 2 +- + drivers/gpio/gpio-max730x.c | 2 +- + drivers/gpio/gpio-mc33880.c | 2 +- + drivers/gpio/gpio-mc9s08dz60.c | 2 +- + drivers/gpio/gpio-ml-ioh.c | 2 +- + drivers/gpio/gpio-mm-lantiq.c | 2 +- + drivers/gpio/gpio-mockup.c | 7 +- + drivers/gpio/gpio-msic.c | 2 +- + drivers/gpio/gpio-mvebu.c | 20 +-- + drivers/gpio/gpio-mxc.c | 9 +- + drivers/gpio/gpio-mxs.c | 4 +- + drivers/gpio/gpio-owl.c | 184 +++++++++++++++++++++ + drivers/gpio/gpio-palmas.c | 6 +- + drivers/gpio/gpio-pca953x.c | 10 +- + drivers/gpio/gpio-pmic-eic-sprd.c | 58 ++++++- + drivers/gpio/gpio-pxa.c | 8 +- + drivers/gpio/gpio-syscon.c | 7 +- + drivers/gpio/gpio-ts4900.c | 7 +- + drivers/gpio/gpio-vf610.c | 4 +- + drivers/gpio/gpio-xlp.c | 9 +- + drivers/gpio/gpio-xra1403.c | 15 +- + drivers/gpio/gpiolib.c | 67 ++++++++ + drivers/mfd/intel_quark_i2c_gpio.c | 3 +- + include/linux/gpio/machine.h | 31 ++++ + include/linux/platform_data/gpio-dwapb.h | 3 +- + 44 files changed, 693 insertions(+), 173 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/actions,owl-gpio.txt + create mode 100644 drivers/gpio/gpio-owl.c +Merging pinctrl/for-next (8e12867fb27d Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/brcm,bcm2835-gpio.txt | 18 + + .../devicetree/bindings/pinctrl/meson,pinctrl.txt | 2 + + .../bindings/pinctrl/pinctrl-mcp23s08.txt | 4 +- + drivers/pinctrl/Kconfig | 1 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/actions/Kconfig | 14 + + drivers/pinctrl/actions/Makefile | 2 + + drivers/pinctrl/actions/pinctrl-owl.c | 587 ++++++ + drivers/pinctrl/actions/pinctrl-owl.h | 142 ++ + drivers/pinctrl/actions/pinctrl-s900.c | 1861 ++++++++++++++++++++ + drivers/pinctrl/freescale/pinctrl-imx.c | 21 +- + drivers/pinctrl/meson/pinctrl-meson-axg.c | 107 ++ + drivers/pinctrl/meson/pinctrl-meson8.c | 23 +- + drivers/pinctrl/qcom/pinctrl-msm.c | 44 +- + drivers/pinctrl/qcom/pinctrl-qdf2xxx.c | 114 +- + drivers/pinctrl/samsung/pinctrl-samsung.c | 29 + + drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | 49 + + drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 54 + + include/dt-bindings/pinctrl/mt7623-pinfunc.h | 90 +- + 19 files changed, 3086 insertions(+), 77 deletions(-) + create mode 100644 drivers/pinctrl/actions/Kconfig + create mode 100644 drivers/pinctrl/actions/Makefile + create mode 100644 drivers/pinctrl/actions/pinctrl-owl.c + create mode 100644 drivers/pinctrl/actions/pinctrl-owl.h + create mode 100644 drivers/pinctrl/actions/pinctrl-s900.c +Merging pinctrl-samsung/for-next (0ca0557e3727 pinctrl: samsung: Remove support for Exynos5440) +$ git merge pinctrl-samsung/for-next +Removing drivers/pinctrl/samsung/pinctrl-exynos5440.c +Merge made by the 'recursive' strategy. + drivers/pinctrl/samsung/Kconfig | 10 +- + drivers/pinctrl/samsung/Makefile | 1 - + drivers/pinctrl/samsung/pinctrl-exynos-arm.c | 30 +- + drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 20 + + drivers/pinctrl/samsung/pinctrl-exynos5440.c | 1005 ------------------------ + 5 files changed, 50 insertions(+), 1016 deletions(-) + delete mode 100644 drivers/pinctrl/samsung/pinctrl-exynos5440.c +Merging pwm/for-next (692099cdcf27 pwm: simplify getting .drvdata) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + drivers/pwm/pwm-atmel-tcb.c | 6 ++---- + drivers/pwm/pwm-meson.c | 4 ++-- + drivers/pwm/pwm-rcar.c | 3 +-- + 3 files changed, 5 insertions(+), 8 deletions(-) +Merging userns/for-next (530621b79f9e signal/um: More carefully relay signals in relay_signal.) +$ git merge userns/for-next +Auto-merging kernel/signal.c +Auto-merging arch/x86/mm/fault.c +Auto-merging arch/parisc/kernel/traps.c +Auto-merging arch/arm64/kernel/traps.c +Merge made by the 'recursive' strategy. + arch/alpha/include/uapi/asm/siginfo.h | 14 --- + arch/alpha/kernel/osf_sys.c | 11 +- + arch/alpha/kernel/signal.c | 20 +--- + arch/alpha/kernel/traps.c | 79 ++++--------- + arch/alpha/mm/fault.c | 13 +-- + arch/arc/mm/fault.c | 2 + + arch/arm/kernel/ptrace.c | 1 + + arch/arm/kernel/swp_emulate.c | 1 + + arch/arm/kernel/traps.c | 5 + + arch/arm/mm/alignment.c | 1 + + arch/arm/mm/fault.c | 4 + + arch/arm/vfp/vfpmodule.c | 3 +- + arch/arm64/kernel/fpsimd.c | 2 +- + arch/arm64/kernel/sys_compat.c | 1 + + arch/arm64/kernel/traps.c | 1 + + arch/arm64/mm/fault.c | 18 ++- + arch/c6x/kernel/traps.c | 9 +- + arch/hexagon/kernel/traps.c | 9 +- + arch/hexagon/mm/vm_fault.c | 20 ++-- + arch/ia64/include/uapi/asm/siginfo.h | 7 -- + arch/ia64/kernel/brl_emu.c | 1 + + arch/ia64/kernel/signal.c | 2 + + arch/ia64/kernel/traps.c | 31 ++++- + arch/ia64/kernel/unaligned.c | 1 + + arch/ia64/mm/fault.c | 4 +- + arch/m68k/kernel/traps.c | 58 +++++----- + arch/m68k/mm/fault.c | 25 ++--- + arch/microblaze/kernel/exceptions.c | 8 +- + arch/microblaze/mm/fault.c | 12 +- + arch/mips/kernel/traps.c | 65 +++-------- + arch/mips/mm/fault.c | 18 +-- + arch/nds32/kernel/traps.c | 35 ++---- + arch/nds32/mm/fault.c | 18 +-- + arch/nios2/kernel/traps.c | 8 +- + arch/openrisc/kernel/traps.c | 30 +---- + arch/openrisc/mm/fault.c | 18 +-- + arch/parisc/kernel/ptrace.c | 10 +- + arch/parisc/kernel/traps.c | 61 ++++------ + arch/parisc/kernel/unaligned.c | 15 +-- + arch/parisc/math-emu/driver.c | 8 +- + arch/parisc/mm/fault.c | 54 +++++---- + arch/powerpc/include/uapi/asm/siginfo.h | 15 --- + arch/powerpc/kernel/process.c | 1 + + arch/powerpc/kernel/traps.c | 13 +-- + arch/powerpc/mm/fault.c | 1 + + arch/powerpc/platforms/cell/spufs/fault.c | 2 +- + arch/riscv/kernel/traps.c | 16 +-- + arch/s390/kernel/traps.c | 29 +---- + arch/s390/mm/fault.c | 21 +--- + arch/sh/kernel/hw_breakpoint.c | 9 +- + arch/sh/kernel/traps_32.c | 17 +-- + arch/sh/math-emu/math.c | 8 +- + arch/sh/mm/fault.c | 9 +- + arch/sparc/include/uapi/asm/siginfo.h | 7 -- + arch/sparc/kernel/process_64.c | 9 +- + arch/sparc/kernel/sys_sparc_32.c | 8 +- + arch/sparc/kernel/sys_sparc_64.c | 8 +- + arch/sparc/kernel/traps_32.c | 104 ++++------------- + arch/sparc/kernel/traps_64.c | 131 +++++---------------- + arch/sparc/kernel/unaligned_32.c | 11 +- + arch/sparc/mm/fault_32.c | 12 +- + arch/sparc/mm/fault_64.c | 8 +- + arch/um/kernel/ptrace.c | 13 +-- + arch/um/kernel/trap.c | 62 ++++------ + arch/unicore32/kernel/fpu-ucf64.c | 8 +- + arch/unicore32/mm/fault.c | 3 + + arch/x86/entry/vsyscall/vsyscall_64.c | 2 +- + arch/x86/kernel/ptrace.c | 2 +- + arch/x86/kernel/signal_compat.c | 2 +- + arch/x86/kernel/traps.c | 3 + + arch/x86/kernel/umip.c | 1 + + arch/x86/kvm/mmu.c | 1 + + arch/x86/mm/fault.c | 1 + + arch/xtensa/kernel/traps.c | 9 +- + arch/xtensa/mm/fault.c | 18 +-- + fs/signalfd.c | 93 +++++++-------- + include/linux/ptrace.h | 1 - + include/linux/signal.h | 3 + + include/linux/tracehook.h | 1 + + include/uapi/asm-generic/siginfo.h | 3 +- + include/uapi/linux/signalfd.h | 6 +- + kernel/signal.c | 181 +++++++++--------------------- + virt/kvm/arm/mmu.c | 1 + + 83 files changed, 490 insertions(+), 1066 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 (9e66317d3c92 Linux 4.14-rc3) +$ git merge random/dev +Already up to date. +Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and counting against aio-max-nr) +$ git merge aio/master +Already up to date. +Merging kselftest/next (dec77e854318 selftests: net: return Kselftest Skip code for skipped tests) +$ git merge kselftest/next +Removing tools/testing/selftests/timers/rtctest.c +Auto-merging tools/testing/selftests/net/rtnetlink.sh +Auto-merging tools/testing/selftests/net/pmtu.sh +Auto-merging tools/testing/selftests/intel_pstate/run.sh +Auto-merging tools/testing/selftests/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + tools/testing/selftests/Makefile | 4 +- + tools/testing/selftests/android/Makefile | 8 - + tools/testing/selftests/android/ion/ion_test.sh | 7 +- + .../breakpoints/step_after_suspend_test.c | 6 +- + .../selftests/cpu-hotplug/cpu-on-off-test.sh | 14 +- + tools/testing/selftests/cpufreq/main.sh | 5 +- + tools/testing/selftests/efivarfs/efivarfs.sh | 7 +- + tools/testing/selftests/exec/execveat.c | 6 +- + tools/testing/selftests/filesystems/Makefile | 1 + + tools/testing/selftests/filesystems/devpts_pts.c | 15 +- + tools/testing/selftests/firmware/fw_fallback.sh | 4 +- + tools/testing/selftests/firmware/fw_filesystem.sh | 4 +- + tools/testing/selftests/firmware/fw_lib.sh | 7 +- + tools/testing/selftests/futex/Makefile | 12 - + tools/testing/selftests/gpio/gpio-mockup.sh | 12 +- + tools/testing/selftests/intel_pstate/run.sh | 5 +- + tools/testing/selftests/ipc/msgque.c | 7 +- + tools/testing/selftests/kmod/kmod.sh | 13 +- + tools/testing/selftests/kselftest.h | 2 +- + tools/testing/selftests/kvm/.gitignore | 3 + + tools/testing/selftests/kvm/lib/assert.c | 9 +- + tools/testing/selftests/kvm/vmx_tsc_adjust_test.c | 4 +- + tools/testing/selftests/lib.mk | 55 ++- + tools/testing/selftests/lib/Makefile | 2 +- + tools/testing/selftests/lib/bitmap.sh | 8 +- + tools/testing/selftests/lib/prime_numbers.sh | 7 +- + tools/testing/selftests/lib/printf.sh | 8 +- + tools/testing/selftests/locking/Makefile | 10 + + tools/testing/selftests/locking/ww_mutex.sh | 8 + + tools/testing/selftests/media_tests/Makefile | 3 +- + .../selftests/media_tests/media_device_open.c | 8 +- + .../selftests/media_tests/media_device_test.c | 10 +- + .../testing/selftests/membarrier/membarrier_test.c | 7 +- + tools/testing/selftests/memfd/run_tests.sh | 14 +- + tools/testing/selftests/memory-hotplug/Makefile | 5 +- + .../selftests/memory-hotplug/mem-on-off-test.sh | 14 +- + tools/testing/selftests/mount/Makefile | 12 +- + tools/testing/selftests/mount/run_tests.sh | 12 + + tools/testing/selftests/mqueue/Makefile | 12 +- + tools/testing/selftests/mqueue/mq_open_tests.c | 37 +- + tools/testing/selftests/mqueue/mq_perf_tests.c | 8 +- + tools/testing/selftests/net/fib_tests.sh | 8 +- + tools/testing/selftests/net/netdevice.sh | 16 +- + tools/testing/selftests/net/pmtu.sh | 5 +- + tools/testing/selftests/net/psock_tpacket.c | 4 +- + tools/testing/selftests/net/rtnetlink.sh | 31 +- + tools/testing/selftests/rtc/.gitignore | 2 + + tools/testing/selftests/rtc/Makefile | 9 + + tools/testing/selftests/rtc/rtctest.c | 238 ++++++++++++ + .../{timers/rtctest_setdate.c => rtc/setdate.c} | 0 + tools/testing/selftests/timers/.gitignore | 3 +- + tools/testing/selftests/timers/Makefile | 4 +- + tools/testing/selftests/timers/rtcpie.c | 134 +++++++ + tools/testing/selftests/timers/rtctest.c | 403 --------------------- + tools/testing/selftests/x86/Makefile | 8 +- + tools/testing/selftests/x86/trivial_program.c | 10 + + 57 files changed, 682 insertions(+), 590 deletions(-) + create mode 100644 tools/testing/selftests/kvm/.gitignore + create mode 100644 tools/testing/selftests/locking/Makefile + mode change 100644 => 100755 tools/testing/selftests/locking/ww_mutex.sh + create mode 100755 tools/testing/selftests/mount/run_tests.sh + create mode 100644 tools/testing/selftests/rtc/.gitignore + create mode 100644 tools/testing/selftests/rtc/Makefile + create mode 100644 tools/testing/selftests/rtc/rtctest.c + rename tools/testing/selftests/{timers/rtctest_setdate.c => rtc/setdate.c} (100%) + create mode 100644 tools/testing/selftests/timers/rtcpie.c + delete mode 100644 tools/testing/selftests/timers/rtctest.c + create mode 100644 tools/testing/selftests/x86/trivial_program.c +Merging y2038/y2038 (5dc0b1529d21 y2038: ipc: Redirect ipc(SEMTIMEDOP, ...) to compat_ksys_semtimedop) +$ git merge y2038/y2038 +Already up to date. +Merging livepatching/for-next (3beed9bf1e3d Merge branch 'for-4.17/upstream-fixes' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (659d7e66340e coresight: Remove %px for printing pcsr value) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + Documentation/trace/coresight-cpu-debug.txt | 4 ++-- + drivers/hwtracing/coresight/coresight-cpu-debug.c | 16 ++-------------- + .../coresight/coresight-dynamic-replicator.c | 10 +--------- + drivers/hwtracing/coresight/coresight-etb10.c | 13 +++---------- + drivers/hwtracing/coresight/coresight-etm-cp14.c | 13 +++---------- + drivers/hwtracing/coresight/coresight-etm-perf.c | 13 +------------ + drivers/hwtracing/coresight/coresight-etm-perf.h | 13 +------------ + drivers/hwtracing/coresight/coresight-etm.h | 13 +++---------- + drivers/hwtracing/coresight/coresight-etm3x-sysfs.c | 13 +------------ + drivers/hwtracing/coresight/coresight-etm3x.c | 13 +++---------- + drivers/hwtracing/coresight/coresight-etm4x-sysfs.c | 13 +------------ + drivers/hwtracing/coresight/coresight-etm4x.c | 13 +++---------- + drivers/hwtracing/coresight/coresight-etm4x.h | 13 +++---------- + drivers/hwtracing/coresight/coresight-funnel.c | 13 +++---------- + drivers/hwtracing/coresight/coresight-priv.h | 13 +++---------- + drivers/hwtracing/coresight/coresight-replicator.c | 13 +++---------- + drivers/hwtracing/coresight/coresight-stm.c | 13 +++---------- + drivers/hwtracing/coresight/coresight-tmc-etf.c | 13 +------------ + drivers/hwtracing/coresight/coresight-tmc-etr.c | 20 ++++---------------- + drivers/hwtracing/coresight/coresight-tmc.c | 10 +--------- + drivers/hwtracing/coresight/coresight-tmc.h | 13 +------------ + drivers/hwtracing/coresight/coresight-tpiu.c | 13 +++---------- + drivers/hwtracing/coresight/coresight.c | 21 +++++++-------------- + drivers/hwtracing/coresight/of_coresight.c | 13 +++---------- + drivers/hwtracing/stm/ftrace.c | 10 +--------- + include/linux/coresight.h | 13 +++---------- + 26 files changed, 63 insertions(+), 275 deletions(-) +Merging rtc/rtc-next (22cb47c1ea20 rtc: stm32: get DBP register and mask from DT st, syscfg property) +$ git merge rtc/rtc-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/rtc/st,stm32-rtc.txt | 10 +- + drivers/rtc/rtc-bq4802.c | 6 +- + drivers/rtc/rtc-cmos.c | 155 ++++++++++++++++----- + drivers/rtc/rtc-ds1216.c | 6 +- + drivers/rtc/rtc-ds1307.c | 2 + + drivers/rtc/rtc-ds1511.c | 9 +- + drivers/rtc/rtc-ds1553.c | 15 +- + drivers/rtc/rtc-ds1685.c | 21 +-- + drivers/rtc/rtc-ds1742.c | 6 +- + drivers/rtc/rtc-lpc32xx.c | 16 +-- + drivers/rtc/rtc-ls1x.c | 7 +- + drivers/rtc/rtc-m48t59.c | 41 +++--- + drivers/rtc/rtc-mv.c | 3 +- + drivers/rtc/rtc-mxc.c | 21 +-- + drivers/rtc/rtc-pcap.c | 15 +- + drivers/rtc/rtc-sc27xx.c | 16 ++- + drivers/rtc/rtc-sh.c | 15 +- + drivers/rtc/rtc-stk17ta8.c | 15 +- + drivers/rtc/rtc-stm32.c | 68 +++++---- + drivers/rtc/rtc-test.c | 3 +- + drivers/rtc/rtc-tps6586x.c | 18 +-- + drivers/rtc/rtc-vr41xx.c | 24 ++-- + drivers/rtc/rtc-zynqmp.c | 10 +- + 23 files changed, 281 insertions(+), 221 deletions(-) +Merging nvdimm/libnvdimm-for-next (638a8e3f28dc memremap: mark devm_memremap_pages() EXPORT_SYMBOL_GPL) +$ git merge nvdimm/libnvdimm-for-next +Auto-merging mm/hmm.c +CONFLICT (content): Merge conflict in mm/hmm.c +Auto-merging mm/Kconfig +Auto-merging include/linux/mm.h +Auto-merging include/linux/memremap.h +Auto-merging fs/xfs/xfs_super.c +Auto-merging fs/xfs/xfs_iops.c +Auto-merging fs/xfs/xfs_inode.h +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ext2/super.c +Auto-merging fs/dax.c +Auto-merging fs/Kconfig +Auto-merging drivers/md/dm.c +Resolved 'mm/hmm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d136ffd9b0d3] Merge remote-tracking branch 'nvdimm/libnvdimm-for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/dax/super.c | 99 +++++++++++++++++++--- + drivers/md/dm.c | 57 +++++++++++++ + drivers/nvdimm/pmem.c | 3 +- + fs/Kconfig | 1 + + fs/dax.c | 97 ++++++++++++++++++++++ + fs/ext2/super.c | 6 +- + fs/ext4/super.c | 6 +- + fs/xfs/xfs_file.c | 72 ++++++++++++++-- + fs/xfs/xfs_inode.h | 16 ++++ + fs/xfs/xfs_ioctl.c | 8 +- + fs/xfs/xfs_iops.c | 16 ++-- + fs/xfs/xfs_pnfs.c | 15 ++-- + fs/xfs/xfs_pnfs.h | 5 +- + fs/xfs/xfs_super.c | 20 ++--- + include/linux/dax.h | 71 ++++++++++++++-- + include/linux/memremap.h | 25 ++---- + include/linux/mm.h | 71 ++++++++++++---- + kernel/Makefile | 3 +- + kernel/iomem.c | 167 +++++++++++++++++++++++++++++++++++++ + kernel/memremap.c | 210 +++++++---------------------------------------- + mm/Kconfig | 5 ++ + mm/gup.c | 36 +++++--- + mm/hmm.c | 13 +-- + mm/swap.c | 3 +- + 24 files changed, 727 insertions(+), 298 deletions(-) + create mode 100644 kernel/iomem.c +Merging at24/at24/for-next (22e06c32b936 eeprom: at24: provide a separate routine for creating dummy i2c clients) +$ git merge at24/at24/for-next +Auto-merging drivers/misc/eeprom/at24.c +Merge made by the 'recursive' strategy. + drivers/misc/eeprom/at24.c | 71 ++++++++++++++++++++++++++++++---------------- + 1 file changed, 46 insertions(+), 25 deletions(-) +Merging ntb/ntb-next (9b42913698a1 ntb: intel: change references of skx to gen3) +$ git merge ntb/ntb-next +Auto-merging drivers/ntb/hw/intel/ntb_hw_gen1.c +Merge made by the 'recursive' strategy. + drivers/ntb/hw/intel/Makefile | 1 + + .../ntb/hw/intel/{ntb_hw_intel.c => ntb_hw_gen1.c} | 713 ++------------------- + drivers/ntb/hw/intel/ntb_hw_gen1.h | 182 ++++++ + drivers/ntb/hw/intel/ntb_hw_gen3.c | 597 +++++++++++++++++ + drivers/ntb/hw/intel/ntb_hw_gen3.h | 110 ++++ + drivers/ntb/hw/intel/ntb_hw_intel.h | 203 ++---- + 6 files changed, 997 insertions(+), 809 deletions(-) + rename drivers/ntb/hw/intel/{ntb_hw_intel.c => ntb_hw_gen1.c} (74%) + create mode 100644 drivers/ntb/hw/intel/ntb_hw_gen1.h + create mode 100644 drivers/ntb/hw/intel/ntb_hw_gen3.c + create mode 100644 drivers/ntb/hw/intel/ntb_hw_gen3.h +Merging kspp/for-next/kspp (bd80928a6e0a Merge branch 'kspp/gcc-plugin/stackleak-v11' into for-next/kspp) +$ git merge kspp/for-next/kspp +Auto-merging scripts/Makefile.gcc-plugins +Auto-merging mm/util.c +Auto-merging drivers/mtd/nand/raw/diskonchip.c +Auto-merging arch/x86/kernel/process_32.c +Auto-merging arch/x86/kernel/dumpstack.c +Auto-merging arch/x86/entry/entry_64_compat.S +Auto-merging arch/x86/Kconfig +Auto-merging arch/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/Makefile | 3 + + 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/entry/erase.c | 58 ++++ + arch/x86/include/asm/processor.h | 7 + + arch/x86/kernel/dumpstack.c | 19 ++ + arch/x86/kernel/process_32.c | 8 + + arch/x86/kernel/process_64.c | 8 + + drivers/md/dm-verity-fec.c | 2 +- + drivers/misc/lkdtm/Makefile | 3 + + drivers/misc/lkdtm/core.c | 2 + + drivers/misc/lkdtm/lkdtm.h | 4 + + drivers/misc/lkdtm/stackleak.c | 141 +++++++++ + drivers/mtd/nand/raw/cafe_nand.c | 7 +- + drivers/mtd/nand/raw/diskonchip.c | 67 ++-- + fs/proc/base.c | 18 ++ + include/linux/compiler.h | 4 + + include/linux/rslib.h | 74 +++-- + lib/reed_solomon/decode_rs.c | 34 +-- + lib/reed_solomon/encode_rs.c | 15 +- + lib/reed_solomon/reed_solomon.c | 240 ++++++++------- + mm/util.c | 33 ++ + scripts/Makefile.gcc-plugins | 3 + + scripts/gcc-plugins/gcc-common.h | 26 +- + scripts/gcc-plugins/stackleak_plugin.c | 470 +++++++++++++++++++++++++++++ + 31 files changed, 1139 insertions(+), 215 deletions(-) + create mode 100644 arch/x86/entry/erase.c + create mode 100644 drivers/misc/lkdtm/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 akpm-current/current (6175f090fa51 ipc/shm: fix shmat() nil address after round-down when remapping) +$ git merge --no-ff akpm-current/current +Auto-merging security/selinux/hooks.c +Auto-merging security/apparmor/lsm.c +Auto-merging mm/page_alloc.c +Auto-merging mm/mmap.c +Auto-merging mm/ksm.c +Auto-merging mm/gup.c +Auto-merging mm/Kconfig +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sched/core.c +CONFLICT (content): Merge conflict in kernel/sched/core.c +Auto-merging kernel/module.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging ipc/shm.c +Auto-merging ipc/sem.c +Auto-merging include/linux/swap.h +Auto-merging include/linux/sched/signal.h +Auto-merging include/linux/sched/mm.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/dax.h +Auto-merging include/linux/cgroup-defs.h +Auto-merging fs/proc/task_mmu.c +Auto-merging fs/proc/base.c +Auto-merging fs/fcntl.c +Auto-merging fs/dcache.c +Auto-merging fs/dax.c +Auto-merging fs/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/sparc/Kconfig +Auto-merging arch/sh/Kconfig +CONFLICT (content): Merge conflict in arch/sh/Kconfig +Auto-merging arch/s390/include/asm/pgtable.h +Auto-merging arch/s390/Kconfig +Auto-merging arch/riscv/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging arch/arc/Kconfig +Auto-merging arch/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/features/vm/pte_special/arch-support.txt +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Resolved 'arch/sh/Kconfig' using previous resolution. +Resolved 'kernel/sched/core.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d7d34e065a6a] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-bdi | 8 + + Documentation/admin-guide/cgroup-v2.rst | 141 +++- + Documentation/blockdev/zram.txt | 25 + + .../features/vm/pte_special/arch-support.txt | 2 +- + Documentation/sysctl/fs.txt | 36 ++ + MAINTAINERS | 3 - + arch/Kconfig | 4 + + arch/arc/Kconfig | 1 + + arch/arc/include/asm/pgtable.h | 2 - + arch/arm/Kconfig | 1 + + arch/arm/include/asm/page.h | 2 + + arch/arm/include/asm/pgtable-3level.h | 1 - + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/pgtable.h | 2 - + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/book3s/64/pgtable.h | 3 - + arch/powerpc/include/asm/pte-common.h | 3 - + arch/riscv/Kconfig | 1 + + arch/riscv/include/asm/pgtable-bits.h | 3 - + arch/s390/Kconfig | 1 + + arch/s390/include/asm/pgtable.h | 1 - + arch/sh/Kconfig | 1 + + arch/sh/include/asm/pgtable.h | 2 - + arch/sparc/Kconfig | 1 + + arch/sparc/include/asm/pgtable_64.h | 3 - + arch/x86/Kconfig | 1 + + arch/x86/include/asm/pgtable_types.h | 1 - + block/genhd.c | 2 +- + drivers/base/node.c | 5 +- + drivers/block/zram/Kconfig | 14 +- + drivers/block/zram/zram_drv.c | 165 ++++- + drivers/block/zram/zram_drv.h | 14 +- + fs/9p/v9fs.c | 29 +- + fs/Kconfig | 3 + + fs/bfs/inode.c | 9 +- + fs/binfmt_elf.c | 16 +- + fs/dax.c | 78 ++- + fs/dcache.c | 3 +- + fs/exec.c | 4 +- + fs/exofs/ore.c | 84 ++- + fs/exofs/ore_raid.c | 75 ++- + fs/exofs/super.c | 23 +- + fs/fcntl.c | 2 +- + fs/namei.c | 53 +- + fs/notify/dnotify/dnotify.c | 5 +- + fs/notify/fanotify/fanotify.c | 6 +- + fs/notify/fanotify/fanotify_user.c | 5 +- + fs/notify/group.c | 4 + + fs/notify/inotify/inotify_fsnotify.c | 2 +- + fs/notify/inotify/inotify_user.c | 5 +- + fs/ocfs2/buffer_head_io.c | 77 ++- + fs/ocfs2/cluster/heartbeat.c | 8 +- + fs/ocfs2/dlmglue.c | 121 +++- + fs/ocfs2/dlmglue.h | 1 + + fs/ocfs2/file.c | 14 +- + fs/ocfs2/file.h | 2 - + fs/ocfs2/ioctl.c | 2 +- + fs/ocfs2/journal.c | 51 +- + fs/ocfs2/ocfs2_fs.h | 4 +- + fs/ocfs2/refcounttree.c | 14 +- + fs/ocfs2/stackglue.c | 6 - + fs/ocfs2/stackglue.h | 3 - + fs/proc/array.c | 2 +- + fs/proc/base.c | 143 ++--- + fs/proc/fd.c | 2 +- + fs/proc/internal.h | 2 +- + fs/proc/kcore.c | 23 +- + fs/proc/task_mmu.c | 26 +- + fs/seq_file.c | 10 - + include/linux/cgroup-defs.h | 5 + + include/linux/dax.h | 4 +- + include/linux/fs.h | 2 + + include/linux/fsnotify_backend.h | 12 +- + include/linux/kcov.h | 14 + + include/linux/kernel.h | 1 + + include/linux/ksm.h | 17 - + include/linux/memcontrol.h | 85 ++- + include/linux/memfd.h | 16 + + include/linux/memory_hotplug.h | 1 - + include/linux/mm.h | 11 +- + include/linux/mm_types.h | 14 +- + include/linux/node.h | 8 +- + include/linux/oom.h | 14 +- + include/linux/page_counter.h | 26 +- + include/linux/pfn_t.h | 4 +- + include/linux/rbtree_augmented.h | 1 + + include/linux/rbtree_latch.h | 1 + + include/linux/sched.h | 5 +- + include/linux/sched/mm.h | 36 +- + include/linux/sched/signal.h | 3 + + include/linux/shmem_fs.h | 13 - + include/linux/slab.h | 59 ++ + include/linux/swap.h | 13 +- + include/uapi/linux/prctl.h | 4 + + init/main.c | 7 + + ipc/sem.c | 18 +- + ipc/shm.c | 19 +- + kernel/cgroup/cgroup.c | 13 +- + kernel/cred.c | 1 + + kernel/exit.c | 93 +-- + kernel/fork.c | 30 +- + kernel/hung_task.c | 11 +- + kernel/kcov.c | 21 +- + kernel/module.c | 5 + + kernel/relay.c | 2 +- + kernel/sched/core.c | 3 + + kernel/sys.c | 21 +- + kernel/sysctl.c | 18 + + lib/Kconfig.debug | 36 +- + lib/bitmap.c | 5 +- + lib/find_bit_benchmark.c | 7 +- + lib/idr.c | 10 +- + lib/percpu_ida.c | 63 +- + lib/test_bitmap.c | 21 +- + mm/Kconfig | 5 +- + mm/Makefile | 1 + + mm/backing-dev.c | 39 +- + mm/debug.c | 4 +- + mm/gup.c | 42 +- + mm/hugetlb_cgroup.c | 6 +- + mm/init-mm.c | 1 + + mm/kasan/kasan.c | 57 +- + mm/ksm.c | 25 +- + mm/list_lru.c | 7 + + mm/memblock.c | 27 +- + mm/memcontrol.c | 713 +++++++++++++++++---- + mm/memfd.c | 345 ++++++++++ + mm/memory.c | 40 +- + mm/memory_hotplug.c | 25 +- + mm/migrate.c | 4 +- + mm/mincore.c | 12 +- + mm/mmap.c | 44 +- + mm/oom_kill.c | 293 +++++---- + mm/page_alloc.c | 57 +- + mm/page_counter.c | 100 ++- + mm/page_owner.c | 4 +- + mm/shmem.c | 367 +---------- + mm/slab.c | 2 + + mm/slob.c | 4 +- + mm/slub.c | 10 +- + mm/sparse-vmemmap.c | 1 - + mm/sparse.c | 37 +- + mm/swap_slots.c | 10 +- + mm/swap_state.c | 19 +- + mm/swapfile.c | 156 ++++- + mm/vmalloc.c | 41 +- + mm/vmpressure.c | 35 +- + mm/vmscan.c | 38 +- + mm/vmstat.c | 6 +- + mm/z3fold.c | 42 +- + net/9p/client.c | 13 +- + scripts/checkpatch.pl | 7 + + scripts/faddr2line | 5 +- + security/apparmor/lsm.c | 1 + + security/selinux/hooks.c | 1 + + tools/testing/selftests/proc/.gitignore | 3 + + tools/testing/selftests/proc/Makefile | 5 +- + tools/testing/selftests/proc/fd-001-lookup.c | 168 +++++ + tools/testing/selftests/proc/fd-002-posix-eq.c | 57 ++ + tools/testing/selftests/proc/fd-003-kthread.c | 178 +++++ + tools/testing/selftests/proc/proc-uptime.h | 16 +- + tools/testing/selftests/proc/proc.h | 39 ++ + tools/testing/selftests/proc/read.c | 17 +- + 163 files changed, 3707 insertions(+), 1563 deletions(-) + create mode 100644 include/linux/memfd.h + create mode 100644 mm/memfd.c + create mode 100644 tools/testing/selftests/proc/fd-001-lookup.c + create mode 100644 tools/testing/selftests/proc/fd-002-posix-eq.c + create mode 100644 tools/testing/selftests/proc/fd-003-kthread.c + create mode 100644 tools/testing/selftests/proc/proc.h +$ 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: mm: use octal not symbolic permissions +Applying: treewide: use PHYS_ADDR_MAX to avoid type casting ULLONG_MAX +Applying: mm: fix oom_kill event handling +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 + + 1dccce36d285...8e03975b1258 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (8e03975b1258 sparc64: NG4 memset 32 bits overflow) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + arch/arm64/mm/init.c | 6 +-- + arch/mips/kernel/setup.c | 4 +- + arch/powerpc/mm/mem.c | 2 +- + arch/sparc/lib/NG4memset.S | 26 ++++++------ + arch/sparc/mm/init_64.c | 2 +- + arch/x86/mm/init_32.c | 2 +- + arch/x86/mm/init_64.c | 2 +- + drivers/firmware/efi/arm-init.c | 2 +- + drivers/media/platform/sti/delta/delta-ipc.c | 4 +- + drivers/remoteproc/qcom_q6v5_pil.c | 2 +- + drivers/soc/qcom/mdt_loader.c | 4 +- + include/linux/ioport.h | 3 ++ + include/linux/memcontrol.h | 26 ++++++++++-- + kernel/kexec_file.c | 2 + + kernel/resource.c | 63 ++++++++++++++++++++++++++++ + mm/cleancache.c | 10 ++--- + mm/cma_debug.c | 25 +++++------ + mm/compaction.c | 2 +- + mm/dmapool.c | 2 +- + mm/failslab.c | 2 +- + mm/frontswap.c | 11 +++-- + mm/memblock.c | 9 ++-- + mm/memcontrol.c | 6 ++- + mm/oom_kill.c | 2 +- + mm/page_alloc.c | 2 +- + mm/page_idle.c | 2 +- + mm/page_owner.c | 4 +- + mm/shmem.c | 9 ++-- + mm/slab_common.c | 4 +- + mm/vmalloc.c | 2 +- + mm/zsmalloc.c | 5 ++- + mm/zswap.c | 38 ++++++++--------- + 32 files changed, 185 insertions(+), 100 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..5a4e5a9ccdce --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing dmi based on 4.17-rc2 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..3f031fd582b7 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20180511 |