diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-12-20 16:04:08 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-12-20 16:04:08 +1100 |
| commit | 7ddd09fc4b745fb1d8942f95389583e08412e0cd (patch) | |
| tree | 9e09f87efac3dba0ef2d137b1346ec4a2e8b32b5 | |
| parent | 6abf691cecda7b92994f650a55c40c0657815daa (diff) | |
| download | linux-next-7ddd09fc4b745fb1d8942f95389583e08412e0cd.tar.gz | |
Add linux-next specific files for 20191220next-20191220
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 315 | ||||
| -rw-r--r-- | Next/Trees | 317 | ||||
| -rw-r--r-- | Next/merge.log | 7644 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 8279 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..1cf3def75ff8 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,315 @@ +Name SHA1 +---- ---- +origin 7e0165b2f1a912a06e381e91f0f4e495f4ac3736 +fixes 31f4f5b495a62c9a8b15b1c3581acd5efeb9af8c +kbuild-current 8f268881d7d278047b00eed54bbb9288dbd6ab23 +arc-current 833a20b8d4924b63ef7700e43fe4941963002822 +arm-current 39f4d441048444f38fcfcfb1aa3102c030544e86 +arm-soc-fixes 43522b78b590356bf0f83dc3e6b72d93f336b086 +arm64-fixes e50be648aaa3da196d4f4ed49d1c5d4ec105fa4a +m68k-current 5ed0794cde59365d4d5895b89bb2f7ef7ffdbd55 +powerpc-fixes 228b607d8ea1b7d4561945058d5692709099d432 +s390-fixes b4adfe55915d8363e244e42386d69567db1719b9 +sparc 038029c03e21be3bab44ff9d8005b51b597a5bf2 +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net 6fa9a115fe7ca507ef5618eb753706425741b285 +bpf 1148f9adbe71415836a18a36c1b4ece999ab0973 +ipsec e42617b825f8073569da76dc4510bfa019b1c35a +netfilter ddd9b5e3e765d8ed5a35786a6cb00111713fe161 +ipvs c24b75e0f9239e78105f81c5f03a751641eb07ef +wireless-drivers 33328bfab892d676920abb440d41fbf4b16c2717 +mac80211 91f84e3ab1b5310f37ed6bbe72dd7255bdf3c4f4 +rdma-fixes dc2316eba73ff03da6dde082a372c6b5209304c5 +sound-current 92adc96f8eecd9522a907c197cc3d62e405539fe +sound-asoc-fixes 38dd05a0cc232ec7914013078985ec6d53986b90 +regmap-fixes e42617b825f8073569da76dc4510bfa019b1c35a +regulator-fixes 6f25f67c4d2321ecb1a922b0a80982f20b046388 +spi-fixes efa968a9b4fb9960f70bf847f1b6e97aae770fff +pci-current ca01e7987463e8675f223c366e262e82f633481a +driver-core.current d1eef1c619749b2a57e514a3fa67d9a516ffa919 +tty.current cb47b9f8630ae3fa3f5fbd0c7003faba7abdf711 +usb.current 6056a0f8ede27b296d10ef46f7f677cc9d715371 +usb-gadget-fixes e5b5da96da50ef30abb39cb9f694e99366404d24 +usb-serial-fixes 0d3010fa442429f8780976758719af05592ff19f +usb-chipidea-fixes 16009db47c51d4ef61270f22a2f1bb385233c34f +phy e42617b825f8073569da76dc4510bfa019b1c35a +staging.current c05c403b1d123031f86e65e867be2c2e9ee1e7e3 +char-misc.current 4aa37c463764052c68c5c430af2a67b5d784c1e0 +soundwire-fixes e42617b825f8073569da76dc4510bfa019b1c35a +thunderbolt-fixes d1eef1c619749b2a57e514a3fa67d9a516ffa919 +input-current 1021dcf19db1387bc0db26d14bbcba719923a466 +crypto-current 84faa307249b341f6ad8de3e1869d77a65e26669 +ide baf6722aa0cbc5381f11520eb661be71b3ac379e +vfio-fixes 95f89e090618efca63918b658c2002e57d393036 +kselftest-fixes 65c5ca4410bff8d10de3a71451da043bb85e70f4 +modules-fixes 57baec7b1b0459ef885e816d8c28a9d9a62bb8de +slave-dma-fixes a40c94be2336f3002563c9ae16572143ae3422e2 +backlight-fixes 219d54332a09e8d8741c1e1982f5eae56099de85 +mtd-fixes df8fed831cbcdce7b283b2d9c1aadadcf8940d05 +mfd-fixes 603d9299da32955d49995738541f750f2ae74839 +v4l-dvb-fixes e5a52a1d15c79bb48a430fb263852263ec1d3f11 +reset-fixes db23808615e29d9a04f96806cac56f78b0fee0ef +mips-fixes f596cf0d8062cb5d0a4513a8b3afca318c13be10 +at91-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +omap-fixes 03729cfa0d543bc996bf959e762ec999afc8f3d2 +kvm-fixes 2f13437b8917627119d163d62f73e7a78a92303a +kvms390-fixes fe33a928bfcd673ecf73b990d704ef18a907c409 +hwmon-fixes 20358214d96b05d87276bdf5a318dc200082206e +nvdimm-fixes c1468554776229d0db69e74a9aaf6f7e7095fd51 +btrfs-fixes bfbbf8cb43a7c7d201c659f2f608d747149082cb +vfs-fixes 1edc8eb2e93130e36ac74ac9c80913815a57d413 +dma-mapping-fixes 9c24eaf81cc44d4bb38081c99eafd72ed85cf7f3 +i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +drivers-x86-fixes e42617b825f8073569da76dc4510bfa019b1c35a +samsung-krzk-fixes a2315d3aea5976acd919d3d3fcf82f752562c25b +pinctrl-samsung-fixes e42617b825f8073569da76dc4510bfa019b1c35a +devicetree-fixes dbce0b65046d1735d7054c54ec2387dba84ba258 +scsi-fixes bba340c79bfe3644829db5c852fdfa9e33837d6d +drm-fixes d1eef1c619749b2a57e514a3fa67d9a516ffa919 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 78d75f5739c457ff37cfe5adab1c01bc1f3375e2 +mmc-fixes f667216c5c7c967c3e568cdddefb51fe606bfe26 +rtc-fixes 653997eeecef95c3ead4fba1b2d27e6a5854d6cd +gnss-fixes d1eef1c619749b2a57e514a3fa67d9a516ffa919 +hyperv-fixes af42d3466bdc8f39806b26f593604fdc54140bcb +soc-fsl-fixes 5674a92ca4b7e5a6a19231edd10298d30324cd27 +risc-v-fixes 13bb95ae200063c886c2242b03c196963c0b7045 +pidfd-fixes 0b8d616fb5a8ffa307b1d3af37f55c15dae14f28 +fpga-fixes dec43da46f63eb71f519d963ba6832838e4262a3 +spdx 2f13437b8917627119d163d62f73e7a78a92303a +gpio-intel-fixes e42617b825f8073569da76dc4510bfa019b1c35a +pinctrl-intel-fixes b9a19bdbc843abd659e8ec6b1b3c32ae3a2455eb +erofs-fixes d1eef1c619749b2a57e514a3fa67d9a516ffa919 +drm-misc-fixes 57177d214ee0816c4436c23d6c933ccb32c571f1 +kspp-gustavo 3d519d6d388ba4f9a75d0e0b6f60d890987bc096 +kbuild 6bfce12999f5a6bf6ab0302eba6099e18b479275 +compiler-attributes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +leaks 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +dma-mapping a7ba70f1787f977f970cd116076c6fce4b9e01cc +asm-generic 9b87647c665dbf93173ca2f43986902b59dfbbba +arc 9fbea0b7e842890a76acffce9be9e430b9e11194 +arm 04bb96427d4ee33fbdf15648ddf578c6ba1aef54 +arm64 de858040ee80e6f41bf0b40090f1c71f966a61b3 +arm-perf 8703317ae576c9bf3e07e5b97275e3f957e8d74b +arm-soc bf8e919552764845fc537859e2ee5cfbb63172d2 +amlogic 714767cd90718f876789f61c7e7af700aa045db0 +aspeed 2aee80727dca69ee225c376f2987c5dbf3fbb416 +at91 a56d3a8ceac3a1818b16f3294a4335b53231c6f2 +bcm2835 f142341846711f8f3cb85e4df5e0130d9e017a9d +imx-mxs 459ee837b230d135147d55387e4f4a7b5da9ec15 +keystone 2af8e1f26c6596540d95965fd45fca2692696e1e +mediatek ca01a6367d0fed86ad4719f8aa5df2a955002fe2 +mvebu cd592187f9de3c6305d6c1c66f7fac084cb5b846 +omap 63eb53c0826fc43fe65038b29006a92e98a62967 +qcom cd6443eb2a278325b86a6320ea6cb1555549559f +realtek 6a41c7019bcaf869d2da3ad57be37de456e55b82 +renesas 4730830f9c2e0c1db90d9576639f5556cecb64b1 +reset dc4491c457b90aa4bba326b6ae9170296d544665 +rockchip 3ce659c9cf8f02aca5873fc84f832b0503c4b848 +samsung-krzk ed21b314fb85e90c311d24ea9f44f3f216b2807a +scmi d1eef1c619749b2a57e514a3fa67d9a516ffa919 +sunxi 3ba34a3cb3caa7a23864ad2b47620c6a78fd9897 +tegra e0fd54137bf5a65d2523ffeec69e5a15935cb4e5 +clk f7f1ed4fd89a5ea173b843d210615cfc698f6ce5 +clk-samsung 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +c6x 8adcc59974b8a65b7eac7d503364837c297139bc +csky 044cf5e153578583ef570b0a502ccdd74bdaf295 +h8300 a5de8865cb3edc9c5b719dc45651b38226805f9e +ia64 240b62d381fe5b66c496a6fd55edff3976a9be51 +m68k 5ed0794cde59365d4d5895b89bb2f7ef7ffdbd55 +m68knommu d1eef1c619749b2a57e514a3fa67d9a516ffa919 +microblaze 22648c989cb8305f51b96b5962df8674697bb2ab +mips a8d0f11ee50ddbd9f243c7a8b1a393a4f23ba093 +nds32 a7f96fce201c4969178c8709a49e005d9792186b +nios2 e32ea127d81c12882f39c2783d78634597ff21a2 +openrisc 0ecdcaa6d5e78649578ff32c37556a4140b64edf +parisc-hd aeea5eae4fd54e94d820ed17ea3b238160be723e +powerpc 7794b1d4185e2587af46435e3e2f6696dae314c7 +fsl a76bea0287ce13d28494b19649d80d8ee5e7b757 +soc-fsl 5a35435ef4e6e4bd2aabd6706b146b298a9cffe5 +risc-v 070389ef0f4bff37053abd7e0f2f80c098b4798c +sifive 467e050e9760fc31dcf854ec88401e18419f5f78 +s390 d1eef1c619749b2a57e514a3fa67d9a516ffa919 +sh a193018e5290ee9d9fe62ad80cd8f874711eb575 +sparc-next b71acb0e372160167bf6d5500b88b30b52ccef6e +uml 9807019a62dc670c73ce8e59e09b41ae458c34b3 +xtensa bd6d7558140c8b3094b7385fffd8162ccbeac6ab +fscrypt 0eee17e3322625b87ce5fa631bda16562a8dc494 +afs 4fe171bb81b13b40bf568330ec3716dfb304ced1 +btrfs 451942d4ded8a6634aa7b0cb78c5ae432692ccc9 +ceph da08e1e1d7c3f805f8771ad6a6fd3a7a30ba4fe2 +cifs d1eef1c619749b2a57e514a3fa67d9a516ffa919 +configfs e2f238f7d5a1fa69ff1884d37acf9a2a3a01b308 +ecryptfs b4a81b87a4cfe2bb26a4a943b748d96a43ef20e8 +erofs d1eef1c619749b2a57e514a3fa67d9a516ffa919 +ext3 4d5c1adaf893b8aa52525d2b81995e949bcb3239 +ext4 d82d47d5d8a6d40bb622cef31b6c6fa09cbd01ea +f2fs 447c5bb5ce145ba3109012f46e304d96411eba69 +fsverity 73f0ec02d670a61afcef49bc0a74d42e324276ea +fuse 8d66fcb7488486bf144eab852e87e03a45e0fd3a +jfs a5fdd713d256887b5f012608701149fa939e5645 +nfs d1eef1c619749b2a57e514a3fa67d9a516ffa919 +nfs-anna 79cc55422ce99be5964bde208ba8557174720893 +nfsd 38a2204f5298620e8a1c3b1dc7b831425106dbc0 +orangefs f9bbb68233aa5bd5ef238bd3532fddf92fa1b53c +overlayfs 6c7bed08450710bb3c80c5f9620a0978f91b5c36 +ubifs 6e78c01fde9023e0701f3af880c1fd9de6e4e8e3 +v9fs 79fb9216b7be1832b90c8ddf3c2d465b46670e81 +xfs 13eaec4b2adf2657b8167b67e27c97cc7314d923 +iomap c275779ff2dd51c96eaae04fac5d766421d6c596 +djw-vfs 3253d9d093376d62b4a56e609f15d2ec5085ac73 +file-locks b41dae061bbd722b9d7fa828f35d22035b218e18 +vfs 912dfe068c43fa13c587b8d30e73d335c5ba7d44 +printk 20aaa2d8e1f3368923833239b9f1f31261703c87 +pci cb224132f23e2dda31a71c49f055dd5ce88927fa +pstore 8d82cee2f8aa8b9bc806907ecd9e1494c6e8526b +hid 62216a51293df32e9ba03851ae965c5da06de345 +i2c 15c0677162b77636899ac668f3bc2055c941b9b7 +i3c 608b68b67a309e96ee6a97fdb090553b14a814d0 +dmi 2429c99fa13a6330cd9e1b9e6086b290735e77bb +hwmon-staging 848a25f01ee7b96918b8b535876f96a43cf8aba3 +jc_docs c1ccff45e54eb54fa4e437da197e6738b002f22d +v4l-dvb 0885acd77eb4644fd88f6d9f41e433f4ee9bc37a +v4l-dvb-next d45331b00ddb179e291766617259261c112db872 +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm 5fb4c90b7da98de72260e0f681b486b7a574e681 +cpufreq-arm d4a386f59527e3a4a2599bf4e4d6987b5c4c55af +cpupower e42617b825f8073569da76dc4510bfa019b1c35a +opp 03758d60265c773e1d06d436b99ee338f2ac55d6 +thermal 3d9613284a62e130fe5eeb22cefe3a8560011120 +thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 7807759e4ad8d46347a5d52a0910269320b81e65 +dlm a48f9721e6db74dfbeb8d4a2cd616b20017f4b78 +swiotlb 4cdfb27ba80d29aa04bc340b2e4b59e9ae74004c +rdma e42617b825f8073569da76dc4510bfa019b1c35a +net-next d8e419da048e45a8258b9721e85232dbb25ac618 +bpf-next 5bf2fc1f9c88397b125d5ec5f65b1ed9300ba59d +ipsec-next e27cca96cd68fa2c6814c90f9a1cfd36bb68c593 +mlx5-next e42617b825f8073569da76dc4510bfa019b1c35a +netfilter-next 13d74c0a9708a4f1ab0164a800ce9ea3de32f47b +nfc-next 1f008cfec5d529b30ca8da1a1f5fbbd457c10382 +ipvs-next d54725cd11a57c30f650260cfb0a92c268bdc3e0 +wireless-drivers-next ae0a723c4cfd89dad31ce238f47ccfbe81b35b84 +bluetooth d44f00b40c03e7c22c8409e88750e02d6ca18d81 +mac80211-next 1ee7826ab68f7e9fa1a01533983acf6a6f62e297 +gfs2 76223fa758285cba0560ac852a5af3012666cf93 +mtd 589e1b6c47ce72fcae103c2e45d899610c92c11e +nand 777260a5c99226cfa58325b6a7c2f39bb46f5aaf +spi-nor d1eef1c619749b2a57e514a3fa67d9a516ffa919 +crypto d9e1670b8005999998b557c0e301bb68192bb1c8 +drm 5f773e551a3b977013df24d570d486645f326672 +amdgpu e1704989a1b924a842c7a6b0f089a465395ccd04 +drm-intel 7d1ff0d9faf66f630c104a6ca6b8a3c6091ba3a3 +drm-tegra d66dfcf80d0f55f95b9ea4a45ca41cc7115e9789 +drm-misc 93ccfa9a4eca482216c5caf88be77e5ffa0d744a +drm-msm e20c9284c8f212081afc28471daaac9b0d54252f +mali-dp f634c6a8028789b05a9277a3d51303829ae29547 +imx-drm 4d24376370fbfc87231d54434a683f2913abcce4 +etnaviv 22567d017c2c1a9b6ce67d054ffcbf6d2d64a6f8 +regmap e42617b825f8073569da76dc4510bfa019b1c35a +sound a032ff0e8065668e672eb2e223e265b7808f35a3 +sound-asoc ed0c3910299d79349e478b01e390d570412925cb +modules ce2b617ce8cbb7ba7a956299061bbc784131333c +input fd7bba685e7d9ebc45de2a7e9bd974fdd615abdf +block eb1cc93eb2c5d9fbef428894c303fc529a4ebcd7 +device-mapper 7fc979f8204fb763e203d3e716c17d352eb96b35 +pcmcia 71705c611263cad99edf85a5ea021e098cac032b +mmc 9f606f11ea98c7a34c9e8c7405ec80ef3572ce69 +md e820d55cb99dd93ac2dc949cf486bb187e5cd70d +mfd ea9a89ca3b9537db9734b7d3e43927d130886c26 +backlight 102a1b382177d89f75bc49b931c329a317cf531f +battery 921377c0b4e8e240e0b56cb13bc22f2ecc4e59df +regulator 3917d361271fc4151b17c88e6f189f34b2b74f05 +security 45893a0abee6b5fd52994a3a1095735aeaec472b +apparmor 341c1fda5e17156619fb71acfc7082b2669b4b72 +integrity 2a7f0e53daf29ca6dc9fbe2a27158f13474ec1b5 +keys 48274e1e5d24407bb2acb768c093add00bf92823 +selinux 5c108d4e18f80be01965792726c81b105fbd677a +smack 92604e825304ce170955df44b00973843054dcd5 +tomoyo 6bd5ce6089b561f5392460bfb654dea89356ab1b +tpmdd 1760eb689ed68c6746744aff2092bff57c78d907 +watchdog d1eef1c619749b2a57e514a3fa67d9a516ffa919 +iommu cde9319e884eb6267a0df446f3c131fe1108defb +vfio 9917b54aded12dff9beb9e709981617b788e44b0 +audit cb5172d96d16df72db8b55146b0ec00bfd97f079 +devicetree fe96df93f86c9006f9c76d53779445dffa4f3b2d +mailbox c6c6bc6ea9fce31baaca053befc31215cfcb3dd9 +spi 20360817c6f00ec30a483f32617b171f437f6d71 +tip ec7b10f2d023bd79cf067c60c194f72a6d672319 +clockevents 6e001f6a4cc73cd06fc7b8c633bc4906c33dd8ad +edac a651c6c64431765c7a833e37dae5b135622bdf04 +irqchip c6d732c8cc6702f890fb91fa58d57355b427f161 +ftrace ff205766dbbee024a4a716638868d98ffb17748a +rcu de73daec335f0227b7303abb0814a3c00c0c55b2 +kvm 7d73710d9ca2564f29d291d0b3badc09efdf25e9 +kvm-arm 96e1968f820680e130aca5d6e517d2de78f64eb2 +kvm-ppc 30486e72093ea2e594f44876b7a445c219449bce +kvms390 c7b7de63124645089ccf9900b9e5ea08059ccae0 +xen-tip c673ec61ade89bf2f417960f986bc25671762efb +percpu 06557cf18eae12b324a1a9e2f21a24c5c4942883 +workqueues 49e9d1a9faf2f71fdfd80a30697ee9a15070626d +drivers-x86 e42617b825f8073569da76dc4510bfa019b1c35a +chrome-platform 737d6777b2315a8b85925affa91325eebac268bd +hsi c1030cd456198a2c58f718c3c4b215698d635553 +leds 5f820ed52371b4f5d8c43c93f03408d0dbc01e5b +ipmi 380665becdeeb4f455c23582b7f32e6b3cea27d2 +driver-core 4c002c978b7f2f2306d53de051c054504af920a9 +usb ea81896dc98f324ff3fb9b1e74b4915a1beb3296 +usb-gadget 726b4fba94bec7e4c16bc681316e82455652c3a8 +usb-serial d1eef1c619749b2a57e514a3fa67d9a516ffa919 +usb-chipidea-next 4d6141288c33b73027260e73df262464cbe1fd0d +phy-next e42617b825f8073569da76dc4510bfa019b1c35a +tty 293f8995948330e1df9228519535593618b5ec0e +char-misc d1eef1c619749b2a57e514a3fa67d9a516ffa919 +extcon 2ddf50a75dab49eeb534dbdad92972f56a84046d +soundwire 09f6a72d014386939d21899921dd379006471a4b +thunderbolt d1eef1c619749b2a57e514a3fa67d9a516ffa919 +staging 6db45b06611ce8ebae6952e249257bd45d980ed4 +mux 05fb8284a41719d5f827af2f383dd7592d8dcfda +icc 1a0013c62b33158dcb67a3c11872a03be50711a3 +slave-dma ed5a0ab41555032a944c18bd5f8eb275c740f856 +cgroup 899969b46c28937195da510abf0ea53d300bf5c7 +scsi 67a358329376d02b83f92034506220a25f93cd31 +scsi-mkp a657d39c16b3bcf062789b5eac977e665a8b36aa +vhost 70e269172e04d261cef144a0caee961bd11283f6 +rpmsg 5c615938c8404b4bbd4081cdb789d9a0f24668b4 +gpio 06c4fc5eda6bce50e3995e436db6aa7fb5bc56eb +gpio-brgl 373894f83b52423e4eb05566977c9c38985b0b57 +gpio-intel e42617b825f8073569da76dc4510bfa019b1c35a +pinctrl de253bf8bf8f9fd9f995182357ceccf310a5c543 +pinctrl-intel 3a67fe38e76a590d2c8ce4731cd64fbd477e5f79 +pinctrl-samsung 225a2ec19aac426ef29f0e4accfc890c87d38bdc +pwm bd88d319abe9a4bb6cc63b23cc760bec46e81fe6 +userns 61a47c1ad3a4dc6882f01ebdc88138ac62d0df03 +ktest 9b5f852ae20d998a534eea46d54e68584868ae8c +random 58be0106c5306b939b07b4b8bf00669a20593f4b +kselftest d1eef1c619749b2a57e514a3fa67d9a516ffa919 +y2038 5ea0f410a68f6984ba0d17ea7cb57e9c1107d7d5 +livepatching 7f436b3066e330f78a626b3af72ff549137cf114 +coresight ad9882f158845df08627dd41af03dddd28104897 +rtc 28b8958c0bf65e6be0c409672724cae210667a58 +nvdimm 0dfbb932bb67dc76646e579ec5cd21a12125a458 +at24 e42617b825f8073569da76dc4510bfa019b1c35a +ntb 1ef512b16bc8e51453d7105609c88f51fba4dcf5 +kspp c593642c8be046915ca3a4a300243a68077cd207 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss d1eef1c619749b2a57e514a3fa67d9a516ffa919 +fsi 2c01397b71c5e5001752046328d7f2aaf51b4c13 +slimbus 8f35288566d79095439e59b27767d3352c53bc5c +nvmem 808c8bcca225039a3a9cfeba0a6be73d1839b251 +xarray 6b81141deb7358dbd64ce3e793cd1e3f5939f807 +hyperv 7a1323b5dfe44a9013a2cc56ef2973034a00bf88 +auxdisplay 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +kgdb c58ff643763c78bef12874ee39995c9f7f987bc2 +pidfd 04882c321b26fef30d8eaa7af63fa62c06e45c76 +devfreq 8ab517d50a70b30cdf52b38f458cdd3be1735805 +hmm e42617b825f8073569da76dc4510bfa019b1c35a +fpga fddc9fcbe69a502d84adf0bad5e2c6c80823838c +kunit e42617b825f8073569da76dc4510bfa019b1c35a +cel a99d8080aaf358d5d23581244e5da23b35e340b9 +kasan-bitops 4f4afc2c9599520300b3f2b3666d2034fca03df3 +generic-ioremap 1188dd7d3fbd367daa90da1b0c707f8e1e61c1ba +kunit-next d1eef1c619749b2a57e514a3fa67d9a516ffa919 +akpm-current 461e28fa2c115993d6df85b3c01d0f3836b03a74 +akpm 46ce41faa1114d92ef2890da637817f350d5ac3f diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..19d302e2f6cc --- /dev/null +++ b/Next/Trees @@ -0,0 +1,317 @@ +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 +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/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 +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/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/fs/fscrypt/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.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/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 +amdgpu-fixes git git://people.freedesktop.org/~agd5f/linux#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 +soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix +risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +pidfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +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/soc/soc.git#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 +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +realtek git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek.git#for-next +renesas git git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-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 +soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/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 +sh git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#sh-next +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +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/fs/fscrypt/fscrypt.git#master +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs 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 +erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +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 +fsverity git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#fsverity +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 +iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next +djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-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/thermal/linux.git#thermal/linux-next +thermal-rzhang 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.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.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 +amdgpu git git://people.freedesktop.org/~agd5f/linux#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 https://gitlab.freedesktop.org/drm/msm.git#msm-next +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 +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 +md git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next-testing +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#for-next +tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master +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 +vfio git git://github.com/awilliam/linux-vfio.git#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#timers/drivers/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-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/chrome-platform/linux.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/pavel/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 +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/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 +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.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 +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/joel/fsi.git#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 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 +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#for-next +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +cel git git://git.linux-nfs.org/projects/cel/cel-2.6.git#cel-next +kasan-bitops git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#topic/kasan-bitops +generic-ioremap git git://git.infradead.org/users/hch/ioremap.git#for-next +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +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..318468fb3f3d --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,7644 @@ +$ date -R +Fri, 20 Dec 2019 08:26:32 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 80a0c2e511a9 Merge tag 'sound-5.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound +Merging origin/master (7e0165b2f1a9 Merge branch 'akpm' (patches from Andrew)) +$ git merge origin/master +Updating 80a0c2e511a9..7e0165b2f1a9 +Fast-forward + crypto/asymmetric_keys/asym_tpm.c | 1 + + crypto/asymmetric_keys/public_key.c | 1 + + drivers/char/tpm/tpm-dev-common.c | 8 ++ + drivers/char/tpm/tpm.h | 1 - + drivers/char/tpm/tpm2-cmd.c | 1 + + drivers/char/tpm/tpm_ftpm_tee.c | 22 ++++- + drivers/char/tpm/tpm_tis_core.c | 35 ++++---- + include/linux/cpufreq.h | 11 --- + include/linux/kasan.h | 15 ++-- + include/linux/mm.h | 3 + + include/linux/sched/cpufreq.h | 3 + + include/linux/tpm.h | 1 + + kernel/sched/cpufreq.c | 18 ++++ + kernel/sched/cpufreq_schedutil.c | 8 +- + lib/Kconfig.debug | 100 ++++++++++----------- + mm/kasan/common.c | 36 +++++--- + mm/memory.c | 136 ++++++++++++++++++++--------- + mm/vmalloc.c | 129 ++++++++++++++++----------- + mm/vmscan.c | 2 +- + security/keys/Kconfig | 4 - + security/keys/Makefile | 2 +- + security/keys/compat.c | 5 -- + security/keys/internal.h | 4 +- + security/keys/trusted-keys/trusted_tpm2.c | 1 + + tools/testing/selftests/tpm2/test_smoke.sh | 6 ++ + tools/testing/selftests/tpm2/tpm2.py | 19 +++- + tools/testing/selftests/tpm2/tpm2_tests.py | 13 +++ + 27 files changed, 370 insertions(+), 215 deletions(-) +Merging fixes/master (31f4f5b495a6 Linux 5.4-rc7) +$ git merge fixes/master +Already up to date. +Merging kbuild-current/fixes (8f268881d7d2 kconfig: remove ---help--- from documentation) +$ git merge kbuild-current/fixes +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/kbuild/kconfig-language.rst | 5 +--- + Makefile | 3 ++- + arch/x86/boot/compressed/Makefile | 2 +- + scripts/kallsyms.c | 38 +++++++++++++++---------------- + scripts/kconfig/expr.c | 7 ++++++ + scripts/mkcompile_h | 10 ++++---- + scripts/package/mkdebian | 2 +- + usr/include/Makefile | 2 +- + 8 files changed, 35 insertions(+), 34 deletions(-) +Merging arc-current/for-curr (833a20b8d492 ARC: asm-offsets: remove duplicate entry) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/include/asm/hugepage.h | 1 - + arch/arc/kernel/asm-offsets.c | 1 - + arch/arc/plat-eznps/Kconfig | 2 +- + 3 files changed, 1 insertion(+), 3 deletions(-) +Merging arm-current/fixes (39f4d4410484 Merge branch 'misc' into fixes) +$ git merge arm-current/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (43522b78b590 Merge tag 'socfpga_dts_fix_for_v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into arm/fixes) +$ git merge arm-soc-fixes/arm/fixes +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 8 ++++---- + arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 8 ++++---- + 2 files changed, 8 insertions(+), 8 deletions(-) +Merging arm64-fixes/for-next/fixes (e50be648aaa3 arm64: uaccess: Remove uaccess_*_not_uao asm macros) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging m68k-current/for-linus (5ed0794cde59 m68k/atari: Convert Falcon IDE drivers to platform drivers) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (228b607d8ea1 KVM: PPC: Book3S HV: Fix regression on big endian hosts) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/spinlock.h | 13 +++++-------- + arch/powerpc/include/asm/uaccess.h | 9 +++++++-- + arch/powerpc/kernel/irq.c | 4 ++-- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 4 ++-- + arch/powerpc/lib/string_32.S | 4 ++-- + arch/powerpc/lib/string_64.S | 6 +++--- + arch/powerpc/mm/mem.c | 8 ++++++++ + arch/powerpc/mm/nohash/8xx.c | 2 +- + arch/powerpc/platforms/pseries/cmm.c | 10 ++++++++++ + arch/powerpc/platforms/pseries/setup.c | 7 +++++++ + drivers/misc/ocxl/context.c | 8 ++++---- + drivers/misc/ocxl/file.c | 23 +++++++++++------------ + 12 files changed, 62 insertions(+), 36 deletions(-) +Merging s390-fixes/fixes (b4adfe55915d s390/ftrace: save traced function caller) +$ git merge s390-fixes/fixes +Merge made by the 'recursive' strategy. + arch/s390/include/asm/timex.h | 4 ++-- + arch/s390/kernel/mcount.S | 1 + + arch/s390/kernel/unwind_bc.c | 15 +++++++++++---- + arch/s390/purgatory/.gitignore | 1 + + arch/s390/purgatory/Makefile | 19 ++++++++++++++----- + arch/s390/purgatory/string.c | 3 +++ + 6 files changed, 32 insertions(+), 11 deletions(-) + create mode 100644 arch/s390/purgatory/string.c +Merging sparc/master (038029c03e21 sparc: remove unneeded uapi/asm/statfs.h) +$ git merge sparc/master +Removing arch/sparc/include/uapi/asm/statfs.h +Merge made by the 'recursive' strategy. + arch/sparc/include/uapi/asm/statfs.h | 7 ------- + 1 file changed, 7 deletions(-) + delete mode 100644 arch/sparc/include/uapi/asm/statfs.h +Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (6fa9a115fe7c Merge branch 'stmmac-fixes') +$ git merge net/master +Auto-merging net/netfilter/nf_tables_api.c +Auto-merging net/ipv4/tcp.c +Auto-merging include/net/sock.h +Auto-merging MAINTAINERS +Auto-merging .mailmap +Merge made by the 'recursive' strategy. + .mailmap | 1 + + .../devicetree/bindings/net/can/tcan4x5x.txt | 4 +- + Documentation/networking/j1939.rst | 2 +- + MAINTAINERS | 17 ++ + arch/mips/net/ebpf_jit.c | 9 +- + arch/riscv/net/bpf_jit_comp.c | 4 +- + drivers/net/bonding/bond_main.c | 42 +-- + drivers/net/can/flexcan.c | 73 +++-- + drivers/net/can/m_can/tcan4x5x.c | 26 +- + drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 6 +- + drivers/net/can/xilinx_can.c | 7 + + drivers/net/dsa/b53/b53_common.c | 21 +- + drivers/net/dsa/ocelot/Kconfig | 1 + + drivers/net/ethernet/amazon/ena/ena_netdev.c | 10 +- + drivers/net/ethernet/atheros/ag71xx.c | 4 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 12 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 1 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 12 + + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 63 ++-- + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 93 ++++-- + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h | 2 + + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 38 ++- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h | 4 + + drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 8 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 4 + + drivers/net/ethernet/cortina/gemini.c | 2 + + drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c | 14 +- + drivers/net/ethernet/ibm/ibmvnic.c | 2 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 7 +- + .../net/ethernet/netronome/nfp/flower/metadata.c | 12 +- + drivers/net/ethernet/qlogic/qede/qede_filter.c | 2 +- + drivers/net/ethernet/qlogic/qla3xxx.c | 8 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 5 +- + drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 2 + + drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 3 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 53 ++-- + .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 4 + + drivers/net/ethernet/ti/Kconfig | 1 + + drivers/net/ethernet/ti/Makefile | 1 + + drivers/net/ethernet/ti/davinci_cpdma.c | 5 +- + drivers/net/fjes/fjes_main.c | 3 + + drivers/net/gtp.c | 109 ++++--- + drivers/net/hamradio/6pack.c | 4 +- + drivers/net/hamradio/mkiss.c | 4 +- + drivers/net/hyperv/rndis_filter.c | 6 +- + drivers/net/phy/phylink.c | 3 +- + drivers/net/usb/lan78xx.c | 3 +- + drivers/net/wireless/ath/ath10k/mac.c | 1 + + .../net/wireless/ath/ath9k/ath9k_pci_owl_loader.c | 2 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 24 +- + .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 25 -- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 30 ++ + drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 13 +- + drivers/net/wireless/marvell/mwifiex/tdls.c | 70 ++++- + drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c | 5 +- + drivers/net/xen-netback/interface.c | 24 +- + drivers/nfc/nxp-nci/i2c.c | 2 +- + drivers/ptp/Kconfig | 2 +- + include/linux/bpf.h | 1 + + include/linux/netdevice.h | 2 +- + include/linux/rculist_nulls.h | 37 +++ + include/net/inet_hashtables.h | 12 +- + include/net/neighbour.h | 1 - + include/net/sock.h | 9 +- + include/net/tcp.h | 11 +- + include/net/x25.h | 3 +- + include/uapi/linux/netfilter/xt_sctp.h | 6 +- + include/uapi/linux/nl80211.h | 5 + + kernel/bpf/btf.c | 1 + + kernel/bpf/trampoline.c | 64 +++- + net/bridge/br_netfilter_hooks.c | 3 + + net/can/j1939/socket.c | 10 +- + net/core/neighbour.c | 3 - + net/core/net-sysfs.c | 7 +- + net/core/sock.c | 2 +- + net/dsa/dsa2.c | 3 +- + net/ipv4/inet_diag.c | 3 +- + net/ipv4/inet_hashtables.c | 16 +- + net/ipv4/tcp.c | 6 +- + net/ipv4/tcp_bbr.c | 3 +- + net/ipv4/tcp_ipv4.c | 7 +- + net/ipv4/tcp_output.c | 17 +- + net/ipv6/addrconf.c | 8 +- + net/mac80211/airtime.c | 2 +- + net/mac80211/debugfs_sta.c | 76 +++-- + net/mac80211/main.c | 4 +- + net/mac80211/sta_info.c | 3 + + net/mac80211/sta_info.h | 1 - + net/mac80211/tx.c | 13 +- + net/netfilter/nf_conntrack_core.c | 7 +- + net/netfilter/nf_conntrack_netlink.c | 3 + + net/netfilter/nf_flow_table_offload.c | 83 +++--- + net/netfilter/nf_queue.c | 2 +- + net/netfilter/nf_tables_api.c | 18 +- + net/netfilter/nf_tables_offload.c | 6 + + net/netfilter/nft_bitwise.c | 4 +- + net/netfilter/nft_cmp.c | 6 + + net/netfilter/nft_range.c | 10 + + net/netfilter/nft_set_rbtree.c | 21 +- + net/nfc/nci/uart.c | 2 +- + net/packet/af_packet.c | 3 +- + net/rfkill/core.c | 7 +- + net/sctp/protocol.c | 5 + + net/sctp/stream.c | 8 +- + net/smc/af_smc.c | 14 +- + net/tipc/bcast.c | 24 +- + net/tipc/discover.c | 6 +- + net/tipc/name_table.c | 279 ++++++++++------- + net/tipc/socket.c | 32 +- + net/vmw_vsock/virtio_transport_common.c | 25 +- + net/wireless/core.c | 1 + + net/x25/af_x25.c | 8 + + net/x25/x25_in.c | 32 ++ + samples/bpf/syscall_tp_kern.c | 18 +- + samples/bpf/trace_event_user.c | 4 +- + tools/bpf/bpftool/prog.c | 2 +- + tools/bpf/bpftool/xlated_dumper.c | 2 +- + tools/testing/selftests/bpf/test_ftrace.sh | 39 +++ + .../selftests/net/forwarding/router_bridge_vlan.sh | 2 +- + tools/testing/selftests/net/tls.c | 28 -- + tools/testing/selftests/netfilter/nft_nat.sh | 332 +++++++++++---------- + .../tc-testing/tc-tests/filters/basic.json | 2 +- + 124 files changed, 1510 insertions(+), 783 deletions(-) + create mode 100755 tools/testing/selftests/bpf/test_ftrace.sh +Merging bpf/master (1148f9adbe71 net, sysctl: Fix compiler warning when only cBPF is present) +$ git merge bpf/master +Auto-merging net/core/filter.c +Auto-merging kernel/bpf/local_storage.c +Merge made by the 'recursive' strategy. + drivers/net/ethernet/intel/i40e/i40e.h | 2 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 10 ++++++--- + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 4 ++++ + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 7 ++++++- + drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 8 ++++++-- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h | 22 ++++++++------------ + .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 1 + + .../net/ethernet/mellanox/mlx5/core/en/xsk/tx.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 19 +---------------- + include/linux/bpf-cgroup.h | 8 ++++---- + include/linux/bpf.h | 2 ++ + kernel/bpf/core.c | 17 +++++++++------ + kernel/bpf/local_storage.c | 24 +++++++++++----------- + kernel/bpf/verifier.c | 16 +++------------ + net/core/filter.c | 1 + + net/core/sysctl_net_core.c | 2 ++ + net/xdp/xsk.c | 22 ++++++++++++-------- + 18 files changed, 86 insertions(+), 83 deletions(-) +Merging ipsec/master (e42617b825f8 Linux 5.5-rc1) +$ git merge ipsec/master +Already up to date. +Merging netfilter/master (ddd9b5e3e765 net-sysfs: Call dev_hold always in rx_queue_add_kobject) +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (c24b75e0f923 ipvs: move old_secure_tcp into struct netns_ipvs) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (33328bfab892 MAINTAINERS: change Gruszka's email address) +$ git merge wireless-drivers/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 ++-- + drivers/net/wireless/marvell/libertas/cfg.c | 16 +++++++++++++--- + drivers/net/wireless/mediatek/mt76/airtime.c | 2 +- + drivers/net/wireless/mediatek/mt76/mac80211.c | 3 ++- + 4 files changed, 18 insertions(+), 7 deletions(-) +Merging mac80211/master (91f84e3ab1b5 mac80211: mesh: restrict airtime metric to peered established plinks) +$ git merge mac80211/master +Merge made by the 'recursive' strategy. + net/mac80211/mesh_hwmp.c | 3 +++ + 1 file changed, 3 insertions(+) +Merging rdma-fixes/for-rc (dc2316eba73f IB/mlx5: Fix device memory flows) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (92adc96f8eec ALSA: usb-audio: set the interface format after resume on Dell WD19) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/usb/card.h | 1 + + sound/usb/pcm.c | 21 +++++++++++++++++++-- + sound/usb/quirks-table.h | 3 ++- + sound/usb/quirks.c | 11 +++++++++++ + sound/usb/usbaudio.h | 3 ++- + 5 files changed, 35 insertions(+), 4 deletions(-) +Merging sound-asoc-fixes/for-linus (38dd05a0cc23 Merge branch 'asoc-5.5' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + sound/soc/sof/intel/hda-dai.c | 11 +++++++++-- + sound/soc/sof/ipc.c | 3 +++ + 2 files changed, 12 insertions(+), 2 deletions(-) +Merging regmap-fixes/for-linus (e42617b825f8 Linux 5.5-rc1) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (6f25f67c4d23 Merge branch 'regulator-5.5' into regulator-linus) +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/regulator/axp20x-regulator.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging spi-fixes/for-linus (efa968a9b4fb Merge branch 'spi-5.5' into spi-linus) +$ git merge spi-fixes/for-linus +Already up to date! +Merge made by the 'recursive' strategy. +Merging pci-current/for-linus (ca01e7987463 PCI: rockchip: Fix IO outbound ATU register number) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (d1eef1c61974 Linux 5.5-rc2) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (cb47b9f8630a tty/serial: atmel: fix out of range clock divider handling) +$ git merge tty.current/tty-linus +Merge made by the 'recursive' strategy. + drivers/tty/serial/atmel_serial.c | 43 ++++++++++++++++++++------------------- + drivers/tty/serial/msm_serial.c | 13 ++++++++++-- + drivers/tty/serial/serial_core.c | 1 + + drivers/tty/serial/sprd_serial.c | 3 +++ + drivers/tty/tty_port.c | 3 ++- + 5 files changed, 39 insertions(+), 24 deletions(-) +Merging usb.current/usb-linus (6056a0f8ede2 usb: xhci: Fix build warning seen with CONFIG_PM=n) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/host/ehci-q.c | 13 ++++++++++++- + drivers/usb/host/xhci-pci.c | 2 +- + drivers/usb/typec/tcpm/Kconfig | 1 + + drivers/usb/usbip/usbip_common.c | 3 +++ + drivers/usb/usbip/vhci_rx.c | 13 +++++++++---- + 5 files changed, 26 insertions(+), 6 deletions(-) +Merging usb-gadget-fixes/fixes (e5b5da96da50 usb: gadget: fix wrong endpoint desc) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (0d3010fa4424 USB: serial: option: add Telit ME910G1 0x110a composition) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/option.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging usb-chipidea-fixes/ci-for-usb-stable (16009db47c51 usb: chipidea: udc: workaround for endpoint conflict issue) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Auto-merging drivers/usb/chipidea/udc.c +Merge made by the 'recursive' strategy. +Merging phy/fixes (e42617b825f8 Linux 5.5-rc1) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (c05c403b1d12 staging: wfx: fix wrong error message) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/staging/axis-fifo/Kconfig | 2 +- + drivers/staging/comedi/drivers/gsc_hpdi.c | 10 +++++++++ + drivers/staging/wfx/data_tx.c | 35 ++++++++++++++++++++++--------- + drivers/staging/wfx/data_tx.h | 5 +++-- + drivers/staging/wfx/hif_tx_mib.h | 1 - + drivers/staging/wfx/main.c | 2 +- + drivers/staging/wfx/queue.c | 1 + + drivers/staging/wfx/sta.c | 6 +++++- + 8 files changed, 46 insertions(+), 16 deletions(-) +Merging char-misc.current/char-misc-linus (4aa37c463764 random: don't forget compat_ioctl on urandom) +$ git merge char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + drivers/char/random.c | 1 + + drivers/hwtracing/intel_th/core.c | 7 ++++--- + drivers/hwtracing/intel_th/intel_th.h | 2 ++ + drivers/hwtracing/intel_th/msu.c | 14 +++++++++----- + drivers/hwtracing/intel_th/pci.c | 10 ++++++++++ + drivers/misc/habanalabs/command_submission.c | 5 +++-- + drivers/misc/habanalabs/context.c | 2 +- + drivers/misc/habanalabs/goya/goya.c | 15 +++++++-------- + 8 files changed, 37 insertions(+), 19 deletions(-) +Merging soundwire-fixes/fixes (e42617b825f8 Linux 5.5-rc1) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (d1eef1c61974 Linux 5.5-rc2) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (1021dcf19db1 Input: imx_sc_key - only take the valid data from SCU firmware as key state) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/evdev.c | 14 +++++++------- + drivers/input/input.c | 26 ++++++++++++++++---------- + drivers/input/keyboard/imx_sc_key.c | 8 +++++++- + drivers/input/misc/uinput.c | 19 ++++++++++++------- + include/uapi/linux/input.h | 1 + + 5 files changed, 43 insertions(+), 25 deletions(-) +Merging crypto-current/master (84faa307249b crypto: arm/curve25519 - add arch-specific key generation function) +$ git merge crypto-current/master +Already up to date. +Merging ide/master (baf6722aa0cb ide: Use dev_get_drvdata where possible) +$ git merge ide/master +Merge made by the 'recursive' strategy. + drivers/ide/siimage.c | 3 +-- + drivers/ide/via82cxxx.c | 3 +-- + 2 files changed, 2 insertions(+), 4 deletions(-) +Merging vfio-fixes/for-linus (95f89e090618 vfio/type1: Initialize resv_msi_base) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (65c5ca4410bf selftests: livepatch: Fix it to do root uid check and skip) +$ git merge kselftest-fixes/fixes +Merge made by the 'recursive' strategy. + tools/testing/selftests/filesystems/epoll/Makefile | 2 +- + tools/testing/selftests/firmware/fw_lib.sh | 6 ++++++ + tools/testing/selftests/livepatch/functions.sh | 15 ++++++++++++++- + tools/testing/selftests/livepatch/test-state.sh | 3 +-- + 4 files changed, 22 insertions(+), 4 deletions(-) +Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging slave-dma-fixes/fixes (a40c94be2336 dmaengine: dma-jz4780: Also break descriptor chains on JZ4725B) +$ git merge slave-dma-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/dma/dma-jz4780.c | 3 ++- + include/linux/dmaengine.h | 5 ++++- + 2 files changed, 6 insertions(+), 2 deletions(-) +Merging backlight-fixes/for-backlight-fixes (219d54332a09 Linux 5.4) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (df8fed831cbc mtd: rawnand: au1550nd: Fix au_read_buf16() prototype) +$ git merge mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (603d9299da32 mfd: mt6397: Fix probe after changing mt6397-core) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (e5a52a1d15c7 media: pulse8-cec: fix lost cec_transmit_attempt_done() call) +$ git merge v4l-dvb-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/media/cec/cec-adap.c | 40 +++++++++++++++++++++---------- + drivers/media/usb/pulse8-cec/pulse8-cec.c | 17 +++++++++---- + 2 files changed, 40 insertions(+), 17 deletions(-) +Merging reset-fixes/reset/fixes (db23808615e2 reset: Do not register resource data for missing resets) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (f596cf0d8062 MIPS: BPF: eBPF JIT: check for MIPS ISA compliance in Kconfig) +$ git merge mips-fixes/mips-fixes +Auto-merging arch/mips/net/ebpf_jit.c +Auto-merging arch/mips/Kconfig +Merge made by the 'recursive' strategy. + arch/mips/Kconfig | 2 +- + arch/mips/boot/compressed/Makefile | 3 +++ + arch/mips/include/asm/cpu-type.h | 3 ++- + arch/mips/include/asm/vdso/gettimeofday.h | 13 ------------- + arch/mips/kernel/cacheinfo.c | 27 ++++++++++++++++++++++++++- + arch/mips/net/ebpf_jit.c | 2 +- + arch/mips/vdso/vgettimeofday.c | 20 ++++++++++++++++++++ + drivers/platform/mips/Kconfig | 2 +- + 8 files changed, 54 insertions(+), 18 deletions(-) +Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (03729cfa0d54 soc: ti: wkup_m3_ipc: Fix race condition with rproc_boot) +$ git merge omap-fixes/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am571x-idk.dts | 6 +----- + arch/arm/boot/dts/am572x-idk-common.dtsi | 4 ---- + arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 25 +++++++++++++++++++++---- + arch/arm/mach-omap2/pdata-quirks.c | 6 +++++- + drivers/bus/ti-sysc.c | 10 ++++++++-- + drivers/soc/ti/wkup_m3_ipc.c | 4 ++-- + 6 files changed, 37 insertions(+), 18 deletions(-) +Merging kvm-fixes/master (2f13437b8917 Merge tag 'trace-v5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (fe33a928bfcd KVM: s390: ENOTSUPP -> EOPNOTSUPP fixups) +$ git merge kvms390-fixes/master +Auto-merging arch/s390/kvm/interrupt.c +Merge made by the 'recursive' strategy. + arch/s390/kvm/interrupt.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging hwmon-fixes/hwmon (20358214d96b hwmon: (adt7475) Make volt2reg return same reg as reg2volt input) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + drivers/hwmon/adt7475.c | 5 ++-- + drivers/hwmon/nct7802.c | 75 +++++++++++++++++++++++++++++++++++++++++++++---- + 2 files changed, 72 insertions(+), 8 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (c14685547762 tools/testing/nvdimm: Fix mock support for ioremap) +$ git merge nvdimm-fixes/libnvdimm-fixes +Merge made by the 'recursive' strategy. + tools/testing/nvdimm/Kbuild | 1 + + tools/testing/nvdimm/test/iomap.c | 6 ++++++ + 2 files changed, 7 insertions(+) +Merging btrfs-fixes/next-fixes (bfbbf8cb43a7 Merge branch 'misc-5.4' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Already up to date! +Merge made by the 'recursive' strategy. +Merging vfs-fixes/fixes (1edc8eb2e931 fs: call fsnotify_sb_delete after evict_inodes) +$ git merge vfs-fixes/fixes +Merge made by the 'recursive' strategy. + fs/drop_caches.c | 2 +- + fs/inode.c | 7 +++++++ + fs/notify/fsnotify.c | 4 ++++ + fs/quota/dquot.c | 1 + + fs/super.c | 4 +++- + lib/iov_iter.c | 3 ++- + 6 files changed, 18 insertions(+), 3 deletions(-) +Merging dma-mapping-fixes/for-linus (9c24eaf81cc4 iommu/vt-d: Return the correct dma mask when we are bypassing the IOMMU) +$ git merge dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7) +$ git merge i3c-fixes/master +Already up to date. +Merging drivers-x86-fixes/fixes (e42617b825f8 Linux 5.5-rc1) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (a2315d3aea59 ARM: exynos_defconfig: Restore debugfs support) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/pinctrl-fixes (e42617b825f8 Linux 5.5-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (dbce0b65046d dt-bindings: Add missing 'properties' keyword enclosing 'snps,tso') +$ git merge devicetree-fixes/dt/linus +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/net/snps,dwmac.yaml | 1 + + 1 file changed, 1 insertion(+) +Merging scsi-fixes/fixes (bba340c79bfe scsi: iscsi: Avoid potential deadlock in iscsi_if_rx func) +$ git merge scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (d1eef1c61974 Linux 5.5-rc2) +$ git merge drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) +$ git merge amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (78d75f5739c4 Merge tag 'gvt-fixes-2019-12-18' of https://github.com/intel/gvt-linux into drm-intel-fixes) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/display/intel_display_power.c | 153 ++++++++++++++++++++- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 + + drivers/gpu/drm/i915/gvt/dmabuf.c | 64 ++++++++- + drivers/gpu/drm/i915/gvt/handlers.c | 16 +++ + drivers/gpu/drm/i915/gvt/hypercall.h | 2 + + drivers/gpu/drm/i915/gvt/kvmgt.c | 23 ++++ + drivers/gpu/drm/i915/gvt/mpt.h | 15 ++ + drivers/gpu/drm/i915/gvt/vgpu.c | 4 +- + drivers/gpu/drm/i915/i915_reg.h | 6 +- + drivers/gpu/drm/i915/i915_request.c | 114 +++++++++++---- + drivers/gpu/drm/i915/i915_scheduler.c | 1 - + drivers/gpu/drm/i915/i915_sw_fence_work.c | 3 +- + drivers/gpu/drm/i915/intel_pm.c | 4 +- + 14 files changed, 365 insertions(+), 45 deletions(-) +Merging mmc-fixes/fixes (f667216c5c7c mmc: sdhci-of-esdhc: re-implement erratum A-009204 workaround) +$ git merge mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mmc/host/mtk-sd.c | 2 ++ + drivers/mmc/host/sdhci-msm.c | 28 +++++++++++++++++++--------- + drivers/mmc/host/sdhci-of-esdhc.c | 17 ++++++++++++----- + drivers/mmc/host/sdhci-pci-core.c | 10 +++++++++- + drivers/mmc/host/sdhci.c | 11 ++++++----- + drivers/mmc/host/sdhci.h | 2 ++ + 6 files changed, 50 insertions(+), 20 deletions(-) +Merging rtc-fixes/rtc-fixes (653997eeecef rtc: mt6397: fix alarm register overwrite) +$ git merge rtc-fixes/rtc-fixes +Merge made by the 'recursive' strategy. + drivers/rtc/rtc-mt6397.c | 39 +++++++++++++++++++++++++-------------- + drivers/rtc/rtc-sun6i.c | 16 ++++++++++++++++ + include/linux/mfd/mt6397/rtc.h | 8 ++++++++ + 3 files changed, 49 insertions(+), 14 deletions(-) +Merging gnss-fixes/gnss-linus (d1eef1c61974 Linux 5.5-rc2) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (af42d3466bdc Linux 5.4-rc8) +$ git merge hyperv-fixes/hyperv-fixes +Already up to date. +Merging soc-fsl-fixes/fix (5674a92ca4b7 soc/fsl/qe: Fix an error code in qe_pin_request()) +$ git merge soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (13bb95ae2000 riscv: Fix use of undefined config option CONFIG_CONFIG_MMU) +$ git merge risc-v-fixes/fixes +Merge made by the 'recursive' strategy. + arch/riscv/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging pidfd-fixes/fixes (0b8d616fb5a8 taskstats: fix data-race) +$ git merge pidfd-fixes/fixes +Merge made by the 'recursive' strategy. + kernel/taskstats.c | 30 +++++++++++++++++++----------- + 1 file changed, 19 insertions(+), 11 deletions(-) +Merging fpga-fixes/fixes (dec43da46f63 fpga: altera-ps-spi: Fix getting of optional confd gpio) +$ git merge fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (2f13437b8917 Merge tag 'trace-v5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) +$ git merge spdx/spdx-linus +Already up to date. +Merging gpio-intel-fixes/fixes (e42617b825f8 Linux 5.5-rc1) +$ git merge gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (b9a19bdbc843 pinctrl: cherryview: Pass irqchip when adding gpiochip) +$ git merge pinctrl-intel-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/pinctrl/intel/pinctrl-baytrail.c | 200 ++++++++++++++++------------- + drivers/pinctrl/intel/pinctrl-cherryview.c | 107 ++++++++------- + 2 files changed, 173 insertions(+), 134 deletions(-) +Merging erofs-fixes/fixes (d1eef1c61974 Linux 5.5-rc2) +$ git merge erofs-fixes/fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (57177d214ee0 drm/sun4i: hdmi: Remove duplicate cleanup calls) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 -- + 1 file changed, 2 deletions(-) +Merging kspp-gustavo/for-next/kspp (3d519d6d388b sh: kgdb: Mark expected switch fall-throughs) +$ git merge kspp-gustavo/for-next/kspp +Already up to date. +Merging kbuild/for-next (6bfce12999f5 kconfig: fix nesting of symbol help text) +$ git merge kbuild/for-next +Merge made by the 'recursive' strategy. + scripts/kconfig/Makefile | 24 ++--- + scripts/kconfig/conf.c | 16 +++ + scripts/kconfig/confdata.c | 16 +++ + scripts/kconfig/expr.c | 3 +- + scripts/kconfig/expr.h | 2 +- + scripts/kconfig/lkc.h | 4 +- + scripts/kconfig/menu.c | 185 ++++++++++++++++++++--------------- + scripts/kconfig/parser.y | 21 ++-- + scripts/kconfig/streamline_config.pl | 4 +- + scripts/kconfig/symbol.c | 22 ----- + 10 files changed, 167 insertions(+), 130 deletions(-) +Merging compiler-attributes/compiler-attributes (54ecb8f7028c Linux 5.4-rc1) +$ git merge compiler-attributes/compiler-attributes +Already up to date. +Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge leaks/leaks-next +Already up to date. +Merging dma-mapping/for-next (a7ba70f1787f dma-mapping: treat dev->bus_dma_mask as a DMA limit) +$ git merge dma-mapping/for-next +Already up to date. +Merging asm-generic/master (9b87647c665d asm-generic: add unlikely to default BUG_ON(x)) +$ git merge asm-generic/master +Already up to date. +Merging arc/for-next (9fbea0b7e842 ARC: add kmemleak support) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (04bb96427d4e ARM: 8947/1: Fix __arch_get_hw_counter() access to CNTVCT) +$ git merge arm/for-next +Already up to date. +Merging arm64/for-next/core (de858040ee80 arm64: entry: refine comment of stack overflow check) +$ git merge arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (8703317ae576 drivers/perf: hisi: update the sccl_id/ccl_id for certain HiSilicon platform) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (bf8e91955276 Merge branch 'arm/fixes' into for-next) +$ git merge arm-soc/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/ux500.yaml | 31 + + MAINTAINERS | 1 + + arch/arm/arm-soc-for-next-contents.txt | 20 + + arch/arm/boot/dts/Makefile | 3 +- + arch/arm/boot/dts/exynos3250.dtsi | 4 +- + arch/arm/boot/dts/exynos4210-universal_c210.dts | 6 +- + arch/arm/boot/dts/exynos4210.dtsi | 4 +- + arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 5 + + arch/arm/boot/dts/exynos4412-midas.dtsi | 29 + + arch/arm/boot/dts/exynos4412-n710x.dts | 5 + + arch/arm/boot/dts/exynos4412.dtsi | 4 +- + arch/arm/boot/dts/exynos5250.dtsi | 4 +- + arch/arm/boot/dts/exynos5420.dtsi | 50 ++ + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 6 +- + arch/arm/boot/dts/exynos54xx.dtsi | 4 +- + arch/arm/boot/dts/ste-ab8500.dtsi | 102 +++- + arch/arm/boot/dts/ste-db8500.dtsi | 15 + + arch/arm/boot/dts/ste-db8520.dtsi | 15 + + arch/arm/boot/dts/ste-dbx5x0-pinctrl.dtsi | 632 +++++++++++++++++++++ + arch/arm/boot/dts/ste-dbx5x0.dtsi | 75 ++- + arch/arm/boot/dts/ste-href-family-pinctrl.dtsi | 532 +---------------- + arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi | 79 +++ + arch/arm/boot/dts/ste-href-tvk1281618-r3.dtsi | 58 ++ + arch/arm/boot/dts/ste-href-tvk1281618.dtsi | 71 +-- + arch/arm/boot/dts/ste-href.dtsi | 67 ++- + arch/arm/boot/dts/ste-href520-tvk.dts | 22 + + arch/arm/boot/dts/ste-hrefprev60-stuib.dts | 10 +- + arch/arm/boot/dts/ste-hrefprev60-tvk.dts | 10 +- + arch/arm/boot/dts/ste-hrefprev60.dtsi | 2 +- + arch/arm/boot/dts/ste-hrefv60plus-stuib.dts | 10 +- + arch/arm/boot/dts/ste-hrefv60plus-tvk.dts | 10 +- + arch/arm/boot/dts/ste-hrefv60plus.dtsi | 1 - + arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi | 5 + + arch/arm/boot/dts/ste-snowball.dts | 70 ++- + arch/arm/configs/u8500_defconfig | 4 +- + arch/arm64/boot/dts/altera/Makefile | 3 +- + .../dts/altera/socfpga_stratix10_socdk_nand.dts | 223 ++++++++ + arch/arm64/boot/dts/intel/Makefile | 3 +- + arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 76 ++- + .../boot/dts/intel/socfpga_agilex_socdk_nand.dts | 135 +++++ + 40 files changed, 1663 insertions(+), 743 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/ux500.yaml + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/ste-db8500.dtsi + create mode 100644 arch/arm/boot/dts/ste-db8520.dtsi + create mode 100644 arch/arm/boot/dts/ste-dbx5x0-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi + create mode 100644 arch/arm/boot/dts/ste-href-tvk1281618-r3.dtsi + create mode 100644 arch/arm/boot/dts/ste-href520-tvk.dts + create mode 100644 arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_nand.dts + create mode 100644 arch/arm64/boot/dts/intel/socfpga_agilex_socdk_nand.dts +Merging amlogic/for-next (714767cd9071 Merge branch 'v5.6/defconfig' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/amlogic.yaml | 3 + + .../bindings/clock/amlogic,meson8-ddr-clkc.yaml | 50 +++ + .../bindings/clock/amlogic,meson8b-clkc.txt | 5 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm/boot/dts/meson.dtsi | 7 + + arch/arm/boot/dts/meson6.dtsi | 7 - + arch/arm/boot/dts/meson8.dtsi | 26 +- + arch/arm/boot/dts/meson8b-ec100.dts | 2 +- + arch/arm/boot/dts/meson8b-mxq.dts | 2 +- + arch/arm/boot/dts/meson8b-odroidc1.dts | 2 +- + arch/arm/boot/dts/meson8b.dtsi | 24 +- + arch/arm64/boot/dts/amlogic/Makefile | 3 + + arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 25 ++ + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 23 ++ + .../boot/dts/amlogic/meson-gx-libretech-pc.dtsi | 375 +++++++++++++++++++++ + arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts | 78 +++++ + .../dts/amlogic/meson-gxl-s905d-libretech-pc.dts | 16 + + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 9 + + .../dts/amlogic/meson-gxm-s912-libretech-pc.dts | 62 ++++ + arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 28 +- + arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 4 + + arch/arm64/configs/defconfig | 2 + + drivers/clk/meson/clk-pll.c | 9 + + drivers/clk/meson/g12a.c | 1 + + drivers/soc/amlogic/meson-ee-pwrc.c | 24 +- + include/dt-bindings/clock/meson8-ddr-clkc.h | 4 + + include/dt-bindings/reset/amlogic,meson8b-reset.h | 6 +- + 27 files changed, 760 insertions(+), 39 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/amlogic,meson8-ddr-clkc.yaml + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905d-libretech-pc.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-s912-libretech-pc.dts + create mode 100644 include/dt-bindings/clock/meson8-ddr-clkc.h +Merging aspeed/for-next (2aee80727dca Merge branch 'defconfig-for-v5.5' into for-next) +$ git merge aspeed/for-next +Auto-merging arch/arm/configs/multi_v7_defconfig +CONFLICT (content): Merge conflict in arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/configs/multi_v5_defconfig +Resolved 'arch/arm/configs/multi_v7_defconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ddfa4a10996a] Merge remote-tracking branch 'aspeed/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging at91/at91-next (a56d3a8ceac3 Merge branches 'at91-soc' and 'at91-dt' into at91-next) +$ git merge at91/at91-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/atmel-at91.yaml | 15 + + arch/arm/Kconfig.debug | 6 +- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/at91-kizbox.dts | 172 ++++++------ + arch/arm/boot/dts/at91-sama5d27_som1.dtsi | 4 + + arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 6 + + arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi | 304 +++++++++++++++++++++ + arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts | 270 ++++++++++++++++++ + arch/arm/boot/dts/at91sam9260.dtsi | 16 +- + arch/arm/boot/dts/at91sam9261.dtsi | 6 +- + arch/arm/boot/dts/at91sam9263.dtsi | 6 +- + arch/arm/boot/dts/at91sam9g45.dtsi | 8 +- + arch/arm/boot/dts/at91sam9rl.dtsi | 8 +- + arch/arm/boot/dts/sama5d2.dtsi | 10 +- + arch/arm/configs/at91_dt_defconfig | 55 ++-- + arch/arm/mach-at91/Kconfig | 24 +- + arch/arm/mach-at91/Makefile | 1 + + arch/arm/mach-at91/at91sam9.c | 18 -- + arch/arm/mach-at91/pm.c | 2 +- + arch/arm/mach-at91/sam9x60.c | 34 +++ + drivers/power/reset/Kconfig | 4 +- + drivers/soc/atmel/soc.c | 5 +- + 22 files changed, 807 insertions(+), 168 deletions(-) + create mode 100644 arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi + create mode 100644 arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts + create mode 100644 arch/arm/mach-at91/sam9x60.c +Merging bcm2835/for-next (f14234184671 Merge branch 'bcm2835-maintainers-next' into for-next) +$ git merge bcm2835/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (459ee837b230 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 4 + + .../devicetree/bindings/display/mxsfb.txt | 1 + + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/e60k02.dtsi | 3 +- + .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 2 - + arch/arm/boot/dts/imx25-pdk.dts | 2 - + arch/arm/boot/dts/imx25.dtsi | 3 + + arch/arm/boot/dts/imx6q-logicpd.dts | 10 + + arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi | 5 + + arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 84 ++++-- + arch/arm/boot/dts/imx6sl-tolino-shine3.dts | 326 +++++++++++++++++++++ + arch/arm/boot/dts/imx6sx-sdb-reva.dts | 1 + + arch/arm/boot/dts/imx6ull-colibri.dtsi | 188 ++++++------ + arch/arm/boot/dts/imx7d-sdb-reva.dts | 3 + + arch/arm/boot/dts/imx7s.dtsi | 7 + + arch/arm/boot/dts/imx7ulp-com.dts | 79 +++++ + arch/arm/boot/dts/ls1021a-tsn.dts | 4 + + arch/arm/boot/dts/ls1021a.dtsi | 19 ++ + arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 10 - + arch/arm/boot/dts/vf610-zii-scu4-aib.dts | 29 +- + arch/arm/configs/imx_v6_v7_defconfig | 2 + + arch/arm/mach-imx/Kconfig | 2 + + arch/arm/mach-imx/cpu.c | 30 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 15 + + arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 15 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 61 ++++ + arch/arm64/boot/dts/freescale/fsl-ls1046a-frwy.dts | 14 + + arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 16 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts | 24 ++ + arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts | 24 ++ + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 13 + + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 2 +- + arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts | 28 ++ + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 11 + + arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 20 ++ + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 12 +- + arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts | 20 ++ + arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 65 ++++ + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 18 +- + arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 27 ++ + .../boot/dts/freescale/imx8mq-zii-ultra-rmb3.dts | 2 +- + .../boot/dts/freescale/imx8mq-zii-ultra-zest.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 99 +++++++ + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 12 - + drivers/clk/imx/Makefile | 2 +- + drivers/clk/imx/clk-composite-7ulp.c | 2 +- + drivers/clk/imx/clk-composite-8m.c | 2 + + drivers/clk/imx/clk-divider-gate.c | 12 +- + drivers/clk/imx/clk-frac-pll.c | 7 +- + drivers/clk/imx/clk-imx6q.c | 5 +- + drivers/clk/imx/clk-imx7ulp.c | 183 ++++++------ + drivers/clk/imx/clk-imx8mm.c | 16 +- + drivers/clk/imx/clk-imx8mn.c | 19 +- + drivers/clk/imx/clk-imx8mq.c | 21 +- + drivers/clk/imx/clk-imx8qxp-lpcg.c | 11 + + drivers/clk/imx/clk-pfdv2.c | 2 +- + drivers/clk/imx/clk-pll14xx.c | 9 +- + drivers/clk/imx/clk-pllv1.c | 14 +- + drivers/clk/imx/clk-pllv2.c | 14 +- + drivers/clk/imx/clk-pllv4.c | 2 +- + drivers/clk/imx/{clk-sccg-pll.c => clk-sscg-pll.c} | 152 +++++----- + drivers/clk/imx/clk.h | 103 ++++--- + drivers/soc/imx/soc-imx8.c | 3 + + 63 files changed, 1465 insertions(+), 430 deletions(-) + create mode 100644 arch/arm/boot/dts/imx6sl-tolino-shine3.dts + create mode 100644 arch/arm/boot/dts/imx7ulp-com.dts + rename drivers/clk/imx/{clk-sccg-pll.c => clk-sscg-pll.c} (70%) +Merging keystone/next (2af8e1f26c65 Merge branch 'for_5.5/driver-soc' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (ca01a6367d0f Merge branch 'v5.5-next/soc' into for-next) +$ git merge mediatek/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/soc/mediatek/scpsys.txt | 6 + + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 18 +++ + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 9 ++ + drivers/soc/mediatek/mtk-cmdq-helper.c | 149 +++++++++++++++++---- + include/dt-bindings/power/mt6765-power.h | 14 ++ + include/linux/mailbox/mtk-cmdq-mailbox.h | 11 ++ + include/linux/soc/mediatek/mtk-cmdq.h | 53 ++++++++ + 7 files changed, 232 insertions(+), 28 deletions(-) + create mode 100644 include/dt-bindings/power/mt6765-power.h +Merging mvebu/for-next (cd592187f9de arm64: dts: uDPU: SFP cages support 3W modules) +$ git merge mvebu/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts | 8 ++++++++ + 1 file changed, 8 insertions(+) +Merging omap/for-next (63eb53c0826f Merge branch 'fixes' into for-next) +$ git merge omap/for-next +Removing include/sound/aess.h +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am335x-evm.dts | 40 +- + arch/arm/boot/dts/am335x-evmsk.dts | 38 +- + arch/arm/boot/dts/am335x-icev2.dts | 13 + + arch/arm/boot/dts/am33xx-l4.dtsi | 16 - + arch/arm/boot/dts/am33xx.dtsi | 69 +- + arch/arm/boot/dts/am3517.dtsi | 2 +- + arch/arm/boot/dts/am4372.dtsi | 142 ++- + arch/arm/boot/dts/am437x-l4.dtsi | 29 - + arch/arm/boot/dts/am57xx-idk-common.dtsi | 59 ++ + arch/arm/boot/dts/dra7-l4.dtsi | 52 +- + arch/arm/boot/dts/dra7.dtsi | 258 +++-- + arch/arm/boot/dts/dra74x.dtsi | 71 +- + arch/arm/boot/dts/dra76-evm.dts | 66 ++ + arch/arm/boot/dts/omap4-l4-abe.dtsi | 7 - + arch/arm/boot/dts/omap4-l4.dtsi | 27 +- + arch/arm/boot/dts/omap4.dtsi | 44 +- + arch/arm/boot/dts/omap5-l4-abe.dtsi | 6 - + arch/arm/boot/dts/omap5-l4.dtsi | 21 +- + arch/arm/boot/dts/omap5.dtsi | 40 +- + arch/arm/mach-omap2/clockdomains43xx_data.c | 10 + + arch/arm/mach-omap2/omap-iommu.c | 128 ++- + arch/arm/mach-omap2/omap_hwmod.c | 18 - + arch/arm/mach-omap2/omap_hwmod.h | 3 - + .../mach-omap2/omap_hwmod_33xx_43xx_common_data.h | 33 - + .../omap_hwmod_33xx_43xx_interconnect_data.c | 124 --- + .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 335 ------- + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 91 -- + arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 448 --------- + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 1040 +------------------- + arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 600 ----------- + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 813 --------------- + arch/arm/mach-omap2/omap_hwmod_reset.c | 24 - + arch/arm/mach-omap2/pdata-quirks.c | 43 +- + arch/arm/mach-omap2/prcm43xx.h | 1 + + drivers/bus/ti-sysc.c | 18 +- + include/linux/platform_data/ti-sysc.h | 1 + + include/sound/aess.h | 53 - + 37 files changed, 848 insertions(+), 3935 deletions(-) + delete mode 100644 include/sound/aess.h +Merging qcom/for-next (cd6443eb2a27 Merge branches 'arm64-for-5.5-fixes', 'drivers-for-5.5-fixes', 'arm64-defconfig-for-5.6', 'arm64-for-5.6', 'defconfig-for-5.6', 'drivers-for-5.6' and 'dts-for-5.6' into for-next) +$ git merge qcom/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/msm/qcom,llcc.yaml | 2 +- + Documentation/devicetree/bindings/arm/qcom.yaml | 44 +- + .../devicetree/bindings/power/qcom,rpmpd.txt | 2 + + arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts | 45 + + arch/arm/boot/dts/qcom-msm8974.dtsi | 222 ++- + arch/arm/configs/qcom_defconfig | 4 + + arch/arm64/boot/dts/qcom/Makefile | 1 + + .../arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi | 19 + + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 11 +- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 2 + + arch/arm64/boot/dts/qcom/msm8996.dtsi | 4 + + arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi | 49 + + arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi | 33 + + arch/arm64/boot/dts/qcom/msm8998-pins.dtsi | 25 +- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 66 +- + arch/arm64/boot/dts/qcom/pm6150.dtsi | 72 + + arch/arm64/boot/dts/qcom/pm6150l.dtsi | 31 + + arch/arm64/boot/dts/qcom/pm8916.dtsi | 6 + + arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 1 + + arch/arm64/boot/dts/qcom/sc7180-idp.dts | 430 +++++ + arch/arm64/boot/dts/qcom/sc7180.dtsi | 1817 ++++++++++++++++++++ + arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 14 + + arch/arm64/boot/dts/qcom/sdm845.dtsi | 22 +- + arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 32 + + arch/arm64/boot/dts/qcom/sm8150.dtsi | 370 +++- + arch/arm64/configs/defconfig | 18 + + drivers/soc/qcom/qmi_interface.c | 8 +- + drivers/soc/qcom/rpmhpd.c | 56 + + include/dt-bindings/power/qcom-rpmpd.h | 24 + + 29 files changed, 3373 insertions(+), 57 deletions(-) + create mode 100644 arch/arm64/boot/dts/qcom/pm6150.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm6150l.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-idp.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180.dtsi +Merging realtek/for-next (6a41c7019bca Merge branch 'v5.5/dt64' into next) +$ git merge realtek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging renesas/next (4730830f9c2e Merge branches 'renesas-arm-defconfig-for-v5.6', 'renesas-arm64-dt-for-v5.6' and 'renesas-drivers-for-v5.6' into renesas-next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/timer/renesas,tmu.txt | 1 + + arch/arm/boot/dts/iwg20d-q7-common.dtsi | 85 ++++++++++++++++++++++ + arch/arm/boot/dts/iwg20d-q7-dbcm-ca.dtsi | 1 - + arch/arm/configs/shmobile_defconfig | 3 + + arch/arm64/boot/dts/renesas/Makefile | 9 +-- + ...8a7796-m3ulcb-kf.dts => r8a77960-m3ulcb-kf.dts} | 4 +- + .../{r8a7796-m3ulcb.dts => r8a77960-m3ulcb.dts} | 4 +- + ...7796-salvator-x.dts => r8a77960-salvator-x.dts} | 4 +- + ...96-salvator-xs.dts => r8a77960-salvator-xs.dts} | 4 +- + .../dts/renesas/{r8a7796.dtsi => r8a77960.dtsi} | 0 + drivers/soc/renesas/Kconfig | 6 +- + 11 files changed, 101 insertions(+), 20 deletions(-) + rename arch/arm64/boot/dts/renesas/{r8a7796-m3ulcb-kf.dts => r8a77960-m3ulcb-kf.dts} (76%) + rename arch/arm64/boot/dts/renesas/{r8a7796-m3ulcb.dts => r8a77960-m3ulcb.dts} (90%) + rename arch/arm64/boot/dts/renesas/{r8a7796-salvator-x.dts => r8a77960-salvator-x.dts} (94%) + rename arch/arm64/boot/dts/renesas/{r8a7796-salvator-xs.dts => r8a77960-salvator-xs.dts} (94%) + rename arch/arm64/boot/dts/renesas/{r8a7796.dtsi => r8a77960.dtsi} (100%) +Merging reset/reset/next (dc4491c457b9 reset: uniphier: Add SCSSI reset control for each channel) +$ git merge reset/reset/next +Merge made by the 'recursive' strategy. + .../bindings/reset/nuvoton,npcm-reset.txt | 32 +++ + drivers/reset/Kconfig | 7 + + drivers/reset/Makefile | 1 + + drivers/reset/core.c | 33 +-- + drivers/reset/reset-npcm.c | 291 +++++++++++++++++++++ + drivers/reset/reset-uniphier.c | 13 +- + include/dt-bindings/reset/nuvoton,npcm7xx-reset.h | 91 +++++++ + 7 files changed, 447 insertions(+), 21 deletions(-) + create mode 100644 Documentation/devicetree/bindings/reset/nuvoton,npcm-reset.txt + create mode 100644 drivers/reset/reset-npcm.c + create mode 100644 include/dt-bindings/reset/nuvoton,npcm7xx-reset.h +Merging rockchip/for-next (3ce659c9cf8f Merge branch 'v5.6-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 3 + + .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 1 + + arch/arm/boot/dts/rk3288-tinker.dtsi | 13 +- + arch/arm/boot/dts/rk3288-veyron-brain.dts | 9 + + .../boot/dts/rk3288-veyron-broadcom-bluetooth.dtsi | 22 + + arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 21 - + arch/arm/boot/dts/rk3288-veyron-fievel.dts | 2 - + arch/arm/boot/dts/rk3288-veyron-jaq.dts | 22 + + arch/arm/boot/dts/rk3288-veyron-jerry.dts | 22 + + arch/arm/boot/dts/rk3288-veyron-mickey.dts | 9 + + arch/arm/boot/dts/rk3288-veyron-minnie.dts | 21 + + arch/arm/boot/dts/rk3288-veyron-pinky.dts | 22 + + arch/arm/boot/dts/rk3288-veyron-speedy.dts | 21 + + arch/arm/boot/dts/rk3288-veyron.dtsi | 59 +- + arch/arm64/boot/dts/rockchip/Makefile | 1 + + arch/arm64/boot/dts/rockchip/px30-evb.dts | 11 + + arch/arm64/boot/dts/rockchip/px30.dtsi | 90 ++- + arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts | 28 +- + arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 27 +- + .../boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts | 4 +- + arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 65 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts | 26 + + arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 11 + + .../boot/dts/rockchip/rk3399-rockpro64-v2.dts | 30 + + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 759 +------------------- + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 763 +++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 9 + + 28 files changed, 1195 insertions(+), 878 deletions(-) + create mode 100644 arch/arm/boot/dts/rk3288-veyron-broadcom-bluetooth.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rockpro64-v2.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi +Merging samsung-krzk/for-next (ed21b314fb85 Merge branch 'next/dt' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging arch/arm/boot/dts/exynos5422-odroid-core.dtsi +Auto-merging arch/arm/boot/dts/exynos5420.dtsi +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 2 +- + arch/arm/boot/dts/exynos5.dtsi | 2 +- + arch/arm/boot/dts/exynos5250-arndale.dts | 2 +- + arch/arm/boot/dts/exynos5410-odroidxu.dts | 2 +- + arch/arm/boot/dts/exynos5420.dtsi | 283 +-------------------- + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 279 +++++++++++++++++++- + arch/arm/boot/dts/exynos5422-odroidhc1.dts | 64 ++--- + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 78 +++--- + arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts | 58 +++++ + arch/arm/boot/dts/exynos5800-peach-pi.dts | 13 + + arch/arm/boot/dts/exynos5800.dtsi | 52 ++-- + arch/arm/configs/exynos_defconfig | 6 + + drivers/soc/samsung/exynos-pmu.c | 4 +- + 13 files changed, 479 insertions(+), 366 deletions(-) +Merging scmi/for-linux-next (d1eef1c61974 Linux 5.5-rc2) +$ git merge scmi/for-linux-next +Already up to date. +Merging sunxi/sunxi/for-next (3ba34a3cb3ca Merge branch 'sunxi/clk-fixes-for-5.5' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging Documentation/devicetree/bindings/pwm/allwinner,sun4i-a10-pwm.yaml +Removing Documentation/devicetree/bindings/clock/sun9i-usb.txt +Removing Documentation/devicetree/bindings/clock/sun9i-de.txt +Removing Documentation/devicetree/bindings/clock/sun8i-de2.txt +Auto-merging Documentation/devicetree/bindings/arm/sunxi.yaml +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/sunxi.yaml | 13 +- + .../clock/allwinner,sun8i-a83t-de2-clk.yaml | 76 +++++++++ + .../clock/allwinner,sun9i-a80-de-clks.yaml | 67 ++++++++ + .../clock/allwinner,sun9i-a80-usb-clocks.yaml | 59 +++++++ + .../devicetree/bindings/clock/sun8i-de2.txt | 34 ----- + .../devicetree/bindings/clock/sun9i-de.txt | 28 ---- + .../devicetree/bindings/clock/sun9i-usb.txt | 24 --- + Documentation/devicetree/bindings/media/rc.yaml | 1 + + .../bindings/pwm/allwinner,sun4i-a10-pwm.yaml | 51 +++++++ + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts | 2 +- + arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 1 + + .../dts/sun8i-h3-emlid-neutis-n5h3-devboard.dts | 72 +++++++++ + arch/arm/boot/dts/sun8i-h3-emlid-neutis-n5h3.dtsi | 11 ++ + arch/arm/boot/dts/sun8i-h3.dtsi | 15 +- + arch/arm/boot/dts/sun8i-r40.dtsi | 28 ++++ + arch/arm/boot/dts/sunxi-h3-h5-emlid-neutis.dtsi | 170 +++++++++++++++++++++ + arch/arm64/boot/dts/allwinner/Makefile | 1 + + arch/arm64/boot/dts/allwinner/axp803.dtsi | 43 +----- + .../dts/allwinner/sun50i-a64-amarula-relic.dts | 6 +- + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 43 +----- + .../boot/dts/allwinner/sun50i-a64-nanopi-a64.dts | 43 +----- + .../allwinner/sun50i-a64-oceanic-5205-5inmfd.dts | 8 +- + .../dts/allwinner/sun50i-a64-olinuxino-emmc.dts | 12 +- + .../boot/dts/allwinner/sun50i-a64-olinuxino.dts | 62 +++----- + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 45 +----- + .../boot/dts/allwinner/sun50i-a64-pine64-lts.dts | 7 +- + .../boot/dts/allwinner/sun50i-a64-pine64-plus.dts | 43 +----- + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 43 +----- + .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 7 +- + .../dts/allwinner/sun50i-a64-sopine-baseboard.dts | 48 +----- + .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 48 +----- + .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 9 +- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 47 +----- + .../sun50i-h5-emlid-neutis-n5-devboard.dts | 88 +---------- + .../dts/allwinner/sun50i-h5-emlid-neutis-n5.dtsi | 68 +-------- + .../allwinner/sun50i-h5-libretech-all-h3-cc.dts | 6 +- + .../dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts | 45 +----- + .../boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts | 43 +----- + .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 43 +----- + .../dts/allwinner/sun50i-h5-orangepi-prime.dts | 48 +----- + .../dts/allwinner/sun50i-h5-orangepi-zero-plus.dts | 9 +- + .../allwinner/sun50i-h5-orangepi-zero-plus2.dts | 43 +----- + arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 59 ++----- + .../boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 14 +- + .../boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 10 +- + .../dts/allwinner/sun50i-h6-orangepi-lite2.dts | 6 +- + .../dts/allwinner/sun50i-h6-orangepi-one-plus.dts | 8 +- + .../boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 8 +- + .../dts/allwinner/sun50i-h6-pine-h64-model-b.dts | 21 +++ + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 23 ++- + .../boot/dts/allwinner/sun50i-h6-tanix-tx6.dts | 15 +- + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 26 +++- + drivers/clk/sunxi-ng/ccu-sun8i-r40.c | 6 +- + drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 4 +- + drivers/clk/sunxi-ng/ccu-sun8i-v3s.h | 2 - + drivers/clk/sunxi/clk-sun6i-apb0-gates.c | 6 +- + 57 files changed, 771 insertions(+), 998 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun8i-a83t-de2-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-de-clks.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/sun8i-de2.txt + delete mode 100644 Documentation/devicetree/bindings/clock/sun9i-de.txt + delete mode 100644 Documentation/devicetree/bindings/clock/sun9i-usb.txt + create mode 100644 arch/arm/boot/dts/sun8i-h3-emlid-neutis-n5h3-devboard.dts + create mode 100644 arch/arm/boot/dts/sun8i-h3-emlid-neutis-n5h3.dtsi + create mode 100644 arch/arm/boot/dts/sunxi-h3-h5-emlid-neutis.dtsi + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts +Merging tegra/for-next (e0fd54137bf5 Merge branch for-5.5/cpufreq into for-next) +$ git merge tegra/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging clk/clk-next (f7f1ed4fd89a Merge branch 'clk-fixes' into clk-next) +$ git merge clk/clk-next +Merge made by the 'recursive' strategy. + drivers/clk/at91/at91sam9260.c | 2 +- + drivers/clk/at91/at91sam9rl.c | 2 +- + drivers/clk/at91/at91sam9x5.c | 2 +- + drivers/clk/at91/pmc.c | 2 +- + drivers/clk/at91/sama5d2.c | 2 +- + drivers/clk/at91/sama5d4.c | 2 +- + drivers/clk/clk.c | 62 +++++++++++++++++++++++++++--------------- + 7 files changed, 46 insertions(+), 28 deletions(-) +Merging clk-samsung/for-next (54ecb8f7028c Linux 5.4-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 (044cf5e15357 csky: Initial stack protector support) +$ git merge csky/linux-next +Auto-merging arch/csky/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + arch/csky/Kconfig | 1 + + arch/csky/include/asm/stackprotector.h | 29 +++++++++++++++++++++++++++++ + arch/csky/kernel/process.c | 6 ++++++ + 4 files changed, 37 insertions(+) + create mode 100644 arch/csky/include/asm/stackprotector.h +Merging h8300/h8300-next (a5de8865cb3e h8300: move definition of __kernel_size_t etc. to posix_types.h) +$ git merge h8300/h8300-next +Removing arch/h8300/include/uapi/asm/bitsperlong.h +Auto-merging arch/h8300/Kconfig +Merge made by the 'recursive' strategy. + arch/h8300/Kconfig | 3 +++ + arch/h8300/include/uapi/asm/bitsperlong.h | 15 --------------- + arch/h8300/include/uapi/asm/posix_types.h | 13 +++++++++++++ + arch/h8300/lib/memset.S | 17 ++++++++++------- + 4 files changed, 26 insertions(+), 22 deletions(-) + delete mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h + create mode 100644 arch/h8300/include/uapi/asm/posix_types.h +Merging ia64/next (240b62d381fe ia64: remove stale paravirt leftovers) +$ git merge ia64/next +Already up to date. +Merging m68k/for-next (5ed0794cde59 m68k/atari: Convert Falcon IDE drivers to platform drivers) +$ git merge m68k/for-next +Already up to date. +Merging m68knommu/for-next (d1eef1c61974 Linux 5.5-rc2) +$ git merge m68knommu/for-next +Already up to date. +Merging microblaze/next (22648c989cb8 microblaze: Increase max dtb size to 64K from 32K) +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (a8d0f11ee50d MIPS: SGI-IP27: Enable ethernet phy on second Origin 200 module) +$ git merge mips/mips-next +Already up to date. +Merging nds32/next (a7f96fce201c MAINTAINERS: add nds32 maintainer) +$ git merge nds32/next +Already up to date. +Merging nios2/for-next (e32ea127d81c nios2: Fix ioremap) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (0ecdcaa6d5e7 openrisc: Fix Kconfig indentation) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (aeea5eae4fd5 parisc: add missing __init annotation) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/include/asm/kexec.h | 4 ---- + arch/parisc/kernel/Makefile | 2 +- + arch/parisc/kernel/drivers.c | 2 +- + 3 files changed, 2 insertions(+), 6 deletions(-) +Merging powerpc/next (7794b1d4185e Merge tag 'powerpc-5.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge powerpc/next +Already up to date. +Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges) +$ git merge fsl/next +Already up to date. +Merging soc-fsl/next (5a35435ef4e6 soc: fsl: qe: remove PPC32 dependency from CONFIG_QUICC_ENGINE) +$ git merge soc-fsl/next +Removing include/soc/fsl/qe/qe_ic.h +Removing drivers/soc/fsl/qe/qe_ic.h +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/cpm.h | 172 +----------- + arch/powerpc/platforms/83xx/km83xx.c | 3 +- + arch/powerpc/platforms/83xx/misc.c | 23 -- + arch/powerpc/platforms/83xx/mpc832x_mds.c | 3 +- + arch/powerpc/platforms/83xx/mpc832x_rdb.c | 3 +- + arch/powerpc/platforms/83xx/mpc836x_mds.c | 3 +- + arch/powerpc/platforms/83xx/mpc836x_rdk.c | 3 +- + arch/powerpc/platforms/83xx/mpc83xx.h | 7 - + arch/powerpc/platforms/85xx/corenet_generic.c | 10 - + arch/powerpc/platforms/85xx/mpc85xx_mds.c | 27 -- + arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 17 -- + arch/powerpc/platforms/85xx/twr_p102x.c | 15 - + drivers/net/ethernet/freescale/Kconfig | 2 +- + drivers/net/wan/fsl_ucc_hdlc.c | 23 +- + drivers/net/wan/fsl_ucc_hdlc.h | 2 +- + drivers/soc/fsl/qe/Kconfig | 3 +- + drivers/soc/fsl/qe/gpio.c | 34 ++- + drivers/soc/fsl/qe/qe.c | 104 +++---- + drivers/soc/fsl/qe/qe_common.c | 50 ++-- + drivers/soc/fsl/qe/qe_ic.c | 285 +++++++++---------- + drivers/soc/fsl/qe/qe_ic.h | 99 ------- + drivers/soc/fsl/qe/qe_io.c | 70 +++-- + drivers/soc/fsl/qe/qe_tdm.c | 8 +- + drivers/soc/fsl/qe/ucc.c | 27 +- + drivers/soc/fsl/qe/ucc_fast.c | 86 +++--- + drivers/soc/fsl/qe/ucc_slow.c | 60 ++-- + drivers/soc/fsl/qe/usb.c | 2 +- + drivers/tty/serial/ucc_uart.c | 385 ++++++++++++++------------ + include/soc/fsl/cpm.h | 171 ++++++++++++ + include/soc/fsl/qe/qe.h | 59 ++-- + include/soc/fsl/qe/qe_ic.h | 135 --------- + include/soc/fsl/qe/ucc_fast.h | 4 +- + include/soc/fsl/qe/ucc_slow.h | 6 +- + 33 files changed, 775 insertions(+), 1126 deletions(-) + delete mode 100644 drivers/soc/fsl/qe/qe_ic.h + create mode 100644 include/soc/fsl/cpm.h + delete mode 100644 include/soc/fsl/qe/qe_ic.h +Merging risc-v/for-next (070389ef0f4b Merge branch 'next/add-nonstable-guidance' into for-next) +$ git merge risc-v/for-next +Merge made by the 'recursive' strategy. + Documentation/riscv/patch-acceptance.rst | 32 ++++++++++++++++++++++++++++++++ + 1 file changed, 32 insertions(+) + create mode 100644 Documentation/riscv/patch-acceptance.rst +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 (d1eef1c61974 Linux 5.5-rc2) +$ git merge s390/features +Already up to date. +Merging sh/sh-next (a193018e5290 sh: add missing EXPORT_SYMBOL() for __delay) +$ git merge sh/sh-next +Merge made by the 'recursive' strategy. + arch/sh/include/asm/bitops-op32.h | 8 +++----- + arch/sh/include/asm/cache.h | 2 +- + arch/sh/kernel/Makefile | 2 -- + arch/sh/kernel/sh_ksyms_32.c | 17 +++++++++++++++++ + arch/sh/lib/delay.c | 1 + + 5 files changed, 22 insertions(+), 8 deletions(-) +Merging sparc-next/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge sparc-next/master +Already up to date. +Merging uml/linux-next (9807019a62dc um: Loadable BPF "Firmware" for vector drivers) +$ git merge uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (bd6d7558140c Merge branch 'xtensa-5.5' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging fscrypt/master (0eee17e33226 f2fs: add support for IV_INO_LBLK_64 encryption policies) +$ git merge fscrypt/master +Already up to date. +Merging afs/afs-next (4fe171bb81b1 afs: Remove set but not used variable 'ret') +$ git merge afs/afs-next +Already up to date. +Merging btrfs/for-next (451942d4ded8 Merge branch 'for-next-next-v5.5-20191216' into for-next-20191216) +$ git merge btrfs/for-next +Merge made by the 'recursive' strategy. + fs/btrfs/block-group.c | 22 +- + fs/btrfs/check-integrity.c | 4 +- + fs/btrfs/compression.c | 4 +- + fs/btrfs/ctree.h | 10 +- + fs/btrfs/disk-io.c | 13 +- + fs/btrfs/disk-io.h | 4 +- + fs/btrfs/extent-tree.c | 42 +-- + fs/btrfs/extent_io.c | 42 +-- + fs/btrfs/extent_io.h | 6 +- + fs/btrfs/file-item.c | 38 +- + fs/btrfs/file.c | 23 +- + fs/btrfs/inode.c | 830 ++++--------------------------------------- + fs/btrfs/ioctl.c | 2 +- + fs/btrfs/ordered-data.c | 81 ++--- + fs/btrfs/ordered-data.h | 26 +- + fs/btrfs/qgroup.c | 44 +-- + fs/btrfs/relocation.c | 20 +- + fs/btrfs/space-info.c | 42 +-- + fs/btrfs/sysfs.c | 50 ++- + fs/btrfs/sysfs.h | 4 +- + fs/btrfs/tests/inode-tests.c | 44 ++- + fs/btrfs/tree-log.c | 411 ++++++--------------- + fs/btrfs/volumes.c | 49 +-- + fs/btrfs/volumes.h | 2 +- + include/trace/events/btrfs.h | 6 +- + 25 files changed, 425 insertions(+), 1394 deletions(-) +Merging ceph/master (da08e1e1d7c3 ceph: add more debug info when decoding mdsmap) +$ git merge ceph/master +Already up to date. +Merging cifs/for-next (d1eef1c61974 Linux 5.5-rc2) +$ git merge cifs/for-next +Already up to date. +Merging configfs/for-next (e2f238f7d5a1 configfs: calculate the depth of parent item) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (b4a81b87a4cf ecryptfs: fix a memory leak bug in ecryptfs_init_messaging()) +$ git merge ecryptfs/next +Merge made by the 'recursive' strategy. + fs/ecryptfs/keystore.c | 2 +- + fs/ecryptfs/messaging.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging erofs/dev (d1eef1c61974 Linux 5.5-rc2) +$ git merge erofs/dev +Already up to date. +Merging ext3/for_next (4d5c1adaf893 reiserfs: Fix spurious unlock in reiserfs_fill_super() error handling) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/ext2/super.c | 1 + + fs/reiserfs/super.c | 4 +++- + 2 files changed, 4 insertions(+), 1 deletion(-) +Merging ext4/dev (d82d47d5d8a6 jbd2: fix kernel-doc notation warning) +$ git merge ext4/dev +Auto-merging include/linux/jbd2.h +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/inode.c +Merge made by the 'recursive' strategy. + fs/ext4/block_validity.c | 6 +- + fs/ext4/dir.c | 6 +- + fs/ext4/ialloc.c | 4 +- + fs/ext4/inode.c | 4 +- + fs/ext4/namei.c | 32 ++++++----- + fs/ext4/super.c | 143 +++++++++++++++++++++++------------------------ + include/linux/jbd2.h | 2 +- + 7 files changed, 102 insertions(+), 95 deletions(-) +Merging f2fs/dev (447c5bb5ce14 f2fs: cover f2fs_lock_op in expand_inode_data case) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + Documentation/filesystems/f2fs.txt | 52 ++ + fs/f2fs/Kconfig | 23 + + fs/f2fs/Makefile | 1 + + fs/f2fs/checkpoint.c | 6 +- + fs/f2fs/compress.c | 1139 ++++++++++++++++++++++++++++++++++++ + fs/f2fs/data.c | 665 ++++++++++++++++++--- + fs/f2fs/debug.c | 9 +- + fs/f2fs/f2fs.h | 294 ++++++++-- + fs/f2fs/file.c | 244 ++++++-- + fs/f2fs/inline.c | 32 +- + fs/f2fs/inode.c | 42 ++ + fs/f2fs/namei.c | 120 ++-- + fs/f2fs/recovery.c | 20 +- + fs/f2fs/segment.c | 264 ++++++++- + fs/f2fs/segment.h | 12 - + fs/f2fs/super.c | 148 ++++- + fs/f2fs/sysfs.c | 8 + + include/linux/f2fs_fs.h | 8 + + include/trace/events/f2fs.h | 99 ++++ + 19 files changed, 2947 insertions(+), 239 deletions(-) + create mode 100644 fs/f2fs/compress.c +Merging fsverity/fsverity (73f0ec02d670 docs: fs-verity: mention statx() support) +$ git merge fsverity/fsverity +Already up to date. +Merging fuse/for-next (8d66fcb74884 fuse: fix Kconfig indentation) +$ git merge fuse/for-next +Already up to date. +Merging jfs/jfs-next (a5fdd713d256 jfs: fix bogus variable self-initialization) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (d1eef1c61974 Linux 5.5-rc2) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (79cc55422ce9 NFS: Fix an RCU lock leak in nfs4_refresh_delegation_stateid()) +$ git merge nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (38a2204f5298 nfsd: depend on CRYPTO_MD5 for legacy client tracking) +$ git merge nfsd/nfsd-next +Already up to date. +Merging orangefs/for-next (f9bbb68233aa orangefs: posix open permission checking...) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (6c7bed084507 ovl: improving copy-up efficiency for big sparse file) +$ git merge overlayfs/overlayfs-next +Merge made by the 'recursive' strategy. + fs/overlayfs/copy_up.c | 41 +++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 39 insertions(+), 2 deletions(-) +Merging ubifs/linux-next (6e78c01fde90 Revert "jffs2: Fix possible null-pointer dereferences in jffs2_add_frag_to_fragtree()") +$ git merge ubifs/linux-next +Already up to date. +Merging v9fs/9p-next (79fb9216b7be 9p: Remove unneeded semicolon) +$ git merge v9fs/9p-next +Merge made by the 'recursive' strategy. + fs/9p/Kconfig | 20 ++++++++++---------- + fs/9p/vfs_inode.c | 2 +- + 2 files changed, 11 insertions(+), 11 deletions(-) +Merging xfs/for-next (13eaec4b2adf xfs: don't commit sunit/swidth updates to disk if that would cause repair failures) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + Documentation/admin-guide/xfs.rst | 2 +- + fs/xfs/libxfs/xfs_alloc.c | 18 ++-- + fs/xfs/libxfs/xfs_bmap.c | 5 +- + fs/xfs/libxfs/xfs_dir2.c | 21 +++++ + fs/xfs/libxfs/xfs_dir2_priv.h | 29 ++----- + fs/xfs/libxfs/xfs_dir2_sf.c | 6 +- + fs/xfs/libxfs/xfs_ialloc.c | 64 +++++++++++++++ + fs/xfs/libxfs/xfs_ialloc.h | 1 + + fs/xfs/libxfs/xfs_trans_resv.c | 96 +++++++++++++++++----- + fs/xfs/xfs_bmap_util.c | 12 +++ + fs/xfs/xfs_buf_item.c | 2 +- + fs/xfs/xfs_mount.c | 168 ++++++++++++++++++++++++++------------ + fs/xfs/xfs_trace.h | 21 +++++ + 13 files changed, 341 insertions(+), 104 deletions(-) +Merging iomap/iomap-for-next (c275779ff2dd iomap: stop using ioend after it's been freed in iomap_finish_ioend()) +$ git merge iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (3253d9d09337 splice: only read in as much information as there is pipe buffer space) +$ git merge djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (b41dae061bbd Merge tag 'xfs-5.4-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge file-locks/locks-next +Already up to date. +Merging vfs/for-next (912dfe068c43 Merge branches 'work.openat2', 'work.recursive_removal' and 'imm.timestamp' into for-next) +$ git merge vfs/for-next +Auto-merging kernel/trace/trace.c +Auto-merging include/linux/syscalls.h +Auto-merging fs/inode.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/ceph/mds_client.c +Merge made by the 'recursive' strategy. + CREDITS | 4 +- + Documentation/filesystems/path-lookup.rst | 68 ++- + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + fs/attr.c | 23 +- + fs/ceph/mds_client.c | 4 +- + fs/cifs/inode.c | 13 +- + fs/configfs/inode.c | 9 +- + fs/debugfs/inode.c | 121 +---- + fs/f2fs/file.c | 18 +- + fs/fat/misc.c | 10 +- + fs/inode.c | 33 +- + fs/kernfs/inode.c | 6 +- + fs/libfs.c | 70 +++ + fs/namei.c | 199 ++++++-- + fs/nsfs.c | 29 +- + fs/ntfs/inode.c | 18 +- + fs/open.c | 149 ++++-- + fs/proc/base.c | 3 +- + fs/proc/namespaces.c | 20 +- + fs/tracefs/inode.c | 114 +---- + fs/ubifs/file.c | 18 +- + fs/ubifs/sb.c | 11 +- + fs/utimes.c | 4 +- + include/linux/debugfs.h | 2 +- + include/linux/fcntl.h | 12 +- + include/linux/fs.h | 3 +- + include/linux/namei.h | 12 +- + include/linux/proc_ns.h | 4 +- + include/linux/syscalls.h | 3 + + include/linux/tracefs.h | 1 - + include/uapi/asm-generic/unistd.h | 5 +- + include/uapi/linux/fcntl.h | 35 ++ + kernel/bpf/offload.c | 12 +- + kernel/events/core.c | 2 +- + kernel/trace/trace.c | 4 +- + kernel/trace/trace_events.c | 6 +- + kernel/trace/trace_hwlat.c | 2 +- + security/apparmor/apparmorfs.c | 6 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/openat2/.gitignore | 1 + + tools/testing/selftests/openat2/Makefile | 8 + + tools/testing/selftests/openat2/helpers.c | 109 +++++ + tools/testing/selftests/openat2/helpers.h | 107 +++++ + tools/testing/selftests/openat2/openat2_test.c | 320 +++++++++++++ + .../testing/selftests/openat2/rename_attack_test.c | 160 +++++++ + tools/testing/selftests/openat2/resolve_test.c | 523 +++++++++++++++++++++ + 63 files changed, 1862 insertions(+), 440 deletions(-) + create mode 100644 tools/testing/selftests/openat2/.gitignore + create mode 100644 tools/testing/selftests/openat2/Makefile + create mode 100644 tools/testing/selftests/openat2/helpers.c + create mode 100644 tools/testing/selftests/openat2/helpers.h + create mode 100644 tools/testing/selftests/openat2/openat2_test.c + create mode 100644 tools/testing/selftests/openat2/rename_attack_test.c + create mode 100644 tools/testing/selftests/openat2/resolve_test.c +Merging printk/for-next (20aaa2d8e1f3 Merge branch 'for-5.5-pr-warning-removal' into for-next) +$ git merge printk/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging pci/next (cb224132f23e Merge branch 'remotes/lorenzo/pci/dwc') +$ git merge pci/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pci/intel-gw-pcie.yaml | 138 ++++++ + drivers/iommu/amd_iommu.c | 7 +- + drivers/pci/controller/dwc/Kconfig | 11 + + drivers/pci/controller/dwc/Makefile | 1 + + drivers/pci/controller/dwc/pci-keystone.c | 2 +- + drivers/pci/controller/dwc/pcie-artpec6.c | 8 +- + drivers/pci/controller/dwc/pcie-designware.c | 57 +++ + drivers/pci/controller/dwc/pcie-designware.h | 12 + + drivers/pci/controller/dwc/pcie-intel-gw.c | 545 +++++++++++++++++++++ + drivers/pci/controller/pci-tegra.c | 2 +- + drivers/pci/controller/pcie-iproc.c | 24 + + drivers/pci/iov.c | 9 +- + drivers/pci/p2pdma.c | 3 + + drivers/pci/pci.c | 24 +- + drivers/pci/pci.h | 3 + + drivers/pci/pcie/err.c | 12 +- + drivers/pci/quirks.c | 99 ++-- + drivers/pci/search.c | 4 +- + drivers/pci/setup-bus.c | 184 ++++--- + include/linux/pci.h | 2 +- + include/uapi/linux/pci_regs.h | 1 + + 21 files changed, 974 insertions(+), 174 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pci/intel-gw-pcie.yaml + create mode 100644 drivers/pci/controller/dwc/pcie-intel-gw.c +Merging pstore/for-next/pstore (8d82cee2f8aa pstore: Make pstore_choose_compression() static) +$ git merge pstore/for-next/pstore +Already up to date. +Merging hid/for-next (62216a51293d Merge branch 'for-5.5/upstream-fixes' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/hid-asus.c | 3 +- + drivers/hid/hid-core.c | 6 + + drivers/hid/hid-ids.h | 3 + + drivers/hid/hid-input.c | 16 ++- + drivers/hid/hid-ite.c | 3 + + drivers/hid/hid-logitech-hidpp.c | 246 ++++++++++++++++++++++++++++++-- + drivers/hid/hid-multitouch.c | 5 +- + drivers/hid/hid-quirks.c | 1 + + drivers/hid/hidraw.c | 13 +- + drivers/hid/i2c-hid/i2c-hid-core.c | 16 ++- + drivers/hid/intel-ish-hid/ipc/hw-ish.h | 1 + + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 1 + + drivers/hid/uhid.c | 2 +- + drivers/hid/usbhid/hiddev.c | 97 ++++++------- + drivers/hid/wacom_wac.c | 6 +- + include/uapi/linux/hidraw.h | 1 + + 16 files changed, 337 insertions(+), 83 deletions(-) +Merging i2c/i2c/for-next (15c0677162b7 dt-bindings: i2c: sh_mobile: Document r8a77961 support) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/renesas,i2c.txt | 3 +- + .../devicetree/bindings/i2c/renesas,iic.txt | 1 + + drivers/i2c/i2c-core-base.c | 20 ++-- + include/linux/i2c.h | 115 ++++++++++----------- + 4 files changed, 68 insertions(+), 71 deletions(-) +Merging i3c/i3c/next (608b68b67a30 MAINTAINERS: fix style in CADENCE I3C MASTER IP entry) +$ git merge i3c/i3c/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 8 +++--- + drivers/i3c/master.c | 4 +-- + drivers/i3c/master/i3c-master-cdns.c | 49 ++++++++++++++++++++++++++++++++---- + 3 files changed, 50 insertions(+), 11 deletions(-) +Merging dmi/master (2429c99fa13a firmware: dmi: Add dmi_memdev_handle) +$ git merge dmi/master +Merge made by the 'recursive' strategy. +Merging hwmon-staging/hwmon-next (848a25f01ee7 hwmon: (w83627ehf) make sensor_dev_attr_##_name variables static) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + .../bindings/hwmon/pmbus/ti,ucd90320.yaml | 45 + + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/max31730.rst | 44 + + Documentation/hwmon/ucd9000.rst | 12 +- + drivers/hwmon/Kconfig | 12 +- + drivers/hwmon/Makefile | 1 + + drivers/hwmon/hwmon.c | 17 +- + drivers/hwmon/max31730.c | 440 ++++++ + drivers/hwmon/pmbus/Kconfig | 6 +- + drivers/hwmon/pmbus/pmbus.h | 11 + + drivers/hwmon/pmbus/pmbus_core.c | 12 + + drivers/hwmon/pmbus/ucd9000.c | 39 +- + drivers/hwmon/w83627ehf.c | 1429 +++++++++----------- + include/linux/hwmon.h | 26 +- + include/linux/pmbus.h | 11 +- + 15 files changed, 1283 insertions(+), 823 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/pmbus/ti,ucd90320.yaml + create mode 100644 Documentation/hwmon/max31730.rst + create mode 100644 drivers/hwmon/max31730.c +Merging jc_docs/docs-next (c1ccff45e54e docs/memory-barriers.txt.kokr: Minor wordsmith) +$ git merge jc_docs/docs-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/automount-support.txt | 2 +- + Documentation/kernel-hacking/hacking.rst | 4 ++-- + Documentation/locking/locktorture.rst | 3 +-- + Documentation/misc-devices/xilinx_sdfec.rst | 1 + + .../process/embargoed-hardware-issues.rst | 23 ++++++++++++---------- + Documentation/riscv/boot-image-header.rst | 4 ++-- + Documentation/trace/ftrace.rst | 9 +++++++-- + .../translations/ko_KR/memory-barriers.txt | 4 ++-- + Documentation/x86/boot.rst | 5 +++-- + arch/riscv/include/asm/image.h | 4 ++-- + 10 files changed, 34 insertions(+), 25 deletions(-) +Merging v4l-dvb/master (0885acd77eb4 media: vivid: support multiplanar touch devices) +$ git merge v4l-dvb/master +Auto-merging drivers/media/v4l2-core/v4l2-ioctl.c +Auto-merging drivers/media/usb/pulse8-cec/pulse8-cec.c +CONFLICT (content): Merge conflict in drivers/media/usb/pulse8-cec/pulse8-cec.c +Auto-merging MAINTAINERS +Removing Documentation/media/v4l-drivers/cx18.rst +Removing Documentation/devicetree/bindings/media/ti-cal.txt +Removing Documentation/devicetree/bindings/media/amlogic,vdec.txt +Resolved 'drivers/media/usb/pulse8-cec/pulse8-cec.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2c58efa06cd2] Merge remote-tracking branch 'v4l-dvb/master' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/media/amlogic,gx-vdec.yaml | 141 ++++ + .../devicetree/bindings/media/amlogic,vdec.txt | 72 -- + .../devicetree/bindings/media/renesas,vin.txt | 4 +- + .../devicetree/bindings/media/ti,cal.yaml | 202 ++++++ + Documentation/devicetree/bindings/media/ti-cal.txt | 72 -- + Documentation/media/uapi/cec/cec-ioc-g-mode.rst | 2 +- + Documentation/media/uapi/v4l/pixfmt-reserved.rst | 3 +- + Documentation/media/uapi/v4l/pixfmt-srggb12p.rst | 2 +- + Documentation/media/uapi/v4l/pixfmt-tch-td16.rst | 34 +- + Documentation/media/uapi/v4l/pixfmt-tch-tu16.rst | 34 +- + Documentation/media/uapi/v4l/vidioc-enum-fmt.rst | 4 +- + .../media/uapi/v4l/vidioc-g-dv-timings.rst | 2 +- + Documentation/media/v4l-drivers/cx18.rst | 39 -- + Documentation/media/v4l-drivers/index.rst | 1 - + MAINTAINERS | 7 +- + drivers/media/i2c/adv748x/adv748x.h | 8 +- + drivers/media/i2c/adv7604.c | 32 +- + drivers/media/pci/cobalt/cobalt-alsa-pcm.c | 69 +- + drivers/media/pci/cx18/cx18-alsa-pcm.c | 75 +- + drivers/media/pci/cx18/cx18-cards.c | 8 +- + drivers/media/pci/cx18/cx18-driver.c | 2 +- + drivers/media/pci/cx23885/cx23885-alsa.c | 1 - + drivers/media/pci/cx23885/cx23885-cards.c | 24 + + drivers/media/pci/cx23885/cx23885-video.c | 3 +- + drivers/media/pci/cx23885/cx23885.h | 1 + + drivers/media/pci/cx25821/cx25821-alsa.c | 1 - + drivers/media/pci/cx88/cx88-alsa.c | 1 - + drivers/media/pci/ivtv/Kconfig | 5 +- + drivers/media/pci/ivtv/ivtv-alsa-pcm.c | 76 +- + drivers/media/pci/ivtv/ivtv-driver.c | 3 +- + drivers/media/pci/ivtv/ivtv-driver.h | 1 - + drivers/media/pci/saa7134/saa7134-alsa.c | 1 - + drivers/media/pci/solo6x10/solo6x10-g723.c | 24 +- + drivers/media/pci/tw686x/tw686x-audio.c | 16 +- + drivers/media/platform/Kconfig | 2 +- + drivers/media/platform/atmel/atmel-isc-base.c | 94 ++- + drivers/media/platform/atmel/atmel-isi.c | 42 +- + drivers/media/platform/atmel/atmel-isi.h | 2 + + drivers/media/platform/coda/coda-bit.c | 29 +- + drivers/media/platform/coda/coda-common.c | 45 +- + drivers/media/platform/coda/coda-jpeg.c | 746 +++++++++++++++++++- + drivers/media/platform/coda/coda.h | 3 + + drivers/media/platform/coda/coda_regs.h | 83 +++ + drivers/media/platform/coda/trace.h | 10 + + drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 3 + + drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 9 +- + drivers/media/platform/pxa_camera.c | 2 + + drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 13 +- + drivers/media/platform/sunxi/sun8i-di/sun8i-di.c | 5 +- + drivers/media/platform/ti-vpe/cal.c | 773 ++++++++++++++++----- + drivers/media/platform/ti-vpe/cal_regs.h | 221 +++--- + drivers/media/platform/ti-vpe/csc.c | 32 +- + drivers/media/platform/vimc/vimc-scaler.c | 166 ++++- + drivers/media/platform/vivid/Makefile | 3 +- + drivers/media/platform/vivid/vivid-core.c | 203 +++++- + drivers/media/platform/vivid/vivid-core.h | 20 + + drivers/media/platform/vivid/vivid-ctrls.c | 11 + + drivers/media/platform/vivid/vivid-kthread-touch.c | 181 +++++ + drivers/media/platform/vivid/vivid-kthread-touch.h | 13 + + drivers/media/platform/vivid/vivid-touch-cap.c | 341 +++++++++ + drivers/media/platform/vivid/vivid-touch-cap.h | 39 ++ + drivers/media/platform/vivid/vivid-vid-common.c | 2 +- + drivers/media/usb/cx231xx/cx231xx-audio.c | 79 +-- + drivers/media/usb/dvb-usb/dvb-usb-urb.c | 2 +- + drivers/media/usb/em28xx/em28xx-audio.c | 87 +-- + drivers/media/usb/go7007/s2250-board.c | 1 + + drivers/media/usb/go7007/snd-go7007.c | 60 +- + drivers/media/usb/gspca/gspca.c | 2 +- + drivers/media/usb/pulse8-cec/pulse8-cec.c | 769 +++++++++++--------- + drivers/media/usb/tm6000/tm6000-alsa.c | 82 +-- + drivers/media/usb/usbtv/usbtv-audio.c | 29 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 2 +- + drivers/staging/media/hantro/Makefile | 1 + + drivers/staging/media/hantro/hantro.h | 66 +- + drivers/staging/media/hantro/hantro_drv.c | 11 +- + drivers/staging/media/hantro/hantro_g1_h264_dec.c | 4 +- + drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c | 6 +- + drivers/staging/media/hantro/hantro_g1_regs.h | 53 ++ + drivers/staging/media/hantro/hantro_g1_vp8_dec.c | 6 +- + drivers/staging/media/hantro/hantro_h1_jpeg_enc.c | 4 +- + drivers/staging/media/hantro/hantro_h264.c | 2 +- + drivers/staging/media/hantro/hantro_hw.h | 17 +- + drivers/staging/media/hantro/hantro_postproc.c | 142 ++++ + drivers/staging/media/hantro/hantro_v4l2.c | 109 ++- + drivers/staging/media/hantro/rk3288_vpu_hw.c | 10 + + .../staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c | 4 +- + .../staging/media/hantro/rk3399_vpu_hw_mpeg2_dec.c | 4 +- + .../staging/media/hantro/rk3399_vpu_hw_vp8_dec.c | 4 +- + drivers/staging/media/imx/imx7-mipi-csis.c | 3 - + drivers/staging/media/meson/vdec/vdec.c | 18 +- + drivers/staging/media/meson/vdec/vdec.h | 1 + + drivers/staging/media/meson/vdec/vdec_1.c | 29 +- + drivers/staging/media/meson/vdec/vdec_platform.c | 60 ++ + drivers/staging/media/meson/vdec/vdec_platform.h | 4 + + include/media/v4l2-device.h | 12 +- + include/media/v4l2-subdev.h | 2 +- + 96 files changed, 4141 insertions(+), 1607 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml + delete mode 100644 Documentation/devicetree/bindings/media/amlogic,vdec.txt + create mode 100644 Documentation/devicetree/bindings/media/ti,cal.yaml + delete mode 100644 Documentation/devicetree/bindings/media/ti-cal.txt + delete mode 100644 Documentation/media/v4l-drivers/cx18.rst + create mode 100644 drivers/media/platform/vivid/vivid-kthread-touch.c + create mode 100644 drivers/media/platform/vivid/vivid-kthread-touch.h + create mode 100644 drivers/media/platform/vivid/vivid-touch-cap.c + create mode 100644 drivers/media/platform/vivid/vivid-touch-cap.h + create mode 100644 drivers/staging/media/hantro/hantro_postproc.c +Merging v4l-dvb-next/master (d45331b00ddb Linux 5.3-rc4) +$ git merge v4l-dvb-next/master +Already up to date. +Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe()) +$ git merge fbdev/fbdev-for-next +Already up to date. +Merging pm/linux-next (5fb4c90b7da9 Merge branch 'powercap' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + drivers/acpi/acpi_video.c | 2 +- + drivers/acpi/battery.c | 75 +++++++++++++++++++++++++++--------- + drivers/acpi/video_detect.c | 16 ++++++++ + drivers/powercap/intel_rapl_common.c | 1 + + tools/power/acpi/Makefile.config | 2 +- + 5 files changed, 75 insertions(+), 21 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (d4a386f59527 cpufreq: tegra186: convert to devm_platform_ioremap_resource) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Merge made by the 'recursive' strategy. + drivers/cpufreq/kirkwood-cpufreq.c | 4 +--- + drivers/cpufreq/tegra186-cpufreq.c | 4 +--- + 2 files changed, 2 insertions(+), 6 deletions(-) +Merging cpupower/cpupower (e42617b825f8 Linux 5.5-rc1) +$ git merge cpupower/cpupower +Already up to date. +Merging opp/opp/linux-next (03758d60265c opp: Replace list_kref with a local counter) +$ git merge opp/opp/linux-next +Merge made by the 'recursive' strategy. + drivers/opp/core.c | 48 +++++++++++++++++++----------------------------- + drivers/opp/of.c | 31 ++++++++++++++++++------------- + drivers/opp/opp.h | 6 ++---- + 3 files changed, 39 insertions(+), 46 deletions(-) +Merging thermal/thermal/linux-next (3d9613284a62 thermal: qoriq: Add hwmon support) +$ git merge thermal/thermal/linux-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../driver-api/thermal/cpu-idle-cooling.rst | 189 ++++++++++++ + .../driver-api/thermal/exynos_thermal.rst | 2 +- + MAINTAINERS | 5 +- + drivers/thermal/Kconfig | 21 +- + drivers/thermal/Makefile | 3 +- + drivers/thermal/amlogic_thermal.c | 6 +- + drivers/thermal/clock_cooling.c | 2 +- + .../thermal/{cpu_cooling.c => cpufreq_cooling.c} | 7 +- + drivers/thermal/cpuidle_cooling.c | 234 ++++++++++++++ + drivers/thermal/db8500_thermal.c | 4 +- + drivers/thermal/devfreq_cooling.c | 3 +- + drivers/thermal/fair_share.c | 4 +- + drivers/thermal/gov_bang_bang.c | 4 +- + drivers/thermal/intel/intel_pch_thermal.c | 2 +- + drivers/thermal/max77620_thermal.c | 2 +- + drivers/thermal/mtk_thermal.c | 12 +- + drivers/thermal/of-thermal.c | 2 +- + drivers/thermal/qoriq_thermal.c | 336 ++++++++++----------- + drivers/thermal/rockchip_thermal.c | 22 +- + drivers/thermal/samsung/exynos_tmu.c | 5 +- + drivers/thermal/step_wise.c | 4 +- + drivers/thermal/tegra/soctherm.c | 15 +- + drivers/thermal/thermal_hwmon.c | 28 ++ + drivers/thermal/thermal_hwmon.h | 7 + + drivers/thermal/user_space.c | 4 +- + drivers/thermal/zx2967_thermal.c | 1 + + include/linux/clock_cooling.h | 2 +- + include/linux/cpu_cooling.h | 28 +- + 28 files changed, 735 insertions(+), 219 deletions(-) + create mode 100644 Documentation/driver-api/thermal/cpu-idle-cooling.rst + rename drivers/thermal/{cpu_cooling.c => cpufreq_cooling.c} (98%) + create mode 100644 drivers/thermal/cpuidle_cooling.c +$ git am -3 ../patches/0001-thermal-qoriq-using-SZ_4K-requires-linux-sizes.h.patch +Applying: thermal: qoriq: using SZ_4K requires linux/sizes.h +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/thermal/qoriq_thermal.c +$ git add -A . +$ git commit -v -a --amend +[master 68f3e5495d14] Merge remote-tracking branch 'thermal/thermal/linux-next' + Date: Fri Dec 20 10:00:20 2019 +1100 +Merging thermal-rzhang/next (54ecb8f7028c Linux 5.4-rc1) +$ git merge thermal-rzhang/next +Already up to date. +Merging thermal-soc/next (6c375eccded4 thermal: db8500: Rewrite to be a pure OF sensor) +$ git merge thermal-soc/next +Already up to date. +Merging ieee1394/for-next (7807759e4ad8 firewire: core: code cleanup after vm_map_pages_zero introduction) +$ git merge ieee1394/for-next +Already up to date. +Merging dlm/next (a48f9721e6db dlm: no need to check return value of debugfs_create functions) +$ git merge dlm/next +Already up to date. +Merging swiotlb/linux-next (4cdfb27ba80d xen/swiotlb: remember having called xen_create_contiguous_region()) +$ git merge swiotlb/linux-next +Auto-merging include/linux/page-flags.h +Auto-merging drivers/xen/swiotlb-xen.c +Merge made by the 'recursive' strategy. +Merging rdma/for-next (e42617b825f8 Linux 5.5-rc1) +$ git merge rdma/for-next +Already up to date. +Merging net-next/master (d8e419da048e Merge branch 'phylib-consolidation') +$ git merge net-next/master +Auto-merging net/vmw_vsock/virtio_transport_common.c +Auto-merging net/unix/af_unix.c +Auto-merging net/tipc/bcast.c +Auto-merging net/socket.c +Auto-merging net/sctp/stream.c +Auto-merging net/ipv4/tcp_ipv4.c +Auto-merging net/ipv4/tcp.c +Auto-merging include/linux/netdevice.h +Auto-merging drivers/s390/net/qeth_core_mpc.h +Auto-merging drivers/s390/net/qeth_core_main.c +Auto-merging drivers/net/wan/fsl_ucc_hdlc.c +Auto-merging drivers/net/usb/usbnet.c +Auto-merging drivers/net/usb/lan78xx.c +Auto-merging drivers/net/phy/phylink.c +CONFLICT (content): Merge conflict in drivers/net/phy/phylink.c +Auto-merging drivers/net/fjes/fjes_main.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h +Auto-merging drivers/net/ethernet/stmicro/stmmac/common.h +Auto-merging drivers/net/ethernet/qlogic/qla3xxx.c +Auto-merging drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c +Auto-merging drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +Auto-merging drivers/net/ethernet/marvell/mv643xx_eth.c +Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +Auto-merging drivers/net/ethernet/intel/i40e/i40e_main.c +Auto-merging drivers/net/ethernet/ibm/ibmvnic.c +Auto-merging drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +Auto-merging drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c +Auto-merging drivers/net/ethernet/cortina/gemini.c +Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.c +Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h +Auto-merging drivers/net/ethernet/atheros/ag71xx.c +Auto-merging drivers/net/ethernet/amazon/ena/ena_netdev.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/amazon/ena/ena_netdev.c +Auto-merging MAINTAINERS +Resolved 'drivers/net/ethernet/amazon/ena/ena_netdev.c' using previous resolution. +Resolved 'drivers/net/phy/phylink.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 08b85c38d3e8] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/net/broadcom-bluetooth.txt | 7 + + .../devicetree/bindings/net/mediatek-dwmac.txt | 33 +- + .../devicetree/bindings/net/ti,dp83867.txt | 12 +- + .../networking/device_drivers/netronome/nfp.rst | 116 +++ + Documentation/networking/ip-sysctl.txt | 4 + + MAINTAINERS | 9 + + arch/m68k/emu/nfeth.c | 2 +- + arch/um/drivers/net_kern.c | 2 +- + arch/um/drivers/vector_kern.c | 2 +- + arch/xtensa/platforms/iss/network.c | 2 +- + drivers/atm/fore200e.c | 25 +- + drivers/bluetooth/btbcm.c | 46 + + drivers/bluetooth/btbcm.h | 16 + + drivers/bluetooth/btusb.c | 12 +- + drivers/bluetooth/hci_bcm.c | 50 +- + drivers/char/pcmcia/synclink_cs.c | 2 +- + drivers/crypto/chelsio/chtls/chtls_cm.c | 2 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 +- + drivers/message/fusion/mptlan.c | 2 +- + drivers/misc/sgi-xp/xpnet.c | 2 +- + drivers/net/Kconfig | 43 + + drivers/net/Makefile | 1 + + drivers/net/appletalk/cops.c | 4 +- + drivers/net/arcnet/arcdevice.h | 2 +- + drivers/net/arcnet/arcnet.c | 2 +- + drivers/net/bonding/bond_3ad.c | 10 - + drivers/net/caif/caif_serial.c | 4 +- + drivers/net/ethernet/3com/3c509.c | 4 +- + drivers/net/ethernet/3com/3c515.c | 4 +- + drivers/net/ethernet/3com/3c574_cs.c | 4 +- + drivers/net/ethernet/3com/3c589_cs.c | 4 +- + drivers/net/ethernet/3com/3c59x.c | 4 +- + drivers/net/ethernet/3com/typhoon.c | 2 +- + drivers/net/ethernet/8390/8390.c | 4 +- + drivers/net/ethernet/8390/8390.h | 4 +- + drivers/net/ethernet/8390/8390p.c | 4 +- + drivers/net/ethernet/8390/axnet_cs.c | 4 +- + drivers/net/ethernet/8390/lib8390.c | 2 +- + drivers/net/ethernet/adaptec/starfire.c | 4 +- + drivers/net/ethernet/agere/et131x.c | 2 +- + drivers/net/ethernet/allwinner/sun4i-emac.c | 2 +- + drivers/net/ethernet/alteon/acenic.c | 4 +- + drivers/net/ethernet/amazon/ena/ena_ethtool.c | 4 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 962 +++++++++++++++++---- + drivers/net/ethernet/amazon/ena/ena_netdev.h | 73 ++ + drivers/net/ethernet/amd/7990.c | 2 +- + drivers/net/ethernet/amd/7990.h | 2 +- + drivers/net/ethernet/amd/a2065.c | 2 +- + drivers/net/ethernet/amd/am79c961a.c | 2 +- + drivers/net/ethernet/amd/amd8111e.c | 2 +- + drivers/net/ethernet/amd/ariadne.c | 2 +- + drivers/net/ethernet/amd/atarilance.c | 4 +- + drivers/net/ethernet/amd/au1000_eth.c | 2 +- + drivers/net/ethernet/amd/declance.c | 2 +- + drivers/net/ethernet/amd/lance.c | 4 +- + drivers/net/ethernet/amd/ni65.c | 4 +- + drivers/net/ethernet/amd/nmclan_cs.c | 4 +- + drivers/net/ethernet/amd/pcnet32.c | 4 +- + drivers/net/ethernet/amd/sunlance.c | 2 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 2 +- + drivers/net/ethernet/apm/xgene-v2/main.c | 2 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 2 +- + drivers/net/ethernet/apple/macmace.c | 4 +- + drivers/net/ethernet/atheros/ag71xx.c | 2 +- + drivers/net/ethernet/atheros/alx/main.c | 2 +- + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 2 +- + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 2 +- + drivers/net/ethernet/atheros/atlx/atl2.c | 2 +- + drivers/net/ethernet/atheros/atlx/atlx.c | 2 +- + drivers/net/ethernet/broadcom/b44.c | 2 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 2 +- + drivers/net/ethernet/broadcom/bnx2.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +- + drivers/net/ethernet/broadcom/sb1250-mac.c | 4 +- + drivers/net/ethernet/broadcom/tg3.c | 2 +- + drivers/net/ethernet/calxeda/xgmac.c | 2 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 +- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 2 +- + drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c | 4 +- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 11 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 25 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 253 ++++-- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 66 +- + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c | 8 +- + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.c | 4 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c | 18 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 14 +- + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 1 + + drivers/net/ethernet/cirrus/cs89x0.c | 2 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 2 +- + drivers/net/ethernet/cortina/gemini.c | 2 +- + drivers/net/ethernet/davicom/dm9000.c | 2 +- + drivers/net/ethernet/dec/tulip/de2104x.c | 2 +- + drivers/net/ethernet/dec/tulip/dmfe.c | 7 +- + drivers/net/ethernet/dec/tulip/tulip_core.c | 4 +- + drivers/net/ethernet/dec/tulip/uli526x.c | 4 +- + drivers/net/ethernet/dec/tulip/winbond-840.c | 4 +- + drivers/net/ethernet/dlink/dl2k.c | 4 +- + drivers/net/ethernet/dlink/sundance.c | 4 +- + drivers/net/ethernet/emulex/benet/be_main.c | 2 +- + drivers/net/ethernet/ethoc.c | 2 +- + drivers/net/ethernet/faraday/ftgmac100.c | 2 +- + drivers/net/ethernet/fealnx.c | 4 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c | 20 + + drivers/net/ethernet/freescale/dpaa2/dprtc-cmd.h | 4 +- + drivers/net/ethernet/freescale/dpaa2/dprtc.h | 2 + + drivers/net/ethernet/freescale/enetc/enetc.c | 2 + + .../net/ethernet/freescale/enetc/enetc_ethtool.c | 1 + + drivers/net/ethernet/freescale/enetc/enetc_qos.c | 3 +- + drivers/net/ethernet/freescale/fec_main.c | 2 +- + drivers/net/ethernet/freescale/fec_mpc52xx.c | 2 +- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 +- + drivers/net/ethernet/freescale/gianfar.c | 2 +- + drivers/net/ethernet/freescale/ucc_geth.c | 2 +- + drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 4 +- + drivers/net/ethernet/google/gve/gve_main.c | 2 +- + drivers/net/ethernet/hisilicon/hip04_eth.c | 2 +- + drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 2 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 10 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 179 ++-- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 18 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 1 - + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 209 +++-- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 13 +- + drivers/net/ethernet/huawei/hinic/hinic_main.c | 2 +- + drivers/net/ethernet/i825xx/82596.c | 4 +- + drivers/net/ethernet/i825xx/ether1.c | 4 +- + drivers/net/ethernet/i825xx/lib82596.c | 4 +- + drivers/net/ethernet/i825xx/sun3_82586.c | 4 +- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 2 +- + drivers/net/ethernet/ibm/emac/core.c | 2 +- + drivers/net/ethernet/ibm/ibmvnic.c | 2 +- + drivers/net/ethernet/intel/e100.c | 2 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 4 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 2 +- + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 2 +- + drivers/net/ethernet/intel/ice/ice_main.c | 2 +- + drivers/net/ethernet/intel/igb/igb_main.c | 4 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 2 +- + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 +- + drivers/net/ethernet/jme.c | 2 +- + drivers/net/ethernet/korina.c | 2 +- + drivers/net/ethernet/lantiq_etop.c | 2 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 22 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- + drivers/net/ethernet/marvell/skge.c | 2 +- + drivers/net/ethernet/marvell/sky2.c | 2 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 16 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c | 4 - + drivers/net/ethernet/mellanox/mlxsw/reg.h | 11 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 21 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 2 + + drivers/net/ethernet/mellanox/mlxsw/spectrum_dcb.c | 8 +- + .../net/ethernet/mellanox/mlxsw/spectrum_qdisc.c | 219 ++++- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 136 +-- + drivers/net/ethernet/micrel/ks8842.c | 2 +- + drivers/net/ethernet/micrel/ksz884x.c | 2 +- + drivers/net/ethernet/microchip/enc28j60.c | 2 +- + drivers/net/ethernet/microchip/encx24j600.c | 2 +- + drivers/net/ethernet/natsemi/natsemi.c | 4 +- + drivers/net/ethernet/natsemi/ns83820.c | 4 +- + drivers/net/ethernet/natsemi/sonic.c | 2 +- + drivers/net/ethernet/natsemi/sonic.h | 2 +- + drivers/net/ethernet/neterion/s2io.c | 2 +- + drivers/net/ethernet/neterion/s2io.h | 2 +- + drivers/net/ethernet/neterion/vxge/vxge-main.c | 2 +- + drivers/net/ethernet/netronome/nfp/abm/cls.c | 14 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 10 +- + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.c | 9 + + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 16 + + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 108 ++- + drivers/net/ethernet/nvidia/forcedeth.c | 2 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 2 +- + drivers/net/ethernet/packetengines/hamachi.c | 4 +- + drivers/net/ethernet/packetengines/yellowfin.c | 4 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 2 +- + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 4 +- + drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 10 +- + drivers/net/ethernet/qlogic/qla3xxx.c | 2 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 4 +- + drivers/net/ethernet/qualcomm/emac/emac.c | 2 +- + drivers/net/ethernet/qualcomm/qca_spi.c | 2 +- + drivers/net/ethernet/qualcomm/qca_uart.c | 2 +- + drivers/net/ethernet/rdc/r6040.c | 2 +- + drivers/net/ethernet/realtek/8139cp.c | 2 +- + drivers/net/ethernet/realtek/8139too.c | 4 +- + drivers/net/ethernet/realtek/atp.c | 4 +- + drivers/net/ethernet/realtek/r8169_main.c | 11 +- + drivers/net/ethernet/renesas/ravb_main.c | 2 +- + drivers/net/ethernet/renesas/sh_eth.c | 2 +- + drivers/net/ethernet/rocker/rocker_main.c | 4 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 2 +- + drivers/net/ethernet/seeq/ether3.c | 4 +- + drivers/net/ethernet/seeq/sgiseeq.c | 2 +- + drivers/net/ethernet/sfc/efx.c | 2 +- + drivers/net/ethernet/sfc/falcon/efx.c | 2 +- + drivers/net/ethernet/sgi/ioc3-eth.c | 4 +- + drivers/net/ethernet/sgi/meth.c | 4 +- + drivers/net/ethernet/silan/sc92031.c | 2 +- + drivers/net/ethernet/sis/sis190.c | 2 +- + drivers/net/ethernet/sis/sis900.c | 4 +- + drivers/net/ethernet/smsc/epic100.c | 4 +- + drivers/net/ethernet/smsc/smc911x.c | 4 +- + drivers/net/ethernet/smsc/smc9194.c | 4 +- + drivers/net/ethernet/smsc/smc91c92_cs.c | 4 +- + drivers/net/ethernet/smsc/smc91x.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 5 + + .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 24 +- + .../net/ethernet/stmicro/stmmac/dwmac-mediatek.c | 89 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 24 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 12 + + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 4 + + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 4 + + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h | 11 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c | 47 +- + drivers/net/ethernet/stmicro/stmmac/dwmac5.c | 118 +++ + drivers/net/ethernet/stmicro/stmmac/dwmac5.h | 24 + + drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h | 6 +- + drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c | 22 +- + drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 27 + + .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 76 ++ + drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 28 +- + drivers/net/ethernet/stmicro/stmmac/hwif.h | 20 +- + drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 16 + + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 + + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 92 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 137 +++ + drivers/net/ethernet/sun/cassini.c | 2 +- + drivers/net/ethernet/sun/niu.c | 2 +- + drivers/net/ethernet/sun/sunbmac.c | 2 +- + drivers/net/ethernet/sun/sungem.c | 2 +- + drivers/net/ethernet/sun/sunhme.c | 2 +- + drivers/net/ethernet/sun/sunqe.c | 2 +- + drivers/net/ethernet/sun/sunvnet_common.c | 2 +- + drivers/net/ethernet/sun/sunvnet_common.h | 2 +- + drivers/net/ethernet/synopsys/dwc-xlgmac-net.c | 2 +- + drivers/net/ethernet/ti/cpmac.c | 2 +- + drivers/net/ethernet/ti/cpsw_priv.c | 2 +- + drivers/net/ethernet/ti/cpsw_priv.h | 2 +- + drivers/net/ethernet/ti/davinci_emac.c | 2 +- + drivers/net/ethernet/ti/netcp_core.c | 2 +- + drivers/net/ethernet/ti/tlan.c | 6 +- + drivers/net/ethernet/toshiba/ps3_gelic_net.c | 2 +- + drivers/net/ethernet/toshiba/ps3_gelic_net.h | 2 +- + drivers/net/ethernet/toshiba/spider_net.c | 2 +- + drivers/net/ethernet/toshiba/tc35815.c | 4 +- + drivers/net/ethernet/via/via-rhine.c | 4 +- + drivers/net/ethernet/wiznet/w5100.c | 2 +- + drivers/net/ethernet/wiznet/w5300.c | 2 +- + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +- + drivers/net/ethernet/xircom/xirc2ps_cs.c | 4 +- + drivers/net/fjes/fjes_main.c | 4 +- + drivers/net/netdevsim/fib.c | 4 +- + drivers/net/phy/Kconfig | 6 + + drivers/net/phy/Makefile | 1 + + drivers/net/phy/bcm84881.c | 269 ++++++ + drivers/net/phy/dp83867.c | 62 +- + drivers/net/phy/dp83869.c | 2 +- + drivers/net/phy/lxt.c | 24 +- + drivers/net/phy/marvell.c | 209 ++--- + drivers/net/phy/marvell10g.c | 2 +- + drivers/net/phy/mdio-i2c.c | 28 +- + drivers/net/phy/mscc.c | 6 - + drivers/net/phy/phy_device.c | 98 ++- + drivers/net/phy/phylink.c | 326 ++++--- + drivers/net/phy/sfp-bus.c | 122 ++- + drivers/net/phy/sfp.c | 188 ++-- + drivers/net/phy/sfp.h | 2 + + drivers/net/phy/uPD60620.c | 7 +- + drivers/net/ppp/ppp_async.c | 18 +- + drivers/net/slip/slip.c | 2 +- + drivers/net/usb/catc.c | 2 +- + drivers/net/usb/hso.c | 2 +- + drivers/net/usb/ipheth.c | 2 +- + drivers/net/usb/kaweth.c | 2 +- + drivers/net/usb/lan78xx.c | 2 +- + drivers/net/usb/pegasus.c | 2 +- + drivers/net/usb/r8152.c | 2 +- + drivers/net/usb/rtl8150.c | 2 +- + drivers/net/usb/usbnet.c | 2 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 2 +- + drivers/net/wan/cosa.c | 4 +- + drivers/net/wan/farsync.c | 2 +- + drivers/net/wan/fsl_ucc_hdlc.c | 2 +- + drivers/net/wan/lmc/lmc_main.c | 4 +- + drivers/net/wan/x25_asy.c | 2 +- + drivers/net/wimax/i2400m/netdev.c | 2 +- + drivers/net/wireguard/Makefile | 18 + + drivers/net/wireguard/allowedips.c | 376 ++++++++ + drivers/net/wireguard/allowedips.h | 59 ++ + drivers/net/wireguard/cookie.c | 236 +++++ + drivers/net/wireguard/cookie.h | 59 ++ + drivers/net/wireguard/device.c | 458 ++++++++++ + drivers/net/wireguard/device.h | 73 ++ + drivers/net/wireguard/main.c | 63 ++ + drivers/net/wireguard/messages.h | 128 +++ + drivers/net/wireguard/netlink.c | 642 ++++++++++++++ + drivers/net/wireguard/netlink.h | 12 + + drivers/net/wireguard/noise.c | 828 ++++++++++++++++++ + drivers/net/wireguard/noise.h | 137 +++ + drivers/net/wireguard/peer.c | 240 +++++ + drivers/net/wireguard/peer.h | 83 ++ + drivers/net/wireguard/peerlookup.c | 221 +++++ + drivers/net/wireguard/peerlookup.h | 64 ++ + drivers/net/wireguard/queueing.c | 53 ++ + drivers/net/wireguard/queueing.h | 197 +++++ + drivers/net/wireguard/ratelimiter.c | 223 +++++ + drivers/net/wireguard/ratelimiter.h | 19 + + drivers/net/wireguard/receive.c | 595 +++++++++++++ + drivers/net/wireguard/selftest/allowedips.c | 683 +++++++++++++++ + drivers/net/wireguard/selftest/counter.c | 104 +++ + drivers/net/wireguard/selftest/ratelimiter.c | 226 +++++ + drivers/net/wireguard/send.c | 413 +++++++++ + drivers/net/wireguard/socket.c | 437 ++++++++++ + drivers/net/wireguard/socket.h | 44 + + drivers/net/wireguard/timers.c | 243 ++++++ + drivers/net/wireguard/timers.h | 31 + + drivers/net/wireguard/version.h | 1 + + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 2 +- + drivers/net/wireless/intersil/hostap/hostap_main.c | 2 +- + drivers/net/wireless/intersil/orinoco/main.c | 2 +- + drivers/net/wireless/intersil/orinoco/orinoco.h | 2 +- + drivers/net/wireless/intersil/prism54/islpci_eth.c | 2 +- + drivers/net/wireless/intersil/prism54/islpci_eth.h | 2 +- + drivers/net/wireless/marvell/mwifiex/main.c | 2 +- + drivers/net/wireless/quantenna/qtnfmac/core.c | 2 +- + drivers/net/wireless/wl3501_cs.c | 2 +- + drivers/net/wireless/zydas/zd1201.c | 2 +- + drivers/net/xen-netback/xenbus.c | 350 ++++---- + drivers/nfc/port100.c | 2 +- + drivers/ptp/ptp_qoriq.c | 15 +- + drivers/s390/net/qeth_core.h | 56 +- + drivers/s390/net/qeth_core_main.c | 127 ++- + drivers/s390/net/qeth_core_mpc.h | 21 +- + drivers/s390/net/qeth_l3.h | 6 +- + drivers/s390/net/qeth_l3_main.c | 106 +-- + drivers/s390/net/qeth_l3_sys.c | 172 ++-- + drivers/staging/ks7010/ks_wlan_net.c | 4 +- + drivers/staging/qlge/qlge_main.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +- + drivers/staging/rtl8192u/r8192U_core.c | 2 +- + drivers/staging/unisys/visornic/visornic_main.c | 2 +- + drivers/staging/wlan-ng/p80211netdev.c | 4 +- + drivers/tty/n_gsm.c | 2 +- + drivers/tty/synclink.c | 2 +- + drivers/tty/synclink_gt.c | 2 +- + drivers/tty/synclinkmp.c | 2 +- + include/linux/fsl/ptp_qoriq.h | 1 + + include/linux/net.h | 1 + + include/linux/netdevice.h | 6 +- + include/linux/phy.h | 2 + + include/linux/sfp.h | 95 +- + include/linux/stmmac.h | 13 + + include/linux/usb/usbnet.h | 2 +- + include/net/addrconf.h | 8 +- + include/net/af_unix.h | 5 + + include/net/af_vsock.h | 2 + + include/net/dsfield.h | 2 +- + include/net/netlink.h | 8 +- + include/net/netns/ipv4.h | 1 + + include/net/pkt_cls.h | 36 +- + include/uapi/linux/ethtool.h | 2 + + include/uapi/linux/if_bonding.h | 10 + + include/uapi/linux/if_bridge.h | 10 + + include/uapi/linux/if_link.h | 1 + + include/uapi/linux/pkt_sched.h | 17 + + include/uapi/linux/vm_sockets.h | 8 +- + include/uapi/linux/wireguard.h | 196 +++++ + net/Makefile | 2 +- + net/atm/lec.c | 2 +- + net/bluetooth/bnep/netdev.c | 2 +- + net/bridge/br_netlink.c | 13 + + net/bridge/br_private.h | 2 + + net/bridge/br_stp.c | 15 + + net/bridge/br_stp_bpdu.c | 4 + + net/core/Makefile | 2 +- + net/core/rtnetlink.c | 5 + + net/dsa/dsa_priv.h | 16 - + net/dsa/port.c | 38 +- + net/ethtool/Makefile | 3 + + net/ethtool/common.c | 171 ++++ + net/ethtool/common.h | 22 + + net/{core/ethtool.c => ethtool/ioctl.c} | 90 +- + net/ipv4/fib_trie.c | 121 ++- + net/ipv4/sysctl_net_ipv4.c | 9 + + net/ipv4/tcp.c | 4 +- + net/ipv4/tcp_ipv4.c | 1 + + net/ipv4/tcp_metrics.c | 13 +- + net/sched/Kconfig | 17 + + net/sched/Makefile | 1 + + net/sched/sch_cake.c | 59 +- + net/sched/sch_ets.c | 828 ++++++++++++++++++ + net/sched/sch_generic.c | 2 +- + net/sctp/associola.c | 10 +- + net/sctp/chunk.c | 2 +- + net/sctp/endpointola.c | 6 +- + net/sctp/input.c | 5 +- + net/sctp/output.c | 2 +- + net/sctp/outqueue.c | 6 +- + net/sctp/sm_make_chunk.c | 7 +- + net/sctp/sm_sideeffect.c | 16 +- + net/sctp/sm_statefuns.c | 2 +- + net/sctp/socket.c | 12 +- + net/sctp/stream.c | 3 +- + net/sctp/stream_interleave.c | 23 +- + net/sctp/transport.c | 2 +- + net/sctp/ulpqueue.c | 15 +- + net/smc/smc_core.c | 3 +- + net/socket.c | 12 + + net/tipc/bcast.c | 11 +- + net/tipc/bearer.c | 11 +- + net/tipc/bearer.h | 6 +- + net/tipc/eth_media.c | 3 +- + net/tipc/ib_media.c | 5 +- + net/tipc/link.c | 199 +++-- + net/tipc/link.h | 9 +- + net/tipc/node.c | 16 +- + net/tipc/udp_media.c | 3 +- + net/unix/af_unix.c | 56 +- + net/vmw_vsock/Kconfig | 12 + + net/vmw_vsock/Makefile | 1 + + net/vmw_vsock/af_vsock.c | 45 +- + net/vmw_vsock/virtio_transport.c | 61 +- + net/vmw_vsock/virtio_transport_common.c | 3 - + net/vmw_vsock/vmci_transport.c | 2 +- + net/vmw_vsock/vsock_loopback.c | 180 ++++ + net/wireless/nl80211.c | 3 +- + .../testing/selftests/drivers/net/mlxsw/qos_lib.sh | 46 +- + .../testing/selftests/drivers/net/mlxsw/sch_ets.sh | 67 ++ + tools/testing/selftests/net/forwarding/lib.sh | 18 + + tools/testing/selftests/net/forwarding/sch_ets.sh | 44 + + .../selftests/net/forwarding/sch_ets_core.sh | 300 +++++++ + .../selftests/net/forwarding/sch_ets_tests.sh | 227 +++++ + tools/testing/selftests/net/so_txtime.c | 84 +- + tools/testing/selftests/net/so_txtime.sh | 9 +- + .../selftests/tc-testing/tc-tests/qdiscs/ets.json | 940 ++++++++++++++++++++ + tools/testing/selftests/wireguard/netns.sh | 537 ++++++++++++ + tools/testing/selftests/wireguard/qemu/.gitignore | 2 + + tools/testing/selftests/wireguard/qemu/Makefile | 385 +++++++++ + .../selftests/wireguard/qemu/arch/aarch64.config | 5 + + .../wireguard/qemu/arch/aarch64_be.config | 6 + + .../selftests/wireguard/qemu/arch/arm.config | 9 + + .../selftests/wireguard/qemu/arch/armeb.config | 10 + + .../selftests/wireguard/qemu/arch/i686.config | 5 + + .../selftests/wireguard/qemu/arch/m68k.config | 9 + + .../selftests/wireguard/qemu/arch/mips.config | 11 + + .../selftests/wireguard/qemu/arch/mips64.config | 14 + + .../selftests/wireguard/qemu/arch/mips64el.config | 15 + + .../selftests/wireguard/qemu/arch/mipsel.config | 12 + + .../selftests/wireguard/qemu/arch/powerpc.config | 10 + + .../wireguard/qemu/arch/powerpc64le.config | 12 + + .../selftests/wireguard/qemu/arch/x86_64.config | 5 + + .../testing/selftests/wireguard/qemu/debug.config | 67 ++ + tools/testing/selftests/wireguard/qemu/init.c | 284 ++++++ + .../testing/selftests/wireguard/qemu/kernel.config | 86 ++ + 470 files changed, 16784 insertions(+), 2528 deletions(-) + create mode 100644 drivers/net/phy/bcm84881.c + create mode 100644 drivers/net/wireguard/Makefile + create mode 100644 drivers/net/wireguard/allowedips.c + create mode 100644 drivers/net/wireguard/allowedips.h + create mode 100644 drivers/net/wireguard/cookie.c + create mode 100644 drivers/net/wireguard/cookie.h + create mode 100644 drivers/net/wireguard/device.c + create mode 100644 drivers/net/wireguard/device.h + create mode 100644 drivers/net/wireguard/main.c + create mode 100644 drivers/net/wireguard/messages.h + create mode 100644 drivers/net/wireguard/netlink.c + create mode 100644 drivers/net/wireguard/netlink.h + create mode 100644 drivers/net/wireguard/noise.c + create mode 100644 drivers/net/wireguard/noise.h + create mode 100644 drivers/net/wireguard/peer.c + create mode 100644 drivers/net/wireguard/peer.h + create mode 100644 drivers/net/wireguard/peerlookup.c + create mode 100644 drivers/net/wireguard/peerlookup.h + create mode 100644 drivers/net/wireguard/queueing.c + create mode 100644 drivers/net/wireguard/queueing.h + create mode 100644 drivers/net/wireguard/ratelimiter.c + create mode 100644 drivers/net/wireguard/ratelimiter.h + create mode 100644 drivers/net/wireguard/receive.c + create mode 100644 drivers/net/wireguard/selftest/allowedips.c + create mode 100644 drivers/net/wireguard/selftest/counter.c + create mode 100644 drivers/net/wireguard/selftest/ratelimiter.c + create mode 100644 drivers/net/wireguard/send.c + create mode 100644 drivers/net/wireguard/socket.c + create mode 100644 drivers/net/wireguard/socket.h + create mode 100644 drivers/net/wireguard/timers.c + create mode 100644 drivers/net/wireguard/timers.h + create mode 100644 drivers/net/wireguard/version.h + create mode 100644 include/uapi/linux/wireguard.h + create mode 100644 net/ethtool/Makefile + create mode 100644 net/ethtool/common.c + create mode 100644 net/ethtool/common.h + rename net/{core/ethtool.c => ethtool/ioctl.c} (95%) + create mode 100644 net/sched/sch_ets.c + create mode 100644 net/vmw_vsock/vsock_loopback.c + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/sch_ets.sh + create mode 100755 tools/testing/selftests/net/forwarding/sch_ets.sh + create mode 100644 tools/testing/selftests/net/forwarding/sch_ets_core.sh + create mode 100644 tools/testing/selftests/net/forwarding/sch_ets_tests.sh + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/ets.json + create mode 100755 tools/testing/selftests/wireguard/netns.sh + create mode 100644 tools/testing/selftests/wireguard/qemu/.gitignore + create mode 100644 tools/testing/selftests/wireguard/qemu/Makefile + create mode 100644 tools/testing/selftests/wireguard/qemu/arch/aarch64.config + create mode 100644 tools/testing/selftests/wireguard/qemu/arch/aarch64_be.config + create mode 100644 tools/testing/selftests/wireguard/qemu/arch/arm.config + create mode 100644 tools/testing/selftests/wireguard/qemu/arch/armeb.config + create mode 100644 tools/testing/selftests/wireguard/qemu/arch/i686.config + create mode 100644 tools/testing/selftests/wireguard/qemu/arch/m68k.config + create mode 100644 tools/testing/selftests/wireguard/qemu/arch/mips.config + create mode 100644 tools/testing/selftests/wireguard/qemu/arch/mips64.config + create mode 100644 tools/testing/selftests/wireguard/qemu/arch/mips64el.config + create mode 100644 tools/testing/selftests/wireguard/qemu/arch/mipsel.config + create mode 100644 tools/testing/selftests/wireguard/qemu/arch/powerpc.config + create mode 100644 tools/testing/selftests/wireguard/qemu/arch/powerpc64le.config + create mode 100644 tools/testing/selftests/wireguard/qemu/arch/x86_64.config + create mode 100644 tools/testing/selftests/wireguard/qemu/debug.config + create mode 100644 tools/testing/selftests/wireguard/qemu/init.c + create mode 100644 tools/testing/selftests/wireguard/qemu/kernel.config +Merging bpf-next/master (5bf2fc1f9c88 bpf: Remove unnecessary assertion on fp_old) +$ git merge bpf-next/master +Auto-merging tools/bpf/bpftool/prog.c +Auto-merging net/core/filter.c +Auto-merging net/core/dev.c +Auto-merging net/bpf/test_run.c +CONFLICT (content): Merge conflict in net/bpf/test_run.c +Auto-merging kernel/bpf/trampoline.c +Auto-merging kernel/bpf/core.c +Auto-merging include/linux/filter.h +Auto-merging include/linux/bpf.h +Auto-merging arch/riscv/net/bpf_jit_comp.c +CONFLICT (content): Merge conflict in arch/riscv/net/bpf_jit_comp.c +Recorded preimage for 'arch/riscv/net/bpf_jit_comp.c' +Resolved 'net/bpf/test_run.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/riscv/net/bpf_jit_comp.c'. +[master 0b48b276ad38] Merge remote-tracking branch 'bpf-next/master' +$ git diff -M --stat --summary HEAD^.. + arch/arm/net/bpf_jit_32.c | 30 +- + arch/arm64/Kconfig | 1 + + arch/riscv/include/asm/perf_event.h | 4 + + arch/riscv/include/asm/pgtable.h | 4 + + arch/riscv/include/uapi/asm/bpf_perf_event.h | 9 + + arch/riscv/net/bpf_jit_comp.c | 531 +++--- + arch/x86/Kconfig | 1 + + arch/x86/net/bpf_jit_comp.c | 150 ++ + include/linux/bpf.h | 72 + + include/linux/filter.h | 40 +- + include/uapi/linux/audit.h | 1 + + include/uapi/linux/btf.h | 3 +- + init/Kconfig | 7 + + kernel/bpf/Makefile | 1 + + kernel/bpf/core.c | 6 +- + kernel/bpf/dispatcher.c | 158 ++ + kernel/bpf/syscall.c | 59 +- + kernel/bpf/trampoline.c | 24 +- + net/bpf/test_run.c | 54 +- + net/core/dev.c | 19 +- + net/core/filter.c | 8 + + samples/bpf/Makefile | 5 +- + samples/bpf/xdp1_user.c | 5 +- + samples/bpf/xdp_adjust_tail_user.c | 5 +- + samples/bpf/xdp_fwd_user.c | 17 +- + samples/bpf/xdp_redirect_cpu_user.c | 4 + + samples/bpf/xdp_redirect_map_user.c | 5 +- + samples/bpf/xdp_redirect_user.c | 5 +- + samples/bpf/xdp_router_ipv4_user.c | 3 + + samples/bpf/xdp_rxq_info_user.c | 4 + + samples/bpf/xdp_sample_pkts_user.c | 12 +- + samples/bpf/xdp_tx_iptunnel_user.c | 5 +- + samples/bpf/xdpsock_user.c | 5 +- + tools/bpf/bpftool/Documentation/bpftool-gen.rst | 305 ++++ + tools/bpf/bpftool/Documentation/bpftool-map.rst | 12 +- + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 18 +- + tools/bpf/bpftool/Documentation/bpftool.rst | 3 +- + tools/bpf/bpftool/bash-completion/bpftool | 156 +- + tools/bpf/bpftool/gen.c | 609 +++++++ + tools/bpf/bpftool/main.c | 3 +- + tools/bpf/bpftool/main.h | 5 +- + tools/bpf/bpftool/map.c | 384 ++++- + tools/bpf/bpftool/net.c | 1 + + tools/bpf/bpftool/prog.c | 388 +++-- + tools/include/uapi/asm/bpf_perf_event.h | 2 + + tools/include/uapi/linux/btf.h | 7 +- + tools/lib/bpf/Makefile | 18 +- + tools/lib/bpf/bpf.h | 6 +- + tools/lib/bpf/bpf_helpers.h | 11 + + tools/lib/bpf/btf.c | 48 +- + tools/lib/bpf/btf.h | 29 +- + tools/lib/bpf/btf_dump.c | 115 +- + tools/lib/bpf/libbpf.c | 1710 ++++++++++++++++---- + tools/lib/bpf/libbpf.h | 107 +- + tools/lib/bpf/libbpf.map | 15 + + tools/lib/bpf/libbpf.pc.template | 2 +- + tools/lib/bpf/libbpf_common.h | 40 + + tools/lib/bpf/libbpf_internal.h | 21 +- + tools/testing/selftests/bpf/.gitignore | 2 + + tools/testing/selftests/bpf/Makefile | 76 +- + .../selftests/bpf/prog_tests/attach_probe.c | 161 +- + .../testing/selftests/bpf/prog_tests/core_extern.c | 169 ++ + .../testing/selftests/bpf/prog_tests/core_reloc.c | 4 + + tools/testing/selftests/bpf/prog_tests/cpu_mask.c | 78 + + .../selftests/bpf/prog_tests/fentry_fexit.c | 101 +- + .../testing/selftests/bpf/prog_tests/fentry_test.c | 69 +- + tools/testing/selftests/bpf/prog_tests/mmap.c | 56 +- + .../testing/selftests/bpf/prog_tests/perf_buffer.c | 29 +- + .../testing/selftests/bpf/prog_tests/probe_user.c | 6 +- + .../testing/selftests/bpf/prog_tests/rdonly_maps.c | 11 +- + .../select_reuseport.c} | 514 +++--- + tools/testing/selftests/bpf/prog_tests/skb_ctx.c | 7 + + tools/testing/selftests/bpf/prog_tests/skeleton.c | 63 + + .../selftests/bpf/prog_tests/stacktrace_build_id.c | 77 +- + .../bpf/prog_tests/stacktrace_build_id_nmi.c | 82 +- + tools/testing/selftests/bpf/prog_tests/xdp_perf.c | 25 + + .../btf__core_reloc_arrays___equiv_zero_sz_arr.c | 3 + + .../btf__core_reloc_arrays___err_bad_zero_sz_arr.c | 3 + + .../bpf/progs/btf__core_reloc_arrays___fixed_arr.c | 3 + + .../testing/selftests/bpf/progs/core_reloc_types.h | 39 + + .../selftests/bpf/progs/test_attach_probe.c | 34 +- + .../testing/selftests/bpf/progs/test_core_extern.c | 62 + + .../selftests/bpf/progs/test_core_reloc_arrays.c | 8 +- + .../bpf/progs/test_select_reuseport_kern.c | 2 +- + tools/testing/selftests/bpf/progs/test_skb_ctx.c | 6 + + tools/testing/selftests/bpf/progs/test_skeleton.c | 46 + + 86 files changed, 5404 insertions(+), 1604 deletions(-) + create mode 100644 arch/riscv/include/uapi/asm/bpf_perf_event.h + create mode 100644 kernel/bpf/dispatcher.c + create mode 100644 tools/bpf/bpftool/Documentation/bpftool-gen.rst + create mode 100644 tools/bpf/bpftool/gen.c + create mode 100644 tools/lib/bpf/libbpf_common.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/core_extern.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/cpu_mask.c + rename tools/testing/selftests/bpf/{test_select_reuseport.c => prog_tests/select_reuseport.c} (54%) + create mode 100644 tools/testing/selftests/bpf/prog_tests/skeleton.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_perf.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___equiv_zero_sz_arr.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_bad_zero_sz_arr.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___fixed_arr.c + create mode 100644 tools/testing/selftests/bpf/progs/test_core_extern.c + create mode 100644 tools/testing/selftests/bpf/progs/test_skeleton.c +Merging ipsec-next/master (e27cca96cd68 xfrm: add espintcp (RFC 8229)) +$ git merge ipsec-next/master +Auto-merging net/unix/af_unix.c +CONFLICT (content): Merge conflict in net/unix/af_unix.c +Resolved 'net/unix/af_unix.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 8ebb3397d66d] Merge remote-tracking branch 'ipsec-next/master' +$ git diff -M --stat --summary HEAD^.. + include/linux/skbuff.h | 11 +- + include/net/espintcp.h | 39 ++++ + include/net/xfrm.h | 4 + + include/uapi/linux/udp.h | 1 + + net/core/datagram.c | 27 ++- + net/ipv4/Kconfig | 11 + + net/ipv4/esp4.c | 264 +++++++++++++++++++++--- + net/ipv4/udp.c | 3 +- + net/ipv4/xfrm4_protocol.c | 9 + + net/unix/af_unix.c | 7 +- + net/xfrm/Makefile | 1 + + net/xfrm/espintcp.c | 509 ++++++++++++++++++++++++++++++++++++++++++++++ + net/xfrm/xfrm_input.c | 21 +- + net/xfrm/xfrm_policy.c | 7 + + net/xfrm/xfrm_state.c | 3 + + 15 files changed, 871 insertions(+), 46 deletions(-) + create mode 100644 include/net/espintcp.h + create mode 100644 net/xfrm/espintcp.c +Merging mlx5-next/mlx5-next (e42617b825f8 Linux 5.5-rc1) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (13d74c0a9708 netfilter: conntrack: remove two export symbols) +$ git merge netfilter-next/master +Auto-merging net/netfilter/nf_conntrack_core.c +Auto-merging net/core/dev.c +Auto-merging include/linux/netdevice.h +Merge made by the 'recursive' strategy. + include/linux/netdevice.h | 1 + + net/core/dev.c | 2 -- + net/netfilter/nf_conntrack_core.c | 1 - + net/netfilter/nf_conntrack_extend.c | 1 - + net/netfilter/nft_tunnel.c | 52 +++++++++++++++++++++++++++---------- + 5 files changed, 40 insertions(+), 17 deletions(-) +Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings) +$ git merge nfc-next/master +Auto-merging net/nfc/netlink.c +Auto-merging net/nfc/hci/core.c +Auto-merging drivers/nfc/st95hf/core.c +Auto-merging drivers/nfc/st21nfca/se.c +CONFLICT (content): Merge conflict in drivers/nfc/st21nfca/se.c +Auto-merging drivers/nfc/st21nfca/dep.c +Auto-merging drivers/nfc/fdp/i2c.c +Auto-merging drivers/nfc/fdp/fdp.c +Resolved 'drivers/nfc/st21nfca/se.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 25a4c3471dd8] Merge remote-tracking branch 'nfc-next/master' +$ git diff -M --stat --summary HEAD^.. + drivers/nfc/fdp/fdp.c | 35 +++++------------------------------ + drivers/nfc/fdp/i2c.c | 26 +++++++++++++------------- + drivers/nfc/st21nfca/dep.c | 3 ++- + drivers/nfc/st21nfca/se.c | 3 +-- + drivers/nfc/st95hf/core.c | 7 ++----- + net/nfc/netlink.c | 3 ++- + 6 files changed, 25 insertions(+), 52 deletions(-) +Merging ipvs-next/master (d54725cd11a5 netfilter: nf_tables: support for multiple devices per netdev hook) +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (ae0a723c4cfd Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) +$ git merge wireless-drivers-next/master +Auto-merging drivers/net/wireless/intel/ipw2x00/ipw2100.c +Auto-merging drivers/net/wireless/ath/ath10k/mac.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/net/wireless/qcom,ath11k.yaml | 273 + + MAINTAINERS | 9 +- + drivers/bcma/scan.c | 7 +- + drivers/net/wireless/ath/Kconfig | 1 + + drivers/net/wireless/ath/Makefile | 1 + + drivers/net/wireless/ath/ath10k/bmi.c | 52 +- + drivers/net/wireless/ath/ath10k/bmi.h | 10 + + drivers/net/wireless/ath/ath10k/core.c | 15 +- + drivers/net/wireless/ath/ath10k/core.h | 2 + + drivers/net/wireless/ath/ath10k/debug.c | 2 + + drivers/net/wireless/ath/ath10k/htc.c | 10 +- + drivers/net/wireless/ath/ath10k/htc.h | 23 +- + drivers/net/wireless/ath/ath10k/htt.h | 3 + + drivers/net/wireless/ath/ath10k/htt_rx.c | 63 +- + drivers/net/wireless/ath/ath10k/hw.h | 3 + + drivers/net/wireless/ath/ath10k/mac.c | 6 +- + drivers/net/wireless/ath/ath10k/qmi.c | 14 +- + drivers/net/wireless/ath/ath10k/sdio.c | 232 +- + drivers/net/wireless/ath/ath10k/sdio.h | 21 +- + drivers/net/wireless/ath/ath10k/snoc.c | 5 +- + drivers/net/wireless/ath/ath10k/testmode.c | 4 +- + drivers/net/wireless/ath/ath10k/wmi-tlv.c | 10 +- + drivers/net/wireless/ath/ath10k/wmi.c | 18 +- + drivers/net/wireless/ath/ath10k/wmi.h | 2 + + drivers/net/wireless/ath/ath11k/Kconfig | 35 + + drivers/net/wireless/ath/ath11k/Makefile | 26 + + drivers/net/wireless/ath/ath11k/ahb.c | 1003 ++++ + drivers/net/wireless/ath/ath11k/ahb.h | 35 + + drivers/net/wireless/ath/ath11k/ce.c | 808 +++ + drivers/net/wireless/ath/ath11k/ce.h | 183 + + drivers/net/wireless/ath/ath11k/core.c | 795 +++ + drivers/net/wireless/ath/ath11k/core.h | 826 +++ + drivers/net/wireless/ath/ath11k/debug.c | 1060 ++++ + drivers/net/wireless/ath/ath11k/debug.h | 281 + + drivers/net/wireless/ath/ath11k/debug_htt_stats.c | 4431 +++++++++++++++ + drivers/net/wireless/ath/ath11k/debug_htt_stats.h | 1620 ++++++ + drivers/net/wireless/ath/ath11k/debugfs_sta.c | 543 ++ + drivers/net/wireless/ath/ath11k/dp.c | 899 +++ + drivers/net/wireless/ath/ath11k/dp.h | 1527 +++++ + drivers/net/wireless/ath/ath11k/dp_rx.c | 4194 ++++++++++++++ + drivers/net/wireless/ath/ath11k/dp_rx.h | 86 + + drivers/net/wireless/ath/ath11k/dp_tx.c | 962 ++++ + drivers/net/wireless/ath/ath11k/dp_tx.h | 40 + + drivers/net/wireless/ath/ath11k/hal.c | 1124 ++++ + drivers/net/wireless/ath/ath11k/hal.h | 897 +++ + drivers/net/wireless/ath/ath11k/hal_desc.h | 2468 ++++++++ + drivers/net/wireless/ath/ath11k/hal_rx.c | 1190 ++++ + drivers/net/wireless/ath/ath11k/hal_rx.h | 332 ++ + drivers/net/wireless/ath/ath11k/hal_tx.c | 154 + + drivers/net/wireless/ath/ath11k/hal_tx.h | 69 + + drivers/net/wireless/ath/ath11k/htc.c | 773 +++ + drivers/net/wireless/ath/ath11k/htc.h | 313 ++ + drivers/net/wireless/ath/ath11k/hw.h | 127 + + drivers/net/wireless/ath/ath11k/mac.c | 5908 ++++++++++++++++++++ + drivers/net/wireless/ath/ath11k/mac.h | 147 + + drivers/net/wireless/ath/ath11k/peer.c | 236 + + drivers/net/wireless/ath/ath11k/peer.h | 35 + + drivers/net/wireless/ath/ath11k/qmi.c | 2433 ++++++++ + drivers/net/wireless/ath/ath11k/qmi.h | 445 ++ + drivers/net/wireless/ath/ath11k/reg.c | 702 +++ + drivers/net/wireless/ath/ath11k/reg.h | 35 + + drivers/net/wireless/ath/ath11k/rx_desc.h | 1212 ++++ + drivers/net/wireless/ath/ath11k/testmode.c | 199 + + drivers/net/wireless/ath/ath11k/testmode.h | 29 + + drivers/net/wireless/ath/ath11k/testmode_i.h | 50 + + drivers/net/wireless/ath/ath11k/trace.c | 9 + + drivers/net/wireless/ath/ath11k/trace.h | 113 + + drivers/net/wireless/ath/ath11k/wmi.c | 5810 +++++++++++++++++++ + drivers/net/wireless/ath/ath11k/wmi.h | 4764 ++++++++++++++++ + drivers/net/wireless/ath/ath9k/hif_usb.c | 2 +- + drivers/net/wireless/ath/regd.c | 10 +- + drivers/net/wireless/ath/wcn36xx/main.c | 1 - + drivers/net/wireless/ath/wil6210/cfg80211.c | 34 + + drivers/net/wireless/ath/wil6210/main.c | 10 +- + drivers/net/wireless/ath/wil6210/txrx.c | 32 +- + drivers/net/wireless/ath/wil6210/txrx_edma.c | 13 +- + drivers/net/wireless/ath/wil6210/txrx_edma.h | 8 +- + drivers/net/wireless/ath/wil6210/wil6210.h | 6 +- + drivers/net/wireless/ath/wil6210/wil_crash_dump.c | 17 +- + drivers/net/wireless/ath/wil6210/wmi.c | 80 +- + drivers/net/wireless/ath/wil6210/wmi.h | 33 + + drivers/net/wireless/atmel/at76c50x-usb.c | 2 +- + drivers/net/wireless/broadcom/b43legacy/main.c | 5 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 18 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 68 +- + .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 54 +- + .../wireless/broadcom/brcm80211/brcmfmac/chip.h | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 2 + + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 3 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 18 + + .../wireless/broadcom/brcm80211/brcmfmac/sdio.h | 1 - + .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 5 +- + .../wireless/broadcom/brcm80211/brcmsmac/main.c | 2 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 7 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 5 +- + drivers/net/wireless/intel/iwlegacy/3945-mac.c | 5 +- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 5 +- + .../net/wireless/intersil/orinoco/orinoco_usb.c | 7 +- + drivers/net/wireless/marvell/mwifiex/main.h | 13 - + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 21 +- + drivers/net/wireless/ralink/rt2x00/rt2800pci.c | 1 + + drivers/net/wireless/ralink/rt2x00/rt2800soc.c | 1 + + drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 1 + + drivers/net/wireless/ralink/rt2x00/rt2x00.h | 2 + + drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 11 - + drivers/net/wireless/ralink/rt2x00/rt2x00mac.c | 20 + + drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 2 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 2 +- + drivers/net/wireless/realtek/rtlwifi/base.h | 4 +- + drivers/net/wireless/realtek/rtlwifi/pci.c | 10 +- + drivers/net/wireless/realtek/rtlwifi/ps.c | 20 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/fw.c | 12 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/fw.h | 103 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/hw.c | 11 +- + .../wireless/realtek/rtlwifi/rtl8192c/dm_common.c | 19 +- + .../wireless/realtek/rtlwifi/rtl8192c/fw_common.h | 14 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/hw.c | 11 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/trx.c | 48 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/mac.c | 49 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/fw.h | 61 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 299 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/trx.h | 853 ++- + .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.h | 36 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/fw.h | 14 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/fw.h | 30 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/fw.h | 102 +- + drivers/net/wireless/realtek/rtlwifi/wifi.h | 115 - + drivers/net/wireless/rsi/rsi_91x_hal.c | 12 +- + drivers/net/wireless/rsi/rsi_91x_usb.c | 49 +- + drivers/net/wireless/zydas/zd1211rw/zd_usb.c | 2 +- + include/linux/mmc/sdio_ids.h | 2 + + 132 files changed, 50743 insertions(+), 1377 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml + create mode 100644 drivers/net/wireless/ath/ath11k/Kconfig + create mode 100644 drivers/net/wireless/ath/ath11k/Makefile + create mode 100644 drivers/net/wireless/ath/ath11k/ahb.c + create mode 100644 drivers/net/wireless/ath/ath11k/ahb.h + create mode 100644 drivers/net/wireless/ath/ath11k/ce.c + create mode 100644 drivers/net/wireless/ath/ath11k/ce.h + create mode 100644 drivers/net/wireless/ath/ath11k/core.c + create mode 100644 drivers/net/wireless/ath/ath11k/core.h + create mode 100644 drivers/net/wireless/ath/ath11k/debug.c + create mode 100644 drivers/net/wireless/ath/ath11k/debug.h + create mode 100644 drivers/net/wireless/ath/ath11k/debug_htt_stats.c + create mode 100644 drivers/net/wireless/ath/ath11k/debug_htt_stats.h + create mode 100644 drivers/net/wireless/ath/ath11k/debugfs_sta.c + create mode 100644 drivers/net/wireless/ath/ath11k/dp.c + create mode 100644 drivers/net/wireless/ath/ath11k/dp.h + create mode 100644 drivers/net/wireless/ath/ath11k/dp_rx.c + create mode 100644 drivers/net/wireless/ath/ath11k/dp_rx.h + create mode 100644 drivers/net/wireless/ath/ath11k/dp_tx.c + create mode 100644 drivers/net/wireless/ath/ath11k/dp_tx.h + create mode 100644 drivers/net/wireless/ath/ath11k/hal.c + create mode 100644 drivers/net/wireless/ath/ath11k/hal.h + create mode 100644 drivers/net/wireless/ath/ath11k/hal_desc.h + create mode 100644 drivers/net/wireless/ath/ath11k/hal_rx.c + create mode 100644 drivers/net/wireless/ath/ath11k/hal_rx.h + create mode 100644 drivers/net/wireless/ath/ath11k/hal_tx.c + create mode 100644 drivers/net/wireless/ath/ath11k/hal_tx.h + create mode 100644 drivers/net/wireless/ath/ath11k/htc.c + create mode 100644 drivers/net/wireless/ath/ath11k/htc.h + create mode 100644 drivers/net/wireless/ath/ath11k/hw.h + create mode 100644 drivers/net/wireless/ath/ath11k/mac.c + create mode 100644 drivers/net/wireless/ath/ath11k/mac.h + create mode 100644 drivers/net/wireless/ath/ath11k/peer.c + create mode 100644 drivers/net/wireless/ath/ath11k/peer.h + create mode 100644 drivers/net/wireless/ath/ath11k/qmi.c + create mode 100644 drivers/net/wireless/ath/ath11k/qmi.h + create mode 100644 drivers/net/wireless/ath/ath11k/reg.c + create mode 100644 drivers/net/wireless/ath/ath11k/reg.h + create mode 100644 drivers/net/wireless/ath/ath11k/rx_desc.h + create mode 100644 drivers/net/wireless/ath/ath11k/testmode.c + create mode 100644 drivers/net/wireless/ath/ath11k/testmode.h + create mode 100644 drivers/net/wireless/ath/ath11k/testmode_i.h + create mode 100644 drivers/net/wireless/ath/ath11k/trace.c + create mode 100644 drivers/net/wireless/ath/ath11k/trace.h + create mode 100644 drivers/net/wireless/ath/ath11k/wmi.c + create mode 100644 drivers/net/wireless/ath/ath11k/wmi.h +Merging bluetooth/master (d44f00b40c03 Bluetooth: hci_qca: Replace of_device_get_match_data with device_get_match_data) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/broadcom-bluetooth.txt | 1 + + drivers/bluetooth/hci_bcm.c | 1 + + drivers/bluetooth/hci_qca.c | 2 +- + include/net/bluetooth/bluetooth.h | 8 +++++--- + net/bluetooth/hci_event.c | 14 ++++++-------- + net/bluetooth/lib.c | 16 ++++++++++++++++ + 6 files changed, 30 insertions(+), 12 deletions(-) +Merging mac80211-next/master (1ee7826ab68f mac80211: Remove redundant assertion) +$ git merge mac80211-next/master +Auto-merging net/mac80211/tx.c +Auto-merging net/mac80211/debugfs_sta.c +Merge made by the 'recursive' strategy. + include/linux/ieee80211.h | 2 +- + include/net/mac80211.h | 32 ++++++++ + include/uapi/linux/wireless.h | 5 +- + net/mac80211/debugfs_sta.c | 6 +- + net/mac80211/ieee80211_i.h | 9 +++ + net/mac80211/iface.c | 67 +++++++++++++++++ + net/mac80211/key.c | 11 +++ + net/mac80211/status.c | 71 ++++++++++++++++++ + net/mac80211/tx.c | 170 +++++++++++++++++++++++++++++++++++++++++- + net/mac80211/util.c | 1 - + 10 files changed, 362 insertions(+), 12 deletions(-) +Merging gfs2/for-next (76223fa75828 gfs2: Another gfs2_find_jhead fix) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/lops.c | 68 +++++++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 44 insertions(+), 24 deletions(-) +Merging mtd/mtd/next (589e1b6c47ce Merge tag 'nand/for-5.5' into mtd/next) +$ git merge mtd/mtd/next +Already up to date. +Merging nand/nand/next (777260a5c992 mtd: rawnand: remove unecessary checking if dmac is NULL) +$ git merge nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (d1eef1c61974 Linux 5.5-rc2) +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (d9e1670b8005 crypto: hmac - Use init_tfm/exit_tfm interface) +$ git merge crypto/master +Auto-merging fs/ecryptfs/keystore.c +Auto-merging crypto/essiv.c +Auto-merging MAINTAINERS +Removing Documentation/padata.txt +Auto-merging .mailmap +Merge made by the 'recursive' strategy. + .mailmap | 1 + + Documentation/core-api/index.rst | 1 + + Documentation/core-api/padata.rst | 169 ++++++ + Documentation/crypto/devel-algos.rst | 4 +- + .../devicetree/bindings/rng/brcm,iproc-rng200.txt | 1 + + Documentation/padata.txt | 163 ------ + MAINTAINERS | 2 +- + arch/arm64/crypto/ghash-ce-glue.c | 2 +- + arch/arm64/crypto/sha1-ce-glue.c | 17 +- + arch/arm64/crypto/sha2-ce-glue.c | 34 +- + arch/arm64/crypto/sha256-glue.c | 32 +- + arch/arm64/crypto/sha512-ce-glue.c | 26 +- + arch/arm64/crypto/sha512-glue.c | 15 +- + arch/x86/crypto/aesni-intel_asm.S | 8 +- + arch/x86/crypto/aesni-intel_glue.c | 45 +- + arch/x86/crypto/camellia_aesni_avx2_glue.c | 74 ++- + arch/x86/crypto/camellia_aesni_avx_glue.c | 72 ++- + arch/x86/crypto/camellia_glue.c | 45 +- + arch/x86/crypto/cast6_avx_glue.c | 68 ++- + arch/x86/crypto/glue_helper.c | 23 +- + arch/x86/crypto/serpent_avx2_glue.c | 65 ++- + arch/x86/crypto/serpent_avx_glue.c | 63 ++- + arch/x86/crypto/serpent_sse2_glue.c | 30 +- + arch/x86/crypto/twofish_avx_glue.c | 75 ++- + arch/x86/crypto/twofish_glue_3way.c | 37 +- + arch/x86/include/asm/crypto/camellia.h | 63 +-- + arch/x86/include/asm/crypto/glue_helper.h | 18 +- + arch/x86/include/asm/crypto/serpent-avx.h | 20 +- + arch/x86/include/asm/crypto/serpent-sse2.h | 28 +- + arch/x86/include/asm/crypto/twofish.h | 19 +- + crypto/af_alg.c | 6 +- + crypto/algapi.c | 65 ++- + crypto/api.c | 20 +- + crypto/cast6_generic.c | 18 +- + crypto/cipher.c | 92 ++-- + crypto/compress.c | 31 +- + crypto/essiv.c | 2 +- + crypto/hmac.c | 24 +- + crypto/internal.h | 4 - + crypto/pcrypt.c | 41 +- + crypto/serpent_generic.c | 6 +- + crypto/shash.c | 29 +- + crypto/skcipher.c | 22 +- + crypto/testmgr.c | 584 ++++++++++++++++----- + crypto/testmgr.h | 14 +- + drivers/char/hw_random/Kconfig | 2 +- + drivers/char/hw_random/iproc-rng200.c | 1 + + drivers/crypto/Kconfig | 22 +- + drivers/crypto/allwinner/sun4i-ss/sun4i-ss-core.c | 22 +- + drivers/crypto/allwinner/sun4i-ss/sun4i-ss-hash.c | 5 +- + drivers/crypto/allwinner/sun4i-ss/sun4i-ss.h | 9 + + drivers/crypto/atmel-aes.c | 271 ++++------ + drivers/crypto/atmel-sha.c | 418 +++++---------- + drivers/crypto/atmel-tdes.c | 338 +++++------- + drivers/crypto/caam/Kconfig | 14 +- + drivers/crypto/caam/ctrl.c | 6 +- + drivers/crypto/ccp/ccp-dev-v3.c | 1 + + drivers/crypto/ccree/cc_driver.c | 8 +- + drivers/crypto/ccree/cc_driver.h | 1 - + drivers/crypto/ccree/cc_fips.c | 2 +- + drivers/crypto/ccree/cc_hash.c | 2 - + drivers/crypto/ccree/cc_pm.c | 2 +- + drivers/crypto/ccree/cc_request_mgr.c | 13 +- + drivers/crypto/chelsio/Kconfig | 30 +- + drivers/crypto/hisilicon/Kconfig | 3 +- + drivers/crypto/hisilicon/sgl.c | 17 +- + drivers/crypto/hisilicon/zip/zip.h | 4 + + drivers/crypto/hisilicon/zip/zip_crypto.c | 92 +--- + drivers/crypto/inside-secure/safexcel_cipher.c | 5 +- + drivers/crypto/omap-aes-gcm.c | 223 ++++---- + drivers/crypto/omap-aes.c | 142 +++-- + drivers/crypto/omap-aes.h | 12 +- + drivers/crypto/omap-crypto.c | 37 +- + drivers/crypto/omap-des.c | 13 +- + drivers/crypto/omap-sham.c | 191 ++++--- + drivers/crypto/padlock-sha.c | 26 +- + drivers/crypto/stm32/Kconfig | 6 +- + drivers/crypto/ux500/Kconfig | 16 +- + fs/ecryptfs/crypto.c | 2 +- + fs/ecryptfs/keystore.c | 4 +- + include/crypto/aead.h | 10 + + include/crypto/algapi.h | 1 + + include/crypto/cast6.h | 4 +- + include/crypto/hash.h | 13 + + include/crypto/internal/aead.h | 10 - + include/crypto/internal/chacha.h | 2 +- + include/crypto/internal/hash.h | 12 + + include/crypto/serpent.h | 4 +- + include/crypto/skcipher.h | 26 +- + include/crypto/xts.h | 2 - + include/linux/cpuhotplug.h | 1 + + include/linux/crypto.h | 91 +--- + include/linux/padata.h | 56 +- + kernel/padata.c | 386 +++++++------- + 94 files changed, 2382 insertions(+), 2374 deletions(-) + create mode 100644 Documentation/core-api/padata.rst + delete mode 100644 Documentation/padata.txt +Merging drm/drm-next (5f773e551a3b drm/amdgpu/display: use msleep rather than udelay for HDCP) +$ git merge drm/drm-next +Removing include/linux/platform_data/tc35876x.h +Removing drivers/gpu/drm/udl/udl_fb.c +Removing drivers/gpu/drm/udl/udl_encoder.c +Removing drivers/gpu/drm/udl/udl_dmabuf.c +Removing drivers/gpu/drm/tilcdc/tilcdc_tfp410.h +Removing drivers/gpu/drm/tilcdc/tilcdc_tfp410.c +Removing drivers/gpu/drm/mediatek/mtk_drm_fb.h +Removing drivers/gpu/drm/mediatek/mtk_drm_fb.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Removing drivers/gpu/drm/bridge/analogix-anx78xx.h +Removing drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_0_sh_mask.h +Removing drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_0_offset.h +Removing drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v10.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/display/tilcdc/tfp410.txt +Merge made by the 'recursive' strategy. + .../bindings/display/dsi-controller.yaml | 91 ++ + .../devicetree/bindings/display/ingenic,lcd.txt | 1 + + .../bindings/display/panel/logicpd,type28.yaml | 42 + + .../bindings/display/panel/sony,acx424akp.yaml | 49 ++ + .../devicetree/bindings/display/renesas,cmm.yaml | 67 ++ + .../devicetree/bindings/display/renesas,du.txt | 15 +- + .../devicetree/bindings/display/tilcdc/tfp410.txt | 21 - + Documentation/gpu/drm-internals.rst | 4 +- + Documentation/gpu/drm-kms.rst | 19 +- + Documentation/gpu/drm-mm.rst | 68 +- + Documentation/gpu/drm-uapi.rst | 49 +- + Documentation/gpu/todo.rst | 60 +- + MAINTAINERS | 25 +- + .../intel-mid/device_libs/platform_tc35876x.c | 26 +- + drivers/auxdisplay/cfag12864bfb.c | 2 +- + drivers/auxdisplay/ht16k33.c | 2 +- + drivers/dma-buf/Kconfig | 11 + + drivers/dma-buf/Makefile | 2 + + drivers/dma-buf/dma-buf.c | 63 +- + drivers/dma-buf/dma-heap.c | 297 +++++++ + drivers/dma-buf/dma-resv.c | 32 + + drivers/dma-buf/heaps/Kconfig | 14 + + drivers/dma-buf/heaps/Makefile | 4 + + drivers/dma-buf/heaps/cma_heap.c | 177 ++++ + drivers/dma-buf/heaps/heap-helpers.c | 271 ++++++ + drivers/dma-buf/heaps/heap-helpers.h | 53 ++ + drivers/dma-buf/heaps/system_heap.c | 123 +++ + drivers/dma-buf/udmabuf.c | 85 +- + drivers/gpu/drm/Kconfig | 4 - + drivers/gpu/drm/Makefile | 4 +- + drivers/gpu/drm/amd/acp/Kconfig | 10 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 293 ++++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 88 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 211 +++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 62 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 47 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 182 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 234 +++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 48 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 113 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 5 - + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 51 -- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 103 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 11 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 13 +- + drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 5 - + drivers/gpu/drm/amd/amdgpu/atombios_i2c.c | 5 - + drivers/gpu/drm/amd/amdgpu/cik.c | 18 + + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 23 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 130 ++- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.h | 8 - + drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 585 ++++++++++++ + drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.h | 32 + + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 827 +++++++++++++++++ + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.h | 42 + + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 641 ++++++++++++++ + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.h | 29 + + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 232 +++-- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 270 +++++- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h | 4 + + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 78 -- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h | 4 - + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 27 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 29 +- + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 65 +- + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 109 ++- + drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 84 +- + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 89 +- + drivers/gpu/drm/amd/amdgpu/si.c | 6 + + drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c | 4 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 82 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 12 + + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 1 + + drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 78 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_1.h | 3 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 481 +--------- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 498 +---------- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.h | 13 - + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 248 +----- + drivers/gpu/drm/amd/amdgpu/vi.c | 22 + + drivers/gpu/drm/amd/amdkfd/Makefile | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 29 +- + drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 10 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 4 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 14 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 1 - + drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 3 - + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 96 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h | 40 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v10.c | 348 -------- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 56 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 24 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 9 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 32 +- + ...d_kernel_queue_v9.c => kfd_packet_manager_v9.c} | 90 +- + ...d_kernel_queue_vi.c => kfd_packet_manager_vi.c} | 41 - + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 28 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 3 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 16 +- + drivers/gpu/drm/amd/display/Kconfig | 33 +- + drivers/gpu/drm/amd/display/Makefile | 4 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 523 +++++++++-- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 50 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 1 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 67 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h | 9 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 53 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 32 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 6 - + drivers/gpu/drm/amd/display/dc/Makefile | 18 +- + drivers/gpu/drm/amd/display/dc/basics/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/basics/dc_common.c | 101 +++ + drivers/gpu/drm/amd/display/dc/basics/dc_common.h | 42 + + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 8 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 78 +- + .../gpu/drm/amd/display/dc/bios/command_table2.c | 85 ++ + .../amd/display/dc/bios/command_table_helper2.c | 6 +- + drivers/gpu/drm/amd/display/dc/calcs/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 4 - + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 6 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 17 +- + .../amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.c | 12 +- + .../dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.c | 6 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 40 +- + .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 6 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 176 ++-- + drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 10 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 238 ++--- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 26 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 744 +++++++++++++--- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 85 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 54 +- + drivers/gpu/drm/amd/display/dc/core/dc_sink.c | 8 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 66 +- + drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 34 +- + drivers/gpu/drm/amd/display/dc/dc.h | 72 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 134 +++ + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 60 ++ + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 62 +- + drivers/gpu/drm/amd/display/dc/dc_dsc.h | 20 +- + drivers/gpu/drm/amd/display/dc/dc_helper.c | 267 +++++- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 28 - + drivers/gpu/drm/amd/display/dc/dc_link.h | 12 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 18 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 38 +- + drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 4 - + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 46 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.h | 4 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 6 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 10 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 87 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h | 13 +- + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 17 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c.c | 19 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 6 - + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.h | 8 - + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.c | 43 - + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.h | 6 +- + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 21 +- + .../amd/display/dc/dce100/dce100_hw_sequencer.c | 3 +- + .../amd/display/dc/dce100/dce100_hw_sequencer.h | 1 + + .../drm/amd/display/dc/dce100/dce100_resource.c | 10 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 100 ++- + .../amd/display/dc/dce110/dce110_hw_sequencer.h | 2 +- + .../drm/amd/display/dc/dce110/dce110_resource.c | 13 +- + .../amd/display/dc/dce112/dce112_hw_sequencer.c | 2 +- + .../amd/display/dc/dce112/dce112_hw_sequencer.h | 1 + + .../drm/amd/display/dc/dce112/dce112_resource.c | 10 +- + .../amd/display/dc/dce120/dce120_hw_sequencer.c | 2 +- + .../amd/display/dc/dce120/dce120_hw_sequencer.h | 1 + + .../drm/amd/display/dc/dce120/dce120_resource.c | 14 +- + .../drm/amd/display/dc/dce80/dce80_hw_sequencer.c | 2 +- + .../drm/amd/display/dc/dce80/dce80_hw_sequencer.h | 1 + + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 10 +- + drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 3 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 6 - + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h | 4 - + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c | 10 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 2 - + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dwb.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dwb.h | 2 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 8 - + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 10 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 7 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 634 +++++-------- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 182 +++- + .../display/dc/dcn10/dcn10_hw_sequencer_debug.h | 43 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 111 +++ + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.h | 33 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.c | 4 - + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.h | 6 - + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 10 - + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 21 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c | 5 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 9 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 10 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 12 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 6 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 9 +- + drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 4 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_dpp_cm.c | 3 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 27 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.h | 2 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 316 ++++++- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h | 16 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 536 +++++------ + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 149 ++-- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 133 +++ + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.h | 33 + + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.c | 7 +- + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.h | 2 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 8 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.c | 16 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 21 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.h | 4 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 114 +-- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 4 +- + .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 15 +- + .../amd/display/dc/dcn20/dcn20_stream_encoder.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn21/Makefile | 3 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c | 414 ++++++++- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c | 14 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.h | 16 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 142 +++ + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.h | 33 + + .../drm/amd/display/dc/dcn21/dcn21_link_encoder.c | 2 - + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 78 +- + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 2 - + drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 10 - + drivers/gpu/drm/amd/display/dc/dm_services.h | 10 + + drivers/gpu/drm/amd/display/dc/dml/Makefile | 8 +- + .../amd/display/dc/dml/dcn20/display_mode_vba_20.c | 3 +- + .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 6 +- + .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 3 +- + .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 2 - + .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 6 +- + .../drm/amd/display/dc/dml/display_mode_enums.h | 2 - + .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 12 - + .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 8 - + .../drm/amd/display/dc/dml/display_mode_structs.h | 6 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 8 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 4 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 105 ++- + drivers/gpu/drm/amd/display/dc/dsc/dscc_types.h | 2 - + drivers/gpu/drm/amd/display/dc/dsc/qp_tables.h | 2 - + drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c | 2 - + drivers/gpu/drm/amd/display/dc/dsc/rc_calc.h | 2 - + drivers/gpu/drm/amd/display/dc/dsc/rc_calc_dpi.c | 2 - + drivers/gpu/drm/amd/display/dc/gpio/Makefile | 9 +- + .../amd/display/dc/gpio/dcn20/hw_factory_dcn20.c | 14 +- + .../amd/display/dc/gpio/dcn20/hw_factory_dcn20.h | 2 - + .../amd/display/dc/gpio/dcn20/hw_translate_dcn20.c | 2 - + .../amd/display/dc/gpio/dcn20/hw_translate_dcn20.h | 2 - + .../amd/display/dc/gpio/dcn21/hw_factory_dcn21.c | 2 - + .../amd/display/dc/gpio/dcn21/hw_factory_dcn21.h | 2 - + .../amd/display/dc/gpio/dcn21/hw_translate_dcn21.c | 2 - + .../amd/display/dc/gpio/dcn21/hw_translate_dcn21.h | 2 - + drivers/gpu/drm/amd/display/dc/gpio/ddc_regs.h | 12 - + drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c | 16 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 12 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_generic.c | 23 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c | 32 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 12 +- + drivers/gpu/drm/amd/display/dc/inc/core_status.h | 2 - + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 36 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 11 +- + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 7 +- + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 12 - + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 4 - + drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 12 - + drivers/gpu/drm/amd/display/dc/inc/hw/dsc.h | 2 - + drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h | 12 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 15 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 17 +- + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 9 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 2 - + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 10 - + drivers/gpu/drm/amd/display/dc/inc/hw/opp.h | 5 +- + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 11 +- + .../drm/amd/display/dc/inc/hw/timing_generator.h | 8 - + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 362 ++------ + .../drm/amd/display/dc/inc/hw_sequencer_private.h | 156 ++++ + drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 6 +- + drivers/gpu/drm/amd/display/dc/inc/reg_helper.h | 19 + + drivers/gpu/drm/amd/display/dc/inc/resource.h | 4 - + drivers/gpu/drm/amd/display/dc/irq/Makefile | 6 +- + .../amd/display/dc/irq/dce110/irq_service_dce110.c | 8 +- + .../amd/display/dc/irq/dce120/irq_service_dce120.c | 4 +- + .../amd/display/dc/irq/dce80/irq_service_dce80.c | 4 +- + .../amd/display/dc/irq/dcn10/irq_service_dcn10.c | 4 +- + .../amd/display/dc/irq/dcn20/irq_service_dcn20.c | 4 +- + .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 4 +- + drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 2 +- + drivers/gpu/drm/amd/display/dc/os_types.h | 3 +- + .../display/dc/virtual/virtual_stream_encoder.c | 9 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 255 ++++++ + .../gpu/drm/amd/display/dmub/inc/dmub_cmd_dal.h | 41 + + .../gpu/drm/amd/display/dmub/inc/dmub_cmd_vbios.h | 41 + + .../gpu/drm/amd/display/dmub/inc/dmub_fw_state.h | 73 ++ + drivers/gpu/drm/amd/display/dmub/inc/dmub_rb.h | 129 +++ + drivers/gpu/drm/amd/display/dmub/inc/dmub_srv.h | 522 +++++++++++ + .../drm/amd/display/dmub/inc/dmub_trace_buffer.h | 69 ++ + .../dmub/inc/dmub_types.h} | 61 +- + drivers/gpu/drm/amd/display/dmub/src/Makefile | 27 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 152 ++++ + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 63 ++ + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.c | 141 +++ + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.h | 48 + + drivers/gpu/drm/amd/display/dmub/src/dmub_reg.c | 109 +++ + drivers/gpu/drm/amd/display/dmub/src/dmub_reg.h | 120 +++ + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 453 ++++++++++ + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 16 +- + drivers/gpu/drm/amd/display/include/dal_types.h | 4 - + .../amd/display/include/grph_object_ctrl_defs.h | 3 +- + .../drm/amd/display/include/link_service_types.h | 7 + + drivers/gpu/drm/amd/display/include/logger_types.h | 6 - + .../drm/amd/display/modules/color/color_gamma.c | 41 +- + .../drm/amd/display/modules/freesync/freesync.c | 2 +- + drivers/gpu/drm/amd/display/modules/hdcp/Makefile | 3 +- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 103 ++- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 197 ++++- + .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 40 +- + .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 886 +++++++++++++++++++ + .../amd/display/modules/hdcp/hdcp2_transition.c | 674 ++++++++++++++ + .../gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c | 326 +++++++ + .../gpu/drm/amd/display/modules/hdcp/hdcp_log.c | 118 +++ + .../gpu/drm/amd/display/modules/hdcp/hdcp_log.h | 98 ++- + .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 507 ++++++++++- + .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.h | 194 ++++ + drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 15 +- + .../drm/amd/display/modules/inc/mod_info_packet.h | 4 +- + .../gpu/drm/amd/display/modules/inc/mod_shared.h | 2 - + .../amd/display/modules/info_packet/info_packet.c | 46 +- + drivers/gpu/drm/amd/include/amd_shared.h | 5 +- + .../amd/include/asic_reg/mmhub/mmhub_1_0_offset.h | 16 + + .../amd/include/asic_reg/mmhub/mmhub_1_0_sh_mask.h | 122 +++ + .../include/asic_reg/mmhub/mmhub_9_4_0_offset.h | 53 -- + .../include/asic_reg/mmhub/mmhub_9_4_0_sh_mask.h | 257 ------ + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 4 +- + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 44 +- + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 14 +- + .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 15 +- + drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 16 + + drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c | 30 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 3 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 10 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 161 ++-- + .../gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c | 3 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 4 +- + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 9 +- + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 1 + + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 3 +- + drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h | 13 + + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 35 +- + drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 175 ++++ + drivers/gpu/drm/amd/powerplay/smu_internal.h | 4 + + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 77 +- + drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 109 ++- + drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 4 +- + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 7 +- + drivers/gpu/drm/amd/powerplay/smumgr/smu9_smumgr.c | 56 +- + .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 14 + + .../gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 27 +- + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 3 +- + drivers/gpu/drm/arc/arcpgu_crtc.c | 36 +- + drivers/gpu/drm/arc/arcpgu_regs.h | 2 +- + drivers/gpu/drm/arm/display/Kconfig | 6 - + .../gpu/drm/arm/display/include/malidp_product.h | 3 +- + drivers/gpu/drm/arm/display/komeda/Makefile | 5 +- + .../gpu/drm/arm/display/komeda/d71/d71_component.c | 22 +- + drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c | 67 +- + drivers/gpu/drm/arm/display/komeda/d71/d71_regs.h | 13 + + .../gpu/drm/arm/display/komeda/komeda_color_mgmt.c | 66 ++ + .../gpu/drm/arm/display/komeda/komeda_color_mgmt.h | 10 +- + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 + + drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 74 +- + drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 42 +- + drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 10 +- + drivers/gpu/drm/arm/display/komeda/komeda_event.c | 24 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 2 +- + .../gpu/drm/arm/display/komeda/komeda_pipeline.h | 3 + + .../drm/arm/display/komeda/komeda_pipeline_state.c | 6 + + drivers/gpu/drm/armada/armada_fbdev.c | 2 +- + drivers/gpu/drm/armada/armada_gem.c | 12 - + drivers/gpu/drm/ast/ast_drv.c | 67 +- + drivers/gpu/drm/ast/ast_drv.h | 20 +- + drivers/gpu/drm/ast/ast_main.c | 54 +- + drivers/gpu/drm/ast/ast_mode.c | 809 ++++++++++------- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 8 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 2 +- + drivers/gpu/drm/bridge/Kconfig | 18 +- + drivers/gpu/drm/bridge/Makefile | 4 +- + drivers/gpu/drm/bridge/analogix-anx78xx.h | 703 --------------- + drivers/gpu/drm/bridge/analogix/Kconfig | 23 + + drivers/gpu/drm/bridge/analogix/Makefile | 4 +- + drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 817 +++++++++++++++++ + .../drm/bridge/{ => analogix}/analogix-anx78xx.c | 146 +-- + drivers/gpu/drm/bridge/analogix/analogix-anx78xx.h | 249 ++++++ + .../gpu/drm/bridge/analogix/analogix-i2c-dptx.c | 165 ++++ + .../gpu/drm/bridge/analogix/analogix-i2c-dptx.h | 256 ++++++ + .../drm/bridge/analogix/analogix-i2c-txcommon.h | 234 +++++ + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 2 +- + drivers/gpu/drm/bridge/panel.c | 20 +- + drivers/gpu/drm/bridge/parade-ps8622.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/drm_agpsupport.c | 4 +- + drivers/gpu/drm/drm_atomic.c | 10 +- + drivers/gpu/drm/drm_atomic_helper.c | 73 +- + drivers/gpu/drm/drm_bridge.c | 280 +++--- + drivers/gpu/drm/drm_color_mgmt.c | 40 +- + drivers/gpu/drm/drm_crtc_helper.c | 2 + + drivers/gpu/drm/drm_dp_mst_topology.c | 73 +- + drivers/gpu/drm/drm_edid.c | 60 +- + drivers/gpu/drm/drm_encoder.c | 15 +- + drivers/gpu/drm/drm_fb_helper.c | 166 +--- + drivers/gpu/drm/drm_file.c | 2 +- + drivers/gpu/drm/drm_fourcc.c | 8 +- + drivers/gpu/drm/drm_gem.c | 3 - + drivers/gpu/drm/drm_gem_shmem_helper.c | 3 + + drivers/gpu/drm/drm_internal.h | 22 + + drivers/gpu/drm/drm_ioctl.c | 4 +- + drivers/gpu/drm/drm_mipi_dsi.c | 57 +- + drivers/gpu/drm/drm_mode_config.c | 28 + + drivers/gpu/drm/drm_mode_object.c | 14 + + drivers/gpu/drm/drm_of.c | 116 +++ + drivers/gpu/drm/drm_panel.c | 109 ++- + drivers/gpu/drm/drm_pci.c | 17 +- + drivers/gpu/drm/drm_prime.c | 9 +- + drivers/gpu/drm/drm_print.c | 18 +- + drivers/gpu/drm/drm_probe_helper.c | 4 +- + drivers/gpu/drm/drm_rect.c | 42 +- + drivers/gpu/drm/exynos/exynos_dp.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_dpi.c | 4 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 15 +- + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 2 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 6 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 2 +- + drivers/gpu/drm/gma500/accel_2d.c | 15 +- + drivers/gpu/drm/gma500/cdv_intel_display.c | 8 +- + drivers/gpu/drm/gma500/cdv_intel_dp.c | 3 - + drivers/gpu/drm/gma500/framebuffer.c | 135 ++- + drivers/gpu/drm/gma500/framebuffer.h | 15 - + drivers/gpu/drm/gma500/gma_display.c | 48 + + drivers/gpu/drm/gma500/gma_display.h | 6 + + drivers/gpu/drm/gma500/mdfld_intel_display.c | 23 - + drivers/gpu/drm/gma500/oaktrail_hdmi.c | 4 +- + drivers/gpu/drm/gma500/oaktrail_lvds.c | 1 + + drivers/gpu/drm/gma500/psb_drv.c | 44 +- + drivers/gpu/drm/gma500/psb_drv.h | 8 +- + drivers/gpu/drm/gma500/psb_intel_display.c | 1 + + drivers/gpu/drm/gma500/psb_intel_drv.h | 3 + + drivers/gpu/drm/gma500/psb_irq.c | 20 +- + drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c | 88 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 2 +- + drivers/gpu/drm/i810/i810_dma.c | 2 +- + drivers/gpu/drm/i810/i810_drv.c | 3 +- + drivers/gpu/drm/i915/display/intel_display.c | 4 +- + drivers/gpu/drm/i915/display/intel_dp.c | 2 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 36 - + .../gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 101 --- + drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c | 16 - + drivers/gpu/drm/i915/i915_drv.c | 2 +- + drivers/gpu/drm/i915/i915_gem.h | 2 +- + drivers/gpu/drm/i915/i915_utils.c | 2 +- + drivers/gpu/drm/i915/intel_pm.c | 2 +- + drivers/gpu/drm/imx/imx-ldb.c | 2 +- + drivers/gpu/drm/imx/parallel-display.c | 2 +- + drivers/gpu/drm/ingenic/ingenic-drm.c | 38 +- + drivers/gpu/drm/lima/Kconfig | 2 +- + drivers/gpu/drm/mcde/mcde_display.c | 57 +- + drivers/gpu/drm/mcde/mcde_drm.h | 1 + + drivers/gpu/drm/mcde/mcde_drv.c | 18 +- + drivers/gpu/drm/mcde/mcde_dsi.c | 177 ++-- + drivers/gpu/drm/mcde/mcde_dsi_regs.h | 21 +- + drivers/gpu/drm/mediatek/Makefile | 1 - + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 16 +- + drivers/gpu/drm/mediatek/mtk_drm_fb.c | 92 -- + drivers/gpu/drm/mediatek/mtk_drm_fb.h | 13 - + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 1 - + drivers/gpu/drm/mediatek/mtk_dsi.c | 2 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 15 +- + drivers/gpu/drm/meson/Makefile | 1 + + drivers/gpu/drm/meson/meson_crtc.c | 79 +- + drivers/gpu/drm/meson/meson_drv.c | 50 +- + drivers/gpu/drm/meson/meson_drv.h | 23 + + drivers/gpu/drm/meson/meson_osd_afbcd.c | 389 ++++++++ + drivers/gpu/drm/meson/meson_osd_afbcd.h | 28 + + drivers/gpu/drm/meson/meson_plane.c | 229 ++++- + drivers/gpu/drm/meson/meson_rdma.c | 135 +++ + drivers/gpu/drm/meson/meson_rdma.h | 21 + + drivers/gpu/drm/meson/meson_registers.h | 110 +++ + drivers/gpu/drm/meson/meson_viu.c | 83 +- + drivers/gpu/drm/meson/meson_viu.h | 19 + + drivers/gpu/drm/mga/mga_drv.h | 2 +- + drivers/gpu/drm/mgag200/Kconfig | 8 +- + drivers/gpu/drm/mgag200/mgag200_cursor.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 44 +- + drivers/gpu/drm/mgag200/mgag200_i2c.c | 3 +- + drivers/gpu/drm/mgag200/mgag200_main.c | 8 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_ttm.c | 2 +- + .../gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c | 2 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 2 +- + drivers/gpu/drm/msm/edp/edp_bridge.c | 10 +- + drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 6 +- + drivers/gpu/drm/msm/msm_fbdev.c | 2 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 9 +- + drivers/gpu/drm/mxsfb/mxsfb_out.c | 2 +- + drivers/gpu/drm/nouveau/Kconfig | 2 +- + drivers/gpu/drm/nouveau/dispnv50/disp.h | 4 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 4 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 57 +- + drivers/gpu/drm/omapdrm/displays/Kconfig | 6 +- + drivers/gpu/drm/omapdrm/dss/Kconfig | 12 +- + drivers/gpu/drm/omapdrm/omap_connector.c | 3 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 4 +- + drivers/gpu/drm/omapdrm/omap_encoder.c | 3 +- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 2 +- + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 21 - + drivers/gpu/drm/panel/Kconfig | 11 + + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-arm-versatile.c | 6 +- + drivers/gpu/drm/panel/panel-boe-himax8279d.c | 978 +++++++++++++++++++++ + .../gpu/drm/panel/panel-feiyang-fy07024di26a30d.c | 16 +- + drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 19 +- + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 29 +- + drivers/gpu/drm/panel/panel-innolux-p079zca.c | 45 +- + drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 11 +- + drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c | 43 +- + drivers/gpu/drm/panel/panel-lg-lb035q02.c | 6 +- + drivers/gpu/drm/panel/panel-lg-lg4573.c | 12 +- + drivers/gpu/drm/panel/panel-lvds.c | 46 +- + drivers/gpu/drm/panel/panel-nec-nl8048hl11.c | 6 +- + drivers/gpu/drm/panel/panel-novatek-nt39016.c | 6 +- + drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 29 +- + drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 11 +- + drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c | 37 +- + .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 62 +- + .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 11 +- + drivers/gpu/drm/panel/panel-raydium-rm67191.c | 8 +- + drivers/gpu/drm/panel/panel-raydium-rm68200.c | 26 +- + drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c | 35 +- + drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 31 +- + drivers/gpu/drm/panel/panel-samsung-ld9040.c | 4 +- + drivers/gpu/drm/panel/panel-samsung-s6d16d0.c | 6 +- + drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 6 +- + drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 6 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 6 +- + drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 4 +- + drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 54 +- + drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c | 34 +- + drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c | 6 +- + drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 37 +- + drivers/gpu/drm/panel/panel-simple.c | 131 +-- + drivers/gpu/drm/panel/panel-sitronix-st7701.c | 23 +- + drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 49 +- + drivers/gpu/drm/panel/panel-sony-acx565akm.c | 6 +- + drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 20 +- + drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 6 +- + drivers/gpu/drm/panel/panel-tpo-tpg110.c | 26 +- + drivers/gpu/drm/panel/panel-truly-nt35597.c | 4 +- + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 32 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 6 +- + drivers/gpu/drm/pl111/pl111_drv.c | 2 +- + drivers/gpu/drm/qxl/qxl_kms.c | 2 +- + drivers/gpu/drm/r128/Makefile | 2 +- + drivers/gpu/drm/{ => r128}/ati_pcigart.c | 5 +- + .../drm => drivers/gpu/drm/r128}/ati_pcigart.h | 0 + drivers/gpu/drm/r128/r128_drv.c | 2 +- + drivers/gpu/drm/r128/r128_drv.h | 3 +- + drivers/gpu/drm/radeon/atom.h | 1 + + drivers/gpu/drm/radeon/atombios_dp.c | 3 - + drivers/gpu/drm/radeon/atombios_encoders.c | 2 +- + drivers/gpu/drm/radeon/btc_dpm.c | 3 +- + drivers/gpu/drm/radeon/ci_dpm.c | 3 +- + drivers/gpu/drm/radeon/cik.c | 4 +- + drivers/gpu/drm/radeon/cypress_dpm.c | 2 +- + drivers/gpu/drm/radeon/evergreen.c | 2 +- + drivers/gpu/drm/radeon/kv_dpm.c | 3 +- + drivers/gpu/drm/radeon/ni.c | 4 +- + drivers/gpu/drm/radeon/ni_dpm.c | 3 +- + drivers/gpu/drm/radeon/r100.c | 6 +- + drivers/gpu/drm/radeon/r300.c | 2 +- + drivers/gpu/drm/radeon/r420.c | 2 +- + drivers/gpu/drm/radeon/r600.c | 6 +- + drivers/gpu/drm/radeon/r600_cs.c | 8 +- + drivers/gpu/drm/radeon/radeon_agp.c | 3 +- + drivers/gpu/drm/radeon/radeon_asic.c | 2 +- + drivers/gpu/drm/radeon/radeon_atombios.c | 3 +- + drivers/gpu/drm/radeon/radeon_audio.c | 2 +- + drivers/gpu/drm/radeon/radeon_bios.c | 4 +- + drivers/gpu/drm/radeon/radeon_clocks.c | 3 +- + drivers/gpu/drm/radeon/radeon_combios.c | 6 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 143 ++- + drivers/gpu/drm/radeon/radeon_cs.c | 2 +- + drivers/gpu/drm/radeon/radeon_device.c | 2 +- + drivers/gpu/drm/radeon/radeon_display.c | 4 +- + drivers/gpu/drm/radeon/radeon_encoders.c | 3 +- + drivers/gpu/drm/radeon/radeon_fb.c | 4 +- + drivers/gpu/drm/radeon/radeon_gart.c | 2 +- + drivers/gpu/drm/radeon/radeon_gem.c | 3 +- + drivers/gpu/drm/radeon/radeon_i2c.c | 2 +- + drivers/gpu/drm/radeon/radeon_irq_kms.c | 2 +- + drivers/gpu/drm/radeon/radeon_kms.c | 2 +- + drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 2 +- + drivers/gpu/drm/radeon/radeon_legacy_tv.c | 8 +- + drivers/gpu/drm/radeon/radeon_pm.c | 2 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 31 +- + drivers/gpu/drm/radeon/rs600.c | 2 +- + drivers/gpu/drm/radeon/rs690.c | 2 +- + drivers/gpu/drm/radeon/rs780_dpm.c | 3 +- + drivers/gpu/drm/radeon/rv770.c | 2 +- + drivers/gpu/drm/radeon/si.c | 4 +- + drivers/gpu/drm/radeon/si_dpm.c | 8 +- + drivers/gpu/drm/radeon/trinity_dpm.c | 3 +- + drivers/gpu/drm/rcar-du/Kconfig | 8 + + drivers/gpu/drm/rcar-du/Makefile | 1 + + drivers/gpu/drm/rcar-du/rcar_cmm.c | 217 +++++ + drivers/gpu/drm/rcar-du/rcar_cmm.h | 58 ++ + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 81 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 2 + + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 6 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.h | 2 + + drivers/gpu/drm/rcar-du/rcar_du_group.c | 10 + + drivers/gpu/drm/rcar-du/rcar_du_group.h | 2 + + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 93 +- + drivers/gpu/drm/rcar-du/rcar_du_regs.h | 5 + + drivers/gpu/drm/rcar-du/rcar_lvds.c | 320 ++++--- + drivers/gpu/drm/rockchip/Kconfig | 8 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 2 +- + drivers/gpu/drm/rockchip/inno_hdmi.c | 6 +- + drivers/gpu/drm/rockchip/rk3066_hdmi.c | 7 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 54 +- + drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_lvds.c | 2 +- + drivers/gpu/drm/savage/savage_drv.c | 2 +- + drivers/gpu/drm/scheduler/sched_main.c | 27 + + drivers/gpu/drm/selftests/Makefile | 3 +- + drivers/gpu/drm/selftests/drm_modeset_selftests.h | 4 + + .../gpu/drm/selftests/test-drm_modeset_common.h | 7 + + drivers/gpu/drm/selftests/test-drm_rect.c | 223 +++++ + drivers/gpu/drm/sis/sis_drv.c | 2 +- + drivers/gpu/drm/sti/sti_dvo.c | 2 +- + drivers/gpu/drm/sun4i/Kconfig | 16 +- + drivers/gpu/drm/sun4i/sun4i_layer.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_lvds.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 2 +- + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 2 +- + drivers/gpu/drm/sun4i/sun8i_mixer.c | 8 +- + drivers/gpu/drm/tdfx/tdfx_drv.c | 2 +- + drivers/gpu/drm/tegra/fb.c | 2 +- + drivers/gpu/drm/tegra/gem.c | 40 - + drivers/gpu/drm/tegra/output.c | 2 +- + drivers/gpu/drm/tilcdc/Makefile | 1 - + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 11 +- + drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 379 -------- + drivers/gpu/drm/tilcdc/tilcdc_tfp410.h | 15 - + drivers/gpu/drm/tiny/st7586.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 36 - + drivers/gpu/drm/ttm/ttm_bo_util.c | 1 - + drivers/gpu/drm/ttm/ttm_bo_vm.c | 27 +- + drivers/gpu/drm/ttm/ttm_tt.c | 5 +- + drivers/gpu/drm/tve200/tve200_drv.c | 2 +- + drivers/gpu/drm/udl/Kconfig | 3 +- + drivers/gpu/drm/udl/Makefile | 2 +- + drivers/gpu/drm/udl/udl_connector.c | 21 +- + drivers/gpu/drm/udl/udl_dmabuf.c | 255 ------ + drivers/gpu/drm/udl/udl_drv.c | 47 +- + drivers/gpu/drm/udl/udl_drv.h | 85 +- + drivers/gpu/drm/udl/udl_encoder.c | 70 -- + drivers/gpu/drm/udl/udl_fb.c | 527 ----------- + drivers/gpu/drm/udl/udl_gem.c | 253 ++---- + drivers/gpu/drm/udl/udl_main.c | 9 - + drivers/gpu/drm/udl/udl_modeset.c | 378 ++++---- + drivers/gpu/drm/udl/udl_transfer.c | 12 +- + drivers/gpu/drm/vc4/Kconfig | 8 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 18 +- + drivers/gpu/drm/via/via_dmablit.c | 2 +- + drivers/gpu/drm/via/via_drv.c | 2 +- + drivers/gpu/drm/via/via_map.c | 3 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 5 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 22 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 70 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 19 +- + drivers/gpu/drm/vkms/vkms_composer.c | 8 +- + drivers/gpu/drm/vkms/vkms_drv.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_prime.c | 33 - + drivers/gpu/drm/xen/xen_drm_front_kms.c | 9 +- + drivers/gpu/host1x/job.c | 21 +- + drivers/gpu/vga/Kconfig | 2 +- + drivers/hid/hid-picolcd_fb.c | 3 +- + .../media/common/videobuf2/videobuf2-dma-contig.c | 8 - + drivers/media/common/videobuf2/videobuf2-dma-sg.c | 8 - + drivers/media/common/videobuf2/videobuf2-vmalloc.c | 8 - + drivers/media/pci/ivtv/ivtvfb.c | 3 +- + drivers/media/platform/vivid/vivid-osd.c | 3 +- + drivers/misc/fastrpc.c | 8 - + drivers/staging/android/ion/ion.c | 14 - + drivers/tee/tee_shm.c | 6 - + drivers/video/fbdev/68328fb.c | 2 +- + drivers/video/fbdev/acornfb.c | 2 +- + drivers/video/fbdev/amba-clcd.c | 2 +- + drivers/video/fbdev/amifb.c | 2 +- + drivers/video/fbdev/arcfb.c | 2 +- + drivers/video/fbdev/arkfb.c | 2 +- + drivers/video/fbdev/asiliantfb.c | 2 +- + drivers/video/fbdev/atmel_lcdfb.c | 2 +- + drivers/video/fbdev/aty/aty128fb.c | 2 +- + drivers/video/fbdev/aty/atyfb.h | 2 +- + drivers/video/fbdev/aty/atyfb_base.c | 6 +- + drivers/video/fbdev/aty/mach64_cursor.c | 4 +- + drivers/video/fbdev/aty/radeon_base.c | 2 +- + drivers/video/fbdev/au1100fb.c | 2 +- + drivers/video/fbdev/au1200fb.c | 2 +- + drivers/video/fbdev/broadsheetfb.c | 2 +- + drivers/video/fbdev/bw2.c | 2 +- + drivers/video/fbdev/carminefb.c | 2 +- + drivers/video/fbdev/cg14.c | 2 +- + drivers/video/fbdev/cg3.c | 2 +- + drivers/video/fbdev/cg6.c | 2 +- + drivers/video/fbdev/chipsfb.c | 2 +- + drivers/video/fbdev/cirrusfb.c | 2 +- + drivers/video/fbdev/clps711x-fb.c | 2 +- + drivers/video/fbdev/cobalt_lcdfb.c | 2 +- + drivers/video/fbdev/controlfb.c | 2 +- + drivers/video/fbdev/core/fb_defio.c | 3 - + drivers/video/fbdev/core/fbmem.c | 22 +- + drivers/video/fbdev/cyber2000fb.c | 2 +- + drivers/video/fbdev/da8xx-fb.c | 2 +- + drivers/video/fbdev/dnfb.c | 2 +- + drivers/video/fbdev/efifb.c | 2 +- + drivers/video/fbdev/ep93xx-fb.c | 2 +- + drivers/video/fbdev/fb-puv3.c | 2 +- + drivers/video/fbdev/ffb.c | 2 +- + drivers/video/fbdev/fm2fb.c | 2 +- + drivers/video/fbdev/fsl-diu-fb.c | 2 +- + drivers/video/fbdev/g364fb.c | 2 +- + drivers/video/fbdev/gbefb.c | 2 +- + drivers/video/fbdev/geode/gx1fb_core.c | 2 +- + drivers/video/fbdev/geode/gxfb_core.c | 2 +- + drivers/video/fbdev/geode/lxfb_core.c | 2 +- + drivers/video/fbdev/goldfishfb.c | 2 +- + drivers/video/fbdev/grvga.c | 2 +- + drivers/video/fbdev/gxt4500.c | 2 +- + drivers/video/fbdev/hecubafb.c | 2 +- + drivers/video/fbdev/hgafb.c | 2 +- + drivers/video/fbdev/hitfb.c | 2 +- + drivers/video/fbdev/hpfb.c | 2 +- + drivers/video/fbdev/hyperv_fb.c | 2 +- + drivers/video/fbdev/i740fb.c | 2 +- + drivers/video/fbdev/imsttfb.c | 2 +- + drivers/video/fbdev/imxfb.c | 2 +- + drivers/video/fbdev/intelfb/intelfb.h | 2 +- + drivers/video/fbdev/intelfb/intelfbdrv.c | 2 +- + drivers/video/fbdev/kyro/fbdev.c | 2 +- + drivers/video/fbdev/leo.c | 2 +- + drivers/video/fbdev/macfb.c | 2 +- + drivers/video/fbdev/matrox/matroxfb_crtc2.c | 2 +- + drivers/video/fbdev/maxinefb.c | 2 +- + drivers/video/fbdev/mb862xx/mb862xxfb.h | 2 +- + drivers/video/fbdev/mb862xx/mb862xxfb_accel.c | 15 +- + drivers/video/fbdev/mb862xx/mb862xxfbdrv.c | 4 +- + drivers/video/fbdev/mbx/mbxfb.c | 2 +- + drivers/video/fbdev/metronomefb.c | 2 +- + drivers/video/fbdev/mmp/fb/mmpfb.c | 2 +- + drivers/video/fbdev/mx3fb.c | 5 +- + drivers/video/fbdev/neofb.c | 2 +- + drivers/video/fbdev/nvidia/nvidia.c | 20 +- + drivers/video/fbdev/ocfb.c | 2 +- + drivers/video/fbdev/offb.c | 2 +- + drivers/video/fbdev/omap/omapfb_main.c | 2 +- + drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 2 +- + drivers/video/fbdev/p9100.c | 2 +- + drivers/video/fbdev/platinumfb.c | 2 +- + drivers/video/fbdev/pm2fb.c | 2 +- + drivers/video/fbdev/pm3fb.c | 2 +- + drivers/video/fbdev/pmag-aa-fb.c | 2 +- + drivers/video/fbdev/pmag-ba-fb.c | 2 +- + drivers/video/fbdev/pmagb-b-fb.c | 2 +- + drivers/video/fbdev/ps3fb.c | 2 +- + drivers/video/fbdev/pvr2fb.c | 2 +- + drivers/video/fbdev/pxa168fb.c | 2 +- + drivers/video/fbdev/pxafb.c | 4 +- + drivers/video/fbdev/q40fb.c | 2 +- + drivers/video/fbdev/riva/fbdev.c | 2 +- + drivers/video/fbdev/s3c-fb.c | 2 +- + drivers/video/fbdev/s3c2410fb.c | 2 +- + drivers/video/fbdev/s3fb.c | 2 +- + drivers/video/fbdev/sa1100fb.c | 2 +- + drivers/video/fbdev/savage/savagefb_driver.c | 2 +- + drivers/video/fbdev/sh7760fb.c | 2 +- + drivers/video/fbdev/sh_mobile_lcdcfb.c | 4 +- + drivers/video/fbdev/simplefb.c | 2 +- + drivers/video/fbdev/sis/sis_main.c | 2 +- + drivers/video/fbdev/skeletonfb.c | 2 +- + drivers/video/fbdev/sm712fb.c | 2 +- + drivers/video/fbdev/smscufx.c | 3 +- + drivers/video/fbdev/ssd1307fb.c | 2 +- + drivers/video/fbdev/sstfb.c | 2 +- + drivers/video/fbdev/stifb.c | 2 +- + drivers/video/fbdev/sunxvr1000.c | 2 +- + drivers/video/fbdev/sunxvr2500.c | 2 +- + drivers/video/fbdev/sunxvr500.c | 2 +- + drivers/video/fbdev/tcx.c | 2 +- + drivers/video/fbdev/tdfxfb.c | 2 +- + drivers/video/fbdev/tgafb.c | 2 +- + drivers/video/fbdev/tmiofb.c | 2 +- + drivers/video/fbdev/tridentfb.c | 2 +- + drivers/video/fbdev/udlfb.c | 1 - + drivers/video/fbdev/uvesafb.c | 4 +- + drivers/video/fbdev/valkyriefb.c | 2 +- + drivers/video/fbdev/vesafb.c | 6 +- + drivers/video/fbdev/vfb.c | 2 +- + drivers/video/fbdev/vga16fb.c | 2 +- + drivers/video/fbdev/vt8500lcdfb.c | 2 +- + drivers/video/fbdev/vt8623fb.c | 2 +- + drivers/video/fbdev/w100fb.c | 2 +- + drivers/video/fbdev/wm8505fb.c | 2 +- + drivers/video/fbdev/xen-fbfront.c | 2 +- + drivers/video/fbdev/xilinxfb.c | 2 +- + drivers/xen/gntdev-dmabuf.c | 23 - + include/drm/drm_atomic.h | 30 +- + include/drm/drm_bridge.h | 136 ++- + include/drm/drm_color_mgmt.h | 25 +- + include/drm/drm_connector.h | 16 +- + include/drm/drm_dp_helper.h | 4 +- + include/drm/drm_dp_mst_helper.h | 12 +- + include/drm/drm_encoder.h | 7 +- + include/drm/drm_fb_helper.h | 40 - + include/drm/drm_gem.h | 4 +- + include/drm/drm_gem_vram_helper.h | 1 - + include/drm/drm_legacy.h | 29 +- + include/drm/drm_mipi_dsi.h | 4 + + include/drm/drm_of.h | 20 + + include/drm/drm_panel.h | 58 +- + include/drm/drm_pci.h | 19 +- + include/drm/drm_print.h | 239 ++--- + include/drm/drm_rect.h | 2 + + include/drm/drm_scdc_helper.h | 6 +- + include/drm/ttm/ttm_bo_api.h | 10 +- + include/linux/dma-buf.h | 27 - + include/linux/dma-heap.h | 59 ++ + include/linux/fb.h | 3 +- + include/linux/host1x.h | 13 - + include/linux/platform_data/tc35876x.h | 11 - + include/uapi/drm/amdgpu_drm.h | 3 + + include/uapi/linux/dma-heap.h | 53 ++ + include/video/mipi_display.h | 24 +- + samples/vfio-mdev/mbochs.c | 16 - + samples/vfio-mdev/mdpy-fb.c | 2 +- + tools/testing/selftests/dmabuf-heaps/Makefile | 6 + + tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c | 396 +++++++++ + 893 files changed, 26674 insertions(+), 12732 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/dsi-controller.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/logicpd,type28.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/sony,acx424akp.yaml + create mode 100644 Documentation/devicetree/bindings/display/renesas,cmm.yaml + delete mode 100644 Documentation/devicetree/bindings/display/tilcdc/tfp410.txt + create mode 100644 drivers/dma-buf/dma-heap.c + create mode 100644 drivers/dma-buf/heaps/Kconfig + create mode 100644 drivers/dma-buf/heaps/Makefile + create mode 100644 drivers/dma-buf/heaps/cma_heap.c + create mode 100644 drivers/dma-buf/heaps/heap-helpers.c + create mode 100644 drivers/dma-buf/heaps/heap-helpers.h + create mode 100644 drivers/dma-buf/heaps/system_heap.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.h + delete mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v10.c + rename drivers/gpu/drm/amd/amdkfd/{kfd_kernel_queue_v9.c => kfd_packet_manager_v9.c} (81%) + rename drivers/gpu/drm/amd/amdkfd/{kfd_kernel_queue_vi.c => kfd_packet_manager_vi.c} (91%) + create mode 100644 drivers/gpu/drm/amd/display/dc/basics/dc_common.c + create mode 100644 drivers/gpu/drm/amd/display/dc/basics/dc_common.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer_debug.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.h + create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw_sequencer_private.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd_dal.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd_vbios.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_fw_state.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_rb.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_srv.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_trace_buffer.h + rename drivers/gpu/drm/amd/{amdkfd/kfd_kernel_queue_cik.c => display/dmub/inc/dmub_types.h} (55%) + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_reg.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_reg.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp2_execution.c + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp2_transition.c + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_0_offset.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_0_sh_mask.h + delete mode 100644 drivers/gpu/drm/bridge/analogix-anx78xx.h + create mode 100644 drivers/gpu/drm/bridge/analogix/analogix-anx6345.c + rename drivers/gpu/drm/bridge/{ => analogix}/analogix-anx78xx.c (90%) + create mode 100644 drivers/gpu/drm/bridge/analogix/analogix-anx78xx.h + create mode 100644 drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.c + create mode 100644 drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.h + create mode 100644 drivers/gpu/drm/bridge/analogix/analogix-i2c-txcommon.h + delete mode 100644 drivers/gpu/drm/mediatek/mtk_drm_fb.c + delete mode 100644 drivers/gpu/drm/mediatek/mtk_drm_fb.h + create mode 100644 drivers/gpu/drm/meson/meson_osd_afbcd.c + create mode 100644 drivers/gpu/drm/meson/meson_osd_afbcd.h + create mode 100644 drivers/gpu/drm/meson/meson_rdma.c + create mode 100644 drivers/gpu/drm/meson/meson_rdma.h + create mode 100644 drivers/gpu/drm/panel/panel-boe-himax8279d.c + rename drivers/gpu/drm/{ => r128}/ati_pcigart.c (98%) + rename {include/drm => drivers/gpu/drm/r128}/ati_pcigart.h (100%) + create mode 100644 drivers/gpu/drm/rcar-du/rcar_cmm.c + create mode 100644 drivers/gpu/drm/rcar-du/rcar_cmm.h + create mode 100644 drivers/gpu/drm/selftests/test-drm_rect.c + delete mode 100644 drivers/gpu/drm/tilcdc/tilcdc_tfp410.c + delete mode 100644 drivers/gpu/drm/tilcdc/tilcdc_tfp410.h + delete mode 100644 drivers/gpu/drm/udl/udl_dmabuf.c + delete mode 100644 drivers/gpu/drm/udl/udl_encoder.c + delete mode 100644 drivers/gpu/drm/udl/udl_fb.c + create mode 100644 include/linux/dma-heap.h + delete mode 100644 include/linux/platform_data/tc35876x.h + create mode 100644 include/uapi/linux/dma-heap.h + create mode 100644 tools/testing/selftests/dmabuf-heaps/Makefile + create mode 100644 tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c +Merging amdgpu/drm-next (e1704989a1b9 drm/amdgpu/display: use msleep rather than udelay for HDCP) +$ git merge amdgpu/drm-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 10 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 112 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 131 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 71 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 11 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 4 +- + .../inc/dmub_fw_state.h => amdgpu/amdgpu_tmz.c} | 67 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.h | 39 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 37 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 2 + + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 11 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 61 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 31 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/mmsch_v1_0.h | 12 + + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 6 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 2 +- + drivers/gpu/drm/amd/amdgpu/nvd.h | 1 + + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 1 + + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 11 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 11 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 34 +- + drivers/gpu/drm/amd/amdgpu/si_dma.c | 11 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 9 +- + drivers/gpu/drm/amd/amdgpu/soc15d.h | 1 + + drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 17 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 90 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.h | 2 + + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 262 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 69 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 17 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2 + + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 9 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 7 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 2 + + drivers/gpu/drm/amd/display/Kconfig | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 209 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 7 + + drivers/gpu/drm/amd/display/dc/calcs/Makefile | 9 + + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 25 +- + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 46 +- + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.h | 6 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 10 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 177 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 10 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 13 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 145 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 59 +- + drivers/gpu/drm/amd/display/dc/dc.h | 5 +- + drivers/gpu/drm/amd/display/dc/dc_dsc.h | 5 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 7 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 13 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 3 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 4 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 68 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 20 + + drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 8 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c | 20 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 36 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 1 - + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.h | 180 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 24 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.h | 1 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 34 +- + drivers/gpu/drm/amd/display/dc/dcn21/Makefile | 8 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c | 314 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.h | 1 + + .../drm/amd/display/dc/dcn21/dcn21_link_encoder.h | 39 + + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 48 +- + drivers/gpu/drm/amd/display/dc/dm_services_types.h | 3 +- + drivers/gpu/drm/amd/display/dc/dml/Makefile | 9 + + .../drm/amd/display/dc/dml/display_mode_structs.h | 1 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 2 +- + drivers/gpu/drm/amd/display/dc/dsc/Makefile | 8 + + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 33 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h | 3 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 7 +- + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 6 +- + drivers/gpu/drm/amd/display/dc/inc/resource.h | 2 + + drivers/gpu/drm/amd/display/dc/os_types.h | 32 + + .../gpu/drm/amd/display/dmub/inc/dmub_fw_meta.h | 63 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_srv.h | 7 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 84 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 117 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.c | 107 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.h | 13 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_reg.h | 10 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 57 +- + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 6 +- + .../drm/amd/display/modules/color/color_gamma.c | 6 +- + .../drm/amd/display/modules/freesync/freesync.c | 32 +- + .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 1 + + .../amd/include/asic_reg/dpcs/dpcs_2_0_0_offset.h | 647 ++++ + .../amd/include/asic_reg/dpcs/dpcs_2_0_0_sh_mask.h | 3912 ++++++++++++++++++++ + .../asic_reg/{dcn => dpcs}/dpcs_2_1_0_offset.h | 0 + .../asic_reg/{dcn => dpcs}/dpcs_2_1_0_sh_mask.h | 0 + .../amd/include/asic_reg/umc/umc_6_1_2_offset.h | 31 + + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 3 - + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 3 +- + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 3 + + .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 3 + + drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 15 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 3 +- + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 3 +- + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 7 +- + drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 18 +- + drivers/gpu/drm/amd/powerplay/smu_internal.h | 4 +- + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 7 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 7 +- + drivers/gpu/drm/lima/lima_sched.c | 5 +- + drivers/gpu/drm/panfrost/panfrost_job.c | 8 +- + drivers/gpu/drm/radeon/atombios_i2c.c | 5 - + drivers/gpu/drm/scheduler/sched_entity.c | 77 +- + drivers/gpu/drm/v3d/v3d_drv.c | 8 +- + include/drm/gpu_scheduler.h | 8 +- + include/drm/task_barrier.h | 107 + + include/uapi/drm/amdgpu_drm.h | 10 +- + include/uapi/linux/kfd_ioctl.h | 19 +- + 155 files changed, 7440 insertions(+), 1018 deletions(-) + rename drivers/gpu/drm/amd/{display/dmub/inc/dmub_fw_state.h => amdgpu/amdgpu_tmz.c} (60%) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_fw_meta.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_2_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_2_0_0_sh_mask.h + rename drivers/gpu/drm/amd/include/asic_reg/{dcn => dpcs}/dpcs_2_1_0_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{dcn => dpcs}/dpcs_2_1_0_sh_mask.h (100%) + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_1_2_offset.h + create mode 100644 include/drm/task_barrier.h +Merging drm-intel/for-linux-next (7d1ff0d9faf6 drm/i915/gt: Add breadcrumb retire to physical engine) +$ git merge drm-intel/for-linux-next +Removing drivers/gpu/drm/i915/selftests/mock_drm.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/i915_sw_fence_work.c +Auto-merging drivers/gpu/drm/i915/i915_scheduler.c +Auto-merging drivers/gpu/drm/i915/i915_request.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_perf.c +Auto-merging drivers/gpu/drm/i915/i915_gem.h +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/gvt/hypercall.h +Removing drivers/gpu/drm/i915/gt/uc/selftest_guc.c +Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.c +Auto-merging drivers/gpu/drm/i915/display/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/display/intel_hdcp.c +Auto-merging drivers/gpu/drm/i915/display/intel_fbc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_fbc.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_power.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c +Auto-merging drivers/gpu/drm/drm_file.c +Auto-merging drivers/gpu/drm/Kconfig +Resolved 'drivers/gpu/drm/i915/display/intel_fbc.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/gt/intel_lrc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master dadf05112e51] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/i915.rst | 3 - + drivers/acpi/acpi_lpss.c | 11 +- + drivers/gpu/drm/Kconfig | 4 + + drivers/gpu/drm/drm_atomic_state_helper.c | 78 +- + drivers/gpu/drm/drm_file.c | 42 + + drivers/gpu/drm/i915/Kconfig.debug | 2 + + drivers/gpu/drm/i915/Makefile | 1 + + drivers/gpu/drm/i915/display/icl_dsi.c | 232 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 53 +- + drivers/gpu/drm/i915/display/intel_atomic.h | 2 + + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 136 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 5 +- + drivers/gpu/drm/i915/display/intel_audio.c | 12 +- + drivers/gpu/drm/i915/display/intel_bios.c | 563 +++-- + drivers/gpu/drm/i915/display/intel_bios.h | 5 + + drivers/gpu/drm/i915/display/intel_bw.c | 31 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 20 +- + drivers/gpu/drm/i915/display/intel_color.c | 198 +- + drivers/gpu/drm/i915/display/intel_crt.c | 34 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 412 ++-- + drivers/gpu/drm/i915/display/intel_ddi.h | 2 +- + drivers/gpu/drm/i915/display/intel_display.c | 2533 ++++++++++---------- + drivers/gpu/drm/i915/display/intel_display.h | 42 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 75 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 75 +- + drivers/gpu/drm/i915/display/intel_dp.c | 149 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 81 +- + drivers/gpu/drm/i915/display/intel_dpio_phy.c | 14 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 20 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 37 +- + drivers/gpu/drm/i915/display/intel_dsb.h | 2 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 14 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 309 +-- + drivers/gpu/drm/i915/display/intel_fbc.h | 11 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.c | 16 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.h | 34 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 2 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 87 +- + drivers/gpu/drm/i915/display/intel_lspcon.c | 4 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 12 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 7 + + drivers/gpu/drm/i915/display/intel_overlay.c | 23 +- + drivers/gpu/drm/i915/display/intel_panel.c | 30 +- + drivers/gpu/drm/i915/display/intel_pipe_crc.c | 6 +- + drivers/gpu/drm/i915/display/intel_psr.c | 153 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 29 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 383 +-- + drivers/gpu/drm/i915/display/intel_tv.c | 8 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 62 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 303 ++- + drivers/gpu/drm/i915/display/intel_vdsc.h | 11 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 30 +- + drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 14 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 149 +- + drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 21 +- + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 188 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 312 +-- + drivers/gpu/drm/i915/gem/i915_gem_ioctls.h | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 3 - + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 471 +++- + drivers/gpu/drm/i915/gem/i915_gem_mman.h | 31 + + drivers/gpu/drm/i915/gem/i915_gem_object.c | 69 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 57 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 31 +- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 12 +- + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_pm.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_region.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 5 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 219 +- + drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 18 +- + .../gpu/drm/i915/gem/selftests/huge_gem_object.c | 11 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 20 +- + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 2 + + .../drm/i915/gem/selftests/i915_gem_coherency.c | 5 +- + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 166 +- + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 315 ++- + .../drm/i915/gem/selftests/i915_gem_object_blt.c | 125 +- + drivers/gpu/drm/i915/gem/selftests/mock_context.c | 9 +- + drivers/gpu/drm/i915/gem/selftests/mock_context.h | 5 +- + drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.h | 2 +- + drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 62 +- + drivers/gpu/drm/i915/gt/intel_context.c | 38 +- + drivers/gpu/drm/i915/gt/intel_context.h | 7 + + drivers/gpu/drm/i915/gt/intel_context_types.h | 1 + + drivers/gpu/drm/i915/gt/intel_engine.h | 13 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 38 +- + drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 20 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 30 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.h | 21 + + drivers/gpu/drm/i915/gt/intel_engine_types.h | 11 + + drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 29 + + drivers/gpu/drm/i915/gt/intel_gt.c | 5 +- + drivers/gpu/drm/i915/gt/intel_gt.h | 6 + + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 12 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 29 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.h | 5 + + drivers/gpu/drm/i915/gt/intel_gt_requests.c | 24 +- + drivers/gpu/drm/i915/gt/intel_gt_requests.h | 1 + + drivers/gpu/drm/i915/gt/intel_lrc.c | 253 +- + drivers/gpu/drm/i915/gt/intel_lrc_reg.h | 4 +- + drivers/gpu/drm/i915/gt/intel_mocs.c | 161 +- + drivers/gpu/drm/i915/gt/intel_rc6.c | 149 +- + drivers/gpu/drm/i915/gt/intel_rc6.h | 6 +- + drivers/gpu/drm/i915/gt/intel_rc6_types.h | 4 +- + drivers/gpu/drm/i915/gt/intel_renderstate.c | 97 +- + drivers/gpu/drm/i915/gt/intel_renderstate.h | 17 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 39 +- + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 185 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 121 +- + drivers/gpu/drm/i915/gt/intel_rps.h | 3 +- + drivers/gpu/drm/i915/gt/intel_timeline.c | 90 +- + drivers/gpu/drm/i915/gt/intel_timeline.h | 4 +- + drivers/gpu/drm/i915/gt/intel_timeline_types.h | 12 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 47 +- + drivers/gpu/drm/i915/gt/mock_engine.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_context.c | 71 +- + drivers/gpu/drm/i915/gt/selftest_engine_cs.c | 360 ++- + .../gpu/drm/i915/gt/selftest_engine_heartbeat.c | 33 +- + drivers/gpu/drm/i915/gt/selftest_gt_pm.c | 19 + + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 16 +- + drivers/gpu/drm/i915/gt/selftest_lrc.c | 357 ++- + drivers/gpu/drm/i915/gt/selftest_mocs.c | 421 ++++ + drivers/gpu/drm/i915/gt/selftest_rc6.c | 204 ++ + drivers/gpu/drm/i915/gt/selftest_rc6.h | 13 + + drivers/gpu/drm/i915/gt/selftest_timeline.c | 6 +- + drivers/gpu/drm/i915/gt/selftest_workarounds.c | 4 +- + drivers/gpu/drm/i915/gt/selftests/mock_timeline.c | 2 +- + drivers/gpu/drm/i915/gt/selftests/mock_timeline.h | 2 + + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 69 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 46 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 24 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 309 +-- + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.h | 52 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 1 - + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 718 +----- + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.h | 54 +- + drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 50 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 53 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 5 +- + drivers/gpu/drm/i915/gt/uc/selftest_guc.c | 299 --- + drivers/gpu/drm/i915/gvt/cmd_parser.h | 4 + + drivers/gpu/drm/i915/gvt/display.h | 5 + + drivers/gpu/drm/i915/gvt/edid.h | 4 + + drivers/gpu/drm/i915/gvt/execlist.h | 2 + + drivers/gpu/drm/i915/gvt/fb_decoder.h | 2 + + drivers/gpu/drm/i915/gvt/gtt.c | 2 +- + drivers/gpu/drm/i915/gvt/hypercall.h | 4 + + drivers/gpu/drm/i915/gvt/interrupt.h | 3 + + drivers/gpu/drm/i915/gvt/mmio.h | 2 + + drivers/gpu/drm/i915/gvt/page_track.h | 3 + + drivers/gpu/drm/i915/gvt/sched_policy.h | 3 + + drivers/gpu/drm/i915/i915_active.c | 121 +- + drivers/gpu/drm/i915/i915_active.h | 28 +- + drivers/gpu/drm/i915/i915_active_types.h | 15 - + drivers/gpu/drm/i915/i915_cmd_parser.c | 318 +-- + drivers/gpu/drm/i915/i915_debugfs.c | 343 ++- + drivers/gpu/drm/i915/i915_drv.c | 27 +- + drivers/gpu/drm/i915/i915_drv.h | 84 +- + drivers/gpu/drm/i915/i915_gem.c | 112 +- + drivers/gpu/drm/i915/i915_gem.h | 8 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 39 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 73 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 1 + + drivers/gpu/drm/i915/i915_getparam.c | 1 + + drivers/gpu/drm/i915/i915_globals.c | 53 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 10 +- + drivers/gpu/drm/i915/i915_irq.c | 66 +- + drivers/gpu/drm/i915/i915_memcpy.c | 75 +- + drivers/gpu/drm/i915/i915_memcpy.h | 2 + + drivers/gpu/drm/i915/i915_pci.c | 21 +- + drivers/gpu/drm/i915/i915_perf.c | 40 +- + drivers/gpu/drm/i915/i915_perf.h | 2 + + drivers/gpu/drm/i915/i915_perf_types.h | 1 - + drivers/gpu/drm/i915/i915_pmu.c | 136 +- + drivers/gpu/drm/i915/i915_pmu.h | 2 +- + drivers/gpu/drm/i915/i915_reg.h | 142 +- + drivers/gpu/drm/i915/i915_request.c | 129 +- + drivers/gpu/drm/i915/i915_request.h | 16 +- + drivers/gpu/drm/i915/i915_scheduler.c | 12 + + drivers/gpu/drm/i915/i915_scheduler.h | 1 + + drivers/gpu/drm/i915/i915_selftest.h | 4 + + drivers/gpu/drm/i915/i915_sw_fence.c | 40 +- + drivers/gpu/drm/i915/i915_sw_fence.h | 5 +- + drivers/gpu/drm/i915/i915_sw_fence_work.c | 15 +- + drivers/gpu/drm/i915/i915_sysfs.c | 31 +- + drivers/gpu/drm/i915/i915_trace.h | 6 +- + drivers/gpu/drm/i915/i915_utils.h | 2 +- + drivers/gpu/drm/i915/i915_vma.c | 72 +- + drivers/gpu/drm/i915/i915_vma.h | 4 + + drivers/gpu/drm/i915/intel_device_info.c | 35 +- + drivers/gpu/drm/i915/intel_device_info.h | 9 +- + drivers/gpu/drm/i915/intel_memory_region.c | 3 + + drivers/gpu/drm/i915/intel_pch.c | 1 + + drivers/gpu/drm/i915/intel_pch.h | 1 + + drivers/gpu/drm/i915/intel_pm.c | 312 +-- + drivers/gpu/drm/i915/intel_pm.h | 2 +- + drivers/gpu/drm/i915/intel_region_lmem.c | 6 +- + drivers/gpu/drm/i915/intel_wakeref.h | 19 +- + drivers/gpu/drm/i915/selftests/i915_active.c | 43 +- + drivers/gpu/drm/i915/selftests/i915_gem.c | 8 +- + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 8 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 31 +- + .../gpu/drm/i915/selftests/i915_live_selftests.h | 4 +- + drivers/gpu/drm/i915/selftests/i915_perf.c | 2 +- + .../gpu/drm/i915/selftests/i915_perf_selftests.h | 13 + + drivers/gpu/drm/i915/selftests/i915_request.c | 123 +- + drivers/gpu/drm/i915/selftests/i915_selftest.c | 43 + + drivers/gpu/drm/i915/selftests/igt_mmap.c | 39 + + drivers/gpu/drm/i915/selftests/igt_mmap.h | 19 + + drivers/gpu/drm/i915/selftests/igt_spinner.c | 40 +- + .../gpu/drm/i915/selftests/intel_memory_region.c | 10 +- + drivers/gpu/drm/i915/selftests/mock_drm.c | 73 - + drivers/gpu/drm/i915/selftests/mock_drm.h | 17 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 7 +- + drivers/gpu/drm/i915/selftests/mock_gtt.h | 3 + + drivers/gpu/drm/i915/selftests/mock_region.h | 5 + + drivers/gpu/drm/i915/selftests/mock_uncore.h | 3 + + drivers/mfd/intel_soc_pmic_core.c | 2 +- + include/drm/drm_atomic_state_helper.h | 6 + + include/drm/drm_file.h | 3 + + include/drm/drm_util.h | 2 +- + include/drm/i915_pciids.h | 31 +- + include/linux/lockdep.h | 8 + + include/uapi/drm/i915_drm.h | 32 + + 228 files changed, 9957 insertions(+), 6516 deletions(-) + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_mman.h + create mode 100644 drivers/gpu/drm/i915/gt/selftest_mocs.c + create mode 100644 drivers/gpu/drm/i915/gt/selftest_rc6.c + create mode 100644 drivers/gpu/drm/i915/gt/selftest_rc6.h + delete mode 100644 drivers/gpu/drm/i915/gt/uc/selftest_guc.c + create mode 100644 drivers/gpu/drm/i915/selftests/i915_perf_selftests.h + create mode 100644 drivers/gpu/drm/i915/selftests/igt_mmap.c + create mode 100644 drivers/gpu/drm/i915/selftests/igt_mmap.h + delete mode 100644 drivers/gpu/drm/i915/selftests/mock_drm.c +Merging drm-tegra/drm/tegra/for-next (d66dfcf80d0f drm/tegra: Run hub cleanup on ->remove()) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (93ccfa9a4eca drm/todo: Updating logging todo) +$ git merge drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/mediatek/mtk_drm_plane.c +Auto-merging drivers/gpu/drm/mcde/mcde_dsi.c +Removing drivers/gpu/drm/bridge/lvds-encoder.c +Removing Documentation/devicetree/bindings/display/bridge/ti,ds90c185.txt +Removing Documentation/devicetree/bindings/display/bridge/thine,thc63lvdm83d.txt +Removing Documentation/devicetree/bindings/display/bridge/lvds-transmitter.txt +Merge made by the 'recursive' strategy. + .../bindings/display/bridge/lvds-codec.yaml | 131 +++++++++++ + .../bindings/display/bridge/lvds-transmitter.txt | 66 ------ + .../bindings/display/bridge/thine,thc63lvdm83d.txt | 50 ----- + .../bindings/display/bridge/ti,ds90c185.txt | 55 ----- + .../display/rockchip/dw_mipi_dsi_rockchip.txt | 13 +- + Documentation/fb/modedb.rst | 3 + + Documentation/gpu/todo.rst | 8 +- + drivers/dma-buf/dma-heap.c | 9 +- + drivers/dma-buf/heaps/system_heap.c | 2 +- + drivers/dma-buf/udmabuf.c | 7 +- + drivers/gpu/drm/arm/malidp_planes.c | 2 +- + drivers/gpu/drm/bochs/bochs_hw.c | 2 +- + drivers/gpu/drm/bridge/Kconfig | 8 +- + drivers/gpu/drm/bridge/Makefile | 2 +- + drivers/gpu/drm/bridge/lvds-codec.c | 151 +++++++++++++ + drivers/gpu/drm/bridge/lvds-encoder.c | 155 ------------- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 40 ++-- + drivers/gpu/drm/drm_client.c | 10 +- + drivers/gpu/drm/drm_drv.c | 5 +- + drivers/gpu/drm/drm_edid.c | 217 ++++++++++++++++-- + drivers/gpu/drm/drm_fb_helper.c | 36 +-- + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 5 +- + drivers/gpu/drm/drm_modes.c | 246 ++++++++++----------- + drivers/gpu/drm/drm_panel.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 8 +- + drivers/gpu/drm/gma500/accel_2d.c | 6 +- + drivers/gpu/drm/mcde/mcde_dsi.c | 239 ++++++++++++++++---- + drivers/gpu/drm/mcde/mcde_dsi_regs.h | 1 + + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 2 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 10 +- + drivers/gpu/drm/rockchip/Kconfig | 1 + + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 173 ++++++++++++++- + drivers/gpu/drm/selftests/drm_cmdline_selftests.h | 5 + + .../gpu/drm/selftests/test-drm_cmdline_parser.c | 122 ++++++++++ + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 13 ++ + drivers/gpu/drm/vc4/vc4_gem.c | 11 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 5 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 25 +-- + drivers/gpu/drm/virtio/virtgpu_fence.c | 5 +- + drivers/gpu/drm/virtio/virtgpu_gem.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 84 ++++--- + drivers/gpu/drm/virtio/virtgpu_vq.c | 23 +- + include/drm/bridge/dw_mipi_dsi.h | 9 + + include/drm/drm_connector.h | 8 + + include/drm/drm_panel.h | 2 +- + include/drm/drm_print.h | 65 ++++++ + include/uapi/linux/dma-heap.h | 4 +- + tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c | 2 +- + 48 files changed, 1381 insertions(+), 671 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/lvds-codec.yaml + delete mode 100644 Documentation/devicetree/bindings/display/bridge/lvds-transmitter.txt + delete mode 100644 Documentation/devicetree/bindings/display/bridge/thine,thc63lvdm83d.txt + delete mode 100644 Documentation/devicetree/bindings/display/bridge/ti,ds90c185.txt + create mode 100644 drivers/gpu/drm/bridge/lvds-codec.c + delete mode 100644 drivers/gpu/drm/bridge/lvds-encoder.c +Merging drm-msm/msm-next (e20c9284c8f2 drm/msm/adreno: Add support for Adreno 510 GPU) +$ git merge drm-msm/msm-next +Already up to date. +Merging mali-dp/for-upstream/mali-dp (f634c6a80287 dt/bindings: display: Add optional property node define for Mali DP500) +$ git merge mali-dp/for-upstream/mali-dp +Merge made by the 'recursive' strategy. +Merging imx-drm/imx-drm/next (4d24376370fb gpu: ipu-v3: image-convert: only sample into the next tile if necessary) +$ git merge imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (22567d017c2c dt-bindings: etnaviv: Add #cooling-cells) +$ git merge etnaviv/etnaviv/next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/display/etnaviv/etnaviv-drm.txt | 1 + + 1 file changed, 1 insertion(+) +Merging regmap/for-next (e42617b825f8 Linux 5.5-rc1) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (a032ff0e8065 Merge branch 'for-linus' into for-next) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + Documentation/sound/alsa-configuration.rst | 3 +- + include/sound/hda_codec.h | 1 - + include/sound/hdaudio.h | 2 + + include/sound/pcm.h | 74 ++++++-- + include/sound/soc-component.h | 4 +- + include/sound/timer.h | 4 +- + include/uapi/sound/asound.h | 145 +++++++++++++-- + sound/aoa/soundbus/i2sbus/pcm.c | 13 +- + sound/arm/aaci.c | 42 ++--- + sound/arm/pxa2xx-ac97.c | 1 - + sound/atmel/ac97c.c | 22 +-- + sound/core/pcm.c | 12 +- + sound/core/pcm_compat.c | 282 +++++++---------------------- + sound/core/pcm_lib.c | 39 ++-- + sound/core/pcm_native.c | 226 ++++++++++++++++++++--- + sound/core/rawmidi.c | 132 +++++++++++--- + sound/core/rawmidi_compat.c | 87 +++------ + sound/core/timer.c | 230 +++++++++++++++++------ + sound/core/timer_compat.c | 62 +------ + sound/drivers/aloop.c | 15 +- + sound/drivers/dummy.c | 16 +- + sound/drivers/ml403-ac97cr.c | 31 +--- + sound/drivers/pcsp/pcsp_lib.c | 18 +- + sound/drivers/vx/vx_pcm.c | 29 +-- + sound/firewire/bebob/bebob_pcm.c | 13 +- + sound/firewire/dice/dice-pcm.c | 15 +- + sound/firewire/digi00x/digi00x-pcm.c | 13 +- + sound/firewire/fireface/ff-pcm.c | 13 +- + sound/firewire/fireworks/fireworks_pcm.c | 13 +- + sound/firewire/isight.c | 11 +- + sound/firewire/motu/motu-pcm.c | 13 +- + sound/firewire/oxfw/oxfw-pcm.c | 21 +-- + sound/firewire/tascam/tascam-pcm.c | 13 +- + sound/hda/hdac_bus.c | 1 + + sound/hda/hdac_controller.c | 29 ++- + sound/isa/ad1816a/ad1816a_lib.c | 23 +-- + sound/isa/cmi8330.c | 5 +- + sound/isa/es1688/es1688_lib.c | 29 +-- + sound/isa/es18xx.c | 27 +-- + sound/isa/gus/gus_main.c | 1 + + sound/isa/gus/gus_pcm.c | 30 +-- + sound/isa/gus/gusmax.c | 3 +- + sound/isa/gus/interwave.c | 1 + + sound/isa/msnd/msnd.c | 2 - + sound/isa/msnd/msnd_pinnacle.c | 1 + + sound/isa/opl3sa2.c | 1 + + sound/isa/opti9xx/opti92x-ad1848.c | 1 + + sound/isa/sb/emu8000_pcm.c | 1 - + sound/isa/sb/sb16_main.c | 23 +-- + sound/isa/sb/sb8_main.c | 23 +-- + sound/isa/sb/sb_common.c | 1 + + sound/isa/wavefront/wavefront.c | 1 + + sound/isa/wss/wss_lib.c | 26 +-- + sound/mips/hal2.c | 27 +-- + sound/mips/sgio2audio.c | 23 +-- + sound/parisc/harmony.c | 20 +- + sound/pci/ad1889.c | 28 +-- + sound/pci/ali5451/ali5451.c | 37 +--- + sound/pci/als300.c | 27 +-- + sound/pci/als4000.c | 25 +-- + sound/pci/asihpi/asihpi.c | 27 +-- + sound/pci/atiixp.c | 19 +- + sound/pci/atiixp_modem.c | 13 +- + sound/pci/au88x0/au88x0.c | 1 + + sound/pci/au88x0/au88x0_pcm.c | 16 +- + sound/pci/aw2/aw2-alsa.c | 48 ++--- + sound/pci/azt3328.c | 35 +--- + sound/pci/bt87x.c | 17 +- + sound/pci/ca0106/ca0106_main.c | 65 +------ + sound/pci/cmipci.c | 47 ++--- + sound/pci/cs4281.c | 27 +-- + sound/pci/cs46xx/cs46xx_lib.c | 11 +- + sound/pci/cs5535audio/cs5535audio.c | 2 +- + sound/pci/cs5535audio/cs5535audio_pcm.c | 14 +- + sound/pci/ctxfi/cthw20k1.c | 4 +- + sound/pci/ctxfi/cthw20k2.c | 1 + + sound/pci/ctxfi/ctpcm.c | 17 +- + sound/pci/echoaudio/echoaudio.c | 26 +-- + sound/pci/emu10k1/emu10k1_main.c | 1 + + sound/pci/emu10k1/emu10k1x.c | 18 +- + sound/pci/emu10k1/emupcm.c | 47 +---- + sound/pci/emu10k1/p16v.c | 50 +---- + sound/pci/ens1370.c | 34 +--- + sound/pci/es1938.c | 33 +--- + sound/pci/es1968.c | 5 +- + sound/pci/fm801.c | 23 +-- + sound/pci/hda/hda_controller.c | 74 ++------ + sound/pci/hda/hda_intel.c | 6 +- + sound/pci/hda/hda_tegra.c | 7 +- + sound/pci/hda/patch_ca0110.c | 2 +- + sound/pci/hda/patch_sigmatel.c | 2 +- + sound/pci/ice1712/ice1712.c | 49 +---- + sound/pci/ice1712/ice1724.c | 32 +--- + sound/pci/intel8x0.c | 27 +-- + sound/pci/intel8x0m.c | 28 +-- + sound/pci/korg1212/korg1212.c | 1 + + sound/pci/lola/lola.c | 2 +- + sound/pci/lola/lola_pcm.c | 12 +- + sound/pci/lx6464es/lx6464es.c | 17 +- + sound/pci/maestro3.c | 12 +- + sound/pci/mixart/mixart.c | 17 +- + sound/pci/nm256/nm256.c | 4 +- + sound/pci/oxygen/oxygen_lib.c | 2 +- + sound/pci/oxygen/oxygen_pcm.c | 58 +++--- + sound/pci/pcxhr/pcxhr.c | 33 +--- + sound/pci/riptide/riptide.c | 13 +- + sound/pci/rme32.c | 44 +---- + sound/pci/rme96.c | 5 +- + sound/pci/rme9652/hdsp.c | 1 + + sound/pci/rme9652/hdspm.c | 1 + + sound/pci/rme9652/rme9652.c | 1 + + sound/pci/sis7019.c | 28 +-- + sound/pci/sonicvibes.c | 23 +-- + sound/pci/trident/trident_main.c | 81 ++------- + sound/pci/via82xx.c | 53 ++---- + sound/pci/via82xx_modem.c | 14 +- + sound/pci/vx222/vx222.c | 1 + + sound/pci/ymfpci/ymfpci_main.c | 39 +--- + sound/pcmcia/pdaudiocf/pdaudiocf.c | 1 + + sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c | 26 +-- + sound/pcmcia/vx/vxpocket.c | 1 + + sound/ppc/pmac.c | 30 +-- + sound/ppc/snd_ps3.c | 29 +-- + sound/sh/aica.c | 30 +-- + sound/sh/sh_dac_audio.c | 21 +-- + sound/soc/intel/skylake/skl-pcm.c | 4 +- + sound/sparc/amd7930.c | 22 +-- + sound/sparc/cs4231.c | 19 +- + sound/sparc/dbri.c | 14 +- + sound/spi/at73c213.c | 12 +- + sound/usb/6fire/pcm.c | 18 +- + sound/usb/caiaq/audio.c | 14 +- + sound/usb/hiface/pcm.c | 19 +- + sound/usb/line6/capture.c | 1 - + sound/usb/line6/pcm.c | 13 +- + sound/usb/line6/playback.c | 1 - + sound/usb/misc/ua101.c | 25 +-- + sound/usb/pcm.c | 58 +++--- + sound/usb/usx2y/usX2Yhwdep.c | 2 +- + sound/usb/usx2y/usbusx2yaudio.c | 27 +-- + sound/usb/usx2y/usx2yhwdeppcm.c | 19 +- + sound/x86/intel_hdmi_audio.c | 17 +- + sound/xen/xen_snd_front_alsa.c | 2 - + 143 files changed, 1369 insertions(+), 2377 deletions(-) +Merging sound-asoc/for-next (ed0c3910299d Merge branch 'asoc-5.6' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging sound/soc/intel/skylake/skl-pcm.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/amlogic,axg-fifo.txt | 4 + + include/sound/soc.h | 33 +- + include/sound/sof.h | 9 +- + include/sound/sof/channel_map.h | 61 +++ + include/sound/sof/dai-imx.h | 20 + + include/sound/sof/dai.h | 1 + + include/sound/sof/info.h | 15 + + include/sound/sof/topology.h | 27 ++ + include/uapi/sound/sof/abi.h | 2 +- + include/uapi/sound/sof/tokens.h | 9 +- + sound/soc/amd/acp-pcm-dma.c | 59 +-- + sound/soc/amd/raven/acp3x-pcm-dma.c | 31 +- + sound/soc/atmel/atmel-pcm-pdc.c | 1 - + sound/soc/au1x/dbdma2.c | 15 +- + sound/soc/au1x/dma.c | 22 +- + sound/soc/bcm/cygnus-pcm.c | 1 - + sound/soc/codecs/cros_ec_codec.c | 8 +- + sound/soc/codecs/cs42l51.c | 16 +- + sound/soc/codecs/hdac_hdmi.c | 63 +-- + sound/soc/codecs/hdmi-codec.c | 32 +- + sound/soc/codecs/max98090.c | 433 ++++++++++++----- + sound/soc/codecs/max98090.h | 3 +- + sound/soc/codecs/rt5514-spi.c | 10 +- + sound/soc/codecs/rt5677-spi.c | 10 +- + sound/soc/codecs/tlv320aic31xx.c | 40 +- + sound/soc/codecs/tlv320aic31xx.h | 3 - + sound/soc/dwc/dwc-pcm.c | 25 +- + sound/soc/fsl/fsl-asoc-card.c | 2 +- + sound/soc/fsl/fsl_asrc_dma.c | 1 - + sound/soc/fsl/fsl_dma.c | 1 - + sound/soc/fsl/fsl_sai.c | 3 +- + sound/soc/fsl/imx-audmix.c | 2 +- + sound/soc/fsl/imx-pcm-fiq.c | 1 - + sound/soc/fsl/mpc5200_dma.c | 1 - + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 26 +- + sound/soc/intel/baytrail/sst-baytrail-pcm.c | 20 +- + sound/soc/intel/boards/Kconfig | 48 ++ + sound/soc/intel/boards/Makefile | 5 + + sound/soc/intel/boards/bdw-rt5650.c | 319 +++++++++++++ + sound/soc/intel/boards/bytcht_es8316.c | 13 +- + sound/soc/intel/boards/bytcr_rt5640.c | 10 + + sound/soc/intel/boards/bytcr_rt5651.c | 22 +- + sound/soc/intel/boards/cml_rt1011_rt5682.c | 8 +- + sound/soc/intel/boards/kbl_da7219_max98927.c | 8 +- + sound/soc/intel/boards/kbl_rt5663_max98927.c | 4 +- + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 4 +- + sound/soc/intel/boards/skl_hda_dsp_generic.c | 8 + + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 4 +- + sound/soc/intel/boards/sof_da7219_max98373.c | 371 +++++++++++++++ + sound/soc/intel/boards/sof_rt5682.c | 34 +- + .../intel/common/soc-acpi-intel-hsw-bdw-match.c | 7 + + sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 7 + + sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 13 + + sound/soc/intel/haswell/sst-haswell-pcm.c | 18 +- + sound/soc/intel/skylake/skl-pcm.c | 27 +- + sound/soc/intel/skylake/skl.c | 7 +- + sound/soc/kirkwood/kirkwood-dma.c | 1 - + sound/soc/mediatek/common/mtk-afe-fe-dai.c | 365 ++++++++++++--- + sound/soc/mediatek/common/mtk-afe-fe-dai.h | 16 + + .../soc/mediatek/common/mtk-afe-platform-driver.c | 13 +- + .../soc/mediatek/common/mtk-afe-platform-driver.h | 2 - + sound/soc/mediatek/common/mtk-base-afe.h | 28 +- + sound/soc/mediatek/common/mtk-btcvsd.c | 1 - + sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 2 - + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 2 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 2 +- + sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 2 - + sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 2 +- + sound/soc/meson/axg-fifo.c | 61 ++- + sound/soc/meson/axg-fifo.h | 9 +- + sound/soc/meson/axg-frddr.c | 36 +- + sound/soc/meson/axg-toddr.c | 24 +- + sound/soc/pxa/mioa701_wm9713.c | 2 +- + sound/soc/pxa/mmp-pcm.c | 1 - + sound/soc/pxa/pxa-ssp.c | 1 - + sound/soc/pxa/pxa2xx-ac97.c | 1 - + sound/soc/pxa/pxa2xx-i2s.c | 1 - + sound/soc/pxa/pxa2xx-pcm.c | 1 - + sound/soc/qcom/lpass-platform.c | 1 - + sound/soc/qcom/qdsp6/q6asm-dai.c | 1 - + sound/soc/samsung/bells.c | 14 +- + sound/soc/samsung/idma.c | 1 - + sound/soc/samsung/littlemill.c | 10 +- + sound/soc/samsung/lowland.c | 2 +- + sound/soc/samsung/neo1973_wm8753.c | 2 +- + sound/soc/samsung/snow.c | 2 +- + sound/soc/samsung/speyside.c | 6 +- + sound/soc/samsung/tm2_wm5110.c | 6 +- + sound/soc/samsung/tobermory.c | 6 +- + sound/soc/sh/dma-sh7760.c | 15 +- + sound/soc/sh/fsi.c | 19 +- + sound/soc/sh/rcar/core.c | 57 +-- + sound/soc/sh/siu_pcm.c | 40 +- + sound/soc/soc-compress.c | 29 +- + sound/soc/soc-core.c | 417 +++++++---------- + sound/soc/soc-generic-dmaengine-pcm.c | 14 +- + sound/soc/soc-topology.c | 51 +- + sound/soc/soc-utils.c | 1 - + sound/soc/sof/Kconfig | 2 +- + sound/soc/sof/Makefile | 2 +- + sound/soc/sof/control.c | 55 +-- + sound/soc/sof/core.c | 288 +++--------- + sound/soc/sof/intel/Kconfig | 1 + + sound/soc/sof/intel/apl.c | 14 +- + sound/soc/sof/intel/bdw.c | 41 +- + sound/soc/sof/intel/byt.c | 110 ++++- + sound/soc/sof/intel/cnl.c | 26 +- + sound/soc/sof/intel/hda-codec.c | 38 +- + sound/soc/sof/intel/hda-ctrl.c | 13 + + sound/soc/sof/intel/hda-dai.c | 1 + + sound/soc/sof/intel/hda-ipc.c | 23 +- + sound/soc/sof/intel/hda-loader.c | 1 - + sound/soc/sof/intel/hda-pcm.c | 4 +- + sound/soc/sof/intel/hda-stream.c | 21 +- + sound/soc/sof/intel/hda.c | 304 +++++++----- + sound/soc/sof/intel/hda.h | 19 +- + sound/soc/sof/intel/intel-ipc.c | 8 +- + sound/soc/sof/intel/shim.h | 6 +- + sound/soc/sof/ipc.c | 33 +- + sound/soc/sof/loader.c | 58 ++- + sound/soc/sof/nocodec.c | 12 - + sound/soc/sof/ops.h | 34 ++ + sound/soc/sof/pcm.c | 172 ++++--- + sound/soc/sof/pm.c | 240 +--------- + sound/soc/sof/sof-acpi-dev.c | 63 +-- + sound/soc/sof/sof-audio.c | 445 ++++++++++++++++++ + sound/soc/sof/sof-audio.h | 211 +++++++++ + sound/soc/sof/sof-of-dev.c | 24 +- + sound/soc/sof/sof-pci-dev.c | 59 +-- + sound/soc/sof/sof-priv.h | 214 +-------- + sound/soc/sof/topology.c | 521 +++++++++++++-------- + sound/soc/sof/trace.c | 4 +- + sound/soc/sof/utils.c | 60 +++ + sound/soc/sof/xtensa/core.c | 2 +- + sound/soc/sprd/sprd-pcm-dma.c | 1 - + sound/soc/stm/stm32_adfsdm.c | 29 +- + sound/soc/tegra/tegra_wm8903.c | 2 +- + sound/soc/ti/davinci-mcasp.c | 35 +- + sound/soc/ti/davinci-mcasp.h | 4 + + sound/soc/ti/rx51.c | 12 +- + sound/soc/txx9/txx9aclc.c | 15 +- + sound/soc/uniphier/aio-dma.c | 31 +- + sound/soc/xilinx/xlnx_formatter_pcm.c | 14 +- + sound/soc/xtensa/xtfpga-i2s.c | 10 +- + 144 files changed, 4008 insertions(+), 2488 deletions(-) + create mode 100644 include/sound/sof/channel_map.h + create mode 100644 sound/soc/intel/boards/bdw-rt5650.c + create mode 100644 sound/soc/intel/boards/sof_da7219_max98373.c + create mode 100644 sound/soc/sof/sof-audio.c + create mode 100644 sound/soc/sof/sof-audio.h +Merging modules/modules-next (ce2b617ce8cb export.h: reduce __ksymtab_strings string duplication by using "MS" section flags) +$ git merge modules/modules-next +Auto-merging kernel/module.c +Merge made by the 'recursive' strategy. + include/asm-generic/export.h | 8 +++-- + include/linux/export.h | 33 ++++++++++++------ + include/linux/moduleparam.h | 82 +++++++++++++++++++++++++++++++++++++++++--- + kernel/module.c | 9 +++-- + 4 files changed, 111 insertions(+), 21 deletions(-) +Merging input/next (fd7bba685e7d Input: apbps2 - add __iomem to register struct) +$ git merge input/next +Merge made by the 'recursive' strategy. + drivers/input/misc/axp20x-pek.c | 7 ++-- + drivers/input/serio/apbps2.c | 2 +- + drivers/input/touchscreen/elants_i2c.c | 77 ++++++++++++++++++++++++++++++---- + 3 files changed, 74 insertions(+), 12 deletions(-) +Merging block/for-next (eb1cc93eb2c5 Merge branch 'for-5.6/block' into for-next) +$ git merge block/for-next +Auto-merging include/linux/namei.h +Auto-merging fs/open.c +CONFLICT (content): Merge conflict in fs/open.c +Auto-merging fs/namei.c +Recorded preimage for 'fs/open.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'fs/open.c'. +[master 7e624d2f279b] Merge remote-tracking branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. + block/blk-mq.c | 69 +- + drivers/android/binder.c | 6 +- + fs/file.c | 6 +- + fs/internal.h | 7 + + fs/io-wq.c | 15 +- + fs/io-wq.h | 10 +- + fs/io_uring.c | 1935 ++++++++++++++++++++++++++++++----------- + fs/namei.c | 2 + + fs/open.c | 4 +- + fs/stat.c | 34 +- + include/linux/list.h | 10 + + include/linux/namei.h | 1 + + include/uapi/linux/io_uring.h | 8 + + 13 files changed, 1542 insertions(+), 565 deletions(-) +$ git am -3 ../patches/0001-io_uring-fix-up-for-open-introduce-openat2-2-syscall.patch +Applying: io_uring: fix up for "open: introduce openat2(2) syscall" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/internal.h +M fs/io_uring.c +$ git add -A . +$ git commit -v -a --amend +[master d85636c2b72c] Merge remote-tracking branch 'block/for-next' + Date: Fri Dec 20 11:43:12 2019 +1100 +Merging device-mapper/for-next (7fc979f8204f docs: dm-integrity: remove reference to ARC4) +$ git merge device-mapper/for-next +Already up to date. +Merging pcmcia/pcmcia-next (71705c611263 PCMCIA/i82092: remove #if 0 block) +$ git merge pcmcia/pcmcia-next +Merge made by the 'recursive' strategy. + drivers/pcmcia/i82092.c | 648 ++++++++++++++++++++++------------------------ + drivers/pcmcia/i82092aa.h | 11 - + 2 files changed, 311 insertions(+), 348 deletions(-) +Merging mmc/next (9f606f11ea98 Merge branch 'fixes' into next) +$ git merge mmc/next +Auto-merging drivers/gpio/gpiolib-of.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/renesas,sdhi.txt | 3 +- + .../devicetree/bindings/mmc/sdhci-atmel.txt | 13 ++- + .../devicetree/bindings/mmc/sdhci-msm.txt | 1 + + drivers/gpio/gpiolib-of.c | 21 ----- + drivers/gpio/gpiolib.c | 11 +++ + drivers/mmc/core/host.c | 33 ++----- + drivers/mmc/core/slot-gpio.c | 31 +++--- + drivers/mmc/host/atmel-mci.c | 2 +- + drivers/mmc/host/au1xmmc.c | 7 +- + drivers/mmc/host/cavium-thunderx.c | 16 +++- + drivers/mmc/host/davinci_mmc.c | 4 +- + drivers/mmc/host/jz4740_mmc.c | 2 +- + drivers/mmc/host/meson-gx-mmc.c | 10 +- + drivers/mmc/host/meson-mx-sdio.c | 4 +- + drivers/mmc/host/mmc_spi.c | 15 ++- + drivers/mmc/host/mmci.c | 96 ++++++++++++++----- + drivers/mmc/host/mmci.h | 10 +- + drivers/mmc/host/mtk-sd.c | 3 +- + drivers/mmc/host/mvsdio.c | 6 +- + drivers/mmc/host/omap_hsmmc.c | 10 +- + drivers/mmc/host/pxamci.c | 12 +-- + drivers/mmc/host/renesas_sdhi.h | 10 +- + drivers/mmc/host/renesas_sdhi_core.c | 22 ++--- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 25 +---- + drivers/mmc/host/s3cmci.c | 4 +- + drivers/mmc/host/sdhci-acpi.c | 2 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 18 ++-- + drivers/mmc/host/sdhci-milbeaut.c | 4 +- + drivers/mmc/host/sdhci-msm.c | 6 +- + drivers/mmc/host/sdhci-of-at91.c | 105 ++++++++++++--------- + drivers/mmc/host/sdhci-of-esdhc.c | 3 +- + drivers/mmc/host/sdhci-pci-core.c | 4 +- + drivers/mmc/host/sdhci-s3c.c | 6 +- + drivers/mmc/host/sdhci-sirf.c | 2 +- + drivers/mmc/host/sdhci-spear.c | 6 +- + drivers/mmc/host/sdhci.c | 17 +--- + drivers/mmc/host/sdhci_am654.c | 4 +- + drivers/mmc/host/sdhci_f_sdh30.c | 4 +- + drivers/mmc/host/sh_mmcif.c | 4 +- + drivers/mmc/host/sunxi-mmc.c | 3 +- + drivers/mmc/host/tmio_mmc_core.c | 6 +- + drivers/mmc/host/uniphier-sd.c | 14 +-- + drivers/mmc/host/usdhi6rol0.c | 15 +-- + drivers/pinctrl/core.c | 33 ++++--- + include/linux/gpio/consumer.h | 7 ++ + include/linux/mfd/tmio.h | 3 - + include/linux/mmc/slot-gpio.h | 5 +- + include/linux/pinctrl/consumer.h | 6 ++ + 48 files changed, 313 insertions(+), 335 deletions(-) +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 (ea9a89ca3b95 mfd: dln2: More sanity checking for endpoints) +$ git merge mfd/for-mfd-next +Merge made by the 'recursive' strategy. + drivers/mfd/dln2.c | 13 +++++++++++-- + drivers/mfd/sm501.c | 19 +++++++------------ + drivers/mfd/syscon.c | 2 +- + 3 files changed, 19 insertions(+), 15 deletions(-) +Merging backlight/for-backlight-next (102a1b382177 backlight: qcom-wled: Fix spelling mistake "trigged" -> "triggered") +$ git merge backlight/for-backlight-next +Already up to date. +Merging battery/for-next (921377c0b4e8 power: supply: abx500_chargalg: Remove unneeded semicolon) +$ git merge battery/for-next +Auto-merging drivers/power/reset/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/supply/battery.txt | 5 + + .../bindings/power/supply/max17040_battery.txt | 33 ++++++ + .../bindings/power/supply/max17042_battery.txt | 6 +- + .../devicetree/bindings/power/supply/sc27xx-fg.txt | 3 + + drivers/power/reset/Kconfig | 16 +-- + drivers/power/reset/gpio-restart.c | 8 +- + drivers/power/supply/Kconfig | 30 ++--- + drivers/power/supply/ab8500_charger.c | 6 +- + drivers/power/supply/ab8500_fg.c | 14 +-- + drivers/power/supply/abx500_chargalg.c | 2 +- + drivers/power/supply/cros_usbpd-charger.c | 10 +- + drivers/power/supply/ingenic-battery.c | 15 ++- + drivers/power/supply/max17040_battery.c | 130 ++++++++++++++++++++- + drivers/power/supply/max17042_battery.c | 17 ++- + drivers/power/supply/max77650-charger.c | 7 ++ + drivers/power/supply/pda_power.c | 4 + + drivers/power/supply/power_supply_core.c | 67 ++++++++++- + drivers/power/supply/sbs-battery.c | 33 +++--- + drivers/power/supply/sc27xx_fuel_gauge.c | 49 +++++++- + drivers/power/supply/ucs1002_power.c | 42 ++++++- + include/linux/power/max17042_battery.h | 48 +++++++- + include/linux/power_supply.h | 10 ++ + 22 files changed, 473 insertions(+), 82 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/supply/max17040_battery.txt +Merging regulator/for-next (3917d361271f Merge branch 'regulator-5.6' into regulator-next) +$ git merge regulator/for-next +Removing Documentation/devicetree/bindings/regulator/st,stm32-vrefbuf.txt +Removing Documentation/devicetree/bindings/regulator/st,stm32-booster.txt +Merge made by the 'recursive' strategy. + .../bindings/regulator/rohm,bd71828-regulator.yaml | 107 +++ + .../bindings/regulator/st,stm32-booster.txt | 18 - + .../bindings/regulator/st,stm32-booster.yaml | 46 ++ + .../bindings/regulator/st,stm32-vrefbuf.txt | 20 - + .../bindings/regulator/st,stm32-vrefbuf.yaml | 52 ++ + drivers/regulator/Kconfig | 12 + + drivers/regulator/Makefile | 1 + + drivers/regulator/bd71828-regulator.c | 812 +++++++++++++++++++++ + drivers/regulator/rk808-regulator.c | 2 +- + 9 files changed, 1031 insertions(+), 39 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/rohm,bd71828-regulator.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/st,stm32-booster.txt + create mode 100644 Documentation/devicetree/bindings/regulator/st,stm32-booster.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/st,stm32-vrefbuf.txt + create mode 100644 Documentation/devicetree/bindings/regulator/st,stm32-vrefbuf.yaml + create mode 100644 drivers/regulator/bd71828-regulator.c +Merging security/next-testing (45893a0abee6 kexec: Fix file verification on S390) +$ git merge security/next-testing +Already up to date. +Merging apparmor/apparmor-next (341c1fda5e17 apparmor: make it so work buffers can be allocated from atomic context) +$ git merge apparmor/apparmor-next +Already up to date. +Merging integrity/next-integrity (2a7f0e53daf2 ima: ima_api: Use struct_size() in kzalloc()) +$ git merge integrity/next-integrity +Already up to date. +Merging keys/keys-next (a2337251cb6b Merge branch 'keys-acl' into keys-next) +$ git merge keys/keys-next +Auto-merging security/keys/internal.h +Auto-merging security/keys/compat.c +Auto-merging security/keys/Kconfig +Auto-merging init/Kconfig +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 include/linux/device.h +Auto-merging fs/pipe.c +Auto-merging fs/ecryptfs/keystore.c +Auto-merging block/blk-core.c +Auto-merging arch/xtensa/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/xtensa/kernel/syscalls/syscall.tbl +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 +Auto-merging arch/sparc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/sparc/kernel/syscalls/syscall.tbl +Auto-merging arch/sh/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/sh/kernel/syscalls/syscall.tbl +Auto-merging arch/s390/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/s390/kernel/syscalls/syscall.tbl +Auto-merging arch/powerpc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/powerpc/kernel/syscalls/syscall.tbl +Auto-merging arch/parisc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/parisc/kernel/syscalls/syscall.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_o32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_o32.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n64.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n64.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n32.tbl +Auto-merging arch/microblaze/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/microblaze/kernel/syscalls/syscall.tbl +Auto-merging arch/m68k/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/m68k/kernel/syscalls/syscall.tbl +Auto-merging arch/ia64/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/ia64/kernel/syscalls/syscall.tbl +Auto-merging arch/arm64/include/asm/unistd32.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd32.h +Auto-merging arch/arm64/include/asm/unistd.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd.h +Auto-merging arch/arm/tools/syscall.tbl +CONFLICT (content): Merge conflict in arch/arm/tools/syscall.tbl +Auto-merging arch/alpha/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/alpha/kernel/syscalls/syscall.tbl +Resolved 'arch/alpha/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/arm/tools/syscall.tbl' using previous resolution. +Resolved 'arch/arm64/include/asm/unistd.h' using previous resolution. +Resolved 'arch/arm64/include/asm/unistd32.h' using previous resolution. +Resolved 'arch/ia64/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/m68k/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/microblaze/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n32.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n64.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_o32.tbl' using previous resolution. +Resolved 'arch/parisc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/powerpc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/s390/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/sh/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/sparc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_32.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_64.tbl' using previous resolution. +Resolved 'arch/xtensa/kernel/syscalls/syscall.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 --no-edit -v -a +[master 0f8f6c926dcf] Merge remote-tracking branch 'keys/keys-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/security/keys/core.rst | 186 +++++- + Documentation/security/keys/request-key.rst | 9 +- + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + + Documentation/watch_queue.rst | 385 ++++++++++++ + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd32.h | 2 + + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + block/Kconfig | 9 + + block/blk-core.c | 29 + + certs/blacklist.c | 7 +- + certs/system_keyring.c | 12 +- + drivers/base/Kconfig | 9 + + drivers/base/Makefile | 1 + + drivers/base/watch.c | 90 +++ + drivers/md/dm-crypt.c | 2 +- + drivers/nvdimm/security.c | 2 +- + drivers/usb/core/Kconfig | 9 + + drivers/usb/core/devio.c | 47 ++ + drivers/usb/core/hub.c | 4 + + fs/afs/security.c | 2 +- + fs/cifs/cifs_spnego.c | 25 +- + fs/cifs/cifsacl.c | 28 +- + fs/cifs/connect.c | 4 +- + fs/ecryptfs/ecryptfs_kernel.h | 2 +- + fs/ecryptfs/keystore.c | 2 +- + fs/fscache/object-list.c | 2 +- + fs/nfs/nfs4idmap.c | 30 +- + fs/pipe.c | 242 +++++--- + fs/splice.c | 12 +- + fs/ubifs/auth.c | 2 +- + include/linux/blkdev.h | 15 + + include/linux/device.h | 7 + + include/linux/key.h | 125 ++-- + include/linux/lsm_audit.h | 1 + + include/linux/lsm_hooks.h | 38 ++ + include/linux/pipe_fs_i.h | 27 +- + include/linux/security.h | 31 + + include/linux/syscalls.h | 1 + + include/linux/usb.h | 18 + + include/linux/watch_queue.h | 127 ++++ + include/uapi/asm-generic/unistd.h | 2 + + include/uapi/linux/keyctl.h | 68 +++ + include/uapi/linux/watch_queue.h | 158 +++++ + init/Kconfig | 12 + + kernel/Makefile | 1 + + kernel/sys_ni.c | 1 + + kernel/watch_queue.c | 658 +++++++++++++++++++++ + lib/digsig.c | 2 +- + net/ceph/ceph_common.c | 2 +- + net/dns_resolver/dns_key.c | 12 +- + net/dns_resolver/dns_query.c | 15 +- + net/rxrpc/key.c | 19 +- + net/wireless/reg.c | 6 +- + samples/Kconfig | 6 + + samples/Makefile | 1 + + samples/watch_queue/Makefile | 7 + + samples/watch_queue/watch_test.c | 251 ++++++++ + security/integrity/digsig.c | 31 +- + security/integrity/digsig_asymmetric.c | 2 +- + security/integrity/evm/evm_crypto.c | 2 +- + security/integrity/ima/ima_mok.c | 13 +- + security/integrity/integrity.h | 6 +- + .../integrity/platform_certs/platform_keyring.c | 14 +- + security/keys/Kconfig | 9 + + security/keys/compat.c | 5 + + security/keys/encrypted-keys/encrypted.c | 2 +- + security/keys/encrypted-keys/masterkey_trusted.c | 2 +- + security/keys/gc.c | 7 +- + security/keys/internal.h | 46 +- + security/keys/key.c | 67 +-- + security/keys/keyctl.c | 201 +++++-- + security/keys/keyring.c | 47 +- + security/keys/permission.c | 363 ++++++++++-- + security/keys/persistent.c | 27 +- + security/keys/proc.c | 22 +- + security/keys/process_keys.c | 86 ++- + security/keys/request_key.c | 38 +- + security/keys/request_key_auth.c | 15 +- + security/security.c | 23 + + security/selinux/hooks.c | 30 +- + security/smack/smack_lsm.c | 85 ++- + 95 files changed, 3497 insertions(+), 428 deletions(-) + create mode 100644 Documentation/watch_queue.rst + create mode 100644 drivers/base/watch.c + create mode 100644 include/linux/watch_queue.h + create mode 100644 include/uapi/linux/watch_queue.h + create mode 100644 kernel/watch_queue.c + create mode 100644 samples/watch_queue/Makefile + create mode 100644 samples/watch_queue/watch_test.c +$ git reset --hard HEAD^ +HEAD is now at 20d06aefdc4c Merge remote-tracking branch 'regulator/for-next' +Merging next-20191211 version of keys +$ git merge -m next-20191211/keys 48274e1e5d24407bb2acb768c093add00bf92823 +Auto-merging security/smack/smack_lsm.c +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging security/keys/internal.h +Auto-merging security/keys/compat.c +Auto-merging security/keys/Kconfig +Auto-merging samples/Makefile +CONFLICT (content): Merge conflict in samples/Makefile +Auto-merging samples/Kconfig +CONFLICT (content): Merge conflict in samples/Kconfig +Auto-merging kernel/sys_ni.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 include/linux/security.h +CONFLICT (content): Merge conflict in include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/device.h +Auto-merging include/linux/blkdev.h +Auto-merging drivers/usb/core/hub.c +Auto-merging drivers/usb/core/devio.c +Auto-merging drivers/misc/Kconfig +Auto-merging drivers/base/Kconfig +Auto-merging block/blk-core.c +Auto-merging block/Kconfig +Auto-merging arch/xtensa/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/xtensa/kernel/syscalls/syscall.tbl +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 +Auto-merging arch/sparc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/sparc/kernel/syscalls/syscall.tbl +Auto-merging arch/sh/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/sh/kernel/syscalls/syscall.tbl +Auto-merging arch/s390/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/s390/kernel/syscalls/syscall.tbl +Auto-merging arch/powerpc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/powerpc/kernel/syscalls/syscall.tbl +Auto-merging arch/parisc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/parisc/kernel/syscalls/syscall.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_o32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_o32.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n64.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n64.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n32.tbl +Auto-merging arch/microblaze/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/microblaze/kernel/syscalls/syscall.tbl +Auto-merging arch/m68k/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/m68k/kernel/syscalls/syscall.tbl +Auto-merging arch/ia64/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/ia64/kernel/syscalls/syscall.tbl +Auto-merging arch/arm64/include/asm/unistd32.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd32.h +Auto-merging arch/arm64/include/asm/unistd.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd.h +Auto-merging arch/arm/tools/syscall.tbl +CONFLICT (content): Merge conflict in arch/arm/tools/syscall.tbl +Auto-merging arch/alpha/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/alpha/kernel/syscalls/syscall.tbl +Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst +Auto-merging Documentation/security/keys/core.rst +Resolved 'arch/alpha/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/arm/tools/syscall.tbl' using previous resolution. +Resolved 'arch/arm64/include/asm/unistd.h' using previous resolution. +Resolved 'arch/arm64/include/asm/unistd32.h' using previous resolution. +Resolved 'arch/ia64/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/m68k/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/microblaze/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n32.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n64.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_o32.tbl' using previous resolution. +Resolved 'arch/parisc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/powerpc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/s390/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/sh/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/sparc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_32.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_64.tbl' using previous resolution. +Resolved 'arch/xtensa/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'include/linux/security.h' using previous resolution. +Resolved 'include/uapi/asm-generic/unistd.h' using previous resolution. +Resolved 'samples/Kconfig' using previous resolution. +Resolved 'samples/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master af708cff030b] next-20191211/keys +$ git diff -M --stat --summary HEAD^.. + Documentation/security/keys/core.rst | 58 ++ + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + + Documentation/watch_queue.rst | 460 +++++++++++ + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd32.h | 2 + + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + block/Kconfig | 9 + + block/blk-core.c | 29 + + drivers/base/Kconfig | 9 + + drivers/base/Makefile | 1 + + drivers/base/watch.c | 90 +++ + drivers/misc/Kconfig | 13 + + drivers/misc/Makefile | 1 + + drivers/misc/watch_queue.c | 898 +++++++++++++++++++++ + drivers/usb/core/Kconfig | 9 + + drivers/usb/core/devio.c | 49 ++ + drivers/usb/core/hub.c | 4 + + include/linux/blkdev.h | 15 + + include/linux/device.h | 7 + + include/linux/key.h | 3 + + include/linux/lsm_audit.h | 1 + + include/linux/lsm_hooks.h | 38 + + include/linux/sched/user.h | 3 +- + include/linux/security.h | 31 + + include/linux/syscalls.h | 1 + + include/linux/usb.h | 18 + + include/linux/watch_queue.h | 94 +++ + include/uapi/asm-generic/unistd.h | 2 + + include/uapi/linux/keyctl.h | 2 + + include/uapi/linux/watch_queue.h | 181 +++++ + kernel/sys_ni.c | 1 + + samples/Kconfig | 8 +- + samples/Makefile | 1 + + samples/watch_queue/Makefile | 7 + + samples/watch_queue/watch_test.c | 231 ++++++ + security/keys/Kconfig | 9 + + security/keys/compat.c | 3 + + security/keys/gc.c | 5 + + security/keys/internal.h | 30 +- + security/keys/key.c | 38 +- + security/keys/keyctl.c | 99 ++- + security/keys/keyring.c | 20 +- + security/keys/request_key.c | 4 +- + security/security.c | 23 + + security/selinux/hooks.c | 14 + + security/smack/smack_lsm.c | 83 +- + 60 files changed, 2591 insertions(+), 30 deletions(-) + create mode 100644 Documentation/watch_queue.rst + create mode 100644 drivers/base/watch.c + create mode 100644 drivers/misc/watch_queue.c + create mode 100644 include/linux/watch_queue.h + create mode 100644 include/uapi/linux/watch_queue.h + create mode 100644 samples/watch_queue/Makefile + create mode 100644 samples/watch_queue/watch_test.c +Merging selinux/next (5c108d4e18f8 selinux: randomize layout of key structures) +$ git merge selinux/next +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_audit.h +CONFLICT (content): Merge conflict in include/linux/lsm_audit.h +Resolved 'include/linux/lsm_audit.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a9cebde37fb7] Merge remote-tracking branch 'selinux/next' +$ git diff -M --stat --summary HEAD^.. + include/linux/lsm_audit.h | 2 + + include/linux/security.h | 2 + + security/Makefile | 2 +- + security/lockdown/lockdown.c | 27 --- + security/lsm_audit.c | 5 + + security/security.c | 33 +++ + security/selinux/Kconfig | 23 +++ + security/selinux/avc.c | 93 +++++---- + security/selinux/hooks.c | 71 +++++-- + security/selinux/ibpkey.c | 2 +- + security/selinux/include/avc.h | 13 +- + security/selinux/include/classmap.h | 2 + + security/selinux/include/objsec.h | 2 +- + security/selinux/include/security.h | 7 +- + security/selinux/netif.c | 2 +- + security/selinux/netnode.c | 2 +- + security/selinux/netport.c | 2 +- + security/selinux/selinuxfs.c | 76 ++++++- + security/selinux/ss/context.h | 11 +- + security/selinux/ss/policydb.c | 5 + + security/selinux/ss/policydb.h | 2 +- + security/selinux/ss/services.c | 234 ++++++++++++++------- + security/selinux/ss/services.h | 6 +- + security/selinux/ss/sidtab.c | 402 +++++++++++++++++++++++------------- + security/selinux/ss/sidtab.h | 70 +++++-- + 25 files changed, 744 insertions(+), 352 deletions(-) +Merging smack/for-next (92604e825304 smack: use GFP_NOFS while holding inode_smack::smk_lock) +$ git merge smack/for-next +Auto-merging security/smack/smack_lsm.c +Merge made by the 'recursive' strategy. +Merging tomoyo/master (6bd5ce6089b5 tomoyo: Suppress RCU warning at list_for_each_entry_rcu().) +$ git merge tomoyo/master +Merge made by the 'recursive' strategy. + security/tomoyo/common.c | 9 ++++++--- + security/tomoyo/domain.c | 15 ++++++++++----- + security/tomoyo/group.c | 9 ++++++--- + security/tomoyo/realpath.c | 32 +------------------------------- + security/tomoyo/util.c | 6 ++++-- + 5 files changed, 27 insertions(+), 44 deletions(-) +Merging tpmdd/next (1760eb689ed6 tpm/tpm_ftpm_tee: add shutdown call back) +$ git merge tpmdd/next +Already up to date. +Merging watchdog/master (d1eef1c61974 Linux 5.5-rc2) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (cde9319e884e iommu/vt-d: Allocate reserved region for ISA with correct permission) +$ git merge iommu/next +Auto-merging drivers/iommu/iommu.c +Merge made by the 'recursive' strategy. + drivers/iommu/dma-iommu.c | 6 +++--- + drivers/iommu/intel-iommu.c | 12 ++---------- + drivers/iommu/iommu.c | 4 ++-- + drivers/iommu/iova.c | 2 +- + 4 files changed, 8 insertions(+), 16 deletions(-) +Merging vfio/next (9917b54aded1 Merge branch 'v5.5/vfio/jiang-yi-irq-bypass-unregister-v1' into v5.5/vfio/next) +$ git merge vfio/next +Already up to date. +Merging audit/next (cb5172d96d16 audit: Add __rcu annotation to RCU pointer) +$ git merge audit/next +Merge made by the 'recursive' strategy. + kernel/audit.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +Merging devicetree/for-next (fe96df93f86c dt-bindings: ata: Convert Allwinner AHCI controller to a schema) +$ git merge devicetree/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/sram/sunxi-sram.txt +Removing Documentation/devicetree/bindings/rtc/st,stm32-rtc.txt +Removing Documentation/devicetree/bindings/phy/sun4i-usb-phy.txt +Removing Documentation/devicetree/bindings/media/sun6i-csi.txt +Removing Documentation/devicetree/bindings/media/cedrus.txt +Removing Documentation/devicetree/bindings/dma/stm32-mdma.txt +Removing Documentation/devicetree/bindings/dma/stm32-dmamux.txt +Removing Documentation/devicetree/bindings/dma/stm32-dma.txt +Removing Documentation/devicetree/bindings/clock/st,stm32mp1-rcc.txt +Removing Documentation/devicetree/bindings/arm/sunxi/sunxi-mbus.txt +Removing Documentation/devicetree/bindings/arm/stm32/stm32-syscon.txt +Removing Documentation/devicetree/bindings/arm/stm32/mlahb.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/stm32/mlahb.txt | 37 ------ + .../devicetree/bindings/arm/stm32/st,mlahb.yaml | 70 +++++++++++ + .../bindings/arm/stm32/st,stm32-syscon.yaml | 41 ++++++ + .../devicetree/bindings/arm/stm32/stm32-syscon.txt | 16 --- + .../arm/sunxi/allwinner,sun4i-a10-mbus.yaml | 65 ++++++++++ + .../devicetree/bindings/arm/sunxi/sunxi-mbus.txt | 37 ------ + .../devicetree/bindings/ata/ahci-platform.txt | 12 -- + .../bindings/ata/allwinner,sun4i-a10-ahci.yaml | 47 +++++++ + .../bindings/ata/allwinner,sun8i-r40-ahci.yaml | 67 ++++++++++ + .../devicetree/bindings/clock/st,stm32mp1-rcc.txt | 60 --------- + .../devicetree/bindings/clock/st,stm32mp1-rcc.yaml | 79 ++++++++++++ + .../devicetree/bindings/dma/st,stm32-dma.yaml | 102 +++++++++++++++ + .../devicetree/bindings/dma/st,stm32-dmamux.yaml | 52 ++++++++ + .../devicetree/bindings/dma/st,stm32-mdma.yaml | 105 ++++++++++++++++ + .../devicetree/bindings/dma/stm32-dma.txt | 83 ------------ + .../devicetree/bindings/dma/stm32-dmamux.txt | 84 ------------- + .../devicetree/bindings/dma/stm32-mdma.txt | 94 -------------- + .../devicetree/bindings/i2c/i2c-imx-lpi2c.txt | 1 + + .../media/allwinner,sun4i-a10-video-engine.yaml | 83 ++++++++++++ + .../bindings/media/allwinner,sun6i-a31-csi.yaml | 115 +++++++++++++++++ + Documentation/devicetree/bindings/media/cedrus.txt | 57 --------- + .../devicetree/bindings/media/sun6i-csi.txt | 61 --------- + .../devicetree/bindings/mmc/fsl-imx-esdhc.txt | 1 + + .../bindings/phy/allwinner,sun4i-a10-usb-phy.yaml | 105 ++++++++++++++++ + .../bindings/phy/allwinner,sun50i-a64-usb-phy.yaml | 106 ++++++++++++++++ + .../bindings/phy/allwinner,sun50i-h6-usb-phy.yaml | 105 ++++++++++++++++ + .../bindings/phy/allwinner,sun5i-a13-usb-phy.yaml | 93 ++++++++++++++ + .../bindings/phy/allwinner,sun6i-a31-usb-phy.yaml | 119 ++++++++++++++++++ + .../bindings/phy/allwinner,sun8i-a23-usb-phy.yaml | 102 +++++++++++++++ + .../bindings/phy/allwinner,sun8i-a83t-usb-phy.yaml | 122 ++++++++++++++++++ + .../bindings/phy/allwinner,sun8i-h3-usb-phy.yaml | 137 ++++++++++++++++++++ + .../bindings/phy/allwinner,sun8i-r40-usb-phy.yaml | 119 ++++++++++++++++++ + .../bindings/phy/allwinner,sun8i-v3s-usb-phy.yaml | 86 +++++++++++++ + .../devicetree/bindings/phy/sun4i-usb-phy.txt | 68 ---------- + .../devicetree/bindings/rtc/st,stm32-rtc.txt | 61 --------- + .../devicetree/bindings/rtc/st,stm32-rtc.yaml | 139 ++++++++++++++++++++ + .../devicetree/bindings/serial/fsl-lpuart.txt | 2 + + .../sram/allwinner,sun4i-a10-system-control.yaml | 140 +++++++++++++++++++++ + Documentation/devicetree/bindings/sram/sram.yaml | 25 ++-- + .../devicetree/bindings/sram/sunxi-sram.txt | 113 ----------------- + .../devicetree/bindings/vendor-prefixes.yaml | 8 ++ + 41 files changed, 2226 insertions(+), 793 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/stm32/mlahb.txt + create mode 100644 Documentation/devicetree/bindings/arm/stm32/st,mlahb.yaml + create mode 100644 Documentation/devicetree/bindings/arm/stm32/st,stm32-syscon.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/stm32/stm32-syscon.txt + create mode 100644 Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/sunxi/sunxi-mbus.txt + create mode 100644 Documentation/devicetree/bindings/ata/allwinner,sun4i-a10-ahci.yaml + create mode 100644 Documentation/devicetree/bindings/ata/allwinner,sun8i-r40-ahci.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/st,stm32mp1-rcc.txt + create mode 100644 Documentation/devicetree/bindings/clock/st,stm32mp1-rcc.yaml + create mode 100644 Documentation/devicetree/bindings/dma/st,stm32-dma.yaml + create mode 100644 Documentation/devicetree/bindings/dma/st,stm32-dmamux.yaml + create mode 100644 Documentation/devicetree/bindings/dma/st,stm32-mdma.yaml + delete mode 100644 Documentation/devicetree/bindings/dma/stm32-dma.txt + delete mode 100644 Documentation/devicetree/bindings/dma/stm32-dmamux.txt + delete mode 100644 Documentation/devicetree/bindings/dma/stm32-mdma.txt + create mode 100644 Documentation/devicetree/bindings/media/allwinner,sun4i-a10-video-engine.yaml + create mode 100644 Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml + delete mode 100644 Documentation/devicetree/bindings/media/cedrus.txt + delete mode 100644 Documentation/devicetree/bindings/media/sun6i-csi.txt + create mode 100644 Documentation/devicetree/bindings/phy/allwinner,sun4i-a10-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/allwinner,sun50i-a64-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/allwinner,sun50i-h6-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/allwinner,sun5i-a13-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/allwinner,sun6i-a31-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/allwinner,sun8i-a23-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/allwinner,sun8i-a83t-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/allwinner,sun8i-h3-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/allwinner,sun8i-r40-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/allwinner,sun8i-v3s-usb-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/sun4i-usb-phy.txt + delete mode 100644 Documentation/devicetree/bindings/rtc/st,stm32-rtc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/st,stm32-rtc.yaml + create mode 100644 Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml + delete mode 100644 Documentation/devicetree/bindings/sram/sunxi-sram.txt +Merging mailbox/mailbox-for-next (c6c6bc6ea9fc mailbox: imx: add support for imx v1 mu) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (20360817c6f0 Merge branch 'spi-5.6' into spi-next) +$ git merge spi/for-next +Removing Documentation/devicetree/bindings/spi/spi-stm32.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/spi-stm32.txt | 62 ------------ + .../devicetree/bindings/spi/st,stm32-spi.yaml | 105 +++++++++++++++++++++ + drivers/spi/spi-atmel.c | 29 +++--- + drivers/spi/spi-bcm2835.c | 45 ++++++--- + drivers/spi/spi-bitbang.c | 21 ++++- + drivers/spi/spi-dw.c | 3 +- + drivers/spi/spi-fsl-dspi.c | 12 +-- + drivers/spi/spi-img-spfi.c | 18 +++- + drivers/spi/spi-meson-spicc.c | 25 +---- + drivers/spi/spi-mxs.c | 6 +- + drivers/spi/spi-rspi.c | 2 - + drivers/spi/spi-sirf.c | 12 +-- + drivers/spi/spi-stm32-qspi.c | 30 ++++-- + drivers/spi/spi-stm32.c | 79 +++++----------- + drivers/spi/spi-ti-qspi.c | 2 - + drivers/spi/spi-topcliff-pch.c | 4 +- + 16 files changed, 253 insertions(+), 202 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/spi/spi-stm32.txt + create mode 100644 Documentation/devicetree/bindings/spi/st,stm32-spi.yaml +Merging tip/auto-latest (ec7b10f2d023 Merge branch 'x86/cleanups') +$ git merge tip/auto-latest +Removing scripts/sortextable.h +Auto-merging net/core/dev.c +Auto-merging mm/vmalloc.c +Auto-merging mm/memory.c +Auto-merging lib/Kconfig.debug +CONFLICT (content): Merge conflict in lib/Kconfig.debug +Auto-merging kernel/trace/trace_events.c +Auto-merging kernel/module.c +Auto-merging kernel/events/core.c +Auto-merging init/Kconfig +Auto-merging include/linux/mm.h +Auto-merging include/linux/fs.h +Auto-merging fs/xfs/xfs_trace.h +Auto-merging fs/btrfs/volumes.h +Auto-merging drivers/media/pci/ivtv/ivtvfb.c +Removing arch/x86/mm/pat_interval.c +Removing arch/x86/include/asm/pat.h +Auto-merging arch/x86/boot/compressed/Makefile +Auto-merging arch/x86/Kconfig +Auto-merging arch/mips/Kconfig +Auto-merging arch/arm64/crypto/sha256-glue.c +Auto-merging arch/arm64/Kconfig +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/x86/boot.rst +Recorded preimage for 'lib/Kconfig.debug' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'lib/Kconfig.debug'. +[master 7090bf60e777] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/dev-tools/index.rst | 1 + + Documentation/dev-tools/kcsan.rst | 256 +++++++++ + Documentation/x86/boot.rst | 2 +- + MAINTAINERS | 11 + + Makefile | 3 +- + arch/alpha/include/asm/vmalloc.h | 4 + + arch/arc/Kconfig | 2 +- + arch/arc/include/asm/vmalloc.h | 4 + + arch/arc/kernel/entry.S | 6 +- + arch/arm/Kconfig | 2 +- + arch/arm/include/asm/switch_to.h | 2 +- + arch/arm/include/asm/vmalloc.h | 4 + + arch/arm/kernel/Makefile | 4 +- + arch/arm/kernel/entry-armv.S | 4 +- + arch/arm/kernel/ftrace.c | 10 +- + arch/arm/kernel/traps.c | 2 + + arch/arm/mm/cache-v7.S | 4 +- + arch/arm/mm/cache-v7m.S | 4 +- + arch/arm64/Kconfig | 54 +- + arch/arm64/crypto/sha256-glue.c | 2 +- + arch/arm64/include/asm/assembler.h | 6 +- + arch/arm64/include/asm/preempt.h | 4 +- + arch/arm64/include/asm/vmalloc.h | 4 + + arch/arm64/kernel/entry.S | 2 +- + arch/arm64/kernel/traps.c | 3 + + arch/c6x/include/asm/vmalloc.h | 4 + + arch/c6x/kernel/entry.S | 8 +- + arch/csky/include/asm/vmalloc.h | 4 + + arch/csky/kernel/entry.S | 4 +- + arch/h8300/include/asm/vmalloc.h | 4 + + arch/h8300/kernel/entry.S | 6 +- + arch/hexagon/include/asm/vmalloc.h | 4 + + arch/hexagon/kernel/vm_entry.S | 6 +- + arch/ia64/include/asm/acpi.h | 5 +- + arch/ia64/include/asm/vmalloc.h | 4 + + arch/ia64/kernel/acpi.c | 2 - + arch/ia64/kernel/entry.S | 12 +- + arch/ia64/kernel/kprobes.c | 2 +- + arch/m68k/include/asm/vmalloc.h | 4 + + arch/microblaze/Kconfig | 2 +- + arch/microblaze/include/asm/vmalloc.h | 4 + + arch/microblaze/kernel/entry.S | 2 +- + arch/mips/Kconfig | 2 +- + arch/mips/include/asm/asmmacro.h | 4 +- + arch/mips/include/asm/vmalloc.h | 4 + + arch/mips/kernel/entry.S | 6 +- + arch/nds32/Kconfig | 2 +- + arch/nds32/include/asm/vmalloc.h | 4 + + arch/nds32/kernel/ex-exit.S | 4 +- + arch/nds32/kernel/ftrace.c | 12 - + arch/nios2/include/asm/vmalloc.h | 4 + + arch/nios2/kernel/entry.S | 2 +- + arch/openrisc/include/asm/vmalloc.h | 4 + + arch/parisc/Kconfig | 4 +- + arch/parisc/include/asm/vmalloc.h | 4 + + arch/parisc/kernel/entry.S | 10 +- + arch/powerpc/Kconfig | 4 +- + arch/powerpc/include/asm/vmalloc.h | 4 + + arch/powerpc/kernel/entry_32.S | 4 +- + arch/powerpc/kernel/entry_64.S | 4 +- + arch/riscv/include/asm/vmalloc.h | 4 + + arch/riscv/kernel/entry.S | 4 +- + arch/s390/Kconfig | 4 +- + arch/s390/include/asm/preempt.h | 4 +- + arch/s390/include/asm/vmalloc.h | 4 + + arch/s390/kernel/dumpstack.c | 2 + + arch/s390/kernel/entry.S | 2 +- + arch/sh/Kconfig | 2 +- + arch/sh/include/asm/vmalloc.h | 4 + + arch/sh/kernel/cpu/sh5/entry.S | 4 +- + arch/sh/kernel/entry-common.S | 4 +- + arch/sparc/Kconfig | 2 +- + arch/sparc/include/asm/vmalloc.h | 4 + + arch/sparc/kernel/rtrap_64.S | 2 +- + arch/um/include/asm/vmalloc.h | 4 + + arch/unicore32/include/asm/vmalloc.h | 4 + + arch/x86/Kconfig | 79 +-- + arch/x86/boot/Makefile | 2 + + arch/x86/boot/compressed/Makefile | 2 + + arch/x86/boot/setup.ld | 5 +- + arch/x86/entry/vdso/Makefile | 3 + + arch/x86/events/core.c | 19 +- + arch/x86/events/intel/bts.c | 16 +- + arch/x86/events/intel/ds.c | 1 + + arch/x86/include/asm/acpi.h | 3 +- + arch/x86/include/asm/bitops.h | 6 +- + arch/x86/include/asm/cpu_entry_area.h | 10 +- + arch/x86/include/asm/ftrace.h | 2 - + arch/x86/include/asm/kprobes.h | 14 +- + arch/x86/include/asm/memtype.h | 27 + + arch/x86/include/asm/microcode_amd.h | 2 +- + arch/x86/include/asm/mmu_context.h | 86 +-- + arch/x86/include/asm/mtrr.h | 4 +- + arch/x86/include/asm/pat.h | 27 - + arch/x86/include/asm/pci.h | 2 +- + arch/x86/include/asm/pgtable_32_areas.h | 53 ++ + arch/x86/include/asm/pgtable_32_types.h | 57 +- + arch/x86/include/asm/pgtable_areas.h | 16 + + arch/x86/include/asm/pgtable_types.h | 143 ++--- + arch/x86/include/asm/processor.h | 7 - + arch/x86/include/asm/realmode.h | 4 +- + arch/x86/include/asm/set_memory.h | 2 - + arch/x86/include/asm/text-patching.h | 86 ++- + arch/x86/include/asm/vmalloc.h | 6 + + arch/x86/kernel/Makefile | 4 + + arch/x86/kernel/acpi/sleep.c | 11 + + arch/x86/kernel/acpi/sleep.h | 2 +- + arch/x86/kernel/alternative.c | 130 ++++- + arch/x86/kernel/cpu/Makefile | 3 + + arch/x86/kernel/cpu/bugs.c | 7 + + arch/x86/kernel/cpu/common.c | 2 +- + arch/x86/kernel/cpu/mce/amd.c | 4 +- + arch/x86/kernel/cpu/mce/core.c | 15 +- + arch/x86/kernel/cpu/mce/inject.c | 2 +- + arch/x86/kernel/cpu/mce/internal.h | 2 - + arch/x86/kernel/cpu/mce/therm_throt.c | 2 +- + arch/x86/kernel/cpu/mtrr/generic.c | 2 +- + arch/x86/kernel/cpu/mtrr/if.c | 63 +-- + arch/x86/kernel/cpu/mtrr/mtrr.c | 2 +- + arch/x86/kernel/cpu/scattered.c | 2 +- + arch/x86/kernel/cpu/topology.c | 2 +- + arch/x86/kernel/cpu/tsx.c | 5 +- + arch/x86/kernel/ftrace.c | 689 +++++------------------- + arch/x86/kernel/jump_label.c | 116 ++-- + arch/x86/kernel/kprobes/core.c | 21 +- + arch/x86/kernel/kprobes/opt.c | 67 ++- + arch/x86/kernel/ldt.c | 83 +++ + arch/x86/kernel/process.c | 4 - + arch/x86/kernel/setup.c | 165 ++---- + arch/x86/kernel/traps.c | 9 - + arch/x86/kernel/unwind_orc.c | 8 +- + arch/x86/kernel/x86_init.c | 2 +- + arch/x86/kvm/mmu/mmu.c | 2 +- + arch/x86/lib/Makefile | 4 + + arch/x86/mm/Makefile | 12 +- + arch/x86/mm/fault.c | 1 + + arch/x86/mm/init_32.c | 29 +- + arch/x86/mm/init_64.c | 36 -- + arch/x86/mm/iomap_32.c | 6 +- + arch/x86/mm/ioremap.c | 12 +- + arch/x86/mm/pat/Makefile | 5 + + arch/x86/mm/{pageattr-test.c => pat/cpa-test.c} | 0 + arch/x86/mm/{pat.c => pat/memtype.c} | 203 ++++--- + arch/x86/mm/{pat_internal.h => pat/memtype.h} | 12 +- + arch/x86/mm/pat/memtype_interval.c | 194 +++++++ + arch/x86/mm/{pageattr.c => pat/set_memory.c} | 24 +- + arch/x86/mm/pat_interval.c | 185 ------- + arch/x86/mm/pgtable_32.c | 1 + + arch/x86/mm/physaddr.c | 1 + + arch/x86/pci/i386.c | 2 +- + arch/x86/platform/efi/quirks.c | 1 + + arch/x86/platform/intel-quark/imr.c | 2 + + arch/x86/platform/intel-quark/imr_selftest.c | 2 + + arch/x86/purgatory/Makefile | 2 + + arch/x86/realmode/Makefile | 3 + + arch/x86/realmode/rm/Makefile | 3 + + arch/x86/xen/Kconfig | 8 +- + arch/x86/xen/mmu_pv.c | 2 +- + arch/xtensa/Kconfig | 2 +- + arch/xtensa/include/asm/vmalloc.h | 4 + + arch/xtensa/kernel/entry.S | 2 +- + arch/xtensa/kernel/traps.c | 7 +- + drivers/acpi/sleep.c | 3 + + drivers/firmware/efi/capsule-loader.c | 1 + + drivers/firmware/efi/libstub/Makefile | 2 + + drivers/infiniband/hw/hfi1/trace_tid.h | 8 +- + drivers/infiniband/hw/hfi1/trace_tx.h | 2 +- + drivers/infiniband/hw/mlx5/main.c | 2 +- + drivers/lightnvm/pblk-trace.h | 8 +- + drivers/media/pci/ivtv/ivtvfb.c | 2 +- + drivers/misc/vmw_balloon.c | 1 + + drivers/net/fjes/fjes_trace.h | 2 +- + drivers/net/wireless/ath/ath10k/trace.h | 6 +- + drivers/virt/vboxguest/vboxguest_core.c | 1 + + drivers/virt/vboxguest/vboxguest_utils.c | 1 + + drivers/xen/preempt.c | 4 +- + fs/btrfs/volumes.h | 2 +- + fs/stack.c | 6 +- + fs/xfs/scrub/trace.h | 6 +- + fs/xfs/xfs_trace.h | 4 +- + include/asm-generic/atomic-instrumented.h | 393 +++++++------- + include/linux/compiler-clang.h | 11 +- + include/linux/compiler-gcc.h | 7 + + include/linux/compiler.h | 57 +- + include/linux/fs.h | 4 +- + include/linux/genhd.h | 6 +- + include/linux/kcsan-checks.h | 93 ++++ + include/linux/kcsan.h | 108 ++++ + include/linux/mm.h | 15 +- + include/linux/module.h | 4 - + include/linux/sched.h | 4 + + include/linux/seqlock.h | 51 +- + include/linux/stop_machine.h | 7 - + include/linux/trace_events.h | 18 +- + include/linux/vmalloc.h | 2 + + include/trace/events/filemap.h | 2 +- + include/trace/trace_events.h | 64 +-- + include/xen/xen-ops.h | 4 +- + init/Kconfig | 2 +- + init/init_task.c | 8 + + init/main.c | 2 + + kernel/Kconfig.locks | 12 +- + kernel/Makefile | 6 + + kernel/cpu.c | 13 +- + kernel/events/core.c | 2 +- + kernel/kcsan/Makefile | 11 + + kernel/kcsan/atomic.h | 27 + + kernel/kcsan/core.c | 621 +++++++++++++++++++++ + kernel/kcsan/debugfs.c | 271 ++++++++++ + kernel/kcsan/encoding.h | 95 ++++ + kernel/kcsan/kcsan.h | 109 ++++ + kernel/kcsan/report.c | 318 +++++++++++ + kernel/kcsan/test.c | 121 +++++ + kernel/kprobes.c | 4 +- + kernel/module.c | 43 -- + kernel/sched/Makefile | 6 + + kernel/sched/clock.c | 6 +- + kernel/sched/core.c | 16 +- + kernel/sched/fair.c | 23 +- + kernel/sched/pelt.c | 20 +- + kernel/sched/psi.c | 5 +- + kernel/sched/wait_bit.c | 1 + + kernel/stop_machine.c | 30 -- + kernel/trace/trace.h | 31 +- + kernel/trace/trace_entries.h | 66 +-- + kernel/trace/trace_events.c | 20 +- + kernel/trace/trace_events_hist.c | 8 +- + kernel/trace/trace_export.c | 106 ++-- + kernel/trace/trace_kprobe.c | 16 +- + kernel/trace/trace_syscalls.c | 50 +- + kernel/trace/trace_uprobe.c | 9 +- + kernel/workqueue.c | 2 +- + lib/Kconfig.debug | 6 +- + lib/Kconfig.kcsan | 116 ++++ + lib/Makefile | 3 + + mm/Makefile | 8 + + mm/highmem.c | 2 +- + mm/memory.c | 2 +- + mm/slub.c | 12 +- + mm/vmalloc.c | 8 + + net/core/dev.c | 2 +- + net/mac80211/trace.h | 28 +- + net/wireless/trace.h | 6 +- + scripts/.gitignore | 2 +- + scripts/Makefile | 13 +- + scripts/Makefile.kcsan | 6 + + scripts/Makefile.lib | 10 + + scripts/atomic/gen-atomic-instrumented.sh | 17 +- + scripts/link-vmlinux.sh | 13 +- + scripts/sortextable.h | 209 ------- + scripts/{sortextable.c => sorttable.c} | 305 +++++------ + scripts/sorttable.h | 380 +++++++++++++ + sound/soc/intel/skylake/skl-sst-cldma.c | 1 + + tools/objtool/check.c | 18 + + 254 files changed, 4908 insertions(+), 2738 deletions(-) + create mode 100644 Documentation/dev-tools/kcsan.rst + create mode 100644 arch/alpha/include/asm/vmalloc.h + create mode 100644 arch/arc/include/asm/vmalloc.h + create mode 100644 arch/arm/include/asm/vmalloc.h + create mode 100644 arch/arm64/include/asm/vmalloc.h + create mode 100644 arch/c6x/include/asm/vmalloc.h + create mode 100644 arch/csky/include/asm/vmalloc.h + create mode 100644 arch/h8300/include/asm/vmalloc.h + create mode 100644 arch/hexagon/include/asm/vmalloc.h + create mode 100644 arch/ia64/include/asm/vmalloc.h + create mode 100644 arch/m68k/include/asm/vmalloc.h + create mode 100644 arch/microblaze/include/asm/vmalloc.h + create mode 100644 arch/mips/include/asm/vmalloc.h + create mode 100644 arch/nds32/include/asm/vmalloc.h + create mode 100644 arch/nios2/include/asm/vmalloc.h + create mode 100644 arch/openrisc/include/asm/vmalloc.h + create mode 100644 arch/parisc/include/asm/vmalloc.h + create mode 100644 arch/powerpc/include/asm/vmalloc.h + create mode 100644 arch/riscv/include/asm/vmalloc.h + create mode 100644 arch/s390/include/asm/vmalloc.h + create mode 100644 arch/sh/include/asm/vmalloc.h + create mode 100644 arch/sparc/include/asm/vmalloc.h + create mode 100644 arch/um/include/asm/vmalloc.h + create mode 100644 arch/unicore32/include/asm/vmalloc.h + create mode 100644 arch/x86/include/asm/memtype.h + delete mode 100644 arch/x86/include/asm/pat.h + create mode 100644 arch/x86/include/asm/pgtable_32_areas.h + create mode 100644 arch/x86/include/asm/pgtable_areas.h + create mode 100644 arch/x86/include/asm/vmalloc.h + create mode 100644 arch/x86/mm/pat/Makefile + rename arch/x86/mm/{pageattr-test.c => pat/cpa-test.c} (100%) + rename arch/x86/mm/{pat.c => pat/memtype.c} (84%) + rename arch/x86/mm/{pat_internal.h => pat/memtype.h} (81%) + create mode 100644 arch/x86/mm/pat/memtype_interval.c + rename arch/x86/mm/{pageattr.c => pat/set_memory.c} (99%) + delete mode 100644 arch/x86/mm/pat_interval.c + create mode 100644 arch/xtensa/include/asm/vmalloc.h + create mode 100644 include/linux/kcsan-checks.h + create mode 100644 include/linux/kcsan.h + create mode 100644 kernel/kcsan/Makefile + create mode 100644 kernel/kcsan/atomic.h + create mode 100644 kernel/kcsan/core.c + create mode 100644 kernel/kcsan/debugfs.c + create mode 100644 kernel/kcsan/encoding.h + create mode 100644 kernel/kcsan/kcsan.h + create mode 100644 kernel/kcsan/report.c + create mode 100644 kernel/kcsan/test.c + create mode 100644 lib/Kconfig.kcsan + create mode 100644 scripts/Makefile.kcsan + delete mode 100644 scripts/sortextable.h + rename scripts/{sortextable.c => sorttable.c} (67%) + create mode 100644 scripts/sorttable.h +Merging clockevents/timers/drivers/next (6e001f6a4cc7 clocksource/drivers/asm9260: Add a check for of_clk_get) +$ git merge clockevents/timers/drivers/next +Already up to date. +Merging edac/edac-for-next (a651c6c64431 EDAC/aspeed: Remove unneeded semicolon) +$ git merge edac/edac-for-next +Merge made by the 'recursive' strategy. + drivers/edac/Kconfig | 3 +-- + drivers/edac/aspeed_edac.c | 4 ++-- + drivers/edac/i5100_edac.c | 7 ------- + drivers/edac/skx_common.c | 2 +- + 4 files changed, 4 insertions(+), 12 deletions(-) +Merging irqchip/irq/irqchip-next (c6d732c8cc67 irqchip/aspeed-i2c-ic: Fix irq domain name memory leak) +$ git merge irqchip/irq/irqchip-next +Auto-merging include/linux/irqchip/arm-gic-v3.h +Merge made by the 'recursive' strategy. + drivers/irqchip/Kconfig | 4 ++-- + drivers/irqchip/irq-aspeed-i2c-ic.c | 2 -- + drivers/irqchip/irq-gic-v3-its.c | 4 ++-- + include/linux/irqchip/arm-gic-v3.h | 3 +++ + 4 files changed, 7 insertions(+), 6 deletions(-) +Merging ftrace/for-next (ff205766dbbe ftrace: Fix function_graph tracer interaction with BPF trampoline) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (de73daec335f rcutorture: Make kvm-find-errors.sh abort on bad directory) +$ git merge rcu/rcu/next +Auto-merging lib/Kconfig.debug +CONFLICT (content): Merge conflict in lib/Kconfig.debug +Auto-merging kernel/kcsan/encoding.h +CONFLICT (content): Merge conflict in kernel/kcsan/encoding.h +Auto-merging kernel/kcsan/core.c +CONFLICT (content): Merge conflict in kernel/kcsan/core.c +Auto-merging kernel/kcsan/atomic.h +Auto-merging include/linux/rculist_nulls.h +Auto-merging include/linux/list.h +Auto-merging include/linux/compiler.h +Auto-merging .mailmap +Resolved 'kernel/kcsan/core.c' using previous resolution. +Resolved 'kernel/kcsan/encoding.h' using previous resolution. +Recorded preimage for 'lib/Kconfig.debug' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'lib/Kconfig.debug'. +[master 3b0a34de67ce] Merge remote-tracking branch 'rcu/rcu/next' +$ git diff -M --stat --summary HEAD^.. + .mailmap | 4 + + Documentation/RCU/{NMI-RCU.txt => NMI-RCU.rst} | 53 +-- + Documentation/RCU/{arrayRCU.txt => arrayRCU.rst} | 34 +- + Documentation/RCU/index.rst | 5 + + Documentation/RCU/lockdep-splat.txt | 2 +- + .../{rcu_dereference.txt => rcu_dereference.rst} | 75 ++-- + .../RCU/{rcubarrier.txt => rcubarrier.rst} | 222 ++++++----- + Documentation/RCU/stallwarn.txt | 11 +- + Documentation/RCU/{whatisRCU.txt => whatisRCU.rst} | 291 +++++++++------ + Documentation/admin-guide/kernel-parameters.txt | 32 ++ + Documentation/dev-tools/kcsan.rst | 24 +- + arch/powerpc/include/asm/barrier.h | 2 - + drivers/net/wireless/mediatek/mt76/agg-rx.c | 4 +- + fs/nfs/dir.c | 2 +- + include/asm-generic/atomic-instrumented.h | 335 ++++++++--------- + include/asm-generic/atomic-long.h | 331 ++++++++--------- + include/linux/atomic-fallback.h | 340 ++++++++--------- + include/linux/compiler-gcc.h | 3 +- + include/linux/compiler.h | 7 +- + include/linux/list.h | 136 +++++-- + include/linux/list_nulls.h | 30 +- + include/linux/rcu_segcblist.h | 2 - + include/linux/rculist.h | 38 +- + include/linux/rculist_nulls.h | 20 +- + include/linux/rcupdate.h | 28 +- + include/linux/rcutiny.h | 2 + + include/linux/rcutree.h | 2 + + include/linux/tick.h | 5 +- + include/linux/timer.h | 2 +- + include/trace/events/rcu.h | 40 +- + kernel/kcsan/Makefile | 1 + + kernel/kcsan/atomic.h | 2 +- + kernel/kcsan/core.c | 18 +- + kernel/kcsan/encoding.h | 14 +- + kernel/rcu/Kconfig | 17 +- + kernel/rcu/Makefile | 1 - + kernel/rcu/rcu.h | 48 +-- + kernel/rcu/rcu_segcblist.c | 25 +- + kernel/rcu/rcu_segcblist.h | 25 +- + kernel/rcu/rcuperf.c | 173 ++++++++- + kernel/rcu/rcutorture.c | 152 ++++---- + kernel/rcu/srcutiny.c | 2 +- + kernel/rcu/srcutree.c | 11 +- + kernel/rcu/tiny.c | 28 +- + kernel/rcu/tree.c | 412 ++++++++++++++++++--- + kernel/rcu/tree.h | 22 +- + kernel/rcu/tree_exp.h | 148 +++++--- + kernel/rcu/tree_plugin.h | 172 ++++----- + kernel/rcu/tree_stall.h | 40 +- + kernel/rcu/update.c | 34 +- + kernel/sysctl.c | 2 +- + kernel/torture.c | 29 +- + lib/Makefile | 1 + + net/tipc/crypto.c | 5 +- + scripts/atomic/fallbacks/acquire | 2 +- + scripts/atomic/fallbacks/add_negative | 2 +- + scripts/atomic/fallbacks/add_unless | 2 +- + scripts/atomic/fallbacks/andnot | 2 +- + scripts/atomic/fallbacks/dec | 2 +- + scripts/atomic/fallbacks/dec_and_test | 2 +- + scripts/atomic/fallbacks/dec_if_positive | 2 +- + scripts/atomic/fallbacks/dec_unless_positive | 2 +- + scripts/atomic/fallbacks/fence | 2 +- + scripts/atomic/fallbacks/fetch_add_unless | 2 +- + scripts/atomic/fallbacks/inc | 2 +- + scripts/atomic/fallbacks/inc_and_test | 2 +- + scripts/atomic/fallbacks/inc_not_zero | 2 +- + scripts/atomic/fallbacks/inc_unless_negative | 2 +- + scripts/atomic/fallbacks/read_acquire | 2 +- + scripts/atomic/fallbacks/release | 2 +- + scripts/atomic/fallbacks/set_release | 2 +- + scripts/atomic/fallbacks/sub_and_test | 2 +- + scripts/atomic/fallbacks/try_cmpxchg | 2 +- + scripts/atomic/gen-atomic-fallback.sh | 2 + + scripts/atomic/gen-atomic-instrumented.sh | 7 +- + scripts/atomic/gen-atomic-long.sh | 3 +- + tools/memory-model/litmus-tests/.gitignore | 2 +- + tools/memory-model/scripts/README | 16 +- + tools/memory-model/scripts/checkalllitmus.sh | 29 +- + tools/memory-model/scripts/checkghlitmus.sh | 11 +- + tools/memory-model/scripts/checklitmus.sh | 25 +- + tools/memory-model/scripts/checklitmushist.sh | 2 +- + tools/memory-model/scripts/checktheselitmus.sh | 43 +++ + tools/memory-model/scripts/cmplitmushist.sh | 49 ++- + tools/memory-model/scripts/hwfnseg.sh | 20 + + tools/memory-model/scripts/initlitmushist.sh | 2 +- + tools/memory-model/scripts/judgelitmus.sh | 120 ++++-- + tools/memory-model/scripts/newlitmushist.sh | 4 +- + tools/memory-model/scripts/parseargs.sh | 21 +- + tools/memory-model/scripts/runlitmus.sh | 80 ++++ + tools/memory-model/scripts/runlitmushist.sh | 29 +- + tools/memory-model/scripts/simpletest.sh | 35 ++ + tools/testing/selftests/rcutorture/bin/cpus2use.sh | 11 +- + tools/testing/selftests/rcutorture/bin/jitter.sh | 30 +- + .../selftests/rcutorture/bin/kvm-find-errors.sh | 2 + + .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 3 +- + .../selftests/rcutorture/bin/kvm-recheck.sh | 17 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 13 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 32 +- + tools/testing/selftests/rcutorture/bin/mkinitrd.sh | 55 +-- + .../selftests/rcutorture/configs/rcu/TREE10 | 18 + + 101 files changed, 2669 insertions(+), 1514 deletions(-) + rename Documentation/RCU/{NMI-RCU.txt => NMI-RCU.rst} (73%) + rename Documentation/RCU/{arrayRCU.txt => arrayRCU.rst} (85%) + rename Documentation/RCU/{rcu_dereference.txt => rcu_dereference.rst} (88%) + rename Documentation/RCU/{rcubarrier.txt => rcubarrier.rst} (72%) + rename Documentation/RCU/{whatisRCU.txt => whatisRCU.rst} (84%) + create mode 100755 tools/memory-model/scripts/checktheselitmus.sh + create mode 100755 tools/memory-model/scripts/hwfnseg.sh + create mode 100755 tools/memory-model/scripts/runlitmus.sh + create mode 100755 tools/memory-model/scripts/simpletest.sh + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE10 +$ git am -3 ../patches/0001-rcu-fix-up-for-Remove-rcu_swap_protected.patch +Applying: rcu: fix up for "Remove rcu_swap_protected()" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/misc/watch_queue.c +$ git add -A . +$ git commit -v -a --amend +[master 18f910b53fbc] Merge remote-tracking branch 'rcu/rcu/next' + Date: Fri Dec 20 13:10:08 2019 +1100 +Merging kvm/linux-next (7d73710d9ca2 kvm: vmx: Stop wasting a page for guest_msrs) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (96e1968f8206 KVM: arm/arm64: vgic-its: Fix restoration of unmapped collections) +$ git merge kvm-arm/next +Auto-merging arch/arm64/kvm/sys_regs.c +Merge made by the 'recursive' strategy. + arch/arm/include/asm/kvm_emulate.h | 5 +++++ + arch/arm/include/asm/kvm_mmio.h | 2 ++ + arch/arm64/include/asm/kvm_emulate.h | 5 +++++ + arch/arm64/include/asm/kvm_mmio.h | 6 ++---- + arch/arm64/kvm/sys_regs.c | 25 ++++++++++++++++++------- + arch/arm64/kvm/sys_regs.h | 17 +++++++++++++++-- + virt/kvm/arm/arm.c | 4 ++-- + virt/kvm/arm/mmio.c | 6 ++++++ + virt/kvm/arm/mmu.c | 30 +++++++++++++++++------------- + virt/kvm/arm/vgic/vgic-init.c | 20 +++++--------------- + virt/kvm/arm/vgic/vgic-its.c | 3 ++- + 11 files changed, 79 insertions(+), 44 deletions(-) +Merging kvm-ppc/kvm-ppc-next (30486e72093e KVM: PPC: Book3S HV: XIVE: Fix potential page leak on error path) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (c7b7de631246 KVM: s390: Do not yield when target is already running) +$ git merge kvms390/next +Already up to date. +Merging xen-tip/linux-next (c673ec61ade8 xen/balloon: fix ballooned page accounting without hotplug enabled) +$ git merge xen-tip/linux-next +Already up to date. +Merging percpu/for-next (06557cf18eae Merge branch 'for-5.6' into for-next) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + include/asm-generic/percpu.h | 10 +++++----- + include/linux/percpu-defs.h | 3 +-- + 2 files changed, 6 insertions(+), 7 deletions(-) +Merging workqueues/for-next (49e9d1a9faf2 workqueue: Add RCU annotation for pwq list walk) +$ git merge workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (e42617b825f8 Linux 5.5-rc1) +$ git merge drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (737d6777b231 cros_ec: treewide: Remove 'include/linux/mfd/cros_ec.h') +$ git merge chrome-platform/for-next +Removing include/linux/mfd/cros_ec.h +Auto-merging drivers/power/supply/cros_usbpd-charger.c +Merge made by the 'recursive' strategy. + drivers/iio/accel/cros_ec_accel_legacy.c | 1 - + .../iio/common/cros_ec_sensors/cros_ec_sensors.c | 1 - + .../common/cros_ec_sensors/cros_ec_sensors_core.c | 1 - + drivers/iio/light/cros_ec_light_prox.c | 1 - + drivers/iio/pressure/cros_ec_baro.c | 1 - + drivers/media/platform/cros-ec-cec/cros-ec-cec.c | 1 - + drivers/mfd/cros_ec_dev.c | 1 - + drivers/platform/chrome/chromeos_laptop.c | 18 ++-- + drivers/platform/chrome/cros_ec_chardev.c | 1 - + drivers/platform/chrome/cros_ec_debugfs.c | 1 - + drivers/platform/chrome/cros_ec_ishtp.c | 2 +- + drivers/platform/chrome/cros_ec_lightbar.c | 1 - + drivers/platform/chrome/cros_ec_lpc.c | 2 +- + drivers/platform/chrome/cros_ec_proto.c | 6 +- + drivers/platform/chrome/cros_ec_sensorhub.c | 1 - + drivers/platform/chrome/cros_ec_sysfs.c | 1 - + drivers/platform/chrome/cros_ec_trace.c | 97 ++++++++++++++++++++-- + drivers/platform/chrome/cros_ec_trace.h | 26 ++++-- + drivers/platform/chrome/cros_ec_vbc.c | 1 - + drivers/platform/chrome/cros_usbpd_logger.c | 1 - + drivers/power/supply/cros_usbpd-charger.c | 1 - + drivers/rtc/rtc-cros-ec.c | 1 - + include/linux/mfd/cros_ec.h | 35 -------- + include/linux/platform_data/cros_ec_proto.h | 23 ++++- + 24 files changed, 149 insertions(+), 76 deletions(-) + delete mode 100644 include/linux/mfd/cros_ec.h +Merging hsi/for-next (c1030cd45619 HSI: Remove dev_err() usage after platform_get_irq()) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (5f820ed52371 leds: trigger: netdev: fix handling on interface rename) +$ git merge leds/for-next +Already up to date. +Merging ipmi/for-next (380665becdee drivers: ipmi: Modify max length of IPMB packet) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + Documentation/driver-api/ipmb.rst | 4 ++++ + drivers/char/ipmi/ipmb_dev_int.c | 31 ++++++++++++++++++++++++++++++- + 2 files changed, 34 insertions(+), 1 deletion(-) +Merging driver-core/driver-core-next (4c002c978b7f device.h: move 'struct driver' stuff out to device/driver.h) +$ git merge driver-core/driver-core-next +Auto-merging init/main.c +Auto-merging include/linux/device.h +CONFLICT (content): Merge conflict in include/linux/device.h +Recorded preimage for 'include/linux/device.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'include/linux/device.h'. +[master 85a7a99c2282] Merge remote-tracking branch 'driver-core/driver-core-next' +$ git diff -M --stat --summary HEAD^.. + drivers/base/base.h | 19 + + drivers/base/bus.c | 1 + + drivers/base/class.c | 1 + + drivers/base/driver.c | 1 + + include/linux/dev_printk.h | 235 ++++++++++ + include/linux/device.h | 999 +----------------------------------------- + include/linux/device/bus.h | 288 ++++++++++++ + include/linux/device/class.h | 266 +++++++++++ + include/linux/device/driver.h | 292 ++++++++++++ + init/main.c | 2 +- + 10 files changed, 1108 insertions(+), 996 deletions(-) + create mode 100644 include/linux/dev_printk.h + create mode 100644 include/linux/device/bus.h + create mode 100644 include/linux/device/class.h + create mode 100644 include/linux/device/driver.h +Merging usb/usb-next (ea81896dc98f thunderbolt: Update documentation with the USB4 information) +$ git merge usb/usb-next +Removing include/linux/platform_data/ehci-sh.h +Auto-merging drivers/net/Makefile +Auto-merging drivers/net/Kconfig +Merge made by the 'recursive' strategy. + Documentation/admin-guide/thunderbolt.rst | 30 +- + .../bindings/connector/usb-connector.txt | 4 +- + drivers/Makefile | 2 +- + drivers/net/Kconfig | 10 +- + drivers/net/Makefile | 2 +- + drivers/thunderbolt/Kconfig | 11 +- + drivers/thunderbolt/Makefile | 4 +- + drivers/thunderbolt/cap.c | 11 +- + drivers/thunderbolt/ctl.c | 19 +- + drivers/thunderbolt/ctl.h | 3 +- + drivers/thunderbolt/eeprom.c | 137 ++-- + drivers/thunderbolt/nhi.c | 3 + + drivers/thunderbolt/nhi.h | 2 + + drivers/thunderbolt/switch.c | 439 +++++++++--- + drivers/thunderbolt/tb.c | 227 ++++-- + drivers/thunderbolt/tb.h | 101 +++ + drivers/thunderbolt/tb_msgs.h | 6 +- + drivers/thunderbolt/tb_regs.h | 65 +- + drivers/thunderbolt/tmu.c | 383 +++++++++++ + drivers/thunderbolt/tunnel.c | 169 ++++- + drivers/thunderbolt/tunnel.h | 9 + + drivers/thunderbolt/usb4.c | 764 +++++++++++++++++++++ + drivers/thunderbolt/xdomain.c | 6 + + drivers/usb/gadget/Kconfig | 28 - + drivers/usb/gadget/function/u_audio.c | 19 +- + drivers/usb/gadget/legacy/Kconfig | 28 + + drivers/usb/host/ehci-sh.c | 7 - + drivers/usb/host/xhci-tegra.c | 439 ++++++++++-- + drivers/usb/serial/Kconfig | 3 - + include/linux/platform_data/ehci-sh.h | 16 - + 30 files changed, 2579 insertions(+), 368 deletions(-) + create mode 100644 drivers/thunderbolt/tmu.c + create mode 100644 drivers/thunderbolt/usb4.c + delete mode 100644 include/linux/platform_data/ehci-sh.h +Merging usb-gadget/next (726b4fba94be usb: dwc3: of-simple: add a shutdown) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (d1eef1c61974 Linux 5.5-rc2) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/ci-for-usb-next (4d6141288c33 usb: chipidea: imx: pinctrl for HSIC is optional) +$ git merge usb-chipidea-next/ci-for-usb-next +Already up to date. +Merging phy-next/next (e42617b825f8 Linux 5.5-rc1) +$ git merge phy-next/next +Already up to date. +Merging tty/tty-next (293f89959483 tty: serial: 21285: stop using the unused[] variable from struct uart_port) +$ git merge tty/tty-next +Auto-merging scripts/Makefile +Auto-merging scripts/.gitignore +Auto-merging drivers/tty/serial/ucc_uart.c +Auto-merging drivers/tty/serial/sprd_serial.c +Removing drivers/tty/serial/samsung.h +Auto-merging drivers/tty/serial/msm_serial.c +Auto-merging drivers/tty/serial/atmel_serial.c +Merge made by the 'recursive' strategy. + arch/powerpc/kernel/legacy_serial.c | 4 +- + drivers/tty/serdev/core.c | 14 +- + drivers/tty/serial/21285.c | 55 ++++- + drivers/tty/serial/8250/8250_aspeed_vuart.c | 5 +- + drivers/tty/serial/8250/8250_core.c | 1 + + drivers/tty/serial/8250/8250_fsl.c | 4 - + drivers/tty/serial/8250/8250_of.c | 4 +- + drivers/tty/serial/8250/8250_omap.c | 5 +- + drivers/tty/serial/8250/8250_port.c | 5 +- + drivers/tty/serial/Kconfig | 2 +- + drivers/tty/serial/amba-pl010.c | 5 +- + drivers/tty/serial/amba-pl011.c | 13 +- + drivers/tty/serial/apbuart.c | 5 +- + drivers/tty/serial/arc_uart.c | 5 +- + drivers/tty/serial/atmel_serial.c | 9 +- + drivers/tty/serial/bcm63xx_uart.c | 5 +- + drivers/tty/serial/clps711x.c | 5 +- + drivers/tty/serial/cpm_uart/cpm_uart_core.c | 9 +- + drivers/tty/serial/dz.c | 5 +- + drivers/tty/serial/efm32-uart.c | 5 +- + drivers/tty/serial/fsl_linflexuart.c | 8 +- + drivers/tty/serial/fsl_lpuart.c | 9 +- + drivers/tty/serial/imx.c | 7 +- + drivers/tty/serial/ip22zilog.c | 7 +- + drivers/tty/serial/meson_uart.c | 5 +- + drivers/tty/serial/milbeaut_usio.c | 5 +- + drivers/tty/serial/mpc52xx_uart.c | 11 +- + drivers/tty/serial/msm_serial.c | 5 +- + drivers/tty/serial/mux.c | 5 +- + drivers/tty/serial/mxs-auart.c | 5 +- + drivers/tty/serial/omap-serial.c | 12 +- + drivers/tty/serial/pch_uart.c | 12 +- + drivers/tty/serial/pmac_zilog.c | 5 +- + drivers/tty/serial/pnx8xxx_uart.c | 7 +- + drivers/tty/serial/pxa.c | 5 +- + drivers/tty/serial/qcom_geni_serial.c | 5 +- + drivers/tty/serial/sa1100.c | 7 +- + drivers/tty/serial/samsung.h | 147 ------------- + drivers/tty/serial/samsung_tty.c | 313 ++++++++++++++++++---------- + drivers/tty/serial/sb1250-duart.c | 5 +- + drivers/tty/serial/sccnxp.c | 5 +- + drivers/tty/serial/serial_txx9.c | 5 +- + drivers/tty/serial/sh-sci.c | 10 +- + drivers/tty/serial/sprd_serial.c | 5 +- + drivers/tty/serial/st-asc.c | 5 +- + drivers/tty/serial/stm32-usart.c | 5 +- + drivers/tty/serial/sunhv.c | 5 +- + drivers/tty/serial/sunsab.c | 5 +- + drivers/tty/serial/sunsu.c | 5 +- + drivers/tty/serial/sunzilog.c | 6 +- + drivers/tty/serial/ucc_uart.c | 2 - + drivers/tty/serial/vr41xx_siu.c | 5 +- + drivers/tty/serial/vt8500_serial.c | 5 +- + drivers/tty/serial/xilinx_uartps.c | 5 +- + drivers/tty/serial/zs.c | 5 +- + drivers/tty/sysrq.c | 9 +- + drivers/tty/tty_io.c | 2 +- + drivers/tty/vt/.gitignore | 1 + + drivers/tty/vt/Makefile | 6 +- + {scripts => drivers/tty/vt}/conmakehash.c | 0 + include/linux/serial_8250.h | 1 + + include/linux/serial_core.h | 78 +++---- + scripts/.gitignore | 1 - + scripts/Makefile | 3 - + 64 files changed, 374 insertions(+), 555 deletions(-) + delete mode 100644 drivers/tty/serial/samsung.h + rename {scripts => drivers/tty/vt}/conmakehash.c (100%) +Merging char-misc/char-misc-next (d1eef1c61974 Linux 5.5-rc2) +$ git merge char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (2ddf50a75dab extcon: sm5502: Remove unneeded semicolon) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-arizona.c | 354 ++++++++++++++++++++++------------------ + drivers/extcon/extcon-sm5502.c | 10 +- + 2 files changed, 199 insertions(+), 165 deletions(-) +Merging soundwire/next (09f6a72d0143 soundwire: intel: add clock stop quirks) +$ git merge soundwire/next +Merge made by the 'recursive' strategy. + drivers/soundwire/intel.c | 20 +++-- + drivers/soundwire/intel.h | 13 +-- + drivers/soundwire/intel_init.c | 32 ++------ + include/linux/soundwire/sdw.h | 19 +++++ + include/linux/soundwire/sdw_intel.h | 156 +++++++++++++++++++++++++++++++++--- + 5 files changed, 196 insertions(+), 44 deletions(-) +Merging thunderbolt/next (d1eef1c61974 Linux 5.5-rc2) +$ git merge thunderbolt/next +Already up to date. +Merging staging/staging-next (6db45b06611c staging: wfx: update TODO) +$ git merge staging/staging-next +Removing include/uapi/linux/hysdn_if.h +Removing include/uapi/linux/gigaset_dev.h +Removing include/uapi/linux/b1lli.h +Removing include/linux/b1pcmcia.h +Auto-merging drivers/staging/wfx/sta.c +Auto-merging drivers/staging/wfx/queue.c +Auto-merging drivers/staging/wfx/main.c +Auto-merging drivers/staging/wfx/hif_tx_mib.h +Auto-merging drivers/staging/wfx/data_tx.h +Auto-merging drivers/staging/wfx/data_tx.c +Auto-merging drivers/staging/qlge/qlge_main.c +Removing drivers/staging/octeon/octeon-stubs.h +Removing drivers/staging/octeon/octeon-ethernet.h +Removing drivers/staging/octeon/ethernet.c +Removing drivers/staging/octeon/ethernet-util.h +Removing drivers/staging/octeon/ethernet-tx.h +Removing drivers/staging/octeon/ethernet-tx.c +Removing drivers/staging/octeon/ethernet-spi.c +Removing drivers/staging/octeon/ethernet-sgmii.c +Removing drivers/staging/octeon/ethernet-rx.h +Removing drivers/staging/octeon/ethernet-rx.c +Removing drivers/staging/octeon/ethernet-rgmii.c +Removing drivers/staging/octeon/ethernet-mem.h +Removing drivers/staging/octeon/ethernet-mem.c +Removing drivers/staging/octeon/ethernet-mdio.h +Removing drivers/staging/octeon/ethernet-mdio.c +Removing drivers/staging/octeon/ethernet-defines.h +Removing drivers/staging/octeon/TODO +Removing drivers/staging/octeon/Makefile +Removing drivers/staging/octeon/Kconfig +Removing drivers/staging/octeon-usb/octeon-hcd.h +Removing drivers/staging/octeon-usb/octeon-hcd.c +Removing drivers/staging/octeon-usb/TODO +Removing drivers/staging/octeon-usb/Makefile +Removing drivers/staging/octeon-usb/Kconfig +Removing drivers/staging/isdn/hysdn/ince1pc.h +Removing drivers/staging/isdn/hysdn/hysdn_sched.c +Removing drivers/staging/isdn/hysdn/hysdn_proclog.c +Removing drivers/staging/isdn/hysdn/hysdn_procconf.c +Removing drivers/staging/isdn/hysdn/hysdn_pof.h +Removing drivers/staging/isdn/hysdn/hysdn_net.c +Removing drivers/staging/isdn/hysdn/hysdn_init.c +Removing drivers/staging/isdn/hysdn/hysdn_defs.h +Removing drivers/staging/isdn/hysdn/hysdn_boot.c +Removing drivers/staging/isdn/hysdn/hycapi.c +Removing drivers/staging/isdn/hysdn/boardergo.h +Removing drivers/staging/isdn/hysdn/boardergo.c +Removing drivers/staging/isdn/hysdn/Makefile +Removing drivers/staging/isdn/hysdn/Kconfig +Removing drivers/staging/isdn/gigaset/usb-gigaset.c +Removing drivers/staging/isdn/gigaset/ser-gigaset.c +Removing drivers/staging/isdn/gigaset/proc.c +Removing drivers/staging/isdn/gigaset/isocdata.c +Removing drivers/staging/isdn/gigaset/interface.c +Removing drivers/staging/isdn/gigaset/gigaset.h +Removing drivers/staging/isdn/gigaset/ev-layer.c +Removing drivers/staging/isdn/gigaset/dummyll.c +Removing drivers/staging/isdn/gigaset/common.c +Removing drivers/staging/isdn/gigaset/capi.c +Removing drivers/staging/isdn/gigaset/bas-gigaset.c +Removing drivers/staging/isdn/gigaset/asyncdata.c +Removing drivers/staging/isdn/gigaset/Makefile +Removing drivers/staging/isdn/gigaset/Kconfig +Removing drivers/staging/isdn/avm/t1pci.c +Removing drivers/staging/isdn/avm/t1isa.c +Removing drivers/staging/isdn/avm/c4.c +Removing drivers/staging/isdn/avm/b1pcmcia.c +Removing drivers/staging/isdn/avm/b1pci.c +Removing drivers/staging/isdn/avm/b1isa.c +Removing drivers/staging/isdn/avm/b1dma.c +Removing drivers/staging/isdn/avm/b1.c +Removing drivers/staging/isdn/avm/avmcard.h +Removing drivers/staging/isdn/avm/avm_cs.c +Removing drivers/staging/isdn/avm/Makefile +Removing drivers/staging/isdn/avm/Kconfig +Removing drivers/staging/isdn/TODO +Removing drivers/staging/isdn/Makefile +Removing drivers/staging/isdn/Kconfig +Removing drivers/isdn/capi/capilib.c +Auto-merging MAINTAINERS +Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst +Removing Documentation/isdn/hysdn.rst +Removing Documentation/isdn/gigaset.rst +Removing Documentation/isdn/avmb1.rst +Merge made by the 'recursive' strategy. + Documentation/isdn/avmb1.rst | 246 -- + Documentation/isdn/gigaset.rst | 465 --- + Documentation/isdn/hysdn.rst | 196 - + Documentation/isdn/index.rst | 3 - + Documentation/isdn/interface_capi.rst | 71 - + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 - + MAINTAINERS | 3 +- + drivers/isdn/Makefile | 2 +- + drivers/isdn/capi/Kconfig | 32 +- + drivers/isdn/capi/Makefile | 18 +- + drivers/isdn/capi/capi.c | 14 +- + drivers/isdn/capi/capilib.c | 202 -- + drivers/isdn/capi/capiutil.c | 231 +- + drivers/isdn/capi/kcapi.c | 409 +-- + drivers/isdn/capi/kcapi.h | 149 +- + drivers/isdn/capi/kcapi_proc.c | 36 +- + drivers/staging/Kconfig | 6 - + drivers/staging/Makefile | 3 - + drivers/staging/exfat/exfat_super.c | 4 +- + drivers/staging/hp/hp100.c | 11 +- + drivers/staging/isdn/Kconfig | 12 - + drivers/staging/isdn/Makefile | 8 - + drivers/staging/isdn/TODO | 22 - + drivers/staging/isdn/avm/Kconfig | 65 - + drivers/staging/isdn/avm/Makefile | 12 - + drivers/staging/isdn/avm/avm_cs.c | 166 - + drivers/staging/isdn/avm/avmcard.h | 581 --- + drivers/staging/isdn/avm/b1.c | 819 ----- + drivers/staging/isdn/avm/b1dma.c | 981 ----- + drivers/staging/isdn/avm/b1isa.c | 243 -- + drivers/staging/isdn/avm/b1pci.c | 416 --- + drivers/staging/isdn/avm/b1pcmcia.c | 224 -- + drivers/staging/isdn/avm/c4.c | 1317 ------- + drivers/staging/isdn/avm/t1isa.c | 594 ---- + drivers/staging/isdn/avm/t1pci.c | 259 -- + drivers/staging/isdn/gigaset/Kconfig | 62 - + drivers/staging/isdn/gigaset/Makefile | 17 - + drivers/staging/isdn/gigaset/asyncdata.c | 606 ---- + drivers/staging/isdn/gigaset/bas-gigaset.c | 2672 -------------- + drivers/staging/isdn/gigaset/capi.c | 2517 ------------- + drivers/staging/isdn/gigaset/common.c | 1153 ------ + drivers/staging/isdn/gigaset/dummyll.c | 74 - + drivers/staging/isdn/gigaset/ev-layer.c | 1910 ---------- + drivers/staging/isdn/gigaset/gigaset.h | 827 ----- + drivers/staging/isdn/gigaset/interface.c | 613 ---- + drivers/staging/isdn/gigaset/isocdata.c | 1006 ------ + drivers/staging/isdn/gigaset/proc.c | 77 - + drivers/staging/isdn/gigaset/ser-gigaset.c | 796 ----- + drivers/staging/isdn/gigaset/usb-gigaset.c | 959 ----- + drivers/staging/isdn/hysdn/Kconfig | 15 - + drivers/staging/isdn/hysdn/Makefile | 12 - + drivers/staging/isdn/hysdn/boardergo.c | 445 --- + drivers/staging/isdn/hysdn/boardergo.h | 100 - + drivers/staging/isdn/hysdn/hycapi.c | 785 ---- + drivers/staging/isdn/hysdn/hysdn_boot.c | 400 --- + drivers/staging/isdn/hysdn/hysdn_defs.h | 282 -- + drivers/staging/isdn/hysdn/hysdn_init.c | 213 -- + drivers/staging/isdn/hysdn/hysdn_net.c | 330 -- + drivers/staging/isdn/hysdn/hysdn_pof.h | 78 - + drivers/staging/isdn/hysdn/hysdn_procconf.c | 411 --- + drivers/staging/isdn/hysdn/hysdn_proclog.c | 357 -- + drivers/staging/isdn/hysdn/hysdn_sched.c | 197 -- + drivers/staging/isdn/hysdn/ince1pc.h | 134 - + drivers/staging/most/cdev/cdev.c | 4 +- + drivers/staging/most/configfs.c | 32 +- + drivers/staging/most/core.c | 34 +- + drivers/staging/most/dim2/dim2.c | 2 +- + drivers/staging/most/i2c/i2c.c | 2 +- + drivers/staging/most/{core.h => most.h} | 26 +- + drivers/staging/most/net/net.c | 6 +- + drivers/staging/most/sound/sound.c | 53 +- + drivers/staging/most/usb/usb.c | 2 +- + drivers/staging/most/video/video.c | 6 +- + drivers/staging/octeon-usb/Kconfig | 11 - + drivers/staging/octeon-usb/Makefile | 2 - + drivers/staging/octeon-usb/TODO | 8 - + drivers/staging/octeon-usb/octeon-hcd.c | 3737 -------------------- + drivers/staging/octeon-usb/octeon-hcd.h | 1847 ---------- + drivers/staging/octeon/Kconfig | 16 - + drivers/staging/octeon/Makefile | 19 - + drivers/staging/octeon/TODO | 9 - + drivers/staging/octeon/ethernet-defines.h | 40 - + drivers/staging/octeon/ethernet-mdio.c | 178 - + drivers/staging/octeon/ethernet-mdio.h | 28 - + drivers/staging/octeon/ethernet-mem.c | 154 - + drivers/staging/octeon/ethernet-mem.h | 9 - + drivers/staging/octeon/ethernet-rgmii.c | 158 - + drivers/staging/octeon/ethernet-rx.c | 538 --- + drivers/staging/octeon/ethernet-rx.h | 31 - + drivers/staging/octeon/ethernet-sgmii.c | 30 - + drivers/staging/octeon/ethernet-spi.c | 226 -- + drivers/staging/octeon/ethernet-tx.c | 717 ---- + drivers/staging/octeon/ethernet-tx.h | 14 - + drivers/staging/octeon/ethernet-util.h | 47 - + drivers/staging/octeon/ethernet.c | 992 ------ + drivers/staging/octeon/octeon-ethernet.h | 107 - + drivers/staging/octeon/octeon-stubs.h | 1433 -------- + drivers/staging/qlge/qlge.h | 15 +- + drivers/staging/qlge/qlge_dbg.c | 32 +- + drivers/staging/qlge/qlge_ethtool.c | 39 +- + drivers/staging/qlge/qlge_main.c | 215 +- + drivers/staging/qlge/qlge_mpi.c | 26 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 151 +- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 34 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 54 +- + drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 12 +- + drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 44 +- + drivers/staging/rts5208/rtsx.c | 7 +- + .../vc04_services/bcm2835-audio/bcm2835-pcm.c | 19 +- + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 9 +- + drivers/staging/wfx/TODO | 81 +- + drivers/staging/wfx/bh.c | 3 +- + drivers/staging/wfx/bus_spi.c | 9 +- + drivers/staging/wfx/data_rx.c | 8 +- + drivers/staging/wfx/data_rx.h | 4 +- + drivers/staging/wfx/data_tx.c | 5 +- + drivers/staging/wfx/data_tx.h | 2 +- + drivers/staging/wfx/fwio.c | 28 +- + drivers/staging/wfx/hif_api_cmd.h | 32 +- + drivers/staging/wfx/hif_api_mib.h | 13 +- + drivers/staging/wfx/hif_rx.c | 103 +- + drivers/staging/wfx/hif_tx.c | 109 +- + drivers/staging/wfx/hif_tx.h | 17 +- + drivers/staging/wfx/hif_tx_mib.h | 26 +- + drivers/staging/wfx/hwio.h | 15 +- + drivers/staging/wfx/main.c | 3 +- + drivers/staging/wfx/queue.c | 8 +- + drivers/staging/wfx/scan.c | 323 +- + drivers/staging/wfx/scan.h | 25 +- + drivers/staging/wfx/secure_link.h | 8 +- + drivers/staging/wfx/sta.c | 348 +- + drivers/staging/wfx/sta.h | 9 +- + drivers/staging/wfx/traces.h | 14 +- + drivers/staging/wfx/wfx.h | 18 +- + drivers/staging/wilc1000/netdev.c | 9 +- + drivers/staging/wilc1000/wlan.c | 23 - + drivers/staging/wilc1000/wlan.h | 1 + + drivers/staging/wilc1000/wlan_cfg.c | 8 +- + include/linux/b1pcmcia.h | 21 - + include/linux/isdn/capilli.h | 18 - + include/linux/isdn/capiutil.h | 456 --- + include/linux/kernelcapi.h | 75 - + include/uapi/linux/b1lli.h | 74 - + include/uapi/linux/gigaset_dev.h | 39 - + include/uapi/linux/hysdn_if.h | 34 - + 145 files changed, 1050 insertions(+), 36963 deletions(-) + delete mode 100644 Documentation/isdn/avmb1.rst + delete mode 100644 Documentation/isdn/gigaset.rst + delete mode 100644 Documentation/isdn/hysdn.rst + delete mode 100644 drivers/isdn/capi/capilib.c + delete mode 100644 drivers/staging/isdn/Kconfig + delete mode 100644 drivers/staging/isdn/Makefile + delete mode 100644 drivers/staging/isdn/TODO + delete mode 100644 drivers/staging/isdn/avm/Kconfig + delete mode 100644 drivers/staging/isdn/avm/Makefile + delete mode 100644 drivers/staging/isdn/avm/avm_cs.c + delete mode 100644 drivers/staging/isdn/avm/avmcard.h + delete mode 100644 drivers/staging/isdn/avm/b1.c + delete mode 100644 drivers/staging/isdn/avm/b1dma.c + delete mode 100644 drivers/staging/isdn/avm/b1isa.c + delete mode 100644 drivers/staging/isdn/avm/b1pci.c + delete mode 100644 drivers/staging/isdn/avm/b1pcmcia.c + delete mode 100644 drivers/staging/isdn/avm/c4.c + delete mode 100644 drivers/staging/isdn/avm/t1isa.c + delete mode 100644 drivers/staging/isdn/avm/t1pci.c + delete mode 100644 drivers/staging/isdn/gigaset/Kconfig + delete mode 100644 drivers/staging/isdn/gigaset/Makefile + delete mode 100644 drivers/staging/isdn/gigaset/asyncdata.c + delete mode 100644 drivers/staging/isdn/gigaset/bas-gigaset.c + delete mode 100644 drivers/staging/isdn/gigaset/capi.c + delete mode 100644 drivers/staging/isdn/gigaset/common.c + delete mode 100644 drivers/staging/isdn/gigaset/dummyll.c + delete mode 100644 drivers/staging/isdn/gigaset/ev-layer.c + delete mode 100644 drivers/staging/isdn/gigaset/gigaset.h + delete mode 100644 drivers/staging/isdn/gigaset/interface.c + delete mode 100644 drivers/staging/isdn/gigaset/isocdata.c + delete mode 100644 drivers/staging/isdn/gigaset/proc.c + delete mode 100644 drivers/staging/isdn/gigaset/ser-gigaset.c + delete mode 100644 drivers/staging/isdn/gigaset/usb-gigaset.c + delete mode 100644 drivers/staging/isdn/hysdn/Kconfig + delete mode 100644 drivers/staging/isdn/hysdn/Makefile + delete mode 100644 drivers/staging/isdn/hysdn/boardergo.c + delete mode 100644 drivers/staging/isdn/hysdn/boardergo.h + delete mode 100644 drivers/staging/isdn/hysdn/hycapi.c + delete mode 100644 drivers/staging/isdn/hysdn/hysdn_boot.c + delete mode 100644 drivers/staging/isdn/hysdn/hysdn_defs.h + delete mode 100644 drivers/staging/isdn/hysdn/hysdn_init.c + delete mode 100644 drivers/staging/isdn/hysdn/hysdn_net.c + delete mode 100644 drivers/staging/isdn/hysdn/hysdn_pof.h + delete mode 100644 drivers/staging/isdn/hysdn/hysdn_procconf.c + delete mode 100644 drivers/staging/isdn/hysdn/hysdn_proclog.c + delete mode 100644 drivers/staging/isdn/hysdn/hysdn_sched.c + delete mode 100644 drivers/staging/isdn/hysdn/ince1pc.h + rename drivers/staging/most/{core.h => most.h} (95%) + delete mode 100644 drivers/staging/octeon-usb/Kconfig + delete mode 100644 drivers/staging/octeon-usb/Makefile + delete mode 100644 drivers/staging/octeon-usb/TODO + delete mode 100644 drivers/staging/octeon-usb/octeon-hcd.c + delete mode 100644 drivers/staging/octeon-usb/octeon-hcd.h + delete mode 100644 drivers/staging/octeon/Kconfig + delete mode 100644 drivers/staging/octeon/Makefile + delete mode 100644 drivers/staging/octeon/TODO + delete mode 100644 drivers/staging/octeon/ethernet-defines.h + delete mode 100644 drivers/staging/octeon/ethernet-mdio.c + delete mode 100644 drivers/staging/octeon/ethernet-mdio.h + delete mode 100644 drivers/staging/octeon/ethernet-mem.c + delete mode 100644 drivers/staging/octeon/ethernet-mem.h + delete mode 100644 drivers/staging/octeon/ethernet-rgmii.c + delete mode 100644 drivers/staging/octeon/ethernet-rx.c + delete mode 100644 drivers/staging/octeon/ethernet-rx.h + delete mode 100644 drivers/staging/octeon/ethernet-sgmii.c + delete mode 100644 drivers/staging/octeon/ethernet-spi.c + delete mode 100644 drivers/staging/octeon/ethernet-tx.c + delete mode 100644 drivers/staging/octeon/ethernet-tx.h + delete mode 100644 drivers/staging/octeon/ethernet-util.h + delete mode 100644 drivers/staging/octeon/ethernet.c + delete mode 100644 drivers/staging/octeon/octeon-ethernet.h + delete mode 100644 drivers/staging/octeon/octeon-stubs.h + delete mode 100644 include/linux/b1pcmcia.h + delete mode 100644 include/uapi/linux/b1lli.h + delete mode 100644 include/uapi/linux/gigaset_dev.h + delete mode 100644 include/uapi/linux/hysdn_if.h +Merging mux/for-next (05fb8284a417 Merge branch 'i2c-mux/for-next' into for-next) +$ git merge mux/for-next +Merge made by the 'recursive' strategy. +Merging icc/icc-next (1a0013c62b33 interconnect: Add interconnect_graph file to debugfs) +$ git merge icc/icc-next +Merge made by the 'recursive' strategy. + Documentation/driver-api/interconnect.rst | 22 +++++ + drivers/interconnect/Makefile | 1 + + drivers/interconnect/core.c | 153 ++++++++++++++++++++++++------ + drivers/interconnect/internal.h | 42 ++++++++ + drivers/interconnect/qcom/msm8974.c | 32 ++----- + drivers/interconnect/qcom/qcs404.c | 32 ++----- + drivers/interconnect/qcom/sdm845.c | 16 +--- + drivers/interconnect/trace.h | 88 +++++++++++++++++ + include/linux/interconnect-provider.h | 14 +++ + 9 files changed, 306 insertions(+), 94 deletions(-) + create mode 100644 drivers/interconnect/internal.h + create mode 100644 drivers/interconnect/trace.h +Merging slave-dma/next (ed5a0ab41555 dmaengine: fsl-edma: Add eDMA support for QorIQ LS1028A platform) +$ git merge slave-dma/next +Auto-merging include/linux/dmaengine.h +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/dma/fsl-edma.txt | 1 + + .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 1 + + drivers/dma/dma-axi-dmac.c | 10 +++++- + drivers/dma/fsl-edma-common.c | 5 +++ + drivers/dma/fsl-edma-common.h | 1 + + drivers/dma/fsl-edma.c | 8 +++++ + drivers/dma/pl330.c | 16 +++------ + drivers/dma/ti/edma.c | 39 ++++++++++++---------- + include/linux/dmaengine.h | 2 +- + 9 files changed, 53 insertions(+), 30 deletions(-) +Merging cgroup/for-next (899969b46c28 Merge branch 'for-5.5' into for-next) +$ git merge cgroup/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging scsi/for-next (67a358329376 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Merge made by the 'recursive' strategy. + drivers/scsi/esp_scsi.c | 22 +-- + drivers/scsi/esp_scsi.h | 41 +++-- + drivers/scsi/scsi_lib.c | 2 + + drivers/scsi/ufs/cdns-pltfrm.c | 106 +++++++++++++ + drivers/scsi/ufs/ufs.h | 6 +- + drivers/scsi/ufs/ufshcd.c | 322 ++++++++++++++++++++------------------- + drivers/scsi/ufs/ufshcd.h | 20 +-- + drivers/scsi/ufs/unipro.h | 11 ++ + include/scsi/scsi_device.h | 1 + + include/uapi/scsi/scsi_bsg_ufs.h | 3 +- + 10 files changed, 336 insertions(+), 198 deletions(-) +Merging scsi-mkp/for-next (a657d39c16b3 Merge branch '5.5/scsi-fixes' into 5.6/scsi-next) +$ git merge scsi-mkp/for-next +Auto-merging drivers/scsi/cxgbi/libcxgbi.c +Merge made by the 'recursive' strategy. + drivers/scsi/aic7xxx/aic7xxx_core.c | 2 +- + drivers/scsi/csiostor/csio_scsi.c | 2 +- + drivers/scsi/cxgbi/libcxgbi.c | 3 +- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 5 -- + drivers/scsi/initio.c | 2 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 3 +- + drivers/scsi/lpfc/lpfc_init.c | 2 +- + drivers/scsi/lpfc/lpfc_sli.c | 10 ++-- + drivers/scsi/mpt3sas/mpt3sas_base.c | 1 - + drivers/scsi/qla2xxx/qla_mbx.c | 5 +- + drivers/scsi/qla2xxx/qla_mr.c | 5 +- + drivers/scsi/qla4xxx/ql4_os.c | 2 +- + drivers/scsi/scsi_logging.h | 2 +- + drivers/scsi/sym53c8xx_2/sym_nvram.c | 4 +- + drivers/scsi/ufs/cdns-pltfrm.c | 1 + + drivers/scsi/ufs/ufs-mediatek.c | 94 ++++++++++++++++++++++++++++++-- + drivers/scsi/ufs/ufs-mediatek.h | 20 +++++++ + drivers/scsi/ufs/ufs-sysfs.c | 20 ------- + drivers/scsi/ufs/ufshcd.c | 50 +++++++++++++---- + drivers/scsi/ufs/ufshcd.h | 1 + + drivers/target/target_core_iblock.c | 4 +- + drivers/target/tcm_fc/tfc_io.c | 1 - + 22 files changed, 174 insertions(+), 65 deletions(-) +Merging vhost/linux-next (70e269172e04 ptr_ring: linked list fallback) +$ git merge vhost/linux-next +Merge made by the 'recursive' strategy. + include/linux/ptr_ring.h | 79 +++++++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 75 insertions(+), 4 deletions(-) +Merging rpmsg/for-next (5c615938c840 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/remoteproc/qcom,adsp.txt | 37 ++++ + drivers/remoteproc/qcom_q6v5_pas.c | 228 ++++++++++++++++++++- + drivers/remoteproc/qcom_sysmon.c | 2 +- + 3 files changed, 262 insertions(+), 5 deletions(-) +Merging gpio/for-next (06c4fc5eda6b Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Auto-merging drivers/gpio/gpiolib.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/renesas,gpio-rcar.txt | 3 +- + .../bindings/gpio/xylon,logicvc-gpio.yaml | 69 +++++++++ + .../devicetree/bindings/mfd/xylon,logicvc.yaml | 50 ++++++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/driver-api/driver-model/devres.rst | 2 + + MAINTAINERS | 1 + + drivers/gpio/Kconfig | 10 +- + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-aspeed-sgpio.c | 2 +- + drivers/gpio/gpio-logicvc.c | 170 +++++++++++++++++++++ + drivers/gpio/gpio-mockup.c | 7 +- + drivers/gpio/gpio-mpc8xxx.c | 1 + + drivers/gpio/gpio-pca953x.c | 26 ++-- + drivers/gpio/gpio-xgs-iproc.c | 2 +- + drivers/gpio/gpio-xtensa.c | 7 +- + drivers/gpio/gpiolib-sysfs.c | 7 +- + drivers/gpio/gpiolib.c | 76 ++++----- + drivers/gpio/gpiolib.h | 2 + + 18 files changed, 364 insertions(+), 74 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/xylon,logicvc-gpio.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/xylon,logicvc.yaml + create mode 100644 drivers/gpio/gpio-logicvc.c +Merging gpio-brgl/gpio/for-next (373894f83b52 gpio: remove unneeded MODULE_VERSION() usage) +$ git merge gpio-brgl/gpio/for-next +Auto-merging drivers/gpio/gpio-pca953x.c +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-bcm-kona.c | 12 +++++++++--- + drivers/gpio/gpio-mvebu.c | 7 +++++-- + drivers/gpio/gpio-pca953x.c | 5 +---- + drivers/gpio/gpio-sama5d2-piobu.c | 1 - + drivers/gpio/gpio-tb10x.c | 1 - + 5 files changed, 15 insertions(+), 11 deletions(-) +Merging gpio-intel/for-next (e42617b825f8 Linux 5.5-rc1) +$ git merge gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (de253bf8bf8f Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/aspeed,ast2600-pinctrl.yaml | 9 +- + .../bindings/pinctrl/qcom,sc7180-pinctrl.txt | 5 +- + drivers/pinctrl/Kconfig | 1 + + drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c | 170 +++++---- + drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 212 ++++++----- + drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 411 ++++++++++++++++++++- + drivers/pinctrl/aspeed/pinctrl-aspeed.c | 50 +-- + drivers/pinctrl/aspeed/pinctrl-aspeed.h | 38 +- + drivers/pinctrl/aspeed/pinmux-aspeed.h | 1 + + drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 8 +- + drivers/pinctrl/mediatek/pinctrl-mtk-mt2712.h | 2 +- + drivers/pinctrl/meson/pinctrl-meson-axg-pmx.h | 2 +- + drivers/pinctrl/pinctrl-ingenic.c | 2 +- + drivers/pinctrl/pinmux.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sc7180.c | 78 +++- + drivers/pinctrl/stm32/pinctrl-stm32.h | 2 +- + 16 files changed, 722 insertions(+), 271 deletions(-) +Merging pinctrl-intel/for-next (3a67fe38e76a pinctrl: lynxpoint: Update summary in the driver) +$ git merge pinctrl-intel/for-next +Removing drivers/gpio/gpio-lynxpoint.c +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/gpio/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 - + drivers/gpio/Kconfig | 8 - + drivers/gpio/Makefile | 1 - + drivers/gpio/gpio-lynxpoint.c | 471 -------------- + drivers/pinctrl/intel/Kconfig | 13 + + drivers/pinctrl/intel/Makefile | 1 + + drivers/pinctrl/intel/pinctrl-baytrail.c | 295 ++++----- + drivers/pinctrl/intel/pinctrl-cherryview.c | 5 +- + drivers/pinctrl/intel/pinctrl-intel.c | 40 +- + drivers/pinctrl/intel/pinctrl-intel.h | 44 ++ + drivers/pinctrl/intel/pinctrl-lynxpoint.c | 975 +++++++++++++++++++++++++++++ + 11 files changed, 1181 insertions(+), 673 deletions(-) + delete mode 100644 drivers/gpio/gpio-lynxpoint.c + create mode 100644 drivers/pinctrl/intel/pinctrl-lynxpoint.c +Merging pinctrl-samsung/for-next (225a2ec19aac pinctrl: samsung: Fix missing OF and GPIOLIB dependency on S3C24xx and S3C64xx) +$ git merge pinctrl-samsung/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/samsung/Kconfig | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) +Merging pwm/for-next (bd88d319abe9 pwm: imx27: Unconditionally write state to hardware) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + drivers/pwm/core.c | 6 +- + drivers/pwm/pwm-cros-ec.c | 58 ++++++++++++++++++-- + drivers/pwm/pwm-imx27.c | 137 +++++++++++++++++++++++++--------------------- + 3 files changed, 133 insertions(+), 68 deletions(-) +Merging userns/for-next (61a47c1ad3a4 sysctl: Remove the sysctl system call) +$ git merge userns/for-next +Already up to date. +Merging ktest/for-next (9b5f852ae20d ktest: Make default build option oldconfig not randconfig) +$ git merge ktest/for-next +Merge made by the 'recursive' strategy. + tools/testing/ktest/ktest.pl | 2 +- + tools/testing/ktest/sample.conf | 22 +++++++++++----------- + 2 files changed, 12 insertions(+), 12 deletions(-) +Merging random/dev (58be0106c530 random: fix soft lockup when trying to read from an uninitialized blocking pool) +$ git merge random/dev +Already up to date. +Merging kselftest/next (d1eef1c61974 Linux 5.5-rc2) +$ git merge kselftest/next +Already up to date. +Merging y2038/y2038 (5ea0f410a68f Merge tags 'block-ioctl-cleanup-5.6' and 'y2038-drivers-for-v5.6-signed' of git://git.kernel.org:/pub/scm/linux/kernel/git/arnd/playground into y2038-for-v5.6) +$ git merge y2038/y2038 +Auto-merging net/packet/af_packet.c +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/blkdev.h +Auto-merging fs/internal.h +Removing fs/compat_ioctl.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_drv.c +Removing block/compat_ioctl.c +Auto-merging Documentation/core-api/index.rst +CONFLICT (content): Merge conflict in Documentation/core-api/index.rst +Resolved 'Documentation/core-api/index.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master dfac25bf7e8c] Merge remote-tracking branch 'y2038/y2038' +$ git diff -M --stat --summary HEAD^.. + Documentation/core-api/index.rst | 1 + + Documentation/core-api/ioctl.rst | 253 +++++++++++++ + arch/arm64/include/asm/compat.h | 22 +- + arch/mips/include/asm/compat.h | 18 - + arch/parisc/include/asm/compat.h | 17 - + arch/powerpc/include/asm/compat.h | 17 - + arch/powerpc/oprofile/backtrace.c | 2 +- + arch/s390/include/asm/compat.h | 6 +- + arch/sh/include/uapi/asm/sockios.h | 4 +- + arch/sparc/include/asm/compat.h | 17 - + arch/sparc/kernel/sys_sparc_64.c | 33 +- + arch/um/drivers/cow.h | 2 +- + arch/um/drivers/cow_user.c | 7 +- + arch/um/drivers/ubd_kern.c | 11 +- + arch/um/include/shared/os.h | 2 +- + arch/um/os-Linux/file.c | 2 +- + arch/x86/include/asm/compat.h | 17 - + .../platforms/iss/include/platform/simcall.h | 4 +- + block/Makefile | 1 - + block/bsg.c | 1 + + block/compat_ioctl.c | 411 --------------------- + block/ioctl.c | 319 +++++++++++++--- + block/scsi_ioctl.c | 214 +++++++---- + drivers/ata/libata-scsi.c | 9 + + drivers/block/aoe/aoeblk.c | 1 + + drivers/block/floppy.c | 3 + + drivers/block/paride/pcd.c | 3 + + drivers/block/paride/pd.c | 1 + + drivers/block/paride/pf.c | 1 + + drivers/block/pktcdvd.c | 26 +- + drivers/block/sunvdc.c | 1 + + drivers/block/virtio_blk.c | 3 + + drivers/block/xen-blkfront.c | 1 + + drivers/cdrom/cdrom.c | 35 +- + drivers/cdrom/gdrom.c | 3 + + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 20 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 11 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 4 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.h | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 5 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 5 +- + drivers/gpu/drm/msm/msm_drv.h | 3 +- + drivers/ide/ide-cd.c | 38 ++ + drivers/ide/ide-disk.c | 1 + + drivers/ide/ide-floppy.c | 4 + + drivers/ide/ide-floppy.h | 2 + + drivers/ide/ide-floppy_ioctl.c | 35 ++ + drivers/ide/ide-gd.c | 17 + + drivers/ide/ide-ioctls.c | 47 ++- + drivers/ide/ide-tape.c | 11 + + drivers/scsi/aic94xx/aic94xx_init.c | 3 + + drivers/scsi/ch.c | 9 +- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 3 + + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 3 + + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 3 + + drivers/scsi/ipr.c | 3 + + drivers/scsi/isci/init.c | 3 + + drivers/scsi/mvsas/mv_init.c | 3 + + drivers/scsi/pm8001/pm8001_init.c | 3 + + drivers/scsi/scsi_ioctl.c | 54 ++- + drivers/scsi/sd.c | 50 +-- + drivers/scsi/sg.c | 170 ++++----- + drivers/scsi/sr.c | 53 ++- + drivers/scsi/st.c | 51 ++- + fs/Makefile | 2 +- + fs/compat_ioctl.c | 261 ------------- + fs/dlm/lowcomms.c | 6 +- + fs/fat/inode.c | 3 +- + fs/hfs/hfs_fs.h | 28 +- + fs/hfs/inode.c | 4 +- + fs/hfsplus/hfsplus_fs.h | 28 +- + fs/hfsplus/inode.c | 12 +- + fs/hostfs/hostfs.h | 22 +- + fs/hostfs/hostfs_kern.c | 15 +- + fs/internal.h | 6 - + fs/ioctl.c | 131 +++++-- + fs/nfs/fscache-index.c | 6 +- + fs/nfs/fscache.c | 18 +- + fs/nfs/fscache.h | 8 +- + fs/nfs/nfs4xdr.c | 10 +- + include/linux/blkdev.h | 7 + + include/linux/compat.h | 18 + + include/linux/falloc.h | 2 - + include/linux/fs.h | 4 - + include/linux/ide.h | 2 + + include/linux/jiffies.h | 20 - + include/linux/libata.h | 6 + + include/linux/sunrpc/cache.h | 42 ++- + include/linux/sunrpc/gss_api.h | 4 +- + include/linux/sunrpc/gss_krb5.h | 2 +- + include/linux/syscalls.h | 9 +- + include/scsi/scsi_ioctl.h | 1 + + include/scsi/sg.h | 30 ++ + include/uapi/linux/acct.h | 2 + + include/uapi/linux/taskstats.h | 6 +- + include/uapi/linux/time_types.h | 5 + + include/uapi/linux/timex.h | 2 + + kernel/acct.c | 4 +- + kernel/time/itimer.c | 18 +- + kernel/time/time.c | 58 +-- + kernel/tsacct.c | 9 +- + net/packet/af_packet.c | 27 +- + net/sunrpc/auth_gss/gss_krb5_mech.c | 12 +- + net/sunrpc/auth_gss/gss_krb5_seal.c | 8 +- + net/sunrpc/auth_gss/gss_krb5_unseal.c | 6 +- + net/sunrpc/auth_gss/gss_krb5_wrap.c | 16 +- + net/sunrpc/auth_gss/gss_mech_switch.c | 2 +- + net/sunrpc/auth_gss/svcauth_gss.c | 6 +- + net/sunrpc/cache.c | 16 +- + net/sunrpc/svcauth_unix.c | 10 +- + 110 files changed, 1561 insertions(+), 1437 deletions(-) + create mode 100644 Documentation/core-api/ioctl.rst + delete mode 100644 block/compat_ioctl.c + delete mode 100644 fs/compat_ioctl.c +Merging livepatching/for-next (7f436b3066e3 Merge branch 'for-5.5/core' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (ad9882f15884 coresight: etm4x: Fix unused function warning) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight-etm4x.c | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) +Merging rtc/rtc-next (28b8958c0bf6 rtc: rv3029: drop deprecated compatbiles) +$ git merge rtc/rtc-next +Auto-merging drivers/rtc/rtc-mt6397.c +Auto-merging .mailmap +Merge made by the 'recursive' strategy. + .mailmap | 1 + + Documentation/ABI/testing/rtc-cdev | 8 + + drivers/rtc/rtc-abx80x.c | 7 +- + drivers/rtc/rtc-ds1343.c | 7 +- + drivers/rtc/rtc-mt6397.c | 10 +- + drivers/rtc/rtc-pcf2127.c | 6 +- + drivers/rtc/rtc-pcf85063.c | 16 +- + drivers/rtc/rtc-pcf8523.c | 6 +- + drivers/rtc/rtc-pcf8563.c | 36 +-- + drivers/rtc/rtc-rv3028.c | 17 +- + drivers/rtc/rtc-rv3029c2.c | 448 +++++++++++++++---------------------- + drivers/rtc/rtc-rv8803.c | 16 +- + drivers/rtc/rtc-rx8010.c | 23 +- + drivers/rtc/rtc-stm32.c | 5 +- + drivers/rtc/rtc-zynqmp.c | 4 +- + include/linux/rtc.h | 1 + + include/uapi/linux/rtc.h | 7 +- + 17 files changed, 240 insertions(+), 378 deletions(-) +Merging nvdimm/libnvdimm-for-next (0dfbb932bb67 MAINTAINERS: Remove Keith from NVDIMM maintainers) +$ git merge nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (e42617b825f8 Linux 5.5-rc1) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (1ef512b16bc8 NTB: Fix an error in get link status) +$ git merge ntb/ntb-next +Auto-merging drivers/ntb/hw/amd/ntb_hw_amd.c +Merge made by the 'recursive' strategy. + drivers/ntb/hw/amd/ntb_hw_amd.c | 4 ++-- + drivers/ntb/hw/amd/ntb_hw_amd.h | 1 - + 2 files changed, 2 insertions(+), 3 deletions(-) +Merging kspp/for-next/kspp (c593642c8be0 treewide: Use sizeof_field() macro) +$ git merge kspp/for-next/kspp +Already up to date. +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge cisco/for-next +Already up to date. +Merging gnss/gnss-next (d1eef1c61974 Linux 5.5-rc2) +$ git merge gnss/gnss-next +Already up to date. +Merging fsi/next (2c01397b71c5 fsi: aspeed: Fix OPB0 byte order register values) +$ git merge fsi/next +Merge made by the 'recursive' strategy. +Merging slimbus/for-next (8f35288566d7 slimbus: qcom-ngd-ctrl: Use dma_request_chan() instead dma_request_slave_channel()) +$ git merge slimbus/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/slimbus/bus.txt | 10 ++++++++++ + drivers/slimbus/qcom-ngd-ctrl.c | 20 ++++++++++++-------- + 2 files changed, 22 insertions(+), 8 deletions(-) +Merging nvmem/for-next (808c8bcca225 nvmem: imx: scu: correct the fuse word index) +$ git merge nvmem/for-next +Merge made by the 'recursive' strategy. + drivers/nvmem/imx-ocotp-scu.c | 16 +++++++--------- + 1 file changed, 7 insertions(+), 9 deletions(-) +Merging xarray/xarray (6b81141deb73 XArray: Improve documentation of search marks) +$ git merge xarray/xarray +Merge made by the 'recursive' strategy. + Documentation/core-api/xarray.rst | 60 +++++++++++++++++++++++---------------- + lib/test_xarray.c | 22 ++++++++++++++ + lib/xarray.c | 8 ++++-- + 3 files changed, 63 insertions(+), 27 deletions(-) +Merging hyperv/hyperv-next (7a1323b5dfe4 Drivers: hv: vmbus: Fix crash handler reset of Hyper-V synic) +$ git merge hyperv/hyperv-next +Already up to date. +Merging auxdisplay/auxdisplay (54ecb8f7028c Linux 5.4-rc1) +$ git merge auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (c58ff643763c kdb: Tweak escape handling for vi users) +$ git merge kgdb/kgdb/for-next +Already up to date. +Merging pidfd/for-next (04882c321b26 Merge branch 'pidfd' into for-next) +$ git merge pidfd/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging devfreq/devfreq-next (8ab517d50a70 PM / devfreq: imx8m-ddrc: Remove unused defines) +$ git merge devfreq/devfreq-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-devfreq | 18 +- + .../memory-controllers/fsl/imx8m-ddrc.yaml | 72 ++++ + drivers/devfreq/Kconfig | 24 +- + drivers/devfreq/Makefile | 1 + + drivers/devfreq/devfreq-event.c | 4 +- + drivers/devfreq/devfreq.c | 84 ++-- + drivers/devfreq/event/Kconfig | 2 +- + drivers/devfreq/event/exynos-ppmu.c | 13 +- + drivers/devfreq/event/rockchip-dfi.c | 5 +- + drivers/devfreq/exynos-bus.c | 148 ++++--- + drivers/devfreq/imx8m-ddrc.c | 459 +++++++++++++++++++++ + drivers/devfreq/rk3399_dmc.c | 1 + + include/linux/devfreq.h | 29 +- + 13 files changed, 736 insertions(+), 124 deletions(-) + create mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/imx8m-ddrc.yaml + create mode 100644 drivers/devfreq/imx8m-ddrc.c +Merging hmm/hmm (e42617b825f8 Linux 5.5-rc1) +$ git merge hmm/hmm +Already up to date. +Merging fpga/for-next (fddc9fcbe69a fpga: dfl: fme: add power management support) +$ git merge fpga/for-next +Already up to date. +Merging kunit/test (e42617b825f8 Linux 5.5-rc1) +$ git merge kunit/test +Already up to date. +Merging cel/cel-next (a99d8080aaf3 Linux 5.4-rc6) +$ git merge cel/cel-next +Already up to date. +Merging kasan-bitops/topic/kasan-bitops (4f4afc2c9599 docs/core-api: Remove possibly confusing sub-headings from Bit Operations) +$ git merge kasan-bitops/topic/kasan-bitops +Already up to date. +Merging generic-ioremap/for-next (1188dd7d3fbd remove ioremap_nocache and devm_ioremap_nocache) +$ git merge generic-ioremap/for-next +Auto-merging tools/testing/nvdimm/test/iomap.c +Auto-merging tools/testing/nvdimm/Kbuild +CONFLICT (content): Merge conflict in tools/testing/nvdimm/Kbuild +Auto-merging sound/x86/intel_hdmi_audio.c +Auto-merging sound/soc/sh/fsi.c +Auto-merging sound/pci/ymfpci/ymfpci_main.c +Auto-merging sound/pci/sis7019.c +Auto-merging sound/pci/rme9652/rme9652.c +Auto-merging sound/pci/rme9652/hdspm.c +Auto-merging sound/pci/rme9652/hdsp.c +Auto-merging sound/pci/rme96.c +Auto-merging sound/pci/rme32.c +Auto-merging sound/pci/nm256/nm256.c +Auto-merging sound/pci/echoaudio/echoaudio.c +Auto-merging sound/pci/cs46xx/cs46xx_lib.c +Auto-merging sound/pci/aw2/aw2-alsa.c +Auto-merging sound/parisc/harmony.c +Auto-merging sound/isa/msnd/msnd_pinnacle.c +Auto-merging sound/drivers/ml403-ac97cr.c +Auto-merging drivers/video/fbdev/w100fb.c +Auto-merging drivers/video/fbdev/valkyriefb.c +Auto-merging drivers/video/fbdev/tridentfb.c +Auto-merging drivers/video/fbdev/tgafb.c +Auto-merging drivers/video/fbdev/tdfxfb.c +Auto-merging drivers/video/fbdev/stifb.c +Auto-merging drivers/video/fbdev/sstfb.c +Auto-merging drivers/video/fbdev/sh_mobile_lcdcfb.c +Auto-merging drivers/video/fbdev/sh7760fb.c +Auto-merging drivers/video/fbdev/pxa168fb.c +Auto-merging drivers/video/fbdev/pvr2fb.c +Auto-merging drivers/video/fbdev/pmagb-b-fb.c +Auto-merging drivers/video/fbdev/pmag-ba-fb.c +Auto-merging drivers/video/fbdev/pmag-aa-fb.c +Auto-merging drivers/video/fbdev/pm3fb.c +Auto-merging drivers/video/fbdev/pm2fb.c +Auto-merging drivers/video/fbdev/mbx/mbxfb.c +Auto-merging drivers/video/fbdev/kyro/fbdev.c +Auto-merging drivers/video/fbdev/intelfb/intelfbdrv.c +Auto-merging drivers/video/fbdev/carminefb.c +Auto-merging drivers/tty/synclinkmp.c +Auto-merging drivers/tty/synclink_gt.c +Auto-merging drivers/tty/synclink.c +Auto-merging drivers/tty/serial/zs.c +Auto-merging drivers/tty/serial/sh-sci.c +Auto-merging drivers/tty/serial/sb1250-duart.c +Auto-merging drivers/tty/serial/mux.c +Auto-merging drivers/tty/serial/meson_uart.c +Auto-merging drivers/tty/serial/dz.c +Auto-merging drivers/tty/serial/8250/8250_port.c +Auto-merging drivers/tty/serial/8250/8250_omap.c +Auto-merging drivers/staging/rts5208/rtsx.c +Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_core.c +Auto-merging drivers/staging/qlge/qlge_main.c +Auto-merging drivers/scsi/qla2xxx/qla_mr.c +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/net/wireless/intel/ipw2x00/ipw2100.c +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +Auto-merging drivers/net/ethernet/ti/netcp_core.c +Auto-merging drivers/net/ethernet/sfc/falcon/efx.c +Auto-merging drivers/net/ethernet/sfc/efx.c +Auto-merging drivers/net/ethernet/natsemi/ns83820.c +Auto-merging drivers/net/ethernet/marvell/sky2.c +Auto-merging drivers/net/ethernet/marvell/skge.c +Auto-merging drivers/net/ethernet/lantiq_etop.c +Auto-merging drivers/net/ethernet/korina.c +Auto-merging drivers/net/ethernet/ethoc.c +Auto-merging drivers/net/ethernet/dec/tulip/de2104x.c +Auto-merging drivers/net/ethernet/broadcom/sb1250-mac.c +Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +Auto-merging drivers/net/ethernet/atheros/ag71xx.c +Auto-merging drivers/net/ethernet/amd/au1000_eth.c +Auto-merging drivers/mmc/host/sdhci-acpi.c +Auto-merging drivers/media/pci/ivtv/ivtv-driver.c +Auto-merging drivers/media/pci/cx18/cx18-driver.c +Auto-merging drivers/media/common/videobuf2/videobuf2-vmalloc.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo_util.c +Auto-merging drivers/gpu/drm/tilcdc/tilcdc_drv.c +Auto-merging drivers/gpu/drm/sti/sti_dvo.c +Auto-merging drivers/gpu/drm/radeon/radeon_ttm.c +Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c +Auto-merging drivers/gpu/drm/gma500/psb_drv.c +Auto-merging drivers/bcma/scan.c +Auto-merging Documentation/driver-api/driver-model/devres.rst +Resolved 'tools/testing/nvdimm/Kbuild' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 59adcb6382ef] Merge remote-tracking branch 'generic-ioremap/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/driver-api/driver-model/devres.rst | 1 - + .../sound/kernel-api/writing-an-alsa-driver.rst | 2 +- + Documentation/x86/pat.rst | 2 -- + arch/alpha/include/asm/io.h | 10 ++------- + arch/arm/include/asm/io.h | 8 -------- + arch/arm/mach-bcm/platsmp.c | 4 ++-- + arch/arm/mach-davinci/devices.c | 2 +- + arch/arm/mach-pxa/magician.c | 2 +- + arch/arm/mach-shmobile/platsmp-apmu.c | 2 +- + arch/arm/mach-shmobile/pm-rcar-gen2.c | 2 +- + arch/arm/mach-shmobile/setup-r8a7740.c | 8 ++++---- + arch/arm/mach-shmobile/setup-r8a7778.c | 2 +- + arch/hexagon/include/asm/io.h | 2 -- + arch/ia64/include/asm/vga.h | 2 +- + arch/ia64/kernel/cyclone.c | 8 ++++---- + arch/m68k/include/asm/kmap.h | 1 - + arch/mips/ar7/clock.c | 8 ++++---- + arch/mips/ar7/gpio.c | 2 +- + arch/mips/ar7/platform.c | 2 +- + arch/mips/ath25/ar2315.c | 4 ++-- + arch/mips/ath25/ar5312.c | 6 +++--- + arch/mips/ath25/board.c | 2 +- + arch/mips/ath79/common.c | 2 +- + arch/mips/ath79/setup.c | 4 ++-- + arch/mips/cavium-octeon/setup.c | 2 +- + arch/mips/generic/board-ocelot.c | 2 +- + arch/mips/include/asm/io.h | 24 +--------------------- + arch/mips/kernel/mips-cm.c | 4 ++-- + arch/mips/kernel/mips-cpc.c | 2 +- + arch/mips/lantiq/falcon/sysctrl.c | 6 +++--- + arch/mips/lantiq/irq.c | 4 ++-- + arch/mips/lantiq/xway/sysctrl.c | 6 +++--- + arch/mips/loongson2ef/common/reset.c | 4 ++-- + arch/mips/loongson32/common/prom.c | 8 ++++---- + arch/mips/loongson32/common/reset.c | 2 +- + arch/mips/loongson32/common/time.c | 2 +- + arch/mips/loongson64/reset.c | 2 +- + arch/mips/mti-malta/malta-dtshim.c | 2 +- + arch/mips/pci/pci-alchemy.c | 2 +- + arch/mips/pci/pci-ar2315.c | 2 +- + arch/mips/pci/pci-bcm63xx.c | 2 +- + arch/mips/pci/pci-rt2880.c | 2 +- + arch/mips/pic32/pic32mzda/early_console.c | 2 +- + arch/mips/pic32/pic32mzda/early_pin.c | 4 ++-- + arch/mips/pmcs-msp71xx/msp_serial.c | 4 ++-- + arch/mips/ralink/irq.c | 2 +- + arch/mips/ralink/of.c | 2 +- + arch/mips/rb532/devices.c | 2 +- + arch/mips/rb532/gpio.c | 2 +- + arch/mips/rb532/prom.c | 2 +- + arch/mips/rb532/setup.c | 2 +- + arch/mips/sni/rm200.c | 4 ++-- + arch/parisc/include/asm/io.h | 5 ++--- + arch/parisc/kernel/perf.c | 2 +- + arch/powerpc/include/asm/io.h | 3 --- + arch/sh/boards/board-sh7785lcr.c | 2 +- + arch/sh/boards/mach-cayman/irq.c | 2 +- + arch/sh/boards/mach-cayman/setup.c | 2 +- + arch/sh/boards/mach-sdk7786/fpga.c | 2 +- + arch/sh/drivers/heartbeat.c | 2 +- + arch/sh/drivers/pci/pci-sh5.c | 4 ++-- + arch/sh/include/asm/io.h | 1 - + arch/sh/kernel/cpu/irq/intc-sh5.c | 2 +- + arch/sh/kernel/cpu/sh2/smp-j2.c | 4 ++-- + arch/sh/kernel/cpu/sh5/clock-sh5.c | 2 +- + arch/sh/kernel/dma-coherent.c | 2 +- + arch/sparc/include/asm/io_64.h | 1 - + arch/unicore32/include/asm/io.h | 1 - + arch/x86/kernel/apb_timer.c | 2 +- + arch/x86/kernel/hpet.c | 2 +- + arch/x86/kernel/quirks.c | 2 +- + arch/x86/kernel/tboot.c | 2 +- + arch/x86/mm/testmmiotrace.c | 4 ++-- + arch/x86/pci/mmconfig_64.c | 2 +- + drivers/acpi/acpi_lpit.c | 2 +- + drivers/ata/pata_arasan_cf.c | 2 +- + drivers/ata/pata_octeon_cf.c | 6 +++--- + drivers/ata/pata_rb532_cf.c | 2 +- + drivers/atm/eni.c | 8 +------- + drivers/bcma/driver_chipcommon_b.c | 2 +- + drivers/bcma/driver_pci_host.c | 6 +++--- + drivers/bcma/host_soc.c | 2 +- + drivers/bcma/scan.c | 6 +++--- + drivers/block/umem.c | 2 +- + drivers/bus/fsl-mc/mc-io.c | 4 ++-- + drivers/char/agp/generic.c | 2 +- + drivers/char/agp/intel-gtt.c | 2 +- + drivers/char/applicom.c | 4 ++-- + drivers/char/hw_random/intel-rng.c | 2 +- + drivers/char/hw_random/octeon-rng.c | 4 ++-- + drivers/clk/renesas/clk-rz.c | 4 ++-- + drivers/clocksource/sh_cmt.c | 2 +- + drivers/clocksource/sh_mtu2.c | 2 +- + drivers/clocksource/sh_tmu.c | 2 +- + drivers/cpufreq/pcc-cpufreq.c | 2 +- + drivers/crypto/hifn_795x.c | 2 +- + drivers/dma/altera-msgdma.c | 4 ++-- + drivers/edac/i3000_edac.c | 2 +- + drivers/edac/i3200_edac.c | 2 +- + drivers/edac/i82975x_edac.c | 2 +- + drivers/edac/ie31200_edac.c | 2 +- + drivers/edac/x38_edac.c | 2 +- + drivers/firewire/nosy.c | 2 +- + drivers/firmware/broadcom/bcm47xx_nvram.c | 2 +- + drivers/gpu/drm/gma500/gtt.c | 2 +- + drivers/gpu/drm/gma500/psb_drv.c | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 2 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- + drivers/gpu/drm/msm/msm_drv.c | 2 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 2 +- + drivers/gpu/drm/sti/sti_dvo.c | 2 +- + drivers/gpu/drm/sti/sti_hda.c | 4 ++-- + drivers/gpu/drm/sti/sti_hdmi.c | 2 +- + drivers/gpu/drm/sti/sti_tvout.c | 2 +- + drivers/gpu/drm/sti/sti_vtg.c | 2 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 4 ++-- + drivers/hwmon/i5k_amb.c | 2 +- + drivers/i2c/busses/i2c-highlander.c | 2 +- + drivers/i2c/busses/i2c-pmcmsp.c | 2 +- + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 2 +- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 4 ++-- + drivers/infiniband/hw/bnxt_re/qplib_res.c | 2 +- + drivers/infiniband/hw/hfi1/pcie.c | 4 ++-- + drivers/infiniband/hw/qib/qib_iba7322.c | 2 +- + drivers/infiniband/hw/qib/qib_init.c | 4 ++-- + drivers/infiniband/hw/qib/qib_pcie.c | 2 +- + drivers/input/keyboard/pxa930_rotary.c | 2 +- + drivers/input/keyboard/sh_keysc.c | 2 +- + drivers/input/mouse/pxa930_trkball.c | 2 +- + drivers/input/serio/gscps2.c | 2 +- + drivers/iommu/amd_iommu_init.c | 2 +- + drivers/ipack/carriers/tpci200.c | 4 ++-- + drivers/ipack/devices/ipoctal.c | 6 +++--- + drivers/irqchip/irq-mips-gic.c | 2 +- + drivers/irqchip/irq-renesas-intc-irqpin.c | 2 +- + drivers/media/common/videobuf2/videobuf2-vmalloc.c | 2 +- + drivers/media/pci/cx18/cx18-driver.c | 2 +- + drivers/media/pci/ivtv/ivtv-driver.c | 6 +++--- + drivers/media/platform/davinci/dm355_ccdc.c | 2 +- + drivers/media/platform/davinci/dm644x_ccdc.c | 2 +- + drivers/media/platform/davinci/isif.c | 2 +- + drivers/media/platform/tegra-cec/tegra_cec.c | 2 +- + drivers/misc/cardreader/rtsx_pcr.c | 2 +- + drivers/misc/mic/scif/scif_nodeqp.c | 2 +- + drivers/misc/pti.c | 2 +- + drivers/mmc/host/sdhci-acpi.c | 2 +- + drivers/mmc/host/via-sdmmc.c | 2 +- + drivers/mtd/devices/bcm47xxsflash.c | 2 +- + drivers/mtd/maps/amd76xrom.c | 2 +- + drivers/mtd/maps/ck804xrom.c | 2 +- + drivers/mtd/maps/esb2rom.c | 2 +- + drivers/mtd/maps/ichxrom.c | 2 +- + drivers/mtd/maps/intel_vr_nor.c | 4 ++-- + drivers/mtd/maps/l440gx.c | 2 +- + drivers/mtd/maps/netsc520.c | 4 ++-- + drivers/mtd/maps/nettel.c | 8 ++++---- + drivers/mtd/maps/pci.c | 4 ++-- + drivers/mtd/maps/sc520cdp.c | 8 ++++---- + drivers/mtd/maps/scb2_flash.c | 2 +- + drivers/mtd/maps/ts5500_flash.c | 4 ++-- + drivers/mtd/nand/raw/au1550nd.c | 2 +- + drivers/mtd/nand/raw/denali_pci.c | 6 +++--- + drivers/mtd/nand/raw/fsl_upm.c | 2 +- + drivers/net/can/at91_can.c | 2 +- + drivers/net/can/cc770/cc770_isa.c | 2 +- + drivers/net/can/sja1000/sja1000_isa.c | 2 +- + drivers/net/can/sja1000/sja1000_platform.c | 2 +- + drivers/net/can/softing/softing_main.c | 2 +- + drivers/net/ethernet/alacritech/slicoss.c | 2 +- + drivers/net/ethernet/altera/altera_tse_main.c | 4 ++-- + drivers/net/ethernet/amd/au1000_eth.c | 6 +++--- + .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 2 +- + drivers/net/ethernet/atheros/ag71xx.c | 3 +-- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- + drivers/net/ethernet/broadcom/sb1250-mac.c | 2 +- + drivers/net/ethernet/brocade/bna/bnad.c | 2 +- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 +- + drivers/net/ethernet/dec/tulip/de2104x.c | 2 +- + drivers/net/ethernet/ethoc.c | 4 ++-- + drivers/net/ethernet/i825xx/sni_82596.c | 6 +++--- + drivers/net/ethernet/korina.c | 6 +++--- + drivers/net/ethernet/lantiq_etop.c | 2 +- + drivers/net/ethernet/marvell/skge.c | 2 +- + drivers/net/ethernet/marvell/sky2.c | 2 +- + drivers/net/ethernet/natsemi/ns83820.c | 2 +- + .../net/ethernet/netronome/nfp/nfp_netvf_main.c | 8 ++++---- + .../ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c | 6 +++--- + drivers/net/ethernet/sfc/ef10.c | 2 +- + drivers/net/ethernet/sfc/efx.c | 2 +- + drivers/net/ethernet/sfc/falcon/efx.c | 2 +- + drivers/net/ethernet/smsc/smsc911x.c | 2 +- + drivers/net/ethernet/ti/netcp_core.c | 2 +- + drivers/net/ethernet/xilinx/ll_temac_main.c | 4 ++-- + drivers/net/fddi/defxx.c | 2 +- + drivers/net/fddi/defza.c | 2 +- + drivers/net/fjes/fjes_hw.c | 2 +- + drivers/net/wan/wanxl.c | 4 ++-- + drivers/net/wireless/ath/ath10k/ahb.c | 4 ++-- + drivers/net/wireless/ath/ath5k/ahb.c | 2 +- + drivers/net/wireless/ath/ath9k/ahb.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 4 ++-- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 2 +- + drivers/opp/ti-opp-supply.c | 2 +- + drivers/parisc/ccio-dma.c | 2 +- + drivers/parisc/dino.c | 2 +- + drivers/parisc/eisa.c | 4 ++-- + drivers/parisc/iosapic.c | 2 +- + drivers/parisc/lba_pci.c | 8 ++++---- + drivers/parisc/sba_iommu.c | 4 ++-- + drivers/pci/controller/dwc/pci-dra7xx.c | 2 +- + drivers/pci/controller/dwc/pcie-designware-ep.c | 2 +- + drivers/pci/msi.c | 2 +- + drivers/pci/pci.c | 2 +- + drivers/pci/quirks.c | 4 ++-- + drivers/pinctrl/bcm/pinctrl-ns2-mux.c | 2 +- + drivers/pinctrl/bcm/pinctrl-nsp-mux.c | 2 +- + drivers/pinctrl/freescale/pinctrl-imx1-core.c | 2 +- + drivers/pinctrl/pinctrl-amd.c | 2 +- + drivers/platform/x86/intel_scu_ipc.c | 2 +- + drivers/platform/x86/intel_telemetry_pltdrv.c | 4 ++-- + drivers/platform/x86/pmc_atom.c | 2 +- + drivers/platform/x86/samsung-laptop.c | 4 ++-- + drivers/regulator/ti-abb-regulator.c | 4 ++-- + drivers/rtc/rtc-sh.c | 2 +- + drivers/scsi/aic7xxx/aic79xx_osm_pci.c | 2 +- + drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | 2 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 2 +- + drivers/scsi/be2iscsi/be_main.c | 6 +++--- + drivers/scsi/bnx2fc/bnx2fc_hwi.c | 2 +- + drivers/scsi/bnx2i/bnx2i_hwi.c | 4 ++-- + drivers/scsi/csiostor/csio_init.c | 2 +- + drivers/scsi/hpsa.c | 2 +- + drivers/scsi/lasi700.c | 2 +- + drivers/scsi/megaraid/megaraid_mbox.c | 2 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 2 +- + drivers/scsi/myrb.c | 2 +- + drivers/scsi/myrs.c | 2 +- + drivers/scsi/pcmcia/nsp_cs.c | 2 +- + drivers/scsi/qla2xxx/qla_mr.c | 4 ++-- + drivers/scsi/smartpqi/smartpqi_init.c | 2 +- + drivers/scsi/sni_53c710.c | 2 +- + drivers/scsi/sun3x_esp.c | 4 ++-- + drivers/scsi/zalon.c | 2 +- + drivers/scsi/zorro_esp.c | 6 +++--- + drivers/sh/clk/core.c | 2 +- + drivers/sh/intc/core.c | 2 +- + drivers/sh/intc/userimask.c | 2 +- + drivers/soc/tegra/flowctrl.c | 2 +- + drivers/soc/tegra/fuse/fuse-tegra.c | 2 +- + drivers/soc/tegra/fuse/tegra-apbmisc.c | 4 ++-- + drivers/soc/tegra/pmc.c | 4 ++-- + drivers/soc/xilinx/xlnx_vcu.c | 4 ++-- + drivers/spi/spi-dw-mid.c | 2 +- + drivers/spi/spi-jcore.c | 2 +- + drivers/spi/spi-npcm-fiu.c | 2 +- + drivers/ssb/driver_extif.c | 2 +- + drivers/ssb/driver_pcicore.c | 6 +++--- + drivers/staging/gasket/gasket_core.c | 2 +- + drivers/staging/kpc2000/kpc2000/core.c | 4 ++-- + drivers/staging/kpc2000/kpc2000_i2c.c | 2 +- + drivers/staging/kpc2000/kpc2000_spi.c | 2 +- + drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.c | 2 +- + drivers/staging/media/allegro-dvt/allegro-core.c | 4 ++-- + drivers/staging/qlge/qlge_main.c | 4 ++-- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +- + drivers/staging/rts5208/rtsx.c | 2 +- + drivers/staging/sm750fb/sm750_hw.c | 2 +- + drivers/staging/uwb/whc-rc.c | 6 +++--- + drivers/tc/tc.c | 2 +- + drivers/tty/cyclades.c | 10 ++++----- + drivers/tty/mips_ejtag_fdc.c | 2 +- + drivers/tty/moxa.c | 4 ++-- + drivers/tty/serial/8250/8250_gsc.c | 2 +- + drivers/tty/serial/8250/8250_omap.c | 2 +- + drivers/tty/serial/8250/8250_pci.c | 6 +++--- + drivers/tty/serial/8250/8250_port.c | 2 +- + drivers/tty/serial/dz.c | 2 +- + drivers/tty/serial/lantiq.c | 2 +- + drivers/tty/serial/meson_uart.c | 2 +- + drivers/tty/serial/mux.c | 2 +- + drivers/tty/serial/owl-uart.c | 2 +- + drivers/tty/serial/pic32_uart.c | 2 +- + drivers/tty/serial/rda-uart.c | 2 +- + drivers/tty/serial/sb1250-duart.c | 4 ++-- + drivers/tty/serial/sh-sci.c | 2 +- + drivers/tty/serial/zs.c | 2 +- + drivers/tty/synclink.c | 4 ++-- + drivers/tty/synclink_gt.c | 2 +- + drivers/tty/synclinkmp.c | 8 ++++---- + drivers/usb/core/hcd-pci.c | 2 +- + drivers/usb/early/xhci-dbc.c | 2 +- + drivers/usb/gadget/udc/amd5536udc_pci.c | 2 +- + drivers/usb/gadget/udc/goku_udc.c | 2 +- + drivers/usb/gadget/udc/net2272.c | 6 +++--- + drivers/usb/gadget/udc/net2280.c | 2 +- + drivers/usb/host/ehci-pmcmsp.c | 6 +++--- + drivers/usb/host/pci-quirks.c | 2 +- + drivers/usb/isp1760/isp1760-if.c | 4 ++-- + drivers/usb/roles/intel-xhci-usb-role-switch.c | 2 +- + drivers/usb/typec/ucsi/ucsi_acpi.c | 2 +- + drivers/vfio/pci/vfio_pci_rdwr.c | 2 +- + .../vfio/platform/reset/vfio_platform_amdxgbe.c | 4 ++-- + .../vfio/platform/reset/vfio_platform_bcmflexrm.c | 2 +- + .../platform/reset/vfio_platform_calxedaxgmac.c | 2 +- + drivers/vfio/platform/vfio_platform_common.c | 4 ++-- + drivers/video/fbdev/carminefb.c | 4 ++-- + drivers/video/fbdev/i810/i810_main.c | 2 +- + drivers/video/fbdev/intelfb/intelfbdrv.c | 2 +- + drivers/video/fbdev/kyro/fbdev.c | 2 +- + drivers/video/fbdev/matrox/matroxfb_base.c | 2 +- + drivers/video/fbdev/mbx/mbxfb.c | 4 ++-- + drivers/video/fbdev/mmp/hw/mmp_ctrl.c | 2 +- + drivers/video/fbdev/pm2fb.c | 2 +- + drivers/video/fbdev/pm3fb.c | 4 ++-- + drivers/video/fbdev/pmag-aa-fb.c | 4 ++-- + drivers/video/fbdev/pmag-ba-fb.c | 4 ++-- + drivers/video/fbdev/pmagb-b-fb.c | 4 ++-- + drivers/video/fbdev/pvr2fb.c | 4 ++-- + drivers/video/fbdev/pxa168fb.c | 2 +- + drivers/video/fbdev/s1d13xxxfb.c | 4 ++-- + drivers/video/fbdev/sh7760fb.c | 2 +- + drivers/video/fbdev/sh_mobile_lcdcfb.c | 2 +- + drivers/video/fbdev/sstfb.c | 4 ++-- + drivers/video/fbdev/stifb.c | 4 ++-- + drivers/video/fbdev/tdfxfb.c | 2 +- + drivers/video/fbdev/tgafb.c | 2 +- + drivers/video/fbdev/tridentfb.c | 4 ++-- + drivers/video/fbdev/valkyriefb.c | 2 +- + drivers/video/fbdev/vermilion/cr_pll.c | 2 +- + drivers/video/fbdev/vermilion/vermilion.c | 4 ++-- + drivers/video/fbdev/via/via-core.c | 2 +- + drivers/video/fbdev/w100fb.c | 6 +++--- + drivers/vme/boards/vme_vmivme7805.c | 2 +- + drivers/vme/bridges/vme_ca91cx42.c | 4 ++-- + drivers/vme/bridges/vme_tsi148.c | 4 ++-- + drivers/w1/masters/matrox_w1.c | 2 +- + drivers/watchdog/bcm63xx_wdt.c | 2 +- + drivers/watchdog/intel_scu_watchdog.c | 2 +- + drivers/watchdog/rc32434_wdt.c | 4 ++-- + include/asm-generic/io.h | 4 ---- + include/asm-generic/iomap.h | 4 ++-- + include/linux/io.h | 6 ++---- + lib/devres.c | 20 ------------------ + scripts/coccinelle/free/devm_free.cocci | 4 ---- + scripts/coccinelle/free/iounmap.cocci | 2 +- + sound/drivers/ml403-ac97cr.c | 2 +- + sound/isa/msnd/msnd_pinnacle.c | 2 +- + sound/parisc/harmony.c | 2 +- + sound/pci/aw2/aw2-alsa.c | 2 +- + sound/pci/cs46xx/cs46xx_lib.c | 2 +- + sound/pci/echoaudio/echoaudio.c | 2 +- + sound/pci/nm256/nm256.c | 6 +++--- + sound/pci/rme32.c | 2 +- + sound/pci/rme96.c | 2 +- + sound/pci/rme9652/hdsp.c | 2 +- + sound/pci/rme9652/hdspm.c | 2 +- + sound/pci/rme9652/rme9652.c | 2 +- + sound/pci/sis7019.c | 2 +- + sound/pci/ymfpci/ymfpci_main.c | 2 +- + sound/soc/au1x/ac97c.c | 2 +- + sound/soc/au1x/i2sc.c | 2 +- + sound/soc/intel/atom/sst/sst_acpi.c | 10 ++++----- + sound/soc/sh/fsi.c | 2 +- + sound/x86/intel_hdmi_audio.c | 2 +- + tools/testing/nvdimm/Kbuild | 3 +-- + tools/testing/nvdimm/test/iomap.c | 12 +++++------ + tools/testing/nvdimm/test/nfit_test.h | 2 +- + 368 files changed, 513 insertions(+), 600 deletions(-) +$ git am -3 ../patches/0001-generic_ioremap-merge-fix-for-tools-testing-nvdimm-F.patch +Applying: generic_ioremap: merge fix for "tools/testing/nvdimm: Fix mock support for ioremap" +$ git reset HEAD^ +Unstaged changes after reset: +M tools/testing/nvdimm/test/iomap.c +$ git add -A . +$ git commit -v -a --amend +[master 8c9a586be5e8] Merge remote-tracking branch 'generic-ioremap/for-next' + Date: Fri Dec 20 14:50:23 2019 +1100 +Merging kunit-next/kunit (d1eef1c61974 Linux 5.5-rc2) +$ git merge kunit-next/kunit +Already up to date. +Merging akpm-current/current (461e28fa2c11 ipc/msg.c: consolidate all xxxctl_down() functions) +$ git merge --no-ff akpm-current/current +Auto-merging mm/vmalloc.c +Auto-merging mm/slub.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging init/main.c +Auto-merging init/Kconfig +Auto-merging include/linux/vmalloc.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/mm.h +Auto-merging fs/nsfs.c +Auto-merging fs/btrfs/compression.c +Auto-merging arch/x86/mm/init_64.c +Auto-merging arch/x86/mm/init_32.c +Auto-merging arch/x86/mm/fault.c +Auto-merging arch/powerpc/mm/mem.c +Auto-merging arch/hexagon/kernel/vm_entry.S +Auto-merging arch/hexagon/include/asm/io.h +CONFLICT (content): Merge conflict in arch/hexagon/include/asm/io.h +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'arch/hexagon/include/asm/io.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b510d7556c8e] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/cgroup-v2.rst | 29 +++ + Documentation/admin-guide/kernel-parameters.txt | 12 + + Documentation/dev-tools/kcov.rst | 10 +- + Documentation/memory-barriers.txt | 16 +- + Documentation/process/deprecated.rst | 10 +- + arch/arm64/mm/mmu.c | 4 +- + arch/hexagon/include/asm/atomic.h | 8 +- + arch/hexagon/include/asm/bitops.h | 8 +- + arch/hexagon/include/asm/cmpxchg.h | 2 +- + arch/hexagon/include/asm/futex.h | 6 +- + arch/hexagon/include/asm/io.h | 1 + + arch/hexagon/include/asm/spinlock.h | 20 +- + arch/hexagon/kernel/stacktrace.c | 4 +- + arch/hexagon/kernel/vm_entry.S | 2 +- + arch/ia64/mm/init.c | 4 +- + arch/powerpc/mm/mem.c | 3 +- + arch/s390/boot/compressed/decompressor.c | 8 +- + arch/s390/boot/ipl_parm.c | 14 ++ + arch/s390/include/asm/setup.h | 7 + + arch/s390/kernel/setup.c | 1 + + arch/s390/mm/init.c | 4 +- + arch/sh/mm/init.c | 4 +- + arch/x86/mm/fault.c | 26 ++- + arch/x86/mm/init_32.c | 4 +- + arch/x86/mm/init_64.c | 4 +- + drivers/acpi/apei/ghes.c | 2 +- + fs/aio.c | 9 +- + fs/binfmt_elf.c | 116 +++++----- + fs/btrfs/compression.c | 2 +- + fs/btrfs/zlib.c | 118 ++++++---- + fs/buffer.c | 56 ++++- + fs/direct-io.c | 2 + + fs/exec.c | 5 + + fs/namespace.c | 2 +- + fs/nsfs.c | 3 + + fs/ocfs2/journal.c | 8 + + fs/posix_acl.c | 7 +- + fs/proc/page.c | 70 ++++-- + fs/ramfs/inode.c | 12 + + include/linux/hugetlb.h | 3 +- + include/linux/io-mapping.h | 5 +- + include/linux/memory_hotplug.h | 7 +- + include/linux/memremap.h | 6 + + include/linux/mm.h | 15 -- + include/linux/sched.h | 9 + + include/linux/string.h | 45 ++++ + include/linux/vmalloc.h | 5 +- + include/linux/wait.h | 4 +- + include/linux/zlib.h | 6 + + include/trace/events/vmscan.h | 71 +++++- + include/uapi/linux/kcov.h | 10 +- + init/Kconfig | 1 - + init/main.c | 31 ++- + ipc/mqueue.c | 105 +++++++-- + ipc/msg.c | 61 ++++-- + ipc/sem.c | 72 +++--- + kernel/cred.c | 6 +- + kernel/hung_task.c | 44 ++++ + kernel/notifier.c | 2 +- + lib/Kconfig | 22 ++ + lib/Kconfig.debug | 6 + + lib/Makefile | 1 + + lib/decompress_inflate.c | 13 ++ + lib/zlib_deflate/deflate.c | 85 +++---- + lib/zlib_deflate/deflate_syms.c | 1 + + lib/zlib_deflate/deftree.c | 54 ----- + lib/zlib_deflate/defutil.h | 134 +++++++++++- + lib/zlib_dfltcc/Makefile | 11 + + lib/zlib_dfltcc/dfltcc.c | 55 +++++ + lib/zlib_dfltcc/dfltcc.h | 147 +++++++++++++ + lib/zlib_dfltcc/dfltcc_deflate.c | 280 ++++++++++++++++++++++++ + lib/zlib_dfltcc/dfltcc_inflate.c | 149 +++++++++++++ + lib/zlib_dfltcc/dfltcc_syms.c | 17 ++ + lib/zlib_dfltcc/dfltcc_util.h | 124 +++++++++++ + lib/zlib_inflate/inflate.c | 32 ++- + lib/zlib_inflate/inflate.h | 8 + + lib/zlib_inflate/infutil.h | 18 +- + mm/early_ioremap.c | 8 +- + mm/gup_benchmark.c | 8 +- + mm/hugetlb.c | 51 ++++- + mm/hugetlb_cgroup.c | 198 ++++++++++++++++- + mm/memcontrol.c | 7 +- + mm/memory_hotplug.c | 102 ++++----- + mm/mempolicy.c | 10 +- + mm/memremap.c | 36 ++- + mm/migrate.c | 23 +- + mm/mmap.c | 43 ++-- + mm/nommu.c | 10 +- + mm/oom_kill.c | 69 +++--- + mm/page_alloc.c | 75 ++++--- + mm/slub.c | 88 ++++---- + mm/sparse.c | 9 +- + mm/vmalloc.c | 11 +- + mm/vmscan.c | 18 +- + mm/zsmalloc.c | 5 + + scripts/checkpatch.pl | 24 ++ + 96 files changed, 2420 insertions(+), 663 deletions(-) + create mode 100644 lib/zlib_dfltcc/Makefile + create mode 100644 lib/zlib_dfltcc/dfltcc.c + create mode 100644 lib/zlib_dfltcc/dfltcc.h + create mode 100644 lib/zlib_dfltcc/dfltcc_deflate.c + create mode 100644 lib/zlib_dfltcc/dfltcc_inflate.c + create mode 100644 lib/zlib_dfltcc/dfltcc_syms.c + create mode 100644 lib/zlib_dfltcc/dfltcc_util.h +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: drivers/block/null_blk_main.c: fix layout +Applying: drivers/block/null_blk_main.c: fix uninitialized var warnings +Applying: pinctrl: fix pxa2xx.c build warnings +Applying: mm: remove __krealloc +Applying: drivers/tty/serial/sh-sci.c: suppress warning +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 + + b2debeec902e...46ce41faa111 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (46ce41faa111 drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + drivers/block/null_blk_main.c | 56 ++++++++++++++-------------- + drivers/media/platform/sti/delta/delta-ipc.c | 4 +- + drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 1 + + drivers/tty/serial/sh-sci.c | 2 +- + include/linux/slab.h | 1 - + mm/slab_common.c | 22 ----------- + scripts/coccinelle/free/devm_free.cocci | 4 -- + 7 files changed, 32 insertions(+), 58 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..125d385f20a1 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing dmi based on 5.4 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..2d2add20007d --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20191220 |