diff options
| -rw-r--r-- | Next/SHA1s | 296 | ||||
| -rw-r--r-- | Next/Trees | 298 | ||||
| -rw-r--r-- | Next/merge.log | 4599 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 5196 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..f20001a918a6 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,296 @@ +Name SHA1 +---- ---- +origin a3a80255d58d0f0d304ba877ae0313a264973a70 +fixes 0ce4e20ca4eaabf2babc29b1e98a8b4e18140a00 +kbuild-current e00d8880481497474792d28c14479a9fb6752046 +arc-current 51769fabee34a542f9d2185e24915cbb717fa4f7 +arm-current c2a3831df6dc164af66d8d86cf356a90c021b86f +arm64-fixes 7fa1e2e6afa7f4c9f46528e61de6a15d9e8dffd9 +m68k-current bed1369f51901b17108a4bb4f7210aab183bea42 +powerpc-fixes 7bea7ac0ca0121798f3618d16201ca4dc4e67a00 +sparc b71acb0e372160167bf6d5500b88b30b52ccef6e +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net cb12d72b27a6f41325ae23a11033cf5fedfa1b97 +bpf c61c27687a5abce11431e6de1adb6e36099b9859 +ipsec e2612cd496e7b465711d219ea6118893d7253f52 +netfilter 80b3671e9377916bf2b02e56113fa7377ce5705a +ipvs feb9f55c33e5114127238a2c87c069b4f30d1f23 +wireless-drivers ec5aecc0b227f5509d25853537f989ca303e2be1 +mac80211 1d51b4b1d3f2db0d6d144175e31a84e472fbd99a +rdma-fixes d6f4a21f309dfe10a5693ad236358dd6fcc46f7a +sound-current 687ae9e287b3a1a71e5e1c2a9c96b23d70768821 +sound-asoc-fixes f06f20da6565b08895d7781530edff8e02ff892d +regmap-fixes b3ffce3993493794dcaa6dfad46f70f7c17d58bc +regulator-fixes b4c4aa249eff44e7ce3765100a8a5fccc2e91da1 +spi-fixes 601ea15da77be261ade00d216cb0709005d86144 +pci-current d2fd6e81912a665993b24dcdc1c1384a42a54f7e +driver-core.current 1c7fc5cbc33980acd13d668f1c8f0313d6ae9fd8 +tty.current 1c7fc5cbc33980acd13d668f1c8f0313d6ae9fd8 +usb.current 1c7fc5cbc33980acd13d668f1c8f0313d6ae9fd8 +usb-gadget-fixes 87b6d2c56825c3119a0e64cc208ae6d795810a2e +usb-serial-fixes 4dcf9ddc9ad5ab649abafa98c5a4d54b1a33dabb +usb-chipidea-fixes d6d768a0ec3c088a88635c64620e1fb34e298aef +phy 827cb0323928952c0db9515aba9d534fb1285b3f +staging.current 5f74a8cbb38d10615ed46bc3e37d9a4c9af8045a +char-misc.current f7ee8ead151f9d0b8dac6ab6c3ff49bbe809c564 +soundwire-fixes bfeffd155283772bbe78c6a05dec7c0128ee500c +thunderbolt-fixes bfeffd155283772bbe78c6a05dec7c0128ee500c +input-current d77651a227f8920dd7ec179b84e400cce844eeb3 +crypto-current d45a90cb5d061fa7d411b974b950fe0b8bc5f265 +ide adf040ddd00152bda99aa9bc2afef9075ac88b34 +vfio-fixes 58fec830fc19208354895d9832785505046d6c01 +kselftest-fixes 3d244c192afeee7dd4f5fb1b916ea4e47420d401 +modules-fixes be71eda5383faa663efdba9ef54a6b8255e3c7f0 +slave-dma-fixes bfeffd155283772bbe78c6a05dec7c0128ee500c +backlight-fixes 651022382c7f8da46cb4872a545ee1da6d097d2a +mtd-fixes 1c7fc5cbc33980acd13d668f1c8f0313d6ae9fd8 +spi-nor-fixes 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +mfd-fixes 48a2ca0ee3994df53da230c7079a18a70ec914f9 +v4l-dvb-fixes 240809ef6630a4ce57c273c2d79ffb657cd361eb +reset-fixes 26fce0557fa639fb7bbc33e31a57cff7df25c3a0 +mips-fixes 8a644c64a9f1aefb99fdc4413e6b7fee17809e38 +at91-fixes bfeffd155283772bbe78c6a05dec7c0128ee500c +omap-fixes 935853fa3e1b476de31e6cd6b7342949b09ad8ad +kvm-fixes 826c1362e79abcd36f99092acd083b5a2d576676 +kvms390-fixes 40ebdb8e59df36e2cc71810bd021a0808b16c956 +hwmon-fixes f422449b58548a41e98fc97b259a283718e527db +nvdimm-fixes e2ad175844ccbb5aa1feb6acbd4a49f924928c34 +btrfs-fixes 65b4e14691314b61b9d81e747affb25299c18e15 +vfs-fixes 61aa329d0762352e2dfa934d49670f21e016162f +dma-mapping-fixes 222e3872c2defe1d80ce6b549542cbf14f3b2bbd +i3c-fixes f29fd331aa055fbeb5a496b4af937b7952111b6b +drivers-x86-fixes bfeffd155283772bbe78c6a05dec7c0128ee500c +samsung-krzk-fixes bfeffd155283772bbe78c6a05dec7c0128ee500c +pinctrl-samsung-fixes 651022382c7f8da46cb4872a545ee1da6d097d2a +devicetree-fixes 3705add0b783e0deeb6646ba0311bf214fe52b0a +scsi-fixes 9e8f1c79831424d30c0e3df068be7f4a244157c9 +drm-fixes e2d3c414ec0f9d1557c8c5ff2c32166e68bbc4ad +drm-intel-fixes 15c05196ff84ab07d9b1d05289216de2d5bedcd7 +mmc-fixes 2bd44dadd5bfb4135162322fd0b45a174d4ad5bf +rtc-fixes bfeffd155283772bbe78c6a05dec7c0128ee500c +gnss-fixes bfeffd155283772bbe78c6a05dec7c0128ee500c +hyperv-fixes a986435b32972cc86eba38c5a397830bff7a7928 +drm-misc-fixes 4bb0e6d7258213d4893c2c876712fbba40e712fe +kbuild e00d8880481497474792d28c14479a9fb6752046 +compiler-attributes 3e2ffd655cc6a694608d997738989ff5572a8266 +leaks 9f84a0f7f1a613335a9aaf0abd5858906752bf93 +dma-mapping 8b1cce9f5832a8eda17d37a3c49fb7dd2d650f46 +asm-generic 2b3c5a99d5f314960e00950c1782eac9361de30f +arc 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +arm 8f839a25b9cc37b528ae2d70e172c8c0c2eca98b +arm64 7e0b44e870cf265bb4a73fd25e0508c7363fcbd6 +arm-perf c061ce249f9bd21a7b6effa46a99563b876f76b6 +arm-soc f217b8e70c76fd3b7f16a660d299c6da4de524ca +actions fb9c1c1deb5ece57810afdbd743358d02e632d2c +alpine 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +amlogic 2710bac89836ef2b722aa244aee14072d9d56519 +aspeed d5e12a2c968dfaef6dc4e925f08c89cd6d83a294 +at91 3850dd7a32a067e749302d0868e453af464714d9 +bcm2835 9ef81d65b288aa22f41c53161af6ffee941226f8 +imx-mxs 32cb82a0e36b5e295f53f4e7b5044afe87a753a8 +keystone a74cab3c7dcb6b9ce985c1d3832bc8f1676cc59b +mediatek ecee13a082e07d1dcce194a12089774b3e5189cd +mvebu b5f034845e70916fd33e172fad5ad530a29c10ab +omap ace2332930862448aa2d9221d76cbee34b9e7615 +reset d3490aa43e56cbf3026d2e79c8e81a9b96003eef +qcom a3ece12f191753bce334a4a4db5469960f194a44 +renesas 903b2bb372998dfae21d0aa817dc511e44fa84ad +rockchip 0355b8299d0a88043f8d4bb96b91b5b931cf0211 +samsung bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +samsung-krzk 2e625e23d6bf11c507b8e42194c2fd728d7920a7 +sunxi 69ac2faf3bc9954636d23c88cf1b4d94cd2fdbb3 +tegra 2731820ce27bfd6e6d26f99f558c40f8ff617c9f +clk 1f7e1389516ecdb4fa446564db38864dd6f88f45 +clk-samsung bfeffd155283772bbe78c6a05dec7c0128ee500c +c6x 8adcc59974b8a65b7eac7d503364837c297139bc +csky 8e16960b1519e0e7861891a4ed405910425bd471 +h8300 21c7acc439b55d0569d7c2fc2eea5194b3910406 +ia64 c51836246f9772dfab8ca7bb945f4a566fe502d5 +m68k 005e13a96c0ed1437cb7f113d5d0f07ad9590962 +m68knommu 1c7fc5cbc33980acd13d668f1c8f0313d6ae9fd8 +microblaze 226a893bbb1f4495d7139fd57143475ada0de61d +mips adcc81f148d733b7e8e641300c5590a2cdc13bf3 +nds32 bfeffd155283772bbe78c6a05dec7c0128ee500c +nios2 1c286267aedf5c9bd8e1ef66ca2583009b930281 +openrisc 57ce8ba0fd3a95bf29ed741df1c52bd591bf43ff +parisc-hd 0c1d7fc698da47cf6d10582660e0fb4d37755753 +powerpc bfeffd155283772bbe78c6a05dec7c0128ee500c +fsl 63d86876f32440a45b6f9d42ab2fb7f68b3a8bf7 +risc-v-pjw 467e050e9760fc31dcf854ec88401e18419f5f78 +risc-v 801009424e05cf110f016d7fac7fcf20ef94941a +sifive 467e050e9760fc31dcf854ec88401e18419f5f78 +s390 a28028959ea8a97b9bea5df07c5b2e35588e5fd1 +sparc-next b71acb0e372160167bf6d5500b88b30b52ccef6e +sh ac21fc2dcb405cf250ad3f1228f64f64930d9211 +uml 940b241d9050fc354f68c182e99fc3da1ff36bc0 +xtensa f1589f675d6591ef716eb8e3aeafdb697ceb8db9 +fscrypt cc0146d0bce01204b0772074b723e65645d9c465 +befs 55d945e2e4aa148ef38bdfabb9569af78183a539 +btrfs 29dcea88779c856c7dc92040a0c01233263101d4 +btrfs-kdave 0078a3f8bf05002d636a6d4816c2635096803c24 +ceph 85f5a4d666fd9be73856ed16bb36c5af5b406b29 +cifs cb891e7a35b9765a7fd32906ef8922f2d46b8883 +configfs cc57c07343bd071cdf1915a91a24ab7d40c9b590 +ecryptfs 5dcea554d5cefa6dcecd57cc2563bd48d3c892d6 +ext3 3f0216106126dad40901274bbaff7feae4ccba67 +ext4 191ce17876c9367819c4b0a25b503c0f6d9054d8 +f2fs cd2dcebde8b8088b8ad77184ee3a1e81fd3da6ba +fuse cc4249fdc6c9520a4f4501a6364f3db752b3792c +jfs 2e3bc6125154c691e987e2554f2c99ec10f83b73 +nfs 3bd6e94bec122a951d462c239b47954cf5f36e33 +nfs-anna deaa5c96c2f7e8b934088a1e70a0fe8797bd1149 +nfsd 978c707df559141e16e124ab59c7f243453f4f06 +orangefs 22fc9db296fcf7ac30151c52765a7fba10870ab7 +overlayfs 2424e1c7256c7fe28748181637bc69e9b6bbe469 +ubifs e58725d51fa8da9133f3f1c54170aa2e43056b91 +v9fs 574d356b7a02c7e1b01a1d9cba8a26b3c2888f45 +xfs 90be9b86da9039fe6cf2880dc16fd0b0899603a5 +file-locks bf77ae4c98d721a9aae3840970d46669a78e034a +vfs 1fab5fff0a7ae1fa3b78383a78f7a56f03a3d673 +printk 15ff2069cb7f967dae6a8f8c176ba51447c75f00 +pci 4cd74d833a4d0cc004b0ce702703ca95f202a625 +pstore 8665569e97dd52920713b95675409648986b5b0d +hid 0a84e89382d6a0acdc502aadd28c1afb157b1f73 +i2c b33a02aadcc6330a61e511240b634dc11112e65e +i3c 25ac3da61ba144f8dbfe377eeec6b1da7ad0854a +dmi 57361846b52bc686112da6ca5368d11210796804 +hwmon-staging 554d08277810da8031c08ecf22a2e487a604be0f +jc_docs be5cd20c9b491504dfb9105404913de25c47c580 +v4l-dvb e8f9b16d72631870e30a3d8e4ee9f1c097bc7ba0 +v4l-dvb-next 76097fe1aee6baedbbbf95475263dc357d8432e4 +fbdev 890d14d2d4b57ff5a149309da3ed36c8a529987f +pm 4acbdd51bea2dbc6ac21805a3edfc49722b50edd +cpufreq-arm d4990efa8c5f1d6079cc49579060302ea5b0c66c +cpupower bfeffd155283772bbe78c6a05dec7c0128ee500c +opp ade0c9493e972171103c7d804840248c32032954 +thermal 24ef9ec891c761483c5270528781b8637b908eef +thermal-soc 9d216211fded20fff301d0317af3238d8383634c +ieee1394 c820518f6ca150d099aaeb7b71ad9e96c61113c0 +dlm 3595c559326d0b660bb088a88e22e0ca630a0e35 +swiotlb 227a76b64718888c1687cc237463aa000ae6fb2b +rdma 5fc01fb846bce8fa6d5f95e2625b8ce0f8e86810 +net-next 22c2ad616b74f3de2256b242572ab449d031d941 +bpf-next d0b2818efbe27e6c2e0c52621c8db18eb5abb5e1 +ipsec-next 590ce401c207fd944827eb5aa5e87d834eddb149 +mlx5-next 73f5a82bb3c9fce550da4a74a32b8cb064b50663 +netfilter-next 9dde6da51297d751198d431b04b597e7679e5766 +nfc-next 1f008cfec5d529b30ca8da1a1f5fbbd457c10382 +ipvs-next 26a1ccc6c117be8e33e0410fce8c5298b0015b99 +wireless-drivers-next 4ad0be160544ffbdafb7cec39bb8e6dd0a97317a +bluetooth 44543f1dd2a39d56c9afdc3778aa050b5a4725b4 +mac80211-next 44a7b3b6e3a458f9549c2cc28e74ecdc470e42f1 +gfs2 8e143b90e4d45cca3dc53760d3cfab988bc74571 +mtd 2431c4f5b46c32c4ac495456b1ef4ce59c0bb85d +nand 9f952302802fe0adf4347c2b54fbe24ce45f9773 +spi-nor 6f79a594afdaeb5d0644dfee91ef570be9f0e3fe +crypto 6b476662b09c393936e0f62c97ad9988d410fd36 +drm b122153c7198e35fcb981ca9efd63b0df8ef3eab +drm-intel 1b4bd5c4a663663e8dd4b7b1c5f8565626eb068b +drm-tegra db5adf4d6dced4e3326ce369fe0c213c968095f4 +drm-misc bd59f2b153af8f387b8fee5cfa5c3084b40b57a0 +drm-msm 61a5d46545fca2377327b22e3cc31e9858266851 +hdlcd d664b851eb2bcdf84a3c063cf59457bb15bc6120 +mali-dp 7e8d4fcf8daf6bc40a7ee2f4755432395541e108 +imx-drm 97144d12df00cbfcc6de3e7be6a5596c1551b1f7 +etnaviv fd4b77e8deea9cced6c1eca8bd64d2f03fc7cc94 +kconfig bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +regmap b3ffce3993493794dcaa6dfad46f70f7c17d58bc +sound 053b055948e97268771de11f2ab9b2aa1640b68d +sound-asoc aaafa148ca02aae48f279345063f87fa66a1668b +modules 93d77e7f1410c366050d6035dcba1a5167c7cf0b +input b6eba86030bf2fa3abcf9a0e3fb04527330da52e +block fae5efba43c2c8ae1aacf8f8753c3ec0b2a2a437 +device-mapper d445bd9cec1a850c2100fcf53684c13b3fd934f2 +pcmcia 95691e3eddc41da2d1cd3cca51fecdfb46bd85bc +mmc e0fc4f56e7240ecd96ea860d35cf2e0d84434bc0 +kgdb 3bd67b37e35069b43cc5de8d138727360c503e8f +md e820d55cb99dd93ac2dc949cf486bb187e5cd70d +mfd c52b8fd546d86a54b22d3fa58cc1d131d6c6cb89 +backlight 3cee7a7d05b11038c8b5fa093e45c6f839ffc867 +battery 9580913966488dc78d8d2893c7427d0a84124e74 +regulator 1488c1d4973aff88d407b589fc548d63cec6f5d8 +security f30160f982fcfaa5292b5de76bd092aab52f88fc +apparmor 43aa09fee2f08c8d90a4f35d4c8c711362afcaee +integrity eed9de3b4f47114f440980203ca27c5fab70f529 +selinux 53e0c2aa9a59a48e3798ef193d573ade85aa80f5 +tpmdd c1a85a00ea66cb6f0bd0f14e47c28c2b0999799f +watchdog 4a22fc534f2f55808c41197cf17d829099032acb +iommu 33798a966b8b75b49c9664171ff400d1313cc7b8 +dwmw2-iommu d8a5b80568a9cb66810e75b182018e9edb68e8ff +vfio 8ba35b3a0046d6573c98f00461d9bd1b86250d35 +trivial 75a24b822d383489badd343cab4cb171d09f93ef +audit 9e36a5d49c3a6fc4a2e0ba2dc11b27c4a8ae6303 +devicetree 5801169a2ed20003f771acecf3ac00574cf10a38 +mailbox d69e11648e486ee0f21cb246f687b083f0d4e124 +spi 408fa9bbcd986a5d8f41b03dc06fe1909f68ebb0 +tip 28948fd5d5b7da71d3227e740a60e5cc2d5bf304 +clockevents bd2bcaa565a2c07dd0492f6172f3ab6ad27c1acc +edac-amd 75dfa87035f9a2659dd0c48af6b4d9899e79cdc9 +irqchip 8fa4e55bbfbfca3ad996517f679ab3648c03d8bb +ftrace 3d739c1f6156c70eb0548aa288dcfbac9e0bd162 +rcu f25bcbbbf5616ade35340eda011b0f47174a0664 +kvm bfeffd155283772bbe78c6a05dec7c0128ee500c +kvm-arm 8c33df1afd86c611da8473dc6fc5f3af3dabe984 +kvm-ppc ae59a7e1945bc2245bbb587071ca737e00daf443 +kvms390 7aedd9d48f2a8332c2c51a40d2dca8c097f0dcdb +xen-tip 867cefb4cb1012f42cada1c7d1f35ac8dd276071 +percpu 718f6757a29b6698391fcd0231eb8266bf86c66c +workqueues 87915adc3f0acdf03c776df42e308e5a155c19af +drivers-x86 bfeffd155283772bbe78c6a05dec7c0128ee500c +chrome-platform bfeffd155283772bbe78c6a05dec7c0128ee500c +hsi 3a658e09a215586918044d8f8b8358eb14fa3f7d +leds 0f85e8498a482cbfdab91fb2d1b81c6c8c1cfd15 +ipmi 535c98b8c211ced1e880ff4f8f37b1fd8f9f9af8 +driver-core bdfe0df1e97beedc15f68ee6556830548e81f63f +usb cb7edfd4cd47ed50ea618b660ee283a2d99edff2 +usb-gadget 1c7fc5cbc33980acd13d668f1c8f0313d6ae9fd8 +usb-serial bfeffd155283772bbe78c6a05dec7c0128ee500c +usb-chipidea-next 9049fce897edae50835a8f799d4b05f67a538e9a +phy-next 49ee1406355eb29227bcb5a5808247581ca6a725 +tty defe3b6d701049a8d4713127c8cb8dcd839e2df7 +char-misc 4ad84cb56b0088f62b0369f36451ebb0fe16f423 +extcon bfeffd155283772bbe78c6a05dec7c0128ee500c +soundwire bfeffd155283772bbe78c6a05dec7c0128ee500c +thunderbolt bfeffd155283772bbe78c6a05dec7c0128ee500c +staging 90c5f2d29fc917037ba7e2f06e518c3fcf1a79d5 +mux a1ad5ff63944ea4c3666d9a454fb3203930829a0 +icc 714e53a78f6feabea3fcf69714833cd8703e2a81 +slave-dma 8160320bd8ebbf4bb106b88c2b1046cfa4d37460 +cgroup 0623413ee0ba5c1f56e1d453e316257c7b6b2583 +scsi 6de89c8b7dbe6c0ef4adf10c78219adeb8c5fe76 +scsi-mkp 326a859b28141bcd3445be0606647250742283a6 +target-updates 1c130ae00b769a2e2df41bad3d6051ee8234b636 +target-bva 60cc43fc888428bb2f18f08997432d426a243338 +vhost b03f1d9194556a660dd7616b49b0086895a45860 +rpmsg e9856d7eb6e4c18d4b69985621ddf6b39027b2e5 +gpio 08589fe40380c00fd529b44097015db17fb4e3bc +gpio-brgl 0bfb75115506e5325b733c52dadc36d2c299a579 +pinctrl 489d4832bfbaca8ba3bfe62afaff690b3b62e6ce +pinctrl-samsung 651022382c7f8da46cb4872a545ee1da6d097d2a +pwm 7ca17b207127240b1e4c8687ba7b9077e655336d +userns ee17e5d6201c66492a0e8053190fca2ed2b8457d +ktest 6cd110a91f52197e3392809cd43466bfe2c524d0 +random 05cbbb6f9ed50c9a64a25c1903712681d4480edb +kselftest bfeffd155283772bbe78c6a05dec7c0128ee500c +y2038 e4b92b108c6cd6b311e4b6e85d6a87a34599a6e3 +livepatching e1fd0398d1e7d64e7db06a51a20b2e884a94c8dd +coresight 675e806209e02efac3f7fb6ca63ceab686e4ca7a +rtc c8c97a4fb52c526be7a78c4c1e61a95cf1c915cc +nvdimm 8a6f7591ddf5085ba2f4cd34539dc5e0e077207d +at24 3b0548784079f3961a18f010ce7c607ad1437be9 +ntb d9842b39e9ecc32533a81b234dcf5876b2b184f7 +kspp be1944712d8e339c5c371dbd377bcd20308c5eb3 +init_task e1e871aff3ded26348c631b1370e257d401cd22d +cisco 84a401a2750628747120a1ff6a54e846bbb9c5f1 +gnss bfeffd155283772bbe78c6a05dec7c0128ee500c +fsi d20810530b7109a95abef5130e6dcec09c5180d7 +siox 1e4b044d22517cae7047c99038abb444423243ca +slimbus 81648d8bc2224278494dd7d7bcbdc428457832ed +nvmem ff3b9b5c6b1b7c8d1c1d29a083f7aefd098a8b78 +xarray edcddd4c879af48ec922d680b2d56834c085683b +hyperv 651022382c7f8da46cb4872a545ee1da6d097d2a +auxdisplay bfeffd155283772bbe78c6a05dec7c0128ee500c +kgdb-dt 97498c96a1869f6e8563a042e490f187a39f68e7 +pidfd 4607de57fff546f7ba957ab067dfbc019755d641 +akpm-current f531bf6f8e5e0b928981d5d056d9aa15cdbe1605 +akpm e5a18af204a62cda300dc6c259b015548508b6e2 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..bc2dc9b02b58 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,298 @@ +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 +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/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 +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#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..fc8b03e360b2 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4599 @@ +$ date -R +Fri, 18 Jan 2019 08:06:46 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 47bfa6d9dc8c Merge tag 'selinux-pr-20190115' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux +Merging origin/master (a3a80255d58d Merge tag 'afs-fixes-20190117' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs) +$ git merge origin/master +Updating 47bfa6d9dc8c..a3a80255d58d +Fast-forward + .../devicetree/bindings/arm/cpu-capacity.txt | 2 +- + .../devicetree/bindings/arm/idle-states.txt | 2 +- + Documentation/devicetree/bindings/arm/sp810.txt | 2 +- + Documentation/devicetree/bindings/arm/topology.txt | 2 +- + .../devicetree/bindings/clock/marvell,mmp2.txt | 2 +- + .../devicetree/bindings/display/arm,pl11x.txt | 2 +- + .../devicetree/bindings/gpio/gpio-mvebu.txt | 2 - + .../bindings/interrupt-controller/arm,gic-v3.txt | 2 +- + .../devicetree/bindings/soc/qcom/qcom,glink.txt | 2 +- + .../devicetree/bindings/soc/qcom/qcom,smp2p.txt | 4 +- + Makefile | 8 ++-- + arch/h8300/Makefile | 2 - + arch/ia64/Makefile | 2 - + arch/nds32/Makefile | 8 ---- + arch/openrisc/Makefile | 3 -- + drivers/of/dynamic.c | 3 -- + drivers/of/fdt.c | 4 -- + drivers/of/overlay.c | 3 -- + drivers/of/pdt.c | 1 - + drivers/of/property.c | 1 + + fs/afs/flock.c | 4 +- + fs/afs/inode.c | 3 +- + fs/afs/protocol_yfs.h | 11 +++++ + fs/afs/rxrpc.c | 53 +++++++++++++++++----- + fs/afs/server_list.c | 4 +- + fs/afs/yfsclient.c | 2 +- + .../dt-bindings/reset/amlogic,meson-axg-reset.h | 3 +- + include/linux/of.h | 1 - + include/trace/events/afs.h | 2 + + init/Kconfig | 1 + + kernel/dma/swiotlb.c | 2 + + kernel/seccomp.c | 4 ++ + scripts/Kbuild.include | 4 -- + scripts/kconfig/Makefile | 2 +- + security/security.c | 7 +++ + security/yama/yama_lsm.c | 4 +- + 36 files changed, 95 insertions(+), 69 deletions(-) +Merging fixes/master (0ce4e20ca4ea x86/syscalls: Mark expected switch fall-throughs) +$ git merge fixes/master +Auto-merging fs/afs/yfsclient.c +Auto-merging fs/afs/rxrpc.c +Auto-merging fs/afs/flock.c +Merge made by the 'recursive' strategy. + arch/x86/include/asm/syscall.h | 28 ++++++++++++++++++ + drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c | 17 +++++++++++ + drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv04.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c | 2 ++ + drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/bios/perf.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/bios/pll.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c | 2 ++ + drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c | 1 + + drivers/scsi/aic7xxx/aic79xx_core.c | 14 +++++---- + drivers/scsi/aic7xxx/aic7xxx_core.c | 12 ++++++-- + drivers/scsi/be2iscsi/be_iscsi.c | 1 + + drivers/scsi/be2iscsi/be_main.c | 1 + + drivers/scsi/bfa/bfa_fcpim.c | 6 ++-- + drivers/scsi/bfa/bfa_fcs_lport.c | 8 ++---- + drivers/scsi/bfa/bfa_fcs_rport.c | 19 +++++-------- + drivers/scsi/bfa/bfa_ioc.c | 9 ++---- + drivers/scsi/csiostor/csio_wr.c | 1 + + drivers/scsi/esas2r/esas2r_init.c | 3 +- + drivers/scsi/imm.c | 33 +++++++++++----------- + drivers/scsi/lpfc/lpfc_ct.c | 2 ++ + drivers/scsi/lpfc/lpfc_els.c | 1 + + drivers/scsi/lpfc/lpfc_hbadisc.c | 4 ++- + drivers/scsi/lpfc/lpfc_nportdisc.c | 1 + + drivers/scsi/lpfc/lpfc_nvme.c | 1 + + drivers/scsi/lpfc/lpfc_scsi.c | 8 +++--- + drivers/scsi/lpfc/lpfc_sli.c | 20 +++++++------ + drivers/scsi/osd/osd_initiator.c | 3 +- + drivers/scsi/osst.c | 6 ++++ + drivers/scsi/ppa.c | 1 + + drivers/scsi/qla4xxx/ql4_os.c | 2 +- + drivers/scsi/st.c | 4 +++ + drivers/scsi/sym53c8xx_2/sym_hipd.c | 2 ++ + drivers/scsi/sym53c8xx_2/sym_nvram.c | 1 + + fs/adfs/dir_f.c | 6 ++++ + fs/afs/cmservice.c | 8 ++++++ + fs/afs/file.c | 2 ++ + fs/afs/flock.c | 1 + + fs/afs/fsclient.c | 31 ++++++++++++-------- + fs/afs/misc.c | 9 ++++++ + fs/afs/rxrpc.c | 1 + + fs/afs/vlclient.c | 18 +++++++----- + fs/afs/yfsclient.c | 30 +++++++++++++------- + 45 files changed, 228 insertions(+), 97 deletions(-) +Merging kbuild-current/fixes (e00d88804814 kbuild: mark prepare0 as PHONY to fix external module build) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (51769fabee34 ARCv2: lib: memeset: fix doing prefetchw outside of buffer) +$ git merge arc-current/for-curr +Auto-merging arch/arc/mm/init.c +Auto-merging arch/arc/mm/fault.c +CONFLICT (content): Merge conflict in arch/arc/mm/fault.c +Auto-merging arch/arc/kernel/setup.c +Auto-merging arch/arc/include/asm/bitops.h +Recorded preimage for 'arch/arc/mm/fault.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/arc/mm/fault.c'. +[master 927f2eb55320] Merge remote-tracking branch 'arc-current/for-curr' +$ git diff -M --stat --summary HEAD^.. + arch/arc/include/asm/Kbuild | 4 - + arch/arc/include/asm/arcregs.h | 12 +- + arch/arc/include/asm/bitops.h | 6 +- + arch/arc/include/asm/perf_event.h | 3 +- + arch/arc/kernel/perf_event.c | 241 ++++++++++++++++++++++++++++---------- + arch/arc/kernel/setup.c | 27 +++-- + arch/arc/kernel/troubleshoot.c | 30 +++-- + arch/arc/lib/memset-archs.S | 40 +++++-- + arch/arc/mm/fault.c | 13 +- + arch/arc/mm/init.c | 3 +- + 10 files changed, 276 insertions(+), 103 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 (7fa1e2e6afa7 kasan, arm64: remove redundant ARCH_SLAB_MINALIGN define) +$ git merge arm64-fixes/for-next/fixes +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/cache.h | 2 -- + arch/arm64/include/asm/mmu.h | 5 ++++- + arch/arm64/kernel/kaslr.c | 8 ++++++-- + 3 files changed, 10 insertions(+), 5 deletions(-) +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 (7bea7ac0ca01 powerpc/syscalls: Fix syscall tracing) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/include/uapi/asm/perf_regs.h | 1 + + arch/powerpc/kernel/head_8xx.S | 3 ++- + arch/powerpc/kernel/signal_64.c | 7 ++++--- + arch/powerpc/kernel/trace/ftrace.c | 7 ------- + arch/powerpc/perf/perf_regs.c | 6 ++++++ + arch/powerpc/platforms/4xx/ocm.c | 6 +++--- + arch/powerpc/platforms/powernv/npu-dma.c | 2 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 3 ++- + arch/powerpc/platforms/pseries/pci.c | 2 ++ + tools/arch/powerpc/include/uapi/asm/perf_regs.h | 1 + + tools/perf/arch/powerpc/include/perf_regs.h | 3 ++- + tools/perf/arch/powerpc/util/perf_regs.c | 1 + + 12 files changed, 25 insertions(+), 17 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 (cb12d72b27a6 atm: he: fix sign-extension overflow on large shift) +$ git merge net/master +Merge made by the 'recursive' strategy. + Documentation/networking/rxrpc.txt | 45 ------- + Documentation/networking/snmp_counter.rst | 130 ++++++++++++++++++++- + drivers/atm/he.c | 2 +- + drivers/net/ethernet/intel/igb/igb.h | 2 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 4 +- + drivers/net/ethernet/intel/igb/igb_main.c | 14 +-- + drivers/net/phy/bcm87xx.c | 2 + + drivers/net/phy/marvell.c | 37 +++++- + drivers/net/phy/meson-gxl.c | 1 + + drivers/net/phy/micrel.c | 2 + + drivers/net/phy/phy.c | 19 ++- + drivers/net/phy/phy_device.c | 12 ++ + drivers/net/usb/aqc111.c | 15 +++ + drivers/net/usb/cdc_ether.c | 8 ++ + include/linux/phy.h | 2 + + include/net/af_rxrpc.h | 16 --- + include/net/ip_fib.h | 2 +- + include/net/netfilter/nf_flow_table.h | 1 - + include/uapi/linux/in.h | 2 +- + net/bpfilter/bpfilter_umh_blob.S | 2 +- + net/bridge/netfilter/ebtables.c | 6 +- + net/core/neighbour.c | 2 +- + net/ipv4/fib_frontend.c | 4 +- + net/ipv4/fib_trie.c | 15 ++- + net/ipv4/fou.c | 9 +- + net/ipv4/ip_gre.c | 23 ++-- + net/ipv4/tcp.c | 2 +- + net/ipv4/udp.c | 16 ++- + net/ipv6/fou6.c | 9 +- + net/ipv6/ip6_gre.c | 14 ++- + net/ipv6/route.c | 14 +-- + net/ipv6/udp.c | 16 ++- + net/netfilter/nf_flow_table_core.c | 5 +- + net/netfilter/nf_tables_api.c | 14 +-- + net/netfilter/nft_flow_offload.c | 13 ++- + net/openvswitch/flow_netlink.c | 2 +- + net/rxrpc/af_rxrpc.c | 70 ----------- + net/rxrpc/ar-internal.h | 19 +-- + net/rxrpc/call_object.c | 97 --------------- + net/rxrpc/conn_client.c | 5 +- + net/rxrpc/sendmsg.c | 24 ++-- + net/sched/act_tunnel_key.c | 19 +-- + net/sched/cls_api.c | 3 +- + net/sched/sch_cake.c | 5 +- + net/sched/sch_cbs.c | 3 +- + net/sched/sch_drr.c | 7 +- + net/sched/sch_dsmark.c | 3 +- + net/sched/sch_hfsc.c | 9 +- + net/sched/sch_htb.c | 3 +- + net/sched/sch_prio.c | 3 +- + net/sched/sch_qfq.c | 20 ++-- + net/sched/sch_tbf.c | 3 +- + net/sctp/ipv6.c | 5 +- + net/sctp/protocol.c | 4 +- + net/tipc/netlink_compat.c | 50 +++++++- + net/tipc/topsrv.c | 2 +- + .../networking/timestamping/txtimestamp.c | 2 +- + .../selftests/tc-testing/tc-tests/actions/ife.json | 88 +++++++------- + .../tc-testing/tc-tests/actions/tunnel_key.json | 31 +---- + 59 files changed, 495 insertions(+), 462 deletions(-) +Merging bpf/master (c61c27687a5a bpf: Correctly annotate implicit fall through in bpf_base_func_proto) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + kernel/bpf/btf.c | 2 +- + kernel/bpf/cgroup.c | 1 + + kernel/bpf/stackmap.c | 9 +++++++-- + net/core/filter.c | 2 +- + net/xdp/xdp_umem.c | 16 +++++++++++++--- + samples/bpf/Makefile | 1 + + samples/bpf/asm_goto_workaround.h | 16 ++++++++++++++++ + tools/bpf/bpftool/Makefile | 9 ++++++++- + tools/lib/bpf/bpf.c | 19 +++++++++++++++---- + tools/testing/selftests/bpf/Makefile | 1 + + tools/testing/selftests/bpf/test_progs.c | 30 ++++++++++++++++++++++++++++++ + 11 files changed, 94 insertions(+), 12 deletions(-) + create mode 100644 samples/bpf/asm_goto_workaround.h +Merging ipsec/master (e2612cd496e7 xfrm: Make set-mark default behavior backward compatible) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/ipv4/ip_vti.c | 50 ++++++++++ + net/xfrm/xfrm_policy.c | 63 ++++++------ + net/xfrm/xfrm_user.c | 13 ++- + tools/testing/selftests/net/xfrm_policy.sh | 153 ++++++++++++++++++++++++----- + 4 files changed, 223 insertions(+), 56 deletions(-) +Merging netfilter/master (80b3671e9377 ip6_gre: update version related info when changing link) +$ 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 (ec5aecc0b227 iwlwifi: make IWLWIFI depend on CFG80211) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/intel/iwlwifi/Kconfig | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +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 (d6f4a21f309d RDMA/uverbs: Mark ioctl responses with UVERBS_ATTR_F_VALID_OUTPUT) +$ git merge rdma-fixes/for-rc +Merge made by the 'recursive' strategy. + drivers/infiniband/core/cma.c | 5 ++- + drivers/infiniband/core/nldev.c | 4 -- + drivers/infiniband/core/rdma_core.h | 2 + + drivers/infiniband/core/uverbs_cmd.c | 11 ++++- + drivers/infiniband/core/uverbs_ioctl.c | 62 ++++++++++++++++++++++------ + drivers/infiniband/core/uverbs_main.c | 1 + + drivers/infiniband/hw/mthca/mthca_provider.c | 4 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma.h | 35 +++++++++++++++- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c | 6 +++ + include/uapi/rdma/vmw_pvrdma-abi.h | 1 + + 10 files changed, 109 insertions(+), 22 deletions(-) +Merging sound-current/for-linus (687ae9e287b3 ASoC: intel: skl: Fix display power regression) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/hda/patch_realtek.c | 2 +- + sound/soc/codecs/hdac_hdmi.c | 116 +++++------------------------------------- + sound/soc/intel/skylake/skl.c | 13 ++--- + 3 files changed, 18 insertions(+), 113 deletions(-) +Merging sound-asoc-fixes/for-linus (f06f20da6565 Merge branch 'asoc-5.0' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + include/sound/soc.h | 6 ++ + sound/core/compress_offload.c | 3 +- + sound/soc/amd/raven/acp3x-pcm-dma.c | 6 +- + sound/soc/codecs/pcm512x.c | 11 +-- + sound/soc/codecs/rt274.c | 5 +- + sound/soc/codecs/rt5514-spi.c | 2 + + sound/soc/codecs/rt5682.c | 1 + + sound/soc/codecs/rt5682.h | 24 ++--- + sound/soc/codecs/tlv320aic32x4.c | 4 + + sound/soc/fsl/imx-audmux.c | 24 ++--- + sound/soc/intel/Kconfig | 2 +- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 8 +- + sound/soc/intel/boards/broadwell.c | 2 +- + sound/soc/intel/boards/glk_rt5682_max98357a.c | 45 ++------- + sound/soc/intel/boards/haswell.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/soc-core.c | 34 +++++-- + sound/soc/soc-dapm.c | 10 +- + sound/soc/ti/davinci-mcasp.c | 136 ++++++++++++-------------- + sound/soc/xilinx/Kconfig | 2 +- + sound/soc/xilinx/xlnx_i2s.c | 15 ++- + 23 files changed, 208 insertions(+), 184 deletions(-) +Merging regmap-fixes/for-linus (b3ffce399349 Merge branch 'regmap-5.0' into regmap-linus) +$ git merge regmap-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-irq.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) +Merging regulator-fixes/for-linus (b4c4aa249eff Merge branch 'regulator-5.0' into regulator-linus) +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/regulator/bcm590xx-regulator.c | 4 ++++ + drivers/regulator/lochnagar-regulator.c | 2 +- + drivers/regulator/max77620-regulator.c | 10 +++++++++- + 3 files changed, 14 insertions(+), 2 deletions(-) +Merging spi-fixes/for-linus (601ea15da77b Merge branch 'spi-5.0' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/spi/spi-dw.c | 36 ++++++++--------- + drivers/spi/spi-fsl-dspi.c | 2 +- + drivers/spi/spi-fsl-lpspi.c | 92 ++++++++++++++++++++++--------------------- + drivers/spi/spi-npcm-pspi.c | 3 +- + drivers/spi/spi-omap2-mcspi.c | 4 +- + drivers/spi/spi-sprd.c | 10 +++-- + 6 files changed, 77 insertions(+), 70 deletions(-) +Merging pci-current/for-linus (d2fd6e81912a PCI: Fix __initdata issue with "pci=disable_acs_redir" parameter) +$ git merge pci-current/for-linus +Merge made by the 'recursive' strategy. + drivers/pci/Kconfig | 22 ++++++++-------------- + drivers/pci/msi.c | 22 +++++++++++++--------- + drivers/pci/pci.c | 3 ++- + 3 files changed, 23 insertions(+), 24 deletions(-) +Merging driver-core.current/driver-core-linus (1c7fc5cbc339 Linux 5.0-rc2) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (1c7fc5cbc339 Linux 5.0-rc2) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (1c7fc5cbc339 Linux 5.0-rc2) +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (87b6d2c56825 usb: dwc2: gadget: Fix Remote Wakeup interrupt bit clearing) +$ git merge usb-gadget-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/usb/dwc2/gadget.c | 2 +- + drivers/usb/dwc3/gadget.c | 4 ++++ + drivers/usb/gadget/function/f_sourcesink.c | 2 +- + 3 files changed, 6 insertions(+), 2 deletions(-) +Merging usb-serial-fixes/usb-linus (4dcf9ddc9ad5 USB: serial: pl2303: add new PID to support PL2303TB) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/ftdi_sio.c | 15 ++++++++++++++- + drivers/usb/serial/pl2303.c | 1 + + drivers/usb/serial/pl2303.h | 2 ++ + drivers/usb/serial/usb-serial-simple.c | 3 ++- + 4 files changed, 19 insertions(+), 2 deletions(-) +Merging usb-chipidea-fixes/ci-for-usb-stable (d6d768a0ec3c usb: chipidea: fix static checker warning for NULL pointer) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/ci_hdrc_imx.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging phy/fixes (827cb0323928 phy: ath79-usb: Fix the main reset name to match the DT binding) +$ git merge phy/fixes +Merge made by the 'recursive' strategy. + drivers/phy/qualcomm/phy-ath79-usb.c | 4 ++-- + drivers/phy/ti/phy-gmii-sel.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging staging.current/staging-linus (5f74a8cbb38d staging: rtl8188eu: Add device code for D-Link DWA-121 rev B1) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 1 + + drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c | 1 + + drivers/staging/wilc1000/host_interface.c | 5 ++--- + drivers/staging/wilc1000/wilc_wlan.c | 7 ++++--- + 4 files changed, 8 insertions(+), 6 deletions(-) +Merging char-misc.current/char-misc-linus (f7ee8ead151f mei: me: add denverton innovation engine device IDs) +$ git merge char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + drivers/android/binderfs.c | 166 ++++++++++++++------- + drivers/hv/channel.c | 9 +- + drivers/hv/hv_balloon.c | 10 +- + drivers/hv/ring_buffer.c | 31 ++-- + drivers/hv/vmbus_drv.c | 91 +++++++---- + drivers/misc/mei/hbm.c | 12 +- + drivers/misc/mei/hw-me-regs.h | 2 + + drivers/misc/mei/pci-me.c | 4 +- + include/linux/hyperv.h | 5 +- + .../linux/android/{binder_ctl.h => binderfs.h} | 0 + 10 files changed, 210 insertions(+), 120 deletions(-) + rename include/uapi/linux/android/{binder_ctl.h => binderfs.h} (100%) +Merging soundwire-fixes/fixes (bfeffd155283 Linux 5.0-rc1) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (bfeffd155283 Linux 5.0-rc1) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (d77651a227f8 Input: uinput - fix undefined behavior in uinput_validate_absinfo()) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/joystick/xpad.c | 3 +++ + drivers/input/misc/uinput.c | 5 +++-- + drivers/input/touchscreen/Kconfig | 2 +- + include/uapi/linux/input.h | 6 +++++- + 4 files changed, 12 insertions(+), 4 deletions(-) +Merging crypto-current/master (d45a90cb5d06 crypto: sm3 - fix undefined shift by >= width of value) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + crypto/adiantum.c | 4 +++ + crypto/authenc.c | 14 +++++++-- + crypto/authencesn.c | 2 +- + crypto/sm3_generic.c | 2 +- + drivers/crypto/Kconfig | 1 + + drivers/crypto/bcm/cipher.c | 44 ++++++++-------------------- + drivers/crypto/caam/caamalg.c | 2 +- + drivers/crypto/caam/caamhash.c | 15 ++++++---- + drivers/crypto/caam/desc.h | 1 + + drivers/crypto/caam/error.h | 9 ++++++ + drivers/crypto/cavium/nitrox/nitrox_reqmgr.c | 2 +- + drivers/crypto/ccree/cc_aead.c | 40 ++++++++++++------------- + drivers/crypto/talitos.c | 26 ++++++---------- + 13 files changed, 80 insertions(+), 82 deletions(-) +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 (58fec830fc19 vfio/type1: Fix unmap overflow off-by-one) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (3d244c192afe selftests/seccomp: Abort without user notification support) +$ git merge kselftest-fixes/fixes +Merge made by the 'recursive' strategy. + tools/testing/selftests/gpio/gpio-mockup-chardev.c | 9 +- + tools/testing/selftests/rtc/rtctest.c | 109 ++++++++++++++++++++- + tools/testing/selftests/seccomp/Makefile | 2 +- + tools/testing/selftests/seccomp/seccomp_bpf.c | 10 +- + tools/testing/selftests/vm/gup_benchmark.c | 1 + + tools/testing/selftests/x86/mpx-mini-test.c | 2 +- + tools/testing/selftests/x86/unwind_vdso.c | 1 - + 7 files changed, 118 insertions(+), 16 deletions(-) +Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging slave-dma-fixes/fixes (bfeffd155283 Linux 5.0-rc1) +$ 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 (1c7fc5cbc339 Linux 5.0-rc2) +$ 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 (240809ef6630 media: vim2m: only cancel work if it is for right context) +$ git merge v4l-dvb-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/media/platform/vim2m.c | 4 +++- + drivers/media/v4l2-core/v4l2-ioctl.c | 24 +++++++++++++++++++----- + 2 files changed, 22 insertions(+), 6 deletions(-) +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 (8a644c64a9f1 MIPS: OCTEON: fix kexec support) +$ git merge mips-fixes/mips-fixes +Merge made by the 'recursive' strategy. + arch/mips/Kconfig | 1 + + arch/mips/bcm47xx/setup.c | 31 +++++++++ + arch/mips/cavium-octeon/setup.c | 2 +- + arch/mips/configs/ath79_defconfig | 1 + + .../include/asm/mach-lantiq/falcon/falcon_irq.h | 2 - + .../mips/include/asm/mach-lantiq/xway/lantiq_irq.h | 2 - + arch/mips/jazz/jazzdma.c | 5 +- + arch/mips/lantiq/irq.c | 77 ++-------------------- + arch/mips/pci/msi-octeon.c | 4 +- + include/linux/bcma/bcma_soc.h | 1 + + 10 files changed, 47 insertions(+), 79 deletions(-) +Merging at91-fixes/at91-fixes (bfeffd155283 Linux 5.0-rc1) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (935853fa3e1b ARM: dts: omap3-gta04: Fix graph_port warning) +$ git merge omap-fixes/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi | 2 +- + arch/arm/boot/dts/omap3-gta04.dtsi | 4 --- + arch/arm/boot/dts/omap3-n950-n9.dtsi | 42 +++++++++++++++++--------- + arch/arm/boot/dts/omap5-l4.dtsi | 2 -- + 4 files changed, 29 insertions(+), 21 deletions(-) +Merging kvm-fixes/master (826c1362e79a x86/kvm/nVMX: don't skip emulated instruction twice when vmptr address is not backed) +$ 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 (f422449b5854 hwmon: (tmp421) Correct the misspelling of the tmp442 compatible attribute in OF device ID table) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + drivers/hwmon/lm80.c | 4 +++- + drivers/hwmon/nct6775.c | 12 +++++++----- + drivers/hwmon/occ/common.c | 24 ++++++++++++------------ + drivers/hwmon/tmp421.c | 2 +- + 4 files changed, 23 insertions(+), 19 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (e2ad175844cc acpi/nfit: Fix command-supported detection) +$ git merge nvdimm-fixes/libnvdimm-fixes +Merge made by the 'recursive' strategy. + drivers/acpi/nfit/core.c | 79 +++++++++++++++++++++++++++++++---------------- + drivers/acpi/nfit/intel.c | 8 ++--- + drivers/nvdimm/nd-core.h | 4 +-- + include/linux/libnvdimm.h | 1 + + 4 files changed, 59 insertions(+), 33 deletions(-) +Merging btrfs-fixes/next-fixes (65b4e1469131 Merge branch 'ext/josef/iput-fixes-for-5.0' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Merge made by the 'recursive' strategy. + fs/btrfs/ctree.h | 11 ++++++++++- + fs/btrfs/disk-io.c | 17 ++++++++++++++--- + fs/btrfs/extent-tree.c | 38 +++++++++++++++++++++++++++----------- + fs/btrfs/inode.c | 26 +++++++++++++++++++++++--- + fs/btrfs/transaction.c | 4 ++++ + 5 files changed, 78 insertions(+), 18 deletions(-) +Merging vfs-fixes/fixes (61aa329d0762 cgroup: saner refcounting for cgroup_root) +$ git merge vfs-fixes/fixes +Auto-merging kernel/cgroup/cgroup.c +Auto-merging kernel/cgroup/cgroup-v1.c +Auto-merging kernel/cgroup/cgroup-internal.h +Merge made by the 'recursive' strategy. + fs/kernfs/mount.c | 8 ++++-- + kernel/cgroup/cgroup-internal.h | 2 +- + kernel/cgroup/cgroup-v1.c | 58 +++++++++-------------------------------- + kernel/cgroup/cgroup.c | 25 +++++++++--------- + 4 files changed, 33 insertions(+), 60 deletions(-) +Merging dma-mapping-fixes/for-linus (222e3872c2de swiotlb: clear io_tlb_start and io_tlb_end in swiotlb_exit) +$ git merge dma-mapping-fixes/for-linus +Merge made by the 'recursive' strategy. +Merging i3c-fixes/master (f29fd331aa05 i3c: master: dw-i3c-master: fix i3c_attach/reattach) +$ git merge i3c-fixes/master +Merge made by the 'recursive' strategy. + drivers/i3c/master/dw-i3c-master.c | 7 ++----- + drivers/i3c/master/i3c-master-cdns.c | 4 ++-- + 2 files changed, 4 insertions(+), 7 deletions(-) +Merging drivers-x86-fixes/fixes (bfeffd155283 Linux 5.0-rc1) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (bfeffd155283 Linux 5.0-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 (3705add0b783 dt-bindings: reset: meson-axg: fix SPDX license id) +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (9e8f1c798314 scsi: cxgb4i: add wait_for_completion()) +$ git merge scsi-fixes/fixes +Auto-merging drivers/scsi/smartpqi/smartpqi_init.c +Auto-merging drivers/scsi/qla4xxx/ql4_os.c +Auto-merging drivers/scsi/pm8001/pm8001_sas.c +Auto-merging drivers/scsi/megaraid/megaraid_sas_fusion.c +Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c +Auto-merging drivers/scsi/lpfc/lpfc_sli.c +Merge made by the 'recursive' strategy. + drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 9 ++- + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 28 ++++++--- + drivers/scsi/cxgbi/libcxgbi.c | 7 ++- + drivers/scsi/cxgbi/libcxgbi.h | 5 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 12 ++-- + drivers/scsi/isci/init.c | 14 ++--- + drivers/scsi/megaraid/megaraid_sas_base.c | 2 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 3 +- + drivers/scsi/pm8001/pm8001_sas.c | 2 +- + drivers/scsi/qedi/qedi_iscsi.c | 3 + + drivers/scsi/qedi/qedi_iscsi.h | 1 + + drivers/scsi/qla1280.c | 2 +- + drivers/scsi/qla2xxx/qla_def.h | 2 + + drivers/scsi/qla2xxx/qla_isr.c | 1 + + drivers/scsi/qla2xxx/qla_os.c | 2 +- + drivers/scsi/qla4xxx/ql4_os.c | 2 + + drivers/scsi/scsi_pm.c | 26 +++++---- + drivers/scsi/sd.c | 6 ++ + drivers/scsi/smartpqi/smartpqi_init.c | 2 +- + drivers/scsi/ufs/ufs.h | 2 +- + drivers/scsi/ufs/ufshcd.c | 2 + + drivers/target/iscsi/iscsi_target.c | 2 +- + drivers/target/target_core_user.c | 88 ++++++++++++++++++++--------- + 23 files changed, 146 insertions(+), 77 deletions(-) +Merging drm-fixes/drm-fixes (e2d3c414ec0f Merge tag 'drm-intel-fixes-2019-01-11' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes) +$ git merge drm-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (15c05196ff84 Merge tag 'gvt-fixes-2018-01-17' of https://github.com/intel/gvt-linux into drm-intel-fixes) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/gvt/handlers.c | 1 + + drivers/gpu/drm/i915/gvt/hypercall.h | 2 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 30 ++++++++++++++++++++++++++---- + drivers/gpu/drm/i915/gvt/mpt.h | 2 +- + 4 files changed, 29 insertions(+), 6 deletions(-) +Merging mmc-fixes/fixes (2bd44dadd5bf mmc: sdhci-iproc: handle mmc_of_parse() errors during probe) +$ git merge mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mmc/host/Kconfig | 4 ++-- + drivers/mmc/host/meson-gx-mmc.c | 18 +++++++++++------- + drivers/mmc/host/sdhci-iproc.c | 5 ++++- + 3 files changed, 17 insertions(+), 10 deletions(-) +Merging rtc-fixes/rtc-fixes (bfeffd155283 Linux 5.0-rc1) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (bfeffd155283 Linux 5.0-rc1) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (a986435b3297 hv_netvsc: fix typos in code comments) +$ git merge hyperv-fixes/hyperv-fixes +Merge made by the 'recursive' strategy. + drivers/net/hyperv/hyperv_net.h | 12 ++-- + drivers/net/hyperv/netvsc.c | 4 +- + drivers/net/hyperv/netvsc_drv.c | 145 ++++++++++++++++++++++++-------------- + drivers/net/hyperv/rndis_filter.c | 36 +++++++--- + 4 files changed, 129 insertions(+), 68 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (4bb0e6d72582 drm/sun4i: backend: add missing of_node_puts) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/meson/meson_crtc.c | 23 ++--------------------- + drivers/gpu/drm/meson/meson_drv.c | 14 ++++++++++++-- + drivers/gpu/drm/qxl/qxl_drv.c | 4 ---- + drivers/gpu/drm/qxl/qxl_prime.c | 14 -------------- + drivers/gpu/drm/rockchip/rockchip_rgb.c | 4 +++- + drivers/gpu/drm/sun4i/sun4i_backend.c | 5 +++-- + drivers/gpu/drm/virtio/virtgpu_drv.c | 4 ---- + drivers/gpu/drm/virtio/virtgpu_drv.h | 4 ---- + drivers/gpu/drm/virtio/virtgpu_prime.c | 14 -------------- + 9 files changed, 20 insertions(+), 66 deletions(-) +Merging kbuild/for-next (e00d88804814 kbuild: mark prepare0 as PHONY to fix external module build) +$ git merge kbuild/for-next +Already up to date. +Merging compiler-attributes/compiler-attributes (3e2ffd655cc6 include/linux/compiler*.h: fix OPTIMIZER_HIDE_VAR) +$ git merge compiler-attributes/compiler-attributes +Auto-merging include/linux/compiler-gcc.h +Merge made by the 'recursive' strategy. + include/linux/compiler-clang.h | 5 ++--- + include/linux/compiler-gcc.h | 4 ---- + include/linux/compiler-intel.h | 4 +--- + include/linux/compiler.h | 4 +++- + 4 files changed, 6 insertions(+), 11 deletions(-) +Merging leaks/leaks-next (9f84a0f7f1a6 leaking_addresses: check if file name contains address) +$ git merge leaks/leaks-next +Merge made by the 'recursive' strategy. +Merging 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 +Removing arch/arm/mach-oxnas/hotplug.c +Merge made by the 'recursive' strategy. + arch/arm/mach-actions/platsmp.c | 15 ------ + arch/arm/mach-oxnas/Makefile | 1 - + arch/arm/mach-oxnas/hotplug.c | 109 ---------------------------------------- + arch/arm/mach-oxnas/platsmp.c | 4 -- + arch/arm/mach-qcom/platsmp.c | 26 ---------- + 5 files changed, 155 deletions(-) + delete mode 100644 arch/arm/mach-oxnas/hotplug.c +Merging arm64/for-next/core (7e0b44e870cf arm64: compat: Hook up io_pgetevents() for 32-bit tasks) +$ git merge arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (c061ce249f9b dt-bindings: arm: Convert PMU binding to json-schema) +$ git merge arm-perf/for-next/perf +Removing Documentation/devicetree/bindings/arm/pmu.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/pmu.txt | 70 --------------------- + Documentation/devicetree/bindings/arm/pmu.yaml | 87 ++++++++++++++++++++++++++ + MAINTAINERS | 2 +- + 3 files changed, 88 insertions(+), 71 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/pmu.txt + create mode 100644 Documentation/devicetree/bindings/arm/pmu.yaml +Merging arm-soc/for-next (f217b8e70c76 ARM: Document merges) +$ git merge arm-soc/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 9ed4e29f0b6c] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 1 - + arch/arm/arm-soc-for-next-contents.txt | 66 ++++++++++++++++++++++++++++++++++ + 2 files changed, 66 insertions(+), 1 deletion(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +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 (2710bac89836 Merge branch 'v5.1/dt64' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + .../display/amlogic,simple-framebuffer.txt | 33 ++++++++++ + .../devicetree/bindings/gpu/arm,mali-utgard.txt | 6 ++ + arch/arm/boot/dts/meson.dtsi | 2 +- + arch/arm/boot/dts/meson6.dtsi | 8 +++ + arch/arm/boot/dts/meson8.dtsi | 66 ++++++++++++++++++++ + arch/arm/boot/dts/meson8b-ec100.dts | 3 +- + arch/arm/boot/dts/meson8b-odroidc1.dts | 28 ++++++++- + arch/arm/boot/dts/meson8b.dtsi | 54 +++++++++++++++++ + arch/arm/boot/dts/meson8m2-mxiii-plus.dts | 3 +- + arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 30 +++++++++- + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 20 +++++++ + arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 70 ++++++++-------------- + .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 3 +- + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 23 +++++++ + .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 3 +- + .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 3 +- + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 13 +++- + arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 3 +- + .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 3 +- + arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 3 +- + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 6 ++ + .../dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts | 3 +- + .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 3 +- + .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 3 +- + .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 3 +- + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 6 ++ + .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 3 +- + .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 3 +- + arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 3 +- + 29 files changed, 325 insertions(+), 85 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/amlogic,simple-framebuffer.txt +Merging aspeed/for-next (d5e12a2c968d Merge branch 'aspeed-5.1-devicetree' into for-next) +$ git merge aspeed/for-next +Merge made by the 'recursive' strategy. + .../dts/aspeed-bmc-arm-stardragon4800-rep2.dts | 10 +++++++ + .../arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts | 35 ++++++++++++++++++++-- + arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 5 ++++ + arch/arm/boot/dts/aspeed-g4.dtsi | 1 + + arch/arm/boot/dts/aspeed-g5.dtsi | 34 ++++++++++++++++++++- + 5 files changed, 82 insertions(+), 3 deletions(-) +Merging at91/at91-next (3850dd7a32a0 Merge branch 'at91-dt' into at91-next) +$ git merge at91/at91-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/at91-nattis-2-natte-2.dts | 2 +- + arch/arm/boot/dts/at91-sama5d27_som1.dtsi | 30 +++++++++++++++++++++++++++++ + arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 4 ++++ + arch/arm/boot/dts/at91-wb45n.dts | 2 +- + arch/arm/boot/dts/at91-wb50n.dts | 4 ++-- + 5 files changed, 38 insertions(+), 4 deletions(-) +Merging bcm2835/for-next (9ef81d65b288 Merge branch 'bcm2835-dt-64-next' into for-next) +$ git merge bcm2835/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/bcm/brcm,bcm2835.txt | 4 + + .../bindings/soc/bcm/brcm,bcm2835-pm.txt | 46 ++ + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/bcm2835-rpi.dtsi | 4 - + arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts | 175 ++++++ + arch/arm/boot/dts/bcm283x.dtsi | 17 +- + arch/arm/mach-bcm/Kconfig | 1 + + arch/arm64/boot/dts/broadcom/Makefile | 3 +- + .../boot/dts/broadcom/bcm2837-rpi-3-a-plus.dts | 2 + + drivers/firmware/raspberrypi.c | 11 + + drivers/mfd/Makefile | 1 + + drivers/mfd/bcm2835-pm.c | 92 +++ + drivers/soc/bcm/Kconfig | 11 + + drivers/soc/bcm/Makefile | 1 + + drivers/soc/bcm/bcm2835-power.c | 661 +++++++++++++++++++++ + drivers/watchdog/bcm2835_wdt.c | 26 +- + include/dt-bindings/soc/bcm2835-pm.h | 28 + + include/linux/mfd/bcm2835-pm.h | 14 + + include/soc/bcm2835/raspberrypi-firmware.h | 4 + + 19 files changed, 1077 insertions(+), 25 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.txt + create mode 100644 arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts + create mode 100644 arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-a-plus.dts + create mode 100644 drivers/mfd/bcm2835-pm.c + create mode 100644 drivers/soc/bcm/bcm2835-power.c + create mode 100644 include/dt-bindings/soc/bcm2835-pm.h + create mode 100644 include/linux/mfd/bcm2835-pm.h +Merging imx-mxs/for-next (32cb82a0e36b Merge branch 'imx/maintainers' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/arm/technologic.txt +Removing Documentation/devicetree/bindings/arm/olimex.txt +Removing Documentation/devicetree/bindings/arm/i2se.txt +Removing Documentation/devicetree/bindings/arm/fsl.txt +Removing Documentation/devicetree/bindings/arm/compulab-boards.txt +Removing Documentation/devicetree/bindings/arm/bhf.txt +Removing Documentation/devicetree/bindings/arm/armadeus.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/armadeus.txt | 6 - + Documentation/devicetree/bindings/arm/bhf.txt | 6 - + .../devicetree/bindings/arm/compulab-boards.txt | 25 - + .../bindings/arm/freescale/fsl,imx7ulp-sim.txt | 16 + + .../devicetree/bindings/arm/freescale/fsl,scu.txt | 8 +- + Documentation/devicetree/bindings/arm/fsl.txt | 237 -------- + Documentation/devicetree/bindings/arm/fsl.yaml | 223 ++++++++ + Documentation/devicetree/bindings/arm/i2se.txt | 22 - + Documentation/devicetree/bindings/arm/olimex.txt | 10 - + .../devicetree/bindings/arm/technologic.txt | 23 - + Documentation/devicetree/bindings/bus/imx-weim.txt | 32 +- + .../devicetree/bindings/power/fsl,imx-gpcv2.txt | 3 + + MAINTAINERS | 13 +- + arch/arm/boot/dts/Makefile | 3 + + arch/arm/boot/dts/imx27.dtsi | 2 +- + arch/arm/boot/dts/imx51-digi-connectcore-jsk.dts | 16 + + arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi | 34 +- + arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 595 +++++++++++++++++++++ + arch/arm/boot/dts/imx6dl-yapp4-draco.dts | 58 ++ + arch/arm/boot/dts/imx6dl-yapp4-hydra.dts | 50 ++ + arch/arm/boot/dts/imx6dl-yapp4-ursa.dts | 54 ++ + arch/arm/boot/dts/imx6q-pistachio.dts | 2 +- + arch/arm/boot/dts/imx6q-tbs2910.dts | 49 +- + arch/arm/boot/dts/imx6sl.dtsi | 8 +- + arch/arm/boot/dts/imx6sll-evk.dts | 2 +- + arch/arm/boot/dts/imx6sx.dtsi | 21 +- + arch/arm/boot/dts/imx6ul.dtsi | 8 + + arch/arm/boot/dts/imx6ull.dtsi | 12 + + arch/arm/boot/dts/imx7s.dtsi | 8 + + arch/arm/boot/dts/imx7ulp.dtsi | 19 +- + arch/arm/boot/dts/ls1021a.dtsi | 10 + + arch/arm/boot/dts/vf610-bk4.dts | 35 +- + arch/arm/boot/dts/vf610-zii-cfu1.dts | 2 +- + arch/arm/configs/imx_v6_v7_defconfig | 3 + + arch/arm/mach-imx/Makefile | 3 +- + arch/arm/mach-imx/common.h | 10 + + arch/arm/mach-imx/cpuidle-imx7ulp.c | 60 +++ + arch/arm/mach-imx/cpuidle.h | 5 + + arch/arm/mach-imx/mach-imx7ulp.c | 46 ++ + arch/arm/mach-imx/pm-imx7ulp.c | 49 +- + arch/arm64/boot/dts/freescale/Makefile | 1 + + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 2 + + arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 6 + + arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 4 +- + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 11 + + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 97 +++- + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 6 + + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 120 +++++ + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 162 +++++- + arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 137 +++++ + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 446 +++++++++++++++ + arch/arm64/configs/defconfig | 16 + + drivers/bus/imx-weim.c | 70 ++- + drivers/firmware/imx/scu-pd.c | 1 + + drivers/soc/imx/Kconfig | 2 +- + drivers/soc/imx/gpcv2.c | 76 ++- + include/dt-bindings/clock/imx8mq-clock.h | 26 +- + 59 files changed, 2501 insertions(+), 474 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/armadeus.txt + delete mode 100644 Documentation/devicetree/bindings/arm/bhf.txt + delete mode 100644 Documentation/devicetree/bindings/arm/compulab-boards.txt + create mode 100644 Documentation/devicetree/bindings/arm/freescale/fsl,imx7ulp-sim.txt + delete mode 100644 Documentation/devicetree/bindings/arm/fsl.txt + create mode 100644 Documentation/devicetree/bindings/arm/fsl.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/i2se.txt + delete mode 100644 Documentation/devicetree/bindings/arm/olimex.txt + delete mode 100644 Documentation/devicetree/bindings/arm/technologic.txt + create mode 100644 arch/arm/boot/dts/imx6dl-yapp4-common.dtsi + create mode 100644 arch/arm/boot/dts/imx6dl-yapp4-draco.dts + create mode 100644 arch/arm/boot/dts/imx6dl-yapp4-hydra.dts + create mode 100644 arch/arm/boot/dts/imx6dl-yapp4-ursa.dts + create mode 100644 arch/arm/mach-imx/cpuidle-imx7ulp.c + create mode 100644 arch/arm64/boot/dts/freescale/imx8qxp-mek.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8qxp.dtsi +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 (ecee13a082e0 Merge branch 'v5.0-next/dts64' into for-next) +$ git merge mediatek/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/mt7623.dtsi | 15 +- + arch/arm64/boot/dts/mediatek/mt2712-evb.dts | 98 +++++ + arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 555 ++++++++++++++++++++++++ + arch/arm64/boot/dts/mediatek/mt6797-evb.dts | 2 + + arch/arm64/boot/dts/mediatek/mt6797-x20-dev.dts | 2 + + arch/arm64/boot/dts/mediatek/mt6797.dtsi | 28 ++ + arch/arm64/boot/dts/mediatek/mt7622.dtsi | 9 +- + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 6 +- + 8 files changed, 707 insertions(+), 8 deletions(-) +Merging mvebu/for-next (b5f034845e70 ARM: dts: kirkwood: Fix polarity of GPIO fan lines) +$ git merge mvebu/for-next +Already up to date. +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 (d3490aa43e56 reset: socfpga: declare socfpga_reset_init in a header file) +$ git merge reset/reset/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + arch/arm/mach-socfpga/socfpga.c | 3 +-- + arch/arm/mach-sunxi/sunxi.c | 2 +- + drivers/reset/reset-socfpga.c | 2 +- + drivers/reset/reset-sunxi.c | 1 + + include/linux/reset/socfpga.h | 7 +++++++ + include/linux/reset/sunxi.h | 7 +++++++ + 7 files changed, 19 insertions(+), 4 deletions(-) + create mode 100644 include/linux/reset/socfpga.h + create mode 100644 include/linux/reset/sunxi.h +Merging qcom/for-next (a3ece12f1917 Merge branch 'arm64-for-5.1' into all-for-5.1) +$ git merge qcom/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 2 + + arch/arm64/boot/dts/qcom/msm8996-pins.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm8916.dtsi | 6 + + arch/arm64/boot/dts/qcom/pms405.dtsi | 79 +++++++++++++ + arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 5 + + arch/arm64/boot/dts/qcom/qcs404.dtsi | 20 ++++ + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 72 +++++++++++- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 176 ++++++++++++++++++++++++++++- + 8 files changed, 358 insertions(+), 4 deletions(-) +Merging renesas/next (903b2bb37299 Merge branches 'fixes-for-v5.0', 'arm-dt-for-v5.1' and 'arm64-dt-for-v5.1' into next) +$ git merge renesas/next +Auto-merging arch/arm64/configs/defconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/arm/shmobile.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/renesas.yaml | 228 +++ + Documentation/devicetree/bindings/arm/shmobile.txt | 155 -- + MAINTAINERS | 6 +- + arch/arm/boot/dts/r8a7743.dtsi | 43 +- + arch/arm/boot/dts/r8a7744.dtsi | 150 +- + arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts | 18 + + arch/arm/boot/dts/r8a7778.dtsi | 28 + + arch/arm/boot/dts/r8a7790-stout.dts | 15 +- + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/configs/shmobile_defconfig | 1 + + arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 5 + + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 5 +- + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 1751 ++++++++++++++++++++ + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 40 +- + .../arm64/boot/dts/renesas/r8a7796-salvator-xs.dts | 3 +- + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 43 +- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 3 + + arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 2 + + arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 25 +- + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 194 +-- + arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 4 +- + arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 138 ++ + arch/arm64/boot/dts/renesas/ulcb.dtsi | 70 +- + arch/arm64/configs/defconfig | 3 + + include/dt-bindings/clock/r8a7778-clock.h | 2 + + 25 files changed, 2503 insertions(+), 430 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/renesas.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/shmobile.txt + create mode 100644 arch/arm64/boot/dts/renesas/r8a774c0.dtsi +Merging rockchip/for-next (0355b8299d0a Merge branch 'v5.1-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 17 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/rk3036-kylin.dts | 1 - + arch/arm/boot/dts/rk3036.dtsi | 1 + + arch/arm/boot/dts/rk3066a.dtsi | 48 ++ + arch/arm/boot/dts/rk3188-bqedison2qc.dts | 17 +- + arch/arm/boot/dts/rk3188.dtsi | 1 - + arch/arm/boot/dts/rv1108-elgin-r1.dts | 206 +++++++ + arch/arm/boot/dts/rv1108.dtsi | 37 ++ + arch/arm64/boot/dts/rockchip/Makefile | 3 + + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 26 +- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 14 + + arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts | 91 +++ + arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4.dts | 66 ++ + arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 677 +++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts | 606 ++++++++++++++++++ + drivers/clk/rockchip/clk-rk3188.c | 4 +- + drivers/clk/rockchip/clk-rk3328.c | 12 +- + 19 files changed, 1816 insertions(+), 13 deletions(-) + create mode 100644 arch/arm/boot/dts/rv1108-elgin-r1.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts +Merging samsung/for-next (bebc6082da0a Linux 4.14) +$ git merge samsung/for-next +Already up to date. +Merging samsung-krzk/for-next (2e625e23d6bf Merge branch 'next/defconfig' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 1 - + arch/arm/boot/dts/exynos4412-odroidx.dts | 2 +- + arch/arm/boot/dts/exynos5250-arndale.dts | 2 +- + arch/arm/boot/dts/s3c2416-smdk2416.dts | 5 +- + arch/arm/boot/dts/s5pv210-aries.dtsi | 90 +++++++++++++++++++++++++ + arch/arm/boot/dts/s5pv210-fascinate4g.dts | 7 -- + arch/arm/boot/dts/s5pv210-galaxys.dts | 7 -- + arch/arm/boot/dts/s5pv210.dtsi | 25 ++++++- + arch/arm/configs/s5pv210_defconfig | 47 ++++++++++--- + arch/arm/mach-s3c24xx/mach-osiris-dvs.c | 8 +-- + 10 files changed, 159 insertions(+), 35 deletions(-) +Merging sunxi/sunxi/for-next (69ac2faf3bc9 Merge branch 'sunxi/fixes-for-5.0' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/sun4i-a10.dtsi | 5 +++ + arch/arm/boot/dts/sun6i-a31.dtsi | 1 + + arch/arm/boot/dts/sun7i-a20-bananapi.dts | 5 +++ + arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 2 +- + arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts | 41 ++++++++++++++++++++++ + arch/arm/boot/dts/sun8i-r40.dtsi | 15 ++++++++ + arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi | 16 ++++++++- + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 1 + + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 11 +++++- + 9 files changed, 94 insertions(+), 3 deletions(-) +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 (1f7e1389516e Merge branch 'clk-fixes' into clk-next) +$ git merge clk/clk-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/fixed-mmio-clock.txt | 24 +++ + .../devicetree/bindings/clock/qcom,rpmcc.txt | 1 + + drivers/clk/Kconfig | 7 +- + drivers/clk/Makefile | 1 + + drivers/clk/at91/sama5d2.c | 3 +- + drivers/clk/clk-clps711x.c | 61 ++----- + drivers/clk/clk-fixed-mmio.c | 101 +++++++++++ + drivers/clk/clk-highbank.c | 1 + + drivers/clk/clk-qoriq.c | 1 + + drivers/clk/clk-versaclock5.c | 4 +- + drivers/clk/clk.c | 2 +- + drivers/clk/imx/clk-composite-8m.c | 2 +- + drivers/clk/imx/clk-imx6q.c | 1 + + drivers/clk/imx/clk-imx6sx.c | 1 + + drivers/clk/imx/clk-imx7d.c | 1 + + drivers/clk/imx/clk-imx8mq.c | 194 ++++++++++----------- + drivers/clk/imx/clk-imx8qxp-lpcg.c | 2 + + drivers/clk/imx/clk-vf610.c | 1 + + drivers/clk/imx/clk.h | 5 +- + drivers/clk/mvebu/armada-370.c | 4 +- + drivers/clk/mvebu/armada-xp.c | 4 +- + drivers/clk/mvebu/dove.c | 8 +- + drivers/clk/mvebu/kirkwood.c | 2 + + drivers/clk/mvebu/mv98dx3236.c | 4 +- + drivers/clk/qcom/Kconfig | 1 + + drivers/clk/qcom/clk-smd-rpm.c | 63 +++++++ + drivers/clk/qcom/gcc-msm8998.c | 51 +++++- + drivers/clk/samsung/clk-exynos4.c | 1 + + drivers/clk/socfpga/clk-pll-a10.c | 1 + + drivers/clk/socfpga/clk-pll-s10.c | 2 +- + drivers/clk/socfpga/clk-pll.c | 1 + + drivers/clk/socfpga/clk-s10.c | 20 +-- + drivers/clk/tegra/clk-tegra124-dfll-fcpu.c | 4 +- + drivers/clk/ti/clk.c | 8 +- + drivers/clk/zynqmp/clkc.c | 4 +- + include/dt-bindings/clock/qcom,rpmcc.h | 10 ++ + 36 files changed, 425 insertions(+), 176 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/fixed-mmio-clock.txt + create mode 100644 drivers/clk/clk-fixed-mmio.c +Merging clk-samsung/for-next (bfeffd155283 Linux 5.0-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 (8e16960b1519 csky: Optimize remove unnecessary loop irq handle) +$ git merge csky/linux-next +Merge made by the 'recursive' strategy. + .../interrupt-controller/csky,apb-intc.txt | 1 + + .../bindings/interrupt-controller/csky,mpintc.txt | 24 +++- + arch/csky/include/asm/pgtable.h | 4 +- + drivers/irqchip/irq-csky-apb-intc.c | 131 ++++++++++++++++----- + drivers/irqchip/irq-csky-mpintc.c | 86 ++++++++++++-- + 5 files changed, 207 insertions(+), 39 deletions(-) +Merging h8300/h8300-next (21c7acc439b5 h8300: pci: Remove local declaration of pcibios_penalize_isa_irq) +$ git merge h8300/h8300-next +Already up to date. +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 (1c7fc5cbc339 Linux 5.0-rc2) +$ git merge m68knommu/for-next +Already up to date. +Merging microblaze/next (226a893bbb1f microblaze: no need to check return value of debugfs_create functions) +$ git merge microblaze/next +Merge made by the 'recursive' strategy. + arch/microblaze/kernel/setup.c | 13 ++----------- + 1 file changed, 2 insertions(+), 11 deletions(-) +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 (bfeffd155283 Linux 5.0-rc1) +$ 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 (0c1d7fc698da CREDITS/MAINTAINERS: Adjust parisc-linux.org email addresses) +$ git merge parisc-hd/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + CREDITS | 20 +++++++++----------- + MAINTAINERS | 7 +++---- + arch/parisc/boot/Makefile | 6 ------ + arch/parisc/include/asm/hardirq.h | 1 + + arch/parisc/kernel/irq.c | 19 ++++++++++++++----- + arch/parisc/kernel/smp.c | 1 + + arch/parisc/kernel/syscall.S | 2 +- + arch/parisc/kernel/syscalls/syscalltbl.sh | 4 ++-- + arch/parisc/kernel/traps.c | 4 ++-- + drivers/parisc/lba_pci.c | 12 ++++++++++++ + 10 files changed, 45 insertions(+), 31 deletions(-) +Merging powerpc/next (bfeffd155283 Linux 5.0-rc1) +$ 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 (801009424e05 Fix a handful of audit-related issue) +$ git merge risc-v/for-next +Already up to date. +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 (a28028959ea8 s390/hypfs: Use struct_size() in kzalloc()) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/boot/string.c | 1 + + arch/s390/hypfs/hypfs_diag0c.c | 3 +-- + arch/s390/include/asm/mmu_context.h | 7 +++---- + arch/s390/include/asm/string.h | 28 ++++++++++++++++++++++------ + arch/s390/kernel/early.c | 4 ++-- + arch/s390/kernel/setup.c | 2 ++ + arch/s390/kernel/smp.c | 11 ++++++++++- + arch/s390/kernel/vdso.c | 5 ++--- + arch/s390/lib/string.c | 28 ++++++++++++++++++++++++++++ + arch/s390/mm/pgtable.c | 2 -- + drivers/s390/char/sclp_config.c | 2 ++ + 11 files changed, 73 insertions(+), 20 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 +Already up to date. +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 +Auto-merging include/uapi/linux/fs.h +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/readpage.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 fs/crypto/fscrypt_private.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 +Auto-merging Documentation/filesystems/fscrypt.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 dd9a5c0b2f75] Merge remote-tracking branch 'fscrypt/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/fscrypt.rst | 4 +- + 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/fscrypt_private.h | 1 - + 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/fsverity.h | 98 ++++ + 57 files changed, 3665 insertions(+), 633 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 (85f5a4d666fd rbd: don't return 0 on unmap if RBD_DEV_FLAG_REMOVING is set) +$ git merge ceph/master +Already up to date. +Merging cifs/for-next (cb891e7a35b9 cifs: fix memory leak of an allocated cifs_ntsd structure) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/smb2pdu.c | 8 ++++++++ + 1 file changed, 8 insertions(+) +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 +Already up to date. +Merging f2fs/dev (cd2dcebde8b8 f2fs: sync filesystem after roll-forward recovery) +$ git merge f2fs/dev +Auto-merging fs/f2fs/sysfs.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/dir.c +Auto-merging fs/f2fs/data.c +Merge made by the 'recursive' strategy. + fs/f2fs/data.c | 5 +---- + fs/f2fs/debug.c | 19 ++++++++++++------- + fs/f2fs/dir.c | 3 ++- + fs/f2fs/f2fs.h | 3 ++- + fs/f2fs/file.c | 14 +++++++++----- + fs/f2fs/super.c | 15 ++++++++++++--- + fs/f2fs/sysfs.c | 2 ++ + include/trace/events/f2fs.h | 3 +++ + 8 files changed, 43 insertions(+), 21 deletions(-) +Merging fuse/for-next (cc4249fdc6c9 fuse: use atomic64_t for khctr) +$ git merge fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/control.c | 4 +- + fs/fuse/cuse.c | 7 +- + fs/fuse/dev.c | 119 ++++++++++++++++++------------- + fs/fuse/dir.c | 54 ++++++-------- + fs/fuse/file.c | 208 ++++++++++++++++++++++++++++-------------------------- + fs/fuse/fuse_i.h | 25 ++++--- + fs/fuse/inode.c | 25 ++++--- + fs/fuse/readdir.c | 4 +- + 8 files changed, 238 insertions(+), 208 deletions(-) +Merging jfs/jfs-next (2e3bc6125154 fs/jfs: Switch to use new generic UUID API) +$ git merge jfs/jfs-next +Merge made by the 'recursive' strategy. + fs/jfs/acl.c | 3 ++- + fs/jfs/jfs_incore.h | 6 ++++-- + fs/jfs/jfs_logmgr.c | 18 +++++++++--------- + fs/jfs/jfs_logmgr.h | 10 +++++----- + fs/jfs/jfs_mount.c | 4 ++-- + fs/jfs/jfs_superblock.h | 8 ++++---- + fs/jfs/namei.c | 2 +- + fs/jfs/super.c | 8 +++++--- + 8 files changed, 32 insertions(+), 27 deletions(-) +Merging nfs/linux-next (3bd6e94bec12 arch: restore generic-y += shmparam.h for some architectures) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (deaa5c96c2f7 SUNRPC: Address Kerberos performance/behavior regression) +$ git merge nfs-anna/linux-next +Merge made by the 'recursive' strategy. + fs/nfs/nfs4file.c | 8 +------- + net/sunrpc/auth.c | 3 +++ + net/sunrpc/auth_gss/auth_gss.c | 12 +++++++++--- + net/sunrpc/clnt.c | 20 ++++++++++++-------- + net/sunrpc/xprt.c | 3 ++- + net/sunrpc/xprtrdma/verbs.c | 10 ++++------ + net/sunrpc/xprtsock.c | 22 ++++++++++++++++++++++ + 7 files changed, 53 insertions(+), 25 deletions(-) +Merging nfsd/nfsd-next (978c707df559 svcrdma: Use struct_size() in kmalloc()) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/nfsd/nfs4callback.c | 4 ++-- + net/sunrpc/svc_xprt.c | 24 +++++++++++++++++++----- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 3 ++- + net/sunrpc/xprtrdma/svc_rdma_rw.c | 6 +++--- + 4 files changed, 26 insertions(+), 11 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 (2424e1c7256c overlayfs: During copy up, first copy up data and then xattrs) +$ git merge overlayfs/overlayfs-next +Merge made by the 'recursive' strategy. + fs/overlayfs/copy_up.c | 31 ++++++++++++++++++------------- + 1 file changed, 18 insertions(+), 13 deletions(-) +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 +Already up to date. +Merging file-locks/locks-next (bf77ae4c98d7 locks: fix error in locks_move_blocks()) +$ 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 +Auto-merging security/security.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 +CONFLICT (content): Merge conflict in kernel/cgroup/cgroup-internal.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/proc/inode.c +Auto-merging fs/namespace.c +Auto-merging fs/namei.c +Auto-merging fs/kernfs/mount.c +Auto-merging fs/Makefile +CONFLICT (content): Merge conflict in fs/Makefile +Auto-merging fs/Kconfig +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 +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-internal.h' using previous resolution. +Resolved 'kernel/cgroup/cgroup-v1.c' using previous resolution. +Resolved 'kernel/cgroup/cgroup.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 486954c1db51] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/mount_api.txt | 709 ++++++++++++++++++++++++++++++++ + arch/x86/kernel/cpu/resctrl/internal.h | 16 + + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 194 +++++---- + 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/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 | 262 ++++++++---- + fs/proc/inode.c | 52 +-- + fs/proc/internal.h | 5 +- + fs/proc/root.c | 244 ++++++++--- + fs/super.c | 344 +++++++++++++--- + fs/sysfs/mount.c | 73 +++- + 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 | 21 + + include/linux/mount.h | 3 + + include/linux/security.h | 18 +- + ipc/mqueue.c | 94 ++++- + ipc/namespace.c | 2 +- + kernel/cgroup/cgroup-internal.h | 52 ++- + kernel/cgroup/cgroup-v1.c | 407 ++++++++++-------- + kernel/cgroup/cgroup.c | 262 +++++++----- + kernel/cgroup/cpuset.c | 56 ++- + security/security.c | 10 + + security/selinux/hooks.c | 99 ++++- + security/selinux/include/security.h | 10 +- + security/smack/smack.h | 20 +- + security/smack/smack_lsm.c | 103 ++++- + 43 files changed, 4482 insertions(+), 1223 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 +$ 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 6f6a29b5dd3c] Merge remote-tracking branch 'vfs/for-next' + Date: Fri Jan 18 09:52:37 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 (4cd74d833a4d Merge branch 'pci/misc') +$ git merge pci/next +Auto-merging drivers/pci/pci.c +Merge made by the 'recursive' strategy. + drivers/pci/hotplug/pciehp_hpc.c | 2 +- + drivers/pci/pci.c | 4 ++-- + drivers/pci/quirks.c | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) +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 (0a84e89382d6 Merge branch 'for-5.0/upstream-fixes' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/Kconfig | 7 ++ + drivers/hid/Makefile | 1 + + drivers/hid/hid-core.c | 23 +++--- + drivers/hid/hid-ids.h | 4 + + drivers/hid/hid-maltron.c | 165 +++++++++++++++++++++++++++++++++++++ + drivers/hid/hid-sony.c | 31 ++++--- + drivers/hid/i2c-hid/i2c-hid-core.c | 2 + + include/linux/hid.h | 3 +- + 8 files changed, 213 insertions(+), 23 deletions(-) + create mode 100644 drivers/hid/hid-maltron.c +Merging i2c/i2c/for-next (b33a02aadcc6 i2c: acpi: Move I2C bits from acpi.h to i2c.h) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + Documentation/i2c/fault-codes | 4 ++++ + drivers/i2c/busses/i2c-brcmstb.c | 13 ++--------- + drivers/i2c/busses/i2c-exynos5.c | 11 ++-------- + drivers/i2c/busses/i2c-imx.c | 37 +++++++++++++++++++------------- + drivers/i2c/busses/i2c-rcar.c | 25 ++++++++++++++++++++++ + drivers/i2c/busses/i2c-s3c2410.c | 8 ++----- + drivers/i2c/busses/i2c-sprd.c | 34 +++++++++++------------------ + drivers/i2c/busses/i2c-synquacer.c | 5 ----- + drivers/i2c/busses/i2c-zx2967.c | 8 ++----- + drivers/i2c/i2c-core-base.c | 3 +++ + include/linux/acpi.h | 11 ---------- + include/linux/i2c.h | 44 ++++++++++++++++++++++++++++++++++++++ + 12 files changed, 118 insertions(+), 85 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 (554d08277810 hwmon: (ltc4245) Replace S_<PERMS> with octal values) +$ git merge hwmon-staging/hwmon-next +Auto-merging drivers/hwmon/lm80.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwmon/dps650ab.txt | 11 + + .../devicetree/bindings/hwmon/hih6130.txt | 12 + + drivers/hwmon/adt7462.c | 4 + + drivers/hwmon/dell-smm-hwmon.c | 97 +++- + drivers/hwmon/gl518sm.c | 120 ++-- + drivers/hwmon/gl520sm.c | 184 +++--- + drivers/hwmon/gpio-fan.c | 2 +- + drivers/hwmon/hih6130.c | 21 +- + drivers/hwmon/hwmon.c | 4 +- + drivers/hwmon/i5500_temp.c | 14 +- + drivers/hwmon/i5k_amb.c | 12 +- + drivers/hwmon/ibmaem.c | 15 +- + drivers/hwmon/ibmpex.c | 14 +- + drivers/hwmon/iio_hwmon.c | 2 +- + drivers/hwmon/ina209.c | 151 +++-- + drivers/hwmon/ina3221.c | 17 +- + drivers/hwmon/jc42.c | 8 +- + drivers/hwmon/k8temp.c | 12 +- + drivers/hwmon/lineage-pem.c | 77 ++- + drivers/hwmon/lm73.c | 34 +- + drivers/hwmon/lm75.c | 6 +- + drivers/hwmon/lm77.c | 45 +- + drivers/hwmon/lm80.c | 138 ++--- + drivers/hwmon/lm83.c | 62 +- + drivers/hwmon/lm90.c | 12 +- + drivers/hwmon/lm92.c | 39 +- + drivers/hwmon/lm93.c | 630 +++++++++------------ + drivers/hwmon/lm95241.c | 8 +- + drivers/hwmon/lm95245.c | 8 +- + drivers/hwmon/ltc2990.c | 32 +- + drivers/hwmon/ltc4151.c | 11 +- + drivers/hwmon/ltc4222.c | 56 +- + drivers/hwmon/ltc4245.c | 8 +- + drivers/hwmon/pmbus/pmbus.c | 64 ++- + 34 files changed, 913 insertions(+), 1017 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/dps650ab.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/hih6130.txt +Merging jc_docs/docs-next (be5cd20c9b49 kernel-doc: suppress 'not described' warnings for embedded struct fields) +$ git merge jc_docs/docs-next +Removing Documentation/networking/checksum-offloads.txt +Auto-merging Documentation/filesystems/index.rst +Merge made by the 'recursive' strategy. + Documentation/admin-guide/tainted-kernels.rst | 159 +++- + Documentation/cgroup-v1/memory.txt | 7 +- + Documentation/core-api/kernel-api.rst | 4 - + Documentation/core-api/memory-allocation.rst | 8 +- + Documentation/core-api/mm-api.rst | 2 +- + Documentation/dev-tools/kcov.rst | 2 +- + Documentation/doc-guide/sphinx.rst | 12 +- + Documentation/fault-injection/fault-injection.txt | 2 +- + Documentation/filesystems/binderfs.rst | 68 ++ + Documentation/filesystems/index.rst | 7 + + Documentation/filesystems/path-lookup.rst | 24 +- + Documentation/hwmon/f71882fg | 2 +- + Documentation/index.rst | 1 + + Documentation/misc-devices/ibmvmc.rst | 1 + + Documentation/misc-devices/index.rst | 17 + + Documentation/networking/checksum-offloads.rst | 143 ++++ + Documentation/networking/checksum-offloads.txt | 122 --- + Documentation/networking/index.rst | 2 + + ...tion-offloads.txt => segmentation-offloads.rst} | 48 +- + Documentation/process/coding-style.rst | 59 +- + Documentation/sysctl/kernel.txt | 50 +- + Documentation/sysctl/vm.txt | 2 +- + .../translations/it_IT/process/coding-style.rst | 57 +- + .../it_IT/process/submitting-patches.rst | 862 ++++++++++++++++++++- + Documentation/translations/zh_CN/coding-style.rst | 57 +- + LICENSES/exceptions/GCC-exception-2.0 | 18 + + include/linux/skbuff.h | 2 +- + samples/Kconfig | 7 + + samples/Makefile | 2 +- + samples/binderfs/Makefile | 1 + + samples/binderfs/binderfs_example.c | 83 ++ + scripts/kernel-doc | 2 +- + scripts/spdxcheck.py | 8 +- + tools/Makefile | 14 +- + tools/debugging/Makefile | 16 + + tools/debugging/kernel-chktaint | 202 +++++ + 36 files changed, 1771 insertions(+), 302 deletions(-) + create mode 100644 Documentation/filesystems/binderfs.rst + create mode 100644 Documentation/misc-devices/index.rst + create mode 100644 Documentation/networking/checksum-offloads.rst + delete mode 100644 Documentation/networking/checksum-offloads.txt + rename Documentation/networking/{segmentation-offloads.txt => segmentation-offloads.rst} (88%) + create mode 100644 LICENSES/exceptions/GCC-exception-2.0 + create mode 100644 samples/binderfs/Makefile + create mode 100644 samples/binderfs/binderfs_example.c + create mode 100644 tools/debugging/Makefile + create mode 100755 tools/debugging/kernel-chktaint +Merging v4l-dvb/master (e8f9b16d7263 media: remove soc_camera ov9640) +$ git merge v4l-dvb/master +Auto-merging drivers/media/platform/vim2m.c +Auto-merging drivers/media/pci/intel/ipu3/ipu3-cio2.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/media/i2c/adv748x.txt | 11 +- + .../devicetree/bindings/media/i2c/ov5645.txt | 6 +- + .../devicetree/bindings/media/rcar_vin.txt | 9 +- + .../bindings/media/renesas,rcar-csi2.txt | 3 +- + .../devicetree/bindings/media/sun6i-csi.txt | 2 +- + Documentation/media/uapi/v4l/buffer.rst | 11 +- + Documentation/media/uapi/v4l/extended-controls.rst | 37 ++-- + .../media/uapi/v4l/pixfmt-meta-intel-ipu3.rst | 25 ++- + Documentation/media/v4l-drivers/imx.rst | 103 ++++++---- + Documentation/media/v4l-drivers/ipu3.rst | 4 +- + MAINTAINERS | 11 +- + drivers/gpu/ipu-v3/ipu-cpmem.c | 26 ++- + drivers/gpu/ipu-v3/ipu-csi.c | 126 +++++++++---- + drivers/media/common/saa7146/saa7146_i2c.c | 5 +- + drivers/media/common/videobuf2/videobuf2-dma-sg.c | 2 +- + drivers/media/common/videobuf2/videobuf2-v4l2.c | 19 +- + drivers/media/dvb-frontends/drxd_hard.c | 30 +-- + drivers/media/dvb-frontends/lgdt3306a.c | 5 +- + drivers/media/dvb-frontends/lgdt330x.c | 2 +- + drivers/media/dvb-frontends/mt312.c | 4 +- + drivers/media/dvb-frontends/sp8870.c | 4 +- + drivers/media/i2c/Kconfig | 7 + + drivers/media/i2c/Makefile | 1 + + drivers/media/i2c/adv748x/adv748x-core.c | 209 ++++++++++++--------- + drivers/media/i2c/adv748x/adv748x.h | 1 + + drivers/media/i2c/dw9714.c | 2 +- + drivers/media/i2c/imx274.c | 2 +- + drivers/media/i2c/ov2640.c | 45 ++++- + drivers/media/i2c/ov5640.c | 58 ++++-- + drivers/media/i2c/ov7670.c | 16 +- + .../i2c/{soc_camera/soc_ov9640.c => ov9640.c} | 123 +++++++----- + drivers/media/i2c/{soc_camera => }/ov9640.h | 7 +- + drivers/media/i2c/soc_camera/Kconfig | 6 - + drivers/media/i2c/soc_camera/Makefile | 1 - + drivers/media/i2c/tw9910.c | 27 +-- + drivers/media/pci/intel/ipu3/ipu3-cio2.c | 5 +- + drivers/media/platform/Kconfig | 2 +- + drivers/media/platform/aspeed-video.c | 1 + + drivers/media/platform/coda/coda-bit.c | 6 +- + drivers/media/platform/coda/coda-common.c | 11 ++ + drivers/media/platform/coda/coda.h | 2 + + drivers/media/platform/rcar-vin/rcar-core.c | 26 +-- + drivers/media/platform/rcar-vin/rcar-csi2.c | 66 ++++--- + drivers/media/platform/s5p-jpeg/jpeg-core.c | 25 +-- + drivers/media/platform/s5p-jpeg/jpeg-core.h | 2 +- + drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c | 2 +- + drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.h | 2 +- + drivers/media/platform/s5p-jpeg/jpeg-regs.h | 2 +- + drivers/media/platform/s5p-mfc/s5p_mfc.c | 1 - + drivers/media/platform/seco-cec/seco-cec.h | 2 +- + drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 1 + + drivers/media/platform/vicodec/codec-fwht.c | 8 +- + drivers/media/platform/vicodec/vicodec-core.c | 12 +- + drivers/media/platform/vim2m.c | 12 +- + drivers/media/platform/vivid/vivid-core.c | 22 ++- + drivers/media/platform/vivid/vivid-vid-out.c | 16 +- + drivers/media/platform/vsp1/vsp1_video.c | 2 +- + drivers/media/spi/cxd2880-spi.c | 8 +- + drivers/media/usb/gspca/cpia1.c | 14 +- + drivers/media/usb/gspca/gspca.c | 18 +- + drivers/media/usb/gspca/m5602/m5602_mt9m111.c | 8 +- + drivers/media/usb/gspca/m5602/m5602_po1030.c | 8 +- + drivers/media/usb/gspca/ov534.c | 153 ++++++++++----- + drivers/media/usb/pwc/pwc-if.c | 69 +++++-- + drivers/media/usb/uvc/uvc_ctrl.c | 2 +- + drivers/media/v4l2-core/v4l2-ctrls.c | 14 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 20 ++ + drivers/staging/media/imx/imx-ic-prpencvf.c | 46 ++++- + drivers/staging/media/imx/imx-media-capture.c | 14 ++ + drivers/staging/media/imx/imx-media-csi.c | 156 +++++++++++---- + drivers/staging/media/imx/imx-media-vdic.c | 12 +- + drivers/staging/media/ipu3/ipu3-css-params.c | 1 + + drivers/staging/media/ipu3/ipu3-dmamap.c | 1 + + drivers/staging/media/sunxi/cedrus/cedrus.h | 9 +- + drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 2 + + drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 28 +-- + drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c | 23 ++- + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 8 +- + include/media/mpeg2-ctrls.h | 14 +- + include/media/v4l2-mem2mem.h | 20 ++ + include/media/videobuf2-dma-sg.h | 2 +- + include/media/videobuf2-v4l2.h | 17 ++ + include/trace/events/pwc.h | 65 +++++++ + include/uapi/linux/v4l2-controls.h | 2 + + include/uapi/linux/videodev2.h | 22 ++- + include/video/imx-ipu-v3.h | 8 +- + 86 files changed, 1323 insertions(+), 619 deletions(-) + rename drivers/media/i2c/{soc_camera/soc_ov9640.c => ov9640.c} (90%) + rename drivers/media/i2c/{soc_camera => }/ov9640.h (96%) + create mode 100644 include/trace/events/pwc.h +Merging v4l-dvb-next/master (76097fe1aee6 media: staging/ipu3-imgu: Add MAINTAINERS entry) +$ git merge v4l-dvb-next/master +Auto-merging drivers/staging/media/ipu3/ipu3-css-params.c +Auto-merging MAINTAINERS +Auto-merging Documentation/media/v4l-drivers/ipu3.rst +CONFLICT (add/add): Merge conflict in Documentation/media/v4l-drivers/ipu3.rst +Auto-merging Documentation/media/uapi/v4l/pixfmt-meta-intel-ipu3.rst +CONFLICT (add/add): Merge conflict in Documentation/media/uapi/v4l/pixfmt-meta-intel-ipu3.rst +Resolved 'Documentation/media/uapi/v4l/pixfmt-meta-intel-ipu3.rst' using previous resolution. +Resolved 'Documentation/media/v4l-drivers/ipu3.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f609f3cedd6e] Merge remote-tracking branch 'v4l-dvb-next/master' +$ git diff -M --stat --summary HEAD^.. +Merging fbdev/fbdev-for-next (890d14d2d4b5 fbdev: fbmem: convert CONFIG_FB_LOGO_CENTER into a cmd line option) +$ git merge fbdev/fbdev-for-next +Auto-merging drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c +Merge made by the 'recursive' strategy. + Documentation/fb/fbcon.txt | 8 ++++++++ + drivers/video/fbdev/core/fbcon.c | 7 +++++++ + drivers/video/fbdev/core/fbmem.c | 19 ++++++++++--------- + drivers/video/fbdev/offb.c | 18 +++++++++--------- + drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c | 2 ++ + drivers/video/logo/Kconfig | 9 --------- + include/linux/fb.h | 1 + + 7 files changed, 37 insertions(+), 27 deletions(-) +Merging pm/linux-next (4acbdd51bea2 Merge branch 'pm-core' into linux-next) +$ git merge pm/linux-next +Auto-merging MAINTAINERS +Removing Documentation/cpuidle/governor.txt +Removing Documentation/cpuidle/driver.txt +Merge made by the 'recursive' strategy. + Documentation/acpi/initrd_table_override.txt | 4 + + Documentation/admin-guide/pm/cpuidle.rst | 104 ++++- + Documentation/cpuidle/driver.txt | 37 -- + Documentation/cpuidle/governor.txt | 28 -- + Documentation/driver-api/pm/cpuidle.rst | 282 +++++++++++++ + Documentation/driver-api/pm/index.rst | 7 +- + MAINTAINERS | 1 + + arch/x86/Kconfig | 2 +- + drivers/acpi/Kconfig | 10 + + drivers/acpi/Makefile | 3 +- + drivers/acpi/acpica/acapps.h | 4 +- + drivers/acpi/acpica/accommon.h | 2 +- + drivers/acpi/acpica/acconvert.h | 2 +- + drivers/acpi/acpica/acdebug.h | 2 +- + drivers/acpi/acpica/acdispat.h | 2 +- + drivers/acpi/acpica/acevents.h | 2 +- + drivers/acpi/acpica/acglobal.h | 3 +- + drivers/acpi/acpica/achware.h | 2 +- + drivers/acpi/acpica/acinterp.h | 2 +- + drivers/acpi/acpica/aclocal.h | 2 +- + drivers/acpi/acpica/acmacros.h | 2 +- + drivers/acpi/acpica/acnamesp.h | 2 +- + drivers/acpi/acpica/acobject.h | 2 +- + drivers/acpi/acpica/acopcode.h | 2 +- + drivers/acpi/acpica/acparser.h | 2 +- + drivers/acpi/acpica/acpredef.h | 2 +- + drivers/acpi/acpica/acresrc.h | 2 +- + drivers/acpi/acpica/acstruct.h | 2 +- + drivers/acpi/acpica/actables.h | 2 +- + drivers/acpi/acpica/acutils.h | 2 +- + drivers/acpi/acpica/amlcode.h | 2 +- + drivers/acpi/acpica/amlresrc.h | 2 +- + drivers/acpi/acpica/dbhistry.c | 2 +- + drivers/acpi/acpica/dsargs.c | 2 +- + drivers/acpi/acpica/dscontrol.c | 2 +- + drivers/acpi/acpica/dsdebug.c | 2 +- + drivers/acpi/acpica/dsfield.c | 2 +- + drivers/acpi/acpica/dsinit.c | 2 +- + drivers/acpi/acpica/dsmethod.c | 2 +- + drivers/acpi/acpica/dsobject.c | 2 +- + drivers/acpi/acpica/dsopcode.c | 17 +- + drivers/acpi/acpica/dspkginit.c | 2 +- + drivers/acpi/acpica/dswexec.c | 2 +- + drivers/acpi/acpica/dswload.c | 2 +- + drivers/acpi/acpica/dswload2.c | 2 +- + drivers/acpi/acpica/dswscope.c | 2 +- + drivers/acpi/acpica/dswstate.c | 2 +- + drivers/acpi/acpica/evevent.c | 2 +- + drivers/acpi/acpica/evglock.c | 2 +- + drivers/acpi/acpica/evgpe.c | 2 +- + drivers/acpi/acpica/evgpeblk.c | 2 +- + drivers/acpi/acpica/evgpeinit.c | 2 +- + drivers/acpi/acpica/evgpeutil.c | 2 +- + drivers/acpi/acpica/evhandler.c | 2 +- + drivers/acpi/acpica/evmisc.c | 2 +- + drivers/acpi/acpica/evregion.c | 2 +- + drivers/acpi/acpica/evrgnini.c | 2 +- + drivers/acpi/acpica/evxface.c | 2 +- + drivers/acpi/acpica/evxfevnt.c | 2 +- + drivers/acpi/acpica/evxfgpe.c | 2 +- + drivers/acpi/acpica/evxfregn.c | 2 +- + drivers/acpi/acpica/exconcat.c | 2 +- + drivers/acpi/acpica/exconfig.c | 2 +- + drivers/acpi/acpica/exconvrt.c | 2 +- + drivers/acpi/acpica/excreate.c | 2 +- + drivers/acpi/acpica/exdebug.c | 2 +- + drivers/acpi/acpica/exdump.c | 2 +- + drivers/acpi/acpica/exfield.c | 2 +- + drivers/acpi/acpica/exfldio.c | 2 +- + drivers/acpi/acpica/exmisc.c | 2 +- + drivers/acpi/acpica/exmutex.c | 2 +- + drivers/acpi/acpica/exnames.c | 2 +- + drivers/acpi/acpica/exoparg1.c | 2 +- + drivers/acpi/acpica/exoparg2.c | 10 +- + drivers/acpi/acpica/exoparg3.c | 2 +- + drivers/acpi/acpica/exoparg6.c | 2 +- + drivers/acpi/acpica/exprep.c | 2 +- + drivers/acpi/acpica/exregion.c | 2 +- + drivers/acpi/acpica/exresnte.c | 2 +- + drivers/acpi/acpica/exresolv.c | 2 +- + drivers/acpi/acpica/exresop.c | 2 +- + drivers/acpi/acpica/exserial.c | 2 +- + drivers/acpi/acpica/exstore.c | 2 +- + drivers/acpi/acpica/exstoren.c | 2 +- + drivers/acpi/acpica/exstorob.c | 2 +- + drivers/acpi/acpica/exsystem.c | 2 +- + drivers/acpi/acpica/extrace.c | 2 +- + drivers/acpi/acpica/exutils.c | 2 +- + drivers/acpi/acpica/hwacpi.c | 2 +- + drivers/acpi/acpica/hwesleep.c | 2 +- + drivers/acpi/acpica/hwgpe.c | 2 +- + drivers/acpi/acpica/hwsleep.c | 2 +- + drivers/acpi/acpica/hwtimer.c | 2 +- + drivers/acpi/acpica/hwvalid.c | 2 +- + drivers/acpi/acpica/hwxface.c | 2 +- + drivers/acpi/acpica/hwxfsleep.c | 2 +- + drivers/acpi/acpica/nsarguments.c | 2 +- + drivers/acpi/acpica/nsconvert.c | 2 +- + drivers/acpi/acpica/nsdump.c | 2 +- + drivers/acpi/acpica/nsdumpdv.c | 2 +- + drivers/acpi/acpica/nsinit.c | 2 +- + drivers/acpi/acpica/nsload.c | 2 +- + drivers/acpi/acpica/nsparse.c | 2 +- + drivers/acpi/acpica/nspredef.c | 2 +- + drivers/acpi/acpica/nsprepkg.c | 2 +- + drivers/acpi/acpica/nsrepair.c | 2 +- + drivers/acpi/acpica/nsrepair2.c | 2 +- + drivers/acpi/acpica/nsutils.c | 2 +- + drivers/acpi/acpica/nswalk.c | 2 +- + drivers/acpi/acpica/nsxfname.c | 2 +- + drivers/acpi/acpica/psargs.c | 2 +- + drivers/acpi/acpica/psloop.c | 2 +- + drivers/acpi/acpica/psobject.c | 2 +- + drivers/acpi/acpica/psopcode.c | 2 +- + drivers/acpi/acpica/psopinfo.c | 2 +- + drivers/acpi/acpica/psparse.c | 2 +- + drivers/acpi/acpica/psscope.c | 2 +- + drivers/acpi/acpica/pstree.c | 2 +- + drivers/acpi/acpica/psutils.c | 2 +- + drivers/acpi/acpica/pswalk.c | 2 +- + drivers/acpi/acpica/psxface.c | 2 +- + drivers/acpi/acpica/tbdata.c | 2 +- + drivers/acpi/acpica/tbfadt.c | 2 +- + drivers/acpi/acpica/tbfind.c | 2 +- + drivers/acpi/acpica/tbinstal.c | 2 +- + drivers/acpi/acpica/tbprint.c | 2 +- + drivers/acpi/acpica/tbutils.c | 2 +- + drivers/acpi/acpica/tbxface.c | 2 +- + drivers/acpi/acpica/tbxfload.c | 2 +- + drivers/acpi/acpica/tbxfroot.c | 2 +- + drivers/acpi/acpica/utaddress.c | 2 +- + drivers/acpi/acpica/utalloc.c | 2 +- + drivers/acpi/acpica/utascii.c | 2 +- + drivers/acpi/acpica/utbuffer.c | 2 +- + drivers/acpi/acpica/utcache.c | 2 +- + drivers/acpi/acpica/utcopy.c | 2 +- + drivers/acpi/acpica/utdebug.c | 2 +- + drivers/acpi/acpica/utdecode.c | 12 +- + drivers/acpi/acpica/uteval.c | 2 +- + drivers/acpi/acpica/utglobal.c | 2 +- + drivers/acpi/acpica/uthex.c | 2 +- + drivers/acpi/acpica/utids.c | 2 +- + drivers/acpi/acpica/utinit.c | 2 +- + drivers/acpi/acpica/utlock.c | 2 +- + drivers/acpi/acpica/utobject.c | 2 +- + drivers/acpi/acpica/utosi.c | 2 +- + drivers/acpi/acpica/utpredef.c | 2 +- + drivers/acpi/acpica/utprint.c | 2 +- + drivers/acpi/acpica/uttrack.c | 14 +- + drivers/acpi/acpica/utuuid.c | 2 +- + drivers/acpi/acpica/utxface.c | 2 +- + drivers/acpi/acpica/utxferror.c | 44 ++ + drivers/acpi/acpica/utxfinit.c | 2 +- + drivers/acpi/apei/einj.c | 17 +- + drivers/acpi/apei/erst.c | 27 +- + drivers/acpi/apei/hest.c | 6 + + drivers/acpi/bus.c | 24 +- + drivers/acpi/internal.h | 4 + + drivers/acpi/tables.c | 12 +- + drivers/ata/Kconfig | 2 +- + drivers/base/power/clock_ops.c | 13 +- + drivers/base/power/runtime.c | 45 ++- + drivers/base/power/sysfs.c | 11 +- + drivers/cpufreq/cpufreq.c | 2 - + drivers/cpufreq/e_powersaver.c | 5 +- + drivers/cpuidle/Kconfig | 11 +- + drivers/cpuidle/governors/Makefile | 1 + + drivers/cpuidle/governors/teo.c | 444 +++++++++++++++++++++ + drivers/gpu/drm/i915/i915_pmu.c | 16 +- + drivers/gpu/drm/i915/i915_pmu.h | 4 +- + drivers/gpu/vga/Kconfig | 1 + + drivers/platform/x86/Kconfig | 6 +- + drivers/thermal/intel/int340x_thermal/Kconfig | 2 +- + include/acpi/acbuffer.h | 2 +- + include/acpi/acconfig.h | 2 +- + include/acpi/acexcep.h | 2 +- + include/acpi/acnames.h | 2 +- + include/acpi/acoutput.h | 4 +- + include/acpi/acpi.h | 2 +- + include/acpi/acpiosxf.h | 2 +- + include/acpi/acpixf.h | 10 +- + include/acpi/acrestyp.h | 2 +- + include/acpi/actbl.h | 2 +- + include/acpi/actbl1.h | 2 +- + include/acpi/actbl2.h | 2 +- + include/acpi/actbl3.h | 2 +- + include/acpi/actypes.h | 2 +- + include/acpi/acuuid.h | 2 +- + include/acpi/platform/acenv.h | 2 +- + include/acpi/platform/acenvex.h | 2 +- + include/acpi/platform/acgcc.h | 2 +- + include/acpi/platform/acgccex.h | 2 +- + include/acpi/platform/acintel.h | 2 +- + include/acpi/platform/aclinux.h | 2 +- + include/acpi/platform/aclinuxex.h | 2 +- + include/linux/cpuidle.h | 8 +- + include/linux/initrd.h | 3 + + include/linux/pm.h | 6 +- + include/linux/pm_runtime.h | 2 + + tools/power/acpi/common/cmfsize.c | 2 +- + tools/power/acpi/common/getopt.c | 2 +- + .../acpi/os_specific/service_layers/oslinuxtbl.c | 2 +- + .../acpi/os_specific/service_layers/osunixdir.c | 2 +- + .../acpi/os_specific/service_layers/osunixmap.c | 2 +- + .../acpi/os_specific/service_layers/osunixxf.c | 2 +- + tools/power/acpi/tools/acpidump/acpidump.h | 2 +- + tools/power/acpi/tools/acpidump/apdump.c | 2 +- + tools/power/acpi/tools/acpidump/apfiles.c | 2 +- + tools/power/acpi/tools/acpidump/apmain.c | 2 +- + 209 files changed, 1239 insertions(+), 361 deletions(-) + delete mode 100644 Documentation/cpuidle/driver.txt + delete mode 100644 Documentation/cpuidle/governor.txt + create mode 100644 Documentation/driver-api/pm/cpuidle.rst + create mode 100644 drivers/cpuidle/governors/teo.c +Merging cpufreq-arm/cpufreq/arm/linux-next (d4990efa8c5f cpufreq: qcom-hw: Move to device_initcall) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Merge made by the 'recursive' strategy. + drivers/cpufreq/qcom-cpufreq-hw.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging cpupower/cpupower (bfeffd155283 Linux 5.0-rc1) +$ 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 (24ef9ec891c7 thermal/intel: fixup for Kconfig string parsing tightening up) +$ git merge thermal/next +Already up to date. +Merging thermal-soc/next (9d216211fded thermal: generic-adc: Fix adc to temp interpolation) +$ git merge thermal-soc/next +Already up to date. +Merging ieee1394/for-next (c820518f6ca1 firewire: Remove depends on HAS_DMA in case of platform dependency) +$ git merge ieee1394/for-next +Already up to date. +Merging dlm/next (3595c559326d dlm: fix invalid cluster name warning) +$ git merge dlm/next +Already up to date. +Merging swiotlb/linux-next (227a76b64718 swiotlb: clear io_tlb_start and io_tlb_end in swiotlb_exit) +$ git merge swiotlb/linux-next +Already up to date. +Merging rdma/for-next (5fc01fb846bc RDMA/cma: Rollback source IP address if failing to acquire device) +$ git merge rdma/for-next +Auto-merging drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c +Auto-merging drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c +Auto-merging drivers/infiniband/hw/qedr/verbs.c +Auto-merging drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +Auto-merging drivers/infiniband/hw/mthca/mthca_provider.c +Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v2.c +Auto-merging drivers/infiniband/hw/cxgb4/qp.c +Auto-merging drivers/infiniband/hw/bnxt_re/qplib_rcfw.c +Auto-merging drivers/infiniband/core/uverbs_main.c +Auto-merging drivers/infiniband/core/uverbs_cmd.c +Auto-merging drivers/infiniband/core/cma.c +Merge made by the 'recursive' strategy. + drivers/infiniband/Kconfig | 15 +++--- + drivers/infiniband/core/Makefile | 4 +- + drivers/infiniband/core/cm.c | 3 +- + drivers/infiniband/core/cma.c | 13 ++++- + drivers/infiniband/core/core_priv.h | 4 +- + drivers/infiniband/core/device.c | 9 ++-- + drivers/infiniband/core/sa_query.c | 4 +- + drivers/infiniband/core/sysfs.c | 28 +++++----- + drivers/infiniband/core/umem.c | 9 +++- + drivers/infiniband/core/uverbs_cmd.c | 5 -- + drivers/infiniband/core/uverbs_main.c | 24 +++++++++ + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 13 ++--- + drivers/infiniband/hw/bnxt_re/main.c | 8 +-- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 3 +- + drivers/infiniband/hw/cxgb3/iwch_provider.c | 18 ++++--- + drivers/infiniband/hw/cxgb4/mem.c | 2 +- + drivers/infiniband/hw/cxgb4/provider.c | 16 +++--- + drivers/infiniband/hw/cxgb4/qp.c | 19 ++++--- + drivers/infiniband/hw/hfi1/sysfs.c | 16 +++--- + drivers/infiniband/hw/hfi1/verbs.c | 2 +- + drivers/infiniband/hw/hns/Kconfig | 1 - + drivers/infiniband/hw/hns/hns_roce_cq.c | 9 ++-- + drivers/infiniband/hw/hns/hns_roce_db.c | 6 +-- + drivers/infiniband/hw/hns/hns_roce_device.h | 3 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 26 +++++++--- + drivers/infiniband/hw/hns/hns_roce_main.c | 4 +- + drivers/infiniband/hw/hns/hns_roce_mr.c | 7 ++- + drivers/infiniband/hw/hns/hns_roce_pd.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_qp.c | 16 +++--- + drivers/infiniband/hw/hns/hns_roce_srq.c | 7 ++- + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 9 ++-- + drivers/infiniband/hw/mlx4/Kconfig | 1 - + drivers/infiniband/hw/mlx4/cq.c | 19 ++++--- + drivers/infiniband/hw/mlx4/doorbell.c | 6 +-- + drivers/infiniband/hw/mlx4/main.c | 9 ++-- + drivers/infiniband/hw/mlx4/mlx4_ib.h | 3 +- + drivers/infiniband/hw/mlx4/mr.c | 11 ++-- + drivers/infiniband/hw/mlx4/qp.c | 14 +++-- + drivers/infiniband/hw/mlx4/srq.c | 5 +- + drivers/infiniband/hw/mlx5/Kconfig | 1 - + drivers/infiniband/hw/mlx5/cq.c | 11 ++-- + drivers/infiniband/hw/mlx5/devx.c | 2 +- + drivers/infiniband/hw/mlx5/doorbell.c | 6 +-- + drivers/infiniband/hw/mlx5/main.c | 68 +++++++++++++------------ + drivers/infiniband/hw/mlx5/mem.c | 5 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 16 ++++-- + drivers/infiniband/hw/mlx5/mr.c | 63 ++++++++++------------- + drivers/infiniband/hw/mlx5/odp.c | 10 ++-- + drivers/infiniband/hw/mlx5/qp.c | 40 +++++++-------- + drivers/infiniband/hw/mlx5/srq.c | 5 +- + drivers/infiniband/hw/mthca/mthca_provider.c | 19 ++++--- + drivers/infiniband/hw/nes/Kconfig | 2 +- + drivers/infiniband/hw/nes/nes_verbs.c | 6 +-- + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 8 +-- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 4 +- + drivers/infiniband/hw/qedr/main.c | 5 +- + drivers/infiniband/hw/qedr/verbs.c | 35 +++++++------ + drivers/infiniband/hw/qib/qib_sysfs.c | 18 +++---- + drivers/infiniband/hw/qib/qib_verbs.c | 2 +- + drivers/infiniband/hw/usnic/usnic_ib_main.c | 2 +- + drivers/infiniband/hw/usnic/usnic_ib_sysfs.c | 26 ++++------ + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 4 +- + drivers/infiniband/hw/usnic/usnic_uiom.c | 5 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c | 2 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 2 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_mr.c | 3 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c | 6 +-- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c | 4 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c | 4 +- + drivers/infiniband/sw/rdmavt/mr.c | 3 +- + drivers/infiniband/sw/rdmavt/pd.c | 2 +- + drivers/infiniband/sw/rdmavt/vt.c | 7 ++- + drivers/infiniband/sw/rxe/rxe_mr.c | 2 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 6 +-- + drivers/infiniband/ulp/srp/ib_srp.c | 3 +- + include/linux/mlx5/driver.h | 4 -- + include/rdma/ib_umem.h | 8 +-- + include/rdma/ib_umem_odp.h | 26 +++++----- + include/rdma/ib_verbs.h | 36 +++++++++++-- + include/rdma/rdma_vt.h | 3 -- + 80 files changed, 452 insertions(+), 405 deletions(-) +Merging net-next/master (22c2ad616b74 net: add a route cache full diagnostic message) +$ git merge net-next/master +Auto-merging include/linux/phy.h +Auto-merging drivers/net/phy/phy_device.c +Auto-merging drivers/net/phy/phy.c +Auto-merging drivers/net/phy/micrel.c +Auto-merging drivers/net/ethernet/intel/igb/igb_main.c +Auto-merging MAINTAINERS +Auto-merging Documentation/networking/snmp_counter.rst +CONFLICT (content): Merge conflict in Documentation/networking/snmp_counter.rst +Resolved 'Documentation/networking/snmp_counter.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ed57ffd4472b] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/net/dsa/ksz.txt | 102 ++-- + Documentation/networking/dsa/dsa.txt | 13 - + Documentation/networking/snmp_counter.rst | 123 +++- + Documentation/networking/switchdev.txt | 2 +- + MAINTAINERS | 1 + + arch/alpha/include/uapi/asm/socket.h | 2 + + arch/arm/mach-orion5x/common.c | 2 +- + arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 2 +- + arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 2 +- + arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 2 +- + arch/arm/mach-orion5x/wnr854t-setup.c | 2 +- + arch/arm/mach-orion5x/wrt350n-v2-setup.c | 2 +- + arch/arm/plat-orion/common.c | 2 +- + arch/ia64/include/uapi/asm/socket.h | 2 + + arch/mips/include/uapi/asm/socket.h | 2 + + arch/parisc/include/uapi/asm/socket.h | 2 + + arch/s390/include/uapi/asm/socket.h | 2 + + arch/sparc/include/uapi/asm/socket.h | 2 + + arch/xtensa/include/uapi/asm/socket.h | 2 + + drivers/net/dsa/lantiq_gswip.c | 24 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 176 +++--- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 12 +- + drivers/net/ethernet/chelsio/cxgb4/l2t.c | 2 +- + drivers/net/ethernet/davicom/dm9000.c | 1 + + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 68 +-- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 5 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c | 13 + + drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h | 3 + + drivers/net/ethernet/huawei/hinic/hinic_hw_if.c | 28 + + drivers/net/ethernet/huawei/hinic/hinic_hw_if.h | 14 + + drivers/net/ethernet/huawei/hinic/hinic_rx.c | 11 +- + drivers/net/ethernet/huawei/hinic/hinic_tx.c | 8 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 3 +- + drivers/net/ethernet/intel/ice/ice.h | 16 + + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 77 ++- + drivers/net/ethernet/intel/ice/ice_common.c | 160 ++++- + drivers/net/ethernet/intel/ice/ice_common.h | 11 +- + drivers/net/ethernet/intel/ice/ice_ethtool.c | 680 ++++++++++++++++++++- + drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 1 + + drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 3 + + drivers/net/ethernet/intel/ice/ice_lib.c | 266 ++++---- + drivers/net/ethernet/intel/ice/ice_lib.h | 5 +- + drivers/net/ethernet/intel/ice/ice_main.c | 135 +++- + drivers/net/ethernet/intel/ice/ice_nvm.c | 81 +++ + drivers/net/ethernet/intel/ice/ice_sched.c | 156 ++--- + drivers/net/ethernet/intel/ice/ice_sched.h | 2 + + drivers/net/ethernet/intel/ice/ice_sriov.c | 9 + + drivers/net/ethernet/intel/ice/ice_txrx.c | 71 ++- + drivers/net/ethernet/intel/ice/ice_txrx.h | 32 +- + drivers/net/ethernet/intel/ice/ice_type.h | 4 +- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 24 +- + drivers/net/ethernet/intel/igb/igb_main.c | 3 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 3 +- + .../mellanox/mlxsw/spectrum_acl_bloom_filter.c | 4 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c | 10 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.h | 3 +- + .../ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c | 6 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 6 +- + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 37 +- + drivers/net/ethernet/mscc/ocelot.c | 3 +- + drivers/net/ethernet/netronome/nfp/flower/cmsg.c | 2 +- + drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 3 + + drivers/net/ethernet/netronome/nfp/flower/main.c | 109 +++- + drivers/net/ethernet/netronome/nfp/flower/main.h | 89 ++- + drivers/net/ethernet/netronome/nfp/flower/match.c | 3 - + .../net/ethernet/netronome/nfp/flower/metadata.c | 27 +- + .../ethernet/netronome/nfp/flower/tunnel_conf.c | 612 ++++++++++++------- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 3 +- + drivers/net/ethernet/realtek/atp.c | 27 +- + drivers/net/ethernet/rocker/rocker_main.c | 2 +- + drivers/net/ethernet/rocker/rocker_ofdpa.c | 4 +- + drivers/net/ethernet/sfc/ef10.c | 14 +- + drivers/net/ethernet/sfc/mcdi.c | 56 +- + drivers/net/ethernet/sfc/mtd.c | 3 + + drivers/net/ethernet/sun/sungem.c | 2 +- + drivers/net/macvlan.c | 3 +- + drivers/net/phy/mdio_bus.c | 2 - + drivers/net/phy/micrel.c | 43 +- + drivers/net/phy/phy.c | 7 +- + drivers/net/phy/phy_device.c | 83 ++- + drivers/net/vxlan.c | 352 ++++++----- + drivers/net/wan/dscc4.c | 50 +- + include/linux/netdevice.h | 6 +- + include/linux/phy.h | 3 + + include/linux/platform_data/b53.h | 2 +- + include/linux/platform_data/dsa.h | 68 +++ + include/linux/platform_data/mv88e6xxx.h | 2 +- + include/net/dsa.h | 66 +- + include/net/switchdev.h | 6 +- + include/net/tls.h | 3 +- + include/net/vxlan.h | 6 +- + include/uapi/asm-generic/socket.h | 2 + + net/bridge/br_fdb.c | 3 +- + net/bridge/br_private.h | 3 +- + net/bridge/br_switchdev.c | 2 +- + net/core/dst.c | 6 +- + net/core/rtnetlink.c | 5 +- + net/core/skmsg.c | 25 +- + net/core/sock.c | 46 +- + net/decnet/dn_fib.c | 2 +- + net/dsa/dsa_priv.h | 3 +- + net/dsa/master.c | 56 +- + net/dsa/slave.c | 5 +- + net/ipv4/tcp_output.c | 47 +- + net/ipv4/tcp_timer.c | 83 ++- + net/ipv4/udp_tunnel.c | 15 +- + net/ipv6/ip6_udp_tunnel.c | 15 +- + net/openvswitch/meter.c | 3 +- + net/switchdev/switchdev.c | 5 +- + net/tls/tls_sw.c | 280 ++++++--- + net/vmw_vsock/af_vsock.c | 2 +- + .../selftests/drivers/net/mlxsw/vxlan_fdb_veto.sh | 126 ++++ + tools/testing/selftests/net/tls.c | 12 +- + 115 files changed, 3472 insertions(+), 1381 deletions(-) + create mode 100644 include/linux/platform_data/dsa.h + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/vxlan_fdb_veto.sh +Merging bpf-next/master (d0b2818efbe2 bpf: fix a (false) compiler warning) +$ git merge bpf-next/master +Auto-merging kernel/bpf/btf.c +Merge made by the 'recursive' strategy. + kernel/bpf/btf.c | 104 +++++++-- + kernel/bpf/verifier.c | 3 +- + tools/bpf/bpftool/Documentation/bpftool-map.rst | 28 ++- + tools/bpf/bpftool/bash-completion/bpftool | 91 ++++++-- + tools/bpf/bpftool/btf_dumper.c | 98 +++++++- + tools/bpf/bpftool/map.c | 225 +++++++++++++------ + tools/lib/bpf/Makefile | 17 +- + tools/testing/selftests/bpf/test_btf.c | 284 +++++++++++++++++++++--- + 8 files changed, 675 insertions(+), 175 deletions(-) +Merging ipsec-next/master (590ce401c207 dt-bindings: net: dsa: ksz9477: fix indentation for switch spi bindings) +$ git merge ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (73f5a82bb3c9 RDMA/mad: Reduce MAD scope to mlx5_ib only) +$ git merge mlx5-next/mlx5-next +Auto-merging include/linux/mlx5/driver.h +Removing drivers/net/ethernet/mellanox/mlx5/core/mad.c +Auto-merging drivers/infiniband/hw/mlx5/mlx5_ib.h +Merge made by the 'recursive' strategy. + drivers/infiniband/hw/mlx5/cmd.c | 37 ++++++++++++ + drivers/infiniband/hw/mlx5/cmd.h | 2 + + drivers/infiniband/hw/mlx5/mad.c | 11 ++-- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 3 - + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/mad.c | 75 ------------------------ + include/linux/mlx5/driver.h | 2 - + 7 files changed, 47 insertions(+), 85 deletions(-) + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/mad.c +Merging netfilter-next/master (9dde6da51297 Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue) +$ 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 (4ad0be160544 brcmfmac: Use firmware_request_nowarn for the clm_blob) +$ git merge wireless-drivers-next/master +Merge made by the 'recursive' strategy. + drivers/bcma/bcma_private.h | 9 +- + drivers/bcma/driver_gpio.c | 2 +- + drivers/bcma/host_pci.c | 2 + + drivers/bcma/host_soc.c | 4 +- + drivers/bcma/main.c | 45 ++----- + .../wireless/broadcom/brcm80211/brcmfmac/common.c | 2 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/dmi.c | 15 +++ + .../net/wireless/broadcom/brcm80211/brcmfmac/pno.c | 5 + + .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 6 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 13 +- + drivers/net/wireless/ray_cs.c | 2 +- + drivers/net/wireless/rsi/rsi_91x_hal.c | 3 + + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 67 +++++++++++ + drivers/net/wireless/rsi/rsi_91x_main.c | 1 + + drivers/net/wireless/rsi/rsi_91x_mgmt.c | 133 +++++++++++++++++++++ + drivers/net/wireless/rsi/rsi_main.h | 22 ++++ + drivers/net/wireless/rsi/rsi_mgmt.h | 35 ++++++ + drivers/net/wireless/st/cw1200/queue.c | 1 - + drivers/net/wireless/st/cw1200/scan.c | 5 +- + drivers/net/wireless/ti/wlcore/main.c | 7 +- + include/linux/bcma/bcma.h | 11 +- + 21 files changed, 321 insertions(+), 69 deletions(-) +Merging bluetooth/master (44543f1dd2a3 Documentation: networking: dsa: Update documentation) +$ 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 (2431c4f5b46c mtd: Implement mtd_{read,write}() as wrappers around mtd_{read,write}_oob()) +$ git merge mtd/mtd/next +Auto-merging drivers/mtd/mtdcore.c +Merge made by the 'recursive' strategy. + drivers/mtd/chips/cfi_cmdset_0001.c | 3 +- + drivers/mtd/chips/gen_probe.c | 2 +- + drivers/mtd/devices/mtdram.c | 2 - + drivers/mtd/lpddr/qinfo_probe.c | 4 +- + drivers/mtd/mtdcore.c | 75 ++++++++++++------------------------- + 5 files changed, 29 insertions(+), 57 deletions(-) +Merging nand/nand/next (9f952302802f mtd: rawnand: Simplify the locking) +$ git merge nand/nand/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/stm32-fmc2-nand.txt | 61 + + drivers/mtd/nand/raw/Kconfig | 9 + + drivers/mtd/nand/raw/Makefile | 1 + + drivers/mtd/nand/raw/denali_dt.c | 27 +- + drivers/mtd/nand/raw/marvell_nand.c | 5 +- + drivers/mtd/nand/raw/mtk_nand.c | 3 +- + drivers/mtd/nand/raw/nand_base.c | 111 +- + drivers/mtd/nand/raw/omap2.c | 20 +- + drivers/mtd/nand/raw/r852.c | 3 +- + drivers/mtd/nand/raw/stm32_fmc2_nand.c | 2073 ++++++++++++++++++++ + drivers/mtd/nand/raw/sunxi_nand.c | 732 +++---- + drivers/mtd/nand/raw/tmio_nand.c | 21 +- + drivers/mtd/nand/spi/core.c | 231 ++- + drivers/mtd/nand/spi/macronix.c | 8 +- + include/linux/mtd/rawnand.h | 24 +- + include/linux/mtd/spinand.h | 7 + + 16 files changed, 2759 insertions(+), 577 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/stm32-fmc2-nand.txt + create mode 100644 drivers/mtd/nand/raw/stm32_fmc2_nand.c +Merging spi-nor/spi-nor/next (6f79a594afda MAINTAINERS: add myself as SPI NOR co-maintainer) +$ git merge spi-nor/spi-nor/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + 1 file changed, 1 insertion(+) +Merging crypto/master (6b476662b09c crypto: algapi - reject NULL crypto_spawn::inst) +$ git merge crypto/master +Auto-merging drivers/crypto/amcc/crypto4xx_core.c +Merge made by the 'recursive' strategy. + crypto/Kconfig | 4 +- + crypto/algapi.c | 36 +---- + crypto/arc4.c | 82 ++++++------ + crypto/cbc.c | 131 ++----------------- + crypto/cfb.c | 139 +++----------------- + crypto/crypto_null.c | 57 ++++---- + crypto/ctr.c | 160 ++++++----------------- + crypto/ecb.c | 151 +++++---------------- + crypto/keywrap.c | 198 ++++++++++------------------ + crypto/ofb.c | 202 ++++++----------------------- + crypto/pcbc.c | 143 +++----------------- + crypto/skcipher.c | 131 +++++++++++++++++++ + crypto/testmgr.h | 53 +++++++- + drivers/crypto/amcc/crypto4xx_core.c | 87 +++++++++++++ + drivers/crypto/amcc/crypto4xx_core.h | 4 + + drivers/crypto/amcc/crypto4xx_reg_def.h | 1 + + drivers/crypto/caam/caamalg_qi2.c | 7 - + drivers/crypto/caam/caamhash.c | 199 +++++++++++++++++++++++++--- + drivers/crypto/caam/caamhash_desc.c | 58 ++++++++- + drivers/crypto/caam/caamhash_desc.h | 2 + + drivers/crypto/caam/ctrl.c | 4 - + drivers/crypto/caam/error.c | 6 + + drivers/crypto/ccp/ccp-crypto-aes-cmac.c | 2 +- + drivers/crypto/ccp/ccp-crypto-sha.c | 2 +- + drivers/crypto/ccp/ccp-ops.c | 2 +- + drivers/crypto/ccp/psp-dev.c | 2 +- + drivers/crypto/ccp/psp-dev.h | 2 +- + drivers/crypto/ccp/sp-dev.c | 2 +- + drivers/crypto/ccp/sp-dev.h | 2 +- + drivers/crypto/ccp/sp-pci.c | 2 +- + drivers/crypto/ccp/sp-platform.c | 2 +- + drivers/crypto/chelsio/chcr_algo.c | 8 +- + drivers/crypto/chelsio/chtls/chtls_io.c | 12 +- + drivers/crypto/ux500/cryp/cryp_core.c | 6 + + drivers/crypto/virtio/virtio_crypto_algs.c | 2 +- + include/crypto/algapi.h | 6 +- + include/crypto/internal/hash.h | 6 +- + include/crypto/internal/skcipher.h | 15 +++ + include/linux/crypto.h | 8 -- + 39 files changed, 872 insertions(+), 1064 deletions(-) +Merging drm/drm-next (b122153c7198 Merge tag 'du-next-20190114' of git://linuxtv.org/pinchartl/media into drm-next) +$ git merge drm/drm-next +Auto-merging include/drm/drm_dp_mst_helper.h +Auto-merging drivers/gpu/drm/virtio/virtgpu_drv.h +Auto-merging drivers/gpu/drm/virtio/virtgpu_drv.c +Auto-merging drivers/gpu/drm/i915/intel_lrc.c +Auto-merging drivers/gpu/drm/drm_mode_object.c +Auto-merging drivers/gpu/drm/bridge/tc358767.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/display/bridge/renesas,lvds.txt | 3 +- + .../devicetree/bindings/display/renesas,du.txt | 2 + + Documentation/gpu/todo.rst | 3 - + MAINTAINERS | 2 +- + drivers/dma-buf/dma-buf.c | 12 +- + drivers/dma-buf/dma-fence.c | 2 +- + drivers/dma-buf/sw_sync.c | 2 +- + drivers/dma-buf/sync_debug.c | 16 +- + drivers/dma-buf/sync_file.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 9 - + drivers/gpu/drm/ast/ast_fb.c | 2 - + drivers/gpu/drm/ati_pcigart.c | 7 +- + drivers/gpu/drm/bochs/bochs_hw.c | 7 + + drivers/gpu/drm/bridge/adv7511/adv7511.h | 4 +- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 8 +- + drivers/gpu/drm/bridge/adv7511/adv7533.c | 2 +- + drivers/gpu/drm/bridge/analogix-anx78xx.c | 4 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 +- + drivers/gpu/drm/bridge/sii902x.c | 4 +- + .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 5 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 4 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 18 +- + drivers/gpu/drm/bridge/tc358767.c | 9 +- + drivers/gpu/drm/drm_atomic.c | 19 +- + drivers/gpu/drm/drm_bridge.c | 4 +- + drivers/gpu/drm/drm_bufs.c | 11 ++ + drivers/gpu/drm/drm_connector.c | 91 +++++++--- + drivers/gpu/drm/drm_context.c | 15 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 109 +++++++----- + drivers/gpu/drm/drm_drv.c | 1 - + drivers/gpu/drm/drm_internal.h | 2 + + drivers/gpu/drm/drm_lease.c | 6 +- + drivers/gpu/drm/drm_mode_config.c | 5 +- + drivers/gpu/drm/drm_mode_object.c | 9 +- + drivers/gpu/drm/drm_modeset_lock.c | 8 + + drivers/gpu/drm/drm_syncobj.c | 91 ++++------ + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_mic.c | 4 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 6 +- + drivers/gpu/drm/i915/i915_gem.c | 4 +- + drivers/gpu/drm/i915/i915_gem_context.c | 8 +- + drivers/gpu/drm/i915/i915_request.c | 12 +- + drivers/gpu/drm/i915/i915_sw_fence.c | 2 +- + drivers/gpu/drm/i915/intel_dp_mst.c | 10 -- + drivers/gpu/drm/i915/intel_engine_cs.c | 2 +- + drivers/gpu/drm/i915/intel_lrc.c | 6 +- + drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 14 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 4 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 2 +- + drivers/gpu/drm/msm/dsi/dsi.h | 2 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 2 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 4 +- + drivers/gpu/drm/msm/edp/edp_bridge.c | 4 +- + drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 4 +- + drivers/gpu/drm/msm/msm_gem.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 8 - + drivers/gpu/drm/qxl/qxl_display.c | 1 - + drivers/gpu/drm/r128/r128_cce.c | 5 +- + drivers/gpu/drm/radeon/radeon_dp_mst.c | 9 - + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 43 +++-- + drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 8 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 42 +++-- + drivers/gpu/drm/rcar-du/rcar_du_drv.h | 9 +- + drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 11 -- + drivers/gpu/drm/rcar-du/rcar_du_encoder.h | 2 - + drivers/gpu/drm/rcar-du/rcar_du_group.c | 51 +++++- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 23 ++- + .../gpu/drm/rcar-du/rcar_du_of_lvds_r8a7790.dts | 93 +++++----- + .../gpu/drm/rcar-du/rcar_du_of_lvds_r8a7791.dts | 53 +++--- + .../gpu/drm/rcar-du/rcar_du_of_lvds_r8a7793.dts | 53 +++--- + .../gpu/drm/rcar-du/rcar_du_of_lvds_r8a7795.dts | 53 +++--- + .../gpu/drm/rcar-du/rcar_du_of_lvds_r8a7796.dts | 53 +++--- + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 1 - + drivers/gpu/drm/rcar-du/rcar_du_plane.h | 3 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 1 - + drivers/gpu/drm/rcar-du/rcar_du_vsp.h | 3 +- + drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c | 15 ++ + drivers/gpu/drm/rcar-du/rcar_lvds.c | 5 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 2 + + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 4 +- + drivers/gpu/drm/sti/sti_dvo.c | 4 +- + drivers/gpu/drm/sti/sti_hda.c | 4 +- + drivers/gpu/drm/sti/sti_hdmi.c | 4 +- + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 2 +- + drivers/gpu/drm/tegra/hub.c | 2 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 34 ++-- + drivers/gpu/drm/v3d/v3d_drv.h | 1 - + drivers/gpu/drm/v3d/v3d_gem.c | 60 ++----- + drivers/gpu/drm/vc4/vc4_crtc.c | 43 +++++ + drivers/gpu/drm/vc4/vc4_drv.h | 3 + + drivers/gpu/drm/vc4/vc4_hdmi.c | 16 ++ + drivers/gpu/drm/vc4/vc4_kms.c | 3 +- + drivers/gpu/drm/vc4/vc4_plane.c | 128 ++++++++++++-- + drivers/gpu/drm/vgem/vgem_fence.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 1 - + drivers/gpu/drm/virtio/virtgpu_drv.c | 9 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 14 -- + drivers/gpu/drm/virtio/virtgpu_fb.c | 191 --------------------- + drivers/gpu/drm/virtio/virtgpu_kms.c | 8 - + drivers/gpu/drm/vkms/vkms_drv.c | 1 + + drivers/gpu/drm/xen/xen_drm_front_conn.c | 1 - + include/drm/bridge/dw_mipi_dsi.h | 3 +- + include/drm/drmP.h | 2 - + include/drm/drm_atomic.h | 37 +++- + include/drm/drm_bridge.h | 8 +- + include/drm/drm_connector.h | 4 +- + include/drm/drm_dp_mst_helper.h | 2 - + include/drm/drm_file.h | 1 + + include/drm/drm_hdcp.h | 2 + + include/drm/drm_legacy.h | 14 +- + include/drm/drm_mode_config.h | 23 ++- + include/drm/drm_syncobj.h | 23 +-- + include/drm/intel-gtt.h | 3 + + include/linux/dma-fence.h | 22 ++- + include/uapi/drm/v3d_drm.h | 8 + + 118 files changed, 941 insertions(+), 900 deletions(-) +Merging drm-intel/for-linux-next (1b4bd5c4a663 drm/i915: Limit the for_each_set_bit() to the valid range) +$ git merge drm-intel/for-linux-next +Auto-merging include/drm/drm_dp_helper.h +Auto-merging drivers/gpu/drm/i915/selftests/intel_hangcheck.c +Auto-merging drivers/gpu/drm/i915/intel_psr.c +Auto-merging drivers/gpu/drm/i915/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/intel_engine_cs.c +Auto-merging drivers/gpu/drm/i915/intel_dp_mst.c +Auto-merging drivers/gpu/drm/i915/i915_sysfs.c +Auto-merging drivers/gpu/drm/i915/i915_request.c +Auto-merging drivers/gpu/drm/i915/i915_pmu.c +Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c +Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c +Auto-merging drivers/gpu/drm/i915/i915_gem_context.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_debugfs.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_debugfs.c +Auto-merging drivers/gpu/drm/i915/gvt/scheduler.c +Auto-merging drivers/acpi/pmic/intel_pmic_xpower.c +Resolved 'drivers/gpu/drm/i915/i915_debugfs.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_gem.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 79d79c32e6bb] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + drivers/acpi/pmic/intel_pmic.c | 61 + + drivers/acpi/pmic/intel_pmic.h | 4 + + drivers/acpi/pmic/intel_pmic_chtwc.c | 19 + + drivers/acpi/pmic/intel_pmic_xpower.c | 1 + + drivers/gpu/drm/i915/Kconfig.debug | 3 +- + drivers/gpu/drm/i915/Makefile | 5 +- + drivers/gpu/drm/i915/dvo.h | 1 - + drivers/gpu/drm/i915/gvt/aperture_gm.c | 8 +- + drivers/gpu/drm/i915/gvt/gvt.h | 2 +- + drivers/gpu/drm/i915/gvt/sched_policy.c | 2 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 4 +- + drivers/gpu/drm/i915/gvt/vgpu.c | 4 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 2 +- + drivers/gpu/drm/i915/i915_debugfs.c | 762 +++++------ + drivers/gpu/drm/i915/i915_drv.c | 265 +--- + drivers/gpu/drm/i915/i915_drv.h | 320 ++--- + drivers/gpu/drm/i915/i915_gem.c | 752 ++--------- + drivers/gpu/drm/i915/i915_gem_context.c | 3 +- + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 1 - + drivers/gpu/drm/i915/i915_gem_evict.c | 1 - + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 10 +- + drivers/gpu/drm/i915/i915_gem_fence_reg.c | 25 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 194 +-- + drivers/gpu/drm/i915/i915_gem_gtt.h | 4 +- + drivers/gpu/drm/i915/i915_gem_internal.c | 1 - + drivers/gpu/drm/i915/i915_gem_object.h | 10 +- + drivers/gpu/drm/i915/i915_gem_shrinker.c | 163 +-- + drivers/gpu/drm/i915/i915_gem_stolen.c | 8 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 5 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 225 ++-- + drivers/gpu/drm/i915/i915_gpu_error.c | 63 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 5 +- + drivers/gpu/drm/i915/i915_ioc32.c | 1 - + drivers/gpu/drm/i915/i915_irq.c | 359 +---- + drivers/gpu/drm/i915/i915_params.c | 32 +- + drivers/gpu/drm/i915/i915_params.h | 11 + + drivers/gpu/drm/i915/i915_pci.c | 6 +- + drivers/gpu/drm/i915/i915_perf.c | 20 +- + drivers/gpu/drm/i915/i915_pmu.c | 23 +- + drivers/gpu/drm/i915/i915_query.c | 2 +- + drivers/gpu/drm/i915/i915_reg.h | 240 ++-- + drivers/gpu/drm/i915/i915_request.c | 209 +-- + drivers/gpu/drm/i915/i915_request.h | 1 - + drivers/gpu/drm/i915/i915_reset.c | 1389 ++++++++++++++++++++ + drivers/gpu/drm/i915/i915_reset.h | 56 + + drivers/gpu/drm/i915/i915_suspend.c | 13 +- + drivers/gpu/drm/i915/i915_sysfs.c | 27 +- + drivers/gpu/drm/i915/i915_timeline.h | 8 - + drivers/gpu/drm/i915/i915_trace.h | 30 - + drivers/gpu/drm/i915/icl_dsi.c | 44 +- + drivers/gpu/drm/i915/intel_acpi.c | 1 - + drivers/gpu/drm/i915/intel_atomic.c | 7 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 5 +- + drivers/gpu/drm/i915/intel_audio.c | 6 +- + drivers/gpu/drm/i915/intel_bios.c | 23 +- + drivers/gpu/drm/i915/intel_breadcrumbs.c | 26 - + drivers/gpu/drm/i915/intel_cdclk.c | 60 +- + drivers/gpu/drm/i915/intel_color.c | 218 ++- + drivers/gpu/drm/i915/intel_connector.c | 1 - + drivers/gpu/drm/i915/intel_crt.c | 89 +- + drivers/gpu/drm/i915/intel_csr.c | 25 +- + drivers/gpu/drm/i915/intel_ddi.c | 370 +++--- + drivers/gpu/drm/i915/intel_device_info.c | 107 +- + drivers/gpu/drm/i915/intel_device_info.h | 31 +- + drivers/gpu/drm/i915/intel_display.c | 293 +++-- + drivers/gpu/drm/i915/intel_display.h | 6 +- + drivers/gpu/drm/i915/intel_dp.c | 614 +++++---- + drivers/gpu/drm/i915/intel_dp_link_training.c | 32 +- + drivers/gpu/drm/i915/intel_dp_mst.c | 15 +- + drivers/gpu/drm/i915/intel_dpio_phy.c | 18 +- + drivers/gpu/drm/i915/intel_dpll_mgr.c | 205 +-- + drivers/gpu/drm/i915/intel_dpll_mgr.h | 53 +- + drivers/gpu/drm/i915/intel_drv.h | 123 +- + drivers/gpu/drm/i915/intel_dsi.h | 2 +- + drivers/gpu/drm/i915/intel_dsi_vbt.c | 24 +- + drivers/gpu/drm/i915/intel_dvo.c | 12 +- + drivers/gpu/drm/i915/intel_engine_cs.c | 168 +-- + drivers/gpu/drm/i915/intel_fbc.c | 33 +- + drivers/gpu/drm/i915/intel_fbdev.c | 10 +- + drivers/gpu/drm/i915/intel_fifo_underrun.c | 18 +- + drivers/gpu/drm/i915/intel_frontbuffer.c | 1 - + drivers/gpu/drm/i915/intel_guc.h | 3 + + drivers/gpu/drm/i915/intel_guc_fw.c | 6 +- + drivers/gpu/drm/i915/intel_guc_log.c | 29 +- + drivers/gpu/drm/i915/intel_guc_submission.c | 3 +- + drivers/gpu/drm/i915/intel_hangcheck.c | 168 +-- + drivers/gpu/drm/i915/intel_hdcp.c | 21 +- + drivers/gpu/drm/i915/intel_hdmi.c | 33 +- + drivers/gpu/drm/i915/intel_hotplug.c | 6 +- + drivers/gpu/drm/i915/intel_huc.c | 8 +- + drivers/gpu/drm/i915/intel_huc_fw.c | 7 +- + drivers/gpu/drm/i915/intel_i2c.c | 21 +- + drivers/gpu/drm/i915/intel_lrc.c | 309 +++-- + drivers/gpu/drm/i915/intel_lrc.h | 10 +- + drivers/gpu/drm/i915/intel_lspcon.c | 20 +- + drivers/gpu/drm/i915/intel_lvds.c | 25 +- + drivers/gpu/drm/i915/intel_mocs.c | 2 +- + drivers/gpu/drm/i915/intel_mocs.h | 1 - + drivers/gpu/drm/i915/intel_opregion.c | 1 - + drivers/gpu/drm/i915/intel_overlay.c | 11 +- + drivers/gpu/drm/i915/intel_panel.c | 27 +- + drivers/gpu/drm/i915/intel_pipe_crc.c | 32 +- + drivers/gpu/drm/i915/intel_pm.c | 916 ++++++------- + drivers/gpu/drm/i915/intel_psr.c | 75 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 505 ++++--- + drivers/gpu/drm/i915/intel_ringbuffer.h | 95 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 594 +++++++-- + drivers/gpu/drm/i915/intel_sdvo.c | 15 +- + drivers/gpu/drm/i915/intel_sprite.c | 91 +- + drivers/gpu/drm/i915/intel_tv.c | 9 +- + drivers/gpu/drm/i915/intel_uc.c | 15 +- + drivers/gpu/drm/i915/intel_uc.h | 6 +- + drivers/gpu/drm/i915/intel_uc_fw.c | 11 +- + drivers/gpu/drm/i915/intel_uncore.c | 508 +------ + drivers/gpu/drm/i915/intel_vdsc.c | 5 +- + drivers/gpu/drm/i915/intel_wopcm.c | 6 +- + drivers/gpu/drm/i915/intel_workarounds.c | 131 +- + drivers/gpu/drm/i915/selftests/huge_pages.c | 40 +- + drivers/gpu/drm/i915/selftests/i915_gem.c | 47 +- + .../gpu/drm/i915/selftests/i915_gem_coherency.c | 5 +- + drivers/gpu/drm/i915/selftests/i915_gem_context.c | 37 +- + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 18 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 10 +- + drivers/gpu/drm/i915/selftests/i915_gem_object.c | 22 +- + drivers/gpu/drm/i915/selftests/i915_request.c | 29 +- + drivers/gpu/drm/i915/selftests/igt_spinner.c | 86 +- + drivers/gpu/drm/i915/selftests/intel_guc.c | 10 +- + drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 327 ++++- + drivers/gpu/drm/i915/selftests/intel_lrc.c | 31 +- + drivers/gpu/drm/i915/selftests/intel_workarounds.c | 120 +- + drivers/gpu/drm/i915/selftests/mock_engine.c | 2 - + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 11 +- + drivers/gpu/drm/i915/selftests/mock_gtt.c | 6 +- + drivers/gpu/drm/i915/vlv_dsi.c | 29 +- + include/drm/drm_dp_helper.h | 4 + + include/linux/mfd/intel_soc_pmic.h | 3 + + 136 files changed, 6422 insertions(+), 6140 deletions(-) + create mode 100644 drivers/gpu/drm/i915/i915_reset.c + create mode 100644 drivers/gpu/drm/i915/i915_reset.h +Merging drm-tegra/drm/tegra/for-next (db5adf4d6dce drm/tegra: hdmi: Fix audio to work with any pixel clock rate) +$ git merge drm-tegra/drm/tegra/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/Makefile | 1 + + drivers/gpu/drm/tegra/drm.h | 2 +- + drivers/gpu/drm/tegra/hda.c | 63 ++++++++++++ + drivers/gpu/drm/tegra/hda.h | 20 ++++ + drivers/gpu/drm/tegra/hdmi.c | 217 ++++++++++++----------------------------- + drivers/gpu/drm/tegra/output.c | 11 ++- + drivers/gpu/drm/tegra/sor.c | 45 ++------- + 7 files changed, 169 insertions(+), 190 deletions(-) + create mode 100644 drivers/gpu/drm/tegra/hda.c + create mode 100644 drivers/gpu/drm/tegra/hda.h +Merging drm-misc/for-linux-next (bd59f2b153af drm/todo: Tick off some tinydrm entries) +$ git merge drm-misc/for-linux-next +Auto-merging include/drm/drm_dp_mst_helper.h +Auto-merging drivers/gpu/drm/virtio/virtgpu_drv.h +Auto-merging drivers/gpu/drm/virtio/virtgpu_drv.c +Removing drivers/gpu/drm/virtio/virtgpu_drm_bus.c +Auto-merging drivers/gpu/drm/tegra/sor.c +Auto-merging drivers/gpu/drm/tegra/hdmi.c +Auto-merging drivers/gpu/drm/sti/sti_hdmi.c +Auto-merging drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c +Auto-merging drivers/gpu/drm/msm/hdmi/hdmi_bridge.c +Auto-merging drivers/gpu/drm/msm/edp/edp_bridge.c +Auto-merging drivers/gpu/drm/msm/dsi/dsi_manager.c +Auto-merging drivers/gpu/drm/meson/meson_drv.c +Auto-merging drivers/gpu/drm/mediatek/mtk_hdmi.c +Auto-merging drivers/gpu/drm/i915/vlv_dsi.c +Auto-merging drivers/gpu/drm/i915/intel_tv.c +Auto-merging drivers/gpu/drm/i915/intel_sdvo.c +Auto-merging drivers/gpu/drm/i915/intel_lvds.c +Auto-merging drivers/gpu/drm/i915/intel_lspcon.c +Auto-merging drivers/gpu/drm/i915/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/intel_dvo.c +Auto-merging drivers/gpu/drm/i915/intel_drv.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/gpu/drm/i915/intel_dp_mst.c +Auto-merging drivers/gpu/drm/i915/intel_dp.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_dp.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/intel_crt.c +Auto-merging drivers/gpu/drm/i915/intel_connector.c +Auto-merging drivers/gpu/drm/i915/icl_dsi.c +Auto-merging drivers/gpu/drm/i915/i915_debugfs.c +Auto-merging drivers/gpu/drm/i2c/tda998x_drv.c +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/drm_dp_helper.c +Auto-merging drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +Auto-merging drivers/gpu/drm/bridge/sii902x.c +Auto-merging drivers/gpu/drm/bridge/analogix-anx78xx.c +Removing drivers/gpu/drm/bochs/bochs_fbdev.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging MAINTAINERS +Resolved 'drivers/gpu/drm/i915/intel_dp.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_drv.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2a5b55b697bb] Merge remote-tracking branch 'drm-misc/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + .../panel/{auo,g101evn010 => auo,g101evn010.txt} | 0 + .../bindings/display/rockchip/rockchip-vop.txt | 1 + + Documentation/gpu/dp-mst/topology-figure-1.dot | 52 ++ + Documentation/gpu/dp-mst/topology-figure-2.dot | 56 ++ + Documentation/gpu/dp-mst/topology-figure-3.dot | 59 ++ + Documentation/gpu/drm-internals.rst | 12 + + Documentation/gpu/drm-kms-helpers.rst | 30 +- + Documentation/gpu/todo.rst | 65 +- + MAINTAINERS | 17 + + drivers/gpu/drm/Kconfig | 4 - + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- + drivers/gpu/drm/amd/amdgpu/atom.c | 2 + + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 11 +- + drivers/gpu/drm/arc/arcpgu_crtc.c | 2 + + drivers/gpu/drm/arc/arcpgu_drv.c | 6 + + drivers/gpu/drm/arc/arcpgu_sim.c | 1 - + drivers/gpu/drm/armada/armada_crtc.c | 8 +- + drivers/gpu/drm/ast/ast_fb.c | 4 +- + drivers/gpu/drm/bochs/Makefile | 2 +- + drivers/gpu/drm/bochs/bochs.h | 23 +- + drivers/gpu/drm/bochs/bochs_drv.c | 35 +- + drivers/gpu/drm/bochs/bochs_fbdev.c | 163 ---- + drivers/gpu/drm/bochs/bochs_hw.c | 19 +- + drivers/gpu/drm/bochs/bochs_kms.c | 218 +++-- + drivers/gpu/drm/bochs/bochs_mm.c | 68 +- + drivers/gpu/drm/bridge/analogix-anx78xx.c | 5 +- + drivers/gpu/drm/bridge/panel.c | 22 +- + drivers/gpu/drm/bridge/sii902x.c | 3 +- + drivers/gpu/drm/bridge/sil-sii8620.c | 3 +- + .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 4 + + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 3 +- + drivers/gpu/drm/cirrus/cirrus_fbdev.c | 3 + + drivers/gpu/drm/drm_crtc.c | 41 - + drivers/gpu/drm/drm_crtc_helper.c | 58 +- + drivers/gpu/drm/drm_crtc_internal.h | 1 + + drivers/gpu/drm/drm_damage_helper.c | 41 + + drivers/gpu/drm/drm_dp_helper.c | 3 + + drivers/gpu/drm/drm_dp_mst_topology.c | 946 ++++++++++++++++----- + drivers/gpu/drm/drm_drv.c | 23 +- + drivers/gpu/drm/drm_edid.c | 101 +-- + drivers/gpu/drm/drm_fb_cma_helper.c | 137 +-- + drivers/gpu/drm/drm_fb_helper.c | 165 ++-- + drivers/gpu/drm/drm_flip_work.c | 1 + + drivers/gpu/drm/drm_framebuffer.c | 1 + + drivers/gpu/drm/drm_gem.c | 36 +- + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 50 +- + drivers/gpu/drm/drm_modes.c | 9 - + drivers/gpu/drm/drm_of.c | 4 +- + drivers/gpu/drm/drm_panel.c | 3 + + drivers/gpu/drm/drm_plane.c | 3 + + drivers/gpu/drm/drm_vblank.c | 45 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 3 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 38 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 4 - + drivers/gpu/drm/i2c/ch7006_drv.c | 6 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 4 +- + drivers/gpu/drm/i915/i915_debugfs.c | 9 +- + drivers/gpu/drm/i915/intel_connector.c | 4 + + drivers/gpu/drm/i915/intel_display.c | 4 + + drivers/gpu/drm/i915/intel_dp_mst.c | 55 +- + drivers/gpu/drm/i915/intel_drv.h | 1 - + drivers/gpu/drm/i915/intel_hdmi.c | 20 +- + drivers/gpu/drm/i915/intel_lspcon.c | 16 +- + drivers/gpu/drm/i915/intel_sdvo.c | 30 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 3 +- + drivers/gpu/drm/meson/meson_drv.c | 20 + + drivers/gpu/drm/meson/meson_dw_hdmi.c | 12 +- + drivers/gpu/drm/mgag200/mgag200_fb.c | 1 + + drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 10 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_dsi_encoder.c | 9 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_dtv_encoder.c | 9 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c | 9 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c | 9 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 9 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_encoder.c | 9 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c | 1 + + drivers/gpu/drm/msm/dsi/dsi_manager.c | 9 +- + drivers/gpu/drm/msm/edp/edp_bridge.c | 9 +- + drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 3 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 26 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.h | 1 - + drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 4 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 103 ++- + drivers/gpu/drm/nouveau/nouveau_display.c | 2 +- + drivers/gpu/drm/omapdrm/omap_connector.c | 9 +- + drivers/gpu/drm/omapdrm/omap_crtc.c | 8 +- + drivers/gpu/drm/omapdrm/omap_encoder.c | 4 +- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 1 + + drivers/gpu/drm/panel/Kconfig | 9 + + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-tpo-tpg110.c | 496 +++++++++++ + drivers/gpu/drm/qxl/qxl_cmd.c | 2 + + drivers/gpu/drm/qxl/qxl_display.c | 4 +- + drivers/gpu/drm/radeon/atom.c | 2 + + drivers/gpu/drm/radeon/radeon_audio.c | 14 +- + drivers/gpu/drm/radeon/radeon_display.c | 2 +- + drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 1 + + drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c | 1 + + drivers/gpu/drm/rockchip/inno_hdmi.c | 4 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 36 - + drivers/gpu/drm/rockchip/rockchip_drm_psr.c | 37 + + drivers/gpu/drm/rockchip/rockchip_drm_psr.h | 3 + + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 157 +++- + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 15 + + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 180 +++- + drivers/gpu/drm/rockchip/rockchip_vop_reg.h | 53 ++ + drivers/gpu/drm/sti/sti_crtc.c | 16 +- + drivers/gpu/drm/sti/sti_hdmi.c | 3 +- + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 3 +- + drivers/gpu/drm/tegra/hdmi.c | 3 +- + drivers/gpu/drm/tegra/sor.c | 3 +- + drivers/gpu/drm/tinydrm/core/tinydrm-core.c | 24 +- + drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c | 100 +-- + drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c | 32 +- + drivers/gpu/drm/tinydrm/hx8357d.c | 3 +- + drivers/gpu/drm/tinydrm/ili9225.c | 151 ++-- + drivers/gpu/drm/tinydrm/ili9341.c | 3 +- + drivers/gpu/drm/tinydrm/mi0283qt.c | 3 +- + drivers/gpu/drm/tinydrm/mipi-dbi.c | 97 ++- + drivers/gpu/drm/tinydrm/repaper.c | 44 +- + drivers/gpu/drm/tinydrm/st7586.c | 87 +- + drivers/gpu/drm/tinydrm/st7735r.c | 3 +- + drivers/gpu/drm/vc4/vc4_drv.h | 1 + + drivers/gpu/drm/vc4/vc4_hdmi.c | 16 +- + drivers/gpu/drm/vc4/vc4_plane.c | 17 +- + drivers/gpu/drm/virtio/Makefile | 2 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 7 +- + drivers/gpu/drm/virtio/virtgpu_drm_bus.c | 103 --- + drivers/gpu/drm/virtio/virtgpu_drv.c | 79 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 10 +- + drivers/gpu/drm/virtio/virtgpu_fence.c | 8 - + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 10 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 17 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 12 +- + drivers/gpu/drm/zte/zx_hdmi.c | 4 +- + drivers/staging/vboxvideo/vbox_fb.c | 5 - + include/drm/bridge/dw_hdmi.h | 6 +- + include/drm/drmP.h | 24 +- + include/drm/drm_atomic.h | 6 +- + include/drm/drm_connector.h | 6 + + include/drm/drm_crtc.h | 3 - + include/drm/drm_crtc_helper.h | 1 + + include/drm/drm_damage_helper.h | 3 + + include/drm/drm_device.h | 288 +++++-- + include/drm/drm_dp_mst_helper.h | 151 +++- + include/drm/drm_edid.h | 10 +- + include/drm/drm_encoder_slave.h | 1 - + include/drm/drm_fb_cma_helper.h | 22 - + include/drm/drm_framebuffer.h | 10 +- + include/drm/drm_gem_cma_helper.h | 5 +- + include/drm/drm_gem_framebuffer_helper.h | 3 + + include/drm/drm_modes.h | 21 +- + include/drm/drm_util.h | 53 +- + include/drm/drm_vblank.h | 22 + + include/drm/tinydrm/mipi-dbi.h | 5 +- + include/drm/tinydrm/tinydrm-helpers.h | 20 +- + include/drm/tinydrm/tinydrm.h | 26 - + include/linux/dma-fence-array.h | 1 + + include/uapi/drm/drm_fourcc.h | 23 + + 164 files changed, 3679 insertions(+), 1970 deletions(-) + rename Documentation/devicetree/bindings/display/panel/{auo,g101evn010 => auo,g101evn010.txt} (100%) + create mode 100644 Documentation/gpu/dp-mst/topology-figure-1.dot + create mode 100644 Documentation/gpu/dp-mst/topology-figure-2.dot + create mode 100644 Documentation/gpu/dp-mst/topology-figure-3.dot + delete mode 100644 drivers/gpu/drm/bochs/bochs_fbdev.c + create mode 100644 drivers/gpu/drm/panel/panel-tpo-tpg110.c + delete mode 100644 drivers/gpu/drm/virtio/virtgpu_drm_bus.c +Merging drm-msm/msm-next (61a5d46545fc dt-bindings: drm/msm/a6xx: Document GMU bindings) +$ git merge drm-msm/msm-next +Auto-merging drivers/gpu/drm/msm/msm_rd.c +Auto-merging drivers/gpu/drm/msm/msm_gpu.c +Auto-merging drivers/gpu/drm/msm/msm_gem.c +Auto-merging drivers/gpu/drm/msm/adreno/a6xx_gmu.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/display/msm/gmu.txt | 59 ++++++++++++++++++++++ + .../devicetree/bindings/display/msm/gpu.txt | 43 ++++++++++++++-- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 2 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 1 - + drivers/gpu/drm/msm/msm_drv.h | 3 +- + drivers/gpu/drm/msm/msm_gem.c | 9 +++- + drivers/gpu/drm/msm/msm_gem_vma.c | 5 +- + drivers/gpu/drm/msm/msm_gpu.c | 2 +- + drivers/gpu/drm/msm/msm_gpu.h | 3 +- + drivers/gpu/drm/msm/msm_rd.c | 7 ++- + 10 files changed, 119 insertions(+), 15 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/msm/gmu.txt +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 (7e8d4fcf8daf drm: arm/komeda: Remove IRQ parsing from initial series) +$ git merge mali-dp/for-upstream/mali-dp +Auto-merging include/uapi/drm/drm_fourcc.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/display/arm,komeda.txt | 73 +++ + Documentation/gpu/afbc.rst | 235 ++++++++++ + Documentation/gpu/drivers.rst | 2 + + Documentation/gpu/komeda-kms.rst | 488 +++++++++++++++++++++ + MAINTAINERS | 15 +- + drivers/gpu/drm/Makefile | 2 +- + drivers/gpu/drm/arm/Kconfig | 12 +- + drivers/gpu/drm/arm/Makefile | 1 + + drivers/gpu/drm/arm/display/Kbuild | 3 + + drivers/gpu/drm/arm/display/Kconfig | 14 + + drivers/gpu/drm/arm/display/include/malidp_io.h | 42 ++ + .../gpu/drm/arm/display/include/malidp_product.h | 23 + + drivers/gpu/drm/arm/display/include/malidp_utils.h | 16 + + drivers/gpu/drm/arm/display/komeda/Makefile | 21 + + drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c | 111 +++++ + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 106 +++++ + drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 187 ++++++++ + drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 110 +++++ + drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 144 ++++++ + .../drm/arm/display/komeda/komeda_format_caps.c | 75 ++++ + .../drm/arm/display/komeda/komeda_format_caps.h | 89 ++++ + .../drm/arm/display/komeda/komeda_framebuffer.c | 165 +++++++ + .../drm/arm/display/komeda/komeda_framebuffer.h | 34 ++ + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 167 +++++++ + drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 113 +++++ + .../gpu/drm/arm/display/komeda/komeda_pipeline.c | 200 +++++++++ + .../gpu/drm/arm/display/komeda/komeda_pipeline.h | 359 +++++++++++++++ + drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 109 +++++ + .../drm/arm/display/komeda/komeda_private_obj.c | 88 ++++ + include/uapi/drm/drm_fourcc.h | 3 + + 30 files changed, 2999 insertions(+), 8 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/arm,komeda.txt + create mode 100644 Documentation/gpu/afbc.rst + create mode 100644 Documentation/gpu/komeda-kms.rst + create mode 100644 drivers/gpu/drm/arm/display/Kbuild + create mode 100644 drivers/gpu/drm/arm/display/Kconfig + create mode 100644 drivers/gpu/drm/arm/display/include/malidp_io.h + create mode 100644 drivers/gpu/drm/arm/display/include/malidp_product.h + create mode 100644 drivers/gpu/drm/arm/display/include/malidp_utils.h + create mode 100644 drivers/gpu/drm/arm/display/komeda/Makefile + create mode 100644 drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c + create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_crtc.c + create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_dev.c + create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_dev.h + create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_drv.c + create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_format_caps.c + create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_format_caps.h + create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c + create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.h + create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_kms.c + create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_kms.h + create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_pipeline.c + create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h + create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_plane.c + create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c +$ git am -3 ../patches/0001-drm-komeda-merge-fix-for-drm_atomic_private_obj_init.patch +Applying: drm/komeda: merge fix for drm_atomic_private_obj_init() API change +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c +$ git add -A . +$ git commit -v -a --amend +[master 04d135b85312] Merge remote-tracking branch 'mali-dp/for-upstream/mali-dp' + Date: Fri Jan 18 11:18:46 2019 +1100 +Merging imx-drm/imx-drm/next (97144d12df00 drm/imx: Allow building under COMPILE_TEST) +$ git merge imx-drm/imx-drm/next +Auto-merging include/video/imx-ipu-v3.h +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/Kconfig | 2 +- + drivers/gpu/drm/imx/imx-drm-core.c | 7 +--- + drivers/gpu/drm/imx/imx-ldb.c | 25 ++++++++---- + drivers/gpu/drm/imx/ipuv3-plane.c | 80 +++++++++++++++++++++++++------------- + drivers/gpu/drm/imx/ipuv3-plane.h | 2 + + drivers/gpu/ipu-v3/ipu-common.c | 8 ++-- + 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 + + 10 files changed, 103 insertions(+), 45 deletions(-) +Merging etnaviv/etnaviv/next (fd4b77e8deea drm/etnaviv: don't restrict to certain architectures) +$ git merge etnaviv/etnaviv/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/gpu/drm/etnaviv/Kconfig | 1 - + drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.h | 2 -- + drivers/gpu/drm/etnaviv/etnaviv_dump.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.h | 1 + + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 6 +++--- + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 2 +- + 8 files changed, 8 insertions(+), 10 deletions(-) +Merging kconfig/for-next (bebc6082da0a Linux 4.14) +$ git merge kconfig/for-next +Already up to date. +Merging regmap/for-next (b3ffce399349 Merge branch 'regmap-5.0' into regmap-linus) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (053b055948e9 ALSA: hda: program stripe control for codec) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + include/sound/hda_register.h | 2 ++ + include/sound/hda_verbs.h | 2 ++ + include/sound/hdaudio.h | 3 ++ + sound/hda/hdac_controller.c | 8 +++-- + sound/hda/hdac_stream.c | 44 ++++++++++++++++++++++++- + sound/isa/gus/gus_main.c | 13 ++++++-- + sound/isa/sb/sb16_main.c | 10 ++++-- + sound/pci/hda/patch_hdmi.c | 10 +++++- + sound/pci/ice1712/ews.c | 7 +++- + sound/pci/oxygen/oxygen_lib.c | 2 +- + sound/pci/oxygen/pcm1796.h | 1 - + sound/pci/oxygen/xonar_pcm179x.c | 71 ++++++++++++++++++++++++++++++++++++++-- + sound/usb/line6/pod.c | 3 +- + sound/usb/mixer.c | 6 +--- + 14 files changed, 161 insertions(+), 21 deletions(-) +Merging sound-asoc/for-next (aaafa148ca02 Merge branch 'asoc-5.1' 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. + Documentation/devicetree/bindings/sound/ak4458.txt | 2 +- + .../bindings/sound/audio-graph-scu-card.txt | 123 --- + Documentation/devicetree/bindings/sound/cs4341.txt | 22 + + .../bindings/sound/davinci-mcasp-audio.txt | 17 + + .../devicetree/bindings/sound/fsl,micfil.txt | 32 + + .../bindings/sound/rockchip,rk3328-codec.txt | 23 + + .../devicetree/bindings/sound/sgtl5000.txt | 9 + + .../devicetree/bindings/sound/simple-scu-card.txt | 94 --- + .../bindings/sound/xlnx,audio-formatter.txt | 29 + + .../devicetree/bindings/sound/xlnx,spdif.txt | 28 + + sound/soc/codecs/Kconfig | 16 +- + sound/soc/codecs/Makefile | 4 + + sound/soc/codecs/adau7002.c | 45 ++ + sound/soc/codecs/ak4458.c | 79 +- + sound/soc/codecs/cs4271.c | 4 +- + sound/soc/codecs/cs4341.c | 346 +++++++++ + sound/soc/codecs/da7219-aad.c | 2 +- + sound/soc/codecs/da7219.c | 85 ++- + sound/soc/codecs/da7219.h | 1 + + sound/soc/codecs/dmic.c | 4 +- + sound/soc/codecs/es8316.c | 200 ++++- + sound/soc/codecs/es8316.h | 7 + + sound/soc/codecs/max98090.c | 15 - + sound/soc/codecs/max98373.c | 6 +- + sound/soc/codecs/max98927.c | 8 +- + sound/soc/codecs/msm8916-wcd-digital.c | 10 - + sound/soc/codecs/mt6351.c | 4 +- + sound/soc/codecs/nau8824.c | 2 +- + sound/soc/codecs/nau8825.c | 1 + + sound/soc/codecs/rk3328_codec.c | 519 +++++++++++++ + sound/soc/codecs/rk3328_codec.h | 210 ++++++ + sound/soc/codecs/rl6347a.c | 4 +- + sound/soc/codecs/rt274.c | 19 +- + sound/soc/codecs/rt286.c | 8 +- + sound/soc/codecs/rt298.c | 12 +- + sound/soc/codecs/rt5514.c | 1 + + sound/soc/codecs/rt5640.c | 6 +- + sound/soc/codecs/rt5645.c | 66 +- + sound/soc/codecs/rt5651.c | 61 +- + sound/soc/codecs/rt5651.h | 1 + + sound/soc/codecs/rt5670.c | 54 -- + sound/soc/codecs/rt5677.c | 8 +- + sound/soc/codecs/rt5682.c | 8 + + sound/soc/codecs/sgtl5000.c | 19 +- + sound/soc/codecs/tlv320aic32x4.c | 30 +- + sound/soc/codecs/tlv320aic32x4.h | 1 + + sound/soc/codecs/tscs42xx.c | 2 +- + sound/soc/codecs/wm8904.c | 21 +- + sound/soc/fsl/Kconfig | 9 + + sound/soc/fsl/Makefile | 2 + + sound/soc/fsl/fsl_micfil.c | 826 +++++++++++++++++++++ + sound/soc/fsl/fsl_micfil.h | 283 +++++++ + 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 | 45 +- + 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/bytcht_es8316.c | 327 +++++++- + sound/soc/intel/boards/bytcr_rt5640.c | 12 + + sound/soc/intel/boards/bytcr_rt5651.c | 103 ++- + sound/soc/intel/boards/glk_rt5682_max98357a.c | 2 +- + sound/soc/intel/boards/kbl_da7219_max98927.c | 4 +- + sound/soc/intel/common/soc-acpi-intel-byt-match.c | 44 +- + 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/pxa/Makefile | 1 - + sound/soc/qcom/Kconfig | 1 + + sound/soc/qcom/sdm845.c | 2 + + sound/soc/sh/rcar/src.c | 125 +++- + sound/soc/ti/davinci-mcasp.c | 175 ++++- + sound/soc/xilinx/Kconfig | 14 + + sound/soc/xilinx/Makefile | 4 + + sound/soc/xilinx/xlnx_formatter_pcm.c | 708 ++++++++++++++++++ + sound/soc/xilinx/xlnx_spdif.c | 339 +++++++++ + 86 files changed, 5315 insertions(+), 1933 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/fsl,micfil.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 Documentation/devicetree/bindings/sound/xlnx,spdif.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 + create mode 100644 sound/soc/fsl/fsl_micfil.c + create mode 100644 sound/soc/fsl/fsl_micfil.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 + create mode 100644 sound/soc/xilinx/xlnx_spdif.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 (b6eba86030bf Input: edt-ft5x06 - add offset support for ev-ft5726) +$ git merge input/next +Merge made by the 'recursive' strategy. + .../bindings/input/cypress,tm2-touchkey.txt | 9 +- + .../bindings/input/touchscreen/edt-ft5x06.txt | 13 +- + drivers/input/keyboard/mcs_touchkey.c | 5 +- + drivers/input/keyboard/mtk-pmic-keys.c | 13 +- + drivers/input/keyboard/tca6416-keypad.c | 4 +- + drivers/input/keyboard/tm2-touchkey.c | 132 ++++++++++++++++----- + drivers/input/misc/soc_button_array.c | 6 +- + drivers/input/touchscreen/ad7879.c | 11 +- + drivers/input/touchscreen/edt-ft5x06.c | 110 +++++++++++++++-- + 9 files changed, 243 insertions(+), 60 deletions(-) +Merging block/for-next (fae5efba43c2 mtip32xx: Ñ•top abusing the managed resource APIs) +$ git merge block/for-next +Merge made by the 'recursive' strategy. + drivers/block/mtip32xx/mtip32xx.c | 37 ++++++++++++++++--------------------- + 1 file changed, 16 insertions(+), 21 deletions(-) +Merging device-mapper/for-next (d445bd9cec1a dm thin: fix passdown_double_checking_shared_status()) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + drivers/md/dm-crypt.c | 25 +++++++++++++++++-------- + drivers/md/dm-thin-metadata.c | 4 ++-- + drivers/md/dm-thin-metadata.h | 2 +- + drivers/md/dm-thin.c | 10 +++++----- + 4 files changed, 25 insertions(+), 16 deletions(-) +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 (e0fc4f56e724 mmc: sdhci-esdhc-imx: add DCMD support for CMDQ) +$ git merge mmc/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/fsl-imx-esdhc.txt | 1 + + Documentation/devicetree/bindings/mmc/ti-omap.txt | 28 -- + drivers/mmc/core/block.c | 9 +- + drivers/mmc/core/sdio_bus.c | 3 +- + drivers/mmc/host/Kconfig | 1 + + drivers/mmc/host/sdhci-brcmstb.c | 4 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 286 ++++++++++++++++++--- + drivers/mmc/host/sdhci-pci-core.c | 10 - + drivers/mmc/host/sdhci-pci-o2micro.c | 140 +++++++++- + drivers/mmc/host/sdhci-pci.h | 6 +- + drivers/mmc/host/sdhci.c | 16 +- + drivers/mmc/host/sdhci.h | 4 + + drivers/mmc/host/sdhci_am654.c | 2 +- + drivers/mmc/host/tmio_mmc_core.c | 3 +- + 14 files changed, 413 insertions(+), 100 deletions(-) +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 +Resolved 'kernel/debug/kdb/kdb_bt.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 30c3e9ff6b1f] 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 +Already up to date. +Merging mfd/for-mfd-next (c52b8fd546d8 mfd: wm8400-core: Make it explicitly non-modular) +$ git merge mfd/for-mfd-next +Merge made by the 'recursive' strategy. + drivers/mfd/aat2870-core.c | 40 +++------------------------------------- + drivers/mfd/adp5520.c | 30 +++++++----------------------- + drivers/mfd/as3711.c | 14 -------------- + drivers/mfd/db8500-prcmu.c | 10 ++++------ + drivers/mfd/htc-i2cpld.c | 18 +----------------- + drivers/mfd/max8925-core.c | 7 +------ + drivers/mfd/rc5t583.c | 14 -------------- + drivers/mfd/sta2x11-mfd.c | 10 ++++------ + drivers/mfd/syscon.c | 12 +----------- + drivers/mfd/tps65090.c | 30 +++++------------------------- + drivers/mfd/tps65910.c | 18 +----------------- + drivers/mfd/tps80031.c | 37 ++----------------------------------- + drivers/mfd/wm831x-core.c | 15 ++------------- + drivers/mfd/wm831x-i2c.c | 20 ++------------------ + drivers/mfd/wm831x-spi.c | 24 ++---------------------- + drivers/mfd/wm8350-core.c | 30 ++---------------------------- + drivers/mfd/wm8350-i2c.c | 24 +----------------------- + drivers/mfd/wm8400-core.c | 18 +++--------------- + include/linux/mfd/wm831x/core.h | 1 - + include/linux/mfd/wm8350/core.h | 1 - + 20 files changed, 41 insertions(+), 332 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 +Already up to date. +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 (1488c1d4973a Merge branch 'regulator-5.1' into regulator-next) +$ git merge regulator/for-next +Removing Documentation/devicetree/bindings/regulator/fixed-regulator.txt +Merge made by the 'recursive' strategy. + .../bindings/regulator/fixed-regulator.txt | 35 ----------- + .../bindings/regulator/fixed-regulator.yaml | 67 ++++++++++++++++++++++ + .../devicetree/bindings/regulator/pfuze100.txt | 2 +- + drivers/regulator/Kconfig | 8 +-- + drivers/regulator/act8865-regulator.c | 5 +- + drivers/regulator/act8945a-regulator.c | 11 ++-- + drivers/regulator/axp20x-regulator.c | 8 ++- + drivers/regulator/core.c | 22 ++++--- + drivers/regulator/hi655x-regulator.c | 1 - + drivers/regulator/lp8755.c | 4 +- + drivers/regulator/max14577-regulator.c | 1 - + drivers/regulator/of_regulator.c | 4 +- + drivers/regulator/pwm-regulator.c | 17 ++---- + drivers/regulator/twl6030-regulator.c | 7 +-- + include/linux/regulator/driver.h | 1 + + 15 files changed, 112 insertions(+), 81 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/regulator/fixed-regulator.txt + create mode 100644 Documentation/devicetree/bindings/regulator/fixed-regulator.yaml +Merging security/next-testing (f30160f982fc Merge branch 'next-general' into next-testing) +$ git merge security/next-testing +Auto-merging security/yama/yama_lsm.c +Auto-merging security/smack/smack_lsm.c +Auto-merging security/smack/smack.h +Auto-merging security/selinux/hooks.c +Removing security/selinux/exports.c +Auto-merging security/security.c +Auto-merging kernel/seccomp.c +Removing include/linux/selinux.h +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging fs/proc/internal.h +Merge made by the 'recursive' strategy. + Documentation/admin-guide/LSM/index.rst | 13 +- + Documentation/admin-guide/kernel-parameters.txt | 4 + + fs/proc/base.c | 64 ++- + fs/proc/internal.h | 1 + + include/linux/cred.h | 1 - + include/linux/lsm_hooks.h | 48 +- + include/linux/security.h | 43 +- + include/linux/selinux.h | 35 -- + kernel/capability.c | 22 +- + kernel/cred.c | 13 - + kernel/seccomp.c | 4 +- + security/Kconfig | 41 +- + security/apparmor/Kconfig | 16 - + security/apparmor/capability.c | 14 +- + security/apparmor/domain.c | 2 +- + security/apparmor/include/capability.h | 2 +- + security/apparmor/include/cred.h | 16 +- + security/apparmor/include/file.h | 5 +- + security/apparmor/include/lib.h | 4 + + security/apparmor/include/task.h | 18 +- + security/apparmor/ipc.c | 3 +- + security/apparmor/lsm.c | 69 ++- + security/apparmor/resource.c | 2 +- + security/apparmor/task.c | 6 +- + security/commoncap.c | 26 +- + security/loadpin/loadpin.c | 8 +- + security/security.c | 649 +++++++++++++++++++++--- + security/selinux/Kconfig | 15 - + security/selinux/Makefile | 2 +- + security/selinux/exports.c | 23 - + security/selinux/hooks.c | 363 ++++--------- + security/selinux/include/audit.h | 3 - + security/selinux/include/objsec.h | 38 +- + security/selinux/selinuxfs.c | 4 +- + security/selinux/ss/services.c | 1 - + security/selinux/xfrm.c | 4 +- + security/smack/smack.h | 44 +- + security/smack/smack_access.c | 6 +- + security/smack/smack_lsm.c | 316 ++++-------- + security/smack/smackfs.c | 18 +- + security/tomoyo/common.h | 22 +- + security/tomoyo/domain.c | 4 +- + security/tomoyo/securityfs_if.c | 15 +- + security/tomoyo/tomoyo.c | 49 +- + security/yama/yama_lsm.c | 8 +- + 45 files changed, 1204 insertions(+), 860 deletions(-) + delete mode 100644 include/linux/selinux.h + delete mode 100644 security/selinux/exports.c +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 (53e0c2aa9a59 selinux: do not override context on context mounts) +$ git merge selinux/next +Auto-merging security/selinux/hooks.c +Merge made by the 'recursive' strategy. + security/selinux/avc.c | 37 +++++++++++++-------------- + security/selinux/hooks.c | 58 ++++++++++++++++++++++++++++++++---------- + security/selinux/include/avc.h | 6 +---- + 3 files changed, 63 insertions(+), 38 deletions(-) +Merging tpmdd/next (c1a85a00ea66 LSM: generalize flag passing to security_capable) +$ git merge tpmdd/next +Already up to date. +Merging watchdog/master (4a22fc534f2f watchdog: tqmx86: Fix a couple IS_ERR() vs NULL bugs) +$ git merge watchdog/master +Merge made by the 'recursive' strategy. + drivers/watchdog/mt7621_wdt.c | 1 + + drivers/watchdog/rt2880_wdt.c | 1 + + drivers/watchdog/tqmx86_wdt.c | 8 ++++---- + 3 files changed, 6 insertions(+), 4 deletions(-) +Merging iommu/next (33798a966b8b Merge branches 'iommu/fixes', 'arm/msm', 'x86/vt-d' and 'core' into next) +$ git merge iommu/next +Merge made by the 'recursive' strategy. + drivers/Makefile | 2 +- + drivers/iommu/Kconfig | 7 +++-- + drivers/iommu/intel-svm.c | 77 ++++++++++++++++++++++++++------------------- + drivers/iommu/msm_iommu.c | 8 ++--- + drivers/iommu/of_iommu.c | 2 +- + include/linux/intel-iommu.h | 21 ++++++------- + include/linux/intel-svm.h | 2 +- + 7 files changed, 65 insertions(+), 54 deletions(-) +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 (9e36a5d49c3a audit: hand taken context to audit_kill_trees for syscall logging) +$ git merge audit/next +Merge made by the 'recursive' strategy. + kernel/audit.c | 7 +++++-- + kernel/audit.h | 4 ++-- + kernel/audit_tree.c | 19 +++++++++++-------- + kernel/auditsc.c | 12 ++++++------ + 4 files changed, 24 insertions(+), 18 deletions(-) +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 +Already up to date. +Merging spi/for-next (408fa9bbcd98 Merge branch 'spi-5.1' into spi-next) +$ git merge spi/for-next +Removing drivers/mtd/spi-nor/fsl-quadspi.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../{mtd/fsl-quadspi.txt => spi/spi-fsl-qspi.txt} | 18 +- + .../devicetree/bindings/spi/spi-stm32.txt | 9 +- + MAINTAINERS | 4 +- + arch/mips/ath79/dev-spi.h | 2 +- + drivers/mtd/spi-nor/Kconfig | 9 - + drivers/mtd/spi-nor/Makefile | 1 - + drivers/mtd/spi-nor/fsl-quadspi.c | 1224 ----------------- + drivers/spi/Kconfig | 17 +- + drivers/spi/Makefile | 1 + + drivers/spi/spi-ath79.c | 114 +- + drivers/spi/spi-atmel.c | 93 +- + drivers/spi/spi-bitbang.c | 13 - + drivers/spi/spi-cadence.c | 78 +- + drivers/spi/spi-clps711x.c | 23 +- + drivers/spi/spi-davinci.c | 54 +- + drivers/spi/spi-dw-mmio.c | 22 - + drivers/spi/spi-dw.c | 13 +- + drivers/spi/spi-fsl-qspi.c | 966 ++++++++++++++ + drivers/spi/spi-geni-qcom.c | 56 +- + drivers/spi/spi-stm32.c | 1403 +++++++++++++++----- + drivers/spi/spi.c | 226 +++- + .../linux/platform_data/spi-ath79.h | 0 + include/linux/spi/spi.h | 25 +- + include/trace/events/spi.h | 31 +- + 24 files changed, 2402 insertions(+), 2000 deletions(-) + rename Documentation/devicetree/bindings/{mtd/fsl-quadspi.txt => spi/spi-fsl-qspi.txt} (73%) + delete mode 100644 drivers/mtd/spi-nor/fsl-quadspi.c + create mode 100644 drivers/spi/spi-fsl-qspi.c + rename arch/mips/include/asm/mach-ath79/ath79_spi_platform.h => include/linux/platform_data/spi-ath79.h (100%) +Merging tip/auto-latest (28948fd5d5b7 Merge branch 'linus') +$ git merge tip/auto-latest +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 8 + + Documentation/kdump/vmcoreinfo.txt | 495 +++++ + 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/boot/Makefile | 2 +- + arch/x86/boot/compressed/vmlinux.lds.S | 2 +- + arch/x86/boot/setup.ld | 2 +- + arch/x86/include/asm/alternative.h | 39 +- + arch/x86/include/asm/bitops.h | 6 - + arch/x86/include/asm/mmu_context.h | 18 + + arch/x86/include/asm/msr.h | 16 +- + arch/x86/include/asm/string_32.h | 104 - + arch/x86/include/asm/string_64.h | 15 - + arch/x86/kernel/alternative.c | 4 +- + arch/x86/kernel/cpu/mce/amd.c | 36 + + arch/x86/kernel/cpu/mce/apei.c | 10 +- + arch/x86/kernel/cpu/mce/core.c | 30 - + arch/x86/kernel/crash.c | 1 + + arch/x86/kernel/e820.c | 9 +- + arch/x86/kernel/hpet.c | 4 - + arch/x86/kernel/kexec-bzimage64.c | 2 + + arch/x86/kernel/machine_kexec_64.c | 3 + + arch/x86/kernel/tsc.c | 30 +- + arch/x86/kernel/vmlinux.lds.S | 4 +- + arch/x86/lib/kaslr.c | 4 +- + arch/x86/mm/mem_encrypt_identity.c | 4 +- + arch/x86/platform/uv/tlb_uv.c | 8 +- + arch/x86/realmode/rm/Makefile | 2 +- + arch/x86/realmode/rm/realmode.lds.S | 2 +- + 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 +----------- + include/linux/interrupt.h | 1 + + include/linux/posix-timers.h | 2 +- + kernel/irq/handle.c | 2 +- + kernel/irq/manage.c | 4 + + kernel/rcu/Kconfig | 30 - + kernel/time/Kconfig | 29 + + kernel/time/posix-cpu-timers.c | 12 +- + 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 + + tools/testing/selftests/x86/protection_keys.c | 41 +- + 89 files changed, 7395 insertions(+), 2182 deletions(-) + create mode 100644 Documentation/kdump/vmcoreinfo.txt + 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 (8fa4e55bbfbf irqchip/madera: Drop GPIO includes) +$ git merge irqchip/irq/irqchip-next +Merge made by the 'recursive' strategy. + drivers/irqchip/irq-gic-v3-mbi.c | 2 +- + drivers/irqchip/irq-madera.c | 2 -- + drivers/irqchip/irq-stm32-exti.c | 1 + + 3 files changed, 2 insertions(+), 3 deletions(-) +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 (f25bcbbbf561 Merge LKMM and RCU commits) +$ git merge rcu/rcu/next +Auto-merging virt/kvm/kvm_main.c +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + .../Expedited-Grace-Periods/ExpSchedFlow.svg | 18 +- + .../Expedited-Grace-Periods.html | 26 +- + .../Memory-Ordering/Tree-RCU-Memory-Ordering.html | 6 +- + .../TreeRCU-callback-invocation.svg | 2 +- + .../RCU/Design/Memory-Ordering/TreeRCU-gp.svg | 8 +- + .../RCU/Design/Memory-Ordering/TreeRCU-qs.svg | 6 +- + .../RCU/Design/Requirements/Requirements.html | 20 +- + Documentation/RCU/stallwarn.txt | 15 +- + Documentation/RCU/torture.txt | 169 +----------- + Documentation/RCU/whatisRCU.txt | 4 +- + Documentation/admin-guide/kernel-parameters.txt | 32 ++- + Documentation/memory-barriers.txt | 6 +- + MAINTAINERS | 6 + + include/asm-generic/bug.h | 3 - + include/linux/rcupdate.h | 74 +----- + include/linux/srcu.h | 1 + + include/linux/srcutree.h | 3 +- + include/linux/torture.h | 3 +- + kernel/locking/locktorture.c | 2 +- + kernel/rcu/rcu.h | 4 +- + kernel/rcu/rcuperf.c | 8 +- + kernel/rcu/rcutorture.c | 40 ++- + kernel/rcu/srcutree.c | 55 ++-- + kernel/rcu/tiny.c | 2 +- + kernel/rcu/tree.c | 248 +++++++++++------- + kernel/rcu/tree.h | 36 +-- + kernel/rcu/tree_exp.h | 184 +++++-------- + kernel/rcu/tree_plugin.h | 221 ++++------------ + kernel/sched/cpufreq.c | 4 +- + kernel/sched/cpufreq_schedutil.c | 2 +- + kernel/sched/sched.h | 2 +- + kernel/sched/topology.c | 4 +- + kernel/time/timer.c | 2 +- + kernel/torture.c | 6 +- + .../rcutorture/bin => include/nolibc}/nolibc.h | 118 +++++++-- + tools/memory-model/Documentation/explanation.txt | 289 +++++++++++---------- + tools/memory-model/README | 25 +- + tools/memory-model/linux-kernel.bell | 35 ++- + tools/memory-model/linux-kernel.cat | 41 ++- + tools/memory-model/linux-kernel.def | 5 + + tools/testing/selftests/rcutorture/bin/mkinitrd.sh | 27 +- + virt/kvm/kvm_main.c | 2 +- + 42 files changed, 825 insertions(+), 939 deletions(-) + rename tools/{testing/selftests/rcutorture/bin => include/nolibc}/nolibc.h (94%) +Merging kvm/linux-next (bfeffd155283 Linux 5.0-rc1) +$ 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 (867cefb4cb10 xen: Fix x86 sched_clock() interface for xen) +$ git merge xen-tip/linux-next +Merge made by the 'recursive' strategy. + arch/x86/xen/enlighten_pv.c | 5 +- + arch/x86/xen/time.c | 12 +++-- + drivers/xen/events/events_base.c | 2 +- + drivers/xen/pvcalls-back.c | 9 ++-- + drivers/xen/pvcalls-front.c | 104 ++++++++++++++++++++++++++++----------- + 5 files changed, 90 insertions(+), 42 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 (bfeffd155283 Linux 5.0-rc1) +$ git merge drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (bfeffd155283 Linux 5.0-rc1) +$ git merge chrome-platform/for-next +Already up to date. +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 (0f85e8498a48 leds: trigger: timer: Add initialization from Device Tree) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-class-led-trigger-pattern | 51 +---------- + Documentation/devicetree/bindings/leds/common.txt | 12 +++ + .../bindings/leds/leds-trigger-pattern.txt | 49 +++++++++++ + drivers/leds/led-core.c | 30 +++++++ + drivers/leds/trigger/ledtrig-oneshot.c | 38 ++++++++- + drivers/leds/trigger/ledtrig-pattern.c | 99 +++++++++++++++++----- + drivers/leds/trigger/ledtrig-timer.c | 34 ++++++++ + include/linux/leds.h | 13 +++ + 8 files changed, 257 insertions(+), 69 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/leds-trigger-pattern.txt +Merging ipmi/for-next (535c98b8c211 ipmi: msghandler: Fix potential Spectre v1 vulnerabilities) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_devintf.c | 6 +- + drivers/char/ipmi/ipmi_msghandler.c | 320 +++++++++++++++++++++++------------- + 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, 386 insertions(+), 188 deletions(-) +Merging driver-core/driver-core-next (bdfe0df1e97b Merge 5.0-rc2 into driver-core-next) +$ git merge driver-core/driver-core-next +Merge made by the 'recursive' strategy. + drivers/base/bus.c | 20 +++++++++++++------- + 1 file changed, 13 insertions(+), 7 deletions(-) +Merging usb/usb-next (cb7edfd4cd47 Merge 5.0-rc2 into usb-next) +$ git merge usb/usb-next +Merge made by the 'recursive' strategy. + drivers/usb/core/config.c | 5 +---- + drivers/usb/core/devio.c | 8 +++----- + drivers/usb/core/urb.c | 5 ++--- + drivers/usb/gadget/udc/snps_udc_core.c | 17 ++++++++--------- + drivers/usb/host/u132-hcd.c | 6 ++++-- + 5 files changed, 18 insertions(+), 23 deletions(-) +Merging usb-gadget/next (1c7fc5cbc339 Linux 5.0-rc2) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (bfeffd155283 Linux 5.0-rc1) +$ 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 (49ee1406355e phy: qcom-qusb2: Add QUSB2 PHY support for msm8998) +$ git merge phy-next/next +Auto-merging drivers/phy/ti/Kconfig +Merge made by the 'recursive' strategy. + .../bindings/phy/phy-rockchip-inno-usb2.txt | 2 + + .../devicetree/bindings/phy/qcom-qmp-phy.txt | 5 + + .../devicetree/bindings/phy/qcom-qusb2-phy.txt | 1 + + .../devicetree/bindings/phy/rcar-gen3-phy-usb2.txt | 2 + + Documentation/devicetree/bindings/phy/ti-phy.txt | 1 + + drivers/phy/freescale/Kconfig | 2 +- + drivers/phy/qualcomm/phy-qcom-qmp.c | 140 +++++++++++++++++++++ + drivers/phy/qualcomm/phy-qcom-qmp.h | 4 + + drivers/phy/qualcomm/phy-qcom-qusb2.c | 40 ++++++ + drivers/phy/qualcomm/phy-qcom-ufs-i.h | 19 +-- + drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 48 +++---- + drivers/phy/ti/Kconfig | 6 +- + drivers/phy/ti/phy-omap-usb2.c | 105 ++++++++++------ + 13 files changed, 283 insertions(+), 92 deletions(-) +Merging tty/tty-next (defe3b6d7010 Merge 5.0-rc2 into tty-next) +$ git merge tty/tty-next +Merge made by the 'recursive' strategy. + drivers/tty/serial/clps711x.c | 23 +-- + drivers/tty/serial/max310x.c | 7 +- + drivers/tty/serial/qcom_geni_serial.c | 279 +++++++++++++--------------------- + drivers/tty/serial/sc16is7xx.c | 4 +- + drivers/tty/serial/sh-sci.c | 71 +++++---- + 5 files changed, 158 insertions(+), 226 deletions(-) +Merging char-misc/char-misc-next (4ad84cb56b00 mei: squash single_recv_buf into one bit in client properties) +$ git merge char-misc/char-misc-next +Auto-merging lib/Kconfig.debug +Merge made by the 'recursive' strategy. + drivers/misc/lkdtm/core.c | 11 ++--------- + drivers/misc/lkdtm/lkdtm.h | 2 ++ + drivers/misc/lkdtm/perms.c | 36 +++++++++++++++++++++++++++--------- + drivers/misc/mei/hw.h | 3 ++- + lib/Kconfig.debug | 1 - + 5 files changed, 33 insertions(+), 20 deletions(-) +Merging extcon/extcon-next (bfeffd155283 Linux 5.0-rc1) +$ git merge extcon/extcon-next +Already up to date. +Merging soundwire/next (bfeffd155283 Linux 5.0-rc1) +$ git merge soundwire/next +Already up to date. +Merging thunderbolt/next (bfeffd155283 Linux 5.0-rc1) +$ git merge thunderbolt/next +Already up to date. +Merging staging/staging-next (90c5f2d29fc9 Merge 5.0-rc2 into staging-next) +$ git merge staging/staging-next +Auto-merging drivers/staging/wilc1000/host_interface.c +Merge made by the 'recursive' strategy. + drivers/staging/Kconfig | 2 + + drivers/staging/Makefile | 1 + + drivers/staging/comedi/drivers/cb_pcimdas.c | 6 +- + drivers/staging/comedi/drivers/usbduxfast.c | 2 +- + drivers/staging/erofs/data.c | 6 - + drivers/staging/erofs/internal.h | 9 +- + drivers/staging/erofs/unzip_vle.c | 2 +- + drivers/staging/erofs/unzip_vle_lz4.c | 2 +- + drivers/staging/erofs/utils.c | 14 +- + drivers/staging/erofs/xattr.c | 10 +- + drivers/staging/fsl-dpaa2/ethsw/dpsw-cmd.h | 2 +- + drivers/staging/fsl-dpaa2/ethsw/dpsw.h | 2 +- + drivers/staging/fsl-dpaa2/ethsw/ethsw.h | 2 +- + drivers/staging/mt7621-dma/ralink-gdma.c | 6 +- + drivers/staging/mt7621-dts/gbpc1.dts | 4 +- + drivers/staging/mt7621-dts/mt7621.dtsi | 55 ++- + drivers/staging/mt7621-pci-phy/Kconfig | 7 + + drivers/staging/mt7621-pci-phy/Makefile | 1 + + drivers/staging/mt7621-pci-phy/TODO | 4 + + .../mt7621-pci-phy/mediatek,mt7621-pci-phy.txt | 54 +++ + drivers/staging/mt7621-pci-phy/pci-mt7621-phy.c | 387 +++++++++++++++++++++ + drivers/staging/mt7621-pci/pci-mt7621.c | 250 ++----------- + drivers/staging/mt7621-pinctrl/Kconfig | 1 + + drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c | 41 +-- + drivers/staging/rtl8192e/dot11d.c | 8 +- + drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 6 +- + drivers/staging/rts5208/ms.c | 5 +- + drivers/staging/rts5208/sd.c | 7 +- + drivers/staging/speakup/Kconfig | 32 +- + drivers/staging/wilc1000/host_interface.c | 2 +- + drivers/staging/wlan-ng/prism2fw.c | 5 +- + 31 files changed, 605 insertions(+), 330 deletions(-) + create mode 100644 drivers/staging/mt7621-pci-phy/Kconfig + create mode 100644 drivers/staging/mt7621-pci-phy/Makefile + create mode 100644 drivers/staging/mt7621-pci-phy/TODO + create mode 100644 drivers/staging/mt7621-pci-phy/mediatek,mt7621-pci-phy.txt + create mode 100644 drivers/staging/mt7621-pci-phy/pci-mt7621-phy.c +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 (714e53a78f6f interconnect: Revert to previous config if any request fails) +$ git merge icc/icc-next +Auto-merging drivers/Makefile +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 | 6 + + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/interconnect/Kconfig | 15 + + drivers/interconnect/Makefile | 6 + + drivers/interconnect/core.c | 799 ++++++++++++++++++++ + 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, 2217 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 (8160320bd8eb Merge branch 'topic/imx' into next) +$ git merge slave-dma/next +Auto-merging drivers/dma/xilinx/xilinx_dma.c +Auto-merging drivers/dma/imx-sdma.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/dma/snps-dma.txt | 2 - + .../devicetree/bindings/dma/xilinx/xilinx_dma.txt | 7 +- + drivers/dma/at_hdmac.c | 5 - + drivers/dma/bcm2835-dma.c | 3 +- + drivers/dma/dma-jz4780.c | 5 +- + drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 2 +- + drivers/dma/dw/Kconfig | 2 + + drivers/dma/dw/Makefile | 2 +- + drivers/dma/dw/core.c | 245 ++++----------------- + drivers/dma/dw/dw.c | 138 ++++++++++++ + drivers/dma/dw/idma32.c | 160 ++++++++++++++ + drivers/dma/dw/internal.h | 15 +- + drivers/dma/dw/pci.c | 53 +++-- + drivers/dma/dw/platform.c | 22 +- + drivers/dma/dw/regs.h | 30 ++- + drivers/dma/imx-sdma.c | 7 + + drivers/dma/mv_xor.c | 5 +- + drivers/dma/pl330.c | 1 - + drivers/dma/qcom/bam_dma.c | 4 +- + drivers/dma/qcom/hidma_mgmt.c | 3 +- + drivers/dma/sa11x0-dma.c | 2 - + drivers/dma/st_fdma.c | 6 +- + drivers/dma/stm32-dma.c | 71 +++++- + drivers/dma/stm32-dmamux.c | 58 ++++- + drivers/dma/stm32-mdma.c | 56 ++++- + drivers/dma/tegra20-apb-dma.c | 45 ++-- + drivers/dma/xilinx/xilinx_dma.c | 166 ++++++++------ + drivers/tty/serial/8250/8250_lpss.c | 1 - + include/linux/dma/dw.h | 9 +- + include/linux/platform_data/dma-dw.h | 12 +- + include/trace/events/tegra_apb_dma.h | 61 +++++ + 31 files changed, 792 insertions(+), 406 deletions(-) + create mode 100644 drivers/dma/dw/dw.c + create mode 100644 drivers/dma/dw/idma32.c + create mode 100644 include/trace/events/tegra_apb_dma.h +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 (6de89c8b7dbe Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +CONFLICT (content): Merge conflict in drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +Auto-merging drivers/scsi/arcmsr/arcmsr_hba.c +CONFLICT (content): Merge conflict in drivers/scsi/arcmsr/arcmsr_hba.c +Resolved 'drivers/scsi/arcmsr/arcmsr_hba.c' using previous resolution. +Resolved 'drivers/scsi/hisi_sas/hisi_sas_v3_hw.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 14d1524d3d1c] Merge remote-tracking branch 'scsi/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/scsi/Kconfig | 2 +- + drivers/scsi/arcmsr/arcmsr.h | 13 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 332 ++++++--- + drivers/scsi/bnx2i/bnx2i_iscsi.c | 2 +- + drivers/scsi/gdth.c | 1286 +++++--------------------------- + drivers/scsi/gdth.h | 30 - + drivers/scsi/gdth_ioctl.h | 89 --- + drivers/scsi/gdth_proc.c | 113 +-- + drivers/scsi/gdth_proc.h | 3 - + drivers/scsi/hisi_sas/hisi_sas.h | 47 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 508 +++++++++++++ + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 9 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 174 ++++- + drivers/scsi/sd.c | 62 ++ + drivers/scsi/sd.h | 62 -- + 15 files changed, 1237 insertions(+), 1495 deletions(-) +Merging scsi-mkp/for-next (326a859b2814 scsi: ufs: Remove select of phy-qcom-ufs from ufs-qcom) +$ git merge scsi-mkp/for-next +Auto-merging drivers/scsi/qla4xxx/ql4_os.c +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging drivers/scsi/qla2xxx/qla_isr.c +Auto-merging drivers/scsi/qla2xxx/qla_def.h +Auto-merging drivers/scsi/qla2xxx/qla_attr.c +Merge made by the 'recursive' strategy. + drivers/scsi/Kconfig | 2 - + drivers/scsi/libsas/sas_expander.c | 29 +++- + drivers/scsi/qla2xxx/qla_attr.c | 21 ++- + drivers/scsi/qla2xxx/qla_def.h | 28 ++++ + drivers/scsi/qla2xxx/qla_gbl.h | 3 +- + drivers/scsi/qla2xxx/qla_iocb.c | 335 ++++++++++++++++++++++++++++++------- + drivers/scsi/qla2xxx/qla_isr.c | 11 ++ + drivers/scsi/qla2xxx/qla_os.c | 205 +++++++++++++++++++++-- + drivers/scsi/qla2xxx/qla_target.c | 2 +- + drivers/scsi/qla2xxx/qla_target.h | 2 + + drivers/scsi/ufs/Kconfig | 1 - + include/scsi/libsas.h | 56 +++---- + 12 files changed, 586 insertions(+), 109 deletions(-) +Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker) +$ git merge target-updates/for-next +Already up to date. +Merging target-bva/for-next (60cc43fc8884 Linux 4.17-rc1) +$ git merge target-bva/for-next +Already up to date. +Merging vhost/linux-next (b03f1d919455 virtio_balloon: remove the unnecessary 0-initialization) +$ git merge vhost/linux-next +Auto-merging include/linux/compiler.h +CONFLICT (content): Merge conflict in include/linux/compiler.h +Auto-merging Documentation/memory-barriers.txt +Resolved 'include/linux/compiler.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7e642c02ba58] 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/misc/mic/vop/vop_main.c | 9 ++- + drivers/net/virtio_net.c | 29 ++++++--- + drivers/pci/setup-bus.c | 10 ++++ + drivers/remoteproc/remoteproc_virtio.c | 9 ++- + drivers/s390/virtio/virtio_ccw.c | 12 +++- + drivers/vhost/scsi.c | 20 ++++--- + drivers/vhost/vhost.c | 8 ++- + drivers/virtio/virtio_balloon.c | 104 ++++++++++++++++++++++----------- + drivers/virtio/virtio_mmio.c | 9 ++- + drivers/virtio/virtio_pci_common.c | 8 +-- + drivers/virtio/virtio_ring.c | 13 +++-- + include/asm-generic/barrier.h | 18 ++++++ + include/linux/compiler.h | 6 +- + include/linux/virtio_config.h | 13 +++-- + 16 files changed, 213 insertions(+), 76 deletions(-) +Merging rpmsg/for-next (e9856d7eb6e4 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Auto-merging Documentation/devicetree/bindings/soc/qcom/qcom,glink.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/remoteproc/qcom,adsp.txt | 6 ++ + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 64 +++++++++++++++++++++- + .../devicetree/bindings/soc/qcom/qcom,glink.txt | 5 ++ + drivers/remoteproc/qcom_q6v5_mss.c | 12 +++- + drivers/remoteproc/qcom_wcnss.c | 2 +- + drivers/remoteproc/remoteproc_debugfs.c | 26 +++++++++ + drivers/rpmsg/rpmsg_core.c | 3 +- + include/linux/remoteproc.h | 4 +- + 8 files changed, 114 insertions(+), 8 deletions(-) +Merging gpio/for-next (08589fe40380 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-mvebu.c | 11 +++++++++++ + drivers/gpio/gpio-sama5d2-piobu.c | 20 ++++++++------------ + drivers/gpio/gpiolib-acpi.c | 5 ++++- + 3 files changed, 23 insertions(+), 13 deletions(-) +Merging gpio-brgl/gpio/for-next (0bfb75115506 Documentation: gpio: driver: fix wire name for I2C) +$ git merge gpio-brgl/gpio/for-next +Auto-merging drivers/gpio/gpio-pca953x.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/gpio/gpio-pca953x.txt | 1 + + Documentation/driver-api/gpio/driver.rst | 2 +- + drivers/gpio/gpio-madera.c | 2 +- + drivers/gpio/gpio-pca953x.c | 1 + + 4 files changed, 4 insertions(+), 2 deletions(-) +Merging pinctrl/for-next (489d4832bfba Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + .../pinctrl/marvell,armada-37xx-pinctrl.txt | 24 +- + drivers/pinctrl/freescale/Kconfig | 7 + + drivers/pinctrl/freescale/Makefile | 1 + + drivers/pinctrl/freescale/pinctrl-imx8qm.c | 326 +++++++++++++++++++++ + drivers/pinctrl/mediatek/Kconfig | 3 + + drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 8 +- + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 11 +- + drivers/pinctrl/pinctrl-amd.c | 2 +- + drivers/pinctrl/pinctrl-mcp23s08.c | 3 +- + drivers/pinctrl/sirf/pinctrl-atlas7.c | 4 +- + 10 files changed, 373 insertions(+), 16 deletions(-) + create mode 100644 drivers/pinctrl/freescale/pinctrl-imx8qm.c +Merging pinctrl-samsung/for-next (651022382c7f Linux 4.20-rc1) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (7ca17b207127 pwm: imx: Signedness bug in imx_pwm_get_state()) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + drivers/pwm/Kconfig | 17 ++- + drivers/pwm/Makefile | 3 +- + drivers/pwm/core.c | 10 +- + drivers/pwm/pwm-imx1.c | 199 ++++++++++++++++++++++++++++++ + drivers/pwm/{pwm-imx.c => pwm-imx27.c} | 217 +++++++++------------------------ + include/linux/pwm.h | 37 +++--- + 6 files changed, 293 insertions(+), 190 deletions(-) + create mode 100644 drivers/pwm/pwm-imx1.c + rename drivers/pwm/{pwm-imx.c => pwm-imx27.c} (59%) +Merging userns/for-next (ee17e5d6201c signal: Make siginmask safe when passed a signal of 0) +$ git merge userns/for-next +Merge made by the 'recursive' strategy. + include/linux/signal.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (bfeffd155283 Linux 5.0-rc1) +$ 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 (e1fd0398d1e7 Merge branch 'for-5.1/fake-signal' into for-next) +$ git merge livepatching/for-next +Auto-merging lib/Kconfig.debug +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-kernel-livepatch | 12 - + Documentation/livepatch/callbacks.txt | 489 +----------- + Documentation/livepatch/cumulative-patches.txt | 102 +++ + Documentation/livepatch/livepatch.txt | 182 +++-- + MAINTAINERS | 1 + + include/linux/livepatch.h | 50 +- + kernel/livepatch/core.c | 822 +++++++++++++-------- + kernel/livepatch/core.h | 5 + + kernel/livepatch/patch.c | 57 +- + kernel/livepatch/patch.h | 5 +- + kernel/livepatch/transition.c | 124 ++-- + kernel/livepatch/transition.h | 1 - + lib/Kconfig.debug | 22 +- + lib/Makefile | 2 + + lib/livepatch/Makefile | 15 + + lib/livepatch/test_klp_atomic_replace.c | 57 ++ + lib/livepatch/test_klp_callbacks_busy.c | 43 ++ + lib/livepatch/test_klp_callbacks_demo.c | 121 +++ + lib/livepatch/test_klp_callbacks_demo2.c | 93 +++ + lib/livepatch/test_klp_callbacks_mod.c | 24 + + lib/livepatch/test_klp_livepatch.c | 51 ++ + lib/livepatch/test_klp_shadow_vars.c | 236 ++++++ + samples/livepatch/livepatch-callbacks-demo.c | 13 +- + samples/livepatch/livepatch-sample.c | 13 +- + samples/livepatch/livepatch-shadow-fix1.c | 14 +- + samples/livepatch/livepatch-shadow-fix2.c | 14 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/livepatch/Makefile | 8 + + tools/testing/selftests/livepatch/README | 43 ++ + tools/testing/selftests/livepatch/config | 1 + + tools/testing/selftests/livepatch/functions.sh | 203 +++++ + .../testing/selftests/livepatch/test-callbacks.sh | 587 +++++++++++++++ + .../testing/selftests/livepatch/test-livepatch.sh | 168 +++++ + .../selftests/livepatch/test-shadow-vars.sh | 60 ++ + 34 files changed, 2603 insertions(+), 1036 deletions(-) + create mode 100644 Documentation/livepatch/cumulative-patches.txt + create mode 100644 lib/livepatch/Makefile + create mode 100644 lib/livepatch/test_klp_atomic_replace.c + create mode 100644 lib/livepatch/test_klp_callbacks_busy.c + create mode 100644 lib/livepatch/test_klp_callbacks_demo.c + create mode 100644 lib/livepatch/test_klp_callbacks_demo2.c + create mode 100644 lib/livepatch/test_klp_callbacks_mod.c + create mode 100644 lib/livepatch/test_klp_livepatch.c + create mode 100644 lib/livepatch/test_klp_shadow_vars.c + create mode 100644 tools/testing/selftests/livepatch/Makefile + create mode 100644 tools/testing/selftests/livepatch/README + create mode 100644 tools/testing/selftests/livepatch/config + create mode 100644 tools/testing/selftests/livepatch/functions.sh + create mode 100755 tools/testing/selftests/livepatch/test-callbacks.sh + create mode 100755 tools/testing/selftests/livepatch/test-livepatch.sh + create mode 100755 tools/testing/selftests/livepatch/test-shadow-vars.sh +Merging coresight/next (675e806209e0 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 (c8c97a4fb52c rtc: isl1208: fix negative digital trim reporting) +$ git merge rtc/rtc-next +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/rtc/rtc.txt | 2 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + MAINTAINERS | 6 + + drivers/rtc/Kconfig | 9 + + drivers/rtc/Makefile | 1 + + drivers/rtc/lib.c | 6 +- + drivers/rtc/rtc-isl1208.c | 9 +- + drivers/rtc/rtc-pcf8523.c | 1 + + drivers/rtc/rtc-sd3078.c | 232 +++++++++++++++++++++ + 9 files changed, 260 insertions(+), 7 deletions(-) + create mode 100644 drivers/rtc/rtc-sd3078.c +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 (3b0548784079 eeprom: at24: remove at24_platform_data) +$ git merge at24/at24/for-next +Removing include/linux/platform_data/at24.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 - + arch/arm/mach-davinci/board-da830-evm.c | 13 +-- + arch/arm/mach-davinci/board-da850-evm.c | 28 ----- + arch/arm/mach-davinci/board-dm365-evm.c | 13 +-- + arch/arm/mach-davinci/board-dm644x-evm.c | 13 +-- + arch/arm/mach-davinci/board-dm646x-evm.c | 13 +-- + arch/arm/mach-davinci/board-mityomapl138.c | 38 ++++--- + arch/arm/mach-davinci/board-sffsdr.c | 13 ++- + arch/arm/mach-davinci/common.c | 15 --- + drivers/misc/eeprom/at24.c | 162 +++++++++++++---------------- + include/linux/davinci_emac.h | 1 - + include/linux/platform_data/at24.h | 60 ----------- + 12 files changed, 122 insertions(+), 248 deletions(-) + delete mode 100644 include/linux/platform_data/at24.h +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 +Auto-merging drivers/ntb/hw/mscc/ntb_hw_switchtec.c +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 0365f9324876] 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 (bfeffd155283 Linux 5.0-rc1) +$ 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 (81648d8bc222 slimbus: core: add missing spin_lock_init on txn_lock) +$ git merge slimbus/for-next +Merge made by the 'recursive' strategy. + drivers/slimbus/core.c | 45 +++++++++++++++++++++++++-------------------- + 1 file changed, 25 insertions(+), 20 deletions(-) +Merging nvmem/for-next (ff3b9b5c6b1b nvmem: core: Avoid useless iterations in nvmem_cell_get_from_lookup()) +$ git merge nvmem/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/nvmem/imx-ocotp.txt | 4 ++- + drivers/nvmem/bcm-ocotp.c | 37 +++++++++++---------- + drivers/nvmem/core.c | 38 +++++++++++++--------- + drivers/nvmem/imx-ocotp.c | 13 ++++++++ + drivers/nvmem/sc27xx-efuse.c | 12 ++++--- + 5 files changed, 66 insertions(+), 38 deletions(-) +Merging xarray/xarray (edcddd4c879a XArray: Fix an arithmetic error in xa_is_err) +$ git merge xarray/xarray +Merge made by the 'recursive' strategy. + Documentation/core-api/xarray.rst | 15 ++- + include/linux/xarray.h | 227 ++++++++++++++++++++++++++++---------- + lib/test_xarray.c | 57 ++++++++-- + lib/xarray.c | 92 ++++++++------- + 4 files changed, 278 insertions(+), 113 deletions(-) +Merging hyperv/hyperv-next (651022382c7f Linux 4.20-rc1) +$ git merge hyperv/hyperv-next +Already up to date. +Merging auxdisplay/auxdisplay (bfeffd155283 Linux 5.0-rc1) +$ git merge auxdisplay/auxdisplay +Already up to date. +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 pidfd/for-next (4607de57fff5 selftests: add tests for pidfd_send_signal()) +$ git merge pidfd/for-next +Auto-merging tools/testing/selftests/Makefile +Auto-merging fs/proc/base.c +Merge made by the 'recursive' strategy. + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + fs/proc/base.c | 9 + + include/linux/proc_fs.h | 6 + + include/linux/syscalls.h | 3 + + include/uapi/asm-generic/unistd.h | 4 +- + kernel/signal.c | 133 +++++++++- + kernel/sys_ni.c | 1 + + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/pidfd/Makefile | 6 + + tools/testing/selftests/pidfd/pidfd_test.c | 381 +++++++++++++++++++++++++++++ + 11 files changed, 539 insertions(+), 7 deletions(-) + create mode 100644 tools/testing/selftests/pidfd/Makefile + create mode 100644 tools/testing/selftests/pidfd/pidfd_test.c +$ git am -3 ../patches/0001-Revert-drm-imx-Allow-building-under-COMPILE_TEST.patch +Applying: Revert "drm/imx: Allow building under COMPILE_TEST" +Merging akpm-current/current (f531bf6f8e5e ipc: conserve sequence numbers in extended IPCMNI mode) +$ git merge --no-ff akpm-current/current +Auto-merging security/selinux/ss/services.c +CONFLICT (content): Merge conflict in security/selinux/ss/services.c +Auto-merging security/selinux/ss/policydb.c +Auto-merging mm/rmap.c +CONFLICT (content): Merge conflict in mm/rmap.c +Removing lib/flex_array.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/signal.c +Auto-merging kernel/exit.c +Auto-merging include/linux/sched.h +Removing include/linux/flex_array.h +Auto-merging fs/proc/internal.h +Auto-merging fs/proc/base.c +Auto-merging fs/fuse/inode.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/afs/super.c +Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +Auto-merging drivers/infiniband/hw/hfi1/init.c +Auto-merging drivers/hv/hv_balloon.c +Auto-merging drivers/block/mtip32xx/mtip32xx.c +Auto-merging block/blk-core.c +Removing Documentation/flexible-arrays.txt +Removing Documentation/core-api/flexible-arrays.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'mm/rmap.c' using previous resolution. +Resolved 'security/selinux/ss/services.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 02bf9bc148ee] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 3 + + Documentation/admin-guide/mm/pagemap.rst | 9 +- + Documentation/core-api/flexible-arrays.rst | 130 --- + Documentation/core-api/genalloc.rst | 2 +- + Documentation/core-api/generic-radix-tree.rst | 12 + + Documentation/core-api/index.rst | 1 + + Documentation/filesystems/proc.txt | 7 +- + Documentation/flexible-arrays.txt | 123 --- + arch/alpha/include/asm/topology.h | 3 +- + arch/arm/mm/dma-mapping.c | 2 +- + arch/arm/mm/mmu.c | 13 +- + arch/arm64/Kconfig | 4 + + arch/arm64/include/asm/hugetlb.h | 5 + + arch/arm64/mm/hugetlbpage.c | 20 + + arch/c6x/include/asm/Kbuild | 1 + + arch/c6x/include/uapi/asm/Kbuild | 1 - + arch/c6x/mm/dma-coherent.c | 9 +- + arch/h8300/include/asm/Kbuild | 1 + + arch/h8300/include/uapi/asm/Kbuild | 1 - + arch/hexagon/include/asm/Kbuild | 1 + + arch/hexagon/include/uapi/asm/Kbuild | 1 - + arch/ia64/kernel/numa.c | 2 +- + arch/ia64/mm/discontig.c | 6 +- + arch/m68k/include/asm/Kbuild | 1 + + arch/m68k/include/uapi/asm/Kbuild | 1 - + arch/microblaze/include/asm/Kbuild | 1 + + arch/microblaze/include/uapi/asm/Kbuild | 1 - + arch/microblaze/mm/init.c | 5 +- + arch/nds32/mm/init.c | 12 +- + arch/openrisc/include/asm/Kbuild | 1 + + arch/openrisc/include/uapi/asm/Kbuild | 1 - + arch/openrisc/mm/ioremap.c | 11 +- + arch/powerpc/include/asm/pci-bridge.h | 3 +- + arch/powerpc/kernel/paca.c | 19 +- + arch/powerpc/kernel/pci-common.c | 3 +- + arch/powerpc/kernel/setup-common.c | 4 +- + arch/powerpc/kernel/setup_64.c | 24 +- + arch/powerpc/mm/hash_utils_64.c | 6 +- + arch/powerpc/mm/numa.c | 14 +- + arch/powerpc/mm/pgtable-book3e.c | 8 +- + arch/powerpc/mm/pgtable-book3s64.c | 5 +- + arch/powerpc/mm/pgtable-radix.c | 25 +- + arch/powerpc/mm/ppc_mmu_32.c | 3 +- + arch/powerpc/platforms/pasemi/iommu.c | 5 +- + arch/powerpc/platforms/powernv/memtrace.c | 5 +- + arch/powerpc/platforms/powernv/opal.c | 3 +- + arch/powerpc/platforms/pseries/setup.c | 18 +- + arch/powerpc/sysdev/dart_iommu.c | 7 +- + arch/s390/numa/numa.c | 14 +- + arch/sh/kernel/syscalls/syscalltbl.sh | 4 +- + arch/sh/kernel/syscalls_32.S | 2 +- + arch/sh/mm/init.c | 18 +- + arch/sh/mm/numa.c | 5 +- + arch/sparc/include/asm/pgtable_64.h | 30 - + arch/sparc/kernel/pci_fire.c | 3 +- + arch/sparc/kernel/pci_schizo.c | 3 +- + arch/sparc/kernel/prom_64.c | 7 +- + arch/sparc/kernel/psycho_common.c | 3 +- + arch/sparc/kernel/sbus.c | 3 +- + arch/sparc/mm/init_64.c | 15 +- + arch/unicore32/include/asm/Kbuild | 1 + + arch/unicore32/include/uapi/asm/Kbuild | 1 - + arch/unicore32/mm/mmu.c | 14 +- + arch/x86/include/asm/pci.h | 3 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 7 +- + arch/x86/kernel/smpboot.c | 3 +- + arch/x86/mm/fault.c | 2 +- + block/blk-core.c | 3 +- + drivers/block/mtip32xx/mtip32xx.c | 5 +- + drivers/dma/dmaengine.c | 4 +- + drivers/hv/hv_balloon.c | 20 +- + drivers/infiniband/hw/hfi1/affinity.c | 3 +- + drivers/infiniband/hw/hfi1/init.c | 3 +- + drivers/iommu/dmar.c | 5 +- + drivers/iommu/intel-iommu.c | 3 +- + drivers/md/raid5-ppl.c | 6 +- + drivers/md/raid5.c | 87 +- + drivers/md/raid5.h | 9 +- + drivers/misc/sgi-xp/xpc_uv.c | 3 +- + drivers/misc/sram-exec.c | 2 +- + drivers/misc/vmw_balloon.c | 32 + + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 +- + drivers/xen/balloon.c | 24 +- + fs/9p/vfs_super.c | 2 +- + fs/afs/super.c | 2 +- + fs/btrfs/disk-io.c | 2 +- + fs/buffer.c | 56 +- + fs/dax.c | 7 + + fs/eventpoll.c | 173 +++- + fs/file.c | 1 + + fs/fuse/inode.c | 2 +- + fs/ocfs2/aops.c | 22 +- + fs/ocfs2/dlm/dlmrecovery.c | 1 - + fs/ocfs2/dlm/dlmunlock.c | 6 + + fs/pipe.c | 3 +- + fs/proc/base.c | 43 +- + fs/proc/generic.c | 4 +- + fs/proc/internal.h | 1 + + fs/proc/page.c | 4 +- + fs/proc/proc_net.c | 20 + + fs/proc/task_mmu.c | 17 +- + include/linux/balloon_compaction.h | 34 +- + include/linux/compaction.h | 5 +- + include/linux/device.h | 2 +- + include/linux/flex_array.h | 149 --- + include/linux/genalloc.h | 2 +- + include/linux/generic-radix-tree.h | 231 +++++ + include/linux/gfp.h | 7 +- + include/linux/hugetlb.h | 48 +- + include/linux/ipc_namespace.h | 1 + + include/linux/kernel.h | 2 +- + include/linux/ksm.h | 7 + + include/linux/memblock.h | 41 + + include/linux/memcontrol.h | 37 +- + include/linux/memory_hotplug.h | 2 +- + include/linux/mm.h | 100 +- + include/linux/mm_types.h | 73 +- + include/linux/mmu_notifier.h | 35 +- + include/linux/mmzone.h | 2 + + include/linux/nodemask.h | 15 +- + include/linux/page-flags.h | 11 +- + include/linux/pagemap.h | 1 + + include/linux/poison.h | 3 - + include/linux/sched.h | 14 + + include/linux/sched/signal.h | 18 + + include/linux/slub_def.h | 2 +- + include/linux/swap.h | 13 +- + include/net/sctp/structs.h | 15 +- + include/uapi/linux/binfmts.h | 2 +- + include/uapi/linux/kernel-page-flags.h | 2 +- + init/init_task.c | 3 +- + init/main.c | 5 + + ipc/ipc_sysctl.c | 14 +- + ipc/util.c | 29 +- + ipc/util.h | 46 +- + kernel/crash_core.c | 2 + + kernel/dma/remap.c | 2 +- + kernel/events/uprobes.c | 3 +- + kernel/exit.c | 15 +- + kernel/fork.c | 1 + + kernel/kthread.c | 3 +- + kernel/locking/lockdep.c | 19 + + kernel/panic.c | 10 +- + kernel/power/snapshot.c | 17 +- + kernel/ptrace.c | 15 +- + kernel/sched/core.c | 3 + + kernel/sched/fair.c | 15 +- + kernel/signal.c | 2 +- + kernel/sysctl.c | 49 +- + lib/Kconfig.debug | 18 + + lib/Makefile | 6 +- + lib/cpumask.c | 3 +- + lib/debugobjects.c | 66 +- + lib/flex_array.c | 398 -------- + lib/genalloc.c | 5 +- + lib/generic-radix-tree.c | 217 ++++ + lib/test_vmalloc.c | 551 +++++++++++ + mm/compaction.c | 1038 +++++++++++++++----- + mm/filemap.c | 223 +++-- + mm/huge_memory.c | 25 +- + mm/hugetlb.c | 18 +- + mm/internal.h | 24 +- + mm/khugepaged.c | 3 +- + mm/ksm.c | 38 +- + mm/madvise.c | 3 +- + mm/memblock.c | 64 ++ + mm/memcontrol.c | 51 +- + mm/memory.c | 48 +- + mm/memory_hotplug.c | 82 +- + mm/mempolicy.c | 4 +- + mm/migrate.c | 9 +- + mm/mprotect.c | 3 +- + mm/mremap.c | 3 +- + mm/oom_kill.c | 8 +- + mm/page_alloc.c | 709 ++++++++----- + mm/page_ext.c | 5 +- + mm/page_owner.c | 4 +- + mm/page_poison.c | 2 + + mm/rmap.c | 6 +- + mm/slab.h | 4 - + mm/slub.c | 7 +- + mm/swap_state.c | 16 +- + mm/swapfile.c | 156 ++- + mm/vmalloc.c | 59 +- + net/core/pktgen.c | 3 +- + net/openvswitch/flow.h | 1 - + net/openvswitch/flow_netlink.h | 1 - + net/openvswitch/flow_table.c | 51 +- + net/openvswitch/flow_table.h | 3 +- + net/qrtr/qrtr.c | 3 +- + net/sctp/stream.c | 105 +- + net/sctp/stream_interleave.c | 2 +- + scripts/checkpatch.pl | 6 +- + scripts/decode_stacktrace.sh | 9 +- + 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/numa.h | 16 + + tools/include/linux/poison.h | 3 - + tools/perf/bench/numa.c | 7 +- + tools/testing/selftests/proc/.gitignore | 1 + + tools/testing/selftests/proc/Makefile | 1 + + tools/testing/selftests/proc/proc-loadavg-001.c | 2 +- + .../selftests/proc/proc-self-map-files-002.c | 2 +- + tools/testing/selftests/proc/proc-self-syscall.c | 2 +- + tools/testing/selftests/proc/proc-self-wchan.c | 2 +- + tools/testing/selftests/proc/read.c | 2 +- + tools/testing/selftests/proc/setns-dcache.c | 129 +++ + tools/testing/selftests/vm/run_vmtests | 16 + + tools/testing/selftests/vm/test_vmalloc.sh | 176 ++++ + tools/vm/page-types.c | 2 +- + 214 files changed, 4562 insertions(+), 2453 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/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 lib/test_vmalloc.c + create mode 100644 tools/include/linux/numa.h + create mode 100644 tools/testing/selftests/proc/setns-dcache.c + create mode 100644 tools/testing/selftests/vm/test_vmalloc.sh +$ 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: include/linux/sched/signal.h: replace `tsk' with `task' +Applying: locking/atomics: build atomic headers as required +Applying: kernel/fork.c: remove duplicated include +Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + f9621904f6dd...e5a18af204a6 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (e5a18af204a6 drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow) +$ git merge --no-ff akpm/master +Removing include/linux/atomic-fallback.h +Removing include/asm-generic/atomic-long.h +Removing include/asm-generic/atomic-instrumented.h +Merge made by the 'recursive' strategy. + Kbuild | 18 +- + Makefile | 8 +- + arch/arm64/include/asm/atomic.h | 2 +- + arch/x86/include/asm/atomic.h | 2 +- + drivers/media/platform/sti/delta/delta-ipc.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/sched/signal.h | 51 +- + kernel/fork.c | 1 - + scripts/Makefile.genheader | 23 + + scripts/atomic/check-atomics.sh | 2 +- + 13 files changed, 64 insertions(+), 5144 deletions(-) + 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 + 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..0701901499a5 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20190118 |