diff options
| -rw-r--r-- | Next/SHA1s | 314 | ||||
| -rw-r--r-- | Next/Trees | 316 | ||||
| -rw-r--r-- | Next/merge.log | 6582 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 7215 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..0dbf4116f3cf --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,314 @@ +Name SHA1 +---- ---- +origin 937d6eefc716a9071f0e3bada19200de1bb9d048 +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 040b5cfbcefa263ccf2c118c4938308606bb7ed8 +bpf b3c424eb6a1a3c485de64619418a471dee6ce849 +ipsec a56dcc6b455830776899ce3686735f1172e12243 +netfilter d1f4c966475c6dd2545c6625022cb24e878bee11 +ipvs c24b75e0f9239e78105f81c5f03a751641eb07ef +wireless-drivers 1e58252e334dc3f3756f424a157d1b7484464c40 +mac80211 e58c1912418980f57ba2060017583067f5f71e52 +rdma-fixes 411c1e6774e2e1f96b1ccce4f119376b94ade3e4 +sound-current cb50445130d14a5a609d7cd88db9d0436313c881 +sound-asoc-fixes 75718643c384e1193ec86b11a3e858d4b5e9a7ed +regmap-fixes af42d3466bdc8f39806b26f593604fdc54140bcb +regulator-fixes 1b353475f3cd952edaee5b28b064245ba124bf4b +spi-fixes 3fae1f60fdc8221b9211b3d863ad53ee06ba80b2 +pci-current 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +driver-core.current 596cf45cbf6e4fa7bcb0df33e373a7d062b644b5 +tty.current d6d5df1db6e9d7f8f76d2911707f7d5877251b02 +usb.current 596cf45cbf6e4fa7bcb0df33e373a7d062b644b5 +usb-gadget-fixes f3fb802efaef3662744a2215a51294d52a7cfc0e +usb-serial-fixes a99d8080aaf358d5d23581244e5da23b35e340b9 +usb-chipidea-fixes 16009db47c51d4ef61270f22a2f1bb385233c34f +phy 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +staging.current 596cf45cbf6e4fa7bcb0df33e373a7d062b644b5 +char-misc.current 596cf45cbf6e4fa7bcb0df33e373a7d062b644b5 +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 da0c9ea146cbe92b832f1b0f694840ea8eb33cce +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 580f93e92c5b35940e02e1b54e646c2237596ed0 +aspeed 2aee80727dca69ee225c376f2987c5dbf3fbb416 +at91 571c4b1fe42bc96eb3360e68fd3ba1a3b3787d8c +bcm2835 f142341846711f8f3cb85e4df5e0130d9e017a9d +imx-mxs 71918b15d58f657ad35e20530b051c9a70999083 +keystone 2af8e1f26c6596540d95965fd45fca2692696e1e +mediatek 4ae1ce88e9a010b6227f0345b0abea0eebd38599 +mvebu 3aa22be2d6b161b744398e60902014893e6898d8 +omap eab1cca2de624a2c9a10d862eb4a5938a57820f4 +qcom 7b0e649c3511849d640c9351df7c1013984ba975 +realtek 6a41c7019bcaf869d2da3ad57be37de456e55b82 +renesas 9c45f53abb9772802044007717e769eafd9b9ce3 +reset b3f1d036f26d024a8ae2e307477ab6b7ba416c02 +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 69738cfdfa7032f45d9e7462d24490e61cf163dd +configfs e2f238f7d5a1fa69ff1884d37acf9a2a3a01b308 +ecryptfs b4a81b87a4cfe2bb26a4a943b748d96a43ef20e8 +erofs 3dcb5fa23e16ef50b09e7a56b47d8e4c04ca09c0 +ext3 c78185c554508855fe517d8612e06a178cd5e386 +ext4 dfdeeb41fb08fbe11d3cfefba9c0fcd00c95a36d +f2fs 803e74be04b32f7785742dcabfc62116718fbb06 +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 3e501af8dd7b581240b476a1aa623f97dc1666ef +printk b004f8e77cc01d793574d5c78a4807546d64f568 +pci 7e124c40517218e079e580909de2652bddb60ff5 +pstore 8d82cee2f8aa8b9bc806907ecd9e1494c6e8526b +hid 4b8c2dffbb85857fbbeb25516ccec51eb3a9e44b +i2c 8dcea9c5fa0575effef1f3b1e5dfce264fc8dab8 +i3c ae24f2b6f828f4ae37d0f0fd3be4e7744b6aab13 +dmi 9a85ac3936add8611c5d7efb67a040a656fc9433 +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 81b6b96475ac7a4ebfceae9f16fb3758327adbfe +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 0faee24149d7ec00fba47e6596b3978f2ab7fafa +drm-intel 3ee1a9f5d0bc0e9dbac5b014e2e8a7d540b836df +drm-tegra 84db889e6d827eefc3dde130fec8382d2dcb23ac +drm-misc 1591fadf857cdbaf2baa55e421af99a61354713c +drm-msm e20c9284c8f212081afc28471daaac9b0d54252f +mali-dp f634c6a8028789b05a9277a3d51303829ae29547 +imx-drm 4d24376370fbfc87231d54434a683f2913abcce4 +etnaviv 22567d017c2c1a9b6ce67d054ffcbf6d2d64a6f8 +regmap 0c4b6e03b8ad372157a5e8005ce775dccea917b3 +sound cb50445130d14a5a609d7cd88db9d0436313c881 +sound-asoc 75718643c384e1193ec86b11a3e858d4b5e9a7ed +modules 5d603311615f612320bb77bd2a82553ef1ced5b7 +input 1a26c920717a24272e15b79b1455f3e99969a3ce +block e5bab666ffa7e142421c280675d01314238a53ba +device-mapper 484e0d2b11e1fdd0d17702b282eb2ed56148385f +pcmcia bd9d6e0371d147b710f549b55d7b44008264aa06 +mmc def7bd940f8cceb41ec3d1383acd8ab937056dcb +md e820d55cb99dd93ac2dc949cf486bb187e5cd70d +mfd edfaeaf742b4c3ee6f58e0b8be95b5296a3375e8 +backlight 102a1b382177d89f75bc49b931c329a317cf531f +battery 9480029fe5c24d482efad38dc631bd555fc7afe2 +regulator 1b353475f3cd952edaee5b28b064245ba124bf4b +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 0e6352f543fd2e3d447a6add16abad2d3959c506 +tip e445033e58108a9891abfbc0dea90b066a75e4a9 +clockevents 6e001f6a4cc73cd06fc7b8c633bc4906c33dd8ad +edac 5781823fd0d39082bfe2bbc20408aaa85a6e06ad +irqchip 961c6a63bcd226eb3e9051c13bc20dbc4e833096 +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 937d6eefc716a9071f0e3bada19200de1bb9d048 +usb 937d6eefc716a9071f0e3bada19200de1bb9d048 +usb-gadget 726b4fba94bec7e4c16bc681316e82455652c3a8 +usb-serial c1a1f273d0825774c80896b8deb1c9ea1d0b91e3 +usb-chipidea-next 4d6141288c33b73027260e73df262464cbe1fd0d +phy-next 4569e64ab6a590dec418f2cd98fbe907a08fd452 +tty 27ed14d0ecb38516b6f3c6fdcd62c25c9454f979 +char-misc 937d6eefc716a9071f0e3bada19200de1bb9d048 +extcon ddd1bbbae486ff5913c8fc72c853dcea60713236 +soundwire 2e8c4ad1f04413a4a67ef10746a7566007d2ed55 +thunderbolt b001da2905e70014b15e98dddf62d0c61b132527 +staging 937d6eefc716a9071f0e3bada19200de1bb9d048 +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 da1af488fddb0344ab6ae8d3702e457128dc9c16 +akpm 3d6fe39a1f3f0be61bd2596debc3227fc72c73a7 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..b04c390ec697 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,6582 @@ +$ date -R +Tue, 03 Dec 2019 08:52:17 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at b94ae8ad9fe7 Merge tag 'seccomp-v5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux +Merging origin/master (937d6eefc716 Merge tag 'docs-5.5a' of git://git.lwn.net/linux) +$ git merge origin/master +Updating b94ae8ad9fe7..937d6eefc716 +Fast-forward + .mailmap | 1 + + CREDITS | 3 +- + .../ABI/testing/sysfs-bus-coresight-devices-etm4x | 183 +- + .../ABI/testing/sysfs-class-led-driver-el15203000 | 139 ++ + Documentation/ABI/testing/sysfs-class-watchdog | 9 +- + .../ABI/testing/sysfs-platform-mellanox-bootctl | 58 + + Documentation/Makefile | 6 +- + Documentation/admin-guide/LSM/SafeSetID.rst | 4 +- + Documentation/admin-guide/cgroup-v2.rst | 14 +- + .../{driver-api => admin-guide}/dell_rbu.rst | 14 +- + .../device-mapper/{dm-dust.txt => dm-dust.rst} | 243 +- + Documentation/admin-guide/device-mapper/index.rst | 1 + + Documentation/admin-guide/index.rst | 65 +- + Documentation/admin-guide/iostats.rst | 47 +- + Documentation/admin-guide/kernel-parameters.txt | 12 +- + Documentation/admin-guide/perf/imx-ddr.rst | 33 +- + Documentation/admin-guide/perf/index.rst | 1 + + Documentation/admin-guide/sysctl/kernel.rst | 12 +- + Documentation/conf.py | 3 +- + Documentation/core-api/genalloc.rst | 26 +- + Documentation/core-api/genericirq.rst | 52 +- + Documentation/core-api/memory-allocation.rst | 50 +- + Documentation/core-api/mm-api.rst | 2 +- + Documentation/core-api/printk-formats.rst | 14 + + Documentation/core-api/refcount-vs-atomic.rst | 36 +- + Documentation/dev-tools/kasan.rst | 63 + + Documentation/dev-tools/kmemleak.rst | 2 +- + Documentation/devicetree/bindings/Makefile | 5 +- + .../devicetree/bindings/arm/amlogic/smp-sram.txt | 32 - + Documentation/devicetree/bindings/arm/arm,scmi.txt | 2 +- + Documentation/devicetree/bindings/arm/arm,scpi.txt | 2 +- + Documentation/devicetree/bindings/arm/axentia.txt | 28 - + .../devicetree/bindings/arm/freescale/fsl,scu.txt | 16 +- + .../bindings/arm/samsung/exynos-chipid.txt | 12 - + .../bindings/arm/samsung/exynos-chipid.yaml | 39 + + .../devicetree/bindings/arm/samsung/pmu.txt | 72 - + .../devicetree/bindings/arm/samsung/pmu.yaml | 105 + + .../bindings/arm/samsung/samsung-boards.txt | 83 - + .../bindings/arm/samsung/samsung-boards.yaml | 181 ++ + .../arm/samsung/samsung-secure-firmware.yaml | 31 + + .../devicetree/bindings/arm/samsung/sysreg.txt | 19 - + .../devicetree/bindings/arm/samsung/sysreg.yaml | 45 + + Documentation/devicetree/bindings/arm/sprd.txt | 14 - + Documentation/devicetree/bindings/arm/sprd.yaml | 33 + + .../devicetree/bindings/arm/stm32/stm32.yaml | 27 +- + .../devicetree/bindings/arm/sunxi/smp-sram.txt | 44 - + .../devicetree/bindings/ata/sata_rcar.txt | 7 +- + .../devicetree/bindings/bus/renesas,bsc.txt | 46 - + .../devicetree/bindings/bus/renesas,bsc.yaml | 60 + + .../devicetree/bindings/bus/simple-pm-bus.txt | 44 - + .../devicetree/bindings/bus/simple-pm-bus.yaml | 75 + + .../bindings/clock/amlogic,axg-audio-clkc.txt | 3 +- + .../bindings/clock/armada3700-periph-clock.txt | 5 +- + .../bindings/clock/bitmain,bm1880-clk.yaml | 76 + + .../devicetree/bindings/clock/imx7ulp-clock.txt | 1 - + .../devicetree/bindings/clock/ingenic,cgu.txt | 1 + + .../devicetree/bindings/clock/qcom,gcc.txt | 94 - + .../devicetree/bindings/clock/qcom,gcc.yaml | 188 ++ + .../devicetree/bindings/clock/qcom,q6sstopcc.yaml | 43 + + .../devicetree/bindings/clock/qcom,rpmh-clk.txt | 27 - + .../devicetree/bindings/clock/qcom,rpmhcc.yaml | 49 + + .../devicetree/bindings/clock/renesas,cpg-mssr.txt | 15 +- + .../clock/renesas,rcar-gen2-cpg-clocks.txt | 60 - + .../bindings/clock/renesas,rcar-usb2-clock-sel.txt | 2 +- + .../devicetree/bindings/clock/ti/davinci/psc.txt | 2 +- + .../bindings/counter/stm32-lptimer-cnt.txt | 29 - + .../bindings/counter/stm32-timer-cnt.txt | 31 - + .../devicetree/bindings/cpu/cpu-topology.txt | 2 +- + .../devicetree/bindings/crypto/samsung-slimsss.txt | 19 - + .../bindings/crypto/samsung-slimsss.yaml | 47 + + .../devicetree/bindings/crypto/samsung-sss.txt | 32 - + .../devicetree/bindings/crypto/samsung-sss.yaml | 58 + + .../devicetree/bindings/crypto/st,stm32-crc.txt | 16 - + .../devicetree/bindings/crypto/st,stm32-crc.yaml | 38 + + .../devicetree/bindings/crypto/st,stm32-cryp.txt | 19 - + .../devicetree/bindings/crypto/st,stm32-cryp.yaml | 51 + + .../devicetree/bindings/crypto/st,stm32-hash.txt | 30 - + .../devicetree/bindings/crypto/st,stm32-hash.yaml | 69 + + .../bindings/display/amlogic,meson-dw-hdmi.yaml | 2 - + .../bindings/display/bridge/ti,sn65dsi86.txt | 2 +- + .../bindings/display/cirrus,clps711x-fb.txt | 2 +- + .../devicetree/bindings/display/imx/fsl,imx-fb.txt | 2 +- + .../bindings/display/panel/sharp,ld-d5116z01b.txt | 26 - + .../bindings/display/panel/sharp,ld-d5116z01b.yaml | 30 + + .../devicetree/bindings/display/st,stm32-dsi.yaml | 150 ++ + .../devicetree/bindings/display/st,stm32-ltdc.txt | 144 -- + .../devicetree/bindings/display/st,stm32-ltdc.yaml | 81 + + .../bindings/dma/allwinner,sun50i-a64-dma.yaml | 4 +- + .../devicetree/bindings/dma/dma-common.yaml | 9 +- + .../devicetree/bindings/dma/jz4780-dma.txt | 3 +- + .../bindings/dma/milbeaut-m10v-hdmac.txt | 32 + + .../bindings/dma/milbeaut-m10v-xdmac.txt | 24 + + .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 1 + + .../bindings/dma/sifive,fu540-c000-pdma.yaml | 55 + + Documentation/devicetree/bindings/dma/ti-edma.txt | 8 + + .../devicetree/bindings/dma/xilinx/xilinx_dma.txt | 24 +- + Documentation/devicetree/bindings/eeprom/at24.txt | 90 +- + Documentation/devicetree/bindings/eeprom/at24.yaml | 188 ++ + .../devicetree/bindings/example-schema.yaml | 81 +- + .../intel,ixp4xx-network-processing-engine.yaml | 2 - + .../bindings/firmware/nvidia,tegra186-bpmp.txt | 2 +- + .../bindings/gpio/brcm,xgs-iproc-gpio.yaml | 70 + + .../devicetree/bindings/gpio/gpio-rda.yaml | 50 + + .../devicetree/bindings/gpio/renesas,gpio-rcar.txt | 1 + + .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 4 +- + .../devicetree/bindings/gpu/arm,mali-midgard.yaml | 22 +- + .../devicetree/bindings/gpu/arm,mali-utgard.yaml | 3 +- + .../devicetree/bindings/gpu/samsung-g2d.txt | 27 - + .../devicetree/bindings/gpu/samsung-g2d.yaml | 75 + + .../devicetree/bindings/gpu/samsung-rotator.txt | 28 - + .../devicetree/bindings/gpu/samsung-rotator.yaml | 48 + + .../devicetree/bindings/gpu/samsung-scaler.txt | 27 - + .../devicetree/bindings/gpu/samsung-scaler.yaml | 81 + + .../bindings/hwlock/st,stm32-hwspinlock.txt | 23 - + .../bindings/hwlock/st,stm32-hwspinlock.yaml | 50 + + .../bindings/i2c/allwinner,sun6i-a31-p2wi.yaml | 4 +- + .../bindings/i2c/amlogic,meson6-i2c.yaml | 53 + + .../devicetree/bindings/i2c/i2c-aspeed.txt | 3 +- + Documentation/devicetree/bindings/i2c/i2c-at91.txt | 3 +- + .../devicetree/bindings/i2c/i2c-meson.txt | 30 - + .../devicetree/bindings/i2c/i2c-stm32.txt | 65 - + Documentation/devicetree/bindings/i2c/i2c.txt | 18 + + .../bindings/i2c/marvell,mv64xxx-i2c.yaml | 4 +- + .../devicetree/bindings/i2c/renesas,i2c.txt | 1 + + .../devicetree/bindings/i2c/renesas,iic.txt | 1 + + .../devicetree/bindings/i2c/st,stm32-i2c.yaml | 141 ++ + .../devicetree/bindings/iio/adc/adi,ad7124.yaml | 3 - + .../devicetree/bindings/iio/adc/adi,ad7606.yaml | 5 +- + .../devicetree/bindings/iio/adc/adi,ad7780.yaml | 1 - + .../devicetree/bindings/iio/adc/avia-hx711.yaml | 1 - + .../bindings/iio/adc/samsung,exynos-adc.txt | 107 - + .../bindings/iio/adc/samsung,exynos-adc.yaml | 151 ++ + .../bindings/iio/chemical/plantower,pms7003.yaml | 1 - + .../devicetree/bindings/iio/pressure/bmp085.yaml | 2 - + .../bindings/iio/timer/stm32-lptimer-trigger.txt | 23 - + .../bindings/iio/timer/stm32-timer-trigger.txt | 25 - + .../bindings/input/fsl,mpr121-touchkey.yaml | 89 + + .../devicetree/bindings/input/ilitek,ili2xxx.txt | 3 +- + Documentation/devicetree/bindings/input/input.yaml | 36 + + Documentation/devicetree/bindings/input/keys.txt | 8 - + .../devicetree/bindings/input/max77650-onkey.txt | 26 - + .../devicetree/bindings/input/max77650-onkey.yaml | 35 + + .../devicetree/bindings/input/mpr121-touchkey.txt | 30 - + .../devicetree/bindings/input/mtk-pmic-keys.txt | 4 +- + .../devicetree/bindings/input/st,stpmic1-onkey.txt | 2 +- + .../bindings/input/touchscreen/ad7879.txt | 4 +- + .../bindings/input/touchscreen/edt-ft5x06.txt | 1 + + .../bindings/interconnect/qcom,qcs404.txt | 45 - + .../bindings/interconnect/qcom,qcs404.yaml | 77 + + .../allwinner,sun7i-a20-sc-nmi.yaml | 4 +- + .../bindings/interrupt-controller/arm,gic-v3.yaml | 1 + + .../bindings/interrupt-controller/renesas,irqc.txt | 48 - + .../interrupt-controller/renesas,irqc.yaml | 87 + + .../interrupt-controller/st,stm32-exti.txt | 29 - + .../interrupt-controller/st,stm32-exti.yaml | 98 + + .../devicetree/bindings/iommu/arm,smmu-v3.txt | 77 - + .../devicetree/bindings/iommu/arm,smmu-v3.yaml | 95 + + .../devicetree/bindings/iommu/arm,smmu.txt | 182 -- + .../devicetree/bindings/iommu/arm,smmu.yaml | 230 ++ + .../bindings/iommu/renesas,ipmmu-vmsa.txt | 1 + + .../devicetree/bindings/iommu/samsung,sysmmu.txt | 67 - + .../devicetree/bindings/iommu/samsung,sysmmu.yaml | 108 + + .../bindings/leds/backlight/led-backlight.txt | 28 + + .../bindings/leds/backlight/lm3630a-backlight.yaml | 6 + + .../bindings/leds/backlight/pm8941-wled.txt | 42 - + .../bindings/leds/backlight/qcom-wled.txt | 154 ++ + .../devicetree/bindings/leds/leds-el15203000.txt | 69 + + .../devicetree/bindings/leds/leds-max77650.txt | 57 - + .../devicetree/bindings/leds/leds-max77650.yaml | 51 + + .../devicetree/bindings/mailbox/fsl,mu.txt | 2 + + .../devicetree/bindings/mailbox/st,stm32-ipcc.yaml | 84 + + .../devicetree/bindings/mailbox/stm32-ipcc.txt | 47 - + .../bindings/media/allwinner,sun4i-a10-ir.yaml | 4 +- + .../bindings/media/amlogic,meson-gx-ao-cec.yaml | 91 + + .../devicetree/bindings/media/meson-ao-cec.txt | 37 - + Documentation/devicetree/bindings/media/rc.yaml | 6 + + .../devicetree/bindings/media/st,stm32-cec.txt | 19 - + .../devicetree/bindings/media/st,stm32-cec.yaml | 54 + + .../devicetree/bindings/media/st,stm32-dcmi.txt | 45 - + .../devicetree/bindings/media/st,stm32-dcmi.yaml | 86 + + .../bindings/memory-controllers/exynos-srom.txt | 79 - + .../bindings/memory-controllers/exynos-srom.yaml | 128 + + Documentation/devicetree/bindings/mfd/madera.txt | 8 + + Documentation/devicetree/bindings/mfd/max77650.txt | 46 - + .../devicetree/bindings/mfd/max77650.yaml | 149 ++ + Documentation/devicetree/bindings/mfd/max77693.txt | 1 + + .../devicetree/bindings/mfd/qcom,spmi-pmic.txt | 2 + + .../bindings/mfd/samsung,exynos5433-lpass.txt | 2 +- + .../devicetree/bindings/mfd/st,stm32-lptimer.yaml | 120 + + .../devicetree/bindings/mfd/st,stm32-timers.yaml | 162 ++ + .../devicetree/bindings/mfd/stm32-lptimer.txt | 48 - + .../devicetree/bindings/mfd/stm32-timers.txt | 73 - + Documentation/devicetree/bindings/mfd/syscon.txt | 32 - + Documentation/devicetree/bindings/mfd/syscon.yaml | 84 + + .../devicetree/bindings/misc/allwinner,syscon.txt | 20 - + .../bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 6 +- + .../bindings/mtd/st,stm32-fmc2-nand.yaml | 98 + + .../devicetree/bindings/mtd/stm32-fmc2-nand.txt | 61 - + .../bindings/net/allwinner,sun4i-a10-emac.yaml | 6 +- + .../bindings/net/allwinner,sun4i-a10-mdio.yaml | 6 +- + .../bindings/net/allwinner,sun7i-a20-gmac.yaml | 6 +- + .../bindings/net/allwinner,sun8i-a83t-emac.yaml | 6 +- + .../bindings/net/can/allwinner,sun4i-a10-can.yaml | 51 + + .../devicetree/bindings/net/can/sun4i_can.txt | 36 - + .../devicetree/bindings/net/davinci-mdio.txt | 36 - + .../devicetree/bindings/net/ti,davinci-mdio.yaml | 71 + + .../bindings/nvmem/allwinner,sun4i-a10-sid.yaml | 4 +- + Documentation/devicetree/bindings/pci/rcar-pci.txt | 1 + + .../bindings/phy/amlogic,meson-g12a-usb2-phy.yaml | 1 - + .../bindings/pinctrl/st,stm32-pinctrl.yaml | 7 +- + .../bindings/power/amlogic,meson-gx-pwrc.txt | 2 +- + .../devicetree/bindings/power/fsl,imx-gpc.txt | 2 +- + .../devicetree/bindings/power/fsl,imx-gpcv2.txt | 2 +- + .../devicetree/bindings/power/pd-samsung.txt | 45 - + .../devicetree/bindings/power/pd-samsung.yaml | 66 + + .../devicetree/bindings/power/power-domain.yaml | 133 ++ + .../devicetree/bindings/power/power_domain.txt | 95 +- + .../bindings/power/renesas,sysc-rmobile.txt | 2 +- + .../bindings/power/reset/syscon-poweroff.txt | 30 - + .../bindings/power/reset/syscon-poweroff.yaml | 60 + + .../bindings/power/reset/syscon-reboot.txt | 30 - + .../bindings/power/reset/syscon-reboot.yaml | 60 + + .../bindings/power/supply/max77650-charger.txt | 28 - + .../bindings/power/supply/max77650-charger.yaml | 34 + + .../bindings/power/xlnx,zynqmp-genpd.txt | 2 +- + .../devicetree/bindings/pwm/atmel-hlcdc-pwm.txt | 2 +- + .../devicetree/bindings/pwm/atmel-pwm.txt | 2 +- + .../devicetree/bindings/pwm/atmel-tcb-pwm.txt | 2 +- + .../devicetree/bindings/pwm/brcm,bcm7038-pwm.txt | 2 +- + .../devicetree/bindings/pwm/brcm,iproc-pwm.txt | 2 +- + .../devicetree/bindings/pwm/brcm,kona-pwm.txt | 2 +- + Documentation/devicetree/bindings/pwm/img-pwm.txt | 2 +- + Documentation/devicetree/bindings/pwm/imx-pwm.txt | 2 +- + .../devicetree/bindings/pwm/imx-tpm-pwm.txt | 2 +- + .../devicetree/bindings/pwm/lpc1850-sct-pwm.txt | 2 +- + Documentation/devicetree/bindings/pwm/mxs-pwm.txt | 2 +- + .../devicetree/bindings/pwm/nvidia,tegra20-pwm.txt | 2 +- + .../devicetree/bindings/pwm/nxp,pca9685-pwm.txt | 2 +- + .../devicetree/bindings/pwm/pwm-bcm2835.txt | 2 +- + .../devicetree/bindings/pwm/pwm-berlin.txt | 2 +- + .../devicetree/bindings/pwm/pwm-fsl-ftm.txt | 2 +- + .../devicetree/bindings/pwm/pwm-hibvt.txt | 2 +- + .../devicetree/bindings/pwm/pwm-lp3943.txt | 2 +- + .../devicetree/bindings/pwm/pwm-mediatek.txt | 2 +- + .../devicetree/bindings/pwm/pwm-meson.txt | 2 +- + .../devicetree/bindings/pwm/pwm-mtk-disp.txt | 2 +- + .../devicetree/bindings/pwm/pwm-omap-dmtimer.txt | 2 +- + .../devicetree/bindings/pwm/pwm-rockchip.txt | 2 +- + .../devicetree/bindings/pwm/pwm-samsung.txt | 51 - + .../devicetree/bindings/pwm/pwm-samsung.yaml | 109 + + .../devicetree/bindings/pwm/pwm-sifive.txt | 2 +- + Documentation/devicetree/bindings/pwm/pwm-sprd.txt | 2 +- + .../devicetree/bindings/pwm/pwm-stm32-lp.txt | 30 - + .../devicetree/bindings/pwm/pwm-stm32.txt | 38 - + .../devicetree/bindings/pwm/pwm-tiecap.txt | 2 +- + .../devicetree/bindings/pwm/pwm-tiehrpwm.txt | 2 +- + Documentation/devicetree/bindings/pwm/pwm-zx.txt | 2 +- + Documentation/devicetree/bindings/pwm/pwm.txt | 11 +- + Documentation/devicetree/bindings/pwm/pwm.yaml | 29 + + .../devicetree/bindings/pwm/renesas,pwm-rcar.txt | 40 - + .../devicetree/bindings/pwm/renesas,pwm-rcar.yaml | 78 + + .../devicetree/bindings/pwm/renesas,tpu-pwm.txt | 35 - + .../devicetree/bindings/pwm/renesas,tpu-pwm.yaml | 69 + + .../devicetree/bindings/pwm/spear-pwm.txt | 2 +- + .../devicetree/bindings/pwm/st,stmpe-pwm.txt | 2 +- + .../devicetree/bindings/pwm/ti,twl-pwm.txt | 2 +- + .../devicetree/bindings/pwm/ti,twl-pwmled.txt | 2 +- + .../devicetree/bindings/pwm/vt8500-pwm.txt | 2 +- + .../bindings/regulator/fixed-regulator.yaml | 1 - + .../bindings/regulator/max77650-regulator.txt | 41 - + .../bindings/regulator/max77650-regulator.yaml | 31 + + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 6 + + .../bindings/remoteproc/st,stm32-rproc.yaml | 128 + + .../devicetree/bindings/remoteproc/stm32-rproc.txt | 63 - + .../bindings/rng/samsung,exynos4-rng.txt | 19 - + .../bindings/rng/samsung,exynos4-rng.yaml | 45 + + .../devicetree/bindings/rng/st,stm32-rng.txt | 25 - + .../devicetree/bindings/rng/st,stm32-rng.yaml | 48 + + .../devicetree/bindings/rtc/renesas,sh-rtc.yaml | 70 + + .../devicetree/bindings/rtc/rtc-mt6397.txt | 29 + + Documentation/devicetree/bindings/rtc/rtc-sh.txt | 28 - + Documentation/devicetree/bindings/rtc/s3c-rtc.txt | 31 - + Documentation/devicetree/bindings/rtc/s3c-rtc.yaml | 89 + + .../devicetree/bindings/serial/samsung_uart.txt | 58 - + .../devicetree/bindings/serial/samsung_uart.yaml | 118 + + .../devicetree/bindings/serial/sprd-uart.txt | 32 - + .../devicetree/bindings/serial/sprd-uart.yaml | 72 + + .../bindings/serio/allwinner,sun4i-a10-ps2.yaml | 51 + + .../bindings/serio/allwinner,sun4i-ps2.txt | 22 - + .../bindings/soc/amlogic/amlogic,canvas.txt | 33 - + .../bindings/soc/amlogic/amlogic,canvas.yaml | 49 + + .../bindings/soc/bcm/brcm,bcm2835-pm.txt | 2 +- + .../devicetree/bindings/soc/mediatek/scpsys.txt | 2 +- + .../devicetree/bindings/soc/ti/sci-pm-domain.txt | 2 +- + .../devicetree/bindings/sram/milbeaut-smp-sram.txt | 24 - + .../devicetree/bindings/sram/renesas,smp-sram.txt | 27 - + .../devicetree/bindings/sram/rockchip-smp-sram.txt | 30 - + .../devicetree/bindings/sram/samsung-sram.txt | 38 - + Documentation/devicetree/bindings/sram/sram.txt | 80 - + Documentation/devicetree/bindings/sram/sram.yaml | 257 ++ + .../devicetree/bindings/submitting-patches.txt | 21 +- + .../bindings/thermal/st,stm32-thermal.yaml | 79 + + .../devicetree/bindings/thermal/stm32-thermal.txt | 61 - + .../devicetree/bindings/timer/ingenic,tcu.txt | 4 +- + .../bindings/timer/samsung,exynos4210-mct.txt | 88 - + .../bindings/timer/samsung,exynos4210-mct.yaml | 124 + + .../devicetree/bindings/timer/st,stm32-timer.txt | 22 - + .../devicetree/bindings/timer/st,stm32-timer.yaml | 47 + + .../bindings/usb/allwinner,sun4i-a10-musb.txt | 28 - + .../bindings/usb/allwinner,sun4i-a10-musb.yaml | 100 + + .../devicetree/bindings/usb/amlogic,dwc3.txt | 88 - + .../bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml | 127 + + .../devicetree/bindings/usb/generic-ehci.yaml | 5 + + .../bindings/watchdog/amlogic,meson-gxbb-wdt.yaml | 3 + + .../bindings/watchdog/atmel-sama5d4-wdt.txt | 2 +- + .../devicetree/bindings/watchdog/renesas,wdt.txt | 1 + + .../devicetree/bindings/watchdog/samsung-wdt.txt | 35 - + .../devicetree/bindings/watchdog/samsung-wdt.yaml | 74 + + Documentation/devicetree/writing-schema.rst | 9 +- + Documentation/doc-guide/kernel-doc.rst | 29 +- + Documentation/driver-api/devfreq.rst | 30 + + Documentation/driver-api/driver-model/devres.rst | 1 + + Documentation/driver-api/{ => gpio}/bt8xxgpio.rst | 2 +- + Documentation/driver-api/gpio/driver.rst | 27 +- + Documentation/driver-api/gpio/index.rst | 1 + + Documentation/driver-api/index.rst | 4 +- + Documentation/driver-api/infrastructure.rst | 3 - + Documentation/driver-api/interconnect.rst | 2 +- + Documentation/driver-api/pti_intel_mid.rst | 4 +- + .../filesystems/{autofs.txt => autofs.rst} | 263 ++- + Documentation/filesystems/index.rst | 1 + + Documentation/filesystems/locking.rst | 2 +- + Documentation/hwmon/inspur-ipsps1.rst | 2 +- + Documentation/i2c/busses/i2c-i801.rst | 1 + + Documentation/i2c/busses/index.rst | 2 +- + Documentation/i2c/index.rst | 2 +- + Documentation/i2c/instantiating-devices.rst | 10 +- + Documentation/i2c/writing-clients.rst | 8 +- + Documentation/index.rst | 1 - + Documentation/maintainer/configure-git.rst | 30 + + Documentation/maintainer/index.rst | 1 + + .../maintainer/maintainer-entry-profile.rst | 102 + + Documentation/memory-barriers.txt | 11 +- + Documentation/mips/ingenic-tcu.rst | 2 +- + Documentation/misc-devices/xilinx_sdfec.rst | 291 +++ + .../networking/device_drivers/mellanox/mlx5.rst | 2 +- + Documentation/networking/devlink-trap.rst | 2 +- + Documentation/networking/phy.rst | 2 +- + Documentation/networking/ppp_generic.txt | 2 + + Documentation/nvdimm/maintainer-entry-profile.rst | 59 + + .../{ioctl => process}/botching-up-ioctls.rst | 2 +- + .../process/embargoed-hardware-issues.rst | 2 +- + Documentation/process/index.rst | 2 + + Documentation/process/maintainers.rst | 1 + + Documentation/process/submitting-patches.rst | 53 +- + Documentation/riscv/boot-image-header.rst | 2 +- + Documentation/scheduler/sched-stats.rst | 4 +- + Documentation/security/keys/core.rst | 2 +- + Documentation/security/lsm.rst | 2 +- + Documentation/sphinx-static/theme_overrides.css | 10 + + Documentation/sphinx/kerneldoc.py | 17 +- + Documentation/sphinx/maintainers_include.py | 197 ++ + Documentation/sphinx/parallel-wrapper.sh | 33 + + .../trace/{ => coresight}/coresight-cpu-debug.rst | 0 + .../trace/coresight/coresight-etm4x-reference.rst | 798 +++++++ + Documentation/trace/{ => coresight}/coresight.rst | 2 +- + Documentation/trace/coresight/index.rst | 9 + + Documentation/trace/index.rst | 3 +- + .../it_IT/process/maintainer-pgp-guide.rst | 2 +- + Documentation/translations/ko_KR/howto.rst | 56 +- + Documentation/translations/ko_KR/index.rst | 4 +- + .../translations/ko_KR/memory-barriers.txt | 227 +- + Documentation/userspace-api/index.rst | 1 + + Documentation/{ => userspace-api}/ioctl/cdrom.rst | 0 + Documentation/{ => userspace-api}/ioctl/hdio.rst | 0 + Documentation/{ => userspace-api}/ioctl/index.rst | 1 - + .../{ => userspace-api}/ioctl/ioctl-decoding.rst | 0 + .../{ => userspace-api}/ioctl/ioctl-number.rst | 0 + Documentation/w1/index.rst | 2 +- + MAINTAINERS | 152 +- + arch/Kconfig | 20 +- + arch/alpha/kernel/osf_sys.c | 67 +- + arch/alpha/kernel/syscalls/syscall.tbl | 4 +- + arch/arc/configs/nps_defconfig | 1 - + arch/arc/configs/tb10x_defconfig | 1 - + arch/arc/include/asm/pgtable.h | 1 - + arch/arc/mm/fault.c | 10 +- + arch/arc/mm/highmem.c | 4 +- + arch/arm/boot/compressed/libfdt_env.h | 4 +- + arch/arm/boot/dts/omap36xx-clocks.dtsi | 4 + + arch/arm/boot/dts/omap3xxx-clocks.dtsi | 2 +- + arch/arm/configs/axm55xx_defconfig | 1 - + arch/arm/configs/keystone_defconfig | 1 - + arch/arm/configs/lpc32xx_defconfig | 1 - + arch/arm/configs/moxart_defconfig | 1 - + arch/arm/configs/qcom_defconfig | 1 - + arch/arm/configs/zx_defconfig | 1 - + arch/arm/mach-pxa/include/mach/tosa.h | 15 - + arch/arm/mach-pxa/tosa.c | 22 + + arch/arm/mach-ux500/cpu-db8500.c | 2 +- + arch/ia64/include/asm/iommu.h | 5 + + arch/ia64/kernel/asm-offsets.c | 2 +- + arch/m68k/configs/m5475evb_defconfig | 1 - + arch/mips/configs/ci20_defconfig | 1 - + arch/mips/configs/loongson3_defconfig | 1 - + arch/mips/configs/malta_qemu_32r6_defconfig | 1 - + arch/mips/configs/maltaaprp_defconfig | 1 - + arch/mips/configs/maltasmvp_defconfig | 1 - + arch/mips/configs/maltasmvp_eva_defconfig | 1 - + arch/mips/configs/maltaup_defconfig | 1 - + arch/mips/configs/omega2p_defconfig | 1 - + arch/mips/configs/qi_lb60_defconfig | 1 - + arch/mips/configs/vocore2_defconfig | 1 - + arch/mips/include/uapi/asm/msgbuf.h | 6 +- + arch/mips/include/uapi/asm/sembuf.h | 4 +- + arch/mips/include/uapi/asm/shmbuf.h | 6 +- + arch/mips/include/uapi/asm/stat.h | 16 +- + arch/mips/kernel/binfmt_elfn32.c | 4 +- + arch/mips/kernel/binfmt_elfo32.c | 4 +- + arch/nds32/kernel/vdso/gettimeofday.c | 61 +- + arch/nios2/configs/10m50_defconfig | 1 - + arch/nios2/configs/3c120_defconfig | 1 - + arch/parisc/configs/c8000_defconfig | 1 - + arch/parisc/configs/generic-32bit_defconfig | 1 - + arch/parisc/include/uapi/asm/msgbuf.h | 6 +- + arch/parisc/include/uapi/asm/sembuf.h | 4 +- + arch/parisc/include/uapi/asm/shmbuf.h | 6 +- + arch/powerpc/boot/libfdt_env.h | 2 + + arch/powerpc/configs/40x/klondike_defconfig | 1 - + arch/powerpc/include/asm/asm-prototypes.h | 3 +- + arch/powerpc/include/asm/book3s/64/pgtable-4k.h | 3 - + arch/powerpc/include/asm/book3s/64/pgtable-64k.h | 3 - + arch/powerpc/include/asm/vdso_datapage.h | 6 +- + arch/powerpc/include/uapi/asm/msgbuf.h | 6 +- + arch/powerpc/include/uapi/asm/sembuf.h | 4 +- + arch/powerpc/include/uapi/asm/shmbuf.h | 6 +- + arch/powerpc/include/uapi/asm/stat.h | 2 +- + arch/powerpc/kernel/asm-offsets.c | 18 +- + arch/powerpc/kernel/syscalls.c | 4 +- + arch/powerpc/kernel/time.c | 5 +- + arch/powerpc/kernel/vdso32/gettimeofday.S | 6 +- + arch/powerpc/kernel/vdso64/gettimeofday.S | 8 +- + arch/powerpc/mm/book3s64/radix_pgtable.c | 1 + + arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 1 + + arch/powerpc/platforms/pseries/papr_scm.c | 25 +- + arch/sh/boards/mach-ecovec24/setup.c | 33 +- + arch/sh/configs/rsk7264_defconfig | 1 - + arch/sparc/include/asm/io_64.h | 1 + + arch/sparc/include/uapi/asm/msgbuf.h | 6 +- + arch/sparc/include/uapi/asm/sembuf.h | 4 +- + arch/sparc/include/uapi/asm/shmbuf.h | 6 +- + arch/sparc/include/uapi/asm/stat.h | 24 +- + arch/sparc/vdso/vclock_gettime.c | 36 +- + arch/um/drivers/harddog_kern.c | 1 + + arch/um/drivers/hostaudio_kern.c | 1 + + arch/x86/Kconfig | 1 + + arch/x86/Kconfig.debug | 2 +- + arch/x86/entry/entry_32.S | 43 +- + arch/x86/entry/vdso/vclock_gettime.c | 6 +- + arch/x86/entry/vsyscall/vsyscall_64.c | 4 +- + arch/x86/events/core.c | 18 +- + arch/x86/include/asm/cpu_entry_area.h | 12 + + arch/x86/include/asm/doublefault.h | 13 + + arch/x86/include/asm/fpu/internal.h | 2 +- + arch/x86/include/asm/iommu.h | 18 + + arch/x86/include/asm/mmu_context.h | 4 +- + arch/x86/include/asm/pgtable_32_types.h | 7 +- + arch/x86/include/asm/processor.h | 2 - + arch/x86/include/asm/traps.h | 3 + + arch/x86/include/uapi/asm/msgbuf.h | 6 +- + arch/x86/include/uapi/asm/sembuf.h | 4 +- + arch/x86/include/uapi/asm/shmbuf.h | 6 +- + arch/x86/kernel/Makefile | 4 +- + arch/x86/kernel/cpu/common.c | 12 +- + arch/x86/kernel/doublefault.c | 86 - + arch/x86/kernel/doublefault_32.c | 136 ++ + arch/x86/kernel/dumpstack_32.c | 30 + + arch/x86/kernel/process.c | 52 +- + arch/x86/kernel/ptrace.c | 36 +- + arch/x86/kernel/traps.c | 31 +- + arch/x86/lib/x86-opcode-map.txt | 44 +- + arch/x86/mm/cpu_entry_area.c | 14 +- + arch/x86/mm/fault.c | 2 +- + arch/x86/mm/kasan_init_64.c | 61 + + arch/x86/mm/pat_interval.c | 12 +- + arch/x86/platform/olpc/olpc-xo1-pm.c | 8 - + arch/x86/platform/olpc/olpc-xo1-sci.c | 6 - + arch/x86/um/vdso/um_vdso.c | 12 +- + arch/xtensa/configs/audio_kc705_defconfig | 1 - + arch/xtensa/configs/cadence_csp_defconfig | 1 - + arch/xtensa/configs/generic_kc705_defconfig | 1 - + arch/xtensa/configs/iss_defconfig | 1 - + arch/xtensa/configs/nommu_kc705_defconfig | 1 - + arch/xtensa/configs/smp_lx200_defconfig | 1 - + arch/xtensa/configs/virt_defconfig | 1 - + block/scsi_ioctl.c | 132 +- + drivers/acpi/nfit/core.c | 7 - + drivers/android/binder.c | 2 +- + drivers/ata/ahci_imx.c | 25 +- + drivers/base/memory.c | 40 +- + drivers/block/ataflop.c | 2 +- + drivers/block/drbd/drbd_req.c | 2 +- + drivers/block/pktcdvd.c | 25 + + drivers/block/sunvdc.c | 2 +- + drivers/cdrom/cdrom.c | 12 +- + drivers/char/ipmi/ipmi_watchdog.c | 1 + + drivers/char/ppdev.c | 12 +- + drivers/char/random.c | 1 + + drivers/char/tpm/tpm_vtpm_proxy.c | 12 +- + drivers/clk/Kconfig | 7 + + drivers/clk/Makefile | 1 + + drivers/clk/at91/sckc.c | 3 +- + drivers/clk/axs10x/i2s_pll_clock.c | 4 +- + drivers/clk/axs10x/pll_clock.c | 7 +- + drivers/clk/bcm/clk-bcm2835-aux.c | 4 +- + drivers/clk/bcm/clk-bcm2835.c | 4 +- + drivers/clk/clk-aspeed.c | 27 +- + drivers/clk/clk-ast2600.c | 49 +- + drivers/clk/clk-bd718x7.c | 1 + + drivers/clk/clk-bm1880.c | 969 ++++++++ + drivers/clk/clk-composite.c | 13 +- + drivers/clk/clk-divider.c | 2 +- + drivers/clk/clk-fixed-rate.c | 2 +- + drivers/clk/clk-gate.c | 2 +- + drivers/clk/clk-gpio.c | 2 +- + drivers/clk/clk-mux.c | 2 +- + drivers/clk/clk.c | 27 +- + drivers/clk/davinci/pll.c | 4 +- + drivers/clk/davinci/psc.c | 4 +- + drivers/clk/hisilicon/clk-hi3660.c | 60 +- + drivers/clk/hisilicon/clk-hi3670.c | 152 +- + drivers/clk/hisilicon/clk-hi6220.c | 3 +- + drivers/clk/hisilicon/reset.c | 4 +- + drivers/clk/imgtec/clk-boston.c | 3 +- + drivers/clk/imx/clk-imx6sll.c | 8 +- + drivers/clk/imx/clk-imx6sx.c | 12 +- + drivers/clk/imx/clk-imx6ul.c | 8 +- + drivers/clk/imx/clk-imx7d.c | 4 +- + drivers/clk/imx/clk-imx7ulp.c | 9 +- + drivers/clk/imx/clk-imx8mm.c | 150 +- + drivers/clk/imx/clk-imx8mn.c | 166 +- + drivers/clk/imx/clk-imx8mq.c | 77 +- + drivers/clk/imx/clk-pll14xx.c | 72 +- + drivers/clk/imx/clk.h | 3 + + drivers/clk/ingenic/Kconfig | 12 +- + drivers/clk/ingenic/Makefile | 1 + + drivers/clk/ingenic/tcu.c | 3 +- + drivers/clk/ingenic/x1000-cgu.c | 274 +++ + drivers/clk/mediatek/clk-mt2712.c | 6 +- + drivers/clk/mediatek/clk-mt6779.c | 3 +- + drivers/clk/mediatek/clk-mt6797.c | 3 +- + drivers/clk/mediatek/clk-mt7622.c | 6 +- + drivers/clk/mediatek/clk-mt7629.c | 6 +- + drivers/clk/mediatek/clk-mt8183.c | 6 +- + drivers/clk/meson/axg-audio.c | 2025 ++++++++++------ + drivers/clk/meson/axg-audio.h | 21 +- + drivers/clk/mvebu/ap-cpu-clk.c | 4 +- + drivers/clk/mvebu/armada-37xx-periph.c | 6 +- + drivers/clk/mvebu/armada-xp.c | 26 - + drivers/clk/mvebu/cp110-system-controller.c | 4 +- + drivers/clk/pxa/clk-pxa27x.c | 1 + + drivers/clk/qcom/Kconfig | 26 + + drivers/clk/qcom/Makefile | 3 + + drivers/clk/qcom/clk-rcg.h | 2 +- + drivers/clk/qcom/clk-rcg2.c | 6 +- + drivers/clk/qcom/clk-rpmh.c | 53 +- + drivers/clk/qcom/clk-smd-rpm.c | 3 + + drivers/clk/qcom/common.c | 5 +- + drivers/clk/qcom/gcc-msm8998.c | 72 + + drivers/clk/qcom/gcc-sc7180.c | 2450 ++++++++++++++++++++ + drivers/clk/qcom/gcc-sdm845.c | 96 +- + drivers/clk/qcom/gpucc-msm8998.c | 338 +++ + drivers/clk/qcom/q6sstop-qcs404.c | 223 ++ + drivers/clk/renesas/Kconfig | 34 +- + drivers/clk/renesas/Makefile | 5 +- + drivers/clk/renesas/clk-mstp.c | 4 +- + drivers/clk/renesas/clk-rcar-gen2.c | 457 ---- + drivers/clk/renesas/r8a774b1-cpg-mssr.c | 327 +++ + drivers/clk/renesas/r8a7796-cpg-mssr.c | 24 +- + drivers/clk/renesas/r8a77965-cpg-mssr.c | 2 +- + drivers/clk/renesas/rcar-gen2-cpg.c | 25 +- + drivers/clk/renesas/rcar-gen3-cpg.c | 64 +- + drivers/clk/renesas/renesas-cpg-mssr.c | 14 +- + drivers/clk/renesas/renesas-cpg-mssr.h | 1 + + drivers/clk/rockchip/clk-half-divider.c | 3 +- + drivers/clk/rockchip/clk-px30.c | 70 +- + drivers/clk/samsung/clk-exynos5420.c | 34 +- + drivers/clk/samsung/clk-s3c2410-dclk.c | 4 +- + drivers/clk/samsung/clk.c | 3 +- + drivers/clk/sprd/common.c | 6 +- + drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 23 +- + drivers/clk/sunxi-ng/ccu-sun8i-h3.h | 4 - + drivers/clk/tegra/Makefile | 2 + + drivers/clk/tegra/clk-dfll.c | 56 + + drivers/clk/tegra/clk-dfll.h | 2 + + drivers/clk/tegra/clk-divider.c | 11 + + drivers/clk/tegra/clk-emc.c | 12 +- + drivers/clk/tegra/clk-id.h | 4 +- + drivers/clk/tegra/clk-periph.c | 21 + + drivers/clk/tegra/clk-pll-out.c | 9 + + drivers/clk/tegra/clk-pll.c | 86 +- + drivers/clk/tegra/clk-sdmmc-mux.c | 16 + + drivers/clk/tegra/clk-super.c | 41 + + drivers/clk/tegra/clk-tegra-fixed.c | 15 + + drivers/clk/tegra/clk-tegra-periph.c | 8 - + drivers/clk/tegra/clk-tegra-super-gen4.c | 7 +- + drivers/clk/tegra/clk-tegra124-dfll-fcpu.c | 1 + + drivers/clk/tegra/clk-tegra124.c | 55 +- + drivers/clk/tegra/clk-tegra20-emc.c | 293 +++ + drivers/clk/tegra/clk-tegra20.c | 80 +- + drivers/clk/tegra/clk-tegra210.c | 181 +- + drivers/clk/tegra/clk-tegra30.c | 63 +- + drivers/clk/tegra/clk.c | 112 +- + drivers/clk/tegra/clk.h | 70 + + drivers/clk/ti/adpll.c | 11 +- + drivers/clk/ti/clk-33xx.c | 4 +- + drivers/clk/ti/clk-43xx.c | 4 +- + drivers/clk/ti/clk-44xx.c | 4 +- + drivers/clk/ti/clk-54xx.c | 11 +- + drivers/clk/ti/clk-7xx.c | 8 +- + drivers/clk/ti/clkctrl.c | 45 +- + drivers/clk/ti/clock.h | 7 +- + drivers/clk/ti/divider.c | 282 +-- + drivers/clk/uniphier/clk-uniphier-core.c | 3 +- + drivers/crypto/qat/qat_common/adf_ctl_drv.c | 2 +- + drivers/dax/bus.c | 22 +- + drivers/dax/pmem/core.c | 6 +- + drivers/dma-buf/dma-buf.c | 4 +- + drivers/dma-buf/sw_sync.c | 2 +- + drivers/dma-buf/sync_file.c | 2 +- + drivers/dma/Kconfig | 88 +- + drivers/dma/Makefile | 4 + + drivers/dma/at_xdmac.c | 7 +- + drivers/dma/dma-jz4780.c | 16 +- + drivers/dma/dw/platform.c | 2 +- + drivers/dma/fsl-dpaa2-qdma/Kconfig | 9 + + drivers/dma/fsl-dpaa2-qdma/Makefile | 3 + + drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c | 825 +++++++ + drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.h | 153 ++ + drivers/dma/fsl-dpaa2-qdma/dpdmai.c | 376 +++ + drivers/dma/fsl-dpaa2-qdma/dpdmai.h | 177 ++ + drivers/dma/fsl-qdma.c | 3 + + drivers/dma/iop-adma.c | 10 +- + drivers/dma/k3dma.c | 7 +- + drivers/dma/mediatek/mtk-cqdma.c | 10 +- + drivers/dma/mediatek/mtk-hsdma.c | 4 +- + drivers/dma/mediatek/mtk-uart-apdma.c | 9 +- + drivers/dma/milbeaut-hdmac.c | 578 +++++ + drivers/dma/milbeaut-xdmac.c | 415 ++++ + drivers/dma/mmp_pdma.c | 2 + + drivers/dma/mmp_tdma.c | 3 + + drivers/dma/owl-dma.c | 7 +- + drivers/dma/sf-pdma/Kconfig | 6 + + drivers/dma/sf-pdma/Makefile | 1 + + drivers/dma/sf-pdma/sf-pdma.c | 620 +++++ + drivers/dma/sf-pdma/sf-pdma.h | 124 + + drivers/dma/sh/rcar-dmac.c | 47 +- + drivers/dma/sprd-dma.c | 17 +- + drivers/dma/ti/edma.c | 77 +- + drivers/dma/uniphier-mdmac.c | 4 +- + drivers/dma/xilinx/xilinx_dma.c | 649 ++++-- + drivers/dma/zx_dma.c | 8 +- + drivers/firewire/core-cdev.c | 12 +- + drivers/firmware/qcom_scm-32.c | 5 + + drivers/firmware/qcom_scm-64.c | 153 +- + drivers/firmware/qcom_scm.c | 6 + + drivers/firmware/qcom_scm.h | 5 + + drivers/gpio/Kconfig | 29 +- + drivers/gpio/Makefile | 3 + + drivers/gpio/TODO | 4 + + drivers/gpio/gpio-104-dio-48e.c | 5 +- + drivers/gpio/gpio-104-idi-48.c | 4 +- + drivers/gpio/gpio-104-idio-16.c | 4 +- + drivers/gpio/gpio-74xx-mmio.c | 5 +- + drivers/gpio/gpio-amd-fch.c | 2 +- + .../gpio/{sgpio-aspeed.c => gpio-aspeed-sgpio.c} | 0 + drivers/gpio/gpio-aspeed.c | 7 +- + drivers/gpio/gpio-ath79.c | 10 +- + drivers/gpio/gpio-bcm-kona.c | 6 +- + drivers/gpio/gpio-bd70528.c | 9 +- + drivers/gpio/gpio-bd9571mwv.c | 4 +- + drivers/gpio/gpio-dln2.c | 6 +- + drivers/gpio/gpio-em.c | 39 +- + drivers/gpio/gpio-exar.c | 5 +- + drivers/gpio/gpio-f7188x.c | 5 +- + drivers/gpio/gpio-gpio-mm.c | 5 +- + drivers/gpio/gpio-htc-egpio.c | 42 +- + drivers/gpio/gpio-ich.c | 5 +- + drivers/gpio/gpio-kempld.c | 5 +- + drivers/gpio/gpio-lp873x.c | 2 +- + drivers/gpio/gpio-lp87565.c | 5 +- + drivers/gpio/gpio-lynxpoint.c | 6 + + drivers/gpio/gpio-madera.c | 5 +- + drivers/gpio/gpio-max3191x.c | 2 +- + drivers/gpio/gpio-max77620.c | 231 +- + drivers/gpio/gpio-merrifield.c | 79 +- + drivers/gpio/gpio-mmio.c | 22 +- + drivers/gpio/gpio-mockup.c | 105 +- + drivers/gpio/gpio-moxtet.c | 4 +- + drivers/gpio/gpio-mpc8xxx.c | 36 +- + drivers/gpio/gpio-mvebu.c | 5 +- + drivers/gpio/gpio-mxc.c | 13 +- + drivers/gpio/gpio-mxs.c | 5 +- + drivers/gpio/gpio-omap.c | 6 +- + drivers/gpio/gpio-pca953x.c | 5 +- + drivers/gpio/gpio-pci-idio-16.c | 4 +- + drivers/gpio/gpio-pcie-idio-24.c | 9 +- + drivers/gpio/gpio-pisosr.c | 2 +- + drivers/gpio/gpio-pl061.c | 5 +- + drivers/gpio/gpio-raspberrypi-exp.c | 5 +- + drivers/gpio/gpio-rcar.c | 7 +- + drivers/gpio/gpio-rda.c | 294 +++ + drivers/gpio/gpio-reg.c | 3 +- + drivers/gpio/gpio-sa1100.c | 5 +- + drivers/gpio/gpio-sama5d2-piobu.c | 7 +- + drivers/gpio/gpio-sch.c | 5 +- + drivers/gpio/gpio-sch311x.c | 5 +- + drivers/gpio/gpio-siox.c | 4 +- + drivers/gpio/gpio-stmpe.c | 5 +- + drivers/gpio/gpio-tc3589x.c | 5 +- + drivers/gpio/gpio-tegra.c | 5 +- + drivers/gpio/gpio-tegra186.c | 380 ++- + drivers/gpio/gpio-thunderx.c | 5 +- + drivers/gpio/gpio-tpic2810.c | 2 +- + drivers/gpio/gpio-tps65086.c | 2 +- + drivers/gpio/gpio-tps65912.c | 4 +- + drivers/gpio/gpio-tps68470.c | 6 +- + drivers/gpio/gpio-tqmx86.c | 5 +- + drivers/gpio/gpio-ts4900.c | 5 +- + drivers/gpio/gpio-twl4030.c | 10 +- + drivers/gpio/gpio-twl6040.c | 3 +- + drivers/gpio/gpio-uniphier.c | 5 +- + drivers/gpio/gpio-wcove.c | 7 +- + drivers/gpio/gpio-ws16c48.c | 5 +- + drivers/gpio/gpio-xgene.c | 32 +- + drivers/gpio/gpio-xgs-iproc.c | 320 +++ + drivers/gpio/gpio-xra1403.c | 5 +- + drivers/gpio/gpio-xtensa.c | 4 +- + drivers/gpio/gpio-zynq.c | 7 +- + drivers/gpio/gpiolib-acpi.c | 17 +- + drivers/gpio/gpiolib-of.c | 18 +- + drivers/gpio/gpiolib.c | 282 ++- + drivers/gpio/gpiolib.h | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 4 +- + drivers/hid/Kconfig | 1 + + drivers/hid/Makefile | 1 + + drivers/hid/hid-core.c | 55 +- + drivers/hid/hid-google-hammer.c | 146 +- + drivers/hid/hid-ids.h | 6 + + drivers/hid/hid-lg-g15.c | 899 +++++++ + drivers/hid/hid-logitech-hidpp.c | 3 + + drivers/hid/hid-quirks.c | 8 +- + drivers/hid/hid-rmi.c | 3 +- + drivers/hid/hidraw.c | 14 +- + drivers/hid/i2c-hid/i2c-hid-core.c | 16 +- + drivers/hid/intel-ish-hid/ishtp/hbm.c | 2 +- + drivers/hid/usbhid/hiddev.c | 11 +- + drivers/hv/hv_balloon.c | 4 +- + drivers/hwmon/fschmd.c | 1 + + drivers/hwmon/w83793.c | 1 + + drivers/hwspinlock/hwspinlock_core.c | 16 +- + drivers/hwspinlock/sprd_hwspinlock.c | 48 +- + drivers/hwspinlock/u8500_hsem.c | 53 +- + drivers/hwtracing/stm/core.c | 12 +- + drivers/i2c/busses/Kconfig | 24 +- + drivers/i2c/busses/i2c-aspeed.c | 4 + + drivers/i2c/busses/i2c-at91-core.c | 38 + + drivers/i2c/busses/i2c-at91-master.c | 53 +- + drivers/i2c/busses/i2c-at91.h | 13 + + drivers/i2c/busses/i2c-bcm-iproc.c | 63 +- + drivers/i2c/busses/i2c-cros-ec-tunnel.c | 15 +- + drivers/i2c/busses/i2c-i801.c | 8 + + drivers/i2c/busses/i2c-icy.c | 9 +- + drivers/i2c/busses/i2c-pxa.c | 75 +- + drivers/i2c/busses/i2c-qup.c | 4 +- + drivers/i2c/busses/i2c-rcar.c | 2 +- + drivers/i2c/busses/i2c-sh_mobile.c | 2 +- + drivers/i2c/busses/i2c-stm32.c | 16 +- + drivers/i2c/busses/i2c-stm32f7.c | 32 +- + drivers/i2c/busses/i2c-tegra.c | 4 +- + drivers/i2c/busses/i2c-xiic.c | 2 + + drivers/i2c/i2c-core-base.c | 63 +- + drivers/i2c/i2c-smbus.c | 7 - + drivers/i2c/muxes/Kconfig | 18 +- + drivers/ide/ide-tape.c | 27 +- + drivers/iio/industrialio-core.c | 2 +- + drivers/infiniband/core/uverbs_main.c | 4 +- + drivers/input/input-poller.c | 9 + + drivers/input/joystick/Kconfig | 1 - + drivers/input/joystick/psxpad-spi.c | 64 +- + drivers/input/keyboard/Kconfig | 28 +- + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/adc-keys.c | 36 +- + drivers/input/keyboard/adp5589-keys.c | 171 +- + drivers/input/keyboard/clps711x-keypad.c | 70 +- + drivers/input/keyboard/gpio_keys.c | 6 +- + drivers/input/keyboard/gpio_keys_polled.c | 72 +- + drivers/input/keyboard/imx_sc_key.c | 187 ++ + drivers/input/keyboard/jornada680_kbd.c | 37 +- + drivers/input/keyboard/mpr121_touchkey.c | 69 +- + drivers/input/misc/Kconfig | 15 - + drivers/input/misc/apanel.c | 153 +- + drivers/input/misc/bma150.c | 190 +- + drivers/input/misc/cobalt_btns.c | 73 +- + drivers/input/misc/gpio_decoder.c | 42 +- + drivers/input/misc/hp_sdc_rtc.c | 342 --- + drivers/input/misc/kxtj9.c | 224 +- + drivers/input/misc/mma8450.c | 101 +- + drivers/input/misc/rb532_button.c | 48 +- + drivers/input/misc/sgi_btns.c | 54 +- + drivers/input/misc/wistron_btns.c | 51 +- + drivers/input/mouse/Kconfig | 15 +- + drivers/input/mouse/gpio_mouse.c | 45 +- + drivers/input/mouse/synaptics.c | 1 + + drivers/input/rmi4/rmi_f54.c | 63 +- + drivers/input/tablet/Kconfig | 20 +- + drivers/input/touchscreen/Kconfig | 6 +- + drivers/input/touchscreen/ar1021_i2c.c | 4 +- + drivers/input/touchscreen/atmel_mxt_ts.c | 4 + + drivers/input/touchscreen/colibri-vf50-ts.c | 1 - + drivers/input/touchscreen/edt-ft5x06.c | 30 + + drivers/input/touchscreen/ili210x.c | 418 ++-- + drivers/input/touchscreen/mms114.c | 3 +- + drivers/input/touchscreen/pixcir_i2c_ts.c | 177 +- + drivers/input/touchscreen/raspberrypi-ts.c | 38 +- + drivers/input/touchscreen/s3c2410_ts.c | 1 - + drivers/input/touchscreen/st1232.c | 184 +- + drivers/input/touchscreen/sur40.c | 92 +- + drivers/input/touchscreen/tps6507x-ts.c | 36 +- + drivers/input/touchscreen/ts4800-ts.c | 68 +- + drivers/input/touchscreen/wacom_i2c.c | 1 - + drivers/iommu/Kconfig | 5 + + drivers/iommu/Makefile | 3 +- + drivers/iommu/amd_iommu.c | 893 ++----- + drivers/iommu/amd_iommu_types.h | 3 +- + drivers/iommu/arm-smmu-impl.c | 5 +- + drivers/iommu/arm-smmu-qcom.c | 51 + + drivers/iommu/arm-smmu-v3.c | 12 +- + drivers/iommu/arm-smmu.c | 223 +- + drivers/iommu/arm-smmu.h | 16 +- + drivers/iommu/dma-iommu.c | 43 +- + drivers/iommu/dmar.c | 5 +- + drivers/iommu/exynos-iommu.c | 2 +- + drivers/iommu/intel-iommu.c | 61 +- + drivers/iommu/io-pgtable-arm-v7s.c | 15 +- + drivers/iommu/io-pgtable-arm.c | 130 +- + drivers/iommu/ioasid.c | 422 ++++ + drivers/iommu/iommu.c | 73 +- + drivers/iommu/ipmmu-vmsa.c | 223 +- + drivers/iommu/msm_iommu.c | 2 +- + drivers/iommu/mtk_iommu.c | 90 +- + drivers/iommu/mtk_iommu.h | 2 +- + drivers/iommu/mtk_iommu_v1.c | 2 +- + drivers/iommu/omap-iommu.c | 2 +- + drivers/iommu/qcom_iommu.c | 10 +- + drivers/iommu/rockchip-iommu.c | 11 +- + drivers/iommu/s390-iommu.c | 2 +- + drivers/iommu/tegra-gart.c | 2 +- + drivers/iommu/tegra-smmu.c | 38 +- + drivers/iommu/virtio-iommu.c | 5 +- + drivers/isdn/capi/capi.c | 31 + + drivers/leds/Kconfig | 17 +- + drivers/leds/Makefile | 1 + + drivers/leds/led-class-flash.c | 50 + + drivers/leds/led-class.c | 10 +- + drivers/leds/led-triggers.c | 90 +- + drivers/leds/leds-an30259a.c | 7 + + drivers/leds/leds-bcm6328.c | 7 +- + drivers/leds/leds-bcm6358.c | 7 +- + drivers/leds/leds-el15203000.c | 357 +++ + drivers/leds/leds-lm3601x.c | 4 +- + drivers/leds/leds-lm3692x.c | 47 +- + drivers/leds/leds-mlxreg.c | 4 +- + drivers/leds/leds-pca9532.c | 14 +- + drivers/leds/leds-tlc591xx.c | 90 +- + drivers/leds/leds.h | 6 + + drivers/leds/trigger/ledtrig-netdev.c | 5 +- + drivers/mailbox/hi6220-mailbox.c | 1 - + drivers/mailbox/imx-mailbox.c | 74 +- + drivers/mailbox/omap-mailbox.c | 2 +- + drivers/mailbox/stm32-ipcc.c | 36 +- + drivers/media/rc/lirc_dev.c | 4 +- + drivers/memory/mtk-smi.c | 4 + + drivers/mfd/ab8500-core.c | 138 +- + drivers/mfd/arizona-core.c | 6 +- + drivers/mfd/cs5535-mfd.c | 108 +- + drivers/mfd/db8500-prcmu.c | 84 +- + drivers/mfd/intel-lpss-pci.c | 41 +- + drivers/mfd/intel-lpss.c | 2 +- + drivers/mfd/intel_soc_pmic_crc.c | 3 + + drivers/mfd/ipaq-micro.c | 6 +- + drivers/mfd/madera-core.c | 27 +- + drivers/mfd/max77620.c | 5 +- + drivers/mfd/mfd-core.c | 118 +- + drivers/mfd/mt6397-core.c | 12 +- + drivers/mfd/qcom-spmi-pmic.c | 4 + + drivers/mfd/rk808.c | 22 +- + drivers/mfd/rohm-bd70528.c | 17 +- + drivers/mfd/syscon.c | 1 - + drivers/mfd/ti_am335x_tscadc.c | 2 +- + drivers/mfd/wm8998-tables.c | 12 - + drivers/misc/cxl/flash.c | 8 +- + drivers/misc/eeprom/at24.c | 9 +- + drivers/misc/genwqe/card_dev.c | 23 +- + drivers/misc/lkdtm/bugs.c | 39 + + drivers/misc/lkdtm/core.c | 3 + + drivers/misc/lkdtm/lkdtm.h | 3 + + drivers/misc/mei/main.c | 22 +- + drivers/misc/vmw_vmci/vmci_host.c | 2 +- + drivers/mtd/ubi/cdev.c | 36 +- + drivers/net/ethernet/cadence/macb_main.c | 1 + + drivers/net/ethernet/emulex/benet/Kconfig | 2 +- + drivers/net/ethernet/faraday/ftgmac100.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 74 +- + drivers/net/ethernet/pensando/ionic/ionic_if.h | 4 +- + drivers/net/ethernet/realtek/r8169_main.c | 3 +- + drivers/net/ethernet/ti/cpsw_ale.c | 12 +- + drivers/net/phy/realtek.c | 9 + + drivers/net/ppp/ppp_generic.c | 245 +- + drivers/net/tap.c | 12 +- + drivers/nvdimm/btt.c | 18 +- + drivers/nvdimm/btt_devs.c | 24 +- + drivers/nvdimm/bus.c | 48 +- + drivers/nvdimm/claim.c | 14 +- + drivers/nvdimm/core.c | 8 +- + drivers/nvdimm/dax_devs.c | 27 +- + drivers/nvdimm/dimm_devs.c | 30 +- + drivers/nvdimm/e820.c | 13 - + drivers/nvdimm/namespace_devs.c | 114 +- + drivers/nvdimm/nd-core.h | 21 +- + drivers/nvdimm/nd.h | 27 +- + drivers/nvdimm/of_pmem.c | 13 - + drivers/nvdimm/pfn_devs.c | 64 +- + drivers/nvdimm/pmem.c | 18 +- + drivers/nvdimm/region_devs.c | 235 +- + drivers/nvme/host/core.c | 2 +- + drivers/of/address.c | 103 +- + drivers/of/base.c | 32 +- + drivers/of/fdt.c | 4 +- + drivers/of/of_private.h | 14 + + drivers/of/overlay.c | 37 +- + drivers/of/property.c | 8 +- + drivers/of/unittest-data/testcases.dts | 1 + + drivers/of/unittest-data/tests-address.dtsi | 48 + + drivers/of/unittest.c | 96 +- + drivers/pci/switch/switchtec.c | 2 +- + drivers/pinctrl/pinctrl-equilibrium.c | 1 + + drivers/platform/mellanox/Kconfig | 16 +- + drivers/platform/mellanox/Makefile | 1 + + drivers/platform/mellanox/mlxbf-bootctl.c | 321 +++ + drivers/platform/mellanox/mlxbf-bootctl.h | 103 + + drivers/platform/x86/Kconfig | 37 +- + drivers/platform/x86/Makefile | 5 + + drivers/platform/x86/acerhdf.c | 7 +- + drivers/platform/x86/asus-laptop.c | 71 +- + drivers/platform/x86/dell-laptop.c | 26 + + drivers/platform/x86/dell_rbu.c | 2 +- + drivers/platform/x86/hdaps.c | 40 +- + drivers/platform/x86/hp-wmi.c | 10 +- + drivers/platform/x86/huawei-wmi.c | 876 ++++++- + drivers/platform/x86/intel_cht_int33fe_common.c | 147 ++ + drivers/platform/x86/intel_cht_int33fe_common.h | 41 + + drivers/platform/x86/intel_cht_int33fe_microb.c | 57 + + ...tel_cht_int33fe.c => intel_cht_int33fe_typec.c} | 78 +- + drivers/platform/x86/intel_int0002_vgpio.c | 28 +- + drivers/platform/x86/intel_pmc_core.c | 17 +- + drivers/platform/x86/intel_punit_ipc.c | 48 +- + drivers/platform/x86/peaq-wmi.c | 66 +- + drivers/platform/x86/system76_acpi.c | 384 +++ + drivers/platform/x86/touchscreen_dmi.c | 52 + + drivers/platform/x86/wmi.c | 2 +- + drivers/power/reset/Kconfig | 10 + + drivers/power/reset/Makefile | 1 + + drivers/power/reset/mt6323-poweroff.c | 97 + + drivers/remoteproc/qcom_q6v5_mss.c | 52 +- + drivers/remoteproc/remoteproc_core.c | 9 +- + drivers/remoteproc/remoteproc_debugfs.c | 3 - + drivers/remoteproc/stm32_rproc.c | 100 +- + drivers/rpmsg/Kconfig | 2 +- + drivers/rpmsg/qcom_glink_native.c | 53 +- + drivers/rpmsg/qcom_glink_smem.c | 2 +- + drivers/rpmsg/rpmsg_char.c | 16 +- + drivers/rtc/dev.c | 33 +- + drivers/rtc/rtc-ds1374.c | 1 + + drivers/rtc/rtc-m41t80.c | 1 + + drivers/rtc/rtc-mt6397.c | 107 +- + drivers/rtc/rtc-vr41xx.c | 8 + + drivers/s390/char/tape_char.c | 41 +- + drivers/sbus/char/display7seg.c | 2 +- + drivers/sbus/char/envctrl.c | 4 +- + drivers/scsi/3w-xxxx.c | 4 +- + drivers/scsi/cxlflash/main.c | 2 +- + drivers/scsi/esas2r/esas2r_main.c | 2 +- + drivers/scsi/megaraid/megaraid_mm.c | 28 +- + drivers/scsi/pmcraid.c | 4 +- + drivers/scsi/sd.c | 14 +- + drivers/scsi/sg.c | 59 +- + drivers/scsi/sr_vendor.c | 18 + + drivers/scsi/st.c | 28 +- + drivers/staging/android/ion/ion.c | 4 +- + drivers/staging/pi433/pi433_if.c | 12 +- + drivers/staging/vme/devices/vme_user.c | 2 +- + drivers/tee/tee_core.c | 2 +- + drivers/thermal/gov_bang_bang.c | 2 +- + drivers/tty/tty_io.c | 5 + + drivers/usb/class/cdc-wdm.c | 2 +- + drivers/usb/class/usbtmc.c | 4 +- + drivers/usb/core/devio.c | 16 +- + drivers/usb/gadget/function/f_fs.c | 12 +- + drivers/vfio/vfio.c | 39 +- + drivers/vhost/net.c | 12 +- + drivers/vhost/scsi.c | 12 +- + drivers/vhost/test.c | 12 +- + drivers/vhost/vsock.c | 12 +- + drivers/video/backlight/Kconfig | 12 +- + drivers/video/backlight/Makefile | 2 +- + drivers/video/backlight/gpio_backlight.c | 128 +- + drivers/video/backlight/ipaq_micro_bl.c | 2 +- + drivers/video/backlight/lm3630a_bl.c | 13 +- + drivers/video/backlight/pm8941-wled.c | 424 ---- + drivers/video/backlight/pwm_bl.c | 39 +- + drivers/video/backlight/qcom-wled.c | 1296 +++++++++++ + drivers/video/backlight/tosa_bl.c | 10 +- + drivers/video/backlight/tosa_bl.h | 8 + + drivers/video/backlight/tosa_lcd.c | 28 +- + drivers/video/fbdev/aty/atyfb_base.c | 12 +- + drivers/video/fbdev/matrox/i2c-matroxfb.c | 4 +- + drivers/virt/fsl_hypervisor.c | 2 +- + drivers/watchdog/Kconfig | 5 +- + drivers/watchdog/acquirewdt.c | 1 + + drivers/watchdog/advantechwdt.c | 1 + + drivers/watchdog/alim1535_wdt.c | 1 + + drivers/watchdog/alim7101_wdt.c | 1 + + drivers/watchdog/ar7_wdt.c | 1 + + drivers/watchdog/aspeed_wdt.c | 16 +- + drivers/watchdog/at91rm9200_wdt.c | 1 + + drivers/watchdog/at91sam9_wdt.h | 34 +- + drivers/watchdog/ath79_wdt.c | 1 + + drivers/watchdog/bcm63xx_wdt.c | 1 + + drivers/watchdog/bd70528_wdt.c | 4 +- + drivers/watchdog/cadence_wdt.c | 6 +- + drivers/watchdog/cpu5wdt.c | 1 + + drivers/watchdog/eurotechwdt.c | 1 + + drivers/watchdog/f71808e_wdt.c | 1 + + drivers/watchdog/gef_wdt.c | 1 + + drivers/watchdog/geodewdt.c | 1 + + drivers/watchdog/ib700wdt.c | 1 + + drivers/watchdog/ibmasr.c | 1 + + drivers/watchdog/imx2_wdt.c | 30 +- + drivers/watchdog/imx7ulp_wdt.c | 45 +- + drivers/watchdog/indydog.c | 1 + + drivers/watchdog/intel-mid_wdt.c | 1 + + drivers/watchdog/intel_scu_watchdog.c | 1 + + drivers/watchdog/iop_wdt.c | 1 + + drivers/watchdog/it8712f_wdt.c | 1 + + drivers/watchdog/ixp4xx_wdt.c | 1 + + drivers/watchdog/jz4740_wdt.c | 108 +- + drivers/watchdog/m54xx_wdt.c | 1 + + drivers/watchdog/machzwd.c | 1 + + drivers/watchdog/mixcomwd.c | 1 + + drivers/watchdog/mtx-1_wdt.c | 1 + + drivers/watchdog/mv64x60_wdt.c | 1 + + drivers/watchdog/nv_tco.c | 1 + + drivers/watchdog/pc87413_wdt.c | 1 + + drivers/watchdog/pcwd.c | 1 + + drivers/watchdog/pcwd_pci.c | 1 + + drivers/watchdog/pcwd_usb.c | 1 + + drivers/watchdog/pika_wdt.c | 1 + + drivers/watchdog/pnx833x_wdt.c | 1 + + drivers/watchdog/rc32434_wdt.c | 1 + + drivers/watchdog/rdc321x_wdt.c | 1 + + drivers/watchdog/riowd.c | 1 + + drivers/watchdog/sa1100_wdt.c | 1 + + drivers/watchdog/sb_wdog.c | 1 + + drivers/watchdog/sbc60xxwdt.c | 1 + + drivers/watchdog/sbc7240_wdt.c | 4 +- + drivers/watchdog/sbc_epx_c3.c | 1 + + drivers/watchdog/sbc_fitpc2_wdt.c | 1 + + drivers/watchdog/sc1200wdt.c | 1 + + drivers/watchdog/sc520_wdt.c | 1 + + drivers/watchdog/sch311x_wdt.c | 1 + + drivers/watchdog/scx200_wdt.c | 1 + + drivers/watchdog/smsc37b787_wdt.c | 1 + + drivers/watchdog/sprd_wdt.c | 6 +- + drivers/watchdog/w83627hf_wdt.c | 11 +- + drivers/watchdog/w83877f_wdt.c | 1 + + drivers/watchdog/w83977f_wdt.c | 1 + + drivers/watchdog/wafer5823wdt.c | 1 + + drivers/watchdog/watchdog_dev.c | 102 +- + drivers/watchdog/wdat_wdt.c | 2 +- + drivers/watchdog/wdrtas.c | 1 + + drivers/watchdog/wdt.c | 1 + + drivers/watchdog/wdt285.c | 1 + + drivers/watchdog/wdt977.c | 1 + + drivers/watchdog/wdt_pci.c | 1 + + drivers/xen/balloon.c | 1 - + fs/aio.c | 2 +- + fs/binfmt_elf.c | 12 +- + fs/binfmt_elf_fdpic.c | 12 +- + fs/btrfs/super.c | 2 +- + fs/buffer.c | 6 +- + fs/ceph/dir.c | 1 + + fs/ceph/file.c | 2 +- + fs/cifs/cifsfs.c | 2 +- + fs/compat_binfmt_elf.c | 4 +- + fs/compat_ioctl.c | 917 +------- + fs/direct-io.c | 21 - + fs/ecryptfs/file.c | 1 + + fs/ext4/ioctl.c | 1 + + fs/f2fs/file.c | 1 + + fs/fat/file.c | 13 +- + fs/fuse/dev.c | 2 +- + fs/gfs2/file.c | 30 + + fs/hpfs/dir.c | 1 + + fs/hpfs/file.c | 1 + + fs/hugetlbfs/inode.c | 63 +- + fs/io_uring.c | 58 +- + fs/ioctl.c | 80 +- + fs/nilfs2/ioctl.c | 1 + + fs/notify/fanotify/fanotify_user.c | 2 +- + fs/ocfs2/acl.c | 4 +- + fs/ocfs2/ioctl.c | 1 + + fs/pstore/platform.c | 2 +- + fs/select.c | 10 +- + fs/timerfd.c | 14 +- + fs/userfaultfd.c | 23 +- + fs/utimes.c | 8 +- + include/asm-generic/4level-fixup.h | 1 - + include/asm-generic/5level-fixup.h | 1 - + include/asm-generic/pgtable-nop4d.h | 2 +- + include/asm-generic/pgtable-nopmd.h | 2 +- + include/asm-generic/pgtable-nopud.h | 2 +- + include/asm-generic/pgtable.h | 51 + + include/asm-generic/tlb.h | 4 - + include/dt-bindings/clock/aspeed-clock.h | 2 + + include/dt-bindings/clock/ast2600-clock.h | 4 + + include/dt-bindings/clock/axg-audio-clkc.h | 10 + + include/dt-bindings/clock/bm1880-clock.h | 82 + + include/dt-bindings/clock/imx7ulp-clock.h | 1 + + include/dt-bindings/clock/imx8mm-clock.h | 19 +- + include/dt-bindings/clock/imx8mn-clock.h | 19 +- + include/dt-bindings/clock/imx8mq-clock.h | 24 +- + include/dt-bindings/clock/omap5.h | 4 + + include/dt-bindings/clock/px30-cru.h | 2 + + include/dt-bindings/clock/qcom,gcc-msm8998.h | 6 + + include/dt-bindings/clock/qcom,gcc-sc7180.h | 155 ++ + include/dt-bindings/clock/qcom,q6sstopcc-qcs404.h | 18 + + include/dt-bindings/clock/r8a774b1-cpg-mssr.h | 57 + + include/dt-bindings/clock/r8a77961-cpg-mssr.h | 65 + + include/dt-bindings/clock/sun8i-h3-ccu.h | 2 +- + include/dt-bindings/clock/tegra124-car-common.h | 3 +- + include/dt-bindings/clock/tegra210-car.h | 6 +- + include/dt-bindings/clock/x1000-cgu.h | 44 + + include/dt-bindings/dma/x1000-dma.h | 40 + + include/dt-bindings/power/r8a774b1-sysc.h | 26 + + include/dt-bindings/power/r8a77961-sysc.h | 32 + + .../reset/amlogic,meson-g12a-audio-reset.h | 15 + + include/linux/blkdev.h | 2 + + include/linux/clk-provider.h | 1 + + include/linux/clk/tegra.h | 24 + + include/linux/clk/ti.h | 3 +- + include/linux/compat.h | 19 +- + include/linux/dma/sprd-dma.h | 4 + + include/linux/dmar.h | 2 + + include/linux/falloc.h | 20 + + include/linux/fs.h | 13 +- + include/linux/gfp.h | 2 + + include/linux/gpio/driver.h | 8 + + include/linux/hugetlb.h | 140 +- + include/linux/i2c-pxa.h | 18 - + include/linux/i2c.h | 21 +- + include/linux/input.h | 1 + + include/linux/interrupt.h | 13 + + include/linux/io-pgtable.h | 2 +- + include/linux/io.h | 2 + + include/linux/ioasid.h | 76 + + include/linux/iommu.h | 65 +- + include/linux/kasan.h | 31 + + include/linux/led-class-flash.h | 41 +- + include/linux/leds.h | 100 +- + include/linux/libfdt_env.h | 5 +- + include/linux/libnvdimm.h | 7 - + include/linux/memblock.h | 3 + + include/linux/memcontrol.h | 49 +- + include/linux/memory_hotplug.h | 11 +- + include/linux/mfd/arizona/registers.h | 7 - + include/linux/mfd/core.h | 49 +- + include/linux/mfd/db8500-prcmu.h | 4 +- + include/linux/mfd/dbx500-prcmu.h | 7 +- + include/linux/mfd/madera/core.h | 11 + + include/linux/mfd/max77620.h | 1 - + include/linux/mfd/mt6397/rtc.h | 71 + + include/linux/mfd/rk808.h | 2 +- + include/linux/mfd/twl.h | 12 +- + include/linux/mm.h | 34 +- + include/linux/mmzone.h | 34 +- + include/linux/moduleloader.h | 2 +- + include/linux/mtio.h | 60 + + include/linux/nd.h | 2 +- + include/linux/of_address.h | 21 +- + include/linux/page-isolation.h | 4 +- + include/linux/platform_data/gpio_backlight.h | 3 - + include/linux/platform_data/i2c-pxa.h | 4 - + include/linux/platform_data/pixcir_i2c_ts.h | 64 - + include/linux/qcom_scm.h | 2 + + include/linux/skbuff.h | 7 +- + include/linux/skmsg.h | 28 +- + include/linux/slab.h | 20 - + include/linux/string.h | 2 + + include/linux/swap.h | 2 +- + include/linux/syscalls.h | 16 +- + include/linux/time.h | 9 +- + include/linux/time32.h | 2 +- + include/linux/types.h | 2 +- + include/linux/vmalloc.h | 12 + + include/net/tls.h | 3 +- + include/trace/events/kmem.h | 47 + + include/trace/events/timer.h | 16 +- + include/uapi/asm-generic/msgbuf.h | 12 +- + include/uapi/asm-generic/posix_types.h | 1 + + include/uapi/asm-generic/sembuf.h | 7 +- + include/uapi/asm-generic/shmbuf.h | 12 +- + include/uapi/linux/cyclades.h | 6 +- + include/uapi/linux/elfcore.h | 8 +- + include/uapi/linux/errqueue.h | 7 + + include/uapi/linux/gpio.h | 24 + + include/uapi/linux/input-event-codes.h | 75 + + include/uapi/linux/iommu.h | 169 ++ + include/uapi/linux/msg.h | 6 +- + include/uapi/linux/ppp-ioctl.h | 2 + + include/uapi/linux/ppp_defs.h | 18 +- + include/uapi/linux/resource.h | 4 +- + include/uapi/linux/sem.h | 4 +- + include/uapi/linux/shm.h | 6 +- + include/uapi/linux/time.h | 6 +- + include/uapi/linux/time_types.h | 5 + + include/uapi/linux/utime.h | 4 +- + init/Kconfig | 17 - + ipc/syscall.c | 2 +- + kernel/compat.c | 24 - + kernel/events/uprobes.c | 2 +- + kernel/fork.c | 4 + + kernel/power/power.h | 2 +- + kernel/sys.c | 4 +- + kernel/sys_ni.c | 23 + + kernel/sysctl.c | 2 +- + kernel/sysctl_binary.c | 1305 ----------- + kernel/time/hrtimer.c | 2 +- + kernel/time/itimer.c | 189 +- + kernel/time/time.c | 32 +- + lib/Kconfig.kasan | 16 + + lib/devres.c | 19 + + lib/genalloc.c | 2 +- + lib/iov_iter.c | 1 + + lib/test_kasan.c | 26 + + lib/vdso/gettimeofday.c | 4 +- + lib/vsprintf.c | 40 +- + mm/Kconfig | 40 +- + mm/cma.c | 6 +- + mm/cma_debug.c | 10 +- + mm/filemap.c | 54 +- + mm/gup.c | 40 +- + mm/huge_memory.c | 2 +- + mm/hugetlb.c | 288 +-- + mm/hwpoison-inject.c | 4 +- + mm/internal.h | 27 +- + mm/kasan/common.c | 233 ++ + mm/kasan/generic_report.c | 3 + + mm/kasan/kasan.h | 1 + + mm/khugepaged.c | 18 + + mm/madvise.c | 14 +- + mm/memblock.c | 111 +- + mm/memcontrol.c | 167 +- + mm/memory-failure.c | 61 +- + mm/memory.c | 52 +- + mm/memory_hotplug.c | 86 +- + mm/mempolicy.c | 47 +- + mm/migrate.c | 16 +- + mm/mmap.c | 63 +- + mm/mprotect.c | 8 +- + mm/mremap.c | 4 +- + mm/nommu.c | 10 +- + mm/page_alloc.c | 137 +- + mm/page_io.c | 15 +- + mm/page_isolation.c | 12 +- + mm/pgtable-generic.c | 9 + + mm/rmap.c | 65 +- + mm/shmem.c | 29 +- + mm/slab.c | 7 +- + mm/slab.h | 6 +- + mm/slab_common.c | 99 +- + mm/slub.c | 36 +- + mm/sparse.c | 18 +- + mm/swap.c | 29 +- + mm/swapfile.c | 7 + + mm/userfaultfd.c | 73 +- + mm/util.c | 22 +- + mm/vmalloc.c | 192 +- + mm/vmscan.c | 662 +++--- + mm/workingset.c | 69 +- + mm/z3fold.c | 375 ++- + net/bluetooth/hci_sock.c | 21 +- + net/bluetooth/rfcomm/sock.c | 14 +- + net/compat.c | 2 +- + net/core/filter.c | 8 +- + net/core/scm.c | 6 +- + net/core/skmsg.c | 2 +- + net/ipv4/tcp.c | 28 +- + net/ipv4/tcp_bpf.c | 2 +- + net/openvswitch/datapath.c | 11 +- + net/rfkill/core.c | 2 +- + net/sched/sch_mq.c | 3 +- + net/sched/sch_mqprio.c | 4 +- + net/sched/sch_multiq.c | 2 +- + net/sched/sch_prio.c | 2 +- + net/socket.c | 7 +- + net/tipc/socket.c | 24 +- + net/tls/tls_main.c | 13 +- + net/tls/tls_sw.c | 32 +- + net/unix/af_unix.c | 19 + + scripts/checkpatch.pl | 8 + + scripts/dtc/Makefile | 4 +- + scripts/dtc/dtx_diff | 12 +- + scripts/jobserver-exec | 66 + + scripts/kernel-doc | 27 +- + scripts/spelling.txt | 28 + + scripts/sphinx-pre-install | 30 +- + security/selinux/hooks.c | 10 +- + sound/core/oss/pcm_oss.c | 4 + + sound/oss/dmasound/dmasound_core.c | 2 + + tools/arch/x86/lib/x86-opcode-map.txt | 44 +- + tools/build/Makefile.feature | 3 +- + tools/build/feature/Makefile | 4 + + tools/build/feature/test-libbpf.c | 7 + + tools/perf/Makefile.config | 10 + + tools/perf/Makefile.perf | 6 +- + tools/perf/arch/arm/tests/dwarf-unwind.c | 4 +- + tools/perf/arch/arm64/tests/dwarf-unwind.c | 4 +- + tools/perf/arch/powerpc/tests/dwarf-unwind.c | 4 +- + tools/perf/arch/s390/annotate/instructions.c | 2 +- + tools/perf/arch/x86/tests/dwarf-unwind.c | 4 +- + tools/perf/arch/x86/tests/insn-x86-dat-32.c | 366 +++ + tools/perf/arch/x86/tests/insn-x86-dat-64.c | 484 ++++ + tools/perf/arch/x86/tests/insn-x86-dat-src.c | 655 ++++++ + tools/perf/arch/x86/util/event.c | 5 +- + tools/perf/builtin-diff.c | 6 +- + tools/perf/builtin-report.c | 7 +- + tools/perf/builtin-script.c | 46 +- + tools/perf/tests/Build | 4 +- + tools/perf/tests/builtin-test.c | 8 +- + tools/perf/tests/code-reading.c | 2 +- + tools/perf/tests/{map_groups.c => maps.c} | 26 +- + tools/perf/tests/tests.h | 4 +- + .../{thread-mg-share.c => thread-maps-share.c} | 36 +- + tools/perf/tests/vmlinux-kallsyms.c | 9 +- + tools/perf/ui/browsers/annotate.c | 2 +- + tools/perf/ui/stdio/hist.c | 4 +- + tools/perf/util/Build | 2 + + tools/perf/util/affinity.c | 73 + + tools/perf/util/affinity.h | 17 + + tools/perf/util/annotate.c | 8 +- + tools/perf/util/bpf-event.c | 4 +- + tools/perf/util/callchain.c | 8 +- + tools/perf/util/cs-etm.c | 2 +- + tools/perf/util/db-export.c | 12 +- + tools/perf/util/event.c | 14 +- + tools/perf/util/fncache.c | 63 + + tools/perf/util/fncache.h | 7 + + tools/perf/util/hist.c | 8 +- + tools/perf/util/intel-pt.c | 2 +- + tools/perf/util/machine.c | 80 +- + tools/perf/util/machine.h | 10 +- + tools/perf/util/map.c | 223 +- + tools/perf/util/map.h | 14 +- + tools/perf/util/map_groups.h | 106 - + tools/perf/util/map_symbol.h | 4 +- + tools/perf/util/maps.h | 87 + + tools/perf/util/perf_regs.h | 2 +- + tools/perf/util/pmu.c | 34 +- + tools/perf/util/probe-event.c | 4 +- + tools/perf/util/python-ext-sources | 1 + + .../util/scripting-engines/trace-event-python.c | 2 +- + tools/perf/util/srccode.c | 9 +- + tools/perf/util/symbol-elf.c | 16 +- + tools/perf/util/symbol.c | 91 +- + tools/perf/util/symbol.h | 6 +- + tools/perf/util/synthetic-events.c | 2 +- + tools/perf/util/thread-stack.c | 4 +- + tools/perf/util/thread.c | 38 +- + tools/perf/util/thread.h | 4 +- + tools/perf/util/unwind-libdw.c | 4 +- + tools/perf/util/unwind-libunwind-local.c | 22 +- + tools/perf/util/unwind-libunwind.c | 36 +- + tools/perf/util/unwind.h | 27 +- + tools/perf/util/vdso.c | 2 +- + tools/power/x86/intel-speed-select/isst-config.c | 1014 ++++++-- + tools/power/x86/intel-speed-select/isst-core.c | 176 +- + tools/power/x86/intel-speed-select/isst-display.c | 156 +- + tools/power/x86/intel-speed-select/isst.h | 5 + + tools/testing/selftests/bpf/test_sockmap.c | 47 +- + tools/testing/selftests/bpf/xdping.c | 2 +- + tools/testing/selftests/memfd/memfd_test.c | 36 + + .../testing/selftests/net/forwarding/tc_common.sh | 39 +- + tools/testing/selftests/net/pmtu.sh | 5 +- + tools/testing/selftests/net/tls.c | 60 + + tools/testing/selftests/vm/config | 1 + + tools/testing/selftests/x86/single_step_syscall.c | 94 +- + 1408 files changed, 43287 insertions(+), 19533 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-led-driver-el15203000 + create mode 100644 Documentation/ABI/testing/sysfs-platform-mellanox-bootctl + rename Documentation/{driver-api => admin-guide}/dell_rbu.rst (94%) + rename Documentation/admin-guide/device-mapper/{dm-dust.txt => dm-dust.rst} (51%) + delete mode 100644 Documentation/devicetree/bindings/arm/amlogic/smp-sram.txt + delete mode 100644 Documentation/devicetree/bindings/arm/axentia.txt + delete mode 100644 Documentation/devicetree/bindings/arm/samsung/exynos-chipid.txt + create mode 100644 Documentation/devicetree/bindings/arm/samsung/exynos-chipid.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/samsung/pmu.txt + create mode 100644 Documentation/devicetree/bindings/arm/samsung/pmu.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt + create mode 100644 Documentation/devicetree/bindings/arm/samsung/samsung-boards.yaml + create mode 100644 Documentation/devicetree/bindings/arm/samsung/samsung-secure-firmware.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/samsung/sysreg.txt + create mode 100644 Documentation/devicetree/bindings/arm/samsung/sysreg.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/sprd.txt + create mode 100644 Documentation/devicetree/bindings/arm/sprd.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/sunxi/smp-sram.txt + delete mode 100644 Documentation/devicetree/bindings/bus/renesas,bsc.txt + create mode 100644 Documentation/devicetree/bindings/bus/renesas,bsc.yaml + delete mode 100644 Documentation/devicetree/bindings/bus/simple-pm-bus.txt + create mode 100644 Documentation/devicetree/bindings/bus/simple-pm-bus.yaml + create mode 100644 Documentation/devicetree/bindings/clock/bitmain,bm1880-clk.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc.txt + create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,q6sstopcc.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/qcom,rpmh-clk.txt + create mode 100644 Documentation/devicetree/bindings/clock/qcom,rpmhcc.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/renesas,rcar-gen2-cpg-clocks.txt + delete mode 100644 Documentation/devicetree/bindings/counter/stm32-lptimer-cnt.txt + delete mode 100644 Documentation/devicetree/bindings/counter/stm32-timer-cnt.txt + delete mode 100644 Documentation/devicetree/bindings/crypto/samsung-slimsss.txt + create mode 100644 Documentation/devicetree/bindings/crypto/samsung-slimsss.yaml + delete mode 100644 Documentation/devicetree/bindings/crypto/samsung-sss.txt + create mode 100644 Documentation/devicetree/bindings/crypto/samsung-sss.yaml + delete mode 100644 Documentation/devicetree/bindings/crypto/st,stm32-crc.txt + create mode 100644 Documentation/devicetree/bindings/crypto/st,stm32-crc.yaml + delete mode 100644 Documentation/devicetree/bindings/crypto/st,stm32-cryp.txt + create mode 100644 Documentation/devicetree/bindings/crypto/st,stm32-cryp.yaml + delete mode 100644 Documentation/devicetree/bindings/crypto/st,stm32-hash.txt + create mode 100644 Documentation/devicetree/bindings/crypto/st,stm32-hash.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/sharp,ld-d5116z01b.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/sharp,ld-d5116z01b.yaml + create mode 100644 Documentation/devicetree/bindings/display/st,stm32-dsi.yaml + delete mode 100644 Documentation/devicetree/bindings/display/st,stm32-ltdc.txt + create mode 100644 Documentation/devicetree/bindings/display/st,stm32-ltdc.yaml + create mode 100644 Documentation/devicetree/bindings/dma/milbeaut-m10v-hdmac.txt + create mode 100644 Documentation/devicetree/bindings/dma/milbeaut-m10v-xdmac.txt + create mode 100644 Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml + create mode 100644 Documentation/devicetree/bindings/eeprom/at24.yaml + create mode 100644 Documentation/devicetree/bindings/gpio/brcm,xgs-iproc-gpio.yaml + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-rda.yaml + delete mode 100644 Documentation/devicetree/bindings/gpu/samsung-g2d.txt + create mode 100644 Documentation/devicetree/bindings/gpu/samsung-g2d.yaml + delete mode 100644 Documentation/devicetree/bindings/gpu/samsung-rotator.txt + create mode 100644 Documentation/devicetree/bindings/gpu/samsung-rotator.yaml + delete mode 100644 Documentation/devicetree/bindings/gpu/samsung-scaler.txt + create mode 100644 Documentation/devicetree/bindings/gpu/samsung-scaler.yaml + delete mode 100644 Documentation/devicetree/bindings/hwlock/st,stm32-hwspinlock.txt + create mode 100644 Documentation/devicetree/bindings/hwlock/st,stm32-hwspinlock.yaml + create mode 100644 Documentation/devicetree/bindings/i2c/amlogic,meson6-i2c.yaml + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-meson.txt + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-stm32.txt + create mode 100644 Documentation/devicetree/bindings/i2c/st,stm32-i2c.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/timer/stm32-lptimer-trigger.txt + delete mode 100644 Documentation/devicetree/bindings/iio/timer/stm32-timer-trigger.txt + create mode 100644 Documentation/devicetree/bindings/input/fsl,mpr121-touchkey.yaml + create mode 100644 Documentation/devicetree/bindings/input/input.yaml + delete mode 100644 Documentation/devicetree/bindings/input/keys.txt + delete mode 100644 Documentation/devicetree/bindings/input/max77650-onkey.txt + create mode 100644 Documentation/devicetree/bindings/input/max77650-onkey.yaml + delete mode 100644 Documentation/devicetree/bindings/input/mpr121-touchkey.txt + delete mode 100644 Documentation/devicetree/bindings/interconnect/qcom,qcs404.txt + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,qcs404.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/st,stm32-exti.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/st,stm32-exti.yaml + delete mode 100644 Documentation/devicetree/bindings/iommu/arm,smmu-v3.txt + create mode 100644 Documentation/devicetree/bindings/iommu/arm,smmu-v3.yaml + delete mode 100644 Documentation/devicetree/bindings/iommu/arm,smmu.txt + create mode 100644 Documentation/devicetree/bindings/iommu/arm,smmu.yaml + delete mode 100644 Documentation/devicetree/bindings/iommu/samsung,sysmmu.txt + create mode 100644 Documentation/devicetree/bindings/iommu/samsung,sysmmu.yaml + create mode 100644 Documentation/devicetree/bindings/leds/backlight/led-backlight.txt + delete mode 100644 Documentation/devicetree/bindings/leds/backlight/pm8941-wled.txt + create mode 100644 Documentation/devicetree/bindings/leds/backlight/qcom-wled.txt + create mode 100644 Documentation/devicetree/bindings/leds/leds-el15203000.txt + delete mode 100644 Documentation/devicetree/bindings/leds/leds-max77650.txt + create mode 100644 Documentation/devicetree/bindings/leds/leds-max77650.yaml + create mode 100644 Documentation/devicetree/bindings/mailbox/st,stm32-ipcc.yaml + delete mode 100644 Documentation/devicetree/bindings/mailbox/stm32-ipcc.txt + create mode 100644 Documentation/devicetree/bindings/media/amlogic,meson-gx-ao-cec.yaml + delete mode 100644 Documentation/devicetree/bindings/media/meson-ao-cec.txt + delete mode 100644 Documentation/devicetree/bindings/media/st,stm32-cec.txt + create mode 100644 Documentation/devicetree/bindings/media/st,stm32-cec.yaml + delete mode 100644 Documentation/devicetree/bindings/media/st,stm32-dcmi.txt + create mode 100644 Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/exynos-srom.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/exynos-srom.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/max77650.txt + create mode 100644 Documentation/devicetree/bindings/mfd/max77650.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/st,stm32-lptimer.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/st,stm32-timers.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/stm32-lptimer.txt + delete mode 100644 Documentation/devicetree/bindings/mfd/stm32-timers.txt + delete mode 100644 Documentation/devicetree/bindings/mfd/syscon.txt + create mode 100644 Documentation/devicetree/bindings/mfd/syscon.yaml + delete mode 100644 Documentation/devicetree/bindings/misc/allwinner,syscon.txt + create mode 100644 Documentation/devicetree/bindings/mtd/st,stm32-fmc2-nand.yaml + delete mode 100644 Documentation/devicetree/bindings/mtd/stm32-fmc2-nand.txt + create mode 100644 Documentation/devicetree/bindings/net/can/allwinner,sun4i-a10-can.yaml + delete mode 100644 Documentation/devicetree/bindings/net/can/sun4i_can.txt + delete mode 100644 Documentation/devicetree/bindings/net/davinci-mdio.txt + create mode 100644 Documentation/devicetree/bindings/net/ti,davinci-mdio.yaml + delete mode 100644 Documentation/devicetree/bindings/power/pd-samsung.txt + create mode 100644 Documentation/devicetree/bindings/power/pd-samsung.yaml + create mode 100644 Documentation/devicetree/bindings/power/power-domain.yaml + delete mode 100644 Documentation/devicetree/bindings/power/reset/syscon-poweroff.txt + create mode 100644 Documentation/devicetree/bindings/power/reset/syscon-poweroff.yaml + delete mode 100644 Documentation/devicetree/bindings/power/reset/syscon-reboot.txt + create mode 100644 Documentation/devicetree/bindings/power/reset/syscon-reboot.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/max77650-charger.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/max77650-charger.yaml + delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-samsung.txt + create mode 100644 Documentation/devicetree/bindings/pwm/pwm-samsung.yaml + delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-stm32-lp.txt + delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-stm32.txt + create mode 100644 Documentation/devicetree/bindings/pwm/pwm.yaml + delete mode 100644 Documentation/devicetree/bindings/pwm/renesas,pwm-rcar.txt + create mode 100644 Documentation/devicetree/bindings/pwm/renesas,pwm-rcar.yaml + delete mode 100644 Documentation/devicetree/bindings/pwm/renesas,tpu-pwm.txt + create mode 100644 Documentation/devicetree/bindings/pwm/renesas,tpu-pwm.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/max77650-regulator.txt + create mode 100644 Documentation/devicetree/bindings/regulator/max77650-regulator.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/st,stm32-rproc.yaml + delete mode 100644 Documentation/devicetree/bindings/remoteproc/stm32-rproc.txt + delete mode 100644 Documentation/devicetree/bindings/rng/samsung,exynos4-rng.txt + create mode 100644 Documentation/devicetree/bindings/rng/samsung,exynos4-rng.yaml + delete mode 100644 Documentation/devicetree/bindings/rng/st,stm32-rng.txt + create mode 100644 Documentation/devicetree/bindings/rng/st,stm32-rng.yaml + create mode 100644 Documentation/devicetree/bindings/rtc/renesas,sh-rtc.yaml + create mode 100644 Documentation/devicetree/bindings/rtc/rtc-mt6397.txt + delete mode 100644 Documentation/devicetree/bindings/rtc/rtc-sh.txt + delete mode 100644 Documentation/devicetree/bindings/rtc/s3c-rtc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/s3c-rtc.yaml + delete mode 100644 Documentation/devicetree/bindings/serial/samsung_uart.txt + create mode 100644 Documentation/devicetree/bindings/serial/samsung_uart.yaml + delete mode 100644 Documentation/devicetree/bindings/serial/sprd-uart.txt + create mode 100644 Documentation/devicetree/bindings/serial/sprd-uart.yaml + create mode 100644 Documentation/devicetree/bindings/serio/allwinner,sun4i-a10-ps2.yaml + delete mode 100644 Documentation/devicetree/bindings/serio/allwinner,sun4i-ps2.txt + delete mode 100644 Documentation/devicetree/bindings/soc/amlogic/amlogic,canvas.txt + create mode 100644 Documentation/devicetree/bindings/soc/amlogic/amlogic,canvas.yaml + delete mode 100644 Documentation/devicetree/bindings/sram/milbeaut-smp-sram.txt + delete mode 100644 Documentation/devicetree/bindings/sram/renesas,smp-sram.txt + delete mode 100644 Documentation/devicetree/bindings/sram/rockchip-smp-sram.txt + delete mode 100644 Documentation/devicetree/bindings/sram/samsung-sram.txt + delete mode 100644 Documentation/devicetree/bindings/sram/sram.txt + create mode 100644 Documentation/devicetree/bindings/sram/sram.yaml + create mode 100644 Documentation/devicetree/bindings/thermal/st,stm32-thermal.yaml + delete mode 100644 Documentation/devicetree/bindings/thermal/stm32-thermal.txt + delete mode 100644 Documentation/devicetree/bindings/timer/samsung,exynos4210-mct.txt + create mode 100644 Documentation/devicetree/bindings/timer/samsung,exynos4210-mct.yaml + delete mode 100644 Documentation/devicetree/bindings/timer/st,stm32-timer.txt + create mode 100644 Documentation/devicetree/bindings/timer/st,stm32-timer.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/allwinner,sun4i-a10-musb.txt + create mode 100644 Documentation/devicetree/bindings/usb/allwinner,sun4i-a10-musb.yaml + create mode 100644 Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/watchdog/samsung-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml + create mode 100644 Documentation/driver-api/devfreq.rst + rename Documentation/driver-api/{ => gpio}/bt8xxgpio.rst (98%) + rename Documentation/filesystems/{autofs.txt => autofs.rst} (77%) + create mode 100644 Documentation/maintainer/maintainer-entry-profile.rst + create mode 100644 Documentation/misc-devices/xilinx_sdfec.rst + create mode 100644 Documentation/nvdimm/maintainer-entry-profile.rst + rename Documentation/{ioctl => process}/botching-up-ioctls.rst (99%) + create mode 100644 Documentation/process/maintainers.rst + create mode 100755 Documentation/sphinx/maintainers_include.py + create mode 100644 Documentation/sphinx/parallel-wrapper.sh + rename Documentation/trace/{ => coresight}/coresight-cpu-debug.rst (100%) + create mode 100644 Documentation/trace/coresight/coresight-etm4x-reference.rst + rename Documentation/trace/{ => coresight}/coresight.rst (99%) + create mode 100644 Documentation/trace/coresight/index.rst + rename Documentation/{ => userspace-api}/ioctl/cdrom.rst (100%) + rename Documentation/{ => userspace-api}/ioctl/hdio.rst (100%) + rename Documentation/{ => userspace-api}/ioctl/index.rst (86%) + rename Documentation/{ => userspace-api}/ioctl/ioctl-decoding.rst (100%) + rename Documentation/{ => userspace-api}/ioctl/ioctl-number.rst (100%) + create mode 100644 arch/x86/include/asm/doublefault.h + delete mode 100644 arch/x86/kernel/doublefault.c + create mode 100644 arch/x86/kernel/doublefault_32.c + create mode 100644 drivers/clk/clk-bm1880.c + create mode 100644 drivers/clk/ingenic/x1000-cgu.c + create mode 100644 drivers/clk/qcom/gcc-sc7180.c + create mode 100644 drivers/clk/qcom/gpucc-msm8998.c + create mode 100644 drivers/clk/qcom/q6sstop-qcs404.c + delete mode 100644 drivers/clk/renesas/clk-rcar-gen2.c + create mode 100644 drivers/clk/renesas/r8a774b1-cpg-mssr.c + create mode 100644 drivers/clk/tegra/clk-tegra20-emc.c + create mode 100644 drivers/dma/fsl-dpaa2-qdma/Kconfig + create mode 100644 drivers/dma/fsl-dpaa2-qdma/Makefile + create mode 100644 drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c + create mode 100644 drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.h + create mode 100644 drivers/dma/fsl-dpaa2-qdma/dpdmai.c + create mode 100644 drivers/dma/fsl-dpaa2-qdma/dpdmai.h + create mode 100644 drivers/dma/milbeaut-hdmac.c + create mode 100644 drivers/dma/milbeaut-xdmac.c + create mode 100644 drivers/dma/sf-pdma/Kconfig + create mode 100644 drivers/dma/sf-pdma/Makefile + create mode 100644 drivers/dma/sf-pdma/sf-pdma.c + create mode 100644 drivers/dma/sf-pdma/sf-pdma.h + rename drivers/gpio/{sgpio-aspeed.c => gpio-aspeed-sgpio.c} (100%) + create mode 100644 drivers/gpio/gpio-rda.c + create mode 100644 drivers/gpio/gpio-xgs-iproc.c + create mode 100644 drivers/hid/hid-lg-g15.c + create mode 100644 drivers/input/keyboard/imx_sc_key.c + create mode 100644 drivers/iommu/arm-smmu-qcom.c + create mode 100644 drivers/iommu/ioasid.c + create mode 100644 drivers/leds/leds-el15203000.c + create mode 100644 drivers/of/unittest-data/tests-address.dtsi + create mode 100644 drivers/platform/mellanox/mlxbf-bootctl.c + create mode 100644 drivers/platform/mellanox/mlxbf-bootctl.h + create mode 100644 drivers/platform/x86/intel_cht_int33fe_common.c + create mode 100644 drivers/platform/x86/intel_cht_int33fe_common.h + create mode 100644 drivers/platform/x86/intel_cht_int33fe_microb.c + rename drivers/platform/x86/{intel_cht_int33fe.c => intel_cht_int33fe_typec.c} (82%) + create mode 100644 drivers/platform/x86/system76_acpi.c + create mode 100644 drivers/power/reset/mt6323-poweroff.c + delete mode 100644 drivers/video/backlight/pm8941-wled.c + create mode 100644 drivers/video/backlight/qcom-wled.c + create mode 100644 drivers/video/backlight/tosa_bl.h + create mode 100644 include/dt-bindings/clock/bm1880-clock.h + create mode 100644 include/dt-bindings/clock/qcom,gcc-sc7180.h + create mode 100644 include/dt-bindings/clock/qcom,q6sstopcc-qcs404.h + create mode 100644 include/dt-bindings/clock/r8a774b1-cpg-mssr.h + create mode 100644 include/dt-bindings/clock/r8a77961-cpg-mssr.h + create mode 100644 include/dt-bindings/clock/x1000-cgu.h + create mode 100644 include/dt-bindings/dma/x1000-dma.h + create mode 100644 include/dt-bindings/power/r8a774b1-sysc.h + create mode 100644 include/dt-bindings/power/r8a77961-sysc.h + delete mode 100644 include/linux/i2c-pxa.h + create mode 100644 include/linux/ioasid.h + create mode 100644 include/linux/mfd/mt6397/rtc.h + create mode 100644 include/linux/mtio.h + delete mode 100644 include/linux/platform_data/pixcir_i2c_ts.h + create mode 100755 scripts/jobserver-exec + create mode 100644 tools/build/feature/test-libbpf.c + rename tools/perf/tests/{map_groups.c => maps.c} (83%) + rename tools/perf/tests/{thread-mg-share.c => thread-maps-share.c} (64%) + create mode 100644 tools/perf/util/affinity.c + create mode 100644 tools/perf/util/affinity.h + create mode 100644 tools/perf/util/fncache.c + create mode 100644 tools/perf/util/fncache.h + delete mode 100644 tools/perf/util/map_groups.h + create mode 100644 tools/perf/util/maps.h +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 (040b5cfbcefa Fixed updating of ethertype in function skb_mpls_pop) +$ git merge net/master +Merge made by the 'recursive' strategy. + include/linux/filter.h | 8 +++- + include/linux/skbuff.h | 3 +- + kernel/bpf/btf.c | 5 ++- + net/core/skbuff.c | 6 ++- + net/openvswitch/actions.c | 3 +- + net/sched/act_mpls.c | 4 +- + net/sched/sch_cake.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 +- + 15 files changed, 72 insertions(+), 56 deletions(-) +Merging bpf/master (b3c424eb6a1a sch_cake: Add missing NLA policy entry TCA_CAKE_SPLIT_GSO) +$ 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 (cb50445130d1 ALSA: hda: Modify stream stripe mask only when needed) +$ 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 | 71 ++++++++++++++++++-------------------- + sound/pci/hda/patch_realtek.c | 41 +++++++++++++--------- + 6 files changed, 151 insertions(+), 69 deletions(-) +Merging sound-asoc-fixes/for-linus (75718643c384 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/sof/intel/byt.c | 18 +++++++------- + sound/soc/sof/topology.c | 4 +++- + 8 files changed, 71 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 (1b353475f3cd 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 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging spi-fixes/for-linus (3fae1f60fdc8 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 (596cf45cbf6e Merge branch 'akpm' (patches from Andrew)) +$ 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 (596cf45cbf6e Merge branch 'akpm' (patches from Andrew)) +$ 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 (596cf45cbf6e Merge branch 'akpm' (patches from Andrew)) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (596cf45cbf6e Merge branch 'akpm' (patches from Andrew)) +$ 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 +Merge made by the 'recursive' strategy. + 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/mips/crypto/chacha-glue.c | 6 ++++-- + arch/mips/crypto/poly1305-glue.c | 6 ++++-- + 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/crypto/Kconfig | 1 + + drivers/crypto/hisilicon/sec2/sec_crypto.c | 4 ++-- + 13 files changed, 56 insertions(+), 34 deletions(-) +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 +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'recursive' strategy. + tools/testing/selftests/Makefile | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging slave-dma-fixes/fixes (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 +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 (da0c9ea146cb Linux 5.4-rc2) +$ git merge erofs-fixes/fixes +Already up to date. +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 +Auto-merging lib/Kconfig.debug +Auto-merging kernel/Makefile +Auto-merging init/Kconfig +Auto-merging include/asm-generic/export.h +CONFLICT (modify/delete): include/Kbuild deleted in kbuild/for-next and modified in HEAD. Version HEAD of include/Kbuild left in tree. +Auto-merging drivers/gpu/drm/i915/Kconfig.debug +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/Kconfig.debug +Removing arch/ia64/include/uapi/asm/ioctls.h +Removing arch/ia64/include/uapi/asm/ioctl.h +Removing arch/ia64/include/uapi/asm/errno.h +Removing arch/hexagon/include/uapi/asm/bitsperlong.h +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/Makefile +Resolved 'drivers/gpu/drm/i915/Kconfig.debug' 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 cadfee76c20b] Merge remote-tracking branch 'kbuild/for-next' +$ git diff -M --stat --summary HEAD^.. + .gitignore | 2 +- + Documentation/Makefile | 6 +- + Documentation/core-api/symbol-namespaces.rst | 3 + + Documentation/dontdiff | 1 + + Documentation/kbuild/makefiles.rst | 17 - + Documentation/kbuild/modules.rst | 13 +- + MAINTAINERS | 4 +- + Makefile | 121 ++- + 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 - + drivers/gpu/drm/i915/Kconfig.debug | 1 - + drivers/video/logo/.gitignore | 1 + + drivers/video/logo/Makefile | 15 +- + {scripts => drivers/video/logo}/pnmtologo.c | 0 + include/Kbuild | 1187 -------------------------- + include/asm-generic/export.h | 2 - + 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 + + usr/include/Makefile | 19 +- + 43 files changed, 452 insertions(+), 1742 deletions(-) + 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 + rename {scripts => drivers/video/logo}/pnmtologo.c (100%) + delete mode 100644 include/Kbuild +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 475068a88a75] 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 (580f93e92c5b 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 c2abdab5ac48] 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 (b3f1d036f26d reset: npcm: add NPCM reset controller driver) +$ 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 +++++++++++++++++++++ + include/dt-bindings/reset/nuvoton,npcm7xx-reset.h | 91 +++++++ + 5 files changed, 422 insertions(+) + 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 +Merge made by the 'recursive' strategy. + arch/openrisc/Kconfig | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) +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 1b3c756cc916] 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 +Merge made by the 'recursive' strategy. + 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 +- + 8 files changed, 247 insertions(+), 58 deletions(-) +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 18b611c9655e] 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 (69738cfdfa70 fs: cifs: Fix atime update check vs mtime) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/file.c | 7 ++++--- + fs/cifs/inode.c | 2 +- + 2 files changed, 5 insertions(+), 4 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 (803e74be04b3 f2fs: stop GC when the victim becomes fully valid) +$ 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 +Auto-merging drivers/mtd/ubi/debug.c +Merge made by the 'recursive' strategy. + 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 - + 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 +++++++++++++++++++++++++++------- + 13 files changed, 85 insertions(+), 77 deletions(-) +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) +$ git merge xfs/for-next +Auto-merging include/linux/fs.h +Auto-merging include/linux/falloc.h +Auto-merging fs/xfs/libxfs/xfs_fs.h +Removing fs/xfs/libxfs/xfs_da_format.c +Auto-merging fs/ioctl.c +Auto-merging fs/compat_ioctl.c +CONFLICT (content): Merge conflict in fs/compat_ioctl.c +Resolved 'fs/compat_ioctl.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4c77979ea824] Merge remote-tracking branch 'xfs/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/compat_ioctl.c | 23 +- + fs/ioctl.c | 12 +- + 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/linux/falloc.h | 3 + + include/linux/fs.h | 2 +- + 126 files changed, 5828 insertions(+), 6267 deletions(-) + delete mode 100644 fs/xfs/libxfs/xfs_da_format.c +$ git am -3 ../patches/0001-fix-up-for-compat-move-FS_IOC_RESVSP_32-handling-to-.patch +Applying: fix up for "compat: move FS_IOC_RESVSP_32 handling to fs/ioctl.c" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/ioctl.c +M include/linux/falloc.h +$ git add -A . +$ git commit -v -a --amend +[master 9aba1db0daa6] Merge remote-tracking branch 'xfs/for-next' + Date: Tue Dec 3 10:24:57 2019 +1100 +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 (3e501af8dd7b Merge branches 'work.misc', 'work.mount3', 'work.namei', 'work.dcache' and 'work.autofs' into for-next) +$ git merge vfs/for-next +Already up to date! +Merge made by the 'recursive' strategy. +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/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 5b62479f3e5b] 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 (8dcea9c5fa05 Merge branch 'i2c/for-5.5' into i2c/for-next) +$ git merge i2c/i2c/for-next +Already up to date! +Merge made by the 'recursive' strategy. +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 (9a85ac3936ad firmware: dmi: Add dmi_memdev_handle) +$ git merge dmi/master +Merge made by the 'recursive' strategy. + drivers/firmware/dmi_scan.c | 41 ++++++++++++++++++++++++++++++++++++++++- + include/linux/dmi.h | 4 ++++ + 2 files changed, 44 insertions(+), 1 deletion(-) +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 +Auto-merging drivers/firewire/core-cdev.c +Merge made by the 'recursive' strategy. + drivers/firewire/core-cdev.c | 3 ++- + drivers/firewire/core-iso.c | 7 ------- + drivers/firewire/core.h | 2 -- + drivers/firewire/ohci.c | 2 +- + 4 files changed, 3 insertions(+), 11 deletions(-) +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 (81b6b96475ac Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux; tag 'dma-mapping-5.5' of git://git.infradead.org/users/hch/dma-mapping) +$ 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 98dbaa82f373] 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 (0faee24149d7 drm/radeon: fix r1xx/r2xx register checker for POT textures) +$ 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 +Recorded preimage for 'drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c'. +[master e90e8352da4b] 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_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 | 59 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 14 +- + 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/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 | 256 +++++- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h | 2 + + 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 | 176 ++-- + .../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 | 33 +- + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 10 +- + 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 | 9 +- + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 3 +- + drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h | 6 + + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 35 +- + drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 103 +++ + drivers/gpu/drm/amd/powerplay/smu_internal.h | 4 + + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 54 +- + drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 44 + + 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 | 3 +- + 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 +- + include/uapi/drm/amdgpu_drm.h | 13 +- + include/uapi/linux/kfd_ioctl.h | 19 +- + 361 files changed, 14247 insertions(+), 5513 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 (3ee1a9f5d0bc drm/i915/gem: Take timeline->mutex to walk list-of-requests) +$ 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/gem/i915_gem_context.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 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 (1591fadf857c drm/mgag200: Add workaround for HW that does not support 'startadd') +$ git merge drm-misc/for-linux-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/mgag200/mgag200_drv.c | 36 +++++++++++++++++++++++++++++++++- + drivers/gpu/drm/mgag200/mgag200_drv.h | 18 +++++++++++++++++ + drivers/gpu/drm/mgag200/mgag200_main.c | 3 ++- + 3 files changed, 55 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 (cb50445130d1 ALSA: hda: Modify stream stripe mask only when needed) +$ git merge sound/for-next +Already up to date. +Merging sound-asoc/for-next (75718643c384 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 (e5bab666ffa7 Merge branch 'for-5.5/io_uring-post' into for-next) +$ git merge block/for-next +Already up to date! +Merge made by the 'recursive' strategy. +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 (1b353475f3cd 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 dab528cb7c81] 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 (0e6352f543fd 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. +Recorded preimage for 'arch/x86/include/asm/pgtable_32_types.h' +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 +Recorded resolution for 'arch/x86/include/asm/pgtable_32_types.h'. +[master acf219dadb01] 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 (961c6a63bcd2 irqchip/csky: Cleanup Kconfig help text) +$ 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-gic-v3-its.c | 4 ++-- + include/linux/irqchip/arm-gic-v3.h | 3 +++ + 3 files changed, 7 insertions(+), 4 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 +Merge made by the 'recursive' strategy. + include/linux/percpu-refcount.h | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) +Merging workqueues/for-next (49e9d1a9faf2 workqueue: Add RCU annotation for pwq list walk) +$ git merge workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (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 (937d6eefc716 Merge tag 'docs-5.5a' of git://git.lwn.net/linux) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (937d6eefc716 Merge tag 'docs-5.5a' of git://git.lwn.net/linux) +$ 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 (27ed14d0ecb3 Revert "serial/8250: Add support for NI-Serial PXI/PXIe+485 devices") +$ git merge tty/tty-next +Auto-merging drivers/tty/tty_io.c +Auto-merging drivers/tty/serial/Kconfig +Auto-merging drivers/tty/serial/8250/8250_pci.c +Auto-merging drivers/tty/hvc/Kconfig +Auto-merging arch/arm/boot/dts/aspeed-g5.dtsi +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + 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/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 + + drivers/mtd/nand/onenand/Makefile | 2 +- + .../mtd/nand/onenand/{samsung.c => samsung_mtd.c} | 0 + drivers/net/wan/z85230.h | 2 - + 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/uapi/linux/serial_core.h | 2 +- + 49 files changed, 665 insertions(+), 715 deletions(-) + rename drivers/mtd/nand/onenand/{samsung.c => samsung_mtd.c} (100%) + rename drivers/tty/serial/{samsung.c => samsung_tty.c} (100%) +Merging char-misc/char-misc-next (937d6eefc716 Merge tag 'docs-5.5a' of git://git.lwn.net/linux) +$ 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 (937d6eefc716 Merge tag 'docs-5.5a' of git://git.lwn.net/linux) +$ 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/usb/storage/uas.c +Auto-merging drivers/scsi/ufs/ufs_bsg.c +Auto-merging drivers/scsi/sg.c +CONFLICT (content): Merge conflict in drivers/scsi/sg.c +Auto-merging drivers/scsi/sd_zbc.c +Auto-merging drivers/scsi/sd.h +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/scsi/scsi_sysfs.c +CONFLICT (content): Merge conflict in drivers/scsi/scsi_sysfs.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/scsi.c +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging drivers/scsi/qla2xxx/qla_mbx.c +Auto-merging drivers/scsi/qla2xxx/qla_attr.c +Auto-merging drivers/scsi/pm8001/pm8001_init.c +Auto-merging drivers/scsi/pm8001/pm8001_hwi.c +Auto-merging drivers/scsi/lpfc/lpfc_sli.c +Auto-merging drivers/scsi/lpfc/lpfc_scsi.c +Auto-merging drivers/scsi/lpfc/lpfc_nportdisc.c +Auto-merging drivers/scsi/lpfc/lpfc_init.c +Auto-merging drivers/scsi/cxlflash/main.c +Auto-merging MAINTAINERS +Resolved 'drivers/scsi/scsi_sysfs.c' using previous resolution. +Resolved 'drivers/scsi/sg.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f36b5932bc3a] Merge remote-tracking branch 'scsi/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/ufs/ti,j721e-ufs.yaml | 68 ++ + .../devicetree/bindings/ufs/ufshcd-pltfrm.txt | 1 + + Documentation/scsi/scsi_mid_low_api.txt | 3 +- + MAINTAINERS | 1 + + drivers/ata/pata_arasan_cf.c | 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/ibmvscsi_tgt/ibmvscsi_tgt.c | 3 +- + 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 | 956 ++++++++++++++++----- + 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 | 10 +- + 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 | 450 +++++++--- + 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 | 78 +- + drivers/scsi/qla2xxx/qla_init.c | 146 ++-- + drivers/scsi/qla2xxx/qla_inline.h | 12 + + drivers/scsi/qla2xxx/qla_iocb.c | 106 ++- + drivers/scsi/qla2xxx/qla_isr.c | 42 +- + 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/scsi_transport_sas.c | 9 +- + drivers/scsi/sd.c | 13 +- + drivers/scsi/sd.h | 3 + + drivers/scsi/sd_zbc.c | 8 +- + drivers/scsi/sg.c | 89 +- + 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 - + 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 +- + 168 files changed, 5676 insertions(+), 2025 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ufs/ti,j721e-ufs.yaml + 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 +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 (88d3c7697f25 vhost: last descriptor must have NEXT clear) +$ git merge vhost/linux-next +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 ab248bf0a4a0] 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. +$ git am -3 ../patches/0001-fix-up-for-compat-move-FS_IOC_RESVSP_32-handling-to-.patch +Applying: fix up for "compat: move FS_IOC_RESVSP_32 handling to fs/ioctl.c" +Using index info to reconstruct a base tree... +M fs/ioctl.c +M include/linux/falloc.h +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +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 +Auto-merging drivers/rtc/rtc-m41t80.c +Auto-merging drivers/rtc/rtc-ds1374.c +Merge made by the 'recursive' strategy. + arch/mips/sgi-ip32/ip32-platform.c | 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 +- + include/linux/rtc.h | 5 + + include/linux/rtc/ds1685.h | 12 +- + 72 files changed, 566 insertions(+), 678 deletions(-) +Merging nvdimm/libnvdimm-for-next (0dfbb932bb67 MAINTAINERS: Remove Keith from NVDIMM maintainers) +$ git merge nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (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 0e37d0e0fbd7] 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 (da1af488fddb ipc/msg.c: consolidate all xxxctl_down() functions) +$ git merge --no-ff akpm-current/current +Auto-merging usr/include/Makefile +Auto-merging tools/testing/selftests/Makefile +Auto-merging scripts/checkpatch.pl +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sys.c +Auto-merging include/uapi/asm-generic/unistd.h +Auto-merging include/uapi/asm-generic/sembuf.h +Auto-merging include/uapi/asm-generic/msgbuf.h +Auto-merging include/linux/wait.h +Auto-merging include/linux/syscalls.h +CONFLICT (content): Merge conflict in include/linux/syscalls.h +Auto-merging include/linux/sched.h +Auto-merging fs/binfmt_elf.c +Auto-merging fs/aio.c +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 +Auto-merging arch/x86/mm/fault.c +Auto-merging arch/x86/include/uapi/asm/sembuf.h +Auto-merging arch/x86/include/uapi/asm/msgbuf.h +Auto-merging arch/sparc/include/uapi/asm/sembuf.h +Auto-merging arch/sparc/include/uapi/asm/msgbuf.h +Auto-merging arch/powerpc/mm/mem.c +Auto-merging arch/powerpc/include/uapi/asm/sembuf.h +Auto-merging arch/powerpc/include/uapi/asm/msgbuf.h +Auto-merging arch/parisc/include/uapi/asm/sembuf.h +Auto-merging arch/parisc/include/uapi/asm/msgbuf.h +Auto-merging arch/mips/include/uapi/asm/sembuf.h +Auto-merging arch/mips/include/uapi/asm/msgbuf.h +Auto-merging Documentation/memory-barriers.txt +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Resolved 'include/linux/syscalls.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6153a9bf8110] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + .gitattributes | 2 + + Documentation/admin-guide/sysctl/kernel.rst | 20 +- + Documentation/dev-tools/kcov.rst | 129 + + Documentation/memory-barriers.txt | 16 +- + Documentation/process/deprecated.rst | 10 +- + arch/arm64/mm/mmu.c | 4 +- + arch/ia64/mm/init.c | 4 +- + arch/mips/include/uapi/asm/msgbuf.h | 1 + + arch/mips/include/uapi/asm/sembuf.h | 2 + + arch/parisc/include/uapi/asm/msgbuf.h | 1 + + arch/parisc/include/uapi/asm/sembuf.h | 1 + + 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/uapi/asm/ipcbuf.h | 2 + + arch/sparc/include/uapi/asm/msgbuf.h | 2 + + arch/sparc/include/uapi/asm/sembuf.h | 2 + + 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/base/node.c | 9 +- + drivers/gpu/drm/drm_property.c | 2 +- + drivers/rapidio/rio-access.c | 2 + + drivers/rapidio/rio-driver.c | 1 + + 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/generic.c | 37 +- + fs/proc/internal.h | 2 +- + fs/proc/page.c | 40 +- + fs/ramfs/inode.c | 12 + + include/linux/build_bug.h | 4 +- + include/linux/kcov.h | 23 + + include/linux/memory_hotplug.h | 7 +- + include/linux/memremap.h | 6 + + include/linux/notifier.h | 4 - + include/linux/proc_fs.h | 4 +- + include/linux/rbtree_augmented.h | 6 +- + include/linux/sched.h | 17 + + include/linux/sched/sysctl.h | 1 + + include/linux/string.h | 45 + + include/linux/syscalls.h | 8 +- + 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/asm-generic/unistd.h | 8 +- + include/uapi/linux/kcov.h | 28 + + include/uapi/linux/scc.h | 1 + + ipc/mqueue.c | 105 +- + ipc/msg.c | 61 +- + ipc/sem.c | 66 +- + kernel/hung_task.c | 94 +- + kernel/kcov.c | 547 +++- + kernel/notifier.c | 43 +- + kernel/profile.c | 6 +- + kernel/sys.c | 4 +- + kernel/sysctl.c | 8 + + lib/Kconfig.debug | 6 + + lib/cpumask.c | 102 +- + lib/math/rational.c | 63 +- + lib/test_meminit.c | 20 +- + mm/huge_memory.c | 6 +- + mm/khugepaged.c | 18 + + mm/memcontrol.c | 52 +- + mm/memory.c | 2 +- + 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/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 - + 103 files changed, 5044 insertions(+), 654 deletions(-) + 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: lib/genalloc.c: export symbol addr_in_gen_pool +Applying: lib/genalloc.c: rename addr_in_gen_pool to gen_pool_has_addr +Applying: Documentation: rename addr_in_gen_pool to gen_pool_has_addr +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: bitops: introduce the for_each_set_clump8 macro +Applying: linux/bitmap.h: fix potential sign-extension overflow +Applying: bitops-introduce-the-for_each_set_clump8-macro-fix-fix +Applying: linux/bitopts.h: Add for_each_set_clump8 documentation +Applying: lib/test_bitmap.c: add for_each_set_clump8 test cases +Applying: gpio: 104-dio-48e: utilize for_each_set_clump8 macro +Applying: gpio: 104-idi-48: utilize for_each_set_clump8 macro +Applying: gpio: gpio-mm: utilize for_each_set_clump8 macro +Applying: gpio: ws16c48: utilize for_each_set_clump8 macro +Applying: gpio: pci-idio-16: utilize for_each_set_clump8 macro +Applying: gpio: pcie-idio-24: utilize for_each_set_clump8 macro +Applying: gpio: uniphier: utilize for_each_set_clump8 macro +Applying: gpio: 74x164: utilize the for_each_set_clump8 macro +Applying: thermal: intel: intel_soc_dts_iosf: Utilize for_each_set_clump8 macro +Applying: gpio: pisosr: utilize the for_each_set_clump8 macro +Applying: gpio: max3191x: utilize the for_each_set_clump8 macro +Applying: gpio: pca953x: utilize the for_each_set_clump8 macro +Applying: lib/test_bitmap: force argument of bitmap_parselist_user() to proper address space +Applying: lib/test_bitmap: undefine macros after use +Applying: lib/test_bitmap: name EXP_BYTES properly +Applying: lib/test_bitmap: rename exp to exp1 to avoid ambiguous name +Applying: lib/test_bitmap: move exp1 and exp2 upper for others to use +Applying: lib/test_bitmap: fix comment about this file +Applying: lib/bitmap: introduce bitmap_replace() helper +Applying: gpio: pca953x: remove redundant variable and check in IRQ handler +Applying: gpio: pca953x: use input from regs structure in pca953x_irq_pending() +Applying: gpio: pca953x: convert to use bitmap API +Applying: gpio: pca953x: reduce stack usage in couple of functions +Applying: gpio: pca953x: tighten up 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-allow-walking-without-vma-v15 +Applying: mm-pagewalk-allow-walking-without-vma-fix +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: mm-add-generic-ptdump-v15 +Applying: mm/ptdump: fix a -Wold-style-declaration warning +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: alpha: use pgtable-nopud instead of 4level-fixup +Applying: arm: nommu: use pgtable-nopud instead of 4level-fixup +Applying: c6x: use pgtable-nopud instead of 4level-fixup +Applying: m68k: nommu: use pgtable-nopud instead of 4level-fixup +Applying: m68k: mm: use pgtable-nopXd instead of 4level-fixup +Applying: microblaze: use pgtable-nopmd instead of 4level-fixup +Applying: nds32: use pgtable-nopmd instead of 4level-fixup +Applying: parisc: use pgtable-nopXd instead of 4level-fixup +Applying: parisc/hugetlb: use pgtable-nopXd instead of 4level-fixup +Applying: sparc32: use pgtable-nopud instead of 4level-fixup +Applying: um: remove unused pxx_offset_proc() and addr_pte() functions +Applying: um: add support for folded p4d page tables +Applying: mm: remove __ARCH_HAS_4LEVEL_HACK and include/asm-generic/4level-fixup.h +Applying: kernel.h: update comment about simple_strto<foo>() functions +Applying: auxdisplay: charlcd: deduplicate simple_strtoul() +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 + + 8271151e47a7...3d6fe39a1f3f akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (3d6fe39a1f3f drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow) +$ git merge --no-ff akpm/master +Removing include/asm-generic/4level-fixup.h +Merge made by the 'recursive' strategy. + Documentation/core-api/genalloc.rst | 2 +- + 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/arc/include/asm/pgtable.h | 1 + + arch/arm/include/asm/pgtable-2level.h | 1 + + arch/arm/include/asm/pgtable-3level.h | 1 + + arch/arm/include/asm/pgtable.h | 2 +- + arch/arm/mm/dma-mapping.c | 2 +- + 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/c6x/include/asm/pgtable.h | 2 +- + 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 | 24 +- + 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/asm/pgtable.h | 5 + + 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/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/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/pgalloc_32.h | 6 +- + arch/sparc/include/asm/pgtable_32.h | 28 +- + arch/sparc/include/asm/pgtable_64.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/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/auxdisplay/charlcd.c | 34 +- + drivers/block/null_blk_main.c | 56 +-- + drivers/firmware/efi/arm-runtime.c | 2 +- + 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/media/platform/sti/delta/delta-ipc.c | 4 +- + drivers/misc/sram-exec.c | 2 +- + drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 1 + + drivers/thermal/intel/intel_soc_dts_iosf.c | 31 +- + drivers/thermal/intel/intel_soc_dts_iosf.h | 2 - + drivers/tty/serial/sh-sci.c | 2 +- + fs/proc/task_mmu.c | 4 +- + include/asm-generic/4level-fixup.h | 39 -- + include/asm-generic/bitops/find.h | 17 + + include/asm-generic/pgtable.h | 20 + + include/linux/bitmap.h | 51 ++ + include/linux/bitops.h | 12 + + include/linux/genalloc.h | 2 +- + include/linux/kernel.h | 19 +- + include/linux/mm.h | 10 +- + include/linux/pagewalk.h | 42 +- + include/linux/ptdump.h | 22 + + kernel/dma/remap.c | 2 +- + lib/Kconfig.debug | 665 ++++++++++++++------------- + lib/bitmap.c | 12 + + lib/find_bit.c | 14 + + lib/genalloc.c | 5 +- + lib/test_bitmap.c | 202 ++++++-- + mm/Kconfig.debug | 21 + + mm/Makefile | 1 + + mm/hmm.c | 8 +- + mm/memory.c | 8 - + mm/migrate.c | 5 +- + mm/mincore.c | 1 + + mm/pagewalk.c | 126 ++++- + mm/ptdump.c | 151 ++++++ + 132 files changed, 1987 insertions(+), 1769 deletions(-) + delete mode 100644 include/asm-generic/4level-fixup.h + 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..7d79a5814b66 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing dmi based on 5.4-rc4 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..8a1c68d35481 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20191203 |