diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-01-30 18:37:55 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-01-30 18:37:55 +1100 |
| commit | 02495e76ded5a6009403fc79ffd27dc50539c723 (patch) | |
| tree | 9e9c603cc5af5e749825515bcb95eaadac774efd | |
| parent | 13bc1bb54fbcc205285e9bb64da5d3034c9f4f47 (diff) | |
| download | linux-next-20190130.tar.gz linux-next-20190130.tar.xz | |
Add linux-next specific files for 20190130next-20190130
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 297 | ||||
| -rw-r--r-- | Next/Trees | 299 | ||||
| -rw-r--r-- | Next/merge.log | 7317 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 7916 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..b6ce07161756 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,297 @@ +Name SHA1 +---- ---- +origin 4aa9fc2a435abe95a1e8d7f8c7b3d6356514b37a +fixes d8d0c3a7f6011a3c3c5bcf433f41d42ce9720faf +kbuild-current 7c2614bf7a1fc0da0743129e5b60af82f34cde55 +arc-current 46c95568661cffda4d710ca336920ee8d1c09e80 +arm-current c2a3831df6dc164af66d8d86cf356a90c021b86f +arm64-fixes 7fa1e2e6afa7f4c9f46528e61de6a15d9e8dffd9 +m68k-current bed1369f51901b17108a4bb4f7210aab183bea42 +powerpc-fixes 7bea7ac0ca0121798f3618d16201ca4dc4e67a00 +sparc b71acb0e372160167bf6d5500b88b30b52ccef6e +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net d07e1e0febe10b65eecd3205ad3bd1e999754887 +bpf 2fa53f8924223e81cd85e19f0c2caf110f086752 +ipsec 6fb6e6371f8c463020a41cc0ed1915e140219c3d +netfilter bfe2599dd2f958de54ccfb11b209797e737a99b5 +ipvs b2e3d68d1251a051a620f9086e18f7ffa6833b5b +wireless-drivers 13e62626c578d9889ebbda7c521be5adff9bef8e +mac80211 93183bdbe73bbdd03e9566c8dc37c9d06b0d0db6 +rdma-fixes 6ab4aba00f811a5265acc4d3eb1863bb3ca60562 +sound-current 693abe11aa6b27aed6eb8222162f8fb986325cef +sound-asoc-fixes 2563c3f2fca30a28f0a14835a09ac74409b16b56 +regmap-fixes f17b5f06cb92ef2250513a1e154c47b78df07d40 +regulator-fixes 79ad4d0d5f3fe489ef92df20ba51db9855ddf7c6 +spi-fixes c96ca22831959b3e5140b881dc76bc8c45c7936a +pci-current 0084379b5a13b2b39135cd21f9b29d3b2e529acc +driver-core.current ff9fb72bc07705c00795ca48631f7fffe24d2c6b +tty.current f17b5f06cb92ef2250513a1e154c47b78df07d40 +usb.current f17b5f06cb92ef2250513a1e154c47b78df07d40 +usb-gadget-fixes 87b6d2c56825c3119a0e64cc208ae6d795810a2e +usb-serial-fixes 527c1e567ead03ec21f6707e79c166ce680f17f7 +usb-chipidea-fixes d6d768a0ec3c088a88635c64620e1fb34e298aef +phy 827cb0323928952c0db9515aba9d534fb1285b3f +staging.current f17b5f06cb92ef2250513a1e154c47b78df07d40 +char-misc.current f17b5f06cb92ef2250513a1e154c47b78df07d40 +soundwire-fixes bfeffd155283772bbe78c6a05dec7c0128ee500c +thunderbolt-fixes f17b5f06cb92ef2250513a1e154c47b78df07d40 +input-current 94803aef3533676194c772383472636c453e3147 +crypto-current 356690d029e10f1aadebc49819d3908d5f6389fb +ide adf040ddd00152bda99aa9bc2afef9075ac88b34 +vfio-fixes 9a71ac7e15a723e90fc40388b4b92eefaabf747c +kselftest-fixes 7d4e591bc051d3382c45caaa2530969fb42ed23d +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 67fc5dc8a541e8f458d7f08bf88ff55933bf9f9d +at91-fixes bfeffd155283772bbe78c6a05dec7c0128ee500c +omap-fixes dc30e70391376ba3987aeb856ae6d9c0706534f1 +kvm-fixes 826c1362e79abcd36f99092acd083b5a2d576676 +kvms390-fixes 40ebdb8e59df36e2cc71810bd021a0808b16c956 +hwmon-fixes 2a2ec4aa0577ec0b7df2d1bde5c84ed39a8637cb +nvdimm-fixes 11189c1089da413aa4b5fd6be4c4d47c78968819 +btrfs-fixes 351a823f6c45ea2b7d2ceeee5c9b2558ac93cfae +vfs-fixes 61aa329d0762352e2dfa934d49670f21e016162f +dma-mapping-fixes 60d8cd572f655aac6107a2330dced004ad1fe3d7 +i3c-fixes f36c1f9a8dfd6a78e6c3fe7aff5e722b84307597 +drivers-x86-fixes 6a730fcb9cb472ba2d42b26a50ac65dacdd68882 +samsung-krzk-fixes bfeffd155283772bbe78c6a05dec7c0128ee500c +pinctrl-samsung-fixes 651022382c7f8da46cb4872a545ee1da6d097d2a +devicetree-fixes 5fa98c2eda35fcd1a1d91a9785c390f54688240c +scsi-fixes 8437fcf14deed67e5ad90b5e8abf62fb20f30881 +drm-fixes f0e7ce1eef5854584dfb59b3824a67edee37580f +drm-intel-fixes a49a17226febf314212a25100d2484af67f31428 +mmc-fixes 3751e008da0df4384031bd66a516c0292f915605 +rtc-fixes bfeffd155283772bbe78c6a05dec7c0128ee500c +gnss-fixes bfeffd155283772bbe78c6a05dec7c0128ee500c +hyperv-fixes 52d3b4949192e93b948daaa40678fcd4b94bcbd0 +drm-misc-fixes 053ff09f1a8f2151339f9fda457c5250929d1c49 +kbuild e83ffce1336b0a3e0901e6274e8e6d616798f911 +compiler-attributes 058b472f20355515e1b4d4c43c83d06dcf11838d +leaks 9f84a0f7f1a613335a9aaf0abd5858906752bf93 +dma-mapping 8b1cce9f5832a8eda17d37a3c49fb7dd2d650f46 +asm-generic 2b3c5a99d5f314960e00950c1782eac9361de30f +arc 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +arm 8f839a25b9cc37b528ae2d70e172c8c0c2eca98b +arm64 0bd3ef34d2a8dd4056560567073d8bfc5da92e39 +arm-perf c061ce249f9bd21a7b6effa46a99563b876f76b6 +arm-soc f217b8e70c76fd3b7f16a660d299c6da4de524ca +actions fb9c1c1deb5ece57810afdbd743358d02e632d2c +alpine 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +amlogic 59f249fca4f07de4476da4e0c9200c6359470721 +aspeed d5e12a2c968dfaef6dc4e925f08c89cd6d83a294 +at91 3850dd7a32a067e749302d0868e453af464714d9 +bcm2835 1ee128f4fff29c1938f25160b0dafbe9feb57d1f +imx-mxs acb0617082048a235e2a1cffdf103f12d62cfb8d +keystone a74cab3c7dcb6b9ce985c1d3832bc8f1676cc59b +mediatek ecee13a082e07d1dcce194a12089774b3e5189cd +mvebu b5f034845e70916fd33e172fad5ad530a29c10ab +omap e6e7b013aca01a78d86335626e01538942761e78 +reset c979dbf59987f4114fdbd491c8ad254343a430fd +qcom bfcc60e88dbc0d4cf873002fe13ef883111ced73 +renesas b716e58aa0d052c19efd8506064daf166ea1a583 +rockchip 21123b35a4e8e2db114330091d6be6baf3d4bd36 +samsung bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +samsung-krzk bb44f1be0b93bc28eebcbfa4d85697ce2b8bd43c +sunxi 03c80f694271e365d9cd732669613a4cc431f00c +tegra 45bfb6b333ab0035bd4f5d722b5645a29dd719a3 +clk 15961a572b903fa724ffab374fce4e88da93db66 +clk-samsung bfeffd155283772bbe78c6a05dec7c0128ee500c +c6x 8adcc59974b8a65b7eac7d503364837c297139bc +csky 7ea322d0f83baa0face3185ff8b4e9179e658a6e +h8300 21c7acc439b55d0569d7c2fc2eea5194b3910406 +ia64 c51836246f9772dfab8ca7bb945f4a566fe502d5 +m68k 28713169d879b67be2ef2f84dcf54905de238294 +m68knommu 4aa9fc2a435abe95a1e8d7f8c7b3d6356514b37a +microblaze 226a893bbb1f4495d7139fd57143475ada0de61d +mips ce680c8c99fdcefd99ca845b256f9db2c6c3847d +nds32 bfeffd155283772bbe78c6a05dec7c0128ee500c +nios2 1c286267aedf5c9bd8e1ef66ca2583009b930281 +openrisc 57ce8ba0fd3a95bf29ed741df1c52bd591bf43ff +parisc-hd 4f0b56cc0a9fa0a18b5d2fd961c37333a081c2b7 +powerpc 63da6caeb84cfad3d1e5774b7049dd1d2c9dec62 +fsl 63d86876f32440a45b6f9d42ab2fb7f68b3a8bf7 +risc-v-pjw 467e050e9760fc31dcf854ec88401e18419f5f78 +risc-v 801009424e05cf110f016d7fac7fcf20ef94941a +sifive 467e050e9760fc31dcf854ec88401e18419f5f78 +s390 7dd541a3fb34b34f0f25154dd0d24d0d9b1ca0f3 +sparc-next b71acb0e372160167bf6d5500b88b30b52ccef6e +sh ac21fc2dcb405cf250ad3f1228f64f64930d9211 +uml 940b241d9050fc354f68c182e99fc3da1ff36bc0 +xtensa 20d45b2c3fe9ff1d0facb5d56826d0ce3c8f1783 +fscrypt f5e55e777cc93eae1416f0fa4908e8846b6d7825 +befs 55d945e2e4aa148ef38bdfabb9569af78183a539 +btrfs 29dcea88779c856c7dc92040a0c01233263101d4 +btrfs-kdave 35dccd9c1e978732e0b9a0f685251c915849c0e1 +ceph 74827ee29565f86e2a64495a5e3e58d3371d74ee +cifs c4627e66f73a28c5515b908c90c2bf7120086497 +configfs cc57c07343bd071cdf1915a91a24ab7d40c9b590 +ecryptfs 5dcea554d5cefa6dcecd57cc2563bd48d3c892d6 +ext3 e92dfb845b3376f5ef1bbedbd0ce09106fac7dbc +ext4 191ce17876c9367819c4b0a25b503c0f6d9054d8 +f2fs cd2dcebde8b8088b8ad77184ee3a1e81fd3da6ba +fuse 5a86a6974d5289763af7be79e3fcfc697f034e21 +jfs 2e3bc6125154c691e987e2554f2c99ec10f83b73 +nfs f17b5f06cb92ef2250513a1e154c47b78df07d40 +nfs-anna 8fc75bed96bb94e23ca51bd9be4daf65c57697bf +nfsd 978c707df559141e16e124ab59c7f243453f4f06 +orangefs 22fc9db296fcf7ac30151c52765a7fba10870ab7 +overlayfs 2424e1c7256c7fe28748181637bc69e9b6bbe469 +ubifs e58725d51fa8da9133f3f1c54170aa2e43056b91 +v9fs 3bbe8b1a4ae9585e9cf15e7036bf9e5374a482df +xfs 4ea899ead2786a30aaa8181fefa81a3df4ad28f6 +file-locks bf77ae4c98d721a9aae3840970d46669a78e034a +vfs 1fab5fff0a7ae1fa3b78383a78f7a56f03a3d673 +printk 15ff2069cb7f967dae6a8f8c176ba51447c75f00 +pci 4cd74d833a4d0cc004b0ce702703ca95f202a625 +pstore 182ca6e0ae23550cf98d05daeab8dcb7fdc0a928 +hid 67288613d46d70506213e8578283823c90751885 +i2c 44783efdfed190088066d4c3470766c28da38a21 +i3c 25ac3da61ba144f8dbfe377eeec6b1da7ad0854a +dmi 57361846b52bc686112da6ca5368d11210796804 +hwmon-staging bb3b529277b612cae7cc340883fe52b8a4ed328b +jc_docs 31f433307043cf14ba1057ce4b8eaac17a2c617f +v4l-dvb c9d06df612977a88c484668ad0a37bc8e4463b22 +v4l-dvb-next 76097fe1aee6baedbbbf95475263dc357d8432e4 +fbdev 890d14d2d4b57ff5a149309da3ed36c8a529987f +pm 3c778e685bced91d0b7b6ca3e05b2e16d1b90dcd +cpufreq-arm 5887f50a1a61b3b42feebe26d8a1ac0bd3dd1c64 +cpupower bfeffd155283772bbe78c6a05dec7c0128ee500c +opp dd7ac2422a9b19d55b56a5435658d18dbbdbe3bc +thermal 301c9a43e158f80cbaa01e9e91509c98bb1f01ca +thermal-soc 9d216211fded20fff301d0317af3238d8383634c +ieee1394 c820518f6ca150d099aaeb7b71ad9e96c61113c0 +dlm 49a57857aeea06ca831043acbb0fa5e0f50602fd +swiotlb 227a76b64718888c1687cc237463aa000ae6fb2b +rdma b360ce3b2be9fb93d7ba7ecdcb4eb16d7e469998 +net-next c829f5f52db9bae0379b98fca2645f6ca9b0fb1e +bpf-next 3d2af27a84a8474e510f5d8362303bfbee946308 +ipsec-next 590ce401c207fd944827eb5aa5e87d834eddb149 +mlx5-next ce4eee5340a966f633fee1e8603aafd223ca394a +netfilter-next 0604628bb03ae695f61b872cc59f1933a8379625 +nfc-next 1f008cfec5d529b30ca8da1a1f5fbbd457c10382 +ipvs-next e2f7cc72cbf42e037229d8bd998966569662442f +wireless-drivers-next 64e2330580fbbfa7077ef2f608555f07e0bb4956 +bluetooth 017a01ccfbc5a35aed83acbf2ee2735f8c3efe8a +mac80211-next 2ec56f9180091a7ff5e178bdca7672c912d74326 +gfs2 2abbf9a4d262511999ac11b4ddc8521c9ee72b88 +mtd b0dd77a796423ad3c609b6708260adca85a0798f +nand e74745d96478d2458181ba6d68ac47f8e7ff7836 +spi-nor a2126b0a010905e57ec8c855c58596098a3839ab +crypto 231baecdef7a906579925ccf1bd45aa734f32320 +drm f91168f48556486743392b8838e20afbd84b7b7a +drm-intel 5b0bd14dcc6bf0d28ad908aa1b8835667f860c84 +drm-tegra f48c11644859c6fa0a4e306452ae6591220e734c +drm-misc 1ff494813bafa127ecba1160262ba39b2fdde7ba +drm-msm 8aa82766de12d11a7e00d02b6d74349f57a8219e +hdlcd d664b851eb2bcdf84a3c063cf59457bb15bc6120 +mali-dp 874cf192964e05dc6f8103aa8bbcd090a7541312 +imx-drm 257ff80474ab506c65c25ce1664dc3ea55f5ed31 +etnaviv fd4b77e8deea9cced6c1eca8bd64d2f03fc7cc94 +kconfig bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +regmap 66fb181d6f824f7695417e8c19560c5b57dc8c2d +sound 45571bb871b217f1031045a27d935ea7c6ea5d12 +sound-asoc eab2c1d1b13f29e885ed37330a7bf4937920d1ea +modules 93d77e7f1410c366050d6035dcba1a5167c7cf0b +input 281d5e66e01ee372a070099aa9c1395569ebfcc1 +block fae5efba43c2c8ae1aacf8f8753c3ec0b2a2a437 +device-mapper 075c18c3e124a1511ebc10a89f1858c8a77dcb01 +pcmcia 95691e3eddc41da2d1cd3cca51fecdfb46bd85bc +mmc a5511c25e0ee155e075ccfd891c24a00c141a1c8 +kgdb 3bd67b37e35069b43cc5de8d138727360c503e8f +md e820d55cb99dd93ac2dc949cf486bb187e5cd70d +mfd c52b8fd546d86a54b22d3fa58cc1d131d6c6cb89 +backlight 3cee7a7d05b11038c8b5fa093e45c6f839ffc867 +battery f83a6ece6997fe64ce9b02e8169c3fb43c68ea55 +regulator c1ea5094ece55a5d5cd934ce3a75b76d461814cc +security f3e6bad019c7d04e8b4ac9bf961fd1396d7c850b +apparmor 43aa09fee2f08c8d90a4f35d4c8c711362afcaee +integrity cd0b86fe9529cb4234bf816306c475da8714055e +selinux e6f2f381e4015386a656a369835f949c26000e6b +tpmdd ba3efe943bc20a26b42cbdead7b91b8ec0f182bc +watchdog f17b5f06cb92ef2250513a1e154c47b78df07d40 +iommu c6770d3f7e18f3a8a9bb470fd3e51e94d93c68e5 +dwmw2-iommu d8a5b80568a9cb66810e75b182018e9edb68e8ff +vfio 8ba35b3a0046d6573c98f00461d9bd1b86250d35 +trivial 75a24b822d383489badd343cab4cb171d09f93ef +audit 05c7a9cb2727cd3c3d8e767f48e5cd18486a8d16 +devicetree 42e45a9449f1376d4decd751612a48f6db1f6e37 +mailbox d69e11648e486ee0f21cb246f687b083f0d4e124 +spi f3b96ecc159a5d04dbbb5c422cb887d1ccae128f +tip e65b1e5fc13b55f1943ba39d9b6a06686e463def +clockevents 7cd6dca3600d8d71328950216688ecd00015d1ce +edac-amd 912ebd99edfa1d1695083fa6d34ac878346ac66b +irqchip 2380a22b60ce6f995eac806e69c66e397b59d045 +ftrace 3d739c1f6156c70eb0548aa288dcfbac9e0bd162 +rcu 9c3bfe49dfc203d8e42ba18974c9c350d5407b80 +kvm bfeffd155283772bbe78c6a05dec7c0128ee500c +kvm-arm 33a69773ef34263661607632e1076974b3a872c9 +kvm-ppc ae59a7e1945bc2245bbb587071ca737e00daf443 +kvms390 7aedd9d48f2a8332c2c51a40d2dca8c097f0dcdb +xen-tip 8d2df8a2d0fa59d1214841202d8e9176057c42ae +percpu 718f6757a29b6698391fcd0231eb8266bf86c66c +workqueues 4d43d395fed124631ca02356c711facb90185175 +drivers-x86 e7706a4359f0f172b5f2ab6807f421145041c393 +chrome-platform bfeffd155283772bbe78c6a05dec7c0128ee500c +hsi 3a658e09a215586918044d8f8b8358eb14fa3f7d +leds 0f85e8498a482cbfdab91fb2d1b81c6c8c1cfd15 +ipmi 2b835103f84d4c366433ca467618bcf822d447e2 +driver-core 0fe6f7874d467456da6f6a221dd92499a3ab1780 +usb c9381e185fdcf86e9d7966d638c933894f87cdd7 +usb-gadget 1c7fc5cbc33980acd13d668f1c8f0313d6ae9fd8 +usb-serial a49e1abf07701600ad5ef990e56d676cbab91bf5 +usb-chipidea-next 9049fce897edae50835a8f799d4b05f67a538e9a +phy-next 49ee1406355eb29227bcb5a5808247581ca6a725 +tty 83b21ed0fc2a7b17c6b9d4f72f664841f797380b +char-misc fdddcfd9c93c6db006004fa5ba7fd9380e721c3f +extcon a9857d45edf3bdda325fadefbf962ca94f34a3fd +soundwire bfeffd155283772bbe78c6a05dec7c0128ee500c +thunderbolt f17b5f06cb92ef2250513a1e154c47b78df07d40 +staging d61b5d546af21e886aafcc9182f5ac5935a3177d +mux a1ad5ff63944ea4c3666d9a454fb3203930829a0 +icc 1c7fc5cbc33980acd13d668f1c8f0313d6ae9fd8 +slave-dma 84aca9e007d251c2ffb6461697a1bd99722f123c +cgroup 0623413ee0ba5c1f56e1d453e316257c7b6b2583 +scsi e999fb7cc97cf90c4db5529697bd8c30931ad2b1 +scsi-mkp ede2afb9c8ed784cdf1b6de9cd02f044668b842a +target-updates 1c130ae00b769a2e2df41bad3d6051ee8234b636 +target-bva 60cc43fc888428bb2f18f08997432d426a243338 +vhost ae5d11d206fce924efcaa8127ffdbdb60c660d7a +rpmsg ac1b79e486310908d9ca50e2ee587c6805d981e6 +gpio 6292247c07f91a1e9d05f221ce0480ce849c92ce +gpio-brgl c131d98b590c133a1a48ea729c2107c38fffe592 +pinctrl fb5ed1b8df2b003d77a38a601a14286caaf7ceee +pinctrl-samsung 651022382c7f8da46cb4872a545ee1da6d097d2a +pwm 7ca17b207127240b1e4c8687ba7b9077e655336d +userns ee17e5d6201c66492a0e8053190fca2ed2b8457d +ktest 6cd110a91f52197e3392809cd43466bfe2c524d0 +random 05cbbb6f9ed50c9a64a25c1903712681d4480edb +kselftest bfeffd155283772bbe78c6a05dec7c0128ee500c +y2038 4ad44aba07b74fdba867d53b4d61bb1facd946fa +livepatching d85ce23d3c207e6d458a23b2d4f256af7a38504f +coresight 8b60fb322bd4d37d8ae0d46eac228b84fe147d6a +rtc 42986fb8119928d32e585c73181f39506937a3b2 +nvdimm 8a6f7591ddf5085ba2f4cd34539dc5e0e077207d +at24 3b0548784079f3961a18f010ce7c607ad1437be9 +ntb d9842b39e9ecc32533a81b234dcf5876b2b184f7 +kspp be1944712d8e339c5c371dbd377bcd20308c5eb3 +init_task e1e871aff3ded26348c631b1370e257d401cd22d +cisco 84a401a2750628747120a1ff6a54e846bbb9c5f1 +gnss f9eb86fddaf2e9a40c79e6ae69865eb6c8913a6e +fsi d20810530b7109a95abef5130e6dcec09c5180d7 +siox 1e4b044d22517cae7047c99038abb444423243ca +slimbus 81648d8bc2224278494dd7d7bcbdc428457832ed +nvmem c86d78c459db1e468410538e2143eb5d37416d69 +xarray edcddd4c879af48ec922d680b2d56834c085683b +hyperv 27207b76011fc71bc742b6a66038c8b9a81ff62c +auxdisplay 49a57857aeea06ca831043acbb0fa5e0f50602fd +kgdb-dt 97498c96a1869f6e8563a042e490f187a39f68e7 +pidfd 5d4254ab421b2057ae9d44dc5f0bc1c8b12e116a +kspp-gustavo f993bd3e061d7e0ccf1808d0e5a0ead749e05f60 +akpm-current fc4d4bfc99dadacb276ab575cd3d4fc4e46e136d +akpm 89a0c92d44f5f256de1ed55aab4f03e5084c26c7 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..e175c0354faa --- /dev/null +++ b/Next/Trees @@ -0,0 +1,299 @@ +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/livepatching/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 +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +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..dcc7eda30f5c --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,7317 @@ +$ date -R +Wed, 30 Jan 2019 09:12:31 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 4aa9fc2a435a Revert "mm, memory_hotplug: initialize struct pages for the full memory section" +Merging origin/master (4aa9fc2a435a Revert "mm, memory_hotplug: initialize struct pages for the full memory section") +$ git merge origin/master +Already up to date. +Merging fixes/master (d8d0c3a7f601 x86/syscalls: Mark expected switch fall-throughs) +$ git merge fixes/master +Auto-merging drivers/scsi/lpfc/lpfc_nvme.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/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 +++++++++++++------- + 44 files changed, 217 insertions(+), 88 deletions(-) +Merging kbuild-current/fixes (7c2614bf7a1f Merge tag '5.0-rc3-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (46c95568661c ARCv2: Enable unaligned access in early ASM code) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/boot/dts/abilis_tb100.dtsi | 58 ++++++++++++++++---------------- + arch/arc/boot/dts/abilis_tb100_dvk.dts | 14 ++++---- + arch/arc/boot/dts/abilis_tb101.dtsi | 58 ++++++++++++++++---------------- + arch/arc/boot/dts/abilis_tb101_dvk.dts | 14 ++++---- + arch/arc/boot/dts/abilis_tb10x.dtsi | 60 +++++++++++++++++----------------- + arch/arc/boot/dts/axc001.dtsi | 6 ++-- + arch/arc/boot/dts/axc003.dtsi | 16 ++++----- + arch/arc/boot/dts/axc003_idu.dtsi | 16 ++++----- + arch/arc/boot/dts/axs10x_mb.dtsi | 22 ++++++------- + arch/arc/boot/dts/hsdk.dts | 4 +-- + arch/arc/boot/dts/vdk_axc003.dtsi | 4 +-- + arch/arc/boot/dts/vdk_axc003_idu.dtsi | 4 +-- + arch/arc/boot/dts/vdk_axs10x_mb.dtsi | 18 +++++----- + arch/arc/kernel/head.S | 8 +++++ + 14 files changed, 155 insertions(+), 147 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 +Already up to date. +Merging m68k-current/for-linus (bed1369f5190 m68k: Fix memblock-related crashes) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (7bea7ac0ca01 powerpc/syscalls: Fix syscall tracing) +$ git merge powerpc-fixes/fixes +Already up to date. +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 (d07e1e0febe1 MAINTAINERS: Add entry for XDP (eXpress Data Path)) +$ git merge net/master +Merge made by the 'recursive' strategy. + MAINTAINERS | 18 ++ + drivers/net/caif/caif_serial.c | 5 +- + drivers/net/dsa/mv88e6xxx/serdes.c | 2 +- + drivers/net/ethernet/alteon/acenic.c | 2 +- + drivers/net/ethernet/altera/altera_msgdma.c | 3 +- + drivers/net/ethernet/amd/amd8111e.c | 2 +- + drivers/net/ethernet/apple/bmac.c | 2 +- + drivers/net/ethernet/broadcom/b44.c | 4 +- + drivers/net/ethernet/cadence/macb.h | 3 + + drivers/net/ethernet/cadence/macb_main.c | 28 +-- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 5 + + drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 16 +- + drivers/net/ethernet/hisilicon/hns_mdio.c | 2 +- + drivers/net/ethernet/i825xx/82596.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 25 ++- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 22 +-- + drivers/net/ethernet/mellanox/mlx5/core/lag.c | 21 +++ + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 2 + + drivers/net/ethernet/mellanox/mlx5/core/qp.c | 5 +- + drivers/net/ethernet/qlogic/qed/qed_dev.c | 8 +- + drivers/net/ethernet/qlogic/qed/qed_l2.c | 12 +- + drivers/net/ethernet/qlogic/qed/qed_l2.h | 3 + + drivers/net/ethernet/qlogic/qed/qed_ll2.c | 20 ++- + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 10 +- + drivers/net/ethernet/qlogic/qed/qed_vf.c | 10 ++ + drivers/net/ethernet/realtek/8139cp.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 4 +- + drivers/net/ethernet/ti/cpmac.c | 2 +- + drivers/vhost/net.c | 3 +- + drivers/vhost/scsi.c | 2 +- + drivers/vhost/vhost.c | 7 +- + drivers/vhost/vhost.h | 4 +- + drivers/vhost/vsock.c | 2 +- + include/net/tls.h | 2 + + net/bridge/netfilter/ebtables.c | 9 +- + net/core/dev.c | 3 + + net/decnet/dn_dev.c | 2 +- + net/ipv4/ip_vti.c | 50 ++++++ + net/ipv4/netfilter/ipt_CLUSTERIP.c | 2 +- + net/ipv6/ip6mr.c | 7 +- + net/netfilter/ipvs/ip_vs_ctl.c | 12 ++ + net/netfilter/nfnetlink_osf.c | 4 + + net/netfilter/nft_compat.c | 189 ++++++++++++++++----- + net/netrom/nr_timer.c | 20 +-- + net/rose/rose_route.c | 5 + + net/tls/tls_sw.c | 6 +- + net/xfrm/xfrm_policy.c | 63 +++---- + net/xfrm/xfrm_user.c | 13 +- + tools/testing/selftests/net/xfrm_policy.sh | 153 ++++++++++++++--- + 50 files changed, 605 insertions(+), 195 deletions(-) +Merging bpf/master (2fa53f892422 bpf, doc: add reviewers to maintainers entry) +$ git merge bpf/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 5 +++++ + net/core/filter.c | 2 ++ + net/core/skmsg.c | 3 +-- + tools/bpf/bpftool/common.c | 6 +----- + tools/bpf/bpftool/map.c | 33 ++++++++++++++++++++++++--------- + tools/bpf/bpftool/prog.c | 5 +++-- + 6 files changed, 36 insertions(+), 18 deletions(-) +Merging ipsec/master (6fb6e6371f8c net: dsa: mv88e6xxx: Fix serdes irq setup going recursive) +$ git merge ipsec/master +Already up to date. +Merging netfilter/master (bfe2599dd2f9 Merge branch 'qed-Bug-fixes') +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (b2e3d68d1251 netfilter: nft_compat: destroy function must not have side effects) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (13e62626c578 wlcore: sdio: Fixup power on/off sequence) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/intel/iwlwifi/Kconfig | 3 ++- + drivers/net/wireless/ti/wlcore/sdio.c | 15 +++++++-------- + 2 files changed, 9 insertions(+), 9 deletions(-) +Merging mac80211/master (93183bdbe73b cfg80211: extend range deviation for DMG) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (6ab4aba00f81 IB/ipoib: Fix for use-after-free in ipoib_cm_tx_start) +$ git merge rdma-fixes/for-rc +Merge made by the 'recursive' strategy. + drivers/infiniband/core/core_priv.h | 1 - + drivers/infiniband/core/device.c | 13 +++++++++--- + drivers/infiniband/core/umem_odp.c | 3 +++ + drivers/infiniband/core/uverbs_main.c | 7 +++---- + drivers/infiniband/core/uverbs_std_types_device.c | 8 +++++++- + drivers/infiniband/hw/hfi1/file_ops.c | 2 +- + drivers/infiniband/hw/hfi1/ud.c | 1 - + drivers/infiniband/hw/hns/hns_roce_srq.c | 10 ++++++++-- + drivers/infiniband/hw/mlx4/mad.c | 6 +++--- + drivers/infiniband/hw/mlx5/flow.c | 3 +-- + drivers/infiniband/hw/mlx5/odp.c | 10 +++++----- + drivers/infiniband/hw/mlx5/qp.c | 16 ++++++++------- + drivers/infiniband/hw/qib/qib_ud.c | 1 - + drivers/infiniband/sw/rdmavt/qp.c | 7 ++++++- + drivers/infiniband/ulp/ipoib/ipoib.h | 1 - + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 3 +-- + include/rdma/ib_verbs.h | 24 +++++++++++++++++++++-- + include/uapi/rdma/hns-abi.h | 5 +++++ + 18 files changed, 84 insertions(+), 37 deletions(-) +Merging sound-current/for-linus (693abe11aa6b ALSA: hda/realtek - Fixed hp_pin no value) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/core/pcm_lib.c | 9 ++++- + sound/pci/hda/patch_realtek.c | 78 +++++++++++++++++++++++++------------------ + sound/usb/quirks.c | 1 + + 3 files changed, 54 insertions(+), 34 deletions(-) +Merging sound-asoc-fixes/for-linus (2563c3f2fca3 Merge branch 'asoc-5.0' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 ++-- + sound/soc/codecs/hdmi-codec.c | 4 ++-- + sound/soc/codecs/rt5682.c | 2 ++ + sound/soc/soc-core.c | 7 ++++++- + 4 files changed, 12 insertions(+), 5 deletions(-) +Merging regmap-fixes/for-linus (f17b5f06cb92 Linux 5.0-rc4) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (79ad4d0d5f3f Merge branch 'regulator-5.0' into regulator-linus) +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/regulator/axp20x-regulator.c | 8 ++-- + drivers/regulator/bcm590xx-regulator.c | 4 ++ + drivers/regulator/da9052-regulator.c | 64 +++++++++++++-------------- + drivers/regulator/lochnagar-regulator.c | 2 +- + drivers/regulator/max77620-regulator.c | 10 ++++- + drivers/regulator/mc13783-regulator.c | 78 ++++++++++++++++----------------- + drivers/regulator/mc13892-regulator.c | 64 +++++++++++++-------------- + drivers/regulator/mc13xxx.h | 20 ++++----- + 8 files changed, 131 insertions(+), 119 deletions(-) +Merging spi-fixes/for-linus (c96ca2283195 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-mem.c | 3 +- + drivers/spi/spi-npcm-pspi.c | 3 +- + drivers/spi/spi-omap2-mcspi.c | 4 +- + drivers/spi/spi-sprd.c | 10 +++-- + drivers/spi/spi-ti-qspi.c | 6 +-- + drivers/spi/spi-topcliff-pch.c | 6 +++ + 9 files changed, 88 insertions(+), 74 deletions(-) +Merging pci-current/for-linus (0084379b5a13 Merge remote-tracking branch 'lorenzo/pci/controller-fixes' into for-linus) +$ git merge pci-current/for-linus +Merge made by the 'recursive' strategy. + arch/arm/mach-cns3xxx/pcie.c | 4 ++-- + drivers/pci/controller/dwc/pci-imx6.c | 11 +++++++---- + drivers/pci/controller/dwc/pcie-armada8k.c | 16 ---------------- + 3 files changed, 9 insertions(+), 22 deletions(-) +Merging driver-core.current/driver-core-linus (ff9fb72bc077 debugfs: return error values, not NULL) +$ git merge driver-core.current/driver-core-linus +Merge made by the 'recursive' strategy. + drivers/base/cacheinfo.c | 6 ++---- + fs/debugfs/inode.c | 46 +++++++++++++++++++++++++++++----------------- + 2 files changed, 31 insertions(+), 21 deletions(-) +Merging tty.current/tty-linus (f17b5f06cb92 Linux 5.0-rc4) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (f17b5f06cb92 Linux 5.0-rc4) +$ 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 +Already up to date. +Merging usb-serial-fixes/usb-linus (527c1e567ead USB: serial: keyspan_usa: add proper SPDX lines for .h files) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +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. +Merging phy/fixes (827cb0323928 phy: ath79-usb: Fix the main reset name to match the DT binding) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (f17b5f06cb92 Linux 5.0-rc4) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (f17b5f06cb92 Linux 5.0-rc4) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (bfeffd155283 Linux 5.0-rc1) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (f17b5f06cb92 Linux 5.0-rc4) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (94803aef3533 Input: pwm-vibra - stop regulator after disabling pwm, not before) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/keyboard/Kconfig | 2 +- + drivers/input/misc/pwm-vibra.c | 19 +++++++++++++------ + 2 files changed, 14 insertions(+), 7 deletions(-) +Merging crypto-current/master (356690d029e1 crypto: cavium/nitrox - Invoke callback after DMA unmap) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + drivers/crypto/cavium/nitrox/nitrox_reqmgr.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 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 (9a71ac7e15a7 vfio-pci/nvlink2: Fix ancient gcc warnings) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (7d4e591bc051 selftests: timers: use LDLIBS instead of LDFLAGS) +$ git merge kselftest-fixes/fixes +Merge made by the 'recursive' strategy. + .../selftests/cpu-hotplug/cpu-on-off-test.sh | 13 +++- + tools/testing/selftests/ir/Makefile | 2 + + tools/testing/selftests/net/Makefile | 2 +- + tools/testing/selftests/seccomp/seccomp_bpf.c | 72 +++++++++++++++++----- + tools/testing/selftests/timers/Makefile | 2 +- + 5 files changed, 71 insertions(+), 20 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 +Already up to date. +Merging reset-fixes/reset/fixes (26fce0557fa6 reset: imx7: Fix always writing bits as 0) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (67fc5dc8a541 MIPS: VDSO: Include $(ccflags-vdso) in o32,n32 .lds builds) +$ git merge mips-fixes/mips-fixes +Merge made by the 'recursive' strategy. + arch/mips/boot/dts/ingenic/ci20.dts | 8 ++++---- + arch/mips/boot/dts/ingenic/jz4740.dtsi | 2 +- + arch/mips/pci/pci-octeon.c | 10 +++++----- + arch/mips/vdso/Makefile | 5 +++-- + 4 files changed, 13 insertions(+), 12 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 (dc30e7039137 ARM: OMAP2+: Variable "reg" in function omap4_dsi_mux_pads() could be uninitialized) +$ git merge omap-fixes/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am335x-shc.dts | 2 +- + arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi | 2 +- + arch/arm/boot/dts/omap3-gta04.dtsi | 4 --- + arch/arm/boot/dts/omap3-n900.dts | 2 +- + arch/arm/boot/dts/omap3-n950-n9.dtsi | 42 +++++++++++++++++--------- + arch/arm/boot/dts/omap4-droid4-xt894.dts | 11 +++++++ + arch/arm/boot/dts/omap5-board-common.dtsi | 9 ++++-- + arch/arm/boot/dts/omap5-cm-t54.dts | 12 +++++++- + arch/arm/boot/dts/omap5-l4.dtsi | 2 -- + arch/arm/mach-omap2/display.c | 7 ++++- + arch/arm/mach-omap2/omap-wakeupgen.c | 36 +++++++++++++++++++++- + drivers/bus/ti-sysc.c | 6 ++-- + drivers/clocksource/timer-ti-dm.c | 5 ++- + 13 files changed, 107 insertions(+), 33 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 (2a2ec4aa0577 hwmon: (nct6775) Fix fan6 detection for NCT6793D) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + drivers/hwmon/nct6775.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging nvdimm-fixes/libnvdimm-fixes (11189c1089da acpi/nfit: Fix command-supported detection) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging btrfs-fixes/next-fixes (351a823f6c45 Merge branch 'misc-4.21' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Merge made by the 'recursive' strategy. + fs/btrfs/ctree.c | 78 ++++++++++++++++++++++++++++++++------------------ + fs/btrfs/transaction.c | 24 ++++++++++------ + fs/btrfs/volumes.c | 4 +-- + 3 files changed, 68 insertions(+), 38 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 (60d8cd572f65 arm64/xen: fix xen-swiotlb cache flushing) +$ git merge dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/master (f36c1f9a8dfd i3c: master: dw: fix deadlock) +$ git merge i3c-fixes/master +Merge made by the 'recursive' strategy. + drivers/i3c/master.c | 2 +- + drivers/i3c/master/dw-i3c-master.c | 18 ++++++++++++------ + 2 files changed, 13 insertions(+), 7 deletions(-) +Merging drivers-x86-fixes/fixes (6a730fcb9cb4 Documentation/ABI: Correct mlxreg-io KernelVersion for 5.0) +$ git merge drivers-x86-fixes/fixes +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-driver-mlxreg-io | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +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 (5fa98c2eda35 dt-bindings: Fix dt_binding_check target for in tree builds) +$ git merge devicetree-fixes/dt/linus +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/Makefile | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) +Merging scsi-fixes/fixes (8437fcf14dee scsi: 53c700: pass correct "dev" to dma_alloc_attrs()) +$ git merge scsi-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/s390/scsi/zfcp_aux.c | 1 - + drivers/s390/scsi/zfcp_scsi.c | 2 ++ + drivers/scsi/53c700.c | 2 +- + drivers/scsi/bnx2fc/bnx2fc_io.c | 4 ++-- + drivers/scsi/libfc/fc_lport.c | 6 +++--- + drivers/scsi/scsi_debug.c | 41 +++++++++++++++++++++-------------------- + 6 files changed, 29 insertions(+), 27 deletions(-) +Merging drm-fixes/drm-fixes (f0e7ce1eef58 Merge tag 'drm-msm-fixes-2019-01-24' of git://people.freedesktop.org/~robclark/linux into drm-fixes) +$ git merge drm-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (a49a17226feb drm/i915: Try to sanitize bogus DPLL state left over by broken SNB BIOSen) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/intel_display.c | 50 +++++++++++++++++++++++++++++++----- + 1 file changed, 44 insertions(+), 6 deletions(-) +Merging mmc-fixes/fixes (3751e008da0d mmc: mediatek: fix incorrect register setting of hs400_cmd_int_delay) +$ git merge mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mmc/host/bcm2835.c | 2 ++ + drivers/mmc/host/mtk-sd.c | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) +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 (52d3b4949192 hv_netvsc: fix typos in code comments) +$ git merge hyperv-fixes/hyperv-fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (053ff09f1a8f drm/rockchip: rgb: update SPDX license identifier) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_modes.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_rgb.c | 11 +---------- + drivers/gpu/drm/rockchip/rockchip_rgb.h | 11 +---------- + 3 files changed, 3 insertions(+), 21 deletions(-) +$ git am -3 ../patches/0001-Revert-drm-i915-Try-to-sanitize-bogus-DPLL-state-lef.patch +Applying: Revert "drm/i915: Try to sanitize bogus DPLL state left over by broken SNB BIOSen" +Merging kbuild/for-next (e83ffce1336b kbuild: descend to scripts/kconfig/ directly when syncconfig is needed) +$ git merge kbuild/for-next +Auto-merging Makefile +Auto-merging Documentation/devicetree/bindings/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/Makefile | 2 +- + Documentation/kbuild/kbuild.txt | 15 ++++------ + Documentation/kbuild/makefiles.txt | 9 ++---- + Makefile | 18 +++++------- + arch/mips/boot/Makefile | 2 +- + arch/powerpc/boot/Makefile | 2 +- + arch/s390/boot/Makefile | 6 ++-- + arch/s390/boot/compressed/Makefile | 4 +-- + arch/s390/scripts/Makefile.chkbss | 25 +++++++--------- + arch/x86/realmode/rm/Makefile | 3 +- + scripts/Kbuild.include | 4 +++ + scripts/Makefile.build | 21 +++++++------- + scripts/Makefile.host | 6 ++-- + scripts/Makefile.lib | 42 ++++++++++++--------------- + scripts/Makefile.modpost | 2 +- + scripts/link-vmlinux.sh | 46 +++++++----------------------- + scripts/mkcompile_h | 4 +-- + 17 files changed, 84 insertions(+), 127 deletions(-) +Merging compiler-attributes/compiler-attributes (058b472f2035 lib/crc32.c: mark crc32_le_base/__crc32c_le_base aliases as __pure) +$ git merge compiler-attributes/compiler-attributes +Merge made by the 'recursive' strategy. + include/linux/module.h | 4 ++-- + lib/crc32.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 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 (0bd3ef34d2a8 arm64: uaccess: Implement unsafe accessors) +$ git merge arm64/for-next/core +Removing arch/arm64/include/asm/memblock.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + arch/arm64/Kconfig | 3 +- + arch/arm64/include/asm/memblock.h | 21 -------- + arch/arm64/include/asm/mmu.h | 1 + + arch/arm64/include/asm/uaccess.h | 111 +++++++++++++++++++++++--------------- + arch/arm64/kernel/asm-offsets.c | 20 ------- + arch/arm64/kernel/setup.c | 1 - + arch/arm64/mm/init.c | 20 +------ + arch/arm64/mm/mmu.c | 1 - + 9 files changed, 73 insertions(+), 106 deletions(-) + delete mode 100644 arch/arm64/include/asm/memblock.h +Merging arm-perf/for-next/perf (c061ce249f9b dt-bindings: arm: Convert PMU binding to json-schema) +$ git merge arm-perf/for-next/perf +Auto-merging MAINTAINERS +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 1fe5c57c5dd1] 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 (59f249fca4f0 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 +++++++ + .../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 +- + 28 files changed, 301 insertions(+), 39 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 (1ee128f4fff2 Merge branch 'bcm2835-drivers-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-a-plus.dts | 4 +- + arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 4 +- + arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 11 +- + arch/arm/boot/dts/bcm2835-rpi-zero.dts | 4 +- + arch/arm/boot/dts/bcm2835-rpi.dtsi | 8 +- + arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 68 ++- + arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts | 175 ++++++ + arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 74 ++- + arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 74 ++- + arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi | 2 +- + 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 | 12 + + 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 + + 27 files changed, 1299 insertions(+), 49 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 (acb061708204 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 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + MAINTAINERS | 15 +- + arch/arm/boot/dts/Makefile | 4 + + 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-colibri-eval-v3.dts | 5 +- + 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/imx6qdl-apalis.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-colibri.dtsi | 4 +- + 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-phytec-pcl063.dtsi | 148 +++++ + arch/arm/boot/dts/imx6ul-phytec-peb-eval-01.dtsi | 55 ++ + .../boot/dts/imx6ul-phytec-phyboard-segin-full.dts | 89 +++ + .../arm/boot/dts/imx6ul-phytec-phyboard-segin.dtsi | 329 ++++++++++++ + arch/arm/boot/dts/imx6ul.dtsi | 8 + + arch/arm/boot/dts/imx6ull-colibri.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/boot/dts/vf610-zii-ssmb-spu3.dts | 3 + + 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 | 156 +++++- + 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 +- + 69 files changed, 3135 insertions(+), 483 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/boot/dts/imx6ul-phytec-pcl063.dtsi + create mode 100644 arch/arm/boot/dts/imx6ul-phytec-peb-eval-01.dtsi + create mode 100644 arch/arm/boot/dts/imx6ul-phytec-phyboard-segin-full.dts + create mode 100644 arch/arm/boot/dts/imx6ul-phytec-phyboard-segin.dtsi + 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 (e6e7b013aca0 Merge branch 'omap-for-v5.0/fixes-v2' into for-next) +$ git merge omap/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/am335x-chiliboard.dts | 4 + + arch/arm/boot/dts/am335x-shc.dts | 4 +- + arch/arm/boot/dts/am33xx-l4.dtsi | 2 - + arch/arm/boot/dts/am3874-iceboard.dts | 496 ++++++++++++++++++++++ + arch/arm/boot/dts/am437x-gp-evm.dts | 2 +- + arch/arm/boot/dts/dm814x.dtsi | 64 ++- + 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 +- + arch/arm/boot/dts/omap4-sdp.dts | 30 ++ + arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 131 +++++- + 13 files changed, 745 insertions(+), 22 deletions(-) + create mode 100644 arch/arm/boot/dts/am3874-iceboard.dts +Merging reset/reset/next (c979dbf59987 reset: imx7: Add support for i.MX8MQ IP block variant) +$ git merge reset/reset/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/reset/brcm,brcmstb-reset.txt | 27 ++++ + .../devicetree/bindings/reset/fsl,imx7-src.txt | 7 +- + MAINTAINERS | 1 + + arch/arm/mach-socfpga/socfpga.c | 3 +- + arch/arm/mach-sunxi/sunxi.c | 2 +- + drivers/reset/Kconfig | 12 +- + drivers/reset/Makefile | 1 + + drivers/reset/reset-brcmstb.c | 132 ++++++++++++++++ + drivers/reset/reset-imx7.c | 172 +++++++++++++++++++-- + drivers/reset/reset-socfpga.c | 2 +- + drivers/reset/reset-sunxi.c | 1 + + include/dt-bindings/reset/imx8mq-reset.h | 64 ++++++++ + include/linux/reset/socfpga.h | 7 + + include/linux/reset/sunxi.h | 7 + + 14 files changed, 416 insertions(+), 22 deletions(-) + create mode 100644 Documentation/devicetree/bindings/reset/brcm,brcmstb-reset.txt + create mode 100644 drivers/reset/reset-brcmstb.c + create mode 100644 include/dt-bindings/reset/imx8mq-reset.h + create mode 100644 include/linux/reset/socfpga.h + create mode 100644 include/linux/reset/sunxi.h +Merging qcom/for-next (bfcc60e88dbc Merge branch 'arm64-for-5.1-2' into all-for-5.1) +$ git merge qcom/for-next +Auto-merging include/linux/pm_opp.h +Auto-merging drivers/opp/core.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/opp/opp.txt | 3 + + .../devicetree/bindings/power/qcom,rpmpd.txt | 145 ++++ + MAINTAINERS | 32 +- + arch/arm/boot/dts/qcom-ipq4019.dtsi | 4 +- + arch/arm/boot/dts/qcom-msm8660.dtsi | 16 +- + .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 130 ++++ + arch/arm/boot/dts/qcom-msm8974.dtsi | 11 + + arch/arm/boot/dts/qcom-pm8941.dtsi | 1 + + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 2 + + arch/arm64/boot/dts/qcom/msm8996-pins.dtsi | 2 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 36 +- + arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi | 2 + + arch/arm64/boot/dts/qcom/msm8998.dtsi | 180 +++++ + arch/arm64/boot/dts/qcom/pm8916.dtsi | 6 + + arch/arm64/boot/dts/qcom/pms405.dtsi | 79 ++ + arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 19 + + arch/arm64/boot/dts/qcom/qcs404.dtsi | 353 +++++++++ + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 84 ++- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 794 +++++++++++++++++---- + drivers/opp/core.c | 18 + + drivers/opp/of.c | 2 + + drivers/opp/opp.h | 2 + + drivers/soc/qcom/Kconfig | 18 + + drivers/soc/qcom/Makefile | 2 + + drivers/soc/qcom/rpmhpd.c | 406 +++++++++++ + drivers/soc/qcom/rpmpd.c | 315 ++++++++ + include/dt-bindings/power/qcom-rpmpd.h | 39 + + include/linux/pm_opp.h | 7 + + 28 files changed, 2568 insertions(+), 140 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/qcom,rpmpd.txt + create mode 100644 drivers/soc/qcom/rpmhpd.c + create mode 100644 drivers/soc/qcom/rpmpd.c + create mode 100644 include/dt-bindings/power/qcom-rpmpd.h +Merging renesas/next (b716e58aa0d0 Merge branches 'arm-defconfig-for-v5.1', 'arm64-dt-for-v5.1' and 'dt-bindings-for-v5.1' into next) +$ git merge renesas/next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/arm/shmobile.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/renesas.yaml | 238 +++ + Documentation/devicetree/bindings/arm/shmobile.txt | 155 -- + MAINTAINERS | 6 +- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/r7s9210-rza2mevb.dts | 82 + + arch/arm/boot/dts/r7s9210.dtsi | 218 +++ + arch/arm/boot/dts/r8a7743.dtsi | 79 +- + arch/arm/boot/dts/r8a7744.dtsi | 188 ++- + arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts | 18 + + arch/arm/boot/dts/r8a7778.dtsi | 28 + + arch/arm/boot/dts/r8a7779.dtsi | 26 + + arch/arm/boot/dts/r8a7790-stout.dts | 15 +- + arch/arm/configs/multi_v7_defconfig | 3 + + arch/arm/configs/shmobile_defconfig | 48 +- + arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 5 + + arch/arm64/boot/dts/renesas/Makefile | 1 + + arch/arm64/boot/dts/renesas/cat875.dtsi | 40 + + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 5 +- + arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts | 97 ++ + arch/arm64/boot/dts/renesas/r8a774c0-ek874.dts | 14 + + 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 | 26 +- + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 194 +-- + arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 4 +- + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 1 + + arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 138 ++ + arch/arm64/boot/dts/renesas/ulcb.dtsi | 71 +- + arch/arm64/configs/defconfig | 3 + + include/dt-bindings/clock/r8a7778-clock.h | 2 + + 34 files changed, 3085 insertions(+), 463 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/renesas.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/shmobile.txt + create mode 100644 arch/arm/boot/dts/r7s9210-rza2mevb.dts + create mode 100644 arch/arm/boot/dts/r7s9210.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/cat875.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774c0-ek874.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774c0.dtsi +Merging rockchip/for-next (21123b35a4e8 Merge branch 'v5.1-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +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-bqcurie2.dts | 1 - + arch/arm/boot/dts/rk3066a-mk808.dts | 1 - + arch/arm/boot/dts/rk3066a-rayeager.dts | 2 - + arch/arm/boot/dts/rk3066a.dtsi | 48 ++ + arch/arm/boot/dts/rk3188-bqedison2qc.dts | 18 +- + arch/arm/boot/dts/rk3188-px3-evb.dts | 1 - + arch/arm/boot/dts/rk3188.dtsi | 1 - + arch/arm/boot/dts/rk3229-evb.dts | 1 - + arch/arm/boot/dts/rk3288-fennec.dts | 1 - + arch/arm/boot/dts/rk3288-firefly-reload.dts | 1 - + arch/arm/boot/dts/rk3288-miqi.dts | 1 - + arch/arm/boot/dts/rk3288-popmetal.dts | 1 - + arch/arm/boot/dts/rk3288-rock2-square.dts | 1 - + arch/arm/boot/dts/rk3288-tinker-s.dts | 1 - + arch/arm/boot/dts/rk3288-vyasa.dts | 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 | 28 +- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 14 + + arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi | 1 - + arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi | 1 - + .../boot/dts/rockchip/rk3368-orion-r68-meta.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts | 2 +- + 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 | 676 +++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts | 606 ++++++++++++++++++ + .../dts/rockchip/rk3399-sapphire-excavator.dts | 3 +- + drivers/clk/rockchip/clk-rk3188.c | 4 +- + drivers/clk/rockchip/clk-rk3328.c | 12 +- + 40 files changed, 1820 insertions(+), 37 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 (bb44f1be0b93 Merge branch 'next/dt' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 14 ++-- + 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, 165 insertions(+), 42 deletions(-) +Merging sunxi/sunxi/for-next (03c80f694271 Merge branch 'sunxi/dt64-for-5.1' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sram/sunxi-sram.txt | 1 + + arch/arm/boot/dts/sun4i-a10.dtsi | 44 +++++ + arch/arm/boot/dts/sun5i-a13-q8-tablet.dts | 7 +- + .../boot/dts/sun5i-reference-design-tablet.dtsi | 2 +- + arch/arm/boot/dts/sun6i-a31.dtsi | 1 + + arch/arm/boot/dts/sun7i-a20-bananapi.dts | 5 + + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 175 +++++++++++++++++-- + arch/arm/boot/dts/sun8i-a23-q8-tablet.dts | 4 + + arch/arm/boot/dts/sun8i-a23.dtsi | 20 +++ + arch/arm/boot/dts/sun8i-a33.dtsi | 194 ++++----------------- + arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 2 +- + arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts | 25 +++ + arch/arm/boot/dts/sun8i-q8-common.dtsi | 37 ++++ + 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 +- + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 3 +- + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 1 + + .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 2 +- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 32 +++- + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 36 ++-- + drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 4 +- + drivers/clk/sunxi-ng/ccu-sun8i-a23.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 2 +- + 24 files changed, 475 insertions(+), 196 deletions(-) +Merging tegra/for-next (45bfb6b333ab Merge branch for-5.1/arm64/dt into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/tegra.yaml | 2 + + .../bindings/firmware/nvidia,tegra186-bpmp.txt | 1 - + .../bindings/firmware/nvidia,tegra210-bpmp.txt | 35 + + arch/arm/mach-tegra/iomap.h | 9 + + arch/arm/mach-tegra/sleep-tegra20.S | 2 - + arch/arm/mach-tegra/sleep-tegra30.S | 25 +- + arch/arm64/boot/dts/nvidia/Makefile | 1 + + arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 18 +- + arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 10 +- + arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 10 +- + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 18 +- + .../boot/dts/nvidia/tegra210-p2894-0050-a08.dts | 9 + + arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi | 1858 ++++++++++++++++++++ + arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 3 +- + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 2 +- + drivers/firmware/tegra/Makefile | 2 + + drivers/firmware/tegra/bpmp-private.h | 29 + + drivers/firmware/tegra/bpmp-tegra186.c | 305 ++++ + drivers/firmware/tegra/bpmp-tegra210.c | 243 +++ + drivers/firmware/tegra/bpmp.c | 366 ++-- + drivers/soc/tegra/fuse/fuse-tegra.c | 12 +- + drivers/soc/tegra/fuse/speedo-tegra210.c | 2 +- + drivers/soc/tegra/pmc.c | 424 +++-- + include/soc/tegra/bpmp.h | 13 +- + include/soc/tegra/pmc.h | 6 - + 25 files changed, 2994 insertions(+), 411 deletions(-) + create mode 100644 Documentation/devicetree/bindings/firmware/nvidia,tegra210-bpmp.txt + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2894-0050-a08.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi + create mode 100644 drivers/firmware/tegra/bpmp-private.h + create mode 100644 drivers/firmware/tegra/bpmp-tegra186.c + create mode 100644 drivers/firmware/tegra/bpmp-tegra210.c +Merging clk/clk-next (15961a572b90 Merge branch 'clk-json-schema' into clk-next) +$ git merge clk/clk-next +Auto-merging drivers/input/serio/olpc_apsp.c +Removing Documentation/devicetree/bindings/clock/fixed-factor-clock.txt +Removing Documentation/devicetree/bindings/clock/fixed-clock.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/fixed-clock.txt | 23 --- + .../devicetree/bindings/clock/fixed-clock.yaml | 44 +++++ + .../bindings/clock/fixed-factor-clock.txt | 28 --- + .../bindings/clock/fixed-factor-clock.yaml | 56 ++++++ + .../devicetree/bindings/clock/fixed-mmio-clock.txt | 24 +++ + .../devicetree/bindings/clock/qcom,rpmcc.txt | 1 + + .../devicetree/bindings/serio/olpc,ap-sp.txt | 4 - + drivers/clk/Kconfig | 6 + + 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.c | 14 +- + drivers/clk/imx/clk-composite-8m.c | 2 +- + drivers/clk/imx/clk-frac-pll.c | 5 +- + 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-imx7ulp.c | 16 +- + drivers/clk/imx/clk-imx8mq.c | 194 ++++++++++----------- + drivers/clk/imx/clk-vf610.c | 1 + + drivers/clk/imx/clk.h | 5 +- + drivers/clk/mmp/clk-of-mmp2.c | 4 - + 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/clk-smd-rpm.c | 63 +++++++ + drivers/clk/qcom/gcc-msm8998.c | 51 +++++- + drivers/clk/qcom/gcc-sdm845.c | 14 +- + drivers/clk/renesas/r8a774a1-cpg-mssr.c | 2 + + drivers/clk/renesas/r8a774c0-cpg-mssr.c | 8 +- + drivers/clk/samsung/clk-exynos4.c | 1 + + drivers/clk/samsung/clk.h | 2 +- + drivers/clk/socfpga/clk-gate.c | 22 ++- + drivers/clk/socfpga/clk-pll-a10.c | 1 + + drivers/clk/socfpga/clk-pll.c | 1 + + drivers/clk/ti/clk.c | 8 +- + drivers/clk/ti/divider.c | 11 +- + drivers/input/serio/olpc_apsp.c | 14 -- + include/dt-bindings/clock/marvell,mmp2.h | 1 - + include/dt-bindings/clock/qcom,rpmcc.h | 10 ++ + include/dt-bindings/clock/r8a774a1-cpg-mssr.h | 1 + + include/dt-bindings/clock/r8a774c0-cpg-mssr.h | 1 + + 47 files changed, 569 insertions(+), 262 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/fixed-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/fixed-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/fixed-factor-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/fixed-factor-clock.yaml + 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 (7ea322d0f83b irqchip/csky: Add support-vector-irq for apb-intc) +$ git merge csky/linux-next +Merge made by the 'recursive' strategy. + .../interrupt-controller/csky,apb-intc.txt | 4 + + .../bindings/interrupt-controller/csky,mpintc.txt | 21 ++- + arch/csky/include/asm/pgtable.h | 4 +- + arch/csky/include/asm/processor.h | 4 +- + arch/csky/kernel/ptrace.c | 3 +- + arch/csky/kernel/smp.c | 3 +- + drivers/irqchip/irq-csky-apb-intc.c | 151 +++++++++++++++++---- + drivers/irqchip/irq-csky-mpintc.c | 113 ++++++++++++++- + 8 files changed, 256 insertions(+), 47 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 (28713169d879 m68k: Add -ffreestanding to CFLAGS) +$ git merge m68k/for-next +Merge made by the 'recursive' strategy. + arch/m68k/Makefile | 5 ++++- + arch/m68k/apollo/Makefile | 2 +- + arch/m68k/atari/config.c | 2 +- + arch/m68k/configs/amcore_defconfig | 20 ------------------- + arch/m68k/configs/amiga_defconfig | 37 ++--------------------------------- + arch/m68k/configs/apollo_defconfig | 34 ++------------------------------ + arch/m68k/configs/atari_defconfig | 33 ++----------------------------- + arch/m68k/configs/bvme6000_defconfig | 33 ++----------------------------- + arch/m68k/configs/hp300_defconfig | 34 ++------------------------------ + arch/m68k/configs/mac_defconfig | 34 ++------------------------------ + arch/m68k/configs/multi_defconfig | 34 ++------------------------------ + arch/m68k/configs/mvme147_defconfig | 34 ++------------------------------ + arch/m68k/configs/mvme16x_defconfig | 33 ++----------------------------- + arch/m68k/configs/q40_defconfig | 38 ++---------------------------------- + arch/m68k/configs/sun3_defconfig | 33 ++----------------------------- + arch/m68k/configs/sun3x_defconfig | 34 ++------------------------------ + arch/m68k/include/asm/macints.h | 3 --- + arch/m68k/kernel/signal.c | 3 ++- + arch/m68k/mac/misc.c | 18 ++++------------- + arch/m68k/mac/via.c | 20 +++++++++++-------- + drivers/dio/dio.c | 4 ++-- + 21 files changed, 50 insertions(+), 438 deletions(-) +Merging m68knommu/for-next (4aa9fc2a435a Revert "mm, memory_hotplug: initialize struct pages for the full memory section") +$ 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 (ce680c8c99fd MIPS: OCTEON: delete unused cvmx-smix-defs.h) +$ git merge mips/mips-next +Removing arch/mips/include/asm/octeon/cvmx-smix-defs.h +Removing arch/mips/ath79/pci.h +Removing arch/mips/ath79/pci.c +Removing arch/mips/ath79/machtypes.h +Removing arch/mips/ath79/mach-ubnt-xm.c +Removing arch/mips/ath79/mach-pb44.c +Removing arch/mips/ath79/mach-db120.c +Removing arch/mips/ath79/mach-ap81.c +Removing arch/mips/ath79/mach-ap136.c +Removing arch/mips/ath79/mach-ap121.c +Removing arch/mips/ath79/irq.c +Removing arch/mips/ath79/dev-wmac.h +Removing arch/mips/ath79/dev-wmac.c +Removing arch/mips/ath79/dev-usb.h +Removing arch/mips/ath79/dev-usb.c +Removing arch/mips/ath79/dev-spi.h +Removing arch/mips/ath79/dev-spi.c +Removing arch/mips/ath79/dev-leds-gpio.h +Removing arch/mips/ath79/dev-leds-gpio.c +Removing arch/mips/ath79/dev-gpio-buttons.h +Removing arch/mips/ath79/dev-gpio-buttons.c +Removing arch/mips/ath79/dev-common.h +Removing arch/mips/ath79/dev-common.c +Auto-merging arch/mips/Kconfig +Merge made by the 'recursive' strategy. + arch/mips/Kconfig | 13 +- + arch/mips/ath79/Kconfig | 73 ----- + arch/mips/ath79/Makefile | 23 +- + arch/mips/ath79/clock.c | 342 ++++++++++------------- + arch/mips/ath79/common.h | 5 - + arch/mips/ath79/dev-common.c | 159 ----------- + arch/mips/ath79/dev-common.h | 18 -- + arch/mips/ath79/dev-gpio-buttons.c | 56 ---- + arch/mips/ath79/dev-gpio-buttons.h | 23 -- + arch/mips/ath79/dev-leds-gpio.c | 54 ---- + arch/mips/ath79/dev-leds-gpio.h | 21 -- + arch/mips/ath79/dev-spi.c | 38 --- + arch/mips/ath79/dev-spi.h | 22 -- + arch/mips/ath79/dev-usb.c | 242 ---------------- + arch/mips/ath79/dev-usb.h | 17 -- + arch/mips/ath79/dev-wmac.c | 155 ---------- + arch/mips/ath79/dev-wmac.h | 17 -- + arch/mips/ath79/irq.c | 169 ----------- + arch/mips/ath79/mach-ap121.c | 92 ------ + arch/mips/ath79/mach-ap136.c | 156 ----------- + arch/mips/ath79/mach-ap81.c | 100 ------- + arch/mips/ath79/mach-db120.c | 136 --------- + arch/mips/ath79/mach-pb44.c | 128 --------- + arch/mips/ath79/mach-ubnt-xm.c | 126 --------- + arch/mips/ath79/machtypes.h | 28 -- + arch/mips/ath79/pci.c | 273 ------------------ + arch/mips/ath79/pci.h | 35 --- + arch/mips/ath79/setup.c | 78 +----- + arch/mips/cavium-octeon/executive/cvmx-helper.c | 20 -- + arch/mips/cavium-octeon/oct_ilm.c | 32 +-- + arch/mips/include/asm/Kbuild | 1 - + arch/mips/include/asm/irqflags.h | 2 +- + arch/mips/include/asm/mach-ath79/ath79.h | 4 - + arch/mips/include/asm/mach-loongson32/platform.h | 4 - + arch/mips/include/asm/octeon/cvmx-smix-defs.h | 276 ------------------ + arch/mips/kernel/mips-r2-to-r6-emul.c | 21 +- + arch/mips/kernel/segment.c | 15 +- + arch/mips/kernel/setup.c | 7 +- + arch/mips/kernel/spinlock_test.c | 21 +- + arch/mips/kernel/unaligned.c | 16 +- + arch/mips/loongson32/Kconfig | 15 - + arch/mips/loongson32/Platform | 4 +- + arch/mips/loongson32/common/platform.c | 63 ----- + arch/mips/math-emu/me-debugfs.c | 23 +- + arch/mips/mm/dma-noncoherent.c | 2 + + arch/mips/mm/sc-debugfs.c | 15 +- + arch/mips/pci/Makefile | 1 + + arch/mips/pci/fixup-ath79.c | 21 ++ + arch/mips/ralink/bootrom.c | 8 +- + include/dt-bindings/clock/ath79-clk.h | 4 +- + 50 files changed, 228 insertions(+), 2946 deletions(-) + delete mode 100644 arch/mips/ath79/dev-common.c + delete mode 100644 arch/mips/ath79/dev-common.h + delete mode 100644 arch/mips/ath79/dev-gpio-buttons.c + delete mode 100644 arch/mips/ath79/dev-gpio-buttons.h + delete mode 100644 arch/mips/ath79/dev-leds-gpio.c + delete mode 100644 arch/mips/ath79/dev-leds-gpio.h + delete mode 100644 arch/mips/ath79/dev-spi.c + delete mode 100644 arch/mips/ath79/dev-spi.h + delete mode 100644 arch/mips/ath79/dev-usb.c + delete mode 100644 arch/mips/ath79/dev-usb.h + delete mode 100644 arch/mips/ath79/dev-wmac.c + delete mode 100644 arch/mips/ath79/dev-wmac.h + delete mode 100644 arch/mips/ath79/irq.c + delete mode 100644 arch/mips/ath79/mach-ap121.c + delete mode 100644 arch/mips/ath79/mach-ap136.c + delete mode 100644 arch/mips/ath79/mach-ap81.c + delete mode 100644 arch/mips/ath79/mach-db120.c + delete mode 100644 arch/mips/ath79/mach-pb44.c + delete mode 100644 arch/mips/ath79/mach-ubnt-xm.c + delete mode 100644 arch/mips/ath79/machtypes.h + delete mode 100644 arch/mips/ath79/pci.c + delete mode 100644 arch/mips/ath79/pci.h + delete mode 100644 arch/mips/include/asm/octeon/cvmx-smix-defs.h + create mode 100644 arch/mips/pci/fixup-ath79.c +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 (4f0b56cc0a9f parisc: remove the HBA_DATA macro) +$ 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/dma-mapping.h | 46 ----------------------------- + arch/parisc/include/asm/hardirq.h | 1 + + arch/parisc/include/asm/pci.h | 4 +-- + arch/parisc/kernel/irq.c | 19 ++++++++---- + arch/parisc/kernel/setup.c | 1 + + arch/parisc/kernel/smp.c | 1 + + arch/parisc/kernel/traps.c | 4 +-- + drivers/parisc/ccio-dma.c | 11 +++++-- + drivers/parisc/dino.c | 11 ++++--- + drivers/parisc/eisa.c | 2 ++ + drivers/parisc/hppb.c | 2 ++ + drivers/parisc/iommu.h | 55 +++++++++++++++++++++++++++++++++++ + drivers/parisc/lba_pci.c | 30 +++++++++++++------ + drivers/parisc/sba_iommu.c | 2 ++ + 17 files changed, 127 insertions(+), 95 deletions(-) + create mode 100644 drivers/parisc/iommu.h +Merging powerpc/next (63da6caeb84c powerpc: remove unnecessary unlikely()) +$ git merge powerpc/next +Auto-merging arch/powerpc/platforms/powernv/npu-dma.c +Merge made by the 'recursive' strategy. + arch/powerpc/Makefile | 4 +- + arch/powerpc/boot/dts/Makefile | 1 + + arch/powerpc/boot/dts/wii.dts | 22 +++ + .../powerpc/include/asm/book3s/64/tlbflush-radix.h | 30 +++- + arch/powerpc/include/asm/hvsi.h | 2 +- + arch/powerpc/include/asm/ipic.h | 3 - + arch/powerpc/include/asm/powernv.h | 1 - + arch/powerpc/kernel/irq.c | 5 - + arch/powerpc/kernel/traps.c | 29 ++-- + arch/powerpc/kernel/udbg.c | 2 +- + arch/powerpc/kernel/vmlinux.lds.S | 4 +- + arch/powerpc/kvm/Makefile | 5 - + arch/powerpc/math-emu/Makefile | 2 +- + arch/powerpc/mm/hash_utils_64.c | 6 +- + arch/powerpc/mm/tlb_nohash.c | 2 +- + arch/powerpc/platforms/Kconfig.cputype | 6 + + arch/powerpc/platforms/cell/spufs/file.c | 5 +- + arch/powerpc/platforms/powernv/npu-dma.c | 4 - + arch/powerpc/platforms/ps3/device-init.c | 4 +- + arch/powerpc/sysdev/ipic.c | 35 ---- + arch/powerpc/sysdev/xive/common.c | 2 +- + tools/testing/selftests/powerpc/include/reg.h | 8 + + tools/testing/selftests/powerpc/include/utils.h | 2 + + tools/testing/selftests/powerpc/tm/.gitignore | 1 + + tools/testing/selftests/powerpc/tm/Makefile | 4 +- + .../powerpc/tm/tm-signal-context-force-tm.c | 184 +++++++++++++++++++++ + 26 files changed, 277 insertions(+), 96 deletions(-) + create mode 100644 tools/testing/selftests/powerpc/tm/tm-signal-context-force-tm.c +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 (7dd541a3fb34 s390: no need to check return value of debugfs_create functions) +$ git merge s390/features +Auto-merging arch/s390/kernel/setup.c +Removing arch/s390/kernel/compat_wrapper.c +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 2 + + arch/s390/boot/string.c | 1 + + arch/s390/hypfs/hypfs.h | 6 +- + arch/s390/hypfs/hypfs_dbfs.c | 8 +- + arch/s390/hypfs/hypfs_diag.c | 9 +- + arch/s390/hypfs/hypfs_diag0c.c | 6 +- + arch/s390/hypfs/hypfs_sprp.c | 6 +- + arch/s390/hypfs/hypfs_vm.c | 3 +- + arch/s390/hypfs/inode.c | 11 +- + arch/s390/include/asm/diag.h | 12 ++ + arch/s390/include/asm/ftrace.h | 25 +++ + arch/s390/include/asm/pci.h | 1 - + arch/s390/include/asm/sclp.h | 1 + + arch/s390/include/asm/string.h | 28 ++- + arch/s390/include/asm/syscall_wrapper.h | 135 +++++++++++++++ + arch/s390/include/uapi/asm/posix_types.h | 6 + + arch/s390/kernel/Makefile | 2 +- + arch/s390/kernel/compat_linux.c | 235 +------------------------ + arch/s390/kernel/compat_wrapper.c | 186 -------------------- + arch/s390/kernel/debug.c | 6 - + arch/s390/kernel/diag.c | 1 + + arch/s390/kernel/entry.S | 4 +- + arch/s390/kernel/kdebugfs.c | 2 - + arch/s390/kernel/setup.c | 21 +++ + arch/s390/kernel/sys_s390.c | 16 +- + arch/s390/kernel/syscalls/syscall.tbl | 286 +++++++++++++++---------------- + arch/s390/kernel/sysinfo.c | 2 - + arch/s390/lib/string.c | 28 +++ + arch/s390/mm/pgtable.c | 2 - + arch/s390/pci/pci_debug.c | 15 +- + drivers/s390/char/sclp.h | 4 +- + drivers/s390/char/sclp_early.c | 2 + + include/linux/syscalls.h | 4 + + ipc/syscall.c | 20 ++- + kernel/sys_ni.c | 1 + + 35 files changed, 464 insertions(+), 633 deletions(-) + create mode 100644 arch/s390/include/asm/syscall_wrapper.h + delete mode 100644 arch/s390/kernel/compat_wrapper.c +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 (20d45b2c3fe9 Merge branch 'xtensa-5.0-fixes' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Merge made by the 'recursive' strategy. + arch/xtensa/Kconfig | 4 +-- + arch/xtensa/boot/dts/Makefile | 6 ++--- + arch/xtensa/configs/audio_kc705_defconfig | 2 +- + arch/xtensa/configs/cadence_csp_defconfig | 2 +- + arch/xtensa/configs/generic_kc705_defconfig | 2 +- + arch/xtensa/configs/nommu_kc705_defconfig | 2 +- + arch/xtensa/configs/smp_lx200_defconfig | 3 ++- + arch/xtensa/kernel/head.S | 5 +++- + arch/xtensa/kernel/smp.c | 41 +++++++++++++++++++---------- + arch/xtensa/kernel/time.c | 2 +- + drivers/irqchip/irq-xtensa-mx.c | 40 +++++++++++++++++----------- + drivers/irqchip/irq-xtensa-pic.c | 6 ++++- + 12 files changed, 73 insertions(+), 42 deletions(-) +Merging fscrypt/master (f5e55e777cc9 fscrypt: return -EXDEV for incompatible rename or link into encrypted dir) +$ git merge fscrypt/master +Removing include/linux/fscrypt_supp.h +Removing include/linux/fscrypt_notsupp.h +Merge made by the 'recursive' strategy. + Documentation/filesystems/fscrypt.rst | 16 +- + arch/mips/configs/generic_defconfig | 2 +- + arch/nds32/configs/defconfig | 2 +- + arch/s390/configs/debug_defconfig | 2 +- + arch/s390/configs/performance_defconfig | 2 +- + fs/crypto/Kconfig | 6 +- + fs/crypto/fscrypt_private.h | 1 - + fs/crypto/hooks.c | 6 +- + fs/crypto/policy.c | 3 +- + fs/ext4/Kconfig | 15 -- + fs/ext4/dir.c | 10 +- + fs/ext4/ext4.h | 12 +- + fs/ext4/ext4_jbd2.h | 2 +- + fs/ext4/extents.c | 4 +- + fs/ext4/ialloc.c | 2 +- + fs/ext4/inode.c | 24 +- + fs/ext4/ioctl.c | 4 +- + fs/ext4/move_extent.c | 3 +- + fs/ext4/namei.c | 18 +- + fs/ext4/page-io.c | 9 +- + fs/ext4/readpage.c | 5 +- + fs/ext4/super.c | 6 +- + fs/ext4/sysfs.c | 4 +- + fs/f2fs/Kconfig | 12 +- + fs/f2fs/data.c | 4 +- + fs/f2fs/dir.c | 10 +- + fs/f2fs/f2fs.h | 14 +- + fs/f2fs/file.c | 10 +- + fs/f2fs/inode.c | 4 +- + fs/f2fs/namei.c | 6 +- + fs/f2fs/super.c | 8 +- + fs/f2fs/sysfs.c | 4 +- + fs/ubifs/Kconfig | 12 +- + fs/ubifs/Makefile | 2 +- + fs/ubifs/ioctl.c | 4 +- + fs/ubifs/sb.c | 2 +- + fs/ubifs/super.c | 2 +- + fs/ubifs/ubifs.h | 5 +- + include/linux/fs.h | 4 +- + include/linux/fscrypt.h | 420 +++++++++++++++++++++++++++++++- + include/linux/fscrypt_notsupp.h | 231 ------------------ + include/linux/fscrypt_supp.h | 204 ---------------- + 42 files changed, 516 insertions(+), 600 deletions(-) + delete mode 100644 include/linux/fscrypt_notsupp.h + delete mode 100644 include/linux/fscrypt_supp.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 (35dccd9c1e97 Merge branch 'for-next-next-v5.0-20190123' into for-next-20190123) +$ git merge btrfs-kdave/for-next +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/transaction.c +Auto-merging fs/btrfs/ctree.c +Merge made by the 'recursive' strategy. + fs/btrfs/acl.c | 9 ++ + fs/btrfs/async-thread.c | 10 +- + fs/btrfs/backref.c | 16 ++- + fs/btrfs/ctree.c | 8 ++ + fs/btrfs/ctree.h | 41 +++++- + fs/btrfs/delayed-ref.c | 15 +- + fs/btrfs/delayed-ref.h | 11 -- + fs/btrfs/dev-replace.c | 8 +- + fs/btrfs/disk-io.c | 36 +++-- + fs/btrfs/extent-tree.c | 247 +++++++++++++++++++++------------ + fs/btrfs/extent_io.c | 138 ++++++++++++------- + fs/btrfs/extent_map.c | 5 +- + fs/btrfs/extent_map.h | 1 + + fs/btrfs/file.c | 5 +- + fs/btrfs/inode.c | 273 ++++++++++++++++++++++++------------- + fs/btrfs/ioctl.c | 41 ++---- + fs/btrfs/qgroup.c | 317 +++++++++++++++++++++++++++++++++---------- + fs/btrfs/qgroup.h | 127 +++++++++++++++-- + fs/btrfs/relocation.c | 101 ++++++++++---- + fs/btrfs/scrub.c | 4 +- + fs/btrfs/super.c | 3 + + fs/btrfs/transaction.c | 1 + + fs/btrfs/volumes.c | 204 +++++++++++++++------------- + fs/btrfs/volumes.h | 5 +- + include/trace/events/btrfs.h | 30 +--- + include/uapi/linux/btrfs.h | 2 + + 26 files changed, 1101 insertions(+), 557 deletions(-) +Merging ceph/master (74827ee29565 ceph: quota: cleanup license mess) +$ git merge ceph/master +Already up to date. +Merging cifs/for-next (c4627e66f73a cifs: limit amount of data we request for xattrs to CIFSMaxBufSize) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/smb2ops.c | 4 +++- + fs/cifs/smb2pdu.h | 19 +++++++++++++++---- + 2 files changed, 18 insertions(+), 5 deletions(-) +Merging configfs/for-next (cc57c07343bd configfs: fix registered group removal) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (5dcea554d5ce eCryptfs: fix a couple type promotion bugs) +$ git merge ecryptfs/next +Merge made by the 'recursive' strategy. + fs/ecryptfs/crypto.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) +Merging ext3/for_next (e92dfb845b33 Pull ext2 fixes.) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/ext2/super.c | 5 +++-- + fs/ext2/xattr.c | 1 + + 2 files changed, 4 insertions(+), 2 deletions(-) +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 (5a86a6974d52 fuse: support clients that don't implement 'opendir') +$ 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 | 341 ++++++++++++++++++++++++++-------------------- + fs/fuse/fuse_i.h | 28 ++-- + fs/fuse/inode.c | 28 ++-- + fs/fuse/readdir.c | 4 +- + include/uapi/linux/fuse.h | 7 +- + 9 files changed, 330 insertions(+), 262 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 (f17b5f06cb92 Linux 5.0-rc4) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (8fc75bed96bb NFS: Fix up return value on fatal errors in nfs_page_async_flush()) +$ git merge nfs-anna/linux-next +Merge made by the 'recursive' strategy. + fs/nfs/super.c | 5 +++++ + fs/nfs/write.c | 9 +++++---- + 2 files changed, 10 insertions(+), 4 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 (3bbe8b1a4ae9 9p: mark expected switch fall-through) +$ git merge v9fs/9p-next +Merge made by the 'recursive' strategy. + net/9p/trans_xen.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging xfs/for-next (4ea899ead278 iomap: fix a use after free in iomap_dio_rw) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/iomap.c | 37 ++++++++++++++++++++++++++++++------- + 1 file changed, 30 insertions(+), 7 deletions(-) +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 +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 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 '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 0e81829c45f1] 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 | 3 +- + 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, 4483 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 61732651031e] Merge remote-tracking branch 'vfs/for-next' + Date: Wed Jan 30 11:09:27 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 (182ca6e0ae23 pstore/ram: Replace dummy_data heap memory with stack memory) +$ git merge pstore/for-next/pstore +Merge made by the 'recursive' strategy. + fs/pstore/ram.c | 35 ++++++++++++++--------------------- + 1 file changed, 14 insertions(+), 21 deletions(-) +Merging hid/for-next (67288613d46d 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-debug.c | 120 ++++++++----------- + drivers/hid/hid-elan.c | 2 +- + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-maltron.c | 165 +++++++++++++++++++++++++++ + drivers/hid/hid-sony.c | 31 +++-- + drivers/hid/i2c-hid/i2c-hid-core.c | 9 ++ + drivers/hid/intel-ish-hid/ipc/ipc.c | 9 +- + drivers/hid/intel-ish-hid/ishtp-hid-client.c | 4 +- + drivers/hid/intel-ish-hid/ishtp-hid.h | 6 +- + drivers/hid/intel-ish-hid/ishtp/bus.c | 21 ++-- + drivers/hid/intel-ish-hid/ishtp/bus.h | 4 +- + drivers/hid/intel-ish-hid/ishtp/client.h | 2 +- + drivers/hid/intel-ish-hid/ishtp/hbm.h | 2 +- + drivers/hid/wacom_sys.c | 32 ++++++ + drivers/hid/wacom_wac.c | 21 ---- + include/linux/hid-debug.h | 9 +- + 18 files changed, 312 insertions(+), 134 deletions(-) + create mode 100644 drivers/hid/hid-maltron.c +Merging i2c/i2c/for-next (44783efdfed1 i2c: aspeed: Remove hard-coded bus timeout value setting) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + Documentation/i2c/fault-codes | 4 ++ + drivers/i2c/busses/i2c-aspeed.c | 1 - + 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 | 27 ++++++++++ + drivers/i2c/busses/i2c-s3c2410.c | 8 +-- + drivers/i2c/busses/i2c-sh_mobile.c | 105 +++++++++++++------------------------ + 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 ++++++++++++++++ + 14 files changed, 156 insertions(+), 155 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 (bb3b529277b6 hwmon: (via-cputemp) Use permission specific SENSOR[_DEVICE]_ATTR variants) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwmon/dps650ab.txt | 11 + + .../devicetree/bindings/hwmon/hih6130.txt | 12 + + .../devicetree/bindings/hwmon/ina3221.txt | 10 + + drivers/hwmon/adm1029.c | 67 +-- + 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 | 36 +- + 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/ltc4261.c | 28 +- + drivers/hwmon/max16065.c | 225 +++----- + drivers/hwmon/max1619.c | 33 +- + drivers/hwmon/max31722.c | 8 +- + drivers/hwmon/max31790.c | 6 +- + drivers/hwmon/max6639.c | 92 ++- + drivers/hwmon/max6642.c | 31 +- + drivers/hwmon/max6650.c | 6 +- + drivers/hwmon/mc13783-adc.c | 49 +- + drivers/hwmon/nct7904.c | 10 +- + drivers/hwmon/nsa320-hwmon.c | 8 +- + drivers/hwmon/pc87360.c | 427 +++++++------- + drivers/hwmon/pc87427.c | 317 +++++------ + drivers/hwmon/pmbus/pmbus.c | 64 ++- + drivers/hwmon/powr1220.c | 144 ++--- + drivers/hwmon/sch5627.c | 146 ++--- + drivers/hwmon/sch5636.c | 202 +++---- + drivers/hwmon/scmi-hwmon.c | 2 +- + drivers/hwmon/scpi-hwmon.c | 4 +- + drivers/hwmon/sht15.c | 34 +- + drivers/hwmon/sht21.c | 17 +- + drivers/hwmon/sht3x.c | 50 +- + drivers/hwmon/smsc47b397.c | 24 +- + drivers/hwmon/stts751.c | 64 +-- + drivers/hwmon/tc654.c | 60 +- + drivers/hwmon/tc74.c | 4 +- + drivers/hwmon/tmp102.c | 4 +- + drivers/hwmon/tmp103.c | 20 +- + drivers/hwmon/tmp421.c | 4 +- + drivers/hwmon/vexpress-hwmon.c | 25 +- + drivers/hwmon/via-cputemp.c | 15 +- + 66 files changed, 1901 insertions(+), 2184 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/dps650ab.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/hih6130.txt +Merging jc_docs/docs-next (31f433307043 Documentation: DMA-API: fix two typos) +$ git merge jc_docs/docs-next +Auto-merging include/linux/skbuff.h +Auto-merging Documentation/networking/index.rst +Removing Documentation/networking/checksum-offloads.txt +Merge made by the 'recursive' strategy. + Documentation/DMA-API.txt | 6 +- + 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 | 3 + + .../networking/{scaling.txt => scaling.rst} | 131 ++-- + ...tion-offloads.txt => segmentation-offloads.rst} | 48 +- + Documentation/process/coding-style.rst | 97 ++- + Documentation/process/stable-api-nonsense.rst | 3 +- + Documentation/process/stable-kernel-rules.rst | 6 +- + Documentation/sysctl/kernel.txt | 50 +- + Documentation/sysctl/vm.txt | 2 +- + .../translations/it_IT/process/coding-style.rst | 60 +- + .../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/checkpatch.pl | 13 - + scripts/kernel-doc | 2 +- + scripts/spdxcheck.py | 8 +- + tools/Makefile | 14 +- + tools/debugging/Makefile | 16 + + tools/debugging/kernel-chktaint | 202 +++++ + 41 files changed, 1901 insertions(+), 373 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/{scaling.txt => scaling.rst} (92%) + 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 (c9d06df61297 media: vicodec: get_next_header is static) +$ git merge v4l-dvb/master +Removing include/media/drv-intf/sh_mobile_ceu.h +Removing include/linux/platform_data/media/soc_camera_platform.h +Auto-merging drivers/media/platform/vim2m.c +Removing drivers/media/platform/soc_camera/soc_scale_crop.h +Removing drivers/media/platform/soc_camera/soc_scale_crop.c +Removing drivers/media/platform/soc_camera/soc_camera_platform.c +Removing drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c +Auto-merging drivers/media/pci/intel/ipu3/ipu3-cio2.c +Removing drivers/media/i2c/soc_camera/soc_tw9910.c +Removing drivers/media/i2c/soc_camera/soc_ov772x.c +Removing drivers/media/i2c/soc_camera/soc_mt9t112.c +Auto-merging MAINTAINERS +Removing Documentation/media/uapi/v4l/dev-teletext.rst +Removing Documentation/media/uapi/v4l/dev-effect.rst +Merge made by the 'recursive' strategy. + .../devicetree/bindings/media/i2c/adv748x.txt | 11 +- + .../bindings/media/i2c/melexis,mlx90640.txt | 20 + + .../devicetree/bindings/media/i2c/mt9m001.txt | 38 + + .../devicetree/bindings/media/i2c/ov5645.txt | 6 +- + .../devicetree/bindings/media/rcar_vin.txt | 9 +- + .../bindings/media/renesas,rcar-csi2.txt | 3 +- + Documentation/devicetree/bindings/media/si470x.txt | 26 + + .../devicetree/bindings/media/sun6i-csi.txt | 2 +- + Documentation/media/uapi/mediactl/request-api.rst | 4 +- + Documentation/media/uapi/v4l/buffer.rst | 11 +- + Documentation/media/uapi/v4l/dev-effect.rst | 28 - + .../uapi/v4l/{dev-codec.rst => dev-mem2mem.rst} | 41 +- + Documentation/media/uapi/v4l/dev-teletext.rst | 41 - + Documentation/media/uapi/v4l/devices.rst | 4 +- + Documentation/media/uapi/v4l/extended-controls.rst | 37 +- + Documentation/media/uapi/v4l/pixfmt-compressed.rst | 2 +- + .../media/uapi/v4l/pixfmt-meta-intel-ipu3.rst | 25 +- + .../media/uapi/v4l/vidioc-prepare-buf.rst | 5 +- + Documentation/media/uapi/v4l/vidioc-qbuf.rst | 2 +- + Documentation/media/v4l-drivers/imx.rst | 103 +- + Documentation/media/v4l-drivers/ipu3.rst | 4 +- + MAINTAINERS | 18 +- + 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 | 28 + + drivers/media/i2c/Makefile | 3 + + drivers/media/i2c/adv748x/adv748x-core.c | 214 ++- + drivers/media/i2c/adv748x/adv748x.h | 1 + + drivers/media/i2c/dw9714.c | 2 +- + drivers/media/i2c/imx274.c | 20 +- + drivers/media/i2c/mt9m001.c | 884 ++++++++++ + drivers/media/i2c/mt9m111.c | 39 + + drivers/media/i2c/ov2640.c | 45 +- + drivers/media/i2c/ov5640.c | 58 +- + drivers/media/i2c/ov7670.c | 201 ++- + drivers/media/i2c/ov8856.c | 1268 ++++++++++++++ + .../i2c/{soc_camera/soc_ov9640.c => ov9640.c} | 123 +- + drivers/media/i2c/{soc_camera => }/ov9640.h | 7 +- + drivers/media/i2c/s5k4ecgx.c | 2 - + drivers/media/i2c/soc_camera/Kconfig | 24 - + drivers/media/i2c/soc_camera/Makefile | 4 - + drivers/media/i2c/soc_camera/soc_mt9t112.c | 1157 ------------- + drivers/media/i2c/soc_camera/soc_ov772x.c | 1123 ------------ + drivers/media/i2c/soc_camera/soc_tw9910.c | 999 ----------- + drivers/media/i2c/tw9910.c | 29 +- + drivers/media/i2c/video-i2c.c | 110 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.c | 5 +- + drivers/media/pci/ivtv/Kconfig | 23 +- + drivers/media/pci/ivtv/ivtvfb.c | 16 +- + drivers/media/platform/Kconfig | 2 +- + drivers/media/platform/aspeed-video.c | 1 + + drivers/media/platform/coda/coda-bit.c | 24 +- + drivers/media/platform/coda/coda-common.c | 13 +- + drivers/media/platform/coda/coda.h | 2 + + drivers/media/platform/exynos4-is/fimc-is.c | 16 +- + drivers/media/platform/qcom/venus/core.c | 12 +- + drivers/media/platform/qcom/venus/core.h | 1 + + drivers/media/platform/qcom/venus/firmware.c | 53 +- + drivers/media/platform/qcom/venus/helpers.c | 3 - + drivers/media/platform/rcar-vin/rcar-core.c | 26 +- + drivers/media/platform/rcar-vin/rcar-csi2.c | 66 +- + drivers/media/platform/rcar-vin/rcar-dma.c | 2 +- + 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/soc_camera/Kconfig | 18 - + drivers/media/platform/soc_camera/Makefile | 8 - + .../platform/soc_camera/sh_mobile_ceu_camera.c | 1810 -------------------- + .../platform/soc_camera/soc_camera_platform.c | 188 -- + drivers/media/platform/soc_camera/soc_scale_crop.c | 426 ----- + drivers/media/platform/soc_camera/soc_scale_crop.h | 47 - + drivers/media/platform/sti/bdisp/bdisp-debug.c | 34 +- + drivers/media/platform/sti/hva/hva-debugfs.c | 36 +- + drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 1 + + drivers/media/platform/vicodec/codec-fwht.c | 148 +- + drivers/media/platform/vicodec/codec-fwht.h | 27 +- + drivers/media/platform/vicodec/codec-v4l2-fwht.c | 390 +++-- + drivers/media/platform/vicodec/codec-v4l2-fwht.h | 15 +- + drivers/media/platform/vicodec/vicodec-core.c | 646 +++++-- + drivers/media/platform/vim2m.c | 12 +- + drivers/media/platform/vimc/vimc-capture.c | 2 +- + drivers/media/platform/vimc/vimc-common.h | 2 + + drivers/media/platform/vimc/vimc-core.c | 1 - + 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/radio/si470x/radio-si470x-i2c.c | 52 +- + drivers/media/radio/si470x/radio-si470x.h | 1 + + 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/media/v4l2-core/videobuf-vmalloc.c | 20 - + drivers/staging/media/imx/imx-ic-prpencvf.c | 51 +- + drivers/staging/media/imx/imx-media-capture.c | 115 +- + drivers/staging/media/imx/imx-media-csi.c | 172 +- + drivers/staging/media/imx/imx-media-dev.c | 24 + + drivers/staging/media/imx/imx-media-utils.c | 15 +- + drivers/staging/media/imx/imx-media-vdic.c | 16 +- + drivers/staging/media/imx/imx-media.h | 2 + + 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 | 15 + + drivers/staging/media/sunxi/cedrus/cedrus_dec.h | 8 +- + drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 28 +- + drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c | 25 +- + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 8 +- + .../platform_data/media/soc_camera_platform.h | 83 - + include/media/drv-intf/sh_mobile_ceu.h | 29 - + include/media/i2c/tw9910.h | 2 - + 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 +- + samples/v4l/v4l2-pci-skeleton.c | 8 +- + 138 files changed, 5070 insertions(+), 7235 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/i2c/melexis,mlx90640.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/mt9m001.txt + create mode 100644 Documentation/devicetree/bindings/media/si470x.txt + delete mode 100644 Documentation/media/uapi/v4l/dev-effect.rst + rename Documentation/media/uapi/v4l/{dev-codec.rst => dev-mem2mem.rst} (50%) + delete mode 100644 Documentation/media/uapi/v4l/dev-teletext.rst + create mode 100644 drivers/media/i2c/mt9m001.c + create mode 100644 drivers/media/i2c/ov8856.c + rename drivers/media/i2c/{soc_camera/soc_ov9640.c => ov9640.c} (90%) + rename drivers/media/i2c/{soc_camera => }/ov9640.h (96%) + delete mode 100644 drivers/media/i2c/soc_camera/soc_mt9t112.c + delete mode 100644 drivers/media/i2c/soc_camera/soc_ov772x.c + delete mode 100644 drivers/media/i2c/soc_camera/soc_tw9910.c + delete mode 100644 drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c + delete mode 100644 drivers/media/platform/soc_camera/soc_camera_platform.c + delete mode 100644 drivers/media/platform/soc_camera/soc_scale_crop.c + delete mode 100644 drivers/media/platform/soc_camera/soc_scale_crop.h + delete mode 100644 include/linux/platform_data/media/soc_camera_platform.h + delete mode 100644 include/media/drv-intf/sh_mobile_ceu.h + 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 eb923655f970] 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 +Already up to date. +Merging pm/linux-next (3c778e685bce Merge branches 'pm-cpuidle' and 'pm-cpufreq' 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 + + drivers/acpi/Kconfig | 10 + + drivers/acpi/acpi_dbg.c | 30 +- + 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 | 93 ++--- + drivers/acpi/apei/erst.c | 27 +- + drivers/acpi/apei/hest.c | 6 + + drivers/acpi/custom_method.c | 6 - + drivers/acpi/ec_sys.c | 36 +- + drivers/acpi/tables.c | 12 +- + drivers/base/power/clock_ops.c | 13 +- + drivers/base/power/domain.c | 11 +- + drivers/base/power/runtime.c | 34 +- + 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 +- + 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/cpufreq.h | 25 +- + include/linux/cpuidle.h | 8 +- + include/linux/initrd.h | 3 + + include/linux/pm_runtime.h | 2 + + kernel/power/energy_model.c | 57 +++ + kernel/power/qos.c | 8 +- + 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 +- + 206 files changed, 1304 insertions(+), 473 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 (5887f50a1a61 MAINTAINERS: Update the active pm tree for ARM) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 13 +-- + drivers/cpufreq/Kconfig.arm | 11 ++ + drivers/cpufreq/Makefile | 1 + + drivers/cpufreq/armada-8k-cpufreq.c | 204 ++++++++++++++++++++++++++++++++++++ + drivers/cpufreq/qcom-cpufreq-hw.c | 2 +- + drivers/cpufreq/s5pv210-cpufreq.c | 67 ++++++++---- + 6 files changed, 272 insertions(+), 26 deletions(-) + create mode 100644 drivers/cpufreq/armada-8k-cpufreq.c +Merging cpupower/cpupower (bfeffd155283 Linux 5.0-rc1) +$ git merge cpupower/cpupower +Already up to date. +Merging opp/opp/linux-next (dd7ac2422a9b opp: no need to check return value of debugfs_create functions) +$ git merge opp/opp/linux-next +Auto-merging drivers/opp/opp.h +Auto-merging drivers/opp/core.c +Merge made by the 'recursive' strategy. + drivers/opp/core.c | 11 +---- + drivers/opp/debugfs.c | 110 +++++++++++++------------------------------------- + drivers/opp/opp.h | 15 ++++--- + 3 files changed, 38 insertions(+), 98 deletions(-) +Merging thermal/next (301c9a43e158 Merge branches 'for-rc' and 'thermal-intel' into next) +$ git merge thermal/next +Merge made by the 'recursive' strategy. + .../thermal/intel/int340x_thermal/int3400_thermal.c | 21 +++++++++++++++++---- + 1 file changed, 17 insertions(+), 4 deletions(-) +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 (49a57857aeea Linux 5.0-rc3) +$ 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 (b360ce3b2be9 infiniband: prefix header search paths with $(srctree)/) +$ git merge rdma/for-next +Auto-merging include/rdma/ib_verbs.h +Auto-merging drivers/infiniband/ulp/ipoib/ipoib.h +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/ocrdma/ocrdma_stats.c +Auto-merging drivers/infiniband/hw/mthca/mthca_provider.c +Auto-merging drivers/infiniband/hw/mlx5/qp.c +Auto-merging drivers/infiniband/hw/mlx5/odp.c +Auto-merging drivers/infiniband/hw/hns/hns_roce_srq.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/umem_odp.c +Auto-merging drivers/infiniband/core/device.c +Auto-merging drivers/infiniband/core/core_priv.h +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/cgroup.c | 5 +- + drivers/infiniband/core/cm.c | 3 +- + drivers/infiniband/core/cma.c | 13 +- + drivers/infiniband/core/core_priv.h | 21 +- + drivers/infiniband/core/device.c | 26 +-- + drivers/infiniband/core/sa_query.c | 4 +- + drivers/infiniband/core/sysfs.c | 28 ++- + drivers/infiniband/core/umem.c | 9 +- + drivers/infiniband/core/umem_odp.c | 7 +- + drivers/infiniband/core/user_mad.c | 43 ++--- + drivers/infiniband/core/uverbs_cmd.c | 5 - + drivers/infiniband/core/uverbs_main.c | 24 +++ + drivers/infiniband/core/verbs.c | 41 ++-- + drivers/infiniband/hw/bnxt_re/Makefile | 2 +- + 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/Makefile | 2 +- + drivers/infiniband/hw/cxgb3/iwch_provider.c | 18 +- + drivers/infiniband/hw/cxgb4/Makefile | 4 +- + drivers/infiniband/hw/cxgb4/cm.c | 17 +- + drivers/infiniband/hw/cxgb4/device.c | 8 +- + drivers/infiniband/hw/cxgb4/mem.c | 2 +- + drivers/infiniband/hw/cxgb4/provider.c | 16 +- + drivers/infiniband/hw/cxgb4/qp.c | 21 +- + drivers/infiniband/hw/hfi1/debugfs.c | 58 +++--- + drivers/infiniband/hw/hfi1/debugfs.h | 12 -- + drivers/infiniband/hw/hfi1/fault.c | 53 ++--- + drivers/infiniband/hw/hfi1/sysfs.c | 16 +- + drivers/infiniband/hw/hfi1/verbs.c | 2 +- + drivers/infiniband/hw/hns/Kconfig | 1 - + drivers/infiniband/hw/hns/Makefile | 2 +- + drivers/infiniband/hw/hns/hns_roce_cmd.h | 12 ++ + 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 | 27 ++- + drivers/infiniband/hw/hns/hns_roce_hem.c | 68 ++++++- + drivers/infiniband/hw/hns/hns_roce_hem.h | 3 + + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 245 ++++++++++++++++++++++-- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 72 ++++++- + drivers/infiniband/hw/hns/hns_roce_main.c | 58 +++++- + 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 | 61 ++++-- + drivers/infiniband/hw/hns/hns_roce_srq.c | 7 +- + drivers/infiniband/hw/i40iw/Makefile | 2 +- + 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/cong.c | 15 +- + drivers/infiniband/hw/mlx5/cq.c | 11 +- + drivers/infiniband/hw/mlx5/devx.c | 127 +++++++++++- + drivers/infiniband/hw/mlx5/doorbell.c | 6 +- + drivers/infiniband/hw/mlx5/main.c | 133 +++++++------ + drivers/infiniband/hw/mlx5/mem.c | 5 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 30 ++- + drivers/infiniband/hw/mlx5/mr.c | 114 ++++------- + drivers/infiniband/hw/mlx5/odp.c | 40 ++-- + 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/Makefile | 2 +- + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 8 +- + drivers/infiniband/hw/ocrdma/ocrdma_stats.c | 67 +++---- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 4 +- + drivers/infiniband/hw/qedr/main.c | 5 +- + drivers/infiniband/hw/qedr/qedr_iw_cm.c | 2 +- + drivers/infiniband/hw/qedr/verbs.c | 55 +++--- + drivers/infiniband/hw/qib/qib_debugfs.c | 27 +-- + drivers/infiniband/hw/qib/qib_sysfs.c | 18 +- + drivers/infiniband/hw/qib/qib_user_pages.c | 8 +- + drivers/infiniband/hw/qib/qib_verbs.c | 2 +- + drivers/infiniband/hw/usnic/Makefile | 2 +- + drivers/infiniband/hw/usnic/usnic_debugfs.c | 26 --- + 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/trace_cq.h | 10 +- + drivers/infiniband/sw/rdmavt/vt.c | 7 +- + drivers/infiniband/sw/rxe/rxe_comp.c | 6 +- + drivers/infiniband/sw/rxe/rxe_loc.h | 6 +- + drivers/infiniband/sw/rxe/rxe_mr.c | 2 +- + drivers/infiniband/sw/rxe/rxe_recv.c | 12 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 3 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 6 +- + drivers/infiniband/ulp/ipoib/ipoib.h | 4 +- + drivers/infiniband/ulp/ipoib/ipoib_fs.c | 7 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 4 +- + drivers/infiniband/ulp/iser/iser_memory.c | 10 +- + drivers/infiniband/ulp/isert/Makefile | 1 - + drivers/infiniband/ulp/srp/ib_srp.c | 3 +- + drivers/infiniband/ulp/srpt/Makefile | 1 - + include/linux/cgroup_rdma.h | 2 +- + include/linux/mlx5/driver.h | 5 +- + include/rdma/ib_umem.h | 8 +- + include/rdma/ib_umem_odp.h | 34 ++-- + include/rdma/ib_verbs.h | 36 +++- + include/rdma/rdma_vt.h | 3 - + kernel/cgroup/rdma.c | 5 +- + 119 files changed, 1343 insertions(+), 837 deletions(-) +Merging net-next/master (c829f5f52db9 cxgb4: cxgb4_tc_u32: use struct_size() in kvzalloc()) +$ git merge net-next/master +Auto-merging tools/bpf/bpftool/prog.c +Auto-merging tools/bpf/bpftool/map.c +Auto-merging net/tls/tls_sw.c +Auto-merging net/core/skmsg.c +Auto-merging net/core/filter.c +Auto-merging include/net/tls.h +Auto-merging include/linux/skbuff.h +Auto-merging drivers/net/ethernet/qlogic/qed/qed_sriov.c +Auto-merging drivers/net/ethernet/qlogic/qed/qed_dev.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c +Auto-merging drivers/net/ethernet/amd/amd8111e.c +Auto-merging arch/arm/boot/dts/ls1021a.dtsi +Auto-merging MAINTAINERS +Removing Documentation/networking/phy.txt +Auto-merging Documentation/networking/index.rst +Merge made by the 'recursive' strategy. + Documentation/bpf/btf.rst | 870 ++ + Documentation/bpf/index.rst | 7 + + Documentation/devicetree/bindings/net/dsa/ksz.txt | 102 +- + .../devicetree/bindings/net/qcom,ethqos.txt | 64 + + .../devicetree/bindings/ptp/ptp-qoriq.txt | 2 + + Documentation/networking/devlink-params-mlxsw.txt | 2 + + Documentation/networking/dsa/dsa.txt | 13 - + Documentation/networking/filter.txt | 15 +- + Documentation/networking/index.rst | 1 + + Documentation/networking/phy.rst | 447 + + Documentation/networking/phy.txt | 427 - + Documentation/networking/snmp_counter.rst | 111 +- + Documentation/networking/switchdev.txt | 2 +- + Documentation/sysctl/net.txt | 14 + + MAINTAINERS | 20 +- + arch/alpha/include/uapi/asm/socket.h | 2 + + arch/arm/boot/dts/ls1021a.dtsi | 1 + + 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/net/bpf_jit_32.c | 53 +- + arch/arm/net/bpf_jit_32.h | 2 + + arch/arm/plat-orion/common.c | 2 +- + arch/arm64/net/bpf_jit_comp.c | 37 +- + 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/powerpc/include/asm/ppc-opcode.h | 1 + + arch/powerpc/net/bpf_jit.h | 4 + + arch/powerpc/net/bpf_jit_comp64.c | 120 +- + arch/s390/include/uapi/asm/socket.h | 2 + + arch/s390/net/bpf_jit_comp.c | 66 +- + arch/sparc/include/uapi/asm/socket.h | 2 + + arch/x86/net/bpf_jit_comp.c | 46 +- + arch/x86/net/bpf_jit_comp32.c | 121 +- + arch/xtensa/include/uapi/asm/socket.h | 2 + + drivers/crypto/chelsio/chtls/chtls_cm.c | 4 + + drivers/isdn/hisax/netjet.c | 6 +- + drivers/isdn/hisax/q931.c | 2 +- + drivers/isdn/hisax/st5481.h | 2 +- + drivers/isdn/isdnloop/isdnloop.c | 2 +- + drivers/net/bonding/bond_3ad.c | 188 +- + drivers/net/bonding/bond_netlink.c | 67 + + drivers/net/dsa/lantiq_gswip.c | 24 +- + drivers/net/dsa/qca8k.c | 16 +- + drivers/net/ethernet/3com/3c509.c | 2 + + drivers/net/ethernet/amd/amd8111e.c | 4 +- + drivers/net/ethernet/atheros/atlx/atl2.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 178 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 12 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 2 +- + drivers/net/ethernet/broadcom/tg3.c | 4 +- + drivers/net/ethernet/brocade/bna/bfa_ioc.c | 9 +- + drivers/net/ethernet/cavium/liquidio/lio_core.c | 3 +- + drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c | 3 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 24 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 3 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c | 3 +- + drivers/net/ethernet/chelsio/cxgb4/l2t.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 47 +- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 7 + + drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 6 +- + drivers/net/ethernet/davicom/dm9000.c | 1 + + drivers/net/ethernet/emulex/benet/be_main.c | 4 - + drivers/net/ethernet/freescale/Kconfig | 1 + + drivers/net/ethernet/freescale/Makefile | 3 + + drivers/net/ethernet/freescale/dpaa2/Makefile | 1 + + .../ethernet/freescale/dpaa2/dpaa2-eth-debugfs.c | 237 + + .../ethernet/freescale/dpaa2/dpaa2-eth-debugfs.h | 31 + + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 98 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 14 +- + drivers/net/ethernet/freescale/enetc/Kconfig | 19 + + drivers/net/ethernet/freescale/enetc/Makefile | 15 + + drivers/net/ethernet/freescale/enetc/enetc.c | 1604 ++ + drivers/net/ethernet/freescale/enetc/enetc.h | 230 + + drivers/net/ethernet/freescale/enetc/enetc_cbdr.c | 210 + + .../net/ethernet/freescale/enetc/enetc_ethtool.c | 597 + + drivers/net/ethernet/freescale/enetc/enetc_hw.h | 532 + + drivers/net/ethernet/freescale/enetc/enetc_msg.c | 164 + + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 931 ++ + drivers/net/ethernet/freescale/enetc/enetc_pf.h | 49 + + drivers/net/ethernet/freescale/enetc/enetc_vf.c | 255 + + drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 5 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 6 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 288 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 9 +- + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 9 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 12 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 4 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 85 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 270 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 10 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 7 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 135 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 8 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 44 +- + 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_main.c | 10 +- + drivers/net/ethernet/huawei/hinic/hinic_rx.c | 11 +- + drivers/net/ethernet/huawei/hinic/hinic_tx.c | 8 +- + drivers/net/ethernet/intel/i40e/i40e.h | 14 +- + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 26 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 244 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 40 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 11 +- + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 110 +- + 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 +- + drivers/net/ethernet/jme.c | 5 +- + drivers/net/ethernet/mellanox/mlx4/cmd.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/eq.c | 5 +- + .../mellanox/mlx5/core/diag/fs_tracepoint.c | 2 + + .../mellanox/mlx5/core/diag/fs_tracepoint.h | 35 + + drivers/net/ethernet/mellanox/mlx5/core/en.h | 28 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 67 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 39 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 154 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 1 - + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 29 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 2 + + drivers/net/ethernet/mellanox/mlxfw/mlxfw.h | 35 +- + drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c | 35 +- + drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c | 35 +- + drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.h | 35 +- + .../net/ethernet/mellanox/mlxfw/mlxfw_mfa2_file.h | 35 +- + .../ethernet/mellanox/mlxfw/mlxfw_mfa2_format.h | 36 +- + .../net/ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv.h | 35 +- + .../ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv_multi.c | 35 +- + .../ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv_multi.h | 36 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 23 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 2 + + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 12 +- + .../ethernet/mellanox/mlxsw/spectrum1_acl_tcam.c | 3 +- + .../ethernet/mellanox/mlxsw/spectrum2_acl_tcam.c | 5 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 7 +- + .../ethernet/mellanox/mlxsw/spectrum_acl_atcam.c | 2 - + .../mellanox/mlxsw/spectrum_acl_bloom_filter.c | 4 +- + .../ethernet/mellanox/mlxsw/spectrum_acl_ctcam.c | 1 - + .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 29 +- + .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.h | 5 +- + .../net/ethernet/mellanox/mlxsw/spectrum_dpipe.c | 2 +- + .../net/ethernet/mellanox/mlxsw/spectrum_ipip.c | 2 + + drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c | 10 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.h | 4 +- + .../ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c | 157 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 255 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 1 + + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 47 +- + drivers/net/ethernet/microchip/lan743x_ethtool.c | 217 +- + drivers/net/ethernet/microchip/lan743x_main.h | 17 +- + drivers/net/ethernet/mscc/ocelot.c | 3 +- + drivers/net/ethernet/neterion/vxge/vxge-main.c | 2 +- + drivers/net/ethernet/netronome/nfp/bpf/jit.c | 139 +- + drivers/net/ethernet/netronome/nfp/bpf/main.h | 51 +- + drivers/net/ethernet/netronome/nfp/bpf/offload.c | 9 +- + drivers/net/ethernet/netronome/nfp/bpf/verifier.c | 74 +- + 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/qed/qed.h | 5 +- + drivers/net/ethernet/qlogic/qed/qed_cxt.c | 1 + + drivers/net/ethernet/qlogic/qed/qed_dev.c | 158 +- + drivers/net/ethernet/qlogic/qed/qed_dev_api.h | 12 + + drivers/net/ethernet/qlogic/qed/qed_hsi.h | 2 +- + drivers/net/ethernet/qlogic/qed/qed_hw.c | 11 + + drivers/net/ethernet/qlogic/qed/qed_int.c | 126 +- + drivers/net/ethernet/qlogic/qed/qed_int.h | 3 + + drivers/net/ethernet/qlogic/qed/qed_main.c | 30 + + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 115 + + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 42 + + drivers/net/ethernet/qlogic/qed/qed_reg_addr.h | 2 + + drivers/net/ethernet/qlogic/qed/qed_spq.c | 22 + + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 9 +- + drivers/net/ethernet/qlogic/qede/qede.h | 3 + + drivers/net/ethernet/qlogic/qede/qede_main.c | 292 +- + drivers/net/ethernet/qlogic/qede/qede_rdma.c | 63 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 3 +- + drivers/net/ethernet/realtek/atp.c | 27 +- + drivers/net/ethernet/realtek/r8169.c | 647 +- + 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/stmicro/stmmac/Kconfig | 10 + + drivers/net/ethernet/stmicro/stmmac/Makefile | 1 + + .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 545 + + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 2 + + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 36 +- + drivers/net/ethernet/sun/sungem.c | 2 +- + drivers/net/ethernet/ti/cpsw-phy-sel.c | 4 +- + drivers/net/macvlan.c | 3 +- + drivers/net/phy/amd.c | 7 +- + drivers/net/phy/aquantia.c | 5 +- + drivers/net/phy/at803x.c | 44 +- + drivers/net/phy/bcm-cygnus.c | 10 +- + drivers/net/phy/bcm-phy-lib.c | 10 +- + drivers/net/phy/bcm-phy-lib.h | 10 +- + drivers/net/phy/bcm63xx.c | 6 +- + drivers/net/phy/bcm7xxx.c | 6 +- + drivers/net/phy/bcm87xx.c | 7 +- + drivers/net/phy/broadcom.c | 6 +- + drivers/net/phy/cicada.c | 7 +- + drivers/net/phy/cortina.c | 11 +- + drivers/net/phy/davicom.c | 7 +- + drivers/net/phy/dp83640.c | 15 +- + drivers/net/phy/dp83822.c | 12 +- + drivers/net/phy/dp83848.c | 12 +- + drivers/net/phy/dp83867.c | 12 +- + drivers/net/phy/et1011c.c | 7 +- + drivers/net/phy/fixed_phy.c | 6 +- + drivers/net/phy/icplus.c | 7 +- + drivers/net/phy/intel-xway.c | 11 +- + drivers/net/phy/lxt.c | 7 +- + drivers/net/phy/marvell.c | 7 +- + drivers/net/phy/marvell10g.c | 1 + + drivers/net/phy/mdio-bcm-iproc.c | 10 +- + drivers/net/phy/mdio-bcm-unimac.c | 6 +- + drivers/net/phy/mdio-bitbang.c | 7 +- + drivers/net/phy/mdio-boardinfo.c | 6 +- + drivers/net/phy/mdio-cavium.c | 7 +- + drivers/net/phy/mdio-cavium.h | 5 +- + drivers/net/phy/mdio-gpio.c | 7 +- + drivers/net/phy/mdio-i2c.c | 5 +- + drivers/net/phy/mdio-i2c.h | 5 +- + drivers/net/phy/mdio-moxart.c | 7 +- + drivers/net/phy/mdio-mux-bcm-iproc.c | 13 +- + drivers/net/phy/mdio-mux-gpio.c | 7 +- + drivers/net/phy/mdio-mux-mmioreg.c | 5 +- + drivers/net/phy/mdio-mux.c | 7 +- + drivers/net/phy/mdio-octeon.c | 7 +- + drivers/net/phy/mdio-sun4i.c | 7 +- + drivers/net/phy/mdio-thunder.c | 7 +- + drivers/net/phy/mdio-xgene.c | 14 +- + drivers/net/phy/mdio-xgene.h | 14 +- + drivers/net/phy/mdio_bus.c | 9 +- + drivers/net/phy/mdio_device.c | 7 +- + drivers/net/phy/meson-gxl.c | 12 +- + drivers/net/phy/micrel.c | 49 +- + drivers/net/phy/microchip.c | 14 +- + drivers/net/phy/mscc.c | 1 + + drivers/net/phy/national.c | 7 +- + drivers/net/phy/phy-core.c | 6 +- + drivers/net/phy/phy.c | 96 +- + drivers/net/phy/phy_device.c | 122 +- + drivers/net/phy/phy_led_triggers.c | 14 +- + drivers/net/phy/phylink.c | 12 +- + drivers/net/phy/qsemi.c | 7 +- + drivers/net/phy/realtek.c | 7 +- + drivers/net/phy/sfp.c | 1 + + drivers/net/phy/smsc.c | 6 +- + drivers/net/phy/spi_ks8995.c | 5 +- + drivers/net/phy/ste10Xp.c | 7 +- + drivers/net/phy/swphy.c | 6 +- + drivers/net/phy/teranetics.c | 5 +- + drivers/net/phy/uPD60620.c | 7 +- + drivers/net/phy/vitesse.c | 9 +- + drivers/net/phy/xilinx_gmii2rgmii.c | 11 +- + drivers/net/sb1000.c | 11 +- + drivers/net/usb/rtl8150.c | 2 - + drivers/net/virtio_net.c | 1 + + drivers/net/vxlan.c | 352 +- + drivers/net/wan/dscc4.c | 50 +- + drivers/net/wan/lmc/Makefile | 2 +- + drivers/ptp/Kconfig | 2 +- + drivers/ptp/Makefile | 4 +- + drivers/ptp/ptp_qoriq.c | 129 +- + drivers/ptp/ptp_qoriq_debugfs.c | 101 + + drivers/s390/net/qeth_core.h | 14 +- + drivers/s390/net/qeth_core_main.c | 132 +- + drivers/s390/net/qeth_core_mpc.h | 1 + + drivers/s390/net/qeth_l2_main.c | 244 +- + drivers/s390/net/qeth_l3_main.c | 113 +- + include/linux/bpf.h | 10 + + include/linux/bpf_verifier.h | 6 + + include/linux/filter.h | 21 + + include/linux/fsl/ptp_qoriq.h | 15 + + include/linux/igmp.h | 11 +- + include/linux/in.h | 5 + + include/linux/ip.h | 5 + + include/linux/ipv6.h | 6 + + include/linux/netdevice.h | 7 +- + include/linux/netfilter/nf_conntrack_proto_gre.h | 17 +- + include/linux/netfilter_ipv4.h | 6 - + include/linux/netlink.h | 1 + + include/linux/phy.h | 12 +- + include/linux/platform_data/b53.h | 2 +- + include/linux/platform_data/dsa.h | 68 + + include/linux/platform_data/mv88e6xxx.h | 2 +- + include/linux/qed/qed_if.h | 21 +- + include/linux/qed/qede_rdma.h | 10 +- + include/linux/skbuff.h | 5 + + include/net/addrconf.h | 27 +- + include/net/bond_3ad.h | 17 + + include/net/dsa.h | 66 +- + include/net/inet_connection_sock.h | 29 +- + include/net/inet_frag.h | 16 +- + include/net/ip_tunnels.h | 2 +- + include/net/ip_vs.h | 3 - + include/net/ipv6_frag.h | 11 +- + include/net/net_namespace.h | 4 + + include/net/netfilter/br_netfilter.h | 1 - + include/net/netfilter/ipv4/nf_conntrack_ipv4.h | 3 + + include/net/netfilter/nf_conntrack.h | 2 - + include/net/netfilter/nf_conntrack_core.h | 5 +- + include/net/netfilter/nf_conntrack_l4proto.h | 122 +- + include/net/netfilter/nf_nat.h | 4 - + include/net/netfilter/nf_tables.h | 26 +- + include/net/netfilter/nf_tables_core.h | 16 + + include/net/netns/conntrack.h | 30 +- + include/net/netns/xdp.h | 13 + + include/net/sch_generic.h | 3 +- + include/net/switchdev.h | 6 +- + include/net/tcp.h | 3 + + include/net/tls.h | 3 +- + include/net/vxlan.h | 6 +- + include/net/xdp_sock.h | 1 + + include/uapi/asm-generic/socket.h | 2 + + include/uapi/linux/bpf.h | 2 + + include/uapi/linux/icmpv6.h | 2 + + include/uapi/linux/if_bonding.h | 24 + + include/uapi/linux/if_link.h | 1 + + include/uapi/linux/igmp.h | 1 + + include/uapi/linux/in.h | 9 +- + include/uapi/linux/netfilter/nf_tables.h | 10 +- + include/uapi/linux/pkt_cls.h | 13 + + include/uapi/linux/xdp_diag.h | 72 + + kernel/bpf/btf.c | 104 +- + kernel/bpf/core.c | 273 +- + kernel/bpf/disasm.c | 34 +- + kernel/bpf/offload.c | 35 + + kernel/bpf/verifier.c | 624 +- + net/batman-adv/multicast.c | 4 +- + net/bpf/test_run.c | 82 + + net/bridge/br_fdb.c | 3 +- + net/bridge/br_multicast.c | 183 +- + net/bridge/br_netfilter_hooks.c | 5 - + net/bridge/br_private.h | 3 +- + net/bridge/br_switchdev.c | 2 +- + net/core/dst.c | 6 +- + net/core/filter.c | 22 + + net/core/flow_dissector.c | 92 +- + net/core/net_namespace.c | 38 +- + net/core/rtnetlink.c | 116 +- + net/core/skmsg.c | 25 +- + net/core/sock.c | 47 +- + net/core/sysctl_net_core.c | 18 + + net/dccp/input.c | 2 +- + net/dccp/timer.c | 4 +- + net/decnet/dn_fib.c | 2 +- + net/dsa/dsa_priv.h | 3 +- + net/dsa/master.c | 56 +- + net/dsa/slave.c | 5 +- + net/ipv4/devinet.c | 86 +- + net/ipv4/igmp.c | 68 +- + net/ipv4/inet_fragment.c | 293 + + net/ipv4/ip_fragment.c | 289 +- + net/ipv4/ip_gre.c | 112 +- + net/ipv4/ip_input.c | 2 +- + net/ipv4/ip_tunnel.c | 62 +- + net/ipv4/ipip.c | 2 +- + net/ipv4/ipmr.c | 61 +- + net/ipv4/netfilter.c | 18 - + net/ipv4/netfilter/nf_nat_l3proto_ipv4.c | 2 +- + net/ipv4/route.c | 72 +- + net/ipv4/tcp.c | 42 +- + net/ipv4/tcp_bbr.c | 180 +- + net/ipv4/tcp_input.c | 8 +- + net/ipv4/tcp_ipv4.c | 2 +- + net/ipv4/tcp_minisocks.c | 34 - + net/ipv4/tcp_output.c | 65 +- + net/ipv4/tcp_timer.c | 87 +- + net/ipv4/udp_tunnel.c | 15 +- + net/ipv6/addrconf.c | 95 +- + net/ipv6/addrlabel.c | 47 +- + net/ipv6/ip6_gre.c | 4 +- + net/ipv6/ip6_udp_tunnel.c | 15 +- + net/ipv6/mcast.c | 2 + + net/ipv6/mcast_snoop.c | 83 +- + net/ipv6/netfilter/nf_conntrack_reasm.c | 260 +- + net/ipv6/netfilter/nf_nat_l3proto_ipv6.c | 2 +- + net/ipv6/reassembly.c | 233 +- + net/ipv6/route.c | 70 +- + net/ipv6/tcp_ipv6.c | 2 +- + net/mpls/af_mpls.c | 103 +- + net/netfilter/Kconfig | 2 +- + net/netfilter/Makefile | 3 +- + net/netfilter/ipvs/ip_vs_core.c | 49 +- + net/netfilter/ipvs/ip_vs_proto_ah_esp.c | 2 - + net/netfilter/ipvs/ip_vs_proto_sctp.c | 8 +- + net/netfilter/ipvs/ip_vs_proto_tcp.c | 15 +- + net/netfilter/ipvs/ip_vs_proto_udp.c | 15 +- + net/netfilter/nf_conntrack_core.c | 210 +- + net/netfilter/nf_conntrack_expect.c | 2 +- + net/netfilter/nf_conntrack_netlink.c | 14 +- + net/netfilter/nf_conntrack_pptp.c | 2 +- + net/netfilter/nf_conntrack_proto.c | 514 +- + net/netfilter/nf_conntrack_proto_dccp.c | 134 +- + net/netfilter/nf_conntrack_proto_generic.c | 85 +- + net/netfilter/nf_conntrack_proto_gre.c | 196 +- + net/netfilter/nf_conntrack_proto_icmp.c | 67 +- + net/netfilter/nf_conntrack_proto_icmpv6.c | 69 +- + net/netfilter/nf_conntrack_proto_sctp.c | 128 +- + net/netfilter/nf_conntrack_proto_tcp.c | 160 +- + net/netfilter/nf_conntrack_proto_udp.c | 80 +- + net/netfilter/nf_conntrack_standalone.c | 427 +- + net/netfilter/nf_flow_table_core.c | 2 +- + net/netfilter/nf_nat_core.c | 15 +- + net/netfilter/nf_tables_api.c | 137 +- + net/netfilter/nf_tables_core.c | 25 +- + net/netfilter/nfnetlink_cttimeout.c | 19 +- + net/netfilter/nft_bitwise.c | 5 +- + net/netfilter/nft_byteorder.c | 6 +- + net/netfilter/nft_cmp.c | 6 +- + net/netfilter/nft_counter.c | 2 +- + net/netfilter/nft_ct.c | 4 +- + net/netfilter/nft_dynset.c | 5 +- + net/netfilter/nft_hash.c | 121 - + net/netfilter/nft_immediate.c | 6 +- + net/netfilter/nft_meta.c | 12 + + net/netfilter/nft_objref.c | 5 +- + net/netfilter/nft_payload.c | 6 +- + net/netfilter/nft_quota.c | 2 +- + net/netfilter/nft_range.c | 5 +- + net/netfilter/nft_rt.c | 6 +- + net/netfilter/utils.c | 19 + + net/netfilter/xt_CT.c | 2 +- + net/netfilter/xt_physdev.c | 9 +- + net/netlink/af_netlink.c | 8 + + net/openvswitch/conntrack.c | 2 +- + net/openvswitch/meter.c | 3 +- + net/sched/cls_basic.c | 25 + + net/sched/cls_matchall.c | 24 + + net/sched/sch_api.c | 3 +- + net/switchdev/switchdev.c | 5 +- + net/tipc/link.c | 2 +- + net/tipc/socket.c | 4 +- + net/tipc/topsrv.c | 3 - + net/tipc/trace.c | 4 +- + net/tls/tls_main.c | 73 +- + net/tls/tls_sw.c | 280 +- + net/vmw_vsock/af_vsock.c | 2 +- + net/xdp/Kconfig | 8 + + net/xdp/Makefile | 1 + + net/xdp/xdp_umem.c | 14 + + net/xdp/xsk.c | 36 +- + net/xdp/xsk.h | 12 + + net/xdp/xsk_diag.c | 191 + + samples/bpf/bpf_insn.h | 20 + + tools/bpf/bpftool/Documentation/bpftool-cgroup.rst | 1 + + .../bpf/bpftool/Documentation/bpftool-feature.rst | 85 + + tools/bpf/bpftool/Documentation/bpftool-map.rst | 29 +- + tools/bpf/bpftool/Documentation/bpftool-net.rst | 1 + + tools/bpf/bpftool/Documentation/bpftool-perf.rst | 1 + + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 1 + + tools/bpf/bpftool/Documentation/bpftool.rst | 1 + + tools/bpf/bpftool/bash-completion/bpftool | 110 +- + tools/bpf/bpftool/btf_dumper.c | 98 +- + tools/bpf/bpftool/cfg.c | 9 +- + tools/bpf/bpftool/feature.c | 764 + + tools/bpf/bpftool/main.c | 3 +- + tools/bpf/bpftool/main.h | 4 + + tools/bpf/bpftool/map.c | 232 +- + tools/bpf/bpftool/prog.c | 10 +- + tools/include/linux/filter.h | 20 + + tools/include/uapi/linux/bpf.h | 2 + + tools/lib/bpf/Build | 2 +- + tools/lib/bpf/Makefile | 17 +- + tools/lib/bpf/libbpf.c | 46 +- + tools/lib/bpf/libbpf.h | 14 + + tools/lib/bpf/libbpf.map | 7 + + tools/lib/bpf/libbpf_probes.c | 242 + + tools/testing/selftests/bpf/Makefile | 112 +- + tools/testing/selftests/bpf/flow_dissector_load.c | 43 +- + tools/testing/selftests/bpf/flow_dissector_load.h | 55 + + tools/testing/selftests/bpf/test_btf.c | 680 +- + tools/testing/selftests/bpf/test_flow_dissector.c | 2 - + tools/testing/selftests/bpf/test_maps.c | 1 - + tools/testing/selftests/bpf/test_progs.c | 78 +- + tools/testing/selftests/bpf/test_socket_cookie.c | 4 +- + tools/testing/selftests/bpf/test_sockmap.c | 1 - + tools/testing/selftests/bpf/test_tcpnotify_user.c | 6 +- + tools/testing/selftests/bpf/test_verifier.c | 15426 +------------------ + tools/testing/selftests/bpf/verifier/.gitignore | 1 + + tools/testing/selftests/bpf/verifier/and.c | 50 + + .../testing/selftests/bpf/verifier/array_access.c | 219 + + tools/testing/selftests/bpf/verifier/basic.c | 23 + + tools/testing/selftests/bpf/verifier/basic_call.c | 50 + + tools/testing/selftests/bpf/verifier/basic_instr.c | 134 + + tools/testing/selftests/bpf/verifier/basic_stack.c | 64 + + .../testing/selftests/bpf/verifier/basic_stx_ldx.c | 45 + + tools/testing/selftests/bpf/verifier/bounds.c | 508 + + .../selftests/bpf/verifier/bounds_deduction.c | 124 + + .../bpf/verifier/bounds_mix_sign_unsign.c | 406 + + .../testing/selftests/bpf/verifier/bpf_get_stack.c | 44 + + tools/testing/selftests/bpf/verifier/calls.c | 1942 +++ + tools/testing/selftests/bpf/verifier/cfg.c | 70 + + .../selftests/bpf/verifier/cgroup_inv_retcode.c | 72 + + tools/testing/selftests/bpf/verifier/cgroup_skb.c | 197 + + .../selftests/bpf/verifier/cgroup_storage.c | 220 + + tools/testing/selftests/bpf/verifier/const_or.c | 60 + + tools/testing/selftests/bpf/verifier/ctx.c | 93 + + tools/testing/selftests/bpf/verifier/ctx_sk_msg.c | 180 + + tools/testing/selftests/bpf/verifier/ctx_skb.c | 1033 ++ + tools/testing/selftests/bpf/verifier/dead_code.c | 159 + + .../selftests/bpf/verifier/direct_packet_access.c | 633 + + .../bpf/verifier/direct_stack_access_wraparound.c | 40 + + tools/testing/selftests/bpf/verifier/div0.c | 184 + + .../testing/selftests/bpf/verifier/div_overflow.c | 104 + + .../selftests/bpf/verifier/helper_access_var_len.c | 614 + + .../selftests/bpf/verifier/helper_packet_access.c | 460 + + .../selftests/bpf/verifier/helper_value_access.c | 953 ++ + tools/testing/selftests/bpf/verifier/jit.c | 88 + + tools/testing/selftests/bpf/verifier/jmp32.c | 724 + + tools/testing/selftests/bpf/verifier/jset.c | 165 + + tools/testing/selftests/bpf/verifier/jump.c | 180 + + tools/testing/selftests/bpf/verifier/junk_insn.c | 45 + + tools/testing/selftests/bpf/verifier/ld_abs.c | 286 + + tools/testing/selftests/bpf/verifier/ld_dw.c | 36 + + tools/testing/selftests/bpf/verifier/ld_imm64.c | 141 + + tools/testing/selftests/bpf/verifier/ld_ind.c | 72 + + tools/testing/selftests/bpf/verifier/leak_ptr.c | 67 + + tools/testing/selftests/bpf/verifier/lwt.c | 189 + + tools/testing/selftests/bpf/verifier/map_in_map.c | 62 + + .../selftests/bpf/verifier/map_ptr_mixing.c | 100 + + tools/testing/selftests/bpf/verifier/map_ret_val.c | 65 + + tools/testing/selftests/bpf/verifier/masking.c | 322 + + tools/testing/selftests/bpf/verifier/meta_access.c | 235 + + .../bpf/verifier/perf_event_sample_period.c | 59 + + .../selftests/bpf/verifier/prevent_map_lookup.c | 74 + + tools/testing/selftests/bpf/verifier/raw_stack.c | 305 + + .../testing/selftests/bpf/verifier/ref_tracking.c | 607 + + tools/testing/selftests/bpf/verifier/runtime_jit.c | 80 + + .../selftests/bpf/verifier/search_pruning.c | 156 + + tools/testing/selftests/bpf/verifier/spill_fill.c | 75 + + tools/testing/selftests/bpf/verifier/stack_ptr.c | 317 + + tools/testing/selftests/bpf/verifier/uninit.c | 39 + + tools/testing/selftests/bpf/verifier/unpriv.c | 521 + + tools/testing/selftests/bpf/verifier/value.c | 104 + + .../selftests/bpf/verifier/value_adj_spill.c | 43 + + .../selftests/bpf/verifier/value_illegal_alu.c | 94 + + .../testing/selftests/bpf/verifier/value_or_null.c | 152 + + .../selftests/bpf/verifier/value_ptr_arith.c | 792 + + tools/testing/selftests/bpf/verifier/var_off.c | 66 + + tools/testing/selftests/bpf/verifier/xadd.c | 97 + + tools/testing/selftests/bpf/verifier/xdp.c | 14 + + .../bpf/verifier/xdp_direct_packet_access.c | 900 ++ + .../selftests/drivers/net/mlxsw/vxlan_fdb_veto.sh | 126 + + .../selftests/net/forwarding/devlink_lib.sh | 2 +- + .../selftests/net/forwarding/ipip_flat_gre.sh | 63 + + .../selftests/net/forwarding/ipip_flat_gre_key.sh | 63 + + .../selftests/net/forwarding/ipip_flat_gre_keys.sh | 63 + + .../selftests/net/forwarding/ipip_hier_gre.sh | 63 + + .../selftests/net/forwarding/ipip_hier_gre_key.sh | 63 + + .../selftests/net/forwarding/ipip_hier_gre_keys.sh | 63 + + tools/testing/selftests/net/forwarding/ipip_lib.sh | 349 + + tools/testing/selftests/net/forwarding/lib.sh | 2 +- + .../selftests/net/forwarding/vxlan_asymmetric.sh | 567 + + .../selftests/net/forwarding/vxlan_symmetric.sh | 551 + + tools/testing/selftests/net/ip_defrag.c | 69 +- + tools/testing/selftests/net/ip_defrag.sh | 16 + + tools/testing/selftests/net/tls.c | 12 +- + 594 files changed, 39334 insertions(+), 23304 deletions(-) + create mode 100644 Documentation/bpf/btf.rst + create mode 100644 Documentation/devicetree/bindings/net/qcom,ethqos.txt + create mode 100644 Documentation/networking/devlink-params-mlxsw.txt + create mode 100644 Documentation/networking/phy.rst + delete mode 100644 Documentation/networking/phy.txt + create mode 100644 drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-debugfs.c + create mode 100644 drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-debugfs.h + create mode 100644 drivers/net/ethernet/freescale/enetc/Kconfig + create mode 100644 drivers/net/ethernet/freescale/enetc/Makefile + create mode 100644 drivers/net/ethernet/freescale/enetc/enetc.c + create mode 100644 drivers/net/ethernet/freescale/enetc/enetc.h + create mode 100644 drivers/net/ethernet/freescale/enetc/enetc_cbdr.c + create mode 100644 drivers/net/ethernet/freescale/enetc/enetc_ethtool.c + create mode 100644 drivers/net/ethernet/freescale/enetc/enetc_hw.h + create mode 100644 drivers/net/ethernet/freescale/enetc/enetc_msg.c + create mode 100644 drivers/net/ethernet/freescale/enetc/enetc_pf.c + create mode 100644 drivers/net/ethernet/freescale/enetc/enetc_pf.h + create mode 100644 drivers/net/ethernet/freescale/enetc/enetc_vf.c + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c + create mode 100644 drivers/ptp/ptp_qoriq_debugfs.c + create mode 100644 include/linux/platform_data/dsa.h + create mode 100644 include/net/netns/xdp.h + create mode 100644 include/uapi/linux/xdp_diag.h + create mode 100644 net/xdp/xsk.h + create mode 100644 net/xdp/xsk_diag.c + create mode 100644 tools/bpf/bpftool/Documentation/bpftool-feature.rst + create mode 100644 tools/bpf/bpftool/feature.c + create mode 100644 tools/lib/bpf/libbpf_probes.c + create mode 100644 tools/testing/selftests/bpf/flow_dissector_load.h + create mode 100644 tools/testing/selftests/bpf/verifier/.gitignore + create mode 100644 tools/testing/selftests/bpf/verifier/and.c + create mode 100644 tools/testing/selftests/bpf/verifier/array_access.c + create mode 100644 tools/testing/selftests/bpf/verifier/basic.c + create mode 100644 tools/testing/selftests/bpf/verifier/basic_call.c + create mode 100644 tools/testing/selftests/bpf/verifier/basic_instr.c + create mode 100644 tools/testing/selftests/bpf/verifier/basic_stack.c + create mode 100644 tools/testing/selftests/bpf/verifier/basic_stx_ldx.c + create mode 100644 tools/testing/selftests/bpf/verifier/bounds.c + create mode 100644 tools/testing/selftests/bpf/verifier/bounds_deduction.c + create mode 100644 tools/testing/selftests/bpf/verifier/bounds_mix_sign_unsign.c + create mode 100644 tools/testing/selftests/bpf/verifier/bpf_get_stack.c + create mode 100644 tools/testing/selftests/bpf/verifier/calls.c + create mode 100644 tools/testing/selftests/bpf/verifier/cfg.c + create mode 100644 tools/testing/selftests/bpf/verifier/cgroup_inv_retcode.c + create mode 100644 tools/testing/selftests/bpf/verifier/cgroup_skb.c + create mode 100644 tools/testing/selftests/bpf/verifier/cgroup_storage.c + create mode 100644 tools/testing/selftests/bpf/verifier/const_or.c + create mode 100644 tools/testing/selftests/bpf/verifier/ctx.c + create mode 100644 tools/testing/selftests/bpf/verifier/ctx_sk_msg.c + create mode 100644 tools/testing/selftests/bpf/verifier/ctx_skb.c + create mode 100644 tools/testing/selftests/bpf/verifier/dead_code.c + create mode 100644 tools/testing/selftests/bpf/verifier/direct_packet_access.c + create mode 100644 tools/testing/selftests/bpf/verifier/direct_stack_access_wraparound.c + create mode 100644 tools/testing/selftests/bpf/verifier/div0.c + create mode 100644 tools/testing/selftests/bpf/verifier/div_overflow.c + create mode 100644 tools/testing/selftests/bpf/verifier/helper_access_var_len.c + create mode 100644 tools/testing/selftests/bpf/verifier/helper_packet_access.c + create mode 100644 tools/testing/selftests/bpf/verifier/helper_value_access.c + create mode 100644 tools/testing/selftests/bpf/verifier/jit.c + create mode 100644 tools/testing/selftests/bpf/verifier/jmp32.c + create mode 100644 tools/testing/selftests/bpf/verifier/jset.c + create mode 100644 tools/testing/selftests/bpf/verifier/jump.c + create mode 100644 tools/testing/selftests/bpf/verifier/junk_insn.c + create mode 100644 tools/testing/selftests/bpf/verifier/ld_abs.c + create mode 100644 tools/testing/selftests/bpf/verifier/ld_dw.c + create mode 100644 tools/testing/selftests/bpf/verifier/ld_imm64.c + create mode 100644 tools/testing/selftests/bpf/verifier/ld_ind.c + create mode 100644 tools/testing/selftests/bpf/verifier/leak_ptr.c + create mode 100644 tools/testing/selftests/bpf/verifier/lwt.c + create mode 100644 tools/testing/selftests/bpf/verifier/map_in_map.c + create mode 100644 tools/testing/selftests/bpf/verifier/map_ptr_mixing.c + create mode 100644 tools/testing/selftests/bpf/verifier/map_ret_val.c + create mode 100644 tools/testing/selftests/bpf/verifier/masking.c + create mode 100644 tools/testing/selftests/bpf/verifier/meta_access.c + create mode 100644 tools/testing/selftests/bpf/verifier/perf_event_sample_period.c + create mode 100644 tools/testing/selftests/bpf/verifier/prevent_map_lookup.c + create mode 100644 tools/testing/selftests/bpf/verifier/raw_stack.c + create mode 100644 tools/testing/selftests/bpf/verifier/ref_tracking.c + create mode 100644 tools/testing/selftests/bpf/verifier/runtime_jit.c + create mode 100644 tools/testing/selftests/bpf/verifier/search_pruning.c + create mode 100644 tools/testing/selftests/bpf/verifier/spill_fill.c + create mode 100644 tools/testing/selftests/bpf/verifier/stack_ptr.c + create mode 100644 tools/testing/selftests/bpf/verifier/uninit.c + create mode 100644 tools/testing/selftests/bpf/verifier/unpriv.c + create mode 100644 tools/testing/selftests/bpf/verifier/value.c + create mode 100644 tools/testing/selftests/bpf/verifier/value_adj_spill.c + create mode 100644 tools/testing/selftests/bpf/verifier/value_illegal_alu.c + create mode 100644 tools/testing/selftests/bpf/verifier/value_or_null.c + create mode 100644 tools/testing/selftests/bpf/verifier/value_ptr_arith.c + create mode 100644 tools/testing/selftests/bpf/verifier/var_off.c + create mode 100644 tools/testing/selftests/bpf/verifier/xadd.c + create mode 100644 tools/testing/selftests/bpf/verifier/xdp.c + create mode 100644 tools/testing/selftests/bpf/verifier/xdp_direct_packet_access.c + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/vxlan_fdb_veto.sh + create mode 100755 tools/testing/selftests/net/forwarding/ipip_flat_gre.sh + create mode 100755 tools/testing/selftests/net/forwarding/ipip_flat_gre_key.sh + create mode 100755 tools/testing/selftests/net/forwarding/ipip_flat_gre_keys.sh + create mode 100755 tools/testing/selftests/net/forwarding/ipip_hier_gre.sh + create mode 100755 tools/testing/selftests/net/forwarding/ipip_hier_gre_key.sh + create mode 100755 tools/testing/selftests/net/forwarding/ipip_hier_gre_keys.sh + create mode 100644 tools/testing/selftests/net/forwarding/ipip_lib.sh + create mode 100755 tools/testing/selftests/net/forwarding/vxlan_asymmetric.sh + create mode 100755 tools/testing/selftests/net/forwarding/vxlan_symmetric.sh +Merging bpf-next/master (3d2af27a84a8 Merge branch 'bpf-flow-dissector-tests') +$ git merge bpf-next/master +Already up to date. +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 (ce4eee5340a9 net/mlx5: Add pci AtomicOps request) +$ 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/mr.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 | 5 +- + drivers/infiniband/hw/mlx5/mr.c | 39 +++--------- + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 55 +++++++++++++++-- + drivers/net/ethernet/mellanox/mlx5/core/mad.c | 75 ------------------------ + drivers/net/ethernet/mellanox/mlx5/core/main.c | 5 ++ + drivers/net/ethernet/mellanox/mlx5/core/mr.c | 11 ++-- + include/linux/mlx5/driver.h | 34 ++++++++--- + 11 files changed, 143 insertions(+), 133 deletions(-) + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/mad.c +Merging netfilter-next/master (0604628bb03a netfilter: nf_tables: add NFTA_RULE_POSITION_ID to nla_policy) +$ git merge netfilter-next/master +Merge made by the 'recursive' strategy. + net/netfilter/nf_tables_api.c | 1 + + 1 file changed, 1 insertion(+) +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 (e2f7cc72cbf4 netfilter: conntrack: fix bogus port values for other l4 protocols) +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (64e2330580fb Merge tag 'iwlwifi-next-for-kalle-2019-01-25' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next) +$ git merge wireless-drivers-next/master +Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/rx.c +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/intel/iwlwifi/cfg/22000.c | 68 +++- + drivers/net/wireless/intel/iwlwifi/cfg/9000.c | 110 ++---- + drivers/net/wireless/intel/iwlwifi/dvm/main.c | 2 +- + .../net/wireless/intel/iwlwifi/fw/api/commands.h | 8 +- + drivers/net/wireless/intel/iwlwifi/fw/api/d3.h | 10 + + drivers/net/wireless/intel/iwlwifi/fw/api/rx.h | 4 - + drivers/net/wireless/intel/iwlwifi/fw/api/stats.h | 15 +- + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 184 +++++++--- + drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 5 +- + drivers/net/wireless/intel/iwlwifi/fw/error-dump.h | 11 +- + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 3 +- + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 12 +- + drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 1 + + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 27 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 7 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 8 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 5 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 96 +----- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 167 +++++++-- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 57 +++- + drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 10 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 87 ++--- + drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 21 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 26 +- + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 10 +- + drivers/net/wireless/intel/iwlwifi/mvm/sf.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 379 +++++++++------------ + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 4 - + .../net/wireless/intel/iwlwifi/mvm/time-event.c | 1 + + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 161 ++++----- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 13 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 86 ++++- + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 2 - + drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 26 -- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 25 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 10 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 3 +- + 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 +- + 58 files changed, 1221 insertions(+), 837 deletions(-) +Merging bluetooth/master (017a01ccfbc5 Bluetooth: btusb: Add shutdown routine for BTUSB_INTEL_NEW devices) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/Kconfig | 4 +- + drivers/bluetooth/btmrvl_drv.h | 2 - + drivers/bluetooth/btmrvl_sdio.c | 43 +++++++++- + drivers/bluetooth/btqca.c | 19 +++++ + drivers/bluetooth/btqca.h | 8 +- + drivers/bluetooth/btrtl.c | 10 ++- + drivers/bluetooth/btusb.c | 73 +++++++++++++++++ + drivers/bluetooth/h4_recv.h | 4 + + drivers/bluetooth/hci_h4.c | 4 + + drivers/bluetooth/hci_qca.c | 5 +- + drivers/usb/core/usb-acpi.c | 163 +++++++++++++++++++++++--------------- + include/net/bluetooth/bluetooth.h | 2 +- + include/net/bluetooth/hci_core.h | 1 + + net/6lowpan/debugfs.c | 42 +++++----- + net/bluetooth/6lowpan.c | 11 +-- + net/bluetooth/af_bluetooth.c | 16 +++- + net/bluetooth/hci_core.c | 5 +- + net/bluetooth/l2cap_core.c | 84 ++++++++++++-------- + net/bluetooth/l2cap_sock.c | 2 +- + net/bluetooth/rfcomm/core.c | 1 + + net/bluetooth/rfcomm/sock.c | 2 +- + net/bluetooth/sco.c | 2 +- + 22 files changed, 363 insertions(+), 140 deletions(-) +Merging mac80211-next/master (2ec56f918009 mac80211: remove unused variable) +$ git merge mac80211-next/master +Auto-merging net/wireless/reg.c +Auto-merging net/wireless/nl80211.c +Auto-merging net/mac80211/cfg.c +Auto-merging drivers/net/wireless/virt_wifi.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/virt_wifi.c | 7 -- + include/net/cfg80211.h | 38 ++++++- + include/net/mac80211.h | 139 +++++++++++++++++++++++++- + include/uapi/linux/nl80211.h | 44 ++++++++- + net/mac80211/agg-tx.c | 2 +- + net/mac80211/cfg.c | 14 ++- + net/mac80211/debugfs.c | 4 + + net/mac80211/debugfs_sta.c | 68 ++++++++++++- + net/mac80211/driver-ops.h | 7 ++ + net/mac80211/ht.c | 8 ++ + net/mac80211/ieee80211_i.h | 11 +++ + net/mac80211/main.c | 11 +++ + net/mac80211/mesh.h | 2 + + net/mac80211/mesh_hwmp.c | 29 ++++-- + net/mac80211/rc80211_minstrel_ht.c | 25 ++++- + net/mac80211/rc80211_minstrel_ht_debugfs.c | 7 +- + net/mac80211/sta_info.c | 46 ++++++++- + net/mac80211/sta_info.h | 17 ++++ + net/mac80211/status.c | 6 ++ + net/mac80211/tx.c | 154 ++++++++++++++++++++++++++++- + net/wireless/nl80211.c | 71 +++++++++++-- + net/wireless/reg.c | 4 +- + net/wireless/wext-compat.c | 2 + + 23 files changed, 663 insertions(+), 53 deletions(-) +Merging gfs2/for-next (2abbf9a4d262 gfs: no need to check return value of debugfs_create functions) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/glock.c | 70 ++++++++++++-------------------------------------------- + fs/gfs2/glock.h | 4 ++-- + fs/gfs2/incore.h | 3 --- + fs/gfs2/main.c | 6 +---- + 4 files changed, 17 insertions(+), 66 deletions(-) +Merging mtd/mtd/next (b0dd77a79642 mtd: docg3: fix a possible memory leak of mtd->name) +$ 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/docg3.c | 7 ++-- + drivers/mtd/devices/mtdram.c | 2 - + drivers/mtd/lpddr/qinfo_probe.c | 4 +- + drivers/mtd/mtdcore.c | 83 +++++++++++-------------------------- + 6 files changed, 32 insertions(+), 69 deletions(-) +Merging nand/nand/next (e74745d96478 mtd: rawnand: fsmc: Disable NAND on remove()) +$ git merge nand/nand/next +Auto-merging drivers/mtd/nand/raw/fsmc_nand.c +Auto-merging drivers/mtd/nand/raw/denali.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/amlogic,meson-nand.txt | 60 + + .../devicetree/bindings/mtd/stm32-fmc2-nand.txt | 61 + + MAINTAINERS | 7 + + drivers/mtd/nand/raw/Kconfig | 17 + + drivers/mtd/nand/raw/Makefile | 2 + + drivers/mtd/nand/raw/denali.c | 42 +- + drivers/mtd/nand/raw/denali.h | 1 - + drivers/mtd/nand/raw/fsmc_nand.c | 16 + + drivers/mtd/nand/raw/marvell_nand.c | 5 +- + drivers/mtd/nand/raw/meson_nand.c | 1468 ++++++++++++++ + drivers/mtd/nand/raw/mtk_nand.c | 3 +- + drivers/mtd/nand/raw/nand_base.c | 159 +- + drivers/mtd/nand/raw/nand_legacy.c | 3 +- + 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/gigadevice.c | 83 + + drivers/mtd/nand/spi/macronix.c | 8 +- + drivers/mtd/nand/spi/toshiba.c | 79 +- + include/linux/mtd/rawnand.h | 26 +- + 22 files changed, 4353 insertions(+), 536 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/amlogic,meson-nand.txt + create mode 100644 Documentation/devicetree/bindings/mtd/stm32-fmc2-nand.txt + create mode 100644 drivers/mtd/nand/raw/meson_nand.c + create mode 100644 drivers/mtd/nand/raw/stm32_fmc2_nand.c +Merging spi-nor/spi-nor/next (a2126b0a0109 mtd: spi-nor: refine Spansion S25FL512S ID) +$ git merge spi-nor/spi-nor/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/mtk-quadspi.txt | 3 ++- + MAINTAINERS | 1 + + drivers/mtd/devices/m25p80.c | 9 ++++++++- + drivers/mtd/spi-nor/Kconfig | 16 ++++++++-------- + drivers/mtd/spi-nor/Makefile | 2 +- + drivers/mtd/spi-nor/mtk-quadspi.c | 3 ++- + drivers/mtd/spi-nor/spi-nor.c | 22 ++++++++++++++++++---- + include/linux/mtd/spi-nor.h | 16 ++++++++++++---- + 8 files changed, 52 insertions(+), 20 deletions(-) +Merging crypto/master (231baecdef7a crypto: clarify name of WEAK_KEY request flag) +$ git merge crypto/master +Auto-merging fs/ecryptfs/crypto.c +Auto-merging drivers/crypto/ixp4xx_crypto.c +Auto-merging drivers/crypto/amcc/crypto4xx_core.c +Merge made by the 'recursive' strategy. + arch/s390/crypto/des_s390.c | 4 +- + arch/sparc/crypto/des_glue.c | 4 +- + arch/x86/crypto/aesni-intel_glue.c | 34 +- + crypto/Kconfig | 4 +- + crypto/aead.c | 4 +- + crypto/aegis.h | 7 +- + crypto/aegis128.c | 6 +- + crypto/aegis128l.c | 6 +- + crypto/aegis256.c | 6 +- + crypto/af_alg.c | 33 +- + crypto/ahash.c | 28 +- + crypto/algapi.c | 63 +- + crypto/arc4.c | 82 +- + crypto/cbc.c | 131 +- + crypto/ccm.c | 78 +- + crypto/cfb.c | 139 +- + crypto/chacha20poly1305.c | 37 +- + crypto/crypto_null.c | 57 +- + crypto/crypto_user_stat.c | 4 - + crypto/ctr.c | 200 +- + crypto/des_generic.c | 4 +- + crypto/ecb.c | 151 +- + crypto/gcm.c | 75 +- + crypto/keywrap.c | 198 +- + crypto/morus1280.c | 6 +- + crypto/morus640.c | 6 +- + crypto/ofb.c | 202 +- + crypto/pcbc.c | 143 +- + crypto/rsa-pkcs1pad.c | 1 + + crypto/shash.c | 27 +- + crypto/skcipher.c | 158 +- + crypto/streebog_generic.c | 2 +- + crypto/testmgr.c | 367 +- + crypto/testmgr.h | 12139 ++++++------------- + crypto/tgr192.c | 6 +- + drivers/char/hw_random/virtio-rng.c | 2 +- + drivers/crypto/amcc/crypto4xx_core.c | 87 + + drivers/crypto/amcc/crypto4xx_core.h | 4 + + drivers/crypto/amcc/crypto4xx_reg_def.h | 1 + + drivers/crypto/atmel-tdes.c | 2 +- + drivers/crypto/bcm/cipher.c | 10 +- + drivers/crypto/bcm/util.c | 40 - + drivers/crypto/bcm/util.h | 6 - + 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-des3.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/ccree/cc_buffer_mgr.c | 87 +- + drivers/crypto/ccree/cc_cipher.c | 9 +- + drivers/crypto/ccree/cc_driver.c | 6 +- + drivers/crypto/ccree/cc_driver.h | 2 - + drivers/crypto/chelsio/chcr_algo.c | 8 +- + drivers/crypto/chelsio/chcr_core.h | 2 +- + drivers/crypto/chelsio/chcr_ipsec.c | 13 +- + drivers/crypto/chelsio/chtls/chtls_io.c | 12 +- + drivers/crypto/hifn_795x.c | 3 +- + drivers/crypto/inside-secure/safexcel_cipher.c | 2 +- + drivers/crypto/ixp4xx_crypto.c | 4 +- + drivers/crypto/marvell/cipher.c | 2 +- + drivers/crypto/n2_core.c | 2 +- + drivers/crypto/omap-des.c | 2 +- + drivers/crypto/picoxcell_crypto.c | 3 +- + drivers/crypto/qce/ablkcipher.c | 4 +- + drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c | 2 +- + drivers/crypto/sunxi-ss/sun4i-ss-cipher.c | 2 +- + drivers/crypto/talitos.c | 2 +- + drivers/crypto/ux500/cryp/cryp_core.c | 26 +- + drivers/crypto/virtio/virtio_crypto_algs.c | 2 +- + fs/crypto/keyinfo.c | 4 +- + fs/ecryptfs/crypto.c | 5 +- + include/crypto/algapi.h | 8 +- + include/crypto/if_alg.h | 7 - + include/crypto/internal/cryptouser.h | 2 + + include/crypto/internal/hash.h | 6 +- + include/crypto/internal/skcipher.h | 15 + + include/crypto/morus1280_glue.h | 7 +- + include/crypto/morus640_glue.h | 7 +- + include/crypto/morus_common.h | 7 +- + include/crypto/streebog.h | 2 +- + include/crypto/xts.h | 4 +- + include/linux/crypto.h | 10 +- + 93 files changed, 4960 insertions(+), 10179 deletions(-) +Merging drm/drm-next (f91168f48556 Merge tag 'drm-misc-next-2019-01-23' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) +$ git merge drm/drm-next +Auto-merging include/drm/drm_dp_mst_helper.h +Auto-merging include/drm/drm_dp_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/sun4i/sun4i_hdmi_enc.c +Auto-merging drivers/gpu/drm/sun4i/sun4i_backend.c +Auto-merging drivers/gpu/drm/msm/msm_gem.c +Auto-merging drivers/gpu/drm/meson/meson_drv.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/i915_gpu_error.c +Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c +Auto-merging drivers/gpu/drm/i915/i915_debugfs.c +Auto-merging drivers/gpu/drm/drm_modes.c +Auto-merging drivers/gpu/drm/drm_mode_object.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/tc358767.c +Removing drivers/gpu/drm/bochs/bochs_fbdev.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/acpi/pmic/intel_pmic_xpower.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/display/bridge/lvds-transmitter.txt | 12 +- + .../bindings/display/bridge/renesas,lvds.txt | 3 +- + .../bindings/display/bridge/thine,thc63lvdm83d.txt | 2 +- + .../bindings/display/bridge/ti,ds90c185.txt | 55 + + .../panel/{auo,g101evn010 => auo,g101evn010.txt} | 0 + .../devicetree/bindings/display/renesas,du.txt | 2 + + .../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 | 68 +- + MAINTAINERS | 19 +- + 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/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/Kconfig | 4 - + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sa.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 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 20 +- + 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 | 6 +- + drivers/gpu/drm/ati_pcigart.c | 7 +- + 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 | 26 +- + drivers/gpu/drm/bochs/bochs_kms.c | 218 ++-- + drivers/gpu/drm/bochs/bochs_mm.c | 68 +- + 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 | 9 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 +- + drivers/gpu/drm/bridge/lvds-encoder.c | 53 +- + drivers/gpu/drm/bridge/panel.c | 22 +- + drivers/gpu/drm/bridge/sii902x.c | 7 +- + drivers/gpu/drm/bridge/sil-sii8620.c | 3 +- + .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 9 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 7 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 18 +- + drivers/gpu/drm/bridge/tc358767.c | 9 +- + drivers/gpu/drm/cirrus/cirrus_fbdev.c | 3 + + 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_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 | 14 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 1055 +++++++++++++++----- + drivers/gpu/drm/drm_drv.c | 24 +- + 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_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_modes.c | 9 - + drivers/gpu/drm/drm_modeset_lock.c | 8 + + 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_syncobj.c | 91 +- + drivers/gpu/drm/drm_vblank.c | 45 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_mic.c | 4 +- + 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 | 10 +- + drivers/gpu/drm/i915/Makefile | 2 +- + drivers/gpu/drm/i915/dvo.h | 1 - + drivers/gpu/drm/i915/gvt/vgpu.c | 4 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 2 +- + drivers/gpu/drm/i915/i915_debugfs.c | 437 ++++---- + drivers/gpu/drm/i915/i915_drv.c | 50 +- + drivers/gpu/drm/i915/i915_drv.h | 250 ++--- + drivers/gpu/drm/i915/i915_gem.c | 225 +---- + drivers/gpu/drm/i915/i915_gem_context.c | 11 +- + 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 | 5 +- + drivers/gpu/drm/i915/i915_gem_fence_reg.c | 11 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 151 +-- + drivers/gpu/drm/i915/i915_gem_gtt.h | 2 - + drivers/gpu/drm/i915/i915_gem_internal.c | 1 - + drivers/gpu/drm/i915/i915_gem_object.h | 3 +- + drivers/gpu/drm/i915/i915_gem_shrinker.c | 104 +- + 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 | 1 - + drivers/gpu/drm/i915/i915_gpu_error.c | 53 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 1 + + drivers/gpu/drm/i915/i915_ioc32.c | 1 - + drivers/gpu/drm/i915/i915_irq.c | 42 +- + 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 | 12 +- + drivers/gpu/drm/i915/i915_query.c | 2 +- + drivers/gpu/drm/i915/i915_reg.h | 222 ++-- + drivers/gpu/drm/i915/i915_request.c | 220 +--- + drivers/gpu/drm/i915/i915_request.h | 1 - + drivers/gpu/drm/i915/i915_suspend.c | 13 +- + drivers/gpu/drm/i915/i915_sw_fence.c | 2 +- + drivers/gpu/drm/i915/i915_timeline.h | 8 - + drivers/gpu/drm/i915/i915_trace.h | 30 - + drivers/gpu/drm/i915/icl_dsi.c | 8 +- + drivers/gpu/drm/i915/intel_acpi.c | 1 - + drivers/gpu/drm/i915/intel_atomic.c | 3 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 1 - + drivers/gpu/drm/i915/intel_audio.c | 3 +- + drivers/gpu/drm/i915/intel_bios.c | 14 +- + drivers/gpu/drm/i915/intel_breadcrumbs.c | 26 - + drivers/gpu/drm/i915/intel_cdclk.c | 10 +- + drivers/gpu/drm/i915/intel_color.c | 218 ++-- + drivers/gpu/drm/i915/intel_connector.c | 5 +- + drivers/gpu/drm/i915/intel_crt.c | 42 +- + drivers/gpu/drm/i915/intel_ddi.c | 334 ++++--- + 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 | 182 ++-- + drivers/gpu/drm/i915/intel_display.h | 6 +- + drivers/gpu/drm/i915/intel_dp.c | 211 ++-- + drivers/gpu/drm/i915/intel_dp_mst.c | 78 +- + drivers/gpu/drm/i915/intel_drv.h | 48 +- + drivers/gpu/drm/i915/intel_dsi.h | 1 - + 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 | 90 +- + drivers/gpu/drm/i915/intel_fbc.c | 31 +- + drivers/gpu/drm/i915/intel_fbdev.c | 1 - + drivers/gpu/drm/i915/intel_fifo_underrun.c | 6 +- + drivers/gpu/drm/i915/intel_frontbuffer.c | 1 - + drivers/gpu/drm/i915/intel_guc_fw.c | 6 +- + drivers/gpu/drm/i915/intel_guc_submission.c | 3 +- + drivers/gpu/drm/i915/intel_hangcheck.c | 167 +--- + drivers/gpu/drm/i915/intel_hdcp.c | 17 +- + drivers/gpu/drm/i915/intel_hdmi.c | 35 +- + drivers/gpu/drm/i915/intel_hotplug.c | 1 - + drivers/gpu/drm/i915/intel_huc_fw.c | 7 +- + drivers/gpu/drm/i915/intel_i2c.c | 1 - + drivers/gpu/drm/i915/intel_lrc.c | 253 +++-- + drivers/gpu/drm/i915/intel_lspcon.c | 16 +- + drivers/gpu/drm/i915/intel_lvds.c | 17 +- + 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 | 8 +- + drivers/gpu/drm/i915/intel_pipe_crc.c | 8 +- + drivers/gpu/drm/i915/intel_pm.c | 738 ++++++-------- + drivers/gpu/drm/i915/intel_psr.c | 69 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 505 +++++----- + drivers/gpu/drm/i915/intel_ringbuffer.h | 93 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 4 +- + drivers/gpu/drm/i915/intel_sdvo.c | 45 +- + drivers/gpu/drm/i915/intel_sprite.c | 7 +- + drivers/gpu/drm/i915/intel_tv.c | 9 +- + drivers/gpu/drm/i915/intel_uc.c | 14 +- + drivers/gpu/drm/i915/intel_uc.h | 6 +- + drivers/gpu/drm/i915/intel_uc_fw.c | 11 +- + drivers/gpu/drm/i915/intel_uncore.c | 147 ++- + drivers/gpu/drm/i915/intel_vdsc.c | 1 - + drivers/gpu/drm/i915/intel_wopcm.c | 6 +- + drivers/gpu/drm/i915/intel_workarounds.c | 131 ++- + drivers/gpu/drm/i915/selftests/huge_pages.c | 35 +- + drivers/gpu/drm/i915/selftests/i915_gem.c | 2 +- + drivers/gpu/drm/i915/selftests/i915_gem_context.c | 6 +- + drivers/gpu/drm/i915/selftests/i915_gem_object.c | 1 + + drivers/gpu/drm/i915/selftests/igt_spinner.c | 86 +- + drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 334 +++++-- + drivers/gpu/drm/i915/selftests/intel_lrc.c | 4 +- + drivers/gpu/drm/i915/selftests/intel_workarounds.c | 82 +- + drivers/gpu/drm/i915/selftests/mock_engine.c | 2 - + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 2 +- + drivers/gpu/drm/i915/vlv_dsi.c | 15 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 7 +- + 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_kms.c | 2 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c | 1 + + 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 | 13 +- + drivers/gpu/drm/msm/edp/edp_bridge.c | 13 +- + drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 7 +- + drivers/gpu/drm/msm/msm_gem.c | 2 +- + 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 | 111 +- + 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-innolux-p079zca.c | 11 +- + drivers/gpu/drm/panel/panel-tpo-tpg110.c | 496 +++++++++ + drivers/gpu/drm/qxl/qxl_cmd.c | 2 + + drivers/gpu/drm/qxl/qxl_display.c | 5 +- + drivers/gpu/drm/r128/r128_cce.c | 5 +- + 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_dp_mst.c | 9 - + drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 1 + + 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 | 17 + + drivers/gpu/drm/rcar-du/rcar_lvds.c | 5 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 2 +- + 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 | 159 ++- + 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/shmobile/shmob_drm_drv.c | 4 +- + drivers/gpu/drm/sti/sti_crtc.c | 16 +- + drivers/gpu/drm/sti/sti_dvo.c | 4 +- + drivers/gpu/drm/sti/sti_hda.c | 4 +- + drivers/gpu/drm/sti/sti_hdmi.c | 7 +- + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 2 +- + drivers/gpu/drm/stm/ltdc.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 25 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 1 + + drivers/gpu/drm/sun4i/sun4i_frontend.c | 350 ++++++- + drivers/gpu/drm/sun4i/sun4i_frontend.h | 52 + + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 3 +- + drivers/gpu/drm/sun4i/sun4i_layer.c | 28 +- + drivers/gpu/drm/tegra/hdmi.c | 3 +- + drivers/gpu/drm/tegra/hub.c | 2 +- + drivers/gpu/drm/tegra/sor.c | 3 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 34 +- + 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/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 | 4 + + drivers/gpu/drm/vc4/vc4_hdmi.c | 32 +- + drivers/gpu/drm/vc4/vc4_kms.c | 3 +- + drivers/gpu/drm/vc4/vc4_plane.c | 145 ++- + drivers/gpu/drm/vgem/vgem_fence.c | 4 +- + drivers/gpu/drm/virtio/Makefile | 2 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 8 +- + drivers/gpu/drm/virtio/virtgpu_drm_bus.c | 103 -- + drivers/gpu/drm/virtio/virtgpu_drv.c | 84 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 24 +- + drivers/gpu/drm/virtio/virtgpu_fb.c | 191 ---- + drivers/gpu/drm/virtio/virtgpu_fence.c | 8 - + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 18 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 17 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 12 +- + drivers/gpu/drm/vkms/vkms_drv.c | 1 + + drivers/gpu/drm/xen/xen_drm_front_conn.c | 1 - + drivers/gpu/drm/zte/zx_hdmi.c | 4 +- + drivers/staging/vboxvideo/vbox_fb.c | 5 - + include/drm/bridge/dw_hdmi.h | 6 +- + include/drm/bridge/dw_mipi_dsi.h | 3 +- + include/drm/drmP.h | 26 +- + include/drm/drm_atomic.h | 43 +- + include/drm/drm_bridge.h | 8 +- + include/drm/drm_connector.h | 10 +- + 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_helper.h | 4 + + include/drm/drm_dp_mst_helper.h | 153 ++- + include/drm/drm_edid.h | 10 +- + include/drm/drm_encoder_slave.h | 1 - + include/drm/drm_fb_cma_helper.h | 22 - + include/drm/drm_file.h | 1 + + include/drm/drm_fourcc.h | 117 +++ + 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_hdcp.h | 2 + + include/drm/drm_legacy.h | 14 +- + include/drm/drm_mode_config.h | 23 +- + include/drm/drm_modes.h | 21 +- + include/drm/drm_syncobj.h | 23 +- + include/drm/drm_util.h | 53 +- + include/drm/drm_vblank.h | 22 + + include/drm/intel-gtt.h | 3 + + 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/linux/dma-fence.h | 22 +- + include/linux/mfd/intel_soc_pmic.h | 3 + + include/uapi/drm/drm_fourcc.h | 39 + + include/uapi/drm/v3d_drm.h | 8 + + 359 files changed, 8157 insertions(+), 6296 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/ti,ds90c185.txt + 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-intel/for-linux-next (5b0bd14dcc6b drm/i915/icl: keep track of unused pll while looping) +$ git merge drm-intel/for-linux-next +Removing drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c +Auto-merging drivers/gpu/drm/i915/intel_lrc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/i915_pmu.c +Auto-merging drivers/gpu/drm/i915/gvt/scheduler.h +Auto-merging drivers/gpu/drm/i915/gvt/scheduler.c +Auto-merging drivers/gpu/drm/i915/gvt/mpt.h +Auto-merging drivers/gpu/drm/i915/gvt/kvmgt.c +Auto-merging drivers/gpu/drm/i915/gvt/hypercall.h +Auto-merging drivers/gpu/drm/i915/gvt/handlers.c +Recorded preimage for 'drivers/gpu/drm/i915/intel_lrc.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/intel_lrc.c'. +[master 9c9b55380e75] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/drm_color_mgmt.c | 43 + + drivers/gpu/drm/i915/Kconfig.debug | 3 +- + drivers/gpu/drm/i915/Makefile | 6 +- + drivers/gpu/drm/i915/gvt/Makefile | 1 - + drivers/gpu/drm/i915/gvt/aperture_gm.c | 8 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 83 +- + drivers/gpu/drm/i915/gvt/display.c | 12 +- + drivers/gpu/drm/i915/gvt/dmabuf.c | 5 +- + drivers/gpu/drm/i915/gvt/edid.c | 32 +- + drivers/gpu/drm/i915/gvt/fb_decoder.c | 12 +- + drivers/gpu/drm/i915/gvt/gvt.c | 108 +- + drivers/gpu/drm/i915/gvt/gvt.h | 8 +- + drivers/gpu/drm/i915/gvt/handlers.c | 29 +- + drivers/gpu/drm/i915/gvt/hypercall.h | 9 +- + drivers/gpu/drm/i915/gvt/interrupt.c | 4 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 42 +- + drivers/gpu/drm/i915/gvt/mmio.c | 6 +- + drivers/gpu/drm/i915/gvt/mmio.h | 11 +- + drivers/gpu/drm/i915/gvt/mmio_context.c | 18 +- + drivers/gpu/drm/i915/gvt/mpt.h | 13 +- + drivers/gpu/drm/i915/gvt/sched_policy.c | 4 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 11 +- + drivers/gpu/drm/i915/gvt/scheduler.h | 2 +- + drivers/gpu/drm/i915/gvt/trace.h | 2 +- + drivers/gpu/drm/i915/i915_debugfs.c | 626 ++++----- + drivers/gpu/drm/i915/i915_drv.c | 217 +--- + drivers/gpu/drm/i915/i915_drv.h | 246 ++-- + drivers/gpu/drm/i915/i915_gem.c | 732 +++-------- + drivers/gpu/drm/i915/i915_gem_context.c | 18 +- + drivers/gpu/drm/i915/i915_gem_context.h | 6 + + drivers/gpu/drm/i915/i915_gem_evict.c | 89 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 17 +- + drivers/gpu/drm/i915/i915_gem_fence_reg.c | 14 +- + drivers/gpu/drm/i915/i915_gem_fence_reg.h | 1 - + drivers/gpu/drm/i915/i915_gem_gtt.c | 73 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 55 +- + drivers/gpu/drm/i915/i915_gem_object.h | 52 +- + drivers/gpu/drm/i915/i915_gem_shrinker.c | 81 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 5 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 224 ++-- + drivers/gpu/drm/i915/i915_gpu_error.c | 233 ++-- + drivers/gpu/drm/i915/i915_gpu_error.h | 40 +- + drivers/gpu/drm/i915/i915_irq.c | 439 ++----- + drivers/gpu/drm/i915/i915_params.c | 6 +- + drivers/gpu/drm/i915/i915_params.h | 2 +- + drivers/gpu/drm/i915/i915_perf.c | 8 +- + drivers/gpu/drm/i915/i915_pmu.c | 23 +- + drivers/gpu/drm/i915/i915_reg.h | 81 +- + drivers/gpu/drm/i915/i915_request.c | 216 +--- + drivers/gpu/drm/i915/i915_request.h | 139 +- + drivers/gpu/drm/i915/i915_reset.c | 1349 ++++++++++++++++++++ + drivers/gpu/drm/i915/i915_reset.h | 59 + + drivers/gpu/drm/i915/i915_scheduler.c | 29 +- + drivers/gpu/drm/i915/i915_selftest.h | 1 + + drivers/gpu/drm/i915/i915_sysfs.c | 27 +- + drivers/gpu/drm/i915/i915_timeline.c | 253 +++- + drivers/gpu/drm/i915/i915_timeline.h | 27 +- + drivers/gpu/drm/i915/i915_trace.h | 25 - + drivers/gpu/drm/i915/i915_vma.c | 84 +- + drivers/gpu/drm/i915/i915_vma.h | 47 +- + drivers/gpu/drm/i915/icl_dsi.c | 37 +- + drivers/gpu/drm/i915/intel_atomic.c | 4 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 40 +- + drivers/gpu/drm/i915/intel_audio.c | 3 +- + drivers/gpu/drm/i915/intel_bios.c | 9 + + drivers/gpu/drm/i915/intel_breadcrumbs.c | 887 +++---------- + drivers/gpu/drm/i915/intel_cdclk.c | 50 +- + drivers/gpu/drm/i915/intel_color.c | 56 +- + drivers/gpu/drm/i915/intel_crt.c | 47 +- + drivers/gpu/drm/i915/intel_csr.c | 93 +- + drivers/gpu/drm/i915/intel_ddi.c | 108 +- + drivers/gpu/drm/i915/intel_display.c | 404 ++++-- + drivers/gpu/drm/i915/intel_dp.c | 403 +++--- + drivers/gpu/drm/i915/intel_dp_link_training.c | 32 +- + drivers/gpu/drm/i915/intel_dp_mst.c | 2 +- + drivers/gpu/drm/i915/intel_dpio_phy.c | 18 +- + drivers/gpu/drm/i915/intel_dpll_mgr.c | 301 +++-- + drivers/gpu/drm/i915/intel_dpll_mgr.h | 55 +- + drivers/gpu/drm/i915/intel_drv.h | 177 ++- + drivers/gpu/drm/i915/intel_dsi.h | 5 +- + drivers/gpu/drm/i915/intel_engine_cs.c | 346 ++--- + drivers/gpu/drm/i915/intel_fbc.c | 2 +- + drivers/gpu/drm/i915/intel_fbdev.c | 9 +- + drivers/gpu/drm/i915/intel_fifo_underrun.c | 12 +- + drivers/gpu/drm/i915/intel_gpu_commands.h | 1 - + drivers/gpu/drm/i915/intel_guc.h | 3 + + drivers/gpu/drm/i915/intel_guc_log.c | 29 +- + drivers/gpu/drm/i915/intel_guc_submission.c | 22 +- + drivers/gpu/drm/i915/intel_gvt.c | 12 +- + drivers/gpu/drm/i915/intel_hangcheck.c | 46 +- + drivers/gpu/drm/i915/intel_hdcp.c | 4 +- + drivers/gpu/drm/i915/intel_hdmi.c | 18 +- + drivers/gpu/drm/i915/intel_hotplug.c | 5 +- + drivers/gpu/drm/i915/intel_huc.c | 8 +- + drivers/gpu/drm/i915/intel_i2c.c | 20 +- + drivers/gpu/drm/i915/intel_lrc.c | 423 ++++-- + drivers/gpu/drm/i915/intel_lrc.h | 10 +- + drivers/gpu/drm/i915/intel_lspcon.c | 20 +- + drivers/gpu/drm/i915/intel_lvds.c | 32 +- + drivers/gpu/drm/i915/intel_mocs.c | 406 +++--- + drivers/gpu/drm/i915/intel_overlay.c | 2 - + drivers/gpu/drm/i915/intel_panel.c | 94 +- + drivers/gpu/drm/i915/intel_pipe_crc.c | 24 +- + drivers/gpu/drm/i915/intel_pm.c | 393 +++--- + drivers/gpu/drm/i915/intel_psr.c | 14 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 287 +++-- + drivers/gpu/drm/i915/intel_ringbuffer.h | 169 +-- + drivers/gpu/drm/i915/intel_runtime_pm.c | 590 +++++++-- + drivers/gpu/drm/i915/intel_sdvo.c | 78 +- + drivers/gpu/drm/i915/intel_sprite.c | 86 +- + drivers/gpu/drm/i915/intel_tv.c | 718 ++++++++--- + drivers/gpu/drm/i915/intel_uc.c | 1 + + drivers/gpu/drm/i915/intel_uncore.c | 585 +-------- + drivers/gpu/drm/i915/intel_vdsc.c | 4 +- + drivers/gpu/drm/i915/selftests/huge_pages.c | 7 +- + 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 | 134 +- + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 105 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 123 +- + drivers/gpu/drm/i915/selftests/i915_gem_object.c | 21 +- + .../gpu/drm/i915/selftests/i915_live_selftests.h | 1 + + .../gpu/drm/i915/selftests/i915_mock_selftests.h | 3 +- + drivers/gpu/drm/i915/selftests/i915_random.c | 33 +- + drivers/gpu/drm/i915/selftests/i915_random.h | 3 + + drivers/gpu/drm/i915/selftests/i915_request.c | 524 ++++++-- + drivers/gpu/drm/i915/selftests/i915_selftest.c | 47 + + drivers/gpu/drm/i915/selftests/i915_timeline.c | 464 ++++++- + drivers/gpu/drm/i915/selftests/i915_vma.c | 81 +- + drivers/gpu/drm/i915/selftests/igt_live_test.c | 78 ++ + drivers/gpu/drm/i915/selftests/igt_live_test.h | 35 + + drivers/gpu/drm/i915/selftests/igt_spinner.c | 5 - + drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c | 470 ------- + drivers/gpu/drm/i915/selftests/intel_guc.c | 10 +- + drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 103 +- + drivers/gpu/drm/i915/selftests/intel_lrc.c | 165 ++- + drivers/gpu/drm/i915/selftests/intel_workarounds.c | 49 +- + drivers/gpu/drm/i915/selftests/lib_sw_fence.c | 54 + + drivers/gpu/drm/i915/selftests/lib_sw_fence.h | 3 + + drivers/gpu/drm/i915/selftests/mock_context.c | 7 +- + drivers/gpu/drm/i915/selftests/mock_engine.c | 160 ++- + drivers/gpu/drm/i915/selftests/mock_engine.h | 6 - + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 24 +- + drivers/gpu/drm/i915/selftests/mock_gtt.c | 15 +- + drivers/gpu/drm/i915/selftests/mock_gtt.h | 4 +- + drivers/gpu/drm/i915/selftests/mock_timeline.c | 3 +- + drivers/gpu/drm/i915/vlv_dsi.c | 36 +- + drivers/gpu/drm/i915/vlv_dsi_pll.c | 31 +- + include/drm/drm_color_mgmt.h | 28 + + include/drm/i915_pciids.h | 4 + + 150 files changed, 9034 insertions(+), 7074 deletions(-) + create mode 100644 drivers/gpu/drm/i915/i915_reset.c + create mode 100644 drivers/gpu/drm/i915/i915_reset.h + create mode 100644 drivers/gpu/drm/i915/selftests/igt_live_test.c + create mode 100644 drivers/gpu/drm/i915/selftests/igt_live_test.h + delete mode 100644 drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c +Merging drm-tegra/drm/tegra/for-next (f48c11644859 drm/tegra: vic: Do not clear driver data) +$ git merge drm-tegra/drm/tegra/for-next +Auto-merging drivers/gpu/drm/tegra/sor.c +Auto-merging drivers/gpu/drm/tegra/hdmi.c +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 ++------- + drivers/gpu/drm/tegra/vic.c | 1 - + 8 files changed, 169 insertions(+), 191 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 (1ff494813baf drm/irq: Ditch DRIVER_IRQ_SHARED) +$ git merge drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/virtio/virtgpu_drv.h +Auto-merging drivers/gpu/drm/tegra/hdmi.c +Auto-merging drivers/gpu/drm/tegra/drm.h +Auto-merging drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c +Auto-merging drivers/gpu/drm/sun4i/sun4i_backend.c +Auto-merging drivers/gpu/drm/rockchip/rockchip_rgb.c +Auto-merging drivers/gpu/drm/qxl/qxl_prime.c +Removing drivers/gpu/drm/qxl/qxl_fb.c +Auto-merging drivers/gpu/drm/qxl/qxl_drv.c +Auto-merging drivers/gpu/drm/msm/msm_drv.h +Auto-merging drivers/gpu/drm/meson/meson_drv.c +Auto-merging drivers/gpu/drm/meson/meson_crtc.c +Auto-merging drivers/gpu/drm/i915/intel_overlay.c +Auto-merging drivers/gpu/drm/i915/intel_fbdev.c +Auto-merging drivers/gpu/drm/i915/intel_fbc.c +Auto-merging 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 +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/intel_crt.c +Auto-merging drivers/gpu/drm/i915/i915_trace.h +Auto-merging drivers/gpu/drm/i915/i915_irq.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/i915_debugfs.c +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/bridge/tc358767.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../display/panel/lemaker,bl035-rgb-002.txt | 12 + + .../bindings/display/panel/pda,91-00156-a0.txt | 14 + + .../bindings/display/panel/sitronix,st7701.txt | 30 ++ + .../bindings/display/sunxi/sun4i-drm.txt | 5 + + .../devicetree/bindings/vendor-prefixes.txt | 2 + + Documentation/gpu/drm-internals.rst | 62 --- + MAINTAINERS | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 2 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 2 +- + drivers/gpu/drm/arc/arcpgu_crtc.c | 2 +- + drivers/gpu/drm/arc/arcpgu_drv.c | 6 +- + drivers/gpu/drm/arc/arcpgu_sim.c | 3 +- + drivers/gpu/drm/arm/hdlcd_crtc.c | 4 +- + drivers/gpu/drm/arm/hdlcd_drv.c | 6 +- + drivers/gpu/drm/arm/malidp_crtc.c | 2 +- + drivers/gpu/drm/arm/malidp_drv.c | 2 +- + drivers/gpu/drm/arm/malidp_mw.c | 2 +- + drivers/gpu/drm/armada/armada_510.c | 2 +- + drivers/gpu/drm/armada/armada_crtc.c | 2 +- + drivers/gpu/drm/armada/armada_crtc.h | 2 + + drivers/gpu/drm/armada/armada_drv.c | 2 +- + drivers/gpu/drm/armada/armada_fb.c | 2 +- + drivers/gpu/drm/ast/ast_drv.c | 1 + + drivers/gpu/drm/ast/ast_mode.c | 1 + + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 2 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 2 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 181 +++----- + drivers/gpu/drm/bochs/bochs_drv.c | 1 + + drivers/gpu/drm/bochs/bochs_kms.c | 1 + + drivers/gpu/drm/bridge/adv7511/adv7511.h | 4 +- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 1 + + drivers/gpu/drm/bridge/analogix-anx78xx.c | 2 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 2 +- + drivers/gpu/drm/bridge/cdns-dsi.c | 4 +- + drivers/gpu/drm/bridge/dumb-vga-dac.c | 2 +- + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 2 +- + drivers/gpu/drm/bridge/nxp-ptn3460.c | 2 +- + drivers/gpu/drm/bridge/panel.c | 2 +- + drivers/gpu/drm/bridge/parade-ps8622.c | 2 +- + drivers/gpu/drm/bridge/sii902x.c | 2 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 2 +- + drivers/gpu/drm/bridge/tc358764.c | 2 +- + drivers/gpu/drm/bridge/tc358767.c | 2 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 2 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 2 +- + drivers/gpu/drm/cirrus/cirrus_drv.c | 1 + + drivers/gpu/drm/cirrus/cirrus_mode.c | 1 + + drivers/gpu/drm/drm_atomic_helper.c | 1 - + drivers/gpu/drm/drm_dp_mst_topology.c | 2 +- + drivers/gpu/drm/drm_fb_helper.c | 4 +- + drivers/gpu/drm/drm_irq.c | 10 +- + drivers/gpu/drm/drm_modeset_helper.c | 2 +- + drivers/gpu/drm/drm_probe_helper.c | 2 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 1 - + drivers/gpu/drm/exynos/exynos_dp.c | 3 +- + drivers/gpu/drm/exynos/exynos_drm_crtc.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_dpi.c | 4 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 4 +- + drivers/gpu/drm/exynos/exynos_drm_fb.c | 6 +- + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 3 +- + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 4 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 4 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 2 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 4 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_kms.c | 2 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 2 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 2 +- + drivers/gpu/drm/gma500/framebuffer.c | 1 - + drivers/gpu/drm/gma500/psb_drv.c | 3 +- + drivers/gpu/drm/gma500/psb_intel_drv.h | 1 + + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 5 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 2 +- + drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 13 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 8 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 6 +- + drivers/gpu/drm/i2c/ch7006_priv.h | 1 + + drivers/gpu/drm/i2c/sil164_drv.c | 2 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 2 +- + drivers/gpu/drm/i915/i915_debugfs.c | 3 +- + drivers/gpu/drm/i915/i915_drv.c | 4 +- + drivers/gpu/drm/i915/i915_gem.c | 2 + + drivers/gpu/drm/i915/i915_ioc32.c | 1 + + drivers/gpu/drm/i915/i915_irq.c | 2 + + drivers/gpu/drm/i915/i915_pci.c | 2 + + drivers/gpu/drm/i915/i915_trace.h | 2 + + drivers/gpu/drm/i915/intel_crt.c | 2 +- + drivers/gpu/drm/i915/intel_display.c | 2 +- + drivers/gpu/drm/i915/intel_dp.c | 2 +- + drivers/gpu/drm/i915/intel_dp_mst.c | 2 +- + drivers/gpu/drm/i915/intel_drv.h | 3 +- + drivers/gpu/drm/i915/intel_fbc.c | 2 + + drivers/gpu/drm/i915/intel_fbdev.c | 2 + + drivers/gpu/drm/i915/intel_lpe_audio.c | 1 + + drivers/gpu/drm/i915/intel_overlay.c | 2 + + drivers/gpu/drm/imx/dw_hdmi-imx.c | 2 +- + drivers/gpu/drm/imx/imx-drm-core.c | 6 +- + drivers/gpu/drm/imx/imx-ldb.c | 2 +- + drivers/gpu/drm/imx/imx-tve.c | 2 +- + drivers/gpu/drm/imx/ipuv3-crtc.c | 12 +- + drivers/gpu/drm/imx/parallel-display.c | 2 +- + drivers/gpu/drm/mediatek/mtk_dpi.c | 2 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 2 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +- + drivers/gpu/drm/mediatek/mtk_drm_fb.c | 2 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 2 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 2 +- + drivers/gpu/drm/meson/meson_crtc.c | 2 +- + drivers/gpu/drm/meson/meson_drv.c | 10 +- + drivers/gpu/drm/meson/meson_dw_hdmi.c | 4 +- + drivers/gpu/drm/meson/meson_venc_cvbs.c | 4 +- + drivers/gpu/drm/mga/mga_drv.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 1 + + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 2 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 2 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_dsi_encoder.c | 2 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_dtv_encoder.c | 2 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c | 2 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c | 2 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 2 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_encoder.c | 2 +- + drivers/gpu/drm/msm/msm_drv.c | 3 +- + drivers/gpu/drm/msm/msm_drv.h | 2 +- + drivers/gpu/drm/msm/msm_fb.c | 2 +- + drivers/gpu/drm/mxsfb/mxsfb_crtc.c | 2 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 5 +- + drivers/gpu/drm/mxsfb/mxsfb_out.c | 2 +- + drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 1 + + drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 1 + + drivers/gpu/drm/nouveau/nouveau_display.c | 1 + + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 4 +- + drivers/gpu/drm/omapdrm/omap_connector.c | 2 +- + drivers/gpu/drm/omapdrm/omap_crtc.c | 1 - + drivers/gpu/drm/omapdrm/omap_drv.c | 2 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 1 - + drivers/gpu/drm/omapdrm/omap_encoder.c | 2 +- + drivers/gpu/drm/omapdrm/omap_fb.c | 2 +- + drivers/gpu/drm/panel/Kconfig | 21 + + drivers/gpu/drm/panel/Makefile | 2 + + drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c | 473 +++++++++++++++++++++ + drivers/gpu/drm/panel/panel-simple.c | 54 +++ + drivers/gpu/drm/panel/panel-sitronix-st7701.c | 426 +++++++++++++++++++ + drivers/gpu/drm/pl111/pl111_drv.c | 8 +- + drivers/gpu/drm/qxl/Makefile | 2 +- + drivers/gpu/drm/qxl/qxl_cmd.c | 34 +- + drivers/gpu/drm/qxl/qxl_display.c | 335 +++++++++------ + drivers/gpu/drm/qxl/qxl_draw.c | 241 +---------- + drivers/gpu/drm/qxl/qxl_drv.c | 6 +- + drivers/gpu/drm/qxl/qxl_drv.h | 64 +-- + drivers/gpu/drm/qxl/qxl_dumb.c | 2 +- + drivers/gpu/drm/qxl/qxl_fb.c | 300 ------------- + drivers/gpu/drm/qxl/qxl_kms.c | 83 ++-- + drivers/gpu/drm/qxl/qxl_object.c | 12 +- + drivers/gpu/drm/qxl/qxl_prime.c | 25 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 10 +- + drivers/gpu/drm/r128/r128_drv.c | 2 +- + drivers/gpu/drm/radeon/radeon_acpi.c | 1 + + drivers/gpu/drm/radeon/radeon_connectors.c | 1 + + drivers/gpu/drm/radeon/radeon_device.c | 1 + + drivers/gpu/drm/radeon/radeon_display.c | 1 + + drivers/gpu/drm/radeon/radeon_dp_mst.c | 1 + + drivers/gpu/drm/radeon/radeon_drv.c | 5 +- + drivers/gpu/drm/radeon/radeon_irq_kms.c | 1 + + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 1 - + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 1 - + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 1 - + drivers/gpu/drm/rcar-du/rcar_lvds.c | 3 +- + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 2 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 +- + drivers/gpu/drm/rockchip/cdn-dp-core.h | 2 +- + drivers/gpu/drm/rockchip/cdn-dp-reg.c | 2 +- + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 2 +- + drivers/gpu/drm/rockchip/inno_hdmi.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 3 +- + drivers/gpu/drm/rockchip/rockchip_drm_psr.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 6 +- + drivers/gpu/drm/rockchip/rockchip_lvds.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_rgb.c | 2 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 1 + + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 3 +- + drivers/gpu/drm/shmobile/shmob_drm_kms.c | 1 + + drivers/gpu/drm/sti/sti_crtc.c | 2 +- + drivers/gpu/drm/sti/sti_drv.c | 2 +- + drivers/gpu/drm/sti/sti_dvo.c | 2 +- + drivers/gpu/drm/sti/sti_hda.c | 2 +- + drivers/gpu/drm/sti/sti_hdmi.c | 2 +- + drivers/gpu/drm/sti/sti_tvout.c | 2 +- + drivers/gpu/drm/stm/drv.c | 8 +- + drivers/gpu/drm/stm/ltdc.c | 11 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 7 +- + drivers/gpu/drm/sun4i/sun4i_crtc.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 6 +- + drivers/gpu/drm/sun4i/sun4i_frontend.c | 4 + + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_layer.c | 37 +- + drivers/gpu/drm/sun4i/sun4i_lvds.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 3 +- + drivers/gpu/drm/sun4i/sun4i_tv.c | 2 +- + drivers/gpu/drm/sun4i/sun6i_drc.c | 1 + + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 2 +- + drivers/gpu/drm/sun4i/sun8i_mixer.c | 2 +- + drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 2 +- + drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 2 +- + drivers/gpu/drm/tegra/drm.h | 2 +- + drivers/gpu/drm/tegra/fb.c | 2 +- + drivers/gpu/drm/tegra/hdmi.c | 2 +- + drivers/gpu/drm/tegra/hub.c | 2 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 3 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.h | 5 +- + drivers/gpu/drm/tilcdc/tilcdc_external.c | 1 + + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 1 + + drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 1 + + drivers/gpu/drm/tinydrm/core/tinydrm-core.c | 2 +- + drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c | 2 +- + drivers/gpu/drm/tve200/tve200_drv.c | 10 +- + drivers/gpu/drm/udl/udl_connector.c | 1 + + drivers/gpu/drm/udl/udl_drv.c | 1 + + drivers/gpu/drm/udl/udl_main.c | 1 + + drivers/gpu/drm/vc4/vc4_crtc.c | 2 +- + drivers/gpu/drm/vc4/vc4_dpi.c | 2 +- + drivers/gpu/drm/vc4/vc4_drv.c | 1 - + drivers/gpu/drm/vc4/vc4_dsi.c | 2 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- + drivers/gpu/drm/vc4/vc4_kms.c | 4 +- + drivers/gpu/drm/vc4/vc4_txp.c | 2 +- + drivers/gpu/drm/vc4/vc4_vec.c | 2 +- + drivers/gpu/drm/via/via_drv.c | 3 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 2 +- + drivers/gpu/drm/vkms/vkms_crtc.c | 3 +- + drivers/gpu/drm/vkms/vkms_drv.c | 2 +- + drivers/gpu/drm/vkms/vkms_output.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 2 +- + drivers/gpu/drm/xen/xen_drm_front.c | 2 +- + drivers/gpu/drm/xen/xen_drm_front_conn.c | 2 +- + drivers/gpu/drm/xen/xen_drm_front_gem.c | 2 +- + drivers/gpu/drm/xen/xen_drm_front_kms.c | 2 +- + drivers/gpu/drm/zte/zx_drm_drv.c | 2 +- + drivers/gpu/drm/zte/zx_hdmi.c | 2 +- + drivers/gpu/drm/zte/zx_tvenc.c | 2 +- + drivers/gpu/drm/zte/zx_vga.c | 2 +- + drivers/gpu/drm/zte/zx_vou.c | 2 +- + drivers/staging/vboxvideo/vbox_drv.c | 3 +- + drivers/staging/vboxvideo/vbox_irq.c | 4 +- + drivers/staging/vboxvideo/vbox_mode.c | 4 +- + include/drm/drm_crtc_helper.h | 16 - + include/drm/drm_drv.h | 135 +++++- + include/drm/drm_probe_helper.h | 27 ++ + include/linux/hdmi.h | 15 + + 268 files changed, 1951 insertions(+), 1287 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/panel/lemaker,bl035-rgb-002.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/pda,91-00156-a0.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/sitronix,st7701.txt + create mode 100644 drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c + create mode 100644 drivers/gpu/drm/panel/panel-sitronix-st7701.c + delete mode 100644 drivers/gpu/drm/qxl/qxl_fb.c + create mode 100644 include/drm/drm_probe_helper.h +Merging drm-msm/msm-next (8aa82766de12 dt-bindings: drm/msm/a6xx: Document GMU bindings) +$ git merge drm-msm/msm-next +Auto-merging drivers/gpu/drm/msm/msm_drv.h +Auto-merging Documentation/devicetree/bindings/display/msm/gpu.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/display/msm/gmu.txt | 59 ++++++++++++++++++++++ + .../devicetree/bindings/display/msm/gpu.txt | 42 +++++++++++++-- + 2 files changed, 98 insertions(+), 3 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 (874cf192964e 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 | 186 ++++++++ + 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, 2998 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 556e133e95f4] Merge remote-tracking branch 'mali-dp/for-upstream/mali-dp' + Date: Wed Jan 30 13:35:12 2019 +1100 +Merging imx-drm/imx-drm/next (257ff80474ab drm/imx: allow building under COMPILE_TEST) +$ git merge imx-drm/imx-drm/next +Auto-merging include/video/imx-ipu-v3.h +Auto-merging drivers/gpu/drm/imx/imx-ldb.c +Auto-merging drivers/gpu/drm/imx/imx-drm-core.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/Kconfig | 3 +- + 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, 104 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 (66fb181d6f82 Merge remote-tracking branch 'regmap/topic/irq' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regcache-rbtree.c | 2 +- + drivers/base/regmap/regmap-irq.c | 99 +++++++++++++++++++++++++++++++++-- + include/linux/regmap.h | 31 +++++++++++ + 3 files changed, 127 insertions(+), 5 deletions(-) +Merging sound/for-next (45571bb871b2 ALSA: hda - Use standard device registration for beep) +$ git merge sound/for-next +Removing sound/firewire/fireface/ff-protocol-ff800.c +Removing sound/firewire/fireface/ff-protocol-ff400.c +Auto-merging sound/aoa/soundbus/i2sbus/core.c +Merge made by the 'recursive' strategy. + .../sound/kernel-api/writing-an-alsa-driver.rst | 25 +- + .../gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c | 1 - + include/sound/hda_register.h | 2 + + include/sound/hda_verbs.h | 2 + + include/sound/hdaudio.h | 3 + + include/sound/pcm.h | 21 +- + sound/aoa/soundbus/i2sbus/core.c | 4 - + sound/arm/aaci.c | 1 - + sound/arm/pxa2xx-ac97.c | 1 - + sound/core/info.c | 12 +- + sound/core/oss/pcm_oss.c | 1 - + sound/core/pcm.c | 96 ++-- + sound/core/pcm_lib.c | 5 +- + sound/core/pcm_local.h | 1 + + sound/core/pcm_memory.c | 16 +- + sound/core/pcm_native.c | 305 ++++++----- + sound/drivers/aloop.c | 4 - + sound/drivers/dummy.c | 2 - + sound/drivers/pcsp/pcsp.c | 1 - + sound/drivers/vx/vx_core.c | 4 - + sound/firewire/Kconfig | 1 + + sound/firewire/dice/dice.c | 12 +- + sound/firewire/fireface/Makefile | 4 +- + sound/firewire/fireface/ff-midi.c | 2 +- + sound/firewire/fireface/ff-pcm.c | 2 +- + sound/firewire/fireface/ff-proc.c | 217 +------- + sound/firewire/fireface/ff-protocol-ff400.c | 161 ------ + sound/firewire/fireface/ff-protocol-ff800.c | 143 ----- + sound/firewire/fireface/ff-protocol-former.c | 597 +++++++++++++++++++++ + sound/firewire/fireface/ff-protocol-latter.c | 430 +++++++++++++++ + sound/firewire/fireface/ff-stream.c | 40 +- + sound/firewire/fireface/ff-transaction.c | 143 +---- + sound/firewire/fireface/ff.c | 28 + + sound/firewire/fireface/ff.h | 23 +- + sound/hda/hdac_controller.c | 8 +- + sound/hda/hdac_stream.c | 44 +- + sound/isa/ad1816a/ad1816a_lib.c | 1 - + sound/isa/als100.c | 1 - + sound/isa/cmi8328.c | 1 - + sound/isa/cmi8330.c | 1 - + sound/isa/es1688/es1688.c | 2 - + sound/isa/es18xx.c | 2 - + sound/isa/gus/gus_main.c | 13 +- + sound/isa/sb/jazz16.c | 1 - + sound/isa/sb/sb16.c | 1 - + sound/isa/sb/sb16_main.c | 10 +- + sound/isa/sb/sb8.c | 1 - + sound/isa/wss/wss_lib.c | 1 - + sound/pci/ali5451/ali5451.c | 4 +- + sound/pci/als300.c | 1 - + sound/pci/als4000.c | 1 - + sound/pci/atiixp.c | 19 +- + sound/pci/atiixp_modem.c | 2 - + sound/pci/azt3328.c | 4 - + sound/pci/ca0106/ca0106_main.c | 3 - + sound/pci/cmipci.c | 4 - + sound/pci/cs4281.c | 2 - + sound/pci/cs46xx/cs46xx_lib.c | 6 - + sound/pci/cs5535audio/cs5535audio_pm.c | 1 - + sound/pci/ctxfi/ctatc.c | 8 - + sound/pci/echoaudio/echoaudio.c | 3 - + sound/pci/emu10k1/emu10k1.c | 6 - + sound/pci/ens1370.c | 3 - + sound/pci/es1938.c | 1 - + sound/pci/es1968.c | 1 - + sound/pci/fm801.c | 1 - + sound/pci/hda/hda_beep.c | 151 +++--- + sound/pci/hda/hda_beep.h | 5 - + sound/pci/hda/hda_codec.c | 56 +- + sound/pci/hda/hda_tegra.c | 114 ++-- + sound/pci/hda/patch_hdmi.c | 10 +- + sound/pci/hda/patch_realtek.c | 4 +- + sound/pci/ice1712/ews.c | 7 +- + sound/pci/ice1712/ice1712.c | 3 - + sound/pci/ice1712/ice1724.c | 3 - + sound/pci/intel8x0.c | 2 - + sound/pci/intel8x0m.c | 3 - + sound/pci/maestro3.c | 1 - + sound/pci/nm256/nm256.c | 1 - + sound/pci/oxygen/oxygen_lib.c | 7 +- + sound/pci/oxygen/pcm1796.h | 1 - + sound/pci/oxygen/xonar_pcm179x.c | 71 ++- + sound/pci/riptide/riptide.c | 1 - + sound/pci/rme96.c | 2 - + sound/pci/sis7019.c | 1 - + sound/pci/trident/trident_main.c | 4 - + sound/pci/via82xx.c | 2 - + sound/pci/via82xx_modem.c | 2 - + sound/pci/ymfpci/ymfpci_main.c | 4 - + sound/pcmcia/pdaudiocf/pdaudiocf_core.c | 1 - + sound/ppc/pmac.c | 1 - + sound/soc/soc-pcm.c | 1 + + sound/usb/card.c | 1 - + sound/usb/line6/driver.c | 4 +- + sound/usb/line6/pod.c | 3 +- + sound/usb/mixer.c | 6 +- + sound/usb/quirks.c | 18 +- + sound/x86/intel_hdmi_audio.c | 12 - + 98 files changed, 1739 insertions(+), 1230 deletions(-) + delete mode 100644 sound/firewire/fireface/ff-protocol-ff400.c + delete mode 100644 sound/firewire/fireface/ff-protocol-ff800.c + create mode 100644 sound/firewire/fireface/ff-protocol-former.c + create mode 100644 sound/firewire/fireface/ff-protocol-latter.c +Merging sound-asoc/for-next (eab2c1d1b13f 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 +Auto-merging MAINTAINERS +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/google,cros-ec-codec.txt | 26 + + Documentation/devicetree/bindings/sound/mt6358.txt | 18 + + .../devicetree/bindings/sound/mt8183-afe-pcm.txt | 36 + + .../devicetree/bindings/sound/qcom,wcd9335.txt | 10 +- + .../bindings/sound/rockchip,rk3328-codec.txt | 23 + + .../devicetree/bindings/sound/sgtl5000.txt | 9 + + .../devicetree/bindings/sound/simple-scu-card.txt | 94 - + .../devicetree/bindings/sound/sprd-pcm.txt | 23 + + .../bindings/sound/xlnx,audio-formatter.txt | 29 + + .../devicetree/bindings/sound/xlnx,spdif.txt | 28 + + MAINTAINERS | 8 + + include/sound/simple_card_utils.h | 4 +- + include/sound/soc-acpi.h | 28 +- + include/sound/soc-dapm.h | 2 + + include/sound/soc-topology.h | 7 +- + include/sound/soc.h | 70 +- + sound/soc/Kconfig | 1 + + sound/soc/Makefile | 1 + + sound/soc/codecs/Kconfig | 41 +- + sound/soc/codecs/Makefile | 10 + + sound/soc/codecs/adau7002.c | 45 + + sound/soc/codecs/ak4458.c | 79 +- + sound/soc/codecs/cros_ec_codec.c | 441 ++ + 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/mt6358.c | 2336 +++++++++ + sound/soc/codecs/mt6358.h | 2314 +++++++++ + sound/soc/codecs/nau8824.c | 2 +- + sound/soc/codecs/nau8825.c | 1 + + sound/soc/codecs/pcm512x.c | 32 +- + 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 | 67 +- + 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/wcd-clsh-v2.c | 576 +++ + sound/soc/codecs/wcd-clsh-v2.h | 49 + + sound/soc/codecs/wcd9335.c | 5248 ++++++++++++++++++++ + sound/soc/codecs/wcd9335.h | 640 +++ + 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/fsl/fsl_sai.c | 8 +- + sound/soc/fsl/fsl_spdif.c | 2 +- + sound/soc/fsl/imx-sgtl5000.c | 11 +- + sound/soc/fsl/imx-spdif.c | 4 +- + sound/soc/generic/Kconfig | 17 - + sound/soc/generic/Makefile | 4 - + sound/soc/generic/audio-graph-card.c | 481 +- + sound/soc/generic/audio-graph-scu-card.c | 501 -- + sound/soc/generic/simple-card-utils.c | 25 +- + sound/soc/generic/simple-card.c | 472 +- + 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/bdw-rt5677.c | 14 + + sound/soc/intel/boards/broadwell.c | 16 + + sound/soc/intel/boards/bxt_da7219_max98357a.c | 13 + + sound/soc/intel/boards/bxt_rt298.c | 13 + + sound/soc/intel/boards/bytcht_da7213.c | 8 + + sound/soc/intel/boards/bytcht_es8316.c | 336 +- + sound/soc/intel/boards/bytcr_rt5640.c | 23 +- + sound/soc/intel/boards/bytcr_rt5651.c | 114 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 12 + + sound/soc/intel/boards/cht_bsw_nau8824.c | 12 + + sound/soc/intel/boards/cht_bsw_rt5645.c | 9 + + sound/soc/intel/boards/cht_bsw_rt5672.c | 30 +- + sound/soc/intel/boards/glk_rt5682_max98357a.c | 23 +- + sound/soc/intel/boards/haswell.c | 15 + + 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/mediatek/Kconfig | 10 + + sound/soc/mediatek/Makefile | 1 + + sound/soc/mediatek/mt8183/Makefile | 13 + + sound/soc/mediatek/mt8183/mt8183-afe-clk.c | 611 +++ + sound/soc/mediatek/mt8183/mt8183-afe-clk.h | 38 + + sound/soc/mediatek/mt8183/mt8183-afe-common.h | 108 + + sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 1237 +++++ + sound/soc/mediatek/mt8183/mt8183-dai-adda.c | 501 ++ + sound/soc/mediatek/mt8183/mt8183-dai-hostless.c | 118 + + sound/soc/mediatek/mt8183/mt8183-dai-i2s.c | 1040 ++++ + sound/soc/mediatek/mt8183/mt8183-dai-pcm.c | 318 ++ + sound/soc/mediatek/mt8183/mt8183-dai-tdm.c | 639 +++ + sound/soc/mediatek/mt8183/mt8183-interconnection.h | 33 + + sound/soc/mediatek/mt8183/mt8183-reg.h | 1666 +++++++ + sound/soc/pxa/Makefile | 1 - + sound/soc/qcom/Kconfig | 1 + + sound/soc/qcom/apq8096.c | 71 +- + sound/soc/qcom/sdm845.c | 2 + + sound/soc/sh/rcar/src.c | 125 +- + sound/soc/soc-core.c | 237 +- + sound/soc/soc-topology.c | 134 +- + sound/soc/sprd/Kconfig | 6 + + sound/soc/sprd/Makefile | 4 + + sound/soc/sprd/sprd-pcm-dma.c | 562 +++ + sound/soc/sprd/sprd-pcm-dma.h | 15 + + 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 ++ + 142 files changed, 24622 insertions(+), 2159 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/google,cros-ec-codec.txt + create mode 100644 Documentation/devicetree/bindings/sound/mt6358.txt + create mode 100644 Documentation/devicetree/bindings/sound/mt8183-afe-pcm.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/sprd-pcm.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/cros_ec_codec.c + create mode 100644 sound/soc/codecs/cs4341.c + create mode 100644 sound/soc/codecs/mt6358.c + create mode 100644 sound/soc/codecs/mt6358.h + create mode 100644 sound/soc/codecs/rk3328_codec.c + create mode 100644 sound/soc/codecs/rk3328_codec.h + create mode 100644 sound/soc/codecs/wcd-clsh-v2.c + create mode 100644 sound/soc/codecs/wcd-clsh-v2.h + create mode 100644 sound/soc/codecs/wcd9335.c + create mode 100644 sound/soc/codecs/wcd9335.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/mediatek/mt8183/Makefile + create mode 100644 sound/soc/mediatek/mt8183/mt8183-afe-clk.c + create mode 100644 sound/soc/mediatek/mt8183/mt8183-afe-clk.h + create mode 100644 sound/soc/mediatek/mt8183/mt8183-afe-common.h + create mode 100644 sound/soc/mediatek/mt8183/mt8183-afe-pcm.c + create mode 100644 sound/soc/mediatek/mt8183/mt8183-dai-adda.c + create mode 100644 sound/soc/mediatek/mt8183/mt8183-dai-hostless.c + create mode 100644 sound/soc/mediatek/mt8183/mt8183-dai-i2s.c + create mode 100644 sound/soc/mediatek/mt8183/mt8183-dai-pcm.c + create mode 100644 sound/soc/mediatek/mt8183/mt8183-dai-tdm.c + create mode 100644 sound/soc/mediatek/mt8183/mt8183-interconnection.h + create mode 100644 sound/soc/mediatek/mt8183/mt8183-reg.h + create mode 100644 sound/soc/sprd/Kconfig + create mode 100644 sound/soc/sprd/Makefile + create mode 100644 sound/soc/sprd/sprd-pcm-dma.c + create mode 100644 sound/soc/sprd/sprd-pcm-dma.h + 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 (281d5e66e01e Input: sx8654 - convert #defined flags to BIT(x)) +$ git merge input/next +Auto-merging drivers/input/touchscreen/Kconfig +Merge made by the 'recursive' strategy. + .../bindings/input/cypress,tm2-touchkey.txt | 9 +- + .../bindings/input/touchscreen/edt-ft5x06.txt | 13 +- + .../bindings/input/touchscreen/sitronix-st1232.txt | 6 +- + .../bindings/input/touchscreen/sx8654.txt | 10 +- + 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/Kconfig | 6 +- + drivers/input/touchscreen/ad7879.c | 11 +- + drivers/input/touchscreen/edt-ft5x06.c | 110 ++++++++- + drivers/input/touchscreen/st1232.c | 121 +++++++--- + drivers/input/touchscreen/sx8654.c | 253 ++++++++++++++++++--- + 14 files changed, 571 insertions(+), 128 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 (075c18c3e124 dm: add missing trace_block_split() to __split_and_process_bio()) +$ git merge device-mapper/for-next +Already up to date. +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 (a5511c25e0ee mmc: jz4740: Remove platform data and use standard APIs) +$ git merge mmc/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/fsl-imx-esdhc.txt | 1 + + .../bindings/mmc/nvidia,tegra20-sdhci.txt | 6 +- + Documentation/devicetree/bindings/mmc/ti-omap.txt | 28 -- + drivers/mmc/core/block.c | 9 +- + drivers/mmc/core/host.c | 2 +- + drivers/mmc/core/sdio_bus.c | 3 +- + drivers/mmc/host/Kconfig | 1 + + drivers/mmc/host/jz4740_mmc.c | 73 ++---- + 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-tegra.c | 160 +++++++++--- + 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 +- + 18 files changed, 554 insertions(+), 200 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 fc9c5dcf9721] 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 (f83a6ece6997 power: supply: bq25890: show max charge current/voltage as configured) +$ git merge battery/for-next +Removing include/linux/power/isp1704_charger.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/supply/sc27xx-fg.txt | 8 +- + drivers/power/supply/axp288_fuel_gauge.c | 14 +--- + drivers/power/supply/bq25890_charger.c | 4 +- + drivers/power/supply/charger-manager.c | 18 ++-- + drivers/power/supply/cpcap-charger.c | 1 + + drivers/power/supply/goldfish_battery.c | 88 +++++++++++++------- + drivers/power/supply/isp1704_charger.c | 60 +++----------- + drivers/power/supply/power_supply_core.c | 2 - + drivers/power/supply/sc27xx_fuel_gauge.c | 95 ++++++++++++++++++++-- + drivers/power/supply/twl4030_charger.c | 4 +- + include/linux/power/isp1704_charger.h | 30 ------- + 11 files changed, 182 insertions(+), 142 deletions(-) + delete mode 100644 include/linux/power/isp1704_charger.h +Merging regulator/for-next (c1ea5094ece5 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 +++ + .../bindings/regulator/max77650-regulator.txt | 41 ++ + .../devicetree/bindings/regulator/pfuze100.txt | 2 +- + .../bindings/regulator/rohm,bd70528-regulator.txt | 68 +++ + drivers/regulator/Kconfig | 27 +- + drivers/regulator/Makefile | 2 + + drivers/regulator/act8865-regulator.c | 5 +- + drivers/regulator/act8945a-regulator.c | 11 +- + drivers/regulator/arizona-ldo1.c | 37 +- + drivers/regulator/axp20x-regulator.c | 14 +- + drivers/regulator/bd70528-regulator.c | 289 ++++++++++++ + drivers/regulator/bd718x7-regulator.c | 14 +- + drivers/regulator/bd9571mwv-regulator.c | 8 +- + drivers/regulator/core.c | 22 +- + drivers/regulator/da9062-regulator.c | 29 +- + drivers/regulator/da9063-regulator.c | 29 +- + drivers/regulator/hi655x-regulator.c | 1 - + drivers/regulator/isl6271a-regulator.c | 13 +- + drivers/regulator/lochnagar-regulator.c | 3 +- + drivers/regulator/lp3971.c | 4 +- + drivers/regulator/lp3972.c | 4 +- + drivers/regulator/lp872x.c | 12 +- + drivers/regulator/lp873x-regulator.c | 4 +- + drivers/regulator/lp8755.c | 6 +- + drivers/regulator/lp87565-regulator.c | 4 +- + drivers/regulator/lp8788-buck.c | 2 +- + drivers/regulator/lp8788-ldo.c | 4 +- + drivers/regulator/max14577-regulator.c | 1 - + drivers/regulator/max77650-regulator.c | 518 +++++++++++++++++++++ + drivers/regulator/mcp16502.c | 1 + + drivers/regulator/of_regulator.c | 4 +- + drivers/regulator/pwm-regulator.c | 17 +- + drivers/regulator/qcom_smd-regulator.c | 104 +++-- + drivers/regulator/rk808-regulator.c | 46 +- + drivers/regulator/stpmic1_regulator.c | 38 +- + drivers/regulator/twl-regulator.c | 7 +- + drivers/regulator/twl6030-regulator.c | 7 +- + drivers/regulator/wm831x-dcdc.c | 39 +- + include/linux/regulator/driver.h | 1 + + 40 files changed, 1266 insertions(+), 274 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/regulator/fixed-regulator.txt + create mode 100644 Documentation/devicetree/bindings/regulator/fixed-regulator.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/max77650-regulator.txt + create mode 100644 Documentation/devicetree/bindings/regulator/rohm,bd70528-regulator.txt + create mode 100644 drivers/regulator/bd70528-regulator.c + create mode 100644 drivers/regulator/max77650-regulator.c +Merging security/next-testing (f3e6bad019c7 Merge branch 'next-general' into next-testing) +$ git merge security/next-testing +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 +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/SafeSetID.rst | 107 ++++ + Documentation/admin-guide/LSM/index.rst | 14 +- + Documentation/admin-guide/kernel-parameters.txt | 4 + + fs/proc/base.c | 64 ++- + fs/proc/internal.h | 1 + + include/linux/capability.h | 5 + + include/linux/cred.h | 1 - + include/linux/lsm_hooks.h | 45 +- + include/linux/security.h | 43 +- + include/linux/selinux.h | 35 -- + kernel/capability.c | 45 +- + kernel/cred.c | 13 - + kernel/seccomp.c | 4 +- + kernel/sys.c | 10 +- + security/Kconfig | 42 +- + security/Makefile | 2 + + 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 | 67 ++- + security/apparmor/resource.c | 2 +- + security/apparmor/task.c | 6 +- + security/commoncap.c | 26 +- + security/keys/keyring.c | 1 + + security/keys/process_keys.c | 3 + + security/keys/request_key.c | 4 + + security/loadpin/loadpin.c | 8 +- + security/safesetid/Kconfig | 14 + + security/safesetid/Makefile | 7 + + security/safesetid/lsm.c | 278 ++++++++++ + security/safesetid/lsm.h | 33 ++ + security/safesetid/securityfs.c | 193 +++++++ + security/security.c | 644 +++++++++++++++++++++--- + security/selinux/Kconfig | 15 - + security/selinux/Makefile | 2 +- + security/selinux/exports.c | 23 - + security/selinux/hooks.c | 362 ++++--------- + 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 | 314 ++++-------- + security/smack/smackfs.c | 18 +- + security/tomoyo/audit.c | 31 +- + security/tomoyo/common.c | 186 ++++--- + security/tomoyo/common.h | 49 +- + security/tomoyo/condition.c | 59 ++- + security/tomoyo/domain.c | 76 ++- + security/tomoyo/file.c | 20 + + security/tomoyo/gc.c | 19 + + security/tomoyo/group.c | 5 + + security/tomoyo/load_policy.c | 8 +- + security/tomoyo/memory.c | 9 +- + security/tomoyo/mount.c | 2 + + security/tomoyo/realpath.c | 18 +- + security/tomoyo/securityfs_if.c | 30 +- + security/tomoyo/tomoyo.c | 160 +++--- + security/tomoyo/util.c | 23 +- + security/yama/yama_lsm.c | 8 +- + 68 files changed, 2271 insertions(+), 1067 deletions(-) + create mode 100644 Documentation/admin-guide/LSM/SafeSetID.rst + delete mode 100644 include/linux/selinux.h + create mode 100644 security/safesetid/Kconfig + create mode 100644 security/safesetid/Makefile + create mode 100644 security/safesetid/lsm.c + create mode 100644 security/safesetid/lsm.h + create mode 100644 security/safesetid/securityfs.c + 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 (cd0b86fe9529 ima: define ima_post_create_tmpfile() hook and add missing call) +$ git merge integrity/next-integrity +Auto-merging fs/namei.c +Auto-merging arch/x86/kernel/kexec-bzimage64.c +Merge made by the 'recursive' strategy. + arch/x86/kernel/kexec-bzimage64.c | 14 ++++++++++--- + certs/system_keyring.c | 23 ++++++++++++++++++++- + fs/namei.c | 1 + + include/keys/system_keyring.h | 11 ++++++++++ + include/linux/ima.h | 5 +++++ + include/linux/verification.h | 1 + + security/integrity/digsig.c | 3 +++ + security/integrity/evm/evm_main.c | 6 +----- + security/integrity/ima/ima_main.c | 35 ++++++++++++++++++++++++++++++-- + security/keys/encrypted-keys/encrypted.c | 4 ++-- + 10 files changed, 90 insertions(+), 13 deletions(-) +Merging selinux/next (e6f2f381e401 selinux: replace BUG_ONs with WARN_ONs in avc.c) +$ git merge selinux/next +Auto-merging security/selinux/ss/services.c +Auto-merging security/selinux/include/security.h +Auto-merging security/selinux/hooks.c +Merge made by the 'recursive' strategy. + security/selinux/avc.c | 199 +++++++++++++++++------------------- + security/selinux/hooks.c | 58 ++++++++--- + security/selinux/include/avc.h | 6 +- + security/selinux/include/security.h | 3 + + security/selinux/ss/services.c | 37 ++++++- + 5 files changed, 176 insertions(+), 127 deletions(-) +Merging tpmdd/next (ba3efe943bc2 tpm: add _head suffix to tcg_efi_specid_event and tcg_pcr_event2) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + drivers/char/tpm/eventlog/tpm1.c | 41 ++++++++++++++++------------------------ + drivers/char/tpm/eventlog/tpm2.c | 12 ++++++------ + include/linux/tpm_eventlog.h | 12 ++++-------- + 3 files changed, 26 insertions(+), 39 deletions(-) +Merging watchdog/master (f17b5f06cb92 Linux 5.0-rc4) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (c6770d3f7e18 Merge branches 'iommu/fixes', 'arm/msm', 'arm/tegra', 'x86/vt-d' and 'core' into next) +$ git merge iommu/next +Removing Documentation/devicetree/bindings/iommu/nvidia,tegra20-gart.txt +Merge made by the 'recursive' strategy. + .../bindings/iommu/nvidia,tegra20-gart.txt | 14 - + .../memory-controllers/nvidia,tegra20-mc.txt | 27 +- + arch/arm/boot/dts/tegra20.dtsi | 15 +- + drivers/Makefile | 2 +- + drivers/iommu/Kconfig | 8 +- + drivers/iommu/amd_iommu.c | 19 +- + drivers/iommu/dma-iommu.c | 3 +- + drivers/iommu/intel-iommu.c | 2 +- + drivers/iommu/intel-svm.c | 77 ++-- + drivers/iommu/iommu.c | 8 +- + drivers/iommu/msm_iommu.c | 8 +- + drivers/iommu/mtk_iommu_v1.c | 4 + + drivers/iommu/tegra-gart.c | 473 ++++++++------------- + drivers/iommu/tegra-smmu.c | 4 - + drivers/memory/tegra/mc.c | 118 +++-- + drivers/memory/tegra/mc.h | 10 +- + include/linux/intel-iommu.h | 21 +- + include/linux/intel-svm.h | 2 +- + include/linux/iommu.h | 1 + + include/soc/tegra/mc.h | 27 +- + 20 files changed, 406 insertions(+), 437 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/iommu/nvidia,tegra20-gart.txt +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 (05c7a9cb2727 audit: clean up AUDITSYSCALL prototypes and stubs) +$ git merge audit/next +Auto-merging security/commoncap.c +Auto-merging include/linux/sched.h +Auto-merging include/linux/capability.h +Auto-merging fs/proc/base.c +Merge made by the 'recursive' strategy. + fs/proc/base.c | 6 +- + include/linux/audit.h | 42 +++++++------- + include/linux/capability.h | 5 +- + include/linux/sched.h | 2 +- + init/init_task.c | 2 +- + kernel/audit.c | 126 +++++++++++++++++++++++++++++++++++++----- + kernel/audit.h | 67 +++++++++++----------- + kernel/audit_fsnotify.c | 2 +- + kernel/audit_tree.c | 19 ++++--- + kernel/audit_watch.c | 2 +- + kernel/auditfilter.c | 2 +- + kernel/auditsc.c | 135 +++++++++++++-------------------------------- + security/commoncap.c | 2 + + 13 files changed, 232 insertions(+), 180 deletions(-) +Merging devicetree/for-next (42e45a9449f1 media: s5p-mfc: Fix memdev DMA configuration) +$ git merge devicetree/for-next +Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/serial/renesas,sci-serial.txt | 2 ++ + drivers/media/platform/s5p-mfc/s5p_mfc.c | 7 +++++++ + drivers/of/of_reserved_mem.c | 4 ---- + 3 files changed, 9 insertions(+), 4 deletions(-) +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 (f3b96ecc159a Merge branch 'spi-5.1' into spi-next) +$ git merge spi/for-next +Removing drivers/mtd/spi-nor/fsl-quadspi.c +Auto-merging drivers/mtd/spi-nor/Makefile +Auto-merging drivers/mtd/spi-nor/Kconfig +CONFLICT (modify/delete): arch/mips/ath79/dev-spi.h deleted in HEAD and modified in spi/for-next. Version spi/for-next of arch/mips/ath79/dev-spi.h left in tree. +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/mips/ath79/dev-spi.h +arch/mips/ath79/dev-spi.h: needs merge +rm 'arch/mips/ath79/dev-spi.h' +$ git commit -v -a +[master c1bb59a3031e] Merge remote-tracking branch 'spi/for-next' +$ git diff -M --stat --summary HEAD^.. + .../{mtd/fsl-quadspi.txt => spi/spi-fsl-qspi.txt} | 18 +- + .../devicetree/bindings/spi/spi-nxp-fspi.txt | 39 + + .../devicetree/bindings/spi/spi-stm32.txt | 9 +- + Documentation/spi/pxa2xx | 10 +- + MAINTAINERS | 12 +- + arch/arm/mach-pxa/cm-x255.c | 2 +- + arch/arm/mach-pxa/cm-x270.c | 2 +- + arch/arm/mach-pxa/corgi.c | 2 +- + arch/arm/mach-pxa/devices.c | 2 +- + arch/arm/mach-pxa/em-x270.c | 4 +- + arch/arm/mach-pxa/hx4700.c | 2 +- + arch/arm/mach-pxa/icontrol.c | 4 +- + arch/arm/mach-pxa/littleton.c | 2 +- + arch/arm/mach-pxa/lubbock.c | 2 +- + arch/arm/mach-pxa/magician.c | 2 +- + arch/arm/mach-pxa/pcm027.c | 2 +- + arch/arm/mach-pxa/poodle.c | 2 +- + arch/arm/mach-pxa/spitz.c | 2 +- + arch/arm/mach-pxa/stargate2.c | 6 +- + arch/arm/mach-pxa/tosa.c | 2 +- + arch/arm/mach-pxa/z2.c | 4 +- + arch/arm/mach-pxa/zeus.c | 2 +- + drivers/gpio/gpiolib-of.c | 2 +- + drivers/mtd/spi-nor/Kconfig | 9 - + drivers/mtd/spi-nor/Makefile | 1 - + drivers/mtd/spi-nor/fsl-quadspi.c | 1224 ----------------- + drivers/spi/Kconfig | 30 +- + drivers/spi/Makefile | 2 + + drivers/spi/spi-ath79.c | 114 +- + drivers/spi/spi-atmel.c | 93 +- + drivers/spi/spi-bcm2835aux.c | 2 +- + drivers/spi/spi-bitbang.c | 13 - + drivers/spi/spi-cadence.c | 84 +- + drivers/spi/spi-clps711x.c | 23 +- + drivers/spi/spi-davinci.c | 54 +- + drivers/spi/spi-dw-mmio.c | 22 - + drivers/spi/spi-dw.c | 18 +- + drivers/spi/spi-fsl-qspi.c | 966 ++++++++++++++ + drivers/spi/spi-geni-qcom.c | 56 +- + drivers/spi/spi-mem.c | 69 + + drivers/spi/spi-mxs.c | 5 + + drivers/spi/spi-nxp-fspi.c | 1106 +++++++++++++++ + drivers/spi/spi-pl022.c | 30 +- + drivers/spi/spi-pxa2xx-dma.c | 58 +- + drivers/spi/spi-pxa2xx-pci.c | 4 +- + drivers/spi/spi-pxa2xx.c | 156 +-- + drivers/spi/spi-pxa2xx.h | 4 +- + drivers/spi/spi-sh-hspi.c | 5 +- + drivers/spi/spi-sh-msiof.c | 10 +- + drivers/spi/spi-stm32.c | 1403 +++++++++++++++----- + drivers/spi/spi.c | 109 +- + .../linux/platform_data/spi-ath79.h | 0 + include/linux/spi/pxa2xx_spi.h | 4 +- + include/linux/spi/spi-mem.h | 5 + + include/linux/spi/spi.h | 23 +- + include/trace/events/spi.h | 31 +- + 56 files changed, 3739 insertions(+), 2128 deletions(-) + rename Documentation/devicetree/bindings/{mtd/fsl-quadspi.txt => spi/spi-fsl-qspi.txt} (73%) + create mode 100644 Documentation/devicetree/bindings/spi/spi-nxp-fspi.txt + delete mode 100644 drivers/mtd/spi-nor/fsl-quadspi.c + create mode 100644 drivers/spi/spi-fsl-qspi.c + create mode 100644 drivers/spi/spi-nxp-fspi.c + rename arch/mips/include/asm/mach-ath79/ath79_spi_platform.h => include/linux/platform_data/spi-ath79.h (100%) +Merging tip/auto-latest (e65b1e5fc13b Merge branch 'x86/kdump') +$ git merge tip/auto-latest +Auto-merging kernel/bpf/core.c +Auto-merging include/linux/filter.h +Auto-merging arch/x86/realmode/rm/Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/sysctl/kernel.txt +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 +++++ + Documentation/power/energy-model.txt | 144 ++ + Documentation/scheduler/sched-energy.txt | 425 ++++ + Documentation/sysctl/kernel.txt | 12 + + Kbuild | 18 +- + MAINTAINERS | 20 +- + arch/alpha/kernel/perf_event.c | 7 +- + arch/arm/mach-imx/mmdc.c | 9 +- + arch/arm/mm/cache-l2x0-pmu.c | 9 +- + 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/powerpc/perf/hv-24x7.c | 10 +- + arch/powerpc/perf/hv-gpci.c | 10 +- + arch/powerpc/perf/imc-pmu.c | 19 +- + arch/x86/Makefile | 1 - + arch/x86/boot/Makefile | 2 +- + arch/x86/boot/compressed/vmlinux.lds.S | 2 +- + arch/x86/boot/setup.ld | 2 +- + arch/x86/events/amd/ibs.c | 13 +- + arch/x86/events/amd/iommu.c | 6 +- + arch/x86/events/amd/power.c | 10 +- + arch/x86/events/amd/uncore.c | 7 +- + arch/x86/events/intel/cstate.c | 12 +- + arch/x86/events/intel/rapl.c | 9 +- + arch/x86/events/intel/uncore.c | 9 +- + arch/x86/events/intel/uncore_snb.c | 9 +- + arch/x86/events/msr.c | 10 +- + arch/x86/include/asm/alternative.h | 39 +- + arch/x86/include/asm/asm-prototypes.h | 1 - + arch/x86/include/asm/bitops.h | 6 - + arch/x86/include/asm/fpu/internal.h | 50 +- + 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/apic/io_apic.c | 2 + + arch/x86/kernel/cpu/amd.c | 8 +- + arch/x86/kernel/cpu/cacheinfo.c | 1 + + 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/e820.c | 9 +- + arch/x86/kernel/hw_breakpoint.c | 1 + + arch/x86/kernel/kgdb.c | 1 + + arch/x86/kernel/machine_kexec_64.c | 3 + + arch/x86/kernel/traps.c | 5 +- + arch/x86/kernel/uprobes.c | 1 + + arch/x86/kernel/vmlinux.lds.S | 4 +- + arch/x86/lib/insn-eval.c | 2 + + arch/x86/platform/uv/tlb_uv.c | 8 +- + arch/x86/realmode/rm/Makefile | 2 +- + arch/x86/realmode/rm/realmode.lds.S | 2 +- + drivers/perf/arm-cci.c | 10 +- + drivers/perf/arm-ccn.c | 6 +- + drivers/perf/arm_dsu_pmu.c | 9 +- + drivers/perf/arm_pmu.c | 15 +- + drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c | 1 + + drivers/perf/hisilicon/hisi_uncore_hha_pmu.c | 1 + + drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c | 1 + + drivers/perf/hisilicon/hisi_uncore_pmu.c | 9 - + drivers/perf/qcom_l2_pmu.c | 9 +- + drivers/perf/qcom_l3_pmu.c | 8 +- + drivers/perf/thunderx2_pmu.c | 10 +- + drivers/perf/xgene_pmu.c | 6 +- + drivers/ras/ras.c | 2 +- + 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/filter.h | 7 + + include/linux/perf_event.h | 31 +- + include/linux/posix-timers.h | 2 +- + include/linux/sched/sysctl.h | 7 + + include/ras/ras_event.h | 8 +- + include/uapi/linux/perf_event.h | 55 +- + kernel/bpf/core.c | 2 +- + kernel/bpf/syscall.c | 2 + + kernel/cpu.c | 9 + + kernel/events/core.c | 247 ++- + kernel/irq/handle.c | 2 +- + kernel/irq/manage.c | 1 + + kernel/kallsyms.c | 2 +- + kernel/locking/lockdep.c | 57 +- + kernel/locking/lockdep_internals.h | 4 + + kernel/rcu/Kconfig | 30 - + kernel/sched/core.c | 7 +- + kernel/sched/fair.c | 78 +- + kernel/sched/sched.h | 18 +- + kernel/sched/topology.c | 31 +- + kernel/sysctl.c | 11 + + kernel/time/Kconfig | 29 + + kernel/time/posix-cpu-timers.c | 13 +- + kernel/trace/bpf_trace.c | 3 +- + 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/include/linux/rbtree.h | 52 +- + tools/include/linux/rbtree_augmented.h | 60 +- + tools/include/uapi/linux/perf_event.h | 55 +- + tools/lib/rbtree.c | 178 +- + 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/perf/Makefile.perf | 4 +- + tools/perf/builtin-annotate.c | 4 +- + tools/perf/builtin-c2c.c | 10 +- + tools/perf/builtin-diff.c | 10 +- + tools/perf/builtin-kmem.c | 4 +- + tools/perf/builtin-probe.c | 1 + + tools/perf/builtin-record.c | 7 + + tools/perf/builtin-report.c | 9 +- + tools/perf/builtin-sched.c | 47 +- + tools/perf/builtin-script.c | 9 +- + tools/perf/builtin-stat.c | 1 - + tools/perf/builtin-top.c | 9 +- + tools/perf/builtin-trace.c | 3 +- + tools/perf/design.txt | 4 + + tools/perf/examples/bpf/augmented_raw_syscalls.c | 18 +- + tools/perf/examples/bpf/augmented_syscalls.c | 22 +- + tools/perf/examples/bpf/etcsnoop.c | 18 +- + tools/perf/include/bpf/bpf.h | 16 +- + tools/perf/perf.h | 1 + + tools/perf/scripts/python/exported-sql-viewer.py | 1 - + tools/perf/scripts/python/sched-migration.py | 2 - + tools/perf/scripts/python/stat-cpi.py | 1 - + tools/perf/tests/attr.py | 33 +- + tools/perf/tests/bp_account.c | 1 - + tools/perf/tests/hists_common.c | 8 +- + tools/perf/tests/hists_cumulate.c | 14 +- + tools/perf/tests/hists_link.c | 8 +- + tools/perf/tests/hists_output.c | 32 +- + tools/perf/ui/browsers/annotate.c | 16 +- + tools/perf/ui/browsers/header.c | 2 +- + tools/perf/ui/browsers/hists.c | 20 +- + tools/perf/ui/browsers/map.c | 1 + + tools/perf/ui/gtk/annotate.c | 1 + + tools/perf/ui/gtk/hists.c | 6 +- + tools/perf/ui/stdio/hist.c | 3 +- + tools/perf/util/Build | 5 + + tools/perf/util/annotate.c | 1 + + tools/perf/util/annotate.h | 14 +- + tools/perf/util/block-range.c | 2 + + tools/perf/util/block-range.h | 6 +- + tools/perf/util/bpf-event.c | 263 +++ + tools/perf/util/bpf-event.h | 38 + + tools/perf/util/branch.h | 27 +- + tools/perf/util/build-id.c | 13 +- + tools/perf/util/build-id.h | 3 +- + tools/perf/util/callchain.h | 1 - + tools/perf/util/color.c | 39 - + tools/perf/util/color.h | 1 + + tools/perf/util/color_config.c | 47 + + tools/perf/util/comm.c | 1 + + tools/perf/util/comm.h | 4 +- + tools/perf/util/cpumap.c | 11 +- + tools/perf/util/dso.c | 10 +- + tools/perf/util/dso.h | 17 +- + tools/perf/util/event.c | 41 + + tools/perf/util/event.h | 57 +- + tools/perf/util/evlist.h | 4 +- + tools/perf/util/evsel.c | 19 +- + tools/perf/util/evsel.h | 2 + + tools/perf/util/hist.c | 199 +- + tools/perf/util/hist.h | 10 +- + tools/perf/util/intlist.h | 2 +- + tools/perf/util/jitdump.c | 1 + + tools/perf/util/machine.c | 111 +- + tools/perf/util/machine.h | 15 +- + tools/perf/util/map.c | 8 +- + tools/perf/util/metricgroup.c | 2 +- + tools/perf/util/ordered-events.c | 6 +- + tools/perf/util/probe-event.c | 4 +- + tools/perf/util/probe-event.h | 5 +- + tools/perf/util/probe-file.c | 1 + + tools/perf/util/rb_resort.h | 8 +- + tools/perf/util/rblist.c | 28 +- + tools/perf/util/rblist.h | 2 +- + tools/perf/util/s390-cpumcf-kernel.h | 62 + + tools/perf/util/s390-cpumsf.c | 77 +- + tools/perf/util/s390-sample-raw.c | 222 ++ + tools/perf/util/sample-raw.c | 18 + + tools/perf/util/sample-raw.h | 14 + + .../util/scripting-engines/trace-event-python.c | 15 +- + tools/perf/util/session.c | 98 +- + tools/perf/util/setup.py | 4 +- + tools/perf/util/sort.h | 4 +- + tools/perf/util/srcline.c | 43 +- + tools/perf/util/srcline.h | 13 +- + tools/perf/util/stat-display.c | 1 + + tools/perf/util/stat-shadow.c | 2 +- + tools/perf/util/strlist.h | 2 +- + tools/perf/util/symbol-minimal.c | 1 + + tools/perf/util/symbol.c | 87 +- + tools/perf/util/symbol.h | 88 +- + tools/perf/util/symbol_conf.h | 73 + + tools/perf/util/symbol_fprintf.c | 3 +- + tools/perf/util/thread.h | 1 + + tools/perf/util/tool.h | 5 +- + tools/perf/util/util.c | 1 + + tools/perf/util/zlib.c | 1 - + 240 files changed, 10337 insertions(+), 3172 deletions(-) + create mode 100644 Documentation/kdump/vmcoreinfo.txt + create mode 100644 Documentation/power/energy-model.txt + create mode 100644 Documentation/scheduler/sched-energy.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 + create mode 100644 tools/perf/util/bpf-event.c + create mode 100644 tools/perf/util/bpf-event.h + create mode 100644 tools/perf/util/color_config.c + create mode 100644 tools/perf/util/s390-cpumcf-kernel.h + create mode 100644 tools/perf/util/s390-sample-raw.c + create mode 100644 tools/perf/util/sample-raw.c + create mode 100644 tools/perf/util/sample-raw.h + create mode 100644 tools/perf/util/symbol_conf.h +Merging clockevents/clockevents/next (7cd6dca3600d clocksource/drivers/arch_timer: Workaround for Allwinner A64 timer instability) +$ git merge clockevents/clockevents/next +Merge made by the 'recursive' strategy. + Documentation/arm64/silicon-errata.txt | 2 ++ + drivers/clocksource/Kconfig | 10 +++++++ + drivers/clocksource/arm_arch_timer.c | 55 ++++++++++++++++++++++++++++++++++ + drivers/clocksource/timer-sun5i.c | 10 +++++++ + 4 files changed, 77 insertions(+) +Merging edac-amd/for-next (912ebd99edfa EDAC: Do not check return value of debugfs_create() functions) +$ git merge edac-amd/for-next +Auto-merging arch/arm/boot/dts/aspeed-g5.dtsi +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/edac/aspeed-sdram-edac.txt | 25 ++ + MAINTAINERS | 7 + + arch/arm/boot/dts/aspeed-g5.dtsi | 7 + + drivers/edac/Kconfig | 9 + + drivers/edac/Makefile | 1 + + drivers/edac/aspeed_edac.c | 421 +++++++++++++++++++++ + drivers/edac/debugfs.c | 48 +-- + drivers/edac/edac_module.h | 8 +- + 8 files changed, 486 insertions(+), 40 deletions(-) + create mode 100644 Documentation/devicetree/bindings/edac/aspeed-sdram-edac.txt + create mode 100644 drivers/edac/aspeed_edac.c +Merging irqchip/irq/irqchip-next (2380a22b60ce irqchip/mmp: Only touch the PJ4 IRQ & FIQ bits on enable/disable) +$ git merge irqchip/irq/irqchip-next +Merge made by the 'recursive' strategy. + drivers/irqchip/irq-gic-v3-its.c | 101 ++++++++++++++++++++++++++++++--------- + drivers/irqchip/irq-mmp.c | 6 ++- + 2 files changed, 84 insertions(+), 23 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 (9c3bfe49dfc2 Merge LKMM and RCU commits) +$ git merge rcu/rcu/next +Auto-merging kernel/sched/topology.c +Auto-merging kernel/sched/sched.h +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 (33a69773ef34 KVM: arm/arm64: Move kvm_is_write_fault to header file) +$ git merge kvm-arm/next +Auto-merging drivers/clocksource/arm_arch_timer.c +Merge made by the 'recursive' strategy. + arch/arm/include/asm/arch_gicv3.h | 4 +- + arch/arm/include/asm/kvm_emulate.h | 8 + + arch/arm/include/asm/kvm_host.h | 53 +++- + arch/arm/include/asm/kvm_hyp.h | 4 + + arch/arm/include/asm/kvm_mmu.h | 11 + + arch/arm/kvm/coproc.c | 23 +- + arch/arm/kvm/hyp/cp15-sr.c | 1 - + arch/arm/kvm/hyp/hyp-entry.S | 2 +- + arch/arm/kvm/hyp/switch.c | 2 +- + arch/arm/kvm/hyp/tlb.c | 4 +- + arch/arm/kvm/interrupts.S | 4 +- + arch/arm64/include/asm/kvm_emulate.h | 8 + + arch/arm64/include/asm/kvm_host.h | 48 ++- + arch/arm64/include/asm/kvm_hyp.h | 3 +- + arch/arm64/include/asm/kvm_mmu.h | 11 + + arch/arm64/include/asm/sysreg.h | 6 +- + arch/arm64/kvm/debug.c | 2 +- + arch/arm64/kvm/hyp.S | 3 - + arch/arm64/kvm/hyp/hyp-entry.S | 12 - + arch/arm64/kvm/hyp/sysreg-sr.c | 1 - + arch/arm64/kvm/sys_regs.c | 99 +++--- + drivers/clocksource/arm_arch_timer.c | 11 +- + include/clocksource/arm_arch_timer.h | 1 + + include/kvm/arm_arch_timer.h | 68 ++-- + virt/kvm/arm/arch_timer.c | 583 ++++++++++++++++++++++++----------- + virt/kvm/arm/arm.c | 62 ++-- + virt/kvm/arm/hyp/vgic-v3-sr.c | 2 +- + virt/kvm/arm/mmu.c | 10 +- + virt/kvm/arm/trace.h | 105 +++++++ + virt/kvm/arm/vgic/vgic-v3.c | 4 +- + 30 files changed, 809 insertions(+), 346 deletions(-) +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 (8d2df8a2d0fa arch/arm/xen: Remove duplicate header) +$ git merge xen-tip/linux-next +Merge made by the 'recursive' strategy. + arch/arm/xen/mm.c | 1 - + 1 file changed, 1 deletion(-) +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 (4d43d395fed1 workqueue: Try to catch flush_work() without INIT_WORK().) +$ git merge workqueues/for-next +Merge made by the 'recursive' strategy. + kernel/workqueue.c | 3 +++ + 1 file changed, 3 insertions(+) +Merging drivers-x86/for-next (e7706a4359f0 platform/x86: mlx-platform: Add support for new VMOD0007 board name) +$ git merge drivers-x86/for-next +Auto-merging Documentation/ABI/stable/sysfs-driver-mlxreg-io +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-driver-mlxreg-io | 14 +++- + drivers/platform/mellanox/mlxreg-hotplug.c | 23 ++++++- + drivers/platform/x86/intel-hid.c | 7 +- + drivers/platform/x86/mlx-platform.c | 91 +++++++++++++++++++++++++ + include/linux/platform_data/mlxreg.h | 6 +- + 5 files changed, 135 insertions(+), 6 deletions(-) +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 (2b835103f84d ipmi: Use dedicated API for copying a UUID) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_devintf.c | 6 +- + drivers/char/ipmi/ipmi_msghandler.c | 159 +++++++++++++++++++++--------- + drivers/char/ipmi/ipmi_si_intf.c | 10 +- + drivers/char/ipmi/ipmi_si_mem_io.c | 5 +- + drivers/char/ipmi/ipmi_si_port_io.c | 5 +- + drivers/char/ipmi/ipmi_ssif.c | 188 +++++++++++++++++++++++++----------- + drivers/char/ipmi/kcs_bmc.c | 5 +- + include/linux/ipmi_smi.h | 27 ++++-- + 8 files changed, 287 insertions(+), 118 deletions(-) +Merging driver-core/driver-core-next (0fe6f7874d46 driver core: Remove the link if there is no driver with AUTO flag) +$ git merge driver-core/driver-core-next +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/debug.c +Auto-merging fs/debugfs/inode.c +Auto-merging drivers/pci/pci.c +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 2 +- + arch/powerpc/platforms/pseries/ibmebus.c | 10 ++--- + drivers/base/base.h | 4 ++ + drivers/base/bus.c | 20 ++++++---- + drivers/base/class.c | 14 +++++-- + drivers/base/core.c | 14 +++---- + drivers/base/firmware_loader/Makefile | 4 +- + .../base/firmware_loader/builtin}/.gitignore | 0 + .../base/firmware_loader/builtin}/Makefile | 0 + drivers/base/firmware_loader/fallback_table.c | 5 --- + drivers/block/rbd.c | 45 +++++++++------------- + drivers/pci/pci-sysfs.c | 5 +-- + drivers/pci/pci.c | 7 ++-- + drivers/rapidio/rio-sysfs.c | 5 +-- + fs/debugfs/inode.c | 4 +- + fs/f2fs/debug.c | 20 ++-------- + fs/f2fs/f2fs.h | 4 +- + fs/f2fs/super.c | 5 +-- + fs/sysfs/file.c | 1 + + include/linux/device.h | 1 - + include/linux/ihex.h | 29 +++++++++----- + lib/kobject.c | 2 +- + lib/kobject_uevent.c | 9 ++--- + tools/firmware/ihex2fw.c | 17 ++++++-- + 24 files changed, 115 insertions(+), 112 deletions(-) + rename {firmware => drivers/base/firmware_loader/builtin}/.gitignore (100%) + rename {firmware => drivers/base/firmware_loader/builtin}/Makefile (100%) +Merging usb/usb-next (c9381e185fdc Merge 5.0-rc4 into usb-next) +$ git merge usb/usb-next +Removing drivers/usb/README +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/usb/usb251xb.txt | 4 + + drivers/usb/Kconfig | 1 + + drivers/usb/README | 54 --------- + drivers/usb/atm/Kconfig | 1 + + drivers/usb/chipidea/Kconfig | 2 + + drivers/usb/class/Kconfig | 1 + + drivers/usb/core/Kconfig | 1 + + drivers/usb/core/config.c | 5 +- + drivers/usb/core/devio.c | 8 +- + drivers/usb/core/driver.c | 23 +++- + drivers/usb/core/hub.c | 59 +++++++--- + drivers/usb/core/hub.h | 2 + + drivers/usb/core/message.c | 3 +- + drivers/usb/core/sysfs.c | 5 +- + drivers/usb/core/urb.c | 5 +- + drivers/usb/core/usb.h | 10 +- + drivers/usb/dwc2/Kconfig | 2 + + drivers/usb/dwc3/Kconfig | 2 + + drivers/usb/gadget/Kconfig | 1 + + drivers/usb/gadget/legacy/Kconfig | 1 + + drivers/usb/gadget/udc/Kconfig | 1 + + drivers/usb/gadget/udc/bdc/Kconfig | 2 + + drivers/usb/gadget/udc/snps_udc_core.c | 17 ++- + drivers/usb/host/Kconfig | 4 +- + drivers/usb/host/ehci-fsl.c | 69 ++++++----- + drivers/usb/host/fsl-mph-dr-of.c | 6 + + drivers/usb/host/ohci-at91.c | 7 +- + drivers/usb/host/u132-hcd.c | 6 +- + drivers/usb/host/whci/{Kbuild => Makefile} | 2 + + drivers/usb/host/xhci.c | 3 +- + drivers/usb/image/Kconfig | 1 + + drivers/usb/isp1760/Kconfig | 2 + + drivers/usb/misc/Kconfig | 1 + + drivers/usb/misc/ftdi-elan.c | 26 ----- + drivers/usb/misc/sisusbvga/Kconfig | 1 + + drivers/usb/misc/sisusbvga/Makefile | 3 +- + drivers/usb/misc/sisusbvga/sisusb.c | 32 +++--- + drivers/usb/misc/sisusbvga/sisusb.h | 15 +-- + drivers/usb/misc/sisusbvga/sisusb_con.c | 127 +++++++++------------ + drivers/usb/misc/sisusbvga/sisusb_init.c | 5 - + drivers/usb/misc/usb251xb.c | 15 ++- + drivers/usb/misc/usb3503.c | 38 ++++-- + drivers/usb/mon/Kconfig | 1 + + drivers/usb/mtu3/Kconfig | 2 + + drivers/usb/musb/Kconfig | 1 + + drivers/usb/phy/Kconfig | 1 + + drivers/usb/renesas_usbhs/rcar3.c | 2 +- + drivers/usb/renesas_usbhs/rza.c | 2 +- + drivers/usb/roles/Kconfig | 2 + + drivers/usb/roles/Makefile | 2 + + drivers/usb/serial/Kconfig | 1 + + drivers/usb/storage/Kconfig | 1 + + drivers/usb/storage/karma.c | 2 + + drivers/usb/typec/Kconfig | 1 + + drivers/usb/typec/altmodes/Kconfig | 1 + + drivers/usb/typec/altmodes/Makefile | 2 + + drivers/usb/typec/mux/Kconfig | 2 + + drivers/usb/typec/tcpm/Kconfig | 2 + + drivers/usb/typec/tcpm/tcpm.c | 8 +- + drivers/usb/typec/ucsi/Kconfig | 2 + + drivers/usb/usbip/Kconfig | 2 + + drivers/usb/usbip/vhci_hcd.c | 6 +- + drivers/usb/wusbcore/Kconfig | 1 + + drivers/uwb/drp-ie.c | 5 +- + include/linux/fsl_devices.h | 7 +- + 65 files changed, 333 insertions(+), 296 deletions(-) + delete mode 100644 drivers/usb/README + rename drivers/usb/host/whci/{Kbuild => Makefile} (79%) +Merging usb-gadget/next (1c7fc5cbc339 Linux 5.0-rc2) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (a49e1abf0770 USB: serial: cp210x: support all gpios on CP2102N QFN28 package) +$ git merge usb-serial/usb-next +Merge made by the 'recursive' strategy. + drivers/usb/serial/cp210x.c | 19 +++++++++++++------ + 1 file changed, 13 insertions(+), 6 deletions(-) +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 (83b21ed0fc2a Merge 5.0-rc4 into tty-next) +$ git merge tty/tty-next +Removing Documentation/devicetree/bindings/serial/snps-dw-apb-uart.txt +Removing Documentation/devicetree/bindings/serial/renesas,rzn1-uart.txt +Removing Documentation/devicetree/bindings/serial/pl011.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/serial/omap_serial.txt | 2 + + Documentation/devicetree/bindings/serial/pl011.txt | 51 ---- + .../devicetree/bindings/serial/pl011.yaml | 126 ++++++++++ + .../bindings/serial/renesas,rzn1-uart.txt | 10 - + .../bindings/serial/snps-dw-apb-uart.txt | 76 ------ + .../bindings/serial/snps-dw-apb-uart.yaml | 140 +++++++++++ + drivers/tty/n_gsm.c | 231 ++++++++--------- + drivers/tty/n_tty.c | 6 +- + drivers/tty/serial/8250/8250_omap.c | 75 +++--- + drivers/tty/serial/clps711x.c | 23 +- + drivers/tty/serial/earlycon-riscv-sbi.c | 13 +- + drivers/tty/serial/fsl_lpuart.c | 16 +- + drivers/tty/serial/lpc32xx_hs.c | 4 + + drivers/tty/serial/max310x.c | 7 +- + drivers/tty/serial/meson_uart.c | 13 +- + drivers/tty/serial/qcom_geni_serial.c | 279 ++++++++------------- + drivers/tty/serial/sc16is7xx.c | 4 +- + drivers/tty/serial/sh-sci.c | 71 +++--- + drivers/tty/sysrq.c | 8 +- + drivers/tty/vt/vc_screen.c | 48 +++- + drivers/tty/vt/vt.c | 62 +++-- + include/linux/console_struct.h | 2 +- + 22 files changed, 715 insertions(+), 552 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/serial/pl011.txt + create mode 100644 Documentation/devicetree/bindings/serial/pl011.yaml + delete mode 100644 Documentation/devicetree/bindings/serial/renesas,rzn1-uart.txt + delete mode 100644 Documentation/devicetree/bindings/serial/snps-dw-apb-uart.txt + create mode 100644 Documentation/devicetree/bindings/serial/snps-dw-apb-uart.yaml +Merging char-misc/char-misc-next (fdddcfd9c93c Merge 5.0-rc4 into char-misc-next) +$ git merge char-misc/char-misc-next +Auto-merging lib/Kconfig.debug +Removing drivers/char/generic_nvram.c +Auto-merging drivers/Makefile +Auto-merging arch/m68k/mac/misc.c +Auto-merging arch/arm64/boot/dts/qcom/sdm845.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/sdm845.dtsi +Auto-merging MAINTAINERS +Resolved 'arch/arm64/boot/dts/qcom/sdm845.dtsi' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2feb9908e290] Merge remote-tracking branch 'char-misc/char-misc-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/interconnect/interconnect.txt | 60 ++ + .../bindings/interconnect/qcom,sdm845.txt | 24 + + Documentation/interconnect/interconnect.rst | 94 +++ + MAINTAINERS | 10 + + arch/Kconfig | 3 + + arch/arm64/boot/dts/qcom/sdm845.dtsi | 6 + + arch/m68k/Kconfig.machine | 2 + + arch/m68k/atari/Makefile | 2 + + arch/m68k/atari/nvram.c | 272 +++++++ + arch/m68k/include/asm/atarihw.h | 6 + + arch/m68k/include/asm/macintosh.h | 4 + + arch/m68k/kernel/setup_mm.c | 82 +- + arch/m68k/mac/misc.c | 174 +++-- + arch/parisc/include/asm/io.h | 9 + + arch/parisc/lib/iomap.c | 64 ++ + arch/powerpc/Kconfig | 6 +- + arch/powerpc/include/asm/io.h | 2 + + arch/powerpc/include/asm/nvram.h | 9 - + arch/powerpc/kernel/nvram_64.c | 158 +--- + arch/powerpc/kernel/setup_32.c | 36 +- + arch/powerpc/platforms/chrp/Makefile | 2 +- + arch/powerpc/platforms/chrp/nvram.c | 14 +- + arch/powerpc/platforms/chrp/setup.c | 2 +- + arch/powerpc/platforms/powermac/Makefile | 2 - + arch/powerpc/platforms/powermac/nvram.c | 9 + + arch/powerpc/platforms/powermac/setup.c | 3 +- + arch/powerpc/platforms/powermac/time.c | 2 +- + arch/powerpc/platforms/pseries/nvram.c | 2 - + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/android/binder.c | 106 ++- + drivers/char/Kconfig | 19 +- + drivers/char/Makefile | 6 +- + drivers/char/applicom.c | 35 +- + drivers/char/efirtc.c | 23 - + drivers/char/generic_nvram.c | 159 ---- + drivers/char/hpet.c | 2 +- + drivers/char/mbcs.c | 1 + + drivers/char/nvram.c | 673 +++++++---------- + 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 +++++++++++++++++++++ + drivers/macintosh/via-cuda.c | 8 +- + drivers/misc/ad525x_dpot.c | 24 +- + drivers/misc/enclosure.c | 4 +- + drivers/misc/ics932s401.c | 2 + + drivers/misc/lkdtm/core.c | 15 +- + drivers/misc/lkdtm/lkdtm.h | 2 + + drivers/misc/lkdtm/perms.c | 36 +- + drivers/misc/mei/hw.h | 3 +- + drivers/misc/mic/vop/vop_main.c | 9 +- + drivers/misc/mic/vop/vop_vringh.c | 36 +- + drivers/misc/sgi-gru/grufault.c | 4 +- + drivers/ntb/hw/intel/ntb_hw_intel.h | 30 +- + drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 36 +- + drivers/platform/goldfish/Kconfig | 4 +- + drivers/scsi/Kconfig | 6 +- + drivers/scsi/atari_scsi.c | 10 +- + drivers/slimbus/core.c | 45 +- + drivers/uio/uio.c | 6 +- + drivers/video/fbdev/Kconfig | 2 +- + drivers/video/fbdev/controlfb.c | 42 +- + drivers/video/fbdev/imsttfb.c | 23 +- + drivers/video/fbdev/matrox/matroxfb_base.c | 7 +- + drivers/video/fbdev/platinumfb.c | 21 +- + drivers/video/fbdev/valkyriefb.c | 30 +- + include/asm-generic/iomap.h | 22 + + include/dt-bindings/interconnect/qcom,sdm845.h | 143 ++++ + include/linux/interconnect-provider.h | 142 ++++ + include/linux/interconnect.h | 59 ++ + include/linux/io-64-nonatomic-hi-lo.h | 64 ++ + include/linux/io-64-nonatomic-lo-hi.h | 64 ++ + include/linux/nvram.h | 133 +++- + include/uapi/linux/android/binder.h | 19 + + include/uapi/linux/pmu.h | 2 + + lib/Kconfig.debug | 1 - + lib/iomap.c | 140 +++- + scripts/ver_linux | 6 +- + 81 files changed, 3789 insertions(+), 1173 deletions(-) + 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 arch/m68k/atari/nvram.c + delete mode 100644 drivers/char/generic_nvram.c + 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 extcon/extcon-next (a9857d45edf3 extcon: ptn5150: Fix return value check in ptn5150_i2c_probe()) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/extcon/extcon-ptn5150.txt | 27 ++ + drivers/extcon/Kconfig | 8 + + drivers/extcon/Makefile | 1 + + drivers/extcon/extcon-ptn5150.c | 339 +++++++++++++++++++++ + 4 files changed, 375 insertions(+) + create mode 100644 Documentation/devicetree/bindings/extcon/extcon-ptn5150.txt + create mode 100644 drivers/extcon/extcon-ptn5150.c +Merging soundwire/next (bfeffd155283 Linux 5.0-rc1) +$ git merge soundwire/next +Already up to date. +Merging thunderbolt/next (f17b5f06cb92 Linux 5.0-rc4) +$ git merge thunderbolt/next +Already up to date. +Merging staging/staging-next (d61b5d546af2 Merge 5.0-rc4 into staging-next) +$ git merge staging/staging-next +Removing drivers/staging/xgifb/vgatypes.h +Removing drivers/staging/xgifb/vb_util.h +Removing drivers/staging/xgifb/vb_table.h +Removing drivers/staging/xgifb/vb_struct.h +Removing drivers/staging/xgifb/vb_setmode.h +Removing drivers/staging/xgifb/vb_setmode.c +Removing drivers/staging/xgifb/vb_init.h +Removing drivers/staging/xgifb/vb_init.c +Removing drivers/staging/xgifb/vb_def.h +Removing drivers/staging/xgifb/XGIfb.h +Removing drivers/staging/xgifb/XGI_main_26.c +Removing drivers/staging/xgifb/XGI_main.h +Removing drivers/staging/xgifb/TODO +Removing drivers/staging/xgifb/Makefile +Removing drivers/staging/xgifb/Kconfig +Removing drivers/staging/android/ion/ion-ioctl.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 5 - + drivers/staging/Kconfig | 6 +- + drivers/staging/Makefile | 13 +- + drivers/staging/android/ion/Makefile | 2 +- + drivers/staging/android/ion/ion-ioctl.c | 98 - + drivers/staging/android/ion/ion.c | 84 +- + drivers/staging/android/ion/ion.h | 42 +- + drivers/staging/android/ion/ion_carveout_heap.c | 19 +- + drivers/staging/android/ion/ion_chunk_heap.c | 25 +- + drivers/staging/android/ion/ion_cma_heap.c | 6 +- + drivers/staging/android/ion/ion_heap.c | 8 +- + drivers/staging/android/ion/ion_page_pool.c | 2 +- + drivers/staging/android/ion/ion_system_heap.c | 8 +- + drivers/staging/android/vsoc.c | 1 - + drivers/staging/comedi/comedi_fops.c | 4 +- + drivers/staging/comedi/drivers/cb_pcimdas.c | 6 +- + drivers/staging/comedi/drivers/ni_pcidio.c | 444 +- + drivers/staging/comedi/drivers/usbduxfast.c | 2 +- + drivers/staging/emxx_udc/emxx_udc.c | 31 +- + drivers/staging/emxx_udc/emxx_udc.h | 2 + + .../erofs/Documentation/filesystems/erofs.txt | 206 + + drivers/staging/erofs/data.c | 37 +- + drivers/staging/erofs/inode.c | 38 +- + drivers/staging/erofs/internal.h | 136 +- + drivers/staging/erofs/namei.c | 4 - + drivers/staging/erofs/super.c | 19 +- + drivers/staging/erofs/unzip_vle.c | 32 +- + drivers/staging/erofs/unzip_vle.h | 24 +- + drivers/staging/erofs/unzip_vle_lz4.c | 2 +- + drivers/staging/erofs/utils.c | 58 +- + drivers/staging/erofs/xattr.c | 35 +- + drivers/staging/erofs/xattr.h | 4 +- + drivers/staging/fbtft/fb_agm1264k-fl.c | 52 +- + drivers/staging/fbtft/fb_bd663474.c | 6 +- + drivers/staging/fbtft/fb_ili9163.c | 6 +- + drivers/staging/fbtft/fb_ili9320.c | 2 +- + drivers/staging/fbtft/fb_ili9325.c | 6 +- + drivers/staging/fbtft/fb_ili9340.c | 2 +- + drivers/staging/fbtft/fb_pcd8544.c | 4 +- + drivers/staging/fbtft/fb_ra8875.c | 4 +- + drivers/staging/fbtft/fb_s6d1121.c | 6 +- + drivers/staging/fbtft/fb_sh1106.c | 2 +- + drivers/staging/fbtft/fb_ssd1289.c | 6 +- + drivers/staging/fbtft/fb_ssd1305.c | 4 +- + drivers/staging/fbtft/fb_ssd1306.c | 4 +- + drivers/staging/fbtft/fb_ssd1325.c | 6 +- + drivers/staging/fbtft/fb_ssd1331.c | 10 +- + drivers/staging/fbtft/fb_ssd1351.c | 2 +- + drivers/staging/fbtft/fb_tls8204.c | 6 +- + drivers/staging/fbtft/fb_uc1611.c | 4 +- + drivers/staging/fbtft/fb_uc1701.c | 6 +- + drivers/staging/fbtft/fb_upd161704.c | 6 +- + drivers/staging/fbtft/fb_watterott.c | 4 +- + drivers/staging/fbtft/fbtft-bus.c | 6 +- + drivers/staging/fbtft/fbtft-core.c | 173 +- + drivers/staging/fbtft/fbtft-io.c | 26 +- + drivers/staging/fbtft/fbtft.h | 21 +- + drivers/staging/fbtft/fbtft_device.c | 344 +- + drivers/staging/fbtft/flexfb.c | 12 +- + 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/gasket/gasket_interrupt.c | 1 - + drivers/staging/goldfish/goldfish_audio.c | 10 - + drivers/staging/greybus/Kconfig | 1 + + drivers/staging/greybus/TODO | 2 - + drivers/staging/greybus/arche-apb-ctrl.c | 152 +- + drivers/staging/greybus/arche-platform.c | 124 +- + drivers/staging/greybus/gpio.c | 156 +- + drivers/staging/gs_fpgaboot/gs_fpgaboot.c | 12 +- + drivers/staging/gs_fpgaboot/gs_fpgaboot.h | 12 +- + drivers/staging/gs_fpgaboot/io.c | 16 +- + drivers/staging/gs_fpgaboot/io.h | 12 +- + drivers/staging/ks7010/ks_hostif.c | 6 +- + drivers/staging/mt7621-dma/Kconfig | 6 - + drivers/staging/mt7621-dma/Makefile | 1 - + drivers/staging/mt7621-dts/gbpc1.dts | 4 +- + drivers/staging/mt7621-dts/mt7621.dtsi | 55 +- + drivers/staging/mt7621-mmc/Kconfig | 2 +- + 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/Makefile | 2 +- + drivers/staging/mt7621-pci/pci-mt7621.c | 255 +- + drivers/staging/mt7621-pinctrl/Kconfig | 1 + + drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c | 43 +- + drivers/staging/netlogic/Kconfig | 2 +- + drivers/staging/ralink-gdma/Kconfig | 6 + + drivers/staging/ralink-gdma/Makefile | 3 + + .../{mt7621-dma => ralink-gdma}/ralink-gdma.c | 6 +- + drivers/staging/rtl8188eu/core/rtw_ap.c | 8 +- + drivers/staging/rtl8188eu/core/rtw_cmd.c | 12 +- + drivers/staging/rtl8188eu/core/rtw_efuse.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 10 +- + drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 12 +- + drivers/staging/rtl8188eu/core/rtw_mlme.c | 44 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 38 +- + drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 18 +- + drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 2 +- + drivers/staging/rtl8188eu/include/wlan_bssdef.h | 6 +- + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 34 +- + drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 9 +- + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 26 +- + drivers/staging/rtl8188eu/os_dep/rtw_android.c | 2 +- + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 6 +- + drivers/staging/rtl8192e/dot11d.c | 18 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 8 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 6 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 8 +- + drivers/staging/rtl8192e/rtl819x_BAProc.c | 6 +- + drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 2 +- + drivers/staging/rtl8192e/rtllib_rx.c | 2 +- + drivers/staging/rtl8712/ieee80211.c | 2 +- + drivers/staging/rtl8712/rtl8712_efuse.c | 2 +- + drivers/staging/rtl8712/rtl8712_led.c | 6 +- + drivers/staging/rtl8712/rtl871x_mlme.c | 2 +- + drivers/staging/rtl8712/rtl871x_recv.c | 4 +- + drivers/staging/rtl8712/rtl871x_sta_mgt.c | 2 +- + drivers/staging/rtl8712/rtl871x_xmit.c | 8 +- + drivers/staging/rtl8712/usb_intf.c | 16 - + drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +- + drivers/staging/rtlwifi/rtl8822be/fw.c | 2 + + drivers/staging/rts5208/ms.c | 5 +- + drivers/staging/rts5208/sd.c | 7 +- + drivers/staging/speakup/Kconfig | 32 +- + drivers/staging/wilc1000/host_interface.c | 982 +--- + drivers/staging/wilc1000/host_interface.h | 127 +- + drivers/staging/wilc1000/linux_wlan.c | 12 +- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 450 +- + drivers/staging/wilc1000/wilc_wfi_netdevice.h | 5 +- + drivers/staging/wilc1000/wilc_wlan.c | 35 +- + drivers/staging/wilc1000/wilc_wlan.h | 19 +- + drivers/staging/wilc1000/wilc_wlan_cfg.c | 27 +- + drivers/staging/wilc1000/wilc_wlan_if.h | 3 - + drivers/staging/wlan-ng/Kconfig | 2 +- + drivers/staging/wlan-ng/prism2fw.c | 5 +- + drivers/staging/xgifb/Kconfig | 11 - + drivers/staging/xgifb/Makefile | 4 - + drivers/staging/xgifb/TODO | 13 - + drivers/staging/xgifb/XGI_main.h | 365 -- + drivers/staging/xgifb/XGI_main_26.c | 2084 -------- + drivers/staging/xgifb/XGIfb.h | 109 - + drivers/staging/xgifb/vb_def.h | 257 - + drivers/staging/xgifb/vb_init.c | 1367 ----- + drivers/staging/xgifb/vb_init.h | 6 - + drivers/staging/xgifb/vb_setmode.c | 5528 -------------------- + drivers/staging/xgifb/vb_setmode.h | 24 - + drivers/staging/xgifb/vb_struct.h | 165 - + drivers/staging/xgifb/vb_table.h | 2513 --------- + drivers/staging/xgifb/vb_util.h | 46 - + drivers/staging/xgifb/vgatypes.h | 51 - + 154 files changed, 2214 insertions(+), 15851 deletions(-) + delete mode 100644 drivers/staging/android/ion/ion-ioctl.c + create mode 100644 drivers/staging/erofs/Documentation/filesystems/erofs.txt + 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 + create mode 100644 drivers/staging/ralink-gdma/Kconfig + create mode 100644 drivers/staging/ralink-gdma/Makefile + rename drivers/staging/{mt7621-dma => ralink-gdma}/ralink-gdma.c (99%) + delete mode 100644 drivers/staging/xgifb/Kconfig + delete mode 100644 drivers/staging/xgifb/Makefile + delete mode 100644 drivers/staging/xgifb/TODO + delete mode 100644 drivers/staging/xgifb/XGI_main.h + delete mode 100644 drivers/staging/xgifb/XGI_main_26.c + delete mode 100644 drivers/staging/xgifb/XGIfb.h + delete mode 100644 drivers/staging/xgifb/vb_def.h + delete mode 100644 drivers/staging/xgifb/vb_init.c + delete mode 100644 drivers/staging/xgifb/vb_init.h + delete mode 100644 drivers/staging/xgifb/vb_setmode.c + delete mode 100644 drivers/staging/xgifb/vb_setmode.h + delete mode 100644 drivers/staging/xgifb/vb_struct.h + delete mode 100644 drivers/staging/xgifb/vb_table.h + delete mode 100644 drivers/staging/xgifb/vb_util.h + delete mode 100644 drivers/staging/xgifb/vgatypes.h +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 (1c7fc5cbc339 Linux 5.0-rc2) +$ git merge icc/icc-next +Already up to date. +Merging slave-dma/next (84aca9e007d2 Merge branch 'topic/xilinx' into next) +$ git merge slave-dma/next +Auto-merging drivers/dma/xilinx/xilinx_dma.c +Auto-merging drivers/dma/imx-sdma.c +CONFLICT (content): Merge conflict in drivers/dma/imx-sdma.c +Resolved 'drivers/dma/imx-sdma.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2f942d208afb] Merge remote-tracking branch 'slave-dma/next' +$ git diff -M --stat --summary HEAD^.. + 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-axi-dmac.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-dma.c | 8 +- + drivers/dma/imx-sdma.c | 22 +- + drivers/dma/mv_xor.c | 5 +- + drivers/dma/pl330.c | 1 - + drivers/dma/qcom/bam_dma.c | 4 +- + drivers/dma/qcom/hidma.c | 19 +- + drivers/dma/qcom/hidma_mgmt.c | 3 +- + drivers/dma/sa11x0-dma.c | 2 - + drivers/dma/sh/usb-dmac.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/tegra210-adma.c | 5 +- + drivers/dma/timb_dma.c | 4 +- + drivers/dma/xilinx/xilinx_dma.c | 170 ++++++++------ + 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 +++++ + 37 files changed, 822 insertions(+), 436 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 (e999fb7cc97c Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/qla4xxx/ql4_os.c +Auto-merging drivers/scsi/qla2xxx/qla_attr.c +Auto-merging drivers/scsi/arcmsr/arcmsr_hba.c +CONFLICT (content): Merge conflict in drivers/scsi/arcmsr/arcmsr_hba.c +Auto-merging drivers/scsi/Kconfig +Auto-merging MAINTAINERS +Resolved 'drivers/scsi/arcmsr/arcmsr_hba.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3ef98c73e7f8] Merge remote-tracking branch 'scsi/for-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 2 +- + drivers/scsi/Kconfig | 4 +- + drivers/scsi/aacraid/Makefile | 2 - + drivers/scsi/aic7xxx/Makefile | 1 - + drivers/scsi/arcmsr/arcmsr.h | 13 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 348 +++++---- + drivers/scsi/bfa/bfad_debugfs.c | 18 - + drivers/scsi/bnx2i/bnx2i_iscsi.c | 2 +- + drivers/scsi/csiostor/csio_init.c | 6 +- + drivers/scsi/cxgbi/Makefile | 2 +- + drivers/scsi/fcoe/fcoe_sysfs.c | 15 +- + drivers/scsi/fcoe/fcoe_transport.c | 1 - + drivers/scsi/fnic/fnic.h | 6 +- + drivers/scsi/fnic/fnic_debugfs.c | 88 +-- + drivers/scsi/fnic/fnic_fcs.c | 10 + + drivers/scsi/fnic/fnic_io.h | 3 +- + drivers/scsi/fnic/fnic_isr.c | 6 +- + drivers/scsi/fnic/fnic_main.c | 37 +- + drivers/scsi/fnic/fnic_scsi.c | 40 +- + drivers/scsi/fnic/fnic_stats.h | 6 +- + drivers/scsi/fnic/fnic_trace.c | 28 +- + drivers/scsi/fnic/fnic_trace.h | 4 +- + drivers/scsi/fnic/vnic_dev.c | 270 ++++++- + drivers/scsi/fnic/vnic_dev.h | 2 + + drivers/scsi/fnic/vnic_devcmd.h | 160 +++- + drivers/scsi/fnic/vnic_resource.h | 7 + + drivers/scsi/fnic/vnic_rq.c | 5 +- + drivers/scsi/fnic/vnic_wq.c | 69 +- + drivers/scsi/fnic/vnic_wq.h | 8 + + 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 | 62 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 601 ++++++++++++++- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 4 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 22 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 223 +++++- + drivers/scsi/hpsa.c | 4 +- + drivers/scsi/libsas/sas_expander.c | 38 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 170 ----- + drivers/scsi/nsp32.c | 1 - + drivers/scsi/pcmcia/Makefile | 2 +- + drivers/scsi/pcmcia/nsp_cs.c | 3 +- + drivers/scsi/qedf/qedf_debugfs.c | 18 +- + drivers/scsi/qedi/qedi_debugfs.c | 17 +- + drivers/scsi/qla2xxx/qla_attr.c | 21 +- + drivers/scsi/qla2xxx/qla_def.h | 28 + + drivers/scsi/qla2xxx/qla_dfs.c | 43 +- + 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/scsi_lib.c | 2 +- + drivers/scsi/sd.c | 440 +++++------ + drivers/scsi/sd.h | 62 -- + drivers/scsi/smartpqi/Makefile | 1 - + drivers/scsi/snic/snic_debugfs.c | 133 +--- + drivers/scsi/snic/snic_main.c | 14 +- + drivers/scsi/snic/snic_stats.h | 2 +- + drivers/scsi/snic/snic_trc.c | 12 +- + drivers/scsi/snic/snic_trc.h | 4 +- + drivers/scsi/ufs/Kconfig | 1 - + include/scsi/libsas.h | 56 +- + include/scsi/scsi.h | 6 - + 68 files changed, 2793 insertions(+), 2439 deletions(-) +Merging scsi-mkp/for-next (ede2afb9c8ed scsi: hisi_sas: Add missing seq_printf() call in hisi_sas_show_row_32()) +$ git merge scsi-mkp/for-next +Already up to date. +Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker) +$ git merge target-updates/for-next +Already up to date. +Merging target-bva/for-next (60cc43fc8884 Linux 4.17-rc1) +$ git merge target-bva/for-next +Already up to date. +Merging vhost/linux-next (ae5d11d206fc arch: move common mmap flags to linux/mman.h) +$ git merge vhost/linux-next +Auto-merging include/drm/drmP.h +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/iommu/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/memory-barriers.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/virtio/iommu.txt | 66 ++ + Documentation/devicetree/bindings/virtio/mmio.txt | 30 + + Documentation/memory-barriers.txt | 20 + + MAINTAINERS | 7 + + arch/alpha/include/asm/barrier.h | 1 + + arch/alpha/include/uapi/asm/mman.h | 4 +- + arch/mips/include/uapi/asm/mman.h | 4 +- + arch/parisc/include/uapi/asm/mman.h | 4 +- + arch/x86/mm/mpx.c | 2 +- + arch/xtensa/include/uapi/asm/mman.h | 4 +- + drivers/iommu/Kconfig | 11 + + drivers/iommu/Makefile | 1 + + drivers/iommu/virtio-iommu.c | 1158 ++++++++++++++++++++ + drivers/net/virtio_net.c | 27 +- + drivers/of/base.c | 10 +- + drivers/pci/of.c | 7 + + drivers/pci/setup-bus.c | 10 + + drivers/virtio/virtio_balloon.c | 6 +- + drivers/virtio/virtio_ring.c | 21 +- + include/asm-generic/barrier.h | 18 + + include/drm/drmP.h | 3 +- + include/linux/compiler.h | 6 +- + include/uapi/asm-generic/mman-common.h | 4 +- + include/uapi/linux/mman.h | 4 + + include/uapi/linux/virtio_config.h | 6 + + include/uapi/linux/virtio_ids.h | 1 + + include/uapi/linux/virtio_iommu.h | 161 +++ + 27 files changed, 1560 insertions(+), 36 deletions(-) + create mode 100644 Documentation/devicetree/bindings/virtio/iommu.txt + create mode 100644 drivers/iommu/virtio-iommu.c + create mode 100644 include/uapi/linux/virtio_iommu.h +Merging rpmsg/for-next (ac1b79e48631 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 | 23 +++++- + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 79 +++++++++++++++++++-- + .../devicetree/bindings/soc/qcom/qcom,glink.txt | 5 ++ + drivers/remoteproc/qcom_q6v5_adsp.c | 4 ++ + drivers/remoteproc/qcom_q6v5_mss.c | 16 ++++- + drivers/remoteproc/qcom_q6v5_pas.c | 4 ++ + drivers/remoteproc/qcom_sysmon.c | 82 ++++++++++++++++++++-- + drivers/remoteproc/qcom_wcnss.c | 6 +- + drivers/remoteproc/remoteproc_debugfs.c | 26 +++++++ + drivers/rpmsg/rpmsg_core.c | 3 +- + include/linux/remoteproc.h | 4 +- + 11 files changed, 234 insertions(+), 18 deletions(-) +Merging gpio/for-next (6292247c07f9 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Auto-merging arch/arm/boot/dts/qcom-pm8941.dtsi +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pinctrl/qcom,pmic-gpio.txt | 1 + + arch/arm/boot/dts/qcom-pm8941.dtsi | 38 +-- + arch/arm/boot/dts/qcom-pma8084.dtsi | 24 +- + arch/arm/mach-sa1100/simpad.c | 1 - + arch/arm64/boot/dts/qcom/pm8005.dtsi | 6 +- + arch/arm64/boot/dts/qcom/pm8998.dtsi | 28 +- + arch/arm64/boot/dts/qcom/pmi8994.dtsi | 12 +- + arch/arm64/boot/dts/qcom/pmi8998.dtsi | 16 +- + drivers/gpio/Kconfig | 8 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-altera-a10sr.c | 4 +- + drivers/gpio/gpio-altera.c | 4 +- + drivers/gpio/gpio-eic-sprd.c | 14 +- + drivers/gpio/gpio-f7188x.c | 24 +- + drivers/gpio/gpio-hlwd.c | 192 +++++++++++- + drivers/gpio/gpio-mvebu.c | 11 + + drivers/gpio/gpio-pca953x.c | 103 ++++--- + drivers/gpio/gpio-pcf857x.c | 26 +- + drivers/gpio/gpio-pmic-eic-sprd.c | 1 - + drivers/gpio/gpio-rcar.c | 12 +- + drivers/gpio/gpio-sama5d2-piobu.c | 20 +- + drivers/gpio/gpio-tqmx86.c | 333 +++++++++++++++++++++ + drivers/gpio/gpio-vf610.c | 5 + + drivers/gpio/gpiolib-acpi.c | 7 +- + drivers/gpio/gpiolib.c | 46 ++- + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 140 +++++++-- + drivers/spmi/spmi-pmic-arb.c | 74 +++-- + include/linux/gpio/driver.h | 5 + + 28 files changed, 910 insertions(+), 246 deletions(-) + create mode 100644 drivers/gpio/gpio-tqmx86.c +Merging gpio-brgl/gpio/for-next (c131d98b590c gpio: altera-a10sr: Trivial coding style fix) +$ git merge gpio-brgl/gpio/for-next +Auto-merging drivers/gpio/gpio-pca953x.c +Auto-merging drivers/gpio/gpio-altera-a10sr.c +CONFLICT (content): Merge conflict in drivers/gpio/gpio-altera-a10sr.c +Resolved 'drivers/gpio/gpio-altera-a10sr.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f1fecc720fd7] Merge remote-tracking branch 'gpio-brgl/gpio/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/gpio/gpio-pca953x.txt | 1 + + Documentation/driver-api/gpio/driver.rst | 2 +- + drivers/gpio/gpio-altera-a10sr.c | 17 +++--- + drivers/gpio/gpio-madera.c | 2 +- + drivers/gpio/gpio-pca953x.c | 1 + + drivers/gpio/gpio-tegra186.c | 70 +++++++++++----------- + 6 files changed, 48 insertions(+), 45 deletions(-) +Merging pinctrl/for-next (fb5ed1b8df2b Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/fsl,imx8mm-pinctrl.txt | 36 ++ + .../pinctrl/marvell,armada-37xx-pinctrl.txt | 24 +- + .../devicetree/bindings/pinctrl/meson,pinctrl.txt | 10 +- + Documentation/driver-api/pinctl.rst | 9 - + arch/arm64/boot/dts/freescale/imx8mm-pinfunc.h | 629 +++++++++++++++++++++ + drivers/pinctrl/berlin/pinctrl-as370.c | 58 +- + drivers/pinctrl/cirrus/pinctrl-madera-core.c | 1 + + drivers/pinctrl/freescale/Kconfig | 7 + + drivers/pinctrl/freescale/Makefile | 1 + + drivers/pinctrl/freescale/pinctrl-imx8qm.c | 326 +++++++++++ + drivers/pinctrl/intel/pinctrl-cherryview.c | 8 +- + drivers/pinctrl/mediatek/Kconfig | 3 + + drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 8 +- + drivers/pinctrl/meson/pinctrl-meson.c | 24 +- + drivers/pinctrl/meson/pinctrl-meson.h | 1 + + drivers/pinctrl/meson/pinctrl-meson8b.c | 6 +- + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 15 +- + drivers/pinctrl/pinconf.c | 222 -------- + drivers/pinctrl/pinctrl-amd.c | 2 +- + drivers/pinctrl/pinctrl-mcp23s08.c | 38 +- + drivers/pinctrl/sh-pfc/pfc-r8a7778.c | 6 +- + drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 17 + + drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 68 +-- + drivers/pinctrl/sh-pfc/pfc-r8a7794.c | 16 + + drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 90 +-- + drivers/pinctrl/sh-pfc/pfc-r8a7796.c | 90 +-- + drivers/pinctrl/sh-pfc/pfc-r8a77965.c | 6 +- + drivers/pinctrl/sh-pfc/pfc-r8a77970.c | 128 ++--- + drivers/pinctrl/sh-pfc/pfc-r8a77980.c | 64 +-- + drivers/pinctrl/sh-pfc/pfc-r8a77990.c | 133 +++-- + drivers/pinctrl/sh-pfc/pfc-r8a77995.c | 11 +- + drivers/pinctrl/sh-pfc/pinctrl.c | 2 + + drivers/pinctrl/sirf/pinctrl-atlas7.c | 4 +- + drivers/pinctrl/sirf/pinctrl-sirf.c | 2 +- + drivers/pinctrl/sunxi/pinctrl-sun50i-h6.c | 2 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 44 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.h | 2 +- + drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 7 +- + include/linux/pinctrl/pinconf.h | 6 - + 39 files changed, 1440 insertions(+), 686 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx8mm-pinctrl.txt + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-pinfunc.h + 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 (4ad44aba07b7 y2038: add 64-bit time_t syscalls to all 32-bit architectures) +$ git merge y2038/y2038 +Auto-merging kernel/sched/core.c +Auto-merging kernel/futex.c +Auto-merging ipc/mqueue.c +Removing arch/sh/include/uapi/asm/unistd_32.h +Auto-merging arch/Kconfig +Merge made by the 'recursive' strategy. + arch/Kconfig | 2 +- + arch/alpha/include/asm/unistd.h | 21 -- + arch/alpha/include/uapi/asm/unistd.h | 10 + + arch/alpha/kernel/osf_sys.c | 5 +- + arch/alpha/kernel/syscalls/syscall.tbl | 22 +- + arch/arm/include/asm/unistd.h | 5 +- + arch/arm/kernel/sys_oabi-compat.c | 8 +- + arch/arm/tools/syscall.tbl | 85 +++--- + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 99 +++++-- + arch/ia64/include/asm/unistd.h | 14 - + arch/ia64/include/uapi/asm/unistd.h | 2 + + arch/ia64/kernel/syscalls/syscall.tbl | 11 +- + arch/m68k/include/asm/unistd.h | 4 +- + arch/m68k/kernel/syscalls/syscall.tbl | 88 ++++-- + arch/microblaze/include/asm/unistd.h | 4 +- + arch/microblaze/kernel/syscalls/syscall.tbl | 83 +++--- + arch/mips/include/asm/unistd.h | 20 +- + arch/mips/kernel/syscalls/syscall_n32.tbl | 77 ++++-- + arch/mips/kernel/syscalls/syscall_n64.tbl | 7 +- + arch/mips/kernel/syscalls/syscall_o32.tbl | 85 ++++-- + arch/parisc/include/asm/unistd.h | 15 +- + arch/parisc/kernel/syscalls/syscall.tbl | 109 ++++++-- + arch/powerpc/include/asm/unistd.h | 8 +- + arch/powerpc/kernel/syscalls/syscall.tbl | 134 +++++++-- + arch/s390/include/asm/unistd.h | 7 +- + arch/s390/kernel/syscalls/syscall.tbl | 87 ++++-- + arch/sh/include/asm/unistd.h | 4 +- + arch/sh/include/uapi/asm/unistd_32.h | 403 ---------------------------- + arch/sh/kernel/syscalls/syscall.tbl | 88 ++++-- + arch/sparc/include/asm/unistd.h | 13 +- + arch/sparc/kernel/sys_sparc_64.c | 61 ++++- + arch/sparc/kernel/syscalls/syscall.tbl | 116 ++++++-- + arch/x86/entry/syscalls/syscall_32.tbl | 85 ++++-- + arch/x86/entry/syscalls/syscall_64.tbl | 6 +- + arch/x86/include/asm/unistd.h | 8 +- + arch/xtensa/include/asm/unistd.h | 14 +- + arch/xtensa/kernel/syscalls/syscall.tbl | 78 ++++-- + drivers/ptp/ptp_clock.c | 2 +- + fs/aio.c | 10 +- + fs/select.c | 4 +- + fs/timerfd.c | 4 +- + fs/utimes.c | 10 +- + include/linux/compat.h | 104 +------ + include/linux/posix-clock.h | 2 +- + include/linux/syscalls.h | 68 ++++- + include/linux/time32.h | 32 ++- + include/linux/time64.h | 8 - + include/linux/timex.h | 4 +- + include/uapi/asm-generic/unistd.h | 103 ++++--- + include/uapi/linux/time.h | 4 - + include/uapi/linux/timex.h | 39 +++ + ipc/mqueue.c | 16 +- + ipc/msg.c | 39 ++- + ipc/sem.c | 41 ++- + ipc/shm.c | 40 ++- + ipc/syscall.c | 12 +- + ipc/util.h | 21 +- + kernel/compat.c | 64 ----- + kernel/futex.c | 2 +- + kernel/sched/core.c | 5 +- + kernel/signal.c | 2 +- + kernel/sys_ni.c | 21 +- + kernel/time/hrtimer.c | 2 +- + kernel/time/ntp.c | 18 +- + kernel/time/ntp_internal.h | 2 +- + kernel/time/posix-clock.c | 2 +- + kernel/time/posix-stubs.c | 25 +- + kernel/time/posix-timers.c | 72 +++-- + kernel/time/posix-timers.h | 2 +- + kernel/time/time.c | 92 ++++++- + kernel/time/timekeeping.c | 4 +- + net/compat.c | 2 +- + scripts/checksyscalls.sh | 40 +++ + 74 files changed, 1546 insertions(+), 1262 deletions(-) + delete mode 100644 arch/sh/include/uapi/asm/unistd_32.h +Merging livepatching/for-next (d85ce23d3c20 Merge branch 'for-5.0/upstream-fixes' 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 | 7 +- + 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 | 18 +- + samples/livepatch/livepatch-shadow-fix2.c | 18 +- + samples/livepatch/livepatch-shadow-mod.c | 11 +- + 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 ++ + 35 files changed, 2616 insertions(+), 1048 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 (8b60fb322bd4 coresight: Use event attributes for sink selection) +$ git merge coresight/next +Auto-merging include/linux/perf_event.h +Merge made by the 'recursive' strategy. + arch/s390/kernel/perf_cpum_sf.c | 6 +- + arch/x86/events/intel/bts.c | 4 +- + arch/x86/events/intel/pt.c | 5 +- + drivers/hwtracing/coresight/coresight-cpu-debug.c | 4 + + drivers/hwtracing/coresight/coresight-etm-perf.c | 106 +++++++++++++++++++--- + drivers/hwtracing/coresight/coresight-etm-perf.h | 6 +- + drivers/hwtracing/coresight/coresight-priv.h | 1 + + drivers/hwtracing/coresight/coresight-stm.c | 12 +-- + drivers/hwtracing/coresight/coresight.c | 57 ++++++++++++ + drivers/hwtracing/coresight/of_coresight.c | 4 +- + drivers/perf/arm_spe_pmu.c | 6 +- + include/linux/coresight.h | 7 +- + include/linux/perf_event.h | 2 +- + kernel/events/ring_buffer.c | 2 +- + 14 files changed, 183 insertions(+), 39 deletions(-) +Merging rtc/rtc-next (42986fb81199 rtc: Add Cadence RTC driver) +$ git merge rtc/rtc-next +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/property-units.txt | 1 + + Documentation/devicetree/bindings/rtc/cdns,rtc.txt | 25 ++ + .../devicetree/bindings/rtc/nxp,pcf85063.txt | 18 + + .../devicetree/bindings/rtc/nxp,pcf8523.txt | 18 + + Documentation/devicetree/bindings/rtc/rtc.txt | 20 +- + .../devicetree/bindings/vendor-prefixes.txt | 1 + + MAINTAINERS | 6 + + drivers/rtc/Kconfig | 19 + + drivers/rtc/Makefile | 2 + + drivers/rtc/lib.c | 6 +- + drivers/rtc/rtc-cadence.c | 423 +++++++++++++++++++++ + drivers/rtc/rtc-coh901331.c | 6 +- + drivers/rtc/rtc-hym8563.c | 2 + + drivers/rtc/rtc-isl1208.c | 9 +- + drivers/rtc/rtc-mc146818-lib.c | 2 +- + drivers/rtc/rtc-pcf85063.c | 39 ++ + drivers/rtc/rtc-pcf8523.c | 29 +- + drivers/rtc/rtc-s3c.c | 87 ++--- + drivers/rtc/rtc-sd3078.c | 232 +++++++++++ + 19 files changed, 866 insertions(+), 79 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/cdns,rtc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/nxp,pcf85063.txt + create mode 100644 Documentation/devicetree/bindings/rtc/nxp,pcf8523.txt + create mode 100644 drivers/rtc/rtc-cadence.c + 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 630d1f897026] 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 (f9eb86fddaf2 dt-bindings: gnss: add lna-supply property) +$ git merge gnss/gnss-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/gnss/gnss.txt | 1 + + .../devicetree/bindings/gnss/sirfstar.txt | 1 + + drivers/gnss/sirf.c | 256 +++++++++++++++++---- + 3 files changed, 214 insertions(+), 44 deletions(-) +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. +Merging nvmem/for-next (c86d78c459db nvmem: allow to select i.MX nvmem driver for i.MX 7D) +$ git merge nvmem/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/nvmem/imx-ocotp.txt | 4 ++- + drivers/nvmem/Kconfig | 2 +- + drivers/nvmem/bcm-ocotp.c | 37 +++++++++++---------- + drivers/nvmem/core.c | 38 +++++++++++++--------- + drivers/nvmem/imx-ocotp.c | 13 ++++++++ + drivers/nvmem/sc27xx-efuse.c | 12 ++++--- + 6 files changed, 67 insertions(+), 39 deletions(-) +Merging xarray/xarray (edcddd4c879a XArray: Fix an arithmetic error in xa_is_err) +$ git merge xarray/xarray +Already up to date. +Merging hyperv/hyperv-next (27207b76011f vmbus: Switch to use new generic UUID API) +$ git merge hyperv/hyperv-next +Auto-merging include/linux/hyperv.h +Auto-merging drivers/hv/vmbus_drv.c +Auto-merging drivers/hv/channel.c +Merge made by the 'recursive' strategy. + drivers/hv/channel.c | 4 +- + drivers/hv/channel_mgmt.c | 18 ++++----- + drivers/hv/hyperv_vmbus.h | 4 +- + drivers/hv/vmbus_drv.c | 48 ++++++++--------------- + include/linux/hyperv.h | 98 +++++++++++++++++++++++------------------------ + 5 files changed, 79 insertions(+), 93 deletions(-) +Merging auxdisplay/auxdisplay (49a57857aeea Linux 5.0-rc3) +$ 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/x86/kernel/kgdb.c +Auto-merging arch/sh/kernel/kgdb.c +Merge made by the 'recursive' strategy. +Merging pidfd/for-next (5d4254ab421b selftests: add tests for pidfd_send_signal()) +$ git merge pidfd/for-next +Auto-merging tools/testing/selftests/Makefile +Auto-merging kernel/sys_ni.c +Auto-merging kernel/signal.c +Auto-merging include/uapi/asm-generic/unistd.h +CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h +Auto-merging include/linux/syscalls.h +Auto-merging fs/proc/base.c +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl +Resolved 'arch/x86/entry/syscalls/syscall_32.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_64.tbl' using previous resolution. +Resolved 'include/uapi/asm-generic/unistd.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9fe742630f0f] Merge remote-tracking branch 'pidfd/for-next' +$ git diff -M --stat --summary HEAD^.. + 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 +Merging kspp-gustavo/for-next/kspp (f993bd3e061d ASN.1: mark expected switch fall-through) +$ git merge kspp-gustavo/for-next/kspp +Auto-merging security/smack/smack_lsm.c +Auto-merging security/apparmor/domain.c +Auto-merging kernel/time/timer.c +Auto-merging kernel/time/hrtimer.c +Auto-merging fs/btrfs/volumes.h +Auto-merging fs/afs/yfsclient.c +Auto-merging fs/afs/rxrpc.c +Auto-merging fs/afs/flock.c +Auto-merging drivers/scsi/lpfc/lpfc_nvme.c +Merge made by the 'recursive' strategy. + fs/affs/super.c | 3 ++- + fs/btrfs/ref-verify.c | 1 + + fs/btrfs/volumes.h | 1 + + fs/ceph/file.c | 1 + + fs/configfs/dir.c | 2 ++ + fs/ext2/inode.c | 2 ++ + fs/ext4/hash.c | 2 ++ + fs/ext4/indirect.c | 4 ++++ + fs/f2fs/node.c | 2 ++ + fs/fcntl.c | 2 +- + fs/gfs2/bmap.c | 4 ++-- + fs/jffs2/fs.c | 1 + + fs/libfs.c | 2 ++ + fs/locks.c | 2 +- + fs/nfsd/nfs4proc.c | 1 + + fs/nfsd/nfs4state.c | 1 + + fs/ocfs2/cluster/quorum.c | 1 + + fs/seq_file.c | 1 + + fs/signalfd.c | 1 + + fs/ufs/util.h | 4 ++-- + kernel/time/hrtimer.c | 1 + + kernel/time/tick-broadcast.c | 1 + + kernel/time/timer.c | 1 + + lib/asn1_decoder.c | 4 ++++ + lib/cmdline.c | 5 +++++ + lib/zstd/bitstream.h | 5 +++++ + lib/zstd/compress.c | 1 + + lib/zstd/decompress.c | 5 ++++- + lib/zstd/huf_compress.c | 2 ++ + security/apparmor/domain.c | 2 +- + security/integrity/ima/ima_appraise.c | 1 + + security/integrity/ima/ima_policy.c | 4 ++++ + security/integrity/ima/ima_template_lib.c | 1 + + security/smack/smack_lsm.c | 3 +-- + 34 files changed, 63 insertions(+), 11 deletions(-) +Merging akpm-current/current (fc4d4bfc99da 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 scripts/checkpatch.pl +Auto-merging net/sctp/stream.c +Auto-merging mm/rmap.c +CONFLICT (content): Merge conflict in mm/rmap.c +Auto-merging mm/page_alloc.c +Removing lib/flex_array.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sysctl.c +Auto-merging kernel/signal.c +Auto-merging kernel/sched/fair.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/locking/lockdep.c +Auto-merging kernel/exit.c +Auto-merging ipc/util.h +Auto-merging init/init_task.c +Auto-merging include/linux/sched.h +Removing include/linux/flex_array.h +Auto-merging include/linux/device.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/iommu/intel-iommu.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 +Auto-merging arch/powerpc/mm/hash_utils_64.c +Auto-merging arch/arm64/Kconfig +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 410bf36052d0] 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 | 121 +-- + 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(+), 2452 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: kasan: fix kasan_check_read/write definitions +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 + + 596546efeca8...89a0c92d44f5 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (89a0c92d44f5 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 | 10 +- + 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/kasan-checks.h | 2 +- + include/linux/sched/signal.h | 51 +- + kernel/fork.c | 1 - + mm/kasan/common.c | 2 + + scripts/Makefile.genheader | 23 + + scripts/atomic/check-atomics.sh | 2 +- + 15 files changed, 68 insertions(+), 5146 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..5323ff3c022b --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20190130 |