diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-12-04 16:01:30 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-12-04 16:01:30 +1100 |
| commit | c7c32c43e831640996f86998452681ff54d17dfb (patch) | |
| tree | 5144e0d6f9b832df75023243d2610789ab63127a | |
| parent | ffbed30d502d4c9033170e8a09c15dd0c30ab7ec (diff) | |
| download | linux-next-c7c32c43e831640996f86998452681ff54d17dfb.tar.gz | |
Add linux-next specific files for 20191204next-20191204
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 314 | ||||
| -rw-r--r-- | Next/Trees | 316 | ||||
| -rw-r--r-- | Next/merge.log | 5156 | ||||
| -rw-r--r-- | Next/quilt-import.log | 14 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 5801 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..c5da2e9e6c62 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,314 @@ +Name SHA1 +---- ---- +origin 2dff2a1c9b7cc83529119eb04cef1d7b68e11352 +fixes 31f4f5b495a62c9a8b15b1c3581acd5efeb9af8c +kbuild-current 80591e61a0f7e88deaada69844e4a31280c4a38f +arc-current 5effc09c4907901f0e71e68e5f2e14211d9a203f +arm-current 39f4d441048444f38fcfcfb1aa3102c030544e86 +arm-soc-fixes db6efda85437d783dd921da5d67ec818826adb12 +arm64-fixes e50be648aaa3da196d4f4ed49d1c5d4ec105fa4a +m68k-current 5ed0794cde59365d4d5895b89bb2f7ef7ffdbd55 +powerpc-fixes 7d6475051fb3d9339c5c760ed9883bc0a9048b21 +s390-fixes 219d54332a09e8d8741c1e1982f5eae56099de85 +sparc 038029c03e21be3bab44ff9d8005b51b597a5bf2 +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net 2f23cd42e19c22c24ff0e221089b7b6123b117c5 +bpf 040b5cfbcefa263ccf2c118c4938308606bb7ed8 +ipsec a56dcc6b455830776899ce3686735f1172e12243 +netfilter d1f4c966475c6dd2545c6625022cb24e878bee11 +ipvs c24b75e0f9239e78105f81c5f03a751641eb07ef +wireless-drivers 1e58252e334dc3f3756f424a157d1b7484464c40 +mac80211 e58c1912418980f57ba2060017583067f5f71e52 +rdma-fixes 411c1e6774e2e1f96b1ccce4f119376b94ade3e4 +sound-current 643a2cc99b53c13d90c02dc344f780ba9a89e012 +sound-asoc-fixes 073130b5fe01a0b4bf2fc37f968538cd6853464d +regmap-fixes af42d3466bdc8f39806b26f593604fdc54140bcb +regulator-fixes 88c888614e8f6acb086b18566d9ca989b7077ec4 +spi-fixes 3d5e7b9c73b3e35e4b5103e16e41ef4e2aa644c0 +pci-current 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +driver-core.current 937d6eefc716a9071f0e3bada19200de1bb9d048 +tty.current d6d5df1db6e9d7f8f76d2911707f7d5877251b02 +usb.current 937d6eefc716a9071f0e3bada19200de1bb9d048 +usb-gadget-fixes f3fb802efaef3662744a2215a51294d52a7cfc0e +usb-serial-fixes a99d8080aaf358d5d23581244e5da23b35e340b9 +usb-chipidea-fixes 16009db47c51d4ef61270f22a2f1bb385233c34f +phy 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +staging.current 937d6eefc716a9071f0e3bada19200de1bb9d048 +char-misc.current 937d6eefc716a9071f0e3bada19200de1bb9d048 +soundwire-fixes 7b47ad3322d114736e08cc244a84fe7af9b861f6 +thunderbolt-fixes 219d54332a09e8d8741c1e1982f5eae56099de85 +input-current 976e3645923bdd2fe7893aae33fd7a21098bfb28 +crypto-current 8a6b8f4d7a891ac66db4f97900a86b55c84a5802 +ide baf6722aa0cbc5381f11520eb661be71b3ac379e +vfio-fixes 95f89e090618efca63918b658c2002e57d393036 +kselftest-fixes f60b85e83659b5fbd3eb2c8f68d33ef4e35ebb2c +modules-fixes 57baec7b1b0459ef885e816d8c28a9d9a62bb8de +slave-dma-fixes bacdcb6675e170bb2e8d3824da220e10274f42a7 +backlight-fixes 219d54332a09e8d8741c1e1982f5eae56099de85 +mtd-fixes df8fed831cbcdce7b283b2d9c1aadadcf8940d05 +mfd-fixes 603d9299da32955d49995738541f750f2ae74839 +v4l-dvb-fixes 3e84a18a259e1df35e5b549ab92ec3baf82ff010 +reset-fixes cc67d61e31ec928602eaa40043a7a1a40854b5bc +mips-fixes a7effde99b6e8119b28c235eda5419c2e03b3089 +at91-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +omap-fixes 6aed5a0e0f56213cc5e4bff674fb42e997f30df7 +kvm-fixes 9cb09e7c1c9af2968d5186ef9085f05641ab65d9 +kvms390-fixes 53936b5bf35e140ae27e4bbf0447a61063f400da +hwmon-fixes 92b39ad440968bab38eb6577d63c12994601ed94 +nvdimm-fixes 6370740e5f8ef12de7f9a9bf48a0393d202cd827 +btrfs-fixes bfbbf8cb43a7c7d201c659f2f608d747149082cb +vfs-fixes 2fa6b1e01a9b1a54769c394f06cd72c3d12a2d48 +dma-mapping-fixes 9c24eaf81cc44d4bb38081c99eafd72ed85cf7f3 +i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +drivers-x86-fixes 7d194c2100ad2a6dded545887d02754948ca5241 +samsung-krzk-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +pinctrl-samsung-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +devicetree-fixes 5dba51754b04a941a1064f584e7a7f607df3f9bc +scsi-fixes 9393c8de628cf0968d81a17cc11841e42191e041 +drm-fixes 51658c04c338d7ef98d6c2c19009e4814632db50 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 71d122629c04707eb7f65447fb2f5bd092d98ce3 +mmc-fixes fed23c5829ecab4ddc712d7b0046e59610ca3ba4 +rtc-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +gnss-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +hyperv-fixes af42d3466bdc8f39806b26f593604fdc54140bcb +soc-fsl-fixes 5674a92ca4b7e5a6a19231edd10298d30324cd27 +risc-v-fixes 1d9b0b66c3ef03e42db63068e1a4e7250992e2b1 +pidfd-fixes 9e77716a75bc6cf54965e5ec069ba7c02b32251c +fpga-fixes dec43da46f63eb71f519d963ba6832838e4262a3 +spdx bf49d9dd6fef688733e2ddbd55f7bcb57df194e4 +gpio-intel-fixes 7d194c2100ad2a6dded545887d02754948ca5241 +pinctrl-intel-fixes 219d54332a09e8d8741c1e1982f5eae56099de85 +erofs-fixes 1aaad89e4acf77e33382427917ba08c2365000b6 +drm-misc-fixes 6645d42d79d33e8a9fe262660a75d5f4556bbea9 +kspp-gustavo da0c9ea146cbe92b832f1b0f694840ea8eb33cce +kbuild d21b7e6b985c15ff75e8668b0282ec5104391901 +compiler-attributes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +leaks 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +dma-mapping a7ba70f1787f977f970cd116076c6fce4b9e01cc +asm-generic 9b87647c665dbf93173ca2f43986902b59dfbbba +arc 9fbea0b7e842890a76acffce9be9e430b9e11194 +arm 1a70cf0e7ee6e73aa29c2dd4dd8d3d38c48d5946 +arm64 d8e85e144bbe12e8d82c6b05d690a34da62cc991 +arm-perf 8703317ae576c9bf3e07e5b97275e3f957e8d74b +arm-soc e1351090dd4a172fb26317ae6fa846ab13c50199 +amlogic 431a6da324af524b8563557437c25e4c7aa6bd1c +aspeed 2aee80727dca69ee225c376f2987c5dbf3fbb416 +at91 571c4b1fe42bc96eb3360e68fd3ba1a3b3787d8c +bcm2835 f142341846711f8f3cb85e4df5e0130d9e017a9d +imx-mxs 71918b15d58f657ad35e20530b051c9a70999083 +keystone 2af8e1f26c6596540d95965fd45fca2692696e1e +mediatek 4ae1ce88e9a010b6227f0345b0abea0eebd38599 +mvebu 3aa22be2d6b161b744398e60902014893e6898d8 +omap eab1cca2de624a2c9a10d862eb4a5938a57820f4 +qcom 7b0e649c3511849d640c9351df7c1013984ba975 +realtek 6a41c7019bcaf869d2da3ad57be37de456e55b82 +renesas 9c45f53abb9772802044007717e769eafd9b9ce3 +reset 00040854fa422f018f231736b588a32e74981e8e +rockchip f0d0e0810786eb35d7175b0c1b9ddc61ac10107f +samsung-krzk 6780daf4858878895bcba2f7fd5b5e53b9e72309 +scmi ec28b2def7478ec82282bf223919fd579e06890b +sunxi 2ddd531f8c8035eef280bd79ae907ce4487e1627 +tegra e0fd54137bf5a65d2523ffeec69e5a15935cb4e5 +clk ec16ffe36d80b18a1f98d126a865d5557ab27c30 +clk-samsung 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +c6x 8adcc59974b8a65b7eac7d503364837c297139bc +csky 044cf5e153578583ef570b0a502ccdd74bdaf295 +h8300 a5de8865cb3edc9c5b719dc45651b38226805f9e +ia64 240b62d381fe5b66c496a6fd55edff3976a9be51 +m68k 5ed0794cde59365d4d5895b89bb2f7ef7ffdbd55 +m68knommu 3ad3cbe305b5a23d829d3723b60be59c36713992 +microblaze 22648c989cb8305f51b96b5962df8674697bb2ab +mips a8d0f11ee50ddbd9f243c7a8b1a393a4f23ba093 +nds32 a7f96fce201c4969178c8709a49e005d9792186b +nios2 91d99a724e9c60e14332c26ab2284bf696b94c8e +openrisc 0ecdcaa6d5e78649578ff32c37556a4140b64edf +parisc-hd 219d54332a09e8d8741c1e1982f5eae56099de85 +powerpc 2807273f5e88ed086d7d5d838fdee71e11e5085f +fsl a76bea0287ce13d28494b19649d80d8ee5e7b757 +soc-fsl 3b8db0348c503823fb09b5f304b196c3362754ea +risc-v 070389ef0f4bff37053abd7e0f2f80c098b4798c +sifive 467e050e9760fc31dcf854ec88401e18419f5f78 +s390 2115fbf7210bd053ba55a95e7ebc366df41aa9cf +sh baf58858e8b6d853a7a8308901fcdd438e92a522 +sparc-next b71acb0e372160167bf6d5500b88b30b52ccef6e +uml 9807019a62dc670c73ce8e59e09b41ae458c34b3 +xtensa bd6d7558140c8b3094b7385fffd8162ccbeac6ab +fscrypt 0eee17e3322625b87ce5fa631bda16562a8dc494 +afs 4fe171bb81b13b40bf568330ec3716dfb304ced1 +btrfs 897636c94003639000939fc1720dd3ae1eea5142 +ceph 82995cc6c5ae4bf4d72edef381a085e52d5b5905 +cifs faa719cf95eb8aaa4def753d8f607742aa4f4fcd +configfs e2f238f7d5a1fa69ff1884d37acf9a2a3a01b308 +ecryptfs b4a81b87a4cfe2bb26a4a943b748d96a43ef20e8 +erofs 3dcb5fa23e16ef50b09e7a56b47d8e4c04ca09c0 +ext3 c78185c554508855fe517d8612e06a178cd5e386 +ext4 dfdeeb41fb08fbe11d3cfefba9c0fcd00c95a36d +f2fs 97eeb4d9d755605385fa329da9afa38729f3413c +fsverity 73f0ec02d670a61afcef49bc0a74d42e324276ea +fuse 8d66fcb7488486bf144eab852e87e03a45e0fd3a +jfs a5fdd713d256887b5f012608701149fa939e5645 +nfs a264abad51d8ecb7954a2f6d9f1885b38daffc74 +nfs-anna 79cc55422ce99be5964bde208ba8557174720893 +nfsd 6bcb98c71eab8677e54d604800928dfb0fc64ffb +orangefs e6b998ab62be29eb244fdb0fa41dcb5a8ad065f2 +overlayfs 5c2e9f346b815841f9bed6029ebcb06415caf640 +ubifs 6e78c01fde9023e0701f3af880c1fd9de6e4e8e3 +v9fs aafee43b72863f1f70aeaf1332d049916e8df239 +xfs 8feb4732ff9f2732354b44c4418569974e2f949c +iomap 88cfd30e188fcf6fd8304586c936a6f22fb665e5 +djw-vfs 3253d9d093376d62b4a56e609f15d2ec5085ac73 +file-locks b41dae061bbd722b9d7fa828f35d22035b218e18 +vfs 001ca08ef6542148686941003b4e631af68b9ff2 +printk b004f8e77cc01d793574d5c78a4807546d64f568 +pci 7e124c40517218e079e580909de2652bddb60ff5 +pstore 8d82cee2f8aa8b9bc806907ecd9e1494c6e8526b +hid 4b8c2dffbb85857fbbeb25516ccec51eb3a9e44b +i2c 2dff2a1c9b7cc83529119eb04cef1d7b68e11352 +i3c ae24f2b6f828f4ae37d0f0fd3be4e7744b6aab13 +dmi 2429c99fa13a6330cd9e1b9e6086b290735e77bb +hwmon-staging 4a1288f1c1cf5829f90c30f9d1af67f526ba4d85 +jc_docs 36bb9778fd11173f2dd1484e4f6797365e18c1d8 +v4l-dvb dca6b3733a4a46e63603496f544ece8ace541fde +v4l-dvb-next d45331b00ddb179e291766617259261c112db872 +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm 1bae6fbafe62f122a0b831ced66bfec6f2c44a2d +cpufreq-arm c23734487fb44ee16c1b007ba72d793c085e4ec4 +cpupower 4611a4fb0cce3973dce8c9d74e5d6261ffa4210f +opp 25cb20a212a1f989385dfe23230817e69c62bee5 +thermal def0aa8690502572c5d6d828bb35459c2725271d +thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 7807759e4ad8d46347a5d52a0910269320b81e65 +dlm a48f9721e6db74dfbeb8d4a2cd616b20017f4b78 +swiotlb 4cdfb27ba80d29aa04bc340b2e4b59e9ae74004c +rdma f295e4cece5cb4c60715fed539abcd62468f9ef1 +net-next 596cf45cbf6e4fa7bcb0df33e373a7d062b644b5 +bpf-next be2eca94d144e3ffed565c483a58ecc76a869c98 +ipsec-next 72c996099dc6fd83947a79cdac05625c6a52ffa6 +mlx5-next 9c0015ef092879f61129cdffbbe22fd30201d39b +netfilter-next 596cf45cbf6e4fa7bcb0df33e373a7d062b644b5 +nfc-next 1f008cfec5d529b30ca8da1a1f5fbbd457c10382 +ipvs-next d54725cd11a57c30f650260cfb0a92c268bdc3e0 +wireless-drivers-next 05d6c8cfdbd6cefac6b373bad72775fcc4193c80 +bluetooth 3168c19d7eb17a0108a3b60ad8e8c1b18ea05c63 +mac80211-next 7a89233ac50468a3a9636803a85d06c8f907f8ee +gfs2 ade48088937f53fe0467162177726176813b9564 +mtd 589e1b6c47ce72fcae103c2e45d899610c92c11e +nand 777260a5c99226cfa58325b6a7c2f39bb46f5aaf +spi-nor 83cba933a6db1dd4d7ac85170f99461fbc339eff +crypto 4ee812f6143d78d8ba1399671d78c8d78bf2817c +drm 3e25dbca8b75d3cc7dbbfd7aaaa0d29c730d45ac +amdgpu 1b3146b47913de5727bac63f8be81415aeccea72 +drm-intel 01bb630319337be15fc50c211126180198d4e157 +drm-tegra 84db889e6d827eefc3dde130fec8382d2dcb23ac +drm-misc d6d07ca19c045924f2b9cac14cb277cc34f85d43 +drm-msm e20c9284c8f212081afc28471daaac9b0d54252f +mali-dp f634c6a8028789b05a9277a3d51303829ae29547 +imx-drm 4d24376370fbfc87231d54434a683f2913abcce4 +etnaviv 22567d017c2c1a9b6ce67d054ffcbf6d2d64a6f8 +regmap 0c4b6e03b8ad372157a5e8005ce775dccea917b3 +sound 643a2cc99b53c13d90c02dc344f780ba9a89e012 +sound-asoc 073130b5fe01a0b4bf2fc37f968538cd6853464d +modules 5d603311615f612320bb77bd2a82553ef1ced5b7 +input 1a26c920717a24272e15b79b1455f3e99969a3ce +block 39c1f82685b4bec32fb10882b70893e806620445 +device-mapper 484e0d2b11e1fdd0d17702b282eb2ed56148385f +pcmcia bd9d6e0371d147b710f549b55d7b44008264aa06 +mmc def7bd940f8cceb41ec3d1383acd8ab937056dcb +md e820d55cb99dd93ac2dc949cf486bb187e5cd70d +mfd edfaeaf742b4c3ee6f58e0b8be95b5296a3375e8 +backlight 102a1b382177d89f75bc49b931c329a317cf531f +battery 9480029fe5c24d482efad38dc631bd555fc7afe2 +regulator 88c888614e8f6acb086b18566d9ca989b7077ec4 +security 45893a0abee6b5fd52994a3a1095735aeaec472b +apparmor 341c1fda5e17156619fb71acfc7082b2669b4b72 +integrity 2a7f0e53daf29ca6dc9fbe2a27158f13474ec1b5 +keys 48274e1e5d24407bb2acb768c093add00bf92823 +selinux 42345b68c2e3e2b6549fc34b937ff44240dfc3b6 +smack 92604e825304ce170955df44b00973843054dcd5 +tomoyo c39593ab0500fcd6db290b311c120349927ddc04 +tpmdd 0b40dbcbba923b5379bd1d601edd6d51e23fe72c +watchdog 33c26ab4d6beec44bd5f525ffba1c23bf962d4a7 +iommu 9b3a713feef8db41d4bcccb3b97e86ee906690c8 +vfio 026948f01eac4dda130aa623b7414375633fe7c1 +audit c34c78dfc1fc68a1f5403f996de8ca62f298d7b2 +devicetree a8de1304b7df30e3a14f2a8b9709bb4ff31a0385 +mailbox c6c6bc6ea9fce31baaca053befc31215cfcb3dd9 +spi 2835ce6b10bde87c61dc9585b4d46af244f6c457 +tip e445033e58108a9891abfbc0dea90b066a75e4a9 +clockevents 6e001f6a4cc73cd06fc7b8c633bc4906c33dd8ad +edac 5781823fd0d39082bfe2bbc20408aaa85a6e06ad +irqchip 090adda307bbeab65ddf98e4a4632f5843fca5ed +ftrace 16c0f03f629a89e6a1249497202b2c154ff46206 +rcu e100e2f047de34725181d990cba57fb1ba5666e2 +kvm 96710247298df52a4b8150a62a6fe87083093ff3 +kvm-arm cd7056ae34af0e9424da97bbc7d2b38246ba8a2c +kvm-ppc 30486e72093ea2e594f44876b7a445c219449bce +kvms390 c7b7de63124645089ccf9900b9e5ea08059ccae0 +xen-tip b3f7931f5c61ba39e81a5c958bf5d65ebb1838af +percpu fc6a00f8f3cf8d255050f201e9757e0f0ac05fca +workqueues 49e9d1a9faf2f71fdfd80a30697ee9a15070626d +drivers-x86 f3e4f3fc8ee9729c4b1b27a478c68b713df53c0c +chrome-platform 30af09e33c82d28a0c460140cf1484eeb34e7a18 +hsi c1030cd456198a2c58f718c3c4b215698d635553 +leds 5f820ed52371b4f5d8c43c93f03408d0dbc01e5b +ipmi 8e6a5c833333e14a5023a5dcabb64b7d9e046bc6 +driver-core 388c645a33a739bb96aa5ffe283ec68786ea7890 +usb 388c645a33a739bb96aa5ffe283ec68786ea7890 +usb-gadget 726b4fba94bec7e4c16bc681316e82455652c3a8 +usb-serial c1a1f273d0825774c80896b8deb1c9ea1d0b91e3 +usb-chipidea-next 4d6141288c33b73027260e73df262464cbe1fd0d +phy-next 4569e64ab6a590dec418f2cd98fbe907a08fd452 +tty 388c645a33a739bb96aa5ffe283ec68786ea7890 +char-misc 388c645a33a739bb96aa5ffe283ec68786ea7890 +extcon ddd1bbbae486ff5913c8fc72c853dcea60713236 +soundwire 2e8c4ad1f04413a4a67ef10746a7566007d2ed55 +thunderbolt b001da2905e70014b15e98dddf62d0c61b132527 +staging 388c645a33a739bb96aa5ffe283ec68786ea7890 +mux 05fb8284a41719d5f827af2f383dd7592d8dcfda +icc a99d8080aaf358d5d23581244e5da23b35e340b9 +slave-dma 67805a4b3c924927d9e064bca235461941f89e4a +cgroup 899969b46c28937195da510abf0ea53d300bf5c7 +scsi bef091d1f68b8e1b72b242ee26d11de26fe169e1 +scsi-mkp 1eb9151eb7c58c2a4b995918271e13037ae278b9 +vhost 88d3c7697f254a57e9056b7a8c8e028b790f1bdb +rpmsg 723710fe4baba34279e94a160867f0417bf53f12 +gpio 41c4616bb81ff9b2efd981453f2c5d8f57d0c0b8 +gpio-brgl 0f67f16a6e88749fc3bf88da7515d3fff472a1cc +gpio-intel 41c4616bb81ff9b2efd981453f2c5d8f57d0c0b8 +pinctrl 6d29032c2cef31633db5dfd946fbcf9190dddef0 +pinctrl-intel 8ae93b5ed9bec003b77c1ffaca852388b8ca490e +pinctrl-samsung a322b3377f4bac32aa25fb1acb9e7afbbbbd0137 +pwm 9e1b4999a1693d67cc87a887057d8012c28fb12b +userns 61a47c1ad3a4dc6882f01ebdc88138ac62d0df03 +ktest 9b5f852ae20d998a534eea46d54e68584868ae8c +random 58be0106c5306b939b07b4b8bf00669a20593f4b +kselftest 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +y2038 6d75353320b4610136de48f52615f7f638a65ca9 +livepatching 7f436b3066e330f78a626b3af72ff549137cf114 +coresight 9a5d847c0bdadb67892b7d176a028578aaed0c3a +rtc f830f7cf4752f6f0db48777b7e16c010bdc95083 +nvdimm 0dfbb932bb67dc76646e579ec5cd21a12125a458 +at24 285be87c79e173f08af5e1a6417a106fb14934b7 +ntb 1ef512b16bc8e51453d7105609c88f51fba4dcf5 +kspp ec2f877856e0af3889940e00b160f7f20f8d774f +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +fsi 2c01397b71c5e5001752046328d7f2aaf51b4c13 +slimbus 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +nvmem 6bd17868c99260458c70dd364b06ba5c28cfe814 +xarray 6b81141deb7358dbd64ce3e793cd1e3f5939f807 +hyperv 7a1323b5dfe44a9013a2cc56ef2973034a00bf88 +auxdisplay 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +kgdb c58ff643763c78bef12874ee39995c9f7f987bc2 +pidfd 04882c321b26fef30d8eaa7af63fa62c06e45c76 +devfreq f53df92a3453805a5343399f00819d47f29a9352 +hmm 93f4e735b6d98ee4b7a1252d81e815a983e359f2 +fpga fddc9fcbe69a502d84adf0bad5e2c6c80823838c +kunit ea2dd7c0875ed31955cda7b1b20612c8337192e5 +cel a99d8080aaf358d5d23581244e5da23b35e340b9 +kasan-bitops 5bece3d66153d78f1fd62108a1553c3f15e71412 +generic-ioremap eafee59440623e06b0ce4a0e49f814a8cf31d8ca +akpm-current d7a7648465d2aca5dce07daf37dd6d8a6376a61a +akpm adabf5b0490f04b6c02ce989cc05e51518959efe diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..2eb9fe5c31d8 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,316 @@ +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 +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..f1a7cb4f2c66 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,5156 @@ +$ date -R +Wed, 04 Dec 2019 07:46:30 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 937d6eefc716 Merge tag 'docs-5.5a' of git://git.lwn.net/linux +Merging origin/master (2dff2a1c9b7c Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging) +$ git merge origin/master +Updating 937d6eefc716..2dff2a1c9b7c +Fast-forward + .gitignore | 2 +- + Documentation/Makefile | 6 +- + Documentation/core-api/symbol-namespaces.rst | 3 + + .../devicetree/bindings/ufs/ti,j721e-ufs.yaml | 68 + + .../devicetree/bindings/ufs/ufshcd-pltfrm.txt | 1 + + Documentation/dontdiff | 1 + + Documentation/kbuild/makefiles.rst | 17 - + Documentation/kbuild/modules.rst | 13 +- + Documentation/scsi/scsi_mid_low_api.txt | 3 +- + MAINTAINERS | 4 +- + Makefile | 121 +- + arch/arm/crypto/chacha-glue.c | 26 +- + arch/arm/crypto/curve25519-glue.c | 5 +- + arch/arm/crypto/poly1305-glue.c | 9 +- + arch/arm64/crypto/chacha-neon-glue.c | 5 +- + arch/arm64/crypto/poly1305-glue.c | 5 +- + arch/hexagon/include/uapi/asm/bitsperlong.h | 27 - + arch/ia64/include/uapi/asm/errno.h | 2 - + arch/ia64/include/uapi/asm/ioctl.h | 2 - + arch/ia64/include/uapi/asm/ioctls.h | 7 - + arch/mips/crypto/chacha-glue.c | 6 +- + arch/mips/crypto/poly1305-glue.c | 6 +- + arch/openrisc/Kconfig | 26 +- + arch/um/Kconfig | 2 +- + arch/um/drivers/Kconfig | 2 +- + arch/um/drivers/vector_kern.c | 113 +- + arch/um/drivers/vector_kern.h | 8 +- + arch/um/drivers/vector_user.c | 94 +- + arch/um/drivers/vector_user.h | 8 +- + arch/um/drivers/virtio_uml.c | 76 +- + arch/um/os-Linux/main.c | 2 +- + arch/x86/crypto/blake2s-glue.c | 6 +- + arch/x86/crypto/chacha_glue.c | 5 +- + arch/x86/crypto/curve25519-x86_64.c | 7 +- + arch/x86/crypto/poly1305_glue.c | 5 +- + drivers/ata/pata_arasan_cf.c | 1 - + drivers/crypto/Kconfig | 1 + + drivers/crypto/hisilicon/sec2/sec_crypto.c | 4 +- + drivers/firewire/core-cdev.c | 3 +- + drivers/firewire/core-iso.c | 7 - + drivers/firewire/core.h | 2 - + drivers/firewire/ohci.c | 2 +- + drivers/firmware/dmi_scan.c | 41 +- + drivers/gpu/drm/i915/Kconfig.debug | 1 - + drivers/mtd/ubi/debug.c | 1 + + drivers/mtd/ubi/fastmap-wl.c | 31 +- + drivers/mtd/ubi/fastmap.c | 14 +- + drivers/mtd/ubi/ubi.h | 8 +- + drivers/mtd/ubi/wl.c | 32 +- + drivers/mtd/ubi/wl.h | 1 - + drivers/s390/scsi/Makefile | 2 +- + drivers/s390/scsi/zfcp_aux.c | 12 +- + drivers/s390/scsi/zfcp_dbf.c | 8 +- + drivers/s390/scsi/zfcp_def.h | 4 +- + drivers/s390/scsi/zfcp_diag.c | 305 ++++ + drivers/s390/scsi/zfcp_diag.h | 101 ++ + drivers/s390/scsi/zfcp_erp.c | 4 +- + drivers/s390/scsi/zfcp_ext.h | 1 + + drivers/s390/scsi/zfcp_fsf.c | 73 +- + drivers/s390/scsi/zfcp_fsf.h | 21 +- + drivers/s390/scsi/zfcp_scsi.c | 4 +- + drivers/s390/scsi/zfcp_sysfs.c | 170 ++- + drivers/scsi/NCR5380.c | 37 +- + drivers/scsi/aacraid/aachba.c | 11 +- + drivers/scsi/aacraid/aacraid.h | 23 +- + drivers/scsi/aacraid/comminit.c | 5 + + drivers/scsi/aacraid/commsup.c | 21 +- + drivers/scsi/aacraid/linit.c | 35 +- + drivers/scsi/aacraid/src.c | 10 + + drivers/scsi/arcmsr/arcmsr_hba.c | 6 +- + drivers/scsi/arm/acornscsi.c | 4 +- + drivers/scsi/atari_scsi.c | 6 +- + drivers/scsi/atp870u.c | 2 +- + drivers/scsi/bfa/bfad.c | 3 +- + drivers/scsi/bfa/bfad_attr.c | 4 +- + drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h | 2 +- + drivers/scsi/bnx2fc/bnx2fc_io.c | 2 +- + drivers/scsi/bnx2i/bnx2i_iscsi.c | 2 +- + drivers/scsi/csiostor/csio_hw.c | 20 +- + drivers/scsi/csiostor/csio_init.c | 7 +- + drivers/scsi/csiostor/csio_lnode.c | 18 +- + drivers/scsi/csiostor/csio_mb.c | 2 +- + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 2 - + drivers/scsi/cxgbi/libcxgbi.c | 28 - + drivers/scsi/cxlflash/main.c | 2 - + drivers/scsi/esas2r/esas2r_flash.c | 1 + + drivers/scsi/fnic/fnic_scsi.c | 3 +- + drivers/scsi/fnic/vnic_dev.c | 2 +- + drivers/scsi/hisi_sas/hisi_sas.h | 67 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 376 +++-- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 6 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 13 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 30 +- + drivers/scsi/hosts.c | 19 +- + drivers/scsi/ips.c | 2 +- + drivers/scsi/isci/port_config.c | 2 +- + drivers/scsi/isci/remote_device.c | 2 +- + drivers/scsi/iscsi_tcp.c | 8 + + drivers/scsi/lpfc/lpfc.h | 40 +- + drivers/scsi/lpfc/lpfc_attr.c | 298 +++- + drivers/scsi/lpfc/lpfc_bsg.c | 18 +- + drivers/scsi/lpfc/lpfc_crtn.h | 7 + + drivers/scsi/lpfc/lpfc_ct.c | 28 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 118 +- + drivers/scsi/lpfc/lpfc_els.c | 57 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 200 ++- + drivers/scsi/lpfc/lpfc_hw4.h | 31 +- + drivers/scsi/lpfc/lpfc_init.c | 954 ++++++++++--- + drivers/scsi/lpfc/lpfc_logmsg.h | 17 + + drivers/scsi/lpfc/lpfc_mbox.c | 1 + + drivers/scsi/lpfc/lpfc_mem.c | 3 - + drivers/scsi/lpfc/lpfc_nportdisc.c | 149 +- + drivers/scsi/lpfc/lpfc_nvme.c | 85 +- + drivers/scsi/lpfc/lpfc_nvmet.c | 103 +- + drivers/scsi/lpfc/lpfc_nvmet.h | 2 - + drivers/scsi/lpfc/lpfc_scsi.c | 43 +- + drivers/scsi/lpfc/lpfc_sli.c | 391 +++++- + drivers/scsi/lpfc/lpfc_sli.h | 3 +- + drivers/scsi/lpfc/lpfc_sli4.h | 42 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/mac_scsi.c | 2 +- + drivers/scsi/megaraid/megaraid_sas.h | 3 + + drivers/scsi/megaraid/megaraid_sas_base.c | 8 +- + drivers/scsi/megaraid/megaraid_sas_fp.c | 7 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 36 +- + drivers/scsi/mpt3sas/mpt3sas_base.h | 15 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 344 ++++- + drivers/scsi/mpt3sas/mpt3sas_ctl.h | 9 + + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 4 +- + drivers/scsi/mpt3sas/mpt3sas_trigger_diag.c | 12 +- + drivers/scsi/mvsas/mv_sas.c | 2 +- + drivers/scsi/ncr53c8xx.c | 2 +- + drivers/scsi/nsp32.c | 2 +- + drivers/scsi/pcmcia/Kconfig | 2 +- + drivers/scsi/pcmcia/nsp_cs.c | 2 - + drivers/scsi/pm8001/pm8001_ctl.c | 20 + + drivers/scsi/pm8001/pm8001_hwi.c | 131 +- + drivers/scsi/pm8001/pm8001_init.c | 36 +- + drivers/scsi/pm8001/pm8001_sas.c | 70 +- + drivers/scsi/pm8001/pm8001_sas.h | 24 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 451 ++++-- + drivers/scsi/pm8001/pm80xx_hwi.h | 3 + + drivers/scsi/qedf/qedf_dbg.h | 2 +- + drivers/scsi/qedf/qedf_main.c | 8 + + drivers/scsi/qedi/qedi_dbg.h | 2 +- + drivers/scsi/qla2xxx/qla_attr.c | 4 +- + drivers/scsi/qla2xxx/qla_def.h | 34 +- + drivers/scsi/qla2xxx/qla_fw.h | 2 + + drivers/scsi/qla2xxx/qla_gbl.h | 1 + + drivers/scsi/qla2xxx/qla_gs.c | 66 +- + drivers/scsi/qla2xxx/qla_init.c | 140 +- + drivers/scsi/qla2xxx/qla_inline.h | 12 + + drivers/scsi/qla2xxx/qla_iocb.c | 106 +- + drivers/scsi/qla2xxx/qla_isr.c | 36 +- + drivers/scsi/qla2xxx/qla_mbx.c | 15 +- + drivers/scsi/qla2xxx/qla_mid.c | 11 +- + drivers/scsi/qla2xxx/qla_nvme.c | 4 +- + drivers/scsi/qla2xxx/qla_os.c | 174 ++- + drivers/scsi/qla2xxx/qla_target.c | 2 +- + drivers/scsi/qla2xxx/qla_tmpl.c | 29 +- + drivers/scsi/qla2xxx/qla_version.h | 2 +- + drivers/scsi/qla4xxx/ql4_mbx.c | 3 - + drivers/scsi/scsi.c | 6 +- + drivers/scsi/scsi_debug.c | 9 +- + drivers/scsi/scsi_lib.c | 45 +- + drivers/scsi/scsi_logging.c | 10 +- + drivers/scsi/scsi_priv.h | 2 +- + drivers/scsi/scsi_sysfs.c | 22 +- + drivers/scsi/scsi_trace.c | 124 +- + drivers/scsi/sd.c | 4 + + drivers/scsi/sg.c | 91 +- + drivers/scsi/smartpqi/smartpqi.h | 77 +- + drivers/scsi/smartpqi/smartpqi_init.c | 437 +++--- + drivers/scsi/smartpqi/smartpqi_sas_transport.c | 22 +- + drivers/scsi/sun3_scsi.c | 4 +- + drivers/scsi/ufs/Kconfig | 10 + + drivers/scsi/ufs/Makefile | 1 + + drivers/scsi/ufs/ti-j721e-ufs.c | 90 ++ + drivers/scsi/ufs/ufs-hisi.c | 5 +- + drivers/scsi/ufs/ufs-mediatek.c | 3 + + drivers/scsi/ufs/ufs-qcom.c | 53 + + drivers/scsi/ufs/ufs-qcom.h | 3 + + drivers/scsi/ufs/ufs-sysfs.c | 15 +- + drivers/scsi/ufs/ufs_bsg.c | 1 + + drivers/scsi/ufs/ufshcd-dwc.c | 2 +- + drivers/scsi/ufs/ufshcd-pltfrm.c | 1 - + drivers/scsi/ufs/ufshcd.c | 214 ++- + drivers/scsi/ufs/ufshcd.h | 12 + + drivers/scsi/ufs/ufshci.h | 2 +- + drivers/scsi/zorro_esp.c | 11 +- + drivers/target/iscsi/cxgbit/cxgbit_ddp.c | 3 - + drivers/target/iscsi/iscsi_target.c | 24 +- + drivers/target/iscsi/iscsi_target_auth.c | 232 ++-- + drivers/target/iscsi/iscsi_target_auth.h | 17 +- + drivers/target/iscsi/iscsi_target_parameters.h | 3 - + drivers/target/target_core_fabric_lib.c | 2 +- + drivers/target/target_core_tpg.c | 12 - + drivers/target/target_core_transport.c | 28 + + drivers/target/target_core_user.c | 6 +- + drivers/target/target_core_xcopy.c | 1 - + drivers/usb/storage/ene_ub6250.c | 2 +- + drivers/usb/storage/transport.c | 3 +- + drivers/usb/storage/uas.c | 1 - + drivers/video/logo/.gitignore | 1 + + drivers/video/logo/Makefile | 15 +- + {scripts => drivers/video/logo}/pnmtologo.c | 0 + fs/compat_ioctl.c | 16 +- + fs/ioctl.c | 16 +- + fs/jffs2/nodelist.c | 2 +- + fs/ubifs/debug.c | 12 - + fs/ubifs/journal.c | 4 +- + fs/ubifs/orphan.c | 17 +- + fs/ubifs/sb.c | 2 +- + fs/ubifs/super.c | 4 +- + fs/ubifs/tnc_commit.c | 34 +- + fs/xfs/Makefile | 1 - + fs/xfs/kmem.c | 2 +- + fs/xfs/kmem.h | 30 - + fs/xfs/libxfs/xfs_ag_resv.c | 2 + + fs/xfs/libxfs/xfs_alloc.c | 1236 ++++++++++------- + fs/xfs/libxfs/xfs_alloc.h | 16 +- + fs/xfs/libxfs/xfs_alloc_btree.c | 1 + + fs/xfs/libxfs/xfs_attr.c | 24 +- + fs/xfs/libxfs/xfs_attr_leaf.c | 134 +- + fs/xfs/libxfs/xfs_attr_leaf.h | 30 +- + fs/xfs/libxfs/xfs_attr_remote.c | 1 + + fs/xfs/libxfs/xfs_bit.c | 1 + + fs/xfs/libxfs/xfs_bmap.c | 686 +++++---- + fs/xfs/libxfs/xfs_btree.c | 97 +- + fs/xfs/libxfs/xfs_btree.h | 37 +- + fs/xfs/libxfs/xfs_da_btree.c | 668 +++++---- + fs/xfs/libxfs/xfs_da_btree.h | 73 +- + fs/xfs/libxfs/xfs_da_format.c | 888 ------------ + fs/xfs/libxfs/xfs_da_format.h | 59 +- + fs/xfs/libxfs/xfs_dir2.c | 72 +- + fs/xfs/libxfs/xfs_dir2.h | 90 +- + fs/xfs/libxfs/xfs_dir2_block.c | 131 +- + fs/xfs/libxfs/xfs_dir2_data.c | 282 ++-- + fs/xfs/libxfs/xfs_dir2_leaf.c | 307 ++-- + fs/xfs/libxfs/xfs_dir2_node.c | 431 +++--- + fs/xfs/libxfs/xfs_dir2_priv.h | 114 +- + fs/xfs/libxfs/xfs_dir2_sf.c | 424 +++--- + fs/xfs/libxfs/xfs_dquot_buf.c | 8 +- + fs/xfs/libxfs/xfs_format.h | 14 +- + fs/xfs/libxfs/xfs_fs.h | 4 +- + fs/xfs/libxfs/xfs_ialloc.c | 117 +- + fs/xfs/libxfs/xfs_iext_tree.c | 2 +- + fs/xfs/libxfs/xfs_inode_buf.c | 21 +- + fs/xfs/libxfs/xfs_inode_buf.h | 5 +- + fs/xfs/libxfs/xfs_inode_fork.c | 22 +- + fs/xfs/libxfs/xfs_inode_fork.h | 18 +- + fs/xfs/libxfs/xfs_log_format.h | 4 +- + fs/xfs/libxfs/xfs_log_recover.h | 4 +- + fs/xfs/libxfs/xfs_refcount.c | 174 ++- + fs/xfs/libxfs/xfs_rmap.c | 377 +++-- + fs/xfs/libxfs/xfs_rtbitmap.c | 4 +- + fs/xfs/libxfs/xfs_sb.c | 1 + + fs/xfs/libxfs/xfs_trans_inode.c | 8 +- + fs/xfs/libxfs/xfs_trans_resv.c | 6 +- + fs/xfs/libxfs/xfs_types.h | 2 - + fs/xfs/scrub/attr.c | 11 +- + fs/xfs/scrub/bitmap.c | 3 +- + fs/xfs/scrub/common.h | 9 +- + fs/xfs/scrub/dabtree.c | 62 +- + fs/xfs/scrub/dabtree.h | 3 +- + fs/xfs/scrub/dir.c | 132 +- + fs/xfs/scrub/fscounters.c | 8 +- + fs/xfs/scrub/health.c | 1 + + fs/xfs/scrub/parent.c | 27 +- + fs/xfs/scrub/quota.c | 7 + + fs/xfs/scrub/scrub.c | 1 + + fs/xfs/xfs_acl.c | 18 +- + fs/xfs/xfs_aops.c | 43 +- + fs/xfs/xfs_aops.h | 3 - + fs/xfs/xfs_attr_inactive.c | 76 +- + fs/xfs/xfs_attr_list.c | 75 +- + fs/xfs/xfs_bmap_item.c | 11 +- + fs/xfs/xfs_bmap_util.c | 255 +--- + fs/xfs/xfs_bmap_util.h | 4 - + fs/xfs/xfs_buf.c | 32 +- + fs/xfs/xfs_buf.h | 1 - + fs/xfs/xfs_buf_item.c | 6 +- + fs/xfs/xfs_dir2_readdir.c | 137 +- + fs/xfs/xfs_discard.c | 6 +- + fs/xfs/xfs_dquot.c | 46 +- + fs/xfs/xfs_dquot.h | 98 +- + fs/xfs/xfs_dquot_item.h | 34 +- + fs/xfs/xfs_error.c | 31 +- + fs/xfs/xfs_error.h | 33 +- + fs/xfs/xfs_extent_busy.c | 2 +- + fs/xfs/xfs_extfree_item.c | 9 +- + fs/xfs/xfs_file.c | 104 +- + fs/xfs/xfs_filestream.c | 3 +- + fs/xfs/xfs_fsmap.c | 1 + + fs/xfs/xfs_icache.c | 8 +- + fs/xfs/xfs_icreate_item.c | 2 +- + fs/xfs/xfs_inode.c | 48 +- + fs/xfs/xfs_inode.h | 31 +- + fs/xfs/xfs_inode_item.c | 15 +- + fs/xfs/xfs_ioctl.c | 203 +-- + fs/xfs/xfs_ioctl.h | 7 - + fs/xfs/xfs_ioctl32.c | 49 +- + fs/xfs/xfs_ioctl32.h | 13 +- + fs/xfs/xfs_iomap.c | 862 ++++++------ + fs/xfs/xfs_iomap.h | 11 +- + fs/xfs/xfs_iops.c | 70 +- + fs/xfs/xfs_itable.c | 6 +- + fs/xfs/xfs_iwalk.c | 3 +- + fs/xfs/xfs_linux.h | 14 +- + fs/xfs/xfs_log.c | 434 +++--- + fs/xfs/xfs_log_cil.c | 6 +- + fs/xfs/xfs_log_priv.h | 33 +- + fs/xfs/xfs_log_recover.c | 148 +- + fs/xfs/xfs_message.c | 22 +- + fs/xfs/xfs_message.h | 6 +- + fs/xfs/xfs_mount.c | 58 +- + fs/xfs/xfs_mount.h | 57 +- + fs/xfs/xfs_pnfs.c | 56 +- + fs/xfs/xfs_qm.c | 67 +- + fs/xfs/xfs_qm.h | 6 +- + fs/xfs/xfs_qm_bhv.c | 8 +- + fs/xfs/xfs_qm_syscalls.c | 139 +- + fs/xfs/xfs_quotaops.c | 3 + + fs/xfs/xfs_refcount_item.c | 9 +- + fs/xfs/xfs_reflink.c | 138 +- + fs/xfs/xfs_reflink.h | 4 +- + fs/xfs/xfs_rmap_item.c | 13 +- + fs/xfs/xfs_rtalloc.c | 3 +- + fs/xfs/xfs_super.c | 1466 ++++++++++---------- + fs/xfs/xfs_super.h | 10 + + fs/xfs/xfs_symlink.c | 1 + + fs/xfs/xfs_symlink.h | 2 +- + fs/xfs/xfs_trace.h | 35 +- + fs/xfs/xfs_trans.c | 2 +- + fs/xfs/xfs_trans_ail.c | 10 +- + fs/xfs/xfs_trans_dquot.c | 56 +- + fs/xfs/xfs_xattr.c | 1 + + include/Kbuild | 1187 ---------------- + include/asm-generic/export.h | 2 - + include/linux/dmi.h | 4 + + include/linux/falloc.h | 10 +- + include/linux/fs.h | 2 +- + include/linux/percpu-refcount.h | 16 +- + include/scsi/iscsi_proto.h | 1 + + include/scsi/scsi_cmnd.h | 5 +- + include/scsi/scsi_device.h | 5 +- + include/scsi/scsi_host.h | 19 +- + include/target/target_core_base.h | 1 - + include/uapi/linux/chio.h | 11 +- + init/Kconfig | 22 +- + kernel/Makefile | 2 +- + kernel/gen_kheaders.sh | 64 +- + lib/Kconfig.debug | 11 - + scripts/.gitignore | 1 - + scripts/Kbuild.include | 15 +- + scripts/Makefile | 2 - + scripts/Makefile.build | 20 +- + scripts/Makefile.headersinst | 18 - + scripts/Makefile.lib | 14 - + scripts/Makefile.modpost | 18 +- + scripts/Makefile.package | 6 +- + scripts/kallsyms.c | 287 ++-- + scripts/kconfig/Makefile | 10 +- + scripts/kconfig/conf.c | 13 +- + scripts/kconfig/mconf-cfg.sh | 3 + + scripts/kconfig/nconf-cfg.sh | 3 + + scripts/kconfig/parser.y | 1 - + scripts/mod/modpost.c | 188 ++- + scripts/mod/modpost.h | 5 +- + scripts/nsdeps | 29 +- + scripts/package/buildtar | 8 +- + scripts/setlocalversion | 22 +- + scripts/ver_linux | 2 + + tools/testing/selftests/Makefile | 5 +- + usr/include/Makefile | 19 +- + 375 files changed, 12394 insertions(+), 10205 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ufs/ti,j721e-ufs.yaml + delete mode 100644 arch/hexagon/include/uapi/asm/bitsperlong.h + delete mode 100644 arch/ia64/include/uapi/asm/errno.h + delete mode 100644 arch/ia64/include/uapi/asm/ioctl.h + delete mode 100644 arch/ia64/include/uapi/asm/ioctls.h + create mode 100644 drivers/s390/scsi/zfcp_diag.c + create mode 100644 drivers/s390/scsi/zfcp_diag.h + create mode 100644 drivers/scsi/ufs/ti-j721e-ufs.c + rename {scripts => drivers/video/logo}/pnmtologo.c (100%) + delete mode 100644 fs/xfs/libxfs/xfs_da_format.c + delete mode 100644 include/Kbuild +Merging fixes/master (31f4f5b495a6 Linux 5.4-rc7) +$ git merge fixes/master +Already up to date. +Merging kbuild-current/fixes (80591e61a0f7 kbuild: tell sparse about the $ARCH) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (5effc09c4907 ARC: perf: Accommodate big-endian CPU) +$ git merge arc-current/for-curr +Already up to date. +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 (db6efda85437 Merge tag 'tee-fixes-for-v5.4' of git://git.linaro.org/people/jens.wiklander/linux-tee into arm/fixes) +$ git merge arm-soc-fixes/arm/fixes +Merge made by the 'recursive' strategy. + drivers/tee/optee/call.c | 7 +++++++ + drivers/tee/optee/core.c | 20 ++++++++++++-------- + drivers/tee/optee/shm_pool.c | 12 +++++++++++- + 3 files changed, 30 insertions(+), 9 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 (7d6475051fb3 powerpc/powernv: Fix CPU idle to be called with IRQs disabled) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (219d54332a09 Linux 5.4) +$ git merge s390-fixes/fixes +Already up to date. +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 (2f23cd42e19c net: sched: fix dump qlen for sch_mq/sch_mqprio with NOLOCK subqueues) +$ git merge net/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 17 +++++++++ + drivers/net/can/slcan.c | 1 + + drivers/net/can/usb/ucan.c | 2 +- + drivers/net/can/xilinx_can.c | 28 +++++++------- + drivers/net/ethernet/mscc/ocelot.c | 14 +++++-- + include/linux/filter.h | 8 +++- + include/linux/skbuff.h | 3 +- + kernel/bpf/btf.c | 5 ++- + net/bridge/br_device.c | 6 +++ + net/core/dev.c | 6 +-- + net/core/rtnetlink.c | 4 +- + net/core/skbuff.c | 6 ++- + net/ipv4/tcp_timer.c | 10 ++++- + net/openvswitch/actions.c | 3 +- + net/sched/act_mpls.c | 4 +- + net/sched/sch_cake.c | 1 + + net/sched/sch_mq.c | 1 + + net/sched/sch_mqprio.c | 1 + + scripts/link-vmlinux.sh | 8 +++- + tools/lib/bpf/Makefile | 10 ++--- + tools/lib/bpf/libbpf.c | 45 ++++++++++------------- + tools/perf/MANIFEST | 1 + + tools/testing/selftests/bpf/progs/fentry_test.c | 12 +++--- + tools/testing/selftests/bpf/progs/fexit_bpf2bpf.c | 6 +-- + tools/testing/selftests/bpf/progs/fexit_test.c | 12 +++--- + tools/testing/selftests/bpf/progs/test_mmap.c | 4 +- + 26 files changed, 138 insertions(+), 80 deletions(-) +Merging bpf/master (040b5cfbcefa Fixed updating of ethertype in function skb_mpls_pop) +$ git merge bpf/master +Already up to date. +Merging ipsec/master (a56dcc6b4558 net: cdc_ncm: Signedness bug in cdc_ncm_set_dgram_size()) +$ git merge ipsec/master +Already up to date. +Merging netfilter/master (d1f4c966475c netfilter: nf_tables_offload: Check for the NETDEV_UNREGISTER event) +$ git merge netfilter/master +Merge made by the 'recursive' strategy. + net/netfilter/nf_conntrack_core.c | 7 ++++--- + net/netfilter/nf_conntrack_netlink.c | 3 +++ + net/netfilter/nf_flow_table_offload.c | 24 +++++++++++++++++------- + net/netfilter/nf_tables_offload.c | 3 +++ + 4 files changed, 27 insertions(+), 10 deletions(-) +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 (1e58252e334d mwifiex: Fix heap overflow in mmwifiex_process_tdls_action_frame()) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + .../net/wireless/ath/ath9k/ath9k_pci_owl_loader.c | 2 +- + 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 +- + 4 files changed, 80 insertions(+), 10 deletions(-) +Merging mac80211/master (e58c19124189 slip: Fix use-after-free Read in slip_open) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (411c1e6774e2 RDMA/hns: Correct the value of srq_desc_size) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (643a2cc99b53 ALSA: hda: hdmi - Keep old slot assignment behavior for Intel platforms) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + include/sound/hdaudio.h | 1 + + sound/drivers/aloop.c | 8 ++--- + sound/hda/hdac_stream.c | 19 ++++++---- + sound/pci/hda/hda_intel.c | 80 ++++++++++++++++++++++++++++++++++++++++--- + sound/pci/hda/patch_hdmi.c | 68 +++++++++++++++++------------------- + sound/pci/hda/patch_realtek.c | 41 +++++++++++++--------- + 6 files changed, 148 insertions(+), 69 deletions(-) +Merging sound-asoc-fixes/for-linus (073130b5fe01 Merge branch 'asoc-5.5' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Auto-merging sound/soc/codecs/wm8904.c +Auto-merging sound/soc/codecs/rt5682.c +Merge made by the 'recursive' strategy. + sound/soc/amd/acp-da7219-max98357a.c | 46 +++++++++++------------------------- + sound/soc/codecs/max98090.c | 30 ++++++++++++++++------- + sound/soc/codecs/max98090.h | 1 - + sound/soc/codecs/rt5677-spi.h | 16 +++++++++++++ + sound/soc/codecs/rt5682.c | 2 ++ + sound/soc/codecs/wm8904.c | 6 +++++ + sound/soc/intel/atom/sst/sst.c | 1 + + sound/soc/sof/intel/byt.c | 18 +++++++------- + sound/soc/sof/topology.c | 4 +++- + 9 files changed, 72 insertions(+), 52 deletions(-) +Merging regmap-fixes/for-linus (af42d3466bdc Linux 5.4-rc8) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (88c888614e8f Merge branch 'regulator-5.5' into regulator-linus) +$ git merge regulator-fixes/for-linus +Auto-merging drivers/regulator/core.c +Merge made by the 'recursive' strategy. + drivers/regulator/core.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) +Merging spi-fixes/for-linus (3d5e7b9c73b3 Merge branch 'spi-5.5' into spi-linus) +$ git merge spi-fixes/for-linus +Auto-merging drivers/spi/spi-pxa2xx.c +Auto-merging drivers/spi/spi-dw.c +Auto-merging drivers/gpio/gpiolib-of.c +Merge made by the 'recursive' strategy. + drivers/gpio/gpiolib-of.c | 27 +++++++++++++++++++++++++++ + drivers/spi/spi-cadence.c | 6 +++--- + drivers/spi/spi-dw.c | 5 +++-- + drivers/spi/spi-fsl-spi.c | 15 +++++++++++++-- + drivers/spi/spi-pxa2xx.c | 4 ++++ + 5 files changed, 50 insertions(+), 7 deletions(-) +Merging pci-current/for-linus (54ecb8f7028c Linux 5.4-rc1) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (937d6eefc716 Merge tag 'docs-5.5a' of git://git.lwn.net/linux) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (d6d5df1db6e9 Linux 5.4-rc5) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (937d6eefc716 Merge tag 'docs-5.5a' of git://git.lwn.net/linux) +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (f3fb802efaef usb: cdns3: gadget: Don't manage pullups) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (a99d8080aaf3 Linux 5.4-rc6) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +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 (54ecb8f7028c Linux 5.4-rc1) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (937d6eefc716 Merge tag 'docs-5.5a' of git://git.lwn.net/linux) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (937d6eefc716 Merge tag 'docs-5.5a' of git://git.lwn.net/linux) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (7b47ad3322d1 soundwire: slave: fix scanf format) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (219d54332a09 Linux 5.4) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (976e3645923b Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up to date. +Merging crypto-current/master (8a6b8f4d7a89 crypto: hisilicon - fix a NULL vs IS_ERR() bug in sec_create_qp_ctx()) +$ 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 (f60b85e83659 Revert "selftests: Fix O= and KBUILD_OUTPUT handling for relative paths") +$ git merge kselftest-fixes/fixes +Already up to date. +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 (bacdcb6675e1 dmaengine: cppi41: Fix cppi41_dma_prep_slave_sg() when idle) +$ git merge slave-dma-fixes/fixes +Already up to date. +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 (3e84a18a259e media: meson/ao-cec: move cec_notifier_cec_adap_register after hw setup) +$ git merge v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (cc67d61e31ec reset: Do not register resource data for missing resets) +$ git merge reset-fixes/reset/fixes +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/reset/brcm,brcmstb-reset.txt | 2 +- + drivers/reset/core.c | 10 ++++------ + drivers/reset/reset-brcmstb.c | 6 ------ + 3 files changed, 5 insertions(+), 13 deletions(-) +Merging mips-fixes/mips-fixes (a7effde99b6e MIPS: Kconfig: Use correct form for 'depends on') +$ git merge mips-fixes/mips-fixes +Merge made by the 'recursive' strategy. + arch/mips/include/asm/cpu-type.h | 3 ++- + arch/mips/include/asm/vdso/gettimeofday.h | 13 ------------- + arch/mips/kernel/cacheinfo.c | 27 ++++++++++++++++++++++++++- + arch/mips/vdso/vgettimeofday.c | 20 ++++++++++++++++++++ + drivers/platform/mips/Kconfig | 2 +- + 5 files changed, 49 insertions(+), 16 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 (6aed5a0e0f56 Merge branch 'watchdog-fix' into fixes) +$ git merge omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (9cb09e7c1c9a KVM: Add a comment describing the /dev/kvm no_compat handling) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (53936b5bf35e KVM: s390: Do not leak kernel stack data in the KVM_S390_INTERRUPT ioctl) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (92b39ad44096 hwmon: (pmbus/ibm-cffps) Fix LED blink behavior) +$ git merge hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (6370740e5f8e fs/dax: Fix pmd vs pte conflict detection) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +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 (2fa6b1e01a9b fs/namei.c: fix missing barriers when checking positivity) +$ git merge vfs-fixes/fixes +Auto-merging fs/quota/dquot.c +Auto-merging fs/namei.c +Auto-merging fs/kernfs/mount.c +Auto-merging fs/dcache.c +Auto-merging fs/cifs/cifsfs.c +Merge made by the 'recursive' strategy. + fs/cifs/cifsfs.c | 7 +------ + fs/dcache.c | 6 ++++-- + fs/debugfs/inode.c | 6 +----- + fs/kernfs/mount.c | 2 +- + fs/namei.c | 56 ++++++++++++++++++++++++++++---------------------- + fs/nfsd/nfs3xdr.c | 4 +--- + fs/nfsd/nfs4xdr.c | 11 +--------- + fs/overlayfs/namei.c | 24 ++++++++-------------- + fs/quota/dquot.c | 7 +------ + include/linux/dcache.h | 5 +++++ + include/linux/namei.h | 1 + + 11 files changed, 56 insertions(+), 73 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 (7d194c2100ad Linux 5.4-rc4) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (54ecb8f7028c Linux 5.4-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/pinctrl-fixes (5f9e832c1370 Linus 5.3-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (5dba51754b04 of: reserved_mem: add missing of_node_put() for proper ref-counting) +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (9393c8de628c scsi: core: Handle drivers which set sg_tablesize to zero) +$ git merge scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (51658c04c338 Merge tag 'drm-intel-fixes-2019-11-21' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes) +$ 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 (71d122629c04 drm/i915/fbdev: Restore physical addresses for fb_mmap()) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (fed23c5829ec mmc: sdhci-of-at91: fix quirk2 overwrite) +$ git merge mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (5f9e832c1370 Linus 5.3-rc1) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (54ecb8f7028c Linux 5.4-rc1) +$ 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 (1d9b0b66c3ef MAINTAINERS: Change to my personal email address) +$ git merge risc-v-fixes/fixes +Already up to date. +Merging pidfd-fixes/fixes (9e77716a75bc fork: fix pidfd_poll()'s return type) +$ git merge pidfd-fixes/fixes +Already up to date. +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 (bf49d9dd6fef export,module: add SPDX GPL-2.0 license identifier to headers with no license) +$ git merge spdx/spdx-linus +Auto-merging include/asm-generic/export.h +Merge made by the 'recursive' strategy. + include/asm-generic/export.h | 1 + + include/linux/export.h | 1 + + include/linux/license.h | 1 + + include/linux/module.h | 7 +++++-- + 4 files changed, 8 insertions(+), 2 deletions(-) +Merging gpio-intel-fixes/fixes (7d194c2100ad Linux 5.4-rc4) +$ git merge gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (219d54332a09 Linux 5.4) +$ git merge pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (1aaad89e4acf erofs: zero out when listxattr is called with no xattr) +$ git merge erofs-fixes/fixes +Merge made by the 'recursive' strategy. + fs/erofs/xattr.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging drm-misc-fixes/for-linux-next-fixes (6645d42d79d3 dma-buf: Fix memory leak in sync_file_merge()) +$ git merge drm-misc-fixes/for-linux-next-fixes +Auto-merging drivers/gpu/drm/mcde/mcde_dsi.c +Auto-merging drivers/dma-buf/sync_file.c +Merge made by the 'recursive' strategy. + drivers/dma-buf/sync_file.c | 2 +- + drivers/gpu/drm/mcde/mcde_dsi.c | 6 ++++-- + 2 files changed, 5 insertions(+), 3 deletions(-) +Merging kspp-gustavo/for-next/kspp (da0c9ea146cb Linux 5.4-rc2) +$ git merge kspp-gustavo/for-next/kspp +Already up to date. +Merging kbuild/for-next (d21b7e6b985c MAINTAINERS: update Kbuild/Kconfig maintainer's email address) +$ git merge kbuild/for-next +Already up to date. +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 +Auto-merging arch/arc/include/asm/pgtable.h +Removing arch/arc/configs/nsim_hs_smp_defconfig +Removing arch/arc/configs/nsim_hs_defconfig +Removing arch/arc/boot/dts/nsim_hs_idu.dts +Removing arch/arc/boot/dts/nsim_hs.dts +Auto-merging arch/arc/Kconfig +Merge made by the 'recursive' strategy. + arch/arc/Kconfig | 9 ++ + arch/arc/Makefile | 2 +- + arch/arc/boot/dts/axc001.dtsi | 6 ++ + arch/arc/boot/dts/axs101.dts | 2 +- + arch/arc/boot/dts/axs103_idu.dts | 2 +- + arch/arc/boot/dts/axs10x_mb.dtsi | 11 ++- + arch/arc/boot/dts/haps_hs.dts | 15 +-- + arch/arc/boot/dts/haps_hs_idu.dts | 1 - + arch/arc/boot/dts/nsim_700.dts | 36 +++---- + arch/arc/boot/dts/nsim_hs.dts | 67 ------------- + arch/arc/boot/dts/nsim_hs_idu.dts | 65 ------------- + arch/arc/configs/haps_hs_defconfig | 30 ++---- + arch/arc/configs/haps_hs_smp_defconfig | 32 ++----- + arch/arc/configs/nsim_700_defconfig | 19 ++-- + arch/arc/configs/nsim_hs_defconfig | 60 ------------ + arch/arc/configs/nsim_hs_smp_defconfig | 58 ----------- + arch/arc/include/asm/cache.h | 2 + + arch/arc/include/asm/entry-compact.h | 4 +- + arch/arc/include/asm/jump_label.h | 72 ++++++++++++++ + arch/arc/include/asm/mmu.h | 6 ++ + arch/arc/include/asm/mmu_context.h | 2 +- + arch/arc/include/asm/pgtable.h | 2 +- + arch/arc/kernel/Makefile | 1 + + arch/arc/kernel/jump_label.c | 170 +++++++++++++++++++++++++++++++++ + arch/arc/mm/tlb.c | 81 ++++++---------- + arch/arc/mm/tlbex.S | 18 ++-- + arch/arc/plat-sim/platform.c | 1 - + 27 files changed, 363 insertions(+), 411 deletions(-) + delete mode 100644 arch/arc/boot/dts/nsim_hs.dts + delete mode 100644 arch/arc/boot/dts/nsim_hs_idu.dts + delete mode 100644 arch/arc/configs/nsim_hs_defconfig + delete mode 100644 arch/arc/configs/nsim_hs_smp_defconfig + create mode 100644 arch/arc/include/asm/jump_label.h + create mode 100644 arch/arc/kernel/jump_label.c +Merging arm/for-next (1a70cf0e7ee6 ARM: 8940/1: ftrace: remove mcount(),ftrace_caller_old() and ftrace_call_old()) +$ git merge arm/for-next +Already up to date. +Merging arm64/for-next/core (d8e85e144bbe arm64: Kconfig: add a choice for endianness) +$ 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 (e1351090dd4a ARM: Document merges) +$ git merge arm-soc/for-next +Auto-merging lib/Makefile +Auto-merging include/linux/firmware/xlnx-zynqmp.h +CONFLICT (modify/delete): include/Kbuild deleted in HEAD and modified in arm-soc/for-next. Version arm-soc/for-next of include/Kbuild left in tree. +Removing drivers/soc/qcom/llcc-sdm845.c +Auto-merging drivers/reset/core.c +Auto-merging drivers/opp/core.c +Auto-merging drivers/clk/Kconfig +Auto-merging drivers/bus/Kconfig +Auto-merging arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts +Auto-merging arch/arm/mm/Kconfig +Auto-merging arch/arm/mach-omap2/pdata-quirks.c +Auto-merging arch/arm/mach-omap2/Makefile +Auto-merging arch/arm/configs/qcom_defconfig +Auto-merging arch/arm/configs/omap2plus_defconfig +Auto-merging arch/arm/configs/keystone_defconfig +Auto-merging arch/arm/boot/dts/omap3-n900.dts +Auto-merging arch/arm/boot/dts/omap3-igep0030-rev-g.dts +Auto-merging arch/arm/boot/dts/omap3-igep0020-rev-f.dts +Auto-merging arch/arm/boot/dts/dra7-l4.dtsi +Removing arch/arm/boot/dts/at91-kizbox2.dts +Auto-merging arch/arm/boot/dts/am3517.dtsi +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/reset/qcom,pdc-global.txt +Removing Documentation/devicetree/bindings/reset/qcom,aoss-reset.txt +Removing Documentation/devicetree/bindings/memory-controllers/nvidia,tegra30-mc.txt +Auto-merging Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml +Removing Documentation/devicetree/bindings/arm/renesas,prr.txt +Removing Documentation/devicetree/bindings/arm/msm/qcom,llcc.txt +Removing Documentation/devicetree/bindings/arm/mrvl/mrvl.txt +Removing Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.txt +Removing Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt +Resolved 'Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f include/Kbuild +rm 'include/Kbuild' +$ git commit --no-edit -v -a +[master 81c7d143fbad] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/arm/microchip.rst | 4 +- + Documentation/devicetree/bindings/arm/amlogic.yaml | 9 +- + .../devicetree/bindings/arm/atmel-at91.yaml | 14 + + .../devicetree/bindings/arm/bcm/bcm2835.yaml | 54 + + .../devicetree/bindings/arm/bcm/brcm,bcm2835.txt | 67 - + Documentation/devicetree/bindings/arm/cpus.yaml | 1 + + Documentation/devicetree/bindings/arm/fsl.yaml | 58 +- + ...-controller.txt => ap80x-system-controller.txt} | 14 +- + .../bindings/arm/marvell/armada-7k-8k.txt | 24 - + .../bindings/arm/marvell/armada-7k-8k.yaml | 61 + + .../devicetree/bindings/arm/mrvl/mrvl.txt | 14 - + .../devicetree/bindings/arm/mrvl/mrvl.yaml | 35 + + .../devicetree/bindings/arm/msm/qcom,llcc.txt | 41 - + .../devicetree/bindings/arm/msm/qcom,llcc.yaml | 55 + + .../devicetree/bindings/arm/omap/prm-inst.txt | 29 + + Documentation/devicetree/bindings/arm/realtek.yaml | 27 +- + .../devicetree/bindings/arm/renesas,prr.txt | 20 - + .../devicetree/bindings/arm/renesas,prr.yaml | 35 + + Documentation/devicetree/bindings/arm/renesas.yaml | 20 + + .../devicetree/bindings/arm/rockchip.yaml | 19 +- + Documentation/devicetree/bindings/arm/sunxi.yaml | 5 + + .../devicetree/bindings/arm/sunxi/sunxi-mbus.txt | 1 + + .../bindings/clock/rockchip,px30-cru.txt | 5 + + .../bindings/crypto/allwinner,sun8i-ce.yaml | 88 + + .../bindings/{lpddr2 => ddr}/lpddr2-timings.txt | 0 + .../devicetree/bindings/{lpddr2 => ddr}/lpddr2.txt | 2 +- + .../devicetree/bindings/ddr/lpddr3-timings.txt | 58 + + Documentation/devicetree/bindings/ddr/lpddr3.txt | 101 + + .../bindings/display/bridge/anx6345.yaml | 102 + + .../firmware/xilinx/xlnx,zynqmp-firmware.txt | 16 +- + .../devicetree/bindings/gpu/arm,mali-midgard.yaml | 5 +- + .../bindings/interrupt-controller/mrvl,intc.txt | 14 +- + .../bindings/memory-controllers/exynos5422-dmc.txt | 84 + + .../memory-controllers/nvidia,tegra124-mc.yaml | 152 + + .../memory-controllers/nvidia,tegra30-emc.yaml | 336 + + .../memory-controllers/nvidia,tegra30-mc.txt | 123 - + .../memory-controllers/nvidia,tegra30-mc.yaml | 167 + + .../devicetree/bindings/nvmem/amlogic-efuse.txt | 6 + + .../devicetree/bindings/phy/phy-mmp3-usb.txt | 13 + + .../devicetree/bindings/power/qcom,rpmpd.txt | 1 + + .../bindings/power/renesas,rcar-sysc.txt | 2 + + .../regulator/nvidia,tegra-regulators-coupling.txt | 65 + + .../bindings/reset/amlogic,meson-axg-audio-arb.txt | 3 +- + .../bindings/reset/amlogic,meson-reset.yaml | 1 + + .../devicetree/bindings/reset/qcom,aoss-reset.txt | 52 - + .../devicetree/bindings/reset/qcom,aoss-reset.yaml | 47 + + .../devicetree/bindings/reset/qcom,pdc-global.txt | 52 - + .../devicetree/bindings/reset/qcom,pdc-global.yaml | 47 + + .../devicetree/bindings/reset/renesas,rst.txt | 2 + + .../devicetree/bindings/reset/uniphier-reset.txt | 5 +- + Documentation/devicetree/bindings/soc/fsl/rcpm.txt | 14 +- + .../devicetree/bindings/soc/qcom/qcom,smd-rpm.txt | 1 + + .../devicetree/bindings/soc/rockchip/grf.txt | 18 +- + .../bindings/timer/mediatek,mtk-timer.txt | 1 + + .../devicetree/bindings/timer/renesas,tmu.txt | 1 + + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + MAINTAINERS | 25 +- + arch/arm/Kconfig | 2 +- + arch/arm/arm-soc-for-next-contents.txt | 225 + + arch/arm/boot/dts/Makefile | 19 +- + arch/arm/boot/dts/am335x-baltos.dtsi | 12 - + arch/arm/boot/dts/am335x-bone-common.dtsi | 22 - + arch/arm/boot/dts/am335x-boneblue.dts | 22 - + arch/arm/boot/dts/am335x-chiliboard.dts | 18 - + arch/arm/boot/dts/am335x-cm-t335.dts | 20 - + arch/arm/boot/dts/am335x-evm.dts | 25 - + arch/arm/boot/dts/am335x-evmsk.dts | 25 - + arch/arm/boot/dts/am335x-guardian.dts | 22 - + arch/arm/boot/dts/am335x-igep0033.dtsi | 25 - + arch/arm/boot/dts/am335x-lxm.dts | 22 - + arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi | 17 - + arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts | 22 - + arch/arm/boot/dts/am335x-netcan-plus-1xx.dts | 87 + + arch/arm/boot/dts/am335x-netcom-plus-2xx.dts | 95 + + arch/arm/boot/dts/am335x-netcom-plus-8xx.dts | 115 + + arch/arm/boot/dts/am335x-osd3358-sm-red.dts | 22 - + arch/arm/boot/dts/am335x-pcm-953.dtsi | 25 - + arch/arm/boot/dts/am335x-pdu001.dts | 28 - + arch/arm/boot/dts/am335x-pepper.dts | 20 - + arch/arm/boot/dts/am335x-pocketbeagle.dts | 22 - + arch/arm/boot/dts/am335x-regor.dtsi | 21 - + arch/arm/boot/dts/am335x-shc.dts | 17 - + arch/arm/boot/dts/am335x-sl50.dts | 22 - + arch/arm/boot/dts/am335x-wega.dtsi | 26 - + arch/arm/boot/dts/am33xx-l4.dtsi | 27 +- + arch/arm/boot/dts/am33xx.dtsi | 99 +- + arch/arm/boot/dts/am3517.dtsi | 6 + + arch/arm/boot/dts/am4372.dtsi | 33 +- + arch/arm/boot/dts/am437x-l4.dtsi | 23 - + arch/arm/boot/dts/armada-38x.dtsi | 5 + + arch/arm/boot/dts/armada-xp-98dx3236.dtsi | 2 +- + arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts | 5 + + arch/arm/boot/dts/armada-xp.dtsi | 2 +- + arch/arm/boot/dts/aspeed-ast2500-evb.dts | 2 + + arch/arm/boot/dts/aspeed-ast2600-evb.dts | 137 +- + .../dts/aspeed-bmc-arm-stardragon4800-rep2.dts | 3 + + arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts | 66 +- + arch/arm/boot/dts/aspeed-bmc-facebook-minipack.dts | 59 +- + .../arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts | 3 + + arch/arm/boot/dts/aspeed-bmc-facebook-yamp.dts | 65 +- + arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 972 +++ + arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts | 58 +- + arch/arm/boot/dts/aspeed-bmc-inspur-on5263m5.dts | 3 + + arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts | 3 + + arch/arm/boot/dts/aspeed-bmc-lenovo-hr630.dts | 3 + + arch/arm/boot/dts/aspeed-bmc-lenovo-hr855xg2.dts | 3 + + arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 3 + + arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts | 3 + + arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 2 + + arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 5 + + arch/arm/boot/dts/aspeed-bmc-opp-swift.dts | 3 + + arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 1195 +++ + arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts | 4 + + arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 7 +- + arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 5 + + arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts | 6 + + arch/arm/boot/dts/aspeed-g4.dtsi | 4 +- + arch/arm/boot/dts/aspeed-g5.dtsi | 26 +- + arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi | 9 +- + arch/arm/boot/dts/aspeed-g6.dtsi | 587 +- + .../boot/dts/ast2500-facebook-netbmc-common.dtsi | 96 + + arch/arm/boot/dts/at91-kizbox2-2.dts | 26 + + arch/arm/boot/dts/at91-kizbox2-common.dtsi | 258 + + arch/arm/boot/dts/at91-kizbox2.dts | 244 - + arch/arm/boot/dts/at91-kizbox3-hs.dts | 309 + + arch/arm/boot/dts/at91-kizbox3_common.dtsi | 412 + + arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 1 + + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 6 + + arch/arm/boot/dts/at91-sama5d4_xplained.dts | 1 + + arch/arm/boot/dts/atlas7-evb.dts | 2 +- + arch/arm/boot/dts/bcm-hr2.dtsi | 2 +- + arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 123 + + arch/arm/boot/dts/bcm2711.dtsi | 844 +++ + arch/arm/boot/dts/bcm2835-common.dtsi | 194 + + arch/arm/boot/dts/bcm2835-rpi.dtsi | 4 - + arch/arm/boot/dts/bcm2835.dtsi | 1 + + arch/arm/boot/dts/bcm2836.dtsi | 1 + + arch/arm/boot/dts/bcm2837.dtsi | 1 + + arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi | 7 + + arch/arm/boot/dts/bcm283x.dtsi | 190 +- + arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts | 53 + + arch/arm/boot/dts/dove.dtsi | 2 +- + arch/arm/boot/dts/dra7-l4.dtsi | 16 - + arch/arm/boot/dts/dra7.dtsi | 51 + + arch/arm/boot/dts/e60k02.dtsi | 306 + + arch/arm/boot/dts/emev2.dtsi | 4 + + arch/arm/boot/dts/exynos3250.dtsi | 13 +- + arch/arm/boot/dts/exynos4.dtsi | 14 +- + arch/arm/boot/dts/exynos4210.dtsi | 27 +- + arch/arm/boot/dts/exynos4412.dtsi | 25 +- + arch/arm/boot/dts/exynos5.dtsi | 4 +- + arch/arm/boot/dts/exynos5250-arndale.dts | 27 +- + arch/arm/boot/dts/exynos5250.dtsi | 41 +- + arch/arm/boot/dts/exynos5260.dtsi | 2 +- + arch/arm/boot/dts/exynos5410.dtsi | 6 +- + arch/arm/boot/dts/exynos5420-peach-pit.dts | 4 + + arch/arm/boot/dts/exynos5420.dtsi | 90 +- + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 117 + + arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts | 4 + + arch/arm/boot/dts/exynos54xx.dtsi | 46 +- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 4 + + arch/arm/boot/dts/exynos5800.dtsi | 2 +- + arch/arm/boot/dts/imx27.dtsi | 2 +- + arch/arm/boot/dts/imx31.dtsi | 2 +- + arch/arm/boot/dts/imx51.dtsi | 2 +- + arch/arm/boot/dts/imx53-qsb-common.dtsi | 44 +- + arch/arm/boot/dts/imx53-usbarmory.dts | 2 +- + arch/arm/boot/dts/imx6dl-apf6dev.dts | 49 +- + arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 39 + + arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 28 +- + arch/arm/boot/dts/imx6dl-yapp4-hydra.dts | 8 +- + arch/arm/boot/dts/imx6dl.dtsi | 1 + + arch/arm/boot/dts/imx6q-apalis-eval.dts | 13 + + arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 13 + + arch/arm/boot/dts/imx6q-apalis-ixora.dts | 13 + + arch/arm/boot/dts/imx6q-apf6dev.dts | 49 +- + arch/arm/boot/dts/imx6q-dhcom-pdk2.dts | 8 + + arch/arm/boot/dts/imx6q-dhcom-som.dtsi | 2 - + arch/arm/boot/dts/imx6q-gw54xx.dts | 19 +- + arch/arm/boot/dts/imx6q.dtsi | 3 + + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 57 +- + arch/arm/boot/dts/imx6qdl-apf6.dtsi | 200 +- + arch/arm/boot/dts/imx6qdl-apf6dev.dtsi | 424 +- + arch/arm/boot/dts/imx6qdl-colibri.dtsi | 35 +- + arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 19 +- + arch/arm/boot/dts/imx6qdl-rex.dtsi | 19 + + arch/arm/boot/dts/imx6qdl-udoo.dtsi | 14 + + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 10 + + arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 7 +- + arch/arm/boot/dts/imx6sl.dtsi | 2 +- + arch/arm/boot/dts/imx6sll-kobo-clarahd.dts | 324 + + arch/arm/boot/dts/imx6sll.dtsi | 2 +- + arch/arm/boot/dts/imx6sx.dtsi | 2 +- + arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 28 +- + arch/arm/boot/dts/imx6ul-imx6ull-opos6ul.dtsi | 148 + + arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi | 338 + + arch/arm/boot/dts/imx6ul-kontron-n6310-s.dts | 405 +- + arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi | 95 +- + arch/arm/boot/dts/imx6ul-kontron-n6311-s.dts | 16 + + arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi | 40 + + arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi | 418 ++ + .../boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi | 109 + + arch/arm/boot/dts/imx6ul-opos6ul.dtsi | 195 +- + arch/arm/boot/dts/imx6ul-opos6uldev.dts | 382 +- + arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi | 2 +- + arch/arm/boot/dts/imx6ul.dtsi | 3 +- + arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 14 + + arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi | 2 +- + arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi | 2 +- + arch/arm/boot/dts/imx6ull-colibri.dtsi | 64 +- + arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts | 16 + + arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi | 40 + + arch/arm/boot/dts/imx6ull-opos6ul.dtsi | 6 + + arch/arm/boot/dts/imx6ull-opos6uldev.dts | 42 + + arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 38 + + arch/arm/boot/dts/imx7-colibri.dtsi | 30 +- + arch/arm/boot/dts/imx7d.dtsi | 6 +- + arch/arm/boot/dts/imx7s.dtsi | 2 +- + arch/arm/boot/dts/imx7ulp-evk.dts | 2 + + arch/arm/boot/dts/imx7ulp.dtsi | 31 +- + arch/arm/boot/dts/keystone-clocks.dtsi | 27 + + arch/arm/boot/dts/keystone-k2e-clocks.dtsi | 20 + + arch/arm/boot/dts/keystone-k2e-netcp.dtsi | 21 +- + arch/arm/boot/dts/keystone-k2hk-netcp.dtsi | 20 +- + arch/arm/boot/dts/keystone-k2l-netcp.dtsi | 20 +- + arch/arm/boot/dts/kirkwood-synology.dtsi | 2 +- + .../boot/dts/logicpd-torpedo-37xx-devkit-28.dts | 20 +- + arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts | 14 + + arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi | 1 + + arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 5 + + arch/arm/boot/dts/mmp3-dell-ariel.dts | 94 + + arch/arm/boot/dts/mmp3.dtsi | 527 ++ + arch/arm/boot/dts/motorola-mapphone-common.dtsi | 786 ++ + arch/arm/boot/dts/mt6323.dtsi | 27 + + arch/arm/boot/dts/omap3-igep0020-rev-f.dts | 8 + + arch/arm/boot/dts/omap3-igep0030-rev-g.dts | 8 + + arch/arm/boot/dts/omap3-n900.dts | 5 + + arch/arm/boot/dts/omap3.dtsi | 25 + + arch/arm/boot/dts/omap34xx-omap36xx-clocks.dtsi | 2 +- + arch/arm/boot/dts/omap4-droid-bionic-xt875.dts | 9 + + arch/arm/boot/dts/omap4-droid4-xt894.dts | 777 +- + arch/arm/boot/dts/omap4-l4-abe.dtsi | 4 - + arch/arm/boot/dts/omap4-l4.dtsi | 16 +- + arch/arm/boot/dts/omap4.dtsi | 28 +- + arch/arm/boot/dts/omap5-l4-abe.dtsi | 3 - + arch/arm/boot/dts/omap5-l4.dtsi | 30 - + arch/arm/boot/dts/omap5.dtsi | 28 +- + arch/arm/boot/dts/openbmc-flash-layout-128.dtsi | 32 + + arch/arm/boot/dts/qcom-ipq4019.dtsi | 12 + + arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts | 22 +- + arch/arm/boot/dts/qcom-msm8974.dtsi | 103 + + arch/arm/boot/dts/qcom-pm8941.dtsi | 10 + + arch/arm/boot/dts/r8a7790-lager.dts | 8 +- + arch/arm/boot/dts/r8a7793-gose.dts | 110 +- + arch/arm/boot/dts/rda8810pl.dtsi | 48 + + arch/arm/boot/dts/rk3036.dtsi | 4 +- + arch/arm/boot/dts/rk3288-rock2-som.dtsi | 8 +- + arch/arm/boot/dts/rk3288-tinker.dtsi | 14 +- + arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi | 1 + + arch/arm/boot/dts/rk3288-veyron-edp.dtsi | 35 +- + arch/arm/boot/dts/rk3288-veyron-jaq.dts | 35 +- + arch/arm/boot/dts/rk3288-veyron-mickey.dts | 7 + + arch/arm/boot/dts/rk3288-veyron-minnie.dts | 35 +- + arch/arm/boot/dts/rk3288-veyron-tiger.dts | 35 +- + arch/arm/boot/dts/rk3288.dtsi | 7 +- + arch/arm/boot/dts/s3c6410-mini6410.dts | 4 + + arch/arm/boot/dts/s3c6410-smdk6410.dts | 4 + + arch/arm/boot/dts/sama5d2.dtsi | 2 +- + arch/arm/boot/dts/socfpga_arria10_socdk_qspi.dts | 2 +- + arch/arm/boot/dts/stm32429i-eval.dts | 3 +- + arch/arm/boot/dts/stm32746g-eval.dts | 3 +- + arch/arm/boot/dts/stm32f429-disco.dts | 2 +- + arch/arm/boot/dts/stm32f469-disco.dts | 3 +- + arch/arm/boot/dts/stm32f469.dtsi | 1 - + arch/arm/boot/dts/stm32f746-disco.dts | 2 +- + arch/arm/boot/dts/stm32f769-disco.dts | 2 +- + arch/arm/boot/dts/stm32h743i-disco.dts | 2 +- + arch/arm/boot/dts/stm32h743i-eval.dts | 2 +- + arch/arm/boot/dts/stm32mp157-pinctrl.dtsi | 28 + + arch/arm/boot/dts/stm32mp157a-avenger96.dts | 8 +- + arch/arm/boot/dts/stm32mp157a-dk1.dts | 77 +- + arch/arm/boot/dts/stm32mp157c-dk2.dts | 21 +- + arch/arm/boot/dts/stm32mp157c-ed1.dts | 41 +- + arch/arm/boot/dts/stm32mp157c-ev1.dts | 3 - + arch/arm/boot/dts/stm32mp157c.dtsi | 23 + + arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 2 +- + arch/arm/boot/dts/sun6i-a31.dtsi | 1 - + arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 16 + + arch/arm/boot/dts/sun8i-a83t.dtsi | 9 + + arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts | 174 + + arch/arm/boot/dts/sun8i-h3.dtsi | 22 + + arch/arm/boot/dts/sun8i-r40.dtsi | 9 + + arch/arm/boot/dts/sun9i-a80.dtsi | 11 + + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 14 + + arch/arm/boot/dts/tegra124-nyan-big-emc.dtsi | 7917 ++++++++++++++++---- + arch/arm/boot/dts/tegra124-venice2.dts | 3 + + arch/arm/boot/dts/tegra124.dtsi | 3 +- + arch/arm/boot/dts/tegra20-cpu-opp-microvolt.dtsi | 201 + + arch/arm/boot/dts/tegra20-cpu-opp.dtsi | 302 + + arch/arm/boot/dts/tegra20-paz00.dts | 41 +- + arch/arm/boot/dts/tegra20-trimslice.dts | 11 + + arch/arm/boot/dts/tegra20.dtsi | 2 + + arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi | 22 +- + arch/arm/boot/dts/tegra30-apalis.dtsi | 22 +- + arch/arm/boot/dts/tegra30-cardhu-a04.dts | 48 + + arch/arm/boot/dts/tegra30-colibri.dtsi | 22 +- + arch/arm/boot/dts/tegra30-cpu-opp-microvolt.dtsi | 801 ++ + arch/arm/boot/dts/tegra30-cpu-opp.dtsi | 1202 +++ + arch/arm/boot/dts/tegra30.dtsi | 14 + + arch/arm/boot/dts/vf-colibri.dtsi | 12 +- + arch/arm/boot/dts/vf500-colibri.dtsi | 2 +- + arch/arm/boot/dts/vf610-bk4.dts | 4 + + arch/arm/boot/dts/vf610-zii-scu4-aib.dts | 12 - + arch/arm/configs/aspeed_g4_defconfig | 18 +- + arch/arm/configs/aspeed_g5_defconfig | 4 + + arch/arm/configs/at91_dt_defconfig | 1 + + arch/arm/configs/exynos_defconfig | 2 + + arch/arm/configs/imx_v6_v7_defconfig | 4 +- + arch/arm/configs/keystone_defconfig | 1 + + arch/arm/configs/multi_v5_defconfig | 4 + + arch/arm/configs/multi_v7_defconfig | 45 +- + arch/arm/configs/omap2plus_defconfig | 10 +- + arch/arm/configs/qcom_defconfig | 1 + + arch/arm/configs/sama5_defconfig | 1 + + arch/arm/configs/shmobile_defconfig | 3 - + arch/arm/configs/sunxi_defconfig | 3 + + arch/arm/configs/tegra_defconfig | 2 + + arch/arm/include/asm/hardware/cache-l2x0.h | 2 + + arch/arm/mach-bcm/Kconfig | 4 +- + arch/arm/mach-bcm/Makefile | 3 +- + arch/arm/mach-bcm/bcm2711.c | 24 + + arch/arm/mach-bcm/bcm_kona_smc.c | 2 +- + arch/arm/mach-bcm/platsmp.c | 2 + + arch/arm/mach-exynos/Kconfig | 1 + + arch/arm/mach-hisi/Kconfig | 16 +- + arch/arm/mach-imx/anatop.c | 20 +- + arch/arm/mach-imx/cpu.c | 38 +- + arch/arm/mach-imx/hotplug.c | 24 +- + arch/arm/mach-mmp/Kconfig | 22 +- + arch/arm/mach-mmp/Makefile | 4 + + arch/arm/mach-mmp/addr-map.h | 7 + + arch/arm/mach-mmp/common.c | 19 +- + arch/arm/mach-mmp/common.h | 1 + + arch/arm/mach-mmp/devices.c | 2 +- + arch/arm/mach-mmp/mmp-dt.c | 5 +- + arch/arm/mach-mmp/mmp2-dt.c | 7 +- + arch/arm/mach-mmp/mmp2.c | 2 +- + arch/arm/mach-mmp/mmp3.c | 29 + + arch/arm/mach-mmp/platsmp.c | 32 + + arch/arm/mach-mmp/pm-mmp2.c | 2 +- + arch/arm/mach-mmp/pm-pxa910.c | 2 +- + arch/arm/mach-mmp/pxa168.c | 2 +- + arch/arm/mach-mmp/pxa910.c | 2 +- + arch/arm/mach-mmp/regs-usb.h | 94 - + arch/arm/mach-mmp/time.c | 43 +- + arch/arm/mach-omap1/Kconfig | 33 +- + arch/arm/mach-omap1/ams-delta-fiq.c | 2 +- + arch/arm/mach-omap2/Kconfig | 1 + + arch/arm/mach-omap2/Makefile | 5 + + arch/arm/mach-omap2/clockdomain.c | 78 +- + arch/arm/mach-omap2/control.c | 4 +- + arch/arm/mach-omap2/control.h | 1 + + arch/arm/mach-omap2/display.c | 1 + + arch/arm/mach-omap2/omap-mpuss-lowpower.c | 2 - + arch/arm/mach-omap2/omap_device.c | 19 +- + arch/arm/mach-omap2/omap_hwmod.c | 97 - + arch/arm/mach-omap2/omap_hwmod.h | 3 - + .../mach-omap2/omap_hwmod_33xx_43xx_common_data.h | 9 - + .../omap_hwmod_33xx_43xx_interconnect_data.c | 32 - + .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 231 - + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 58 - + arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 48 - + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 347 +- + arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 317 - + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 433 +- + arch/arm/mach-omap2/omap_twl.c | 8 +- + arch/arm/mach-omap2/opp4xxx_data.c | 16 +- + arch/arm/mach-omap2/pdata-quirks.c | 52 - + arch/arm/mach-omap2/pm.c | 1 + + arch/arm/mach-omap2/pm.h | 14 + + arch/arm/mach-omap2/pm44xx.c | 13 +- + arch/arm/mach-omap2/pmic-cpcap.c | 271 + + arch/arm/mach-omap2/prm44xx.c | 4 +- + arch/arm/mach-omap2/vc.c | 57 +- + arch/arm/mach-omap2/vc.h | 2 +- + arch/arm/mach-s3c24xx/s3c2416.c | 2 +- + arch/arm/mach-s3c24xx/s3c2443.c | 2 +- + arch/arm/mach-s3c24xx/spi-core.h | 2 +- + arch/arm/mach-s3c64xx/setup-usb-phy.c | 4 +- + arch/arm/mach-shmobile/setup-rcar-gen2.c | 1 - + arch/arm/mach-tegra/reset-handler.S | 6 +- + arch/arm/mach-tegra/sleep-tegra30.S | 4 +- + arch/arm/mm/Kconfig | 2 +- + arch/arm/plat-samsung/devs.c | 4 +- + arch/arm/plat-samsung/include/plat/usb-phy.h | 4 +- + arch/arm64/Kconfig.platforms | 11 +- + arch/arm64/boot/dts/actions/s900-bubblegum-96.dts | 62 + + arch/arm64/boot/dts/actions/s900.dtsi | 45 + + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 29 + + .../dts/allwinner/sun50i-a64-sopine-baseboard.dts | 25 + + .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 45 +- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 18 + + .../dts/allwinner/sun50i-h5-emlid-neutis-n5.dtsi | 13 + + arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 9 + + .../boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 6 + + .../boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 33 + + .../boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 6 + + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 6 + + .../boot/dts/allwinner/sun50i-h6-tanix-tx6.dts | 4 + + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 66 +- + .../boot/dts/altera/socfpga_stratix10_socdk.dts | 4 +- + arch/arm64/boot/dts/amlogic/Makefile | 2 + + arch/arm64/boot/dts/amlogic/meson-a1-ad401.dts | 30 + + arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 130 + + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 13 +- + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 455 +- + arch/arm64/boot/dts/amlogic/meson-g12.dtsi | 392 + + arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 3 + + arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 3 + + arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 33 +- + .../dts/amlogic/meson-g12b-a311d-khadas-vim3.dts | 25 + + .../boot/dts/amlogic/meson-g12b-odroid-n2.dts | 2 +- + .../dts/amlogic/meson-g12b-s922x-khadas-vim3.dts | 25 + + .../boot/dts/amlogic/meson-g12b-ugoos-am6.dts | 557 ++ + arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 26 +- + .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 3 + + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 10 +- + .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 3 + + .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 3 + + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 73 +- + arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 3 + + .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 4 + + arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 3 + + .../dts/amlogic/meson-gxl-s805x-libretech-ac.dts | 2 +- + .../boot/dts/amlogic/meson-gxl-s805x-p241.dts | 3 + + .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 7 +- + .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 5 +- + .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 3 + + .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 3 + + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 10 + + .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 6 + + arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 3 + + arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dts | 4 + + arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 6 +- + arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 7 + + .../boot/dts/amlogic/meson-sm1-khadas-vim3l.dts | 25 + + arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 208 + + arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 344 + + arch/arm64/boot/dts/arm/juno-base.dtsi | 27 + + arch/arm64/boot/dts/broadcom/Makefile | 3 +- + arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts | 2 + + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 168 +- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 28 +- + arch/arm64/boot/dts/freescale/Makefile | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 2 - + arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 83 +- + arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts | 1 + + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 110 +- + arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 151 +- + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 15 +- + arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts | 231 +- + arch/arm64/boot/dts/freescale/imx8mn-evk.dts | 30 + + arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 249 + + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 40 +- + arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 65 +- + .../dts/freescale/imx8mq-hummingboard-pulse.dts | 2 + + .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 4 + + arch/arm64/boot/dts/freescale/imx8mq-nitrogen.dts | 2 + + arch/arm64/boot/dts/freescale/imx8mq-pico-pi.dts | 4 + + arch/arm64/boot/dts/freescale/imx8mq-sr-som.dtsi | 2 + + .../arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi | 40 +- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 17 +- + arch/arm64/boot/dts/freescale/imx8qxp-ai_ml.dts | 4 + + .../boot/dts/freescale/imx8qxp-colibri-eval-v3.dts | 15 + + .../dts/freescale/imx8qxp-colibri-eval-v3.dtsi | 62 + + arch/arm64/boot/dts/freescale/imx8qxp-colibri.dtsi | 598 ++ + arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 8 + + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 13 +- + arch/arm64/boot/dts/freescale/s32v234-evb.dts | 25 + + arch/arm64/boot/dts/freescale/s32v234.dtsi | 139 + + arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 38 + + arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 32 + + arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts | 58 + + arch/arm64/boot/dts/lg/lg1312.dtsi | 2 +- + arch/arm64/boot/dts/lg/lg1313.dtsi | 2 +- + arch/arm64/boot/dts/marvell/Makefile | 3 + + .../dts/marvell/armada-3720-espressobin-emmc.dts | 42 + + .../marvell/armada-3720-espressobin-v7-emmc.dts | 59 + + .../dts/marvell/armada-3720-espressobin-v7.dts | 36 + + .../boot/dts/marvell/armada-3720-espressobin.dts | 184 +- + .../boot/dts/marvell/armada-3720-espressobin.dtsi | 177 + + .../boot/dts/marvell/armada-3720-turris-mox.dts | 8 + + arch/arm64/boot/dts/marvell/armada-70x0.dtsi | 28 +- + arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi | 3 +- + arch/arm64/boot/dts/marvell/armada-80x0.dtsi | 56 +- + arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi | 23 + + arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi | 42 + + arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 456 +- + arch/arm64/boot/dts/marvell/armada-ap807-quad.dtsi | 93 + + arch/arm64/boot/dts/marvell/armada-ap807.dtsi | 29 + + arch/arm64/boot/dts/marvell/armada-ap80x.dtsi | 444 ++ + arch/arm64/boot/dts/marvell/armada-common.dtsi | 4 +- + arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 575 +- + arch/arm64/boot/dts/marvell/armada-cp115.dtsi | 12 + + arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 568 ++ + arch/arm64/boot/dts/marvell/cn9130-db.dts | 403 + + arch/arm64/boot/dts/marvell/cn9130.dtsi | 37 + + arch/arm64/boot/dts/marvell/cn9131-db.dts | 202 + + arch/arm64/boot/dts/marvell/cn9132-db.dts | 221 + + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 9 + + arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 12 +- + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 4 +- + arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 36 +- + arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 33 +- + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 171 +- + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 7 + + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 2 +- + arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 35 + + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 25 +- + arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 2 + + .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 55 + + .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 80 + + .../boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 6 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 4 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 4 + + arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi | 54 + + arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi | 82 + + arch/arm64/boot/dts/qcom/msm8998-pins.dtsi | 13 + + arch/arm64/boot/dts/qcom/msm8998.dtsi | 84 +- + arch/arm64/boot/dts/qcom/qcs404.dtsi | 41 + + arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 53 +- + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 12 + + arch/arm64/boot/dts/qcom/sdm845.dtsi | 12 +- + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 14 + + arch/arm64/boot/dts/realtek/Makefile | 5 + + arch/arm64/boot/dts/realtek/rtd1293-ds418j.dts | 30 + + arch/arm64/boot/dts/realtek/rtd1293.dtsi | 51 + + arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts | 3 +- + arch/arm64/boot/dts/realtek/rtd1295.dtsi | 3 +- + arch/arm64/boot/dts/realtek/rtd1296-ds418.dts | 30 + + arch/arm64/boot/dts/realtek/rtd1296.dtsi | 65 + + arch/arm64/boot/dts/realtek/rtd129x.dtsi | 50 +- + arch/arm64/boot/dts/renesas/Makefile | 6 + + arch/arm64/boot/dts/renesas/hihope-common.dtsi | 28 +- + arch/arm64/boot/dts/renesas/hihope-rzg2-ex.dtsi | 51 +- + .../boot/dts/renesas/r8a774a1-hihope-rzg2m-ex.dts | 4 + + .../boot/dts/renesas/r8a774a1-hihope-rzg2m.dts | 11 + + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 13 +- + .../boot/dts/renesas/r8a774b1-hihope-rzg2n-ex.dts | 15 + + .../boot/dts/renesas/r8a774b1-hihope-rzg2n.dts | 41 + + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 2627 +++++++ + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 20 +- + arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 73 + + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 65 +- + .../boot/dts/renesas/r8a77961-salvator-xs.dts | 31 + + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 723 ++ + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 35 +- + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 5 +- + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 3 +- + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 24 + + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 22 + + .../renesas/rzg2-advantech-idk-1110wr-panel.dtsi | 41 + + arch/arm64/boot/dts/rockchip/Makefile | 4 + + arch/arm64/boot/dts/rockchip/px30-evb.dts | 321 +- + arch/arm64/boot/dts/rockchip/px30.dtsi | 157 +- + arch/arm64/boot/dts/rockchip/rk3308-evb.dts | 230 + + arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts | 188 + + arch/arm64/boot/dts/rockchip/rk3308.dtsi | 1739 +++++ + arch/arm64/boot/dts/rockchip/rk3328-a1.dts | 359 + + arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 1 + + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 32 + + arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts | 10 + + .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 10 + + arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 14 +- + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 5 + + .../boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts | 72 + + arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts | 670 +- + arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 767 ++ + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts | 18 +- + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 28 + + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 1 + + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 108 + + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 59 + + .../boot/dts/ti/k3-j721e-common-proc-board.dts | 162 + + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 218 + + arch/arm64/boot/dts/ti/k3-j721e.dtsi | 2 + + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 29 + + arch/arm64/configs/defconfig | 16 +- + drivers/base/power/wakeup.c | 54 + + drivers/bus/Kconfig | 5 +- + drivers/bus/hisi_lpc.c | 9 +- + drivers/bus/ti-sysc.c | 87 +- + drivers/clk/Kconfig | 5 + + drivers/clk/mmp/Makefile | 2 +- + drivers/firmware/arm_scmi/perf.c | 2 +- + drivers/firmware/imx/imx-dsp.c | 2 +- + drivers/firmware/imx/imx-scu-irq.c | 1 + + drivers/firmware/imx/imx-scu.c | 24 +- + drivers/firmware/meson/meson_sm.c | 110 +- + drivers/firmware/tegra/bpmp.c | 2 +- + drivers/firmware/xilinx/zynqmp.c | 8 +- + drivers/memory/atmel-ebi.c | 11 +- + drivers/memory/brcmstb_dpfe.c | 164 +- + drivers/memory/emif.c | 5 +- + drivers/memory/jedec_ddr.h | 61 + + drivers/memory/of_memory.c | 149 + + drivers/memory/of_memory.h | 18 + + drivers/memory/samsung/Kconfig | 13 + + drivers/memory/samsung/Makefile | 1 + + drivers/memory/samsung/exynos5422-dmc.c | 1550 ++++ + drivers/memory/tegra/Kconfig | 10 + + drivers/memory/tegra/Makefile | 1 + + drivers/memory/tegra/mc.c | 52 +- + drivers/memory/tegra/mc.h | 74 +- + drivers/memory/tegra/tegra114.c | 10 +- + drivers/memory/tegra/tegra124.c | 30 +- + drivers/memory/tegra/tegra20-emc.c | 134 +- + drivers/memory/tegra/tegra30-emc.c | 1232 +++ + drivers/memory/tegra/tegra30.c | 34 +- + drivers/nvmem/meson-efuse.c | 24 +- + drivers/phy/marvell/Kconfig | 11 + + drivers/phy/marvell/Makefile | 1 + + drivers/phy/marvell/phy-mmp3-usb.c | 291 + + drivers/reset/Kconfig | 5 +- + drivers/reset/core.c | 8 +- + drivers/reset/hisilicon/reset-hi3660.c | 2 +- + drivers/reset/reset-meson-audio-arb.c | 43 +- + drivers/reset/reset-meson.c | 35 +- + drivers/reset/reset-uniphier-glue.c | 4 + + drivers/reset/reset-zynqmp.c | 2 +- + drivers/soc/amlogic/meson-gx-socinfo.c | 3 + + drivers/soc/atmel/Kconfig | 11 + + drivers/soc/atmel/Makefile | 1 + + drivers/soc/atmel/sfr.c | 99 + + drivers/soc/fsl/Kconfig | 10 + + drivers/soc/fsl/Makefile | 1 + + drivers/soc/fsl/rcpm.c | 151 + + drivers/soc/imx/soc-imx-scu.c | 34 +- + drivers/soc/imx/soc-imx8.c | 49 +- + drivers/soc/mediatek/mtk-scpsys.c | 214 +- + drivers/soc/qcom/Kconfig | 14 +- + drivers/soc/qcom/Makefile | 3 +- + drivers/soc/qcom/{llcc-slice.c => llcc-qcom.c} | 130 +- + drivers/soc/qcom/llcc-sdm845.c | 100 - + drivers/soc/qcom/qcom_aoss.c | 8 +- + drivers/soc/qcom/rpmpd.c | 23 + + drivers/soc/qcom/smd-rpm.c | 18 +- + drivers/soc/qcom/socinfo.c | 2 + + drivers/soc/renesas/Kconfig | 32 +- + drivers/soc/renesas/Makefile | 4 +- + drivers/soc/renesas/r8a7743-sysc.c | 1 - + drivers/soc/renesas/r8a7745-sysc.c | 1 - + drivers/soc/renesas/r8a77470-sysc.c | 1 - + drivers/soc/renesas/r8a774a1-sysc.c | 1 - + drivers/soc/renesas/r8a774b1-sysc.c | 37 + + drivers/soc/renesas/r8a774c0-sysc.c | 4 +- + drivers/soc/renesas/r8a7779-sysc.c | 1 - + drivers/soc/renesas/r8a7790-sysc.c | 1 - + drivers/soc/renesas/r8a7791-sysc.c | 1 - + drivers/soc/renesas/r8a7792-sysc.c | 1 - + drivers/soc/renesas/r8a7794-sysc.c | 1 - + drivers/soc/renesas/r8a7795-sysc.c | 33 +- + drivers/soc/renesas/r8a7796-sysc.c | 30 +- + drivers/soc/renesas/r8a77965-sysc.c | 4 +- + drivers/soc/renesas/r8a77970-sysc.c | 4 +- + drivers/soc/renesas/r8a77980-sysc.c | 4 +- + drivers/soc/renesas/r8a77990-sysc.c | 4 +- + drivers/soc/renesas/r8a77995-sysc.c | 1 - + drivers/soc/renesas/rcar-rst.c | 2 + + drivers/soc/renesas/rcar-sysc.c | 26 +- + drivers/soc/renesas/rcar-sysc.h | 9 +- + drivers/soc/renesas/renesas-soc.c | 15 +- + drivers/soc/samsung/Kconfig | 10 + + drivers/soc/samsung/Makefile | 3 + + drivers/soc/samsung/exynos-asv.c | 177 + + drivers/soc/samsung/exynos-asv.h | 71 + + drivers/soc/samsung/exynos-chipid.c | 12 +- + drivers/soc/samsung/exynos5422-asv.c | 505 ++ + drivers/soc/samsung/exynos5422-asv.h | 31 + + drivers/soc/tegra/Kconfig | 10 + + drivers/soc/tegra/Makefile | 2 + + drivers/soc/tegra/flowctrl.c | 19 +- + drivers/soc/tegra/fuse/fuse-tegra.c | 198 +- + drivers/soc/tegra/fuse/fuse-tegra30.c | 154 + + drivers/soc/tegra/fuse/fuse.h | 8 + + drivers/soc/tegra/pmc.c | 232 +- + drivers/soc/tegra/regulators-tegra20.c | 365 + + drivers/soc/tegra/regulators-tegra30.c | 317 + + drivers/soc/ti/Makefile | 1 + + drivers/soc/ti/omap_prm.c | 391 + + drivers/soc/xilinx/zynqmp_pm_domains.c | 10 +- + include/dt-bindings/pinctrl/rockchip.h | 8 +- + include/dt-bindings/power/qcom-rpmpd.h | 9 + + include/dt-bindings/reset/amlogic,meson-a1-reset.h | 74 + + .../reset/amlogic,meson-axg-audio-arb.h | 2 + + include/dt-bindings/reset/realtek,rtd1295.h | 111 + + include/linux/firmware/meson/meson_sm.h | 15 +- + include/linux/firmware/xlnx-zynqmp.h | 3 +- + include/linux/logic_pio.h | 4 +- + include/linux/mfd/syscon/atmel-matrix.h | 1 - + include/linux/platform_data/ti-prm.h | 21 + + include/linux/pm_wakeup.h | 9 + + include/linux/reset-controller.h | 3 +- + include/linux/reset.h | 46 + + .../mach-mmp => include/linux/soc/mmp}/cputype.h | 29 + + include/linux/soc/qcom/llcc-qcom.h | 94 +- + include/soc/tegra/mc.h | 2 +- + lib/Makefile | 2 +- + lib/logic_pio.c | 14 +- + 712 files changed, 46348 insertions(+), 11949 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/bcm/bcm2835.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt + rename Documentation/devicetree/bindings/arm/marvell/{ap806-system-controller.txt => ap80x-system-controller.txt} (91%) + delete mode 100644 Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.txt + create mode 100644 Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/mrvl/mrvl.txt + create mode 100644 Documentation/devicetree/bindings/arm/mrvl/mrvl.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,llcc.txt + create mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,llcc.yaml + create mode 100644 Documentation/devicetree/bindings/arm/omap/prm-inst.txt + delete mode 100644 Documentation/devicetree/bindings/arm/renesas,prr.txt + create mode 100644 Documentation/devicetree/bindings/arm/renesas,prr.yaml + create mode 100644 Documentation/devicetree/bindings/crypto/allwinner,sun8i-ce.yaml + rename Documentation/devicetree/bindings/{lpddr2 => ddr}/lpddr2-timings.txt (100%) + rename Documentation/devicetree/bindings/{lpddr2 => ddr}/lpddr2.txt (96%) + create mode 100644 Documentation/devicetree/bindings/ddr/lpddr3-timings.txt + create mode 100644 Documentation/devicetree/bindings/ddr/lpddr3.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/anx6345.yaml + create mode 100644 Documentation/devicetree/bindings/memory-controllers/exynos5422-dmc.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-mc.yaml + create mode 100644 Documentation/devicetree/bindings/memory-controllers/nvidia,tegra30-emc.yaml + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/nvidia,tegra30-mc.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/nvidia,tegra30-mc.yaml + create mode 100644 Documentation/devicetree/bindings/phy/phy-mmp3-usb.txt + create mode 100644 Documentation/devicetree/bindings/regulator/nvidia,tegra-regulators-coupling.txt + delete mode 100644 Documentation/devicetree/bindings/reset/qcom,aoss-reset.txt + create mode 100644 Documentation/devicetree/bindings/reset/qcom,aoss-reset.yaml + delete mode 100644 Documentation/devicetree/bindings/reset/qcom,pdc-global.txt + create mode 100644 Documentation/devicetree/bindings/reset/qcom,pdc-global.yaml + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/am335x-netcan-plus-1xx.dts + create mode 100644 arch/arm/boot/dts/am335x-netcom-plus-2xx.dts + create mode 100644 arch/arm/boot/dts/am335x-netcom-plus-8xx.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts + create mode 100644 arch/arm/boot/dts/ast2500-facebook-netbmc-common.dtsi + create mode 100644 arch/arm/boot/dts/at91-kizbox2-2.dts + create mode 100644 arch/arm/boot/dts/at91-kizbox2-common.dtsi + delete mode 100644 arch/arm/boot/dts/at91-kizbox2.dts + create mode 100644 arch/arm/boot/dts/at91-kizbox3-hs.dts + create mode 100644 arch/arm/boot/dts/at91-kizbox3_common.dtsi + create mode 100644 arch/arm/boot/dts/bcm2711-rpi-4-b.dts + create mode 100644 arch/arm/boot/dts/bcm2711.dtsi + create mode 100644 arch/arm/boot/dts/bcm2835-common.dtsi + create mode 100644 arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi + create mode 100644 arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts + create mode 100644 arch/arm/boot/dts/e60k02.dtsi + create mode 100644 arch/arm/boot/dts/imx6sll-kobo-clarahd.dts + create mode 100644 arch/arm/boot/dts/imx6ul-imx6ull-opos6ul.dtsi + create mode 100644 arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi + create mode 100644 arch/arm/boot/dts/imx6ul-kontron-n6311-s.dts + create mode 100644 arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi + create mode 100644 arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi + create mode 100644 arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts + create mode 100644 arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-opos6ul.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-opos6uldev.dts + create mode 100644 arch/arm/boot/dts/mmp3-dell-ariel.dts + create mode 100644 arch/arm/boot/dts/mmp3.dtsi + create mode 100644 arch/arm/boot/dts/motorola-mapphone-common.dtsi + create mode 100644 arch/arm/boot/dts/omap4-droid-bionic-xt875.dts + create mode 100644 arch/arm/boot/dts/openbmc-flash-layout-128.dtsi + create mode 100644 arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts + create mode 100644 arch/arm/boot/dts/tegra20-cpu-opp-microvolt.dtsi + create mode 100644 arch/arm/boot/dts/tegra20-cpu-opp.dtsi + create mode 100644 arch/arm/boot/dts/tegra30-cpu-opp-microvolt.dtsi + create mode 100644 arch/arm/boot/dts/tegra30-cpu-opp.dtsi + create mode 100644 arch/arm/mach-bcm/bcm2711.c + create mode 100644 arch/arm/mach-mmp/mmp3.c + create mode 100644 arch/arm/mach-mmp/platsmp.c + create mode 100644 arch/arm/mach-omap2/pmic-cpcap.c + create mode 100644 arch/arm64/boot/dts/amlogic/meson-a1-ad401.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-a1.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts + create mode 100644 arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-evk.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8qxp-colibri-eval-v3.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8qxp-colibri-eval-v3.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8qxp-colibri.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/s32v234-evb.dts + create mode 100644 arch/arm64/boot/dts/freescale/s32v234.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts + create mode 100644 arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts + create mode 100644 arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts + create mode 100644 arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/armada-ap807-quad.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/armada-ap807.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/armada-ap80x.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/armada-cp115.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/armada-cp11x.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/cn9130-db.dts + create mode 100644 arch/arm64/boot/dts/marvell/cn9130.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/cn9131-db.dts + create mode 100644 arch/arm64/boot/dts/marvell/cn9132-db.dts + create mode 100644 arch/arm64/boot/dts/realtek/rtd1293-ds418j.dts + create mode 100644 arch/arm64/boot/dts/realtek/rtd1293.dtsi + create mode 100644 arch/arm64/boot/dts/realtek/rtd1296-ds418.dts + create mode 100644 arch/arm64/boot/dts/realtek/rtd1296.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-ex.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774b1.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a77961-salvator-xs.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a77961.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/rzg2-advantech-idk-1110wr-panel.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3308-evb.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3308.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-a1.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi + create mode 100644 drivers/memory/samsung/exynos5422-dmc.c + create mode 100644 drivers/memory/tegra/tegra30-emc.c + create mode 100644 drivers/phy/marvell/phy-mmp3-usb.c + create mode 100644 drivers/soc/atmel/sfr.c + create mode 100644 drivers/soc/fsl/rcpm.c + rename drivers/soc/qcom/{llcc-slice.c => llcc-qcom.c} (68%) + delete mode 100644 drivers/soc/qcom/llcc-sdm845.c + create mode 100644 drivers/soc/renesas/r8a774b1-sysc.c + create mode 100644 drivers/soc/samsung/exynos-asv.c + create mode 100644 drivers/soc/samsung/exynos-asv.h + create mode 100644 drivers/soc/samsung/exynos5422-asv.c + create mode 100644 drivers/soc/samsung/exynos5422-asv.h + create mode 100644 drivers/soc/tegra/regulators-tegra20.c + create mode 100644 drivers/soc/tegra/regulators-tegra30.c + create mode 100644 drivers/soc/ti/omap_prm.c + create mode 100644 include/dt-bindings/reset/amlogic,meson-a1-reset.h + create mode 100644 include/dt-bindings/reset/realtek,rtd1295.h + create mode 100644 include/linux/platform_data/ti-prm.h + rename {arch/arm/mach-mmp => include/linux/soc/mmp}/cputype.h (70%) +Merging amlogic/for-next (431a6da324af Merge branch 'v5.5/fixes' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/meson8.dtsi | 2 +- + .../boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 26 ++++++++++++++++++++-- + 3 files changed, 29 insertions(+), 3 deletions(-) +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 +Merge made by the 'recursive' strategy. +Merging at91/at91-next (571c4b1fe42b Merge branches 'at91-drivers', 'at91-dt' and 'at91-defconfig' into at91-next) +$ git merge at91/at91-next +Already up to date! +Merge made by the 'recursive' strategy. +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 (71918b15d58f Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Already up to date! +Merge made by the 'recursive' strategy. +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 (4ae1ce88e9a0 Merge branch 'v5.3-next/soc' into for-next) +$ git merge mediatek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (3aa22be2d6b1 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (eab1cca2de62 Merge branch 'omap-for-v5.5/dt-v2' into for-next) +$ git merge omap/for-next +Auto-merging arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi +Auto-merging arch/arm/boot/dts/dra7-l4.dtsi +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts | 2 +- + arch/arm/boot/dts/am57xx-beagle-x15-revc.dts | 2 +- + arch/arm/boot/dts/dra7-l4.dtsi | 2 +- + .../arm/boot/dts/logicpd-torpedo-37xx-devkit-28.dts | 1 - + arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi | 13 ++++++++++++- + arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi | 4 ++-- + arch/arm/boot/dts/omap3-tao3530.dtsi | 2 +- + arch/arm/boot/dts/omap4.dtsi | 4 ++-- + arch/arm/mach-omap2/timer.c | 4 ++-- + drivers/bus/ti-sysc.c | 21 ++++++++++++++++----- + include/linux/platform_data/ti-sysc.h | 1 + + 11 files changed, 39 insertions(+), 17 deletions(-) +Merging qcom/for-next (7b0e649c3511 Merge branches 'arm64-for-5.5-fixes' and 'drivers-for-5.5-fixes', remote-tracking branches 'origin/arm64-defconfig-for-5.5', 'origin/defconfig-for-5.5' and 'origin/dts-for-5.5' into for-next) +$ git merge qcom/for-next +Auto-merging arch/arm64/configs/defconfig +CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig +Resolved 'arch/arm64/configs/defconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master aa1bf323325d] Merge remote-tracking branch 'qcom/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi | 1 + + arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 1 + + arch/arm64/configs/defconfig | 14 ++++++++++++++ + drivers/soc/qcom/rpmhpd.c | 2 ++ + 4 files changed, 18 insertions(+) +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 (9c45f53abb97 Merge branches 'renesas-arm-defconfig-for-v5.5', 'renesas-arm64-defconfig-for-v5.5', 'renesas-arm64-dt-for-v5.5', 'renesas-drivers-for-v5.5' and 'renesas-dt-bindings-for-v5.5' into renesas-next) +$ git merge renesas/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging reset/reset/next (00040854fa42 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/reset-npcm.c | 291 +++++++++++++++++++++ + drivers/reset/reset-uniphier.c | 13 +- + include/dt-bindings/reset/nuvoton,npcm7xx-reset.h | 91 +++++++ + 6 files changed, 430 insertions(+), 5 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 (f0d0e0810786 Merge branch 'v5.5-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/rockchip/px30-evb.dts | 6 ++ + arch/arm64/boot/dts/rockchip/px30.dtsi | 71 ++++++++++++++++++++-- + 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 | 2 + + arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 62 ++++++++++++++++--- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts | 14 +++++ + arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 11 ++++ + 9 files changed, 181 insertions(+), 42 deletions(-) +Merging samsung-krzk/for-next (6780daf48588 Merge branch 'next/dt' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. + 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 +- + 11 files changed, 107 insertions(+), 14 deletions(-) +Merging scmi/for-linux-next (ec28b2def747 Merge branch 'tc2_spc_cpufreq_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge scmi/for-linux-next +Merge made by the 'recursive' strategy. + arch/arm/mach-vexpress/spc.c | 12 +++++++++++- + arch/arm64/boot/dts/arm/juno-base.dtsi | 1 - + arch/arm64/boot/dts/arm/juno-clocks.dtsi | 4 ++-- + drivers/cpufreq/vexpress-spc-cpufreq.c | 2 +- + drivers/firmware/arm_scmi/bus.c | 8 ++++---- + 5 files changed, 18 insertions(+), 9 deletions(-) +Merging sunxi/sunxi/for-next (2ddd531f8c80 Merge branches 'sunxi/clk-for-5.5' and 'sunxi/dt-for-5.5' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging tegra/for-next (e0fd54137bf5 Merge branch for-5.5/cpufreq into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + drivers/cpufreq/tegra124-cpufreq.c | 59 ++++++++++++++++++++++++++++++++++++++ + drivers/memory/tegra/tegra30-emc.c | 2 +- + drivers/soc/tegra/pmc.c | 47 ++++++++++++++++++++++++++++-- + 3 files changed, 105 insertions(+), 3 deletions(-) +Merging clk/clk-next (ec16ffe36d80 Merge branches 'clk-ingenic', 'clk-init-leak', 'clk-ux500' and 'clk-bitmain' into clk-next) +$ git merge clk/clk-next +Already up to date. +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 +Merge made by the 'recursive' strategy. + arch/ia64/include/asm/irqflags.h | 4 --- + arch/ia64/include/uapi/asm/gcc_intrin.h | 24 +++++++-------- + arch/ia64/include/uapi/asm/intel_intrin.h | 32 +++++++++---------- + arch/ia64/include/uapi/asm/intrinsics.h | 51 ++++--------------------------- + 4 files changed, 34 insertions(+), 77 deletions(-) +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 (3ad3cbe305b5 m68k/coldfire: Use CONFIG_PREEMPTION) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/coldfire/entry.S | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (91d99a724e9c nios2: force the string buffer NULL-terminated) +$ 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 (219d54332a09 Linux 5.4) +$ git merge parisc-hd/for-next +Already up to date. +Merging powerpc/next (2807273f5e88 powerpc/fixmap: fix crash with HIGHMEM) +$ 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 (3b8db0348c50 soc: fsl: add RCPM driver) +$ git merge soc-fsl/next +Already up to date. +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 ++++++++++++++++++++++++++++++++ + arch/riscv/Kconfig.socs | 16 ++++++++-------- + arch/riscv/configs/defconfig | 24 ++++++++++++++++++++++++ + arch/riscv/configs/rv32_defconfig | 24 ++++++++++++++++++++++++ + arch/riscv/mm/init.c | 32 ++++++++++++++++++++++++++++++++ + 5 files changed, 120 insertions(+), 8 deletions(-) + 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 (2115fbf7210b s390: remove compat vdso code) +$ git merge s390/features +Removing arch/s390/kernel/vdso32/vdso32_wrapper.S +Removing arch/s390/kernel/vdso32/vdso32.lds.S +Removing arch/s390/kernel/vdso32/note.S +Removing arch/s390/kernel/vdso32/gettimeofday.S +Removing arch/s390/kernel/vdso32/getcpu.S +Removing arch/s390/kernel/vdso32/clock_gettime.S +Removing arch/s390/kernel/vdso32/clock_getres.S +Removing arch/s390/kernel/vdso32/Makefile +Removing arch/s390/kernel/vdso32/.gitignore +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 18 +- + arch/s390/Makefile | 1 - + arch/s390/boot/startup.c | 5 + + arch/s390/include/asm/cpu_mf.h | 2 +- + arch/s390/include/asm/perf_event.h | 7 + + arch/s390/include/asm/processor.h | 2 +- + arch/s390/include/asm/stacktrace.h | 36 +++- + arch/s390/include/asm/unwind.h | 8 +- + arch/s390/include/asm/vdso.h | 13 +- + arch/s390/kernel/Makefile | 1 - + arch/s390/kernel/asm-offsets.c | 3 +- + arch/s390/kernel/dumpstack.c | 7 +- + arch/s390/kernel/head64.S | 2 +- + arch/s390/kernel/machine_kexec.c | 4 +- + arch/s390/kernel/perf_cpum_sf.c | 136 ++++++------ + arch/s390/kernel/setup.c | 9 +- + arch/s390/kernel/smp.c | 7 +- + arch/s390/kernel/stacktrace.c | 43 ++++ + arch/s390/kernel/unwind_bc.c | 80 ++++--- + arch/s390/kernel/vdso.c | 42 +--- + arch/s390/kernel/vdso32/.gitignore | 1 - + arch/s390/kernel/vdso32/Makefile | 66 ------ + arch/s390/kernel/vdso32/clock_getres.S | 44 ---- + arch/s390/kernel/vdso32/clock_gettime.S | 179 ---------------- + arch/s390/kernel/vdso32/getcpu.S | 33 --- + arch/s390/kernel/vdso32/gettimeofday.S | 103 --------- + arch/s390/kernel/vdso32/note.S | 13 -- + arch/s390/kernel/vdso32/vdso32.lds.S | 142 ------------- + arch/s390/kernel/vdso32/vdso32_wrapper.S | 15 -- + arch/s390/kernel/vdso64/getcpu.S | 4 +- + arch/s390/lib/Makefile | 3 + + arch/s390/lib/test_unwind.c | 347 +++++++++++++++++++++++++++++++ + arch/s390/mm/maccess.c | 12 +- + arch/s390/pci/pci.c | 5 + + drivers/s390/crypto/zcrypt_error.h | 2 + + 35 files changed, 627 insertions(+), 768 deletions(-) + delete mode 100644 arch/s390/kernel/vdso32/.gitignore + delete mode 100644 arch/s390/kernel/vdso32/Makefile + delete mode 100644 arch/s390/kernel/vdso32/clock_getres.S + delete mode 100644 arch/s390/kernel/vdso32/clock_gettime.S + delete mode 100644 arch/s390/kernel/vdso32/getcpu.S + delete mode 100644 arch/s390/kernel/vdso32/gettimeofday.S + delete mode 100644 arch/s390/kernel/vdso32/note.S + delete mode 100644 arch/s390/kernel/vdso32/vdso32.lds.S + delete mode 100644 arch/s390/kernel/vdso32/vdso32_wrapper.S + create mode 100644 arch/s390/lib/test_unwind.c +Merging sh/sh-next (baf58858e8b6 sh: prefer __section from compiler_attributes.h) +$ git merge sh/sh-next +Auto-merging arch/sh/kernel/hw_breakpoint.c +CONFLICT (modify/delete): arch/sh/include/uapi/asm/types.h deleted in sh/sh-next and modified in HEAD. Version HEAD of arch/sh/include/uapi/asm/types.h left in tree. +CONFLICT (modify/delete): arch/sh/include/uapi/asm/setup.h deleted in sh/sh-next and modified in HEAD. Version HEAD of arch/sh/include/uapi/asm/setup.h left in tree. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/sh/include/uapi/asm/setup.h arch/sh/include/uapi/asm/types.h +rm 'arch/sh/include/uapi/asm/setup.h' +rm 'arch/sh/include/uapi/asm/types.h' +$ git commit --no-edit -v -a +[master 20b073c07856] Merge remote-tracking branch 'sh/sh-next' +$ git diff -M --stat --summary HEAD^.. + arch/sh/include/asm/bitops-op32.h | 8 +++----- + arch/sh/include/asm/cache.h | 2 +- + arch/sh/include/uapi/asm/setup.h | 2 -- + arch/sh/include/uapi/asm/types.h | 2 -- + arch/sh/kernel/Makefile | 2 -- + 5 files changed, 4 insertions(+), 12 deletions(-) + delete mode 100644 arch/sh/include/uapi/asm/setup.h + delete mode 100644 arch/sh/include/uapi/asm/types.h +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 +Auto-merging arch/xtensa/kernel/vmlinux.lds.S +CONFLICT (content): Merge conflict in arch/xtensa/kernel/vmlinux.lds.S +Removing arch/xtensa/include/asm/user.h +Removing arch/xtensa/include/asm/hw_irq.h +Auto-merging arch/xtensa/Kconfig +Resolved 'arch/xtensa/kernel/vmlinux.lds.S' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a848dccaadfe] Merge remote-tracking branch 'xtensa/xtensa-for-next' +$ git diff -M --stat --summary HEAD^.. + .../features/core/tracehook/arch-support.txt | 2 +- + arch/xtensa/Kconfig | 396 ++++++++++++--------- + arch/xtensa/Kconfig.debug | 7 + + arch/xtensa/Makefile | 3 +- + arch/xtensa/boot/Makefile | 5 + + arch/xtensa/configs/xip_kc705_defconfig | 119 +++++++ + arch/xtensa/include/asm/Kbuild | 2 + + arch/xtensa/include/asm/atomic.h | 124 +++---- + arch/xtensa/include/asm/bitops.h | 323 +++++------------ + arch/xtensa/include/asm/cache.h | 6 + + arch/xtensa/include/asm/cmpxchg.h | 71 ++-- + arch/xtensa/include/asm/fixmap.h | 8 +- + arch/xtensa/include/asm/futex.h | 10 +- + arch/xtensa/include/asm/hw_irq.h | 14 - + arch/xtensa/include/asm/initialize_mmu.h | 3 +- + arch/xtensa/include/asm/kmem_layout.h | 29 ++ + arch/xtensa/include/asm/page.h | 11 + + arch/xtensa/include/asm/pgtable.h | 4 - + arch/xtensa/include/asm/processor.h | 3 +- + arch/xtensa/include/asm/syscall.h | 4 +- + arch/xtensa/include/asm/uaccess.h | 16 +- + arch/xtensa/include/asm/user.h | 20 -- + arch/xtensa/include/asm/vectors.h | 44 +-- + arch/xtensa/kernel/coprocessor.S | 10 +- + arch/xtensa/kernel/entry.S | 22 +- + arch/xtensa/kernel/head.S | 13 +- + arch/xtensa/kernel/process.c | 2 + + arch/xtensa/kernel/ptrace.c | 18 +- + arch/xtensa/kernel/setup.c | 7 + + arch/xtensa/kernel/signal.c | 4 +- + arch/xtensa/kernel/traps.c | 27 +- + arch/xtensa/kernel/vmlinux.lds.S | 58 ++- + arch/xtensa/mm/fault.c | 16 +- + arch/xtensa/mm/init.c | 4 +- + arch/xtensa/mm/kasan_init.c | 12 +- + arch/xtensa/mm/mmu.c | 4 +- + arch/xtensa/mm/tlb.c | 14 +- + 37 files changed, 772 insertions(+), 663 deletions(-) + create mode 100644 arch/xtensa/configs/xip_kc705_defconfig + delete mode 100644 arch/xtensa/include/asm/hw_irq.h + delete mode 100644 arch/xtensa/include/asm/user.h +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 (897636c94003 Merge branch 'misc-5.5' into for-next-20191119) +$ git merge btrfs/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ceph/master (82995cc6c5ae libceph, rbd, ceph: convert to use the new mount API) +$ git merge ceph/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/block/rbd.c | 467 ++++++++++++++++--------------- + fs/ceph/cache.c | 9 +- + fs/ceph/cache.h | 5 +- + fs/ceph/mds_client.c | 19 +- + fs/ceph/mdsmap.c | 11 +- + fs/ceph/super.c | 646 ++++++++++++++++++++++--------------------- + fs/ceph/super.h | 13 +- + include/linux/ceph/libceph.h | 10 +- + net/ceph/ceph_common.c | 419 +++++++++++++--------------- + net/ceph/messenger.c | 2 - + net/ceph/mon_client.c | 3 - + 12 files changed, 803 insertions(+), 803 deletions(-) +Merging cifs/for-next (faa719cf95eb smb3: query attributes on file close) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifsglob.h | 3 +++ + fs/cifs/file.c | 11 +++++++---- + fs/cifs/inode.c | 2 +- + fs/cifs/smb2inode.c | 2 +- + fs/cifs/smb2ops.c | 49 +++++++++++++++++++++++++++++++++++++++++++---- + fs/cifs/smb2pdu.c | 55 +++++++++++++++++++++++++++++++++-------------------- + fs/cifs/smb2pdu.h | 11 +++++++++++ + fs/cifs/smb2proto.h | 7 ++++--- + 8 files changed, 106 insertions(+), 34 deletions(-) +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 (3dcb5fa23e16 erofs: remove unnecessary output in erofs_show_options()) +$ git merge erofs/dev +Already up to date. +Merging ext3/for_next (c78185c55450 Pull ext2 error number fix.) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/ext2/super.c | 1 + + 1 file changed, 1 insertion(+) +Merging ext4/dev (dfdeeb41fb08 Merge branch 'tt/misc' into dev) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (97eeb4d9d755 Merge tag 'xfs-5.5-merge-16' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge f2fs/dev +Already up to date. +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 +Merge made by the 'recursive' strategy. + fs/fuse/Kconfig | 4 +- + fs/fuse/dir.c | 25 +++++-- + fs/fuse/file.c | 6 +- + fs/fuse/fuse_i.h | 2 + + fs/fuse/readdir.c | 2 +- + fs/fuse/virtio_fs.c | 210 ++++++++++++++++++++++++++-------------------------- + 6 files changed, 134 insertions(+), 115 deletions(-) +Merging jfs/jfs-next (a5fdd713d256 jfs: fix bogus variable self-initialization) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (a264abad51d8 SUNRPC: Capture completion of all RPC tasks) +$ git merge nfs/linux-next +Merge made by the 'recursive' strategy. + fs/lockd/host.c | 3 +- + fs/nfs/callback.h | 4 +- + fs/nfs/callback_proc.c | 8 +- + fs/nfs/callback_xdr.c | 6 +- + fs/nfs/client.c | 11 + + fs/nfs/delegation.c | 158 ++++++++++----- + fs/nfs/delegation.h | 3 +- + fs/nfs/export.c | 1 + + fs/nfs/file.c | 2 +- + fs/nfs/inode.c | 54 ++--- + fs/nfs/internal.h | 2 +- + fs/nfs/namespace.c | 3 + + fs/nfs/nfs2xdr.c | 21 +- + fs/nfs/nfs3client.c | 5 +- + fs/nfs/nfs3xdr.c | 14 +- + fs/nfs/nfs42.h | 15 +- + fs/nfs/nfs42proc.c | 201 ++++++++++++++++--- + fs/nfs/nfs42xdr.c | 190 +++++++++++++++++- + fs/nfs/nfs4_fs.h | 21 +- + fs/nfs/nfs4client.c | 13 +- + fs/nfs/nfs4file.c | 141 ++++++++++++- + fs/nfs/nfs4proc.c | 69 ++++--- + fs/nfs/nfs4state.c | 51 ++++- + fs/nfs/nfs4super.c | 4 +- + fs/nfs/nfs4trace.h | 175 ++++++++++++++++ + fs/nfs/nfs4xdr.c | 24 +-- + fs/nfs/nfstrace.h | 33 +++ + fs/nfs/pnfs.c | 2 - + fs/nfs/super.c | 6 +- + fs/nfs/sysfs.c | 3 +- + include/linux/nfs4.h | 26 +++ + include/linux/nfs_fs.h | 4 +- + include/linux/nfs_fs_sb.h | 6 +- + include/linux/nfs_xdr.h | 31 ++- + include/linux/sunrpc/clnt.h | 1 + + include/linux/sunrpc/xprt.h | 3 +- + include/trace/events/rpcrdma.h | 198 ++++++++++++------ + include/trace/events/sunrpc.h | 94 +++++++++ + net/sunrpc/clnt.c | 21 +- + net/sunrpc/sched.c | 3 +- + net/sunrpc/xdr.c | 11 +- + net/sunrpc/xprt.c | 22 +- + net/sunrpc/xprtrdma/backchannel.c | 2 +- + net/sunrpc/xprtrdma/frwr_ops.c | 53 +---- + net/sunrpc/xprtrdma/rpc_rdma.c | 413 +++++++++++++++++++++++++------------- + net/sunrpc/xprtrdma/transport.c | 33 +-- + net/sunrpc/xprtrdma/verbs.c | 194 ++++++++++-------- + net/sunrpc/xprtrdma/xprt_rdma.h | 18 +- + net/sunrpc/xprtsock.c | 2 +- + 49 files changed, 1756 insertions(+), 622 deletions(-) +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 (6bcb98c71eab nfsd: merge server-to-server copy patches) +$ git merge nfsd/nfsd-next +Auto-merging net/sunrpc/xprtsock.c +Auto-merging include/trace/events/sunrpc.h +Auto-merging include/trace/events/rpcrdma.h +Auto-merging include/linux/sunrpc/xprtsock.h +Auto-merging include/linux/sunrpc/xprt.h +Auto-merging include/linux/sunrpc/clnt.h +Auto-merging fs/nfsd/nfs4xdr.c +Merge made by the 'recursive' strategy. + fs/nfsd/Kconfig | 12 +- + fs/nfsd/filecache.c | 2 - + fs/nfsd/nfs4callback.c | 104 +++++-- + fs/nfsd/nfs4proc.c | 441 ++++++++++++++++++++++++++--- + fs/nfsd/nfs4recover.c | 23 +- + fs/nfsd/nfs4state.c | 211 ++++++++++++-- + fs/nfsd/nfs4xdr.c | 157 +++++++++- + fs/nfsd/nfsd.h | 35 ++- + fs/nfsd/nfsfh.h | 5 +- + fs/nfsd/nfssvc.c | 9 +- + fs/nfsd/state.h | 35 ++- + fs/nfsd/vfs.c | 20 +- + fs/nfsd/vfs.h | 2 +- + fs/nfsd/xdr4.h | 39 ++- + include/linux/lockd/debug.h | 4 - + include/linux/lockd/lockd.h | 4 - + include/linux/sunrpc/auth.h | 3 - + include/linux/sunrpc/auth_gss.h | 2 - + include/linux/sunrpc/clnt.h | 3 - + include/linux/sunrpc/gss_api.h | 2 - + include/linux/sunrpc/gss_err.h | 3 - + include/linux/sunrpc/msg_prot.h | 3 - + include/linux/sunrpc/rpc_pipe_fs.h | 3 - + include/linux/sunrpc/svcauth.h | 4 - + include/linux/sunrpc/svcauth_gss.h | 2 - + include/linux/sunrpc/xdr.h | 3 - + include/linux/sunrpc/xprt.h | 4 - + include/linux/sunrpc/xprtsock.h | 4 - + include/trace/events/rpcgss.h | 45 +++ + include/trace/events/rpcrdma.h | 30 +- + include/trace/events/sunrpc.h | 55 ++++ + net/sunrpc/auth_gss/gss_mech_switch.c | 4 +- + net/sunrpc/auth_gss/svcauth_gss.c | 92 ++++-- + net/sunrpc/cache.c | 6 - + net/sunrpc/svc.c | 2 + + net/sunrpc/svcauth.c | 2 + + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 1 + + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 8 +- + net/sunrpc/xprtsock.c | 3 +- + 39 files changed, 1177 insertions(+), 210 deletions(-) +Merging orangefs/for-next (e6b998ab62be orangefs: remove redundant assignment to err) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (5c2e9f346b81 ovl: filter of trusted xattr results in audit) +$ git merge overlayfs/overlayfs-next +Already up to date. +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 (aafee43b7286 9p/vfs_super.c: Remove unused parameter data in v9fs_fill_super) +$ git merge v9fs/9p-next +Already up to date. +Merging xfs/for-next (8feb4732ff9f xfs: allow parent directory scans to be interrupted with fatal signals) +Merging iomap/iomap-for-next (88cfd30e188f iomap: remove unneeded variable in iomap_dio_rw()) +$ git merge iomap/iomap-for-next +Merge made by the 'recursive' strategy. + fs/iomap/direct-io.c | 39 ++++++++++++++++++++++----------------- + 1 file changed, 22 insertions(+), 17 deletions(-) +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 (001ca08ef654 Merge branches 'next.autofs' and 'fixes' into for-next) +$ git merge vfs/for-next +Auto-merging fs/utimes.c +Auto-merging fs/fcntl.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/dcache.c +Merge made by the 'recursive' strategy. + fs/attr.c | 23 +++++++++++------------ + fs/autofs/autofs_i.h | 2 +- + fs/autofs/expire.c | 6 +++--- + fs/autofs/root.c | 39 ++++++++++++++------------------------- + fs/configfs/inode.c | 9 +++------ + fs/dcache.c | 2 +- + fs/f2fs/file.c | 18 ++++++------------ + fs/fcntl.c | 2 +- + fs/internal.h | 1 - + fs/namespace.c | 6 +++--- + fs/ntfs/inode.c | 18 ++++++------------ + fs/ubifs/file.c | 18 ++++++------------ + fs/utimes.c | 4 ++-- + include/linux/list.h | 12 +++++++----- + include/linux/lockref.h | 6 ++++++ + lib/lockref.c | 16 ++++++++++++++++ + 16 files changed, 86 insertions(+), 96 deletions(-) +Merging printk/for-next (b004f8e77cc0 Merge branch 'for-5.5-pr-warning-removal' into for-next) +$ git merge printk/for-next +Auto-merging scripts/checkpatch.pl +Merge made by the 'recursive' strategy. + include/linux/printk.h | 3 +-- + kernel/workqueue.c | 4 ++-- + scripts/checkpatch.pl | 9 --------- + 3 files changed, 3 insertions(+), 13 deletions(-) +Merging pci/next (7e124c405172 Merge branch 'pci/trivial') +$ git merge pci/next +Auto-merging lib/devres.c +Auto-merging include/linux/pci.h +Auto-merging drivers/video/fbdev/core/fbmem.c +Auto-merging drivers/scsi/pm8001/pm8001_init.c +Auto-merging drivers/scsi/pm8001/pm8001_hwi.c +Auto-merging drivers/pci/switch/switchtec.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/hotplug/rpaphp_core.c +Auto-merging drivers/nvme/host/core.c +Auto-merging drivers/net/ethernet/intel/e1000/e1000_main.c +Auto-merging drivers/memstick/host/jmb38x_ms.c +Auto-merging drivers/iommu/Kconfig +Auto-merging drivers/gpu/drm/radeon/si.c +Auto-merging drivers/gpu/drm/radeon/cik.c +Auto-merging drivers/gpu/drm/amd/amdgpu/si.c +Auto-merging drivers/gpu/drm/amd/amdgpu/cik.c +Auto-merging drivers/ata/sata_nv.c +Auto-merging arch/s390/pci/pci.c +Auto-merging arch/powerpc/include/asm/Kbuild +CONFLICT (content): Merge conflict in arch/powerpc/include/asm/Kbuild +Auto-merging arch/arm64/boot/dts/amlogic/meson-sm1.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/amlogic/meson-sm1.dtsi +Auto-merging arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi +Auto-merging arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +Auto-merging MAINTAINERS +Auto-merging Documentation/power/pci.rst +CONFLICT (content): Merge conflict in Documentation/power/pci.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'Documentation/power/pci.rst' using previous resolution. +Resolved 'arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi' using previous resolution. +Resolved 'arch/arm64/boot/dts/amlogic/meson-sm1.dtsi' using previous resolution. +Resolved 'arch/powerpc/include/asm/Kbuild' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5d21cef0cc38] Merge remote-tracking branch 'pci/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-pci | 13 + + Documentation/admin-guide/kernel-parameters.txt | 11 +- + .../devicetree/bindings/pci/amlogic,meson-pcie.txt | 12 +- + .../devicetree/bindings/pci/layerscape-pci.txt | 1 + + Documentation/power/pci.rst | 24 +- + MAINTAINERS | 4 +- + arch/alpha/kernel/pci-sysfs.c | 8 +- + arch/arc/include/asm/Kbuild | 1 - + arch/arm/include/asm/Kbuild | 1 - + arch/arm64/include/asm/Kbuild | 1 - + arch/mips/include/asm/Kbuild | 1 - + arch/powerpc/include/asm/Kbuild | 1 - + arch/riscv/include/asm/Kbuild | 1 - + arch/s390/include/asm/pci.h | 5 +- + arch/s390/include/asm/pci_clp.h | 6 +- + arch/s390/pci/pci.c | 16 +- + arch/s390/pci/pci_clp.c | 6 +- + arch/sparc/include/asm/Kbuild | 1 - + arch/x86/pci/Makefile | 4 +- + arch/x86/pci/common.c | 2 +- + arch/x86/pci/fixup.c | 11 + + arch/x86/pci/intel_mid_pci.c | 2 +- + arch/x86/pci/numachip.c | 5 +- + drivers/ata/pata_atp867x.c | 2 +- + drivers/ata/sata_nv.c | 2 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 95 ++++-- + drivers/gpu/drm/amd/amdgpu/si.c | 97 ++++-- + drivers/gpu/drm/radeon/cik.c | 94 ++++-- + drivers/gpu/drm/radeon/si.c | 97 ++++-- + drivers/iommu/Kconfig | 1 + + drivers/iommu/of_iommu.c | 2 + + drivers/irqchip/irq-gic-v2m.c | 1 + + drivers/irqchip/irq-gic-v3-its-pci-msi.c | 1 + + drivers/memstick/host/jmb38x_ms.c | 2 +- + drivers/misc/pci_endpoint_test.c | 8 +- + drivers/net/ethernet/intel/e1000/e1000.h | 1 - + drivers/net/ethernet/intel/e1000/e1000_main.c | 2 +- + drivers/net/ethernet/intel/ixgb/ixgb.h | 1 - + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 4 +- + drivers/net/ethernet/synopsys/dwc-xlgmac-pci.c | 2 +- + drivers/nvme/host/core.c | 10 - + drivers/pci/Kconfig | 26 +- + drivers/pci/Makefile | 3 +- + drivers/pci/access.c | 2 +- + drivers/pci/ats.c | 207 ++++++------ + drivers/pci/controller/Kconfig | 31 +- + drivers/pci/controller/Makefile | 4 +- + drivers/pci/controller/cadence/Kconfig | 45 +++ + drivers/pci/controller/cadence/Makefile | 5 + + .../pci/controller/{ => cadence}/pcie-cadence-ep.c | 96 +----- + .../controller/{ => cadence}/pcie-cadence-host.c | 97 +----- + drivers/pci/controller/cadence/pcie-cadence-plat.c | 174 ++++++++++ + .../pci/controller/{ => cadence}/pcie-cadence.c | 0 + .../pci/controller/{ => cadence}/pcie-cadence.h | 79 ++++- + drivers/pci/controller/dwc/Kconfig | 6 +- + drivers/pci/controller/dwc/pci-dra7xx.c | 2 +- + drivers/pci/controller/dwc/pci-layerscape-ep.c | 2 +- + drivers/pci/controller/dwc/pci-layerscape.c | 1 + + drivers/pci/controller/dwc/pci-meson.c | 136 ++++++-- + drivers/pci/controller/dwc/pcie-artpec6.c | 2 +- + drivers/pci/controller/dwc/pcie-designware-host.c | 41 +-- + drivers/pci/controller/dwc/pcie-designware-plat.c | 2 +- + drivers/pci/controller/dwc/pcie-designware.h | 2 +- + drivers/pci/controller/dwc/pcie-tegra194.c | 6 +- + drivers/pci/controller/dwc/pcie-uniphier.c | 10 + + drivers/pci/controller/pci-aardvark.c | 133 ++++---- + drivers/pci/controller/pci-ftpci100.c | 79 ++--- + drivers/pci/controller/pci-host-common.c | 2 +- + drivers/pci/controller/pci-hyperv.c | 218 ++++++++++-- + drivers/pci/controller/pci-mvebu.c | 4 +- + drivers/pci/controller/pci-thunder-pem.c | 1 + + drivers/pci/controller/pci-v3-semi.c | 74 ++-- + drivers/pci/controller/pci-versatile.c | 71 +--- + drivers/pci/controller/pci-xgene.c | 73 ++-- + drivers/pci/controller/pcie-altera.c | 41 +-- + drivers/pci/controller/pcie-iproc-msi.c | 5 +- + drivers/pci/controller/pcie-iproc-platform.c | 9 +- + drivers/pci/controller/pcie-iproc.c | 106 +++--- + drivers/pci/controller/pcie-mediatek.c | 43 +-- + drivers/pci/controller/pcie-mobiveil.c | 146 ++++---- + drivers/pci/controller/pcie-rcar.c | 92 +++-- + drivers/pci/controller/pcie-rockchip-host.c | 158 +++------ + drivers/pci/controller/pcie-rockchip.h | 7 +- + drivers/pci/controller/pcie-xilinx-nwl.c | 21 +- + drivers/pci/controller/pcie-xilinx.c | 18 +- + drivers/pci/controller/vmd.c | 34 +- + drivers/pci/endpoint/functions/pci-epf-test.c | 10 +- + drivers/pci/endpoint/pci-epc-mem.c | 2 +- + drivers/pci/hotplug/Kconfig | 2 +- + drivers/pci/hotplug/acpiphp_glue.c | 12 +- + drivers/pci/hotplug/pciehp.h | 8 +- + drivers/pci/hotplug/pciehp_core.c | 36 +- + drivers/pci/hotplug/pciehp_ctrl.c | 10 +- + drivers/pci/hotplug/pciehp_hpc.c | 67 +++- + drivers/pci/hotplug/rpaphp_core.c | 4 +- + drivers/pci/iov.c | 9 +- + drivers/pci/msi.c | 25 +- + drivers/pci/of.c | 67 +++- + drivers/pci/pci-bridge-emul.c | 25 +- + drivers/pci/pci-bridge-emul.h | 78 ++--- + drivers/pci/pci-driver.c | 198 +++++------ + drivers/pci/pci-sysfs.c | 28 +- + drivers/pci/pci.c | 372 ++++++++++++++------- + drivers/pci/pci.h | 48 +-- + drivers/pci/pcie/Kconfig | 10 - + drivers/pci/pcie/aer.c | 88 ++++- + drivers/pci/pcie/aspm.c | 245 +++++++++----- + drivers/pci/pcie/dpc.c | 2 +- + drivers/pci/pcie/portdrv.h | 2 + + drivers/pci/pcie/portdrv_core.c | 7 +- + drivers/pci/pcie/portdrv_pci.c | 8 + + drivers/pci/pcie/ptm.c | 2 +- + drivers/pci/probe.c | 60 ++-- + drivers/pci/proc.c | 4 +- + drivers/pci/quirks.c | 157 ++++++--- + drivers/pci/setup-bus.c | 70 ++-- + drivers/pci/switch/switchtec.c | 2 +- + drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c | 70 +++- + drivers/rapidio/devices/tsi721.c | 2 +- + drivers/scsi/pm8001/pm8001_hwi.c | 2 +- + drivers/scsi/pm8001/pm8001_init.c | 2 +- + drivers/staging/gasket/gasket_constants.h | 3 - + drivers/staging/gasket/gasket_core.c | 12 +- + drivers/staging/gasket/gasket_core.h | 4 +- + drivers/tty/serial/8250/8250_pci.c | 8 +- + drivers/usb/core/hcd-pci.c | 2 +- + drivers/usb/host/pci-quirks.c | 2 +- + drivers/vfio/pci/vfio_pci.c | 11 +- + drivers/vfio/pci/vfio_pci_config.c | 32 +- + drivers/vfio/pci/vfio_pci_private.h | 4 +- + drivers/video/fbdev/aty/radeon_pm.c | 2 +- + drivers/video/fbdev/core/fbmem.c | 4 +- + drivers/video/fbdev/efifb.c | 2 +- + drivers/xen/platform-pci.c | 14 +- + include/asm-generic/Kbuild | 1 + + include/linux/aer.h | 4 + + include/linux/of_pci.h | 5 +- + include/linux/pci-ats.h | 77 ++--- + include/linux/pci-epc.h | 2 +- + include/linux/pci.h | 59 ++-- + include/linux/pci_ids.h | 1 + + include/linux/resource_ext.h | 12 + + include/uapi/linux/pci_regs.h | 3 + + lib/devres.c | 2 +- + tools/pci/pcitest.c | 1 + + 146 files changed, 2746 insertions(+), 2130 deletions(-) + create mode 100644 drivers/pci/controller/cadence/Kconfig + create mode 100644 drivers/pci/controller/cadence/Makefile + rename drivers/pci/controller/{ => cadence}/pcie-cadence-ep.c (83%) + rename drivers/pci/controller/{ => cadence}/pcie-cadence-host.c (75%) + create mode 100644 drivers/pci/controller/cadence/pcie-cadence-plat.c + rename drivers/pci/controller/{ => cadence}/pcie-cadence.c (100%) + rename drivers/pci/controller/{ => cadence}/pcie-cadence.h (82%) +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 (4b8c2dffbb85 Merge branch 'for-5.5/core' into for-next) +$ git merge hid/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging i2c/i2c/for-next (2dff2a1c9b7c Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging) +$ git merge i2c/i2c/for-next +Already up to date. +Merging i3c/i3c/next (ae24f2b6f828 MAINTAINERS: add myself as maintainer of Cadence I3C master controller driver) +$ git merge i3c/i3c/next +Already up to date. +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 (4a1288f1c1cf dell-smm-hwmon: Add documentation) +$ git merge hwmon-staging/hwmon-next +Already up to date. +Merging jc_docs/docs-next (36bb9778fd11 docs: remove a bunch of stray CRs) +$ git merge jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (dca6b3733a4a media: Revert "media: mtk-vcodec: Remove extra area allocation in an input buffer on encoding") +$ git merge v4l-dvb/master +Already up to date. +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 (1bae6fbafe62 Merge branches 'acpi-bus', 'acpi-osl', 'acpi-button' and 'acpi-misc' into linux-next) +$ git merge pm/linux-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 2 +- + arch/sh/kernel/cpu/shmobile/cpuidle.c | 8 +- + drivers/acpi/Kconfig | 8 +- + drivers/acpi/bus.c | 2 +- + drivers/acpi/button.c | 13 +++ + drivers/acpi/ec.c | 36 +++----- + drivers/acpi/osl.c | 28 +++--- + drivers/acpi/sleep.c | 26 ++++-- + drivers/acpi/sysfs.c | 6 +- + drivers/base/Kconfig | 4 + + drivers/base/power/Makefile | 1 + + drivers/base/power/qos-test.c | 117 ++++++++++++++++++++++++ + drivers/base/power/qos.c | 73 +++++++++++++-- + drivers/cpufreq/Kconfig.powerpc | 8 +- + drivers/cpufreq/Kconfig.x86 | 16 ++-- + drivers/cpuidle/Kconfig | 16 ++-- + drivers/cpuidle/Kconfig.arm | 22 ++--- + drivers/cpuidle/cpuidle.c | 2 +- + drivers/cpuidle/poll_state.c | 1 - + drivers/devfreq/devfreq.c | 4 + + drivers/idle/intel_idle.c | 6 +- + drivers/power/avs/Kconfig | 12 +-- + include/linux/cpuidle.h | 2 +- + include/linux/pm_qos.h | 86 +++++++++-------- + kernel/power/qos.c | 4 +- + 25 files changed, 363 insertions(+), 140 deletions(-) + create mode 100644 drivers/base/power/qos-test.c +Merging cpufreq-arm/cpufreq/arm/linux-next (c23734487fb4 cpufreq: sun50i: Fix CPU speed bin detection) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (4611a4fb0cce cpupower: ToDo: Update ToDo with ideas for per_cpu_schedule handling) +$ git merge cpupower/cpupower +Already up to date. +Merging opp/opp/linux-next (25cb20a212a1 PM / OPP: Support adjusting OPP voltages at runtime) +$ git merge opp/opp/linux-next +Already up to date. +Merging thermal/thermal/linux-next (def0aa869050 thermal: Fix deadlock in thermal thermal_zone_device_check) +$ git merge thermal/thermal/linux-next +Auto-merging drivers/cpufreq/cpufreq-dt-platdev.c +Auto-merging drivers/clk/qcom/gcc-sdm845.c +Auto-merging drivers/clk/qcom/clk-rpmh.c +Auto-merging arch/arm64/configs/defconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/thermal/qcom-tsens.txt +Merge made by the 'recursive' strategy. + .../bindings/thermal/amlogic,thermal.yaml | 54 +++ + .../devicetree/bindings/thermal/qcom-tsens.txt | 55 --- + .../devicetree/bindings/thermal/qcom-tsens.yaml | 170 +++++++ + .../bindings/thermal/rcar-gen3-thermal.txt | 1 + + Documentation/driver-api/thermal/sysfs-api.rst | 26 +- + MAINTAINERS | 10 + + arch/arm64/configs/defconfig | 1 + + drivers/clk/qcom/clk-rpmh.c | 2 +- + drivers/clk/qcom/gcc-qcs404.c | 2 +- + drivers/clk/qcom/gcc-sdm845.c | 2 +- + drivers/cpufreq/cpufreq-dt-platdev.c | 2 +- + drivers/cpufreq/cpufreq_conservative.c | 2 +- + drivers/cpufreq/cpufreq_ondemand.c | 2 +- + drivers/cpufreq/cpufreq_performance.c | 2 +- + drivers/cpufreq/cpufreq_powersave.c | 2 +- + drivers/cpufreq/cpufreq_userspace.c | 2 +- + drivers/cpufreq/qcom-cpufreq-hw.c | 2 +- + drivers/thermal/Kconfig | 12 + + drivers/thermal/Makefile | 1 + + drivers/thermal/amlogic_thermal.c | 333 +++++++++++++ + drivers/thermal/cpu_cooling.c | 404 +++++++--------- + drivers/thermal/qcom/tsens-8960.c | 4 +- + drivers/thermal/qcom/tsens-common.c | 529 +++++++++++++++++++-- + drivers/thermal/qcom/tsens-v0_1.c | 11 + + drivers/thermal/qcom/tsens-v1.c | 198 +++++++- + drivers/thermal/qcom/tsens-v2.c | 13 + + drivers/thermal/qcom/tsens.c | 62 ++- + drivers/thermal/qcom/tsens.h | 288 +++++++++-- + drivers/thermal/qoriq_thermal.c | 120 ++++- + drivers/thermal/rcar_gen3_thermal.c | 4 + + drivers/thermal/thermal-generic-adc.c | 9 +- + drivers/thermal/thermal_core.c | 107 +---- + drivers/thermal/thermal_mmio.c | 1 - + include/linux/cpu_cooling.h | 18 +- + include/linux/energy_model.h | 3 +- + include/linux/thermal.h | 11 - + kernel/sched/cpufreq_schedutil.c | 2 +- + 37 files changed, 1878 insertions(+), 589 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/amlogic,thermal.yaml + delete mode 100644 Documentation/devicetree/bindings/thermal/qcom-tsens.txt + create mode 100644 Documentation/devicetree/bindings/thermal/qcom-tsens.yaml + create mode 100644 drivers/thermal/amlogic_thermal.c +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 (f295e4cece5c RDMA/hns: Delete unnecessary callback functions for cq) +$ git merge rdma/for-next +Already up to date. +Merging net-next/master (596cf45cbf6e Merge branch 'akpm' (patches from Andrew)) +$ git merge net-next/master +Already up to date. +Merging bpf-next/master (be2eca94d144 Merge tag 'for-linus-5.5-1' of git://github.com/cminyard/linux-ipmi) +$ git merge bpf-next/master +Already up to date. +Merging ipsec-next/master (72c996099dc6 cxgb4: Fix an error code in cxgb4_mqprio_alloc_hw_resources()) +$ git merge ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (9c0015ef0928 IB/mlx5: Implement callbacks for getting VFs GUID attributes) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (596cf45cbf6e Merge branch 'akpm' (patches from Andrew)) +$ git merge netfilter-next/master +Already up to date. +Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings) +$ git merge nfc-next/master +Auto-merging 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 5b2b8158bd8e] 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 (05d6c8cfdbd6 mt76: fix fix ampdu locking) +$ git merge wireless-drivers-next/master +Already up to date. +Merging bluetooth/master (3168c19d7eb1 Bluetooth: btusb: fix memory leak on fw) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/broadcom-bluetooth.txt | 7 +++ + drivers/bluetooth/btbcm.c | 46 ++++++++++++++++++++ + drivers/bluetooth/btbcm.h | 16 +++++++ + drivers/bluetooth/btusb.c | 8 ++-- + drivers/bluetooth/hci_bcm.c | 50 +++++++++++++++++++++- + 5 files changed, 121 insertions(+), 6 deletions(-) +Merging mac80211-next/master (7a89233ac504 mac80211: Use Airtime-based Queue Limits (AQL) on packet dequeue) +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (ade48088937f gfs2: Don't write log headers after file system withdraw) +$ git merge gfs2/for-next +Auto-merging fs/gfs2/file.c +Auto-merging fs/gfs2/bmap.c +Merge made by the 'recursive' strategy. + fs/gfs2/aops.c | 6 +++--- + fs/gfs2/bmap.c | 11 +++++++++-- + fs/gfs2/file.c | 56 ++++++++++++++++++++++++++++++++-------------------- + fs/gfs2/glock.c | 16 ++++++++++----- + fs/gfs2/glops.c | 4 ++-- + fs/gfs2/inode.c | 16 +++++++-------- + fs/gfs2/log.c | 25 +++++++++++++++++++---- + fs/gfs2/log.h | 2 +- + fs/gfs2/lops.c | 34 +++++++++++++++---------------- + fs/gfs2/lops.h | 3 ++- + fs/gfs2/meta_io.c | 6 +++--- + fs/gfs2/ops_fstype.c | 5 ++--- + fs/gfs2/quota.c | 4 ++-- + fs/gfs2/recovery.c | 8 +++++--- + fs/gfs2/super.c | 33 ++++++++++++++++++------------- + fs/gfs2/sys.c | 2 +- + fs/gfs2/trans.c | 2 ++ + fs/gfs2/util.c | 2 +- + fs/gfs2/util.h | 9 +++++++++ + 19 files changed, 152 insertions(+), 92 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 (83cba933a6db mtd: spi-nor: Set default Quad Enable method for ISSI flashes) +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (4ee812f6143d crypto: vmx - Avoid weird build failures) +$ git merge crypto/master +Already up to date. +Merging drm/drm-next (3e25dbca8b75 Merge tag 'drm-intel-next-fixes-2019-11-28' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) +$ git merge drm/drm-next +Auto-merging include/linux/qcom_scm.h +Auto-merging drivers/soc/qcom/Makefile +Auto-merging drivers/soc/qcom/Kconfig +Auto-merging drivers/gpu/drm/i915/i915_active.c +Auto-merging drivers/gpu/drm/i915/gt/intel_engine_pm.c +Auto-merging drivers/firmware/qcom_scm.h +Auto-merging drivers/firmware/qcom_scm.c +Auto-merging drivers/firmware/qcom_scm-64.c +Auto-merging drivers/firmware/qcom_scm-32.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/display/msm/gmu.txt | 51 +++ + .../devicetree/bindings/display/msm/mdp5.txt | 2 + + .../devicetree/bindings/sram/qcom,ocmem.yaml | 96 +++++ + drivers/firmware/qcom_scm-32.c | 52 ++- + drivers/firmware/qcom_scm-64.c | 12 + + drivers/firmware/qcom_scm.c | 53 +++ + drivers/firmware/qcom_scm.h | 9 + + drivers/gpu/drm/i915/Kconfig.profile | 2 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 4 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 29 +- + drivers/gpu/drm/i915/gt/intel_context.c | 21 +- + drivers/gpu/drm/i915/gt/intel_engine.h | 4 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 8 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 67 +++- + drivers/gpu/drm/i915/gt/intel_engine_pm.h | 10 + + drivers/gpu/drm/i915/gt/intel_engine_types.h | 8 + + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 3 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.h | 5 + + drivers/gpu/drm/i915/gt/intel_gt_requests.c | 83 +++- + drivers/gpu/drm/i915/gt/intel_gt_requests.h | 7 + + drivers/gpu/drm/i915/gt/intel_lrc.c | 50 ++- + drivers/gpu/drm/i915/gt/intel_reset.c | 2 +- + drivers/gpu/drm/i915/gt/intel_ring.c | 13 +- + drivers/gpu/drm/i915/gt/intel_timeline.c | 35 +- + drivers/gpu/drm/i915/gt/intel_timeline_types.h | 5 +- + drivers/gpu/drm/i915/gt/selftest_engine_pm.c | 7 +- + drivers/gpu/drm/i915/i915_active.c | 5 +- + drivers/gpu/drm/i915/i915_pmu.c | 6 +- + drivers/gpu/drm/i915/i915_query.c | 7 +- + drivers/gpu/drm/i915/intel_wakeref.c | 21 +- + drivers/gpu/drm/i915/intel_wakeref.h | 45 ++- + drivers/gpu/drm/msm/Kconfig | 1 + + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 28 +- + drivers/gpu/drm/msm/adreno/a3xx_gpu.h | 3 +- + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 25 +- + drivers/gpu/drm/msm/adreno/a4xx_gpu.h | 3 +- + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 79 +++- + drivers/gpu/drm/msm/adreno/a5xx_power.c | 7 + + drivers/gpu/drm/msm/adreno/adreno_device.c | 15 + + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 40 ++ + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 15 + + drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c | 43 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 21 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 20 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 39 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 15 - + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 7 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 60 +-- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 4 - + drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 6 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 10 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 114 +++++- + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 3 - + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 23 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.h | 2 + + drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c | 2 - + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 28 +- + drivers/gpu/drm/msm/dsi/dsi_cfg.h | 1 + + drivers/gpu/drm/msm/dsi/dsi_host.c | 3 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 8 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 1 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 60 ++- + drivers/gpu/drm/msm/hdmi/hdmi_phy.c | 8 +- + drivers/gpu/drm/msm/msm_gpu.c | 6 +- + drivers/gpu/drm/msm/msm_gpummu.c | 6 +- + drivers/gpu/drm/msm/msm_iommu.c | 6 +- + drivers/gpu/drm/msm/msm_mmu.h | 4 +- + drivers/gpu/drm/msm/msm_rd.c | 16 +- + drivers/soc/qcom/Kconfig | 10 + + drivers/soc/qcom/Makefile | 1 + + drivers/soc/qcom/ocmem.c | 433 +++++++++++++++++++++ + include/linux/qcom_scm.h | 26 ++ + include/soc/qcom/ocmem.h | 65 ++++ + 73 files changed, 1589 insertions(+), 400 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sram/qcom,ocmem.yaml + create mode 100644 drivers/soc/qcom/ocmem.c + create mode 100644 include/soc/qcom/ocmem.h +Merging amdgpu/drm-next (1b3146b47913 drm/scheduler: Avoid accessing freed bad job.) +$ git merge amdgpu/drm-next +Auto-merging drivers/gpu/drm/radeon/si.c +Auto-merging drivers/gpu/drm/radeon/cik.c +Auto-merging drivers/gpu/drm/amd/powerplay/navi10_ppt.c +Auto-merging drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +Auto-merging drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +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 +Auto-merging drivers/gpu/drm/amd/display/dc/dml/Makefile +Auto-merging drivers/gpu/drm/amd/display/dc/dcn21/Makefile +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/Makefile +Auto-merging drivers/gpu/drm/amd/display/dc/calcs/Makefile +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Removing drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v10.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +Auto-merging drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +Auto-merging drivers/gpu/drm/amd/amdgpu/soc15.h +Auto-merging drivers/gpu/drm/amd/amdgpu/si.c +Auto-merging drivers/gpu/drm/amd/amdgpu/nv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c +Auto-merging drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/cik.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Auto-merging MAINTAINERS +Resolved 'drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 629bf3bd667d] Merge remote-tracking branch 'amdgpu/drm-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 1 - + drivers/gpu/drm/amd/acp/Kconfig | 10 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 31 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 23 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 20 +- + 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 | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 171 +++- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 99 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 4 +- + 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.h | 2 + + 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 | 43 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 11 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 12 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 205 +++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 4 +- + .../kfd_kernel_queue_cik.c => amdgpu/amdgpu_tmz.c} | 49 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.h | 39 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 113 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 5 - + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 5 + + 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 | 25 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 201 ++--- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 46 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 107 +-- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c | 19 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 5 + + 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/nv.c | 29 +- + drivers/gpu/drm/amd/amdgpu/nvd.h | 1 + + 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/sdma_v2_4.c | 3 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/si.c | 6 + + drivers/gpu/drm/amd/amdgpu/si_dma.c | 3 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 48 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 12 + + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 1 + + drivers/gpu/drm/amd/amdgpu/soc15d.h | 1 + + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 481 +---------- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 496 +----------- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.h | 13 - + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 246 +----- + drivers/gpu/drm/amd/amdgpu/vi.c | 29 +- + drivers/gpu/drm/amd/amdkfd/Kconfig | 2 +- + drivers/gpu/drm/amd/amdkfd/Makefile | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 68 +- + drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 2 +- + 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 | 68 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h | 6 - + 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 | 4 +- + ...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 | 30 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 3 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 25 +- + drivers/gpu/drm/amd/display/Kconfig | 33 +- + drivers/gpu/drm/amd/display/Makefile | 4 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 518 ++++++++++-- + 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 | 9 +- + 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 | 77 +- + .../gpu/drm/amd/display/dc/bios/command_table2.c | 80 ++ + .../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 | 10 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 166 ++-- + drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 50 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 26 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 578 +++++++++++--- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 45 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 45 +- + drivers/gpu/drm/amd/display/dc/core/dc_sink.c | 8 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 25 +- + drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 14 +- + drivers/gpu/drm/amd/display/dc/dc.h | 67 +- + 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 | 4 - + drivers/gpu/drm/amd/display/dc/dc_helper.c | 264 +++++- + 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.h | 11 +- + 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 +- + .../drm/amd/display/dc/dce100/dce100_resource.c | 10 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 21 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.h | 1 - + .../drm/amd/display/dc/dce110/dce110_resource.c | 10 +- + .../drm/amd/display/dc/dce112/dce112_resource.c | 10 +- + .../drm/amd/display/dc/dce120/dce120_resource.c | 14 +- + .../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 | 7 +- + .../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 | 7 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 3 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 501 ++++-------- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 181 +++-- + .../display/dc/dcn10/dcn10_hw_sequencer_debug.h | 43 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 105 +++ + 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 +- + 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 | 315 +++++++- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h | 16 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 478 +++++------ + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 150 ++-- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 127 +++ + 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 | 16 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.h | 4 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 183 +++-- + .../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 | 410 +++++++++- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c | 13 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.h | 14 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 131 +++ + 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 +- + .../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 | 3 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 6 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 4 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 8 +- + 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 | 6 +- + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 6 - + .../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 | 11 +- + 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 | 54 +- + 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 | 4 +- + .../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 | 267 +++++++ + drivers/gpu/drm/amd/display/dmub/inc/dmub_rb.h | 129 +++ + drivers/gpu/drm/amd/display/dmub/inc/dmub_srv.h | 518 ++++++++++++ + .../drm/amd/display/dmub/inc/dmub_trace_buffer.h | 68 ++ + drivers/gpu/drm/amd/display/dmub/inc/dmub_types.h | 64 ++ + drivers/gpu/drm/amd/display/dmub/src/Makefile | 27 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 142 ++++ + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 64 ++ + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.c | 126 +++ + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.h | 45 ++ + 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 | 430 ++++++++++ + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 4 - + 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 | 2 - + .../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 | 884 +++++++++++++++++++++ + .../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/amdgpu_smu.c | 51 +- + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 11 +- + 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 | 5 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 4 +- + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 13 +- + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 8 +- + drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h | 11 +- + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 36 +- + drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 104 ++- + drivers/gpu/drm/amd/powerplay/smu_internal.h | 8 +- + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 83 +- + drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 72 +- + drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 4 +- + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 7 +- + .../gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 27 +- + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 4 +- + drivers/gpu/drm/radeon/atombios_dp.c | 3 - + drivers/gpu/drm/radeon/r100.c | 4 +- + drivers/gpu/drm/radeon/r200.c | 4 +- + drivers/gpu/drm/radeon/r600_cs.c | 8 +- + drivers/gpu/drm/radeon/radeon_audio.c | 2 +- + drivers/gpu/drm/radeon/radeon_combios.c | 3 +- + drivers/gpu/drm/radeon/radeon_display.c | 2 - + drivers/gpu/drm/radeon/radeon_legacy_tv.c | 8 +- + drivers/gpu/drm/radeon/si_dpm.c | 5 +- + drivers/gpu/drm/scheduler/sched_main.c | 27 + + include/uapi/drm/amdgpu_drm.h | 13 +- + include/uapi/linux/kfd_ioctl.h | 19 +- + 364 files changed, 14407 insertions(+), 5672 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h + rename drivers/gpu/drm/amd/{amdkfd/kfd_kernel_queue_cik.c => amdgpu/amdgpu_tmz.c} (56%) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.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/dmub/inc/dmub_cmd.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 + create mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_types.h + 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 +Merging drm-intel/for-linux-next (01bb63031933 drm/i915/ehl: Make icp_digital_port_connected() use phy instead of port) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/display/intel_dp.c | 12 +++++------- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 4 ++-- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 6 +++--- + drivers/gpu/drm/i915/gvt/handlers.c | 5 +++-- + 4 files changed, 13 insertions(+), 14 deletions(-) +Merging drm-tegra/drm/tegra/for-next (84db889e6d82 drm/tegra: Unconditionally select IOMMU_IOVA) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (d6d07ca19c04 drm/dp_mst: Fix build on systems with STACKTRACE_SUPPORT=n) +$ git merge drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/Kconfig +Merge made by the 'recursive' strategy. + drivers/gpu/drm/Kconfig | 1 + + drivers/gpu/drm/mgag200/mgag200_drv.c | 36 +++++++++++++++++++++++++++++++++- + drivers/gpu/drm/mgag200/mgag200_drv.h | 18 +++++++++++++++++ + drivers/gpu/drm/mgag200/mgag200_main.c | 3 ++- + 4 files changed, 56 insertions(+), 2 deletions(-) +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 (0c4b6e03b8ad Merge branch 'regmap-5.5' into regmap-next) +$ git merge regmap/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging sound/for-next (643a2cc99b53 ALSA: hda: hdmi - Keep old slot assignment behavior for Intel platforms) +$ git merge sound/for-next +Already up to date. +Merging sound-asoc/for-next (073130b5fe01 Merge branch 'asoc-5.5' into asoc-linus) +$ git merge sound-asoc/for-next +Already up to date. +Merging modules/modules-next (5d603311615f kernel/module.c: wakeup processes in module_wq on module unload) +$ git merge modules/modules-next +Auto-merging kernel/module.c +Auto-merging include/linux/export.h +Merge made by the 'recursive' strategy. + include/linux/export.h | 91 ++++++++++++++------------------------------- + include/linux/moduleparam.h | 4 +- + kernel/module.c | 4 +- + 3 files changed, 33 insertions(+), 66 deletions(-) +Merging input/next (1a26c920717a Input: snvs_pwrkey - send key events for i.MX6 S, DL and Q) +$ git merge input/next +Merge made by the 'recursive' strategy. + drivers/input/keyboard/Kconfig | 2 +- + drivers/input/keyboard/snvs_pwrkey.c | 44 +++++++++++++++++++++++++++--------- + 2 files changed, 34 insertions(+), 12 deletions(-) +Merging block/for-next (39c1f82685b4 Merge branch 'for-linus' into for-next) +$ git merge block/for-next +Merge made by the 'recursive' strategy. + block/blk-zoned.c | 149 ++++++------- + block/ioctl.c | 2 +- + drivers/block/null_blk_main.c | 41 ++-- + drivers/md/dm-table.c | 12 +- + drivers/md/dm-zoned-target.c | 2 +- + drivers/scsi/sd_zbc.c | 2 - + fs/block_dev.c | 2 +- + fs/io-wq.c | 2 +- + fs/io-wq.h | 10 +- + fs/io_uring.c | 482 +++++++++++++++++++++++++++++++++--------- + include/linux/blkdev.h | 24 +-- + include/linux/bvec.h | 22 +- + include/linux/socket.h | 20 +- + include/uapi/linux/io_uring.h | 1 + + net/socket.c | 76 +++---- + 15 files changed, 551 insertions(+), 296 deletions(-) +Merging device-mapper/for-next (484e0d2b11e1 dm: add dm-clone to the documentation index) +$ git merge device-mapper/for-next +Auto-merging Documentation/admin-guide/device-mapper/index.rst +Merge made by the 'recursive' strategy. + Documentation/admin-guide/device-mapper/index.rst | 1 + + drivers/md/dm-mpath.c | 37 +---------------------- + 2 files changed, 2 insertions(+), 36 deletions(-) +Merging pcmcia/pcmcia-next (bd9d6e0371d1 pcmcia: remove unused dprintk definition) +$ git merge pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (def7bd940f8c dt-bindings: mmc: Correct the type of the clk phase properties) +$ git merge mmc/next +Already up to date. +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 (edfaeaf742b4 Revert "mfd: syscon: Set name of regmap_config") +$ git merge mfd/for-mfd-next +Already up to date. +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 (9480029fe5c2 power: supply: bd70528: Add MODULE_ALIAS to allow module auto loading) +$ git merge battery/for-next +Already up to date. +Merging regulator/for-next (88c888614e8f Merge branch 'regulator-5.5' into regulator-linus) +$ git merge regulator/for-next +Already up to date. +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 +Auto-merging security/apparmor/policy_unpack.c +Auto-merging security/apparmor/policy.c +Auto-merging security/apparmor/mount.c +Auto-merging security/apparmor/match.c +Auto-merging security/apparmor/lsm.c +Auto-merging security/apparmor/label.c +Auto-merging security/apparmor/include/policy_unpack.h +Auto-merging security/apparmor/include/path.h +Auto-merging security/apparmor/include/match.h +Auto-merging security/apparmor/include/file.h +Auto-merging security/apparmor/include/apparmor.h +Auto-merging security/apparmor/file.c +Auto-merging security/apparmor/domain.c +Auto-merging security/apparmor/apparmorfs.c +Auto-merging security/apparmor/Kconfig +Merge made by the 'recursive' strategy. + security/apparmor/Kconfig | 2 + + security/apparmor/apparmorfs.c | 130 +++++++++++++++++++- + security/apparmor/domain.c | 46 +++---- + security/apparmor/file.c | 45 ++++--- + security/apparmor/include/apparmor.h | 1 + + security/apparmor/include/file.h | 2 +- + security/apparmor/include/match.h | 3 +- + security/apparmor/include/path.h | 50 +------- + security/apparmor/include/policy_unpack.h | 8 +- + security/apparmor/label.c | 12 +- + security/apparmor/lsm.c | 198 ++++++++++++++++++++++++------ + security/apparmor/match.c | 6 +- + security/apparmor/mount.c | 67 +++++++--- + security/apparmor/policy.c | 5 +- + security/apparmor/policy_unpack.c | 116 ++++++++++++++++- + 15 files changed, 526 insertions(+), 165 deletions(-) +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 (48274e1e5d24 Merge branch 'notifications-core' into keys-next) +$ git merge keys/keys-next +Auto-merging security/smack/smack_lsm.c +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +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/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/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/alpha/kernel/syscalls/syscall.tbl +Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst +Auto-merging Documentation/security/keys/core.rst +Resolved 'include/linux/security.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 --no-edit -v -a +[master 66deff3a07e3] Merge remote-tracking branch 'keys/keys-next' +$ 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/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 + + 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 | 4 +- + 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 +- + 61 files changed, 2593 insertions(+), 32 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 (42345b68c2e3 selinux: default_range glblub implementation) +$ git merge selinux/next +Already up to date. +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 (c39593ab0500 tomoyo: Don't use nifty names on sockets.) +$ git merge tomoyo/master +Merge made by the 'recursive' strategy. + security/tomoyo/realpath.c | 32 +------------------------------- + security/tomoyo/tomoyo.c | 6 ++++++ + 2 files changed, 7 insertions(+), 31 deletions(-) +Merging tpmdd/next (0b40dbcbba92 KEYS: trusted: Remove set but not used variable 'keyhndl') +$ git merge tpmdd/next +Already up to date. +Merging watchdog/master (33c26ab4d6be watchdog: jz4740: Drop dependency on MACH_JZ47xx) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (9b3a713feef8 Merge branches 'iommu/fixes', 'arm/qcom', 'arm/renesas', 'arm/rockchip', 'arm/mediatek', 'arm/tegra', 'arm/smmu', 'x86/amd', 'x86/vt-d', 'virtio' and 'core' into next) +$ git merge iommu/next +Already up to date. +Merging vfio/next (026948f01eac vfio/type1: remove hugepage checks in is_invalid_reserved_pfn()) +$ git merge vfio/next +Auto-merging drivers/vfio/vfio_iommu_type1.c +Merge made by the 'recursive' strategy. + drivers/vfio/vfio_iommu_type1.c | 26 ++++---------------------- + 1 file changed, 4 insertions(+), 22 deletions(-) +Merging audit/next (c34c78dfc1fc audit: remove redundant condition check in kauditd_thread()) +$ git merge audit/next +Already up to date. +Merging devicetree/for-next (a8de1304b7df libfdt: define INT32_MAX and UINT32_MAX in libfdt_env.h) +$ git merge devicetree/for-next +Already up to date. +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 (2835ce6b10bd Merge remote-tracking branch 'spi/topic/ptp' into spi-next) +$ git merge spi/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging tip/auto-latest (e445033e5810 Merge branch 'WIP.x86/mm') +$ git merge tip/auto-latest +Auto-merging scripts/Makefile.lib +Auto-merging mm/Makefile +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/workqueue.c +Auto-merging kernel/trace/trace_syscalls.c +Auto-merging kernel/trace/trace_kprobe.c +Auto-merging kernel/trace/trace_export.c +CONFLICT (content): Merge conflict in kernel/trace/trace_export.c +Auto-merging kernel/trace/trace_events_hist.c +Auto-merging kernel/trace/trace_events.c +Auto-merging kernel/trace/trace.h +Auto-merging kernel/time/time.c +CONFLICT (content): Merge conflict in kernel/time/time.c +Auto-merging kernel/time/hrtimer.c +Auto-merging kernel/module.c +Auto-merging kernel/fork.c +Auto-merging kernel/Makefile +Auto-merging include/trace/trace_events.h +Auto-merging include/trace/events/rpcrdma.h +CONFLICT (content): Merge conflict in include/trace/events/rpcrdma.h +Auto-merging include/linux/trace_events.h +Auto-merging include/linux/module.h +Removing include/linux/irqchip/ingenic.h +Auto-merging include/linux/interrupt.h +Auto-merging fs/xfs/xfs_trace.h +Auto-merging fs/exec.c +Auto-merging drivers/pinctrl/qcom/pinctrl-msm.c +Auto-merging drivers/infiniband/hw/mlx5/main.c +Auto-merging drivers/acpi/sleep.c +Auto-merging arch/x86/xen/xen-asm_32.S +Auto-merging arch/x86/platform/efi/quirks.c +CONFLICT (modify/delete): arch/x86/mm/pat_interval.c deleted in tip/auto-latest and modified in HEAD. Version HEAD of arch/x86/mm/pat_interval.c left in tree. +Auto-merging arch/x86/mm/pat/set_memory.c +Auto-merging arch/x86/mm/ioremap.c +Auto-merging arch/x86/kernel/traps.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/kernel/head_32.S +CONFLICT (content): Merge conflict in arch/x86/kernel/head_32.S +Auto-merging arch/x86/kernel/ftrace.c +Auto-merging arch/x86/kernel/cpu/common.c +Auto-merging arch/x86/kernel/Makefile +Auto-merging arch/x86/include/asm/processor.h +Auto-merging arch/x86/include/asm/pgtable_32_types.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/pgtable_32_types.h +Removing arch/x86/include/asm/pat.h +Auto-merging arch/x86/include/asm/ftrace.h +Auto-merging arch/x86/entry/entry_32.S +CONFLICT (content): Merge conflict in arch/x86/entry/entry_32.S +Auto-merging arch/x86/Kconfig +Auto-merging arch/arm/kernel/Makefile +Auto-merging Makefile +Auto-merging MAINTAINERS +Resolved 'arch/x86/entry/entry_32.S' using previous resolution. +Resolved 'arch/x86/include/asm/pgtable_32_types.h' using previous resolution. +Resolved 'arch/x86/kernel/head_32.S' using previous resolution. +Resolved 'include/trace/events/rpcrdma.h' using previous resolution. +Resolved 'kernel/time/time.c' using previous resolution. +Resolved 'kernel/trace/trace_export.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/x86/mm/pat_interval.c +rm 'arch/x86/mm/pat_interval.c' +$ git commit --no-edit -v -a +[master 4fc52faf2532] 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 ++++++++ + .../interrupt-controller/brcm,bcm7038-l1-intc.txt | 11 + + .../interrupt-controller/fsl,ls-extirq.txt | 49 ++ + .../bindings/interrupt-controller/interrupts.txt | 12 + + .../bindings/interrupt-controller/qcom,pdc.txt | 3 +- + MAINTAINERS | 11 + + Makefile | 3 +- + arch/arm/include/asm/arch_gicv3.h | 2 +- + arch/arm/kernel/Makefile | 4 +- + arch/arm/kernel/ftrace.c | 10 +- + arch/ia64/include/asm/acpi.h | 5 +- + arch/ia64/kernel/acpi.c | 2 - + arch/nds32/kernel/ftrace.c | 12 - + arch/x86/Kconfig | 3 +- + arch/x86/boot/Makefile | 2 + + arch/x86/boot/compressed/Makefile | 2 + + arch/x86/entry/entry_32.S | 2 +- + arch/x86/entry/vdso/Makefile | 3 + + 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/ftrace.h | 2 - + arch/x86/include/asm/kprobes.h | 14 +- + arch/x86/include/asm/memtype.h | 27 + + 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_types.h | 143 ++--- + arch/x86/include/asm/set_memory.h | 2 - + arch/x86/include/asm/text-patching.h | 86 ++- + arch/x86/kernel/Makefile | 4 + + arch/x86/kernel/acpi/sleep.c | 11 + + arch/x86/kernel/acpi/sleep.h | 2 +- + arch/x86/kernel/alternative.c | 122 +++- + arch/x86/kernel/cpu/Makefile | 3 + + arch/x86/kernel/cpu/common.c | 2 +- + arch/x86/kernel/cpu/mtrr/generic.c | 2 +- + 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/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/setup.c | 164 ++--- + arch/x86/kernel/traps.c | 9 - + 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/init_32.c | 28 - + 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} | 22 +- + arch/x86/mm/pat_interval.c | 185 ------ + 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/mmu_pv.c | 2 +- + arch/x86/xen/xen-asm_32.S | 1 - + drivers/acpi/sleep.c | 4 +- + drivers/clocksource/Kconfig | 1 + + drivers/clocksource/asm9260_timer.c | 4 + + drivers/clocksource/renesas-ostm.c | 189 +++--- + drivers/clocksource/timer-of.c | 6 +- + 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/irqchip/Kconfig | 8 +- + drivers/irqchip/Makefile | 1 + + drivers/irqchip/irq-bcm7038-l1.c | 119 +++- + drivers/irqchip/irq-gic-v3-its.c | 302 ++++++--- + drivers/irqchip/irq-gic-v3.c | 4 +- + drivers/irqchip/irq-ingenic.c | 85 ++- + drivers/irqchip/irq-ls-extirq.c | 197 ++++++ + drivers/irqchip/irq-ti-sci-inta.c | 5 +- + drivers/irqchip/irq-zevio.c | 2 +- + drivers/irqchip/qcom-pdc.c | 149 ++++- + 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/pinctrl/qcom/pinctrl-msm.c | 112 +++- + drivers/pinctrl/qcom/pinctrl-msm.h | 14 + + drivers/pinctrl/qcom/pinctrl-sdm845.c | 23 +- + drivers/virt/vboxguest/vboxguest_core.c | 1 + + drivers/virt/vboxguest/vboxguest_utils.c | 1 + + fs/exec.c | 2 +- + fs/proc/array.c | 2 +- + 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/hrtimer.h | 14 +- + include/linux/interrupt.h | 3 +- + include/linux/irq.h | 6 + + include/linux/irq_work.h | 10 +- + include/linux/irqchip/arm-gic-v3.h | 4 +- + include/linux/irqchip/ingenic.h | 14 - + include/linux/irqdomain.h | 1 + + include/linux/kcsan-checks.h | 93 +++ + include/linux/kcsan.h | 108 ++++ + include/linux/module.h | 4 - + include/linux/sched.h | 6 +- + include/linux/seqlock.h | 51 +- + include/linux/soc/qcom/irq.h | 34 + + include/linux/trace_events.h | 18 +- + include/trace/events/filemap.h | 2 +- + include/trace/trace_events.h | 64 +- + init/init_task.c | 8 + + init/main.c | 2 + + kernel/Makefile | 6 + + kernel/bpf/stackmap.c | 2 +- + kernel/fork.c | 2 +- + kernel/irq/chip.c | 44 ++ + kernel/irq/irqdesc.c | 2 +- + kernel/irq_work.c | 34 +- + 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/module.c | 43 -- + kernel/printk/printk.c | 2 +- + kernel/sched/Makefile | 6 + + kernel/time/hrtimer.c | 11 +- + kernel/time/time.c | 25 +- + kernel/trace/bpf_trace.c | 2 +- + 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 +- + lib/Kconfig.debug | 2 + + lib/Kconfig.kcsan | 116 ++++ + lib/Makefile | 3 + + mm/Makefile | 8 + + net/mac80211/trace.h | 28 +- + net/wireless/trace.h | 6 +- + scripts/Makefile.kcsan | 6 + + scripts/Makefile.lib | 10 + + scripts/atomic/gen-atomic-instrumented.sh | 17 +- + sound/soc/intel/skylake/skl-sst-cldma.c | 1 + + tools/objtool/check.c | 18 + + 166 files changed, 4922 insertions(+), 2205 deletions(-) + create mode 100644 Documentation/dev-tools/kcsan.rst + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/fsl,ls-extirq.txt + create mode 100644 arch/x86/include/asm/memtype.h + delete mode 100644 arch/x86/include/asm/pat.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 drivers/irqchip/irq-ls-extirq.c + delete mode 100644 include/linux/irqchip/ingenic.h + create mode 100644 include/linux/kcsan-checks.h + create mode 100644 include/linux/kcsan.h + create mode 100644 include/linux/soc/qcom/irq.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 +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 (5781823fd0d3 EDAC/altera: Use the Altera System Manager driver) +$ git merge edac/edac-for-next +Already up to date. +Merging irqchip/irq/irqchip-next (090adda307bb 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 (16c0f03f629a tracing: Enable syscall optimization for MIPS) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (e100e2f047de Merge commit '8dcdfb7096a304130ab36fbb0f2961deaf863e5a' into for-mingo) +$ git merge rcu/rcu/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging kvm/linux-next (96710247298d Merge tag 'kvm-ppc-next-5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into HEAD) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (cd7056ae34af Merge remote-tracking branch 'kvmarm/misc-5.5' into kvmarm/next) +$ git merge kvm-arm/next +Already up to date. +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 (b3f7931f5c61 xen/gntdev: switch from kcalloc() to kvcalloc()) +$ git merge xen-tip/linux-next +Merge made by the 'recursive' strategy. + drivers/xen/events/events_base.c | 16 ++-------- + drivers/xen/gntdev-common.h | 2 +- + drivers/xen/gntdev-dmabuf.c | 11 ++----- + drivers/xen/gntdev.c | 64 ++++++++++++++++------------------------ + 4 files changed, 32 insertions(+), 61 deletions(-) +Merging percpu/for-next (fc6a00f8f3cf Merge branch 'for-5.5' into for-next) +$ git merge percpu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +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 (f3e4f3fc8ee9 platform/x86: hp-wmi: Fix ACPI errors caused by passing 0 as input size) +$ git merge drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (30af09e33c82 platform/chrome: cros_ec: Add Kconfig default for cros-ec-sensorhub) +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-platform-wilco-ec | 17 ++ + drivers/iio/accel/cros_ec_accel_legacy.c | 6 - + drivers/iio/common/cros_ec_sensors/Kconfig | 2 +- + .../iio/common/cros_ec_sensors/cros_ec_sensors.c | 6 - + .../common/cros_ec_sensors/cros_ec_sensors_core.c | 4 +- + drivers/iio/light/cros_ec_light_prox.c | 6 - + drivers/input/keyboard/cros_ec_keyb.c | 6 +- + drivers/mfd/cros_ec_dev.c | 235 +----------------- + drivers/platform/chrome/Kconfig | 19 +- + drivers/platform/chrome/Makefile | 1 + + drivers/platform/chrome/cros_ec.c | 84 ++++++- + drivers/platform/chrome/cros_ec_ishtp.c | 25 +- + drivers/platform/chrome/cros_ec_lpc.c | 17 +- + drivers/platform/chrome/cros_ec_proto.c | 267 ++++++++++++++++++--- + drivers/platform/chrome/cros_ec_rpmsg.c | 19 +- + drivers/platform/chrome/cros_ec_sensorhub.c | 199 +++++++++++++++ + drivers/platform/chrome/wilco_ec/Kconfig | 2 +- + drivers/platform/chrome/wilco_ec/Makefile | 3 +- + drivers/platform/chrome/wilco_ec/core.c | 28 ++- + drivers/platform/chrome/wilco_ec/debugfs.c | 47 +++- + drivers/platform/chrome/wilco_ec/keyboard_leds.c | 191 +++++++++++++++ + drivers/platform/chrome/wilco_ec/sysfs.c | 91 +++++++ + include/linux/platform_data/cros_ec_proto.h | 138 +++-------- + include/linux/platform_data/cros_ec_sensorhub.h | 30 +++ + include/linux/platform_data/wilco-ec.h | 15 ++ + 25 files changed, 1017 insertions(+), 441 deletions(-) + create mode 100644 drivers/platform/chrome/cros_ec_sensorhub.c + create mode 100644 drivers/platform/chrome/wilco_ec/keyboard_leds.c + create mode 100644 include/linux/platform_data/cros_ec_sensorhub.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 (8e6a5c833333 ipmi: fix ipmb_poll()'s return type) +$ git merge ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (388c645a33a7 Merge tag 'spdx-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx) +$ git merge driver-core/driver-core-next +Auto-merging kernel/time/time.c +CONFLICT (content): Merge conflict in kernel/time/time.c +Auto-merging arch/xtensa/kernel/vmlinux.lds.S +Auto-merging arch/arm/boot/dts/aspeed-g5.dtsi +Auto-merging Documentation/power/pci.rst +CONFLICT (content): Merge conflict in Documentation/power/pci.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Recorded preimage for 'Documentation/power/pci.rst' +Recorded preimage for 'kernel/time/time.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'Documentation/power/pci.rst'. +Recorded resolution for 'kernel/time/time.c'. +[master a83c9fad5c5f] Merge remote-tracking branch 'driver-core/driver-core-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/stable/sysfs-driver-aspeed-vuart | 11 +- + Documentation/admin-guide/kernel-parameters.txt | 2 +- + Documentation/devicetree/bindings/serial/8250.txt | 5 + + .../devicetree/bindings/serial/fsl-lpuart.txt | 3 +- + .../bindings/serial/renesas,sci-serial.txt | 6 +- + Documentation/power/pci.rst | 10 +- + Documentation/process/magic-number.rst | 1 - + .../translations/it_IT/process/magic-number.rst | 1 - + .../translations/zh_CN/process/magic-number.rst | 1 - + arch/arm/boot/dts/aspeed-g5.dtsi | 1 + + arch/mips/sgi-ip32/ip32-platform.c | 2 +- + arch/xtensa/kernel/vmlinux.lds.S | 2 +- + drivers/mtd/nand/onenand/Makefile | 2 +- + .../mtd/nand/onenand/{samsung.c => samsung_mtd.c} | 0 + drivers/net/wan/z85230.h | 2 - + drivers/rtc/Kconfig | 31 ++- + drivers/rtc/interface.c | 58 +++- + drivers/rtc/rtc-ab-b5ze-s3.c | 11 - + drivers/rtc/rtc-armada38x.c | 10 +- + drivers/rtc/rtc-asm9260.c | 4 +- + drivers/rtc/rtc-aspeed.c | 4 +- + drivers/rtc/rtc-at91rm9200.c | 19 +- + drivers/rtc/rtc-at91sam9.c | 4 +- + drivers/rtc/rtc-bd70528.c | 1 + + drivers/rtc/rtc-brcmstb-waketimer.c | 5 +- + drivers/rtc/rtc-cadence.c | 4 +- + drivers/rtc/rtc-coh901331.c | 4 +- + drivers/rtc/rtc-cros-ec.c | 22 +- + drivers/rtc/rtc-da9063.c | 3 + + drivers/rtc/rtc-davinci.c | 4 +- + drivers/rtc/rtc-digicolor.c | 4 +- + drivers/rtc/rtc-ds1216.c | 4 +- + drivers/rtc/rtc-ds1286.c | 4 +- + drivers/rtc/rtc-ds1302.c | 2 - + drivers/rtc/rtc-ds1343.c | 297 ++++++--------------- + drivers/rtc/rtc-ds1347.c | 102 +++---- + drivers/rtc/rtc-ds1374.c | 3 +- + drivers/rtc/rtc-ds1511.c | 4 +- + drivers/rtc/rtc-ds1553.c | 4 +- + drivers/rtc/rtc-ds1685.c | 116 ++++---- + drivers/rtc/rtc-em3027.c | 4 +- + drivers/rtc/rtc-ep93xx.c | 4 +- + drivers/rtc/rtc-fsl-ftm-alarm.c | 24 +- + drivers/rtc/rtc-goldfish.c | 8 +- + drivers/rtc/rtc-jz4740.c | 4 +- + drivers/rtc/rtc-lpc24xx.c | 4 +- + drivers/rtc/rtc-lpc32xx.c | 15 +- + drivers/rtc/rtc-m41t80.c | 6 +- + drivers/rtc/rtc-m48t86.c | 11 +- + drivers/rtc/rtc-mc146818-lib.c | 15 +- + drivers/rtc/rtc-meson.c | 6 +- + drivers/rtc/rtc-msm6242.c | 23 +- + drivers/rtc/rtc-mt7622.c | 4 +- + drivers/rtc/rtc-mv.c | 4 +- + drivers/rtc/rtc-omap.c | 4 +- + drivers/rtc/rtc-pcf2127.c | 10 +- + drivers/rtc/rtc-pcf8523.c | 18 +- + drivers/rtc/rtc-pcf8563.c | 2 +- + drivers/rtc/rtc-pic32.c | 4 +- + drivers/rtc/rtc-pm8xxx.c | 2 +- + drivers/rtc/rtc-r7301.c | 7 +- + drivers/rtc/rtc-rtd119x.c | 4 +- + drivers/rtc/rtc-rv3028.c | 146 ++++++++++ + drivers/rtc/rtc-rx6110.c | 16 +- + drivers/rtc/rtc-s35390a.c | 16 +- + drivers/rtc/rtc-s3c.c | 4 +- + drivers/rtc/rtc-sa1100.c | 4 +- + drivers/rtc/rtc-sc27xx.c | 7 - + drivers/rtc/rtc-sirfsoc.c | 8 - + drivers/rtc/rtc-spear.c | 4 +- + drivers/rtc/rtc-st-lpc.c | 5 +- + drivers/rtc/rtc-stk17ta8.c | 4 +- + drivers/rtc/rtc-stm32.c | 4 +- + drivers/rtc/rtc-sun6i.c | 2 - + drivers/rtc/rtc-sunxi.c | 4 +- + drivers/rtc/rtc-tegra.c | 8 +- + drivers/rtc/rtc-tps65910.c | 21 +- + drivers/rtc/rtc-tx4939.c | 4 +- + drivers/rtc/rtc-v3020.c | 3 +- + drivers/rtc/rtc-vt8500.c | 32 +-- + drivers/rtc/rtc-wilco-ec.c | 8 +- + drivers/rtc/rtc-xgene.c | 6 +- + drivers/rtc/rtc-zynqmp.c | 7 +- + drivers/rtc/sysfs.c | 5 +- + drivers/tty/Kconfig | 40 +-- + drivers/tty/amiserial.c | 84 ------ + drivers/tty/hvc/Kconfig | 28 +- + drivers/tty/hvc/hvc_dcc.c | 28 ++ + drivers/tty/rocket.c | 32 ++- + drivers/tty/serdev/core.c | 111 +++++++- + drivers/tty/serial/8250/8250_aspeed_vuart.c | 84 ++++++ + drivers/tty/serial/8250/8250_dw.c | 83 +++--- + drivers/tty/serial/8250/8250_exar.c | 19 ++ + drivers/tty/serial/8250/8250_lpss.c | 21 +- + drivers/tty/serial/8250/8250_mtk.c | 2 +- + drivers/tty/serial/8250/8250_of.c | 31 +++ + drivers/tty/serial/8250/8250_pci.c | 292 +------------------- + drivers/tty/serial/8250/8250_port.c | 14 - + drivers/tty/serial/8250/Kconfig | 3 +- + drivers/tty/serial/Kconfig | 104 ++++---- + drivers/tty/serial/Makefile | 2 +- + drivers/tty/serial/amba-pl011.c | 12 +- + drivers/tty/serial/fsl_linflexuart.c | 4 +- + drivers/tty/serial/fsl_lpuart.c | 84 ++++-- + drivers/tty/serial/ifx6x60.c | 3 + + drivers/tty/serial/imx.c | 7 +- + drivers/tty/serial/msm_serial.c | 10 +- + drivers/tty/serial/pch_uart.c | 5 +- + drivers/tty/serial/qcom_geni_serial.c | 68 ++++- + drivers/tty/serial/{samsung.c => samsung_tty.c} | 0 + drivers/tty/serial/serial-tegra.c | 3 +- + drivers/tty/serial/serial_core.c | 2 +- + drivers/tty/serial/sirfsoc_uart.h | 5 +- + drivers/tty/serial/sprd_serial.c | 33 +++ + drivers/tty/serial/stm32-usart.c | 6 +- + drivers/tty/serial/uartlite.c | 97 ++----- + drivers/tty/tty_io.c | 14 +- + drivers/tty/tty_ldisc.c | 7 +- + drivers/tty/vt/keyboard.c | 2 +- + drivers/tty/vt/vc_screen.c | 3 + + include/linux/rtc.h | 5 + + include/linux/rtc/ds1685.h | 12 +- + include/uapi/linux/serial_core.h | 2 +- + kernel/time/time.c | 5 +- + 124 files changed, 1240 insertions(+), 1401 deletions(-) + rename drivers/mtd/nand/onenand/{samsung.c => samsung_mtd.c} (100%) + rename drivers/tty/serial/{samsung.c => samsung_tty.c} (100%) +Merging usb/usb-next (388c645a33a7 Merge tag 'spdx-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx) +$ git merge usb/usb-next +Already up to date. +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 (c1a1f273d082 USB: serial: ftdi_sio: add device IDs for U-Blox C099-F9P) +$ 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 (4569e64ab6a5 phy: phy-rockchip-inno-usb2: add phy description for px30) +$ git merge phy-next/next +Already up to date. +Merging tty/tty-next (388c645a33a7 Merge tag 'spdx-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx) +$ git merge tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (388c645a33a7 Merge tag 'spdx-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx) +$ git merge char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (ddd1bbbae486 extcon: sm5502: remove redundant assignment to variable cable_type) +$ git merge extcon/extcon-next +Already up to date. +Merging soundwire/next (2e8c4ad1f044 soundwire: ignore uniqueID when irrelevant) +$ git merge soundwire/next +Already up to date. +Merging thunderbolt/next (b001da2905e7 thunderbolt: Power cycle the router if NVM authentication fails) +$ git merge thunderbolt/next +Merge made by the 'recursive' strategy. +Merging staging/staging-next (388c645a33a7 Merge tag 'spdx-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx) +$ git merge staging/staging-next +Already up to date. +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 (a99d8080aaf3 Linux 5.4-rc6) +$ git merge icc/icc-next +Already up to date. +Merging slave-dma/next (67805a4b3c92 dmaengine: Fix Kconfig indentation) +$ git merge slave-dma/next +Already up to date. +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 (bef091d1f68b Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/sd_zbc.c +Auto-merging drivers/scsi/sd.h +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/scsi/lpfc/lpfc_init.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 3 +-- + drivers/scsi/lpfc/lpfc_init.c | 2 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 2 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 3 +-- + drivers/scsi/qla2xxx/qla_gs.c | 16 ++++++++++++++-- + drivers/scsi/qla2xxx/qla_init.c | 6 +++--- + drivers/scsi/qla2xxx/qla_isr.c | 6 +++--- + drivers/scsi/scsi_transport_sas.c | 9 +-------- + drivers/scsi/sd.c | 9 ++------- + drivers/scsi/sd.h | 3 +++ + drivers/scsi/sd_zbc.c | 8 +++++--- + 12 files changed, 36 insertions(+), 32 deletions(-) +Merging scsi-mkp/for-next (1eb9151eb7c5 scsi: MAINTAINERS: Add the linux-scsi mailing list to the ISCSI entry) +$ git merge scsi-mkp/for-next +Already up to date. +Merging vhost/linux-next (3f44c42b2ca0 vhost: last descriptor must have NEXT clear) +$ git merge vhost/linux-next +Auto-merging net/sched/sch_generic.c +Auto-merging include/linux/netdevice.h +Auto-merging drivers/vhost/test.c +Auto-merging drivers/vhost/net.c +Auto-merging drivers/staging/rtl8192u/r8192U_core.c +Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_core.c +Auto-merging drivers/staging/qlge/qlge_main.c +Auto-merging drivers/s390/net/qeth_core_main.c +Auto-merging drivers/s390/net/qeth_core.h +Auto-merging drivers/net/wireless/quantenna/qtnfmac/core.c +Auto-merging drivers/net/wireless/marvell/mwifiex/main.c +Auto-merging drivers/net/wireless/intel/ipw2x00/ipw2100.c +Auto-merging drivers/net/usb/usbnet.c +Auto-merging drivers/net/usb/r8152.c +Auto-merging drivers/net/usb/lan78xx.c +Auto-merging drivers/net/usb/hso.c +Auto-merging drivers/net/slip/slip.c +Auto-merging drivers/net/ethernet/ti/cpsw.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/ti/cpsw.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +Auto-merging drivers/net/ethernet/sgi/ioc3-eth.c +Auto-merging drivers/net/ethernet/sfc/efx.c +Auto-merging drivers/net/ethernet/renesas/sh_eth.c +Auto-merging drivers/net/ethernet/renesas/ravb_main.c +Auto-merging drivers/net/ethernet/realtek/r8169_main.c +Auto-merging drivers/net/ethernet/qualcomm/emac/emac.c +Auto-merging drivers/net/ethernet/pensando/ionic/ionic_lif.c +Auto-merging drivers/net/ethernet/nvidia/forcedeth.c +Auto-merging drivers/net/ethernet/netronome/nfp/nfp_net_common.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c +Auto-merging drivers/net/ethernet/mellanox/mlx4/en_netdev.c +Auto-merging drivers/net/ethernet/mediatek/mtk_eth_soc.c +Auto-merging drivers/net/ethernet/marvell/pxa168_eth.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/ixgb/ixgb_main.c +Auto-merging drivers/net/ethernet/intel/igbvf/netdev.c +Auto-merging drivers/net/ethernet/intel/igb/igb_main.c +Auto-merging drivers/net/ethernet/intel/ice/ice_main.c +Auto-merging drivers/net/ethernet/intel/i40e/i40e_main.c +Auto-merging drivers/net/ethernet/intel/fm10k/fm10k_netdev.c +Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c +Auto-merging drivers/net/ethernet/intel/e1000/e1000_main.c +Auto-merging drivers/net/ethernet/ibm/ibmvnic.c +Auto-merging drivers/net/ethernet/ibm/emac/core.c +Auto-merging drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +Auto-merging drivers/net/ethernet/hisilicon/hix5hd2_gmac.c +Auto-merging drivers/net/ethernet/hisilicon/hip04_eth.c +Auto-merging drivers/net/ethernet/google/gve/gve_main.c +Auto-merging drivers/net/ethernet/freescale/gianfar.c +Auto-merging drivers/net/ethernet/freescale/fec_main.c +Auto-merging drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +Auto-merging drivers/net/ethernet/faraday/ftgmac100.c +Auto-merging drivers/net/ethernet/cavium/thunder/nicvf_main.c +Auto-merging drivers/net/ethernet/calxeda/xgmac.c +Auto-merging drivers/net/ethernet/broadcom/genet/bcmgenet.c +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.c +Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +Auto-merging drivers/net/ethernet/broadcom/bcmsysport.c +Auto-merging drivers/net/ethernet/broadcom/b44.c +Auto-merging drivers/net/ethernet/atheros/ag71xx.c +Auto-merging drivers/net/ethernet/amazon/ena/ena_netdev.c +Auto-merging drivers/infiniband/ulp/ipoib/ipoib_main.c +Auto-merging arch/um/drivers/vector_kern.c +Recorded preimage for 'drivers/net/ethernet/ti/cpsw.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/net/ethernet/ti/cpsw.c'. +[master 774d2141b567] Merge remote-tracking branch 'vhost/linux-next' +$ git diff -M --stat --summary HEAD^.. + 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/char/pcmcia/synclink_cs.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/appletalk/cops.c | 4 +- + drivers/net/arcnet/arcdevice.h | 2 +- + drivers/net/arcnet/arcnet.c | 2 +- + 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 | 2 +- + 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_netdev.c | 2 +- + 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/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/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/tulip_core.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/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 +- + 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/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/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 | 2 +- + 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 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 10 +- + 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/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 | 2 +- + drivers/net/ethernet/renesas/ravb_main.c | 2 +- + drivers/net/ethernet/renesas/sh_eth.c | 2 +- + 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 | 2 +- + 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/stmmac_main.c | 2 +- + 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/davinci_emac.c | 2 +- + drivers/net/ethernet/ti/netcp_core.c | 2 +- + drivers/net/ethernet/ti/tlan.c | 4 +- + 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/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/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/s390/net/qeth_core.h | 2 +- + drivers/s390/net/qeth_core_main.c | 2 +- + 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 +- + drivers/vhost/net.c | 32 +- + drivers/vhost/test.c | 19 +- + drivers/vhost/vhost.c | 328 ++++++++++++++++++++- + drivers/vhost/vhost.h | 20 +- + drivers/virtio/virtio_balloon.c | 25 +- + include/linux/netdevice.h | 5 +- + include/linux/ptr_ring.h | 79 ++++- + include/linux/usb/usbnet.h | 2 +- + net/atm/lec.c | 2 +- + net/bluetooth/bnep/netdev.c | 2 +- + net/sched/sch_generic.c | 2 +- + 239 files changed, 770 insertions(+), 336 deletions(-) +$ git am -3 ../patches/0001-netdev-fix-up-for-pass-the-stuck-queue-to-the-timeou.patch +Applying: netdev: fix up for "pass the stuck queue to the timeout handler" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/net/ethernet/ti/cpsw_priv.c +M drivers/net/ethernet/ti/cpsw_priv.h +$ git add -A . +$ git commit -v -a --amend +[master a94c95198204] Merge remote-tracking branch 'vhost/linux-next' + Date: Wed Dec 4 13:54:08 2019 +1100 +$ git reset --hard HEAD^ +HEAD is now at e5f03330e124 Merge remote-tracking branch 'scsi/for-next' +Merging next-20191203 version of vhost +$ git merge -m next-20191203/vhost 88d3c7697f254a57e9056b7a8c8e028b790f1bdb +Auto-merging drivers/vhost/test.c +Auto-merging drivers/vhost/net.c +Merge made by the 'recursive' strategy. + drivers/vhost/net.c | 32 +++- + drivers/vhost/test.c | 19 ++- + drivers/vhost/vhost.c | 328 +++++++++++++++++++++++++++++++++++++++- + drivers/vhost/vhost.h | 20 ++- + drivers/virtio/virtio_balloon.c | 25 +-- + include/linux/ptr_ring.h | 79 +++++++++- + 6 files changed, 473 insertions(+), 30 deletions(-) +Merging rpmsg/for-next (723710fe4bab Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging gpio/for-next (41c4616bb81f gpio: Add TODO item for regmap helper) +$ git merge gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (0f67f16a6e88 gpio: mmio: remove untrue leftover comment) +$ git merge gpio-brgl/gpio/for-next +Already up to date. +Merging gpio-intel/for-next (41c4616bb81f gpio: Add TODO item for regmap helper) +$ git merge gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (6d29032c2cef pinctrl: Fix warning by adding missing MODULE_LICENSE) +$ git merge pinctrl/for-next +Already up to date. +Merging pinctrl-intel/for-next (8ae93b5ed9be pinctrl: cherryview: Missed type change to unsigned int) +$ git merge pinctrl-intel/for-next +Already up to date. +Merging pinctrl-samsung/for-next (a322b3377f4b pinctrl: samsung: Fix device node refcount leaks in init code) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (9e1b4999a169 pwm: stm32: Pass breakinput instead of its values) +$ git merge pwm/for-next +CONFLICT (modify/delete): Documentation/devicetree/bindings/pwm/pwm-stm32.txt deleted in HEAD and modified in pwm/for-next. Version pwm/for-next of Documentation/devicetree/bindings/pwm/pwm-stm32.txt left in tree. +Auto-merging Documentation/devicetree/bindings/pwm/pwm-mediatek.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f Documentation/devicetree/bindings/pwm/pwm-stm32.txt +rm 'Documentation/devicetree/bindings/pwm/pwm-stm32.txt' +$ git commit --no-edit -v -a +[master 009520d84fa8] Merge remote-tracking branch 'pwm/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/pwm/pwm-mediatek.txt | 2 +- + drivers/pwm/pwm-stm32.c | 112 +++++++++++++++------ + drivers/pwm/pwm-sun4i.c | 5 +- + include/linux/mfd/stm32-timers.h | 12 +-- + include/linux/pwm.h | 5 +- + 5 files changed, 90 insertions(+), 46 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 (54ecb8f7028c Linux 5.4-rc1) +$ git merge kselftest/next +Already up to date. +Merging y2038/y2038 (6d75353320b4 Merge tag 'y2038-cleanups-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground into y2038) +$ git merge y2038/y2038 +Already up to date! +Merge made by the 'recursive' strategy. +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 (9a5d847c0bda coresight: replicator: Fix missing spin_lock_init()) +$ git merge coresight/next +Already up to date. +Merging rtc/rtc-next (f830f7cf4752 rtc: Fix Kconfig indentation) +$ git merge rtc/rtc-next +Already up to date. +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 (285be87c79e1 eeprom: at24: Improve confusing log message) +$ 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 +Merge made by the 'recursive' strategy. + drivers/ntb/hw/amd/ntb_hw_amd.c | 5 +++-- + drivers/ntb/hw/amd/ntb_hw_amd.h | 1 - + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging kspp/for-next/kspp (ec2f877856e0 treewide: Use sizeof_member() macro) +$ git merge kspp/for-next/kspp +Auto-merging virt/kvm/kvm_main.c +Auto-merging sound/soc/codecs/hdmi-codec.c +Auto-merging security/integrity/ima/ima_policy.c +Auto-merging net/unix/af_unix.c +Auto-merging net/sctp/socket.c +Auto-merging net/sched/cls_flower.c +Auto-merging net/sched/act_ct.c +Auto-merging net/openvswitch/flow.h +Auto-merging net/openvswitch/datapath.c +Auto-merging net/netfilter/nf_tables_api.c +Auto-merging net/ipv6/ip6_gre.c +Auto-merging net/ipv4/tcp.c +Auto-merging net/ipv4/ip_gre.c +Auto-merging net/dccp/proto.c +Auto-merging net/core/xdp.c +Auto-merging net/core/skbuff.c +Auto-merging net/core/flow_dissector.c +Auto-merging net/core/filter.c +Auto-merging net/core/dev.c +Auto-merging net/caif/caif_socket.c +Auto-merging kernel/signal.c +Auto-merging kernel/fork.c +Auto-merging kernel/bpf/local_storage.c +Auto-merging kernel/bpf/cgroup.c +Auto-merging include/net/sock.h +Auto-merging include/linux/slab.h +Auto-merging include/linux/kvm_host.h +Auto-merging include/linux/filter.h +Auto-merging fs/fuse/virtio_fs.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ext2/super.c +Auto-merging fs/crypto/keyring.c +Auto-merging drivers/usb/gadget/function/f_fs.c +Auto-merging drivers/scsi/smartpqi/smartpqi_init.c +Auto-merging drivers/scsi/cxgbi/libcxgbi.c +Auto-merging drivers/scsi/aacraid/aachba.c +Auto-merging drivers/s390/net/qeth_core_mpc.h +Auto-merging drivers/s390/net/qeth_core_main.c +Auto-merging drivers/net/vxlan.c +Auto-merging drivers/net/usb/usbnet.c +Auto-merging drivers/net/hyperv/netvsc_drv.c +Auto-merging drivers/net/ethernet/ti/netcp_ethss.c +Auto-merging drivers/net/ethernet/netronome/nfp/bpf/offload.c +Auto-merging drivers/net/ethernet/netronome/nfp/bpf/jit.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +Auto-merging drivers/net/ethernet/mellanox/mlx4/en_ethtool.c +Auto-merging drivers/net/ethernet/marvell/mv643xx_eth.c +Auto-merging drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h +Auto-merging drivers/net/ethernet/intel/ice/ice_ethtool.c +Auto-merging drivers/net/ethernet/intel/i40e/i40e_ethtool.c +Auto-merging drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c +Auto-merging drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +Auto-merging drivers/md/raid5-ppl.c +Auto-merging drivers/infiniband/hw/hfi1/verbs.h +Auto-merging drivers/infiniband/hw/hfi1/sdma.c +Auto-merging drivers/infiniband/hw/efa/efa_verbs.c +Auto-merging drivers/gpu/drm/i915/gvt/scheduler.c +Auto-merging drivers/firmware/efi/efi.c +Auto-merging crypto/essiv.c +Auto-merging crypto/adiantum.c +Auto-merging block/blk-core.c +Auto-merging arch/x86/kernel/fpu/xstate.c +CONFLICT (content): Merge conflict in arch/x86/kernel/fpu/xstate.c +Auto-merging arch/arm64/include/asm/processor.h +Auto-merging Documentation/process/coding-style.rst +Resolved 'arch/x86/kernel/fpu/xstate.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master fb8262d69a6b] Merge remote-tracking branch 'kspp/for-next/kspp' +$ git diff -M --stat --summary HEAD^.. + Documentation/process/coding-style.rst | 2 +- + .../translations/it_IT/process/coding-style.rst | 2 +- + .../translations/zh_CN/process/coding-style.rst | 2 +- + arch/arc/kernel/unwind.c | 6 +- + arch/arm64/include/asm/processor.h | 10 +- + arch/mips/cavium-octeon/executive/cvmx-bootmem.c | 9 +- + arch/powerpc/net/bpf_jit32.h | 4 +- + arch/powerpc/net/bpf_jit_comp.c | 16 +-- + arch/sparc/net/bpf_jit_comp_32.c | 8 +- + arch/x86/kernel/fpu/xstate.c | 4 +- + block/blk-core.c | 4 +- + crypto/adiantum.c | 4 +- + crypto/essiv.c | 2 +- + drivers/firmware/efi/efi.c | 2 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 2 +- + drivers/infiniband/hw/efa/efa_verbs.c | 2 +- + drivers/infiniband/hw/hfi1/sdma.c | 2 +- + drivers/infiniband/hw/hfi1/verbs.h | 4 +- + drivers/infiniband/ulp/opa_vnic/opa_vnic_ethtool.c | 2 +- + drivers/input/keyboard/applespi.c | 2 +- + drivers/md/raid5-ppl.c | 2 +- + drivers/media/platform/omap3isp/isppreview.c | 24 ++-- + drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 4 +- + .../net/ethernet/cavium/liquidio/octeon_console.c | 16 +-- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 2 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 2 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 2 +- + drivers/net/ethernet/huawei/hinic/hinic_ethtool.c | 8 +- + drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | 2 +- + drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 2 +- + drivers/net/ethernet/intel/ice/ice_ethtool.c | 10 +- + drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 2 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 4 +- + drivers/net/ethernet/intel/igc/igc_ethtool.c | 4 +- + drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c | 4 +- + drivers/net/ethernet/intel/ixgbevf/ethtool.c | 4 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/fpga/ipsec.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 4 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c | 4 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c | 2 +- + drivers/net/ethernet/netronome/nfp/bpf/jit.c | 10 +- + drivers/net/ethernet/netronome/nfp/bpf/main.c | 2 +- + drivers/net/ethernet/netronome/nfp/bpf/offload.c | 2 +- + drivers/net/ethernet/netronome/nfp/flower/main.h | 2 +- + .../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c | 2 +- + drivers/net/ethernet/qlogic/qede/qede.h | 2 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 2 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_ethtool.c | 2 +- + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 4 +- + drivers/net/ethernet/ti/cpsw_ethtool.c | 6 +- + drivers/net/ethernet/ti/netcp_ethss.c | 32 ++--- + drivers/net/fjes/fjes_ethtool.c | 2 +- + drivers/net/geneve.c | 2 +- + drivers/net/hyperv/netvsc_drv.c | 2 +- + drivers/net/usb/sierra_net.c | 2 +- + drivers/net/usb/usbnet.c | 2 +- + drivers/net/vxlan.c | 4 +- + drivers/net/wireless/marvell/libertas/debugfs.c | 2 +- + drivers/net/wireless/marvell/mwifiex/util.h | 4 +- + drivers/s390/net/qeth_core_main.c | 2 +- + drivers/s390/net/qeth_core_mpc.h | 10 +- + drivers/scsi/aacraid/aachba.c | 4 +- + drivers/scsi/be2iscsi/be_cmds.h | 2 +- + drivers/scsi/cxgbi/libcxgbi.c | 2 +- + drivers/scsi/smartpqi/smartpqi_init.c | 6 +- + drivers/staging/qlge/qlge_ethtool.c | 2 +- + drivers/target/iscsi/cxgbit/cxgbit_main.c | 2 +- + drivers/usb/atm/usbatm.c | 2 +- + drivers/usb/gadget/function/f_fs.c | 2 +- + fs/befs/linuxvfs.c | 2 +- + fs/crypto/keyring.c | 2 +- + fs/ext2/super.c | 2 +- + fs/ext4/super.c | 2 +- + fs/freevxfs/vxfs_super.c | 2 +- + fs/fuse/virtio_fs.c | 2 +- + fs/orangefs/super.c | 2 +- + fs/ufs/super.c | 2 +- + fs/verity/enable.c | 2 +- + include/linux/filter.h | 12 +- + include/linux/kvm_host.h | 2 +- + include/linux/phy_led_triggers.h | 2 +- + include/linux/slab.h | 2 +- + include/linux/stddef.h | 13 +- + include/net/garp.h | 2 +- + include/net/ip_tunnels.h | 6 +- + include/net/mrp.h | 2 +- + include/net/netfilter/nf_conntrack_helper.h | 2 +- + include/net/netfilter/nf_tables_core.h | 2 +- + include/net/sock.h | 2 +- + ipc/util.c | 2 +- + kernel/bpf/cgroup.c | 2 +- + kernel/bpf/local_storage.c | 4 +- + kernel/fork.c | 2 +- + kernel/signal.c | 12 +- + kernel/utsname.c | 2 +- + net/802/mrp.c | 6 +- + net/batman-adv/main.c | 2 +- + net/bridge/br.c | 2 +- + net/caif/caif_socket.c | 2 +- + net/core/dev.c | 2 +- + net/core/filter.c | 140 ++++++++++----------- + net/core/flow_dissector.c | 10 +- + net/core/skbuff.c | 2 +- + net/core/xdp.c | 4 +- + net/dccp/proto.c | 2 +- + net/ipv4/ip_gre.c | 4 +- + net/ipv4/ip_vti.c | 4 +- + net/ipv4/raw.c | 2 +- + net/ipv4/tcp.c | 2 +- + net/ipv6/ip6_gre.c | 4 +- + net/ipv6/raw.c | 2 +- + net/iucv/af_iucv.c | 2 +- + net/netfilter/nf_tables_api.c | 4 +- + net/netfilter/nfnetlink_cthelper.c | 2 +- + net/netfilter/nft_ct.c | 12 +- + net/netfilter/nft_masq.c | 2 +- + net/netfilter/nft_nat.c | 6 +- + net/netfilter/nft_redir.c | 2 +- + net/netfilter/nft_tproxy.c | 4 +- + net/netfilter/xt_RATEEST.c | 2 +- + net/netlink/af_netlink.c | 2 +- + net/openvswitch/datapath.c | 2 +- + net/openvswitch/flow.h | 4 +- + net/rxrpc/af_rxrpc.c | 2 +- + net/sched/act_ct.c | 4 +- + net/sched/cls_flower.c | 2 +- + net/sctp/socket.c | 4 +- + net/unix/af_unix.c | 2 +- + security/integrity/ima/ima_policy.c | 4 +- + sound/soc/codecs/hdmi-codec.c | 2 +- + tools/testing/selftests/bpf/bpf_util.h | 6 +- + virt/kvm/kvm_main.c | 2 +- + 136 files changed, 341 insertions(+), 337 deletions(-) +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge cisco/for-next +Already up to date. +Merging gnss/gnss-next (54ecb8f7028c Linux 5.4-rc1) +$ 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 (54ecb8f7028c Linux 5.4-rc1) +$ git merge slimbus/for-next +Already up to date. +Merging nvmem/for-next (6bd17868c992 nvmem: add Rockchip OTP driver) +$ git merge nvmem/for-next +Auto-merging include/linux/nvmem-consumer.h +Merge made by the 'recursive' strategy. +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 (f53df92a3453 PM / devfreq: Don't fail devfreq_dev_release if not in list) +$ git merge devfreq/devfreq-next +Auto-merging drivers/devfreq/devfreq.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-devfreq | 7 + + .../memory-controllers/fsl/imx8m-ddrc.yaml | 72 ++++ + drivers/devfreq/Kconfig | 20 +- + drivers/devfreq/Makefile | 1 + + drivers/devfreq/devfreq.c | 145 ++++--- + drivers/devfreq/event/exynos-ppmu.c | 13 +- + drivers/devfreq/imx8m-ddrc.c | 465 +++++++++++++++++++++ + 7 files changed, 649 insertions(+), 74 deletions(-) + create mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/imx8m-ddrc.yaml + create mode 100644 drivers/devfreq/imx8m-ddrc.c +Merging hmm/hmm (93f4e735b6d9 mm/hmm: remove hmm_range_dma_map and hmm_range_dma_unmap) +$ 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 (ea2dd7c0875e lib/list-test: add a test for the 'list' doubly linked list) +$ 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 (5bece3d66153 powerpc: support KASAN instrumentation of bitops) +$ git merge kasan-bitops/topic/kasan-bitops +Removing include/asm-generic/bitops-instrumented.h +Auto-merging arch/x86/include/asm/bitops.h +Merge made by the 'recursive' strategy. + Documentation/core-api/kernel-api.rst | 17 +- + arch/powerpc/include/asm/bitops.h | 51 ++-- + arch/s390/include/asm/bitops.h | 4 +- + arch/x86/include/asm/bitops.h | 4 +- + include/asm-generic/bitops-instrumented.h | 263 --------------------- + include/asm-generic/bitops/instrumented-atomic.h | 100 ++++++++ + include/asm-generic/bitops/instrumented-lock.h | 81 +++++++ + .../asm-generic/bitops/instrumented-non-atomic.h | 114 +++++++++ + 8 files changed, 346 insertions(+), 288 deletions(-) + delete mode 100644 include/asm-generic/bitops-instrumented.h + create mode 100644 include/asm-generic/bitops/instrumented-atomic.h + create mode 100644 include/asm-generic/bitops/instrumented-lock.h + create mode 100644 include/asm-generic/bitops/instrumented-non-atomic.h +Merging generic-ioremap/for-next (eafee5944062 nds32: use generic ioremap) +$ git merge generic-ioremap/for-next +Already up to date. +Merging akpm-current/current (d7a7648465d2 ipc/msg.c: consolidate all xxxctl_down() functions) +$ git merge --no-ff akpm-current/current +Auto-merging scripts/checkpatch.pl +Auto-merging lib/Kconfig.debug +Auto-merging include/linux/sched.h +Removing include/asm-generic/4level-fixup.h +Auto-merging drivers/vhost/vhost.h +Auto-merging drivers/vhost/vhost.c +Auto-merging drivers/usb/core/hub.c +Auto-merging arch/x86/mm/init_64.c +Auto-merging arch/x86/mm/init_32.c +Merge made by the 'recursive' strategy. + .gitattributes | 2 + + Documentation/core-api/genalloc.rst | 2 +- + Documentation/dev-tools/kcov.rst | 129 + + Documentation/memory-barriers.txt | 16 +- + Documentation/process/deprecated.rst | 10 +- + arch/Kconfig | 22 +- + arch/alpha/include/asm/mmzone.h | 1 - + arch/alpha/include/asm/pgalloc.h | 4 +- + arch/alpha/include/asm/pgtable.h | 24 +- + arch/alpha/mm/init.c | 12 +- + arch/arm/include/asm/pgtable.h | 2 +- + arch/arm/mm/dma-mapping.c | 2 +- + arch/arm64/mm/mmu.c | 4 +- + arch/c6x/include/asm/pgtable.h | 2 +- + arch/ia64/mm/init.c | 4 +- + arch/m68k/include/asm/mcf_pgalloc.h | 7 - + arch/m68k/include/asm/mcf_pgtable.h | 28 +- + arch/m68k/include/asm/mmu_context.h | 12 +- + arch/m68k/include/asm/motorola_pgalloc.h | 4 +- + arch/m68k/include/asm/motorola_pgtable.h | 32 +- + arch/m68k/include/asm/page.h | 9 +- + arch/m68k/include/asm/pgtable_mm.h | 11 +- + arch/m68k/include/asm/pgtable_no.h | 2 +- + arch/m68k/include/asm/sun3_pgalloc.h | 5 - + arch/m68k/include/asm/sun3_pgtable.h | 18 - + arch/m68k/kernel/sys_m68k.c | 10 +- + arch/m68k/mm/init.c | 6 +- + arch/m68k/mm/kmap.c | 39 +- + arch/m68k/mm/mcfmmu.c | 16 +- + arch/m68k/mm/motorola.c | 17 +- + arch/m68k/sun3x/dvma.c | 7 +- + arch/microblaze/include/asm/page.h | 3 - + arch/microblaze/include/asm/pgalloc.h | 16 - + arch/microblaze/include/asm/pgtable.h | 32 +- + arch/microblaze/kernel/signal.c | 10 +- + arch/microblaze/mm/init.c | 7 +- + arch/microblaze/mm/pgtable.c | 13 +- + arch/mips/include/uapi/asm/msgbuf.h | 1 + + arch/mips/include/uapi/asm/sembuf.h | 2 + + arch/nds32/include/asm/page.h | 3 - + arch/nds32/include/asm/pgalloc.h | 3 - + arch/nds32/include/asm/pgtable.h | 12 +- + arch/nds32/include/asm/tlb.h | 1 - + arch/nds32/kernel/pm.c | 4 +- + arch/nds32/mm/fault.c | 16 +- + arch/nds32/mm/init.c | 11 +- + arch/nds32/mm/mm-nds32.c | 6 +- + arch/nds32/mm/proc.c | 26 +- + arch/parisc/include/asm/page.h | 30 +- + arch/parisc/include/asm/pgalloc.h | 41 +- + arch/parisc/include/asm/pgtable.h | 52 +- + arch/parisc/include/asm/tlb.h | 2 + + arch/parisc/include/uapi/asm/msgbuf.h | 1 + + arch/parisc/include/uapi/asm/sembuf.h | 1 + + arch/parisc/kernel/cache.c | 13 +- + arch/parisc/kernel/pci-dma.c | 9 +- + arch/parisc/mm/fixmap.c | 10 +- + arch/parisc/mm/hugetlbpage.c | 18 +- + arch/powerpc/include/uapi/asm/msgbuf.h | 2 + + arch/powerpc/include/uapi/asm/sembuf.h | 2 + + arch/powerpc/mm/mem.c | 3 +- + arch/s390/include/uapi/asm/ipcbuf.h | 2 + + arch/s390/mm/init.c | 4 +- + arch/sh/mm/init.c | 4 +- + arch/sparc/include/asm/pgalloc_32.h | 6 +- + arch/sparc/include/asm/pgtable_32.h | 28 +- + arch/sparc/include/uapi/asm/ipcbuf.h | 2 + + arch/sparc/include/uapi/asm/msgbuf.h | 2 + + arch/sparc/include/uapi/asm/sembuf.h | 2 + + arch/sparc/mm/fault_32.c | 11 +- + arch/sparc/mm/highmem.c | 6 +- + arch/sparc/mm/io-unit.c | 6 +- + arch/sparc/mm/iommu.c | 6 +- + arch/sparc/mm/srmmu.c | 51 +- + arch/um/include/asm/pgtable-2level.h | 1 - + arch/um/include/asm/pgtable-3level.h | 1 - + arch/um/include/asm/pgtable.h | 3 + + arch/um/kernel/mem.c | 8 +- + arch/um/kernel/skas/mmu.c | 12 +- + arch/um/kernel/skas/uaccess.c | 7 +- + arch/um/kernel/tlb.c | 85 +- + arch/um/kernel/trap.c | 4 +- + arch/x86/include/uapi/asm/msgbuf.h | 3 + + arch/x86/include/uapi/asm/sembuf.h | 2 + + arch/x86/mm/fault.c | 26 +- + arch/x86/mm/init_32.c | 4 +- + arch/x86/mm/init_64.c | 4 +- + arch/xtensa/include/uapi/asm/ipcbuf.h | 2 + + arch/xtensa/include/uapi/asm/msgbuf.h | 2 + + arch/xtensa/include/uapi/asm/sembuf.h | 1 + + drivers/acpi/apei/ghes.c | 2 +- + drivers/auxdisplay/charlcd.c | 34 +- + drivers/base/node.c | 9 +- + drivers/gpio/gpio-104-dio-48e.c | 73 +- + drivers/gpio/gpio-104-idi-48.c | 36 +- + drivers/gpio/gpio-74x164.c | 19 +- + drivers/gpio/gpio-gpio-mm.c | 73 +- + drivers/gpio/gpio-max3191x.c | 19 +- + drivers/gpio/gpio-pca953x.c | 195 +- + drivers/gpio/gpio-pci-idio-16.c | 75 +- + drivers/gpio/gpio-pcie-idio-24.c | 109 +- + drivers/gpio/gpio-pisosr.c | 12 +- + drivers/gpio/gpio-uniphier.c | 13 +- + drivers/gpio/gpio-ws16c48.c | 73 +- + drivers/gpu/drm/drm_property.c | 2 +- + drivers/misc/sram-exec.c | 2 +- + drivers/rapidio/rio-access.c | 2 + + drivers/rapidio/rio-driver.c | 1 + + drivers/thermal/intel/intel_soc_dts_iosf.c | 31 +- + drivers/thermal/intel/intel_soc_dts_iosf.h | 2 - + drivers/usb/core/hub.c | 5 + + drivers/vhost/vhost.c | 6 + + drivers/vhost/vhost.h | 1 + + fs/aio.c | 9 +- + fs/binfmt_elf.c | 56 +- + fs/buffer.c | 56 +- + fs/eventpoll.c | 52 +- + fs/proc/Kconfig | 8 +- + fs/proc/generic.c | 37 +- + fs/proc/internal.h | 2 +- + fs/proc/page.c | 40 +- + fs/ramfs/inode.c | 12 + + include/asm-generic/4level-fixup.h | 39 - + include/asm-generic/bitops/find.h | 17 + + include/linux/bitmap.h | 51 + + include/linux/bitops.h | 12 + + include/linux/build_bug.h | 4 +- + include/linux/genalloc.h | 2 +- + include/linux/kcov.h | 23 + + include/linux/kernel.h | 19 +- + include/linux/memory_hotplug.h | 7 +- + include/linux/memremap.h | 6 + + include/linux/mm.h | 10 +- + include/linux/notifier.h | 4 - + include/linux/proc_fs.h | 4 +- + include/linux/rbtree_augmented.h | 6 +- + include/linux/sched.h | 17 + + include/linux/string.h | 45 + + include/linux/sysctl.h | 6 +- + include/linux/thread_info.h | 2 + + include/linux/vmalloc.h | 5 +- + include/linux/vmstat.h | 50 + + include/linux/wait.h | 4 +- + include/trace/events/vmscan.h | 71 +- + include/uapi/asm-generic/ipcbuf.h | 2 + + include/uapi/asm-generic/msgbuf.h | 2 + + include/uapi/asm-generic/sembuf.h | 1 + + include/uapi/linux/kcov.h | 28 + + include/uapi/linux/scc.h | 1 + + init/Kconfig | 76 +- + ipc/mqueue.c | 105 +- + ipc/msg.c | 61 +- + ipc/sem.c | 66 +- + kernel/dma/remap.c | 2 +- + kernel/hung_task.c | 44 + + kernel/kcov.c | 547 +++- + kernel/notifier.c | 43 +- + kernel/profile.c | 6 +- + kernel/sys.c | 4 +- + lib/Kconfig.debug | 6 + + lib/bitmap.c | 12 + + lib/find_bit.c | 14 + + lib/genalloc.c | 5 +- + lib/math/rational.c | 63 +- + lib/test_bitmap.c | 202 +- + lib/test_meminit.c | 20 +- + lib/ubsan.c | 64 +- + mm/kasan/common.c | 1 + + mm/memcontrol.c | 52 +- + mm/memory.c | 10 +- + mm/memory_hotplug.c | 102 +- + mm/mempolicy.c | 10 +- + mm/memremap.c | 36 +- + mm/mmap.c | 43 +- + mm/nommu.c | 10 +- + mm/oom_kill.c | 67 +- + mm/page_alloc.c | 32 +- + mm/slab_common.c | 12 + + mm/slub.c | 88 +- + mm/vmalloc.c | 11 +- + mm/vmscan.c | 18 +- + mm/vmstat.c | 60 +- + net/sunrpc/rpc_pipe.c | 2 +- + scripts/checkpatch.pl | 37 +- + scripts/get_maintainer.pl | 38 +- + tools/testing/selftests/Makefile | 1 + + .../testing/selftests/filesystems/epoll/.gitignore | 1 + + tools/testing/selftests/filesystems/epoll/Makefile | 7 + + .../filesystems/epoll/epoll_wakeup_test.c | 3074 ++++++++++++++++++++ + usr/include/Makefile | 4 - + 190 files changed, 5990 insertions(+), 1674 deletions(-) + delete mode 100644 include/asm-generic/4level-fixup.h + create mode 100644 tools/testing/selftests/filesystems/epoll/.gitignore + create mode 100644 tools/testing/selftests/filesystems/epoll/Makefile + create mode 100644 tools/testing/selftests/filesystems/epoll/epoll_wakeup_test.c +$ 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: kernel-hacking: group sysrq/kgdb/ubsan into 'Generic Kernel Debugging Instruments' +Applying: kernel-hacking: create submenu for arch special debugging options +Applying: kernel-hacking: group kernel data structures debugging together +Applying: kernel-hacking: move kernel testing and coverage options to same submenu +Applying: kernel-hacking: move Oops into 'Lockups and Hangs' +Applying: kernel-hacking: move SCHED_STACK_END_CHECK after DEBUG_STACK_USAGE +Applying: kernel-hacking: create a submenu for scheduler debugging options +Applying: kernel-hacking: move DEBUG_BUGVERBOSE to 'printk and dmesg options' +Applying: kernel-hacking: move DEBUG_FS to 'Generic Kernel Debugging Instruments' +Applying: lib/: fix Kconfig indentation +Applying: mm: add generic p?d_leaf() macros +Applying: arc: mm: add p?d_leaf() definitions +Applying: arm: mm: add p?d_leaf() definitions +Applying: arm64: mm: add p?d_leaf() definitions +Applying: mips: mm: add p?d_leaf() definitions +Applying: powerpc: mm: add p?d_leaf() definitions +Applying: riscv: mm: add p?d_leaf() definitions +Applying: s390: mm: add p?d_leaf() definitions +Applying: sparc: mm: add p?d_leaf() definitions +Applying: x86: mm: add p?d_leaf() definitions +Applying: mm: pagewalk: add p4d_entry() and pgd_entry() +Applying: mm: pagewalk: allow walking without vma +Applying: mm: pagewalk: add test_p?d callbacks +Applying: mm: pagewalk: add 'depth' parameter to pte_hole +Applying: x86: mm: point to struct seq_file from struct pg_state +Applying: x86: mm+efi: convert ptdump_walk_pgd_level() to take a mm_struct +Applying: x86: mm: convert ptdump_walk_pgd_level_debugfs() to take an mm_struct +Applying: x86: mm: convert ptdump_walk_pgd_level_core() to take an mm_struct +Applying: mm: add generic ptdump +Applying: x86: mm: convert dump_pagetables to use walk_page_range +Applying: arm64: mm: convert mm/dump.c to use walk_page_range() +Applying: arm64: mm: display non-present entries in ptdump +Applying: mm: ptdump: reduce level numbers by 1 in note_page() +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 + + a76b642c7f4a...adabf5b0490f akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (adabf5b0490f drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + arch/arc/include/asm/pgtable.h | 1 + + arch/arm/include/asm/pgtable-2level.h | 1 + + arch/arm/include/asm/pgtable-3level.h | 1 + + arch/arm64/Kconfig | 1 + + arch/arm64/Kconfig.debug | 19 +- + arch/arm64/include/asm/pgtable.h | 2 + + arch/arm64/include/asm/ptdump.h | 8 +- + arch/arm64/mm/Makefile | 4 +- + arch/arm64/mm/dump.c | 148 +++--- + arch/arm64/mm/mmu.c | 4 +- + arch/arm64/mm/ptdump_debugfs.c | 2 +- + arch/mips/include/asm/pgtable.h | 5 + + arch/powerpc/include/asm/book3s/64/pgtable.h | 30 +- + arch/riscv/include/asm/pgtable-64.h | 7 + + arch/riscv/include/asm/pgtable.h | 7 + + arch/s390/include/asm/pgtable.h | 2 + + arch/sparc/include/asm/pgtable_64.h | 2 + + arch/x86/Kconfig | 1 + + arch/x86/Kconfig.debug | 20 +- + arch/x86/include/asm/pgtable.h | 10 +- + arch/x86/mm/Makefile | 4 +- + arch/x86/mm/debug_pagetables.c | 8 +- + arch/x86/mm/dump_pagetables.c | 343 ++++--------- + arch/x86/platform/efi/efi_32.c | 2 +- + arch/x86/platform/efi/efi_64.c | 4 +- + drivers/block/null_blk_main.c | 56 +-- + drivers/firmware/efi/arm-runtime.c | 2 +- + drivers/media/platform/sti/delta/delta-ipc.c | 4 +- + drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 1 + + drivers/tty/serial/sh-sci.c | 2 +- + fs/proc/task_mmu.c | 4 +- + include/asm-generic/pgtable.h | 20 + + include/linux/pagewalk.h | 42 +- + include/linux/ptdump.h | 22 + + lib/Kconfig | 2 +- + lib/Kconfig.debug | 697 ++++++++++++++------------- + lib/Kconfig.kgdb | 8 +- + mm/Kconfig.debug | 21 + + mm/Makefile | 1 + + mm/hmm.c | 8 +- + mm/migrate.c | 5 +- + mm/mincore.c | 1 + + mm/pagewalk.c | 126 ++++- + mm/ptdump.c | 151 ++++++ + 44 files changed, 982 insertions(+), 827 deletions(-) + create mode 100644 include/linux/ptdump.h + create mode 100644 mm/ptdump.c diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..686582160127 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,14 @@ +Importing dmi based on 5.4 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 219d54332a09e8d8741c1e1982f5eae56099de85 +Updating files: 24% (16318/65701)
Updating files: 25% (16426/65701)
Updating files: 26% (17083/65701)
Updating files: 27% (17740/65701)
Updating files: 28% (18397/65701)
Updating files: 29% (19054/65701)
Updating files: 30% (19711/65701)
Updating files: 31% (20368/65701)
Updating files: 32% (21025/65701)
Updating files: 33% (21682/65701)
Updating files: 34% (22339/65701)
Updating files: 35% (22996/65701)
Updating files: 36% (23653/65701)
Updating files: 37% (24310/65701)
Updating files: 38% (24967/65701)
Updating files: 39% (25624/65701)
Updating files: 40% (26281/65701)
Updating files: 41% (26938/65701)
Updating files: 41% (26998/65701)
Updating files: 42% (27595/65701)
Updating files: 43% (28252/65701)
Updating files: 44% (28909/65701)
Updating files: 45% (29566/65701)
Updating files: 46% (30223/65701)
Updating files: 47% (30880/65701)
Updating files: 48% (31537/65701)
Updating files: 49% (32194/65701)
Updating files: 50% (32851/65701)
Updating files: 51% (33508/65701)
Updating files: 52% (34165/65701)
Updating files: 53% (34822/65701)
Updating files: 53% (35257/65701)
Updating files: 54% (35479/65701)
Updating files: 55% (36136/65701)
Updating files: 56% (36793/65701)
Updating files: 57% (37450/65701)
Updating files: 58% (38107/65701)
Updating files: 59% (38764/65701)
Updating files: 60% (39421/65701)
Updating files: 61% (40078/65701)
Updating files: 62% (40735/65701)
Updating files: 63% (41392/65701)
Updating files: 64% (42049/65701)
Updating files: 65% (42706/65701)
Updating files: 66% (43363/65701)
Updating files: 66% (43910/65701)
Updating files: 67% (44020/65701)
Updating files: 68% (44677/65701)
Updating files: 69% (45334/65701)
Updating files: 70% (45991/65701)
Updating files: 71% (46648/65701)
Updating files: 72% (47305/65701)
Updating files: 73% (47962/65701)
Updating files: 74% (48619/65701)
Updating files: 75% (49276/65701)
Updating files: 76% (49933/65701)
Updating files: 77% (50590/65701)
Updating files: 78% (51247/65701)
Updating files: 79% (51904/65701)
Updating files: 80% (52561/65701)
Updating files: 81% (53218/65701)
Updating files: 81% (53482/65701)
Updating files: 82% (53875/65701)
Updating files: 83% (54532/65701)
Updating files: 84% (55189/65701)
Updating files: 85% (55846/65701)
Updating files: 86% (56503/65701)
Updating files: 87% (57160/65701)
Updating files: 88% (57817/65701)
Updating files: 89% (58474/65701)
Updating files: 90% (59131/65701)
Updating files: 91% (59788/65701)
Updating files: 92% (60445/65701)
Updating files: 93% (61102/65701)
Updating files: 94% (61759/65701)
Updating files: 95% (62416/65701)
Updating files: 96% (63073/65701)
Updating files: 97% (63730/65701)
Updating files: 98% (64387/65701)
Updating files: 99% (65044/65701)
Updating files: 100% (65701/65701)
Updating files: 100% (65701/65701), done. +HEAD is now at 219d54332a09 Linux 5.4 +$ git am -s --patch-format=mbox ../quilt/dmi/dmi-store-memory-type.patch +Applying: firmware: dmi: Remember the memory type +$ git am -s --patch-format=mbox ../quilt/dmi/dmi-add-dmi_memdev_handle.patch +Applying: firmware: dmi: Add dmi_memdev_handle +$ cd /home/sfr/kernels/next/next +$ git fetch -f ../quilt-tmp master:dmi/master +From ../quilt-tmp + + 9a85ac3936ad...2429c99fa13a master -> dmi/master (forced update) diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..64c6ace820b1 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20191204 |