diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-01-03 14:10:53 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-01-03 14:10:53 +1100 |
| commit | a4983672f9ca4c8393f26b6b80710e6c78886b8c (patch) | |
| tree | 85d0365e9e42814bab4065365cae9ee50f50ebc2 | |
| parent | 019a60bf6e2839f9b5c8d439cdbfb28b28e99754 (diff) | |
Add linux-next specific files for 20190103
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 294 | ||||
| -rw-r--r-- | Next/Trees | 296 | ||||
| -rw-r--r-- | Next/merge.log | 3028 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 3621 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..ed57d6aca326 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,294 @@ +Name SHA1 +---- ---- +origin 85f78456f286da46fb054c7d45e4193cb757ac83 +fixes b71acb0e372160167bf6d5500b88b30b52ccef6e +kbuild-current e1ef035d272ef4dbfdda98e58699698305138856 +arc-current 5fac3149be6f23b6dfcb6a50319d397ed3cdf6ed +arm-current c2a3831df6dc164af66d8d86cf356a90c021b86f +arm64-fixes 3238c359acee4ab57f15abb5a82b8ab38a661ee7 +m68k-current bed1369f51901b17108a4bb4f7210aab183bea42 +powerpc-fixes f460772291f8171988b2b60141a45706123d0c69 +sparc b71acb0e372160167bf6d5500b88b30b52ccef6e +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net d63967e475ae10f286dbd35e189cb241e0b1f284 +bpf 8b6b25cf93b73e8e399adc55b0ffb9db32b881e0 +ipsec 3061169a47ee3572af6de78887222b6d03771621 +netfilter a007232066f6839d6f256bab21e825d968f1a163 +ipvs feb9f55c33e5114127238a2c87c069b4f30d1f23 +wireless-drivers 53884577fbcef33a7d15ad664e664a3dabe35171 +mac80211 1d51b4b1d3f2db0d6d144175e31a84e472fbd99a +rdma-fixes 37fbd834b4e492dc41743830cbe435f35120abd8 +sound-current 3e9ad24b0e91c066311a958afbd6210dda8a43eb +sound-asoc-fixes 6cb3c5b355ab688de5accd97946c4d329f62ad19 +regmap-fixes 8fe28cb58bcb235034b64cbbb7550a8a43fd88be +regulator-fixes c8c6b9fda37fb69d23e62d835b7afd579ac17551 +spi-fixes 21929ad56551e4f9221a125182ffbd3406a485c6 +pci-current 1063a5148ac9d1606e80886fa53ee57d45fb4589 +driver-core.current 8e143b90e4d45cca3dc53760d3cfab988bc74571 +tty.current 8e143b90e4d45cca3dc53760d3cfab988bc74571 +usb.current 8e143b90e4d45cca3dc53760d3cfab988bc74571 +usb-gadget-fixes 069caf5950dfa75d0526cd89c439ff9d9d3136d8 +usb-serial-fixes 28a86092b1753b802ef7e3de8a4c4a69a9c1bb03 +usb-chipidea-fixes a930d8bd94d8db7715d1af74299f710b1fb22fc8 +phy c88520db18ba0b9a41326c3b8680e7c09eb4c381 +staging.current 195303136f192d37b89e20a8d1d2670d0d825266 +char-misc.current 8e143b90e4d45cca3dc53760d3cfab988bc74571 +soundwire-fixes 651022382c7f8da46cb4872a545ee1da6d097d2a +thunderbolt-fixes 8fe28cb58bcb235034b64cbbb7550a8a43fd88be +input-current 592b15ba7260f8dec8bfc71ef0ea1934801a35aa +crypto-current c79b411eaa7257204f89c30651c45cea22278769 +ide adf040ddd00152bda99aa9bc2afef9075ac88b34 +vfio-fixes 0e714d27786ce1fb3efa9aac58abc096e68b1c2a +kselftest-fixes 2bd61abead58c82714a1f6fa6beb0fd0df6a6d13 +modules-fixes be71eda5383faa663efdba9ef54a6b8255e3c7f0 +slave-dma-fixes ffe843b18211301ad25893eba09f402c19d12304 +backlight-fixes 651022382c7f8da46cb4872a545ee1da6d097d2a +mtd-fixes 40b412897ccb4b98b2cfb2a0aaabed58dd9e2086 +spi-nor-fixes 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +mfd-fixes 48a2ca0ee3994df53da230c7079a18a70ec914f9 +v4l-dvb-fixes 078ab3ea2c3bb69cb989d52346fefa1246055e5b +reset-fixes 26fce0557fa639fb7bbc33e31a57cff7df25c3a0 +mips-fixes db1ce3f5d01d2d6d5714aefba0159d2cb5167a0b +at91-fixes 4ab7ca092c3c7ac8b16aa28eba723a8868f82f14 +omap-fixes 84fb6c7feb1494ebb7d1ec8b95cfb7ada0264465 +kvm-fixes 3cf85f9f6bd7b172122865432b4c6f0ec844e22a +kvms390-fixes 40ebdb8e59df36e2cc71810bd021a0808b16c956 +hwmon-fixes 1fcbdf7c21221582c0de492d862b6f5fd76f8a07 +nvdimm-fixes 2c5357c6a2f26c5126595b3b3d5852c8374da3fd +btrfs-fixes 72549bc085d61a88e9884198f482fe98ef3a5f03 +vfs-fixes ea5751ccd665a2fd1b24f9af81f6167f0718c5f6 +dma-mapping-fixes c92a54cfa0257e8ffd66b2a17d49e9c0bd4b769f +i3c-fixes 651022382c7f8da46cb4872a545ee1da6d097d2a +drivers-x86-fixes 651022382c7f8da46cb4872a545ee1da6d097d2a +samsung-krzk-fixes 651022382c7f8da46cb4872a545ee1da6d097d2a +pinctrl-samsung-fixes 651022382c7f8da46cb4872a545ee1da6d097d2a +devicetree-fixes ab63e725b49c80f941446327d79ba5b68593bf5a +scsi-fixes 61cce6f6eeced5ddd9cac55e807fe28b4f18c1ba +drm-fixes b6aac625e579ca684448f8ace632f8dceb972afb +drm-intel-fixes 8fe28cb58bcb235034b64cbbb7550a8a43fd88be +mmc-fixes e3ae3401aa19432ee4943eb0bbc2ec704d07d793 +rtc-fixes 9bde0afb7a906f1dabdba37162551565740b862d +gnss-fixes 40e020c129cfc991e8ab4736d2665351ffd1468d +hyperv-fixes fda2485b9ca464d82aabe45456a58d7b4181d328 +drm-misc-fixes 505b5240329b922f21f91d5b5d1e535c805eca6d +kbuild e1ef035d272ef4dbfdda98e58699698305138856 +compiler-attributes 71391bdd2e9aab188f86bf1ecd9b232531ec7eea +leaks 9f84a0f7f1a613335a9aaf0abd5858906752bf93 +dma-mapping 8b1cce9f5832a8eda17d37a3c49fb7dd2d650f46 +asm-generic 2b3c5a99d5f314960e00950c1782eac9361de30f +arc 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +arm 8f839a25b9cc37b528ae2d70e172c8c0c2eca98b +arm64 12f799c8c739518e12248bbd000eb0a246e8e5f8 +arm-perf 69c32972d59388c041268e8206e8eb1acff29b9a +arm-soc c1788574c9e857fac4b1370cf3dc261d13213c7b +actions fb9c1c1deb5ece57810afdbd743358d02e632d2c +alpine 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +amlogic b28b14c7c157a9203c3d2323ed46356e6c69104a +aspeed f59cffb441bc234ffa51b1d9405e99a75d7ac809 +at91 d3d7c4c30eb299471e95513b8abd6f607c5f2a5e +bcm2835 3c9d403d2fe149a02c03054edad0cb6105ef84fe +imx-mxs 467e1ec42943b298f8e019ccd2a3583fd5d0793e +keystone a74cab3c7dcb6b9ce985c1d3832bc8f1676cc59b +mediatek c2f7a6c7e1e5e5f9c92532c6c44d8fe4133ad9ec +mvebu 50eba438c55e41e5b746e70afe03c79808be4dff +omap ace2332930862448aa2d9221d76cbee34b9e7615 +reset 8a1b9fd55f256d8b7fc2fdf0c9b9c5a3783c9a00 +qcom 9bf0624f555d40fb67a52ea833023b9fc678a41c +renesas f0722e173448f5122d74c6348987ffd26b68065f +rockchip 70e6e2983473aab8a5e318d1352668052b86637e +samsung bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +samsung-krzk 75c4a45418911e86997790d517a5552935cfdb09 +sunxi 0c42f6e65f0cfb2d09136e49c7f8a6524ec5eb3d +tegra 2731820ce27bfd6e6d26f99f558c40f8ff617c9f +clk 08972760d366b83a87d366b0079747f8c409163c +clk-samsung 651022382c7f8da46cb4872a545ee1da6d097d2a +c6x 8adcc59974b8a65b7eac7d503364837c297139bc +csky f50fd2d8524c15b08da9e7e9d84752f0f1be7172 +h8300 21c7acc439b55d0569d7c2fc2eea5194b3910406 +ia64 c51836246f9772dfab8ca7bb945f4a566fe502d5 +m68k 005e13a96c0ed1437cb7f113d5d0f07ad9590962 +m68knommu 40e020c129cfc991e8ab4736d2665351ffd1468d +microblaze 19d111ccce9f4c3e0820585d991bf5ae9172cbe3 +mips adcc81f148d733b7e8e641300c5590a2cdc13bf3 +nds32 e2f3f8b4a497d26bdcd55a53246ec2e613ae0fd4 +nios2 1c286267aedf5c9bd8e1ef66ca2583009b930281 +openrisc 57ce8ba0fd3a95bf29ed741df1c52bd591bf43ff +parisc-hd b40df8f74254685a0c0337e2920e49c1006c41cc +powerpc 8d6973327ee84c2f40dd9efd8928d4a1186c96e2 +fsl 63d86876f32440a45b6f9d42ab2fb7f68b3a8bf7 +risc-v-pjw 467e050e9760fc31dcf854ec88401e18419f5f78 +risc-v 9c60096d499e2b963d2680996b03c8c77eab7cdd +sifive 467e050e9760fc31dcf854ec88401e18419f5f78 +s390 ec10574d00da0d8b6ec9d0099410aae8aad4695a +sparc-next b71acb0e372160167bf6d5500b88b30b52ccef6e +sh ac21fc2dcb405cf250ad3f1228f64f64930d9211 +uml 940b241d9050fc354f68c182e99fc3da1ff36bc0 +xtensa f1589f675d6591ef716eb8e3aeafdb697ceb8db9 +fscrypt cc0146d0bce01204b0772074b723e65645d9c465 +befs 55d945e2e4aa148ef38bdfabb9569af78183a539 +btrfs 29dcea88779c856c7dc92040a0c01233263101d4 +btrfs-kdave 0078a3f8bf05002d636a6d4816c2635096803c24 +ceph 5ccedf1ccd710ba32f36986b49eeb764e53e7ef1 +cifs 919fb566c8696547a47f0835dad294b7018b7112 +configfs cc57c07343bd071cdf1915a91a24ab7d40c9b590 +ecryptfs 5dcea554d5cefa6dcecd57cc2563bd48d3c892d6 +ext3 3f0216106126dad40901274bbaff7feae4ccba67 +ext4 191ce17876c9367819c4b0a25b503c0f6d9054d8 +f2fs 64beba0558fce7b59e9a8a7afd77290e82a22163 +fuse 2e64ff154ce6ce9a8dc0f9556463916efa6ff460 +jfs a83722f45c5baa350693795b0dc3f04ab5201a6b +nfs e1ef035d272ef4dbfdda98e58699698305138856 +nfs-anna 260f71eff493a844531629854c0935fa8de4fa2c +nfsd 0ad30ff67bd3e82da8c1dc4d74b88aca846dbbd9 +orangefs 22fc9db296fcf7ac30151c52765a7fba10870ab7 +overlayfs ec7ba118b9407c9b4d998b8065167afae5ed04be +ubifs e58725d51fa8da9133f3f1c54170aa2e43056b91 +v9fs 574d356b7a02c7e1b01a1d9cba8a26b3c2888f45 +xfs 90be9b86da9039fe6cf2880dc16fd0b0899603a5 +file-locks 052b8cfa4070caa53125cd589da0cfe744132a94 +vfs 1fab5fff0a7ae1fa3b78383a78f7a56f03a3d673 +printk 15ff2069cb7f967dae6a8f8c176ba51447c75f00 +pci 72199051af6205049e96ee7ed34f4fc5f44d1baf +pstore 8665569e97dd52920713b95675409648986b5b0d +hid f8e8ae868301e536cbcd9e192ac3be19169a19f3 +i2c eb7dd4b831c06d6bbd7fd202ef288fe708e2d7b3 +i3c 25ac3da61ba144f8dbfe377eeec6b1da7ad0854a +dmi 57361846b52bc686112da6ca5368d11210796804 +hwmon-staging 9aa3aa15f4c2f74f47afd6c5db4b420fadf3f315 +jc_docs 942104a21ce4951420ddf6c6b3179a0627301f7e +v4l-dvb 4bd46aa0353e022c2401a258e93b107880a66533 +v4l-dvb-next 76097fe1aee6baedbbbf95475263dc357d8432e4 +fbdev 399382f8018204407174f0229b4087d40e1cdc82 +pm f4747b9c68b8864cac32cddc45fdcfdfafb3397c +cpupower 901d32bc69f3423ad53947b992f973123faf2622 +opp ade0c9493e972171103c7d804840248c32032954 +thermal eaaa598c0a285ef3b0efa54e711a385269fe50ce +thermal-soc 9d216211fded20fff301d0317af3238d8383634c +ieee1394 c820518f6ca150d099aaeb7b71ad9e96c61113c0 +dlm 3595c559326d0b660bb088a88e22e0ca630a0e35 +swiotlb da689221f952ce7237bc3dacaa626732f7f033ef +rdma f617e5ffe04fd46010b618c9eeadaa04588704c9 +net-next b71acb0e372160167bf6d5500b88b30b52ccef6e +bpf-next b71acb0e372160167bf6d5500b88b30b52ccef6e +ipsec-next fa89a4593b927b3f59c3b69379f31d3b22272e4e +mlx5-next 71bef2fd583be4a5e414faf193fc243f8447c51b +netfilter-next fa2323325e8b0c61ded1e3d2c6f12f3aa43c4e30 +nfc-next 1f008cfec5d529b30ca8da1a1f5fbbd457c10382 +ipvs-next 26a1ccc6c117be8e33e0410fce8c5298b0015b99 +wireless-drivers-next fa2323325e8b0c61ded1e3d2c6f12f3aa43c4e30 +bluetooth b71acb0e372160167bf6d5500b88b30b52ccef6e +mac80211-next 44a7b3b6e3a458f9549c2cc28e74ecdc470e42f1 +gfs2 8e143b90e4d45cca3dc53760d3cfab988bc74571 +mtd f366d3854ec0fec0f9949dac46431598614a956b +nand 732774437ae01d9882e60314e303898e63c7f038 +spi-nor b422847877e35d6818f65cb359a60f529fe22c4b +crypto c79b411eaa7257204f89c30651c45cea22278769 +drm 74136a3d47f51ae72ee8b9ebc1ec2a29bcf30676 +drm-intel cb6f4c2c3478b2ff68bd5d0b6020394120075e30 +drm-tegra 180b46ecdc9f7762aba65c0b029f59c7a6b314fd +drm-misc c75ff001f4fe21a8c9f15aad799a8949aea109f7 +drm-msm 99c66bc051e7407fe0bf0607b142ec0be1a1d1dd +hdlcd d664b851eb2bcdf84a3c063cf59457bb15bc6120 +mali-dp fd99bd8b805c7c01af7dd66e22bb31c8cfe64310 +imx-drm 6cec571b70eccb119d5f8d3adc80548e89471e39 +etnaviv 801c7a1e528623f073c4007cb04d9a817e33b3a4 +kconfig bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +regmap d851a015bf3c6d27fb2af0a0ac7842b4322263ac +sound 3e9ad24b0e91c066311a958afbd6210dda8a43eb +sound-asoc b0b2b8feec72a7d665c804df1c517e48ccd9deec +modules 93d77e7f1410c366050d6035dcba1a5167c7cf0b +input 1e3c336ad8f40f88a8961c434640920fe35cc08b +block c3f57725d1cca09e55c9a5363f7eac9fedc1a74e +device-mapper bd938bf0b6cf3d25fdb654e4daa9447744eb48b8 +pcmcia 95691e3eddc41da2d1cd3cca51fecdfb46bd85bc +mmc 5215b2e952f3f94d74cac1a59494eb8ac647e216 +kgdb 3bd67b37e35069b43cc5de8d138727360c503e8f +md e820d55cb99dd93ac2dc949cf486bb187e5cd70d +mfd 6e889719194d9e14767e5fc9930c162593fe2afd +backlight 3cee7a7d05b11038c8b5fa093e45c6f839ffc867 +battery 9580913966488dc78d8d2893c7427d0a84124e74 +regulator f7c51a85cfe4c4ad1dad87e057dfae00b5cb1097 +security aa99a14dfb500a71ec7540988561824a309d0a34 +apparmor 43aa09fee2f08c8d90a4f35d4c8c711362afcaee +integrity eed9de3b4f47114f440980203ca27c5fab70f529 +selinux ee1a84fdfeedfd7362e9a8a8f15fedc3482ade2d +tpmdd 9488585b21bef0df1217e510c7134905d1d376a7 +watchdog e3c21e088f8936a004a3d9f2f4e14b3f2bdd6ea9 +iommu 03ebe48e235f17d70f34890d34d8153b8a84c02e +dwmw2-iommu d8a5b80568a9cb66810e75b182018e9edb68e8ff +vfio 8ba35b3a0046d6573c98f00461d9bd1b86250d35 +trivial 75a24b822d383489badd343cab4cb171d09f93ef +audit d406db524c32ca35bd85cada28a547fff3115715 +devicetree 5801169a2ed20003f771acecf3ac00574cf10a38 +mailbox d69e11648e486ee0f21cb246f687b083f0d4e124 +spi eaf986d9631fd6d25206c614863f8609b729a1ff +tip 8500c25e42f3594e922240135365cb9334cd9c52 +clockevents bd2bcaa565a2c07dd0492f6172f3ab6ad27c1acc +edac-amd 75dfa87035f9a2659dd0c48af6b4d9899e79cdc9 +irqchip fb94109b764e7676fa63834b9033ba97175877a0 +ftrace 3d739c1f6156c70eb0548aa288dcfbac9e0bd162 +rcu 06aa5694f8708b06f788e5b8d9002ef3850b48c7 +kvm a0aea130afebcd091d5396d13f25b9da24c9144a +kvm-arm 8c33df1afd86c611da8473dc6fc5f3af3dabe984 +kvm-ppc ae59a7e1945bc2245bbb587071ca737e00daf443 +kvms390 7aedd9d48f2a8332c2c51a40d2dca8c097f0dcdb +xen-tip e6587cdbd732eacb4c7ce592ed46f7bbcefb655f +percpu 718f6757a29b6698391fcd0231eb8266bf86c66c +workqueues 87915adc3f0acdf03c776df42e308e5a155c19af +drivers-x86 fb7255a923115188ac134bb562d1c44f4f3a413b +chrome-platform 2a70a4cda0dadb7412bc04a0611cfc129d2804cb +hsi 3a658e09a215586918044d8f8b8358eb14fa3f7d +leds 8146aace60c7409cc60a1598bc9647a5bbb12eb4 +ipmi d09eac7d08aa00a3f09960a3e960d65883351a08 +driver-core 8e143b90e4d45cca3dc53760d3cfab988bc74571 +usb 8e143b90e4d45cca3dc53760d3cfab988bc74571 +usb-gadget 4fe4f9fecc36956fd53c8edf96dd0c691ef98ff9 +usb-serial 8d503f206c336677954160ac62f0c7d9c219cd89 +usb-chipidea-next 9049fce897edae50835a8f799d4b05f67a538e9a +phy-next 2e38c2e7026a9846b5bdadf0bf82808ec2c2f446 +tty 8e143b90e4d45cca3dc53760d3cfab988bc74571 +char-misc 8e143b90e4d45cca3dc53760d3cfab988bc74571 +extcon a2dc50914744eea9f83a70a5db0486be625e5dc0 +soundwire b1635596860dd3229645e41276f6c83ca788e4c1 +thunderbolt dcc3c9e37fbd70e728d08cce0e50121605390fa0 +staging 195303136f192d37b89e20a8d1d2670d0d825266 +mux a1ad5ff63944ea4c3666d9a454fb3203930829a0 +icc f8325633fbaed049fadbe5774bdaa679b336320f +slave-dma 8fc4a3d104a30618e19d986434cf584338f79e62 +cgroup 0623413ee0ba5c1f56e1d453e316257c7b6b2583 +scsi 1f0fe08f8a459d2b67ff326e7dcde41507ad0388 +scsi-mkp da7903092b880b25971ca9103cb0b934a44ace2b +target-updates 1c130ae00b769a2e2df41bad3d6051ee8234b636 +target-bva 60cc43fc888428bb2f18f08997432d426a243338 +vhost 7f86a211fabeddadb358df804dc5ad951717b1e7 +rpmsg f369d7f18308637d415cc9e84850cb54ee35ecd6 +gpio 18a6d70e28cfd959a0a47ad56c4fc0648942f168 +gpio-brgl 1a9430db2835c0c00acc87d915b573496998c1bf +pinctrl 88cc9fc41c7318565bcf28a843b1e4e3f2acf894 +pinctrl-samsung 651022382c7f8da46cb4872a545ee1da6d097d2a +pwm e94b815524f83536415d7d59cc1833ad05934d97 +userns 1e9c75fb9c47a75a9aec0cd17db5f6dc36b58e00 +ktest 6cd110a91f52197e3392809cd43466bfe2c524d0 +random 05cbbb6f9ed50c9a64a25c1903712681d4480edb +kselftest 283ac6d5fb2a47f12bcef7806b78acf6ad89907e +y2038 e4b92b108c6cd6b311e4b6e85d6a87a34599a6e3 +livepatching bd0ab5efe8eccef387678a894804fad39fe5bc8c +coresight 7ff8957175d6d02c64270f357193fb05f6447216 +rtc 36e14f5fdfdf7cec8887b7ff69cd9bb5051ecf62 +nvdimm 8a6f7591ddf5085ba2f4cd34539dc5e0e077207d +at24 37cf28d3b5bca1b532a0b6aac722e7f2788a9294 +ntb d9842b39e9ecc32533a81b234dcf5876b2b184f7 +kspp be1944712d8e339c5c371dbd377bcd20308c5eb3 +init_task e1e871aff3ded26348c631b1370e257d401cd22d +cisco 84a401a2750628747120a1ff6a54e846bbb9c5f1 +gnss 2595646791c319cadfdbf271563aac97d0843dc7 +fsi d20810530b7109a95abef5130e6dcec09c5180d7 +siox 1e4b044d22517cae7047c99038abb444423243ca +slimbus 39a577fe6163739b3b9b3dc6b81793502f6f00c2 +nvmem 5035d66cc6297483a3d7e1b1af5cf8b04f089e43 +xarray 48483614de97c4f5219abeda630e62b2bebdce62 +hyperv 651022382c7f8da46cb4872a545ee1da6d097d2a +auxdisplay d4683eee8cd6283d1cfe5e787f089b30736b219a +kgdb-dt 97498c96a1869f6e8563a042e490f187a39f68e7 +akpm-current e2230989e25921c73810d232256bb13992c33fa1 +akpm 2ed882b822a5067b88ba56de41f5068ae855d07e diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..b30af0dc761e --- /dev/null +++ b/Next/Trees @@ -0,0 +1,296 @@ +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 +soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +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 +spi-nor-fixes git git://git.infradead.org/linux-mtd.git#spi-nor/fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus +i3c-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#master +drivers-x86-fixes git git://git.infradead.org/linux-platform-drivers-x86.git#fixes +samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#pinctrl-fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes git git://git.freedesktop.org/git/drm/drm.git#drm-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-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 +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +leaks git https://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git#leaks-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 +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +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/at91/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 +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 +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 +csky git git://github.com/c-sky/csky-linux.git#linux-next +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +nds32 git git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git#next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +risc-v-pjw git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/riscv.git#for-next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux.git#for-next +sifive git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/sifive.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 +v9fs git git://github.com/martinetd/linux#9p-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +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/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/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 +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next +thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#master +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +nfc-next git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +mtd git git://git.infradead.org/linux-mtd.git#mtd/next +nand git git://git.infradead.org/linux-mtd.git#nand/next +spi-nor git git://git.infradead.org/linux-mtd.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.git#drm-next +drm-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 +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 +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 +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-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-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/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.infradead.org/linux-platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git#for-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-next +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git#next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#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 +icc git git://git.linaro.org/people/georgi.djakov/linux.git#icc-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 +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 +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/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 +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +y2038 git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038 +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching#for-next +coresight git git://git.linaro.org/kernel/coresight.git#next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +init_task git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#init_task +cisco git https://github.com/daniel-walker/cisco-linux.git#for-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/benh/linux-fsi.git#master +siox git https://git.pengutronix.de/git/ukl/linux#siox/next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/linux-dax.git#xarray +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git https://github.com/ojeda/linux.git#auxdisplay +kgdb-dt git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +akpm-current mmotm https://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm https://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..f65f5a24b006 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3028 @@ +$ date -R +Thu, 03 Jan 2019 09:13:57 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 28e8c4bc8eb4 Merge tag 'rtc-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux +Merging origin/master (85f78456f286 Merge tag '9p-for-4.21' of git://github.com/martinetd/linux) +$ git merge origin/master +Updating 28e8c4bc8eb4..85f78456f286 +Fast-forward + Documentation/admin-guide/LSM/Smack.rst | 4 + + Documentation/admin-guide/kernel-parameters.txt | 12 +- + .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 4 +- + .../devicetree/bindings/dma/renesas,usb-dmac.txt | 3 + + Documentation/devicetree/bindings/dma/snps-dma.txt | 4 + + .../devicetree/bindings/dma/uniphier-mio-dmac.txt | 25 + + .../devicetree/bindings/iommu/arm,smmu.txt | 43 + + .../bindings/iommu/renesas,ipmmu-vmsa.txt | 2 + + Documentation/driver-api/dmaengine/dmatest.rst | 109 +- + Documentation/filesystems/cifs/TODO | 26 +- + Documentation/ioctl/ioctl-number.txt | 1 + + Documentation/security/keys/trusted-encrypted.rst | 31 +- + Documentation/userspace-api/seccomp_filter.rst | 84 ++ + MAINTAINERS | 5 +- + arch/arc/kernel/kgdb.c | 12 +- + arch/arm/kernel/kgdb.c | 14 +- + arch/arm64/kernel/kgdb.c | 14 +- + arch/h8300/kernel/kgdb.c | 2 +- + arch/hexagon/kernel/kgdb.c | 34 +- + arch/microblaze/kernel/kgdb.c | 2 +- + arch/mips/kernel/kgdb.c | 25 +- + arch/nios2/kernel/kgdb.c | 2 +- + arch/openrisc/kernel/entry.S | 2 +- + arch/openrisc/kernel/head.S | 2 +- + arch/powerpc/kernel/eeh.c | 2 +- + arch/powerpc/kernel/iommu.c | 4 +- + arch/powerpc/kernel/kgdb.c | 8 +- + arch/s390/kernel/compat_wrapper.c | 2 +- + arch/sh/kernel/kgdb.c | 14 +- + arch/sparc/kernel/kgdb_32.c | 2 +- + arch/sparc/kernel/kgdb_64.c | 2 +- + arch/sparc/kernel/smp_64.c | 2 +- + arch/x86/kernel/Makefile | 4 + + arch/x86/kernel/ima_arch.c | 75 ++ + arch/x86/kernel/kgdb.c | 11 +- + arch/x86/kernel/tboot.c | 2 +- + drivers/acpi/arm64/iort.c | 23 +- + drivers/char/tpm/Makefile | 16 +- + drivers/char/tpm/st33zp24/st33zp24.c | 2 +- + drivers/char/tpm/tpm-chip.c | 11 +- + drivers/char/tpm/tpm-dev-common.c | 52 +- + drivers/char/tpm/tpm-dev.h | 5 +- + drivers/char/tpm/tpm-interface.c | 832 +----------- + drivers/char/tpm/tpm-sysfs.c | 52 +- + drivers/char/tpm/tpm.h | 97 +- + drivers/char/tpm/tpm1-cmd.c | 781 +++++++++++ + drivers/char/tpm/tpm2-cmd.c | 308 +++-- + drivers/char/tpm/tpm2-space.c | 2 +- + drivers/char/tpm/tpm_i2c_nuvoton.c | 11 +- + drivers/char/tpm/tpm_ibmvtpm.c | 6 +- + drivers/char/tpm/tpm_tis_core.c | 10 +- + drivers/dma/Kconfig | 11 + + drivers/dma/Makefile | 1 + + drivers/dma/amba-pl08x.c | 14 +- + drivers/dma/bcm2835-dma.c | 13 +- + drivers/dma/coh901318.c | 5 - + drivers/dma/dmatest.c | 299 ++++- + drivers/dma/dw/core.c | 2 + + drivers/dma/dw/platform.c | 6 + + drivers/dma/dw/regs.h | 4 + + drivers/dma/ep93xx_dma.c | 6 +- + drivers/dma/imx-sdma.c | 60 +- + drivers/dma/mediatek/Kconfig | 13 + + drivers/dma/mediatek/Makefile | 1 + + drivers/dma/mediatek/mtk-cqdma.c | 951 ++++++++++++++ + drivers/dma/mic_x100_dma.c | 22 +- + drivers/dma/mmp_pdma.c | 28 +- + drivers/dma/pl330.c | 28 +- + drivers/dma/pxa_dma.c | 36 +- + drivers/dma/qcom/hidma_dbg.c | 33 +- + drivers/dma/sa11x0-dma.c | 21 +- + drivers/dma/sh/Kconfig | 12 +- + drivers/dma/sh/Makefile | 1 - + drivers/dma/sh/rcar-dmac.c | 2 +- + drivers/dma/sh/shdma-r8a73a4.c | 74 -- + drivers/dma/sh/shdma.h | 7 - + drivers/dma/sh/shdmac.c | 7 - + drivers/dma/sprd-dma.c | 152 ++- + drivers/dma/ste_dma40.c | 31 +- + drivers/dma/uniphier-mdmac.c | 506 ++++++++ + drivers/dma/xilinx/xilinx_dma.c | 44 +- + drivers/dma/xilinx/zynqmp_dma.c | 39 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- + drivers/gpu/drm/i915/intel_display.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +- + drivers/iommu/amd_iommu.c | 275 ++-- + drivers/iommu/amd_iommu_init.c | 64 +- + drivers/iommu/amd_iommu_types.h | 1 + + drivers/iommu/amd_iommu_v2.c | 2 + + drivers/iommu/arm-smmu-v3.c | 63 +- + drivers/iommu/arm-smmu.c | 209 ++- + drivers/iommu/dma-iommu.c | 22 +- + drivers/iommu/dmar.c | 91 +- + drivers/iommu/intel-iommu.c | 351 ++--- + drivers/iommu/intel-pasid.c | 449 ++++++- + drivers/iommu/intel-pasid.h | 40 +- + drivers/iommu/intel-svm.c | 171 +-- + drivers/iommu/intel_irq_remapping.c | 6 +- + drivers/iommu/io-pgtable-arm-v7s.c | 4 - + drivers/iommu/iommu-sysfs.c | 14 +- + drivers/iommu/iommu.c | 113 +- + drivers/iommu/ipmmu-vmsa.c | 88 +- + drivers/iommu/irq_remapping.c | 1 - + drivers/iommu/msm_iommu.c | 13 +- + drivers/iommu/mtk_iommu.c | 25 +- + drivers/iommu/mtk_iommu_v1.c | 47 +- + drivers/iommu/of_iommu.c | 16 +- + drivers/iommu/omap-iommu-debug.c | 25 +- + drivers/iommu/qcom_iommu.c | 34 +- + drivers/iommu/rockchip-iommu.c | 13 +- + drivers/iommu/tegra-gart.c | 37 +- + drivers/iommu/tegra-smmu.c | 26 +- + drivers/misc/mic/scif/scif_rma.c | 2 +- + drivers/misc/mic/scif/scif_rma.h | 2 +- + drivers/usb/host/xhci.c | 2 +- + drivers/vfio/vfio_iommu_type1.c | 33 +- + fs/block_dev.c | 7 +- + fs/cifs/Kconfig | 5 +- + fs/cifs/Makefile | 2 +- + fs/cifs/cifs_debug.c | 12 + + fs/cifs/cifs_dfs_ref.c | 138 +- + fs/cifs/cifs_fs_sb.h | 9 + + fs/cifs/cifsencrypt.c | 13 +- + fs/cifs/cifsfs.c | 17 +- + fs/cifs/cifsfs.h | 2 +- + fs/cifs/cifsglob.h | 15 +- + fs/cifs/cifsproto.h | 28 +- + fs/cifs/cifssmb.c | 88 +- + fs/cifs/connect.c | 924 ++++++++++--- + fs/cifs/dfs_cache.c | 1367 ++++++++++++++++++++ + fs/cifs/dfs_cache.h | 97 ++ + fs/cifs/file.c | 12 +- + fs/cifs/inode.c | 44 +- + fs/cifs/misc.c | 68 +- + fs/cifs/readdir.c | 9 +- + fs/cifs/sess.c | 4 +- + fs/cifs/smb1ops.c | 15 +- + fs/cifs/smb2inode.c | 16 +- + fs/cifs/smb2maperror.c | 4 +- + fs/cifs/smb2ops.c | 322 +++-- + fs/cifs/smb2pdu.c | 108 +- + fs/cifs/smb2pdu.h | 1 - + fs/cifs/smb2proto.h | 15 +- + fs/cifs/transport.c | 8 +- + fs/iomap.c | 3 +- + include/dt-bindings/dma/dw-dmac.h | 14 + + include/linux/device.h | 10 + + include/linux/dma/sprd-dma.h | 62 +- + include/linux/dma_remapping.h | 58 - + include/linux/efi.h | 34 + + include/linux/ima.h | 15 + + include/linux/intel-iommu.h | 108 +- + include/linux/iommu.h | 18 +- + include/linux/kgdb.h | 24 +- + include/linux/platform_data/dma-dw.h | 6 + + include/linux/sa11x0-dma.h | 24 - + include/linux/seccomp.h | 9 +- + include/linux/shdma-base.h | 7 +- + include/linux/syscalls.h | 2 +- + include/linux/tpm.h | 11 +- + include/uapi/linux/seccomp.h | 40 +- + kernel/debug/debug_core.c | 65 +- + kernel/debug/debug_core.h | 1 + + kernel/debug/kdb/kdb_bt.c | 11 +- + kernel/debug/kdb/kdb_debugger.c | 7 - + kernel/debug/kdb/kdb_main.c | 14 +- + kernel/seccomp.c | 467 ++++++- + mm/page_io.c | 3 +- + net/9p/client.c | 21 + + net/9p/trans_common.c | 1 + + samples/seccomp/.gitignore | 1 + + samples/seccomp/Makefile | 7 +- + samples/seccomp/user-trap.c | 375 ++++++ + security/integrity/Kconfig | 11 + + security/integrity/Makefile | 5 + + security/integrity/digsig.c | 111 +- + security/integrity/ima/Kconfig | 10 +- + security/integrity/ima/ima_appraise.c | 14 +- + security/integrity/ima/ima_crypto.c | 5 +- + security/integrity/ima/ima_main.c | 21 +- + security/integrity/ima/ima_policy.c | 171 ++- + security/integrity/integrity.h | 22 +- + security/integrity/platform_certs/efi_parser.c | 108 ++ + security/integrity/platform_certs/load_uefi.c | 194 +++ + .../integrity/platform_certs/platform_keyring.c | 58 + + security/smack/smack_lsm.c | 12 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/ima/Makefile | 11 + + tools/testing/selftests/ima/config | 4 + + tools/testing/selftests/ima/test_kexec_load.sh | 54 + + tools/testing/selftests/seccomp/seccomp_bpf.c | 447 ++++++- + 191 files changed, 10341 insertions(+), 3158 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/uniphier-mio-dmac.txt + create mode 100644 arch/x86/kernel/ima_arch.c + create mode 100644 drivers/char/tpm/tpm1-cmd.c + create mode 100644 drivers/dma/mediatek/mtk-cqdma.c + delete mode 100644 drivers/dma/sh/shdma-r8a73a4.c + create mode 100644 drivers/dma/uniphier-mdmac.c + create mode 100644 fs/cifs/dfs_cache.c + create mode 100644 fs/cifs/dfs_cache.h + create mode 100644 include/dt-bindings/dma/dw-dmac.h + delete mode 100644 include/linux/dma_remapping.h + delete mode 100644 include/linux/sa11x0-dma.h + create mode 100644 samples/seccomp/user-trap.c + create mode 100644 security/integrity/platform_certs/efi_parser.c + create mode 100644 security/integrity/platform_certs/load_uefi.c + create mode 100644 security/integrity/platform_certs/platform_keyring.c + create mode 100644 tools/testing/selftests/ima/Makefile + create mode 100644 tools/testing/selftests/ima/config + create mode 100755 tools/testing/selftests/ima/test_kexec_load.sh +Merging fixes/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge fixes/master +Already up to date. +Merging kbuild-current/fixes (e1ef035d272e Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (5fac3149be6f ARC: adjust memblock_reserve of kernel memory) +$ git merge arc-current/for-curr +Auto-merging arch/arc/mm/init.c +Merge made by the 'recursive' strategy. + arch/arc/include/asm/Kbuild | 4 -- + arch/arc/include/asm/arcregs.h | 2 +- + arch/arc/include/asm/bitops.h | 6 +- + arch/arc/include/asm/perf_event.h | 3 +- + arch/arc/kernel/perf_event.c | 136 ++++++++++++++++++++++---------------- + arch/arc/kernel/setup.c | 5 +- + arch/arc/kernel/troubleshoot.c | 30 +++++---- + arch/arc/mm/init.c | 3 +- + 8 files changed, 107 insertions(+), 82 deletions(-) +Merging arm-current/fixes (c2a3831df6dc ARM: 8816/1: dma-mapping: fix potential uninitialized return) +$ git merge arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (3238c359acee arm64: dma-mapping: Fix FORCE_CONTIGUOUS buffer clearing) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging m68k-current/for-linus (bed1369f5190 m68k: Fix memblock-related crashes) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (f460772291f8 KVM: PPC: Book3S HV: radix: Fix uninitialized var build error) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/configs/ppc40x_defconfig | 1 + + arch/powerpc/kernel/head_booke.h | 18 ++++++++++++------ + arch/powerpc/kvm/book3s_64_mmu_radix.c | 2 +- + arch/powerpc/platforms/4xx/ocm.c | 10 +++++----- + 4 files changed, 19 insertions(+), 12 deletions(-) +Merging sparc/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ 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 (d63967e475ae isdn: fix kernel-infoleak in capi_unlocked_ioctl) +$ git merge net/master +Auto-merging net/compat.c +Auto-merging include/linux/phy/phy.h +Auto-merging drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +Merge made by the 'recursive' strategy. + Documentation/networking/snmp_counter.rst | 240 +++++++++++++++++- + drivers/isdn/capi/kcapi.c | 4 +- + drivers/isdn/hisax/hfc_pci.c | 2 + + drivers/net/dsa/bcm_sf2.c | 7 +- + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 4 +- + drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c | 4 + + drivers/net/ethernet/freescale/fman/fman_memac.c | 2 +- + drivers/net/ethernet/freescale/fman/fman_tgec.c | 2 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 7 +- + drivers/net/ethernet/huawei/hinic/hinic_main.c | 6 + + drivers/net/ethernet/ibm/ibmveth.c | 6 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 + + drivers/net/ethernet/realtek/r8169.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 4 +- + drivers/net/ethernet/sun/niu.c | 10 +- + drivers/net/ethernet/ti/cpts.c | 4 +- + drivers/net/hamradio/6pack.c | 16 +- + drivers/net/tap.c | 3 +- + drivers/net/wan/fsl_ucc_hdlc.c | 1 - + drivers/net/wan/x25_asy.c | 2 + + include/linux/phy.h | 13 +- + include/linux/phy/phy.h | 2 +- + include/linux/ptr_ring.h | 2 + + include/net/ip_tunnels.h | 20 ++ + include/net/netfilter/nf_conntrack_count.h | 19 +- + include/net/sock.h | 38 ++- + net/ax25/af_ax25.c | 11 +- + net/ax25/ax25_dev.c | 2 + + net/compat.c | 15 +- + net/core/ethtool.c | 12 +- + net/core/rtnetlink.c | 5 + + net/core/sock.c | 15 +- + net/ipv4/fib_rules.c | 8 +- + net/ipv4/ip_gre.c | 9 + + net/ipv4/ip_tunnel.c | 9 - + net/ipv4/ip_vti.c | 12 +- + net/ipv6/addrconf.c | 4 +- + net/ipv6/ip6_gre.c | 10 +- + net/ipv6/ip6_tunnel.c | 10 +- + net/ipv6/ip6_vti.c | 8 +- + net/ipv6/ip6mr.c | 17 +- + net/ipv6/reassembly.c | 2 +- + net/ipv6/route.c | 10 +- + net/ipv6/sit.c | 3 + + net/netfilter/nf_conncount.c | 290 ++++++++++------------ + net/netfilter/nf_tables_api.c | 2 + + net/netfilter/nft_connlimit.c | 14 +- + net/netrom/af_netrom.c | 15 +- + net/rds/tcp.c | 2 +- + net/sunrpc/svcsock.c | 2 +- + net/tipc/bearer.c | 1 - + net/tipc/netlink_compat.c | 2 + + 52 files changed, 619 insertions(+), 295 deletions(-) +Merging bpf/master (8b6b25cf93b7 selftests/bpf: fix error printing in test_devmap()) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + tools/testing/selftests/bpf/test_maps.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging ipsec/master (3061169a47ee Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf) +$ git merge ipsec/master +Already up to date. +Merging netfilter/master (a007232066f6 netfilter: nf_conncount: fix argument order to find_next_bit) +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates of non-anonymous set) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (53884577fbce ath10k: skip sending quiet mode cmd for WCN3990) +$ git merge wireless-drivers/master +Already up to date. +Merging mac80211/master (1d51b4b1d3f2 Merge tag 'm68k-for-v4.20-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (37fbd834b4e4 IB/core: Fix oops in netdev_next_upper_dev_rcu()) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (3e9ad24b0e91 ALSA: hda - Revert DSP detection on legacy HD-audio driver) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/hda/Kconfig | 62 ------------------------------------------ + sound/pci/hda/hda_controller.h | 2 +- + sound/pci/hda/hda_intel.c | 54 +++++------------------------------- + sound/pci/hda/hda_tegra.c | 2 ++ + sound/pci/hda/patch_realtek.c | 2 +- + sound/soc/intel/Kconfig | 6 ---- + 6 files changed, 11 insertions(+), 117 deletions(-) +Merging sound-asoc-fixes/for-linus (6cb3c5b355ab Merge branch 'asoc-4.20' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Already up to date! +Merge made by the 'recursive' strategy. +Merging regmap-fixes/for-linus (8fe28cb58bcb Linux 4.20) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (c8c6b9fda37f Merge branch 'regulator-4.20' into regulator-linus) +$ git merge regulator-fixes/for-linus +Already up to date! +Merge made by the 'recursive' strategy. +Merging spi-fixes/for-linus (21929ad56551 Merge branch 'spi-4.20' into spi-linus) +$ git merge spi-fixes/for-linus +Already up to date! +Merge made by the 'recursive' strategy. +Merging pci-current/for-linus (1063a5148ac9 PCI/AER: Queue one GHES event, not several uninitialized ones) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (8e143b90e4d4 Merge tag 'iommu-updates-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (8e143b90e4d4 Merge tag 'iommu-updates-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (8e143b90e4d4 Merge tag 'iommu-updates-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu) +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (069caf5950df USB: omap_udc: fix rejection of out transfers when DMA is used) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (28a86092b175 USB: serial: option: add Telit LN940 series) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb: chipidea: Always build ULPI code) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Already up to date. +Merging phy/fixes (c88520db18ba phy: qcom-qusb2: Fix HSTX_TRIM tuning with fused value for SDM845) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (195303136f19 Merge tag 'kconfig-v4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (8e143b90e4d4 Merge tag 'iommu-updates-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (651022382c7f Linux 4.20-rc1) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (8fe28cb58bcb Linux 4.20) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (592b15ba7260 Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Removing include/linux/platform_data/ad7879.h +Auto-merging drivers/input/touchscreen/Makefile +Auto-merging drivers/input/touchscreen/Kconfig +Auto-merging drivers/input/serio/Kconfig +Auto-merging drivers/input/misc/rotary_encoder.c +Auto-merging drivers/clk/mmp/clk-of-mmp2.c +Merge made by the 'recursive' strategy. + .../input/touchscreen/raspberrypi,firmware-ts.txt | 26 +++ + .../devicetree/bindings/serio/olpc,ap-sp.txt | 4 + + drivers/clk/mmp/clk-of-mmp2.c | 4 + + drivers/input/keyboard/nomadik-ske-keypad.c | 2 +- + drivers/input/misc/drv2667.c | 6 +- + drivers/input/misc/rotary_encoder.c | 6 +- + drivers/input/mouse/elan_i2c_core.c | 1 + + drivers/input/serio/Kconfig | 1 - + drivers/input/serio/olpc_apsp.c | 28 ++- + drivers/input/touchscreen/Kconfig | 12 ++ + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/ad7879.c | 109 +++------- + drivers/input/touchscreen/atmel_mxt_ts.c | 4 +- + drivers/input/touchscreen/ektf2127.c | 2 +- + drivers/input/touchscreen/gunze.c | 4 +- + drivers/input/touchscreen/inexio.c | 4 +- + drivers/input/touchscreen/mtouch.c | 4 +- + drivers/input/touchscreen/raspberrypi-ts.c | 227 +++++++++++++++++++++ + include/dt-bindings/clock/marvell,mmp2.h | 1 + + include/linux/platform_data/ad7879.h | 42 ---- + 20 files changed, 347 insertions(+), 141 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/raspberrypi,firmware-ts.txt + create mode 100644 drivers/input/touchscreen/raspberrypi-ts.c + delete mode 100644 include/linux/platform_data/ad7879.h +Merging crypto-current/master (c79b411eaa72 crypto: skcipher - remove remnants of internal IV generators) +$ git merge crypto-current/master +Already up to date. +Merging ide/master (adf040ddd001 ide: Use of_node_name_eq for node name comparisons) +$ git merge ide/master +Merge made by the 'recursive' strategy. +Merging vfio-fixes/for-linus (0e714d27786c vfio/pci: Fix potential Spectre v1) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (2bd61abead58 selftests/seccomp: Remove SIGSTOP si_pid check) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging slave-dma-fixes/fixes (ffe843b18211 dmaengine: dw: Fix FIFO size for Intel Merrifield) +$ git merge slave-dma-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (651022382c7f Linux 4.20-rc1) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/master (40b412897ccb mtd: nand: Fix memory allocation in nanddev_bbt_init()) +$ git merge mtd-fixes/master +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 (48a2ca0ee399 Revert "mfd: cros_ec: Use devm_kzalloc for private data") +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (078ab3ea2c3b media: Add a Kconfig option for the Request API) +$ git merge v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (26fce0557fa6 reset: imx7: Fix always writing bits as 0) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (db1ce3f5d01d MIPS: Fix a R10000_LLSC_WAR logic in atomic.h) +$ git merge mips-fixes/mips-fixes +Auto-merging arch/mips/ralink/Kconfig +CONFLICT (content): Merge conflict in arch/mips/ralink/Kconfig +Removing arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_dsp.h +Removing arch/mips/bcm63xx/dev-dsp.c +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging .mailmap +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'arch/mips/ralink/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master dd5f4da36f4e] Merge remote-tracking branch 'mips-fixes/mips-fixes' +$ git diff -M --stat --summary HEAD^.. + .mailmap | 5 +- + MAINTAINERS | 3 +- + arch/mips/alchemy/common/time.c | 2 +- + arch/mips/alchemy/devboards/db1000.c | 76 ++++------------------ + arch/mips/alchemy/devboards/db1200.c | 24 ++++--- + arch/mips/alchemy/devboards/db1300.c | 23 +++++-- + arch/mips/alchemy/devboards/db1550.c | 13 +++- + arch/mips/bcm63xx/Makefile | 6 +- + arch/mips/bcm63xx/boards/board_bcm963xx.c | 20 ------ + arch/mips/bcm63xx/dev-dsp.c | 56 ---------------- + arch/mips/bcm63xx/reset.c | 2 +- + arch/mips/include/asm/atomic.h | 2 +- + .../asm/mach-au1x00/cpu-feature-overrides.h | 3 + + .../include/asm/mach-bcm63xx/bcm63xx_dev_dsp.h | 14 ---- + .../mips/include/asm/mach-bcm63xx/board_bcm963xx.h | 5 -- + arch/mips/ralink/Kconfig | 1 + + 16 files changed, 68 insertions(+), 187 deletions(-) + delete mode 100644 arch/mips/bcm63xx/dev-dsp.c + delete mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_dsp.h +Merging at91-fixes/at91-fixes (4ab7ca092c3c ARM: dts: at91: sama5d2: use the divided clock for SMC) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (84fb6c7feb14 ARM: dts: Fix OMAP4430 SDP Ethernet startup) +$ git merge omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (3cf85f9f6bd7 KVM: x86: nSVM: fix switch to guest mmu) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (40ebdb8e59df KVM: s390: Make huge pages unavailable in ucontrol VMs) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (1fcbdf7c2122 hwmon: (lm80) Fix missing unlock on error in set_fan_div()) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + drivers/hwmon/lm80.c | 4 +++- + drivers/hwmon/nct6775.c | 12 +++++++----- + 2 files changed, 10 insertions(+), 6 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (2c5357c6a2f2 Merge branch 'for-4.20/dax-fixes' into libnvdimm-pending) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date! +Merge made by the 'recursive' strategy. +Merging btrfs-fixes/next-fixes (72549bc085d6 Merge branch 'misc-4.20' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Auto-merging fs/btrfs/tree-log.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/btrfs_inode.h +Merge made by the 'recursive' strategy. +Merging vfs-fixes/fixes (ea5751ccd665 proc/sysctl: don't return ENOMEM on lookup when a table is unregistering) +$ git merge vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (c92a54cfa025 dma-direct: do not include SME mask in the DMA supported check) +$ git merge dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/master (651022382c7f Linux 4.20-rc1) +$ git merge i3c-fixes/master +Already up to date. +Merging drivers-x86-fixes/fixes (651022382c7f Linux 4.20-rc1) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (651022382c7f Linux 4.20-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/pinctrl-fixes (651022382c7f Linux 4.20-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (ab63e725b49c Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (61cce6f6eece scsi: sd: use mempool for discard special page) +$ git merge scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (b6aac625e579 Merge tag 'drm-misc-fixes-2018-12-20' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes) +$ git merge drm-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (8fe28cb58bcb Linux 4.20) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (e3ae3401aa19 mmc: core: Use a minimum 1600ms timeout when enabling CACHE ctrl) +$ git merge mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (9bde0afb7a90 rtc: pcf2127: fix a kmemleak caused in pcf2127_i2c_gather_write) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (40e020c129cf Linux 4.20-rc6) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (fda2485b9ca4 Drivers: hv: vmbus: Check for ring when getting debug info) +$ git merge hyperv-fixes/hyperv-fixes +Auto-merging include/linux/hyperv.h +Merge made by the 'recursive' strategy. + drivers/hv/ring_buffer.c | 31 ++++++++--------- + drivers/hv/vmbus_drv.c | 91 ++++++++++++++++++++++++++++++++---------------- + include/linux/hyperv.h | 5 +-- + 3 files changed, 79 insertions(+), 48 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (505b5240329b drm/ioctl: Fix Spectre v1 vulnerabilities) +$ git merge drm-misc-fixes/for-linux-next-fixes +Already up to date. +Merging kbuild/for-next (e1ef035d272e Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) +$ git merge kbuild/for-next +Already up to date. +Merging compiler-attributes/compiler-attributes (71391bdd2e9a include/linux/compiler_types.h: don't pollute userspace with macro definitions) +$ git merge compiler-attributes/compiler-attributes +Already up to date. +Merging leaks/leaks-next (9f84a0f7f1a6 leaking_addresses: check if file name contains address) +$ git merge leaks/leaks-next +Merge made by the 'recursive' strategy. +Merging dma-mapping/for-next (8b1cce9f5832 dma-mapping: fix inverted logic in dma_supported) +$ git merge dma-mapping/for-next +Already up to date. +Merging asm-generic/master (2b3c5a99d5f3 sh: generate uapi header and syscall table header files) +$ 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 (8f839a25b9cc Merge branches 'fixes', 'misc', 'sa1100-for-next', 'smp-hotplug' (early part) and 'spectre' into for-next) +$ git merge arm/for-next +Auto-merging drivers/pcmcia/Kconfig +Auto-merging arch/arm/mach-sa1100/Kconfig +Removing arch/arm/mach-realview/hotplug.h +Removing arch/arm/mach-realview/hotplug.c +Auto-merging arch/arm/mach-pxa/mainstone.c +Auto-merging arch/arm/mach-pxa/lubbock.c +Auto-merging arch/arm/mach-pxa/Kconfig +Removing arch/arm/mach-oxnas/hotplug.c +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 25 ++-- + arch/arm/boot/compressed/atags_to_fdt.c | 23 ++++ + arch/arm/common/sa1111.c | 59 --------- + arch/arm/include/asm/assembler.h | 6 +- + arch/arm/include/asm/hardware/sa1111.h | 4 - + arch/arm/include/asm/uaccess.h | 18 +++ + arch/arm/kernel/head.S | 2 +- + arch/arm/kernel/smp.c | 15 +++ + arch/arm/lib/copy_from_user.S | 23 +++- + arch/arm/lib/copy_to_user.S | 27 +++- + arch/arm/lib/getuser.S | 11 ++ + arch/arm/lib/putuser.S | 20 +-- + arch/arm/mach-actions/platsmp.c | 15 --- + arch/arm/mach-omap2/Kconfig | 1 - + arch/arm/mach-omap2/omap-smp.c | 20 --- + arch/arm/mach-oxnas/Makefile | 1 - + arch/arm/mach-oxnas/hotplug.c | 109 ---------------- + arch/arm/mach-oxnas/platsmp.c | 4 - + arch/arm/mach-pxa/Kconfig | 2 +- + arch/arm/mach-pxa/include/mach/mainstone.h | 4 + + arch/arm/mach-pxa/lubbock.c | 16 +++ + arch/arm/mach-pxa/mainstone.c | 53 ++++++++ + arch/arm/mach-qcom/platsmp.c | 26 ---- + arch/arm/mach-realview/Makefile | 1 - + arch/arm/mach-realview/hotplug.c | 111 ---------------- + arch/arm/mach-realview/hotplug.h | 1 - + arch/arm/mach-realview/platsmp-dt.c | 8 +- + arch/arm/mach-sa1100/Kconfig | 2 + + arch/arm/mach-sa1100/assabet.c | 143 ++++++++------------- + arch/arm/mach-sa1100/cerf.c | 11 +- + arch/arm/mach-sa1100/generic.c | 10 -- + arch/arm/mach-sa1100/h3100.c | 1 + + arch/arm/mach-sa1100/jornada720.c | 12 ++ + arch/arm/mach-sa1100/neponset.c | 19 +++ + arch/arm/mach-vexpress/Makefile | 1 - + arch/arm/mach-vexpress/core.h | 2 - + arch/arm/mach-vexpress/platsmp.c | 7 + + arch/arm/mm/copypage-fa.c | 35 +++-- + arch/arm/mm/copypage-feroceon.c | 98 +++++++------- + arch/arm/mm/copypage-v4mc.c | 19 ++- + arch/arm/mm/copypage-v4wb.c | 41 +++--- + arch/arm/mm/copypage-v4wt.c | 37 +++--- + arch/arm/mm/copypage-xsc3.c | 79 +++++------- + arch/arm/mm/copypage-xscale.c | 79 ++++++------ + arch/arm/mm/fault.c | 6 + + arch/arm/mm/proc-macros.S | 4 +- + arch/arm/mm/pv-fixup-asm.S | 16 +-- + arch/arm/plat-omap/Kconfig | 1 - + arch/arm/plat-versatile/Makefile | 1 + + arch/arm/plat-versatile/headsmp.S | 2 +- + .../{mach-vexpress => plat-versatile}/hotplug.c | 47 ++++--- + arch/arm/plat-versatile/include/plat/platsmp.h | 2 + + arch/arm/plat-versatile/platsmp.c | 47 +++++-- + drivers/pcmcia/Kconfig | 6 + + drivers/pcmcia/Makefile | 1 + + drivers/pcmcia/max1600.c | 122 ++++++++++++++++++ + drivers/pcmcia/max1600.h | 32 +++++ + drivers/pcmcia/pxa2xx_mainstone.c | 113 +++++----------- + drivers/pcmcia/sa1100_simpad.c | 4 +- + drivers/pcmcia/sa1111_jornada720.c | 83 ++++++++---- + drivers/pcmcia/sa1111_lubbock.c | 110 +++------------- + drivers/pcmcia/sa1111_neponset.c | 79 +++--------- + 62 files changed, 869 insertions(+), 1008 deletions(-) + delete mode 100644 arch/arm/mach-oxnas/hotplug.c + delete mode 100644 arch/arm/mach-realview/hotplug.c + delete mode 100644 arch/arm/mach-realview/hotplug.h + rename arch/arm/{mach-vexpress => plat-versatile}/hotplug.c (56%) + create mode 100644 drivers/pcmcia/max1600.c + create mode 100644 drivers/pcmcia/max1600.h +Merging arm64/for-next/core (12f799c8c739 arm64: kaslr: print PHYS_OFFSET in dump_kernel_offset()) +$ git merge arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (69c32972d593 drivers/perf: Add Cavium ThunderX2 SoC UNCORE PMU driver) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (c1788574c9e8 ARM: Document merges) +$ git merge arm-soc/for-next +Removing arch/arm/mach-sti/headsmp.S +Auto-merging arch/arm/Makefile +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 6 + + Documentation/devicetree/bindings/arm/rda.txt | 17 + + .../bindings/memory-controllers/pl353-smc.txt | 47 ++ + .../devicetree/bindings/serial/rda,8810pl-uart.txt | 17 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + MAINTAINERS | 17 +- + arch/arm/Kconfig | 2 + + arch/arm/Makefile | 1 + + arch/arm/arm-soc-for-next-contents.txt | 45 ++ + arch/arm/boot/dts/Makefile | 3 + + arch/arm/boot/dts/rda8810pl-orangepi-2g-iot.dts | 50 ++ + arch/arm/boot/dts/rda8810pl-orangepi-i96.dts | 50 ++ + arch/arm/boot/dts/rda8810pl.dtsi | 99 +++ + arch/arm/mach-rda/Kconfig | 7 + + arch/arm/mach-rda/Makefile | 1 + + arch/arm/mach-sti/Makefile | 2 +- + arch/arm/mach-sti/headsmp.S | 43 -- + arch/arm/mach-sti/platsmp.c | 88 +-- + arch/arm64/Kconfig.platforms | 8 + + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 14 + + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 15 + + arch/arm64/boot/dts/freescale/Makefile | 2 + + arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 303 ++++++++ + arch/arm64/boot/dts/freescale/imx8mq-pinfunc.h | 623 +++++++++++++++ + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 416 +++++++++++ + arch/arm64/configs/defconfig | 1 + + drivers/memory/Kconfig | 9 + + drivers/memory/Makefile | 1 + + drivers/memory/pl353-smc.c | 463 ++++++++++++ + drivers/tee/optee/core.c | 3 + + drivers/tee/optee/supp.c | 13 +- + drivers/tty/serial/Kconfig | 19 + + drivers/tty/serial/Makefile | 1 + + drivers/tty/serial/rda-uart.c | 831 +++++++++++++++++++++ + include/linux/pl353-smc.h | 30 + + include/linux/qcom_scm.h | 3 + + include/uapi/linux/serial_core.h | 3 + + 37 files changed, 3128 insertions(+), 126 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/rda.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/pl353-smc.txt + create mode 100644 Documentation/devicetree/bindings/serial/rda,8810pl-uart.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/rda8810pl-orangepi-2g-iot.dts + create mode 100644 arch/arm/boot/dts/rda8810pl-orangepi-i96.dts + create mode 100644 arch/arm/boot/dts/rda8810pl.dtsi + create mode 100644 arch/arm/mach-rda/Kconfig + create mode 100644 arch/arm/mach-rda/Makefile + delete mode 100644 arch/arm/mach-sti/headsmp.S + create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-evk.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-pinfunc.h + create mode 100644 arch/arm64/boot/dts/freescale/imx8mq.dtsi + create mode 100644 drivers/memory/pl353-smc.c + create mode 100644 drivers/tty/serial/rda-uart.c + create mode 100644 include/linux/pl353-smc.h +Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps' 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 (b28b14c7c157 Merge branch 'v4.21/drivers' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging aspeed/for-next (f59cffb441bc Merge branch 'dt-for-v4.21' into for-next) +$ git merge aspeed/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging at91/at91-next (d3d7c4c30eb2 Merge branches 'at91-soc' and 'at91-dt' into at91-next) +$ git merge at91/at91-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging bcm2835/for-next (3c9d403d2fe1 Merge branch 'bcm2835-drivers-next' into for-next) +$ git merge bcm2835/for-next +Merge made by the 'recursive' strategy. + arch/arm/configs/bcm2835_defconfig | 3 +++ + 1 file changed, 3 insertions(+) +Merging imx-mxs/for-next (467e1ec42943 Merge branch 'imx8mq/dt' into for-next) +$ git merge imx-mxs/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging keystone/next (a74cab3c7dcb Merge branch 'for_4.20/drivers-soc' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (c2f7a6c7e1e5 Merge branch 'v4.20-next/soc' into for-next) +$ git merge mediatek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (50eba438c55e Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (ace233293086 Merge branch 'omap-for-v4.21/dt' into for-next) +$ git merge omap/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am335x-chiliboard.dts | 4 ++++ + arch/arm/boot/dts/omap3-evm-common.dtsi | 7 +++++-- + arch/arm/boot/dts/omap3-evm-processor-common.dtsi | 10 +++++++++- + arch/arm/boot/dts/omap4-droid4-xt894.dts | 10 +++++++--- + arch/arm/boot/dts/omap4-panda-common.dtsi | 6 ++++-- + 5 files changed, 29 insertions(+), 8 deletions(-) +Merging reset/reset/next (8a1b9fd55f25 reset: uniphier-glue: Add AHCI reset control support in glue layer) +$ git merge reset/reset/next +Auto-merging arch/arm/mach-socfpga/socfpga.c +CONFLICT (content): Merge conflict in arch/arm/mach-socfpga/socfpga.c +Resolved 'arch/arm/mach-socfpga/socfpga.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 98db2a70fb20] Merge remote-tracking branch 'reset/reset/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/reset/socfpga-reset.txt | 3 +- + .../devicetree/bindings/reset/uniphier-reset.txt | 25 +++--- + arch/arm/mach-socfpga/socfpga.c | 4 + + drivers/reset/Kconfig | 20 +++-- + drivers/reset/Makefile | 3 +- + drivers/reset/core.c | 42 +++++++++++ + drivers/reset/reset-hsdk.c | 1 + + drivers/reset/reset-simple.c | 13 +--- + drivers/reset/reset-socfpga.c | 88 ++++++++++++++++++++++ + ...reset-uniphier-usb3.c => reset-uniphier-glue.c} | 50 +++++++----- + include/linux/reset.h | 15 +++- + 11 files changed, 212 insertions(+), 52 deletions(-) + create mode 100644 drivers/reset/reset-socfpga.c + rename drivers/reset/{reset-uniphier-usb3.c => reset-uniphier-glue.c} (73%) +Merging qcom/for-next (9bf0624f555d Merge tag 'qcom-drivers-for-4.21-2' into foobar-for-4.21-2) +$ git merge qcom/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging renesas/next (f0722e173448 Merge branches 'fixes-for-v4.21', 'fixes-for-v4.20', 'dt-bindings-for-v4.21', 'drivers-for-v4.21', 'arm-defconfig-for-v4.21', 'arm-dt-for-v4.21' and 'arm64-dt-for-v4.21' into next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. + drivers/soc/renesas/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging rockchip/for-next (70e6e2983473 dt-bindings: arm: Convert Rockchip board/soc bindings to json-schema) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. +Merging samsung/for-next (bebc6082da0a Linux 4.14) +$ git merge samsung/for-next +Already up to date. +Merging samsung-krzk/for-next (75c4a4541891 Merge branch 'next/dt64' into for-next) +$ git merge samsung-krzk/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging sunxi/sunxi/for-next (0c42f6e65f0c Merge branches 'sunxi/dt-for-4.21' and 'sunxi/dt64-for-4.21' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging tegra/for-next (2731820ce27b Merge branch for-4.21/clk into for-next) +$ git merge tegra/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging clk/clk-next (08972760d366 clk: imx8qxp: make the name of clock ID generic) +$ git merge clk/clk-next +Removing include/dt-bindings/clock/imx8qxp-clock.h +Merge made by the 'recursive' strategy. + drivers/clk/imx/clk-imx8qxp-lpcg.c | 148 +++++++-------- + drivers/clk/imx/clk-imx8qxp.c | 154 ++++++++-------- + include/dt-bindings/clock/imx8-clock.h | 289 ++++++++++++++++++++++++++++++ + include/dt-bindings/clock/imx8qxp-clock.h | 289 ------------------------------ + 4 files changed, 440 insertions(+), 440 deletions(-) + create mode 100644 include/dt-bindings/clock/imx8-clock.h + delete mode 100644 include/dt-bindings/clock/imx8qxp-clock.h +Merging clk-samsung/for-next (651022382c7f Linux 4.20-rc1) +$ git merge clk-samsung/for-next +Already up to date. +Merging c6x/for-linux-next (8adcc59974b8 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge c6x/for-linux-next +Already up to date. +Merging csky/linux-next (f50fd2d8524c csky: Add perf support for C-SKY) +$ git merge csky/linux-next +Auto-merging include/uapi/linux/elf-em.h +Auto-merging include/uapi/linux/audit.h +Auto-merging arch/csky/Kconfig +Merge made by the 'recursive' strategy. + arch/csky/Kconfig | 30 +- + arch/csky/Makefile | 4 + + arch/csky/abiv1/inc/abi/pgtable-bits.h | 1 + + arch/csky/abiv1/inc/abi/switch_context.h | 17 + + arch/csky/abiv2/Makefile | 1 + + arch/csky/abiv2/inc/abi/entry.h | 28 +- + arch/csky/abiv2/inc/abi/pgtable-bits.h | 2 +- + arch/csky/abiv2/inc/abi/switch_context.h | 32 + + arch/csky/abiv2/mcount.S | 124 ++++ + arch/csky/abiv2/memcpy.S | 8 +- + arch/csky/include/asm/elf.h | 13 +- + arch/csky/include/asm/ftrace.h | 13 + + arch/csky/include/asm/perf_event.h | 7 + + arch/csky/include/asm/processor.h | 15 +- + arch/csky/include/asm/smp.h | 4 + + arch/csky/include/asm/syscall.h | 7 + + arch/csky/include/asm/thread_info.h | 4 + + arch/csky/include/uapi/asm/Kbuild | 2 - + arch/csky/include/uapi/asm/ptrace.h | 39 +- + arch/csky/kernel/Makefile | 7 + + arch/csky/kernel/asm-offsets.c | 3 - + arch/csky/kernel/dumpstack.c | 59 +- + arch/csky/kernel/entry.S | 50 +- + arch/csky/kernel/ftrace.c | 50 ++ + arch/csky/kernel/perf_event.c | 1031 ++++++++++++++++++++++++++++++ + arch/csky/kernel/process.c | 29 +- + arch/csky/kernel/ptrace.c | 42 +- + arch/csky/kernel/signal.c | 2 - + arch/csky/kernel/smp.c | 73 ++- + arch/csky/kernel/stacktrace.c | 57 ++ + arch/csky/kernel/traps.c | 6 - + arch/csky/mm/fault.c | 7 +- + arch/csky/mm/ioremap.c | 2 +- + drivers/clocksource/timer-mp-csky.c | 6 +- + include/uapi/linux/audit.h | 1 + + include/uapi/linux/elf-em.h | 1 + + 36 files changed, 1555 insertions(+), 222 deletions(-) + create mode 100644 arch/csky/abiv1/inc/abi/switch_context.h + create mode 100644 arch/csky/abiv2/inc/abi/switch_context.h + create mode 100644 arch/csky/abiv2/mcount.S + create mode 100644 arch/csky/include/asm/ftrace.h + create mode 100644 arch/csky/include/asm/perf_event.h + create mode 100644 arch/csky/kernel/ftrace.c + create mode 100644 arch/csky/kernel/perf_event.c + create mode 100644 arch/csky/kernel/stacktrace.c +Merging h8300/h8300-next (21c7acc439b5 h8300: pci: Remove local declaration of pcibios_penalize_isa_irq) +$ git merge h8300/h8300-next +Removing arch/h8300/include/asm/pci.h +Merge made by the 'recursive' strategy. + arch/h8300/include/asm/Kbuild | 1 + + arch/h8300/include/asm/pci.h | 18 ------------------ + 2 files changed, 1 insertion(+), 18 deletions(-) + delete mode 100644 arch/h8300/include/asm/pci.h +Merging ia64/next (c51836246f97 ia64: generate uapi header and system call table files) +$ git merge ia64/next +Already up to date. +Merging m68k/for-next (005e13a96c0e m68k: Generate uapi header and syscall table header files) +$ git merge m68k/for-next +Already up to date. +Merging m68knommu/for-next (40e020c129cf Linux 4.20-rc6) +$ git merge m68knommu/for-next +Already up to date. +Merging microblaze/next (19d111ccce9f microblaze: remove the explicit removal of system.dtb) +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (adcc81f148d7 MIPS: math-emu: Write-protect delay slot emulation pages) +$ git merge mips/mips-next +Already up to date. +Merging nds32/next (e2f3f8b4a497 nds32: support hardware prefetcher) +$ git merge nds32/next +Already up to date. +Merging nios2/for-next (1c286267aedf nios2: update_mmu_cache preload the TLB with the new PTE) +$ git merge nios2/for-next +Auto-merging arch/nios2/Kconfig +Merge made by the 'recursive' strategy. + arch/nios2/Kconfig | 1 - + arch/nios2/include/asm/pgtable.h | 1 - + arch/nios2/include/asm/tlbflush.h | 19 +++- + arch/nios2/kernel/nios2_ksyms.c | 12 +++ + arch/nios2/mm/cacheflush.c | 7 +- + arch/nios2/mm/fault.c | 2 +- + arch/nios2/mm/tlb.c | 191 ++++++++++++++++++++--------------- + arch/nios2/platform/Kconfig.platform | 9 -- + 8 files changed, 141 insertions(+), 101 deletions(-) +Merging openrisc/for-next (57ce8ba0fd3a openrisc: Fix broken paths to arch/or32) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (b40df8f74254 parisc: Count IPI function calls) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/include/asm/hardirq.h | 1 + + arch/parisc/kernel/irq.c | 4 ++++ + arch/parisc/kernel/smp.c | 1 + + drivers/parisc/lba_pci.c | 12 ++++++++++++ + 4 files changed, 18 insertions(+) +Merging powerpc/next (8d6973327ee8 Merge tag 'powerpc-4.21-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge powerpc/next +Already up to date. +Merging fsl/next (63d86876f324 Revert "powerpc/fsl_pci: simplify fsl_pci_dma_set_mask") +$ git merge fsl/next +Already up to date. +Merging risc-v-pjw/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge risc-v-pjw/for-next +Already up to date. +Merging risc-v/for-next (9c60096d499e automerging branch "kernel.org-palmer-linux/next-sg_chain" into "for-next") +$ git merge risc-v/for-next +Auto-merging include/uapi/linux/audit.h +Auto-merging arch/riscv/Kconfig +CONFLICT (content): Merge conflict in arch/riscv/Kconfig +Resolved 'arch/riscv/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f7d0a6fe01a2] Merge remote-tracking branch 'risc-v/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/riscv/Kconfig | 3 +++ + arch/riscv/configs/defconfig | 2 +- + arch/riscv/include/asm/ptrace.h | 5 +++++ + arch/riscv/include/asm/syscall.h | 10 ++++++++++ + arch/riscv/include/asm/thread_info.h | 6 ++++++ + arch/riscv/include/asm/unistd.h | 2 ++ + arch/riscv/kernel/entry.S | 4 ++-- + arch/riscv/kernel/ptrace.c | 9 ++++++++- + include/uapi/linux/audit.h | 2 ++ + 9 files changed, 39 insertions(+), 4 deletions(-) +Merging sifive/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge sifive/for-next +Already up to date. +Merging s390/features (ec10574d00da Merge tag 'vfio-ccw-20181213' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/vfio-ccw into features) +$ git merge s390/features +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 +- + arch/s390/include/asm/ap.h | 28 ++-- + arch/s390/include/uapi/asm/zcrypt.h | 4 +- + arch/s390/mm/fault.c | 24 ---- + arch/s390/pci/pci.c | 4 +- + arch/s390/pci/pci_clp.c | 2 +- + drivers/s390/block/dasd.c | 15 +- + drivers/s390/block/dasd_proc.c | 3 +- + drivers/s390/char/tape_proc.c | 7 +- + drivers/s390/cio/qdio_debug.c | 18 +-- + drivers/s390/cio/vfio_ccw_fsm.c | 7 +- + drivers/s390/cio/vfio_ccw_private.h | 1 - + drivers/s390/crypto/ap_bus.c | 277 +++++++++++++++++++++--------------- + drivers/s390/crypto/ap_queue.c | 23 ++- + drivers/s390/crypto/vfio_ap_drv.c | 1 + + drivers/s390/crypto/zcrypt_error.h | 2 + + lib/bust_spinlocks.c | 6 +- + 17 files changed, 222 insertions(+), 204 deletions(-) +Merging sparc-next/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge sparc-next/master +Already up to date. +Merging sh/for-next (ac21fc2dcb40 sh: switch to NO_BOOTMEM) +$ git merge sh/for-next +Already up to date. +Merging uml/linux-next (940b241d9050 um: Remove obsolete reenable_XX calls) +$ git merge uml/linux-next +Auto-merging arch/um/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 +- + arch/um/Kconfig | 1 + + arch/um/Kconfig.debug | 1 + + arch/um/drivers/chan_kern.c | 10 -- + arch/um/drivers/line.c | 10 -- + arch/um/drivers/mconsole_kern.c | 2 - + arch/um/drivers/net_kern.c | 2 - + arch/um/drivers/port_kern.c | 1 - + arch/um/drivers/random.c | 1 - + arch/um/drivers/ubd_kern.c | 231 ++++++++++++++++++++++++-------------- + arch/um/drivers/vector_user.c | 2 + + arch/um/include/asm/Kbuild | 2 - + arch/um/include/asm/pgtable.h | 9 +- + arch/um/include/shared/irq_user.h | 1 - + arch/um/include/shared/os.h | 1 + + arch/um/kernel/irq.c | 6 - + arch/um/kernel/sigio.c | 1 - + arch/um/kernel/skas/uaccess.c | 23 ++-- + arch/um/kernel/tlb.c | 115 ++++++++++++------- + arch/um/os-Linux/file.c | 10 ++ + 20 files changed, 259 insertions(+), 173 deletions(-) +Merging xtensa/xtensa-for-next (f1589f675d65 Merge branch 'xtensa-jumplabel' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging fscrypt/master (cc0146d0bce0 fscrypt: remove CRYPTO_CTR dependency) +$ git merge fscrypt/master +Removing include/linux/fscrypt_supp.h +Removing include/linux/fscrypt_notsupp.h +Auto-merging include/linux/fs.h +Auto-merging fs/ubifs/sb.c +Auto-merging fs/ubifs/Kconfig +CONFLICT (content): Merge conflict in fs/ubifs/Kconfig +Auto-merging fs/f2fs/sysfs.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/namei.c +Auto-merging fs/f2fs/inode.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/dir.c +CONFLICT (content): Merge conflict in fs/f2fs/dir.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/page-io.c +Auto-merging fs/ext4/namei.c +Auto-merging fs/ext4/ioctl.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/ialloc.c +Auto-merging fs/ext4/ext4.h +Auto-merging arch/mips/configs/generic_defconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/ioctl/ioctl-number.txt +Auto-merging Documentation/filesystems/index.rst +CONFLICT (content): Merge conflict in Documentation/filesystems/index.rst +Resolved 'Documentation/filesystems/index.rst' using previous resolution. +Resolved 'fs/f2fs/dir.c' using previous resolution. +Resolved 'fs/ubifs/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8272e713307e] Merge remote-tracking branch 'fscrypt/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/fscrypt.rst | 183 ++++--- + Documentation/filesystems/fsverity.rst | 583 ++++++++++++++++++++ + Documentation/filesystems/index.rst | 11 + + Documentation/ioctl/ioctl-number.txt | 1 + + MAINTAINERS | 12 + + arch/mips/configs/generic_defconfig | 2 +- + arch/nds32/configs/defconfig | 2 +- + arch/s390/configs/debug_defconfig | 2 +- + arch/s390/configs/performance_defconfig | 2 +- + fs/Kconfig | 2 + + fs/Makefile | 1 + + fs/crypto/Kconfig | 6 +- + fs/crypto/crypto.c | 28 +- + fs/crypto/fname.c | 22 +- + fs/crypto/fscrypt_private.h | 68 ++- + fs/crypto/keyinfo.c | 351 +++++++++--- + fs/crypto/policy.c | 5 +- + fs/ext4/Kconfig | 15 - + fs/ext4/dir.c | 10 +- + fs/ext4/ext4.h | 23 +- + fs/ext4/ext4_jbd2.h | 2 +- + fs/ext4/extents.c | 4 +- + fs/ext4/file.c | 4 + + fs/ext4/ialloc.c | 2 +- + fs/ext4/inode.c | 37 +- + fs/ext4/ioctl.c | 16 +- + fs/ext4/move_extent.c | 3 +- + fs/ext4/namei.c | 18 +- + fs/ext4/page-io.c | 9 +- + fs/ext4/readpage.c | 211 ++++++-- + fs/ext4/super.c | 107 +++- + fs/ext4/sysfs.c | 10 +- + fs/f2fs/Kconfig | 12 +- + fs/f2fs/data.c | 47 +- + fs/f2fs/dir.c | 10 +- + fs/f2fs/f2fs.h | 24 +- + fs/f2fs/file.c | 64 ++- + fs/f2fs/inode.c | 11 +- + fs/f2fs/namei.c | 6 +- + fs/f2fs/super.c | 39 +- + fs/f2fs/sysfs.c | 15 +- + fs/ubifs/Kconfig | 13 +- + fs/ubifs/Makefile | 2 +- + fs/ubifs/ioctl.c | 4 +- + fs/ubifs/sb.c | 2 +- + fs/ubifs/super.c | 2 +- + fs/ubifs/ubifs.h | 5 +- + fs/verity/Kconfig | 53 ++ + fs/verity/Makefile | 5 + + fs/verity/fsverity_private.h | 134 +++++ + fs/verity/hash_algs.c | 115 ++++ + fs/verity/ioctl.c | 164 ++++++ + fs/verity/setup.c | 911 ++++++++++++++++++++++++++++++++ + fs/verity/signature.c | 187 +++++++ + fs/verity/verify.c | 298 +++++++++++ + include/linux/fs.h | 15 +- + include/linux/fscrypt.h | 416 ++++++++++++++- + include/linux/fscrypt_notsupp.h | 231 -------- + include/linux/fscrypt_supp.h | 204 ------- + include/linux/fsverity.h | 111 ++++ + include/uapi/linux/fs.h | 4 +- + include/uapi/linux/fsverity.h | 98 ++++ + 62 files changed, 4133 insertions(+), 821 deletions(-) + create mode 100644 Documentation/filesystems/fsverity.rst + create mode 100644 fs/verity/Kconfig + create mode 100644 fs/verity/Makefile + create mode 100644 fs/verity/fsverity_private.h + create mode 100644 fs/verity/hash_algs.c + create mode 100644 fs/verity/ioctl.c + create mode 100644 fs/verity/setup.c + create mode 100644 fs/verity/signature.c + create mode 100644 fs/verity/verify.c + delete mode 100644 include/linux/fscrypt_notsupp.h + delete mode 100644 include/linux/fscrypt_supp.h + create mode 100644 include/linux/fsverity.h + create mode 100644 include/uapi/linux/fsverity.h +Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard issues) +$ git merge befs/for-next +Merge made by the 'recursive' strategy. + fs/befs/btree.c | 97 ++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 51 insertions(+), 46 deletions(-) +Merging btrfs/next (29dcea88779c Linux 4.17) +$ git merge btrfs/next +Already up to date. +Merging btrfs-kdave/for-next (0078a3f8bf05 Merge branch 'for-next-current-v4.19-20181219' into for-next-20181219) +$ git merge btrfs-kdave/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ceph/master (5ccedf1ccd71 ceph: don't encode inode pathes into reconnect message) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + fs/ceph/caps.c | 75 ++++++++++++++++++------------ + fs/ceph/inode.c | 60 ++++++++++-------------- + fs/ceph/mds_client.c | 129 ++++++++++++++++++++++++++++++--------------------- + fs/ceph/mds_client.h | 16 ++++--- + fs/ceph/mdsmap.c | 1 - + net/ceph/messenger.c | 55 +++++++++------------- + 6 files changed, 174 insertions(+), 162 deletions(-) +Merging cifs/for-next (919fb566c869 cifs: fix confusing warning message on reconnect) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/connect.c | 2 +- + fs/cifs/smb2ops.c | 4 +++- + 2 files changed, 4 insertions(+), 2 deletions(-) +Merging configfs/for-next (cc57c07343bd configfs: fix registered group removal) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (5dcea554d5ce eCryptfs: fix a couple type promotion bugs) +$ git merge ecryptfs/next +Merge made by the 'recursive' strategy. + fs/ecryptfs/crypto.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) +Merging ext3/for_next (3f0216106126 Pull quota locking fix.) +$ git merge ext3/for_next +Auto-merging include/linux/fs.h +Auto-merging fs/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + fs/Makefile | 3 +- + fs/ext2/dir.c | 49 +++++++++------------- + fs/fs_types.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++ + include/linux/fs.h | 17 +------- + include/linux/fs_types.h | 73 ++++++++++++++++++++++++++++++++ + 6 files changed, 202 insertions(+), 46 deletions(-) + create mode 100644 fs/fs_types.c + create mode 100644 include/linux/fs_types.h +Merging ext4/dev (191ce17876c9 ext4: fix special inode number checks in __ext4_iget()) +$ git merge ext4/dev +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/inode.c +Merge made by the 'recursive' strategy. + fs/ext4/fsync.c | 16 ++++++++++++---- + fs/ext4/inline.c | 6 +++--- + fs/ext4/inode.c | 5 +++-- + fs/ext4/super.c | 2 +- + 4 files changed, 19 insertions(+), 10 deletions(-) +Merging f2fs/dev (64beba0558fc f2fs: sanity check of xattr entry size) +$ git merge f2fs/dev +Already up to date. +Merging fuse/for-next (2e64ff154ce6 fuse: continue to send FUSE_RELEASEDIR when FUSE_OPEN returns ENOSYS) +$ git merge fuse/for-next +Already up to date. +Merging jfs/jfs-next (a83722f45c5b jfs: fix spelling mistake, EACCESS -> EACCES) +$ git merge jfs/jfs-next +Merge made by the 'recursive' strategy. + fs/jfs/namei.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging nfs/linux-next (e1ef035d272e Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (260f71eff493 sunrpc: convert to DEFINE_SHOW_ATTRIBUTE) +$ git merge nfs-anna/linux-next +CONFLICT (modify/delete): net/sunrpc/xprtrdma/fmr_ops.c deleted in nfs-anna/linux-next and modified in HEAD. Version HEAD of net/sunrpc/xprtrdma/fmr_ops.c left in tree. +Removing net/sunrpc/auth_generic.c +Auto-merging fs/nfs/write.c +Auto-merging fs/nfs/nfs4proc.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f net/sunrpc/xprtrdma/fmr_ops.c +net/sunrpc/xprtrdma/fmr_ops.c: needs merge +rm 'net/sunrpc/xprtrdma/fmr_ops.c' +$ git commit -v -a +[master ab3b7fb28aff] Merge remote-tracking branch 'nfs-anna/linux-next' +$ git diff -M --stat --summary HEAD^.. + fs/lockd/clntproc.c | 6 +- + fs/nfs/blocklayout/blocklayout.c | 2 +- + fs/nfs/client.c | 9 +- + fs/nfs/delegation.c | 28 +- + fs/nfs/delegation.h | 10 +- + fs/nfs/dir.c | 59 ++-- + fs/nfs/flexfilelayout/flexfilelayout.c | 64 ++-- + fs/nfs/flexfilelayout/flexfilelayout.h | 8 +- + fs/nfs/flexfilelayout/flexfilelayoutdev.c | 16 +- + fs/nfs/inode.c | 13 +- + fs/nfs/internal.h | 15 +- + fs/nfs/nfs3proc.c | 4 +- + fs/nfs/nfs4_fs.h | 68 ++--- + fs/nfs/nfs4client.c | 4 +- + fs/nfs/nfs4proc.c | 158 +++++----- + fs/nfs/nfs4renewd.c | 9 +- + fs/nfs/nfs4session.c | 5 +- + fs/nfs/nfs4state.c | 131 ++++----- + fs/nfs/nfs4trace.h | 456 ++++++++++++++++++++--------- + fs/nfs/pagelist.c | 4 +- + fs/nfs/pnfs.c | 14 +- + fs/nfs/pnfs.h | 10 +- + fs/nfs/pnfs_dev.c | 4 +- + fs/nfs/pnfs_nfs.c | 2 +- + fs/nfs/proc.c | 2 +- + fs/nfs/super.c | 13 +- + fs/nfs/unlink.c | 20 +- + fs/nfs/write.c | 24 +- + fs/nfsd/nfs4callback.c | 31 +- + fs/nfsd/state.h | 2 +- + include/linux/cred.h | 26 +- + include/linux/nfs_fs.h | 13 +- + include/linux/nfs_fs_sb.h | 2 +- + include/linux/nfs_xdr.h | 16 +- + include/linux/sunrpc/auth.h | 51 +--- + include/linux/sunrpc/clnt.h | 5 +- + include/linux/sunrpc/sched.h | 6 +- + include/trace/events/rpcrdma.h | 218 ++++++++++++-- + include/trace/events/sunrpc.h | 172 +++++------ + kernel/cred.c | 58 +++- + net/sunrpc/Makefile | 2 +- + net/sunrpc/auth.c | 116 ++++---- + net/sunrpc/auth_generic.c | 293 ------------------ + net/sunrpc/auth_gss/auth_gss.c | 47 +-- + net/sunrpc/auth_gss/gss_mech_switch.c | 2 +- + net/sunrpc/auth_null.c | 4 - + net/sunrpc/auth_unix.c | 110 +++---- + net/sunrpc/backchannel_rqst.c | 2 +- + net/sunrpc/clnt.c | 29 +- + net/sunrpc/rpc_pipe.c | 19 +- + net/sunrpc/rpcb_clnt.c | 12 +- + net/sunrpc/sched.c | 5 +- + net/sunrpc/xprtmultipath.c | 4 +- + net/sunrpc/xprtrdma/Makefile | 3 +- + net/sunrpc/xprtrdma/backchannel.c | 39 +-- + net/sunrpc/xprtrdma/fmr_ops.c | 337 --------------------- + net/sunrpc/xprtrdma/frwr_ops.c | 209 ++++++++----- + net/sunrpc/xprtrdma/rpc_rdma.c | 78 +++-- + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 8 +- + net/sunrpc/xprtrdma/transport.c | 91 +++--- + net/sunrpc/xprtrdma/verbs.c | 255 +++++++--------- + net/sunrpc/xprtrdma/xprt_rdma.h | 80 ++--- + net/sunrpc/xprtsock.c | 10 +- + 63 files changed, 1518 insertions(+), 1995 deletions(-) + delete mode 100644 net/sunrpc/auth_generic.c + delete mode 100644 net/sunrpc/xprtrdma/fmr_ops.c +Merging nfsd/nfsd-next (0ad30ff67bd3 nfs: fixed broken compilation in nfs_callback_up_net()) +$ git merge nfsd/nfsd-next +Auto-merging net/sunrpc/xprtsock.c +Auto-merging net/sunrpc/xprtrdma/xprt_rdma.h +Auto-merging net/sunrpc/xprtrdma/transport.c +Auto-merging net/sunrpc/xprtrdma/backchannel.c +Auto-merging net/sunrpc/svcsock.c +Auto-merging include/trace/events/sunrpc.h +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/lockd/clntproc.c +Merge made by the 'recursive' strategy. + fs/lockd/clnt4xdr.c | 22 ++---- + fs/lockd/clntproc.c | 2 +- + fs/lockd/clntxdr.c | 22 ++---- + fs/lockd/xdr.c | 4 +- + fs/lockd/xdr4.c | 4 +- + fs/nfs/callback.c | 10 +-- + fs/nfsd/nfs4layouts.c | 1 - + fs/nfsd/nfs4proc.c | 15 ++-- + fs/nfsd/nfs4recover.c | 17 ++--- + fs/nfsd/nfs4state.c | 10 +-- + fs/nfsd/nfsctl.c | 2 + + fs/nfsd/vfs.c | 17 ++++- + include/linux/sunrpc/bc_xprt.h | 19 +++-- + include/linux/sunrpc/svc.h | 7 +- + include/linux/sunrpc/svc_rdma.h | 2 +- + include/linux/sunrpc/svc_xprt.h | 1 - + include/linux/sunrpc/xprt.h | 1 - + include/trace/events/sunrpc.h | 6 +- + net/sunrpc/auth_gss/svcauth_gss.c | 8 +-- + net/sunrpc/cache.c | 10 ++- + net/sunrpc/svc.c | 24 +++++-- + net/sunrpc/svc_xprt.c | 9 +-- + net/sunrpc/svcsock.c | 120 ------------------------------- + net/sunrpc/xprtrdma/backchannel.c | 20 ------ + net/sunrpc/xprtrdma/svc_rdma.c | 6 -- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 63 ++++++++++++++++ + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 57 ++++----------- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 59 --------------- + net/sunrpc/xprtrdma/transport.c | 1 - + net/sunrpc/xprtrdma/xprt_rdma.h | 1 - + net/sunrpc/xprtsock.c | 12 ---- + 31 files changed, 192 insertions(+), 360 deletions(-) +Merging orangefs/for-next (22fc9db296fc orangefs: no need to check for service_operation returns > 0) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (ec7ba118b940 Revert "ovl: relax permission checking on underlying layers") +$ git merge overlayfs/overlayfs-next +Already up to date. +Merging ubifs/linux-next (e58725d51fa8 ubifs: Handle re-linking of inodes correctly while recovery) +$ git merge ubifs/linux-next +Already up to date. +Merging v9fs/9p-next (574d356b7a02 9p/net: put a lower bound on msize) +$ git merge v9fs/9p-next +Already up to date. +Merging xfs/for-next (90be9b86da90 xfs: xfs_fsops: drop useless LIST_HEAD) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/xfs/xfs_buf.c | 1 - + fs/xfs/xfs_fsops.c | 1 - + 2 files changed, 2 deletions(-) +Merging file-locks/locks-next (052b8cfa4070 locks: Use inode_is_open_for_write) +$ git merge file-locks/locks-next +Already up to date. +Merging vfs/for-next (1fab5fff0a7a Merge branches 'work.mount', 'work.misc', 'misc.misc' and 'work.iov_iter' into for-next) +$ git merge vfs/for-next +Auto-merging security/smack/smack_lsm.c +Auto-merging security/selinux/include/security.h +Auto-merging security/selinux/hooks.c +CONFLICT (content): Merge conflict in security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging lib/iov_iter.c +Auto-merging kernel/cgroup/cpuset.c +Auto-merging kernel/cgroup/cgroup.c +CONFLICT (content): Merge conflict in kernel/cgroup/cgroup.c +Auto-merging kernel/cgroup/cgroup-v1.c +CONFLICT (content): Merge conflict in kernel/cgroup/cgroup-v1.c +Auto-merging kernel/cgroup/cgroup-internal.h +Auto-merging init/do_mounts_initrd.c +Auto-merging include/uapi/linux/fs.h +Auto-merging include/linux/fs.h +CONFLICT (content): Merge conflict in include/linux/fs.h +Auto-merging include/linux/cgroup.h +Auto-merging fs/nfs/super.c +Auto-merging fs/nfs/internal.h +Auto-merging fs/namespace.c +Auto-merging fs/namei.c +Auto-merging fs/hugetlbfs/inode.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/ctree.h +Auto-merging fs/Makefile +CONFLICT (content): Merge conflict in fs/Makefile +Auto-merging fs/Kconfig +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/kernel/cpu/resctrl/rdtgroup.c +CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/resctrl/rdtgroup.c +Auto-merging arch/x86/kernel/cpu/resctrl/internal.h +Auto-merging arch/sparc/kernel/setup_64.c +Auto-merging arch/sparc/kernel/setup_32.c +Auto-merging arch/arc/kernel/setup.c +Resolved 'arch/x86/kernel/cpu/resctrl/rdtgroup.c' using previous resolution. +Resolved 'fs/Makefile' using previous resolution. +Resolved 'include/linux/fs.h' using previous resolution. +Resolved 'kernel/cgroup/cgroup-v1.c' using previous resolution. +Resolved 'kernel/cgroup/cgroup.c' using previous resolution. +Resolved 'security/selinux/hooks.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0f4b08b5b228] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/mount_api.txt | 709 +++++++++++++++++++++++++ + arch/arc/kernel/setup.c | 1 + + arch/arm/kernel/atags_parse.c | 1 + + arch/sh/kernel/setup.c | 1 + + arch/sparc/kernel/setup_32.c | 1 + + arch/sparc/kernel/setup_64.c | 1 + + arch/x86/kernel/cpu/resctrl/internal.h | 16 + + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 194 ++++--- + arch/x86/kernel/setup.c | 1 + + drivers/base/devtmpfs.c | 1 + + fs/Kconfig | 7 + + fs/Makefile | 2 +- + fs/afs/internal.h | 9 +- + fs/afs/mntpt.c | 149 +++--- + fs/afs/super.c | 439 ++++++++-------- + fs/afs/volume.c | 4 +- + fs/btrfs/ctree.h | 4 - + fs/btrfs/super.c | 82 +-- + fs/exec.c | 2 +- + fs/exofs/super.c | 37 +- + fs/filesystems.c | 4 + + fs/fs_context.c | 646 +++++++++++++++++++++++ + fs/fs_parser.c | 555 ++++++++++++++++++++ + fs/hugetlbfs/inode.c | 371 +++++++------ + fs/internal.h | 13 +- + fs/kernfs/kernfs-internal.h | 1 + + fs/kernfs/mount.c | 87 ++-- + fs/namei.c | 4 +- + fs/namespace.c | 394 +++++++++----- + fs/nfs/internal.h | 2 +- + fs/nfs/super.c | 34 +- + fs/pnode.c | 1 + + fs/proc/inode.c | 52 +- + fs/proc/internal.h | 5 +- + fs/proc/root.c | 244 ++++++--- + fs/super.c | 346 +++++++++--- + fs/sysfs/mount.c | 73 ++- + include/linux/binfmts.h | 1 - + include/linux/cgroup.h | 3 +- + include/linux/errno.h | 1 + + include/linux/fs.h | 14 +- + include/linux/fs_context.h | 181 +++++++ + include/linux/fs_parser.h | 119 +++++ + include/linux/kernfs.h | 40 +- + include/linux/lsm_hooks.h | 38 +- + include/linux/mount.h | 5 +- + include/linux/security.h | 100 ++-- + include/uapi/linux/fs.h | 56 +- + include/uapi/linux/mount.h | 58 +++ + init/do_mounts.c | 1 + + init/do_mounts_initrd.c | 1 + + ipc/mqueue.c | 94 +++- + ipc/namespace.c | 2 +- + kernel/cgroup/cgroup-internal.h | 50 +- + kernel/cgroup/cgroup-v1.c | 359 +++++++------ + kernel/cgroup/cgroup.c | 246 +++++---- + kernel/cgroup/cpuset.c | 56 +- + lib/iov_iter.c | 54 +- + scripts/selinux/genheaders/genheaders.c | 29 +- + security/apparmor/lsm.c | 1 + + security/apparmor/mount.c | 1 + + security/security.c | 49 +- + security/selinux/hooks.c | 894 ++++++++++++++------------------ + security/selinux/include/security.h | 10 +- + security/smack/smack.h | 20 +- + security/smack/smack_lsm.c | 438 ++++++++-------- + security/tomoyo/mount.c | 1 + + 67 files changed, 5158 insertions(+), 2257 deletions(-) + create mode 100644 Documentation/filesystems/mount_api.txt + create mode 100644 fs/fs_context.c + create mode 100644 fs/fs_parser.c + create mode 100644 include/linux/fs_context.h + create mode 100644 include/linux/fs_parser.h + create mode 100644 include/uapi/linux/mount.h +$ git am -3 ../patches/0001-vfs-work-around-CONFIG_PRINTK-n-in-fs_context-loggin.patch +Applying: vfs: work around CONFIG_PRINTK=n in fs_context logging code +$ git reset HEAD^ +Unstaged changes after reset: +M fs/fs_context.c +$ git add -A . +$ git commit -v -a --amend +[master 02633fb24f08] Merge remote-tracking branch 'vfs/for-next' + Date: Thu Jan 3 10:50:31 2019 +1100 +Merging printk/for-next (15ff2069cb7f printk: Add caller information to printk() output.) +$ git merge printk/for-next +Auto-merging lib/Kconfig.debug +Auto-merging kernel/printk/printk.c +Merge made by the 'recursive' strategy. + kernel/printk/printk.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++---- + lib/Kconfig.debug | 17 ++++++++++++++++ + 2 files changed, 68 insertions(+), 4 deletions(-) +Merging pci/next (72199051af62 Merge branch 'pci/imx6') +$ git merge pci/next +Auto-merging include/linux/pci_ids.h +Auto-merging include/linux/pci.h +Auto-merging drivers/pci/pcie/aspm.c +Auto-merging drivers/pci/pci-driver.c +Auto-merging drivers/pci/p2pdma.c +Auto-merging drivers/pci/controller/dwc/pcie-designware-ep.c +Auto-merging drivers/pci/controller/dwc/pci-layerscape.c +Auto-merging drivers/pci/controller/dwc/pci-imx6.c +Auto-merging drivers/pci/Kconfig +Auto-merging arch/s390/pci/pci.c +Auto-merging arch/arm64/boot/dts/mediatek/mt7622.dtsi +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pci/amlogic,meson-pcie.txt | 70 +++ + .../devicetree/bindings/pci/fsl,imx6q-pcie.txt | 4 +- + .../devicetree/bindings/pci/mediatek-pcie.txt | 8 - + .../devicetree/bindings/pci/uniphier-pcie.txt | 81 +++ + Documentation/driver-api/pci/p2pdma.rst | 4 +- + MAINTAINERS | 16 +- + arch/arm/boot/dts/mt7623.dtsi | 3 - + arch/arm64/boot/dts/mediatek/mt7622.dtsi | 2 - + arch/s390/pci/pci.c | 3 + + arch/x86/pci/broadcom_bus.c | 4 +- + drivers/pci/Kconfig | 6 +- + drivers/pci/controller/dwc/Kconfig | 24 +- + drivers/pci/controller/dwc/Makefile | 2 + + drivers/pci/controller/dwc/pci-imx6.c | 102 +++- + drivers/pci/controller/dwc/pci-layerscape.c | 10 +- + drivers/pci/controller/dwc/pci-meson.c | 592 +++++++++++++++++++++ + drivers/pci/controller/dwc/pcie-armada8k.c | 16 + + drivers/pci/controller/dwc/pcie-designware-ep.c | 4 + + drivers/pci/controller/dwc/pcie-designware-host.c | 40 +- + drivers/pci/controller/dwc/pcie-designware.c | 8 +- + drivers/pci/controller/dwc/pcie-designware.h | 28 +- + drivers/pci/controller/dwc/pcie-histb.c | 2 +- + drivers/pci/controller/dwc/pcie-uniphier.c | 471 ++++++++++++++++ + drivers/pci/controller/pcie-mediatek.c | 109 +--- + drivers/pci/iov.c | 48 +- + drivers/pci/p2pdma.c | 14 +- + drivers/pci/pci-driver.c | 27 +- + drivers/pci/pci.h | 2 + + drivers/pci/pcie/aspm.c | 6 - + drivers/pci/pcie/portdrv.h | 16 +- + drivers/pci/quirks.c | 24 + + drivers/pci/switch/switchtec.c | 154 +++++- + drivers/usb/dwc3/dwc3-haps.c | 4 - + include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 1 + + include/linux/pci.h | 7 +- + include/linux/pci_ids.h | 3 + + include/linux/switchtec.h | 16 + + 37 files changed, 1721 insertions(+), 210 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pci/amlogic,meson-pcie.txt + create mode 100644 Documentation/devicetree/bindings/pci/uniphier-pcie.txt + create mode 100644 drivers/pci/controller/dwc/pci-meson.c + create mode 100644 drivers/pci/controller/dwc/pcie-uniphier.c +Merging pstore/for-next/pstore (8665569e97dd pstore/ram: Avoid NULL deref in ftrace merging failure path) +$ git merge pstore/for-next/pstore +Already up to date. +Merging hid/for-next (f8e8ae868301 Merge branch 'for-4.21/ish' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + Documentation/hid/uhid.txt | 2 +- + Documentation/input/event-codes.rst | 21 +- + drivers/hid/hid-asus.c | 28 +++ + drivers/hid/hid-core.c | 174 +++++++++++++++ + drivers/hid/hid-cougar.c | 2 + + drivers/hid/hid-debug.c | 12 +- + drivers/hid/hid-ids.h | 3 + + drivers/hid/hid-input.c | 108 ++++++++- + drivers/hid/hid-logitech-hidpp.c | 375 +++++++++++++++++++++++++++++--- + drivers/hid/hidraw.c | 8 +- + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 7 +- + drivers/hid/intel-ish-hid/ishtp-hid.c | 2 +- + include/linux/hid.h | 17 +- + include/uapi/linux/input-event-codes.h | 2 + + samples/hidraw/hid-example.c | 2 +- + 15 files changed, 704 insertions(+), 59 deletions(-) +Merging i2c/i2c/for-next (eb7dd4b831c0 Merge branch 'i2c/for-5.0' into i2c/for-next) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/eeprom/at24.txt | 1 + + Documentation/devicetree/bindings/i2c/i2c-at91.txt | 2 +- + .../devicetree/bindings/i2c/i2c-mux-ltc4306.txt | 4 +- + .../devicetree/bindings/i2c/i2c-mux-pca954x.txt | 2 +- + Documentation/devicetree/bindings/i2c/i2c-rcar.txt | 1 + + .../devicetree/bindings/i2c/i2c-sh_mobile.txt | 10 +- + .../devicetree/bindings/i2c/i2c-stm32.txt | 6 + + .../devicetree/bindings/i2c/nxp,pca9541.txt | 2 +- + drivers/i2c/busses/i2c-axxia.c | 168 +++++++++++++++---- + drivers/i2c/busses/i2c-bcm2835.c | 10 +- + drivers/i2c/busses/i2c-cros-ec-tunnel.c | 14 +- + drivers/i2c/busses/i2c-ibm_iic.c | 2 +- + drivers/i2c/busses/i2c-imx.c | 3 +- + drivers/i2c/busses/i2c-powermac.c | 8 +- + drivers/i2c/busses/i2c-sh_mobile.c | 2 + + drivers/i2c/busses/i2c-stm32f7.c | 182 +++++++++++++++------ + drivers/i2c/busses/i2c-tegra.c | 54 +++--- + drivers/misc/eeprom/Kconfig | 2 +- + drivers/misc/eeprom/at24.c | 3 + + 19 files changed, 340 insertions(+), 136 deletions(-) +Merging i3c/i3c/next (25ac3da61ba1 i3c: master: cdns: fix I2C transfers in Cadence I3C master driver) +$ git merge i3c/i3c/next +Already up to date. +Merging dmi/master (57361846b52b Linux 4.19-rc2) +$ git merge dmi/master +Already up to date. +Merging hwmon-staging/hwmon-next (9aa3aa15f4c2 hwmon: (lm80) fix a missing check of bus read in lm80 probe) +$ git merge hwmon-staging/hwmon-next +Already up to date. +Merging jc_docs/docs-next (942104a21ce4 docs: improve pathname-lookup document structure) +$ git merge jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (4bd46aa0353e media: cx23885: only reset DMA on problematic CPUs) +$ git merge v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (76097fe1aee6 media: staging/ipu3-imgu: Add MAINTAINERS entry) +$ git merge v4l-dvb-next/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. +Merging fbdev/fbdev-for-next (399382f80182 drm/nouveau: fix incorrect FB_BACKLIGHT usage in Kconfig) +$ git merge fbdev/fbdev-for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/nouveau/Kconfig | 3 ++- + drivers/video/fbdev/Kconfig | 5 ++-- + drivers/video/fbdev/clps711x-fb.c | 5 +++- + drivers/video/fbdev/core/fbcon.c | 2 +- + drivers/video/fbdev/core/fbmem.c | 39 ++++++++++++++++++++++++----- + drivers/video/fbdev/core/fbsysfs.c | 8 +++--- + drivers/video/fbdev/fsl-diu-fb.c | 3 +-- + drivers/video/fbdev/omap2/omapfb/dss/core.c | 18 +++---------- + drivers/video/fbdev/pxa168fb.c | 2 +- + drivers/video/fbdev/pxafb.c | 4 +-- + drivers/video/fbdev/udlfb.c | 14 +++++------ + drivers/video/fbdev/uvesafb.c | 2 +- + drivers/video/logo/Kconfig | 9 +++++++ + include/linux/fb.h | 2 +- + include/uapi/linux/fb.h | 2 -- + 15 files changed, 71 insertions(+), 47 deletions(-) +Merging pm/linux-next (f4747b9c68b8 drivers: base: swnode: check if swnode is NULL before dereferencing it) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + drivers/base/swnode.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +Merging cpupower/cpupower (901d32bc69f3 cpupower : Auto-completion for cpupower tool) +$ git merge cpupower/cpupower +Already up to date. +Merging opp/opp/linux-next (ade0c9493e97 Merge branch 'opp/genpd/propagation' into opp/linux-next) +$ git merge opp/opp/linux-next +Already up to date. +Merging thermal/next (eaaa598c0a28 Merge branches 'for-rc' and 'thermal-core' into next) +$ git merge thermal/next +Auto-merging drivers/thermal/Kconfig +CONFLICT (content): Merge conflict in drivers/thermal/Kconfig +Resolved 'drivers/thermal/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c1402b97ee77] Merge remote-tracking branch 'thermal/next' +$ git diff -M --stat --summary HEAD^.. + drivers/thermal/Kconfig | 94 ++-------------------- + drivers/thermal/Makefile | 10 +-- + drivers/thermal/intel/Kconfig | 77 ++++++++++++++++++ + drivers/thermal/intel/Makefile | 12 +++ + .../thermal/{ => intel}/int340x_thermal/Kconfig | 0 + .../thermal/{ => intel}/int340x_thermal/Makefile | 0 + .../{ => intel}/int340x_thermal/acpi_thermal_rel.c | 0 + .../{ => intel}/int340x_thermal/acpi_thermal_rel.h | 0 + .../{ => intel}/int340x_thermal/int3400_thermal.c | 9 +-- + .../{ => intel}/int340x_thermal/int3402_thermal.c | 0 + .../{ => intel}/int340x_thermal/int3403_thermal.c | 0 + .../{ => intel}/int340x_thermal/int3406_thermal.c | 0 + .../int340x_thermal/int340x_thermal_zone.c | 0 + .../int340x_thermal/int340x_thermal_zone.h | 0 + .../int340x_thermal/processor_thermal_device.c | 0 + .../thermal/{ => intel}/intel_bxt_pmic_thermal.c | 0 + drivers/thermal/{ => intel}/intel_pch_thermal.c | 0 + drivers/thermal/{ => intel}/intel_powerclamp.c | 0 + .../thermal/{ => intel}/intel_quark_dts_thermal.c | 0 + drivers/thermal/{ => intel}/intel_soc_dts_iosf.c | 0 + drivers/thermal/{ => intel}/intel_soc_dts_iosf.h | 0 + .../thermal/{ => intel}/intel_soc_dts_thermal.c | 0 + drivers/thermal/{ => intel}/x86_pkg_temp_thermal.c | 0 + drivers/thermal/qcom/Kconfig | 11 +++ + drivers/thermal/qcom/Makefile | 1 + + drivers/thermal/{ => qcom}/qcom-spmi-temp-alarm.c | 2 +- + drivers/thermal/rockchip_thermal.c | 8 +- + drivers/thermal/spear_thermal.c | 8 +- + drivers/thermal/st/st_thermal.c | 6 +- + drivers/thermal/thermal_core.c | 18 +++-- + drivers/thermal/thermal_sysfs.c | 11 ++- + drivers/thermal/zx2967_thermal.c | 6 +- + 32 files changed, 138 insertions(+), 135 deletions(-) + create mode 100644 drivers/thermal/intel/Kconfig + create mode 100644 drivers/thermal/intel/Makefile + rename drivers/thermal/{ => intel}/int340x_thermal/Kconfig (100%) + rename drivers/thermal/{ => intel}/int340x_thermal/Makefile (100%) + rename drivers/thermal/{ => intel}/int340x_thermal/acpi_thermal_rel.c (100%) + rename drivers/thermal/{ => intel}/int340x_thermal/acpi_thermal_rel.h (100%) + rename drivers/thermal/{ => intel}/int340x_thermal/int3400_thermal.c (96%) + rename drivers/thermal/{ => intel}/int340x_thermal/int3402_thermal.c (100%) + rename drivers/thermal/{ => intel}/int340x_thermal/int3403_thermal.c (100%) + rename drivers/thermal/{ => intel}/int340x_thermal/int3406_thermal.c (100%) + rename drivers/thermal/{ => intel}/int340x_thermal/int340x_thermal_zone.c (100%) + rename drivers/thermal/{ => intel}/int340x_thermal/int340x_thermal_zone.h (100%) + rename drivers/thermal/{ => intel}/int340x_thermal/processor_thermal_device.c (100%) + rename drivers/thermal/{ => intel}/intel_bxt_pmic_thermal.c (100%) + rename drivers/thermal/{ => intel}/intel_pch_thermal.c (100%) + rename drivers/thermal/{ => intel}/intel_powerclamp.c (100%) + rename drivers/thermal/{ => intel}/intel_quark_dts_thermal.c (100%) + rename drivers/thermal/{ => intel}/intel_soc_dts_iosf.c (100%) + rename drivers/thermal/{ => intel}/intel_soc_dts_iosf.h (100%) + rename drivers/thermal/{ => intel}/intel_soc_dts_thermal.c (100%) + rename drivers/thermal/{ => intel}/x86_pkg_temp_thermal.c (100%) + rename drivers/thermal/{ => qcom}/qcom-spmi-temp-alarm.c (99%) +$ git am -3 ../patches/0001-drivers-thermal-fixup-for-Kconfig-string-parsing-tig.patch +Applying: drivers: thermal: fixup for Kconfig string parsing tightening up +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/thermal/intel/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master b06cd51beca4] Merge remote-tracking branch 'thermal/next' + Date: Thu Jan 3 11:18:30 2019 +1100 +Merging thermal-soc/next (9d216211fded thermal: generic-adc: Fix adc to temp interpolation) +$ git merge thermal-soc/next +Auto-merging drivers/thermal/broadcom/brcmstb_thermal.c +Auto-merging drivers/thermal/broadcom/bcm2835_thermal.c +Auto-merging drivers/thermal/armada_thermal.c +Auto-merging drivers/thermal/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../arm/marvell/ap806-system-controller.txt | 7 + + .../arm/marvell/cp110-system-controller.txt | 9 + + .../bindings/thermal/rcar-gen3-thermal.txt | 3 +- + .../devicetree/bindings/thermal/rcar-thermal.txt | 6 +- + MAINTAINERS | 5 + + drivers/thermal/Kconfig | 2 +- + drivers/thermal/armada_thermal.c | 280 ++++++++++++++++++++- + drivers/thermal/broadcom/bcm2835_thermal.c | 11 + + drivers/thermal/broadcom/brcmstb_thermal.c | 24 +- + drivers/thermal/imx_thermal.c | 52 ++-- + drivers/thermal/intel/intel_powerclamp.c | 14 +- + drivers/thermal/qcom/tsens-common.c | 12 +- + drivers/thermal/rcar_thermal.c | 8 + + drivers/thermal/st/Makefile | 2 +- + drivers/thermal/tegra/soctherm.c | 12 +- + drivers/thermal/thermal-generic-adc.c | 12 +- + drivers/thermal/thermal_hwmon.h | 4 +- + drivers/thermal/uniphier_thermal.c | 13 +- + 18 files changed, 383 insertions(+), 93 deletions(-) +Merging ieee1394/for-next (c820518f6ca1 firewire: Remove depends on HAS_DMA in case of platform dependency) +$ git merge ieee1394/for-next +Merge made by the 'recursive' strategy. + drivers/firewire/Kconfig | 1 - + 1 file changed, 1 deletion(-) +Merging dlm/next (3595c559326d dlm: fix invalid cluster name warning) +$ git merge dlm/next +Already up to date. +Merging swiotlb/linux-next (da689221f952 xen/blkfront: avoid NULL blkfront_info dereference on device removal) +$ git merge swiotlb/linux-next +Auto-merging drivers/block/xen-blkfront.c +Merge made by the 'recursive' strategy. +Merging rdma/for-next (f617e5ffe04f RDMA/srpt: Use kmem_cache_free() instead of kfree()) +$ git merge rdma/for-next +Already up to date. +Merging net-next/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge net-next/master +Already up to date. +Merging bpf-next/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge bpf-next/master +Already up to date. +Merging ipsec-next/master (fa89a4593b92 xfrm6_tunnel: Fix spi check in __xfrm6_tunnel_alloc_spi) +$ git merge ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (71bef2fd583b IB/mlx5: Introduce uid as part of alloc/dealloc transport domain) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (fa2323325e8b selftests: net: reuseport_addr_any: silence clang warning) +$ git merge netfilter-next/master +Already up to date. +Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings) +$ git merge nfc-next/master +Auto-merging drivers/nfc/fdp/i2c.c +Merge made by the 'recursive' strategy. + drivers/nfc/fdp/fdp.c | 35 +++++------------------------------ + drivers/nfc/fdp/i2c.c | 26 +++++++++++++------------- + drivers/nfc/st21nfca/dep.c | 3 ++- + drivers/nfc/st21nfca/se.c | 5 +++-- + drivers/nfc/st95hf/core.c | 7 ++----- + net/nfc/netlink.c | 6 ++++-- + 6 files changed, 29 insertions(+), 53 deletions(-) +Merging ipvs-next/master (26a1ccc6c117 bpf: test: fix spelling mistake "REUSEEPORT" -> "REUSEPORT") +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (fa2323325e8b selftests: net: reuseport_addr_any: silence clang warning) +$ git merge wireless-drivers-next/master +Already up to date. +Merging bluetooth/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge bluetooth/master +Already up to date. +Merging mac80211-next/master (44a7b3b6e3a4 Merge branch 'bnxt_en-next') +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (8e143b90e4d4 Merge tag 'iommu-updates-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu) +$ git merge gfs2/for-next +Already up to date. +Merging mtd/mtd/next (f366d3854ec0 Merge tag 'spi-nor/for-4.21' of git://git.infradead.org/linux-mtd into mtd/next) +$ git merge mtd/mtd/next +Already up to date. +Merging nand/nand/next (732774437ae0 mtd: rawnand: sunxi: Write pageprog related opcodes to WCMD_SET) +$ git merge nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (b422847877e3 mtd: spi-nor: Add support for is25lp016d) +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (c79b411eaa72 crypto: skcipher - remove remnants of internal IV generators) +$ git merge crypto/master +Already up to date. +Merging drm/drm-next (74136a3d47f5 Merge branch 'drm-next-4.21' of git://people.freedesktop.org/~agd5f/linux into drm-next) +$ git merge drm/drm-next +Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Resolved 'drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master aa958fac596d] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 8 - + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 15 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 53 +++-- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.h | 10 + + drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 7 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 7 + + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 78 +++++-- + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 5 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 9 +- + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 30 ++- + drivers/gpu/drm/amd/amdgpu/vi.c | 18 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 4 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 93 ++++++-- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 15 ++ + .../amd/display/dc/bios/command_table_helper2.c | 1 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 10 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 48 +++- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 246 +++++++++++---------- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 3 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 6 +- + drivers/gpu/drm/amd/display/dc/dc_helper.c | 4 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c | 7 + + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 11 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 15 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 1 + + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 1 + + drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c | 1 + + .../drm/amd/display/include/bios_parser_types.h | 1 + + drivers/gpu/drm/amd/display/include/dal_types.h | 1 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 43 ++++ + drivers/gpu/drm/i915/gvt/cmd_parser.c | 6 +- + drivers/gpu/drm/i915/gvt/gvt.c | 2 +- + drivers/gpu/drm/i915/gvt/gvt.h | 4 + + drivers/gpu/drm/i915/gvt/handlers.c | 1 + + drivers/gpu/drm/i915/gvt/interrupt.c | 2 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 33 +++ + drivers/gpu/drm/ttm/ttm_bo.c | 33 +-- + 49 files changed, 623 insertions(+), 289 deletions(-) +Merging drm-intel/for-linux-next (cb6f4c2c3478 Merge tag 'gvt-next-2018-12-07' of https://github.com/intel/gvt-linux into drm-intel-next-fixes) +$ git merge drm-intel/for-linux-next +Already up to date. +Merging drm-tegra/drm/tegra/for-next (180b46ecdc9f drm/tegra: sor: Reset the SOR if possible) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (c75ff001f4fe drm: Put damage blob when destroy plane state) +$ git merge drm-misc/for-linux-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_atomic_state_helper.c | 3 +++ + drivers/gpu/drm/drm_damage_helper.c | 3 ++- + 2 files changed, 5 insertions(+), 1 deletion(-) +Merging drm-msm/msm-next (99c66bc051e7 drm/msm: Unblock writer if reader closes file) +$ git merge drm-msm/msm-next +Auto-merging drivers/gpu/drm/msm/msm_rd.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/msm/msm_rd.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) +Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane) +$ git merge hdlcd/for-upstream/hdlcd +Already up to date. +Merging mali-dp/for-upstream/mali-dp (fd99bd8b805c drm: malidp: Add the size of the superblocks when calculating total size for AFBC buffers) +$ git merge mali-dp/for-upstream/mali-dp +Already up to date. +Merging imx-drm/imx-drm/next (6cec571b70ec drm/imx: ipuv3-plane: add function to query atomic update status) +$ git merge imx-drm/imx-drm/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/ipuv3-plane.c | 20 ++++++++++++++++++++ + drivers/gpu/drm/imx/ipuv3-plane.h | 2 ++ + drivers/gpu/ipu-v3/ipu-pre.c | 6 ++++++ + drivers/gpu/ipu-v3/ipu-prg.c | 16 ++++++++++++++++ + drivers/gpu/ipu-v3/ipu-prv.h | 1 + + include/video/imx-ipu-v3.h | 1 + + 6 files changed, 46 insertions(+) +Merging etnaviv/etnaviv/next (801c7a1e5286 drm/etnaviv: remove lastctx member from gpu struct) +$ git merge etnaviv/etnaviv/next +Already up to date. +Merging kconfig/for-next (bebc6082da0a Linux 4.14) +$ git merge kconfig/for-next +Already up to date. +Merging regmap/for-next (d851a015bf3c Merge branch 'regmap-4.21' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-irq.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging sound/for-next (3e9ad24b0e91 ALSA: hda - Revert DSP detection on legacy HD-audio driver) +$ git merge sound/for-next +Already up to date. +Merging sound-asoc/for-next (b0b2b8feec72 Merge branch 'asoc-4.21' into asoc-next) +$ git merge sound-asoc/for-next +Removing sound/soc/generic/simple-scu-card.c +Removing sound/soc/generic/audio-graph-scu-card.c +Removing Documentation/devicetree/bindings/sound/simple-scu-card.txt +Removing Documentation/devicetree/bindings/sound/audio-graph-scu-card.txt +Merge made by the 'recursive' strategy. + .../bindings/sound/audio-graph-scu-card.txt | 123 ----- + Documentation/devicetree/bindings/sound/cs4341.txt | 22 + + .../bindings/sound/rockchip,rk3328-codec.txt | 23 + + .../devicetree/bindings/sound/simple-scu-card.txt | 94 ---- + .../bindings/sound/xlnx,audio-formatter.txt | 29 ++ + sound/core/compress_offload.c | 3 +- + sound/soc/codecs/Kconfig | 15 +- + sound/soc/codecs/Makefile | 4 + + sound/soc/codecs/cs4341.c | 346 +++++++++++++ + sound/soc/codecs/pcm512x.c | 11 +- + sound/soc/codecs/rk3328_codec.c | 519 +++++++++++++++++++ + sound/soc/codecs/rk3328_codec.h | 210 ++++++++ + sound/soc/codecs/wm8904.c | 21 +- + sound/soc/generic/Kconfig | 17 - + sound/soc/generic/Makefile | 4 - + sound/soc/generic/audio-graph-card.c | 465 +++++++++-------- + sound/soc/generic/audio-graph-scu-card.c | 501 ------------------ + sound/soc/generic/simple-card-utils.c | 14 +- + sound/soc/generic/simple-card.c | 454 ++++++++++------- + sound/soc/generic/simple-scu-card.c | 474 ----------------- + sound/soc/intel/atom/sst-atom-controls.c | 2 +- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 2 +- + sound/soc/intel/atom/sst/sst_acpi.c | 2 +- + sound/soc/intel/atom/sst/sst_drv_interface.c | 2 +- + sound/soc/intel/atom/sst/sst_loader.c | 2 +- + sound/soc/intel/baytrail/sst-baytrail-ipc.c | 3 +- + sound/soc/intel/baytrail/sst-baytrail-pcm.c | 2 +- + sound/soc/intel/boards/broadwell.c | 2 +- + sound/soc/intel/boards/glk_rt5682_max98357a.c | 2 +- + sound/soc/intel/boards/haswell.c | 2 +- + sound/soc/intel/boards/kbl_da7219_max98927.c | 4 +- + sound/soc/intel/haswell/sst-haswell-ipc.c | 2 +- + sound/soc/intel/haswell/sst-haswell-pcm.c | 4 +- + sound/soc/intel/skylake/skl-messages.c | 2 +- + sound/soc/intel/skylake/skl-pcm.c | 2 +- + sound/soc/intel/skylake/skl-topology.c | 2 +- + sound/soc/qcom/qdsp6/q6asm-dai.c | 17 +- + sound/soc/qcom/sdm845.c | 31 +- + sound/soc/sh/dma-sh7760.c | 2 +- + sound/soc/xilinx/Kconfig | 9 +- + sound/soc/xilinx/Makefile | 2 + + sound/soc/xilinx/xlnx_formatter_pcm.c | 565 +++++++++++++++++++++ + sound/soc/xilinx/xlnx_i2s.c | 15 +- + 43 files changed, 2373 insertions(+), 1654 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/sound/audio-graph-scu-card.txt + create mode 100644 Documentation/devicetree/bindings/sound/cs4341.txt + create mode 100644 Documentation/devicetree/bindings/sound/rockchip,rk3328-codec.txt + delete mode 100644 Documentation/devicetree/bindings/sound/simple-scu-card.txt + create mode 100644 Documentation/devicetree/bindings/sound/xlnx,audio-formatter.txt + create mode 100644 sound/soc/codecs/cs4341.c + create mode 100644 sound/soc/codecs/rk3328_codec.c + create mode 100644 sound/soc/codecs/rk3328_codec.h + delete mode 100644 sound/soc/generic/audio-graph-scu-card.c + delete mode 100644 sound/soc/generic/simple-scu-card.c + create mode 100644 sound/soc/xilinx/xlnx_formatter_pcm.c +Merging modules/modules-next (93d77e7f1410 ARM: module: Fix function kallsyms on Thumb-2) +$ git merge modules/modules-next +Already up to date. +Merging input/next (1e3c336ad8f4 Input: atmel_mxt_ts - don't try to free unallocated kernel memory) +$ git merge input/next +Already up to date. +Merging block/for-next (c3f57725d1cc Merge branch 'for-4.21/block-late' into for-next) +$ git merge block/for-next +Auto-merging drivers/block/drbd/drbd_receiver.c +Auto-merging block/bio.c +Merge made by the 'recursive' strategy. + block/bio.c | 4 + + block/blk-cgroup.c | 23 ---- + block/bsg.c | 4 + + drivers/ata/pata_macio.c | 2 + + drivers/block/amiflop.c | 2 - + drivers/block/drbd/drbd_debugfs.c | 2 + + drivers/block/drbd/drbd_int.h | 19 +-- + drivers/block/drbd/drbd_main.c | 28 ++++- + drivers/block/drbd/drbd_nl.c | 133 ++++++++++++++++---- + drivers/block/drbd/drbd_protocol.h | 47 +++++++ + drivers/block/drbd/drbd_receiver.c | 251 ++++++++++++++++++++++++++++++++----- + drivers/block/drbd/drbd_req.c | 19 +-- + drivers/block/drbd/drbd_req.h | 2 + + drivers/block/drbd/drbd_state.c | 11 +- + drivers/block/drbd/drbd_state.h | 5 +- + drivers/block/drbd/drbd_worker.c | 2 +- + drivers/block/loop.c | 1 - + drivers/block/sunvdc.c | 1 - + drivers/block/swim3.c | 14 ++- + drivers/cdrom/gdrom.c | 1 + + drivers/lightnvm/pblk-recovery.c | 1 - + include/linux/blk-cgroup.h | 21 +++- + include/linux/drbd.h | 2 +- + include/linux/genl_magic_struct.h | 5 +- + 24 files changed, 469 insertions(+), 131 deletions(-) +Merging device-mapper/for-next (bd938bf0b6cf Merge branch 'dm-4.20' into dm-next) +$ git merge device-mapper/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges) +$ git merge pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (5215b2e952f3 mmc: mediatek: Add MMC_CAP_SDIO_IRQ support) +$ git merge mmc/next +Already up to date. +Merging kgdb/kgdb-next (3bd67b37e350 kdb: print real address of pointers instead of hashed addresses) +$ git merge kgdb/kgdb-next +Auto-merging kernel/debug/kdb/kdb_support.c +Auto-merging kernel/debug/kdb/kdb_main.c +Auto-merging kernel/debug/kdb/kdb_bt.c +CONFLICT (content): Merge conflict in kernel/debug/kdb/kdb_bt.c +Recorded preimage for 'kernel/debug/kdb/kdb_bt.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'kernel/debug/kdb/kdb_bt.c'. +[master 83674f0f2ede] Merge remote-tracking branch 'kgdb/kgdb-next' +$ git diff -M --stat --summary HEAD^.. +Merging md/for-next (e820d55cb99d md: fix raid10 hang issue caused by barrier) +$ git merge md/for-next +Auto-merging lib/Kconfig +Auto-merging drivers/md/md.c +Merge made by the 'recursive' strategy. + drivers/md/md.c | 14 +++------ + drivers/md/raid10.c | 76 ++++++++++++++++++---------------------------- + include/linux/raid/pq.h | 8 ++++- + lib/Kconfig | 8 +++++ + lib/raid6/algos.c | 81 ++++++++++++++++++++++++++----------------------- + lib/raid6/test/Makefile | 3 ++ + 6 files changed, 94 insertions(+), 96 deletions(-) +Merging mfd/for-mfd-next (6e889719194d mfd: exynos-lpass: Enable UART module support) +$ git merge mfd/for-mfd-next +Auto-merging include/linux/mfd/tmio.h +Auto-merging drivers/mfd/cros_ec_dev.c +Auto-merging drivers/mfd/axp20x.c +Merge made by the 'recursive' strategy. + drivers/mfd/Kconfig | 1 + + drivers/mfd/ab8500-core.c | 2 +- + drivers/mfd/axp20x.c | 126 +++++++++++++++++++---------------- + drivers/mfd/bd9571mwv.c | 1 + + drivers/mfd/cros_ec_dev.c | 1 + + drivers/mfd/db8500-prcmu.c | 4 +- + drivers/mfd/exynos-lpass.c | 4 +- + drivers/mfd/madera-core.c | 5 +- + drivers/mfd/max77620.c | 2 +- + drivers/mfd/mc13xxx-core.c | 4 +- + drivers/mfd/mt6397-core.c | 3 +- + drivers/mfd/qcom_rpm.c | 4 ++ + drivers/mfd/rave-sp.c | 2 +- + drivers/mfd/stmpe.c | 12 ++-- + drivers/mfd/tps65218.c | 24 +------ + drivers/mfd/tps6586x.c | 24 +++++++ + drivers/mfd/twl-core.c | 4 +- + drivers/mfd/wm5110-tables.c | 2 + + include/linux/mfd/cros_ec_commands.h | 94 ++++++++++++++++++++++++++ + include/linux/mfd/ingenic-tcu.h | 2 +- + include/linux/mfd/madera/core.h | 7 ++ + include/linux/mfd/tmio.h | 2 +- + 22 files changed, 233 insertions(+), 97 deletions(-) +Merging backlight/for-backlight-next (3cee7a7d05b1 backlight: 88pm860x_bl: Use of_node_name_eq for node name comparisons) +$ git merge backlight/for-backlight-next +Auto-merging drivers/video/backlight/pwm_bl.c +Merge made by the 'recursive' strategy. + drivers/video/backlight/88pm860x_bl.c | 2 +- + drivers/video/backlight/pwm_bl.c | 28 +++++++++++++++++----------- + 2 files changed, 18 insertions(+), 12 deletions(-) +Merging battery/for-next (958091396648 power: supply: bq25890: fix BAT_COMP field definition) +$ git merge battery/for-next +Already up to date. +Merging regulator/for-next (f7c51a85cfe4 Merge branch 'regulator-4.21' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + drivers/regulator/lochnagar-regulator.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging security/next-testing (aa99a14dfb50 Merge branch 'next-general' into next-testing) +$ git merge security/next-testing +Already up to date! +Merge made by the 'recursive' strategy. +Merging apparmor/apparmor-next (43aa09fee2f0 apparmor: Fix warning about unused function apparmor_ipv6_postroute) +$ git merge apparmor/apparmor-next +Auto-merging security/apparmor/lsm.c +Merge made by the 'recursive' strategy. + security/apparmor/lsm.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging integrity/next-integrity (eed9de3b4f47 ima: Use inode_is_open_for_write) +$ git merge integrity/next-integrity +Already up to date. +Merging selinux/next (ee1a84fdfeed selinux: overhaul sidtab to fix bug and improve performance) +$ git merge selinux/next +Already up to date. +Merging tpmdd/next (9488585b21be tpm: add support for partial reads) +$ git merge tpmdd/next +Already up to date. +Merging watchdog/master (e3c21e088f89 watchdog: tqmx86: Add watchdog driver for the IO controller) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (03ebe48e235f Merge branches 'iommu/fixes', 'arm/renesas', 'arm/mediatek', 'arm/tegra', 'arm/omap', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next) +$ git merge iommu/next +Already up to date. +Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15) +$ git merge dwmw2-iommu/master +Already up to date. +Merging vfio/next (8ba35b3a0046 vfio-mdev/samples: Use u8 instead of char for handle functions) +$ 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 (d406db524c32 audit: remove duplicated include from audit.c) +$ git merge audit/next +Already up to date. +Merging devicetree/for-next (5801169a2ed2 of: __of_detach_node() - remove node from phandle cache) +$ git merge devicetree/for-next +Already up to date. +Merging mailbox/mailbox-for-next (d69e11648e48 mailbox: tegra-hsp: Use device-managed registration API) +$ git merge mailbox/mailbox-for-next +Merge made by the 'recursive' strategy. + .../bindings/mailbox/nvidia,tegra186-hsp.txt | 30 +- + drivers/mailbox/arm_mhu.c | 12 +- + drivers/mailbox/bcm-flexrm-mailbox.c | 4 +- + drivers/mailbox/bcm-pdc-mailbox.c | 4 +- + drivers/mailbox/bcm2835-mailbox.c | 18 +- + drivers/mailbox/hi3660-mailbox.c | 35 +- + drivers/mailbox/hi6220-mailbox.c | 11 +- + drivers/mailbox/imx-mailbox.c | 3 +- + drivers/mailbox/mailbox-altera.c | 15 +- + drivers/mailbox/mailbox-sti.c | 13 +- + drivers/mailbox/mailbox-xgene-slimpro.c | 11 +- + drivers/mailbox/mailbox.c | 101 +++- + drivers/mailbox/mtk-cmdq-mailbox.c | 11 +- + drivers/mailbox/omap-mailbox.c | 4 +- + drivers/mailbox/platform_mhu.c | 12 +- + drivers/mailbox/qcom-apcs-ipc-mailbox.c | 3 +- + drivers/mailbox/rockchip-mailbox.c | 15 +- + drivers/mailbox/stm32-ipcc.c | 4 +- + drivers/mailbox/tegra-hsp.c | 517 +++++++++++++++++---- + drivers/mailbox/ti-msgmgr.c | 15 +- + include/dt-bindings/mailbox/tegra186-hsp.h | 11 + + include/linux/mailbox_client.h | 1 + + include/linux/mailbox_controller.h | 9 + + 23 files changed, 612 insertions(+), 247 deletions(-) +Merging spi/for-next (eaf986d9631f Merge branch 'spi-4.21' into spi-next) +$ git merge spi/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging tip/auto-latest (8500c25e42f3 Merge branch 'sched/urgent') +$ git merge tip/auto-latest +Auto-merging MAINTAINERS +Auto-merging Kbuild +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 8 + + Kbuild | 18 +- + MAINTAINERS | 1 + + arch/arm64/include/asm/atomic.h | 237 +-- + arch/arm64/include/asm/atomic_ll_sc.h | 28 +- + arch/arm64/include/asm/atomic_lse.h | 38 +- + arch/arm64/include/asm/cmpxchg.h | 60 +- + arch/arm64/include/asm/sync_bitops.h | 16 +- + arch/x86/kernel/hpet.c | 4 - + arch/x86/kernel/tsc.c | 30 +- + drivers/firmware/efi/efi.c | 3 + + include/asm-generic/atomic-instrumented.h | 1688 +++++++++++++++-- + include/asm-generic/atomic-long.h | 1173 +++++++++--- + include/linux/atomic-fallback.h | 2294 +++++++++++++++++++++++ + include/linux/atomic.h | 1241 +----------- + kernel/watchdog.c | 7 + + scripts/atomic/atomic-tbl.sh | 186 ++ + scripts/atomic/atomics.tbl | 41 + + scripts/atomic/check-atomics.sh | 19 + + scripts/atomic/fallbacks/acquire | 9 + + scripts/atomic/fallbacks/add_negative | 16 + + scripts/atomic/fallbacks/add_unless | 16 + + scripts/atomic/fallbacks/andnot | 7 + + scripts/atomic/fallbacks/dec | 7 + + scripts/atomic/fallbacks/dec_and_test | 15 + + scripts/atomic/fallbacks/dec_if_positive | 15 + + scripts/atomic/fallbacks/dec_unless_positive | 14 + + scripts/atomic/fallbacks/fence | 11 + + scripts/atomic/fallbacks/fetch_add_unless | 23 + + scripts/atomic/fallbacks/inc | 7 + + scripts/atomic/fallbacks/inc_and_test | 15 + + scripts/atomic/fallbacks/inc_not_zero | 14 + + scripts/atomic/fallbacks/inc_unless_negative | 14 + + scripts/atomic/fallbacks/read_acquire | 7 + + scripts/atomic/fallbacks/release | 8 + + scripts/atomic/fallbacks/set_release | 7 + + scripts/atomic/fallbacks/sub_and_test | 16 + + scripts/atomic/fallbacks/try_cmpxchg | 11 + + scripts/atomic/gen-atomic-fallback.sh | 181 ++ + scripts/atomic/gen-atomic-instrumented.sh | 182 ++ + scripts/atomic/gen-atomic-long.sh | 101 + + tools/memory-model/.gitignore | 1 + + tools/memory-model/README | 2 + + tools/memory-model/linux-kernel.bell | 3 +- + tools/memory-model/linux-kernel.cat | 4 +- + tools/memory-model/linux-kernel.def | 1 + + tools/memory-model/scripts/README | 70 + + tools/memory-model/scripts/checkalllitmus.sh | 53 +- + tools/memory-model/scripts/checkghlitmus.sh | 65 + + tools/memory-model/scripts/checklitmus.sh | 74 +- + tools/memory-model/scripts/checklitmushist.sh | 60 + + tools/memory-model/scripts/cmplitmushist.sh | 87 + + tools/memory-model/scripts/initlitmushist.sh | 68 + + tools/memory-model/scripts/judgelitmus.sh | 78 + + tools/memory-model/scripts/newlitmushist.sh | 61 + + tools/memory-model/scripts/parseargs.sh | 136 ++ + tools/memory-model/scripts/runlitmushist.sh | 87 + + 57 files changed, 6698 insertions(+), 1940 deletions(-) + create mode 100644 include/linux/atomic-fallback.h + create mode 100755 scripts/atomic/atomic-tbl.sh + create mode 100755 scripts/atomic/atomics.tbl + create mode 100755 scripts/atomic/check-atomics.sh + create mode 100755 scripts/atomic/fallbacks/acquire + create mode 100755 scripts/atomic/fallbacks/add_negative + create mode 100755 scripts/atomic/fallbacks/add_unless + create mode 100755 scripts/atomic/fallbacks/andnot + create mode 100755 scripts/atomic/fallbacks/dec + create mode 100755 scripts/atomic/fallbacks/dec_and_test + create mode 100755 scripts/atomic/fallbacks/dec_if_positive + create mode 100755 scripts/atomic/fallbacks/dec_unless_positive + create mode 100755 scripts/atomic/fallbacks/fence + create mode 100755 scripts/atomic/fallbacks/fetch_add_unless + create mode 100755 scripts/atomic/fallbacks/inc + create mode 100755 scripts/atomic/fallbacks/inc_and_test + create mode 100755 scripts/atomic/fallbacks/inc_not_zero + create mode 100755 scripts/atomic/fallbacks/inc_unless_negative + create mode 100755 scripts/atomic/fallbacks/read_acquire + create mode 100755 scripts/atomic/fallbacks/release + create mode 100755 scripts/atomic/fallbacks/set_release + create mode 100755 scripts/atomic/fallbacks/sub_and_test + create mode 100755 scripts/atomic/fallbacks/try_cmpxchg + create mode 100755 scripts/atomic/gen-atomic-fallback.sh + create mode 100755 scripts/atomic/gen-atomic-instrumented.sh + create mode 100755 scripts/atomic/gen-atomic-long.sh + create mode 100644 tools/memory-model/.gitignore + create mode 100644 tools/memory-model/scripts/README + create mode 100644 tools/memory-model/scripts/checkghlitmus.sh + create mode 100644 tools/memory-model/scripts/checklitmushist.sh + create mode 100644 tools/memory-model/scripts/cmplitmushist.sh + create mode 100644 tools/memory-model/scripts/initlitmushist.sh + create mode 100644 tools/memory-model/scripts/judgelitmus.sh + create mode 100644 tools/memory-model/scripts/newlitmushist.sh + create mode 100644 tools/memory-model/scripts/parseargs.sh + create mode 100644 tools/memory-model/scripts/runlitmushist.sh +Merging clockevents/clockevents/next (bd2bcaa565a2 Merge branch 'clockevents/4.21' of http://git.linaro.org/people/daniel.lezcano/linux into timers/core) +$ git merge clockevents/clockevents/next +Already up to date. +Merging edac-amd/for-next (75dfa87035f9 EDAC, fsl_ddr: Add LS1021A to the list of supported hardware) +$ git merge edac-amd/for-next +Already up to date. +Merging irqchip/irq/irqchip-next (fb94109b764e irqchip/stm32: protect configuration registers with hwspinlock) +$ git merge irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (3d739c1f6156 tracing: Use the return of str_has_prefix() to remove open coded numbers) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (06aa5694f870 Merge LKMM and RCU commits) +$ git merge rcu/rcu/next +Auto-merging tools/memory-model/scripts/runlitmushist.sh +CONFLICT (add/add): Merge conflict in tools/memory-model/scripts/runlitmushist.sh +Auto-merging tools/memory-model/scripts/parseargs.sh +CONFLICT (add/add): Merge conflict in tools/memory-model/scripts/parseargs.sh +Auto-merging tools/memory-model/scripts/newlitmushist.sh +CONFLICT (add/add): Merge conflict in tools/memory-model/scripts/newlitmushist.sh +Auto-merging tools/memory-model/scripts/judgelitmus.sh +CONFLICT (add/add): Merge conflict in tools/memory-model/scripts/judgelitmus.sh +Auto-merging tools/memory-model/scripts/initlitmushist.sh +CONFLICT (add/add): Merge conflict in tools/memory-model/scripts/initlitmushist.sh +Auto-merging tools/memory-model/scripts/checklitmushist.sh +CONFLICT (add/add): Merge conflict in tools/memory-model/scripts/checklitmushist.sh +Auto-merging tools/memory-model/scripts/checkghlitmus.sh +CONFLICT (add/add): Merge conflict in tools/memory-model/scripts/checkghlitmus.sh +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3651efd4fe17] Merge remote-tracking branch 'rcu/rcu/next' +$ git diff -M --stat --summary HEAD^.. +Merging kvm/linux-next (a0aea130afeb KVM: x86: Add CPUID support for new instruction WBNOINVD) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (8c33df1afd86 arm: KVM: Add S2_PMD_{MASK,SIZE} constants) +$ git merge kvm-arm/next +Already up to date. +Merging kvm-ppc/kvm-ppc-next (ae59a7e1945b KVM: PPC: Book3S HV: Keep rc bits in shadow pgtable in sync with host) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (7aedd9d48f2a KVM: s390: fix kmsg component kvm-s390) +$ git merge kvms390/next +Already up to date. +Merging xen-tip/linux-next (e6587cdbd732 pvcalls-back: set -ENOTCONN in pvcalls_conn_back_read) +$ git merge xen-tip/linux-next +Merge made by the 'recursive' strategy. + drivers/xen/pvcalls-back.c | 7 ++++--- + drivers/xen/pvcalls-front.c | 20 +++++++++++++------- + 2 files changed, 17 insertions(+), 10 deletions(-) +Merging percpu/for-next (718f6757a29b Merge branch 'for-4.21' into for-next) +$ git merge percpu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (87915adc3f0a workqueue: re-add lockdep dependencies for flushing) +$ git merge workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (fb7255a92311 platform/x86: mlx-platform: Convert to use SPDX identifier) +$ git merge drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (2a70a4cda0da MAINTAINERS: platform/chrome: Add Enric as a maintainer) +$ git merge chrome-platform/for-next +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 12ec282c5a17] Merge remote-tracking branch 'chrome-platform/for-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 1 + + drivers/platform/chrome/cros_ec_proto.c | 22 +++++++++++++++++----- + include/linux/mfd/cros_ec.h | 6 ++++-- + 3 files changed, 22 insertions(+), 7 deletions(-) +Merging hsi/for-next (3a658e09a215 HSI: omap_ssi: Change to use DEFINE_SHOW_ATTRIBUTE macro) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (8146aace60c7 led: triggers: Initialize LED_INIT_DEFAULT_TRIGGER if trigger is brought after class) +$ git merge leds/for-next +Already up to date. +Merging ipmi/for-next (d09eac7d08aa ipmi: Don't initialize anything in the core until something uses it) +$ git merge ipmi/for-next +Auto-merging drivers/char/ipmi/ipmi_si_intf.c +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_devintf.c | 6 +- + drivers/char/ipmi/ipmi_msghandler.c | 292 +++++++++++++++++++++++------------- + drivers/char/ipmi/ipmi_si_intf.c | 5 +- + drivers/char/ipmi/ipmi_ssif.c | 211 ++++++++++++++++++-------- + drivers/char/ipmi/kcs_bmc.c | 5 +- + include/linux/ipmi_smi.h | 27 +++- + 6 files changed, 367 insertions(+), 179 deletions(-) +Merging driver-core/driver-core-next (8e143b90e4d4 Merge tag 'iommu-updates-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (8e143b90e4d4 Merge tag 'iommu-updates-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu) +$ git merge usb/usb-next +Already up to date. +Merging usb-gadget/next (4fe4f9fecc36 usb: dwc2: Fix disable all EP's on disconnect) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (8d503f206c33 USB: serial: pl2303: add ids for Hewlett-Packard HP POS pole displays) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/ci-for-usb-next (9049fce897ed usb: chipidea: imx: allow to configure oc polarity on i.MX25) +$ git merge usb-chipidea-next/ci-for-usb-next +Already up to date. +Merging phy-next/next (2e38c2e7026a phy: qcom-qmp: Expose provided clocks to DT) +$ git merge phy-next/next +Already up to date. +Merging tty/tty-next (8e143b90e4d4 Merge tag 'iommu-updates-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu) +$ git merge tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (8e143b90e4d4 Merge tag 'iommu-updates-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu) +$ git merge char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (a2dc50914744 extcon: max8997: Fix lack of path setting in USB device mode) +$ git merge extcon/extcon-next +Already up to date. +Merging soundwire/next (b1635596860d soundwire: intel: constify snd_soc_dai_ops structures) +$ git merge soundwire/next +Already up to date. +Merging thunderbolt/next (dcc3c9e37fbd thunderbolt: Export IOMMU based DMA protection support to userspace) +$ git merge thunderbolt/next +Already up to date. +Merging staging/staging-next (195303136f19 Merge tag 'kconfig-v4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) +$ git merge staging/staging-next +Already up to date. +Merging mux/for-next (a1ad5ff63944 Merge branch 'i2c-mux/for-next' into for-next) +$ git merge mux/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. +Merging icc/icc-next (f8325633fbae MAINTAINERS: add a maintainer for the interconnect API) +$ git merge icc/icc-next +Auto-merging drivers/Makefile +Auto-merging drivers/Kconfig +Auto-merging arch/arm64/boot/dts/qcom/sdm845.dtsi +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/interconnect/interconnect.txt | 60 ++ + .../bindings/interconnect/qcom,sdm845.txt | 24 + + Documentation/interconnect/interconnect.rst | 94 +++ + MAINTAINERS | 10 + + arch/arm64/boot/dts/qcom/sdm845.dtsi | 5 + + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/interconnect/Kconfig | 15 + + drivers/interconnect/Makefile | 6 + + drivers/interconnect/core.c | 787 +++++++++++++++++++ + drivers/interconnect/qcom/Kconfig | 13 + + drivers/interconnect/qcom/Makefile | 5 + + drivers/interconnect/qcom/sdm845.c | 838 +++++++++++++++++++++ + include/dt-bindings/interconnect/qcom,sdm845.h | 143 ++++ + include/linux/interconnect-provider.h | 142 ++++ + include/linux/interconnect.h | 59 ++ + 16 files changed, 2204 insertions(+) + create mode 100644 Documentation/devicetree/bindings/interconnect/interconnect.txt + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sdm845.txt + create mode 100644 Documentation/interconnect/interconnect.rst + create mode 100644 drivers/interconnect/Kconfig + create mode 100644 drivers/interconnect/Makefile + create mode 100644 drivers/interconnect/core.c + create mode 100644 drivers/interconnect/qcom/Kconfig + create mode 100644 drivers/interconnect/qcom/Makefile + create mode 100644 drivers/interconnect/qcom/sdm845.c + create mode 100644 include/dt-bindings/interconnect/qcom,sdm845.h + create mode 100644 include/linux/interconnect-provider.h + create mode 100644 include/linux/interconnect.h +Merging slave-dma/next (8fc4a3d104a3 Merge branch 'topic/fsl' into next) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/dma/fsl-qdma.txt | 57 + + drivers/dma/Kconfig | 14 + + drivers/dma/Makefile | 1 + + drivers/dma/fsl-qdma.c | 1259 ++++++++++++++++++++ + drivers/dma/fsldma.c | 16 +- + drivers/dma/fsldma.h | 61 +- + 6 files changed, 1381 insertions(+), 27 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/fsl-qdma.txt + create mode 100644 drivers/dma/fsl-qdma.c +Merging cgroup/for-next (0623413ee0ba Merge branch 'for-4.21' into for-next) +$ git merge cgroup/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging scsi/for-next (1f0fe08f8a45 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Merge made by the 'recursive' strategy. +Merging scsi-mkp/for-next (da7903092b88 scsi: isci: request: mark expected switch fall-through) +$ git merge scsi-mkp/for-next +Already up to date. +Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker) +$ git merge target-updates/for-next +Already up to date. +Merging target-bva/for-next (60cc43fc8884 Linux 4.17-rc1) +$ git merge target-bva/for-next +Already up to date. +Merging vhost/linux-next (7f86a211fabe virtio: use dependent_ptr_mb) +$ git merge vhost/linux-next +Auto-merging include/linux/compiler.h +Auto-merging include/linux/compiler-gcc.h +Auto-merging include/linux/compiler-clang.h +Auto-merging drivers/virtio/virtio_ring.c +CONFLICT (content): Merge conflict in drivers/virtio/virtio_ring.c +Auto-merging drivers/vhost/scsi.c +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/block/virtio_blk.c +Auto-merging Documentation/memory-barriers.txt +Recorded preimage for 'drivers/virtio/virtio_ring.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/virtio/virtio_ring.c'. +[master 65f2c338068d] Merge remote-tracking branch 'vhost/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/memory-barriers.txt | 20 ++++++ + arch/alpha/include/asm/barrier.h | 1 + + drivers/block/virtio_blk.c | 83 +++++++++++++++++++++++- + drivers/net/virtio_net.c | 29 ++++++--- + drivers/pci/setup-bus.c | 10 +++ + drivers/vhost/scsi.c | 4 +- + drivers/vhost/vsock.c | 16 ++--- + drivers/virtio/virtio_pci_legacy.c | 6 +- + drivers/virtio/virtio_ring.c | 12 ++-- + include/asm-generic/barrier.h | 18 ++++++ + include/linux/compiler-clang.h | 5 +- + include/linux/compiler-gcc.h | 4 -- + include/linux/compiler-intel.h | 4 +- + include/linux/compiler.h | 8 ++- + include/uapi/linux/vhost.h | 113 +------------------------------- + include/uapi/linux/vhost_types.h | 128 +++++++++++++++++++++++++++++++++++++ + include/uapi/linux/virtio_blk.h | 54 ++++++++++++++++ + 17 files changed, 366 insertions(+), 149 deletions(-) + create mode 100644 include/uapi/linux/vhost_types.h +Merging rpmsg/for-next (f369d7f18308 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Merge made by the 'recursive' strategy. + .../bindings/hwlock/st,stm32-hwspinlock.txt | 23 +++ + drivers/hwspinlock/Kconfig | 9 ++ + drivers/hwspinlock/Makefile | 1 + + drivers/hwspinlock/stm32_hwspinlock.c | 156 +++++++++++++++++++++ + drivers/remoteproc/qcom_wcnss.c | 2 +- + drivers/remoteproc/remoteproc_debugfs.c | 26 ++++ + include/linux/remoteproc.h | 4 +- + 7 files changed, 218 insertions(+), 3 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwlock/st,stm32-hwspinlock.txt + create mode 100644 drivers/hwspinlock/stm32_hwspinlock.c +Merging gpio/for-next (18a6d70e28cf Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging gpio-brgl/gpio/for-next (1a9430db2835 ima: cleanup the match_token policy code) +$ git merge gpio-brgl/gpio/for-next +Already up to date. +Merging pinctrl/for-next (88cc9fc41c73 dt-bindings: arm: fsl-scu: add imx8qm pinctrl support) +$ git merge pinctrl/for-next +Already up to date. +Merging pinctrl-samsung/for-next (651022382c7f Linux 4.20-rc1) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (e94b815524f8 dt-bindings: pwm: rcar: Add r8a774c0 support) +$ git merge pwm/for-next +Already up to date. +Merging userns/for-next (1e9c75fb9c47 mnt: fix __detach_mounts infinite loop) +$ git merge userns/for-next +Already up to date. +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 (05cbbb6f9ed5 drivers/char/random.c: make primary_crng static) +$ git merge random/dev +Auto-merging drivers/char/random.c +Merge made by the 'recursive' strategy. + drivers/char/random.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) +Merging kselftest/next (283ac6d5fb2a selftests: Fix test errors related to lib.mk khdr target) +$ git merge kselftest/next +Already up to date. +Merging y2038/y2038 (e4b92b108c6c timekeeping: remove obsolete time accessors) +$ git merge y2038/y2038 +Already up to date. +Merging livepatching/for-next (bd0ab5efe8ec Merge branch 'for-4.21/upstream' into for-next) +$ git merge livepatching/for-next +Merge made by the 'recursive' strategy. + samples/livepatch/livepatch-shadow-fix1.c | 5 +++++ + samples/livepatch/livepatch-shadow-mod.c | 4 ++++ + 2 files changed, 9 insertions(+) +Merging coresight/next (7ff8957175d6 coresight: Use of_node_name_eq for node name comparisons) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight-cpu-debug.c | 4 ++++ + drivers/hwtracing/coresight/coresight-stm.c | 12 ++++-------- + drivers/hwtracing/coresight/of_coresight.c | 4 ++-- + 3 files changed, 10 insertions(+), 10 deletions(-) +Merging rtc/rtc-next (36e14f5fdfdf rtc: rename core files) +$ git merge rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (8a6f7591ddf5 Merge branch 'for-5.0/dax' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging at24/at24/for-next (37cf28d3b5bc eeprom: at24: add support for 24c2048) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (d9842b39e9ec ntb_hw_switchtec: Added support of >=4G memory windows) +$ git merge ntb/ntb-next +Auto-merging include/linux/switchtec.h +Merge made by the 'recursive' strategy. + drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 11 ++++++++--- + include/linux/switchtec.h | 10 +++++++--- + 2 files changed, 15 insertions(+), 6 deletions(-) +Merging kspp/for-next/kspp (be1944712d8e Merge branch 'for-next/gcc-plugin/arm-stackprotector' into for-next/kspp) +$ git merge kspp/for-next/kspp +Already up to date! +Merge made by the 'recursive' strategy. +Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove) +$ git merge init_task/init_task +Already up to date. +Merging cisco/for-next (84a401a27506 Merge branch 'for-x86' into for-next) +$ git merge cisco/for-next +Auto-merging init/Kconfig +Auto-merging arch/x86/kernel/setup.c +CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/powerpc/kernel/prom.c +Auto-merging arch/powerpc/Kconfig +Resolved 'arch/x86/kernel/setup.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8c0d554512e2] Merge remote-tracking branch 'cisco/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/powerpc/Kconfig | 23 +-------- + arch/powerpc/configs/44x/fsp2_defconfig | 29 ++++++----- + arch/powerpc/configs/44x/iss476-smp_defconfig | 24 ++++----- + arch/powerpc/configs/44x/warp_defconfig | 12 ++--- + arch/powerpc/configs/holly_defconfig | 12 ++--- + arch/powerpc/configs/mvme5100_defconfig | 25 +++++----- + arch/powerpc/configs/skiroot_defconfig | 48 +++++++++--------- + arch/powerpc/configs/storcenter_defconfig | 15 +++--- + arch/powerpc/kernel/prom.c | 4 ++ + arch/powerpc/kernel/prom_init.c | 8 +-- + arch/powerpc/kernel/prom_init_check.sh | 2 +- + arch/x86/Kconfig | 44 +--------------- + arch/x86/kernel/setup.c | 19 ++----- + include/linux/cmdline.h | 72 +++++++++++++++++++++++++++ + init/Kconfig | 69 +++++++++++++++++++++++++ + 15 files changed, 235 insertions(+), 171 deletions(-) + create mode 100644 include/linux/cmdline.h +Merging gnss/gnss-next (2595646791c3 Linux 4.20-rc5) +$ git merge gnss/gnss-next +Already up to date. +Merging fsi/master (d20810530b71 fsi: fsi-scom.c: Remove duplicate header) +$ git merge fsi/master +Already up to date. +Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4) +$ git merge siox/siox/next +Already up to date. +Merging slimbus/for-next (39a577fe6163 slimbus: ngd: fix spelling mistake "exeeds" -> "exceeds") +$ git merge slimbus/for-next +Auto-merging drivers/slimbus/qcom-ngd-ctrl.c +Merge made by the 'recursive' strategy. +Merging nvmem/for-next (5035d66cc629 nvmem: meson-efuse: add peripheral clock) +$ git merge nvmem/for-next +Auto-merging include/linux/nvmem-provider.h +CONFLICT (content): Merge conflict in include/linux/nvmem-provider.h +Auto-merging drivers/nvmem/core.c +Resolved 'include/linux/nvmem-provider.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master cb4e05c77ace] Merge remote-tracking branch 'nvmem/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging xarray/xarray (48483614de97 XArray: Fix xa_alloc when id exceeds max) +$ git merge xarray/xarray +Already up to date. +Merging hyperv/hyperv-next (651022382c7f Linux 4.20-rc1) +$ git merge hyperv/hyperv-next +Already up to date. +Merging auxdisplay/auxdisplay (d4683eee8cd6 auxdisplay: charlcd: fix x/y command parsing) +$ git merge auxdisplay/auxdisplay +Merge made by the 'recursive' strategy. +Merging kgdb-dt/kgdb/for-next (97498c96a186 kgdb/treewide: constify struct kgdb_arch arch_kgdb_ops) +$ git merge kgdb-dt/kgdb/for-next +Auto-merging arch/sh/kernel/kgdb.c +Merge made by the 'recursive' strategy. +Merging akpm-current/current (e2230989e259 ipc: conserve sequence numbers in extended IPCMNI mode) +$ git merge --no-ff akpm-current/current +Auto-merging lib/Kconfig.debug +Auto-merging init/main.c +Auto-merging init/initramfs.c +Auto-merging include/linux/binfmts.h +Auto-merging fs/proc/inode.c +Auto-merging fs/hugetlbfs/inode.c +Auto-merging fs/exec.c +Auto-merging fs/eventpoll.c +Auto-merging fs/dax.c +Auto-merging fs/buffer.c +Auto-merging block/genhd.c +Auto-merging arch/arc/include/asm/bitops.h +Auto-merging Documentation/process/coding-style.rst +Auto-merging Documentation/filesystems/proc.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 11 + + Documentation/filesystems/proc.txt | 7 +- + Documentation/process/coding-style.rst | 3 + + Documentation/sysctl/kernel.txt | 17 + + arch/alpha/include/asm/bitops.h | 4 +- + arch/arc/include/asm/bitops.h | 4 +- + arch/arm/include/asm/page.h | 2 + + arch/c6x/include/asm/bitops.h | 2 +- + arch/csky/include/asm/bitops.h | 2 +- + arch/hexagon/include/asm/bitops.h | 2 +- + arch/ia64/include/asm/bitops.h | 3 +- + arch/m68k/include/asm/bitops.h | 2 +- + arch/mips/include/asm/bitops.h | 2 +- + arch/openrisc/include/asm/bitops/fls.h | 2 +- + arch/parisc/include/asm/bitops.h | 2 +- + arch/s390/include/asm/bitops.h | 4 +- + arch/sparc/include/asm/pgtable_64.h | 30 -- + arch/unicore32/include/asm/bitops.h | 2 +- + arch/x86/include/asm/bitops.h | 2 +- + block/genhd.c | 2 +- + drivers/dma-buf/udmabuf.c | 2 +- + drivers/hv/hv_balloon.c | 6 +- + drivers/xen/balloon.c | 23 +- + fs/autofs/autofs_i.h | 13 +- + fs/autofs/dev-ioctl.c | 27 +- + fs/autofs/init.c | 2 +- + fs/autofs/inode.c | 67 +-- + fs/autofs/root.c | 16 +- + fs/autofs/waitq.c | 10 +- + fs/bfs/bfs.h | 11 +- + fs/bfs/dir.c | 4 +- + fs/bfs/file.c | 2 +- + fs/bfs/inode.c | 65 ++- + fs/binfmt_script.c | 10 +- + fs/buffer.c | 50 +- + fs/dax.c | 7 + + fs/eventpoll.c | 218 ++++---- + fs/exec.c | 105 ++-- + fs/fat/cache.c | 2 +- + fs/fat/dir.c | 4 +- + fs/fat/fat.h | 30 +- + fs/fat/fatent.c | 16 +- + fs/fat/inode.c | 26 +- + fs/fat/misc.c | 2 +- + fs/hfsplus/dir.c | 1 + + fs/hfsplus/hfsplus_fs.h | 2 + + fs/hfsplus/inode.c | 21 + + fs/hugetlbfs/inode.c | 2 +- + fs/ocfs2/aops.c | 22 +- + fs/ocfs2/dlm/dlmrecovery.c | 1 - + fs/ocfs2/dlm/dlmunlock.c | 6 + + fs/proc/base.c | 18 +- + fs/proc/inode.c | 4 +- + fs/proc/task_mmu.c | 17 +- + fs/proc/util.c | 1 + + include/asm-generic/bitops/builtin-fls.h | 2 +- + include/asm-generic/bitops/fls.h | 2 +- + include/linux/binfmts.h | 1 + + include/linux/build_bug.h | 36 +- + include/linux/genalloc.h | 13 +- + include/linux/ipc_namespace.h | 1 + + include/linux/kernel.h | 1 + + include/linux/memblock.h | 41 ++ + include/linux/memory_hotplug.h | 2 +- + include/linux/mm.h | 50 +- + include/linux/mmu_notifier.h | 35 +- + include/linux/pagemap.h | 1 + + include/linux/printk.h | 2 +- + include/linux/sched.h | 7 + + include/linux/sched/signal.h | 18 + + include/linux/sched/task.h | 2 + + include/linux/swap.h | 13 +- + include/uapi/linux/auto_fs.h | 2 +- + include/uapi/linux/bfs_fs.h | 2 +- + include/uapi/linux/binfmts.h | 2 +- + include/uapi/linux/fcntl.h | 1 + + include/uapi/linux/msdos_fs.h | 9 +- + include/uapi/linux/sysctl.h | 1 + + init/initramfs.c | 6 +- + init/main.c | 3 +- + ipc/ipc_sysctl.c | 14 +- + ipc/util.c | 29 +- + ipc/util.h | 46 +- + kernel/events/uprobes.c | 3 +- + kernel/fork.c | 5 - + kernel/hung_task.c | 20 +- + kernel/kcov.c | 2 +- + kernel/panic.c | 28 ++ + kernel/ptrace.c | 15 +- + kernel/sysctl.c | 9 + + kernel/sysctl_binary.c | 1 + + lib/Kconfig.debug | 6 + + lib/debugobjects.c | 66 ++- + lib/find_bit_benchmark.c | 11 +- + lib/genalloc.c | 20 +- + mm/filemap.c | 213 +++++--- + mm/huge_memory.c | 12 +- + mm/hugetlb.c | 10 +- + mm/internal.h | 1 + + mm/khugepaged.c | 3 +- + mm/ksm.c | 36 +- + mm/madvise.c | 3 +- + mm/memblock.c | 64 +++ + mm/memfd.c | 3 +- + mm/memory.c | 33 +- + mm/memory_hotplug.c | 60 +-- + mm/migrate.c | 5 +- + mm/mincore.c | 12 +- + mm/mprotect.c | 3 +- + mm/mremap.c | 3 +- + mm/oom_kill.c | 2 +- + mm/page_alloc.c | 634 ++++++++++++++---------- + mm/page_owner.c | 4 +- + mm/rmap.c | 6 +- + mm/shmem.c | 475 ++++++++++-------- + mm/slub.c | 15 +- + mm/swap_state.c | 16 +- + mm/swapfile.c | 156 ++++-- + mm/vmscan.c | 23 +- + scripts/checkpatch.pl | 19 +- + scripts/gdb/linux/proc.py | 2 +- + tools/include/asm-generic/bitops/fls.h | 2 +- + tools/testing/selftests/memfd/memfd_test.c | 74 +++ + 123 files changed, 2179 insertions(+), 1156 deletions(-) +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: scripts/atomic/check-atomics.sh: don't assume that scripts are executable +Applying: mm: treewide: remove unused address argument from pte_alloc functions +Applying: mm-treewide-remove-unused-address-argument-from-pte_alloc-functions-v2-fix +Applying: mm: speed up mremap by 20x on large regions +Applying: mm/mremap: fix 'move_normal_pmd' unused function warning +Applying: mm: select HAVE_MOVE_PMD on x86 for faster mremap +Applying: kernel/async.c: remove some duplicated includes +Applying: kernel/signal.c: remove some duplicated includes +Applying: locking/atomics: build atomic headers as required +Applying: mm: balloon: update comment about isolation/migration/compaction +Applying: mm: convert PG_balloon to PG_offline +Applying: mm-convert-pg_balloon-to-pg_offline-fix +Applying: kexec: export PG_offline to VMCOREINFO +Applying: xen/balloon: mark inflated pages PG_offline +Applying: hv_balloon: mark inflated pages PG_offline +Applying: vmw_balloon: mark inflated pages PG_offline +Applying: vmw_balloon-mark-inflated-pages-pg_offline-v2 +Applying: PM/Hibernate: use pfn_to_online_page() +Applying: PM/Hibernate: exclude all PageOffline() pages +Applying: pm-hibernate-exclude-all-pageoffline-pages-v2 +Applying: kernel/locking/mutex.c: remove caller signal_pending branch predictions +Applying: kernel/sched/: remove caller signal_pending branch predictions +Applying: arch/arc/mm/fault.c: remove caller signal_pending_branch predictions +Applying: mm/: remove caller signal_pending branch predictions +Applying: fs/: remove caller signal_pending branch predictions +Applying: fs-remove-caller-signal_pending-branch-predictions-fix +Applying: include/linux/sched/signal.h: replace `tsk' with `task' +Applying: fs: don't open code lru_to_page() +Applying: drivers/base/platform.c: kmemleak ignore a known leak +Applying: docs: fix Co-Developed-by docs +Applying: checkpatch: add Co-developed-by to signature tags +Applying: mm/page_io.c: fix polled swap page in +Applying: kernel/fork.c: remove duplicated include +Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow +Applying: openvswitch: convert to kvmalloc +Applying: md: convert to kvmalloc +Applying: selinux: convert to kvmalloc +Applying: Generic radix trees +Applying: proc: commit to genradix +Applying: sctp: convert to genradix +Applying: Drop flex_arrays +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 90775de4d86b...2ed882b822a5 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (2ed882b822a5 Drop flex_arrays) +$ git merge --no-ff akpm/master +Removing lib/flex_array.c +Removing include/linux/flex_array.h +Removing include/linux/atomic-fallback.h +Removing include/asm-generic/atomic-long.h +Removing include/asm-generic/atomic-instrumented.h +Removing Documentation/flexible-arrays.txt +Removing Documentation/core-api/flexible-arrays.rst +Merge made by the 'recursive' strategy. + Documentation/admin-guide/mm/pagemap.rst | 9 +- + Documentation/core-api/flexible-arrays.rst | 130 -- + Documentation/core-api/generic-radix-tree.rst | 12 + + Documentation/core-api/index.rst | 1 + + Documentation/flexible-arrays.txt | 123 -- + Documentation/process/submitting-patches.rst | 4 +- + Kbuild | 18 +- + Makefile | 8 +- + arch/Kconfig | 5 + + arch/alpha/include/asm/pgalloc.h | 6 +- + arch/arc/include/asm/pgalloc.h | 5 +- + arch/arc/mm/fault.c | 2 +- + arch/arm/include/asm/pgalloc.h | 4 +- + arch/arm64/include/asm/atomic.h | 2 +- + arch/arm64/include/asm/pgalloc.h | 4 +- + arch/hexagon/include/asm/pgalloc.h | 6 +- + arch/ia64/include/asm/pgalloc.h | 5 +- + arch/m68k/include/asm/mcf_pgalloc.h | 8 +- + arch/m68k/include/asm/motorola_pgalloc.h | 4 +- + arch/m68k/include/asm/sun3_pgalloc.h | 6 +- + arch/microblaze/include/asm/pgalloc.h | 19 +- + arch/microblaze/mm/pgtable.c | 3 +- + arch/mips/include/asm/pgalloc.h | 6 +- + arch/nds32/include/asm/pgalloc.h | 5 +- + arch/nios2/include/asm/pgalloc.h | 6 +- + arch/openrisc/include/asm/pgalloc.h | 5 +- + arch/openrisc/mm/ioremap.c | 3 +- + arch/parisc/include/asm/pgalloc.h | 4 +- + arch/powerpc/include/asm/book3s/32/pgalloc.h | 6 +- + arch/powerpc/include/asm/book3s/64/pgalloc.h | 12 +- + arch/powerpc/include/asm/nohash/32/pgalloc.h | 6 +- + arch/powerpc/include/asm/nohash/64/pgalloc.h | 6 +- + arch/powerpc/mm/pgtable-frag.c | 2 +- + arch/powerpc/mm/pgtable_32.c | 8 +- + arch/riscv/include/asm/pgalloc.h | 6 +- + arch/s390/include/asm/pgalloc.h | 4 +- + arch/sh/include/asm/pgalloc.h | 6 +- + arch/sparc/include/asm/pgalloc_32.h | 5 +- + arch/sparc/include/asm/pgalloc_64.h | 6 +- + arch/sparc/mm/init_64.c | 6 +- + arch/sparc/mm/srmmu.c | 4 +- + arch/um/include/asm/pgalloc.h | 4 +- + arch/um/kernel/mem.c | 4 +- + arch/unicore32/include/asm/pgalloc.h | 4 +- + arch/x86/Kconfig | 1 + + arch/x86/include/asm/atomic.h | 2 +- + arch/x86/include/asm/pgalloc.h | 4 +- + arch/x86/mm/pgtable.c | 4 +- + arch/xtensa/include/asm/pgalloc.h | 8 +- + drivers/base/platform.c | 3 + + drivers/hv/hv_balloon.c | 14 +- + drivers/md/raid5-ppl.c | 6 +- + drivers/md/raid5.c | 87 +- + drivers/md/raid5.h | 9 +- + drivers/media/platform/sti/delta/delta-ipc.c | 4 +- + drivers/misc/vmw_balloon.c | 32 + + drivers/xen/balloon.c | 3 + + fs/afs/file.c | 5 +- + fs/afs/fs_probe.c | 2 +- + fs/afs/vl_probe.c | 2 +- + fs/btrfs/extent_io.c | 3 +- + fs/buffer.c | 2 +- + fs/ceph/addr.c | 5 +- + fs/cifs/file.c | 3 +- + fs/exec.c | 4 +- + fs/ext4/readpage.c | 2 +- + fs/ocfs2/aops.c | 3 +- + fs/orangefs/inode.c | 2 +- + fs/orangefs/orangefs-bufmap.c | 2 +- + fs/proc/base.c | 43 +- + fs/proc/page.c | 4 +- + include/asm-generic/atomic-instrumented.h | 1787 ------------------- + include/asm-generic/atomic-long.h | 1012 ----------- + include/linux/atomic-fallback.h | 2294 ------------------------- + include/linux/atomic.h | 4 +- + include/linux/balloon_compaction.h | 34 +- + include/linux/flex_array.h | 149 -- + include/linux/generic-radix-tree.h | 231 +++ + include/linux/mm.h | 15 +- + include/linux/mm_inline.h | 3 - + include/linux/page-flags.h | 11 +- + include/linux/poison.h | 3 - + include/linux/sched/signal.h | 51 +- + include/net/sctp/structs.h | 15 +- + include/uapi/linux/kernel-page-flags.h | 2 +- + kernel/async.c | 1 - + kernel/crash_core.c | 2 + + kernel/fork.c | 1 - + kernel/locking/mutex.c | 2 +- + kernel/power/snapshot.c | 17 +- + kernel/sched/core.c | 2 +- + kernel/sched/swait.c | 2 +- + kernel/sched/wait.c | 2 +- + kernel/signal.c | 2 - + lib/Makefile | 5 +- + lib/flex_array.c | 398 ----- + lib/generic-radix-tree.c | 217 +++ + mm/filemap.c | 2 +- + mm/gup.c | 2 +- + mm/huge_memory.c | 8 +- + mm/hugetlb.c | 2 +- + mm/kasan/init.c | 2 +- + mm/memory.c | 19 +- + mm/migrate.c | 2 +- + mm/mremap.c | 66 +- + mm/page_io.c | 4 +- + mm/swap.c | 2 +- + mm/userfaultfd.c | 2 +- + net/openvswitch/flow.h | 1 - + net/openvswitch/flow_netlink.h | 1 - + net/openvswitch/flow_table.c | 51 +- + net/openvswitch/flow_table.h | 3 +- + net/sctp/stream.c | 105 +- + net/sctp/stream_interleave.c | 2 +- + scripts/Makefile.genheader | 23 + + scripts/atomic/check-atomics.sh | 2 +- + scripts/checkpatch.pl | 1 + + security/selinux/ss/avtab.c | 40 +- + security/selinux/ss/avtab.h | 4 +- + security/selinux/ss/conditional.c | 6 +- + security/selinux/ss/policydb.c | 122 +- + security/selinux/ss/policydb.h | 12 +- + security/selinux/ss/services.c | 22 +- + tools/include/linux/poison.h | 3 - + tools/vm/page-types.c | 2 +- + virt/kvm/arm/mmu.c | 2 +- + 126 files changed, 992 insertions(+), 6544 deletions(-) + delete mode 100644 Documentation/core-api/flexible-arrays.rst + create mode 100644 Documentation/core-api/generic-radix-tree.rst + delete mode 100644 Documentation/flexible-arrays.txt + delete mode 100644 include/asm-generic/atomic-instrumented.h + delete mode 100644 include/asm-generic/atomic-long.h + delete mode 100644 include/linux/atomic-fallback.h + delete mode 100644 include/linux/flex_array.h + create mode 100644 include/linux/generic-radix-tree.h + delete mode 100644 lib/flex_array.c + create mode 100644 lib/generic-radix-tree.c + create mode 100644 scripts/Makefile.genheader diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..ebc034a1a1b4 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing dmi based on 4.19-rc2 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..6d7b1cac06c4 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20190103 |