diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-11-05 21:38:09 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-11-05 21:38:09 +1100 |
| commit | 51309b9d73f5de2d8cba2c850df0c3b5d9125bee (patch) | |
| tree | 1a5260b16f0348f4c22d082f1a06a579ce26f485 | |
| parent | 7fa9d7f0e576a992f1df2778ce8940661c9c7643 (diff) | |
| download | linux-51309b9d73f5de2d8cba2c850df0c3b5d9125bee.tar.gz linux-51309b9d73f5de2d8cba2c850df0c3b5d9125bee.tar.xz | |
Add linux-next specific files for 20191105next-20191105
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 311 | ||||
| -rw-r--r-- | Next/Trees | 313 | ||||
| -rw-r--r-- | Next/merge.log | 12724 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 13351 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..3beef6ba8325 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,311 @@ +Name SHA1 +---- ---- +origin a99d8080aaf358d5d23581244e5da23b35e340b9 +fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +kbuild-current d6d5df1db6e9d7f8f76d2911707f7d5877251b02 +arc-current 5effc09c4907901f0e71e68e5f2e14211d9a203f +arm-current 39f4d441048444f38fcfcfb1aa3102c030544e86 +arm-soc-fixes 3a82cd4484890aef7ea8aa1a70937551d83c7f26 +arm64-fixes 1cf45b8fdbb87040e1d1bd793891089f4678aa41 +m68k-current 0f1979b402df5f0dd86425830ddaa191d70f3655 +powerpc-fixes 7d6475051fb3d9339c5c760ed9883bc0a9048b21 +s390-fixes 3d7efa4edd07be5c5c3ffa95ba63e97e070e1f3f +sparc 038029c03e21be3bab44ff9d8005b51b597a5bf2 +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net 3d1e5039f5f87a8731202ceca08764ee7cb010d3 +bpf 7de086909365cd60a5619a45af3f4152516fd75c +ipsec 68ce6688a5baefde30914fc07fc27292dbbe8320 +netfilter 1204c70d9dcba31164f78ad5d8c88c42335d51f8 +ipvs c24b75e0f9239e78105f81c5f03a751641eb07ef +wireless-drivers 3d206e6899a07fe853f703f7e68f84b48b919129 +mac80211 1fab1b89e2e8f01204a9c05a39fd0b6411a48593 +rdma-fixes b681a0529968d2261aa15d7a1e78801b2c06bb07 +sound-current 706ad6746a66546daf96d4e4a95e46faf6cf689a +sound-asoc-fixes 315ebd829f730263848f1a90d60b7d427b722723 +regmap-fixes da0c9ea146cbe92b832f1b0f694840ea8eb33cce +regulator-fixes 51e53e6f6be87c1ab38681d38a89b2e885626364 +spi-fixes 3482f557c30321cfe3ed08c046f9c8b2e931352d +pci-current 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +driver-core.current d6d5df1db6e9d7f8f76d2911707f7d5877251b02 +tty.current d6d5df1db6e9d7f8f76d2911707f7d5877251b02 +usb.current a99d8080aaf358d5d23581244e5da23b35e340b9 +usb-gadget-fixes f3fb802efaef3662744a2215a51294d52a7cfc0e +usb-serial-fixes bc25770f00d3f4e7482278f9823c2c2793605484 +usb-chipidea-fixes 16009db47c51d4ef61270f22a2f1bb385233c34f +phy 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +staging.current fe4c59394ededc798ab939556d887d2e1234c67f +char-misc.current 9d55499d8da49e9261e95a490f3fda41d955f505 +soundwire-fixes 7b47ad3322d114736e08cc244a84fe7af9b861f6 +thunderbolt-fixes 747125db6dcd8bcc21f13d013f6e6a2acade21ee +input-current b1a402e75a5f5127ff1ffff0615249f98df8b7b3 +crypto-current f703964fc66804e6049f2670fc11045aa8359b1a +ide baf6722aa0cbc5381f11520eb661be71b3ac379e +vfio-fixes 95f89e090618efca63918b658c2002e57d393036 +kselftest-fixes 303e6218ecec475d5bc3e5922dec770ee5baf107 +modules-fixes 09684950050be09ed6cd591e6fbf0c71d3473237 +slave-dma-fixes bacdcb6675e170bb2e8d3824da220e10274f42a7 +backlight-fixes e93c9c99a629c61837d5a7fc2120cd2b6c70dbdd +mtd-fixes df8fed831cbcdce7b283b2d9c1aadadcf8940d05 +mfd-fixes 603d9299da32955d49995738541f750f2ae74839 +v4l-dvb-fixes 3e84a18a259e1df35e5b549ab92ec3baf82ff010 +reset-fixes f430c7ed8bc22992ed528b518da465b060b9223f +mips-fixes f6929c92e283a35b183c293574adcbca409bf144 +at91-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +omap-fixes 6aed5a0e0f56213cc5e4bff674fb42e997f30df7 +kvm-fixes 671ddc700fd08b94967b1e2a937020e30c838609 +kvms390-fixes 53936b5bf35e140ae27e4bbf0447a61063f400da +hwmon-fixes a99d8080aaf358d5d23581244e5da23b35e340b9 +nvdimm-fixes 6370740e5f8ef12de7f9a9bf48a0393d202cd827 +btrfs-fixes e05781a99fd51fd98530fa3a44d1ccf4fdc5cb91 +vfs-fixes 03ad0d703df75c43f78bd72e16124b5b94a95188 +dma-mapping-fixes 9c24eaf81cc44d4bb38081c99eafd72ed85cf7f3 +i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +drivers-x86-fixes 7d194c2100ad2a6dded545887d02754948ca5241 +samsung-krzk-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +pinctrl-samsung-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +devicetree-fixes 5dba51754b04a941a1064f584e7a7f607df3f9bc +scsi-fixes d3566abb1a1e7772116e4d50fb6a58d19c9802e5 +drm-fixes a99d8080aaf358d5d23581244e5da23b35e340b9 +amdgpu-fixes c0e70e10b11b1b7ca0f537e7ce4404a0459cdc7c +drm-intel-fixes a99d8080aaf358d5d23581244e5da23b35e340b9 +mmc-fixes a99d8080aaf358d5d23581244e5da23b35e340b9 +rtc-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +gnss-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +hyperv-fixes 590c28b9199c99593b879cbb82d7d4be605894ec +soc-fsl-fixes 5674a92ca4b7e5a6a19231edd10298d30324cd27 +risc-v-fixes 1d9b0b66c3ef03e42db63068e1a4e7250992e2b1 +pidfd-fixes 913fe0eb39c6f6c9ecb1af284376259cdc1d8c77 +fpga-fixes dec43da46f63eb71f519d963ba6832838e4262a3 +spdx 02dc96ef6c25f990452c114c59d75c368a1f4c8f +gpio-intel-fixes 7d194c2100ad2a6dded545887d02754948ca5241 +pinctrl-intel-fixes 67d33aecd030226f0a577eb683aaa6853ecf8f91 +erofs-fixes da0c9ea146cbe92b832f1b0f694840ea8eb33cce +drm-misc-fixes b330f3972f4f2a829d41fb9e9b552bec7d73a840 +kspp-gustavo da0c9ea146cbe92b832f1b0f694840ea8eb33cce +kbuild 5bf9e7d8f8b786d54a223781150183907140ba96 +compiler-attributes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +leaks 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +dma-mapping b3d53f5fce5d07b4981f0f4f93e579e389a99b07 +asm-generic 9b87647c665dbf93173ca2f43986902b59dfbbba +arc 2f4ecf68a048de44d72157d637bf9cbbbdb357b0 +arm cb73737ea1d27181f5c4bfb1288e97f3e8a4abc7 +arm64 a2ffd8ebdcb830ae959e41441c55a55ce05a9f6a +arm-perf f1d303a1b5dd75d18734a2ca56ca90691639a79d +arm-soc 06fd047bde63ad3b6503e5a3baae93d0f19bf22b +amlogic 7c37bc96b8e03aa393d91471ec9f1b3f1668d497 +aspeed 7671be39c4d9c09bf73d7b16fc8d50e8f57f295c +at91 ba9b1009f561f0cb669842463158b38e0cff45c6 +bcm2835 f142341846711f8f3cb85e4df5e0130d9e017a9d +imx-mxs 71918b15d58f657ad35e20530b051c9a70999083 +keystone 2af8e1f26c6596540d95965fd45fca2692696e1e +mediatek 4ae1ce88e9a010b6227f0345b0abea0eebd38599 +mvebu 3aa22be2d6b161b744398e60902014893e6898d8 +omap 0adbc82922017d1f402c266a2bb23e2c0a598f48 +qcom 4d35d4201bc181b9ab94b3497d26249f3b46ff91 +realtek 6a41c7019bcaf869d2da3ad57be37de456e55b82 +renesas 9c45f53abb9772802044007717e769eafd9b9ce3 +reset c2ffa00ad6152ad54940f942fc316b9c83d5e6f9 +rockchip 9e86089c7f148833a042524b6cc1f56e821fac76 +samsung-krzk a4276bb320c42c9c7bdcd7c670f7ee4967aad1f8 +scmi a99d8080aaf358d5d23581244e5da23b35e340b9 +sunxi 5da8253c3f5a102e2235e8777c3d2fa7395f096c +tegra 6c7c92944894af074ce1c7ff6c96becbcb096266 +clk 8d3a12f3fb682a18c1db775dae387f1196725bd1 +clk-samsung 45f10dabb56bc5dee52df47dccd3bfab1e58eea1 +c6x 8adcc59974b8a65b7eac7d503364837c297139bc +csky 044cf5e153578583ef570b0a502ccdd74bdaf295 +h8300 a5de8865cb3edc9c5b719dc45651b38226805f9e +ia64 0d3d343560bad8e1b7879fe94251cfe731a2dd13 +m68k 7cf78b6b12fd5550545e4b73b35dca18bd46b44c +m68knommu dd13a0f1d3f88eb733da9059c69f811e8d5ac9d0 +microblaze 22648c989cb8305f51b96b5962df8674697bb2ab +mips dece3c2a320b0a6d891da6ff774ab763969b6860 +nds32 932296120543149e3397af252e7daee7af37eb05 +nios2 91d99a724e9c60e14332c26ab2284bf696b94c8e +openrisc f3b17320db25b4cdd50f0396b096644455357dac +parisc-hd e9c837c6ab07127b02357efcfe1a23d030db1aca +powerpc d78d5dace5398b542fd5a21b50db6e88ce7d392e +fsl 8a35879a60be0e931eec9a6edea340937b1f2f7d +soc-fsl 36f6cf9dc2f5339509f6b55d2a81f8df427c3f95 +risc-v a4531f3dba5f9b3e638f024ee096571adbac1598 +sifive 467e050e9760fc31dcf854ec88401e18419f5f78 +s390 effb83ccc83a97dbbe5214f4c443522719f05f3a +sh baf58858e8b6d853a7a8308901fcdd438e92a522 +sparc-next b71acb0e372160167bf6d5500b88b30b52ccef6e +uml 73625ed66389d4c620520058d828f43a93ab4d0c +xtensa c61b02fb6c4388378cb40a8bf69c696a2cf9286e +fscrypt 065ab4c4701ff6e28785eb8172925fc3068cc15e +afs a0753c29004f4983e303abce019f29e183b1ee48 +btrfs 6eb305c9273a2503dd89ec31993038d81c639e88 +ceph 1f08529c84cfecaf1261ed9b7e17fab18541c58f +cifs 404e73aaeaa070d69c4b8de22b93489063cd7a86 +configfs e9c03af21cc7e5723d4f1e90fe45d2cdccb70dc7 +ecryptfs b4a81b87a4cfe2bb26a4a943b748d96a43ef20e8 +erofs 0602fc8bb4f26bea4788854b297535fde1e047ba +ext3 7f494a73ee5a742fcf29e82ada23da147060cb42 +ext4 0d0a60c92fedbd4bf484c4c9b5cd49c16d05fb3f +f2fs a5f7bc69e7e7c5971f8a4dc4af4953d134c81340 +fsverity 95ae251fe82838b85c6d37e5a1775006e2a42ae0 +fuse 091d1a7267726ba162b12ce9332d76cdae602789 +jfs a5fdd713d256887b5f012608701149fa939e5645 +nfs a99d8080aaf358d5d23581244e5da23b35e340b9 +nfs-anna 79cc55422ce99be5964bde208ba8557174720893 +nfsd 5fcaf6982d1167f1cd9b264704f6d1ef4c505d54 +orangefs e6b998ab62be29eb244fdb0fa41dcb5a8ad065f2 +overlayfs 5c2e9f346b815841f9bed6029ebcb06415caf640 +ubifs 6a379f67454a3c740671ed6c7793b76ffecef50b +v9fs aafee43b72863f1f70aeaf1332d049916e8df239 +xfs c34d570d158699c6c812f5df653aaf2e3a83acca +iomap a901004214994f12523b47521cddfa4426f284c1 +djw-vfs 7118dd2d41afb79fe206df1fb7c8d79e79aa4382 +file-locks b41dae061bbd722b9d7fa828f35d22035b218e18 +vfs 3e501af8dd7b581240b476a1aa623f97dc1666ef +printk 4a6442ff627fc8ba76d56060b8a2020b9c9a4b6a +pci 59a426f044a4e242a316da539e5040af43639644 +pstore 8d82cee2f8aa8b9bc806907ecd9e1494c6e8526b +hid e0316fc294a6df22d846d6373446354ead7f5515 +i2c 70d0b04517cd0c0432dc3ddda1f4864cb283ddaf +i3c 469191c7fcd069a500c2a26c49c9baef9dabf66d +dmi 9a85ac3936add8611c5d7efb67a040a656fc9433 +hwmon-staging 93a794f1b78588c0885fe13a904fe685c049beaa +jc_docs 1c16b3d58681b583157a1b74c4c4dd96a08f5931 +v4l-dvb a4260ea49547aa0c84c353f9de5998a0315d89fe +v4l-dvb-next d45331b00ddb179e291766617259261c112db872 +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm 7dba3cb7cc3a651a2644195377a440d49098aad6 +cpufreq-arm e32beb064105e13d4db0b03b4da7142065db1b34 +cpupower d80a4ac20800035c46a3868ad9e11ebda0049c7d +opp c86487ec42bd20ed69b77bccdf48ffb1f9e08add +thermal 7d0f31b2fee50fb94ec38db054a4ed288ce72dff +thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 812cd88749e098ad976b6a1c149984dfd6c0f195 +dlm a48f9721e6db74dfbeb8d4a2cd616b20017f4b78 +swiotlb 4cdfb27ba80d29aa04bc340b2e4b59e9ae74004c +rdma 84a92ffd0eeae23dd5eab0bc73d0736bff331962 +net-next 56c1291ee48b4da2a70aa116098c2afc4a54783b +bpf-next f23c7ce341c2dfd187d4e3712ba6c110969463a0 +ipsec-next fd1ac07f3f17fbbc2f08e3b43951bed937d86a7b +mlx5-next e53a9d26cf80565cfb7172fc52a0dfac73613a0f +netfilter-next 1574cf83c7a069f5f29295170ed8a568ccebcb7b +nfc-next 1f008cfec5d529b30ca8da1a1f5fbbd457c10382 +ipvs-next d54725cd11a57c30f650260cfb0a92c268bdc3e0 +wireless-drivers-next 086ddf860650cfa3065d6698fae81335b1846cdb +bluetooth cf94da6f502d8caecabd56b194541c873c8a7a3c +mac80211-next 3f2aef10ffad76c31275ae66b1d6e486b22619d6 +gfs2 1a48049adb98a20fad05ed86bc00c2f9120a006e +mtd 267c1d772380cfbced547abb17f1d6827904f909 +nand 777260a5c99226cfa58325b6a7c2f39bb46f5aaf +spi-nor 3d63ee5deb466fd66ed6ffb164a87ce36425cf36 +crypto 298b4c604008025b134bc6fccbc4018449945d60 +drm 57c2af791b6c8087b6d8b56046838427d2ec0d73 +amdgpu 93e6e11732b6b57df0fe534a66f24a4f15ce8a0a +drm-intel 458863e08e13ecf22b9ba1ee6d4baba0ce9990ea +drm-tegra 84db889e6d827eefc3dde130fec8382d2dcb23ac +drm-misc 8a537de0f3d8b655cb901c948ed863bf0b23277b +drm-msm e20c9284c8f212081afc28471daaac9b0d54252f +mali-dp f634c6a8028789b05a9277a3d51303829ae29547 +imx-drm 4d24376370fbfc87231d54434a683f2913abcce4 +etnaviv 22567d017c2c1a9b6ce67d054ffcbf6d2d64a6f8 +regmap da0c9ea146cbe92b832f1b0f694840ea8eb33cce +sound 6111fd2370eecae9f11bfdc08ba097e0b51fcfd3 +sound-asoc b0e42496a9e49b978042bc946f6677ea4a5cdff3 +modules c3a6cf19e695c8b0a9bf8b5933f863e12d878b7c +input d843304b22e84b41dd00663a13cb960d2f4d064d +block 8f027e5994f732065246eb4e8b5c63ad8811b187 +device-mapper 13bd677a472d534bf100bab2713efc3f9e3f5978 +mmc 3a07e0b48c98b64d061e9e55b33c98db00093368 +md e820d55cb99dd93ac2dc949cf486bb187e5cd70d +mfd 1f98ed315b06da74d96a3d5365dd2d7072e2e0ce +backlight 53e4929150610149aac3453e2030c59b871984bb +battery 9480029fe5c24d482efad38dc631bd555fc7afe2 +regulator 3151d022d7409a54818c8915fcbe791c2ce448b9 +security 45893a0abee6b5fd52994a3a1095735aeaec472b +apparmor 136db994852a9b405ac1074de0e7a1c4c840b8ee +integrity 2a7f0e53daf29ca6dc9fbe2a27158f13474ec1b5 +keys 48274e1e5d24407bb2acb768c093add00bf92823 +selinux 42345b68c2e3e2b6549fc34b937ff44240dfc3b6 +smack 92604e825304ce170955df44b00973843054dcd5 +tomoyo 79c8ca578dbf776e86f452524c9bad0eae3b6f15 +tpmdd 6ffdd4c0e27ed86a6d27b4bff680be7ede1b0561 +watchdog ca2fc5efffde5a3827adfb0ab6a51b6f1c64d5ff +iommu 50f07c7db715d45a466aeb7203488f2a1d2743f2 +vfio 026948f01eac4dda130aa623b7414375633fe7c1 +audit c34c78dfc1fc68a1f5403f996de8ca62f298d7b2 +devicetree 067c650c456e758f933aaf87a202f841d34be269 +mailbox 556a0964e28c4441dcdd50fb07596fd042246bd5 +spi e2787cbf4bf780214ce46cb3d41ec4b156a01306 +tip 013bfb61922920f6548923454b6e398b7e747f80 +clockevents 6e001f6a4cc73cd06fc7b8c633bc4906c33dd8ad +edac 466503d6b1b33be46ab87c6090f0ade6c6011cbc +irqchip 41860cc447045c811ce6d5a92f93a065a691fe8e +ftrace 8ed4889eb83179dbc9a105cfed65cc42ecb61097 +rcu 8dcdfb7096a304130ab36fbb0f2961deaf863e5a +kvm 20baa8e515a55dc7467d9584cc458b5700c0a3aa +kvm-arm ab71d95313166900f9a3d71e12a9d046f9265698 +kvm-ppc 55d7004299eb917767761f01a208d50afad4f535 +kvms390 c7b7de63124645089ccf9900b9e5ea08059ccae0 +xen-tip 6ccae60d014d5d1f89c40e7e4b619f343ca24b03 +percpu 825dbc6ff7a3a063ea91be7d94af940080b0c991 +workqueues 30ae2fc0a75eb5f1a38bbee7355d8e3bc823a6e1 +drivers-x86 fa2a590d0d024eb3a048d817029959bef90bd191 +chrome-platform 3ea09dfacaa3c7f8f7da58e5033bd6b5e2a5cf71 +hsi c1030cd456198a2c58f718c3c4b215698d635553 +leds 448d6fcb7a52047f56737e475150f6169d08e20b +ipmi 4aa7afb0ee20a97fbf0c5bab3df028d5fb85fdab +driver-core 09b0965ee8cced20a4791ff54506f1a6600996fe +usb 16c8373ecf7b3c723a8e765d798ea413bc8345a6 +usb-gadget 726b4fba94bec7e4c16bc681316e82455652c3a8 +usb-serial 35714565089e5e8b091c1155517b67e29118f09d +usb-chipidea-next 973ce009b308dd02fbe6eaa7983b1ef084e9de2f +phy-next 4569e64ab6a590dec418f2cd98fbe907a08fd452 +tty c2a552197106b45d0d801d5b8a6be47563a700df +char-misc 891e60368ba1840c1b8bbc72beb1da0dae289430 +extcon ddd1bbbae486ff5913c8fc72c853dcea60713236 +soundwire 3ccb8551f52edfcf16291cde07a8d49fc3976b7a +thunderbolt 354a7a7716edb377953a324421915d7788e0bca9 +staging 6647e4e84501e7f935f108729da9a6fd60924d8b +mux 05fb8284a41719d5f827af2f383dd7592d8dcfda +icc 0bf9146d94a00c7759a30241eeabd3e2b28c5f15 +slave-dma 7208474d1c7af9f86dfb1f20bfa2abbe22ad2017 +cgroup 8c26b3a71bdf31b1b2b626c85f8428fbc1ee00a6 +scsi 4b9029e0a68d0df29f2ba0d8b07a6afa149e8eba +scsi-mkp c2a18e31433212e521d57866716d574e168cd86d +vhost 8766aecd61f7a5460958ca0f3b30cf64bc8602b0 +rpmsg 1587a11907d8e48805df8d363dfdee89deea0434 +gpio 1723e834a4aafd9a73ba6eb61aed6b092acfde73 +gpio-brgl 2b9f48e934075c1907c05cf52da9d339e76fa57c +gpio-intel 7d194c2100ad2a6dded545887d02754948ca5241 +pinctrl bf74543583fa7cf70c40e6fb3bcf75096bf8606a +pinctrl-intel c9ccf71fc8073b8d3a484751585088ff14c8d762 +pinctrl-samsung a322b3377f4bac32aa25fb1acb9e7afbbbbd0137 +pwm 9e1b4999a1693d67cc87a887057d8012c28fb12b +userns 318759b4737c3b3789e2fd64d539f437d52386f5 +ktest aecea57f84b0586b62c010bea946468d77f6bf0f +random 58be0106c5306b939b07b4b8bf00669a20593f4b +kselftest 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +y2038 0682b746099a202b31ef7fcf91c445a86a667af1 +livepatching 8b65d6ab9d7026bdc795083cb6c04c16b2a0bc7d +coresight d87f04ffb55b3472d2ff44946dced798d6f0287f +rtc c6c2d36bc46fcf9a27e1b5b7cd2708bc66cd479e +nvdimm 4c806b897d6075bfa5067e524fb058c57ab64e7b +at24 285be87c79e173f08af5e1a6417a106fb14934b7 +ntb 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +kspp ec2f877856e0af3889940e00b160f7f20f8d774f +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +fsi ca9902e3140eecbb77d478be6013200e0d4a5b54 +slimbus 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +nvmem 6bd17868c99260458c70dd364b06ba5c28cfe814 +xarray b7e9728f3d7fc5c5c8508d99f1675212af5cfd49 +hyperv 94f90545a08f6bb98c9b8a97688314f68282fe20 +auxdisplay 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +kgdb c58ff643763c78bef12874ee39995c9f7f987bc2 +pidfd 1282387e9dca949277f38f8b9a0a697664860bec +devfreq d2f5fccd1ac9363247888de40f2d05b6a1593e9f +hmm bbe3329e354d3ab5dc18ea2f1ec7fdd20e5d6fae +fpga fddc9fcbe69a502d84adf0bad5e2c6c80823838c +kunit ea2dd7c0875ed31955cda7b1b20612c8337192e5 +cel fd86460a2c947188f92ef706487ef426366a9e9c +akpm-current 867a29bb95b6310bcb8b1db59883863f0ae8261c +akpm ba0a1688b438896a1c66380b62b4330f52a3281f diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..84f0db5524f0 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,313 @@ +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 +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/mzx/devfreq.git#for-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 +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..ea6dcd31c5b3 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,12724 @@ +$ date -R +Tue, 05 Nov 2019 07:40:47 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +
[KUpdating files: 90% (5993/6626)
[KUpdating files: 91% (6030/6626)
[KUpdating files: 92% (6096/6626)
[KUpdating files: 93% (6163/6626)
[KUpdating files: 94% (6229/6626)
[KUpdating files: 95% (6295/6626)
[KUpdating files: 96% (6361/6626)
[KUpdating files: 97% (6428/6626)
[KUpdating files: 98% (6494/6626)
[KUpdating files: 99% (6560/6626)
[KUpdating files: 100% (6626/6626)
[KUpdating files: 100% (6626/6626), done. +HEAD is now at 320000e72ec0 Merge tag 'iommu-fixes-v5.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu +Merging origin/master (a99d8080aaf3 Linux 5.4-rc6) +$ git merge origin/master +Updating 320000e72ec0..a99d8080aaf3 +Fast-forward + Documentation/arm64/silicon-errata.rst | 7 +- + .../networking/device_drivers/intel/e100.rst | 14 +- + .../networking/device_drivers/intel/e1000.rst | 12 +- + .../networking/device_drivers/intel/e1000e.rst | 14 +- + .../networking/device_drivers/intel/fm10k.rst | 10 +- + .../networking/device_drivers/intel/i40e.rst | 8 +- + .../networking/device_drivers/intel/iavf.rst | 8 +- + .../networking/device_drivers/intel/ice.rst | 6 +- + .../networking/device_drivers/intel/igb.rst | 12 +- + .../networking/device_drivers/intel/igbvf.rst | 6 +- + .../networking/device_drivers/intel/ixgbe.rst | 10 +- + .../networking/device_drivers/intel/ixgbevf.rst | 6 +- + .../networking/device_drivers/pensando/ionic.rst | 6 +- + Documentation/networking/ip-sysctl.txt | 11 +- + MAINTAINERS | 7 +- + Makefile | 2 +- + arch/arm64/include/asm/cputype.h | 2 + + arch/arm64/include/asm/pgtable-prot.h | 15 +- + arch/arm64/kernel/cpu_errata.c | 59 +- + arch/parisc/kernel/entry.S | 2 +- + arch/powerpc/include/asm/book3s/32/kup.h | 1 + + arch/powerpc/include/asm/elf.h | 3 + + arch/powerpc/kernel/prom_init.c | 13 + + arch/powerpc/kernel/prom_init_check.sh | 3 +- + arch/powerpc/platforms/powernv/eeh-powernv.c | 2 +- + arch/powerpc/platforms/powernv/smp.c | 53 +- + arch/riscv/include/asm/io.h | 7 + + arch/riscv/include/asm/irq.h | 3 + + arch/riscv/include/asm/pgtable.h | 7 +- + arch/riscv/include/asm/switch_to.h | 1 + + arch/riscv/kernel/cpufeature.c | 1 + + arch/riscv/kernel/head.h | 21 + + arch/riscv/kernel/irq.c | 2 +- + arch/riscv/kernel/module-sections.c | 1 + + arch/riscv/kernel/process.c | 2 + + arch/riscv/kernel/ptrace.c | 4 +- + arch/riscv/kernel/reset.c | 1 + + arch/riscv/kernel/setup.c | 2 + + arch/riscv/kernel/signal.c | 8 +- + arch/riscv/kernel/smp.c | 2 + + arch/riscv/kernel/smpboot.c | 5 +- + arch/riscv/kernel/syscall_table.c | 1 + + arch/riscv/kernel/time.c | 1 + + arch/riscv/kernel/traps.c | 5 +- + arch/riscv/kernel/vdso.c | 3 +- + arch/riscv/mm/context.c | 1 + + arch/riscv/mm/fault.c | 2 + + arch/riscv/mm/init.c | 5 +- + arch/riscv/mm/sifive_l2_cache.c | 2 +- + arch/s390/include/asm/unwind.h | 1 + + arch/s390/kernel/idle.c | 29 +- + arch/s390/kernel/unwind_bc.c | 18 +- + arch/s390/mm/cmm.c | 12 +- + arch/um/drivers/ubd_kern.c | 8 +- + arch/x86/boot/compressed/eboot.c | 4 +- + arch/x86/events/amd/ibs.c | 8 +- + arch/x86/events/intel/uncore.c | 44 +- + arch/x86/events/intel/uncore.h | 12 - + arch/x86/kvm/svm.c | 10 +- + arch/x86/kvm/vmx/vmx.c | 14 +- + block/blk-iocost.c | 4 +- + drivers/acpi/processor_perflib.c | 34 +- + drivers/acpi/processor_thermal.c | 34 +- + drivers/crypto/chelsio/chtls/chtls_cm.c | 2 +- + drivers/crypto/chelsio/chtls/chtls_io.c | 2 +- + drivers/dma/imx-sdma.c | 8 + + drivers/dma/qcom/bam_dma.c | 19 + + drivers/dma/sprd-dma.c | 27 +- + drivers/dma/tegra210-adma.c | 7 + + drivers/dma/ti/cppi41.c | 21 +- + drivers/dma/xilinx/xilinx_dma.c | 10 +- + drivers/firmware/efi/Kconfig | 1 + + drivers/firmware/efi/efi.c | 2 +- + drivers/firmware/efi/libstub/Makefile | 1 + + drivers/firmware/efi/libstub/arm32-stub.c | 16 +- + drivers/firmware/efi/libstub/efi-stub-helper.c | 24 +- + drivers/firmware/efi/test/efi_test.c | 8 + + drivers/firmware/efi/tpm.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 9 + + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 9 + + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 1 + + drivers/gpu/drm/amd/display/dc/calcs/Makefile | 19 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 4 + + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 9 + + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 24 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 6 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c | 22 +- + drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 19 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn21/Makefile | 19 +- + drivers/gpu/drm/amd/display/dc/dml/Makefile | 19 +- + .../amd/display/dc/dml/dcn20/display_mode_vba_20.c | 3 +- + drivers/gpu/drm/amd/display/dc/dsc/Makefile | 19 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 4 +- + drivers/gpu/drm/etnaviv/etnaviv_dump.c | 4 +- + drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c | 6 +- + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 17 +- + drivers/gpu/drm/i915/display/intel_display.c | 11 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 15 + + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 4 +- + drivers/gpu/drm/i915/i915_drv.h | 2 + + drivers/gpu/drm/panfrost/panfrost_drv.c | 2 +- + drivers/gpu/drm/panfrost/panfrost_mmu.c | 15 +- + drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 1 + + drivers/gpu/drm/radeon/radeon_drv.c | 14 + + drivers/gpu/drm/scheduler/sched_main.c | 19 +- + drivers/gpu/drm/v3d/v3d_gem.c | 5 +- + drivers/hwmon/ina3221.c | 2 +- + drivers/hwmon/nct7904.c | 15 +- + drivers/infiniband/core/core_priv.h | 1 + + drivers/infiniband/core/device.c | 2 + + drivers/infiniband/core/iwcm.c | 52 +- + drivers/infiniband/core/netlink.c | 107 ++-- + drivers/infiniband/core/nldev.c | 2 +- + drivers/infiniband/core/uverbs.h | 2 +- + drivers/infiniband/core/verbs.c | 9 +- + drivers/infiniband/hw/cxgb4/cm.c | 30 +- + drivers/infiniband/hw/hfi1/sdma.c | 5 +- + drivers/infiniband/hw/hfi1/tid_rdma.c | 5 - + drivers/infiniband/hw/hfi1/verbs.c | 10 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 6 +- + drivers/infiniband/hw/mlx5/mr.c | 4 +- + drivers/infiniband/hw/mlx5/qp.c | 8 +- + drivers/infiniband/hw/qedr/main.c | 2 +- + drivers/infiniband/sw/siw/siw_qp.c | 2 + + drivers/infiniband/sw/siw/siw_verbs.c | 2 - + drivers/isdn/capi/capi.c | 2 +- + drivers/net/bonding/bond_alb.c | 2 +- + drivers/net/bonding/bond_main.c | 28 +- + drivers/net/dsa/bcm_sf2.c | 36 +- + drivers/net/dsa/sja1105/Kconfig | 4 +- + drivers/net/ethernet/arc/emac_rockchip.c | 3 + + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 10 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 112 ++-- + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h | 3 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c | 28 +- + drivers/net/ethernet/chelsio/cxgb4/sge.c | 8 +- + drivers/net/ethernet/cortina/gemini.h | 2 +- + drivers/net/ethernet/faraday/ftgmac100.c | 25 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.h | 2 +- + drivers/net/ethernet/freescale/dpaa2/dprtc-cmd.h | 2 +- + drivers/net/ethernet/freescale/dpaa2/dprtc.h | 2 +- + drivers/net/ethernet/freescale/fec_main.c | 2 +- + drivers/net/ethernet/freescale/fec_ptp.c | 4 +- + drivers/net/ethernet/google/gve/gve_rx.c | 2 + + drivers/net/ethernet/google/gve/gve_tx.c | 24 +- + drivers/net/ethernet/hisilicon/hip04_eth.c | 16 +- + drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 7 +- + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 5 - + drivers/net/ethernet/intel/igb/e1000_82575.c | 2 +- + drivers/net/ethernet/intel/igb/igb_main.c | 8 +- + drivers/net/ethernet/intel/igc/igc_main.c | 3 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 1 - + drivers/net/ethernet/marvell/mvneta_bm.h | 32 +- + .../net/ethernet/mellanox/mlx4/resource_tracker.c | 42 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 3 +- + .../ethernet/mellanox/mlx5/core/en/hv_vhca_stats.c | 4 +- + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 12 +- + drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 13 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls.c | 2 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls.h | 29 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 190 ++++--- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 13 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 5 +- + .../net/ethernet/mellanox/mlx5/core/en_selftest.c | 15 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 16 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 10 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 36 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 35 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 1 - + .../mellanox/mlx5/core/eswitch_offloads_termtbl.c | 22 +- + .../net/ethernet/mellanox/mlx5/core/fpga/conn.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/health.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/core.c | 4 +- + drivers/net/ethernet/mscc/ocelot.c | 11 +- + drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 18 - + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 2 + + drivers/net/ethernet/pensando/ionic/ionic_main.c | 2 + + drivers/net/ethernet/qlogic/qed/qed_main.c | 27 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 2 +- + drivers/net/ethernet/realtek/r8169_main.c | 4 + + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1 + + drivers/net/fjes/fjes_main.c | 15 +- + drivers/net/hamradio/bpqether.c | 22 - + drivers/net/hyperv/netvsc_drv.c | 15 +- + drivers/net/ipvlan/ipvlan_main.c | 2 - + drivers/net/macsec.c | 18 - + drivers/net/macvlan.c | 19 - + drivers/net/netdevsim/dev.c | 5 + + drivers/net/phy/phylink.c | 16 + + drivers/net/phy/smsc.c | 1 + + drivers/net/ppp/ppp_generic.c | 2 - + drivers/net/team/team.c | 16 +- + drivers/net/usb/cdc_ether.c | 7 + + drivers/net/usb/lan78xx.c | 5 +- + drivers/net/usb/r8152.c | 1 + + drivers/net/vrf.c | 1 - + drivers/net/vxlan.c | 62 +- + drivers/net/wimax/i2400m/op-rfkill.c | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/api/scan.h | 22 +- + drivers/net/wireless/intel/iwlwifi/fw/file.h | 3 + + drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 1 + + drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 5 + + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 6 + + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 40 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 140 +++-- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 131 +++-- + .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 25 + + drivers/net/wireless/intersil/hostap/hostap_hw.c | 25 - + drivers/net/wireless/mediatek/mt76/Makefile | 2 + + drivers/net/wireless/mediatek/mt76/dma.c | 6 +- + drivers/net/wireless/mediatek/mt76/mt76.h | 6 +- + drivers/net/wireless/mediatek/mt76/mt76x2/pci.c | 2 + + drivers/net/wireless/mediatek/mt76/pci.c | 46 ++ + drivers/net/wireless/realtek/rtlwifi/pci.c | 3 +- + drivers/net/wireless/realtek/rtlwifi/ps.c | 6 + + drivers/net/wireless/virt_wifi.c | 54 +- + drivers/nvme/host/multipath.c | 9 +- + drivers/nvme/host/tcp.c | 2 +- + drivers/pwm/core.c | 9 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 4 +- + drivers/scsi/lpfc/lpfc_sli.c | 2 +- + drivers/scsi/qla2xxx/qla_attr.c | 7 +- + drivers/scsi/qla2xxx/qla_bsg.c | 6 +- + drivers/scsi/qla2xxx/qla_mbx.c | 3 +- + drivers/scsi/qla2xxx/qla_os.c | 4 + + drivers/scsi/sd.c | 3 +- + drivers/scsi/ufs/ufs_bsg.c | 4 + + drivers/target/iscsi/cxgbit/cxgbit_cm.c | 3 +- + drivers/usb/cdns3/gadget.c | 37 +- + drivers/usb/cdns3/host-export.h | 1 - + drivers/usb/cdns3/host.c | 1 + + drivers/usb/core/config.c | 5 + + drivers/usb/dwc3/Kconfig | 1 + + drivers/usb/dwc3/core.c | 3 +- + drivers/usb/dwc3/dwc3-pci.c | 2 +- + drivers/usb/dwc3/gadget.c | 6 + + drivers/usb/gadget/composite.c | 4 + + drivers/usb/gadget/configfs.c | 110 +++- + drivers/usb/gadget/udc/atmel_usba_udc.c | 6 +- + drivers/usb/gadget/udc/core.c | 11 + + drivers/usb/gadget/udc/fsl_udc_core.c | 2 +- + drivers/usb/gadget/udc/renesas_usb3.c | 11 +- + drivers/usb/host/xhci-debugfs.c | 24 +- + drivers/usb/host/xhci-ring.c | 2 + + drivers/usb/host/xhci.c | 54 +- + drivers/usb/misc/ldusb.c | 13 +- + drivers/usb/mtu3/mtu3_core.c | 1 + + drivers/usb/renesas_usbhs/common.c | 12 +- + drivers/usb/renesas_usbhs/mod_gadget.c | 4 +- + drivers/usb/serial/whiteheat.c | 13 +- + drivers/usb/serial/whiteheat.h | 2 +- + drivers/usb/storage/scsiglue.c | 10 - + drivers/usb/storage/uas.c | 20 - + drivers/usb/usbip/vhci_tx.c | 3 + + fs/cifs/smb2ops.c | 3 +- + fs/io_uring.c | 14 +- + fs/nfs/delegation.c | 12 +- + fs/nfs/delegation.h | 1 + + fs/nfs/nfs4proc.c | 7 +- + include/linux/dynamic_debug.h | 6 + + include/linux/efi.h | 18 +- + include/linux/filter.h | 1 - + include/linux/gfp.h | 23 + + include/linux/if_macvlan.h | 1 - + include/linux/if_team.h | 1 + + include/linux/if_vlan.h | 11 - + include/linux/mlx5/mlx5_ifc.h | 3 +- + include/linux/netdevice.h | 61 +- + include/linux/perf_event.h | 2 +- + include/linux/platform_data/dma-imx-sdma.h | 3 + + include/linux/security.h | 1 + + include/linux/skbuff.h | 36 +- + include/linux/socket.h | 2 +- + include/linux/sunrpc/bc_xprt.h | 5 + + include/net/bonding.h | 2 +- + include/net/busy_poll.h | 6 +- + include/net/flow_dissector.h | 3 +- + include/net/fq.h | 2 +- + include/net/fq_impl.h | 4 +- + include/net/hwbm.h | 10 +- + include/net/ip.h | 4 +- + include/net/ip_vs.h | 1 + + include/net/net_namespace.h | 2 +- + include/net/sock.h | 15 +- + include/net/vxlan.h | 1 + + include/rdma/ib_verbs.h | 2 +- + kernel/bpf/core.c | 2 +- + kernel/bpf/devmap.c | 33 +- + kernel/bpf/syscall.c | 31 +- + kernel/cgroup/cpuset.c | 3 +- + kernel/events/core.c | 2 +- + kernel/sched/topology.c | 11 +- + net/8021q/vlan.c | 1 - + net/8021q/vlan_dev.c | 33 -- + net/atm/common.c | 2 +- + net/batman-adv/bat_iv_ogm.c | 61 +- + net/batman-adv/bat_v_ogm.c | 41 +- + net/batman-adv/hard-interface.c | 2 + + net/batman-adv/soft-interface.c | 32 -- + net/batman-adv/types.h | 7 + + net/bluetooth/6lowpan.c | 8 - + net/bluetooth/af_bluetooth.c | 4 +- + net/bridge/br_device.c | 8 - + net/bridge/netfilter/nf_conntrack_bridge.c | 2 +- + net/caif/caif_socket.c | 2 +- + net/core/datagram.c | 8 +- + net/core/dev.c | 623 +++++++++++++++------ + net/core/dev_addr_lists.c | 12 +- + net/core/ethtool.c | 4 +- + net/core/flow_dissector.c | 38 +- + net/core/lwt_bpf.c | 7 +- + net/core/net_namespace.c | 18 +- + net/core/rtnetlink.c | 17 +- + net/core/sock.c | 6 +- + net/dccp/ipv4.c | 2 +- + net/decnet/af_decnet.c | 2 +- + net/dsa/master.c | 5 - + net/dsa/slave.c | 12 - + net/ieee802154/6lowpan/core.c | 8 - + net/ipv4/datagram.c | 2 +- + net/ipv4/fib_frontend.c | 2 +- + net/ipv4/inet_hashtables.c | 2 +- + net/ipv4/ip_gre.c | 4 +- + net/ipv4/ip_output.c | 11 +- + net/ipv4/tcp.c | 4 +- + net/ipv4/tcp_ipv4.c | 6 +- + net/ipv4/udp.c | 29 +- + net/ipv6/addrconf_core.c | 1 + + net/ipv6/inet6_hashtables.c | 2 +- + net/ipv6/ip6_gre.c | 4 +- + net/ipv6/udp.c | 2 +- + net/l2tp/l2tp_eth.c | 1 - + net/netfilter/ipvs/ip_vs_app.c | 12 +- + net/netfilter/ipvs/ip_vs_ctl.c | 29 +- + net/netfilter/ipvs/ip_vs_pe.c | 3 +- + net/netfilter/ipvs/ip_vs_sched.c | 3 +- + net/netfilter/ipvs/ip_vs_sync.c | 13 +- + net/netfilter/nf_flow_table_core.c | 3 +- + net/netfilter/nf_tables_offload.c | 2 +- + net/netfilter/nft_payload.c | 38 ++ + net/netrom/af_netrom.c | 23 - + net/nfc/llcp_sock.c | 4 +- + net/openvswitch/datapath.c | 20 +- + net/openvswitch/vport-internal_dev.c | 11 +- + net/phonet/socket.c | 4 +- + net/rose/af_rose.c | 23 - + net/rxrpc/ar-internal.h | 1 + + net/rxrpc/recvmsg.c | 18 +- + net/sched/cls_bpf.c | 8 +- + net/sched/sch_generic.c | 19 +- + net/sched/sch_hhf.c | 8 +- + net/sched/sch_sfb.c | 13 +- + net/sched/sch_sfq.c | 14 +- + net/sched/sch_taprio.c | 2 +- + net/sctp/socket.c | 8 +- + net/smc/af_smc.c | 13 +- + net/smc/smc_core.c | 2 +- + net/smc/smc_pnet.c | 2 +- + net/sunrpc/backchannel_rqst.c | 7 +- + net/sunrpc/xprt.c | 5 + + net/sunrpc/xprtrdma/backchannel.c | 2 + + net/tipc/socket.c | 4 +- + net/unix/af_unix.c | 6 +- + net/vmw_vsock/af_vsock.c | 2 +- + net/wireless/chan.c | 5 + + net/wireless/nl80211.c | 2 +- + net/wireless/util.c | 3 +- + net/xdp/xdp_umem.c | 6 + + security/lockdown/lockdown.c | 1 + + sound/core/timer.c | 24 +- + sound/firewire/bebob/bebob_stream.c | 3 +- + sound/hda/hdac_controller.c | 2 - + sound/pci/hda/hda_intel.c | 2 +- + sound/pci/hda/patch_hdmi.c | 10 +- + sound/pci/hda/patch_realtek.c | 11 + + sound/usb/quirks.c | 1 + + tools/testing/selftests/bpf/test_offload.py | 5 + + tools/testing/selftests/bpf/test_tc_edt.sh | 2 +- + tools/testing/selftests/net/fib_tests.sh | 21 + + tools/testing/selftests/net/l2tp.sh | 0 + tools/testing/selftests/net/reuseport_dualstack.c | 3 +- + tools/usb/usbip/libsrc/usbip_device_driver.c | 6 +- + virt/kvm/kvm_main.c | 48 +- + 390 files changed, 3401 insertions(+), 1851 deletions(-) + create mode 100644 arch/riscv/kernel/head.h + create mode 100644 drivers/net/wireless/mediatek/mt76/pci.c + mode change 100644 => 100755 tools/testing/selftests/net/l2tp.sh +Merging fixes/master (54ecb8f7028c Linux 5.4-rc1) +$ git merge fixes/master +Already up to date. +Merging kbuild-current/fixes (d6d5df1db6e9 Linux 5.4-rc5) +$ 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 (3a82cd448489 Merge tag 'imx-fixes-5.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes) +$ git merge arm-soc-fixes/arm/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi | 4 ++++ + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 8 ++++++++ + arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 1 + + arch/arm/mach-sunxi/mc_smp.c | 6 +++++- + arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 6 +++--- + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 6 +++--- + arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi | 2 +- + drivers/reset/core.c | 5 +++-- + drivers/soc/imx/gpc.c | 8 ++++---- + include/linux/reset-controller.h | 4 ++-- + include/linux/reset.h | 2 +- + 12 files changed, 36 insertions(+), 18 deletions(-) +Merging arm64-fixes/for-next/fixes (1cf45b8fdbb8 arm64: apply ARM64_ERRATUM_843419 workaround for Brahma-B53 core) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging m68k-current/for-linus (0f1979b402df m68k: Remove ioremap_fullcache()) +$ 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 (3d7efa4edd07 s390/idle: fix cpu idle time calculation) +$ 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 (3d1e5039f5f8 dccp: do not leak jiffies on the wire) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/freescale/fec_main.c | 2 ++ + net/dccp/ipv4.c | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) +Merging bpf/master (7de086909365 powerpc/bpf: Fix tail call implementation) +$ git merge bpf/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + arch/powerpc/net/bpf_jit_comp64.c | 13 +++++++++++++ + include/linux/bpf.h | 4 ++-- + kernel/bpf/cgroup.c | 4 ++-- + kernel/bpf/syscall.c | 7 +++++-- + samples/bpf/Makefile | 1 + + tools/perf/perf-sys.h | 6 ++++-- + tools/testing/selftests/bpf/test_sysctl.c | 8 +++++++- + 8 files changed, 35 insertions(+), 9 deletions(-) +Merging ipsec/master (68ce6688a5ba net: sched: taprio: Fix potential integer overflow in taprio_set_picos_per_byte) +$ git merge ipsec/master +Already up to date. +Merging netfilter/master (1204c70d9dcb Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (c24b75e0f923 ipvs: move old_secure_tcp into struct netns_ipvs) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (3d206e6899a0 iwlwifi: fw api: support new API for scan config cmd) +$ git merge wireless-drivers/master +Already up to date. +Merging mac80211/master (1fab1b89e2e8 nl80211: fix validation of mesh path nexthop) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (b681a0529968 RDMA/hns: Prevent memory leaks of eq->buf_list) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (706ad6746a66 ALSA: bebob: fix to detect configured source of sampling clock for Focusrite Saffire Pro i/o series) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/firewire/bebob/bebob_focusrite.c | 3 +++ + 1 file changed, 3 insertions(+) +Merging sound-asoc-fixes/for-linus (315ebd829f73 Merge branch 'asoc-5.4' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + sound/core/compress_offload.c | 2 +- + sound/soc/codecs/hdac_hda.c | 2 +- + sound/soc/codecs/hdmi-codec.c | 12 +++++------- + sound/soc/codecs/msm8916-wcd-analog.c | 4 ++-- + sound/soc/kirkwood/kirkwood-i2s.c | 11 ++++++----- + sound/soc/rockchip/rockchip_max98090.c | 7 +++++-- + sound/soc/sh/rcar/dma.c | 4 ++-- + sound/soc/sof/debug.c | 6 ++++-- + sound/soc/sof/intel/hda-stream.c | 4 ++-- + sound/soc/sof/ipc.c | 4 +++- + sound/soc/ti/sdma-pcm.c | 2 +- + 11 files changed, 32 insertions(+), 26 deletions(-) +Merging regmap-fixes/for-linus (da0c9ea146cb Linux 5.4-rc2) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (51e53e6f6be8 Merge branch 'regulator-5.4' into regulator-linus) +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/regulator/bd70528-regulator.c | 1 + + drivers/regulator/core.c | 1 + + 2 files changed, 2 insertions(+) +Merging spi-fixes/for-linus (3482f557c303 Merge branch 'spi-5.4' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/spi/spi-atmel.c | 10 +++------- + drivers/spi/spi-dw-mmio.c | 5 +++++ + drivers/spi/spi-fsl-dspi.c | 5 ++++- + drivers/spi/spi-fsl-lpspi.c | 2 +- + drivers/spi/spi-fsl-qspi.c | 38 +++++++++++++++++++++++++++++++++----- + drivers/spi/spi-gpio.c | 4 +++- + drivers/spi/spi-mxic.c | 6 +++--- + drivers/spi/spi-orion.c | 3 --- + drivers/spi/spi-pxa2xx.c | 19 ++++++++++++++----- + drivers/spi/spi-rspi.c | 8 ++------ + drivers/spi/spi-sifive.c | 11 +++++++---- + drivers/spi/spi-stm32-qspi.c | 3 ++- + drivers/spi/spi.c | 19 ++++++++++--------- + drivers/spi/spidev.c | 3 +++ + 14 files changed, 90 insertions(+), 46 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 (d6d5df1db6e9 Linux 5.4-rc5) +$ 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 (a99d8080aaf3 Linux 5.4-rc6) +$ 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 (bc25770f00d3 USB: serial: ti_usb_3410_5052: clean up serial data access) +$ 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 (fe4c59394ede Merge tag 'iio-fixes-for-5.4b' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus) +$ git merge staging.current/staging-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 + + drivers/iio/adc/stm32-adc.c | 4 +- + drivers/iio/imu/adis16480.c | 5 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 9 + + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 2 + + drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c | 15 +- + drivers/iio/proximity/srf04.c | 29 +- + drivers/staging/Kconfig | 2 + + drivers/staging/Makefile | 1 + + drivers/staging/vboxsf/Kconfig | 10 + + drivers/staging/vboxsf/Makefile | 5 + + drivers/staging/vboxsf/TODO | 7 + + drivers/staging/vboxsf/dir.c | 418 +++++++++++++ + drivers/staging/vboxsf/file.c | 370 ++++++++++++ + drivers/staging/vboxsf/shfl_hostintf.h | 901 +++++++++++++++++++++++++++++ + drivers/staging/vboxsf/super.c | 499 ++++++++++++++++ + drivers/staging/vboxsf/utils.c | 550 ++++++++++++++++++ + drivers/staging/vboxsf/vboxsf_wrappers.c | 371 ++++++++++++ + drivers/staging/vboxsf/vfsmod.h | 138 +++++ + 19 files changed, 3322 insertions(+), 20 deletions(-) + create mode 100644 drivers/staging/vboxsf/Kconfig + create mode 100644 drivers/staging/vboxsf/Makefile + create mode 100644 drivers/staging/vboxsf/TODO + create mode 100644 drivers/staging/vboxsf/dir.c + create mode 100644 drivers/staging/vboxsf/file.c + create mode 100644 drivers/staging/vboxsf/shfl_hostintf.h + create mode 100644 drivers/staging/vboxsf/super.c + create mode 100644 drivers/staging/vboxsf/utils.c + create mode 100644 drivers/staging/vboxsf/vboxsf_wrappers.c + create mode 100644 drivers/staging/vboxsf/vfsmod.h +Merging char-misc.current/char-misc-linus (9d55499d8da4 intel_th: pci: Add Jasper Lake PCH support) +$ git merge char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + drivers/hwtracing/intel_th/gth.c | 3 +++ + drivers/hwtracing/intel_th/msu.c | 11 ++++++++--- + drivers/hwtracing/intel_th/pci.c | 10 ++++++++++ + drivers/interconnect/core.c | 4 ++++ + drivers/interconnect/qcom/qcs404.c | 3 ++- + drivers/interconnect/qcom/sdm845.c | 3 ++- + drivers/soundwire/Kconfig | 1 + + drivers/soundwire/intel.c | 4 ++-- + drivers/soundwire/slave.c | 3 ++- + drivers/thunderbolt/nhi_ops.c | 1 - + drivers/thunderbolt/switch.c | 28 +++++++++++----------------- + 11 files changed, 45 insertions(+), 26 deletions(-) +Merging soundwire-fixes/fixes (7b47ad3322d1 soundwire: slave: fix scanf format) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (747125db6dcd thunderbolt: Drop unnecessary read when writing LC command in Ice Lake) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (b1a402e75a5f Input: st1232 - fix reporting multitouch coordinates) +$ git merge input-current/for-linus +Already up to date. +Merging crypto-current/master (f703964fc668 crypto: arm/aes-ce - add dependency on AES library) +$ git merge crypto-current/master +Already up to date. +Merging ide/master (baf6722aa0cb ide: Use dev_get_drvdata where possible) +$ git merge ide/master +Merge made by the 'recursive' strategy. + drivers/ide/siimage.c | 3 +-- + drivers/ide/via82cxxx.c | 3 +-- + 2 files changed, 2 insertions(+), 4 deletions(-) +Merging vfio-fixes/for-linus (95f89e090618 vfio/type1: Initialize resv_msi_base) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (303e6218ecec selftests: Fix O= and KBUILD_OUTPUT handling for relative paths) +$ git merge kselftest-fixes/fixes +Merge made by the 'recursive' strategy. + tools/testing/selftests/Makefile | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +Merging modules-fixes/modules-linus (09684950050b scripts/nsdeps: use alternative sed delimiter) +$ 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 (e93c9c99a629 Linux 5.1) +$ 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 +Merge made by the 'recursive' strategy. + drivers/media/platform/meson/ao-cec-g12a.c | 36 +++++++++++++++--------------- + drivers/media/platform/meson/ao-cec.c | 30 ++++++++++++------------- + 2 files changed, 33 insertions(+), 33 deletions(-) +Merging reset-fixes/reset/fixes (f430c7ed8bc2 reset: fix reset_control_ops kerneldoc comment) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (f6929c92e283 MAINTAINERS: Remove Kevin as maintainer of BMIPS generic platforms) +$ git merge mips-fixes/mips-fixes +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 - + arch/mips/sgi-ip27/Kconfig | 7 ------- + arch/mips/sgi-ip27/ip27-init.c | 21 ++++++--------------- + arch/mips/sgi-ip27/ip27-memory.c | 4 ---- + 4 files changed, 6 insertions(+), 27 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 (671ddc700fd0 KVM: nVMX: Don't leak L1 MMIO regions to L2) +$ 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 (a99d8080aaf3 Linux 5.4-rc6) +$ 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 (e05781a99fd5 Merge branch 'misc-5.4' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Merge made by the 'recursive' strategy. + fs/btrfs/space-info.c | 21 +++++++++++++++++++++ + fs/btrfs/tree-checker.c | 8 -------- + fs/btrfs/volumes.c | 1 + + 3 files changed, 22 insertions(+), 8 deletions(-) +Merging vfs-fixes/fixes (03ad0d703df7 autofs: fix a leak in autofs_expire_indirect()) +$ git merge vfs-fixes/fixes +Merge made by the 'recursive' strategy. + fs/aio.c | 10 +++++----- + fs/autofs/expire.c | 5 +++-- + fs/namespace.c | 15 +++++++-------- + 3 files changed, 15 insertions(+), 15 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 (d3566abb1a1e scsi: qla2xxx: stop timer in shutdown path) +$ git merge scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (a99d8080aaf3 Linux 5.4-rc6) +$ git merge drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (c0e70e10b11b drm/amd/display: fix dcn21 Makefile for clang) +$ git merge amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (a99d8080aaf3 Linux 5.4-rc6) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (a99d8080aaf3 Linux 5.4-rc6) +$ 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 (590c28b9199c Drivers: hv: vmbus: Fix harmless building warnings without CONFIG_PM_SLEEP) +$ git merge hyperv-fixes/hyperv-fixes +Merge made by the 'recursive' strategy. + drivers/iommu/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (913fe0eb39c6 clone3: validate stack arguments) +$ git merge pidfd-fixes/fixes +Merge made by the 'recursive' strategy. + include/uapi/linux/sched.h | 4 ++++ + kernel/fork.c | 33 ++++++++++++++++++++++++++++++++- + 2 files changed, 36 insertions(+), 1 deletion(-) +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 (02dc96ef6c25 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge spdx/spdx-linus +Already up to date. +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 (67d33aecd030 pinctrl: cherryview: Allocate IRQ chip dynamic) +$ git merge pinctrl-intel-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/pinctrl/intel/pinctrl-cherryview.c | 26 +++++++++++++------------- + drivers/pinctrl/intel/pinctrl-intel.c | 21 ++++++++++++++++++++- + 2 files changed, 33 insertions(+), 14 deletions(-) +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 (b330f3972f4f fbdev: c2p: Fix link failure on non-inlining) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/video/fbdev/c2p_core.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 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 (5bf9e7d8f8b7 kbuild: Extend defconfig field size from 24 to 27) +$ git merge kbuild/for-next +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 +Merge made by the 'recursive' strategy. + Documentation/Makefile | 6 ++- + Documentation/kbuild/modules.rst | 13 +++--- + Makefile | 11 +++-- + 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/video/logo/.gitignore | 1 + + drivers/video/logo/Makefile | 15 +++---- + {scripts => drivers/video/logo}/pnmtologo.c | 0 + kernel/Makefile | 2 +- + kernel/gen_kheaders.sh | 64 +++++++++++++++++------------ + scripts/.gitignore | 1 - + scripts/Makefile | 2 - + scripts/Makefile.build | 11 +++-- + scripts/Makefile.modpost | 9 ++-- + scripts/Makefile.package | 3 +- + scripts/kconfig/Makefile | 5 ++- + scripts/kconfig/parser.y | 1 - + scripts/mod/modpost.c | 10 +---- + scripts/setlocalversion | 22 +++++----- + 21 files changed, 88 insertions(+), 126 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%) +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 (b3d53f5fce5d usb: core: Remove redundant vmap checks) +$ git merge dma-mapping/for-next +Merge made by the 'recursive' strategy. + arch/arm/mm/dma-mapping-nommu.c | 2 +- + drivers/usb/core/hcd.c | 8 +------- + include/linux/dma-mapping.h | 8 ++++++-- + kernel/dma/coherent.c | 16 +++++++++------- + kernel/dma/contiguous.c | 9 +++++---- + kernel/dma/debug.c | 1 + + 6 files changed, 23 insertions(+), 21 deletions(-) +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 (2f4ecf68a048 ARC: mm: tlb flush optim: elide redundant uTLB invalidates for MMUv3) +$ git merge arc/for-next +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 +Merge made by the 'recursive' strategy. + arch/arc/Makefile | 2 +- + 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/entry-compact.h | 4 +- + arch/arc/include/asm/mmu.h | 6 +++ + arch/arc/include/asm/mmu_context.h | 2 +- + arch/arc/include/asm/pgtable.h | 2 +- + arch/arc/mm/tlb.c | 81 +++++++++++++--------------------- + arch/arc/mm/tlbex.S | 18 +++++--- + arch/arc/plat-sim/platform.c | 1 - + 18 files changed, 95 insertions(+), 404 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 +Merging arm/for-next (cb73737ea1d2 ARM: 8928/1: ARM_ERRATA_775420: Spelling s/date/data/) +$ git merge arm/for-next +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 2 +- + arch/arm/boot/compressed/atags_to_fdt.c | 12 ++++++------ + arch/arm/include/asm/pci.h | 2 ++ + arch/arm/kernel/arch_timer.c | 1 + + arch/arm/kernel/module-plts.c | 1 + + arch/arm/kernel/process.c | 2 ++ + arch/arm/kernel/psci_smp.c | 6 +++--- + arch/arm/kernel/signal.h | 2 ++ + arch/arm/kernel/tcm.c | 5 +++-- + arch/arm/kernel/topology.c | 2 +- + arch/arm/mach-footbridge/dc21285.c | 1 - + arch/arm/mm/dma-mapping.c | 34 ++++++++++++++++++--------------- + arch/arm/mm/init.c | 7 ++++--- + arch/arm/mm/iomap.c | 2 ++ + 14 files changed, 47 insertions(+), 32 deletions(-) +Merging arm64/for-next/core (a2ffd8ebdcb8 Merge branch 'for-next/elf-hwcap-docs' into for-next/core) +$ git merge arm64/for-next/core +Auto-merging drivers/irqchip/irq-gic-v3.c +Auto-merging arch/arm64/kernel/cpu_errata.c +Auto-merging Documentation/arm64/silicon-errata.rst +Merge made by the 'recursive' strategy. + Documentation/arm64/booting.rst | 3 + + Documentation/arm64/cpu-feature-registers.rst | 19 +- + Documentation/arm64/elf_hwcaps.rst | 67 +++--- + Documentation/arm64/silicon-errata.rst | 6 + + arch/arm/mm/proc-v7-bugs.c | 10 +- + arch/arm64/Kconfig | 30 +++ + arch/arm64/include/asm/asm-uaccess.h | 9 - + arch/arm64/include/asm/barrier.h | 12 + + arch/arm64/include/asm/cache.h | 3 +- + arch/arm64/include/asm/cpucaps.h | 4 +- + arch/arm64/include/asm/cpufeature.h | 14 ++ + arch/arm64/include/asm/daifflags.h | 19 +- + arch/arm64/include/asm/exception.h | 22 +- + arch/arm64/include/asm/irqflags.h | 19 +- + arch/arm64/include/asm/kvm_host.h | 3 +- + arch/arm64/include/asm/pgtable.h | 16 +- + arch/arm64/include/asm/processor.h | 14 ++ + arch/arm64/include/asm/syscall_wrapper.h | 6 - + arch/arm64/include/asm/traps.h | 10 - + arch/arm64/kernel/Makefile | 6 +- + arch/arm64/kernel/cpu_errata.c | 82 ++++--- + arch/arm64/kernel/cpuinfo.c | 2 +- + arch/arm64/kernel/entry-common.c | 332 ++++++++++++++++++++++++++ + arch/arm64/kernel/entry.S | 281 +--------------------- + arch/arm64/kernel/fpsimd.c | 6 +- + arch/arm64/kernel/probes/kprobes.c | 4 - + arch/arm64/kernel/psci.c | 15 +- + arch/arm64/kernel/sdei.c | 3 +- + arch/arm64/kernel/sys_compat.c | 11 + + arch/arm64/kernel/syscall.c | 4 +- + arch/arm64/kernel/traps.c | 21 +- + arch/arm64/kernel/vmlinux.lds.S | 3 - + arch/arm64/kvm/hyp/switch.c | 52 +++- + arch/arm64/kvm/hyp/sysreg-sr.c | 35 ++- + arch/arm64/kvm/hyp/tlb.c | 23 ++ + arch/arm64/mm/fault.c | 64 ++--- + arch/arm64/mm/init.c | 89 ++++--- + arch/powerpc/include/asm/page.h | 9 - + arch/powerpc/mm/mem.c | 20 +- + arch/s390/include/asm/page.h | 2 - + arch/s390/mm/init.c | 1 + + arch/x86/include/asm/pgtable.h | 6 + + drivers/firmware/arm_sdei.c | 12 +- + drivers/firmware/psci/psci.c | 24 +- + drivers/irqchip/irq-gic-v3.c | 20 ++ + include/linux/arm-smccc.h | 16 ++ + include/linux/arm_sdei.h | 6 - + include/linux/dma-direct.h | 2 + + include/linux/irqchip/arm-gic-v3.h | 2 + + include/linux/mmzone.h | 45 ++-- + include/linux/psci.h | 9 +- + init/initramfs.c | 8 + + kernel/dma/direct.c | 13 +- + mm/memory.c | 104 ++++++-- + 54 files changed, 1027 insertions(+), 591 deletions(-) + create mode 100644 arch/arm64/kernel/entry-common.c +Merging arm-perf/for-next/perf (f1d303a1b5dd perf/imx_ddr: Dump AXI ID filter info to userspace) +$ git merge arm-perf/for-next/perf +Merge made by the 'recursive' strategy. + Documentation/admin-guide/perf/imx-ddr.rst | 15 +- + Documentation/admin-guide/perf/thunderx2-pmu.rst | 20 +- + Documentation/devicetree/bindings/perf/arm-ccn.txt | 1 + + .../devicetree/bindings/perf/fsl-imx-ddr.txt | 1 + + arch/arm64/kernel/perf_event.c | 191 +++++---------- + drivers/perf/arm-cci.c | 4 +- + drivers/perf/arm-ccn.c | 4 +- + drivers/perf/arm_smmuv3_pmu.c | 5 +- + drivers/perf/fsl_imx8_ddr_perf.c | 124 ++++++++-- + drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c | 5 +- + drivers/perf/hisilicon/hisi_uncore_hha_pmu.c | 4 +- + drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c | 4 +- + drivers/perf/thunderx2_pmu.c | 267 ++++++++++++++++++--- + drivers/perf/xgene_pmu.c | 14 +- + 14 files changed, 440 insertions(+), 219 deletions(-) +Merging arm-soc/for-next (06fd047bde63 Merge branch 'arm/fixes' into for-next) +$ git merge arm-soc/for-next +Auto-merging arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +Auto-merging arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +Auto-merging arch/arm/boot/dts/sunxi-h3-h5.dtsi +Auto-merging arch/arm/boot/dts/sun9i-a80.dtsi +Auto-merging arch/arm/boot/dts/sun8i-r40.dtsi +Auto-merging arch/arm/boot/dts/sun8i-a83t.dtsi +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +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 +Removing Documentation/devicetree/bindings/arm/renesas,prr.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 +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/bcm/bcm2835.yaml | 54 + + .../devicetree/bindings/arm/bcm/brcm,bcm2835.txt | 67 - + Documentation/devicetree/bindings/arm/cpus.yaml | 1 + + ...-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/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 + + Documentation/devicetree/bindings/arm/sunxi.yaml | 5 + + .../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 + + .../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/phy/phy-mmp3-usb.txt | 13 + + .../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 +- + .../devicetree/bindings/soc/rockchip/grf.txt | 1 + + .../devicetree/bindings/timer/renesas,tmu.txt | 1 + + MAINTAINERS | 22 +- + arch/arm/Kconfig | 2 +- + arch/arm/arm-soc-for-next-contents.txt | 155 + + arch/arm/boot/dts/Makefile | 10 +- + 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/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/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/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/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/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/omap3-igep0020-rev-f.dts | 8 + + arch/arm/boot/dts/omap3-igep0030-rev-g.dts | 8 + + 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/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-edp.dtsi | 35 +- + arch/arm/boot/dts/rk3288-veyron-jaq.dts | 35 +- + 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/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/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 | 9 + + arch/arm/boot/dts/sun8i-r40.dtsi | 9 + + arch/arm/boot/dts/sun9i-a80.dtsi | 11 + + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 5 + + 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/configs/exynos_defconfig | 2 + + arch/arm/configs/keystone_defconfig | 1 + + arch/arm/configs/multi_v7_defconfig | 36 +- + arch/arm/configs/omap2plus_defconfig | 10 +- + 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-hisi/Kconfig | 16 +- + 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-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/omap-mpuss-lowpower.c | 2 - + 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-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/arm64/Kconfig.platforms | 6 +- + 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 + + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 9 + + .../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 | 25 + + .../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 | 33 + + .../boot/dts/altera/socfpga_stratix10_socdk.dts | 4 +- + 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/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/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/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/px30-evb.dts | 309 +- + arch/arm64/boot/dts/rockchip/px30.dtsi | 83 +- + 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-roc-pc.dts | 32 +- + 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/configs/defconfig | 10 + + drivers/bus/ti-sysc.c | 87 +- + drivers/clk/Kconfig | 5 + + drivers/clk/mmp/Makefile | 2 +- + drivers/firmware/tegra/bpmp.c | 2 +- + 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/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/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/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 + + include/Kbuild | 1 + + include/dt-bindings/clock/r8a774b1-cpg-mssr.h | 57 + + include/dt-bindings/clock/r8a77961-cpg-mssr.h | 65 + + include/dt-bindings/clock/tegra124-car-common.h | 3 +- + include/dt-bindings/clock/tegra210-car.h | 3 +- + include/dt-bindings/pinctrl/rockchip.h | 8 +- + include/dt-bindings/power/r8a774b1-sysc.h | 26 + + include/dt-bindings/power/r8a77961-sysc.h | 32 + + 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/platform_data/ti-prm.h | 21 + + include/linux/reset-controller.h | 3 +- + include/linux/reset.h | 46 + + .../mach-mmp => include/linux/soc/mmp}/cputype.h | 29 + + 413 files changed, 27663 insertions(+), 7727 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 + 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/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/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/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/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/broadcom/bcm2711-rpi-4-b.dts + 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 drivers/memory/samsung/exynos5422-dmc.c + create mode 100644 drivers/phy/marvell/phy-mmp3-usb.c + create mode 100644 drivers/soc/renesas/r8a774b1-sysc.c + 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/clock/r8a774b1-cpg-mssr.h + create mode 100644 include/dt-bindings/clock/r8a77961-cpg-mssr.h + create mode 100644 include/dt-bindings/power/r8a774b1-sysc.h + create mode 100644 include/dt-bindings/power/r8a77961-sysc.h + 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 (7c37bc96b8e0 Merge branch 'v5.5/dt64' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/amlogic.yaml | 9 +- + .../bindings/clock/amlogic,axg-audio-clkc.txt | 3 +- + .../devicetree/bindings/nvmem/amlogic-efuse.txt | 6 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + 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 | 449 +++++------------ + 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-khadas-vim3.dtsi | 4 + + .../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 | 1 + + .../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-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 +++++++++++++ + drivers/clk/meson/g12a.c | 13 +- + drivers/clk/meson/gxbb.c | 1 + + drivers/firmware/meson/meson_sm.c | 110 ++-- + drivers/nvmem/meson-efuse.c | 24 +- + drivers/soc/amlogic/meson-gx-socinfo.c | 3 + + include/dt-bindings/clock/axg-audio-clkc.h | 10 + + .../reset/amlogic,meson-g12a-audio-reset.h | 15 + + include/linux/firmware/meson/meson_sm.h | 15 +- + 48 files changed, 2212 insertions(+), 414 deletions(-) + 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 +Merging aspeed/for-next (7671be39c4d9 ARM: dts: aspeed-g5: Add SGPIO description) +$ git merge aspeed/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/aspeed-ast2500-evb.dts | 2 + + arch/arm/boot/dts/aspeed-ast2600-evb.dts | 76 +- + .../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 | 572 +++++++++- + .../boot/dts/ast2500-facebook-netbmc-common.dtsi | 96 ++ + arch/arm/boot/dts/openbmc-flash-layout-128.dtsi | 32 + + include/dt-bindings/clock/aspeed-clock.h | 2 + + include/dt-bindings/clock/ast2600-clock.h | 4 + + 32 files changed, 3120 insertions(+), 176 deletions(-) + 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/openbmc-flash-layout-128.dtsi +Merging at91/at91-next (ba9b1009f561 Merge branches 'at91-drivers', 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next) +$ git merge at91/at91-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + Documentation/arm/microchip.rst | 4 +- + .../devicetree/bindings/arm/atmel-at91.yaml | 7 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm/boot/dts/Makefile | 1 + + 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/sama5d2.dtsi | 2 +- + arch/arm/configs/at91_dt_defconfig | 1 + + arch/arm/configs/sama5_defconfig | 1 + + drivers/memory/atmel-ebi.c | 11 +- + drivers/soc/atmel/Kconfig | 11 + + drivers/soc/atmel/Makefile | 1 + + drivers/soc/atmel/sfr.c | 99 +++++ + include/linux/mfd/syscon/atmel-matrix.h | 1 - + 15 files changed, 853 insertions(+), 10 deletions(-) + 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 drivers/soc/atmel/sfr.c +Merging bcm2835/for-next (f14234184671 Merge branch 'bcm2835-maintainers-next' into for-next) +$ git merge bcm2835/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (71918b15d58f Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 58 +- + .../devicetree/bindings/clock/imx7ulp-clock.txt | 1 - + arch/arm/boot/dts/Makefile | 4 +- + arch/arm/boot/dts/e60k02.dtsi | 306 +++++++++++ + 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/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/imx_v6_v7_defconfig | 4 +- + arch/arm/mach-imx/anatop.c | 20 +- + arch/arm/mach-imx/cpu.c | 38 +- + arch/arm/mach-imx/hotplug.c | 24 +- + arch/arm64/Kconfig.platforms | 5 + + 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/configs/defconfig | 6 +- + 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 | 152 ++---- + drivers/clk/imx/clk-imx8mq.c | 77 ++- + drivers/clk/imx/clk-pll14xx.c | 72 +-- + drivers/clk/imx/clk.h | 3 + + drivers/firmware/imx/imx-dsp.c | 2 +- + drivers/firmware/imx/imx-scu-irq.c | 1 + + drivers/firmware/imx/imx-scu.c | 24 +- + drivers/soc/imx/soc-imx-scu.c | 34 +- + drivers/soc/imx/soc-imx8.c | 49 +- + 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 +- + 120 files changed, 4604 insertions(+), 2370 deletions(-) + 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/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 +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 (0adbc8292201 Merge branch 'omap-for-v5.5/prm' into for-next) +$ git merge omap/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 ++ + arch/arm/boot/dts/am3517.dtsi | 6 ++++++ + 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/mach-omap1/ams-delta-fiq.c | 2 +- + 6 files changed, 40 insertions(+), 2 deletions(-) +Merging qcom/for-next (4d35d4201bc1 Merge branches 'arm64-for-5.5', 'arm64-defconfig-for-5.5', 'defconfig-for-5.5' 'drivers-for-5.5' and 'dts-for-5.5' into for-next) +$ git merge qcom/for-next +Removing drivers/soc/qcom/llcc-sdm845.c +Auto-merging arch/arm64/configs/defconfig +CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig +Removing Documentation/devicetree/bindings/arm/msm/qcom,llcc.txt +Recorded preimage for 'arch/arm64/configs/defconfig' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/arm64/configs/defconfig'. +[master eb2c43dbd403] Merge remote-tracking branch 'qcom/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/arm/msm/qcom,llcc.txt | 41 ------- + .../devicetree/bindings/arm/msm/qcom,llcc.yaml | 55 +++++++++ + .../devicetree/bindings/power/qcom,rpmpd.txt | 1 + + .../devicetree/bindings/soc/qcom/qcom,smd-rpm.txt | 1 + + 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/configs/qcom_defconfig | 1 + + 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.dtsi | 12 +- + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 14 +++ + arch/arm64/configs/defconfig | 14 +++ + 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 + + include/dt-bindings/power/qcom-rpmpd.h | 9 ++ + include/linux/soc/qcom/llcc-qcom.h | 94 ++++----------- + 34 files changed, 839 insertions(+), 326 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,llcc.txt + create mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,llcc.yaml + rename drivers/soc/qcom/{llcc-slice.c => llcc-qcom.c} (68%) + delete mode 100644 drivers/soc/qcom/llcc-sdm845.c +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 (c2ffa00ad615 reset: document (devm_)reset_control_get_optional variants) +$ git merge reset/reset/next +Already up to date. +Merging rockchip/for-next (9e86089c7f14 Merge branch 'v5.5-clk/next' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 10 + + .../devicetree/bindings/soc/rockchip/grf.txt | 17 +- + arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi | 1 + + arch/arm/boot/dts/rk3288-veyron-mickey.dts | 7 + + arch/arm64/boot/dts/rockchip/Makefile | 2 + + arch/arm64/boot/dts/rockchip/px30-evb.dts | 12 + + arch/arm64/boot/dts/rockchip/px30.dtsi | 74 +- + 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/rk3399-puma.dtsi | 5 + + arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts | 115 +- + drivers/clk/rockchip/clk-half-divider.c | 3 +- + 13 files changed, 2377 insertions(+), 26 deletions(-) + 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 +Merging samsung-krzk/for-next (a4276bb320c4 Merge branch 'next/drivers' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging drivers/opp/core.c +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.dtsi | 4 +- + arch/arm/boot/dts/exynos5250.dtsi | 4 +- + arch/arm/boot/dts/exynos54xx.dtsi | 4 +- + arch/arm/mach-exynos/Kconfig | 1 + + 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/plat-samsung/devs.c | 4 +- + arch/arm/plat-samsung/include/plat/usb-phy.h | 4 +- + drivers/opp/core.c | 69 ++++ + 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 ++ + include/linux/pm_opp.h | 13 + + 22 files changed, 912 insertions(+), 24 deletions(-) + 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 +Merging scmi/for-linux-next (a99d8080aaf3 Linux 5.4-rc6) +$ git merge scmi/for-linux-next +Already up to date. +Merging sunxi/sunxi/for-next (5da8253c3f5a Merge branches 'sunxi/clk-fixes-for-5.4', 'sunxi/config-for-5.5', 'sunxi/config64-for-5.5', 'sunxi/dt-for-5.5' and 'sunxi/fixes-for-5.4' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Merge made by the 'recursive' strategy. + drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 23 ++++++++++++++++------- + drivers/clk/sunxi-ng/ccu-sun9i-a80.c | 2 +- + drivers/clk/sunxi/clk-sunxi.c | 4 ++-- + 3 files changed, 19 insertions(+), 10 deletions(-) +Merging tegra/for-next (6c7c92944894 Merge branch for-5.5/cpufreq into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + drivers/clk/clk.c | 17 + + 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-id.h | 4 +- + drivers/clk/tegra/clk-periph.c | 18 + + drivers/clk/tegra/clk-pll-out.c | 9 + + drivers/clk/tegra/clk-pll.c | 86 +- + drivers/clk/tegra/clk-sdmmc-mux.c | 12 + + drivers/clk/tegra/clk-super.c | 35 + + 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/cpufreq/tegra124-cpufreq.c | 59 ++ + 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 +- + include/dt-bindings/clock/tegra210-car.h | 7 +- + include/linux/clk-provider.h | 1 + + include/linux/clk/tegra.h | 24 + + include/soc/tegra/mc.h | 2 +- + 36 files changed, 2469 insertions(+), 338 deletions(-) + create mode 100644 drivers/clk/tegra/clk-tegra20-emc.c + create mode 100644 drivers/memory/tegra/tegra30-emc.c +Merging clk/clk-next (8d3a12f3fb68 Merge branch 'clk-fixes' into clk-next) +$ git merge clk/clk-next +Auto-merging drivers/clk/imx/clk-imx8mn.c +CONFLICT (content): Merge conflict in drivers/clk/imx/clk-imx8mn.c +Auto-merging drivers/clk/imx/clk-imx8mm.c +Resolved 'drivers/clk/imx/clk-imx8mn.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4d402e60aa28] Merge remote-tracking branch 'clk/clk-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/clock/armada3700-periph-clock.txt | 5 +- + drivers/clk/at91/clk-main.c | 5 +- + drivers/clk/at91/sam9x60.c | 1 + + drivers/clk/at91/sckc.c | 20 ++- + 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-ast2600.c | 9 +- + drivers/clk/clk-bd718x7.c | 1 + + 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/imx/clk-imx8mm.c | 2 +- + drivers/clk/imx/clk-imx8mn.c | 16 +-- + 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/mvebu/armada-37xx-periph.c | 6 +- + drivers/clk/samsung/clk-exynos5420.c | 27 +++- + drivers/clk/samsung/clk-exynos5433.c | 14 +- + drivers/clk/samsung/clk-s3c2410-dclk.c | 4 +- + drivers/clk/sprd/common.c | 4 +- + drivers/clk/ti/clk-dra7-atl.c | 6 - + drivers/clk/ti/clkctrl.c | 5 +- + 31 files changed, 203 insertions(+), 198 deletions(-) +Merging clk-samsung/for-next (45f10dabb56b clk: samsung: exynos5420: Add SET_RATE_PARENT flag to clocks on G3D path) +$ git merge clk-samsung/for-next +Merge made by the 'recursive' strategy. + drivers/clk/samsung/clk-exynos5420.c | 34 ++++++++++++++++++++++++++-------- + 1 file changed, 26 insertions(+), 8 deletions(-) +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 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 (0d3d343560ba genirq: remove the is_affinity_mask_valid hook) +$ git merge ia64/next +Already up to date. +Merging m68k/for-next (7cf78b6b12fd m68k: q40: Fix info-leak in rtc_ioctl) +$ git merge m68k/for-next +Merge made by the 'recursive' strategy. + arch/m68k/q40/config.c | 1 + + drivers/nubus/nubus.c | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging m68knommu/for-next (dd13a0f1d3f8 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 +Merge made by the 'recursive' strategy. + arch/microblaze/Kconfig | 1 + + arch/microblaze/configs/mmu_defconfig | 3 +++ + arch/microblaze/include/asm/irq.h | 1 - + arch/microblaze/kernel/entry.S | 5 ----- + arch/microblaze/kernel/head.S | 2 +- + arch/microblaze/kernel/vmlinux.lds.S | 2 +- + 6 files changed, 6 insertions(+), 8 deletions(-) +Merging mips/mips-next (dece3c2a320b MIPS: Loongson: Fix return value of loongson_hwmon_init) +$ git merge mips/mips-next +Auto-merging arch/mips/sgi-ip27/ip27-memory.c +Auto-merging arch/mips/sgi-ip27/ip27-init.c +CONFLICT (content): Merge conflict in arch/mips/sgi-ip27/ip27-init.c +Removing arch/mips/loongson64/loongson-3/Makefile +Removing arch/mips/loongson64/common/serial.c +Removing arch/mips/include/asm/sgi/sgi.h +Removing arch/mips/fw/arc/tree.c +Removing arch/mips/fw/arc/time.c +Removing arch/mips/fw/arc/salone.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Recorded preimage for 'arch/mips/sgi-ip27/ip27-init.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/mips/sgi-ip27/ip27-init.c'. +[master 19fbc5da340b] Merge remote-tracking branch 'mips/mips-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/mips/ralink.txt | 14 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/driver-api/nvmem.rst | 2 + + MAINTAINERS | 10 +- + arch/mips/Kbuild.platforms | 2 + + arch/mips/Kconfig | 163 ++++-- + arch/mips/Kconfig.debug | 3 - + arch/mips/Makefile | 3 + + arch/mips/Makefile.postlink | 10 +- + arch/mips/boot/dts/ingenic/ci20.dts | 214 ++++++++ + arch/mips/boot/dts/ingenic/jz4780.dtsi | 86 ++++ + .../dts/ralink/gardena_smart_gateway_mt7688.dts | 197 +++++++ + arch/mips/boot/dts/ralink/mt7628a.dtsi | 16 + + arch/mips/cavium-octeon/setup.c | 2 +- + arch/mips/configs/fuloong2e_defconfig | 2 +- + arch/mips/configs/lemote2f_defconfig | 2 +- + arch/mips/configs/loongson3_defconfig | 2 - + arch/mips/fw/arc/Makefile | 6 +- + arch/mips/fw/arc/cmdline.c | 16 +- + arch/mips/fw/arc/env.c | 6 - + arch/mips/fw/arc/file.c | 49 -- + arch/mips/fw/arc/identify.c | 15 +- + arch/mips/fw/arc/init.c | 20 +- + arch/mips/fw/arc/memory.c | 9 + + arch/mips/fw/arc/misc.c | 59 --- + arch/mips/fw/arc/promlib.c | 25 +- + arch/mips/fw/arc/salone.c | 25 - + arch/mips/fw/arc/time.c | 25 - + arch/mips/fw/arc/tree.c | 127 ----- + arch/mips/generic/init.c | 6 +- + arch/mips/include/asm/atomic.h | 571 +++++++-------------- + arch/mips/include/asm/barrier.h | 228 ++------ + arch/mips/include/asm/bitops.h | 443 +++++----------- + arch/mips/include/asm/bootinfo.h | 4 +- + arch/mips/include/asm/bugs.h | 18 +- + arch/mips/include/asm/cmpxchg.h | 59 ++- + arch/mips/include/asm/cop2.h | 2 +- + arch/mips/include/asm/cpu-type.h | 9 +- + arch/mips/include/asm/cpu.h | 8 +- + arch/mips/include/asm/futex.h | 15 +- + arch/mips/include/asm/hazards.h | 4 +- + arch/mips/include/asm/io.h | 2 +- + arch/mips/include/asm/irqflags.h | 2 +- + arch/mips/include/asm/llsc.h | 19 +- + arch/mips/include/asm/mach-ip22/spaces.h | 12 +- + arch/mips/include/asm/mach-ip27/mmzone.h | 2 +- + arch/mips/include/asm/mach-ip27/topology.h | 5 +- + .../include/asm/mach-ip30/cpu-feature-overrides.h | 83 +++ + arch/mips/include/asm/mach-ip30/irq.h | 87 ++++ + .../mips/include/asm/mach-ip30/kernel-entry-init.h | 13 + + arch/mips/include/asm/mach-ip30/mangle-port.h | 22 + + arch/mips/include/asm/mach-ip30/spaces.h | 20 + + arch/mips/include/asm/mach-ip30/war.h | 26 + + .../asm/mach-loongson2ef/cpu-feature-overrides.h | 44 ++ + .../cs5536/cs5536.h | 0 + .../cs5536/cs5536_mfgpt.h | 0 + .../cs5536/cs5536_pci.h | 0 + .../cs5536/cs5536_vsm.h | 0 + arch/mips/include/asm/mach-loongson2ef/loongson.h | 328 ++++++++++++ + .../machine.h | 12 +- + .../include/asm/mach-loongson2ef/mc146818rtc.h | 36 ++ + .../{mach-loongson64 => mach-loongson2ef}/mem.h | 6 +- + arch/mips/include/asm/mach-loongson2ef/pci.h | 46 ++ + arch/mips/include/asm/mach-loongson2ef/spaces.h | 10 + + .../asm/mach-loongson64/cpu-feature-overrides.h | 3 - + arch/mips/include/asm/mach-loongson64/irq.h | 4 - + .../asm/mach-loongson64/kernel-entry-init.h | 32 +- + arch/mips/include/asm/mach-loongson64/loongson.h | 114 ---- + .../include/asm/mach-loongson64/loongson_regs.h | 227 ++++++++ + arch/mips/include/asm/mach-loongson64/mmzone.h | 29 +- + arch/mips/include/asm/mach-loongson64/pci.h | 31 -- + arch/mips/include/asm/mach-loongson64/topology.h | 4 +- + arch/mips/include/asm/module.h | 8 +- + arch/mips/include/asm/pci/bridge.h | 1 + + arch/mips/include/asm/processor.h | 2 +- + arch/mips/include/asm/r4kcache.h | 362 +------------ + arch/mips/include/asm/sgi/heart.h | 272 ++++++++++ + arch/mips/include/asm/sgi/sgi.h | 48 -- + arch/mips/include/asm/sgialib.h | 22 +- + arch/mips/include/asm/sgiarcs.h | 103 ++-- + arch/mips/include/asm/sn/agent.h | 2 +- + arch/mips/include/asm/sn/arch.h | 31 -- + arch/mips/include/asm/sn/gda.h | 4 +- + arch/mips/include/asm/sn/hub.h | 4 +- + arch/mips/include/asm/sn/ioc3.h | 9 + + arch/mips/include/asm/sn/mapped_kernel.h | 4 +- + arch/mips/include/asm/sn/sn0/arch.h | 18 +- + arch/mips/include/asm/sn/sn_private.h | 5 +- + arch/mips/include/asm/sn/types.h | 4 - + arch/mips/include/asm/string.h | 121 ----- + arch/mips/include/asm/sync.h | 207 ++++++++ + arch/mips/include/asm/unroll.h | 77 +++ + arch/mips/kernel/Makefile | 2 +- + arch/mips/kernel/cpu-probe.c | 30 +- + arch/mips/kernel/genex.S | 8 +- + arch/mips/kernel/idle.c | 5 +- + arch/mips/kernel/perf_event_mipsxx.c | 4 +- + arch/mips/kernel/pm-cps.c | 20 +- + arch/mips/kernel/{cpu-bugs64.c => r4k-bugs64.c} | 11 +- + arch/mips/kernel/setup.c | 137 +++-- + arch/mips/kernel/syscall.c | 3 +- + arch/mips/kernel/traps.c | 2 +- + arch/mips/lib/bitops.c | 57 +- + arch/mips/lib/csum_partial.S | 4 +- + arch/mips/loongson2ef/Kconfig | 93 ++++ + arch/mips/loongson2ef/Makefile | 18 + + arch/mips/loongson2ef/Platform | 32 ++ + .../{loongson64 => loongson2ef}/common/Makefile | 0 + .../common/bonito-irq.c | 0 + .../{loongson64 => loongson2ef}/common/cmdline.c | 0 + .../common/cs5536/Makefile | 0 + .../common/cs5536/cs5536_acc.c | 0 + .../common/cs5536/cs5536_ehci.c | 0 + .../common/cs5536/cs5536_ide.c | 0 + .../common/cs5536/cs5536_isa.c | 0 + .../common/cs5536/cs5536_mfgpt.c | 0 + .../common/cs5536/cs5536_ohci.c | 0 + .../common/cs5536/cs5536_pci.c | 0 + .../common/early_printk.c | 2 +- + arch/mips/loongson2ef/common/env.c | 71 +++ + .../mips/{loongson64 => loongson2ef}/common/init.c | 5 - + arch/mips/{loongson64 => loongson2ef}/common/irq.c | 0 + .../{loongson64 => loongson2ef}/common/machtype.c | 1 - + arch/mips/{loongson64 => loongson2ef}/common/mem.c | 37 -- + arch/mips/loongson2ef/common/pci.c | 89 ++++ + .../{loongson64 => loongson2ef}/common/platform.c | 0 + arch/mips/{loongson64 => loongson2ef}/common/pm.c | 9 +- + .../{loongson64 => loongson2ef}/common/reset.c | 21 - + arch/mips/{loongson64 => loongson2ef}/common/rtc.c | 0 + arch/mips/loongson2ef/common/serial.c | 86 ++++ + .../{loongson64 => loongson2ef}/common/setup.c | 21 - + .../mips/{loongson64 => loongson2ef}/common/time.c | 4 - + .../{loongson64 => loongson2ef}/common/uart_base.c | 17 +- + .../fuloong-2e/Makefile | 0 + .../{loongson64 => loongson2ef}/fuloong-2e/dma.c | 0 + .../{loongson64 => loongson2ef}/fuloong-2e/irq.c | 0 + .../{loongson64 => loongson2ef}/fuloong-2e/reset.c | 0 + .../{loongson64 => loongson2ef}/lemote-2f/Makefile | 0 + .../{loongson64 => loongson2ef}/lemote-2f/clock.c | 6 +- + .../{loongson64 => loongson2ef}/lemote-2f/dma.c | 0 + .../lemote-2f/ec_kb3310b.c | 0 + .../lemote-2f/ec_kb3310b.h | 0 + .../{loongson64 => loongson2ef}/lemote-2f/irq.c | 0 + .../lemote-2f/machtype.c | 0 + .../{loongson64 => loongson2ef}/lemote-2f/pm.c | 0 + .../{loongson64 => loongson2ef}/lemote-2f/reset.c | 2 +- + arch/mips/loongson64/Kconfig | 119 +---- + arch/mips/loongson64/Makefile | 29 +- + arch/mips/loongson64/Platform | 35 +- + arch/mips/loongson64/{loongson-3 => }/acpi_init.c | 0 + arch/mips/loongson64/cmdline.c | 42 ++ + arch/mips/loongson64/common/serial.c | 117 ----- + arch/mips/loongson64/{loongson-3 => }/cop2-ex.c | 0 + arch/mips/loongson64/{loongson-3 => }/dma.c | 0 + arch/mips/loongson64/{common => }/env.c | 62 +-- + arch/mips/loongson64/{loongson-3 => }/hpet.c | 0 + arch/mips/loongson64/init.c | 45 ++ + arch/mips/loongson64/{loongson-3 => }/irq.c | 8 +- + arch/mips/loongson64/loongson-3/Makefile | 11 - + arch/mips/loongson64/{loongson-3 => }/numa.c | 11 +- + arch/mips/loongson64/{common => }/pci.c | 5 +- + arch/mips/loongson64/{loongson-3 => }/platform.c | 0 + arch/mips/loongson64/pm.c | 104 ++++ + arch/mips/loongson64/reset.c | 64 +++ + arch/mips/loongson64/rtc.c | 39 ++ + arch/mips/loongson64/setup.c | 30 ++ + arch/mips/loongson64/{loongson-3 => }/smp.c | 160 ++++-- + arch/mips/loongson64/{loongson-3 => }/smp.h | 0 + arch/mips/loongson64/time.c | 29 ++ + arch/mips/mm/c-r4k.c | 47 +- + arch/mips/mm/page.c | 2 +- + arch/mips/mm/tlb-r4k.c | 4 +- + arch/mips/mm/tlbex.c | 6 +- + arch/mips/oprofile/Makefile | 4 +- + arch/mips/oprofile/common.c | 4 +- + arch/mips/pci/Makefile | 2 +- + arch/mips/pci/pci-ip27.c | 13 - + arch/mips/pci/pci-xtalk-bridge.c | 153 +++++- + arch/mips/power/cpu.c | 8 +- + arch/mips/sgi-ip22/ip22-mc.c | 74 +-- + arch/mips/sgi-ip27/ip27-common.h | 10 + + arch/mips/sgi-ip27/ip27-hubio.c | 10 +- + arch/mips/sgi-ip27/ip27-init.c | 53 +- + arch/mips/sgi-ip27/ip27-irq.c | 4 +- + arch/mips/sgi-ip27/ip27-klconfig.c | 14 +- + arch/mips/sgi-ip27/ip27-klnuma.c | 21 +- + arch/mips/sgi-ip27/ip27-memory.c | 73 +-- + arch/mips/sgi-ip27/ip27-nmi.c | 16 +- + arch/mips/sgi-ip27/ip27-reset.c | 8 +- + arch/mips/sgi-ip27/ip27-smp.c | 82 +-- + arch/mips/sgi-ip27/ip27-timer.c | 6 +- + arch/mips/sgi-ip27/ip27-xtalk.c | 48 +- + arch/mips/sgi-ip30/Makefile | 9 + + arch/mips/sgi-ip30/Platform | 8 + + arch/mips/sgi-ip30/ip30-common.h | 9 + + arch/mips/sgi-ip30/ip30-console.c | 23 + + arch/mips/sgi-ip30/ip30-irq.c | 328 ++++++++++++ + arch/mips/sgi-ip30/ip30-power.c | 41 ++ + arch/mips/sgi-ip30/ip30-setup.c | 138 +++++ + arch/mips/sgi-ip30/ip30-smp.c | 149 ++++++ + arch/mips/sgi-ip30/ip30-timer.c | 63 +++ + arch/mips/sgi-ip30/ip30-xtalk.c | 152 ++++++ + arch/mips/tools/.gitignore | 1 + + arch/mips/tools/Makefile | 5 + + arch/mips/tools/loongson3-llsc-check.c | 307 +++++++++++ + drivers/cpufreq/loongson2_cpufreq.c | 2 +- + drivers/gpio/Kconfig | 2 +- + drivers/gpio/gpio-loongson.c | 2 +- + drivers/nvmem/core.c | 61 +-- + drivers/platform/mips/Kconfig | 4 +- + drivers/platform/mips/cpu_hwmon.c | 17 +- + include/drm/drm_cache.h | 2 +- + include/linux/nvmem-consumer.h | 9 + + 213 files changed, 5485 insertions(+), 3218 deletions(-) + create mode 100644 arch/mips/boot/dts/ralink/gardena_smart_gateway_mt7688.dts + delete mode 100644 arch/mips/fw/arc/salone.c + delete mode 100644 arch/mips/fw/arc/time.c + delete mode 100644 arch/mips/fw/arc/tree.c + create mode 100644 arch/mips/include/asm/mach-ip30/cpu-feature-overrides.h + create mode 100644 arch/mips/include/asm/mach-ip30/irq.h + create mode 100644 arch/mips/include/asm/mach-ip30/kernel-entry-init.h + create mode 100644 arch/mips/include/asm/mach-ip30/mangle-port.h + create mode 100644 arch/mips/include/asm/mach-ip30/spaces.h + create mode 100644 arch/mips/include/asm/mach-ip30/war.h + create mode 100644 arch/mips/include/asm/mach-loongson2ef/cpu-feature-overrides.h + rename arch/mips/include/asm/{mach-loongson64 => mach-loongson2ef}/cs5536/cs5536.h (100%) + rename arch/mips/include/asm/{mach-loongson64 => mach-loongson2ef}/cs5536/cs5536_mfgpt.h (100%) + rename arch/mips/include/asm/{mach-loongson64 => mach-loongson2ef}/cs5536/cs5536_pci.h (100%) + rename arch/mips/include/asm/{mach-loongson64 => mach-loongson2ef}/cs5536/cs5536_vsm.h (100%) + create mode 100644 arch/mips/include/asm/mach-loongson2ef/loongson.h + rename arch/mips/include/asm/{mach-loongson64 => mach-loongson2ef}/machine.h (60%) + create mode 100644 arch/mips/include/asm/mach-loongson2ef/mc146818rtc.h + rename arch/mips/include/asm/{mach-loongson64 => mach-loongson2ef}/mem.h (86%) + create mode 100644 arch/mips/include/asm/mach-loongson2ef/pci.h + create mode 100644 arch/mips/include/asm/mach-loongson2ef/spaces.h + create mode 100644 arch/mips/include/asm/mach-loongson64/loongson_regs.h + create mode 100644 arch/mips/include/asm/sgi/heart.h + delete mode 100644 arch/mips/include/asm/sgi/sgi.h + create mode 100644 arch/mips/include/asm/sync.h + create mode 100644 arch/mips/include/asm/unroll.h + rename arch/mips/kernel/{cpu-bugs64.c => r4k-bugs64.c} (97%) + create mode 100644 arch/mips/loongson2ef/Kconfig + create mode 100644 arch/mips/loongson2ef/Makefile + create mode 100644 arch/mips/loongson2ef/Platform + rename arch/mips/{loongson64 => loongson2ef}/common/Makefile (100%) + rename arch/mips/{loongson64 => loongson2ef}/common/bonito-irq.c (100%) + rename arch/mips/{loongson64 => loongson2ef}/common/cmdline.c (100%) + rename arch/mips/{loongson64 => loongson2ef}/common/cs5536/Makefile (100%) + rename arch/mips/{loongson64 => loongson2ef}/common/cs5536/cs5536_acc.c (100%) + rename arch/mips/{loongson64 => loongson2ef}/common/cs5536/cs5536_ehci.c (100%) + rename arch/mips/{loongson64 => loongson2ef}/common/cs5536/cs5536_ide.c (100%) + rename arch/mips/{loongson64 => loongson2ef}/common/cs5536/cs5536_isa.c (100%) + rename arch/mips/{loongson64 => loongson2ef}/common/cs5536/cs5536_mfgpt.c (100%) + rename arch/mips/{loongson64 => loongson2ef}/common/cs5536/cs5536_ohci.c (100%) + rename arch/mips/{loongson64 => loongson2ef}/common/cs5536/cs5536_pci.c (100%) + rename arch/mips/{loongson64 => loongson2ef}/common/early_printk.c (93%) + create mode 100644 arch/mips/loongson2ef/common/env.c + rename arch/mips/{loongson64 => loongson2ef}/common/init.c (95%) + rename arch/mips/{loongson64 => loongson2ef}/common/irq.c (100%) + rename arch/mips/{loongson64 => loongson2ef}/common/machtype.c (96%) + rename arch/mips/{loongson64 => loongson2ef}/common/mem.c (75%) + create mode 100644 arch/mips/loongson2ef/common/pci.c + rename arch/mips/{loongson64 => loongson2ef}/common/platform.c (100%) + rename arch/mips/{loongson64 => loongson2ef}/common/pm.c (93%) + rename arch/mips/{loongson64 => loongson2ef}/common/reset.c (79%) + rename arch/mips/{loongson64 => loongson2ef}/common/rtc.c (100%) + create mode 100644 arch/mips/loongson2ef/common/serial.c + rename arch/mips/{loongson64 => loongson2ef}/common/setup.c (57%) + rename arch/mips/{loongson64 => loongson2ef}/common/time.c (91%) + rename arch/mips/{loongson64 => loongson2ef}/common/uart_base.c (56%) + rename arch/mips/{loongson64 => loongson2ef}/fuloong-2e/Makefile (100%) + rename arch/mips/{loongson64 => loongson2ef}/fuloong-2e/dma.c (100%) + rename arch/mips/{loongson64 => loongson2ef}/fuloong-2e/irq.c (100%) + rename arch/mips/{loongson64 => loongson2ef}/fuloong-2e/reset.c (100%) + rename arch/mips/{loongson64 => loongson2ef}/lemote-2f/Makefile (100%) + rename arch/mips/{loongson64 => loongson2ef}/lemote-2f/clock.c (96%) + rename arch/mips/{loongson64 => loongson2ef}/lemote-2f/dma.c (100%) + rename arch/mips/{loongson64 => loongson2ef}/lemote-2f/ec_kb3310b.c (100%) + rename arch/mips/{loongson64 => loongson2ef}/lemote-2f/ec_kb3310b.h (100%) + rename arch/mips/{loongson64 => loongson2ef}/lemote-2f/irq.c (100%) + rename arch/mips/{loongson64 => loongson2ef}/lemote-2f/machtype.c (100%) + rename arch/mips/{loongson64 => loongson2ef}/lemote-2f/pm.c (100%) + rename arch/mips/{loongson64 => loongson2ef}/lemote-2f/reset.c (98%) + rename arch/mips/loongson64/{loongson-3 => }/acpi_init.c (100%) + create mode 100644 arch/mips/loongson64/cmdline.c + delete mode 100644 arch/mips/loongson64/common/serial.c + rename arch/mips/loongson64/{loongson-3 => }/cop2-ex.c (100%) + rename arch/mips/loongson64/{loongson-3 => }/dma.c (100%) + rename arch/mips/loongson64/{common => }/env.c (79%) + rename arch/mips/loongson64/{loongson-3 => }/hpet.c (100%) + create mode 100644 arch/mips/loongson64/init.c + rename arch/mips/loongson64/{loongson-3 => }/irq.c (96%) + delete mode 100644 arch/mips/loongson64/loongson-3/Makefile + rename arch/mips/loongson64/{loongson-3 => }/numa.c (96%) + rename arch/mips/loongson64/{common => }/pci.c (97%) + rename arch/mips/loongson64/{loongson-3 => }/platform.c (100%) + create mode 100644 arch/mips/loongson64/pm.c + create mode 100644 arch/mips/loongson64/reset.c + create mode 100644 arch/mips/loongson64/rtc.c + create mode 100644 arch/mips/loongson64/setup.c + rename arch/mips/loongson64/{loongson-3 => }/smp.c (92%) + rename arch/mips/loongson64/{loongson-3 => }/smp.h (100%) + create mode 100644 arch/mips/loongson64/time.c + create mode 100644 arch/mips/sgi-ip27/ip27-common.h + create mode 100644 arch/mips/sgi-ip30/Makefile + create mode 100644 arch/mips/sgi-ip30/Platform + create mode 100644 arch/mips/sgi-ip30/ip30-common.h + create mode 100644 arch/mips/sgi-ip30/ip30-console.c + create mode 100644 arch/mips/sgi-ip30/ip30-irq.c + create mode 100644 arch/mips/sgi-ip30/ip30-power.c + create mode 100644 arch/mips/sgi-ip30/ip30-setup.c + create mode 100644 arch/mips/sgi-ip30/ip30-smp.c + create mode 100644 arch/mips/sgi-ip30/ip30-timer.c + create mode 100644 arch/mips/sgi-ip30/ip30-xtalk.c + create mode 100644 arch/mips/tools/loongson3-llsc-check.c +Merging nds32/next (932296120543 nds32: add new emulations for floating point instruction) +$ 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 (f3b17320db25 openrisc: map as uncached in ioremap) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (e9c837c6ab07 parisc: Avoid spurious inequivalent alias kernel error messages) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/include/asm/checksum.h | 101 +++++++++++++++++++------------------ + arch/parisc/kernel/cache.c | 2 +- + kernel/kexec_file.c | 4 +- + 3 files changed, 55 insertions(+), 52 deletions(-) +Merging powerpc/next (d78d5dace539 powerpc/book3s64/hash: Use secondary hash for bolted mapping if the primary is full) +$ git merge powerpc/next +Auto-merging security/lockdown/lockdown.c +Auto-merging include/linux/security.h +Merge made by the 'recursive' strategy. + arch/powerpc/Makefile | 12 +-- + ...corenet_basic_defconfig => corenet_base.config} | 0 + arch/powerpc/configs/debug.config | 1 + + ...mpc85xx_basic_defconfig => mpc85xx_base.config} | 0 + ...mpc86xx_basic_defconfig => mpc86xx_base.config} | 0 + arch/powerpc/configs/skiroot_defconfig | 1 + + arch/powerpc/kernel/Makefile | 5 +- + arch/powerpc/kernel/setup_64.c | 26 ++--- + arch/powerpc/kernel/time.c | 2 +- + arch/powerpc/kernel/udbg.c | 14 +-- + arch/powerpc/mm/book3s64/hash_native.c | 38 +++++-- + arch/powerpc/mm/book3s64/hash_utils.c | 18 ++++ + arch/powerpc/mm/book3s64/pkeys.c | 10 -- + arch/powerpc/mm/init_64.c | 54 +++++++--- + arch/powerpc/platforms/powernv/opal.c | 86 ++++++++++++++- + arch/powerpc/platforms/pseries/lpar.c | 16 ++- + arch/powerpc/platforms/pseries/papr_scm.c | 4 +- + arch/powerpc/xmon/xmon.c | 119 ++++++++++++++++----- + include/linux/security.h | 2 + + security/lockdown/lockdown.c | 2 + + tools/testing/selftests/powerpc/signal/sigfuz.c | 2 +- + 21 files changed, 306 insertions(+), 106 deletions(-) + rename arch/powerpc/configs/{corenet_basic_defconfig => corenet_base.config} (100%) + create mode 100644 arch/powerpc/configs/debug.config + rename arch/powerpc/configs/{mpc85xx_basic_defconfig => mpc85xx_base.config} (100%) + rename arch/powerpc/configs/{mpc86xx_basic_defconfig => mpc86xx_base.config} (100%) +Merging fsl/next (8a35879a60be powerpc/fsl_booke/32: Document KASLR implementation) +$ git merge fsl/next +Auto-merging arch/powerpc/mm/init_64.c +Auto-merging arch/powerpc/include/asm/page.h +Merge made by the 'recursive' strategy. + Documentation/powerpc/kaslr-booke32.rst | 42 +++ + arch/powerpc/Kconfig | 11 + + arch/powerpc/include/asm/nohash/mmu-book3e.h | 11 +- + arch/powerpc/include/asm/page.h | 7 + + arch/powerpc/kernel/early_32.c | 5 +- + arch/powerpc/kernel/exceptions-64e.S | 12 +- + arch/powerpc/kernel/fsl_booke_entry_mapping.S | 25 +- + arch/powerpc/kernel/head_fsl_booke.S | 61 +++- + arch/powerpc/kernel/machine_kexec.c | 1 + + arch/powerpc/kernel/misc_64.S | 7 +- + arch/powerpc/kernel/setup-common.c | 20 ++ + arch/powerpc/mm/init-common.c | 7 + + arch/powerpc/mm/init_32.c | 5 - + arch/powerpc/mm/init_64.c | 5 - + arch/powerpc/mm/mmu_decl.h | 11 + + arch/powerpc/mm/nohash/Makefile | 1 + + arch/powerpc/mm/nohash/fsl_booke.c | 8 +- + arch/powerpc/mm/nohash/kaslr_booke.c | 401 ++++++++++++++++++++++++++ + 18 files changed, 587 insertions(+), 53 deletions(-) + create mode 100644 Documentation/powerpc/kaslr-booke32.rst + create mode 100644 arch/powerpc/mm/nohash/kaslr_booke.c +Merging soc-fsl/next (36f6cf9dc2f5 soc: fsl: add RCPM driver) +$ git merge soc-fsl/next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/soc/fsl/rcpm.txt | 14 +- + drivers/base/power/wakeup.c | 54 ++++++++ + drivers/soc/fsl/Kconfig | 10 ++ + drivers/soc/fsl/Makefile | 1 + + drivers/soc/fsl/rcpm.c | 151 +++++++++++++++++++++ + include/linux/pm_wakeup.h | 9 ++ + 6 files changed, 235 insertions(+), 4 deletions(-) + create mode 100644 drivers/soc/fsl/rcpm.c +Merging risc-v/for-next (a4531f3dba5f Merge branch 'next/tlb-opt' into dev/riscv/for-v5.5-rc1) +$ git merge risc-v/for-next +Merge made by the 'recursive' strategy. + arch/riscv/Kconfig | 14 +++++++++ + arch/riscv/include/asm/seccomp.h | 10 ++++++ + arch/riscv/include/asm/thread_info.h | 5 ++- + arch/riscv/kernel/cpu.c | 45 ++------------------------- + arch/riscv/kernel/entry.S | 27 ++++++++++++++-- + arch/riscv/kernel/ptrace.c | 10 ++++++ + arch/riscv/mm/tlbflush.c | 25 +++++++++++++-- + tools/testing/selftests/seccomp/seccomp_bpf.c | 8 ++++- + 8 files changed, 96 insertions(+), 48 deletions(-) + create mode 100644 arch/riscv/include/asm/seccomp.h +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 (effb83ccc83a s390: add error handling to perf_callchain_kernel) +$ git merge s390/features +Auto-merging arch/s390/boot/startup.c +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 28 ++++++++--- + arch/s390/boot/startup.c | 2 +- + arch/s390/include/asm/alternative.h | 4 +- + arch/s390/include/asm/bug.h | 4 +- + arch/s390/include/asm/pgalloc.h | 16 +++++- + arch/s390/include/asm/pgtable.h | 97 ++++++++++++------------------------- + arch/s390/include/asm/processor.h | 2 +- + arch/s390/include/asm/qdio.h | 1 + + arch/s390/include/asm/spinlock.h | 2 +- + arch/s390/include/asm/stacktrace.h | 2 +- + arch/s390/include/asm/timex.h | 17 ++++--- + arch/s390/kernel/early.c | 17 +------ + arch/s390/kernel/perf_event.c | 8 ++- + arch/s390/kernel/process.c | 36 ++++++-------- + arch/s390/kernel/time.c | 9 ---- + arch/s390/lib/spinlock.c | 4 +- + drivers/s390/cio/qdio.h | 26 +++++----- + drivers/s390/cio/qdio_main.c | 26 +++++----- + drivers/s390/cio/qdio_setup.c | 2 - + drivers/s390/cio/qdio_thinint.c | 41 ++++++---------- + drivers/s390/net/qeth_l3.h | 2 - + drivers/s390/net/qeth_l3_sys.c | 2 +- + 22 files changed, 147 insertions(+), 201 deletions(-) +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 658005d119a9] 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 (73625ed66389 um: irq: Fix LAST_IRQ usage in init_IRQ()) +$ git merge uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (c61b02fb6c43 Merge branch 'xtensa-5.5-asm-memopt' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Removing arch/xtensa/include/asm/user.h +Removing arch/xtensa/include/asm/hw_irq.h +Merge made by the 'recursive' strategy. + .../features/core/tracehook/arch-support.txt | 2 +- + arch/xtensa/Kconfig | 396 ++++++++++++--------- + arch/xtensa/Makefile | 3 +- + arch/xtensa/boot/Makefile | 5 + + arch/xtensa/configs/xip_kc705_defconfig | 120 +++++++ + 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/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/uaccess.h | 16 +- + arch/xtensa/include/asm/user.h | 20 -- + arch/xtensa/include/asm/vectors.h | 44 +-- + arch/xtensa/kernel/head.S | 13 +- + arch/xtensa/kernel/setup.c | 7 + + arch/xtensa/kernel/vmlinux.lds.S | 58 ++- + arch/xtensa/mm/init.c | 4 +- + 22 files changed, 682 insertions(+), 599 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 (065ab4c4701f docs: ioctl-number: document fscrypt ioctl numbers) +$ git merge fscrypt/master +Merge made by the 'recursive' strategy. + Documentation/filesystems/fscrypt.rst | 5 +- + Documentation/ioctl/ioctl-number.rst | 1 + + fs/crypto/bio.c | 29 +-------- + fs/crypto/crypto.c | 114 +++------------------------------- + fs/crypto/fscrypt_private.h | 9 --- + fs/crypto/keysetup.c | 111 ++++----------------------------- + fs/crypto/keysetup_v1.c | 4 -- + include/linux/fscrypt.h | 32 ---------- + 8 files changed, 26 insertions(+), 279 deletions(-) +Merging afs/afs-next (a0753c29004f afs: Support RCU pathwalk) +$ git merge afs/afs-next +Already up to date. +Merging btrfs/for-next (6eb305c9273a Merge branch 'for-next-next-v5.4-20191104' into for-next-20191104) +$ git merge btrfs/for-next +Merge made by the 'recursive' strategy. + fs/btrfs/Kconfig | 2 + + fs/btrfs/async-thread.c | 113 ++++---- + fs/btrfs/async-thread.h | 37 +-- + fs/btrfs/block-group.c | 418 +++++++++++++++-------------- + fs/btrfs/block-group.h | 5 +- + fs/btrfs/btrfs_inode.h | 3 - + fs/btrfs/compression.c | 269 ++++++++++++++----- + fs/btrfs/compression.h | 46 +--- + fs/btrfs/ctree.c | 355 +++++++++++++----------- + fs/btrfs/ctree.h | 37 +-- + fs/btrfs/delalloc-space.c | 21 +- + fs/btrfs/delayed-inode.c | 18 +- + fs/btrfs/dev-replace.c | 2 +- + fs/btrfs/dev-replace.h | 2 +- + fs/btrfs/disk-io.c | 365 ++++++++++++------------- + fs/btrfs/disk-io.h | 4 +- + fs/btrfs/export.c | 4 +- + fs/btrfs/extent-io-tree.h | 248 +++++++++++++++++ + fs/btrfs/extent-tree.c | 243 ++++++++++++++--- + fs/btrfs/extent_io.c | 192 +++++++------ + fs/btrfs/extent_io.h | 231 +--------------- + fs/btrfs/extent_map.c | 6 +- + fs/btrfs/extent_map.h | 11 +- + fs/btrfs/file-item.c | 1 - + fs/btrfs/file.c | 74 +++-- + fs/btrfs/free-space-cache.c | 47 ++-- + fs/btrfs/free-space-tree.c | 83 +++--- + fs/btrfs/inode.c | 178 ++++++++----- + fs/btrfs/ioctl.c | 53 ++-- + fs/btrfs/locking.c | 312 ++++++++++++++++++---- + fs/btrfs/locking.h | 13 +- + fs/btrfs/lzo.c | 53 +--- + fs/btrfs/misc.h | 11 + + fs/btrfs/ordered-data.c | 1 - + fs/btrfs/print-tree.c | 6 +- + fs/btrfs/props.c | 6 +- + fs/btrfs/qgroup.c | 9 +- + fs/btrfs/raid56.c | 101 ++++--- + fs/btrfs/reada.c | 17 +- + fs/btrfs/relocation.c | 28 +- + fs/btrfs/scrub.c | 33 ++- + fs/btrfs/send.c | 45 +++- + fs/btrfs/space-info.c | 6 +- + fs/btrfs/space-info.h | 3 +- + fs/btrfs/super.c | 26 +- + fs/btrfs/sysfs.c | 53 +++- + fs/btrfs/tests/btrfs-tests.c | 5 +- + fs/btrfs/tests/free-space-tree-tests.c | 75 +++--- + fs/btrfs/transaction.c | 92 ++++++- + fs/btrfs/transaction.h | 5 +- + fs/btrfs/tree-checker.c | 211 +++++++++++---- + fs/btrfs/tree-log.c | 136 ++++------ + fs/btrfs/volumes.c | 474 +++++++++------------------------ + fs/btrfs/volumes.h | 20 +- + fs/btrfs/zlib.c | 52 +--- + fs/btrfs/zstd.c | 47 ++-- + include/trace/events/btrfs.h | 107 ++++---- + include/uapi/linux/btrfs.h | 5 +- + include/uapi/linux/btrfs_tree.h | 23 +- + 59 files changed, 2727 insertions(+), 2316 deletions(-) + create mode 100644 fs/btrfs/extent-io-tree.h +Merging ceph/master (1f08529c84cf ceph: add missing check in d_revalidate snapdir handling) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + fs/ceph/caps.c | 10 +++++----- + fs/ceph/dir.c | 15 ++++++++------- + fs/ceph/inode.c | 1 + + 3 files changed, 14 insertions(+), 12 deletions(-) +Merging cifs/for-next (404e73aaeaa0 cifs: move cifsFileInfo_put logic into a work-queue) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifs_debug.c | 5 ++ + fs/cifs/cifs_spnego.c | 2 +- + fs/cifs/cifsacl.c | 2 - + fs/cifs/cifsfs.c | 44 +++++++--- + fs/cifs/cifsfs.h | 3 +- + fs/cifs/cifsglob.h | 50 ++++++++++- + fs/cifs/cifsproto.h | 8 ++ + fs/cifs/connect.c | 92 ++++++++++++++++---- + fs/cifs/file.c | 142 ++++++++++++++++++++++++------- + fs/cifs/sess.c | 218 +++++++++++++++++++++++++++++++++++++++++++++++- + fs/cifs/smb2misc.c | 44 ++++++---- + fs/cifs/smb2ops.c | 31 +++++-- + fs/cifs/smb2pdu.c | 109 ++++++++++++++---------- + fs/cifs/smb2proto.h | 3 +- + fs/cifs/smb2transport.c | 165 +++++++++++++++++++++++++++--------- + fs/cifs/smbdirect.c | 36 ++++---- + fs/cifs/transport.c | 27 ++++-- + 17 files changed, 784 insertions(+), 197 deletions(-) +Merging configfs/for-next (e9c03af21cc7 configfs: calculate the symlink target only once) +$ 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 (0602fc8bb4f2 erofs: support superblock checksum) +$ git merge erofs/dev +Merge made by the 'recursive' strategy. + fs/erofs/Kconfig | 1 + + fs/erofs/erofs_fs.h | 3 +- + fs/erofs/internal.h | 1 + + fs/erofs/super.c | 36 ++++++++- + fs/erofs/utils.c | 13 ++- + fs/erofs/zdata.c | 226 +++++++++++++++++++++------------------------------- + fs/erofs/zdata.h | 8 +- + 7 files changed, 139 insertions(+), 149 deletions(-) +Merging ext3/for_next (7f494a73ee5a Pull MAINTAINERS file update.) +$ git merge ext3/for_next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + fs/ext2/balloc.c | 9 ++++++++- + fs/ext2/ioctl.c | 5 ++++- + fs/notify/fdinfo.c | 2 +- + fs/notify/fsnotify.c | 2 -- + fs/notify/fsnotify.h | 2 ++ + fs/quota/dquot.c | 8 +------- + fs/quota/quota.c | 7 +++---- + fs/quota/quota_v1.c | 1 - + fs/reiserfs/inode.c | 12 ++++++++++-- + fs/reiserfs/namei.c | 7 +++++-- + fs/reiserfs/reiserfs.h | 2 ++ + fs/reiserfs/super.c | 2 ++ + fs/reiserfs/xattr.c | 19 ++++++++++++------- + fs/reiserfs/xattr_acl.c | 4 +--- + 15 files changed, 52 insertions(+), 31 deletions(-) +Merging ext4/dev (0d0a60c92fed Merge branch 'rh/dioread-nolock-1k' into dev) +$ git merge ext4/dev +Merge made by the 'recursive' strategy. + fs/ext4/ext4.h | 13 +++- + fs/ext4/extents.c | 49 ++++++++++----- + fs/ext4/inode.c | 136 ++++++++++++++++++++++++++-------------- + fs/ext4/page-io.c | 110 ++++++++++++++++++++++----------- + fs/ext4/super.c | 10 --- + fs/jbd2/commit.c | 13 ++-- + fs/jbd2/journal.c | 30 ++++++--- + fs/jbd2/transaction.c | 144 ++++++++++++++++++++----------------------- + fs/ocfs2/suballoc.c | 19 +++--- + include/linux/jbd2.h | 27 +------- + include/linux/journal-head.h | 21 ++++--- + 11 files changed, 332 insertions(+), 240 deletions(-) +Merging f2fs/dev (a5f7bc69e7e7 f2fs: support aligned pinned file) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + Documentation/filesystems/f2fs.txt | 2 +- + fs/f2fs/data.c | 179 ++++++++++++++++++++++++++++++------- + fs/f2fs/f2fs.h | 38 ++++++-- + fs/f2fs/file.c | 39 ++++++-- + fs/f2fs/gc.c | 34 ++++++- + fs/f2fs/inode.c | 6 +- + fs/f2fs/recovery.c | 2 +- + fs/f2fs/segment.c | 24 ++++- + fs/f2fs/segment.h | 2 + + fs/f2fs/super.c | 30 ++++++- + fs/f2fs/sysfs.c | 2 + + fs/f2fs/xattr.c | 14 ++- + 12 files changed, 315 insertions(+), 57 deletions(-) +Merging fsverity/fsverity (95ae251fe828 f2fs: add fs-verity support) +$ git merge fsverity/fsverity +Already up to date. +Merging fuse/for-next (091d1a726772 fuse: redundant get_fuse_inode() calls in fuse_writepages_fill()) +$ git merge fuse/for-next +Already up to date. +Merging jfs/jfs-next (a5fdd713d256 jfs: fix bogus variable self-initialization) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (a99d8080aaf3 Linux 5.4-rc6) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (79cc55422ce9 NFS: Fix an RCU lock leak in nfs4_refresh_delegation_stateid()) +$ git merge nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (5fcaf6982d11 sunrpc: fix crash when cache_head become valid before update) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/nfsd/nfs4recover.c | 11 +++-------- + fs/nfsd/nfs4state.c | 19 ++++++++++++------- + fs/nfsd/nfs4xdr.c | 2 -- + include/trace/events/rpcrdma.h | 30 +++++++++++++++++++++++------- + net/sunrpc/cache.c | 6 ------ + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 8 ++++++-- + 6 files changed, 44 insertions(+), 32 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 (6a379f67454a jffs2: Fix memory leak in jffs2_scan_eraseblock() error path) +$ git merge ubifs/linux-next +Already up to date. +Merging v9fs/9p-next (aafee43b7286 9p/vfs_super.c: Remove unused parameter data in v9fs_fill_super) +$ git merge v9fs/9p-next +Already up to date. +Merging xfs/for-next (c34d570d1586 xfs: cleanup use of the XFS_ALLOC_ flags) +$ git merge xfs/for-next +Auto-merging fs/ext4/inode.c +Auto-merging fs/dax.c +Merge made by the 'recursive' strategy. + fs/compat_ioctl.c | 31 +- + fs/dax.c | 13 +- + fs/ext2/inode.c | 2 +- + fs/ext4/inode.c | 2 +- + fs/gfs2/bmap.c | 3 +- + fs/gfs2/file.c | 6 +- + fs/ioctl.c | 12 +- + fs/iomap/Makefile | 16 +- + fs/iomap/apply.c | 25 +- + fs/iomap/buffered-io.c | 749 ++++++++++++++++++++++++++++---- + fs/iomap/direct-io.c | 9 +- + fs/iomap/fiemap.c | 4 +- + fs/iomap/seek.c | 4 +- + fs/iomap/swapfile.c | 3 +- + fs/iomap/trace.c | 12 + + fs/iomap/trace.h | 88 ++++ + fs/xfs/libxfs/xfs_alloc.c | 915 +++++++++++++++++++++++----------------- + fs/xfs/libxfs/xfs_alloc.h | 16 +- + fs/xfs/libxfs/xfs_alloc_btree.c | 1 + + fs/xfs/libxfs/xfs_attr_leaf.c | 85 +++- + fs/xfs/libxfs/xfs_attr_leaf.h | 4 +- + fs/xfs/libxfs/xfs_bmap.c | 326 +++++++------- + fs/xfs/libxfs/xfs_bmap.h | 3 +- + fs/xfs/libxfs/xfs_btree.c | 10 +- + fs/xfs/libxfs/xfs_btree.h | 12 +- + fs/xfs/libxfs/xfs_dir2_sf.c | 2 +- + fs/xfs/libxfs/xfs_iext_tree.c | 2 +- + fs/xfs/libxfs/xfs_inode_fork.c | 8 +- + fs/xfs/libxfs/xfs_inode_fork.h | 14 +- + fs/xfs/scrub/bitmap.c | 3 +- + fs/xfs/xfs_aops.c | 791 ++++++---------------------------- + fs/xfs/xfs_aops.h | 20 - + fs/xfs/xfs_attr_inactive.c | 6 +- + fs/xfs/xfs_attr_list.c | 60 ++- + fs/xfs/xfs_bmap_util.c | 247 ++--------- + fs/xfs/xfs_bmap_util.h | 4 - + fs/xfs/xfs_buf.c | 17 +- + fs/xfs/xfs_buf.h | 1 - + fs/xfs/xfs_dir2_readdir.c | 27 +- + fs/xfs/xfs_dquot.c | 6 +- + fs/xfs/xfs_extent_busy.c | 2 +- + fs/xfs/xfs_file.c | 111 +++-- + fs/xfs/xfs_filestream.c | 2 +- + fs/xfs/xfs_inode.c | 7 +- + fs/xfs/xfs_inode.h | 7 + + fs/xfs/xfs_ioctl.c | 100 +---- + fs/xfs/xfs_ioctl.h | 1 - + fs/xfs/xfs_ioctl32.c | 9 +- + fs/xfs/xfs_iomap.c | 858 ++++++++++++++++++------------------- + fs/xfs/xfs_iomap.h | 13 +- + fs/xfs/xfs_iops.c | 55 ++- + fs/xfs/xfs_log.c | 428 ++++++++----------- + fs/xfs/xfs_log_cil.c | 2 +- + fs/xfs/xfs_log_priv.h | 25 +- + fs/xfs/xfs_mount.c | 46 +- + fs/xfs/xfs_mount.h | 48 +-- + fs/xfs/xfs_pnfs.c | 56 ++- + fs/xfs/xfs_quotaops.c | 3 + + fs/xfs/xfs_reflink.c | 138 +----- + fs/xfs/xfs_reflink.h | 4 +- + fs/xfs/xfs_rtalloc.c | 3 +- + fs/xfs/xfs_super.c | 118 ++---- + fs/xfs/xfs_super.h | 10 + + fs/xfs/xfs_trace.h | 100 ++--- + include/linux/falloc.h | 3 + + include/linux/fs.h | 2 +- + include/linux/iomap.h | 129 ++++-- + 67 files changed, 2885 insertions(+), 2954 deletions(-) + create mode 100644 fs/iomap/trace.c + create mode 100644 fs/iomap/trace.h +Merging iomap/iomap-for-next (a90100421499 fs/iomap: remove redundant check in iomap_dio_rw()) +$ git merge iomap/iomap-for-next +Merge made by the 'recursive' strategy. + fs/iomap/direct-io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging djw-vfs/vfs-for-next (7118dd2d41af splice: only read in as much information as there is pipe buffer space) +$ git merge djw-vfs/vfs-for-next +Merge made by the 'recursive' strategy. + fs/splice.c | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) +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 (4a6442ff627f Merge branch 'for-5.5-pr-warn' into for-next) +$ git merge printk/for-next +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/dma/debug.c +Auto-merging fs/afs/yfsclient.c +Auto-merging fs/afs/inode.c +Auto-merging drivers/of/fdt.c +Auto-merging drivers/isdn/hardware/mISDN/w6692.c +Auto-merging drivers/isdn/hardware/mISDN/netjet.c +Auto-merging drivers/isdn/hardware/mISDN/mISDNisar.c +Auto-merging drivers/isdn/hardware/mISDN/mISDNipac.c +Auto-merging drivers/isdn/hardware/mISDN/hfcsusb.c +Auto-merging drivers/isdn/hardware/mISDN/hfcpci.c +Auto-merging drivers/isdn/hardware/mISDN/avmfritz.c +Auto-merging drivers/crypto/n2_core.c +Auto-merging drivers/acpi/apei/ghes.c +Auto-merging arch/x86/mm/testmmiotrace.c +Auto-merging arch/x86/kernel/umip.c +Auto-merging arch/x86/kernel/apic/apic.c +Auto-merging arch/x86/kernel/amd_gart_64.c +Auto-merging arch/ia64/kernel/setup.c +Auto-merging arch/arm64/kernel/smp.c +Auto-merging arch/arm64/kernel/hw_breakpoint.c +Auto-merging Documentation/core-api/printk-formats.rst +Merge made by the 'recursive' strategy. + Documentation/core-api/printk-formats.rst | 12 ++ + arch/alpha/kernel/perf_event.c | 4 +- + arch/arm64/kernel/hw_breakpoint.c | 8 +- + arch/arm64/kernel/smp.c | 11 +- + arch/ia64/kernel/setup.c | 2 +- + arch/riscv/kernel/module.c | 4 +- + arch/sh/boards/mach-sdk7786/nmi.c | 2 +- + arch/sh/drivers/pci/fixups-sdk7786.c | 2 +- + arch/sh/kernel/io_trapped.c | 2 +- + arch/sh/kernel/setup.c | 2 +- + arch/sh/mm/consistent.c | 5 +- + arch/sparc/kernel/smp_64.c | 6 +- + arch/x86/kernel/amd_gart_64.c | 12 +- + arch/x86/kernel/apic/apic.c | 41 +++--- + arch/x86/kernel/setup_percpu.c | 4 +- + arch/x86/kernel/tboot.c | 15 +- + arch/x86/kernel/tsc_sync.c | 8 +- + arch/x86/kernel/umip.c | 6 +- + arch/x86/mm/kmmio.c | 7 +- + arch/x86/mm/mmio-mod.c | 6 +- + arch/x86/mm/numa_emulation.c | 4 +- + arch/x86/mm/testmmiotrace.c | 6 +- + arch/x86/oprofile/op_x86_model.h | 6 +- + arch/x86/platform/olpc/olpc-xo15-sci.c | 2 +- + arch/x86/platform/sfi/sfi.c | 3 +- + arch/x86/xen/setup.c | 2 +- + drivers/acpi/apei/apei-base.c | 44 +++--- + drivers/acpi/apei/einj.c | 4 +- + drivers/acpi/apei/erst-dbg.c | 5 +- + drivers/acpi/apei/ghes.c | 25 ++-- + drivers/acpi/apei/hest.c | 14 +- + drivers/acpi/battery.c | 2 +- + drivers/acpi/resource.c | 4 +- + drivers/block/drbd/drbd_nl.c | 13 +- + drivers/cdrom/gdrom.c | 4 +- + drivers/clocksource/samsung_pwm_timer.c | 3 +- + drivers/crypto/n2_core.c | 12 +- + drivers/ide/tx4938ide.c | 2 +- + drivers/ide/tx4939ide.c | 6 +- + drivers/isdn/hardware/mISDN/avmfritz.c | 16 +-- + drivers/isdn/hardware/mISDN/hfcmulti.c | 8 +- + drivers/isdn/hardware/mISDN/hfcpci.c | 3 +- + drivers/isdn/hardware/mISDN/hfcsusb.c | 4 +- + drivers/isdn/hardware/mISDN/mISDNipac.c | 4 +- + drivers/isdn/hardware/mISDN/mISDNisar.c | 10 +- + drivers/isdn/hardware/mISDN/netjet.c | 8 +- + drivers/isdn/hardware/mISDN/w6692.c | 12 +- + drivers/isdn/mISDN/hwchannel.c | 7 +- + drivers/macintosh/windfarm_fcu_controls.c | 4 +- + drivers/macintosh/windfarm_lm87_sensor.c | 4 +- + drivers/macintosh/windfarm_pm72.c | 22 +-- + drivers/macintosh/windfarm_rm31.c | 6 +- + drivers/of/fdt.c | 20 +-- + drivers/oprofile/oprofile_perf.c | 8 +- + drivers/platform/x86/asus-laptop.c | 2 +- + drivers/platform/x86/eeepc-laptop.c | 2 +- + drivers/platform/x86/intel_oaktrail.c | 10 +- + drivers/scsi/a3000.c | 2 +- + drivers/sh/intc/core.c | 4 +- + drivers/video/console/vgacon.c | 6 +- + fs/afs/flock.c | 4 +- + fs/afs/inode.c | 13 +- + fs/afs/yfsclient.c | 4 +- + include/linux/errname.h | 16 +++ + kernel/dma/debug.c | 2 +- + kernel/trace/trace_benchmark.c | 4 +- + lib/Kconfig.debug | 9 ++ + lib/Makefile | 1 + + lib/cpu_rmap.c | 2 +- + lib/errname.c | 223 ++++++++++++++++++++++++++++++ + lib/test_printf.c | 21 +++ + lib/vsprintf.c | 27 ++++ + sound/soc/samsung/s3c-i2s-v2.c | 6 +- + tools/lib/api/debug-internal.h | 4 +- + tools/lib/api/debug.c | 4 +- + tools/lib/api/fs/fs.c | 4 +- + 76 files changed, 558 insertions(+), 268 deletions(-) + create mode 100644 include/linux/errname.h + create mode 100644 lib/errname.c +Merging pci/next (59a426f044a4 Merge branch 'pci/trivial') +$ git merge pci/next +Auto-merging drivers/pci/pci.c +Auto-merging drivers/memstick/host/jmb38x_ms.c +Auto-merging drivers/iommu/Kconfig +Auto-merging arch/s390/pci/pci_clp.c +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/admin-guide/kernel-parameters.txt +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. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 45ae6652db43] 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 +- + Documentation/power/pci.rst | 42 ++-- + MAINTAINERS | 3 +- + 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 | 46 ++-- + 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/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/pci/Kconfig | 2 +- + drivers/pci/access.c | 2 +- + drivers/pci/ats.c | 207 +++++++++-------- + drivers/pci/controller/dwc/pci-dra7xx.c | 2 +- + drivers/pci/controller/dwc/pci-layerscape-ep.c | 2 +- + drivers/pci/controller/dwc/pci-meson.c | 136 +++++++++--- + drivers/pci/controller/dwc/pcie-artpec6.c | 2 +- + drivers/pci/controller/dwc/pcie-designware-host.c | 12 +- + 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/pci-aardvark.c | 73 ++++-- + drivers/pci/controller/pci-hyperv.c | 10 +- + drivers/pci/controller/pci-mvebu.c | 4 +- + drivers/pci/controller/pci-thunder-pem.c | 1 + + drivers/pci/controller/pcie-cadence.h | 2 +- + drivers/pci/controller/pcie-iproc-msi.c | 5 +- + drivers/pci/controller/pcie-iproc.c | 28 +++ + drivers/pci/controller/pcie-mobiveil.c | 119 +++++----- + drivers/pci/controller/pcie-rcar.c | 6 +- + drivers/pci/controller/pcie-rockchip.h | 2 +- + drivers/pci/endpoint/functions/pci-epf-test.c | 10 +- + drivers/pci/endpoint/pci-epc-mem.c | 2 +- + drivers/pci/hotplug/pciehp.h | 2 + + drivers/pci/hotplug/pciehp_ctrl.c | 6 +- + drivers/pci/hotplug/pciehp_hpc.c | 2 + + drivers/pci/hotplug/rpaphp_core.c | 4 +- + drivers/pci/iov.c | 9 +- + drivers/pci/msi.c | 25 +-- + drivers/pci/pci-bridge-emul.c | 25 ++- + drivers/pci/pci-bridge-emul.h | 78 +++---- + drivers/pci/pci-driver.c | 157 +++++++------ + drivers/pci/pci-sysfs.c | 28 +-- + drivers/pci/pci.c | 36 ++- + drivers/pci/pci.h | 32 ++- + drivers/pci/pcie/Kconfig | 7 - + 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/probe.c | 44 ++-- + drivers/pci/proc.c | 4 +- + drivers/pci/quirks.c | 40 +++- + drivers/pci/setup-bus.c | 32 ++- + 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/core/fbmem.c | 4 +- + drivers/video/fbdev/efifb.c | 2 +- + 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 | 44 ++-- + include/uapi/linux/pci_regs.h | 1 + + lib/devres.c | 2 +- + 106 files changed, 1210 insertions(+), 827 deletions(-) +Merging pstore/for-next/pstore (8d82cee2f8aa pstore: Make pstore_choose_compression() static) +$ git merge pstore/for-next/pstore +Merge made by the 'recursive' strategy. + fs/pstore/platform.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging hid/for-next (e0316fc294a6 Merge branch 'for-5.5/ish' into for-next) +$ git merge hid/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 7 + + drivers/hid/Kconfig | 1 + + drivers/hid/Makefile | 1 + + drivers/hid/hid-google-hammer.c | 146 ++++-- + drivers/hid/hid-ids.h | 4 + + drivers/hid/hid-lg-g15.c | 899 +++++++++++++++++++++++++++++++++ + drivers/hid/hidraw.c | 10 +- + drivers/hid/i2c-hid/i2c-hid-core.c | 4 + + drivers/hid/intel-ish-hid/ishtp/hbm.c | 2 +- + include/uapi/linux/input-event-codes.h | 75 +++ + 10 files changed, 1100 insertions(+), 49 deletions(-) + create mode 100644 drivers/hid/hid-lg-g15.c +Merging i2c/i2c/for-next (70d0b04517cd Merge branch 'i2c/for-current-fixed' into i2c/for-next) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/i2c-aspeed.txt | 3 +- + Documentation/devicetree/bindings/i2c/i2c-at91.txt | 3 +- + Documentation/devicetree/bindings/i2c/i2c.txt | 18 ++++++++ + .../devicetree/bindings/i2c/renesas,i2c.txt | 1 + + .../devicetree/bindings/i2c/renesas,iic.txt | 1 + + Documentation/i2c/busses/i2c-i801.rst | 1 + + drivers/i2c/busses/Kconfig | 1 + + drivers/i2c/busses/i2c-aspeed.c | 4 ++ + drivers/i2c/busses/i2c-at91-core.c | 38 +++++++++++++++++ + drivers/i2c/busses/i2c-at91-master.c | 49 ++++++++++++++++++++-- + drivers/i2c/busses/i2c-at91.h | 13 ++++++ + drivers/i2c/busses/i2c-i801.c | 8 ++++ + drivers/i2c/busses/i2c-stm32f7.c | 2 +- + drivers/i2c/i2c-core-base.c | 6 +++ + include/linux/i2c.h | 6 +++ + 15 files changed, 148 insertions(+), 6 deletions(-) +Merging i3c/i3c/next (469191c7fcd0 MAINTAINERS: Mark linux-i3c mailing list moderated) +$ git merge i3c/i3c/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/i3c/master.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) +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 (93a794f1b785 docs: hwmon: Document bel-pfe pmbus driver) +$ git merge hwmon-staging/hwmon-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwmon/adi,ltc2947.yaml | 104 ++ + .../devicetree/bindings/hwmon/ibm,cffps1.txt | 3 + + Documentation/hwmon/bel-pfe.rst | 112 ++ + Documentation/hwmon/ina3221.rst | 12 + + Documentation/hwmon/index.rst | 2 + + Documentation/hwmon/ltc2947.rst | 100 ++ + MAINTAINERS | 11 + + drivers/hwmon/Kconfig | 28 +- + drivers/hwmon/Makefile | 3 + + drivers/hwmon/abituguru.c | 2 +- + drivers/hwmon/applesmc.c | 38 +- + drivers/hwmon/aspeed-pwm-tacho.c | 7 +- + drivers/hwmon/ina3221.c | 163 ++- + drivers/hwmon/ltc2947-core.c | 1183 ++++++++++++++++++++ + drivers/hwmon/ltc2947-i2c.c | 49 + + drivers/hwmon/ltc2947-spi.c | 50 + + drivers/hwmon/ltc2947.h | 12 + + drivers/hwmon/pmbus/Kconfig | 9 + + drivers/hwmon/pmbus/Makefile | 1 + + drivers/hwmon/pmbus/bel-pfe.c | 131 +++ + drivers/hwmon/pmbus/ibm-cffps.c | 37 +- + drivers/hwmon/tmp421.c | 3 +- + drivers/hwmon/w83793.c | 2 +- + 23 files changed, 2006 insertions(+), 56 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/adi,ltc2947.yaml + create mode 100644 Documentation/hwmon/bel-pfe.rst + create mode 100644 Documentation/hwmon/ltc2947.rst + create mode 100644 drivers/hwmon/ltc2947-core.c + create mode 100644 drivers/hwmon/ltc2947-i2c.c + create mode 100644 drivers/hwmon/ltc2947-spi.c + create mode 100644 drivers/hwmon/ltc2947.h + create mode 100644 drivers/hwmon/pmbus/bel-pfe.c +Merging jc_docs/docs-next (1c16b3d58681 docs/core-api: memory-allocation: mention size helpers) +$ git merge jc_docs/docs-next +Auto-merging fs/cifs/cifsfs.c +Auto-merging drivers/net/ethernet/faraday/ftgmac100.c +Auto-merging MAINTAINERS +Auto-merging Documentation/networking/device_drivers/pensando/ionic.rst +CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/pensando/ionic.rst +Auto-merging Documentation/networking/device_drivers/intel/ixgbevf.rst +CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/ixgbevf.rst +Auto-merging Documentation/networking/device_drivers/intel/ixgbe.rst +CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/ixgbe.rst +Auto-merging Documentation/networking/device_drivers/intel/igbvf.rst +CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/igbvf.rst +Auto-merging Documentation/networking/device_drivers/intel/igb.rst +CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/igb.rst +Auto-merging Documentation/networking/device_drivers/intel/ice.rst +CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/ice.rst +Auto-merging Documentation/networking/device_drivers/intel/iavf.rst +CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/iavf.rst +Auto-merging Documentation/networking/device_drivers/intel/i40e.rst +CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/i40e.rst +Auto-merging Documentation/networking/device_drivers/intel/fm10k.rst +CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/fm10k.rst +Auto-merging Documentation/networking/device_drivers/intel/e1000e.rst +CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/e1000e.rst +Auto-merging Documentation/networking/device_drivers/intel/e1000.rst +CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/e1000.rst +Auto-merging Documentation/networking/device_drivers/intel/e100.rst +CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/e100.rst +Auto-merging Documentation/admin-guide/perf/imx-ddr.rst +CONFLICT (content): Merge conflict in Documentation/admin-guide/perf/imx-ddr.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/Makefile +Auto-merging .mailmap +Recorded preimage for 'Documentation/admin-guide/perf/imx-ddr.rst' +Recorded preimage for 'Documentation/networking/device_drivers/intel/e100.rst' +Recorded preimage for 'Documentation/networking/device_drivers/intel/e1000.rst' +Recorded preimage for 'Documentation/networking/device_drivers/intel/e1000e.rst' +Recorded preimage for 'Documentation/networking/device_drivers/intel/fm10k.rst' +Recorded preimage for 'Documentation/networking/device_drivers/intel/i40e.rst' +Recorded preimage for 'Documentation/networking/device_drivers/intel/iavf.rst' +Recorded preimage for 'Documentation/networking/device_drivers/intel/ice.rst' +Recorded preimage for 'Documentation/networking/device_drivers/intel/igb.rst' +Recorded preimage for 'Documentation/networking/device_drivers/intel/igbvf.rst' +Recorded preimage for 'Documentation/networking/device_drivers/intel/ixgbe.rst' +Recorded preimage for 'Documentation/networking/device_drivers/intel/ixgbevf.rst' +Recorded preimage for 'Documentation/networking/device_drivers/pensando/ionic.rst' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'Documentation/admin-guide/perf/imx-ddr.rst'. +Recorded resolution for 'Documentation/networking/device_drivers/intel/e100.rst'. +Recorded resolution for 'Documentation/networking/device_drivers/intel/e1000.rst'. +Recorded resolution for 'Documentation/networking/device_drivers/intel/e1000e.rst'. +Recorded resolution for 'Documentation/networking/device_drivers/intel/fm10k.rst'. +Recorded resolution for 'Documentation/networking/device_drivers/intel/i40e.rst'. +Recorded resolution for 'Documentation/networking/device_drivers/intel/iavf.rst'. +Recorded resolution for 'Documentation/networking/device_drivers/intel/ice.rst'. +Recorded resolution for 'Documentation/networking/device_drivers/intel/igb.rst'. +Recorded resolution for 'Documentation/networking/device_drivers/intel/igbvf.rst'. +Recorded resolution for 'Documentation/networking/device_drivers/intel/ixgbe.rst'. +Recorded resolution for 'Documentation/networking/device_drivers/intel/ixgbevf.rst'. +Recorded resolution for 'Documentation/networking/device_drivers/pensando/ionic.rst'. +[master 5fe87cf0bcee] Merge remote-tracking branch 'jc_docs/docs-next' +$ git diff -M --stat --summary HEAD^.. + .mailmap | 1 + + CREDITS | 3 +- + Documentation/Makefile | 5 +- + Documentation/admin-guide/LSM/SafeSetID.rst | 4 +- + Documentation/admin-guide/cgroup-v2.rst | 7 +- + .../{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 | 14 +- + Documentation/admin-guide/perf/imx-ddr.rst | 35 ++- + Documentation/admin-guide/perf/index.rst | 1 + + Documentation/admin-guide/sysctl/kernel.rst | 6 +- + Documentation/conf.py | 3 +- + Documentation/core-api/genalloc.rst | 26 +- + Documentation/core-api/genericirq.rst | 50 ++-- + Documentation/core-api/memory-allocation.rst | 50 ++-- + Documentation/core-api/mm-api.rst | 2 +- + Documentation/core-api/refcount-vs-atomic.rst | 36 +-- + Documentation/dev-tools/kmemleak.rst | 2 +- + .../devicetree/bindings/cpu/cpu-topology.txt | 2 +- + .../devicetree/bindings/timer/ingenic,tcu.txt | 2 +- + Documentation/driver-api/dma-buf.rst | 6 +- + Documentation/driver-api/gpio/driver.rst | 2 +- + Documentation/driver-api/index.rst | 2 - + Documentation/driver-api/infrastructure.rst | 3 - + Documentation/driver-api/pti_intel_mid.rst | 4 +- + Documentation/filesystems/debugfs.txt | 10 +- + Documentation/hwmon/inspur-ipsps1.rst | 2 +- + Documentation/i2c/busses/index.rst | 2 +- + Documentation/i2c/index.rst | 2 +- + Documentation/index.rst | 1 - + Documentation/mips/ingenic-tcu.rst | 2 +- + Documentation/misc-devices/xilinx_sdfec.rst | 291 +++++++++++++++++++++ + .../networking/device_drivers/intel/e100.rst | 14 +- + .../networking/device_drivers/intel/e1000.rst | 12 +- + .../networking/device_drivers/intel/e1000e.rst | 14 +- + .../networking/device_drivers/intel/fm10k.rst | 10 +- + .../networking/device_drivers/intel/i40e.rst | 8 +- + .../networking/device_drivers/intel/iavf.rst | 8 +- + .../networking/device_drivers/intel/ice.rst | 6 +- + .../networking/device_drivers/intel/igb.rst | 12 +- + .../networking/device_drivers/intel/igbvf.rst | 6 +- + .../networking/device_drivers/intel/ixgbe.rst | 10 +- + .../networking/device_drivers/intel/ixgbevf.rst | 6 +- + .../networking/device_drivers/mellanox/mlx5.rst | 2 +- + .../networking/device_drivers/pensando/ionic.rst | 6 +- + Documentation/networking/devlink-trap.rst | 2 +- + Documentation/networking/phy.rst | 2 +- + .../{ioctl => process}/botching-up-ioctls.rst | 2 +- + Documentation/process/index.rst | 2 + + Documentation/process/maintainers.rst | 1 + + Documentation/riscv/boot-image-header.rst | 2 +- + Documentation/scheduler/sched-stats.rst | 4 +- + Documentation/security/lsm.rst | 2 +- + Documentation/sphinx-static/theme_overrides.css | 10 + + Documentation/sphinx/maintainers_include.py | 197 ++++++++++++++ + .../it_IT/process/maintainer-pgp-guide.rst | 2 +- + 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 | 66 ++--- + drivers/net/ethernet/faraday/ftgmac100.c | 2 +- + drivers/net/ethernet/pensando/ionic/ionic_if.h | 4 +- + drivers/platform/x86/Kconfig | 2 +- + drivers/platform/x86/dell_rbu.c | 2 +- + fs/cifs/cifsfs.c | 2 +- + lib/genalloc.c | 2 +- + scripts/jobserver-count | 58 ++++ + scripts/kernel-doc | 11 +- + scripts/sphinx-pre-install | 29 +- + 76 files changed, 1039 insertions(+), 429 deletions(-) + rename Documentation/{driver-api => admin-guide}/dell_rbu.rst (94%) + rename Documentation/admin-guide/device-mapper/{dm-dust.txt => dm-dust.rst} (51%) + create mode 100644 Documentation/misc-devices/xilinx_sdfec.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 + 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 100755 scripts/jobserver-count +Merging v4l-dvb/master (a4260ea49547 media: sun4i: Add H3 deinterlace driver) +$ git merge v4l-dvb/master +Removing drivers/media/usb/dvb-usb-v2/gl861.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../media/allwinner,sun8i-h3-deinterlace.yaml | 76 ++ + .../devicetree/bindings/media/i2c/ad5820.txt | 11 +- + .../devicetree/bindings/media/i2c/imx290.txt | 57 ++ + .../devicetree/bindings/media/i2c/nokia,smia.txt | 2 - + .../devicetree/bindings/media/i2c/ov2659.txt | 9 + + Documentation/media/cec.h.rst.exceptions | 89 ++ + Documentation/media/kapi/v4l2-controls.rst | 9 + + Documentation/media/uapi/cec/cec-funcs.rst | 1 + + .../media/uapi/cec/cec-ioc-adap-g-caps.rst | 6 +- + .../media/uapi/cec/cec-ioc-adap-g-conn-info.rst | 105 ++ + Documentation/media/uapi/cec/cec-ioc-dqevent.rst | 8 + + Documentation/media/uapi/mediactl/request-api.rst | 4 +- + Documentation/media/uapi/v4l/biblio.rst | 9 + + Documentation/media/uapi/v4l/buffer.rst | 13 + + Documentation/media/uapi/v4l/dev-mem2mem.rst | 1 + + .../media/uapi/v4l/dev-stateless-decoder.rst | 424 ++++++++ + Documentation/media/uapi/v4l/ext-ctrls-codec.rst | 561 ++++++++++- + Documentation/media/uapi/v4l/ext-ctrls-flash.rst | 2 +- + .../media/uapi/v4l/ext-ctrls-image-source.rst | 10 + + Documentation/media/uapi/v4l/meta-formats.rst | 1 + + Documentation/media/uapi/v4l/pixfmt-compressed.rst | 35 +- + Documentation/media/uapi/v4l/pixfmt-meta-vivid.rst | 60 ++ + .../media/uapi/v4l/vidioc-decoder-cmd.rst | 10 +- + Documentation/media/uapi/v4l/vidioc-g-fbuf.rst | 2 +- + Documentation/media/uapi/v4l/vidioc-queryctrl.rst | 24 + + Documentation/media/uapi/v4l/vidioc-reqbufs.rst | 6 + + Documentation/media/v4l-drivers/imx.rst | 75 +- + Documentation/media/v4l-drivers/vimc.rst | 16 +- + Documentation/media/videodev2.h.rst.exceptions | 5 + + MAINTAINERS | 17 + + drivers/media/cec/cec-adap.c | 12 +- + drivers/media/cec/cec-api.c | 20 + + drivers/media/cec/cec-core.c | 5 - + drivers/media/cec/cec-pin.c | 10 + + drivers/media/common/videobuf2/videobuf2-v4l2.c | 12 +- + drivers/media/dvb-frontends/cxd2820r_c.c | 2 +- + drivers/media/dvb-frontends/cxd2820r_t.c | 2 +- + drivers/media/dvb-frontends/cxd2820r_t2.c | 2 +- + drivers/media/dvb-frontends/cxd2841er.c | 12 +- + drivers/media/dvb-frontends/drx39xyj/drxj.c | 2 +- + drivers/media/dvb-frontends/mb86a20s.c | 54 +- + drivers/media/dvb-frontends/mt312.c | 13 +- + drivers/media/dvb-frontends/si2168.h | 47 +- + drivers/media/dvb-frontends/si2168_priv.h | 10 +- + drivers/media/dvb-frontends/tc90522.c | 27 +- + drivers/media/dvb-frontends/tc90522.h | 3 + + drivers/media/i2c/Kconfig | 68 +- + drivers/media/i2c/Makefile | 1 + + drivers/media/i2c/ad5820.c | 35 +- + drivers/media/i2c/adv7180.c | 6 +- + drivers/media/i2c/adv7842.c | 4 +- + drivers/media/i2c/imx214.c | 9 + + drivers/media/i2c/imx290.c | 884 +++++++++++++++++ + drivers/media/i2c/lm3646.c | 2 +- + drivers/media/i2c/max2175.c | 4 +- + drivers/media/i2c/mt9m001.c | 2 +- + drivers/media/i2c/ov2659.c | 139 ++- + drivers/media/i2c/ov5640.c | 33 +- + drivers/media/i2c/ov5695.c | 2 +- + drivers/media/i2c/ov6650.c | 266 +++-- + drivers/media/i2c/smiapp/smiapp-core.c | 326 +++---- + drivers/media/i2c/smiapp/smiapp-reg.h | 36 +- + drivers/media/i2c/smiapp/smiapp.h | 3 - + drivers/media/i2c/st-mipid02.c | 5 + + drivers/media/mc/mc-device.c | 65 +- + drivers/media/pci/cx18/cx18-ioctl.c | 2 +- + drivers/media/pci/cx23885/cx23888-ir.c | 5 +- + drivers/media/pci/cx88/cx88-cards.c | 43 + + drivers/media/pci/cx88/cx88-dvb.c | 1 + + drivers/media/pci/cx88/cx88-video.c | 11 +- + drivers/media/pci/cx88/cx88.h | 1 + + drivers/media/pci/dm1105/dm1105.c | 1 - + drivers/media/pci/ivtv/ivtv-vbi.c | 2 +- + drivers/media/pci/saa7164/saa7164-core.c | 166 ++-- + drivers/media/pci/smipcie/smipcie.h | 1 - + drivers/media/platform/Kconfig | 17 +- + drivers/media/platform/Makefile | 4 +- + drivers/media/platform/am437x/am437x-vpfe.c | 860 +++++++--------- + drivers/media/platform/am437x/am437x-vpfe.h | 43 +- + drivers/media/platform/am437x/am437x-vpfe_regs.h | 10 +- + drivers/media/platform/aspeed-video.c | 55 +- + drivers/media/platform/cadence/cdns-csi2rx.c | 2 +- + drivers/media/platform/cec-gpio/cec-gpio.c | 41 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 20 +- + .../media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 8 +- + .../media/platform/mtk-vcodec/vdec/vdec_h264_if.c | 1 - + .../media/platform/mtk-vcodec/vdec/vdec_vp8_if.c | 1 - + .../media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 1 - + drivers/media/platform/mtk-vcodec/vdec_vpu_if.c | 9 +- + drivers/media/platform/mtk-vcodec/vdec_vpu_if.h | 9 - + drivers/media/platform/qcom/venus/core.c | 56 +- + drivers/media/platform/qcom/venus/core.h | 30 + + drivers/media/platform/qcom/venus/helpers.c | 247 ++++- + drivers/media/platform/qcom/venus/helpers.h | 3 +- + drivers/media/platform/qcom/venus/hfi_venus.c | 6 + + drivers/media/platform/qcom/venus/vdec.c | 8 +- + drivers/media/platform/qcom/venus/venc.c | 4 + + drivers/media/platform/rcar-vin/rcar-core.c | 7 +- + drivers/media/platform/rcar-vin/rcar-dma.c | 58 +- + drivers/media/platform/rcar-vin/rcar-v4l2.c | 97 +- + drivers/media/platform/rcar-vin/rcar-vin.h | 4 +- + drivers/media/platform/s3c-camif/camif-regs.c | 2 +- + drivers/media/platform/seco-cec/seco-cec.c | 1 + + drivers/media/platform/sunxi/Makefile | 1 + + drivers/media/platform/sunxi/sun8i-di/Makefile | 2 + + drivers/media/platform/sunxi/sun8i-di/sun8i-di.c | 1028 ++++++++++++++++++++ + drivers/media/platform/sunxi/sun8i-di/sun8i-di.h | 237 +++++ + drivers/media/platform/ti-vpe/csc.c | 254 +++-- + drivers/media/platform/ti-vpe/csc.h | 4 +- + drivers/media/platform/ti-vpe/vpdma.c | 11 +- + drivers/media/platform/ti-vpe/vpdma.h | 2 + + drivers/media/platform/ti-vpe/vpdma_priv.h | 5 +- + drivers/media/platform/ti-vpe/vpe.c | 394 +++++--- + drivers/media/platform/vim2m.c | 4 + + drivers/media/platform/vimc/Makefile | 7 +- + drivers/media/platform/vimc/vimc-capture.c | 105 +- + drivers/media/platform/vimc/vimc-common.c | 76 +- + drivers/media/platform/vimc/vimc-common.h | 116 +-- + drivers/media/platform/vimc/vimc-core.c | 215 ++-- + drivers/media/platform/vimc/vimc-debayer.c | 182 ++-- + drivers/media/platform/vimc/vimc-scaler.c | 102 +- + drivers/media/platform/vimc/vimc-sensor.c | 104 +- + drivers/media/platform/vimc/vimc-streamer.c | 6 +- + drivers/media/platform/vivid/Makefile | 2 +- + drivers/media/platform/vivid/vivid-core.c | 197 +++- + drivers/media/platform/vivid/vivid-core.h | 24 + + drivers/media/platform/vivid/vivid-ctrls.c | 75 ++ + drivers/media/platform/vivid/vivid-kthread-cap.c | 54 +- + drivers/media/platform/vivid/vivid-kthread-out.c | 49 +- + drivers/media/platform/vivid/vivid-meta-cap.c | 201 ++++ + drivers/media/platform/vivid/vivid-meta-cap.h | 29 + + drivers/media/platform/vivid/vivid-meta-out.c | 174 ++++ + drivers/media/platform/vivid/vivid-meta-out.h | 25 + + drivers/media/platform/vivid/vivid-vid-cap.c | 8 +- + drivers/media/platform/vivid/vivid-vid-out.c | 8 +- + drivers/media/rc/imon.c | 64 +- + drivers/media/rc/imon_raw.c | 22 +- + drivers/media/rc/ir-rcmm-decoder.c | 6 +- + drivers/media/rc/keymaps/Makefile | 1 + + drivers/media/rc/keymaps/rc-vega-s9x.c | 54 + + drivers/media/rc/mceusb.c | 141 ++- + drivers/media/rc/rc-core-priv.h | 2 +- + drivers/media/rc/rc-main.c | 1 + + drivers/media/rc/tango-ir.c | 14 +- + drivers/media/tuners/qm1d1c0042.c | 2 +- + drivers/media/tuners/si2157.c | 6 + + drivers/media/tuners/si2157.h | 33 +- + drivers/media/tuners/si2157_priv.h | 5 +- + drivers/media/tuners/tuner-xc2028-types.h | 2 +- + drivers/media/tuners/tuner-xc2028.h | 2 +- + drivers/media/usb/b2c2/flexcop-usb.c | 8 +- + drivers/media/usb/cx231xx/Kconfig | 2 +- + drivers/media/usb/cx231xx/cx231xx-417.c | 508 +++------- + drivers/media/usb/cx231xx/cx231xx-audio.c | 1 - + drivers/media/usb/cx231xx/cx231xx-cards.c | 6 +- + drivers/media/usb/cx231xx/cx231xx-vbi.c | 172 ++-- + drivers/media/usb/cx231xx/cx231xx-vbi.h | 2 +- + drivers/media/usb/cx231xx/cx231xx-video.c | 795 ++++----------- + drivers/media/usb/cx231xx/cx231xx.h | 30 +- + drivers/media/usb/dvb-usb-v2/af9035.c | 37 +- + drivers/media/usb/dvb-usb-v2/dvb_usb.h | 2 + + drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 1 + + drivers/media/usb/dvb-usb-v2/dvbsky.c | 19 +- + drivers/media/usb/dvb-usb-v2/gl861.c | 391 +++----- + drivers/media/usb/dvb-usb-v2/gl861.h | 14 - + drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 6 +- + drivers/media/usb/dvb-usb/af9005.c | 5 +- + drivers/media/usb/dvb-usb/cxusb.c | 3 +- + drivers/media/usb/em28xx/em28xx-audio.c | 1 - + drivers/media/usb/em28xx/em28xx-cards.c | 20 + + drivers/media/usb/em28xx/em28xx-dvb.c | 30 +- + drivers/media/usb/em28xx/em28xx.h | 1 + + drivers/media/usb/gspca/sq905.c | 3 + + drivers/media/usb/gspca/sq905c.c | 3 + + drivers/media/usb/gspca/stv0680.c | 2 +- + drivers/media/usb/gspca/stv06xx/stv06xx_st6422.c | 2 +- + drivers/media/usb/tm6000/tm6000-regs.h | 2 +- + drivers/media/usb/tm6000/tm6000-usb-isoc.h | 2 +- + drivers/media/usb/tm6000/tm6000.h | 2 +- + drivers/media/usb/usbvision/usbvision-video.c | 29 +- + drivers/media/usb/uvc/uvc_driver.c | 28 +- + drivers/media/usb/uvc/uvc_metadata.c | 4 +- + drivers/media/usb/uvc/uvc_queue.c | 2 +- + drivers/media/usb/uvc/uvcvideo.h | 2 +- + drivers/media/usb/zr364xx/zr364xx.c | 1 - + drivers/media/v4l2-core/v4l2-common.c | 128 +-- + drivers/media/v4l2-core/v4l2-ctrls.c | 185 +++- + drivers/media/v4l2-core/v4l2-dev.c | 112 ++- + drivers/media/v4l2-core/v4l2-dv-timings.c | 2 +- + drivers/media/v4l2-core/v4l2-fwnode.c | 1 + + drivers/media/v4l2-core/v4l2-ioctl.c | 18 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 190 +++- + drivers/staging/media/hantro/hantro.h | 20 +- + drivers/staging/media/hantro/hantro_drv.c | 16 +- + drivers/staging/media/hantro/hantro_g1_h264_dec.c | 7 +- + drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c | 11 +- + drivers/staging/media/hantro/hantro_g1_vp8_dec.c | 11 +- + drivers/staging/media/hantro/hantro_h1_jpeg_enc.c | 4 +- + drivers/staging/media/hantro/hantro_h264.c | 64 +- + drivers/staging/media/hantro/hantro_hw.h | 4 +- + drivers/staging/media/hantro/rk3288_vpu_hw.c | 16 +- + drivers/staging/media/hantro/rk3399_vpu_hw.c | 12 +- + .../staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c | 4 +- + .../staging/media/hantro/rk3399_vpu_hw_mpeg2_dec.c | 11 +- + .../staging/media/hantro/rk3399_vpu_hw_vp8_dec.c | 12 +- + drivers/staging/media/imx/imx-ic-prp.c | 25 +- + drivers/staging/media/imx/imx-ic-prpencvf.c | 51 +- + drivers/staging/media/imx/imx-media-capture.c | 15 +- + drivers/staging/media/imx/imx-media-csi.c | 41 +- + drivers/staging/media/imx/imx-media-utils.c | 10 +- + drivers/staging/media/imx/imx-media-vdic.c | 27 +- + drivers/staging/media/imx/imx6-mipi-csi2.c | 27 +- + drivers/staging/media/imx/imx7-media-csi.c | 38 +- + drivers/staging/media/imx/imx7-mipi-csis.c | 34 +- + drivers/staging/media/omap4iss/iss.c | 6 +- + drivers/staging/media/omap4iss/iss_video.c | 4 +- + drivers/staging/media/sunxi/cedrus/Makefile | 2 +- + drivers/staging/media/sunxi/cedrus/cedrus.c | 64 +- + drivers/staging/media/sunxi/cedrus/cedrus.h | 18 + + drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 9 + + drivers/staging/media/sunxi/cedrus/cedrus_h264.c | 12 +- + drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 616 ++++++++++++ + drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 20 +- + drivers/staging/media/sunxi/cedrus/cedrus_regs.h | 302 +++++- + drivers/staging/media/sunxi/cedrus/cedrus_video.c | 98 +- + drivers/staging/media/sunxi/cedrus/cedrus_video.h | 1 + + include/media/cec-pin.h | 10 +- + include/media/cec.h | 31 - + include/media/dvb-usb-ids.h | 1 + + include/media/hevc-ctrls.h | 212 ++++ + include/media/i2c/smiapp.h | 1 - + include/media/rc-map.h | 23 +- + include/media/v4l2-common.h | 33 +- + include/media/v4l2-ctrls.h | 83 ++ + include/media/v4l2-mem2mem.h | 44 +- + include/media/videobuf2-core.h | 3 + + include/media/videobuf2-v4l2.h | 5 + + include/uapi/linux/cec-funcs.h | 34 +- + include/uapi/linux/cec.h | 133 ++- + include/uapi/linux/v4l2-controls.h | 1 + + include/uapi/linux/videodev2.h | 21 +- + 241 files changed, 10431 insertions(+), 4252 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/allwinner,sun8i-h3-deinterlace.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/imx290.txt + create mode 100644 Documentation/media/uapi/cec/cec-ioc-adap-g-conn-info.rst + create mode 100644 Documentation/media/uapi/v4l/dev-stateless-decoder.rst + create mode 100644 Documentation/media/uapi/v4l/pixfmt-meta-vivid.rst + create mode 100644 drivers/media/i2c/imx290.c + create mode 100644 drivers/media/platform/sunxi/sun8i-di/Makefile + create mode 100644 drivers/media/platform/sunxi/sun8i-di/sun8i-di.c + create mode 100644 drivers/media/platform/sunxi/sun8i-di/sun8i-di.h + create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.c + create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.h + create mode 100644 drivers/media/platform/vivid/vivid-meta-out.c + create mode 100644 drivers/media/platform/vivid/vivid-meta-out.h + create mode 100644 drivers/media/rc/keymaps/rc-vega-s9x.c + delete mode 100644 drivers/media/usb/dvb-usb-v2/gl861.h + create mode 100644 drivers/staging/media/sunxi/cedrus/cedrus_h265.c + create mode 100644 include/media/hevc-ctrls.h +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 (7dba3cb7cc3a Merge branch 'pm-cpufreq-fixes' into linux-next) +$ git merge pm/linux-next +Auto-merging lib/vsprintf.c +Auto-merging lib/test_printf.c +CONFLICT (content): Merge conflict in lib/test_printf.c +Auto-merging MAINTAINERS +Auto-merging Documentation/core-api/printk-formats.rst +Resolved 'lib/test_printf.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master e43ff0729010] Merge remote-tracking branch 'pm/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/core-api/printk-formats.rst | 34 ++-- + Documentation/firmware-guide/acpi/namespace.rst | 2 +- + MAINTAINERS | 9 + + drivers/acpi/Kconfig | 14 +- + drivers/acpi/Makefile | 5 +- + drivers/acpi/acpi_configfs.c | 4 +- + drivers/acpi/acpi_lpss.c | 48 ++--- + drivers/acpi/acpi_platform.c | 43 +++++ + drivers/acpi/acpi_video.c | 8 +- + drivers/acpi/acpica/acdebug.h | 2 + + drivers/acpi/acpica/acstruct.h | 10 ++ + drivers/acpi/acpica/acutils.h | 9 +- + drivers/acpi/acpica/dbconvert.c | 4 + + drivers/acpi/acpica/dbdisply.c | 2 - + drivers/acpi/acpica/dbfileio.c | 2 +- + drivers/acpi/acpica/dbinput.c | 36 +++- + drivers/acpi/acpica/dbmethod.c | 4 + + drivers/acpi/acpica/dbnames.c | 114 ++++++++++++ + drivers/acpi/acpica/dbobject.c | 1 - + drivers/acpi/acpica/dscontrol.c | 2 +- + drivers/acpi/acpica/dsfield.c | 12 +- + drivers/acpi/acpica/evgpeblk.c | 11 +- + drivers/acpi/acpica/evgpeinit.c | 3 - + drivers/acpi/acpica/evmisc.c | 12 +- + drivers/acpi/acpica/evregion.c | 4 +- + drivers/acpi/acpica/evrgnini.c | 1 - + drivers/acpi/acpica/hwxfsleep.c | 3 + + drivers/acpi/acpica/nsconvert.c | 2 +- + drivers/acpi/acpica/nsdump.c | 6 +- + drivers/acpi/acpica/nsxfname.c | 4 +- + drivers/acpi/acpica/psobject.c | 7 +- + drivers/acpi/acpica/rscreate.c | 3 + + drivers/acpi/acpica/tbdata.c | 3 + + drivers/acpi/acpica/tbxfload.c | 40 ++++- + drivers/acpi/acpica/utbuffer.c | 52 +++--- + drivers/acpi/acpica/utids.c | 2 - + drivers/acpi/acpica/uttrack.c | 2 +- + drivers/acpi/button.c | 139 ++++++++------- + drivers/acpi/ec.c | 195 +++++++++++++++------ + drivers/acpi/internal.h | 3 +- + drivers/acpi/pmic/intel_pmic.c | 20 ++- + .../pmic/{intel_pmic_crc.c => intel_pmic_bytcrc.c} | 4 +- + drivers/acpi/pmic/intel_pmic_chtcrc.c | 44 +++++ + drivers/acpi/processor_idle.c | 21 ++- + drivers/acpi/property.c | 48 +++++ + drivers/acpi/scan.c | 1 + + drivers/acpi/utils.c | 32 ++++ + drivers/base/property.c | 83 ++++++++- + drivers/base/swnode.c | 43 ++++- + drivers/cpufreq/cpufreq.c | 5 +- + drivers/cpufreq/intel_pstate.c | 4 +- + drivers/cpufreq/powernv-cpufreq.c | 17 +- + drivers/cpuidle/driver.c | 15 +- + drivers/cpuidle/governors/teo.c | 78 +++++++-- + drivers/firmware/efi/efi.c | 2 +- + drivers/iommu/amd_iommu.c | 30 +--- + drivers/mfd/intel_soc_pmic_crc.c | 5 +- + drivers/mmc/host/sdhci-acpi.c | 49 ++---- + drivers/of/property.c | 16 ++ + include/acpi/acpi_bus.h | 8 +- + include/acpi/acpixf.h | 8 +- + include/acpi/button.h | 12 -- + include/linux/acpi.h | 8 + + include/linux/fwnode.h | 10 +- + include/linux/property.h | 8 +- + kernel/power/snapshot.c | 9 +- + lib/test_printf.c | 32 ++++ + lib/vsprintf.c | 93 ++++++---- + scripts/checkpatch.pl | 9 +- + 69 files changed, 1158 insertions(+), 413 deletions(-) + rename drivers/acpi/pmic/{intel_pmic_crc.c => intel_pmic_bytcrc.c} (98%) + create mode 100644 drivers/acpi/pmic/intel_pmic_chtcrc.c +Merging cpufreq-arm/cpufreq/arm/linux-next (e32beb064105 cpufreq: vexpress-spc: find and skip duplicates when merging frequencies) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Removing drivers/cpufreq/arm_big_little.h +Removing drivers/cpufreq/arm_big_little.c +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/omap3-gta04.dtsi +Auto-merging arch/arm/boot/dts/am3517.dtsi +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/omap/omap.txt | 30 +- + .../devicetree/bindings/cpufreq/ti-cpufreq.txt | 6 +- + MAINTAINERS | 5 +- + arch/arm/boot/dts/am3517.dtsi | 31 + + arch/arm/boot/dts/am3517_mt_ventoux.dts | 2 +- + arch/arm/boot/dts/logicpd-som-lv-35xx-devkit.dts | 2 +- + arch/arm/boot/dts/logicpd-torpedo-35xx-devkit.dts | 2 +- + arch/arm/boot/dts/omap3-beagle-xm.dts | 2 +- + arch/arm/boot/dts/omap3-beagle.dts | 2 +- + arch/arm/boot/dts/omap3-cm-t3530.dts | 2 +- + arch/arm/boot/dts/omap3-cm-t3730.dts | 2 +- + arch/arm/boot/dts/omap3-devkit8000-lcd43.dts | 2 +- + arch/arm/boot/dts/omap3-devkit8000-lcd70.dts | 2 +- + arch/arm/boot/dts/omap3-devkit8000.dts | 2 +- + arch/arm/boot/dts/omap3-gta04.dtsi | 2 +- + arch/arm/boot/dts/omap3-ha-lcd.dts | 2 +- + arch/arm/boot/dts/omap3-ha.dts | 2 +- + arch/arm/boot/dts/omap3-igep0020-rev-f.dts | 2 +- + arch/arm/boot/dts/omap3-igep0020.dts | 2 +- + arch/arm/boot/dts/omap3-igep0030-rev-g.dts | 2 +- + arch/arm/boot/dts/omap3-igep0030.dts | 2 +- + arch/arm/boot/dts/omap3-ldp.dts | 2 +- + arch/arm/boot/dts/omap3-lilly-a83x.dtsi | 2 +- + arch/arm/boot/dts/omap3-lilly-dbb056.dts | 2 +- + arch/arm/boot/dts/omap3-n9.dts | 2 +- + arch/arm/boot/dts/omap3-n950-n9.dtsi | 7 - + arch/arm/boot/dts/omap3-n950.dts | 2 +- + arch/arm/boot/dts/omap3-overo-storm-alto35.dts | 2 +- + arch/arm/boot/dts/omap3-overo-storm-chestnut43.dts | 2 +- + arch/arm/boot/dts/omap3-overo-storm-gallop43.dts | 2 +- + arch/arm/boot/dts/omap3-overo-storm-palo35.dts | 2 +- + arch/arm/boot/dts/omap3-overo-storm-palo43.dts | 2 +- + arch/arm/boot/dts/omap3-overo-storm-summit.dts | 2 +- + arch/arm/boot/dts/omap3-overo-storm-tobi.dts | 2 +- + arch/arm/boot/dts/omap3-overo-storm-tobiduo.dts | 2 +- + arch/arm/boot/dts/omap3-pandora-1ghz.dts | 2 +- + arch/arm/boot/dts/omap3-sbc-t3530.dts | 2 +- + arch/arm/boot/dts/omap3-sbc-t3730.dts | 2 +- + arch/arm/boot/dts/omap3-sniper.dts | 2 +- + arch/arm/boot/dts/omap3-thunder.dts | 2 +- + arch/arm/boot/dts/omap3-zoom3.dts | 2 +- + arch/arm/boot/dts/omap3430-sdp.dts | 2 +- + arch/arm/boot/dts/omap34xx.dtsi | 66 ++- + arch/arm/boot/dts/omap36xx.dtsi | 65 +- + drivers/cpufreq/Kconfig.arm | 12 +- + drivers/cpufreq/Makefile | 2 - + drivers/cpufreq/arm_big_little.c | 658 --------------------- + drivers/cpufreq/arm_big_little.h | 43 -- + drivers/cpufreq/cpufreq-dt-platdev.c | 2 +- + drivers/cpufreq/imx-cpufreq-dt.c | 20 +- + drivers/cpufreq/s3c64xx-cpufreq.c | 7 - + drivers/cpufreq/scpi-cpufreq.c | 2 - + drivers/cpufreq/ti-cpufreq.c | 119 +++- + drivers/cpufreq/vexpress-spc-cpufreq.c | 584 +++++++++++++++++- + 54 files changed, 894 insertions(+), 839 deletions(-) + delete mode 100644 drivers/cpufreq/arm_big_little.c + delete mode 100644 drivers/cpufreq/arm_big_little.h +Merging cpupower/cpupower (d80a4ac20800 cpupower : Handle set and info subcommands correctly) +$ git merge cpupower/cpupower +Merge made by the 'recursive' strategy. + tools/power/cpupower/utils/cpupower-info.c | 9 +++++++++ + tools/power/cpupower/utils/cpupower-set.c | 9 +++++++++ + tools/power/cpupower/utils/idle_monitor/hsw_ext_idle.c | 1 - + 3 files changed, 18 insertions(+), 1 deletion(-) +Merging opp/opp/linux-next (c86487ec42bd Merge branch 'opp/fixes' into opp/linux-next) +$ git merge opp/opp/linux-next +Merge made by the 'recursive' strategy. +Merging thermal/thermal/linux-next (7d0f31b2fee5 drivers: thermal: tsens: fix potential integer overflow on multiply) +$ git merge thermal/thermal/linux-next +Auto-merging drivers/cpufreq/cpufreq-dt-platdev.c +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 + + 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 | 11 + + drivers/thermal/Makefile | 1 + + drivers/thermal/amlogic_thermal.c | 333 +++++++++++++ + 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 | 103 +--- + drivers/thermal/thermal_mmio.c | 1 - + include/linux/cpu_cooling.h | 18 +- + include/linux/thermal.h | 11 - + kernel/sched/cpufreq_schedutil.c | 2 +- + 34 files changed, 1709 insertions(+), 345 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 (812cd88749e0 firewire: mark expected switch fall-throughs) +$ git merge ieee1394/for-next +Auto-merging drivers/firewire/core-topology.c +Auto-merging drivers/firewire/core-iso.c +Auto-merging drivers/firewire/core-device.c +Merge made by the 'recursive' strategy. +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 (84a92ffd0eea RDMA/qedr: Add iWARP doorbell recovery support) +$ git merge rdma/for-next +Removing include/uapi/rdma/nes-abi.h +Removing include/uapi/rdma/cxgb3-abi.h +Auto-merging include/rdma/ib_verbs.h +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging drivers/infiniband/sw/siw/siw_verbs.c +Auto-merging drivers/infiniband/hw/qedr/main.c +Auto-merging drivers/infiniband/hw/mlx5/qp.c +Auto-merging drivers/infiniband/hw/mlx5/mr.c +CONFLICT (content): Merge conflict in drivers/infiniband/hw/mlx5/mr.c +Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v2.c +Removing drivers/infiniband/hw/cxgb3/tcb.h +Removing drivers/infiniband/hw/cxgb3/iwch_qp.c +Removing drivers/infiniband/hw/cxgb3/iwch_provider.h +Removing drivers/infiniband/hw/cxgb3/iwch_provider.c +Removing drivers/infiniband/hw/cxgb3/iwch_mem.c +Removing drivers/infiniband/hw/cxgb3/iwch_ev.c +Removing drivers/infiniband/hw/cxgb3/iwch_cq.c +Removing drivers/infiniband/hw/cxgb3/iwch_cm.h +Removing drivers/infiniband/hw/cxgb3/iwch_cm.c +Removing drivers/infiniband/hw/cxgb3/iwch.h +Removing drivers/infiniband/hw/cxgb3/iwch.c +Removing drivers/infiniband/hw/cxgb3/cxio_wr.h +Removing drivers/infiniband/hw/cxgb3/cxio_resource.h +Removing drivers/infiniband/hw/cxgb3/cxio_resource.c +Removing drivers/infiniband/hw/cxgb3/cxio_hal.h +Removing drivers/infiniband/hw/cxgb3/cxio_hal.c +Removing drivers/infiniband/hw/cxgb3/Makefile +Removing drivers/infiniband/hw/cxgb3/Kconfig +Auto-merging drivers/infiniband/core/verbs.c +Auto-merging drivers/infiniband/core/nldev.c +Auto-merging drivers/infiniband/core/device.c +Auto-merging drivers/infiniband/core/core_priv.h +Auto-merging MAINTAINERS +Auto-merging Documentation/driver-api/index.rst +Recorded preimage for 'drivers/infiniband/hw/mlx5/mr.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/infiniband/hw/mlx5/mr.c'. +[master ec6281fc5ee4] Merge remote-tracking branch 'rdma/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/stable/sysfs-class-infiniband | 19 - + Documentation/ABI/stable/sysfs-driver-ib_srp | 2 + + Documentation/driver-api/index.rst | 1 + + Documentation/driver-api/infiniband.rst | 127 ++ + MAINTAINERS | 8 - + drivers/infiniband/Kconfig | 1 - + drivers/infiniband/core/Makefile | 2 +- + drivers/infiniband/core/cache.c | 8 +- + drivers/infiniband/core/cm.c | 42 +- + drivers/infiniband/core/cm_msgs.h | 32 +- + drivers/infiniband/core/cma.c | 92 +- + drivers/infiniband/core/core_priv.h | 14 + + drivers/infiniband/core/counters.c | 40 +- + drivers/infiniband/core/device.c | 43 +- + drivers/infiniband/core/ib_core_uverbs.c | 299 +++ + drivers/infiniband/core/iwpm_util.h | 5 +- + drivers/infiniband/core/nldev.c | 141 +- + drivers/infiniband/core/rdma_core.c | 1 + + drivers/infiniband/core/restrack.c | 20 +- + drivers/infiniband/core/restrack.h | 1 - + drivers/infiniband/core/rw.c | 25 +- + drivers/infiniband/core/sa_query.c | 2 +- + drivers/infiniband/core/sysfs.c | 2 +- + drivers/infiniband/core/umem_odp.c | 38 +- + drivers/infiniband/core/uverbs_cmd.c | 2 + + drivers/infiniband/core/uverbs_ioctl.c | 3 + + drivers/infiniband/core/uverbs_main.c | 88 +- + drivers/infiniband/core/verbs.c | 2 + + drivers/infiniband/hw/Makefile | 1 - + drivers/infiniband/hw/bnxt_re/bnxt_re.h | 1 + + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 18 - + drivers/infiniband/hw/bnxt_re/ib_verbs.h | 3 - + drivers/infiniband/hw/bnxt_re/main.c | 134 +- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 5 +- + drivers/infiniband/hw/cxgb3/Kconfig | 19 - + drivers/infiniband/hw/cxgb3/Makefile | 7 - + drivers/infiniband/hw/cxgb3/cxio_hal.c | 1312 ------------ + drivers/infiniband/hw/cxgb3/cxio_hal.h | 204 -- + drivers/infiniband/hw/cxgb3/cxio_resource.c | 344 --- + drivers/infiniband/hw/cxgb3/cxio_resource.h | 69 - + drivers/infiniband/hw/cxgb3/cxio_wr.h | 802 ------- + drivers/infiniband/hw/cxgb3/iwch.c | 282 --- + drivers/infiniband/hw/cxgb3/iwch.h | 155 -- + drivers/infiniband/hw/cxgb3/iwch_cm.c | 2258 -------------------- + drivers/infiniband/hw/cxgb3/iwch_cm.h | 233 -- + drivers/infiniband/hw/cxgb3/iwch_cq.c | 230 -- + drivers/infiniband/hw/cxgb3/iwch_ev.c | 232 -- + drivers/infiniband/hw/cxgb3/iwch_mem.c | 101 - + drivers/infiniband/hw/cxgb3/iwch_provider.c | 1321 ------------ + drivers/infiniband/hw/cxgb3/iwch_provider.h | 347 --- + drivers/infiniband/hw/cxgb3/iwch_qp.c | 1082 ---------- + drivers/infiniband/hw/cxgb3/tcb.h | 632 ------ + drivers/infiniband/hw/cxgb4/provider.c | 7 +- + drivers/infiniband/hw/efa/efa.h | 18 +- + drivers/infiniband/hw/efa/efa_main.c | 1 + + drivers/infiniband/hw/efa/efa_verbs.c | 329 ++- + drivers/infiniband/hw/hns/Kconfig | 17 +- + drivers/infiniband/hw/hns/Makefile | 8 +- + drivers/infiniband/hw/hns/hns_roce_ah.c | 14 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 6 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 26 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 4 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 6 +- + drivers/infiniband/hw/hns/hns_roce_qp.c | 34 +- + drivers/infiniband/hw/hns/hns_roce_restrack.c | 10 +- + drivers/infiniband/hw/hns/hns_roce_srq.c | 24 +- + drivers/infiniband/hw/mlx4/main.c | 9 +- + drivers/infiniband/hw/mlx5/Makefile | 2 +- + drivers/infiniband/hw/mlx5/cq.c | 33 +- + drivers/infiniband/hw/mlx5/devx.c | 8 +- + drivers/infiniband/hw/mlx5/gsi.c | 2 +- + drivers/infiniband/hw/mlx5/main.c | 64 +- + drivers/infiniband/hw/mlx5/mem.c | 199 ++ + drivers/infiniband/hw/mlx5/mlx5_ib.h | 53 +- + drivers/infiniband/hw/mlx5/mr.c | 175 +- + drivers/infiniband/hw/mlx5/odp.c | 989 +++++---- + drivers/infiniband/hw/mlx5/qp.c | 12 +- + drivers/infiniband/hw/mlx5/restrack.c | 90 + + drivers/infiniband/hw/qedr/main.c | 4 +- + drivers/infiniband/hw/qedr/qedr.h | 72 +- + drivers/infiniband/hw/qedr/qedr_iw_cm.c | 148 +- + drivers/infiniband/hw/qedr/verbs.c | 627 ++++-- + drivers/infiniband/hw/qedr/verbs.h | 3 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_dev_api.h | 15 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c | 115 +- + drivers/infiniband/sw/rdmavt/ah.c | 1 - + drivers/infiniband/sw/rdmavt/cq.c | 2 - + drivers/infiniband/sw/rdmavt/qp.c | 30 +- + drivers/infiniband/sw/rdmavt/vt.c | 3 +- + drivers/infiniband/sw/rxe/rxe.c | 13 - + drivers/infiniband/sw/rxe/rxe_param.h | 13 - + drivers/infiniband/sw/rxe/rxe_verbs.c | 7 + + drivers/infiniband/sw/rxe/rxe_verbs.h | 1 + + drivers/infiniband/sw/siw/siw.h | 21 +- + drivers/infiniband/sw/siw/siw_cm.c | 45 +- + drivers/infiniband/sw/siw/siw_main.c | 35 +- + drivers/infiniband/sw/siw/siw_verbs.c | 350 +-- + drivers/infiniband/sw/siw/siw_verbs.h | 1 + + drivers/infiniband/ulp/iser/iscsi_iser.c | 5 +- + drivers/infiniband/ulp/iser/iscsi_iser.h | 34 +- + drivers/infiniband/ulp/iser/iser_initiator.c | 5 + + drivers/infiniband/ulp/iser/iser_memory.c | 6 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 72 +- + .../infiniband/ulp/opa_vnic/opa_vnic_internal.h | 8 +- + drivers/infiniband/ulp/srp/ib_srp.c | 47 +- + drivers/infiniband/ulp/srp/ib_srp.h | 4 + + drivers/infiniband/ulp/srpt/ib_srpt.c | 225 +- + drivers/infiniband/ulp/srpt/ib_srpt.h | 58 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 4 - + drivers/net/ethernet/mellanox/mlx5/core/mr.c | 28 +- + include/linux/mlx5/driver.h | 4 - + include/linux/mlx5/mlx5_ifc.h | 2 +- + include/rdma/ib_cm.h | 32 +- + include/rdma/ib_umem_odp.h | 18 - + include/rdma/ib_verbs.h | 65 +- + include/rdma/restrack.h | 5 + + include/uapi/rdma/cxgb3-abi.h | 82 - + include/uapi/rdma/ib_user_ioctl_verbs.h | 22 + + include/uapi/rdma/nes-abi.h | 115 - + include/uapi/rdma/qedr-abi.h | 25 + + include/uapi/rdma/rdma_user_ioctl_cmds.h | 22 - + include/uapi/rdma/vmw_pvrdma-abi.h | 5 + + 122 files changed, 3440 insertions(+), 11951 deletions(-) + create mode 100644 Documentation/driver-api/infiniband.rst + create mode 100644 drivers/infiniband/core/ib_core_uverbs.c + delete mode 100644 drivers/infiniband/hw/cxgb3/Kconfig + delete mode 100644 drivers/infiniband/hw/cxgb3/Makefile + delete mode 100644 drivers/infiniband/hw/cxgb3/cxio_hal.c + delete mode 100644 drivers/infiniband/hw/cxgb3/cxio_hal.h + delete mode 100644 drivers/infiniband/hw/cxgb3/cxio_resource.c + delete mode 100644 drivers/infiniband/hw/cxgb3/cxio_resource.h + delete mode 100644 drivers/infiniband/hw/cxgb3/cxio_wr.h + delete mode 100644 drivers/infiniband/hw/cxgb3/iwch.c + delete mode 100644 drivers/infiniband/hw/cxgb3/iwch.h + delete mode 100644 drivers/infiniband/hw/cxgb3/iwch_cm.c + delete mode 100644 drivers/infiniband/hw/cxgb3/iwch_cm.h + delete mode 100644 drivers/infiniband/hw/cxgb3/iwch_cq.c + delete mode 100644 drivers/infiniband/hw/cxgb3/iwch_ev.c + delete mode 100644 drivers/infiniband/hw/cxgb3/iwch_mem.c + delete mode 100644 drivers/infiniband/hw/cxgb3/iwch_provider.c + delete mode 100644 drivers/infiniband/hw/cxgb3/iwch_provider.h + delete mode 100644 drivers/infiniband/hw/cxgb3/iwch_qp.c + delete mode 100644 drivers/infiniband/hw/cxgb3/tcb.h + create mode 100644 drivers/infiniband/hw/mlx5/restrack.c + delete mode 100644 include/uapi/rdma/cxgb3-abi.h + delete mode 100644 include/uapi/rdma/nes-abi.h +Merging net-next/master (56c1291ee48b bpf: re-fix skip write only files in debugfs) +$ git merge net-next/master +Auto-merging tools/testing/selftests/bpf/test_sysctl.c +Removing tools/testing/selftests/bpf/test_libbpf_open.c +Removing tools/testing/selftests/bpf/test_libbpf.sh +Removing tools/testing/selftests/bpf/bpf_helpers.h +Auto-merging samples/bpf/Makefile +CONFLICT (content): Merge conflict in samples/bpf/Makefile +Auto-merging kernel/bpf/syscall.c +Auto-merging include/linux/bpf.h +Auto-merging drivers/staging/Makefile +CONFLICT (content): Merge conflict in drivers/staging/Makefile +Auto-merging drivers/staging/Kconfig +CONFLICT (content): Merge conflict in drivers/staging/Kconfig +Auto-merging drivers/spi/spi.c +Auto-merging drivers/s390/net/qeth_l3.h +Auto-merging drivers/s390/cio/qdio_main.c +Auto-merging drivers/s390/cio/qdio.h +Auto-merging drivers/net/ethernet/pensando/ionic/ionic_if.h +Removing drivers/net/ethernet/mellanox/mlx5/core/steering/dr_crc32.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c +Auto-merging drivers/net/ethernet/freescale/fec_main.c +Auto-merging drivers/net/ethernet/faraday/ftgmac100.c +Auto-merging drivers/isdn/hardware/mISDN/mISDNisar.c +Removing drivers/bluetooth/btwilink.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/net/sh_eth.txt +Removing Documentation/devicetree/bindings/net/nfc/pn533-i2c.txt +Recorded preimage for 'drivers/staging/Kconfig' +Recorded preimage for 'drivers/staging/Makefile' +Resolved 'samples/bpf/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/staging/Kconfig'. +Recorded resolution for 'drivers/staging/Makefile'. +[master 7668c2ced87a] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-class-net-statistics | 16 + + Documentation/bpf/index.rst | 9 + + Documentation/bpf/prog_flow_dissector.rst | 3 + + Documentation/bpf/s390.rst | 205 +++ + .../devicetree/bindings/net/ftgmac100.txt | 8 + + Documentation/devicetree/bindings/net/lpc-eth.txt | 5 + + .../devicetree/bindings/net/nfc/pn532.txt | 46 + + .../devicetree/bindings/net/nfc/pn533-i2c.txt | 29 - + .../devicetree/bindings/net/renesas,ether.yaml | 114 ++ + Documentation/devicetree/bindings/net/sh_eth.txt | 69 - + .../devicetree/bindings/ptp/ptp-idtcm.yaml | 69 + + Documentation/networking/af_xdp.rst | 259 +++- + .../device_drivers/freescale/dpaa2/index.rst | 1 + + .../freescale/dpaa2/mac-phy-support.rst | 191 +++ + .../networking/devlink-params-mv88e6xxx.txt | 7 + + Documentation/networking/tls.rst | 26 + + MAINTAINERS | 18 +- + arch/x86/mm/Makefile | 2 +- + arch/x86/mm/maccess.c | 43 + + arch/x86/net/bpf_jit_comp.c | 107 +- + drivers/atm/firestream.c | 2 +- + drivers/bluetooth/Kconfig | 11 - + drivers/bluetooth/Makefile | 1 - + drivers/bluetooth/btintel.c | 45 + + drivers/bluetooth/btintel.h | 5 + + drivers/bluetooth/btrtl.c | 2 +- + drivers/bluetooth/btusb.c | 54 +- + drivers/bluetooth/btwilink.c | 337 ----- + drivers/bluetooth/hci_bcm.c | 2 + + drivers/bluetooth/hci_ll.c | 39 +- + drivers/bluetooth/hci_nokia.c | 2 +- + drivers/bluetooth/hci_qca.c | 135 +- + drivers/bus/fsl-mc/dprc-driver.c | 6 +- + drivers/bus/fsl-mc/dprc.c | 53 + + drivers/bus/fsl-mc/fsl-mc-bus.c | 43 + + drivers/bus/fsl-mc/fsl-mc-private.h | 42 + + drivers/crypto/chelsio/Kconfig | 2 +- + drivers/crypto/chelsio/chtls/chtls.h | 5 +- + drivers/crypto/chelsio/chtls/chtls_main.c | 20 +- + drivers/firmware/broadcom/Kconfig | 8 + + drivers/firmware/broadcom/Makefile | 1 + + drivers/firmware/broadcom/tee_bnxt_fw.c | 279 ++++ + drivers/isdn/hardware/mISDN/hfcsusb.h | 4 +- + drivers/isdn/hardware/mISDN/mISDNisar.c | 1 - + drivers/net/bonding/bond_main.c | 77 +- + drivers/net/caif/Kconfig | 16 +- + drivers/net/dsa/Kconfig | 1 + + drivers/net/dsa/b53/b53_common.c | 73 +- + drivers/net/dsa/b53/b53_priv.h | 8 +- + drivers/net/dsa/bcm_sf2.c | 18 +- + drivers/net/dsa/bcm_sf2_cfp.c | 6 +- + drivers/net/dsa/dsa_loop.c | 5 +- + drivers/net/dsa/lan9303-core.c | 4 +- + drivers/net/dsa/lantiq_gswip.c | 4 +- + drivers/net/dsa/microchip/ksz9477_i2c.c | 1 - + drivers/net/dsa/microchip/ksz_common.c | 12 +- + drivers/net/dsa/mt7530.c | 23 +- + drivers/net/dsa/mv88e6060.c | 4 +- + drivers/net/dsa/mv88e6xxx/chip.c | 229 ++- + drivers/net/dsa/mv88e6xxx/chip.h | 4 + + drivers/net/dsa/mv88e6xxx/global1.h | 3 + + drivers/net/dsa/mv88e6xxx/global1_atu.c | 32 + + drivers/net/dsa/qca8k.c | 14 +- + drivers/net/dsa/realtek-smi-core.c | 5 +- + drivers/net/dsa/sja1105/sja1105.h | 35 +- + drivers/net/dsa/sja1105/sja1105_clocking.c | 65 +- + drivers/net/dsa/sja1105/sja1105_dynamic_config.c | 12 +- + drivers/net/dsa/sja1105/sja1105_ethtool.c | 16 +- + drivers/net/dsa/sja1105/sja1105_main.c | 350 ++--- + drivers/net/dsa/sja1105/sja1105_ptp.c | 548 +++++--- + drivers/net/dsa/sja1105/sja1105_ptp.h | 91 +- + drivers/net/dsa/sja1105/sja1105_spi.c | 251 ++-- + drivers/net/dsa/vitesse-vsc73xx-core.c | 5 +- + drivers/net/ethernet/Kconfig | 1 - + drivers/net/ethernet/Makefile | 1 - + drivers/net/ethernet/altera/altera_tse_main.c | 6 +- + drivers/net/ethernet/amazon/ena/ena_ethtool.c | 35 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 158 ++- + drivers/net/ethernet/amazon/ena/ena_netdev.h | 14 +- + drivers/net/ethernet/aquantia/atlantic/Makefile | 3 + + drivers/net/ethernet/aquantia/atlantic/aq_cfg.h | 4 +- + .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 35 +- + .../net/ethernet/aquantia/atlantic/aq_filters.c | 17 +- + drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 48 +- + drivers/net/ethernet/aquantia/atlantic/aq_main.c | 105 +- + drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 96 +- + drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 16 +- + .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 5 +- + drivers/net/ethernet/aquantia/atlantic/aq_phy.c | 147 ++ + drivers/net/ethernet/aquantia/atlantic/aq_phy.h | 32 + + drivers/net/ethernet/aquantia/atlantic/aq_ptp.c | 1392 ++++++++++++++++++ + drivers/net/ethernet/aquantia/atlantic/aq_ptp.h | 140 ++ + drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 57 +- + drivers/net/ethernet/aquantia/atlantic/aq_ring.h | 7 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 327 ++++- + .../aquantia/atlantic/hw_atl/hw_atl_b0_internal.h | 9 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c | 96 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h | 58 +- + .../aquantia/atlantic/hw_atl/hw_atl_llh_internal.h | 223 ++- + .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 7 +- + .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 174 ++- + .../aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c | 97 +- + drivers/net/ethernet/arc/emac_arc.c | 15 +- + drivers/net/ethernet/arc/emac_rockchip.c | 7 +- + drivers/net/ethernet/atheros/ag71xx.c | 5 +- + drivers/net/ethernet/aurora/nb8800.c | 4 +- + drivers/net/ethernet/aurora/nb8800.h | 2 +- + drivers/net/ethernet/broadcom/b44.c | 3 - + drivers/net/ethernet/broadcom/bcmsysport.c | 4 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 60 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 18 + + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 9 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 37 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h | 2 + + drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 416 +++++- + drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h | 20 + + drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 10 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h | 3 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 23 +- + drivers/net/ethernet/broadcom/genet/bcmmii.c | 8 +- + drivers/net/ethernet/cadence/macb_main.c | 7 +- + drivers/net/ethernet/calxeda/xgmac.c | 2 +- + drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 12 +- + drivers/net/ethernet/chelsio/cxgb4/l2t.c | 8 +- + drivers/net/ethernet/faraday/ftgmac100.c | 56 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 370 ++--- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.h | 12 +- + .../net/ethernet/freescale/dpaa/dpaa_eth_sysfs.c | 6 +- + drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 68 +- + drivers/net/ethernet/freescale/dpaa2/Makefile | 2 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 165 ++- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 11 + + .../net/ethernet/freescale/dpaa2/dpaa2-ethtool.c | 27 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 302 ++++ + drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h | 32 + + drivers/net/ethernet/freescale/dpaa2/dpmac-cmd.h | 62 + + drivers/net/ethernet/freescale/dpaa2/dpmac.c | 149 ++ + drivers/net/ethernet/freescale/dpaa2/dpmac.h | 144 ++ + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 4 +- + drivers/net/ethernet/freescale/fec_main.c | 8 +- + drivers/net/ethernet/freescale/fman/fman.c | 6 +- + drivers/net/ethernet/freescale/fman/fman_port.c | 17 +- + drivers/net/ethernet/freescale/fman/fman_port.h | 2 + + drivers/net/ethernet/freescale/fman/mac.c | 6 +- + drivers/net/ethernet/freescale/gianfar.c | 7 +- + drivers/net/ethernet/hisilicon/hip04_eth.c | 7 +- + drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 5 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 4 +- + drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 5 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.c | 2 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 27 +- + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 93 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 588 ++++---- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 36 +- + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 45 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 7 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 39 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 2 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 188 ++- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 2 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 547 +++++++- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 20 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 100 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 2 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 47 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 8 + + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c | 10 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 114 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 1 + + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c | 30 +- + drivers/net/ethernet/ibm/emac/core.c | 5 +- + drivers/net/ethernet/intel/e1000e/ethtool.c | 4 +- + drivers/net/ethernet/intel/e1000e/hw.h | 12 + + drivers/net/ethernet/intel/e1000e/ich8lan.c | 7 + + drivers/net/ethernet/intel/e1000e/netdev.c | 273 +++- + drivers/net/ethernet/intel/e1000e/ptp.c | 2 + + drivers/net/ethernet/intel/e1000e/regs.h | 4 + + drivers/net/ethernet/intel/i40e/i40e.h | 1 + + drivers/net/ethernet/intel/i40e/i40e_adminq.c | 71 +- + drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 8 +- + drivers/net/ethernet/intel/i40e/i40e_common.c | 116 +- + drivers/net/ethernet/intel/i40e/i40e_dcb.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_dcb.h | 3 + + drivers/net/ethernet/intel/i40e/i40e_devids.h | 2 + + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 41 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 31 +- + drivers/net/ethernet/intel/i40e/i40e_nvm.c | 61 +- + drivers/net/ethernet/intel/i40e/i40e_prototype.h | 36 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 12 +- + drivers/net/ethernet/intel/i40e/i40e_type.h | 1 + + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 45 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 1 - + drivers/net/ethernet/intel/igb/e1000_82575.h | 1 + + drivers/net/ethernet/intel/igb/igb_main.c | 23 +- + drivers/net/ethernet/intel/igc/igc.h | 1 - + drivers/net/ethernet/intel/igc/igc_defines.h | 8 +- + drivers/net/ethernet/intel/igc/igc_hw.h | 1 + + drivers/net/ethernet/intel/igc/igc_mac.c | 104 ++ + drivers/net/ethernet/intel/igc/igc_mac.h | 2 + + drivers/net/ethernet/intel/igc/igc_main.c | 226 ++- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 24 +- + drivers/net/ethernet/marvell/Kconfig | 1 + + drivers/net/ethernet/marvell/mv643xx_eth.c | 7 +- + drivers/net/ethernet/marvell/mvneta.c | 625 +++++++-- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 30 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 4 +- + drivers/net/ethernet/mediatek/mtk_eth_path.c | 6 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 8 +- + drivers/net/ethernet/mediatek/mtk_sgmii.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 2 +- + .../ethernet/mellanox/mlx5/core/en/port_buffer.c | 2 +- + .../ethernet/mellanox/mlx5/core/en/reporter_rx.c | 6 +- + .../ethernet/mellanox/mlx5/core/en/reporter_tx.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 129 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 6 + + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 13 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 4 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/fpga/cmd.h | 10 +- + .../net/ethernet/mellanox/mlx5/core/fpga/core.c | 61 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 89 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 1 + + drivers/net/ethernet/mellanox/mlx5/core/health.c | 12 +- + drivers/net/ethernet/mellanox/mlx5/core/lag.c | 65 +- + drivers/net/ethernet/mellanox/mlx5/core/lag.h | 5 + + drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c | 78 +- + drivers/net/ethernet/mellanox/mlx5/core/lag_mp.h | 6 + + drivers/net/ethernet/mellanox/mlx5/core/main.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/sriov.c | 10 +- + .../mellanox/mlx5/core/steering/dr_crc32.c | 98 -- + .../mellanox/mlx5/core/steering/dr_domain.c | 3 - + .../mellanox/mlx5/core/steering/dr_matcher.c | 65 +- + .../ethernet/mellanox/mlx5/core/steering/dr_rule.c | 13 +- + .../ethernet/mellanox/mlx5/core/steering/dr_ste.c | 10 +- + .../mellanox/mlx5/core/steering/dr_types.h | 20 +- + drivers/net/ethernet/mellanox/mlx5/core/wq.c | 38 +- + drivers/net/ethernet/mellanox/mlx5/core/wq.h | 25 +- + drivers/net/ethernet/mellanox/mlxsw/core.c | 53 +- + drivers/net/ethernet/mellanox/mlxsw/core.h | 18 +- + drivers/net/ethernet/mellanox/mlxsw/core_env.c | 23 +- + drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c | 66 +- + drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 40 +- + drivers/net/ethernet/mellanox/mlxsw/i2c.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/minimal.c | 34 +- + drivers/net/ethernet/mellanox/mlxsw/pci.c | 18 +- + drivers/net/ethernet/mellanox/mlxsw/pci_hw.h | 7 +- + drivers/net/ethernet/mellanox/mlxsw/port.h | 2 - + drivers/net/ethernet/mellanox/mlxsw/reg.h | 77 +- + drivers/net/ethernet/mellanox/mlxsw/resources.h | 6 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 497 +++++-- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 33 +- + .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 57 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c | 2 +- + .../net/ethernet/mellanox/mlxsw/spectrum_qdisc.c | 3 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 59 +- + .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 21 + + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/switchib.c | 3 +- + drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 4 +- + drivers/net/ethernet/mscc/ocelot_board.c | 12 +- + drivers/net/ethernet/netronome/nfp/bpf/jit.c | 2 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 3 +- + drivers/net/ethernet/ni/nixge.c | 5 +- + drivers/net/ethernet/nxp/lpc_eth.c | 28 +- + drivers/net/ethernet/pensando/ionic/ionic.h | 4 +- + drivers/net/ethernet/pensando/ionic/ionic_dev.c | 60 +- + drivers/net/ethernet/pensando/ionic/ionic_dev.h | 12 + + .../net/ethernet/pensando/ionic/ionic_devlink.c | 9 +- + .../net/ethernet/pensando/ionic/ionic_ethtool.c | 128 +- + drivers/net/ethernet/pensando/ionic/ionic_if.h | 196 +-- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 41 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.h | 13 +- + drivers/net/ethernet/pensando/ionic/ionic_main.c | 24 +- + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 290 ++-- + drivers/net/ethernet/qlogic/qed/qed_int.h | 4 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.h | 2 +- + drivers/net/ethernet/qlogic/qede/qede_filter.c | 2 +- + drivers/net/ethernet/realtek/r8169_main.c | 97 +- + drivers/net/ethernet/renesas/ravb_main.c | 4 +- + drivers/net/ethernet/renesas/sh_eth.c | 7 +- + drivers/net/ethernet/rocker/rocker_main.c | 9 +- + .../net/ethernet/samsung/sxgbe/sxgbe_platform.c | 5 +- + drivers/net/ethernet/sfc/ef10.c | 14 +- + drivers/net/ethernet/sfc/efx.c | 269 +++- + drivers/net/ethernet/sfc/efx.h | 3 + + drivers/net/ethernet/sfc/ethtool.c | 25 + + drivers/net/ethernet/sfc/net_driver.h | 64 +- + drivers/net/ethernet/sfc/rx.c | 149 +- + drivers/net/ethernet/sfc/tx.c | 92 ++ + drivers/net/ethernet/sgi/ioc3-eth.c | 62 +- + drivers/net/ethernet/socionext/netsec.c | 9 +- + drivers/net/ethernet/socionext/sni_ave.c | 6 +- + .../net/ethernet/stmicro/stmmac/dwmac-anarion.c | 10 +- + .../net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 5 +- + .../net/ethernet/stmicro/stmmac/dwmac-mediatek.c | 36 +- + .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 5 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 9 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 6 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 7 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 8 +- + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 2 - + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 22 + + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 119 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 29 + + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h | 3 + + .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 17 +- + drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 5 +- + drivers/net/ethernet/stmicro/stmmac/hwif.h | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 25 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 6 +- + .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 114 +- + drivers/net/ethernet/ti/cpsw.c | 5 +- + drivers/net/ethernet/ti/cpsw_priv.h | 2 +- + drivers/net/ethernet/ti/netcp_ethss.c | 5 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 6 +- + drivers/net/ipvlan/ipvlan_main.c | 4 +- + drivers/net/netdevsim/Makefile | 2 +- + drivers/net/netdevsim/bus.c | 1 + + drivers/net/netdevsim/dev.c | 371 ++--- + drivers/net/netdevsim/fib.c | 176 ++- + drivers/net/netdevsim/health.c | 325 +++++ + drivers/net/netdevsim/netdev.c | 10 +- + drivers/net/netdevsim/netdevsim.h | 33 +- + drivers/net/phy/at803x.c | 33 +- + drivers/net/phy/broadcom.c | 89 +- + drivers/net/phy/dp83867.c | 152 +- + drivers/net/phy/marvell.c | 255 +++- + drivers/net/phy/mscc.c | 14 +- + drivers/net/phy/phy-core.c | 16 +- + drivers/net/phy/phy_device.c | 141 +- + drivers/net/phy/phylink.c | 28 +- + drivers/net/phy/sfp-bus.c | 65 +- + drivers/net/team/team.c | 5 +- + drivers/net/tun.c | 17 +- + drivers/net/usb/ax88179_178a.c | 34 +- + drivers/net/usb/lan78xx.c | 3 - + drivers/net/usb/r8152.c | 1219 ++++++++++++++-- + drivers/net/vxlan.c | 5 +- + drivers/net/wimax/i2400m/debugfs.c | 6 +- + drivers/net/wimax/i2400m/usb.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9003_hw.c | 2 +- + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 2 +- + drivers/net/wireless/ath/ath9k/main.c | 2 +- + drivers/net/wireless/ath/carl9170/main.c | 3 +- + drivers/net/wireless/ath/wcn36xx/main.c | 5 +- + .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 3 +- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 2 +- + drivers/net/wireless/intel/iwlwifi/dvm/tx.c | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-fh.h | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 5 +- + drivers/net/wireless/mac80211_hwsim.c | 37 +- + drivers/net/wireless/marvell/mwl8k.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7603/main.c | 3 +- + drivers/net/wireless/mediatek/mt76/mt7615/main.c | 3 +- + drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 3 +- + drivers/net/wireless/mediatek/mt7601u/main.c | 3 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 4 +- + drivers/net/wireless/realtek/rtlwifi/base.c | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/hw.c | 4 +- + drivers/net/wireless/realtek/rtw88/mac80211.c | 3 +- + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 3 +- + drivers/net/wireless/ti/wlcore/spi.c | 2 +- + drivers/net/xen-netback/interface.c | 114 +- + drivers/nfc/nfcmrvl/i2c.c | 1 - + drivers/nfc/pn533/Kconfig | 11 + + drivers/nfc/pn533/Makefile | 2 + + drivers/nfc/pn533/i2c.c | 32 +- + drivers/nfc/pn533/pn533.c | 281 +++- + drivers/nfc/pn533/pn533.h | 40 +- + drivers/nfc/pn533/uart.c | 323 +++++ + drivers/nfc/pn533/usb.c | 16 +- + drivers/nfc/s3fwrn5/i2c.c | 1 - + drivers/of/of_mdio.c | 4 +- + drivers/of/of_net.c | 16 +- + drivers/ptp/Kconfig | 12 + + drivers/ptp/Makefile | 1 + + drivers/ptp/idt8a340_reg.h | 659 +++++++++ + drivers/ptp/ptp_clockmatrix.c | 1425 +++++++++++++++++++ + drivers/ptp/ptp_clockmatrix.h | 104 ++ + drivers/ptp/ptp_dte.c | 4 +- + drivers/s390/cio/qdio.h | 1 + + drivers/s390/cio/qdio_main.c | 31 +- + drivers/s390/net/qeth_core.h | 9 + + drivers/s390/net/qeth_core_main.c | 108 +- + drivers/s390/net/qeth_core_mpc.h | 4 +- + drivers/s390/net/qeth_l2_main.c | 21 - + drivers/s390/net/qeth_l3.h | 24 +- + drivers/s390/net/qeth_l3_main.c | 41 +- + drivers/soc/fsl/qbman/qman.c | 7 + + drivers/spi/spi.c | 127 ++ + drivers/staging/Kconfig | 2 + + drivers/staging/Makefile | 1 + + drivers/{net/ethernet => staging}/hp/Kconfig | 0 + drivers/{net/ethernet => staging}/hp/Makefile | 0 + drivers/{net/ethernet => staging}/hp/hp100.c | 0 + drivers/{net/ethernet => staging}/hp/hp100.h | 0 + include/linux/bpf.h | 76 +- + include/linux/bpf_types.h | 1 + + include/linux/bpf_verifier.h | 8 +- + include/linux/brcmphy.h | 10 +- + include/linux/btf.h | 32 + + include/linux/dim.h | 63 +- + include/linux/extable.h | 10 + + include/linux/filter.h | 6 +- + include/linux/firmware/broadcom/tee_bnxt_fw.h | 14 + + include/linux/fsl/mc.h | 2 + + include/linux/linkmode.h | 6 + + include/linux/mroute_base.h | 28 +- + include/linux/netdevice.h | 22 +- + include/linux/netfilter.h | 41 +- + include/linux/netfilter/ipset/ip_set.h | 196 +-- + include/linux/netfilter/ipset/ip_set_bitmap.h | 14 - + include/linux/netfilter/ipset/ip_set_getport.h | 3 - + include/linux/of_net.h | 7 +- + include/linux/phy.h | 4 + + include/linux/sfp.h | 10 +- + include/linux/skbuff.h | 6 +- + include/linux/skmsg.h | 12 +- + include/linux/spi/spi.h | 61 + + include/linux/stmmac.h | 4 +- + include/linux/sxgbe_platform.h | 4 +- + include/linux/tcp.h | 2 +- + include/linux/uaccess.h | 16 + + include/net/act_api.h | 46 +- + include/net/addrconf.h | 6 +- + include/net/cfg80211.h | 2 +- + include/net/devlink.h | 13 +- + include/net/dsa.h | 90 +- + include/net/fib_notifier.h | 13 +- + include/net/fib_rules.h | 3 +- + include/net/flow_dissector.h | 20 +- + include/net/genetlink.h | 20 +- + include/net/ip6_fib.h | 11 +- + include/net/ip_fib.h | 11 +- + include/net/ip_vs.h | 2 +- + include/net/ipv6.h | 5 + + include/net/mac80211.h | 11 +- + include/net/net_namespace.h | 6 +- + include/net/netfilter/nf_conntrack_extend.h | 10 - + include/net/netfilter/nf_flow_table.h | 1 + + include/net/netfilter/nf_tables.h | 16 +- + include/net/netns/mib.h | 3 + + include/net/sch_generic.h | 12 +- + include/net/sctp/ulpevent.h | 16 +- + include/net/smc.h | 3 + + include/net/snmp.h | 6 + + include/net/sock.h | 3 +- + include/net/tls.h | 69 +- + include/net/tls_toe.h | 77 + + include/net/xdp_sock.h | 51 +- + include/soc/fsl/qman.h | 11 + + include/trace/bpf_probe.h | 3 +- + include/trace/events/bridge.h | 12 +- + include/trace/events/xdp.h | 2 +- + include/uapi/linux/bpf.h | 182 ++- + include/uapi/linux/dcbnl.h | 2 +- + include/uapi/linux/devlink.h | 4 + + include/uapi/linux/ethtool.h | 6 + + include/uapi/linux/if.h | 1 + + include/uapi/linux/if_link.h | 2 + + include/uapi/linux/netfilter/nf_tables.h | 2 + + include/uapi/linux/netfilter_arp/arp_tables.h | 2 +- + include/uapi/linux/netfilter_bridge/ebtables.h | 2 +- + include/uapi/linux/netfilter_ipv4/ip_tables.h | 2 +- + include/uapi/linux/netfilter_ipv6/ip6_tables.h | 2 +- + include/uapi/linux/nl80211.h | 8 + + include/uapi/linux/pkt_cls.h | 5 + + include/uapi/linux/rtnetlink.h | 7 + + include/uapi/linux/sctp.h | 16 +- + include/uapi/linux/snmp.h | 17 + + include/uapi/linux/tcp.h | 10 +- + include/uapi/linux/tipc.h | 1 + + include/uapi/linux/tipc_config.h | 4 +- + include/uapi/linux/virtio_ring.h | 2 +- + init/do_mounts.c | 49 + + kernel/bpf/btf.c | 322 ++++- + kernel/bpf/core.c | 43 +- + kernel/bpf/stackmap.c | 7 +- + kernel/bpf/syscall.c | 91 +- + kernel/bpf/verifier.c | 287 +++- + kernel/bpf/xskmap.c | 112 +- + kernel/extable.c | 2 + + kernel/trace/bpf_trace.c | 227 ++- + lib/test_bpf.c | 112 +- + mm/maccess.c | 70 +- + net/bluetooth/hci_conn.c | 8 + + net/bluetooth/hci_core.c | 13 +- + net/bluetooth/smp.c | 6 - + net/bpf/test_run.c | 9 + + net/bridge/br_fdb.c | 157 +-- + net/bridge/br_input.c | 7 +- + net/bridge/br_private.h | 24 +- + net/bridge/br_switchdev.c | 12 +- + net/caif/Kconfig | 10 +- + net/core/dev.c | 406 ++++-- + net/core/devlink.c | 264 +++- + net/core/fib_notifier.c | 95 +- + net/core/fib_rules.c | 23 +- + net/core/filter.c | 19 +- + net/core/flow_dissector.c | 155 +- + net/core/net-procfs.c | 4 +- + net/core/pktgen.c | 1 - + net/core/rtnetlink.c | 206 ++- + net/core/sock.c | 16 +- + net/core/xdp.c | 2 +- + net/dsa/dsa.c | 56 +- + net/dsa/dsa2.c | 383 +++-- + net/dsa/dsa_priv.h | 23 +- + net/dsa/port.c | 13 +- + net/dsa/slave.c | 25 +- + net/dsa/switch.c | 4 +- + net/dsa/tag_8021q.c | 11 +- + net/ieee802154/nl802154.c | 39 +- + net/ipv4/fib_notifier.c | 13 +- + net/ipv4/fib_rules.c | 5 +- + net/ipv4/fib_trie.c | 44 +- + net/ipv4/icmp.c | 3 +- + net/ipv4/igmp.c | 2 +- + net/ipv4/ip_input.c | 3 +- + net/ipv4/ipconfig.c | 10 +- + net/ipv4/ipmr.c | 13 +- + net/ipv4/ipmr_base.c | 30 +- + net/ipv4/tcp.c | 12 +- + net/ipv4/tcp_fastopen.c | 5 +- + net/ipv4/tcp_input.c | 4 + + net/ipv4/tcp_ipv4.c | 6 +- + net/ipv6/addrconf.c | 7 +- + net/ipv6/fib6_notifier.c | 11 +- + net/ipv6/fib6_rules.c | 5 +- + net/ipv6/icmp.c | 22 +- + net/ipv6/ip6_fib.c | 50 +- + net/ipv6/ip6_input.c | 3 +- + net/ipv6/ip6mr.c | 13 +- + net/ipv6/netfilter/nf_tproxy_ipv6.c | 2 +- + net/ipv6/route.c | 4 +- + net/mac80211/agg-tx.c | 9 +- + net/mac80211/ibss.c | 9 +- + net/mac80211/rc80211_minstrel.c | 48 +- + net/mac80211/rc80211_minstrel.h | 57 +- + net/mac80211/rc80211_minstrel_debugfs.c | 8 +- + net/mac80211/rc80211_minstrel_ht.c | 73 +- + net/mac80211/rc80211_minstrel_ht.h | 2 +- + net/mac80211/rc80211_minstrel_ht_debugfs.c | 8 +- + net/mac80211/tx.c | 15 +- + net/netfilter/core.c | 20 + + net/netfilter/ipset/ip_set_bitmap_gen.h | 2 +- + net/netfilter/ipset/ip_set_bitmap_ip.c | 26 +- + net/netfilter/ipset/ip_set_bitmap_ipmac.c | 18 +- + net/netfilter/ipset/ip_set_bitmap_port.c | 41 +- + net/netfilter/ipset/ip_set_core.c | 212 ++- + net/netfilter/ipset/ip_set_getport.c | 28 - + net/netfilter/ipset/ip_set_hash_gen.h | 4 +- + net/netfilter/ipset/ip_set_hash_ip.c | 10 +- + net/netfilter/ipset/ip_set_hash_ipmac.c | 8 +- + net/netfilter/ipset/ip_set_hash_ipmark.c | 8 +- + net/netfilter/ipset/ip_set_hash_ipport.c | 8 +- + net/netfilter/ipset/ip_set_hash_ipportip.c | 8 +- + net/netfilter/ipset/ip_set_hash_ipportnet.c | 24 +- + net/netfilter/ipset/ip_set_hash_mac.c | 6 +- + net/netfilter/ipset/ip_set_hash_net.c | 24 +- + net/netfilter/ipset/ip_set_hash_netiface.c | 24 +- + net/netfilter/ipset/ip_set_hash_netnet.c | 28 +- + net/netfilter/ipset/ip_set_hash_netport.c | 24 +- + net/netfilter/ipset/ip_set_hash_netportnet.c | 28 +- + net/netfilter/ipset/ip_set_list_set.c | 4 +- + net/netfilter/ipvs/ip_vs_core.c | 47 +- + net/netfilter/ipvs/ip_vs_ctl.c | 12 +- + net/netfilter/ipvs/ip_vs_ovf.c | 2 +- + net/netfilter/ipvs/ip_vs_xmit.c | 18 +- + net/netfilter/nf_conntrack_core.c | 2 - + net/netfilter/nf_conntrack_ecache.c | 23 +- + net/netfilter/nf_conntrack_extend.c | 21 +- + net/netfilter/nf_conntrack_netlink.c | 76 +- + net/netfilter/nf_tables_api.c | 572 +++++--- + net/netfilter/nf_tables_offload.c | 188 ++- + net/netfilter/nft_chain_filter.c | 45 +- + net/netlink/genetlink.c | 303 ++-- + net/nfc/netlink.c | 17 +- + net/openvswitch/conntrack.c | 21 +- + net/openvswitch/datapath.c | 65 +- + net/openvswitch/flow.h | 1 - + net/openvswitch/flow_table.c | 381 ++++- + net/openvswitch/flow_table.h | 19 +- + net/qrtr/tun.c | 6 +- + net/rds/ib.c | 10 +- + net/rds/ib.h | 15 +- + net/rds/ib_cm.c | 167 ++- + net/rds/ib_recv.c | 13 +- + net/rds/ib_send.c | 19 +- + net/rxrpc/peer_object.c | 2 + + net/sched/act_api.c | 55 +- + net/sched/act_bpf.c | 5 +- + net/sched/act_connmark.c | 4 +- + net/sched/act_csum.c | 10 +- + net/sched/act_ct.c | 16 +- + net/sched/act_ctinfo.c | 4 +- + net/sched/act_gact.c | 21 +- + net/sched/act_ife.c | 5 +- + net/sched/act_ipt.c | 12 +- + net/sched/act_mirred.c | 19 +- + net/sched/act_mpls.c | 5 +- + net/sched/act_nat.c | 4 +- + net/sched/act_pedit.c | 5 +- + net/sched/act_police.c | 14 +- + net/sched/act_sample.c | 4 +- + net/sched/act_simple.c | 5 +- + net/sched/act_skbedit.c | 4 +- + net/sched/act_skbmod.c | 4 +- + net/sched/act_tunnel_key.c | 9 +- + net/sched/act_vlan.c | 16 +- + net/sched/sch_fq.c | 3 +- + net/sched/sch_fq_codel.c | 1 - + net/sched/sch_generic.c | 16 +- + net/sctp/associola.c | 22 +- + net/sctp/chunk.c | 40 +- + net/sctp/ulpevent.c | 57 +- + net/smc/af_smc.c | 4 + + net/smc/smc.h | 1 + + net/smc/smc_cdc.c | 4 +- + net/smc/smc_close.c | 70 +- + net/smc/smc_close.h | 2 + + net/smc/smc_core.c | 238 +++- + net/smc/smc_core.h | 9 + + net/smc/smc_ib.c | 15 +- + net/smc/smc_ib.h | 1 + + net/smc/smc_ism.c | 5 + + net/smc/smc_llc.c | 2 +- + net/smc/smc_pnet.c | 5 +- + net/smc/smc_rx.c | 10 +- + net/smc/smc_tx.c | 26 +- + net/smc/smc_wr.c | 10 +- + net/tipc/core.c | 16 + + net/tipc/core.h | 6 + + net/tipc/discover.c | 4 +- + net/tipc/link.c | 61 +- + net/tipc/msg.c | 206 ++- + net/tipc/msg.h | 31 +- + net/tipc/name_distr.c | 2 +- + net/tipc/netlink.c | 21 +- + net/tipc/netlink.h | 1 - + net/tipc/netlink_compat.c | 28 +- + net/tipc/node.c | 161 ++- + net/tipc/node.h | 12 +- + net/tipc/socket.c | 129 +- + net/tipc/udp_media.c | 6 +- + net/tls/Kconfig | 10 + + net/tls/Makefile | 5 +- + net/tls/tls_device.c | 46 +- + net/tls/tls_main.c | 172 +-- + net/tls/tls_proc.c | 47 + + net/tls/tls_sw.c | 18 +- + net/tls/tls_toe.c | 139 ++ + net/tls/trace.c | 10 + + net/tls/trace.h | 202 +++ + net/unix/af_unix.c | 6 +- + net/vmw_vsock/hyperv_transport.c | 22 +- + net/vmw_vsock/virtio_transport_common.c | 55 +- + net/wireless/nl80211.c | 6 +- + net/wireless/reg.h | 2 +- + net/xdp/xsk.c | 33 +- + samples/bpf/Makefile | 166 ++- + samples/bpf/Makefile.target | 75 + + samples/bpf/README.rst | 41 +- + samples/bpf/hbm_kern.h | 27 +- + samples/bpf/map_perf_test_kern.c | 28 +- + samples/bpf/offwaketime_kern.c | 1 + + samples/bpf/parse_ldabs.c | 1 + + samples/bpf/sampleip_kern.c | 1 + + samples/bpf/sockex1_kern.c | 1 + + samples/bpf/sockex2_kern.c | 1 + + samples/bpf/sockex3_kern.c | 1 + + samples/bpf/spintest_kern.c | 1 + + samples/bpf/tcbpf1_kern.c | 1 + + samples/bpf/test_map_in_map_kern.c | 20 +- + samples/bpf/test_overhead_kprobe_kern.c | 1 + + samples/bpf/test_probe_write_user_kern.c | 3 +- + samples/bpf/trace_event_kern.c | 1 + + samples/bpf/tracex1_kern.c | 1 + + samples/bpf/tracex2_kern.c | 1 + + samples/bpf/tracex3_kern.c | 1 + + samples/bpf/tracex4_kern.c | 1 + + samples/bpf/tracex5_kern.c | 1 + + samples/bpf/xdp_adjust_tail_kern.c | 7 +- + samples/bpf/xdp_adjust_tail_user.c | 29 +- + samples/bpf/xdpsock_user.c | 2 +- + samples/pktgen/README.rst | 2 +- + samples/pktgen/functions.sh | 154 +- + samples/pktgen/parameters.sh | 2 +- + .../pktgen/pktgen_bench_xmit_mode_netif_receive.sh | 15 +- + .../pktgen/pktgen_bench_xmit_mode_queue_xmit.sh | 15 +- + samples/pktgen/pktgen_sample01_simple.sh | 23 +- + samples/pktgen/pktgen_sample02_multiqueue.sh | 23 +- + .../pktgen/pktgen_sample03_burst_single_flow.sh | 15 +- + samples/pktgen/pktgen_sample04_many_flows.sh | 22 +- + samples/pktgen/pktgen_sample05_flow_per_thread.sh | 15 +- + ...tgen_sample06_numa_awared_queue_irq_affinity.sh | 23 +- + scripts/bpf_helpers_doc.py | 155 +- + security/selinux/nlmsgtab.c | 4 +- + tools/bpf/bpftool/btf.c | 57 +- + tools/bpf/bpftool/main.c | 4 +- + tools/bpf/bpftool/main.h | 2 +- + tools/bpf/bpftool/prog.c | 22 +- + tools/include/uapi/linux/bpf.h | 182 ++- + tools/include/uapi/linux/if_link.h | 2 + + tools/lib/bpf/.gitignore | 4 + + tools/lib/bpf/Makefile | 58 +- + tools/lib/bpf/bpf.c | 5 +- + tools/lib/bpf/bpf.h | 5 +- + tools/lib/bpf/bpf_core_read.h | 189 +++ + tools/{testing/selftests => lib}/bpf/bpf_endian.h | 0 + tools/lib/bpf/bpf_helpers.h | 47 + + tools/lib/bpf/bpf_tracing.h | 195 +++ + tools/lib/bpf/btf.c | 72 +- + tools/lib/bpf/btf.h | 4 +- + tools/lib/bpf/btf_dump.c | 37 +- + tools/lib/bpf/libbpf.c | 1480 ++++++++++++-------- + tools/lib/bpf/libbpf.h | 81 +- + tools/lib/bpf/libbpf.map | 13 + + tools/lib/bpf/libbpf_internal.h | 59 +- + tools/lib/bpf/libbpf_probes.c | 1 + + tools/lib/bpf/{test_libbpf.cpp => test_libbpf.c} | 14 +- + tools/lib/bpf/xsk.c | 130 +- + tools/testing/selftests/bpf/.gitignore | 6 +- + tools/testing/selftests/bpf/Makefile | 386 +++-- + tools/testing/selftests/bpf/bpf_helpers.h | 535 ------- + tools/testing/selftests/bpf/bpf_legacy.h | 39 + + tools/testing/selftests/bpf/cgroup_helpers.c | 4 +- + .../selftests/bpf/prog_tests/attach_probe.c | 44 +- + .../bpf/{test_btf_dump.c => prog_tests/btf_dump.c} | 88 +- + .../testing/selftests/bpf/prog_tests/core_reloc.c | 85 +- + .../bpf/prog_tests/flow_dissector_reattach.c | 140 ++ + tools/testing/selftests/bpf/prog_tests/kfree_skb.c | 89 ++ + tools/testing/selftests/bpf/prog_tests/pinning.c | 210 +++ + .../testing/selftests/bpf/prog_tests/probe_user.c | 78 ++ + .../testing/selftests/bpf/prog_tests/rdonly_maps.c | 95 ++ + .../selftests/bpf/prog_tests/reference_tracking.c | 19 +- + .../section_names.c} | 90 +- + tools/testing/selftests/bpf/prog_tests/skb_ctx.c | 5 + + .../bpf/progs/btf__core_reloc_existence.c | 3 + + ...tf__core_reloc_existence___err_wrong_arr_kind.c | 3 + + ...re_reloc_existence___err_wrong_arr_value_type.c | 3 + + ...tf__core_reloc_existence___err_wrong_int_kind.c | 3 + + .../btf__core_reloc_existence___err_wrong_int_sz.c | 3 + + ...tf__core_reloc_existence___err_wrong_int_type.c | 3 + + ..._core_reloc_existence___err_wrong_struct_type.c | 3 + + .../progs/btf__core_reloc_existence___minimal.c | 3 + + .../bpf/progs/btf_dump_test_case_padding.c | 5 +- + .../testing/selftests/bpf/progs/core_reloc_types.h | 65 + + tools/testing/selftests/bpf/progs/kfree_skb.c | 103 ++ + tools/testing/selftests/bpf/progs/loop1.c | 1 + + tools/testing/selftests/bpf/progs/loop2.c | 1 + + tools/testing/selftests/bpf/progs/loop3.c | 1 + + tools/testing/selftests/bpf/progs/pyperf.h | 67 +- + tools/testing/selftests/bpf/progs/sockopt_sk.c | 13 +- + tools/testing/selftests/bpf/progs/strobemeta.h | 36 +- + tools/testing/selftests/bpf/progs/tcp_rtt.c | 13 +- + .../selftests/bpf/progs/test_attach_probe.c | 1 - + tools/testing/selftests/bpf/progs/test_btf_haskv.c | 1 + + tools/testing/selftests/bpf/progs/test_btf_newkv.c | 1 + + .../selftests/bpf/progs/test_core_reloc_arrays.c | 11 +- + .../bpf/progs/test_core_reloc_existence.c | 79 ++ + .../selftests/bpf/progs/test_core_reloc_flavors.c | 9 +- + .../selftests/bpf/progs/test_core_reloc_ints.c | 19 +- + .../selftests/bpf/progs/test_core_reloc_kernel.c | 62 +- + .../selftests/bpf/progs/test_core_reloc_misc.c | 9 +- + .../selftests/bpf/progs/test_core_reloc_mods.c | 19 +- + .../selftests/bpf/progs/test_core_reloc_nesting.c | 7 +- + .../bpf/progs/test_core_reloc_primitives.c | 13 +- + .../bpf/progs/test_core_reloc_ptr_as_arr.c | 5 +- + .../selftests/bpf/progs/test_get_stack_rawtp.c | 4 +- + .../testing/selftests/bpf/progs/test_perf_buffer.c | 1 - + tools/testing/selftests/bpf/progs/test_pinning.c | 31 + + .../selftests/bpf/progs/test_pinning_invalid.c | 16 + + .../testing/selftests/bpf/progs/test_probe_user.c | 26 + + .../bpf/{ => progs}/test_queue_stack_map.h | 0 + .../testing/selftests/bpf/progs/test_rdonly_maps.c | 83 ++ + .../selftests/bpf/progs/test_sk_lookup_kern.c | 18 +- + tools/testing/selftests/bpf/progs/test_skb_ctx.c | 1 + + .../selftests/bpf/progs/test_stacktrace_map.c | 1 - + .../testing/selftests/bpf/progs/test_tcp_estats.c | 2 +- + tools/testing/selftests/bpf/test_flow_dissector.sh | 48 +- + tools/testing/selftests/bpf/test_libbpf.sh | 43 - + tools/testing/selftests/bpf/test_libbpf_open.c | 144 -- + tools/testing/selftests/bpf/test_maps.c | 12 +- + tools/testing/selftests/bpf/test_progs.c | 50 +- + tools/testing/selftests/bpf/test_sysctl.c | 23 + + tools/testing/selftests/bpf/verifier/loops1.c | 17 + + .../net/mlxsw/spectrum-2/mirror_gre_scale.sh | 16 + + .../drivers/net/mlxsw/spectrum-2/resource_scale.sh | 46 + + .../net/mlxsw/spectrum-2/tc_flower_scale.sh | 20 + + .../drivers/net/mlxsw/spectrum/mirror_gre_scale.sh | 7 +- + .../selftests/drivers/net/netdevsim/devlink.sh | 288 +++- + .../drivers/net/netdevsim/devlink_in_netns.sh | 72 + + tools/testing/selftests/net/forwarding/lib.sh | 7 +- + tools/testing/selftests/netfilter/Makefile | 2 +- + tools/testing/selftests/netfilter/ipvs.sh | 228 +++ + tools/testing/selftests/tc-testing/config | 10 + + .../tc-testing/tc-tests/actions/csum.json | 24 + + .../selftests/tc-testing/tc-tests/actions/ct.json | 96 ++ + .../tc-testing/tc-tests/actions/gact.json | 24 + + .../tc-testing/tc-tests/actions/mirred.json | 24 + + .../tc-testing/tc-tests/actions/pedit.json | 499 ++++++- + .../tc-testing/tc-tests/actions/tunnel_key.json | 24 + + .../tc-testing/tc-tests/actions/vlan.json | 24 + + 808 files changed, 31896 insertions(+), 10047 deletions(-) + create mode 100644 Documentation/bpf/s390.rst + create mode 100644 Documentation/devicetree/bindings/net/nfc/pn532.txt + delete mode 100644 Documentation/devicetree/bindings/net/nfc/pn533-i2c.txt + create mode 100644 Documentation/devicetree/bindings/net/renesas,ether.yaml + delete mode 100644 Documentation/devicetree/bindings/net/sh_eth.txt + create mode 100644 Documentation/devicetree/bindings/ptp/ptp-idtcm.yaml + create mode 100644 Documentation/networking/device_drivers/freescale/dpaa2/mac-phy-support.rst + create mode 100644 Documentation/networking/devlink-params-mv88e6xxx.txt + create mode 100644 arch/x86/mm/maccess.c + delete mode 100644 drivers/bluetooth/btwilink.c + create mode 100644 drivers/firmware/broadcom/tee_bnxt_fw.c + create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_phy.c + create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_phy.h + create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_ptp.c + create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_ptp.h + create mode 100644 drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c + create mode 100644 drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h + create mode 100644 drivers/net/ethernet/freescale/dpaa2/dpmac-cmd.h + create mode 100644 drivers/net/ethernet/freescale/dpaa2/dpmac.c + create mode 100644 drivers/net/ethernet/freescale/dpaa2/dpmac.h + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/steering/dr_crc32.c + create mode 100644 drivers/net/netdevsim/health.c + create mode 100644 drivers/nfc/pn533/uart.c + create mode 100644 drivers/ptp/idt8a340_reg.h + create mode 100644 drivers/ptp/ptp_clockmatrix.c + create mode 100644 drivers/ptp/ptp_clockmatrix.h + rename drivers/{net/ethernet => staging}/hp/Kconfig (100%) + rename drivers/{net/ethernet => staging}/hp/Makefile (100%) + rename drivers/{net/ethernet => staging}/hp/hp100.c (100%) + rename drivers/{net/ethernet => staging}/hp/hp100.h (100%) + create mode 100644 include/linux/firmware/broadcom/tee_bnxt_fw.h + create mode 100644 include/net/tls_toe.h + create mode 100644 net/tls/tls_proc.c + create mode 100644 net/tls/tls_toe.c + create mode 100644 net/tls/trace.c + create mode 100644 net/tls/trace.h + create mode 100644 samples/bpf/Makefile.target + create mode 100644 tools/lib/bpf/bpf_core_read.h + rename tools/{testing/selftests => lib}/bpf/bpf_endian.h (100%) + create mode 100644 tools/lib/bpf/bpf_helpers.h + create mode 100644 tools/lib/bpf/bpf_tracing.h + rename tools/lib/bpf/{test_libbpf.cpp => test_libbpf.c} (61%) + delete mode 100644 tools/testing/selftests/bpf/bpf_helpers.h + create mode 100644 tools/testing/selftests/bpf/bpf_legacy.h + rename tools/testing/selftests/bpf/{test_btf_dump.c => prog_tests/btf_dump.c} (51%) + create mode 100644 tools/testing/selftests/bpf/prog_tests/flow_dissector_reattach.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/kfree_skb.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/pinning.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/probe_user.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/rdonly_maps.c + rename tools/testing/selftests/bpf/{test_section_names.c => prog_tests/section_names.c} (73%) + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_existence.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_existence___err_wrong_arr_kind.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_existence___err_wrong_arr_value_type.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_existence___err_wrong_int_kind.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_existence___err_wrong_int_sz.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_existence___err_wrong_int_type.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_existence___err_wrong_struct_type.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_existence___minimal.c + create mode 100644 tools/testing/selftests/bpf/progs/kfree_skb.c + create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_existence.c + create mode 100644 tools/testing/selftests/bpf/progs/test_pinning.c + create mode 100644 tools/testing/selftests/bpf/progs/test_pinning_invalid.c + create mode 100644 tools/testing/selftests/bpf/progs/test_probe_user.c + rename tools/testing/selftests/bpf/{ => progs}/test_queue_stack_map.h (100%) + create mode 100644 tools/testing/selftests/bpf/progs/test_rdonly_maps.c + delete mode 100755 tools/testing/selftests/bpf/test_libbpf.sh + delete mode 100644 tools/testing/selftests/bpf/test_libbpf_open.c + create mode 100644 tools/testing/selftests/drivers/net/mlxsw/spectrum-2/mirror_gre_scale.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/spectrum-2/resource_scale.sh + create mode 100644 tools/testing/selftests/drivers/net/mlxsw/spectrum-2/tc_flower_scale.sh + create mode 100755 tools/testing/selftests/drivers/net/netdevsim/devlink_in_netns.sh + create mode 100755 tools/testing/selftests/netfilter/ipvs.sh +Merging bpf-next/master (f23c7ce341c2 Merge branch 'bpf-libbpf-bitfield-size-relo') +$ git merge bpf-next/master +Removing tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_wrong_sz_8.c +Removing tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_wrong_sz_64.c +Removing tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_wrong_sz_32.c +Removing tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_wrong_sz_16.c +Removing tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_bitfield.c +Removing tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_wrong_val_type2.c +Removing tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_wrong_val_type1.c +Merge made by the 'recursive' strategy. + tools/lib/bpf/bpf_core_read.h | 79 +++++++ + tools/lib/bpf/libbpf.c | 243 +++++++++++++++------ + tools/lib/bpf/libbpf_internal.h | 4 + + .../testing/selftests/bpf/prog_tests/core_reloc.c | 123 ++++++++++- + .../btf__core_reloc_arrays___err_wrong_val_type.c | 3 + + .../btf__core_reloc_arrays___err_wrong_val_type1.c | 3 - + .../btf__core_reloc_arrays___err_wrong_val_type2.c | 3 - + .../bpf/progs/btf__core_reloc_bitfields.c | 3 + + .../btf__core_reloc_bitfields___bit_sz_change.c | 3 + + .../btf__core_reloc_bitfields___bitfield_vs_int.c | 3 + + ...__core_reloc_bitfields___err_too_big_bitfield.c | 3 + + .../btf__core_reloc_bitfields___just_big_enough.c | 3 + + .../progs/btf__core_reloc_ints___err_bitfield.c | 3 - + .../progs/btf__core_reloc_ints___err_wrong_sz_16.c | 3 - + .../progs/btf__core_reloc_ints___err_wrong_sz_32.c | 3 - + .../progs/btf__core_reloc_ints___err_wrong_sz_64.c | 3 - + .../progs/btf__core_reloc_ints___err_wrong_sz_8.c | 3 - + .../selftests/bpf/progs/btf__core_reloc_size.c | 3 + + .../bpf/progs/btf__core_reloc_size___diff_sz.c | 3 + + .../testing/selftests/bpf/progs/core_reloc_types.h | 173 +++++++++------ + .../bpf/progs/test_core_reloc_bitfields_direct.c | 63 ++++++ + .../bpf/progs/test_core_reloc_bitfields_probed.c | 62 ++++++ + .../selftests/bpf/progs/test_core_reloc_size.c | 51 +++++ + 23 files changed, 682 insertions(+), 161 deletions(-) + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_wrong_val_type.c + delete mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_wrong_val_type1.c + delete mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_wrong_val_type2.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_bitfields.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_bitfields___bit_sz_change.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_bitfields___bitfield_vs_int.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_bitfields___err_too_big_bitfield.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_bitfields___just_big_enough.c + delete mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_bitfield.c + delete mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_wrong_sz_16.c + delete mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_wrong_sz_32.c + delete mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_wrong_sz_64.c + delete mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_wrong_sz_8.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_size.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_size___diff_sz.c + create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_bitfields_direct.c + create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_bitfields_probed.c + create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_size.c +Merging ipsec-next/master (fd1ac07f3f17 xfrm: ifdef setsockopt(UDP_ENCAP_ESPINUDP/UDP_ENCAP_ESPINUDP_NON_IKE)) +$ git merge ipsec-next/master +Auto-merging net/xfrm/xfrm_interface.c +Auto-merging net/ipv4/udp.c +Merge made by the 'recursive' strategy. + include/net/xfrm.h | 7 ------- + net/ipv4/udp.c | 2 ++ + net/xfrm/xfrm_interface.c | 23 ----------------------- + 3 files changed, 2 insertions(+), 30 deletions(-) +Merging mlx5-next/mlx5-next (e53a9d26cf80 IB/mlx5: Introduce and use mlx5_core_is_vf()) +$ git merge mlx5-next/mlx5-next +Auto-merging include/linux/mlx5/driver.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +Auto-merging drivers/infiniband/hw/mlx5/main.c +Merge made by the 'recursive' strategy. + drivers/infiniband/hw/mlx5/main.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 573 +++++++++++++-------- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 66 ++- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 259 +++++----- + include/linux/mlx5/driver.h | 5 + + 5 files changed, 537 insertions(+), 368 deletions(-) +Merging netfilter-next/master (1574cf83c7a0 Merge tag 'mlx5-updates-2019-11-01' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux) +$ 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 8179d4f4f602] 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 (086ddf860650 mt7601u: use DEFINE_DEBUGFS_ATTRIBUTE to define debugfs fops) +$ git merge wireless-drivers-next/master +Auto-merging drivers/net/wireless/realtek/rtw88/mac80211.c +Auto-merging drivers/net/wireless/realtek/rtlwifi/ps.c +Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/trans.c +Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/scan.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-prph.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/file.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/dbg.c +Auto-merging drivers/net/wireless/ath/ath10k/core.c +Resolved 'drivers/net/wireless/intel/iwlwifi/mvm/mvm.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 51d1a243cdc8] Merge remote-tracking branch 'wireless-drivers-next/master' +$ git diff -M --stat --summary HEAD^.. + .../bindings/net/wireless/qcom,ath10k.txt | 6 + + drivers/bcma/driver_chipcommon_pmu.c | 24 +- + drivers/net/wireless/admtek/adm8211.c | 6 +- + drivers/net/wireless/ath/ar5523/ar5523.c | 3 +- + drivers/net/wireless/ath/ath10k/ce.c | 5 - + drivers/net/wireless/ath/ath10k/core.c | 43 +- + drivers/net/wireless/ath/ath10k/core.h | 9 + + drivers/net/wireless/ath/ath10k/coredump.c | 38 +- + drivers/net/wireless/ath/ath10k/coredump.h | 1 + + drivers/net/wireless/ath/ath10k/debugfs_sta.c | 2 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 2 +- + drivers/net/wireless/ath/ath10k/hw.c | 3 + + drivers/net/wireless/ath/ath10k/hw.h | 3 + + drivers/net/wireless/ath/ath10k/mac.c | 189 +++-- + drivers/net/wireless/ath/ath10k/mac.h | 1 + + drivers/net/wireless/ath/ath10k/pci.c | 62 +- + drivers/net/wireless/ath/ath10k/qmi.c | 48 +- + drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.c | 22 + + drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h | 1 + + drivers/net/wireless/ath/ath10k/sdio.c | 3 - + drivers/net/wireless/ath/ath10k/snoc.c | 387 +++------ + drivers/net/wireless/ath/ath10k/snoc.h | 30 +- + drivers/net/wireless/ath/ath10k/usb.c | 1 + + drivers/net/wireless/ath/ath10k/wmi-tlv.c | 82 +- + drivers/net/wireless/ath/ath10k/wmi-tlv.h | 68 ++ + drivers/net/wireless/ath/ath10k/wmi.c | 49 +- + drivers/net/wireless/ath/ath10k/wmi.h | 27 + + drivers/net/wireless/ath/ath5k/pci.c | 3 +- + drivers/net/wireless/ath/ath6kl/wmi.c | 6 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2 +- + .../net/wireless/ath/ath9k/ath9k_pci_owl_loader.c | 1 - + drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 23 +- + drivers/net/wireless/ath/ath9k/pci.c | 5 +- + drivers/net/wireless/ath/wil6210/pcie_bus.c | 6 +- + drivers/net/wireless/ath/wil6210/wmi.c | 8 +- + drivers/net/wireless/atmel/atmel_cs.c | 2 - + drivers/net/wireless/broadcom/b43/dma.c | 4 +- + drivers/net/wireless/broadcom/b43/main.c | 6 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 53 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 81 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.h | 4 +- + .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 3 +- + .../wireless/broadcom/brcm80211/brcmfmac/feature.h | 4 +- + .../broadcom/brcm80211/brcmfmac/fwil_types.h | 13 + + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 2 - + .../net/wireless/broadcom/brcm80211/brcmfmac/pno.c | 4 + + .../wireless/broadcom/brcm80211/brcmsmac/channel.c | 10 +- + .../wireless/broadcom/brcm80211/brcmsmac/main.c | 3 +- + .../broadcom/brcm80211/include/brcmu_wifi.h | 2 + + drivers/net/wireless/intel/iwlegacy/3945-mac.c | 8 +- + drivers/net/wireless/intel/iwlegacy/common.c | 10 +- + drivers/net/wireless/intel/iwlwifi/Makefile | 3 +- + drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 55 +- + drivers/net/wireless/intel/iwlwifi/cfg/9000.c | 25 +- + drivers/net/wireless/intel/iwlwifi/fw/api/d3.h | 8 + + .../net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h | 514 +++++------- + .../net/wireless/intel/iwlwifi/fw/api/mac-cfg.h | 33 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rx.h | 5 + + .../net/wireless/intel/iwlwifi/fw/api/time-event.h | 80 +- + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 811 +++++++++++-------- + drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 47 +- + drivers/net/wireless/intel/iwlwifi/fw/debugfs.c | 35 + + drivers/net/wireless/intel/iwlwifi/fw/error-dump.h | 63 +- + drivers/net/wireless/intel/iwlwifi/fw/file.h | 6 +- + drivers/net/wireless/intel/iwlwifi/fw/img.h | 12 - + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 58 +- + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 28 +- + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 891 ++++++++++++++++++++- + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.h | 22 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 4 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 26 +- + drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 7 + + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 40 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 29 +- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 3 + + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 33 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 40 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 34 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 31 + + drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 8 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.h | 4 - + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 23 +- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 20 +- + .../net/wireless/intel/iwlwifi/mvm/time-event.c | 189 ++++- + .../net/wireless/intel/iwlwifi/mvm/time-event.h | 21 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 14 +- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 2 +- + .../wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c | 77 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 149 ++-- + drivers/net/wireless/marvell/libertas/if_sdio.c | 5 + + drivers/net/wireless/marvell/libertas/mesh.c | 1 - + drivers/net/wireless/marvell/mwifiex/pcie.c | 9 +- + drivers/net/wireless/marvell/mwifiex/scan.c | 14 +- + .../net/wireless/mediatek/mt76/mt76x02_beacon.c | 5 +- + drivers/net/wireless/mediatek/mt7601u/debugfs.c | 2 +- + drivers/net/wireless/mediatek/mt7601u/phy.c | 2 +- + .../wireless/quantenna/qtnfmac/pcie/pearl_pcie.c | 2 - + .../wireless/quantenna/qtnfmac/pcie/topaz_pcie.c | 2 - + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 93 ++- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 6 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 9 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 508 +++++++++++- + .../realtek/rtlwifi/btcoexist/halbtc8192e2ant.c | 9 - + .../realtek/rtlwifi/btcoexist/halbtc8723b1ant.c | 9 +- + drivers/net/wireless/realtek/rtlwifi/efuse.c | 6 +- + drivers/net/wireless/realtek/rtlwifi/ps.c | 6 +- + drivers/net/wireless/realtek/rtlwifi/regd.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/dm.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/phy.c | 21 +- + .../wireless/realtek/rtlwifi/rtl8192c/dm_common.c | 2 - + .../wireless/realtek/rtlwifi/rtl8192c/phy_common.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.c | 5 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/phy.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.c | 11 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/def.h | 619 ++++++-------- + .../net/wireless/realtek/rtlwifi/rtl8192se/fw.c | 31 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/trx.c | 189 ++--- + .../net/wireless/realtek/rtlwifi/rtl8723ae/phy.c | 17 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/phy.c | 8 +- + .../realtek/rtlwifi/rtl8723com/fw_common.c | 4 - + .../net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 9 +- + drivers/net/wireless/realtek/rtlwifi/usb.c | 5 +- + drivers/net/wireless/realtek/rtw88/Makefile | 1 + + drivers/net/wireless/realtek/rtw88/bf.c | 400 +++++++++ + drivers/net/wireless/realtek/rtw88/bf.h | 92 +++ + drivers/net/wireless/realtek/rtw88/coex.c | 38 +- + drivers/net/wireless/realtek/rtw88/debug.c | 174 +++- + drivers/net/wireless/realtek/rtw88/debug.h | 2 + + drivers/net/wireless/realtek/rtw88/fw.c | 227 +++++- + drivers/net/wireless/realtek/rtw88/fw.h | 80 +- + drivers/net/wireless/realtek/rtw88/hci.h | 6 + + drivers/net/wireless/realtek/rtw88/mac.c | 138 +++- + drivers/net/wireless/realtek/rtw88/mac.h | 6 + + drivers/net/wireless/realtek/rtw88/mac80211.c | 260 +++++- + drivers/net/wireless/realtek/rtw88/main.c | 315 ++++++-- + drivers/net/wireless/realtek/rtw88/main.h | 239 +++++- + drivers/net/wireless/realtek/rtw88/pci.c | 81 +- + drivers/net/wireless/realtek/rtw88/phy.c | 171 +++- + drivers/net/wireless/realtek/rtw88/phy.h | 30 + + drivers/net/wireless/realtek/rtw88/ps.c | 188 +++-- + drivers/net/wireless/realtek/rtw88/ps.h | 16 +- + drivers/net/wireless/realtek/rtw88/reg.h | 7 + + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 469 ++++++++++- + drivers/net/wireless/realtek/rtw88/rtw8822b.h | 12 + + .../net/wireless/realtek/rtw88/rtw8822b_table.c | 829 ++++++++++++++++--- + .../net/wireless/realtek/rtw88/rtw8822b_table.h | 2 + + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 376 ++++++++- + drivers/net/wireless/realtek/rtw88/rtw8822c.h | 12 + + .../net/wireless/realtek/rtw88/rtw8822c_table.c | 94 +-- + drivers/net/wireless/realtek/rtw88/rx.c | 101 ++- + drivers/net/wireless/realtek/rtw88/rx.h | 11 + + drivers/net/wireless/realtek/rtw88/sec.c | 21 + + drivers/net/wireless/realtek/rtw88/sec.h | 1 + + drivers/net/wireless/realtek/rtw88/tx.c | 135 +++- + drivers/net/wireless/realtek/rtw88/tx.h | 8 + + drivers/net/wireless/realtek/rtw88/util.c | 27 + + drivers/net/wireless/rsi/rsi_91x_mgmt.c | 1 + + drivers/net/wireless/rsi/rsi_91x_usb.c | 4 +- + drivers/net/wireless/st/cw1200/fwio.c | 6 +- + drivers/net/wireless/st/cw1200/queue.c | 3 +- + drivers/net/wireless/st/cw1200/scan.c | 3 +- + drivers/net/wireless/ti/wlcore/main.c | 15 +- + 162 files changed, 8541 insertions(+), 2523 deletions(-) + create mode 100644 drivers/net/wireless/realtek/rtw88/bf.c + create mode 100644 drivers/net/wireless/realtek/rtw88/bf.h +Merging bluetooth/master (cf94da6f502d Bluetooth: Fix invalid-free in bcsp_close()) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/broadcom-bluetooth.txt | 1 + + drivers/bluetooth/btrtl.c | 2 +- + drivers/bluetooth/hci_bcm.c | 1 + + drivers/bluetooth/hci_bcsp.c | 3 + + drivers/bluetooth/hci_qca.c | 127 ++++++++++++++++++++- + net/bluetooth/hci_request.c | 19 ++- + 6 files changed, 144 insertions(+), 9 deletions(-) +Merging mac80211-next/master (3f2aef10ffad mac80211: fix a typo of "function") +$ git merge mac80211-next/master +Merge made by the 'recursive' strategy. + include/net/mac80211.h | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) +Merging gfs2/for-next (1a48049adb98 gfs2: make gfs2_fs_parameters static) +$ git merge gfs2/for-next +Auto-merging fs/gfs2/file.c +Merge made by the 'recursive' strategy. + fs/gfs2/aops.c | 2 +- + fs/gfs2/file.c | 1 + + fs/gfs2/glops.c | 2 +- + fs/gfs2/inode.c | 2 +- + fs/gfs2/ops_fstype.c | 2 +- + fs/gfs2/quota.c | 2 +- + fs/gfs2/recovery.c | 2 +- + 7 files changed, 7 insertions(+), 6 deletions(-) +Merging mtd/mtd/next (267c1d772380 MAINTAINERS: ubi/ubifs: Update the Git repository) +$ git merge mtd/mtd/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/intel,ixp4xx-flash.txt | 22 ++++ + MAINTAINERS | 14 +-- + drivers/mtd/devices/spear_smi.c | 42 ++++++- + drivers/mtd/devices/st_spi_fsm.c | 1 - + drivers/mtd/maps/Kconfig | 11 ++ + drivers/mtd/maps/Makefile | 1 + + drivers/mtd/maps/l440gx.c | 2 +- + drivers/mtd/maps/physmap-core.c | 5 + + drivers/mtd/maps/physmap-ixp4xx.c | 132 +++++++++++++++++++++ + drivers/mtd/maps/physmap-ixp4xx.h | 17 +++ + drivers/mtd/mtdchar.c | 10 +- + drivers/mtd/nand/raw/denali_dt.c | 4 +- + drivers/mtd/nand/raw/hisi504_nand.c | 4 +- + drivers/mtd/nand/raw/lpc32xx_mlc.c | 1 - + drivers/mtd/nand/raw/marvell_nand.c | 4 +- + drivers/mtd/nand/raw/meson_nand.c | 4 +- + drivers/mtd/nand/raw/mtk_ecc.c | 4 +- + drivers/mtd/nand/raw/mtk_nand.c | 1 - + drivers/mtd/nand/raw/omap2.c | 8 +- + drivers/mtd/nand/raw/sh_flctl.c | 4 +- + drivers/mtd/nand/raw/stm32_fmc2_nand.c | 5 +- + drivers/mtd/nand/raw/sunxi_nand.c | 4 +- + drivers/mtd/spi-nor/cadence-quadspi.c | 4 +- + 23 files changed, 247 insertions(+), 57 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/intel,ixp4xx-flash.txt + create mode 100644 drivers/mtd/maps/physmap-ixp4xx.c + create mode 100644 drivers/mtd/maps/physmap-ixp4xx.h +Merging nand/nand/next (777260a5c992 mtd: rawnand: remove unecessary checking if dmac is NULL) +$ git merge nand/nand/next +Auto-merging drivers/mtd/nand/raw/denali_dt.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/mtd/cadence-nand-controller.txt | 53 + + MAINTAINERS | 7 + + drivers/mtd/nand/raw/Kconfig | 7 + + drivers/mtd/nand/raw/Makefile | 1 + + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 23 +- + drivers/mtd/nand/raw/cadence-nand-controller.c | 3030 ++++++++++++++++++++ + drivers/mtd/nand/raw/denali_dt.c | 55 +- + drivers/mtd/nand/raw/mxic_nand.c | 4 +- + drivers/mtd/nand/raw/nand_base.c | 8 +- + drivers/mtd/nand/raw/nand_micron.c | 4 +- + 10 files changed, 3132 insertions(+), 60 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/cadence-nand-controller.txt + create mode 100644 drivers/mtd/nand/raw/cadence-nand-controller.c +Merging spi-nor/spi-nor/next (3d63ee5deb46 mtd: spi-nor: fix silent truncation in spi_nor_read_raw()) +$ git merge spi-nor/spi-nor/next +Auto-merging drivers/mtd/spi-nor/cadence-quadspi.c +Merge made by the 'recursive' strategy. + drivers/mtd/spi-nor/aspeed-smc.c | 23 +- + drivers/mtd/spi-nor/cadence-quadspi.c | 54 ++- + drivers/mtd/spi-nor/hisi-sfc.c | 23 +- + drivers/mtd/spi-nor/intel-spi-pci.c | 6 + + drivers/mtd/spi-nor/intel-spi.c | 58 ++- + drivers/mtd/spi-nor/mtk-quadspi.c | 25 +- + drivers/mtd/spi-nor/nxp-spifi.c | 23 +- + drivers/mtd/spi-nor/spi-nor.c | 803 ++++++++++++++++---------------- + include/linux/mtd/spi-nor.h | 51 +- + include/linux/platform_data/intel-spi.h | 1 + + 10 files changed, 566 insertions(+), 501 deletions(-) +Merging crypto/master (298b4c604008 crypto: amcc - restore CRYPTO_AES dependency) +$ git merge crypto/master +Auto-merging include/linux/pci.h +Removing drivers/crypto/hisilicon/sgl.h +Auto-merging drivers/crypto/chelsio/chtls/chtls_io.c +Removing crypto/blkcipher.c +Auto-merging arch/arm/mach-omap2/pdata-quirks.c +Auto-merging arch/arm/crypto/Kconfig +CONFLICT (content): Merge conflict in arch/arm/crypto/Kconfig +Auto-merging arch/arm/boot/dts/omap3-n900.dts +Auto-merging MAINTAINERS +Recorded preimage for 'arch/arm/crypto/Kconfig' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/arm/crypto/Kconfig'. +[master ecd022c7091f] Merge remote-tracking branch 'crypto/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/debugfs-hisi-hpre | 57 + + Documentation/crypto/api-skcipher.rst | 13 +- + Documentation/crypto/architecture.rst | 2 - + Documentation/crypto/devel-algos.rst | 27 +- + .../bindings/crypto/allwinner,sun8i-ss.yaml | 60 + + .../bindings/crypto/amlogic,gxl-crypto.yaml | 52 + + .../devicetree/bindings/rng/nuvoton,npcm-rng.txt | 12 + + .../devicetree/bindings/rng/omap3_rom_rng.txt | 27 + + .../bindings/rng/samsung,exynos5250-trng.txt | 17 + + MAINTAINERS | 21 +- + arch/arm/boot/dts/omap3-n900.dts | 6 + + arch/arm/crypto/Kconfig | 20 +- + arch/arm/crypto/Makefile | 32 +- + arch/arm/crypto/crct10dif-ce-core.S | 2 +- + arch/arm/crypto/ghash-ce-core.S | 1 + + arch/arm/crypto/sha1-ce-core.S | 1 + + arch/arm/crypto/sha2-ce-core.S | 1 + + arch/arm/mach-omap2/pdata-quirks.c | 14 +- + arch/arm64/crypto/Kconfig | 8 +- + arch/arm64/crypto/aes-neonbs-glue.c | 2 +- + arch/arm64/crypto/ghash-ce-core.S | 501 +++-- + arch/arm64/crypto/ghash-ce-glue.c | 293 ++- + arch/powerpc/crypto/aes-spe-glue.c | 454 ++--- + arch/s390/crypto/aes_s390.c | 609 +++--- + arch/s390/crypto/des_s390.c | 419 ++-- + arch/s390/crypto/paes_s390.c | 414 ++-- + arch/sparc/crypto/aes_glue.c | 310 ++- + arch/sparc/crypto/camellia_glue.c | 217 +-- + arch/sparc/crypto/des_glue.c | 499 +++-- + crypto/Kconfig | 100 +- + crypto/Makefile | 10 +- + crypto/aegis128-core.c | 125 +- + crypto/aegis128-neon-inner.c | 50 + + crypto/aegis128-neon.c | 21 + + crypto/af_alg.c | 2 +- + crypto/algif_skcipher.c | 2 +- + crypto/api.c | 2 +- + crypto/blake2b_generic.c | 435 +++++ + crypto/blkcipher.c | 548 ------ + crypto/cryptd.c | 2 +- + crypto/crypto_user_base.c | 4 +- + crypto/crypto_user_stat.c | 8 +- + crypto/ecc.c | 3 +- + crypto/essiv.c | 6 +- + crypto/jitterentropy-kcapi.c | 8 +- + crypto/jitterentropy.c | 13 +- + crypto/jitterentropy.h | 17 + + crypto/skcipher.c | 124 +- + crypto/testmgr.c | 52 + + crypto/testmgr.h | 682 +++++++ + drivers/char/hw_random/Kconfig | 13 + + drivers/char/hw_random/Makefile | 1 + + drivers/char/hw_random/atmel-rng.c | 4 +- + drivers/char/hw_random/bcm2835-rng.c | 5 +- + drivers/char/hw_random/core.c | 61 +- + drivers/char/hw_random/exynos-trng.c | 4 +- + drivers/char/hw_random/hisi-rng.c | 4 +- + drivers/char/hw_random/iproc-rng200.c | 9 +- + drivers/char/hw_random/ks-sa-rng.c | 6 +- + drivers/char/hw_random/meson-rng.c | 4 +- + drivers/char/hw_random/mtk-rng.c | 9 +- + drivers/char/hw_random/npcm-rng.c | 184 ++ + drivers/char/hw_random/omap-rng.c | 13 +- + drivers/char/hw_random/omap3-rom-rng.c | 168 +- + drivers/char/hw_random/pasemi-rng.c | 4 +- + drivers/char/hw_random/pic32-rng.c | 4 +- + drivers/char/hw_random/st-rng.c | 4 +- + drivers/char/hw_random/tx4939-rng.c | 4 +- + drivers/char/hw_random/xgene-rng.c | 4 +- + drivers/crypto/Kconfig | 82 +- + drivers/crypto/Makefile | 3 +- + drivers/crypto/allwinner/Kconfig | 87 + + drivers/crypto/allwinner/Makefile | 3 + + .../{sunxi-ss => allwinner/sun4i-ss}/Makefile | 0 + .../sun4i-ss}/sun4i-ss-cipher.c | 10 + + .../sun4i-ss}/sun4i-ss-core.c | 139 +- + .../sun4i-ss}/sun4i-ss-hash.c | 12 + + .../sun4i-ss}/sun4i-ss-prng.c | 9 +- + .../{sunxi-ss => allwinner/sun4i-ss}/sun4i-ss.h | 2 + + drivers/crypto/allwinner/sun8i-ce/Makefile | 2 + + .../crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c | 434 +++++ + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 676 +++++++ + drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h | 254 +++ + drivers/crypto/allwinner/sun8i-ss/Makefile | 2 + + .../crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c | 438 +++++ + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c | 642 ++++++ + drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h | 218 +++ + drivers/crypto/amlogic/Kconfig | 24 + + drivers/crypto/amlogic/Makefile | 2 + + drivers/crypto/amlogic/amlogic-gxl-cipher.c | 381 ++++ + drivers/crypto/amlogic/amlogic-gxl-core.c | 331 ++++ + drivers/crypto/amlogic/amlogic-gxl.h | 170 ++ + drivers/crypto/atmel-aes.c | 83 +- + drivers/crypto/caam/Kconfig | 6 +- + drivers/crypto/caam/caampkc.c | 72 +- + drivers/crypto/caam/caampkc.h | 8 +- + drivers/crypto/caam/ctrl.c | 222 +-- + drivers/crypto/caam/intern.h | 4 - + drivers/crypto/caam/qi.c | 8 +- + drivers/crypto/caam/qi.h | 1 - + drivers/crypto/cavium/nitrox/Kconfig | 2 +- + drivers/crypto/cavium/nitrox/nitrox_aead.c | 39 +- + drivers/crypto/cavium/nitrox/nitrox_dev.h | 15 + + drivers/crypto/cavium/nitrox/nitrox_main.c | 9 +- + drivers/crypto/cavium/nitrox/nitrox_mbx.c | 8 + + drivers/crypto/cavium/nitrox/nitrox_req.h | 4 + + drivers/crypto/cavium/nitrox/nitrox_skcipher.c | 133 +- + drivers/crypto/ccp/Kconfig | 2 +- + drivers/crypto/ccp/ccp-dev-v5.c | 14 +- + drivers/crypto/ccp/ccp-dev.c | 15 +- + drivers/crypto/ccp/ccp-dmaengine.c | 1 + + drivers/crypto/ccp/ccp-ops.c | 3 +- + drivers/crypto/ccp/psp-dev.c | 30 +- + drivers/crypto/ccree/cc_aead.c | 3 +- + drivers/crypto/chelsio/chtls/chtls_io.c | 5 +- + drivers/crypto/geode-aes.c | 433 ++-- + drivers/crypto/geode-aes.h | 15 +- + drivers/crypto/hisilicon/Kconfig | 29 +- + drivers/crypto/hisilicon/Makefile | 5 +- + drivers/crypto/hisilicon/hpre/Makefile | 2 + + drivers/crypto/hisilicon/hpre/hpre.h | 83 + + drivers/crypto/hisilicon/hpre/hpre_crypto.c | 1137 +++++++++++ + drivers/crypto/hisilicon/hpre/hpre_main.c | 1052 ++++++++++ + drivers/crypto/hisilicon/qm.c | 123 +- + drivers/crypto/hisilicon/qm.h | 17 +- + drivers/crypto/hisilicon/sgl.c | 184 +- + drivers/crypto/hisilicon/sgl.h | 24 - + drivers/crypto/hisilicon/zip/zip.h | 1 - + drivers/crypto/hisilicon/zip/zip_crypto.c | 46 +- + drivers/crypto/hisilicon/zip/zip_main.c | 83 +- + drivers/crypto/inside-secure/safexcel.c | 328 ++-- + drivers/crypto/inside-secure/safexcel.h | 123 +- + drivers/crypto/inside-secure/safexcel_cipher.c | 2059 ++++++++++++++++---- + drivers/crypto/inside-secure/safexcel_hash.c | 1475 +++++++++++++- + drivers/crypto/inside-secure/safexcel_ring.c | 5 +- + drivers/crypto/mediatek/mtk-aes.c | 2 +- + drivers/crypto/nx/nx-aes-cbc.c | 81 +- + drivers/crypto/nx/nx-aes-ccm.c | 40 +- + drivers/crypto/nx/nx-aes-ctr.c | 87 +- + drivers/crypto/nx/nx-aes-ecb.c | 76 +- + drivers/crypto/nx/nx-aes-gcm.c | 24 +- + drivers/crypto/nx/nx.c | 64 +- + drivers/crypto/nx/nx.h | 19 +- + drivers/crypto/nx/nx_debugfs.c | 18 +- + drivers/crypto/padlock-aes.c | 157 +- + drivers/crypto/qat/Kconfig | 2 +- + drivers/crypto/qce/ablkcipher.c | 2 +- + drivers/crypto/qce/sha.c | 2 +- + drivers/crypto/talitos.c | 6 +- + drivers/crypto/ux500/Kconfig | 2 +- + drivers/crypto/ux500/hash/hash_core.c | 3 +- + drivers/crypto/virtio/Kconfig | 2 +- + drivers/net/wireless/cisco/Kconfig | 2 +- + include/crypto/algapi.h | 74 - + include/crypto/internal/skcipher.h | 42 - + include/crypto/skcipher.h | 49 +- + include/linux/crypto.h | 426 +--- + include/linux/pci.h | 1 + + include/uapi/linux/psp-sev.h | 3 + + net/bluetooth/Kconfig | 2 +- + net/rxrpc/Kconfig | 2 +- + net/xfrm/Kconfig | 2 +- + net/xfrm/xfrm_algo.c | 4 +- + 163 files changed, 14583 insertions(+), 5253 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-hisi-hpre + create mode 100644 Documentation/devicetree/bindings/crypto/allwinner,sun8i-ss.yaml + create mode 100644 Documentation/devicetree/bindings/crypto/amlogic,gxl-crypto.yaml + create mode 100644 Documentation/devicetree/bindings/rng/nuvoton,npcm-rng.txt + create mode 100644 Documentation/devicetree/bindings/rng/omap3_rom_rng.txt + create mode 100644 Documentation/devicetree/bindings/rng/samsung,exynos5250-trng.txt + create mode 100644 crypto/blake2b_generic.c + delete mode 100644 crypto/blkcipher.c + create mode 100644 crypto/jitterentropy.h + create mode 100644 drivers/char/hw_random/npcm-rng.c + create mode 100644 drivers/crypto/allwinner/Kconfig + create mode 100644 drivers/crypto/allwinner/Makefile + rename drivers/crypto/{sunxi-ss => allwinner/sun4i-ss}/Makefile (100%) + rename drivers/crypto/{sunxi-ss => allwinner/sun4i-ss}/sun4i-ss-cipher.c (98%) + rename drivers/crypto/{sunxi-ss => allwinner/sun4i-ss}/sun4i-ss-core.c (87%) + rename drivers/crypto/{sunxi-ss => allwinner/sun4i-ss}/sun4i-ss-hash.c (98%) + rename drivers/crypto/{sunxi-ss => allwinner/sun4i-ss}/sun4i-ss-prng.c (92%) + rename drivers/crypto/{sunxi-ss => allwinner/sun4i-ss}/sun4i-ss.h (98%) + create mode 100644 drivers/crypto/allwinner/sun8i-ce/Makefile + create mode 100644 drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c + create mode 100644 drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c + create mode 100644 drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h + create mode 100644 drivers/crypto/allwinner/sun8i-ss/Makefile + create mode 100644 drivers/crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c + create mode 100644 drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c + create mode 100644 drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h + create mode 100644 drivers/crypto/amlogic/Kconfig + create mode 100644 drivers/crypto/amlogic/Makefile + create mode 100644 drivers/crypto/amlogic/amlogic-gxl-cipher.c + create mode 100644 drivers/crypto/amlogic/amlogic-gxl-core.c + create mode 100644 drivers/crypto/amlogic/amlogic-gxl.h + create mode 100644 drivers/crypto/hisilicon/hpre/Makefile + create mode 100644 drivers/crypto/hisilicon/hpre/hpre.h + create mode 100644 drivers/crypto/hisilicon/hpre/hpre_crypto.c + create mode 100644 drivers/crypto/hisilicon/hpre/hpre_main.c + delete mode 100644 drivers/crypto/hisilicon/sgl.h +Merging drm/drm-next (8a86b00a437e Merge tag 'drm-next-5.5-2019-11-01' of git://people.freedesktop.org/~agd5f/linux into drm-next) +$ git merge drm/drm-next +Removing include/drm/drm_vram_mm_helper.h +Removing include/drm/drm_os_linux.h +Removing include/drm/drmP.h +Auto-merging drivers/video/fbdev/core/fbmem.c +Auto-merging drivers/media/platform/seco-cec/seco-cec.c +Auto-merging drivers/media/platform/meson/ao-cec.c +Auto-merging drivers/media/platform/meson/ao-cec-g12a.c +Removing drivers/gpu/drm/virtio/virtgpu_ttm.c +Removing drivers/gpu/drm/vboxvideo/vbox_fb.c +Auto-merging drivers/gpu/drm/v3d/v3d_gem.c +Auto-merging drivers/gpu/drm/scheduler/sched_main.c +Auto-merging drivers/gpu/drm/radeon/radeon_drv.c +Auto-merging drivers/gpu/drm/panfrost/panfrost_drv.c +Removing drivers/gpu/drm/omapdrm/dss/core.c +Removing drivers/gpu/drm/lima/lima_object.h +Removing drivers/gpu/drm/lima/lima_object.c +Removing drivers/gpu/drm/lima/lima_gem_prime.h +Removing drivers/gpu/drm/lima/lima_gem_prime.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h +Removing drivers/gpu/drm/i915/gt/intel_hangcheck.c +Auto-merging drivers/gpu/drm/i915/display/intel_dpll_mgr.h +Auto-merging drivers/gpu/drm/i915/display/intel_dpll_mgr.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Removing drivers/gpu/drm/drm_vram_mm_helper.c +Removing drivers/gpu/drm/cirrus/cirrus_drv.h +Auto-merging drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c +Auto-merging drivers/gpu/drm/arm/display/komeda/komeda_kms.c +Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn21/Makefile +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c +Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging MAINTAINERS +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/i915/i915_drv.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/i915_drv.h'. +[master f2362489239f] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + .../display/allwinner,sun6i-a31-mipi-dsi.yaml | 5 + + .../devicetree/bindings/display/arm,malidp.txt | 3 + + .../devicetree/bindings/display/bridge/anx7814.txt | 6 +- + .../bindings/display/bridge/renesas,dw-hdmi.txt | 1 + + .../bindings/display/bridge/renesas,lvds.txt | 1 + + .../bindings/display/mediatek/mediatek,disp.txt | 30 +- + .../bindings/display/mediatek/mediatek,dsi.txt | 4 +- + .../devicetree/bindings/display/renesas,du.txt | 2 + + .../bindings/display/rockchip/rockchip-vop.txt | 6 +- + Documentation/gpu/amdgpu.rst | 30 +- + Documentation/gpu/drm-kms-helpers.rst | 3 - + Documentation/gpu/drm-mm.rst | 11 +- + Documentation/gpu/i915.rst | 82 +- + Documentation/gpu/mcde.rst | 2 +- + Documentation/gpu/todo.rst | 135 +- + MAINTAINERS | 13 + + drivers/dma-buf/dma-buf.c | 120 +- + drivers/dma-buf/dma-fence.c | 78 +- + drivers/gpu/drm/Kconfig | 29 +- + drivers/gpu/drm/Makefile | 6 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 99 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 77 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 19 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 147 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 289 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 214 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 214 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 176 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 86 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 274 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 79 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 267 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 216 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h | 5 - + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 6 - + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 169 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c | 40 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 38 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 107 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 37 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 28 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 39 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 38 + + drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c | 70 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c | 84 + + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 101 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 71 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 53 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 434 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 87 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 625 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 43 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 209 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 99 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 41 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 230 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 158 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 5 - + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 308 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 52 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 50 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 2 + + drivers/gpu/drm/amd/amdgpu/arct_reg_init.c | 3 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 67 +- + drivers/gpu/drm/amd/amdgpu/cik.h | 3 + + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 38 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 38 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 44 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 38 +- + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 5 +- + drivers/gpu/drm/amd/amdgpu/df_v1_7.c | 5 + + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 24 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 34 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 1364 +++++---- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 22 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.h | 2 + + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 94 +- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 25 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 27 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 30 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 417 +-- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 3 + + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 21 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.h | 2 + + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 2 + + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 380 +++ + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h | 41 + + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 4 +- + drivers/gpu/drm/amd/amdgpu/navi10_reg_init.c | 1 - + drivers/gpu/drm/amd/amdgpu/navi12_reg_init.c | 1 - + drivers/gpu/drm/amd/amdgpu/navi14_reg_init.c | 1 - + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 17 +- + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.h | 1 + + drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 3 +- + drivers/gpu/drm/amd/amdgpu/nbio_v6_1.h | 1 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.h | 1 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 214 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.h | 1 + + drivers/gpu/drm/amd/amdgpu/nv.c | 73 +- + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 44 +- + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 258 +- + drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 1 + + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 161 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/si.c | 11 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 175 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 2 + + drivers/gpu/drm/amd/amdgpu/umc_v6_0.c | 37 + + drivers/gpu/drm/amd/amdgpu/umc_v6_0.h | 31 + + drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 48 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 23 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 31 +- + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 41 +- + drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c | 1 - + drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c | 1 - + drivers/gpu/drm/amd/amdgpu/vi.c | 84 +- + drivers/gpu/drm/amd/amdgpu/vi.h | 3 + + drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 8 +- + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 139 +- + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 19 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 9 +- + drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 18 +- + drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.c | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 272 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 108 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 15 +- + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 5 + + drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 3 + + drivers/gpu/drm/amd/amdkfd/kfd_module.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 37 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 3 + + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 26 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 32 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 25 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 3 + + drivers/gpu/drm/amd/display/Kconfig | 28 +- + drivers/gpu/drm/amd/display/Makefile | 7 + + drivers/gpu/drm/amd/display/amdgpu_dm/Makefile | 4 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 379 ++- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 14 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 2 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 9 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 52 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 346 +++ + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h | 66 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 17 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 10 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 49 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 153 +- + drivers/gpu/drm/amd/display/dc/Makefile | 4 + + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 7 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 8 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 25 + + .../amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c | 14 +- + .../amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.c | 4 +- + .../drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 13 +- + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 186 +- + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.h | 1 + + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 304 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.h | 4 +- + .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 38 +- + .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h | 4 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 281 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 345 ++- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 101 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 44 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 3 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 74 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 4 +- + drivers/gpu/drm/amd/display/dc/dc.h | 44 +- + drivers/gpu/drm/amd/display/dc/dc_ddc_types.h | 3 +- + drivers/gpu/drm/amd/display/dc/dc_dsc.h | 14 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 91 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 18 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 23 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 22 + + drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 10 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 93 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.h | 187 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 3 - + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 1 + + drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 8 +- + .../drm/amd/display/dc/dce100/dce100_resource.c | 52 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 44 +- + .../drm/amd/display/dc/dce110/dce110_resource.c | 51 +- + .../drm/amd/display/dc/dce112/dce112_resource.c | 52 +- + .../drm/amd/display/dc/dce120/dce120_resource.c | 52 +- + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 51 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h | 5 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 8 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 28 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 27 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 50 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c | 8 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.h | 2 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 60 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 5 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 43 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 62 + + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 5 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c | 57 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.c | 9 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.h | 89 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 2 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_dwb_scl.c | 4 - + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 12 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 640 +++- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 16 + + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.h | 7 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 6 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 349 ++- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 34 +- + .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 4 + + drivers/gpu/drm/amd/display/dc/dcn21/Makefile | 2 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c | 116 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.h | 34 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c | 122 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.h | 33 + + .../drm/amd/display/dc/dcn21/dcn21_link_encoder.c | 470 +++ + .../drm/amd/display/dc/dcn21/dcn21_link_encoder.h | 61 + + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 380 ++- + drivers/gpu/drm/amd/display/dc/dm_cp_psp.h | 49 + + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 2 +- + drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 5 +- + .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 12 +- + .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 8 +- + .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 8 +- + .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 11 +- + .../drm/amd/display/dc/dml/display_mode_structs.h | 3 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 5 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 1 + + .../amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 10 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 85 +- + drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c | 3 - + drivers/gpu/drm/amd/display/dc/gpio/gpio_base.c | 2 - + drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c | 2 - + drivers/gpu/drm/amd/display/dc/hdcp/Makefile | 28 + + drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c | 324 ++ + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 9 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h | 6 + + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 5 + + drivers/gpu/drm/amd/display/dc/inc/hw/aux_engine.h | 3 + + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 12 +- + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 17 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 3 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/dsc.h | 12 +- + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 4 + + drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/opp.h | 1 + + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 5 + + .../drm/amd/display/dc/inc/hw/timing_generator.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 19 +- + .../drm/amd/display/include/ddc_service_types.h | 2 + + drivers/gpu/drm/amd/display/include/hdcp_types.h | 96 + + .../drm/amd/display/modules/color/color_gamma.c | 51 +- + .../drm/amd/display/modules/freesync/freesync.c | 53 +- + drivers/gpu/drm/amd/display/modules/hdcp/Makefile | 32 + + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 426 +++ + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 442 +++ + .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 531 ++++ + .../amd/display/modules/hdcp/hdcp1_transition.c | 307 ++ + .../gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c | 305 ++ + .../gpu/drm/amd/display/modules/hdcp/hdcp_log.c | 163 + + .../gpu/drm/amd/display/modules/hdcp/hdcp_log.h | 139 + + .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 328 ++ + .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.h | 272 ++ + .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 1 + + drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 289 ++ + .../drm/amd/display/modules/inc/mod_info_packet.h | 3 + + .../amd/display/modules/info_packet/info_packet.c | 98 + + .../drm/amd/display/modules/power/power_helpers.c | 93 +- + .../drm/amd/display/modules/power/power_helpers.h | 1 + + drivers/gpu/drm/amd/include/amd_shared.h | 2 + + .../gpu/drm/amd/include/asic_reg/bif/bif_4_1_d.h | 1 + + .../drm/amd/include/asic_reg/bif/bif_4_1_sh_mask.h | 2 + + .../gpu/drm/amd/include/asic_reg/bif/bif_5_0_d.h | 1 + + .../drm/amd/include/asic_reg/bif/bif_5_0_sh_mask.h | 2 + + .../amd/include/asic_reg/dcn/dcn_2_1_0_offset.h | 10 + + .../drm/amd/include/asic_reg/gc/gc_9_0_offset.h | 18 +- + .../drm/amd/include/asic_reg/gc/gc_9_0_sh_mask.h | 18 +- + .../drm/amd/include/asic_reg/nbio/nbio_7_4_0_smn.h | 12 + + .../amd/include/asic_reg/nbio/nbio_7_4_offset.h | 4 +- + .../amd/include/asic_reg/nbio/nbio_7_4_sh_mask.h | 49 +- + .../amd/include/asic_reg/oss/osssys_4_0_sh_mask.h | 4 + + .../gpu/drm/amd/include/asic_reg/smu/smu_7_0_1_d.h | 1 + + .../amd/include/asic_reg/smu/smu_7_0_1_sh_mask.h | 2 + + .../gpu/drm/amd/include/asic_reg/smu/smu_7_1_2_d.h | 1 + + .../amd/include/asic_reg/smu/smu_7_1_2_sh_mask.h | 2 + + .../gpu/drm/amd/include/asic_reg/smu/smu_7_1_3_d.h | 1 + + .../amd/include/asic_reg/smu/smu_7_1_3_sh_mask.h | 2 + + .../include/asic_reg/smuio/smuio_11_0_0_offset.h | 92 + + .../include/asic_reg/smuio/smuio_11_0_0_sh_mask.h | 176 ++ + .../drm/amd/include/asic_reg/vcn/vcn_2_5_offset.h | 12 + + drivers/gpu/drm/amd/include/atomfirmware.h | 27 +- + drivers/gpu/drm/amd/include/discovery.h | 1 - + .../amd/include/ivsrcid/nbio/irqsrcs_nbif_7_4.h | 42 + + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 13 +- + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 6 + + drivers/gpu/drm/amd/include/renoir_ip_offset.h | 34 + + drivers/gpu/drm/amd/include/vega10_enum.h | 1 + + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 19 + + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 1140 +++++-- + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 500 ++- + drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 3 +- + drivers/gpu/drm/amd/powerplay/hwmgr/ci_baco.c | 195 ++ + drivers/gpu/drm/amd/powerplay/hwmgr/ci_baco.h | 29 + + drivers/gpu/drm/amd/powerplay/hwmgr/common_baco.c | 19 + + drivers/gpu/drm/amd/powerplay/hwmgr/common_baco.h | 13 + + drivers/gpu/drm/amd/powerplay/hwmgr/fiji_baco.c | 196 ++ + drivers/gpu/drm/amd/powerplay/hwmgr/fiji_baco.h | 29 + + drivers/gpu/drm/amd/powerplay/hwmgr/polaris_baco.c | 222 ++ + drivers/gpu/drm/amd/powerplay/hwmgr/polaris_baco.h | 29 + + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_baco.c | 91 + + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_baco.h | 32 + + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 10 +- + drivers/gpu/drm/amd/powerplay/hwmgr/tonga_baco.c | 231 ++ + drivers/gpu/drm/amd/powerplay/hwmgr/tonga_baco.h | 29 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 6 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_baco.c | 23 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 26 +- + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 365 +-- + drivers/gpu/drm/amd/powerplay/inc/arcturus_ppsmc.h | 3 +- + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 1 + + .../amd/powerplay/inc/smu11_driver_if_arcturus.h | 49 +- + drivers/gpu/drm/amd/powerplay/inc/smu_types.h | 3 + + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 122 +- + drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h | 41 +- + drivers/gpu/drm/amd/powerplay/inc/vega20_ppsmc.h | 3 +- + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 180 +- + drivers/gpu/drm/amd/powerplay/navi10_ppt.h | 6 + + drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 479 ++- + drivers/gpu/drm/amd/powerplay/smu_internal.h | 204 ++ + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 298 +- + drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 153 +- + .../gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c | 2 +- + drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c | 2 - + .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 2 +- + .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c | 2 +- + .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c | 4 +- + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 133 +- + drivers/gpu/drm/arc/arcpgu_hdmi.c | 1 + + drivers/gpu/drm/arm/display/Kconfig | 6 + + drivers/gpu/drm/arm/display/komeda/Makefile | 2 + + .../gpu/drm/arm/display/komeda/d71/d71_component.c | 221 +- + drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c | 41 +- + drivers/gpu/drm/arm/display/komeda/d71/d71_dev.h | 2 + + drivers/gpu/drm/arm/display/komeda/d71/d71_regs.h | 9 +- + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 105 +- + drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 77 +- + drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 20 + + drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 30 +- + drivers/gpu/drm/arm/display/komeda/komeda_event.c | 140 + + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 2 + + drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 2 + + .../gpu/drm/arm/display/komeda/komeda_pipeline.h | 17 +- + .../drm/arm/display/komeda/komeda_pipeline_state.c | 76 +- + .../drm/arm/display/komeda/komeda_wb_connector.c | 5 + + drivers/gpu/drm/arm/malidp_drv.c | 16 +- + drivers/gpu/drm/arm/malidp_hw.c | 9 + + drivers/gpu/drm/arm/malidp_hw.h | 3 + + drivers/gpu/drm/arm/malidp_regs.h | 10 + + drivers/gpu/drm/ast/Kconfig | 2 + + drivers/gpu/drm/ast/ast_drv.c | 6 +- + drivers/gpu/drm/ast/ast_drv.h | 43 +- + drivers/gpu/drm/ast/ast_main.c | 1 - + drivers/gpu/drm/ast/ast_mode.c | 266 +- + drivers/gpu/drm/ast/ast_ttm.c | 3 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 3 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 5 +- + drivers/gpu/drm/bochs/Kconfig | 2 + + drivers/gpu/drm/bochs/bochs.h | 1 - + drivers/gpu/drm/bochs/bochs_drv.c | 7 +- + drivers/gpu/drm/bochs/bochs_kms.c | 26 +- + drivers/gpu/drm/bochs/bochs_mm.c | 3 +- + drivers/gpu/drm/bridge/Kconfig | 3 +- + drivers/gpu/drm/bridge/analogix-anx78xx.c | 110 +- + drivers/gpu/drm/bridge/analogix-anx78xx.h | 17 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 1 + + drivers/gpu/drm/bridge/cdns-dsi.c | 3 +- + drivers/gpu/drm/bridge/dumb-vga-dac.c | 1 + + drivers/gpu/drm/bridge/lvds-encoder.c | 3 +- + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 1 + + drivers/gpu/drm/bridge/nxp-ptn3460.c | 1 + + drivers/gpu/drm/bridge/panel.c | 70 +- + drivers/gpu/drm/bridge/parade-ps8622.c | 1 + + drivers/gpu/drm/bridge/sii902x.c | 1 + + drivers/gpu/drm/bridge/sii9234.c | 37 +- + drivers/gpu/drm/bridge/sil-sii8620.c | 11 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c | 4 +- + .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 10 + + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 114 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.h | 39 + + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 10 +- + drivers/gpu/drm/bridge/tc358764.c | 1 + + drivers/gpu/drm/bridge/tc358767.c | 66 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 1 + + drivers/gpu/drm/bridge/ti-tfp410.c | 1 + + drivers/gpu/drm/cirrus/cirrus.c | 6 +- + drivers/gpu/drm/cirrus/cirrus_drv.h | 247 -- + drivers/gpu/drm/drm_atomic_helper.c | 18 +- + drivers/gpu/drm/drm_atomic_uapi.c | 2 +- + drivers/gpu/drm/drm_blend.c | 7 +- + drivers/gpu/drm/drm_cache.c | 14 +- + drivers/gpu/drm/drm_client_modeset.c | 3 +- + drivers/gpu/drm/drm_connector.c | 142 +- + drivers/gpu/drm/drm_crtc_helper.c | 23 +- + drivers/gpu/drm/drm_crtc_helper_internal.h | 3 + + drivers/gpu/drm/drm_damage_helper.c | 8 +- + drivers/gpu/drm/drm_debugfs_crc.c | 8 +- + drivers/gpu/drm/drm_dp_cec.c | 29 +- + drivers/gpu/drm/drm_dp_helper.c | 177 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 1807 ++++++++--- + drivers/gpu/drm/drm_dp_mst_topology_internal.h | 24 + + drivers/gpu/drm/drm_drv.c | 17 - + drivers/gpu/drm/drm_dsc.c | 23 +- + drivers/gpu/drm/drm_edid.c | 222 +- + drivers/gpu/drm/drm_edid_load.c | 2 +- + drivers/gpu/drm/drm_encoder.c | 1 + + drivers/gpu/drm/drm_fb_helper.c | 62 +- + drivers/gpu/drm/drm_gem.c | 30 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 31 +- + drivers/gpu/drm/drm_gem_ttm_helper.c | 73 + + drivers/gpu/drm/drm_gem_vram_helper.c | 735 ++++- + drivers/gpu/drm/drm_memory.c | 1 + + drivers/gpu/drm/drm_mipi_dbi.c | 11 +- + drivers/gpu/drm/drm_mm.c | 36 +- + drivers/gpu/drm/drm_mode_config.c | 2 - + drivers/gpu/drm/drm_of.c | 5 - + drivers/gpu/drm/drm_panel.c | 14 +- + drivers/gpu/drm/drm_prime.c | 9 + + drivers/gpu/drm/drm_print.c | 60 +- + drivers/gpu/drm/drm_probe_helper.c | 4 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 3 +- + drivers/gpu/drm/drm_syncobj.c | 38 +- + drivers/gpu/drm/drm_trace.h | 14 +- + drivers/gpu/drm/drm_vblank.c | 60 +- + drivers/gpu/drm/drm_vram_helper_common.c | 8 +- + drivers/gpu/drm/drm_vram_mm_helper.c | 297 -- + drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 8 +- + drivers/gpu/drm/exynos/exynos_dp.c | 1 + + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1 + + drivers/gpu/drm/exynos/exynos_drm_mic.c | 1 + + drivers/gpu/drm/exynos/exynos_hdmi.c | 32 +- + drivers/gpu/drm/exynos/exynos_mixer.c | 4 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 1 + + drivers/gpu/drm/gma500/cdv_intel_display.c | 2 + + drivers/gpu/drm/gma500/mdfld_dsi_output.c | 2 +- + drivers/gpu/drm/gma500/oaktrail_crtc.c | 2 + + drivers/gpu/drm/hisilicon/hibmc/Kconfig | 3 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 14 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 6 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 3 +- + drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 1 + + drivers/gpu/drm/i2c/sil164_drv.c | 2 +- + drivers/gpu/drm/i2c/tda9950.c | 12 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 10 +- + drivers/gpu/drm/i810/i810_dma.c | 4 +- + drivers/gpu/drm/i915/Kconfig | 18 +- + drivers/gpu/drm/i915/Kconfig.debug | 145 +- + drivers/gpu/drm/i915/Kconfig.profile | 49 + + drivers/gpu/drm/i915/Kconfig.unstable | 29 + + drivers/gpu/drm/i915/Makefile | 25 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 2 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 68 +- + drivers/gpu/drm/i915/display/intel_atomic.h | 5 + + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 58 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 4 + + drivers/gpu/drm/i915/display/intel_audio.c | 46 +- + drivers/gpu/drm/i915/display/intel_bios.c | 8 +- + drivers/gpu/drm/i915/display/intel_bios.h | 3 +- + drivers/gpu/drm/i915/display/intel_bw.c | 81 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 1316 ++++---- + drivers/gpu/drm/i915/display/intel_cdclk.h | 13 +- + drivers/gpu/drm/i915/display/intel_color.c | 550 +++- + drivers/gpu/drm/i915/display/intel_color.h | 7 + + drivers/gpu/drm/i915/display/intel_connector.c | 21 +- + drivers/gpu/drm/i915/display/intel_crt.c | 13 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 837 +++-- + drivers/gpu/drm/i915/display/intel_ddi.h | 3 +- + drivers/gpu/drm/i915/display/intel_display.c | 2403 +++++++++------ + drivers/gpu/drm/i915/display/intel_display.h | 67 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 554 ++-- + drivers/gpu/drm/i915/display/intel_display_power.h | 43 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 63 +- + drivers/gpu/drm/i915/display/intel_dp.c | 521 +++- + drivers/gpu/drm/i915/display/intel_dp.h | 9 + + drivers/gpu/drm/i915/display/intel_dp_mst.c | 73 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 412 ++- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 5 + + drivers/gpu/drm/i915/display/intel_dsb.c | 332 ++ + drivers/gpu/drm/i915/display/intel_dsb.h | 52 + + drivers/gpu/drm/i915/display/intel_dsi.c | 3 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 4 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 7 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 14 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.c | 19 +- + drivers/gpu/drm/i915/display/intel_gmbus.c | 2 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 216 +- + drivers/gpu/drm/i915/display/intel_hdcp.h | 4 + + drivers/gpu/drm/i915/display/intel_hdmi.c | 303 +- + drivers/gpu/drm/i915/display/intel_hdmi.h | 1 + + drivers/gpu/drm/i915/display/intel_hotplug.c | 3 +- + drivers/gpu/drm/i915/display/intel_hotplug.h | 1 + + drivers/gpu/drm/i915/display/intel_lpe_audio.c | 2 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 10 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 32 +- + drivers/gpu/drm/i915/display/intel_psr.c | 441 ++- + drivers/gpu/drm/i915/display/intel_psr.h | 1 - + drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +- + drivers/gpu/drm/i915/display/intel_sdvo.h | 1 + + drivers/gpu/drm/i915/display/intel_sprite.c | 549 +++- + drivers/gpu/drm/i915/display/intel_sprite.h | 8 +- + drivers/gpu/drm/i915/display/intel_tc.c | 87 +- + drivers/gpu/drm/i915/display/intel_tc.h | 1 + + drivers/gpu/drm/i915/display/intel_tv.c | 12 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 55 + + drivers/gpu/drm/i915/display/intel_vdsc.c | 74 +- + drivers/gpu/drm/i915/display/intel_vga.c | 160 + + drivers/gpu/drm/i915/display/intel_vga.h | 18 + + drivers/gpu/drm/i915/display/vlv_dsi.c | 8 +- + drivers/gpu/drm/i915/gem/i915_gem_client_blt.c | 9 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 613 ++-- + drivers/gpu/drm/i915/gem/i915_gem_context.h | 61 +- + drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 22 +- + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 56 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 89 +- + drivers/gpu/drm/i915/gem/i915_gem_internal.c | 20 +- + drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 99 + + drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 37 + + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 84 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 38 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 52 +- + drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 13 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 34 +- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 48 +- + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 5 +- + drivers/gpu/drm/i915/gem/i915_gem_pm.c | 174 +- + drivers/gpu/drm/i915/gem/i915_gem_pm.h | 3 - + drivers/gpu/drm/i915/gem/i915_gem_region.c | 174 ++ + drivers/gpu/drm/i915/gem/i915_gem_region.h | 29 + + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 82 +- + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 124 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 130 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.h | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_throttle.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 42 +- + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 33 +- + .../gpu/drm/i915/gem/selftests/huge_gem_object.c | 3 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 579 +++- + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 30 +- + .../drm/i915/gem/selftests/i915_gem_coherency.c | 214 +- + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 704 +++-- + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 306 +- + .../drm/i915/gem/selftests/i915_gem_object_blt.c | 354 ++- + drivers/gpu/drm/i915/gem/selftests/i915_gem_phys.c | 2 - + drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c | 33 +- + drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.h | 13 +- + drivers/gpu/drm/i915/gem/selftests/mock_context.c | 17 +- + drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 19 +- + drivers/gpu/drm/i915/gt/intel_context.c | 25 +- + drivers/gpu/drm/i915/gt/intel_context.h | 1 + + drivers/gpu/drm/i915/gt/intel_context_types.h | 1 + + drivers/gpu/drm/i915/gt/intel_engine.h | 231 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 244 +- + drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 234 ++ + drivers/gpu/drm/i915/gt/intel_engine_heartbeat.h | 23 + + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 28 +- + drivers/gpu/drm/i915/gt/intel_engine_pool.c | 15 +- + drivers/gpu/drm/i915/gt/intel_engine_pool.h | 4 +- + drivers/gpu/drm/i915/gt/intel_engine_types.h | 91 +- + drivers/gpu/drm/i915/gt/intel_engine_user.c | 18 +- + drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 37 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 156 +- + drivers/gpu/drm/i915/gt/intel_gt.h | 16 +- + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 5 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 118 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.h | 15 +- + drivers/gpu/drm/i915/gt/intel_gt_requests.c | 137 + + drivers/gpu/drm/i915/gt/intel_gt_requests.h | 24 + + drivers/gpu/drm/i915/gt/intel_gt_types.h | 36 +- + drivers/gpu/drm/i915/gt/intel_hangcheck.c | 360 --- + drivers/gpu/drm/i915/gt/intel_llc.c | 161 + + drivers/gpu/drm/i915/gt/intel_llc.h | 15 + + drivers/gpu/drm/i915/gt/intel_llc_types.h | 13 + + drivers/gpu/drm/i915/gt/intel_lrc.c | 1494 ++++++--- + drivers/gpu/drm/i915/gt/intel_lrc.h | 39 +- + drivers/gpu/drm/i915/gt/intel_lrc_reg.h | 66 +- + drivers/gpu/drm/i915/gt/intel_mocs.c | 277 +- + drivers/gpu/drm/i915/gt/intel_mocs.h | 3 - + drivers/gpu/drm/i915/gt/intel_rc6.c | 712 +++++ + drivers/gpu/drm/i915/gt/intel_rc6.h | 25 + + drivers/gpu/drm/i915/gt/intel_rc6_types.h | 28 + + drivers/gpu/drm/i915/gt/intel_renderstate.c | 1 + + drivers/gpu/drm/i915/gt/intel_reset.c | 172 +- + drivers/gpu/drm/i915/gt/intel_reset.h | 14 +- + drivers/gpu/drm/i915/gt/intel_reset_types.h | 6 + + drivers/gpu/drm/i915/gt/intel_ring.c | 323 ++ + drivers/gpu/drm/i915/gt/intel_ring.h | 131 + + ...{intel_ringbuffer.c => intel_ring_submission.c} | 404 +-- + drivers/gpu/drm/i915/gt/intel_ring_types.h | 51 + + drivers/gpu/drm/i915/gt/intel_rps.c | 1872 ++++++++++++ + drivers/gpu/drm/i915/gt/intel_rps.h | 38 + + drivers/gpu/drm/i915/gt/intel_rps_types.h | 93 + + drivers/gpu/drm/i915/gt/intel_sseu.c | 37 +- + drivers/gpu/drm/i915/gt/intel_sseu.h | 37 +- + drivers/gpu/drm/i915/gt/intel_timeline.c | 52 +- + drivers/gpu/drm/i915/gt/intel_timeline_types.h | 10 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 67 +- + drivers/gpu/drm/i915/gt/mock_engine.c | 7 + + drivers/gpu/drm/i915/gt/selftest_context.c | 71 +- + .../gpu/drm/i915/gt/selftest_engine_heartbeat.c | 350 +++ + drivers/gpu/drm/i915/gt/selftest_engine_pm.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_gt_pm.c | 59 + + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 207 +- + drivers/gpu/drm/i915/gt/selftest_llc.c | 80 + + drivers/gpu/drm/i915/gt/selftest_llc.h | 14 + + drivers/gpu/drm/i915/gt/selftest_lrc.c | 1943 ++++++++++-- + drivers/gpu/drm/i915/gt/selftest_reset.c | 16 +- + drivers/gpu/drm/i915/gt/selftest_timeline.c | 138 +- + drivers/gpu/drm/i915/gt/selftest_workarounds.c | 270 +- + drivers/gpu/drm/i915/gt/selftests/mock_timeline.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 170 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 2 - + drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 56 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_log.h | 4 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h | 3 + + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 21 +- + drivers/gpu/drm/i915/gt/uc/intel_huc.c | 41 +- + drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 15 - + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 38 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 76 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h | 11 +- + drivers/gpu/drm/i915/gt/uc/selftest_guc.c | 46 +- + drivers/gpu/drm/i915/gvt/aperture_gm.c | 14 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 2 + + drivers/gpu/drm/i915/gvt/dmabuf.c | 3 +- + drivers/gpu/drm/i915/gvt/execlist.c | 4 +- + drivers/gpu/drm/i915/gvt/handlers.c | 19 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 17 - + drivers/gpu/drm/i915/gvt/mmio_context.c | 1 + + drivers/gpu/drm/i915/gvt/scheduler.c | 48 +- + drivers/gpu/drm/i915/i915_active.c | 346 ++- + drivers/gpu/drm/i915/i915_active.h | 330 +- + drivers/gpu/drm/i915/i915_active_types.h | 33 +- + drivers/gpu/drm/i915/i915_buddy.c | 1 + + drivers/gpu/drm/i915/i915_debugfs.c | 522 ++-- + drivers/gpu/drm/i915/i915_drv.c | 278 +- + drivers/gpu/drm/i915/i915_drv.h | 612 +--- + drivers/gpu/drm/i915/i915_gem.c | 369 +-- + drivers/gpu/drm/i915/i915_gem.h | 16 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 58 +- + drivers/gpu/drm/i915/i915_gem_fence_reg.c | 104 +- + drivers/gpu/drm/i915/i915_gem_fence_reg.h | 7 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 415 +-- + drivers/gpu/drm/i915/i915_gem_gtt.h | 77 +- + drivers/gpu/drm/i915/i915_getparam.c | 8 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 150 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 8 +- + drivers/gpu/drm/i915/i915_irq.c | 839 ++--- + drivers/gpu/drm/i915/i915_irq.h | 16 +- + drivers/gpu/drm/i915/i915_params.c | 12 +- + drivers/gpu/drm/i915/i915_params.h | 5 +- + drivers/gpu/drm/i915/i915_pci.c | 80 +- + drivers/gpu/drm/i915/i915_perf.c | 1855 +++++++---- + drivers/gpu/drm/i915/i915_perf.h | 32 +- + drivers/gpu/drm/i915/i915_perf_types.h | 435 +++ + drivers/gpu/drm/i915/i915_pmu.c | 309 +- + drivers/gpu/drm/i915/i915_pmu.h | 8 +- + drivers/gpu/drm/i915/i915_priolist_types.h | 7 + + drivers/gpu/drm/i915/i915_query.c | 306 +- + drivers/gpu/drm/i915/i915_reg.h | 876 ++++-- + drivers/gpu/drm/i915/i915_request.c | 235 +- + drivers/gpu/drm/i915/i915_request.h | 40 +- + drivers/gpu/drm/i915/i915_scatterlist.h | 8 +- + drivers/gpu/drm/i915/i915_scheduler.c | 48 +- + drivers/gpu/drm/i915/i915_scheduler.h | 18 - + drivers/gpu/drm/i915/i915_scheduler_types.h | 9 + + drivers/gpu/drm/i915/i915_suspend.c | 11 +- + drivers/gpu/drm/i915/i915_switcheroo.c | 67 + + drivers/gpu/drm/i915/i915_switcheroo.h | 14 + + drivers/gpu/drm/i915/i915_sysfs.c | 162 +- + drivers/gpu/drm/i915/i915_trace.h | 40 +- + drivers/gpu/drm/i915/i915_utils.c | 43 +- + drivers/gpu/drm/i915/i915_utils.h | 34 +- + drivers/gpu/drm/i915/i915_vma.c | 639 ++-- + drivers/gpu/drm/i915/i915_vma.h | 134 +- + drivers/gpu/drm/i915/intel_csr.c | 4 +- + drivers/gpu/drm/i915/intel_device_info.c | 230 +- + drivers/gpu/drm/i915/intel_device_info.h | 8 +- + drivers/gpu/drm/i915/intel_memory_region.c | 272 ++ + drivers/gpu/drm/i915/intel_memory_region.h | 129 + + drivers/gpu/drm/i915/intel_pch.c | 10 +- + drivers/gpu/drm/i915/intel_pch.h | 6 +- + drivers/gpu/drm/i915/intel_pm.c | 3207 ++------------------ + drivers/gpu/drm/i915/intel_pm.h | 27 - + drivers/gpu/drm/i915/intel_region_lmem.c | 132 + + drivers/gpu/drm/i915/intel_region_lmem.h | 16 + + drivers/gpu/drm/i915/intel_runtime_pm.c | 1 - + drivers/gpu/drm/i915/intel_uncore.c | 94 +- + drivers/gpu/drm/i915/intel_uncore.h | 20 +- + drivers/gpu/drm/i915/oa/i915_oa_tgl.c | 121 + + drivers/gpu/drm/i915/oa/i915_oa_tgl.h | 16 + + drivers/gpu/drm/i915/selftests/i915_active.c | 90 +- + drivers/gpu/drm/i915/selftests/i915_buddy.c | 4 + + drivers/gpu/drm/i915/selftests/i915_gem.c | 45 +- + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 143 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 404 ++- + .../gpu/drm/i915/selftests/i915_live_selftests.h | 5 + + .../gpu/drm/i915/selftests/i915_mock_selftests.h | 1 + + drivers/gpu/drm/i915/selftests/i915_perf.c | 217 ++ + drivers/gpu/drm/i915/selftests/i915_random.c | 20 + + drivers/gpu/drm/i915/selftests/i915_random.h | 4 + + drivers/gpu/drm/i915/selftests/i915_request.c | 502 +-- + drivers/gpu/drm/i915/selftests/i915_selftest.c | 23 +- + drivers/gpu/drm/i915/selftests/i915_vma.c | 19 +- + drivers/gpu/drm/i915/selftests/igt_flush_test.c | 33 +- + drivers/gpu/drm/i915/selftests/igt_flush_test.h | 2 +- + drivers/gpu/drm/i915/selftests/igt_live_test.c | 19 +- + drivers/gpu/drm/i915/selftests/igt_reset.c | 4 +- + drivers/gpu/drm/i915/selftests/igt_spinner.c | 2 +- + .../gpu/drm/i915/selftests/intel_memory_region.c | 624 ++++ + drivers/gpu/drm/i915/selftests/intel_uncore.c | 56 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 54 +- + drivers/gpu/drm/i915/selftests/mock_gtt.c | 7 +- + drivers/gpu/drm/i915/selftests/mock_region.c | 60 + + drivers/gpu/drm/i915/selftests/mock_region.h | 16 + + drivers/gpu/drm/i915/selftests/mock_uncore.c | 5 +- + drivers/gpu/drm/i915/selftests/mock_uncore.h | 3 +- + drivers/gpu/drm/imx/imx-ldb.c | 1 + + drivers/gpu/drm/imx/parallel-display.c | 1 + + drivers/gpu/drm/ingenic/ingenic-drm.c | 5 +- + drivers/gpu/drm/lima/Kconfig | 1 + + drivers/gpu/drm/lima/Makefile | 4 +- + drivers/gpu/drm/lima/lima_device.c | 5 +- + drivers/gpu/drm/lima/lima_drv.c | 22 +- + drivers/gpu/drm/lima/lima_gem.c | 195 +- + drivers/gpu/drm/lima/lima_gem.h | 32 +- + drivers/gpu/drm/lima/lima_gem_prime.c | 46 - + drivers/gpu/drm/lima/lima_gem_prime.h | 13 - + drivers/gpu/drm/lima/lima_mmu.c | 1 - + drivers/gpu/drm/lima/lima_object.c | 119 - + drivers/gpu/drm/lima/lima_object.h | 35 - + drivers/gpu/drm/lima/lima_sched.c | 6 +- + drivers/gpu/drm/lima/lima_vm.c | 87 +- + drivers/gpu/drm/mcde/mcde_drv.c | 3 +- + drivers/gpu/drm/mcde/mcde_dsi.c | 4 +- + drivers/gpu/drm/mediatek/Makefile | 2 + + drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 61 +- + drivers/gpu/drm/mediatek/mtk_dpi.c | 1 + + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 37 +- + drivers/gpu/drm/mediatek/mtk_drm_ddp.c | 128 +- + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 67 + + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 21 + + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 3 +- + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 4 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 234 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 1 + + drivers/gpu/drm/mediatek/mtk_mipi_tx.c | 338 +-- + drivers/gpu/drm/mediatek/mtk_mipi_tx.h | 49 + + drivers/gpu/drm/mediatek/mtk_mt8173_mipi_tx.c | 288 ++ + drivers/gpu/drm/mediatek/mtk_mt8183_mipi_tx.c | 149 + + drivers/gpu/drm/meson/meson_drv.c | 32 + + drivers/gpu/drm/meson/meson_dw_hdmi.c | 115 +- + drivers/gpu/drm/meson/meson_vclk.c | 9 +- + drivers/gpu/drm/mgag200/Kconfig | 2 + + drivers/gpu/drm/mgag200/mgag200_cursor.c | 327 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 7 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 23 +- + drivers/gpu/drm/mgag200/mgag200_main.c | 20 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 17 +- + drivers/gpu/drm/mgag200/mgag200_ttm.c | 7 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 4 +- + drivers/gpu/drm/msm/dsi/dsi.h | 1 + + drivers/gpu/drm/msm/edp/edp.c | 4 +- + drivers/gpu/drm/msm/edp/edp.h | 1 + + drivers/gpu/drm/msm/edp/edp_ctrl.c | 70 +- + drivers/gpu/drm/msm/hdmi/hdmi.c | 4 +- + drivers/gpu/drm/msm/hdmi/hdmi.h | 2 + + drivers/gpu/drm/mxsfb/mxsfb_crtc.c | 20 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 46 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.h | 4 +- + drivers/gpu/drm/mxsfb/mxsfb_out.c | 26 +- + drivers/gpu/drm/nouveau/dispnv04/disp.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 40 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 43 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 19 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 1 + + drivers/gpu/drm/omapdrm/dss/Makefile | 2 +- + drivers/gpu/drm/omapdrm/dss/core.c | 55 - + drivers/gpu/drm/omapdrm/dss/dispc.c | 46 +- + drivers/gpu/drm/omapdrm/dss/dsi.c | 3 +- + drivers/gpu/drm/omapdrm/dss/dss.c | 37 + + drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 9 +- + drivers/gpu/drm/omapdrm/dss/hdmi5_core.c | 129 +- + drivers/gpu/drm/omapdrm/dss/output.c | 1 + + drivers/gpu/drm/omapdrm/omap_dmm_tiler.h | 2 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 1 + + drivers/gpu/drm/omapdrm/omap_encoder.c | 1 + + drivers/gpu/drm/omapdrm/omap_fb.c | 9 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 137 +- + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 2 +- + drivers/gpu/drm/panel/panel-arm-versatile.c | 5 +- + .../gpu/drm/panel/panel-feiyang-fy07024di26a30d.c | 5 +- + drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 5 +- + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 5 +- + drivers/gpu/drm/panel/panel-innolux-p079zca.c | 5 +- + drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 5 +- + drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c | 5 +- + drivers/gpu/drm/panel/panel-lg-lb035q02.c | 5 +- + drivers/gpu/drm/panel/panel-lg-lg4573.c | 5 +- + drivers/gpu/drm/panel/panel-lvds.c | 26 +- + drivers/gpu/drm/panel/panel-nec-nl8048hl11.c | 5 +- + drivers/gpu/drm/panel/panel-novatek-nt39016.c | 5 +- + drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 5 +- + drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 5 +- + drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c | 5 +- + .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 5 +- + .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 4 +- + drivers/gpu/drm/panel/panel-raydium-rm67191.c | 5 +- + drivers/gpu/drm/panel/panel-raydium-rm68200.c | 5 +- + drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c | 5 +- + drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 5 +- + drivers/gpu/drm/panel/panel-samsung-ld9040.c | 5 +- + drivers/gpu/drm/panel/panel-samsung-s6d16d0.c | 5 +- + drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 5 +- + drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 5 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 5 +- + drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 5 +- + drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 5 +- + drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c | 5 +- + drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c | 5 +- + drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 5 +- + drivers/gpu/drm/panel/panel-simple.c | 29 +- + drivers/gpu/drm/panel/panel-sitronix-st7701.c | 5 +- + drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 4 +- + drivers/gpu/drm/panel/panel-sony-acx565akm.c | 5 +- + drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 5 +- + drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 5 +- + drivers/gpu/drm/panel/panel-tpo-tpg110.c | 5 +- + drivers/gpu/drm/panel/panel-truly-nt35597.c | 5 +- + drivers/gpu/drm/panfrost/TODO | 2 + + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 124 +- + drivers/gpu/drm/panfrost/panfrost_devfreq.h | 3 +- + drivers/gpu/drm/panfrost/panfrost_device.h | 14 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 2 +- + drivers/gpu/drm/panfrost/panfrost_gem.c | 2 +- + drivers/gpu/drm/panfrost/panfrost_issues.h | 81 + + drivers/gpu/drm/panfrost/panfrost_job.c | 17 +- + drivers/gpu/drm/pl111/pl111_display.c | 4 +- + drivers/gpu/drm/pl111/pl111_drv.c | 4 +- + drivers/gpu/drm/qxl/Kconfig | 1 + + drivers/gpu/drm/qxl/qxl_drv.c | 20 +- + drivers/gpu/drm/qxl/qxl_drv.h | 4 +- + drivers/gpu/drm/qxl/qxl_object.c | 32 +- + drivers/gpu/drm/qxl/qxl_release.c | 11 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 62 +- + drivers/gpu/drm/radeon/cik.c | 8 +- + drivers/gpu/drm/radeon/radeon_audio.c | 4 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 27 +- + drivers/gpu/drm/radeon/radeon_dp_mst.c | 24 +- + drivers/gpu/drm/radeon/radeon_drv.c | 2 +- + drivers/gpu/drm/radeon/radeon_gem.c | 2 +- + drivers/gpu/drm/radeon/radeon_object.c | 2 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 1 + + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 30 + + drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 5 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 6 +- + drivers/gpu/drm/rcar-du/rcar_lvds.c | 29 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 12 +- + drivers/gpu/drm/rockchip/cdn-dp-core.h | 3 +- + drivers/gpu/drm/rockchip/cdn-dp-reg.c | 19 +- + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 2 + + drivers/gpu/drm/rockchip/rk3066_hdmi.c | 8 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 169 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 10 +- + drivers/gpu/drm/rockchip/rockchip_lvds.c | 1 + + drivers/gpu/drm/rockchip/rockchip_rgb.c | 4 +- + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 48 +- + drivers/gpu/drm/scheduler/sched_fence.c | 4 +- + drivers/gpu/drm/scheduler/sched_main.c | 43 +- + drivers/gpu/drm/selftests/Makefile | 2 +- + drivers/gpu/drm/selftests/drm_modeset_selftests.h | 2 + + drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c | 238 ++ + drivers/gpu/drm/selftests/test-drm_framebuffer.c | 2 +- + drivers/gpu/drm/selftests/test-drm_mm.c | 14 +- + .../gpu/drm/selftests/test-drm_modeset_common.h | 2 + + drivers/gpu/drm/sti/sti_cursor.c | 2 +- + drivers/gpu/drm/sti/sti_dvo.c | 3 +- + drivers/gpu/drm/sti/sti_gdp.c | 2 +- + drivers/gpu/drm/sti/sti_hda.c | 3 +- + drivers/gpu/drm/sti/sti_hdmi.c | 26 +- + drivers/gpu/drm/sti/sti_tvout.c | 10 +- + drivers/gpu/drm/sti/sti_vtg.c | 2 +- + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 5 +- + drivers/gpu/drm/stm/ltdc.c | 39 +- + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 6 +- + drivers/gpu/drm/sun4i/sun4i_lvds.c | 1 + + drivers/gpu/drm/sun4i/sun4i_rgb.c | 1 + + drivers/gpu/drm/sun4i/sun4i_tcon.c | 1 + + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 35 +- + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h | 1 + + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 2 + + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h | 1 + + drivers/gpu/drm/tegra/Kconfig | 2 +- + drivers/gpu/drm/tegra/Makefile | 1 + + drivers/gpu/drm/tegra/dc.c | 30 +- + drivers/gpu/drm/tegra/dc.h | 2 - + drivers/gpu/drm/tegra/dp.c | 876 ++++++ + drivers/gpu/drm/tegra/dp.h | 177 ++ + drivers/gpu/drm/tegra/dpaux.c | 208 +- + drivers/gpu/drm/tegra/drm.c | 417 +-- + drivers/gpu/drm/tegra/drm.h | 13 +- + drivers/gpu/drm/tegra/falcon.c | 64 +- + drivers/gpu/drm/tegra/falcon.h | 16 +- + drivers/gpu/drm/tegra/fb.c | 4 +- + drivers/gpu/drm/tegra/gem.c | 81 +- + drivers/gpu/drm/tegra/gem.h | 2 +- + drivers/gpu/drm/tegra/gr2d.c | 12 +- + drivers/gpu/drm/tegra/gr3d.c | 12 +- + drivers/gpu/drm/tegra/hub.c | 6 +- + drivers/gpu/drm/tegra/output.c | 28 +- + drivers/gpu/drm/tegra/plane.c | 104 + + drivers/gpu/drm/tegra/plane.h | 8 + + drivers/gpu/drm/tegra/sor.c | 2576 +++++++++------- + drivers/gpu/drm/tegra/sor.h | 3 + + drivers/gpu/drm/tegra/vic.c | 138 +- + drivers/gpu/drm/tilcdc/tilcdc_external.c | 5 +- + drivers/gpu/drm/tilcdc/tilcdc_plane.c | 2 +- + drivers/gpu/drm/tiny/gm12u320.c | 2 +- + drivers/gpu/drm/ttm/ttm_agp_backend.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 190 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 27 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 69 +- + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 57 +- + drivers/gpu/drm/ttm/ttm_memory.c | 2 +- + drivers/gpu/drm/ttm/ttm_page_alloc.c | 4 +- + drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 4 +- + drivers/gpu/drm/tve200/tve200_drv.c | 4 +- + drivers/gpu/drm/udl/udl_connector.c | 8 - + drivers/gpu/drm/v3d/v3d_bo.c | 2 +- + drivers/gpu/drm/v3d/v3d_drv.c | 5 +- + drivers/gpu/drm/v3d/v3d_gem.c | 55 +- + drivers/gpu/drm/vboxvideo/Kconfig | 2 + + drivers/gpu/drm/vboxvideo/Makefile | 2 +- + drivers/gpu/drm/vboxvideo/vbox_drv.c | 19 +- + drivers/gpu/drm/vboxvideo/vbox_drv.h | 27 - + drivers/gpu/drm/vboxvideo/vbox_fb.c | 149 - + drivers/gpu/drm/vboxvideo/vbox_main.c | 119 +- + drivers/gpu/drm/vboxvideo/vbox_mode.c | 138 +- + drivers/gpu/drm/vboxvideo/vbox_ttm.c | 3 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 2 +- + drivers/gpu/drm/vc4/vc4_dpi.c | 3 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 5 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +- + drivers/gpu/drm/vc4/vc4_hvs.c | 2 +- + drivers/gpu/drm/vc4/vc4_plane.c | 4 +- + drivers/gpu/drm/virtio/Kconfig | 2 +- + drivers/gpu/drm/virtio/Makefile | 2 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 22 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 135 +- + drivers/gpu/drm/virtio/virtgpu_fence.c | 4 + + drivers/gpu/drm/virtio/virtgpu_gem.c | 183 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 228 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 24 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 270 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 61 +- + drivers/gpu/drm/virtio/virtgpu_prime.c | 34 - + drivers/gpu/drm/virtio/virtgpu_ttm.c | 305 -- + drivers/gpu/drm/virtio/virtgpu_vq.c | 227 +- + drivers/gpu/drm/vkms/vkms_crtc.c | 9 +- + drivers/gpu/drm/vkms/vkms_drv.c | 15 +- + drivers/gpu/drm/vkms/vkms_drv.h | 6 + + drivers/gpu/drm/vkms/vkms_gem.c | 27 + + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 17 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 5 + + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 4 + + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 3 + + drivers/gpu/drm/vmwgfx/vmwgfx_validation.h | 2 +- + drivers/gpu/drm/xen/xen_drm_front_kms.c | 7 +- + drivers/gpu/host1x/Kconfig | 2 +- + drivers/gpu/host1x/bus.c | 2 +- + drivers/gpu/host1x/cdma.c | 6 +- + drivers/gpu/host1x/channel.c | 13 +- + drivers/gpu/host1x/channel.h | 1 + + drivers/gpu/host1x/dev.c | 236 +- + drivers/gpu/host1x/dev.h | 3 + + drivers/gpu/host1x/intr.c | 1 - + drivers/gpu/host1x/job.c | 91 +- + drivers/gpu/host1x/job.h | 4 + + drivers/media/cec/cec-notifier.c | 5 +- + drivers/media/platform/cros-ec-cec/cros-ec-cec.c | 6 +- + drivers/media/platform/meson/ao-cec-g12a.c | 4 +- + drivers/media/platform/meson/ao-cec.c | 4 +- + drivers/media/platform/s5p-cec/s5p_cec.c | 4 +- + drivers/media/platform/seco-cec/seco-cec.c | 4 +- + drivers/media/platform/sti/cec/stih-cec.c | 4 +- + drivers/media/platform/tegra-cec/tegra_cec.c | 4 +- + drivers/misc/mei/hdcp/mei_hdcp.c | 45 +- + drivers/misc/mei/hdcp/mei_hdcp.h | 17 +- + drivers/video/fbdev/core/fbmem.c | 17 +- + drivers/video/fbdev/sa1100fb.c | 13 - + drivers/video/hdmi.c | 8 +- + include/drm/amd_asic_type.h | 56 +- + include/drm/bridge/dw_hdmi.h | 2 + + include/drm/drmP.h | 103 - + include/drm/drm_bridge.h | 33 +- + include/drm/drm_connector.h | 25 +- + include/drm/drm_crtc.h | 1 - + include/drm/drm_dp_helper.h | 140 +- + include/drm/drm_dp_mst_helper.h | 172 +- + include/drm/drm_drv.h | 2 - + include/drm/drm_edid.h | 5 +- + include/drm/drm_encoder.h | 6 +- + include/drm/drm_fb_helper.h | 7 +- + include/drm/drm_gem.h | 15 + + include/drm/drm_gem_shmem_helper.h | 30 +- + include/drm/drm_gem_ttm_helper.h | 21 + + include/drm/drm_gem_vram_helper.h | 107 +- + include/drm/drm_mm.h | 7 +- + include/drm/drm_modeset_helper_vtables.h | 7 +- + include/drm/drm_modeset_lock.h | 9 + + include/drm/drm_os_linux.h | 55 - + include/drm/drm_panel.h | 13 +- + include/drm/drm_plane.h | 31 +- + include/drm/drm_prime.h | 2 - + include/drm/drm_print.h | 26 + + include/drm/drm_rect.h | 31 + + include/drm/drm_simple_kms_helper.h | 2 +- + include/drm/drm_vblank.h | 15 +- + include/drm/drm_vram_mm_helper.h | 104 - + include/drm/i915_drm.h | 18 - + include/drm/i915_mei_hdcp_interface.h | 42 +- + include/drm/ttm/ttm_bo_api.h | 66 +- + include/drm/ttm/ttm_bo_driver.h | 32 +- + include/drm/ttm/ttm_execbuf_util.h | 2 +- + include/drm/ttm/ttm_memory.h | 1 - + include/linux/device_cgroup.h | 19 +- + include/linux/dma-buf.h | 63 +- + include/linux/fb.h | 2 +- + include/linux/host1x.h | 26 +- + include/media/cec-notifier.h | 7 +- + include/uapi/drm/amdgpu_drm.h | 2 + + include/uapi/drm/drm.h | 3 +- + include/uapi/drm/drm_fourcc.h | 28 +- + include/uapi/drm/exynos_drm.h | 2 +- + include/uapi/drm/i915_drm.h | 128 +- + include/uapi/drm/omap_drm.h | 18 +- + include/uapi/drm/v3d_drm.h | 8 +- + security/device_cgroup.c | 15 +- + 1101 files changed, 59706 insertions(+), 29564 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v6_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v6_0.h + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dm_cp_psp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/hdcp/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c + create mode 100644 drivers/gpu/drm/amd/display/include/hdcp_types.h + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/Makefile + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_transition.c + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp_log.c + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp_log.h + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.h + create mode 100644 drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h + create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/nbio/irqsrcs_nbif_7_4.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/ci_baco.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/ci_baco.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_baco.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_baco.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris_baco.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris_baco.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_baco.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_baco.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_baco.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_baco.h + create mode 100644 drivers/gpu/drm/amd/powerplay/smu_internal.h + create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_event.c + delete mode 100644 drivers/gpu/drm/cirrus/cirrus_drv.h + create mode 100644 drivers/gpu/drm/drm_dp_mst_topology_internal.h + create mode 100644 drivers/gpu/drm/drm_gem_ttm_helper.c + delete mode 100644 drivers/gpu/drm/drm_vram_mm_helper.c + create mode 100644 drivers/gpu/drm/i915/Kconfig.unstable + create mode 100644 drivers/gpu/drm/i915/display/intel_dsb.c + create mode 100644 drivers/gpu/drm/i915/display/intel_dsb.h + create mode 100644 drivers/gpu/drm/i915/display/intel_vga.c + create mode 100644 drivers/gpu/drm/i915/display/intel_vga.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_lmem.c + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_lmem.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_region.c + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_region.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_heartbeat.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_requests.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_requests.h + delete mode 100644 drivers/gpu/drm/i915/gt/intel_hangcheck.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_llc.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_llc.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_llc_types.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_rc6.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_rc6.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_rc6_types.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_ring.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_ring.h + rename drivers/gpu/drm/i915/gt/{intel_ringbuffer.c => intel_ring_submission.c} (85%) + create mode 100644 drivers/gpu/drm/i915/gt/intel_ring_types.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_rps.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_rps.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_rps_types.h + create mode 100644 drivers/gpu/drm/i915/gt/selftest_engine_heartbeat.c + create mode 100644 drivers/gpu/drm/i915/gt/selftest_gt_pm.c + create mode 100644 drivers/gpu/drm/i915/gt/selftest_llc.c + create mode 100644 drivers/gpu/drm/i915/gt/selftest_llc.h + create mode 100644 drivers/gpu/drm/i915/i915_perf_types.h + create mode 100644 drivers/gpu/drm/i915/i915_switcheroo.c + create mode 100644 drivers/gpu/drm/i915/i915_switcheroo.h + create mode 100644 drivers/gpu/drm/i915/intel_memory_region.c + create mode 100644 drivers/gpu/drm/i915/intel_memory_region.h + create mode 100644 drivers/gpu/drm/i915/intel_region_lmem.c + create mode 100644 drivers/gpu/drm/i915/intel_region_lmem.h + create mode 100644 drivers/gpu/drm/i915/oa/i915_oa_tgl.c + create mode 100644 drivers/gpu/drm/i915/oa/i915_oa_tgl.h + create mode 100644 drivers/gpu/drm/i915/selftests/i915_perf.c + create mode 100644 drivers/gpu/drm/i915/selftests/intel_memory_region.c + create mode 100644 drivers/gpu/drm/i915/selftests/mock_region.c + create mode 100644 drivers/gpu/drm/i915/selftests/mock_region.h + delete mode 100644 drivers/gpu/drm/lima/lima_gem_prime.c + delete mode 100644 drivers/gpu/drm/lima/lima_gem_prime.h + delete mode 100644 drivers/gpu/drm/lima/lima_object.c + delete mode 100644 drivers/gpu/drm/lima/lima_object.h + create mode 100644 drivers/gpu/drm/mediatek/mtk_mipi_tx.h + create mode 100644 drivers/gpu/drm/mediatek/mtk_mt8173_mipi_tx.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_mt8183_mipi_tx.c + delete mode 100644 drivers/gpu/drm/omapdrm/dss/core.c + create mode 100644 drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c + create mode 100644 drivers/gpu/drm/tegra/dp.c + create mode 100644 drivers/gpu/drm/tegra/dp.h + delete mode 100644 drivers/gpu/drm/vboxvideo/vbox_fb.c + delete mode 100644 drivers/gpu/drm/virtio/virtgpu_ttm.c + delete mode 100644 include/drm/drmP.h + create mode 100644 include/drm/drm_gem_ttm_helper.h + delete mode 100644 include/drm/drm_os_linux.h + delete mode 100644 include/drm/drm_vram_mm_helper.h +$ git am -3 ../patches/0001-cec-fix-up-for-cec-add-cec_adapter-to-cec_notifier_c.patch +Applying: cec: fix up for "cec: add cec_adapter to cec_notifier_cec_adap_unregister()" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/media/platform/cec-gpio/cec-gpio.c +$ git add -A . +$ git commit -v -a --amend +[master 9d507987e208] Merge remote-tracking branch 'drm/drm-next' + Date: Tue Nov 5 13:35:07 2019 +1100 +$ git am -3 ../patches/drm_v3d-Fix-double-free-in-v3d_submit_cl_ioctl.patch +Applying: drm/v3d: Fix double free in v3d_submit_cl_ioctl() +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/v3d/v3d_gem.c +$ git add -A . +$ git commit -v -a --amend +[master 4d0b6fc08444] Merge remote-tracking branch 'drm/drm-next' + Date: Tue Nov 5 13:35:07 2019 +1100 +$ git reset --hard HEAD^ +HEAD is now at ecd022c7091f Merge remote-tracking branch 'crypto/master' +Merging next-20191031 version of drm +$ git merge -m next-20191031/drm 57c2af791b6c8087b6d8b56046838427d2ec0d73 +Removing include/drm/drm_vram_mm_helper.h +Removing include/drm/drm_os_linux.h +Removing include/drm/drmP.h +Auto-merging drivers/video/fbdev/core/fbmem.c +Auto-merging drivers/media/platform/seco-cec/seco-cec.c +Auto-merging drivers/media/platform/meson/ao-cec.c +Auto-merging drivers/media/platform/meson/ao-cec-g12a.c +Removing drivers/gpu/drm/virtio/virtgpu_ttm.c +Removing drivers/gpu/drm/vboxvideo/vbox_fb.c +Auto-merging drivers/gpu/drm/v3d/v3d_gem.c +Auto-merging drivers/gpu/drm/radeon/radeon_drv.c +Auto-merging drivers/gpu/drm/panfrost/panfrost_drv.c +Removing drivers/gpu/drm/omapdrm/dss/core.c +Removing drivers/gpu/drm/lima/lima_object.h +Removing drivers/gpu/drm/lima/lima_object.c +Removing drivers/gpu/drm/lima/lima_gem_prime.h +Removing drivers/gpu/drm/lima/lima_gem_prime.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/display/intel_dpll_mgr.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Removing drivers/gpu/drm/drm_vram_mm_helper.c +Removing drivers/gpu/drm/cirrus/cirrus_drv.h +Auto-merging drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c +Auto-merging drivers/gpu/drm/arm/display/komeda/komeda_kms.c +Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn21/Makefile +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c +Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging MAINTAINERS +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_drv.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 675dc5e99294] next-20191031/drm +$ git diff -M --stat --summary HEAD^.. + .../display/allwinner,sun6i-a31-mipi-dsi.yaml | 5 + + .../devicetree/bindings/display/arm,malidp.txt | 3 + + .../devicetree/bindings/display/bridge/anx7814.txt | 6 +- + .../bindings/display/bridge/renesas,dw-hdmi.txt | 1 + + .../bindings/display/bridge/renesas,lvds.txt | 1 + + .../bindings/display/mediatek/mediatek,disp.txt | 30 +- + .../bindings/display/mediatek/mediatek,dsi.txt | 4 +- + .../devicetree/bindings/display/renesas,du.txt | 2 + + .../bindings/display/rockchip/rockchip-vop.txt | 6 +- + Documentation/gpu/amdgpu.rst | 30 +- + Documentation/gpu/drm-kms-helpers.rst | 3 - + Documentation/gpu/drm-mm.rst | 11 +- + Documentation/gpu/i915.rst | 76 +- + Documentation/gpu/mcde.rst | 2 +- + Documentation/gpu/todo.rst | 127 +- + MAINTAINERS | 13 + + drivers/dma-buf/dma-fence.c | 78 +- + drivers/gpu/drm/Kconfig | 29 +- + drivers/gpu/drm/Makefile | 6 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 98 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 69 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 19 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 143 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 286 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 214 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 214 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 173 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 74 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 274 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 77 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 248 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 162 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c | 40 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 34 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 104 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 34 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 28 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 39 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 38 + + drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c | 70 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c | 84 + + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 101 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 71 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 425 +++- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 87 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 585 ++++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 43 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 200 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 99 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 41 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 200 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 158 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 5 - + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 299 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 52 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 50 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 2 + + drivers/gpu/drm/amd/amdgpu/arct_reg_init.c | 3 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 48 +- + drivers/gpu/drm/amd/amdgpu/cik.h | 3 + + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 38 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 38 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 44 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 38 +- + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 5 +- + drivers/gpu/drm/amd/amdgpu/df_v1_7.c | 5 + + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 24 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 31 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 1355 ++++++------- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 22 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.h | 2 + + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 94 +- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 25 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 27 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 30 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 417 ++-- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 3 + + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 21 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.h | 2 + + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 2 + + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 380 ++++ + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h | 41 + + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 4 +- + drivers/gpu/drm/amd/amdgpu/navi10_reg_init.c | 1 - + drivers/gpu/drm/amd/amdgpu/navi12_reg_init.c | 1 - + drivers/gpu/drm/amd/amdgpu/navi14_reg_init.c | 1 - + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 17 +- + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.h | 1 + + drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 3 +- + drivers/gpu/drm/amd/amdgpu/nbio_v6_1.h | 1 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.h | 1 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 214 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.h | 1 + + drivers/gpu/drm/amd/amdgpu/nv.c | 70 +- + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 44 +- + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 248 ++- + drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 1 + + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 161 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 174 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 2 + + drivers/gpu/drm/amd/amdgpu/umc_v6_0.c | 37 + + drivers/gpu/drm/amd/amdgpu/umc_v6_0.h | 31 + + drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 48 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 23 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 30 +- + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 41 +- + drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c | 1 - + drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c | 1 - + drivers/gpu/drm/amd/amdgpu/vi.c | 84 +- + drivers/gpu/drm/amd/amdgpu/vi.h | 3 + + drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 8 +- + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 139 +- + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 19 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 7 + + drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 18 +- + drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.c | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 267 ++- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 65 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 15 +- + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 5 + + drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 3 + + drivers/gpu/drm/amd/amdkfd/kfd_module.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 37 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 3 + + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 26 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 32 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 25 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 3 + + drivers/gpu/drm/amd/display/Kconfig | 28 +- + drivers/gpu/drm/amd/display/Makefile | 7 + + drivers/gpu/drm/amd/display/amdgpu_dm/Makefile | 4 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 239 ++- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 14 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 9 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 31 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 346 ++++ + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h | 66 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 17 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 10 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 48 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 109 +- + drivers/gpu/drm/amd/display/dc/Makefile | 4 + + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 7 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 8 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 25 + + .../drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 3 + + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 156 +- + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.h | 1 + + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 160 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.h | 11 +- + .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 38 +- + .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h | 4 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 273 ++- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 160 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 101 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 44 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 3 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 26 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 4 +- + drivers/gpu/drm/amd/display/dc/dc.h | 41 +- + drivers/gpu/drm/amd/display/dc/dc_dsc.h | 14 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 91 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 18 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 23 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 22 + + drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 6 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 93 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.h | 187 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 3 - + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 1 + + drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 8 +- + .../drm/amd/display/dc/dce100/dce100_resource.c | 15 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 33 +- + .../drm/amd/display/dc/dce110/dce110_resource.c | 14 +- + .../drm/amd/display/dc/dce112/dce112_resource.c | 15 +- + .../drm/amd/display/dc/dce120/dce120_resource.c | 15 +- + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 14 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h | 5 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 8 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 28 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 23 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 50 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c | 8 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.h | 2 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 60 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 5 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 15 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 62 + + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 5 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c | 57 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.c | 9 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.h | 89 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 2 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_dwb_scl.c | 4 - + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 12 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 619 ++++-- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 14 + + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.h | 7 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 6 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 89 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 3 - + .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 4 + + drivers/gpu/drm/amd/display/dc/dcn21/Makefile | 2 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c | 116 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.h | 34 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c | 122 ++ + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.h | 33 + + .../drm/amd/display/dc/dcn21/dcn21_link_encoder.c | 470 +++++ + .../drm/amd/display/dc/dcn21/dcn21_link_encoder.h | 61 + + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 303 ++- + drivers/gpu/drm/amd/display/dc/dm_cp_psp.h | 49 + + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 2 +- + drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 9 +- + .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 9 +- + .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 8 +- + .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 8 +- + .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 11 +- + .../drm/amd/display/dc/dml/display_mode_structs.h | 2 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 2 + + .../amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 10 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 85 +- + drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c | 3 - + drivers/gpu/drm/amd/display/dc/gpio/gpio_base.c | 2 - + drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c | 2 - + drivers/gpu/drm/amd/display/dc/hdcp/Makefile | 28 + + drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c | 326 +++ + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 5 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h | 6 + + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 5 + + drivers/gpu/drm/amd/display/dc/inc/hw/aux_engine.h | 3 + + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 11 +- + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 15 + + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 3 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/dsc.h | 12 +- + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 4 + + drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/opp.h | 1 + + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 5 + + .../drm/amd/display/dc/inc/hw/timing_generator.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 19 +- + .../drm/amd/display/include/ddc_service_types.h | 2 + + drivers/gpu/drm/amd/display/include/hdcp_types.h | 96 + + .../drm/amd/display/modules/freesync/freesync.c | 53 +- + drivers/gpu/drm/amd/display/modules/hdcp/Makefile | 32 + + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 426 ++++ + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 442 +++++ + .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 531 +++++ + .../amd/display/modules/hdcp/hdcp1_transition.c | 307 +++ + .../gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c | 305 +++ + .../gpu/drm/amd/display/modules/hdcp/hdcp_log.c | 163 ++ + .../gpu/drm/amd/display/modules/hdcp/hdcp_log.h | 139 ++ + .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 328 +++ + .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.h | 272 +++ + .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 1 + + drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 289 +++ + .../drm/amd/display/modules/inc/mod_info_packet.h | 3 + + .../amd/display/modules/info_packet/info_packet.c | 98 + + .../drm/amd/display/modules/power/power_helpers.c | 93 +- + .../drm/amd/display/modules/power/power_helpers.h | 1 + + .../gpu/drm/amd/include/asic_reg/bif/bif_4_1_d.h | 1 + + .../drm/amd/include/asic_reg/bif/bif_4_1_sh_mask.h | 2 + + .../gpu/drm/amd/include/asic_reg/bif/bif_5_0_d.h | 1 + + .../drm/amd/include/asic_reg/bif/bif_5_0_sh_mask.h | 2 + + .../amd/include/asic_reg/dcn/dcn_2_1_0_offset.h | 10 + + .../drm/amd/include/asic_reg/gc/gc_9_0_offset.h | 18 +- + .../drm/amd/include/asic_reg/gc/gc_9_0_sh_mask.h | 18 +- + .../drm/amd/include/asic_reg/nbio/nbio_7_4_0_smn.h | 12 + + .../amd/include/asic_reg/nbio/nbio_7_4_offset.h | 4 +- + .../amd/include/asic_reg/nbio/nbio_7_4_sh_mask.h | 49 +- + .../amd/include/asic_reg/oss/osssys_4_0_sh_mask.h | 4 + + .../gpu/drm/amd/include/asic_reg/smu/smu_7_0_1_d.h | 1 + + .../amd/include/asic_reg/smu/smu_7_0_1_sh_mask.h | 2 + + .../gpu/drm/amd/include/asic_reg/smu/smu_7_1_2_d.h | 1 + + .../amd/include/asic_reg/smu/smu_7_1_2_sh_mask.h | 2 + + .../gpu/drm/amd/include/asic_reg/smu/smu_7_1_3_d.h | 1 + + .../amd/include/asic_reg/smu/smu_7_1_3_sh_mask.h | 2 + + .../include/asic_reg/smuio/smuio_11_0_0_offset.h | 92 + + .../include/asic_reg/smuio/smuio_11_0_0_sh_mask.h | 176 ++ + drivers/gpu/drm/amd/include/atomfirmware.h | 27 +- + drivers/gpu/drm/amd/include/discovery.h | 1 - + .../amd/include/ivsrcid/nbio/irqsrcs_nbif_7_4.h | 42 + + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 13 +- + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 6 + + drivers/gpu/drm/amd/include/renoir_ip_offset.h | 34 + + drivers/gpu/drm/amd/include/vega10_enum.h | 1 + + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 19 + + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 374 ++-- + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 50 +- + drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 3 +- + drivers/gpu/drm/amd/powerplay/hwmgr/ci_baco.c | 195 ++ + drivers/gpu/drm/amd/powerplay/hwmgr/ci_baco.h | 29 + + drivers/gpu/drm/amd/powerplay/hwmgr/common_baco.c | 19 + + drivers/gpu/drm/amd/powerplay/hwmgr/common_baco.h | 13 + + drivers/gpu/drm/amd/powerplay/hwmgr/fiji_baco.c | 196 ++ + drivers/gpu/drm/amd/powerplay/hwmgr/fiji_baco.h | 29 + + drivers/gpu/drm/amd/powerplay/hwmgr/polaris_baco.c | 222 +++ + drivers/gpu/drm/amd/powerplay/hwmgr/polaris_baco.h | 29 + + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_baco.c | 91 + + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_baco.h | 32 + + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 10 +- + drivers/gpu/drm/amd/powerplay/hwmgr/tonga_baco.c | 231 +++ + drivers/gpu/drm/amd/powerplay/hwmgr/tonga_baco.h | 29 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 6 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_baco.c | 23 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 26 +- + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 66 +- + drivers/gpu/drm/amd/powerplay/inc/arcturus_ppsmc.h | 3 +- + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 1 + + .../amd/powerplay/inc/smu11_driver_if_arcturus.h | 21 +- + drivers/gpu/drm/amd/powerplay/inc/smu_types.h | 3 + + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 2 +- + drivers/gpu/drm/amd/powerplay/inc/vega20_ppsmc.h | 3 +- + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 114 +- + drivers/gpu/drm/amd/powerplay/navi10_ppt.h | 6 + + drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 463 ++++- + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 128 +- + drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 101 +- + .../gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c | 2 +- + drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c | 2 - + .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 2 +- + .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c | 2 +- + .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c | 4 +- + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 59 +- + drivers/gpu/drm/arc/arcpgu_hdmi.c | 1 + + drivers/gpu/drm/arm/display/Kconfig | 6 + + drivers/gpu/drm/arm/display/komeda/Makefile | 2 + + .../gpu/drm/arm/display/komeda/d71/d71_component.c | 221 ++- + drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c | 41 +- + drivers/gpu/drm/arm/display/komeda/d71/d71_dev.h | 2 + + drivers/gpu/drm/arm/display/komeda/d71/d71_regs.h | 9 +- + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 105 +- + drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 77 +- + drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 20 + + drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 30 +- + drivers/gpu/drm/arm/display/komeda/komeda_event.c | 140 ++ + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 2 + + drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 2 + + .../gpu/drm/arm/display/komeda/komeda_pipeline.h | 17 +- + .../drm/arm/display/komeda/komeda_pipeline_state.c | 76 +- + .../drm/arm/display/komeda/komeda_wb_connector.c | 5 + + drivers/gpu/drm/arm/malidp_drv.c | 16 +- + drivers/gpu/drm/arm/malidp_hw.c | 9 + + drivers/gpu/drm/arm/malidp_hw.h | 3 + + drivers/gpu/drm/arm/malidp_regs.h | 10 + + drivers/gpu/drm/ast/Kconfig | 2 + + drivers/gpu/drm/ast/ast_drv.c | 6 +- + drivers/gpu/drm/ast/ast_drv.h | 43 +- + drivers/gpu/drm/ast/ast_main.c | 1 - + drivers/gpu/drm/ast/ast_mode.c | 266 +-- + drivers/gpu/drm/ast/ast_ttm.c | 3 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 3 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 5 +- + drivers/gpu/drm/bochs/Kconfig | 2 + + drivers/gpu/drm/bochs/bochs.h | 1 - + drivers/gpu/drm/bochs/bochs_drv.c | 7 +- + drivers/gpu/drm/bochs/bochs_mm.c | 3 +- + drivers/gpu/drm/bridge/Kconfig | 3 +- + drivers/gpu/drm/bridge/analogix-anx78xx.c | 110 +- + drivers/gpu/drm/bridge/analogix-anx78xx.h | 17 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 1 + + drivers/gpu/drm/bridge/cdns-dsi.c | 3 +- + drivers/gpu/drm/bridge/dumb-vga-dac.c | 1 + + drivers/gpu/drm/bridge/lvds-encoder.c | 3 +- + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 1 + + drivers/gpu/drm/bridge/nxp-ptn3460.c | 1 + + drivers/gpu/drm/bridge/panel.c | 70 +- + drivers/gpu/drm/bridge/parade-ps8622.c | 1 + + drivers/gpu/drm/bridge/sii902x.c | 1 + + drivers/gpu/drm/bridge/sii9234.c | 37 +- + drivers/gpu/drm/bridge/sil-sii8620.c | 11 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c | 4 +- + .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 10 + + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 114 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.h | 39 + + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 10 +- + drivers/gpu/drm/bridge/tc358764.c | 1 + + drivers/gpu/drm/bridge/tc358767.c | 66 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 1 + + drivers/gpu/drm/bridge/ti-tfp410.c | 1 + + drivers/gpu/drm/cirrus/cirrus.c | 4 +- + drivers/gpu/drm/cirrus/cirrus_drv.h | 247 --- + drivers/gpu/drm/drm_atomic_helper.c | 18 +- + drivers/gpu/drm/drm_atomic_uapi.c | 2 +- + drivers/gpu/drm/drm_blend.c | 7 +- + drivers/gpu/drm/drm_client_modeset.c | 3 +- + drivers/gpu/drm/drm_connector.c | 142 +- + drivers/gpu/drm/drm_crtc_helper.c | 23 +- + drivers/gpu/drm/drm_crtc_helper_internal.h | 3 + + drivers/gpu/drm/drm_damage_helper.c | 8 +- + drivers/gpu/drm/drm_debugfs_crc.c | 8 +- + drivers/gpu/drm/drm_dp_cec.c | 29 +- + drivers/gpu/drm/drm_dp_helper.c | 177 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 1807 ++++++++++++----- + drivers/gpu/drm/drm_dp_mst_topology_internal.h | 24 + + drivers/gpu/drm/drm_drv.c | 17 - + drivers/gpu/drm/drm_dsc.c | 23 +- + drivers/gpu/drm/drm_edid.c | 222 ++- + drivers/gpu/drm/drm_edid_load.c | 2 +- + drivers/gpu/drm/drm_encoder.c | 1 + + drivers/gpu/drm/drm_fb_helper.c | 1 + + drivers/gpu/drm/drm_gem.c | 27 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 28 +- + drivers/gpu/drm/drm_gem_ttm_helper.c | 73 + + drivers/gpu/drm/drm_gem_vram_helper.c | 610 ++++-- + drivers/gpu/drm/drm_memory.c | 1 + + drivers/gpu/drm/drm_mipi_dbi.c | 11 +- + drivers/gpu/drm/drm_mm.c | 36 +- + drivers/gpu/drm/drm_mode_config.c | 2 - + drivers/gpu/drm/drm_of.c | 5 - + drivers/gpu/drm/drm_panel.c | 14 +- + drivers/gpu/drm/drm_prime.c | 9 + + drivers/gpu/drm/drm_print.c | 60 +- + drivers/gpu/drm/drm_probe_helper.c | 4 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 1 + + drivers/gpu/drm/drm_syncobj.c | 38 +- + drivers/gpu/drm/drm_trace.h | 14 +- + drivers/gpu/drm/drm_vblank.c | 60 +- + drivers/gpu/drm/drm_vram_helper_common.c | 8 +- + drivers/gpu/drm/drm_vram_mm_helper.c | 297 --- + drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 8 +- + drivers/gpu/drm/exynos/exynos_dp.c | 1 + + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1 + + drivers/gpu/drm/exynos/exynos_drm_mic.c | 1 + + drivers/gpu/drm/exynos/exynos_hdmi.c | 32 +- + drivers/gpu/drm/exynos/exynos_mixer.c | 4 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 1 + + drivers/gpu/drm/gma500/cdv_intel_display.c | 2 + + drivers/gpu/drm/gma500/oaktrail_crtc.c | 2 + + drivers/gpu/drm/hisilicon/hibmc/Kconfig | 3 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 6 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 3 +- + drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 1 + + drivers/gpu/drm/i2c/sil164_drv.c | 2 +- + drivers/gpu/drm/i2c/tda9950.c | 12 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 10 +- + drivers/gpu/drm/i810/i810_dma.c | 4 +- + drivers/gpu/drm/i915/Kconfig | 12 +- + drivers/gpu/drm/i915/Kconfig.debug | 144 +- + drivers/gpu/drm/i915/Makefile | 10 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 24 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 19 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 2 + + drivers/gpu/drm/i915/display/intel_audio.c | 36 +- + drivers/gpu/drm/i915/display/intel_bios.c | 8 +- + drivers/gpu/drm/i915/display/intel_bios.h | 3 +- + drivers/gpu/drm/i915/display/intel_bw.c | 81 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 1283 +++++------- + drivers/gpu/drm/i915/display/intel_cdclk.h | 13 +- + drivers/gpu/drm/i915/display/intel_color.c | 550 ++++- + drivers/gpu/drm/i915/display/intel_color.h | 7 + + drivers/gpu/drm/i915/display/intel_connector.c | 21 +- + drivers/gpu/drm/i915/display/intel_crt.c | 4 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 812 +++++--- + drivers/gpu/drm/i915/display/intel_ddi.h | 3 +- + drivers/gpu/drm/i915/display/intel_display.c | 2097 ++++++++++++-------- + drivers/gpu/drm/i915/display/intel_display.h | 66 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 552 ++++-- + drivers/gpu/drm/i915/display/intel_display_power.h | 43 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 43 +- + drivers/gpu/drm/i915/display/intel_dp.c | 468 ++++- + drivers/gpu/drm/i915/display/intel_dp.h | 9 + + drivers/gpu/drm/i915/display/intel_dp_mst.c | 68 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 412 +++- + drivers/gpu/drm/i915/display/intel_dsb.c | 332 ++++ + drivers/gpu/drm/i915/display/intel_dsb.h | 52 + + drivers/gpu/drm/i915/display/intel_dsi.c | 3 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 4 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 7 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 14 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.c | 19 +- + drivers/gpu/drm/i915/display/intel_gmbus.c | 2 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 214 +- + drivers/gpu/drm/i915/display/intel_hdcp.h | 4 + + drivers/gpu/drm/i915/display/intel_hdmi.c | 297 +-- + drivers/gpu/drm/i915/display/intel_hdmi.h | 1 + + drivers/gpu/drm/i915/display/intel_hotplug.c | 3 +- + drivers/gpu/drm/i915/display/intel_hotplug.h | 1 + + drivers/gpu/drm/i915/display/intel_lpe_audio.c | 2 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 8 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 31 +- + drivers/gpu/drm/i915/display/intel_psr.c | 413 ++-- + drivers/gpu/drm/i915/display/intel_psr.h | 1 - + drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +- + drivers/gpu/drm/i915/display/intel_sdvo.h | 1 + + drivers/gpu/drm/i915/display/intel_sprite.c | 123 +- + drivers/gpu/drm/i915/display/intel_sprite.h | 1 - + drivers/gpu/drm/i915/display/intel_tc.c | 87 +- + drivers/gpu/drm/i915/display/intel_tc.h | 1 + + drivers/gpu/drm/i915/display/intel_tv.c | 10 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 3 + + drivers/gpu/drm/i915/display/intel_vga.c | 160 ++ + drivers/gpu/drm/i915/display/intel_vga.h | 18 + + drivers/gpu/drm/i915/display/vlv_dsi.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_client_blt.c | 9 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 403 ++-- + drivers/gpu/drm/i915/gem/i915_gem_context.h | 46 +- + drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 21 +- + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 56 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 88 +- + drivers/gpu/drm/i915/gem/i915_gem_internal.c | 17 +- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 82 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 33 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 48 +- + drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 25 +- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 7 + + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 5 +- + drivers/gpu/drm/i915/gem/i915_gem_pm.c | 147 +- + drivers/gpu/drm/i915/gem/i915_gem_region.c | 174 ++ + drivers/gpu/drm/i915/gem/i915_gem_region.h | 29 + + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 79 +- + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 124 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 127 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.h | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_throttle.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 42 +- + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 30 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 260 ++- + .../drm/i915/gem/selftests/i915_gem_coherency.c | 40 +- + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 540 +++-- + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 272 ++- + .../drm/i915/gem/selftests/i915_gem_object_blt.c | 4 - + drivers/gpu/drm/i915/gem/selftests/i915_gem_phys.c | 2 - + drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c | 33 +- + drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.h | 13 +- + drivers/gpu/drm/i915/gem/selftests/mock_context.c | 15 +- + drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 19 +- + drivers/gpu/drm/i915/gt/intel_context.c | 24 +- + drivers/gpu/drm/i915/gt/intel_context_types.h | 1 + + drivers/gpu/drm/i915/gt/intel_engine.h | 4 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 158 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 20 +- + drivers/gpu/drm/i915/gt/intel_engine_pool.c | 15 +- + drivers/gpu/drm/i915/gt/intel_engine_pool.h | 4 +- + drivers/gpu/drm/i915/gt/intel_engine_types.h | 36 +- + drivers/gpu/drm/i915/gt/intel_engine_user.c | 18 +- + drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 37 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 160 +- + drivers/gpu/drm/i915/gt/intel_gt.h | 12 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 104 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.h | 11 + + drivers/gpu/drm/i915/gt/intel_gt_requests.c | 137 ++ + drivers/gpu/drm/i915/gt/intel_gt_requests.h | 24 + + drivers/gpu/drm/i915/gt/intel_gt_types.h | 25 +- + drivers/gpu/drm/i915/gt/intel_hangcheck.c | 15 +- + drivers/gpu/drm/i915/gt/intel_llc.c | 161 ++ + drivers/gpu/drm/i915/gt/intel_llc.h | 15 + + drivers/gpu/drm/i915/gt/intel_llc_types.h | 13 + + drivers/gpu/drm/i915/gt/intel_lrc.c | 1170 ++++++++--- + drivers/gpu/drm/i915/gt/intel_lrc.h | 14 + + drivers/gpu/drm/i915/gt/intel_lrc_reg.h | 66 +- + drivers/gpu/drm/i915/gt/intel_mocs.c | 274 +-- + drivers/gpu/drm/i915/gt/intel_mocs.h | 3 - + drivers/gpu/drm/i915/gt/intel_rc6.c | 712 +++++++ + drivers/gpu/drm/i915/gt/intel_rc6.h | 25 + + drivers/gpu/drm/i915/gt/intel_rc6_types.h | 28 + + drivers/gpu/drm/i915/gt/intel_reset.c | 169 +- + drivers/gpu/drm/i915/gt/intel_reset.h | 14 +- + drivers/gpu/drm/i915/gt/intel_reset_types.h | 6 + + drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 103 +- + drivers/gpu/drm/i915/gt/intel_sseu.c | 37 +- + drivers/gpu/drm/i915/gt/intel_sseu.h | 37 +- + drivers/gpu/drm/i915/gt/intel_timeline.c | 46 +- + drivers/gpu/drm/i915/gt/intel_timeline_types.h | 10 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 46 +- + drivers/gpu/drm/i915/gt/mock_engine.c | 6 + + drivers/gpu/drm/i915/gt/selftest_context.c | 68 +- + drivers/gpu/drm/i915/gt/selftest_engine_pm.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_gt_pm.c | 59 + + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 179 +- + drivers/gpu/drm/i915/gt/selftest_llc.c | 77 + + drivers/gpu/drm/i915/gt/selftest_llc.h | 14 + + drivers/gpu/drm/i915/gt/selftest_lrc.c | 1407 ++++++++++--- + drivers/gpu/drm/i915/gt/selftest_reset.c | 14 +- + drivers/gpu/drm/i915/gt/selftest_timeline.c | 137 +- + drivers/gpu/drm/i915/gt/selftest_workarounds.c | 260 +-- + drivers/gpu/drm/i915/gt/selftests/mock_timeline.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 31 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 3 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h | 3 + + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 12 +- + drivers/gpu/drm/i915/gt/uc/intel_huc.c | 37 +- + drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 15 - + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 32 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 51 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h | 11 +- + drivers/gpu/drm/i915/gt/uc/selftest_guc.c | 46 +- + drivers/gpu/drm/i915/gvt/aperture_gm.c | 14 +- + drivers/gpu/drm/i915/gvt/execlist.c | 4 +- + drivers/gpu/drm/i915/gvt/handlers.c | 2 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 17 - + drivers/gpu/drm/i915/gvt/scheduler.c | 45 +- + drivers/gpu/drm/i915/i915_active.c | 344 ++-- + drivers/gpu/drm/i915/i915_active.h | 328 +-- + drivers/gpu/drm/i915/i915_active_types.h | 33 +- + drivers/gpu/drm/i915/i915_buddy.c | 1 + + drivers/gpu/drm/i915/i915_debugfs.c | 322 +-- + drivers/gpu/drm/i915/i915_drv.c | 242 +-- + drivers/gpu/drm/i915/i915_drv.h | 503 +---- + drivers/gpu/drm/i915/i915_gem.c | 333 +--- + drivers/gpu/drm/i915/i915_gem.h | 30 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 58 +- + drivers/gpu/drm/i915/i915_gem_fence_reg.c | 98 +- + drivers/gpu/drm/i915/i915_gem_fence_reg.h | 7 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 312 +-- + drivers/gpu/drm/i915/i915_gem_gtt.h | 72 +- + drivers/gpu/drm/i915/i915_getparam.c | 8 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 28 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 3 +- + drivers/gpu/drm/i915/i915_irq.c | 360 ++-- + drivers/gpu/drm/i915/i915_irq.h | 4 +- + drivers/gpu/drm/i915/i915_params.c | 3 +- + drivers/gpu/drm/i915/i915_pci.c | 73 +- + drivers/gpu/drm/i915/i915_perf.c | 1488 +++++++++----- + drivers/gpu/drm/i915/i915_perf.h | 32 +- + drivers/gpu/drm/i915/i915_perf_types.h | 406 ++++ + drivers/gpu/drm/i915/i915_pmu.c | 284 +-- + drivers/gpu/drm/i915/i915_pmu.h | 8 +- + drivers/gpu/drm/i915/i915_query.c | 306 ++- + drivers/gpu/drm/i915/i915_reg.h | 670 +++++-- + drivers/gpu/drm/i915/i915_request.c | 225 +-- + drivers/gpu/drm/i915/i915_request.h | 40 +- + drivers/gpu/drm/i915/i915_scatterlist.h | 8 +- + drivers/gpu/drm/i915/i915_scheduler.c | 17 +- + drivers/gpu/drm/i915/i915_scheduler.h | 18 - + drivers/gpu/drm/i915/i915_scheduler_types.h | 9 + + drivers/gpu/drm/i915/i915_suspend.c | 11 +- + drivers/gpu/drm/i915/i915_switcheroo.c | 67 + + drivers/gpu/drm/i915/i915_switcheroo.h | 14 + + drivers/gpu/drm/i915/i915_sysfs.c | 88 +- + drivers/gpu/drm/i915/i915_trace.h | 40 +- + drivers/gpu/drm/i915/i915_vma.c | 596 ++++-- + drivers/gpu/drm/i915/i915_vma.h | 132 +- + drivers/gpu/drm/i915/intel_csr.c | 4 +- + drivers/gpu/drm/i915/intel_device_info.c | 217 +- + drivers/gpu/drm/i915/intel_device_info.h | 5 +- + drivers/gpu/drm/i915/intel_memory_region.c | 213 ++ + drivers/gpu/drm/i915/intel_memory_region.h | 120 ++ + drivers/gpu/drm/i915/intel_pch.c | 6 +- + drivers/gpu/drm/i915/intel_pch.h | 5 +- + drivers/gpu/drm/i915/intel_pm.c | 1275 ++---------- + drivers/gpu/drm/i915/intel_pm.h | 3 - + drivers/gpu/drm/i915/intel_runtime_pm.c | 1 - + drivers/gpu/drm/i915/intel_uncore.c | 94 +- + drivers/gpu/drm/i915/intel_uncore.h | 20 +- + drivers/gpu/drm/i915/selftests/i915_active.c | 42 +- + drivers/gpu/drm/i915/selftests/i915_buddy.c | 4 + + drivers/gpu/drm/i915/selftests/i915_gem.c | 12 +- + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 55 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 400 +++- + .../gpu/drm/i915/selftests/i915_live_selftests.h | 3 + + .../gpu/drm/i915/selftests/i915_mock_selftests.h | 1 + + drivers/gpu/drm/i915/selftests/i915_perf.c | 216 ++ + drivers/gpu/drm/i915/selftests/i915_random.c | 20 + + drivers/gpu/drm/i915/selftests/i915_random.h | 4 + + drivers/gpu/drm/i915/selftests/i915_request.c | 498 +++-- + drivers/gpu/drm/i915/selftests/i915_selftest.c | 8 +- + drivers/gpu/drm/i915/selftests/i915_vma.c | 19 +- + drivers/gpu/drm/i915/selftests/igt_flush_test.c | 33 +- + drivers/gpu/drm/i915/selftests/igt_flush_test.h | 2 +- + drivers/gpu/drm/i915/selftests/igt_live_test.c | 14 +- + drivers/gpu/drm/i915/selftests/igt_reset.c | 4 +- + drivers/gpu/drm/i915/selftests/igt_spinner.c | 2 +- + .../gpu/drm/i915/selftests/intel_memory_region.c | 282 +++ + drivers/gpu/drm/i915/selftests/intel_uncore.c | 2 + + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 48 +- + drivers/gpu/drm/i915/selftests/mock_gtt.c | 6 +- + drivers/gpu/drm/i915/selftests/mock_region.c | 59 + + drivers/gpu/drm/i915/selftests/mock_region.h | 16 + + drivers/gpu/drm/i915/selftests/mock_uncore.c | 5 +- + drivers/gpu/drm/i915/selftests/mock_uncore.h | 3 +- + drivers/gpu/drm/imx/imx-ldb.c | 1 + + drivers/gpu/drm/imx/parallel-display.c | 1 + + drivers/gpu/drm/ingenic/ingenic-drm.c | 5 +- + drivers/gpu/drm/lima/Kconfig | 1 + + drivers/gpu/drm/lima/Makefile | 4 +- + drivers/gpu/drm/lima/lima_device.c | 5 +- + drivers/gpu/drm/lima/lima_drv.c | 22 +- + drivers/gpu/drm/lima/lima_gem.c | 195 +- + drivers/gpu/drm/lima/lima_gem.h | 32 +- + drivers/gpu/drm/lima/lima_gem_prime.c | 46 - + drivers/gpu/drm/lima/lima_gem_prime.h | 13 - + drivers/gpu/drm/lima/lima_mmu.c | 1 - + drivers/gpu/drm/lima/lima_object.c | 119 -- + drivers/gpu/drm/lima/lima_object.h | 35 - + drivers/gpu/drm/lima/lima_sched.c | 6 +- + drivers/gpu/drm/lima/lima_vm.c | 87 +- + drivers/gpu/drm/mcde/mcde_drv.c | 3 +- + drivers/gpu/drm/mcde/mcde_dsi.c | 4 +- + drivers/gpu/drm/mediatek/Makefile | 2 + + drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 61 +- + drivers/gpu/drm/mediatek/mtk_dpi.c | 1 + + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 37 +- + drivers/gpu/drm/mediatek/mtk_drm_ddp.c | 128 +- + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 67 + + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 21 + + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 3 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 234 ++- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 1 + + drivers/gpu/drm/mediatek/mtk_mipi_tx.c | 338 +--- + drivers/gpu/drm/mediatek/mtk_mipi_tx.h | 49 + + drivers/gpu/drm/mediatek/mtk_mt8173_mipi_tx.c | 288 +++ + drivers/gpu/drm/mediatek/mtk_mt8183_mipi_tx.c | 149 ++ + drivers/gpu/drm/meson/meson_drv.c | 32 + + drivers/gpu/drm/meson/meson_dw_hdmi.c | 115 +- + drivers/gpu/drm/meson/meson_vclk.c | 9 +- + drivers/gpu/drm/mgag200/Kconfig | 2 + + drivers/gpu/drm/mgag200/mgag200_cursor.c | 327 +-- + drivers/gpu/drm/mgag200/mgag200_drv.c | 7 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 23 +- + drivers/gpu/drm/mgag200/mgag200_main.c | 20 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 17 +- + drivers/gpu/drm/mgag200/mgag200_ttm.c | 7 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 4 +- + drivers/gpu/drm/msm/dsi/dsi.h | 1 + + drivers/gpu/drm/msm/edp/edp.c | 4 +- + drivers/gpu/drm/msm/edp/edp.h | 1 + + drivers/gpu/drm/msm/edp/edp_ctrl.c | 70 +- + drivers/gpu/drm/msm/hdmi/hdmi.c | 4 +- + drivers/gpu/drm/msm/hdmi/hdmi.h | 2 + + drivers/gpu/drm/mxsfb/mxsfb_crtc.c | 20 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 46 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.h | 4 +- + drivers/gpu/drm/mxsfb/mxsfb_out.c | 26 +- + drivers/gpu/drm/nouveau/dispnv04/disp.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 40 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 43 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 19 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 1 + + drivers/gpu/drm/omapdrm/dss/Makefile | 2 +- + drivers/gpu/drm/omapdrm/dss/core.c | 55 - + drivers/gpu/drm/omapdrm/dss/dispc.c | 46 +- + drivers/gpu/drm/omapdrm/dss/dsi.c | 3 +- + drivers/gpu/drm/omapdrm/dss/dss.c | 37 + + drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 9 +- + drivers/gpu/drm/omapdrm/dss/hdmi5_core.c | 129 +- + drivers/gpu/drm/omapdrm/dss/output.c | 1 + + drivers/gpu/drm/omapdrm/omap_dmm_tiler.h | 2 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 1 + + drivers/gpu/drm/omapdrm/omap_encoder.c | 1 + + drivers/gpu/drm/omapdrm/omap_fb.c | 9 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 137 +- + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 2 +- + drivers/gpu/drm/panel/panel-arm-versatile.c | 5 +- + .../gpu/drm/panel/panel-feiyang-fy07024di26a30d.c | 5 +- + drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 5 +- + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 5 +- + drivers/gpu/drm/panel/panel-innolux-p079zca.c | 5 +- + drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 5 +- + drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c | 5 +- + drivers/gpu/drm/panel/panel-lg-lb035q02.c | 5 +- + drivers/gpu/drm/panel/panel-lg-lg4573.c | 5 +- + drivers/gpu/drm/panel/panel-lvds.c | 26 +- + drivers/gpu/drm/panel/panel-nec-nl8048hl11.c | 5 +- + drivers/gpu/drm/panel/panel-novatek-nt39016.c | 5 +- + drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 5 +- + drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 5 +- + drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c | 5 +- + .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 5 +- + .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 4 +- + drivers/gpu/drm/panel/panel-raydium-rm67191.c | 5 +- + drivers/gpu/drm/panel/panel-raydium-rm68200.c | 5 +- + drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c | 5 +- + drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 5 +- + drivers/gpu/drm/panel/panel-samsung-ld9040.c | 5 +- + drivers/gpu/drm/panel/panel-samsung-s6d16d0.c | 5 +- + drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 5 +- + drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 5 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 5 +- + drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 5 +- + drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 5 +- + drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c | 5 +- + drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c | 5 +- + drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 5 +- + drivers/gpu/drm/panel/panel-simple.c | 29 +- + drivers/gpu/drm/panel/panel-sitronix-st7701.c | 5 +- + drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 4 +- + drivers/gpu/drm/panel/panel-sony-acx565akm.c | 5 +- + drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 5 +- + drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 5 +- + drivers/gpu/drm/panel/panel-tpo-tpg110.c | 5 +- + drivers/gpu/drm/panel/panel-truly-nt35597.c | 5 +- + drivers/gpu/drm/panfrost/TODO | 2 + + drivers/gpu/drm/panfrost/panfrost_drv.c | 2 +- + drivers/gpu/drm/panfrost/panfrost_gem.c | 2 +- + drivers/gpu/drm/panfrost/panfrost_issues.h | 81 + + drivers/gpu/drm/panfrost/panfrost_job.c | 2 - + drivers/gpu/drm/pl111/pl111_drv.c | 4 +- + drivers/gpu/drm/qxl/Kconfig | 1 + + drivers/gpu/drm/qxl/qxl_drv.c | 20 +- + drivers/gpu/drm/qxl/qxl_drv.h | 2 +- + drivers/gpu/drm/qxl/qxl_object.c | 21 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 51 +- + drivers/gpu/drm/radeon/radeon_audio.c | 4 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 27 +- + drivers/gpu/drm/radeon/radeon_dp_mst.c | 24 +- + drivers/gpu/drm/radeon/radeon_drv.c | 2 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 1 + + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 30 + + drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 5 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 6 +- + drivers/gpu/drm/rcar-du/rcar_lvds.c | 29 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 12 +- + drivers/gpu/drm/rockchip/cdn-dp-core.h | 3 +- + drivers/gpu/drm/rockchip/cdn-dp-reg.c | 19 +- + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 2 + + drivers/gpu/drm/rockchip/rk3066_hdmi.c | 8 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 169 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 10 +- + drivers/gpu/drm/rockchip/rockchip_lvds.c | 1 + + drivers/gpu/drm/rockchip/rockchip_rgb.c | 4 +- + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 48 +- + drivers/gpu/drm/scheduler/sched_fence.c | 4 +- + drivers/gpu/drm/selftests/Makefile | 2 +- + drivers/gpu/drm/selftests/drm_modeset_selftests.h | 2 + + drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c | 238 +++ + drivers/gpu/drm/selftests/test-drm_framebuffer.c | 2 +- + drivers/gpu/drm/selftests/test-drm_mm.c | 14 +- + .../gpu/drm/selftests/test-drm_modeset_common.h | 2 + + drivers/gpu/drm/sti/sti_cursor.c | 2 +- + drivers/gpu/drm/sti/sti_dvo.c | 3 +- + drivers/gpu/drm/sti/sti_gdp.c | 2 +- + drivers/gpu/drm/sti/sti_hda.c | 3 +- + drivers/gpu/drm/sti/sti_hdmi.c | 26 +- + drivers/gpu/drm/sti/sti_tvout.c | 10 +- + drivers/gpu/drm/sti/sti_vtg.c | 2 +- + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 5 +- + drivers/gpu/drm/stm/ltdc.c | 39 +- + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 6 +- + drivers/gpu/drm/sun4i/sun4i_lvds.c | 1 + + drivers/gpu/drm/sun4i/sun4i_rgb.c | 1 + + drivers/gpu/drm/sun4i/sun4i_tcon.c | 1 + + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 35 +- + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h | 1 + + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 2 + + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h | 1 + + drivers/gpu/drm/tegra/Makefile | 1 + + drivers/gpu/drm/tegra/dp.c | 133 ++ + drivers/gpu/drm/tegra/dp.h | 26 + + drivers/gpu/drm/tegra/dpaux.c | 1 + + drivers/gpu/drm/tegra/sor.c | 1 + + drivers/gpu/drm/tilcdc/tilcdc_external.c | 5 +- + drivers/gpu/drm/tilcdc/tilcdc_plane.c | 2 +- + drivers/gpu/drm/tiny/gm12u320.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 58 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 60 +- + drivers/gpu/drm/tve200/tve200_drv.c | 4 +- + drivers/gpu/drm/udl/udl_connector.c | 8 - + drivers/gpu/drm/v3d/v3d_bo.c | 2 +- + drivers/gpu/drm/v3d/v3d_drv.c | 5 +- + drivers/gpu/drm/v3d/v3d_gem.c | 55 +- + drivers/gpu/drm/vboxvideo/Kconfig | 2 + + drivers/gpu/drm/vboxvideo/Makefile | 2 +- + drivers/gpu/drm/vboxvideo/vbox_drv.c | 19 +- + drivers/gpu/drm/vboxvideo/vbox_drv.h | 27 - + drivers/gpu/drm/vboxvideo/vbox_fb.c | 149 -- + drivers/gpu/drm/vboxvideo/vbox_main.c | 119 +- + drivers/gpu/drm/vboxvideo/vbox_mode.c | 85 +- + drivers/gpu/drm/vboxvideo/vbox_ttm.c | 3 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 2 +- + drivers/gpu/drm/vc4/vc4_dpi.c | 3 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 5 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +- + drivers/gpu/drm/vc4/vc4_hvs.c | 2 +- + drivers/gpu/drm/vc4/vc4_plane.c | 4 +- + drivers/gpu/drm/virtio/Kconfig | 2 +- + drivers/gpu/drm/virtio/Makefile | 2 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 22 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 135 +- + drivers/gpu/drm/virtio/virtgpu_fence.c | 4 + + drivers/gpu/drm/virtio/virtgpu_gem.c | 183 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 228 +-- + drivers/gpu/drm/virtio/virtgpu_kms.c | 24 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 270 +-- + drivers/gpu/drm/virtio/virtgpu_plane.c | 61 +- + drivers/gpu/drm/virtio/virtgpu_prime.c | 34 - + drivers/gpu/drm/virtio/virtgpu_ttm.c | 305 --- + drivers/gpu/drm/virtio/virtgpu_vq.c | 227 ++- + drivers/gpu/drm/vkms/vkms_crtc.c | 9 +- + drivers/gpu/drm/vkms/vkms_drv.c | 15 +- + drivers/gpu/drm/vkms/vkms_drv.h | 6 + + drivers/gpu/drm/vkms/vkms_gem.c | 27 + + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 5 + + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 + + drivers/media/cec/cec-notifier.c | 5 +- + drivers/media/platform/cros-ec-cec/cros-ec-cec.c | 6 +- + drivers/media/platform/meson/ao-cec-g12a.c | 4 +- + drivers/media/platform/meson/ao-cec.c | 4 +- + drivers/media/platform/s5p-cec/s5p_cec.c | 4 +- + drivers/media/platform/seco-cec/seco-cec.c | 4 +- + drivers/media/platform/sti/cec/stih-cec.c | 4 +- + drivers/media/platform/tegra-cec/tegra_cec.c | 4 +- + drivers/misc/mei/hdcp/mei_hdcp.c | 45 +- + drivers/misc/mei/hdcp/mei_hdcp.h | 17 +- + drivers/video/fbdev/core/fbmem.c | 17 +- + drivers/video/fbdev/sa1100fb.c | 13 - + drivers/video/hdmi.c | 8 +- + include/drm/amd_asic_type.h | 56 +- + include/drm/bridge/dw_hdmi.h | 2 + + include/drm/drmP.h | 103 - + include/drm/drm_bridge.h | 33 +- + include/drm/drm_connector.h | 25 +- + include/drm/drm_crtc.h | 1 - + include/drm/drm_dp_helper.h | 140 +- + include/drm/drm_dp_mst_helper.h | 172 +- + include/drm/drm_drv.h | 2 - + include/drm/drm_edid.h | 5 +- + include/drm/drm_encoder.h | 6 +- + include/drm/drm_fb_helper.h | 6 +- + include/drm/drm_gem.h | 14 + + include/drm/drm_gem_shmem_helper.h | 30 +- + include/drm/drm_gem_ttm_helper.h | 21 + + include/drm/drm_gem_vram_helper.h | 82 +- + include/drm/drm_mm.h | 7 +- + include/drm/drm_modeset_helper_vtables.h | 7 +- + include/drm/drm_modeset_lock.h | 9 + + include/drm/drm_os_linux.h | 55 - + include/drm/drm_panel.h | 13 +- + include/drm/drm_plane.h | 31 +- + include/drm/drm_prime.h | 2 - + include/drm/drm_print.h | 26 + + include/drm/drm_rect.h | 31 + + include/drm/drm_vblank.h | 15 +- + include/drm/drm_vram_mm_helper.h | 104 - + include/drm/i915_drm.h | 18 - + include/drm/i915_mei_hdcp_interface.h | 42 +- + include/drm/ttm/ttm_bo_api.h | 10 +- + include/drm/ttm/ttm_bo_driver.h | 6 +- + include/linux/device_cgroup.h | 19 +- + include/linux/fb.h | 2 +- + include/media/cec-notifier.h | 7 +- + include/uapi/drm/amdgpu_drm.h | 2 + + include/uapi/drm/drm.h | 3 +- + include/uapi/drm/drm_fourcc.h | 28 +- + include/uapi/drm/i915_drm.h | 113 +- + include/uapi/drm/omap_drm.h | 18 +- + include/uapi/drm/v3d_drm.h | 8 +- + security/device_cgroup.c | 15 +- + 985 files changed, 44336 insertions(+), 21417 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v6_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v6_0.h + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dm_cp_psp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/hdcp/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c + create mode 100644 drivers/gpu/drm/amd/display/include/hdcp_types.h + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/Makefile + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_transition.c + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp_log.c + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp_log.h + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.h + create mode 100644 drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h + create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/nbio/irqsrcs_nbif_7_4.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/ci_baco.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/ci_baco.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_baco.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_baco.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris_baco.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris_baco.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_baco.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_baco.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_baco.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_baco.h + create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_event.c + delete mode 100644 drivers/gpu/drm/cirrus/cirrus_drv.h + create mode 100644 drivers/gpu/drm/drm_dp_mst_topology_internal.h + create mode 100644 drivers/gpu/drm/drm_gem_ttm_helper.c + delete mode 100644 drivers/gpu/drm/drm_vram_mm_helper.c + create mode 100644 drivers/gpu/drm/i915/display/intel_dsb.c + create mode 100644 drivers/gpu/drm/i915/display/intel_dsb.h + create mode 100644 drivers/gpu/drm/i915/display/intel_vga.c + create mode 100644 drivers/gpu/drm/i915/display/intel_vga.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_region.c + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_region.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_requests.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_requests.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_llc.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_llc.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_llc_types.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_rc6.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_rc6.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_rc6_types.h + create mode 100644 drivers/gpu/drm/i915/gt/selftest_gt_pm.c + create mode 100644 drivers/gpu/drm/i915/gt/selftest_llc.c + create mode 100644 drivers/gpu/drm/i915/gt/selftest_llc.h + create mode 100644 drivers/gpu/drm/i915/i915_perf_types.h + create mode 100644 drivers/gpu/drm/i915/i915_switcheroo.c + create mode 100644 drivers/gpu/drm/i915/i915_switcheroo.h + create mode 100644 drivers/gpu/drm/i915/intel_memory_region.c + create mode 100644 drivers/gpu/drm/i915/intel_memory_region.h + create mode 100644 drivers/gpu/drm/i915/selftests/i915_perf.c + create mode 100644 drivers/gpu/drm/i915/selftests/intel_memory_region.c + create mode 100644 drivers/gpu/drm/i915/selftests/mock_region.c + create mode 100644 drivers/gpu/drm/i915/selftests/mock_region.h + delete mode 100644 drivers/gpu/drm/lima/lima_gem_prime.c + delete mode 100644 drivers/gpu/drm/lima/lima_gem_prime.h + delete mode 100644 drivers/gpu/drm/lima/lima_object.c + delete mode 100644 drivers/gpu/drm/lima/lima_object.h + create mode 100644 drivers/gpu/drm/mediatek/mtk_mipi_tx.h + create mode 100644 drivers/gpu/drm/mediatek/mtk_mt8173_mipi_tx.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_mt8183_mipi_tx.c + delete mode 100644 drivers/gpu/drm/omapdrm/dss/core.c + create mode 100644 drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c + create mode 100644 drivers/gpu/drm/tegra/dp.c + create mode 100644 drivers/gpu/drm/tegra/dp.h + delete mode 100644 drivers/gpu/drm/vboxvideo/vbox_fb.c + delete mode 100644 drivers/gpu/drm/virtio/virtgpu_ttm.c + delete mode 100644 include/drm/drmP.h + create mode 100644 include/drm/drm_gem_ttm_helper.h + delete mode 100644 include/drm/drm_os_linux.h + delete mode 100644 include/drm/drm_vram_mm_helper.h +$ git am -3 ../patches/0001-cec-fix-up-for-cec-add-cec_adapter-to-cec_notifier_c.patch +Applying: cec: fix up for "cec: add cec_adapter to cec_notifier_cec_adap_unregister()" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/media/platform/cec-gpio/cec-gpio.c +$ git add -A . +$ git commit -v -a --amend +[master e12bf70240d4] next-20191031/drm + Date: Tue Nov 5 13:47:57 2019 +1100 +$ git am -3 ../patches/drm_v3d-Fix-double-free-in-v3d_submit_cl_ioctl.patch +Applying: drm/v3d: Fix double free in v3d_submit_cl_ioctl() +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/v3d/v3d_gem.c +$ git add -A . +$ git commit -v -a --amend +[master db05ff64c1d8] next-20191031/drm + Date: Tue Nov 5 13:47:57 2019 +1100 +Merging amdgpu/drm-next (93e6e11732b6 drm/radeon: fix si_enable_smc_cac() failed issue) +$ git merge amdgpu/drm-next +Auto-merging include/uapi/linux/kfd_ioctl.h +CONFLICT (content): Merge conflict in include/uapi/linux/kfd_ioctl.h +Auto-merging include/drm/ttm/ttm_bo_api.h +Auto-merging drivers/gpu/drm/ttm/ttm_bo_vm.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +Auto-merging drivers/gpu/drm/radeon/radeon_drv.c +Auto-merging drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +Auto-merging drivers/gpu/drm/amd/display/dc/dsc/Makefile +Auto-merging drivers/gpu/drm/amd/display/dc/dml/Makefile +Auto-merging drivers/gpu/drm/amd/display/dc/dcn21/Makefile +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn21/Makefile +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/Makefile +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn20/Makefile +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c +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 +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_priv.h +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Resolved 'drivers/gpu/drm/amd/amdkfd/kfd_chardev.c' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/amd/display/dc/dcn20/Makefile' +Recorded preimage for 'drivers/gpu/drm/amd/display/dc/dcn21/Makefile' +Resolved 'drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h' using previous resolution. +Resolved 'include/uapi/linux/kfd_ioctl.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/amd/display/dc/dcn20/Makefile'. +Recorded resolution for 'drivers/gpu/drm/amd/display/dc/dcn21/Makefile'. +[master c2f9441e0e83] Merge remote-tracking branch 'amdgpu/drm-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 - + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 4 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 3 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 3 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 3 - + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 6 - + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 11 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 56 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c | 52 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.h | 39 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 20 - + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 3 + + drivers/gpu/drm/amd/amdgpu/cik.c | 19 + + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 23 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 31 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 3 +- + drivers/gpu/drm/amd/amdgpu/nvd.h | 1 + + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/si.c | 11 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 6 +- + drivers/gpu/drm/amd/amdgpu/soc15d.h | 1 + + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 3 - + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 5 - + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 47 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 + + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 9 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 140 +++- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 2 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 21 + + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 48 +- + .../amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c | 14 +- + .../amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.c | 4 +- + .../drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 10 +- + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 38 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 178 ++--- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.h | 7 - + .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 8 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 185 ++++++ + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 48 +- + drivers/gpu/drm/amd/display/dc/dc.h | 9 +- + drivers/gpu/drm/amd/display/dc/dc_ddc_types.h | 3 +- + drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 4 + + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 10 +- + .../drm/amd/display/dc/dce100/dce100_resource.c | 37 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 11 +- + .../drm/amd/display/dc/dce110/dce110_resource.c | 37 +- + .../drm/amd/display/dc/dce112/dce112_resource.c | 37 +- + .../drm/amd/display/dc/dce120/dce120_resource.c | 37 +- + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 37 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 4 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 28 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 33 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 4 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 260 +++++--- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 31 + + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 79 ++- + drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 4 +- + .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 3 +- + .../drm/amd/display/dc/dml/display_mode_structs.h | 1 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 3 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 1 + + drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c | 4 +- + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 4 - + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 3 +- + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 2 - + .../drm/amd/display/modules/color/color_gamma.c | 51 +- + drivers/gpu/drm/amd/include/amd_shared.h | 2 + + .../drm/amd/include/asic_reg/vcn/vcn_2_5_offset.h | 12 + + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 722 +++++++++++++++++++-- + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 450 +++++++++---- + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 337 +++------- + .../amd/powerplay/inc/smu11_driver_if_arcturus.h | 28 +- + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 122 +++- + drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h | 41 +- + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 66 +- + drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 32 +- + drivers/gpu/drm/amd/powerplay/smu_internal.h | 204 ++++++ + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 196 ++---- + drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 74 +-- + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 76 ++- + drivers/gpu/drm/radeon/cik.c | 8 +- + drivers/gpu/drm/radeon/si_dpm.c | 1 + + drivers/gpu/drm/ttm/ttm_bo_util.c | 64 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 174 +++-- + include/drm/ttm/ttm_bo_api.h | 14 + + include/uapi/drm/amdgpu_drm.h | 10 +- + 112 files changed, 3368 insertions(+), 1274 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.h + create mode 100644 drivers/gpu/drm/amd/powerplay/smu_internal.h +Merging drm-intel/for-linux-next (458863e08e13 drm/i915: Mark contents as dirty on a write fault) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/selftests/i915_gem.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/selftests/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_request.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_request.c +Auto-merging drivers/gpu/drm/i915/i915_drv.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/gt/intel_workarounds.c +Auto-merging drivers/gpu/drm/i915/gt/intel_ringbuffer.c +Auto-merging drivers/gpu/drm/i915/gt/intel_reset.h +Auto-merging drivers/gpu/drm/i915/gt/intel_reset.c +Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_pm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_pm.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_mman.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_mman.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Resolved 'drivers/gpu/drm/i915/gem/i915_gem_mman.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/gem/i915_gem_pm.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_drv.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_request.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/selftests/i915_gem.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d1d753ac9ad5] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. +Merging drm-tegra/drm/tegra/for-next (84db889e6d82 drm/tegra: Unconditionally select IOMMU_IOVA) +$ git merge drm-tegra/drm/tegra/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/Kconfig | 2 +- + drivers/gpu/drm/tegra/dc.c | 30 +- + drivers/gpu/drm/tegra/dc.h | 2 - + drivers/gpu/drm/tegra/dp.c | 765 +++++++++++- + drivers/gpu/drm/tegra/dp.h | 157 ++- + drivers/gpu/drm/tegra/dpaux.c | 207 ++-- + drivers/gpu/drm/tegra/drm.c | 417 ++++--- + drivers/gpu/drm/tegra/drm.h | 13 +- + drivers/gpu/drm/tegra/falcon.c | 64 +- + drivers/gpu/drm/tegra/falcon.h | 16 +- + drivers/gpu/drm/tegra/fb.c | 4 +- + drivers/gpu/drm/tegra/gem.c | 81 +- + drivers/gpu/drm/tegra/gem.h | 2 +- + drivers/gpu/drm/tegra/gr2d.c | 12 +- + drivers/gpu/drm/tegra/gr3d.c | 12 +- + drivers/gpu/drm/tegra/hub.c | 6 +- + drivers/gpu/drm/tegra/output.c | 28 +- + drivers/gpu/drm/tegra/plane.c | 104 ++ + drivers/gpu/drm/tegra/plane.h | 8 + + drivers/gpu/drm/tegra/sor.c | 2575 +++++++++++++++++++++++----------------- + drivers/gpu/drm/tegra/sor.h | 3 + + drivers/gpu/drm/tegra/vic.c | 138 ++- + drivers/gpu/host1x/Kconfig | 2 +- + drivers/gpu/host1x/bus.c | 2 +- + drivers/gpu/host1x/cdma.c | 6 +- + drivers/gpu/host1x/channel.c | 13 +- + drivers/gpu/host1x/channel.h | 1 + + drivers/gpu/host1x/dev.c | 236 ++-- + drivers/gpu/host1x/dev.h | 3 + + drivers/gpu/host1x/intr.c | 1 - + drivers/gpu/host1x/job.c | 91 +- + drivers/gpu/host1x/job.h | 4 + + include/linux/host1x.h | 26 +- + 33 files changed, 3309 insertions(+), 1722 deletions(-) +Merging drm-misc/for-linux-next (8a537de0f3d8 drm/doc: Update IGT documentation) +$ git merge drm-misc/for-linux-next +Auto-merging include/drm/ttm/ttm_bo_api.h +Auto-merging drivers/gpu/drm/ttm/ttm_bo_vm.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo_util.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/ttm/ttm_bo_util.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +Auto-merging drivers/gpu/drm/scheduler/sched_main.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Resolved 'drivers/gpu/drm/ttm/ttm_bo_util.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 28aa46c4528b] Merge remote-tracking branch 'drm-misc/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/drm-uapi.rst | 32 +--- + Documentation/gpu/todo.rst | 25 ++- + drivers/dma-buf/dma-buf.c | 120 +++++++++--- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 215 ++++++++++++---------- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h | 5 - + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 32 +++- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 9 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- + drivers/gpu/drm/bochs/bochs_kms.c | 26 +-- + drivers/gpu/drm/cirrus/cirrus.c | 2 +- + drivers/gpu/drm/drm_agpsupport.c | 4 +- + drivers/gpu/drm/drm_cache.c | 14 +- + drivers/gpu/drm/drm_fb_helper.c | 61 ++---- + drivers/gpu/drm/drm_gem.c | 3 + + drivers/gpu/drm/drm_gem_shmem_helper.c | 3 - + drivers/gpu/drm/drm_gem_vram_helper.c | 131 ++++++++++++- + drivers/gpu/drm/drm_mode_object.c | 14 ++ + drivers/gpu/drm/drm_simple_kms_helper.c | 2 +- + drivers/gpu/drm/gma500/mdfld_dsi_output.c | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 14 +- + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 4 +- + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 124 ++++--------- + drivers/gpu/drm/panfrost/panfrost_devfreq.h | 3 +- + drivers/gpu/drm/panfrost/panfrost_device.h | 14 +- + drivers/gpu/drm/panfrost/panfrost_job.c | 15 +- + drivers/gpu/drm/pl111/pl111_display.c | 4 +- + drivers/gpu/drm/qxl/qxl_drv.h | 2 + + drivers/gpu/drm/qxl/qxl_object.c | 11 +- + drivers/gpu/drm/qxl/qxl_release.c | 11 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 11 +- + drivers/gpu/drm/radeon/radeon_gem.c | 2 +- + drivers/gpu/drm/radeon/radeon_object.c | 2 +- + drivers/gpu/drm/scheduler/sched_main.c | 43 +++-- + drivers/gpu/drm/ttm/ttm_agp_backend.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 132 ++++--------- + drivers/gpu/drm/ttm/ttm_bo_util.c | 23 +-- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 11 +- + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 57 +----- + drivers/gpu/drm/ttm/ttm_memory.c | 2 +- + drivers/gpu/drm/ttm/ttm_page_alloc.c | 4 +- + drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 4 +- + drivers/gpu/drm/ttm/ttm_tt.c | 5 +- + drivers/gpu/drm/vboxvideo/vbox_mode.c | 63 +------ + drivers/gpu/drm/vkms/vkms_drv.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 17 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 3 + + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 3 + + drivers/gpu/drm/vmwgfx/vmwgfx_validation.h | 2 +- + drivers/gpu/drm/xen/xen_drm_front_kms.c | 7 +- + include/drm/drm_fb_helper.h | 1 - + include/drm/drm_gem.h | 5 +- + include/drm/drm_gem_vram_helper.h | 25 +++ + include/drm/drm_scdc_helper.h | 6 +- + include/drm/drm_simple_kms_helper.h | 2 +- + include/drm/ttm/ttm_bo_api.h | 56 ------ + include/drm/ttm/ttm_bo_driver.h | 26 +-- + include/drm/ttm/ttm_execbuf_util.h | 2 +- + include/drm/ttm/ttm_memory.h | 1 - + include/linux/dma-buf.h | 63 ++++++- + include/uapi/drm/exynos_drm.h | 2 +- + 67 files changed, 749 insertions(+), 769 deletions(-) +Merging drm-msm/msm-next (e20c9284c8f2 drm/msm/adreno: Add support for Adreno 510 GPU) +$ git merge drm-msm/msm-next +Auto-merging drivers/soc/qcom/Makefile +Auto-merging drivers/soc/qcom/Kconfig +Auto-merging drivers/gpu/drm/msm/dsi/dsi_host.c +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +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/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 ++++ + 49 files changed, 1235 insertions(+), 307 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 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 (da0c9ea146cb Linux 5.4-rc2) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (6111fd2370ee ALSA: pcm: Fix missing check of the new non-cached buffer type) +$ git merge sound/for-next +Auto-merging include/linux/pci.h +Auto-merging drivers/pci/pci.c +Merge made by the 'recursive' strategy. + drivers/pci/pci.c | 18 ++ + include/linux/pci.h | 2 + + include/sound/intel-dsp-config.h | 34 +++ + sound/core/Kconfig | 28 +- + sound/core/pcm_native.c | 3 +- + sound/drivers/Kconfig | 20 +- + sound/firewire/Kconfig | 6 +- + sound/firewire/amdtp-stream.c | 407 ++++++++++++++++++++++------ + sound/firewire/amdtp-stream.h | 28 +- + sound/firewire/bebob/bebob.h | 4 +- + sound/firewire/bebob/bebob_midi.c | 2 +- + sound/firewire/bebob/bebob_pcm.c | 71 +++-- + sound/firewire/bebob/bebob_stream.c | 92 ++++--- + sound/firewire/dice/dice-midi.c | 2 +- + sound/firewire/dice/dice-pcm.c | 72 +++-- + sound/firewire/dice/dice-stream.c | 11 +- + sound/firewire/dice/dice.h | 4 +- + sound/firewire/digi00x/digi00x-midi.c | 2 +- + sound/firewire/digi00x/digi00x-pcm.c | 57 +++- + sound/firewire/digi00x/digi00x-stream.c | 14 +- + sound/firewire/digi00x/digi00x.h | 4 +- + sound/firewire/fireface/ff-pcm.c | 51 +++- + sound/firewire/fireface/ff-stream.c | 22 +- + sound/firewire/fireface/ff.h | 4 +- + sound/firewire/fireworks/fireworks.h | 4 +- + sound/firewire/fireworks/fireworks_midi.c | 2 +- + sound/firewire/fireworks/fireworks_pcm.c | 63 +++-- + sound/firewire/fireworks/fireworks_stream.c | 14 +- + sound/firewire/motu/motu-midi.c | 2 +- + sound/firewire/motu/motu-pcm.c | 54 +++- + sound/firewire/motu/motu-proc.c | 4 +- + sound/firewire/motu/motu-protocol-v2.c | 142 +++++----- + sound/firewire/motu/motu-protocol-v3.c | 4 +- + sound/firewire/motu/motu-stream.c | 14 +- + sound/firewire/motu/motu.c | 34 ++- + sound/firewire/motu/motu.h | 10 +- + sound/firewire/oxfw/oxfw-midi.c | 4 +- + sound/firewire/oxfw/oxfw-pcm.c | 66 +++-- + sound/firewire/oxfw/oxfw-stream.c | 15 +- + sound/firewire/oxfw/oxfw.h | 4 +- + sound/firewire/tascam/tascam-pcm.c | 56 +++- + sound/firewire/tascam/tascam-stream.c | 14 +- + sound/firewire/tascam/tascam.h | 4 +- + sound/hda/Kconfig | 10 +- + sound/hda/Makefile | 5 +- + sound/hda/intel-dsp-config.c | 357 ++++++++++++++++++++++++ + sound/hda/intel-nhlt.c | 3 - + sound/isa/Kconfig | 18 +- + sound/mips/Kconfig | 12 +- + sound/pci/Kconfig | 2 +- + sound/pci/hda/Kconfig | 11 +- + sound/pci/hda/hda_bind.c | 4 + + sound/pci/hda/hda_intel.c | 60 ++-- + sound/soc/cirrus/Kconfig | 14 +- + sound/soc/codecs/Kconfig | 32 +-- + sound/soc/intel/Kconfig | 4 +- + sound/soc/intel/boards/Kconfig | 48 ++-- + sound/soc/intel/skylake/skl.c | 19 +- + sound/soc/pxa/Kconfig | 16 +- + sound/soc/qcom/Kconfig | 20 +- + sound/soc/samsung/Kconfig | 8 +- + sound/soc/sof/imx/Kconfig | 12 +- + sound/soc/sof/intel/Kconfig | 24 +- + sound/soc/sof/sof-pci-dev.c | 6 + + sound/soc/xilinx/Kconfig | 20 +- + sound/soc/zte/Kconfig | 12 +- + sound/usb/Kconfig | 32 +-- + sound/usb/clock.c | 10 +- + sound/x86/intel_hdmi_audio.c | 4 +- + 69 files changed, 1642 insertions(+), 589 deletions(-) + create mode 100644 include/sound/intel-dsp-config.h + create mode 100644 sound/hda/intel-dsp-config.c +Merging sound-asoc/for-next (b0e42496a9e4 Merge branch 'asoc-5.5' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging sound/soc/sof/sof-pci-dev.c +Auto-merging sound/soc/sof/intel/Kconfig +Auto-merging sound/soc/sof/imx/Kconfig +Removing sound/soc/samsung/arndale_rt5631.c +Auto-merging sound/soc/samsung/Kconfig +CONFLICT (content): Merge conflict in sound/soc/samsung/Kconfig +Auto-merging sound/soc/intel/boards/Kconfig +CONFLICT (content): Merge conflict in sound/soc/intel/boards/Kconfig +Auto-merging sound/soc/intel/Kconfig +Auto-merging sound/soc/codecs/Kconfig +Auto-merging include/drm/bridge/dw_hdmi.h +Auto-merging drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +Auto-merging drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt +Removing Documentation/devicetree/bindings/sound/sun4i-codec.txt +Removing Documentation/devicetree/bindings/sound/samsung-i2s.txt +Removing Documentation/devicetree/bindings/sound/samsung,odroid.txt +Resolved 'sound/soc/intel/boards/Kconfig' using previous resolution. +Resolved 'sound/soc/samsung/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a79f4b67197d] Merge remote-tracking branch 'sound-asoc/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/sound/adi,adau7118.yaml | 85 ++ + .../bindings/sound/allwinner,sun4i-a10-codec.yaml | 267 +++++ + .../sound/allwinner,sun8i-a23-codec-analog.yaml | 38 + + .../devicetree/bindings/sound/arndale.txt | 5 +- + .../devicetree/bindings/sound/fsl,mqs.txt | 36 + + .../bindings/sound/google,cros-ec-codec.txt | 24 +- + .../devicetree/bindings/sound/mt8183-afe-pcm.txt | 6 + + .../sound/mt8183-mt6358-ts3a227-max98357.txt | 7 +- + .../devicetree/bindings/sound/renesas,rsnd.txt | 1 + + .../bindings/sound/rockchip-max98090.txt | 27 +- + Documentation/devicetree/bindings/sound/rt1011.txt | 10 + + Documentation/devicetree/bindings/sound/rt5682.txt | 6 + + .../devicetree/bindings/sound/samsung,odroid.txt | 54 - + .../devicetree/bindings/sound/samsung,odroid.yaml | 91 ++ + .../devicetree/bindings/sound/samsung-i2s.txt | 84 -- + .../devicetree/bindings/sound/samsung-i2s.yaml | 138 +++ + .../devicetree/bindings/sound/sun4i-codec.txt | 94 -- + .../bindings/sound/sun8i-codec-analog.txt | 17 - + .../devicetree/bindings/sound/tas2562.txt | 34 + + .../devicetree/bindings/sound/tas2770.txt | 37 + + MAINTAINERS | 1 + + .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 11 + + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 41 +- + drivers/platform/chrome/cros_ec_trace.c | 5 +- + include/drm/bridge/dw_hdmi.h | 4 + + include/dt-bindings/sound/samsung-i2s.h | 12 +- + include/linux/platform_data/cros_ec_commands.h | 285 +++-- + include/sound/dmaengine_pcm.h | 5 + + include/sound/hda_codec.h | 1 + + include/sound/pxa2xx-lib.h | 26 +- + include/sound/rt5682.h | 1 + + include/sound/simple_card_utils.h | 1 + + include/sound/soc-acpi-intel-match.h | 1 + + include/sound/soc-acpi.h | 4 + + include/sound/soc-component.h | 45 +- + include/sound/soc-dpcm.h | 18 +- + include/sound/soc.h | 16 +- + include/sound/sof.h | 3 + + include/sound/sof/dai-imx.h | 34 + + include/sound/sof/dai.h | 2 + + include/sound/sof/header.h | 2 + + include/sound/sof/pm.h | 8 + + include/sound/sof/stream.h | 4 +- + include/sound/wm8904.h | 2 +- + include/uapi/sound/sof/abi.h | 2 +- + include/uapi/sound/sof/tokens.h | 11 +- + sound/arm/pxa2xx-pcm-lib.c | 80 +- + sound/core/pcm_dmaengine.c | 83 ++ + sound/pci/hda/patch_hdmi.c | 19 +- + sound/soc/amd/acp-pcm-dma.c | 63 +- + sound/soc/amd/raven/acp3x-pcm-dma.c | 56 +- + sound/soc/atmel/atmel-pcm-pdc.c | 48 +- + sound/soc/au1x/dbdma2.c | 64 +- + sound/soc/au1x/dma.c | 63 +- + sound/soc/bcm/cygnus-pcm.c | 56 +- + sound/soc/codecs/Kconfig | 41 + + sound/soc/codecs/Makefile | 10 + + sound/soc/codecs/adau1761.c | 129 +++ + sound/soc/codecs/adau7118-hw.c | 43 + + sound/soc/codecs/adau7118-i2c.c | 82 ++ + sound/soc/codecs/adau7118.c | 586 ++++++++++ + sound/soc/codecs/adau7118.h | 24 + + sound/soc/codecs/cros_ec_codec.c | 1128 +++++++++++++++----- + sound/soc/codecs/cx2072x.c | 2 +- + sound/soc/codecs/hdac_hda.c | 114 +- + sound/soc/codecs/hdac_hda.h | 13 +- + sound/soc/codecs/madera.h | 2 + + sound/soc/codecs/msm8916-wcd-analog.c | 54 +- + sound/soc/codecs/mt6358.c | 105 ++ + sound/soc/codecs/pcm3168a.c | 95 +- + sound/soc/codecs/rt1011.c | 249 ++++- + sound/soc/codecs/rt1011.h | 24 + + sound/soc/codecs/rt5514-spi.c | 41 +- + sound/soc/codecs/rt5645.c | 13 + + sound/soc/codecs/rt5663.c | 4 +- + sound/soc/codecs/rt5677-spi.c | 386 +++++++ + sound/soc/codecs/rt5677-spi.h | 1 + + sound/soc/codecs/rt5682.c | 15 + + sound/soc/codecs/tas2562.c | 590 ++++++++++ + sound/soc/codecs/tas2562.h | 85 ++ + sound/soc/codecs/tas2770.c | 819 ++++++++++++++ + sound/soc/codecs/tas2770.h | 143 +++ + sound/soc/codecs/tlv320aic32x4.c | 3 + + sound/soc/codecs/wcd9335.c | 10 +- + sound/soc/codecs/wm8958-dsp2.c | 22 +- + sound/soc/codecs/wm8994.c | 156 ++- + sound/soc/codecs/wm8994.h | 10 +- + sound/soc/dwc/dwc-pcm.c | 48 +- + sound/soc/fsl/Kconfig | 10 + + sound/soc/fsl/Makefile | 2 + + sound/soc/fsl/fsl_asrc.c | 110 +- + sound/soc/fsl/fsl_asrc.h | 7 +- + sound/soc/fsl/fsl_asrc_dma.c | 120 ++- + sound/soc/fsl/fsl_dma.c | 54 +- + sound/soc/fsl/fsl_esai.c | 12 + + sound/soc/fsl/fsl_mqs.c | 335 ++++++ + sound/soc/fsl/imx-pcm-fiq.c | 56 +- + sound/soc/fsl/mpc5200_dma.c | 51 +- + sound/soc/generic/audio-graph-card.c | 4 +- + sound/soc/generic/simple-card.c | 4 +- + sound/soc/intel/Kconfig | 17 +- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 30 +- + sound/soc/intel/baytrail/sst-baytrail-pcm.c | 52 +- + sound/soc/intel/boards/Kconfig | 52 +- + sound/soc/intel/boards/Makefile | 14 +- + sound/soc/intel/boards/bxt_da7219_max98357a.c | 11 + + sound/soc/intel/boards/bxt_rt298.c | 11 + + sound/soc/intel/boards/cht_bsw_rt5645.c | 26 +- + sound/soc/intel/boards/cml_rt1011_rt5682.c | 487 +++++++++ + sound/soc/intel/boards/glk_rt5682_max98357a.c | 11 + + sound/soc/intel/boards/hda_dsp_common.c | 85 ++ + sound/soc/intel/boards/hda_dsp_common.h | 32 + + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 146 ++- + sound/soc/intel/boards/skl_hda_dsp_common.c | 6 + + sound/soc/intel/boards/skl_hda_dsp_common.h | 27 +- + sound/soc/intel/boards/skl_hda_dsp_generic.c | 3 +- + sound/soc/intel/boards/sof_rt5682.c | 13 +- + sound/soc/intel/common/Makefile | 1 + + sound/soc/intel/common/soc-acpi-intel-cnl-match.c | 7 + + sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 18 + + sound/soc/intel/haswell/sst-haswell-pcm.c | 62 +- + sound/soc/intel/skylake/skl-pcm.c | 67 +- + sound/soc/jz4740/jz4740-i2s.c | 6 +- + sound/soc/kirkwood/kirkwood-dma.c | 52 +- + sound/soc/mediatek/Kconfig | 1 + + .../soc/mediatek/common/mtk-afe-platform-driver.c | 28 +- + .../soc/mediatek/common/mtk-afe-platform-driver.h | 10 +- + sound/soc/mediatek/common/mtk-btcvsd.c | 76 +- + sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 11 +- + sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 26 +- + .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 70 +- + sound/soc/meson/axg-fifo.c | 56 +- + sound/soc/meson/axg-fifo.h | 20 +- + sound/soc/meson/axg-frddr.c | 24 +- + sound/soc/meson/axg-toddr.c | 24 +- + sound/soc/pxa/mmp-pcm.c | 62 +- + sound/soc/pxa/poodle.c | 2 +- + sound/soc/pxa/pxa-ssp.c | 14 +- + sound/soc/pxa/pxa2xx-ac97.c | 14 +- + sound/soc/pxa/pxa2xx-i2s.c | 14 +- + sound/soc/pxa/pxa2xx-pcm.c | 14 +- + sound/soc/qcom/lpass-platform.c | 70 +- + sound/soc/qcom/qdsp6/q6asm-dai.c | 71 +- + sound/soc/qcom/qdsp6/q6routing.c | 14 +- + sound/soc/rockchip/Kconfig | 3 +- + sound/soc/rockchip/rockchip_max98090.c | 313 ++++-- + sound/soc/samsung/Kconfig | 6 +- + sound/soc/samsung/Makefile | 4 +- + sound/soc/samsung/arndale.c | 217 ++++ + sound/soc/samsung/arndale_rt5631.c | 164 --- + sound/soc/samsung/idma.c | 58 +- + sound/soc/sh/dma-sh7760.c | 46 +- + sound/soc/sh/fsi.c | 31 +- + sound/soc/sh/rcar/core.c | 34 +- + sound/soc/sh/rcar/dma.c | 30 +- + sound/soc/sh/siu_pcm.c | 44 +- + sound/soc/soc-component.c | 119 +-- + sound/soc/soc-compress.c | 52 +- + sound/soc/soc-core.c | 330 +++--- + sound/soc/soc-generic-dmaengine-pcm.c | 163 +-- + sound/soc/soc-ops.c | 11 +- + sound/soc/soc-pcm.c | 118 +- + sound/soc/soc-utils.c | 11 +- + sound/soc/sof/Kconfig | 43 +- + sound/soc/sof/control.c | 34 + + sound/soc/sof/core.c | 31 +- + sound/soc/sof/debug.c | 16 + + sound/soc/sof/imx/Kconfig | 8 +- + sound/soc/sof/imx/imx8.c | 7 + + sound/soc/sof/intel/Kconfig | 50 +- + sound/soc/sof/intel/apl.c | 8 + + sound/soc/sof/intel/bdw.c | 31 +- + sound/soc/sof/intel/byt.c | 44 +- + sound/soc/sof/intel/cnl.c | 67 +- + sound/soc/sof/intel/hda-codec.c | 22 +- + sound/soc/sof/intel/hda-dsp.c | 122 ++- + sound/soc/sof/intel/hda-ipc.c | 6 +- + sound/soc/sof/intel/hda-ipc.h | 51 + + sound/soc/sof/intel/hda-loader.c | 25 +- + sound/soc/sof/intel/hda-pcm.c | 15 +- + sound/soc/sof/intel/hda-stream.c | 24 +- + sound/soc/sof/intel/hda.c | 14 +- + sound/soc/sof/intel/hda.h | 20 +- + sound/soc/sof/ipc.c | 10 +- + sound/soc/sof/ops.h | 10 + + sound/soc/sof/pcm.c | 135 ++- + sound/soc/sof/pm.c | 95 +- + sound/soc/sof/sof-acpi-dev.c | 12 +- + sound/soc/sof/sof-pci-dev.c | 80 +- + sound/soc/sof/sof-priv.h | 52 +- + sound/soc/sof/topology.c | 456 +++++--- + sound/soc/sof/trace.c | 17 +- + sound/soc/sprd/sprd-pcm-dma.c | 74 +- + sound/soc/stm/stm32_adfsdm.c | 42 +- + sound/soc/stm/stm32_sai.c | 2 +- + sound/soc/stm/stm32_spdifrx.c | 18 +- + sound/soc/sunxi/sun4i-codec.c | 6 +- + sound/soc/tegra/tegra30_i2s.c | 56 +- + sound/soc/txx9/txx9aclc.c | 48 +- + sound/soc/uniphier/aio-dma.c | 51 +- + sound/soc/ux500/ux500_msp_i2s.c | 3 +- + sound/soc/xilinx/xlnx_formatter_pcm.c | 63 +- + sound/soc/xtensa/xtfpga-i2s.c | 30 +- + 203 files changed, 10647 insertions(+), 2812 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/adi,adau7118.yaml + create mode 100644 Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-codec.yaml + create mode 100644 Documentation/devicetree/bindings/sound/allwinner,sun8i-a23-codec-analog.yaml + create mode 100644 Documentation/devicetree/bindings/sound/fsl,mqs.txt + delete mode 100644 Documentation/devicetree/bindings/sound/samsung,odroid.txt + create mode 100644 Documentation/devicetree/bindings/sound/samsung,odroid.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/samsung-i2s.txt + create mode 100644 Documentation/devicetree/bindings/sound/samsung-i2s.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/sun4i-codec.txt + delete mode 100644 Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt + create mode 100644 Documentation/devicetree/bindings/sound/tas2562.txt + create mode 100644 Documentation/devicetree/bindings/sound/tas2770.txt + create mode 100644 include/sound/sof/dai-imx.h + create mode 100644 sound/soc/codecs/adau7118-hw.c + create mode 100644 sound/soc/codecs/adau7118-i2c.c + create mode 100644 sound/soc/codecs/adau7118.c + create mode 100644 sound/soc/codecs/adau7118.h + create mode 100644 sound/soc/codecs/tas2562.c + create mode 100644 sound/soc/codecs/tas2562.h + create mode 100644 sound/soc/codecs/tas2770.c + create mode 100644 sound/soc/codecs/tas2770.h + create mode 100644 sound/soc/fsl/fsl_mqs.c + create mode 100644 sound/soc/intel/boards/cml_rt1011_rt5682.c + create mode 100644 sound/soc/intel/boards/hda_dsp_common.c + create mode 100644 sound/soc/intel/boards/hda_dsp_common.h + create mode 100644 sound/soc/intel/common/soc-acpi-intel-jsl-match.c + create mode 100644 sound/soc/samsung/arndale.c + delete mode 100644 sound/soc/samsung/arndale_rt5631.c + create mode 100644 sound/soc/sof/intel/hda-ipc.h +Merging modules/modules-next (c3a6cf19e695 export: avoid code duplication in include/linux/export.h) +$ git merge modules/modules-next +Merge made by the 'recursive' strategy. + include/linux/export.h | 91 ++++++++++++++++---------------------------------- + kernel/module.c | 2 +- + 2 files changed, 29 insertions(+), 64 deletions(-) +Merging input/next (d843304b22e8 Input: synaptics-rmi4 - simplify data read in rmi_f54_work) +$ git merge input/next +Removing include/linux/platform_data/pixcir_i2c_ts.h +Removing Documentation/devicetree/bindings/input/mpr121-touchkey.txt +Removing Documentation/devicetree/bindings/input/keys.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/freescale/fsl,scu.txt | 14 + + .../bindings/input/fsl,mpr121-touchkey.yaml | 89 ++++++ + Documentation/devicetree/bindings/input/input.yaml | 36 +++ + Documentation/devicetree/bindings/input/keys.txt | 8 - + .../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/edt-ft5x06.txt | 1 + + drivers/gpio/gpiolib-devres.c | 33 +- + drivers/gpio/gpiolib.c | 48 +++ + drivers/input/input-poller.c | 9 + + drivers/input/joystick/Kconfig | 1 - + drivers/input/joystick/psxpad-spi.c | 64 ++-- + drivers/input/keyboard/Kconfig | 14 +- + 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 | 1 - + drivers/input/mouse/gpio_mouse.c | 45 ++- + drivers/input/rmi4/rmi_f54.c | 48 +-- + drivers/input/touchscreen/Kconfig | 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/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 - + include/linux/gpio/consumer.h | 54 +++- + include/linux/input.h | 1 + + include/linux/platform_data/pixcir_i2c_ts.h | 64 ---- + 52 files changed, 1450 insertions(+), 1694 deletions(-) + 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/mpr121-touchkey.txt + create mode 100644 drivers/input/keyboard/imx_sc_key.c + delete mode 100644 include/linux/platform_data/pixcir_i2c_ts.h +Merging block/for-next (8f027e5994f7 Merge branch 'for-5.5/block' into for-next) +$ git merge block/for-next +Auto-merging include/linux/socket.h +Auto-merging include/Kbuild +Auto-merging fs/io_uring.c +Auto-merging drivers/nvme/host/tcp.c +Auto-merging drivers/ata/sata_nv.c +Merge made by the 'recursive' strategy. + Documentation/driver-api/libata.rst | 14 +- + block/blk-core.c | 4 +- + block/blk-exec.c | 2 + + block/blk-merge.c | 16 +- + block/blk-mq-sysfs.c | 31 +- + block/blk-mq.c | 130 ++-- + block/blk-mq.h | 9 - + block/blk-stat.c | 7 +- + block/blk-sysfs.c | 8 - + block/blk.h | 7 +- + block/opal_proto.h | 2 +- + block/sed-opal.c | 312 +++++++-- + block/t10-pi.c | 8 +- + drivers/ata/acard-ahci.c | 6 +- + drivers/ata/ahci.c | 13 + + drivers/ata/ahci_tegra.c | 6 +- + drivers/ata/libahci.c | 6 +- + drivers/ata/libata-core.c | 12 +- + drivers/ata/libata-sff.c | 12 +- + drivers/ata/pata_macio.c | 6 +- + drivers/ata/pata_pxa.c | 8 +- + drivers/ata/pdc_adma.c | 7 +- + drivers/ata/sata_fsl.c | 4 +- + drivers/ata/sata_inic162x.c | 4 +- + drivers/ata/sata_mv.c | 34 +- + drivers/ata/sata_nv.c | 18 +- + drivers/ata/sata_promise.c | 6 +- + drivers/ata/sata_qstor.c | 8 +- + drivers/ata/sata_rcar.c | 6 +- + drivers/ata/sata_sil.c | 8 +- + drivers/ata/sata_sil24.c | 6 +- + drivers/ata/sata_sx4.c | 6 +- + drivers/block/loop.c | 26 +- + drivers/block/mtip32xx/mtip32xx.c | 2 +- + drivers/block/null_blk.h | 8 + + drivers/block/null_blk_main.c | 104 ++- + drivers/block/null_blk_zoned.c | 21 +- + drivers/md/md-bitmap.c | 2 +- + drivers/md/md-linear.c | 5 +- + drivers/md/md-multipath.c | 5 +- + drivers/md/md.c | 68 +- + drivers/md/md.h | 4 +- + drivers/md/raid0.c | 7 +- + drivers/md/raid1.c | 5 +- + drivers/md/raid10.c | 5 +- + drivers/md/raid5.c | 4 +- + drivers/nvme/host/core.c | 24 +- + drivers/nvme/host/fc.c | 49 +- + drivers/nvme/host/multipath.c | 13 +- + drivers/nvme/host/nvme.h | 20 +- + drivers/nvme/host/pci.c | 6 +- + drivers/nvme/host/rdma.c | 16 +- + drivers/nvme/host/tcp.c | 4 +- + drivers/nvme/target/admin-cmd.c | 133 ++-- + drivers/nvme/target/core.c | 20 +- + drivers/nvme/target/discovery.c | 70 +- + drivers/nvme/target/fabrics-cmd.c | 15 +- + drivers/nvme/target/fc.c | 31 +- + drivers/nvme/target/io-cmd-bdev.c | 43 +- + drivers/nvme/target/io-cmd-file.c | 20 +- + drivers/nvme/target/loop.c | 7 +- + drivers/nvme/target/nvmet.h | 10 +- + drivers/nvme/target/rdma.c | 8 +- + drivers/nvme/target/tcp.c | 14 +- + fs/Kconfig | 3 + + fs/Makefile | 1 + + fs/block_dev.c | 37 +- + fs/fcntl.c | 2 +- + fs/io-wq.c | 925 +++++++++++++++++++++++++ + fs/io-wq.h | 63 ++ + fs/io_uring.c | 1294 +++++++++++++++++++++++------------ + include/Kbuild | 1 + + include/linux/blk-mq.h | 299 ++++++-- + include/linux/blk_types.h | 2 +- + include/linux/blkdev.h | 1 - + include/linux/libata.h | 13 +- + include/linux/nvme-fc.h | 182 +++-- + include/linux/nvme.h | 54 +- + include/linux/sched.h | 1 + + include/linux/sed-opal.h | 1 + + include/linux/socket.h | 3 + + include/trace/events/io_uring.h | 358 ++++++++++ + include/trace/events/wbt.h | 12 +- + include/uapi/linux/fcntl.h | 9 +- + include/uapi/linux/io_uring.h | 22 +- + include/uapi/linux/sed-opal.h | 20 + + init/Kconfig | 1 + + kernel/sched/core.c | 16 +- + net/socket.c | 65 +- + tools/include/uapi/linux/fcntl.h | 9 +- + 90 files changed, 3745 insertions(+), 1144 deletions(-) + create mode 100644 fs/io-wq.c + create mode 100644 fs/io-wq.h + create mode 100644 include/trace/events/io_uring.h +Merging device-mapper/for-next (13bd677a472d dm cache: fix bugs when a GFP_NOWAIT allocation fails) +$ git merge device-mapper/for-next +Already up to date. +Merging mmc/next (3a07e0b48c98 mmc: renesas_sdhi_internal_dmac: Add r8a774b1 support) +$ git merge mmc/next +Auto-merging drivers/memstick/host/jmb38x_ms.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/arasan,sdhci.txt | 17 + + Documentation/devicetree/bindings/mmc/jz4740.txt | 8 +- + Documentation/devicetree/bindings/mmc/owl-mmc.yaml | 59 ++ + .../devicetree/bindings/mmc/renesas,sdhi.txt | 1 + + .../devicetree/bindings/mmc/sdhci-atmel.txt | 5 + + .../devicetree/bindings/mmc/sdhci-milbeaut.txt | 30 + + MAINTAINERS | 2 + + drivers/memstick/host/jmb38x_ms.c | 12 +- + drivers/mmc/core/block.c | 151 ++--- + drivers/mmc/host/Kconfig | 19 + + drivers/mmc/host/Makefile | 2 + + drivers/mmc/host/bcm2835.c | 4 +- + drivers/mmc/host/cavium-octeon.c | 15 +- + drivers/mmc/host/dw_mmc.c | 4 +- + drivers/mmc/host/jz4740_mmc.c | 41 +- + drivers/mmc/host/mmci.c | 198 +++--- + drivers/mmc/host/mmci.h | 5 + + drivers/mmc/host/mmci_stm32_sdmmc.c | 46 +- + drivers/mmc/host/owl-mmc.c | 696 +++++++++++++++++++++ + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 1 + + drivers/mmc/host/sdhci-esdhc.h | 14 + + drivers/mmc/host/sdhci-milbeaut.c | 362 +++++++++++ + drivers/mmc/host/sdhci-of-arasan.c | 15 + + drivers/mmc/host/sdhci-of-at91.c | 19 + + drivers/mmc/host/sdhci-of-esdhc.c | 257 ++++++-- + drivers/mmc/host/sdhci-pci-core.c | 53 +- + drivers/mmc/host/sdhci-pci.h | 2 + + drivers/mmc/host/sdhci.c | 11 + + drivers/mmc/host/sdhci_f_sdh30.c | 26 +- + drivers/mmc/host/sdhci_f_sdh30.h | 32 + + drivers/mmc/host/tmio_mmc_core.c | 9 - + 31 files changed, 1839 insertions(+), 277 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/owl-mmc.yaml + create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-milbeaut.txt + create mode 100644 drivers/mmc/host/owl-mmc.c + create mode 100644 drivers/mmc/host/sdhci-milbeaut.c + create mode 100644 drivers/mmc/host/sdhci_f_sdh30.h +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 (1f98ed315b06 mfd: mfd-core: Move pdev->mfd_cell creation back into mfd_add_device()) +$ git merge mfd/for-mfd-next +Auto-merging drivers/mfd/mt6397-core.c +CONFLICT (content): Merge conflict in drivers/mfd/mt6397-core.c +Auto-merging drivers/mfd/intel_soc_pmic_crc.c +Recorded preimage for 'drivers/mfd/mt6397-core.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/mfd/mt6397-core.c'. +[master 46cdd5f24a41] Merge remote-tracking branch 'mfd/for-mfd-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/mfd/madera.txt | 8 ++ + .../devicetree/bindings/mfd/qcom,spmi-pmic.txt | 2 + + arch/x86/platform/olpc/olpc-xo1-pm.c | 8 -- + arch/x86/platform/olpc/olpc-xo1-sci.c | 6 - + drivers/mfd/ab8500-core.c | 138 +++++++-------------- + drivers/mfd/arizona-core.c | 6 +- + drivers/mfd/cs5535-mfd.c | 108 ++++++++-------- + drivers/mfd/db8500-prcmu.c | 21 ++-- + drivers/mfd/intel-lpss-pci.c | 28 +++-- + drivers/mfd/ipaq-micro.c | 6 +- + drivers/mfd/madera-core.c | 27 +++- + drivers/mfd/max77620.c | 5 +- + drivers/mfd/mfd-core.c | 113 +++-------------- + drivers/mfd/mt6397-core.c | 12 +- + drivers/mfd/qcom-spmi-pmic.c | 4 + + drivers/mfd/rk808.c | 22 +--- + drivers/mfd/wm8998-tables.c | 12 -- + include/linux/mfd/arizona/registers.h | 7 -- + include/linux/mfd/core.h | 49 +++++--- + include/linux/mfd/madera/core.h | 11 ++ + include/linux/mfd/max77620.h | 1 - + include/linux/mfd/rk808.h | 2 +- + include/linux/mfd/twl.h | 12 +- + 23 files changed, 241 insertions(+), 367 deletions(-) +Merging backlight/for-backlight-next (53e492915061 backlight: Kconfig: jornada720: Use CONFIG_PREEMPTION) +$ git merge backlight/for-backlight-next +Merge made by the 'recursive' strategy. + .../bindings/leds/backlight/led-backlight.txt | 28 ++++++++++++++++ + .../bindings/leds/backlight/lm3630a-backlight.yaml | 5 +++ + drivers/video/backlight/Kconfig | 4 +-- + drivers/video/backlight/ipaq_micro_bl.c | 2 +- + drivers/video/backlight/lm3630a_bl.c | 13 +++++++- + drivers/video/backlight/pwm_bl.c | 39 +++++++++++++--------- + 6 files changed, 72 insertions(+), 19 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/backlight/led-backlight.txt +Merging battery/for-next (9480029fe5c2 power: supply: bd70528: Add MODULE_ALIAS to allow module auto loading) +$ git merge battery/for-next +Removing include/linux/mfd/abx500/ab8500-gpadc.h +Removing drivers/mfd/ab8500-gpadc.c +Auto-merging drivers/hwmon/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/ab8500.txt | 119 ++ + .../bindings/power/supply/cpcap-charger.txt | 9 +- + MAINTAINERS | 1 + + arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi | 6 +- + drivers/hwmon/Kconfig | 3 +- + drivers/hwmon/ab8500.c | 65 +- + drivers/iio/adc/Kconfig | 10 + + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/ab8500-gpadc.c | 1218 ++++++++++++++++++++ + drivers/mfd/Kconfig | 7 - + drivers/mfd/Makefile | 1 - + drivers/mfd/ab8500-debugfs.c | 715 ------------ + drivers/mfd/ab8500-gpadc.c | 1075 ----------------- + drivers/power/reset/at91-reset.c | 6 +- + drivers/power/reset/at91-sama5d2_shdwc.c | 8 +- + drivers/power/supply/Kconfig | 2 +- + drivers/power/supply/ab8500_btemp.c | 50 +- + drivers/power/supply/ab8500_charger.c | 83 +- + drivers/power/supply/ab8500_fg.c | 49 +- + drivers/power/supply/abx500_chargalg.c | 8 +- + drivers/power/supply/axp20x_usb_power.c | 8 + + drivers/power/supply/bd70528-charger.c | 1 + + drivers/power/supply/cpcap-battery.c | 271 ++++- + drivers/power/supply/cpcap-charger.c | 222 +++- + drivers/power/supply/test_power.c | 61 + + include/linux/mfd/abx500/ab8500-gpadc.h | 75 -- + 26 files changed, 2044 insertions(+), 2030 deletions(-) + create mode 100644 drivers/iio/adc/ab8500-gpadc.c + delete mode 100644 drivers/mfd/ab8500-gpadc.c + delete mode 100644 include/linux/mfd/abx500/ab8500-gpadc.h +Merging regulator/for-next (3151d022d740 Merge branch 'regulator-5.5' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + .../bindings/regulator/fixed-regulator.yaml | 4 + + .../bindings/regulator/qcom,rpmh-regulator.txt | 4 + + .../bindings/regulator/qcom,smd-rpm-regulator.txt | 21 +++++ + .../bindings/regulator/qcom,spmi-regulator.txt | 25 ++++++ + .../devicetree/bindings/regulator/regulator.yaml | 7 +- + drivers/regulator/bd718x7-regulator.c | 1 + + drivers/regulator/core.c | 6 ++ + drivers/regulator/da9062-regulator.c | 14 +--- + drivers/regulator/da9063-regulator.c | 9 +-- + drivers/regulator/da9211-regulator.c | 12 +-- + drivers/regulator/fixed.c | 2 + + drivers/regulator/max77686-regulator.c | 5 +- + drivers/regulator/max8907-regulator.c | 15 +++- + drivers/regulator/pbias-regulator.c | 75 +++++++----------- + drivers/regulator/pcap-regulator.c | 4 - + drivers/regulator/qcom-rpmh-regulator.c | 62 ++++++++++++++- + drivers/regulator/qcom_smd-regulator.c | 92 ++++++++++++++++++++++ + drivers/regulator/qcom_spmi-regulator.c | 41 ++++++++++ + drivers/regulator/rk808-regulator.c | 29 ++----- + drivers/regulator/s2mps11.c | 7 +- + drivers/regulator/s5m8767.c | 7 +- + drivers/regulator/slg51000-regulator.c | 13 ++- + drivers/regulator/stm32-vrefbuf.c | 4 +- + drivers/regulator/tps65090-regulator.c | 26 +++--- + drivers/regulator/tps65132-regulator.c | 17 ++-- + drivers/regulator/uniphier-regulator.c | 4 +- + include/linux/regulator/fixed.h | 1 + + 27 files changed, 365 insertions(+), 142 deletions(-) +Merging security/next-testing (45893a0abee6 kexec: Fix file verification on S390) +$ git merge security/next-testing +Already up to date. +Merging apparmor/apparmor-next (136db994852a apparmor: increase left match history buffer size) +$ 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/include/policy_unpack.h +Auto-merging security/apparmor/include/path.h +Auto-merging security/apparmor/include/match.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 | 26 +++-- + security/apparmor/include/apparmor.h | 1 + + security/apparmor/include/match.h | 3 +- + security/apparmor/include/path.h | 49 +-------- + security/apparmor/include/policy_unpack.h | 8 +- + security/apparmor/lsm.c | 160 ++++++++++++++++++++++++------ + security/apparmor/match.c | 6 +- + security/apparmor/mount.c | 67 ++++++++++--- + security/apparmor/policy.c | 5 +- + security/apparmor/policy_unpack.c | 116 +++++++++++++++++++++- + 13 files changed, 477 insertions(+), 142 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 include/linux/security.h +Auto-merging include/linux/blkdev.h +Auto-merging block/blk-core.c +Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst +Merge made by the 'recursive' strategy. + 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 | 32 +- + 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 | 7 + + 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 +Auto-merging security/selinux/hooks.c +Merge made by the 'recursive' strategy. + security/selinux/hooks.c | 12 ++++++++++++ + security/selinux/include/security.h | 3 ++- + security/selinux/selinuxfs.c | 4 ---- + security/selinux/ss/context.h | 32 ++++++++++++++++++++++++++++++++ + security/selinux/ss/ebitmap.c | 18 ++++++++++++++++++ + security/selinux/ss/ebitmap.h | 1 + + security/selinux/ss/mls.c | 3 +++ + security/selinux/ss/policydb.c | 5 +++++ + security/selinux/ss/policydb.h | 1 + + 9 files changed, 74 insertions(+), 5 deletions(-) +Merging smack/for-next (92604e825304 smack: use GFP_NOFS while holding inode_smack::smk_lock) +$ git merge smack/for-next +Auto-merging security/smack/smack_lsm.c +Merge made by the 'recursive' strategy. +Merging tomoyo/master (79c8ca578dbf Revert "printk: Monitor change of console loglevel.") +$ git merge tomoyo/master +Merge made by the 'recursive' strategy. + security/tomoyo/tomoyo.c | 6 ++++++ + 1 file changed, 6 insertions(+) +Merging tpmdd/next (6ffdd4c0e27e KEYS: trusted: Remove set but not used variable 'keyhndl') +$ git merge tpmdd/next +Auto-merging include/Kbuild +Merge made by the 'recursive' strategy. + .../bindings/security/tpm/google,cr50.txt | 19 ++ + crypto/asymmetric_keys/asym_tpm.c | 101 +++---- + drivers/char/tpm/Kconfig | 7 + + drivers/char/tpm/Makefile | 4 +- + drivers/char/tpm/tpm-interface.c | 64 +--- + drivers/char/tpm/tpm-sysfs.c | 45 +-- + drivers/char/tpm/tpm.h | 248 +--------------- + drivers/char/tpm/tpm1-cmd.c | 15 + + drivers/char/tpm/tpm2-cmd.c | 311 +------------------- + drivers/char/tpm/tpm_crb.c | 123 +++++--- + drivers/char/tpm/tpm_tis.c | 2 +- + drivers/char/tpm/tpm_tis_core.c | 79 +++++ + drivers/char/tpm/tpm_tis_spi.c | 143 +++++---- + drivers/char/tpm/tpm_tis_spi.h | 53 ++++ + drivers/char/tpm/tpm_tis_spi_cr50.c | 321 +++++++++++++++++++++ + include/Kbuild | 1 - + include/keys/{trusted.h => trusted_tpm.h} | 49 +--- + include/linux/tpm.h | 250 ++++++++++++++-- + security/keys/Makefile | 2 +- + security/keys/trusted-keys/Makefile | 8 + + .../{trusted.c => trusted-keys/trusted_tpm1.c} | 98 +++---- + security/keys/trusted-keys/trusted_tpm2.c | 314 ++++++++++++++++++++ + 22 files changed, 1370 insertions(+), 887 deletions(-) + create mode 100644 Documentation/devicetree/bindings/security/tpm/google,cr50.txt + create mode 100644 drivers/char/tpm/tpm_tis_spi.h + create mode 100644 drivers/char/tpm/tpm_tis_spi_cr50.c + rename include/keys/{trusted.h => trusted_tpm.h} (77%) + create mode 100644 security/keys/trusted-keys/Makefile + rename security/keys/{trusted.c => trusted-keys/trusted_tpm1.c} (94%) + create mode 100644 security/keys/trusted-keys/trusted_tpm2.c +Merging watchdog/master (ca2fc5efffde watchdog: f71808e_wdt: Add F81803 support) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (50f07c7db715 Merge branches 'iommu/fixes', 'arm/qcom', 'arm/renesas', 'arm/rockchip', 'arm/mediatek', 'arm/tegra', 'x86/amd', 'x86/vt-d', 'virtio' and 'core' into next) +$ git merge iommu/next +Auto-merging drivers/iommu/amd_iommu.c +Auto-merging drivers/iommu/Kconfig +Merge made by the 'recursive' strategy. + .../bindings/iommu/renesas,ipmmu-vmsa.txt | 1 + + drivers/iommu/Kconfig | 5 + + drivers/iommu/Makefile | 1 + + drivers/iommu/amd_iommu.c | 893 ++++----------------- + drivers/iommu/amd_iommu_types.h | 3 +- + drivers/iommu/arm-smmu-v3.c | 2 +- + drivers/iommu/arm-smmu.c | 2 +- + drivers/iommu/dma-iommu.c | 43 +- + drivers/iommu/exynos-iommu.c | 2 +- + drivers/iommu/intel-iommu.c | 33 +- + drivers/iommu/ioasid.c | 422 ++++++++++ + drivers/iommu/iommu.c | 73 +- + drivers/iommu/ipmmu-vmsa.c | 7 +- + drivers/iommu/msm_iommu.c | 2 +- + drivers/iommu/mtk_iommu.c | 2 +- + drivers/iommu/mtk_iommu_v1.c | 2 +- + drivers/iommu/omap-iommu.c | 2 +- + drivers/iommu/qcom_iommu.c | 6 +- + drivers/iommu/rockchip-iommu.c | 9 +- + 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/memory/mtk-smi.c | 4 + + include/linux/ioasid.h | 76 ++ + include/linux/iommu.h | 57 +- + include/uapi/linux/iommu.h | 169 ++++ + 27 files changed, 1074 insertions(+), 789 deletions(-) + create mode 100644 drivers/iommu/ioasid.c + create mode 100644 include/linux/ioasid.h +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 +Merge made by the 'recursive' strategy. + fs/namei.c | 8 ++++++-- + include/linux/audit.h | 5 +++-- + include/uapi/linux/audit.h | 1 + + kernel/audit.c | 15 ++++++++------- + 4 files changed, 18 insertions(+), 11 deletions(-) +Merging devicetree/for-next (067c650c456e dtc: Use pkg-config to locate libyaml) +$ git merge devicetree/for-next +Auto-merging scripts/checkpatch.pl +Auto-merging drivers/of/fdt.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/watchdog/samsung-wdt.txt +Auto-merging Documentation/devicetree/bindings/usb/generic-ehci.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/usb/generic-ehci.yaml +Removing Documentation/devicetree/bindings/timer/st,stm32-timer.txt +Removing Documentation/devicetree/bindings/timer/samsung,exynos4210-mct.txt +Removing Documentation/devicetree/bindings/thermal/stm32-thermal.txt +Removing Documentation/devicetree/bindings/sram/sram.txt +Removing Documentation/devicetree/bindings/sram/samsung-sram.txt +Removing Documentation/devicetree/bindings/sram/rockchip-smp-sram.txt +Removing Documentation/devicetree/bindings/sram/renesas,smp-sram.txt +Removing Documentation/devicetree/bindings/sram/milbeaut-smp-sram.txt +Removing Documentation/devicetree/bindings/soc/amlogic/amlogic,canvas.txt +Removing Documentation/devicetree/bindings/serio/allwinner,sun4i-ps2.txt +Removing Documentation/devicetree/bindings/rtc/s3c-rtc.txt +Removing Documentation/devicetree/bindings/rtc/rtc-sh.txt +Removing Documentation/devicetree/bindings/rng/samsung,exynos4-rng.txt +Removing Documentation/devicetree/bindings/regulator/max77650-regulator.txt +Auto-merging Documentation/devicetree/bindings/regulator/fixed-regulator.yaml +Removing Documentation/devicetree/bindings/pwm/renesas,tpu-pwm.txt +Removing Documentation/devicetree/bindings/pwm/renesas,pwm-rcar.txt +Removing Documentation/devicetree/bindings/power/supply/max77650-charger.txt +Removing Documentation/devicetree/bindings/power/reset/syscon-reboot.txt +Removing Documentation/devicetree/bindings/power/reset/syscon-poweroff.txt +Removing Documentation/devicetree/bindings/net/can/sun4i_can.txt +Removing Documentation/devicetree/bindings/mfd/max77650.txt +Removing Documentation/devicetree/bindings/memory-controllers/exynos-srom.txt +Removing Documentation/devicetree/bindings/media/st,stm32-dcmi.txt +Removing Documentation/devicetree/bindings/media/st,stm32-cec.txt +Removing Documentation/devicetree/bindings/media/meson-ao-cec.txt +Removing Documentation/devicetree/bindings/leds/leds-max77650.txt +Removing Documentation/devicetree/bindings/iommu/samsung,sysmmu.txt +Removing Documentation/devicetree/bindings/iommu/arm,smmu.txt +Removing Documentation/devicetree/bindings/iommu/arm,smmu-v3.txt +Removing Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt +Removing Documentation/devicetree/bindings/input/max77650-onkey.txt +Removing Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.txt +Removing Documentation/devicetree/bindings/hwlock/st,stm32-hwspinlock.txt +Removing Documentation/devicetree/bindings/gpu/samsung-scaler.txt +Removing Documentation/devicetree/bindings/gpu/samsung-rotator.txt +Removing Documentation/devicetree/bindings/gpu/samsung-g2d.txt +Auto-merging Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml +Removing Documentation/devicetree/bindings/display/st,stm32-ltdc.txt +Removing Documentation/devicetree/bindings/display/panel/sharp,ld-d5116z01b.txt +Removing Documentation/devicetree/bindings/crypto/samsung-sss.txt +Removing Documentation/devicetree/bindings/crypto/samsung-slimsss.txt +Removing Documentation/devicetree/bindings/bus/simple-pm-bus.txt +Removing Documentation/devicetree/bindings/bus/renesas,bsc.txt +Removing Documentation/devicetree/bindings/arm/sunxi/smp-sram.txt +Removing Documentation/devicetree/bindings/arm/samsung/sysreg.txt +Removing Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt +Removing Documentation/devicetree/bindings/arm/samsung/pmu.txt +Removing Documentation/devicetree/bindings/arm/samsung/exynos-chipid.txt +Removing Documentation/devicetree/bindings/arm/amlogic/smp-sram.txt +Resolved 'Documentation/devicetree/bindings/usb/generic-ehci.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master de358e9facc0] Merge remote-tracking branch 'devicetree/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/arm/amlogic/smp-sram.txt | 32 --- + .../bindings/arm/samsung/exynos-chipid.txt | 12 - + .../bindings/arm/samsung/exynos-chipid.yaml | 40 ++++ + .../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 ++++ + .../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 ++++++ + .../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 +++++ + .../bindings/display/amlogic,meson-dw-hdmi.yaml | 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 +++++++ + Documentation/devicetree/bindings/eeprom/at24.txt | 90 +------- + Documentation/devicetree/bindings/eeprom/at24.yaml | 188 +++++++++++++++ + .../devicetree/bindings/example-schema.yaml | 81 ++++++- + .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 3 +- + .../devicetree/bindings/gpu/arm,mali-midgard.yaml | 3 +- + .../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 ++++ + .../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 - + .../devicetree/bindings/input/max77650-onkey.txt | 26 --- + .../devicetree/bindings/input/max77650-onkey.yaml | 35 +++ + .../bindings/interrupt-controller/renesas,irqc.txt | 48 ---- + .../interrupt-controller/renesas,irqc.yaml | 87 +++++++ + .../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 | 229 ++++++++++++++++++ + .../devicetree/bindings/iommu/samsung,sysmmu.txt | 67 ------ + .../devicetree/bindings/iommu/samsung,sysmmu.yaml | 108 +++++++++ + .../devicetree/bindings/leds/leds-max77650.txt | 57 ----- + .../devicetree/bindings/leds/leds-max77650.yaml | 51 ++++ + .../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/max77650.txt | 46 ---- + .../devicetree/bindings/mfd/max77650.yaml | 149 ++++++++++++ + .../bindings/net/can/allwinner,sun4i-a10-can.yaml | 51 ++++ + .../devicetree/bindings/net/can/sun4i_can.txt | 36 --- + 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/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 +++ + .../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 ++++++ + .../bindings/regulator/fixed-regulator.yaml | 1 - + .../bindings/regulator/max77650-regulator.txt | 41 ---- + .../bindings/regulator/max77650-regulator.yaml | 31 +++ + .../bindings/rng/samsung,exynos4-rng.txt | 19 -- + .../bindings/rng/samsung,exynos4-rng.yaml | 45 ++++ + .../devicetree/bindings/rtc/renesas,sh-rtc.yaml | 70 ++++++ + Documentation/devicetree/bindings/rtc/rtc-sh.txt | 28 --- + Documentation/devicetree/bindings/rtc/s3c-rtc.txt | 31 --- + Documentation/devicetree/bindings/rtc/s3c-rtc.yaml | 89 +++++++ + .../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 ++++ + .../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 ----- + .../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 ++++ + .../devicetree/bindings/usb/generic-ehci.yaml | 5 + + .../bindings/watchdog/amlogic,meson-gxbb-wdt.yaml | 3 + + .../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 | 3 + + MAINTAINERS | 13 +- + drivers/of/address.c | 103 ++++----- + drivers/of/base.c | 32 ++- + drivers/of/fdt.c | 4 +- + drivers/of/of_private.h | 14 ++ + drivers/of/unittest-data/testcases.dts | 1 + + drivers/of/unittest-data/tests-address.dtsi | 48 ++++ + drivers/of/unittest.c | 92 ++++++++ + include/linux/libfdt_env.h | 2 +- + include/linux/of_address.h | 21 +- + scripts/checkpatch.pl | 8 + + scripts/dtc/Makefile | 4 +- + scripts/dtc/dtx_diff | 12 +- + 134 files changed, 4282 insertions(+), 2477 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/amlogic/smp-sram.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/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 + 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/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/eeprom/at24.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 + 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/input/max77650-onkey.txt + create mode 100644 Documentation/devicetree/bindings/input/max77650-onkey.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/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 + 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/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/net/can/allwinner,sun4i-a10-can.yaml + delete mode 100644 Documentation/devicetree/bindings/net/can/sun4i_can.txt + 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/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 + delete mode 100644 Documentation/devicetree/bindings/rng/samsung,exynos4-rng.txt + create mode 100644 Documentation/devicetree/bindings/rng/samsung,exynos4-rng.yaml + create mode 100644 Documentation/devicetree/bindings/rtc/renesas,sh-rtc.yaml + 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 + 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/watchdog/samsung-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml + create mode 100644 drivers/of/unittest-data/tests-address.dtsi +Merging mailbox/mailbox-for-next (556a0964e28c mailbox: qcom-apcs: fix max_register value) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (e2787cbf4bf7 Merge remote-tracking branch 'spi/topic/ptp' into spi-next) +$ git merge spi/for-next +Auto-merging sound/soc/pxa/pxa-ssp.c +Removing Documentation/devicetree/bindings/spi/spi-sifive.txt +Removing Documentation/devicetree/bindings/spi/sh-msiof.txt +Removing Documentation/devicetree/bindings/spi/sh-hspi.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/renesas,hspi.yaml | 57 ++++++ + .../devicetree/bindings/spi/renesas,rzn1-spi.txt | 11 ++ + .../devicetree/bindings/spi/renesas,sh-msiof.yaml | 159 ++++++++++++++++ + Documentation/devicetree/bindings/spi/sh-hspi.txt | 26 --- + Documentation/devicetree/bindings/spi/sh-msiof.txt | 105 ----------- + .../devicetree/bindings/spi/snps,dw-apb-ssi.txt | 3 +- + .../devicetree/bindings/spi/spi-sifive.txt | 37 ---- + .../devicetree/bindings/spi/spi-sifive.yaml | 86 +++++++++ + .../devicetree/bindings/spi/spi-xilinx.txt | 4 +- + arch/arm/plat-pxa/ssp.c | 4 +- + drivers/iio/imu/adis.c | 24 +-- + drivers/spi/Kconfig | 1 + + drivers/spi/spi-atmel.c | 207 ++++++++++++--------- + drivers/spi/spi-axi-spi-engine.c | 16 +- + drivers/spi/spi-bcm63xx-hsspi.c | 3 +- + drivers/spi/spi-bcm63xx.c | 2 +- + drivers/spi/spi-cavium.c | 3 +- + drivers/spi/spi-dw-mmio.c | 1 + + drivers/spi/spi-dw-pci.c | 24 ++- + drivers/spi/spi-dw.c | 1 + + drivers/spi/spi-dw.h | 1 - + drivers/spi/spi-falcon.c | 2 +- + drivers/spi/spi-fsl-dspi.c | 38 +++- + drivers/spi/spi-fsl-espi.c | 19 +- + drivers/spi/spi-fsl-lpspi.c | 2 +- + drivers/spi/spi-fsl-qspi.c | 17 ++ + drivers/spi/spi-fsl-spi.c | 3 +- + drivers/spi/spi-gpio.c | 5 +- + drivers/spi/spi-lantiq-ssc.c | 10 +- + drivers/spi/spi-loopback-test.c | 12 +- + drivers/spi/spi-mpc512x-psc.c | 3 +- + drivers/spi/spi-mpc52xx-psc.c | 3 +- + drivers/spi/spi-mt65xx.c | 11 +- + drivers/spi/spi-mxic.c | 2 +- + drivers/spi/spi-npcm-pspi.c | 3 +- + drivers/spi/spi-omap-100k.c | 7 +- + drivers/spi/spi-orion.c | 6 +- + drivers/spi/spi-pl022.c | 25 ++- + drivers/spi/spi-pxa2xx.c | 70 +++---- + drivers/spi/spi-sc18is602.c | 3 +- + drivers/spi/spi-sh-hspi.c | 3 +- + drivers/spi/spi-slave-mt27xx.c | 12 +- + drivers/spi/spi-sprd-adi.c | 8 + + drivers/spi/spi-sprd.c | 15 +- + drivers/spi/spi-tegra114.c | 39 ++-- + drivers/spi/spi-tegra20-sflash.c | 5 +- + drivers/spi/spi-topcliff-pch.c | 7 +- + drivers/spi/spi-txx9.c | 78 ++++++-- + drivers/spi/spi-xcomm.c | 3 +- + drivers/spi/spi-xilinx.c | 7 +- + drivers/spi/spi-xtensa-xtfpga.c | 10 +- + drivers/spi/spi-zynq-qspi.c | 1 - + drivers/spi/spi.c | 177 +++++++++++++++--- + drivers/spi/spidev.c | 6 +- + include/linux/pxa2xx_ssp.h | 2 +- + include/linux/spi/spi.h | 71 +++++-- + sound/soc/pxa/mmp-sspa.c | 2 +- + sound/soc/pxa/pxa-ssp.c | 10 +- + 58 files changed, 951 insertions(+), 521 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/renesas,hspi.yaml + create mode 100644 Documentation/devicetree/bindings/spi/renesas,rzn1-spi.txt + create mode 100644 Documentation/devicetree/bindings/spi/renesas,sh-msiof.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/sh-hspi.txt + delete mode 100644 Documentation/devicetree/bindings/spi/sh-msiof.txt + delete mode 100644 Documentation/devicetree/bindings/spi/spi-sifive.txt + create mode 100644 Documentation/devicetree/bindings/spi/spi-sifive.yaml +Merging tip/auto-latest (013bfb619229 Merge branch 'core/objtool') +$ git merge tip/auto-latest +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging samples/bpf/Makefile +CONFLICT (content): Merge conflict in samples/bpf/Makefile +Auto-merging net/sched/act_vlan.c +Auto-merging net/sched/act_tunnel_key.c +Auto-merging net/sched/act_skbedit.c +Auto-merging net/sched/act_sample.c +Auto-merging net/sched/act_police.c +Auto-merging net/sched/act_mpls.c +Auto-merging net/sched/act_mirred.c +Auto-merging net/sched/act_ife.c +Auto-merging net/sched/act_ctinfo.c +Auto-merging net/sched/act_ct.c +Auto-merging net/sched/act_csum.c +Auto-merging net/sched/act_api.c +Auto-merging net/netfilter/nf_tables_api.c +Auto-merging net/core/sock.c +Auto-merging net/core/dev.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/bpf/stackmap.c +Auto-merging kernel/bpf/cgroup.c +Auto-merging include/net/sock.h +Auto-merging include/linux/security.h +CONFLICT (content): Merge conflict in include/linux/security.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/jbd2.h +Auto-merging fs/jbd2/transaction.c +Auto-merging drivers/gpu/drm/i915/i915_request.c +Auto-merging drivers/gpu/drm/i915/gt/intel_engine_pm.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_shrinker.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_shrinker.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.c +Auto-merging drivers/gpu/drm/drm_connector.c +Auto-merging drivers/cpufreq/cpufreq.c +Auto-merging arch/x86/kernel/apic/apic.c +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/powerpc/kernel/time.c +Auto-merging MAINTAINERS +Auto-merging Documentation/index.rst +Removing Documentation/RCU/Design/Requirements/Requirements.html +Removing Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Memory-Ordering.html +Removing Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Diagram.html +Removing Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html +Removing Documentation/RCU/Design/Data-Structures/Data-Structures.html +Resolved 'drivers/gpu/drm/i915/gem/i915_gem_shrinker.c' using previous resolution. +Resolved 'include/linux/security.h' using previous resolution. +Recorded preimage for 'samples/bpf/Makefile' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'samples/bpf/Makefile'. +[master 2bbf3924dd68] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + .../Design/Data-Structures/Data-Structures.html | 1391 -------- + .../RCU/Design/Data-Structures/Data-Structures.rst | 1163 +++++++ + .../Expedited-Grace-Periods.html | 668 ---- + .../Expedited-Grace-Periods.rst | 521 +++ + .../Design/Memory-Ordering/Tree-RCU-Diagram.html | 9 - + .../Memory-Ordering/Tree-RCU-Memory-Ordering.html | 704 ---- + .../Memory-Ordering/Tree-RCU-Memory-Ordering.rst | 624 ++++ + .../RCU/Design/Memory-Ordering/TreeRCU-gp.svg | 2 +- + .../RCU/Design/Memory-Ordering/TreeRCU-qs.svg | 2 +- + .../RCU/Design/Requirements/Requirements.html | 3401 -------------------- + .../RCU/Design/Requirements/Requirements.rst | 2704 ++++++++++++++++ + Documentation/RCU/index.rst | 7 +- + Documentation/RCU/lockdep.txt | 18 +- + Documentation/RCU/whatisRCU.txt | 14 +- + Documentation/asm-annotations.rst | 216 ++ + Documentation/index.rst | 8 + + MAINTAINERS | 7 + + arch/ia64/kernel/time.c | 4 +- + arch/powerpc/kernel/time.c | 6 +- + arch/powerpc/perf/core-book3s.c | 18 +- + arch/s390/kernel/vtime.c | 4 +- + arch/x86/Kconfig | 7 +- + arch/x86/Kconfig.cpu | 25 +- + arch/x86/Makefile_32.cpu | 1 + + arch/x86/boot/Makefile | 1 + + arch/x86/boot/compressed/Makefile | 1 + + arch/x86/boot/compressed/efi_stub_32.S | 4 +- + arch/x86/boot/compressed/efi_thunk_64.S | 33 +- + arch/x86/boot/compressed/head_32.S | 15 +- + arch/x86/boot/compressed/head_64.S | 63 +- + arch/x86/boot/compressed/mem_encrypt.S | 11 +- + arch/x86/boot/copy.S | 16 +- + arch/x86/boot/pmjump.S | 10 +- + arch/x86/crypto/aegis128-aesni-asm.S | 36 +- + arch/x86/crypto/aes_ctrby8_avx-x86_64.S | 12 +- + arch/x86/crypto/aesni-intel_asm.S | 114 +- + arch/x86/crypto/aesni-intel_avx-x86_64.S | 32 +- + arch/x86/crypto/blowfish-x86_64-asm_64.S | 16 +- + arch/x86/crypto/camellia-aesni-avx-asm_64.S | 44 +- + arch/x86/crypto/camellia-aesni-avx2-asm_64.S | 44 +- + arch/x86/crypto/camellia-x86_64-asm_64.S | 16 +- + arch/x86/crypto/cast5-avx-x86_64-asm_64.S | 24 +- + arch/x86/crypto/cast6-avx-x86_64-asm_64.S | 32 +- + arch/x86/crypto/chacha-avx2-x86_64.S | 12 +- + arch/x86/crypto/chacha-avx512vl-x86_64.S | 12 +- + arch/x86/crypto/chacha-ssse3-x86_64.S | 16 +- + arch/x86/crypto/crc32-pclmul_asm.S | 4 +- + arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 4 +- + arch/x86/crypto/crct10dif-pcl-asm_64.S | 4 +- + arch/x86/crypto/des3_ede-asm_64.S | 8 +- + arch/x86/crypto/ghash-clmulni-intel_asm.S | 12 +- + arch/x86/crypto/nh-avx2-x86_64.S | 4 +- + arch/x86/crypto/nh-sse2-x86_64.S | 4 +- + arch/x86/crypto/poly1305-avx2-x86_64.S | 4 +- + arch/x86/crypto/poly1305-sse2-x86_64.S | 8 +- + arch/x86/crypto/serpent-avx-x86_64-asm_64.S | 32 +- + arch/x86/crypto/serpent-avx2-asm_64.S | 32 +- + arch/x86/crypto/serpent-sse2-i586-asm_32.S | 8 +- + arch/x86/crypto/serpent-sse2-x86_64-asm_64.S | 8 +- + arch/x86/crypto/sha1_avx2_x86_64_asm.S | 4 +- + arch/x86/crypto/sha1_ni_asm.S | 4 +- + arch/x86/crypto/sha1_ssse3_asm.S | 4 +- + arch/x86/crypto/sha256-avx-asm.S | 4 +- + arch/x86/crypto/sha256-avx2-asm.S | 4 +- + arch/x86/crypto/sha256-ssse3-asm.S | 4 +- + arch/x86/crypto/sha256_ni_asm.S | 4 +- + arch/x86/crypto/sha512-avx-asm.S | 4 +- + arch/x86/crypto/sha512-avx2-asm.S | 4 +- + arch/x86/crypto/sha512-ssse3-asm.S | 4 +- + arch/x86/crypto/twofish-avx-x86_64-asm_64.S | 32 +- + arch/x86/crypto/twofish-i586-asm_32.S | 8 +- + arch/x86/crypto/twofish-x86_64-asm_64-3way.S | 8 +- + arch/x86/crypto/twofish-x86_64-asm_64.S | 8 +- + arch/x86/entry/calling.h | 2 +- + arch/x86/entry/entry_32.S | 163 +- + arch/x86/entry/entry_64.S | 109 +- + arch/x86/entry/entry_64_compat.S | 16 +- + arch/x86/entry/syscall_32.c | 8 +- + arch/x86/entry/syscall_64.c | 14 +- + arch/x86/entry/syscalls/syscall_32.tbl | 8 +- + arch/x86/entry/thunk_32.S | 4 +- + arch/x86/entry/thunk_64.S | 7 +- + arch/x86/entry/vdso/vdso32/system_call.S | 2 +- + arch/x86/events/core.c | 8 + + arch/x86/events/intel/bts.c | 8 +- + arch/x86/events/intel/core.c | 12 +- + arch/x86/events/intel/lbr.c | 23 + + arch/x86/events/intel/p4.c | 5 +- + arch/x86/events/perf_event.h | 11 + + arch/x86/ia32/ia32_signal.c | 5 +- + arch/x86/include/asm/asm.h | 8 +- + arch/x86/include/asm/cpufeatures.h | 1 + + arch/x86/include/asm/crash.h | 1 - + arch/x86/include/asm/emulate_prefix.h | 14 + + arch/x86/include/asm/fixmap.h | 2 +- + arch/x86/include/asm/insn.h | 6 + + arch/x86/include/asm/linkage.h | 4 - + arch/x86/include/asm/module.h | 2 + + arch/x86/include/asm/pgtable-3level.h | 46 +- + arch/x86/include/asm/syscall_wrapper.h | 76 +- + arch/x86/include/asm/uv/bios.h | 2 +- + arch/x86/include/asm/uv/uv.h | 16 +- + arch/x86/include/asm/uv/uv_hub.h | 61 +- + arch/x86/include/asm/xen/interface.h | 11 +- + arch/x86/include/uapi/asm/bootparam.h | 25 +- + arch/x86/kernel/acpi/wakeup_32.S | 9 +- + arch/x86/kernel/acpi/wakeup_64.S | 10 +- + arch/x86/kernel/apic/apic.c | 2 +- + arch/x86/kernel/apic/io_apic.c | 25 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 184 +- + arch/x86/kernel/cpu/intel.c | 8 +- + arch/x86/kernel/cpu/mce/amd.c | 2 +- + arch/x86/kernel/cpu/mce/core.c | 93 +- + arch/x86/kernel/cpu/mce/intel.c | 11 +- + arch/x86/kernel/cpu/mce/internal.h | 6 + + arch/x86/kernel/cpu/mce/therm_throt.c | 2 +- + arch/x86/kernel/cpu/microcode/amd.c | 4 +- + arch/x86/kernel/cpu/microcode/core.c | 36 +- + arch/x86/kernel/cpu/microcode/intel.c | 5 +- + arch/x86/kernel/cpu/rdrand.c | 22 +- + arch/x86/kernel/ftrace_32.S | 23 +- + arch/x86/kernel/ftrace_64.S | 47 +- + arch/x86/kernel/head_32.S | 62 +- + arch/x86/kernel/head_64.S | 113 +- + arch/x86/kernel/irqflags.S | 8 +- + arch/x86/kernel/jailhouse.c | 136 +- + arch/x86/kernel/kprobes/core.c | 4 + + arch/x86/kernel/relocate_kernel_32.S | 13 +- + arch/x86/kernel/relocate_kernel_64.S | 13 +- + arch/x86/kernel/traps.c | 5 - + arch/x86/kernel/uprobes.c | 2 +- + arch/x86/kernel/verify_cpu.S | 4 +- + arch/x86/kvm/pmu.c | 4 +- + arch/x86/kvm/vmx/vmenter.S | 12 +- + arch/x86/kvm/x86.c | 4 +- + arch/x86/lib/atomic64_386_32.S | 4 +- + arch/x86/lib/atomic64_cx8_32.S | 32 +- + arch/x86/lib/checksum_32.S | 16 +- + arch/x86/lib/clear_page_64.S | 12 +- + arch/x86/lib/cmpxchg16b_emu.S | 4 +- + arch/x86/lib/cmpxchg8b_emu.S | 4 +- + arch/x86/lib/copy_page_64.S | 8 +- + arch/x86/lib/copy_user_64.S | 21 +- + arch/x86/lib/csum-copy_64.S | 4 +- + arch/x86/lib/getuser.S | 22 +- + arch/x86/lib/hweight.S | 8 +- + arch/x86/lib/insn.c | 34 + + arch/x86/lib/iomap_copy_64.S | 4 +- + arch/x86/lib/memcpy_64.S | 20 +- + arch/x86/lib/memmove_64.S | 8 +- + arch/x86/lib/memset_64.S | 16 +- + arch/x86/lib/msr-reg.S | 8 +- + arch/x86/lib/putuser.S | 19 +- + arch/x86/lib/retpoline.S | 4 +- + arch/x86/math-emu/div_Xsig.S | 4 +- + arch/x86/math-emu/div_small.S | 4 +- + arch/x86/math-emu/fpu_system.h | 6 +- + arch/x86/math-emu/mul_Xsig.S | 12 +- + arch/x86/math-emu/polynom_Xsig.S | 4 +- + arch/x86/math-emu/reg_ld_str.c | 6 +- + arch/x86/math-emu/reg_norm.S | 8 +- + arch/x86/math-emu/reg_round.S | 4 +- + arch/x86/math-emu/reg_u_add.S | 4 +- + arch/x86/math-emu/reg_u_div.S | 4 +- + arch/x86/math-emu/reg_u_mul.S | 4 +- + arch/x86/math-emu/reg_u_sub.S | 4 +- + arch/x86/math-emu/round_Xsig.S | 8 +- + arch/x86/math-emu/shr_Xsig.S | 4 +- + arch/x86/math-emu/wm_shrx.S | 8 +- + arch/x86/math-emu/wm_sqrt.S | 4 +- + arch/x86/mm/mem_encrypt_boot.S | 8 +- + arch/x86/mm/pgtable.c | 4 +- + arch/x86/platform/efi/efi_stub_32.S | 4 +- + arch/x86/platform/efi/efi_stub_64.S | 4 +- + arch/x86/platform/efi/efi_thunk_64.S | 16 +- + arch/x86/platform/olpc/xo1-wakeup.S | 3 +- + arch/x86/platform/pvh/head.S | 18 +- + arch/x86/platform/uv/bios_uv.c | 9 +- + arch/x86/power/hibernate_asm_32.S | 14 +- + arch/x86/power/hibernate_asm_64.S | 14 +- + arch/x86/purgatory/entry64.S | 24 +- + arch/x86/purgatory/setup-x86_64.S | 14 +- + arch/x86/purgatory/stack.S | 7 +- + arch/x86/realmode/rm/header.S | 8 +- + arch/x86/realmode/rm/realmode.lds.S | 1 + + arch/x86/realmode/rm/reboot.S | 13 +- + arch/x86/realmode/rm/stack.S | 14 +- + arch/x86/realmode/rm/trampoline_32.S | 16 +- + arch/x86/realmode/rm/trampoline_64.S | 29 +- + arch/x86/realmode/rm/trampoline_common.S | 2 +- + arch/x86/realmode/rm/wakeup_asm.S | 17 +- + arch/x86/realmode/rmpiggy.S | 10 +- + arch/x86/tools/gen-insn-attr-x86.awk | 4 +- + arch/x86/um/vdso/vdso.S | 6 +- + arch/x86/xen/xen-asm.S | 28 +- + arch/x86/xen/xen-asm_32.S | 7 +- + arch/x86/xen/xen-asm_64.S | 34 +- + arch/x86/xen/xen-head.S | 8 +- + drivers/cpufreq/cpufreq.c | 2 +- + drivers/gpu/drm/drm_connector.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 4 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 2 +- + drivers/gpu/drm/i915/i915_request.c | 2 +- + drivers/leds/trigger/ledtrig-activity.c | 2 +- + drivers/scsi/scsi.c | 4 +- + drivers/scsi/scsi_sysfs.c | 8 +- + drivers/tty/tty_ldsem.c | 8 +- + fs/afs/vl_list.c | 4 +- + fs/dcache.c | 2 +- + fs/jbd2/transaction.c | 4 +- + fs/kernfs/dir.c | 4 +- + fs/ocfs2/dlmglue.c | 2 +- + fs/proc/stat.c | 4 +- + include/linux/context_tracking.h | 30 +- + include/linux/context_tracking_state.h | 21 +- + include/linux/jbd2.h | 2 +- + include/linux/kernel_stat.h | 11 + + include/linux/linkage.h | 249 +- + include/linux/lockdep.h | 21 +- + include/linux/lsm_hooks.h | 15 + + include/linux/percpu-rwsem.h | 4 +- + include/linux/perf_event.h | 45 +- + include/linux/rculist_bl.h | 28 - + include/linux/rcupdate.h | 20 +- + include/linux/rcutiny.h | 1 + + include/linux/rcutree.h | 1 + + include/linux/rwlock_api_smp.h | 16 +- + include/linux/sched.h | 9 +- + include/linux/security.h | 38 + + include/linux/seqlock.h | 4 +- + include/linux/spinlock_api_smp.h | 8 +- + include/linux/tick.h | 9 +- + include/linux/vtime.h | 59 +- + include/linux/ww_mutex.h | 2 +- + include/net/sock.h | 2 +- + include/trace/events/rcu.h | 47 +- + include/trace/events/timer.h | 3 +- + kernel/bpf/cgroup.c | 4 +- + kernel/bpf/stackmap.c | 2 +- + kernel/context_tracking.c | 6 +- + kernel/cpu.c | 2 +- + kernel/events/core.c | 141 +- + kernel/events/ring_buffer.c | 24 +- + kernel/futex.c | 2 +- + kernel/locking/lockdep.c | 3 +- + kernel/locking/locktorture.c | 9 +- + kernel/locking/mutex.c | 8 +- + kernel/locking/rtmutex.c | 6 +- + kernel/locking/rwsem.c | 10 +- + kernel/printk/printk.c | 10 +- + kernel/rcu/rcu.h | 4 +- + kernel/rcu/rcu_segcblist.c | 6 +- + kernel/rcu/rcuperf.c | 16 - + kernel/rcu/rcutorture.c | 44 +- + kernel/rcu/tree.c | 73 +- + kernel/rcu/tree.h | 1 + + kernel/rcu/tree_plugin.h | 2 +- + kernel/sched/core.c | 2 +- + kernel/sched/cputime.c | 160 +- + kernel/sched/fair.c | 1195 ++++--- + kernel/sched/features.h | 1 + + kernel/sched/topology.c | 9 +- + kernel/stop_machine.c | 1 + + kernel/time/tick-sched.c | 13 +- + kernel/trace/trace_event_perf.c | 15 +- + kernel/workqueue.c | 10 +- + lib/locking-selftest.c | 24 +- + lib/smp_processor_id.c | 2 +- + lib/ubsan.c | 5 +- + mm/memcontrol.c | 2 +- + net/core/dev.c | 4 +- + net/core/sock.c | 2 +- + net/core/sock_reuseport.c | 4 +- + net/netfilter/nf_tables_api.c | 5 +- + net/sched/act_api.c | 2 +- + net/sched/act_csum.c | 4 +- + net/sched/act_ct.c | 3 +- + net/sched/act_ctinfo.c | 4 +- + net/sched/act_ife.c | 2 +- + net/sched/act_mirred.c | 4 +- + net/sched/act_mpls.c | 2 +- + net/sched/act_police.c | 6 +- + net/sched/act_sample.c | 4 +- + net/sched/act_skbedit.c | 4 +- + net/sched/act_tunnel_key.c | 4 +- + net/sched/act_vlan.c | 2 +- + security/safesetid/securityfs.c | 4 +- + security/security.c | 27 + + security/selinux/hooks.c | 69 + + security/selinux/include/classmap.h | 2 + + security/selinux/include/objsec.h | 6 +- + tools/arch/x86/include/asm/emulate_prefix.h | 14 + + tools/arch/x86/include/asm/insn.h | 6 + + tools/arch/x86/include/asm/irq_vectors.h | 146 + + tools/arch/x86/include/asm/msr-index.h | 857 +++++ + tools/arch/x86/lib/insn.c | 34 + + tools/arch/x86/tools/gen-insn-attr-x86.awk | 4 +- + tools/lib/lockdep/include/liblockdep/common.h | 3 +- + tools/lib/lockdep/include/liblockdep/mutex.h | 2 +- + tools/lib/lockdep/include/liblockdep/rwlock.h | 2 +- + tools/lib/lockdep/preload.c | 16 +- + tools/memory-model/Documentation/explanation.txt | 602 +++- + tools/memory-model/linux-kernel.cat | 2 +- + tools/objtool/check.c | 1 + + tools/objtool/sync-check.sh | 3 +- + tools/perf/Documentation/perf-config.txt | 5 + + tools/perf/Documentation/perf-diff.txt | 5 + + tools/perf/Documentation/perf-list.txt | 3 + + tools/perf/Documentation/perf-stat.txt | 6 + + tools/perf/Documentation/perf-trace.txt | 14 + + tools/perf/Makefile.config | 33 +- + tools/perf/Makefile.perf | 21 +- + tools/perf/arch/arm/util/Build | 2 + + tools/perf/arch/arm/util/perf_regs.c | 6 + + tools/perf/arch/arm64/util/Build | 1 + + tools/perf/arch/arm64/util/perf_regs.c | 6 + + tools/perf/arch/csky/util/Build | 2 + + tools/perf/arch/csky/util/perf_regs.c | 6 + + tools/perf/arch/riscv/util/Build | 2 + + tools/perf/arch/riscv/util/perf_regs.c | 6 + + tools/perf/arch/s390/util/Build | 1 + + tools/perf/arch/s390/util/perf_regs.c | 6 + + tools/perf/arch/x86/tests/perf-time-to-tsc.c | 9 +- + tools/perf/builtin-diff.c | 143 + + tools/perf/builtin-kvm.c | 11 +- + tools/perf/builtin-list.c | 14 +- + tools/perf/builtin-record.c | 10 +- + tools/perf/builtin-report.c | 7 + + tools/perf/builtin-script.c | 10 +- + tools/perf/builtin-stat.c | 6 + + tools/perf/builtin-top.c | 20 +- + tools/perf/builtin-trace.c | 979 +++++- + tools/perf/check-headers.sh | 5 +- + tools/perf/lib/Build | 1 + + tools/perf/lib/Makefile | 6 +- + tools/perf/lib/core.c | 3 +- + tools/perf/lib/evlist.c | 357 ++ + tools/perf/lib/include/internal/evlist.h | 43 + + tools/perf/lib/include/internal/evsel.h | 1 + + tools/perf/lib/include/internal/mmap.h | 45 +- + tools/perf/lib/include/internal/tests.h | 20 +- + tools/perf/lib/include/perf/core.h | 3 + + tools/perf/lib/include/perf/evlist.h | 15 +- + tools/perf/lib/include/perf/evsel.h | 2 - + tools/perf/lib/include/perf/mmap.h | 15 + + tools/perf/lib/internal.h | 5 + + tools/perf/lib/libperf.map | 10 +- + tools/perf/lib/mmap.c | 275 ++ + tools/perf/lib/tests/Makefile | 6 +- + tools/perf/lib/tests/test-cpumap.c | 2 +- + tools/perf/lib/tests/test-evlist.c | 219 +- + tools/perf/lib/tests/test-evsel.c | 2 +- + tools/perf/lib/tests/test-threadmap.c | 2 +- + .../arch/arm64/hisilicon/hip08/uncore-ddrc.json | 16 +- + .../arch/arm64/hisilicon/hip08/uncore-hha.json | 23 +- + .../arch/arm64/hisilicon/hip08/uncore-l3c.json | 56 + + tools/perf/pmu-events/jevents.c | 26 +- + tools/perf/pmu-events/jevents.h | 3 +- + tools/perf/pmu-events/pmu-events.h | 1 + + tools/perf/scripts/python/exported-sql-viewer.py | 1555 ++++++++- + tools/perf/tests/backward-ring-buffer.c | 7 +- + tools/perf/tests/bp_account.c | 20 +- + tools/perf/tests/bp_signal.c | 15 +- + tools/perf/tests/bpf.c | 7 +- + tools/perf/tests/builtin-test.c | 2 +- + tools/perf/tests/code-reading.c | 9 +- + tools/perf/tests/keep-tracking.c | 9 +- + tools/perf/tests/mmap-basic.c | 9 +- + tools/perf/tests/openat-syscall-tp-fields.c | 9 +- + tools/perf/tests/perf-record.c | 9 +- + tools/perf/tests/sw-clock.c | 9 +- + tools/perf/tests/switch-tracking.c | 9 +- + tools/perf/tests/task-exit.c | 18 +- + tools/perf/tests/tests.h | 1 + + tools/perf/trace/beauty/Build | 1 + + tools/perf/trace/beauty/beauty.h | 35 +- + tools/perf/trace/beauty/mmap.c | 4 +- + tools/perf/trace/beauty/tracepoints/Build | 2 + + .../trace/beauty/tracepoints/x86_irq_vectors.c | 29 + + .../trace/beauty/tracepoints/x86_irq_vectors.sh | 27 + + tools/perf/trace/beauty/tracepoints/x86_msr.c | 39 + + tools/perf/trace/beauty/tracepoints/x86_msr.sh | 40 + + tools/perf/util/Build | 1 + + tools/perf/util/annotate.c | 200 +- + tools/perf/util/annotate.h | 2 + + tools/perf/util/env.c | 16 + + tools/perf/util/env.h | 1 + + tools/perf/util/evlist.c | 334 +- + tools/perf/util/evlist.h | 12 + + tools/perf/util/mmap.c | 260 +- + tools/perf/util/mmap.h | 28 +- + tools/perf/util/parse-events.c | 4 +- + tools/perf/util/parse-events.h | 2 +- + tools/perf/util/parse-regs-options.c | 8 +- + tools/perf/util/perf_regs.c | 4 - + tools/perf/util/perf_regs.h | 4 +- + tools/perf/util/pmu.c | 17 +- + tools/perf/util/pmu.h | 4 +- + tools/perf/util/python.c | 7 +- + .../perf/util/scripting-engines/trace-event-perl.c | 8 +- + .../util/scripting-engines/trace-event-python.c | 9 +- + tools/perf/util/session.c | 29 - + tools/perf/util/session.h | 6 +- + tools/perf/util/sort.h | 4 + + tools/perf/util/spark.c | 34 + + tools/perf/util/spark.h | 8 + + tools/perf/util/stat.c | 10 + + tools/perf/util/stat.h | 2 + + tools/perf/util/string2.h | 3 + + tools/perf/util/symbol.h | 2 + + tools/perf/util/time-utils.c | 27 +- + tools/perf/util/time-utils.h | 5 + + tools/perf/util/trace-event-parse.c | 31 - + tools/perf/util/trace-event.h | 2 - + .../selftests/rcutorture/configs/rcu/TASKS03 | 3 - + .../selftests/rcutorture/configs/rcu/TREE02 | 3 - + .../selftests/rcutorture/configs/rcu/TREE04 | 3 - + .../selftests/rcutorture/configs/rcu/TREE06 | 3 - + .../selftests/rcutorture/configs/rcu/TREE08 | 3 - + .../selftests/rcutorture/configs/rcu/TREE09 | 3 - + .../selftests/rcutorture/configs/rcu/TRIVIAL | 3 - + .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 1 - + 423 files changed, 15007 insertions(+), 9366 deletions(-) + delete mode 100644 Documentation/RCU/Design/Data-Structures/Data-Structures.html + create mode 100644 Documentation/RCU/Design/Data-Structures/Data-Structures.rst + delete mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.rst + delete mode 100644 Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Diagram.html + delete mode 100644 Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Memory-Ordering.html + create mode 100644 Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Memory-Ordering.rst + delete mode 100644 Documentation/RCU/Design/Requirements/Requirements.html + create mode 100644 Documentation/RCU/Design/Requirements/Requirements.rst + create mode 100644 Documentation/asm-annotations.rst + create mode 100644 arch/x86/include/asm/emulate_prefix.h + create mode 100644 tools/arch/x86/include/asm/emulate_prefix.h + create mode 100644 tools/arch/x86/include/asm/irq_vectors.h + create mode 100644 tools/arch/x86/include/asm/msr-index.h + create mode 100644 tools/perf/arch/arm/util/perf_regs.c + create mode 100644 tools/perf/arch/arm64/util/perf_regs.c + create mode 100644 tools/perf/arch/csky/util/perf_regs.c + create mode 100644 tools/perf/arch/riscv/util/perf_regs.c + create mode 100644 tools/perf/arch/s390/util/perf_regs.c + create mode 100644 tools/perf/lib/include/perf/mmap.h + create mode 100644 tools/perf/lib/mmap.c + create mode 100644 tools/perf/trace/beauty/tracepoints/Build + create mode 100644 tools/perf/trace/beauty/tracepoints/x86_irq_vectors.c + create mode 100755 tools/perf/trace/beauty/tracepoints/x86_irq_vectors.sh + create mode 100644 tools/perf/trace/beauty/tracepoints/x86_msr.c + create mode 100755 tools/perf/trace/beauty/tracepoints/x86_msr.sh + create mode 100644 tools/perf/util/spark.c + create mode 100644 tools/perf/util/spark.h +$ git am -3 ../patches/0001-drm-i915-update-for-mutex_release-API-change.patch +Applying: drm/i915: update for mutex_release API change +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/i915/gt/intel_gt_pm.c +M drivers/gpu/drm/i915/gt/intel_lrc.c +M drivers/gpu/drm/i915/i915_active.c +$ git add -A . +$ git commit -v -a --amend +[master 2e876e899699] Merge remote-tracking branch 'tip/auto-latest' + Date: Tue Nov 5 15:27:52 2019 +1100 +Merging clockevents/timers/drivers/next (6e001f6a4cc7 clocksource/drivers/asm9260: Add a check for of_clk_get) +$ git merge clockevents/timers/drivers/next +Auto-merging drivers/clocksource/timer-of.c +Merge made by the 'recursive' strategy. + drivers/clocksource/Kconfig | 1 + + drivers/clocksource/asm9260_timer.c | 4 + + drivers/clocksource/renesas-ostm.c | 189 ++++++++++++++---------------------- + drivers/clocksource/timer-of.c | 6 +- + 4 files changed, 80 insertions(+), 120 deletions(-) +Merging edac/edac-for-next (466503d6b1b3 EDAC/amd64: Set grain per DIMM) +$ git merge edac/edac-for-next +Merge made by the 'recursive' strategy. + drivers/edac/amd64_edac.c | 2 ++ + drivers/edac/aspeed_edac.c | 7 +---- + drivers/edac/edac_device.c | 50 ++++++++++++++++++++--------------- + drivers/edac/edac_device.h | 54 ++++++++++++++++++++++++++++++-------- + drivers/edac/i5100_edac.c | 2 -- + drivers/edac/i5400_edac.c | 15 +++-------- + drivers/edac/i7300_edac.c | 4 +-- + drivers/edac/sb_edac.c | 21 ++++++--------- + drivers/edac/skx_base.c | 51 +++++++++++++++++++++++++++++++++--- + drivers/edac/skx_common.c | 65 +++++++++++++++++++++++----------------------- + drivers/edac/skx_common.h | 4 ++- + 11 files changed, 172 insertions(+), 103 deletions(-) +Merging irqchip/irq/irqchip-next (41860cc44704 irqchip/sifive-plic: Skip contexts except supervisor in plic_init()) +$ git merge irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (8ed4889eb831 selftests/ftrace: Fix same probe error test) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (8dcdfb7096a3 Merge branches 'doc.2019.10.29a', 'fixes.2019.10.30a', 'nohz.2019.10.28a', 'replace.2019.10.30a', 'torture.2019.10.05a' and 'lkmm.2019.10.05a' into HEAD) +$ git merge rcu/rcu/next +Already up to date. +Merging kvm/linux-next (20baa8e515a5 Merge tag 'kvm-ppc-fixes-5.4-1' 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 (ab71d9531316 Merge remote-tracking branch 'kvmarm/misc-5.5' into kvmarm/next) +$ git merge kvm-arm/next +Auto-merging virt/kvm/kvm_main.c +Auto-merging include/Kbuild +Auto-merging arch/arm64/kernel/cpu_errata.c +Auto-merging arch/arm64/include/asm/kvm_host.h +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 6 +- + Documentation/virt/kvm/api.txt | 55 +++++++++- + Documentation/virt/kvm/arm/pvtime.rst | 80 ++++++++++++++ + Documentation/virt/kvm/devices/vcpu.txt | 14 +++ + arch/arm/include/asm/kvm_arm.h | 1 + + arch/arm/include/asm/kvm_emulate.h | 5 + + arch/arm/include/asm/kvm_host.h | 33 ++++++ + arch/arm/include/uapi/asm/kvm.h | 3 +- + arch/arm/kvm/Makefile | 2 +- + arch/arm/kvm/guest.c | 14 +++ + arch/arm/kvm/handle_exit.c | 2 +- + arch/arm/mm/proc-v7-bugs.c | 13 +-- + arch/arm64/include/asm/kvm_arm.h | 3 +- + arch/arm64/include/asm/kvm_emulate.h | 17 ++- + arch/arm64/include/asm/kvm_host.h | 37 +++++++ + arch/arm64/include/asm/paravirt.h | 9 +- + arch/arm64/include/asm/pvclock-abi.h | 17 +++ + arch/arm64/include/uapi/asm/kvm.h | 5 +- + arch/arm64/kernel/cpu_errata.c | 81 +++++--------- + arch/arm64/kernel/paravirt.c | 140 ++++++++++++++++++++++++ + arch/arm64/kernel/time.c | 3 + + arch/arm64/kvm/Kconfig | 4 + + arch/arm64/kvm/Makefile | 2 + + arch/arm64/kvm/guest.c | 23 ++++ + arch/arm64/kvm/handle_exit.c | 4 +- + arch/arm64/kvm/inject_fault.c | 4 +- + drivers/irqchip/irq-gic-v4.c | 7 +- + include/Kbuild | 2 + + include/kvm/arm_hypercalls.h | 43 ++++++++ + include/kvm/arm_psci.h | 2 +- + include/kvm/arm_vgic.h | 4 +- + include/linux/arm-smccc.h | 59 ++++++++++ + include/linux/cpuhotplug.h | 1 + + include/linux/irqchip/arm-gic-v4.h | 2 + + include/linux/kvm_host.h | 26 ++++- + include/linux/kvm_types.h | 2 + + include/uapi/linux/kvm.h | 10 ++ + virt/kvm/arm/arm.c | 45 +++++++- + virt/kvm/arm/hypercalls.c | 71 ++++++++++++ + virt/kvm/arm/mmio.c | 9 +- + virt/kvm/arm/psci.c | 84 +------------- + virt/kvm/arm/pvtime.c | 131 ++++++++++++++++++++++ + virt/kvm/arm/vgic/vgic-v3.c | 4 + + virt/kvm/arm/vgic/vgic-v4.c | 55 +++++----- + virt/kvm/arm/vgic/vgic.c | 4 - + virt/kvm/arm/vgic/vgic.h | 2 - + virt/kvm/kvm_main.c | 6 +- + 47 files changed, 939 insertions(+), 207 deletions(-) + create mode 100644 Documentation/virt/kvm/arm/pvtime.rst + create mode 100644 arch/arm64/include/asm/pvclock-abi.h + create mode 100644 include/kvm/arm_hypercalls.h + create mode 100644 virt/kvm/arm/hypercalls.c + create mode 100644 virt/kvm/arm/pvtime.c +Merging kvm-ppc/kvm-ppc-next (55d7004299eb KVM: PPC: Book3S HV: Reject mflags=2 (LPCR[AIL]=2) ADDR_TRANS_MODE mode) +$ git merge kvm-ppc/kvm-ppc-next +Auto-merging include/uapi/linux/kvm.h +CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h +Auto-merging Documentation/virt/kvm/api.txt +Resolved 'include/uapi/linux/kvm.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master cc84538b396d] Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/virt/kvm/api.txt | 3 + + Documentation/virt/kvm/devices/xics.txt | 14 +++- + Documentation/virt/kvm/devices/xive.txt | 8 ++ + arch/powerpc/include/asm/kvm_host.h | 1 - + arch/powerpc/include/asm/kvm_ppc.h | 1 + + arch/powerpc/include/asm/reg.h | 12 +++ + arch/powerpc/include/uapi/asm/kvm.h | 3 + + arch/powerpc/kvm/book3s.c | 27 +------ + arch/powerpc/kvm/book3s.h | 3 + + arch/powerpc/kvm/book3s_32_mmu.c | 6 -- + arch/powerpc/kvm/book3s_64_mmu.c | 15 ---- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 24 ++---- + arch/powerpc/kvm/book3s_hv.c | 28 ++----- + arch/powerpc/kvm/book3s_hv_builtin.c | 82 ++++++++++++++++---- + arch/powerpc/kvm/book3s_hv_nested.c | 2 +- + arch/powerpc/kvm/book3s_pr.c | 40 +++++++++- + arch/powerpc/kvm/book3s_xive.c | 128 +++++++++++++++++++++++++------- + arch/powerpc/kvm/book3s_xive.h | 5 ++ + arch/powerpc/kvm/book3s_xive_native.c | 38 ++++------ + arch/powerpc/kvm/e500_mmu_host.c | 6 +- + arch/powerpc/kvm/powerpc.c | 2 + + include/uapi/linux/kvm.h | 1 + + 22 files changed, 288 insertions(+), 161 deletions(-) +Merging kvms390/next (c7b7de631246 KVM: s390: Do not yield when target is already running) +$ git merge kvms390/next +Auto-merging arch/s390/kvm/kvm-s390.c +Merge made by the 'recursive' strategy. + arch/s390/include/asm/kvm_host.h | 1 + + arch/s390/kvm/diag.c | 22 ++++++++++++++++++---- + arch/s390/kvm/interrupt.c | 5 ++--- + arch/s390/kvm/kvm-s390.c | 19 ++++++++----------- + tools/testing/selftests/kvm/s390x/sync_regs_test.c | 15 +++++++++------ + 5 files changed, 38 insertions(+), 24 deletions(-) +Merging xen-tip/linux-next (6ccae60d014d xen: issue deprecation warning for 32-bit pv guest) +$ git merge xen-tip/linux-next +Already up to date. +Merging percpu/for-next (825dbc6ff7a3 percpu: add __percpu to SHIFT_PERCPU_PTR) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + include/linux/percpu-defs.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging workqueues/for-next (30ae2fc0a75e workqueue: Minor follow-ups to the rescuer destruction change) +$ git merge workqueues/for-next +Auto-merging kernel/workqueue.c +Merge made by the 'recursive' strategy. + kernel/workqueue.c | 29 ++++++++++++++++++++++------- + 1 file changed, 22 insertions(+), 7 deletions(-) +Merging drivers-x86/for-next (fa2a590d0d02 platform/x86: intel_punit_ipc: Drop useless label) +$ git merge drivers-x86/for-next +Auto-merging drivers/platform/x86/intel_punit_ipc.c +Auto-merging drivers/platform/x86/asus-laptop.c +Auto-merging drivers/platform/x86/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-platform-mellanox-bootctl | 58 ++ + MAINTAINERS | 10 +- + drivers/platform/mellanox/Kconfig | 12 + + drivers/platform/mellanox/Makefile | 1 + + drivers/platform/mellanox/mlxbf-bootctl.c | 321 ++++++++ + drivers/platform/mellanox/mlxbf-bootctl.h | 103 +++ + drivers/platform/x86/Kconfig | 35 +- + 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/hdaps.c | 40 +- + 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_punit_ipc.c | 48 +- + drivers/platform/x86/peaq-wmi.c | 66 +- + drivers/platform/x86/system76_acpi.c | 384 +++++++++ + drivers/thermal/gov_bang_bang.c | 2 +- + tools/power/x86/intel-speed-select/isst-config.c | 878 ++++++++++++++++----- + tools/power/x86/intel-speed-select/isst-core.c | 21 + + tools/power/x86/intel-speed-select/isst-display.c | 14 +- + tools/power/x86/intel-speed-select/isst.h | 3 + + 25 files changed, 2837 insertions(+), 467 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-platform-mellanox-bootctl + 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 +Merging chrome-platform/for-next (3ea09dfacaa3 platform/chrome: wilco_ec: Add charging config driver) +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-platform-wilco-ec | 17 ++ + drivers/platform/chrome/cros_ec.c | 33 ++++ + drivers/platform/chrome/cros_ec_proto.c | 70 ++++++++ + 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 | 103 ------------ + include/linux/platform_data/wilco-ec.h | 15 ++ + 10 files changed, 479 insertions(+), 119 deletions(-) + create mode 100644 drivers/platform/chrome/wilco_ec/keyboard_leds.c +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 (448d6fcb7a52 leds: pca953x: Use of_device_get_match_data()) +$ git merge leds/for-next +Auto-merging include/linux/leds.h +Auto-merging drivers/video/backlight/Kconfig +Removing Documentation/devicetree/bindings/leds/backlight/pm8941-wled.txt +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-class-led-driver-el15203000 | 139 ++++++++ + .../bindings/leds/backlight/pm8941-wled.txt | 42 --- + .../bindings/leds/backlight/qcom-wled.txt | 102 ++++++ + .../devicetree/bindings/leds/leds-el15203000.txt | 69 ++++ + 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-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-pca9532.c | 14 +- + drivers/leds/leds-tlc591xx.c | 90 ++---- + drivers/leds/leds.h | 6 + + drivers/video/backlight/Kconfig | 8 +- + drivers/video/backlight/Makefile | 2 +- + .../video/backlight/{pm8941-wled.c => qcom-wled.c} | 0 + include/linux/led-class-flash.h | 41 ++- + include/linux/leds.h | 100 +++--- + 22 files changed, 952 insertions(+), 251 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-led-driver-el15203000 + 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 + create mode 100644 drivers/leds/leds-el15203000.c + rename drivers/video/backlight/{pm8941-wled.c => qcom-wled.c} (100%) +Merging ipmi/for-next (4aa7afb0ee20 ipmi: Fix memory leak in __ipmi_bmc_register) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/char/ipmi/bt-bmc.c | 4 +-- + drivers/char/ipmi/ipmi_msghandler.c | 55 ++++++++++++++++--------------------- + include/linux/ipmi_smi.h | 12 +++++--- + 3 files changed, 33 insertions(+), 38 deletions(-) +Merging driver-core/driver-core-next (09b0965ee8cc IB: mlx5: no need to check return value of debugfs_create functions) +$ git merge driver-core/driver-core-next +Auto-merging include/linux/fwnode.h +Auto-merging include/linux/device.h +Auto-merging drivers/of/property.c +Auto-merging drivers/mmc/host/dw_mmc.c +Auto-merging drivers/infiniband/hw/mlx5/mlx5_ib.h +Auto-merging drivers/infiniband/hw/mlx5/main.c +Auto-merging arch/sh/kernel/setup.c +Auto-merging arch/powerpc/platforms/pseries/lpar.c +Auto-merging Documentation/filesystems/debugfs.txt +CONFLICT (content): Merge conflict in Documentation/filesystems/debugfs.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Recorded preimage for 'Documentation/filesystems/debugfs.txt' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'Documentation/filesystems/debugfs.txt'. +[master 4fdd4a52a322] Merge remote-tracking branch 'driver-core/driver-core-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.rst | 1 + + Documentation/admin-guide/kernel-parameters.txt | 6 + + Documentation/driver-api/device_link.rst | 3 +- + Documentation/driver-api/driver-model/driver.rst | 43 +++ + Documentation/filesystems/debugfs.txt | 42 +-- + arch/powerpc/platforms/pseries/dtl.c | 38 +-- + arch/powerpc/platforms/pseries/hvCall_inst.c | 12 +- + arch/powerpc/platforms/pseries/lpar.c | 15 +- + arch/sh/drivers/Makefile | 2 +- + arch/sh/drivers/platform_early.c | 347 +++++++++++++++++++++++ + arch/sh/include/asm/platform_early.h | 61 ++++ + arch/sh/kernel/cpu/sh2/setup-sh7619.c | 3 +- + arch/sh/kernel/cpu/sh2a/setup-mxg.c | 3 +- + arch/sh/kernel/cpu/sh2a/setup-sh7201.c | 3 +- + arch/sh/kernel/cpu/sh2a/setup-sh7203.c | 3 +- + arch/sh/kernel/cpu/sh2a/setup-sh7206.c | 3 +- + arch/sh/kernel/cpu/sh2a/setup-sh7264.c | 3 +- + arch/sh/kernel/cpu/sh2a/setup-sh7269.c | 3 +- + arch/sh/kernel/cpu/sh3/setup-sh3.c | 1 + + arch/sh/kernel/cpu/sh3/setup-sh7705.c | 3 +- + arch/sh/kernel/cpu/sh3/setup-sh770x.c | 3 +- + arch/sh/kernel/cpu/sh3/setup-sh7710.c | 3 +- + arch/sh/kernel/cpu/sh3/setup-sh7720.c | 3 +- + arch/sh/kernel/cpu/sh4/setup-sh4-202.c | 3 +- + arch/sh/kernel/cpu/sh4/setup-sh7750.c | 9 +- + arch/sh/kernel/cpu/sh4/setup-sh7760.c | 3 +- + arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 3 +- + arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 3 +- + arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 3 +- + arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 3 +- + arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 3 +- + arch/sh/kernel/cpu/sh4a/setup-sh7734.c | 3 +- + arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 3 +- + arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 3 +- + arch/sh/kernel/cpu/sh4a/setup-sh7770.c | 3 +- + arch/sh/kernel/cpu/sh4a/setup-sh7780.c | 3 +- + arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 3 +- + arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 3 +- + arch/sh/kernel/cpu/sh4a/setup-shx3.c | 3 +- + arch/sh/kernel/cpu/sh5/setup-sh5.c | 3 +- + arch/sh/kernel/setup.c | 3 +- + arch/sh/kernel/time.c | 5 +- + drivers/base/core.c | 245 +++++++++++++++- + drivers/base/firmware_loader/main.c | 3 +- + drivers/base/platform.c | 335 ++-------------------- + drivers/base/soc.c | 30 +- + drivers/clocksource/sh_cmt.c | 13 +- + drivers/clocksource/sh_mtu2.c | 13 +- + drivers/clocksource/sh_tmu.c | 14 +- + drivers/infiniband/hw/mlx5/main.c | 62 +--- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 9 +- + drivers/mmc/host/atmel-mci.c | 10 +- + drivers/mmc/host/dw_mmc.c | 10 +- + drivers/ntb/test/ntb_pingpong.c | 5 +- + drivers/of/platform.c | 12 + + drivers/of/property.c | 254 +++++++++++++++++ + drivers/tty/serial/sh-sci.c | 11 +- + fs/debugfs/file.c | 87 ++---- + include/linux/debugfs.h | 131 ++++----- + include/linux/device.h | 31 ++ + include/linux/fwnode.h | 41 +++ + include/linux/platform_device.h | 64 +---- + include/linux/sys_soc.h | 1 + + 63 files changed, 1339 insertions(+), 711 deletions(-) + create mode 100644 arch/sh/drivers/platform_early.c + create mode 100644 arch/sh/include/asm/platform_early.h +Merging usb/usb-next (16c8373ecf7b Merge 5.4-rc6 into usb-next) +$ git merge usb/usb-next +Auto-merging drivers/usb/core/hub.c +Auto-merging drivers/usb/core/devio.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/dma/renesas,usb-dmac.txt | 1 + + .../devicetree/bindings/phy/rcar-gen3-phy-usb2.txt | 2 + + .../devicetree/bindings/phy/rcar-gen3-phy-usb3.txt | 2 + + .../devicetree/bindings/usb/renesas,usb3-peri.txt | 24 ++ + .../devicetree/bindings/usb/renesas,usbhs.txt | 1 + + .../devicetree/bindings/usb/ti,hd3ss3220.txt | 38 +++ + Documentation/devicetree/bindings/usb/usb-xhci.txt | 1 + + Documentation/devicetree/bindings/usb/usb251xb.txt | 1 + + drivers/usb/chipidea/ci_hdrc_tegra.c | 22 +- + drivers/usb/core/config.c | 12 +- + drivers/usb/core/devio.c | 19 +- + drivers/usb/core/hub.c | 196 +++++++++------- + drivers/usb/dwc3/Kconfig | 4 +- + drivers/usb/gadget/legacy/Kconfig | 20 +- + drivers/usb/gadget/legacy/acm_ms.c | 3 - + drivers/usb/gadget/legacy/mass_storage.c | 3 - + drivers/usb/gadget/udc/Kconfig | 2 +- + drivers/usb/gadget/udc/at91_udc.c | 4 +- + drivers/usb/gadget/udc/bcm63xx_udc.c | 7 +- + drivers/usb/gadget/udc/bdc/bdc_core.c | 4 +- + drivers/usb/gadget/udc/bdc/bdc_udc.c | 2 +- + drivers/usb/gadget/udc/gr_udc.c | 4 +- + drivers/usb/gadget/udc/pxa25x_udc.c | 4 +- + drivers/usb/gadget/udc/pxa27x_udc.c | 4 +- + drivers/usb/gadget/udc/r8a66597-udc.c | 5 +- + drivers/usb/gadget/udc/renesas_usb3.c | 4 +- + drivers/usb/gadget/udc/s3c-hsudc.c | 5 +- + drivers/usb/host/Kconfig | 68 +++--- + drivers/usb/host/isp1362-hcd.c | 5 +- + drivers/usb/host/ohci-at91.c | 8 +- + drivers/usb/host/u132-hcd.c | 2 +- + drivers/usb/host/xhci-tegra.c | 101 ++++++-- + drivers/usb/image/microtek.c | 3 +- + drivers/usb/isp1760/isp1760-hcd.c | 2 - + drivers/usb/misc/Kconfig | 8 +- + drivers/usb/misc/ftdi-elan.c | 6 +- + drivers/usb/misc/sisusbvga/Kconfig | 2 +- + drivers/usb/misc/usb251xb.c | 49 +++- + drivers/usb/mtu3/mtu3_gadget_ep0.c | 35 ++- + drivers/usb/musb/musb_core.c | 4 +- + drivers/usb/musb/musb_gadget.c | 3 +- + drivers/usb/phy/phy-keystone.c | 4 +- + drivers/usb/phy/phy-mxs-usb.c | 4 +- + drivers/usb/renesas_usbhs/common.c | 5 +- + drivers/usb/renesas_usbhs/common.h | 3 +- + drivers/usb/renesas_usbhs/mod.c | 19 +- + drivers/usb/renesas_usbhs/mod_gadget.c | 12 +- + drivers/usb/serial/Kconfig | 44 ++-- + drivers/usb/storage/scsiglue.c | 4 +- + drivers/usb/typec/Kconfig | 11 + + drivers/usb/typec/Makefile | 1 + + drivers/usb/typec/hd3ss3220.c | 261 +++++++++++++++++++++ + drivers/usb/usbip/stub_tx.c | 2 +- + 53 files changed, 743 insertions(+), 317 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/ti,hd3ss3220.txt + create mode 100644 drivers/usb/typec/hd3ss3220.c +Merging usb-gadget/next (726b4fba94be usb: dwc3: of-simple: add a shutdown) +$ git merge usb-gadget/next +Auto-merging drivers/usb/renesas_usbhs/mod_gadget.c +Auto-merging drivers/usb/renesas_usbhs/common.c +Auto-merging drivers/usb/gadget/udc/renesas_usb3.c +Auto-merging drivers/usb/gadget/udc/lpc32xx_udc.c +Auto-merging drivers/usb/gadget/udc/fsl_udc_core.c +Auto-merging drivers/usb/gadget/udc/Kconfig +Auto-merging drivers/usb/gadget/composite.c +Auto-merging drivers/usb/dwc3/core.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/usb/ti,j721e-usb.yaml | 86 + + drivers/phy/renesas/phy-rcar-gen3-usb2.c | 2 +- + drivers/usb/cdns3/Kconfig | 10 + + drivers/usb/cdns3/Makefile | 1 + + drivers/usb/cdns3/cdns3-ti.c | 236 ++ + drivers/usb/dwc2/core.c | 2 +- + drivers/usb/dwc3/core.c | 37 + + drivers/usb/dwc3/debug.h | 4 +- + drivers/usb/dwc3/dwc3-of-simple.c | 28 +- + drivers/usb/gadget/composite.c | 6 +- + drivers/usb/gadget/function/f_acm.c | 21 + + drivers/usb/gadget/function/f_obex.c | 2 +- + drivers/usb/gadget/function/f_serial.c | 21 + + drivers/usb/gadget/function/f_tcm.c | 13 +- + drivers/usb/gadget/function/u_serial.c | 516 +-- + drivers/usb/gadget/function/u_serial.h | 8 + + drivers/usb/gadget/legacy/serial.c | 49 +- + drivers/usb/gadget/udc/Kconfig | 11 + + drivers/usb/gadget/udc/Makefile | 1 + + drivers/usb/gadget/udc/dummy_hcd.c | 10 +- + drivers/usb/gadget/udc/fsl_udc_core.c | 10 +- + drivers/usb/gadget/udc/lpc32xx_udc.c | 6 +- + drivers/usb/gadget/udc/renesas_usb3.c | 15 + + drivers/usb/gadget/udc/tegra-xudc.c | 3810 ++++++++++++++++++++ + 24 files changed, 4618 insertions(+), 287 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/ti,j721e-usb.yaml + create mode 100644 drivers/usb/cdns3/cdns3-ti.c + create mode 100644 drivers/usb/gadget/udc/tegra-xudc.c +Merging usb-serial/usb-next (35714565089e USB: serial: ch341: reimplement line-speed handling) +$ git merge usb-serial/usb-next +Merge made by the 'recursive' strategy. + drivers/usb/serial/ch341.c | 97 ++++++++++++++++++++++++++-------- + drivers/usb/serial/pl2303.c | 124 ++++++++++++++++++++++++++++++++++++-------- + drivers/usb/serial/pl2303.h | 6 +++ + 3 files changed, 182 insertions(+), 45 deletions(-) +Merging usb-chipidea-next/ci-for-usb-next (973ce009b308 usb: chipidea: imx: check data->usbmisc_data against NULL before access) +$ git merge usb-chipidea-next/ci-for-usb-next +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/ci_hdrc_imx.c | 10 ++++++ + drivers/usb/chipidea/ci_hdrc_imx.h | 2 ++ + drivers/usb/chipidea/core.c | 2 +- + drivers/usb/chipidea/udc.c | 73 ++++++++++++++++++++------------------ + drivers/usb/chipidea/usbmisc_imx.c | 31 +++++++++++----- + 5 files changed, 74 insertions(+), 44 deletions(-) +Merging phy-next/next (4569e64ab6a5 phy: phy-rockchip-inno-usb2: add phy description for px30) +$ git merge phy-next/next +Auto-merging drivers/phy/renesas/phy-rcar-gen3-usb2.c +Merge made by the 'recursive' strategy. + .../bindings/phy/allwinner,sun50i-h6-usb3-phy.yaml | 47 ++ + .../bindings/phy/phy-rockchip-inno-usb2.txt | 1 + + .../devicetree/bindings/phy/qcom-qmp-phy.txt | 7 +- + .../bindings/phy/rockchip,px30-dsi-dphy.yaml | 75 ++ + drivers/phy/allwinner/Kconfig | 11 + + drivers/phy/allwinner/Makefile | 1 + + drivers/phy/allwinner/phy-sun50i-usb3.c | 190 +++++ + drivers/phy/broadcom/phy-brcm-usb-init.c | 10 +- + drivers/phy/hisilicon/phy-hisi-inno-usb2.c | 4 +- + drivers/phy/hisilicon/phy-histb-combphy.c | 4 +- + drivers/phy/lantiq/phy-lantiq-vrx200-pcie.c | 3 +- + drivers/phy/marvell/phy-mvebu-a3700-utmi.c | 9 +- + drivers/phy/phy-xgene.c | 2 +- + drivers/phy/qualcomm/phy-qcom-qmp.c | 120 +++ + drivers/phy/qualcomm/phy-qcom-qmp.h | 96 +++ + drivers/phy/qualcomm/phy-qcom-usb-hs.c | 7 +- + drivers/phy/renesas/phy-rcar-gen2.c | 5 +- + drivers/phy/renesas/phy-rcar-gen3-usb2.c | 5 +- + drivers/phy/rockchip/Kconfig | 8 + + drivers/phy/rockchip/Makefile | 1 + + drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c | 805 +++++++++++++++++++++ + drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 1 + + drivers/phy/tegra/xusb-tegra186.c | 23 + + drivers/phy/tegra/xusb-tegra210.c | 137 +++- + drivers/phy/tegra/xusb.c | 93 ++- + drivers/phy/tegra/xusb.h | 4 + + drivers/phy/ti/phy-dm816x-usb.c | 3 - + drivers/phy/ti/phy-gmii-sel.c | 2 +- + include/linux/phy/phy.h | 3 +- + include/linux/phy/tegra/xusb.h | 4 +- + 30 files changed, 1640 insertions(+), 41 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/allwinner,sun50i-h6-usb3-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/rockchip,px30-dsi-dphy.yaml + create mode 100644 drivers/phy/allwinner/phy-sun50i-usb3.c + create mode 100644 drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c +Merging tty/tty-next (c2a552197106 Merge 5.4-rc5 into tty-next) +$ git merge tty/tty-next +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 + + arch/arm/boot/dts/aspeed-g5.dtsi | 1 + + drivers/tty/hvc/hvc_dcc.c | 28 ++++++ + drivers/tty/n_gsm.c | 1 + + drivers/tty/serdev/core.c | 111 ++++++++++++++++++--- + drivers/tty/serial/8250/8250_aspeed_vuart.c | 84 ++++++++++++++++ + drivers/tty/serial/8250/8250_dw.c | 75 ++++++-------- + drivers/tty/serial/8250/8250_exar.c | 19 ++++ + drivers/tty/serial/8250/8250_lpss.c | 21 ++-- + drivers/tty/serial/8250/8250_of.c | 31 ++++++ + drivers/tty/serial/8250/8250_port.c | 14 --- + drivers/tty/serial/8250/Kconfig | 1 + + drivers/tty/serial/Kconfig | 8 +- + drivers/tty/serial/amba-pl011.c | 4 - + drivers/tty/serial/fsl_linflexuart.c | 4 +- + drivers/tty/serial/imx.c | 5 +- + drivers/tty/serial/qcom_geni_serial.c | 68 +++++++++++-- + drivers/tty/serial/sirfsoc_uart.h | 5 +- + drivers/tty/serial/sprd_serial.c | 33 ++++++ + drivers/tty/tty_ldisc.c | 7 +- + include/uapi/linux/serial_core.h | 2 +- + 23 files changed, 424 insertions(+), 116 deletions(-) +Merging char-misc/char-misc-next (891e60368ba1 drivers: mcb: use symbol namespaces) +$ git merge char-misc/char-misc-next +Auto-merging samples/Makefile +CONFLICT (content): Merge conflict in samples/Makefile +Auto-merging samples/Kconfig +CONFLICT (content): Merge conflict in samples/Kconfig +Auto-merging drivers/misc/Kconfig +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 a9a412803045] Merge remote-tracking branch 'char-misc/char-misc-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-mei | 2 +- + drivers/android/binder.c | 6 +- + drivers/android/binder_alloc.c | 1 - + drivers/gpio/gpio-menz127.c | 1 + + drivers/greybus/connection.c | 3 - + drivers/iio/adc/men_z188_adc.c | 1 + + drivers/mcb/mcb-core.c | 28 ++--- + drivers/mcb/mcb-lpc.c | 1 + + drivers/mcb/mcb-parse.c | 2 +- + drivers/mcb/mcb-pci.c | 1 + + drivers/misc/Kconfig | 1 - + drivers/misc/atmel_tclib.c | 4 +- + drivers/misc/cardreader/rts5260.c | 3 +- + drivers/misc/eeprom/eeprom.c | 4 + + drivers/misc/fastrpc.c | 209 ++++++++++++++++++++++++++++++-- + drivers/misc/hpilo.h | 2 +- + drivers/misc/ibmvmc.h | 4 +- + drivers/misc/lis3lv02d/lis3lv02d.c | 80 ++++++------ + drivers/misc/lis3lv02d/lis3lv02d.h | 4 +- + drivers/misc/mei/bus-fixup.c | 9 -- + drivers/misc/mei/hw-me.c | 2 +- + drivers/misc/mic/Kconfig | 16 --- + drivers/misc/ocxl/ocxl_internal.h | 2 +- + drivers/misc/ocxl/trace.h | 2 +- + drivers/misc/sgi-gru/gruprocfs.c | 11 +- + drivers/misc/ti-st/st_core.c | 4 +- + drivers/platform/goldfish/Kconfig | 3 +- + drivers/tty/serial/8250/8250_men_mcb.c | 1 + + drivers/tty/serial/men_z135_uart.c | 1 + + drivers/w1/masters/sgi_w1.c | 4 +- + drivers/watchdog/menz69_wdt.c | 1 + + include/uapi/misc/fastrpc.h | 15 +++ + samples/Kconfig | 6 + + samples/Makefile | 1 + + samples/mei/Makefile | 12 +- + 35 files changed, 316 insertions(+), 131 deletions(-) +Merging extcon/extcon-next (ddd1bbbae486 extcon: sm5502: remove redundant assignment to variable cable_type) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-intel-cht-wc.c | 16 ++++++++++++++-- + drivers/extcon/extcon-sm5502.c | 6 +++++- + drivers/extcon/extcon-sm5502.h | 2 ++ + 3 files changed, 21 insertions(+), 3 deletions(-) +Merging soundwire/next (3ccb8551f52e soundwire: cadence_master: make clock stop exit configurable on init) +$ git merge soundwire/next +Auto-merging drivers/soundwire/intel.c +Auto-merging drivers/soundwire/Kconfig +Merge made by the 'recursive' strategy. + drivers/soundwire/Kconfig | 2 +- + drivers/soundwire/cadence_master.c | 292 +++++++++++++++++-------------------- + drivers/soundwire/cadence_master.h | 39 ++--- + drivers/soundwire/intel.c | 191 +++++++----------------- + drivers/soundwire/intel_init.c | 1 + + include/linux/soundwire/sdw.h | 3 - + 6 files changed, 203 insertions(+), 325 deletions(-) +Merging thunderbolt/next (354a7a7716ed thunderbolt: Do not start firmware unless asked by the user) +$ git merge thunderbolt/next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-thunderbolt | 36 ++ + drivers/thunderbolt/cap.c | 6 +- + drivers/thunderbolt/ctl.c | 8 +- + drivers/thunderbolt/eeprom.c | 11 - + drivers/thunderbolt/icm.c | 157 ++++--- + drivers/thunderbolt/lc.c | 193 ++++++++- + drivers/thunderbolt/path.c | 52 ++- + drivers/thunderbolt/switch.c | 532 +++++++++++++++++++++--- + drivers/thunderbolt/tb.c | 340 ++++++++++++--- + drivers/thunderbolt/tb.h | 81 +++- + drivers/thunderbolt/tb_msgs.h | 2 + + drivers/thunderbolt/tb_regs.h | 97 +++-- + drivers/thunderbolt/tunnel.c | 364 +++++++++++++++- + drivers/thunderbolt/tunnel.h | 10 +- + drivers/thunderbolt/xdomain.c | 5 +- + 15 files changed, 1628 insertions(+), 266 deletions(-) +Merging staging/staging-next (6647e4e84501 staging: exfat: Ensure we unlock upon error in ffsReadFile) +$ git merge staging/staging-next +Auto-merging drivers/staging/Makefile +CONFLICT (content): Merge conflict in drivers/staging/Makefile +Auto-merging drivers/staging/Kconfig +CONFLICT (content): Merge conflict in drivers/staging/Kconfig +Auto-merging drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c +Auto-merging drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h +Auto-merging drivers/iio/imu/inv_mpu6050/inv_mpu_core.c +Auto-merging drivers/iio/adc/stm32-adc.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.txt +Removing Documentation/devicetree/bindings/iio/light/bh1750.txt +Removing Documentation/devicetree/bindings/iio/adc/max1027-adc.txt +Recorded preimage for 'drivers/staging/Kconfig' +Recorded preimage for 'drivers/staging/Makefile' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/staging/Kconfig'. +Recorded resolution for 'drivers/staging/Makefile'. +[master 0f8301935c1d] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-iio-adc-ad7192 | 39 + + .../devicetree/bindings/counter/ti-eqep.yaml | 50 + + .../devicetree/bindings/iio/adc/ingenic,adc.txt | 1 + + .../devicetree/bindings/iio/adc/max1027-adc.txt | 20 - + .../devicetree/bindings/iio/iio-bindings.txt | 5 + + .../devicetree/bindings/iio/imu/nxp,fxos8700.yaml | 76 + + .../devicetree/bindings/iio/imu/st_lsm6dsx.txt | 3 + + .../devicetree/bindings/iio/light/adux1020.yaml | 47 + + .../devicetree/bindings/iio/light/bh1750.txt | 18 - + .../devicetree/bindings/iio/light/bh1750.yaml | 43 + + .../bindings/iio/proximity/maxbotix,mb1232.txt | 29 - + .../bindings/iio/proximity/maxbotix,mb1232.yaml | 60 + + .../bindings/iio/temperature/adi,ltc2983.yaml | 480 ++++++ + .../devicetree/bindings/trivial-devices.yaml | 12 + + Documentation/driver-api/generic-counter.rst | 162 +- + MAINTAINERS | 34 + + drivers/bus/Kconfig | 9 + + drivers/bus/Makefile | 1 + + drivers/{pwm/pwm-tipwmss.c => bus/ti-pwmss.c} | 0 + drivers/counter/104-quad-8.c | 33 +- + drivers/counter/Kconfig | 11 + + drivers/counter/Makefile | 1 + + drivers/counter/counter.c | 101 +- + drivers/counter/ftm-quaddec.c | 14 +- + drivers/counter/stm32-lptimer-cnt.c | 7 +- + drivers/counter/stm32-timer-cnt.c | 23 +- + drivers/counter/ti-eqep.c | 466 ++++++ + drivers/iio/accel/st_accel_core.c | 1 - + drivers/iio/adc/Kconfig | 15 +- + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/ad7949.c | 33 +- + drivers/iio/adc/ad_sigma_delta.c | 3 +- + drivers/iio/adc/at91-sama5d2_adc.c | 4 +- + drivers/iio/adc/cpcap-adc.c | 2 +- + drivers/iio/adc/exynos_adc.c | 6 +- + drivers/iio/adc/hx711.c | 22 +- + drivers/iio/adc/ingenic-adc.c | 149 +- + drivers/iio/adc/intel_mrfld_adc.c | 262 ++++ + drivers/iio/adc/max1027.c | 180 ++- + drivers/iio/adc/mcp320x.c | 2 +- + drivers/iio/adc/meson_saradc.c | 4 +- + drivers/iio/adc/sc27xx_adc.c | 16 +- + drivers/iio/adc/stm32-adc-core.c | 11 +- + drivers/iio/adc/stm32-adc.c | 21 +- + drivers/iio/adc/stmpe-adc.c | 2 +- + drivers/iio/adc/twl4030-madc.c | 18 +- + drivers/iio/adc/xilinx-xadc-core.c | 4 +- + drivers/iio/chemical/atlas-ph-sensor.c | 8 +- + drivers/iio/chemical/sgp30.c | 2 +- + drivers/iio/chemical/sps30.c | 2 +- + drivers/iio/dac/ad7303.c | 13 +- + drivers/iio/dac/stm32-dac-core.c | 138 +- + drivers/iio/dac/stm32-dac.c | 94 +- + drivers/iio/gyro/adis16080.c | 8 +- + drivers/iio/gyro/adis16130.c | 2 - + drivers/iio/gyro/itg3200_core.c | 2 +- + drivers/iio/gyro/mpu3050-core.c | 2 +- + drivers/iio/gyro/st_gyro_core.c | 1 - + drivers/iio/imu/Kconfig | 27 + + drivers/iio/imu/Makefile | 5 + + drivers/iio/imu/fxos8700.h | 10 + + drivers/iio/imu/fxos8700_core.c | 649 ++++++++ + drivers/iio/imu/fxos8700_i2c.c | 71 + + drivers/iio/imu/fxos8700_spi.c | 59 + + drivers/iio/imu/inv_mpu6050/Makefile | 7 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_aux.c | 204 +++ + drivers/iio/imu/inv_mpu6050/inv_mpu_aux.h | 19 + + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 152 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 60 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 70 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_magn.c | 356 +++++ + drivers/iio/imu/inv_mpu6050/inv_mpu_magn.h | 36 + + drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c | 11 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 86 +- + drivers/iio/imu/st_lsm6dsx/Kconfig | 3 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 79 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 100 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 821 +++++++++- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 10 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 10 + + drivers/iio/industrialio-core.c | 17 + + drivers/iio/light/Kconfig | 11 + + drivers/iio/light/Makefile | 1 + + drivers/iio/light/adux1020.c | 849 ++++++++++ + drivers/iio/light/bh1750.c | 4 +- + drivers/iio/light/cm36651.c | 2 +- + drivers/iio/light/tcs3414.c | 30 +- + drivers/iio/magnetometer/st_magn_core.c | 1 - + drivers/iio/pressure/bmp280-core.c | 130 +- + drivers/iio/pressure/bmp280-i2c.c | 6 - + drivers/iio/pressure/bmp280-spi.c | 6 - + drivers/iio/pressure/bmp280.h | 1 - + drivers/iio/pressure/st_pressure_core.c | 1 - + drivers/iio/pressure/zpa2326.c | 16 +- + drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 5 +- + drivers/iio/proximity/sx9500.c | 16 +- + drivers/iio/temperature/Kconfig | 11 + + drivers/iio/temperature/Makefile | 1 + + drivers/iio/temperature/ltc2983.c | 1557 +++++++++++++++++++ + drivers/iio/temperature/max31856.c | 2 + + drivers/iio/temperature/maxim_thermocouple.c | 2 +- + drivers/pwm/Kconfig | 9 - + drivers/pwm/Makefile | 1 - + drivers/staging/Kconfig | 2 + + drivers/staging/Makefile | 1 + + drivers/staging/axis-fifo/axis-fifo.c | 301 +--- + drivers/staging/axis-fifo/axis-fifo.txt | 18 +- + drivers/staging/board/armadillo800eva.c | 12 +- + .../clocking-wizard/clk-xlnx-clock-wizard.c | 4 +- + drivers/staging/comedi/drivers/dt3000.c | 3 +- + drivers/staging/comedi/drivers/ni_routes.c | 2 - + drivers/staging/emxx_udc/emxx_udc.c | 27 +- + drivers/staging/exfat/TODO | 9 + + drivers/staging/exfat/exfat.h | 10 +- + drivers/staging/exfat/exfat_cache.c | 48 +- + drivers/staging/exfat/exfat_core.c | 87 +- + drivers/staging/exfat/exfat_super.c | 340 ++-- + drivers/staging/fbtft/Kconfig | 7 + + drivers/staging/fbtft/Makefile | 1 + + drivers/staging/fbtft/fb_seps525.c | 213 +++ + drivers/staging/fbtft/fb_uc1611.c | 22 +- + drivers/staging/fbtft/fbtft-core.c | 2 +- + drivers/staging/fieldbus/anybuss/anybuss-client.h | 11 +- + drivers/staging/fieldbus/anybuss/arcx-anybus.c | 8 +- + drivers/staging/fieldbus/anybuss/hms-profinet.c | 2 +- + drivers/staging/fieldbus/anybuss/host.c | 6 +- + drivers/staging/fieldbus/dev_core.c | 3 - + drivers/staging/fieldbus/fieldbus_dev.h | 6 + + drivers/staging/gasket/gasket_ioctl.c | 16 +- + drivers/staging/iio/accel/adis16240.c | 1 - + drivers/staging/iio/adc/ad7192.c | 79 +- + drivers/staging/iio/frequency/ad9834.c | 4 + + drivers/staging/isdn/avm/b1.c | 41 +- + drivers/staging/isdn/gigaset/interface.c | 2 +- + drivers/staging/kpc2000/kpc2000_i2c.c | 204 ++- + drivers/staging/kpc2000/kpc2000_spi.c | 24 +- + drivers/staging/media/allegro-dvt/nal-h264.c | 2 +- + drivers/staging/most/configfs.c | 2 +- + drivers/staging/mt7621-dma/mtk-hsdma.c | 14 +- + drivers/staging/mt7621-pci/pci-mt7621.c | 23 +- + drivers/staging/netlogic/TODO | 2 +- + drivers/staging/netlogic/xlr_net.c | 3 +- + drivers/staging/octeon-usb/octeon-hcd.c | 3 +- + drivers/staging/octeon/ethernet-mdio.c | 6 +- + drivers/staging/octeon/ethernet-rgmii.c | 4 +- + drivers/staging/octeon/ethernet-rx.c | 6 +- + drivers/staging/octeon/ethernet-tx.c | 6 +- + drivers/staging/octeon/ethernet.c | 6 +- + drivers/staging/octeon/octeon-ethernet.h | 4 +- + drivers/staging/octeon/octeon-stubs.h | 73 +- + drivers/staging/olpc_dcon/Kconfig | 21 +- + drivers/staging/olpc_dcon/Makefile | 4 +- + drivers/staging/olpc_dcon/TODO | 1 - + drivers/staging/olpc_dcon/olpc_dcon.c | 6 +- + drivers/staging/olpc_dcon/olpc_dcon.h | 5 - + drivers/staging/qlge/TODO | 3 - + drivers/staging/qlge/qlge.h | 145 +- + drivers/staging/qlge/qlge_dbg.c | 287 ++-- + drivers/staging/qlge/qlge_main.c | 891 +++++------ + drivers/staging/qlge/qlge_mpi.c | 1 - + drivers/staging/ralink-gdma/ralink-gdma.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_ap.c | 43 +- + drivers/staging/rtl8188eu/core/rtw_efuse.c | 5 +- + drivers/staging/rtl8188eu/core/rtw_mlme.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 167 +- + drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 26 +- + drivers/staging/rtl8188eu/core/rtw_xmit.c | 4 +- + drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 55 +- + drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 1 - + drivers/staging/rtl8188eu/include/rtw_efuse.h | 1 - + drivers/staging/rtl8188eu/include/sta_info.h | 2 +- + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 30 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 4 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 4 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 8 +- + drivers/staging/rtl8192u/r8190_rtl8256.c | 4 +- + drivers/staging/rtl8192u/r8192U_core.c | 127 +- + drivers/staging/rtl8712/rtl8712_led.c | 2 +- + drivers/staging/rtl8712/rtl8712_recv.c | 40 +- + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 8 +- + drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 103 +- + drivers/staging/rtl8723bs/core/rtw_ap.c | 11 +- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 20 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 174 +-- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 23 +- + drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 1 - + drivers/staging/rtl8723bs/core/rtw_recv.c | 9 +- + drivers/staging/rtl8723bs/core/rtw_security.c | 145 +- + drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 3 - + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 19 +- + drivers/staging/rtl8723bs/core/rtw_xmit.c | 92 +- + drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 2 - + drivers/staging/rtl8723bs/hal/hal_btcoex.c | 2 +- + drivers/staging/rtl8723bs/hal/hal_com.c | 1 - + drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 1076 ------------- + drivers/staging/rtl8723bs/hal/odm_DIG.c | 1 - + drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 6 +- + drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 77 +- + drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c | 41 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 2 - + drivers/staging/rtl8723bs/hal/sdio_ops.c | 125 +- + drivers/staging/rtl8723bs/include/drv_types.h | 4 - + drivers/staging/rtl8723bs/include/hal_com_phycfg.h | 26 - + drivers/staging/rtl8723bs/include/hal_data.h | 21 - + drivers/staging/rtl8723bs/include/osdep_service.h | 4 - + .../rtl8723bs/include/osdep_service_linux.h | 7 - + drivers/staging/rtl8723bs/include/rtl8723b_hal.h | 15 - + drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 1 - + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 31 +- + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 59 +- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 23 +- + drivers/staging/rtl8723bs/os_dep/osdep_service.c | 136 -- + drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 1 - + drivers/staging/rts5208/ms.c | 86 +- + drivers/staging/rts5208/ms.h | 70 +- + drivers/staging/rts5208/rtsx.c | 3 +- + drivers/staging/rts5208/rtsx_transport.c | 4 +- + drivers/staging/rts5208/sd.h | 2 +- + drivers/staging/rts5208/xd.c | 8 +- + drivers/staging/rts5208/xd.h | 6 +- + drivers/staging/sm750fb/ddk750_chip.c | 41 +- + drivers/staging/sm750fb/ddk750_chip.h | 18 +- + drivers/staging/sm750fb/ddk750_display.c | 4 +- + drivers/staging/sm750fb/ddk750_mode.c | 16 +- + drivers/staging/sm750fb/ddk750_sii164.c | 28 +- + drivers/staging/sm750fb/ddk750_sii164.h | 11 +- + drivers/staging/sm750fb/sm750_accel.c | 94 +- + drivers/staging/sm750fb/sm750_accel.h | 83 +- + drivers/staging/sm750fb/sm750_cursor.h | 17 +- + drivers/staging/uwb/rsv.c | 4 +- + .../vc04_services/bcm2835-audio/bcm2835-vchiq.c | 5 +- + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 4 +- + .../vc04_services/bcm2835-camera/mmal-vchiq.c | 2 +- + .../staging/vc04_services/interface/vchi/vchi.h | 46 +- + .../vc04_services/interface/vchi/vchi_cfg.h | 172 +- + .../vc04_services/interface/vchi/vchi_common.h | 24 +- + .../interface/vchiq_arm/vchiq_2835_arm.c | 8 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 30 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 11 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 4 +- + .../vc04_services/interface/vchiq_arm/vchiq_if.h | 6 +- + .../interface/vchiq_arm/vchiq_ioctl.h | 2 +- + .../vc04_services/interface/vchiq_arm/vchiq_shim.c | 54 +- + drivers/staging/vt6655/card.c | 24 +- + drivers/staging/vt6655/card.h | 2 +- + drivers/staging/vt6655/device_main.c | 14 +- + drivers/staging/vt6655/power.c | 10 +- + drivers/staging/vt6655/rf.c | 5 +- + drivers/staging/vt6655/rf.h | 19 +- + drivers/staging/vt6655/rxtx.c | 5 +- + drivers/staging/vt6656/main_usb.c | 9 +- + drivers/staging/vt6656/rxtx.c | 8 +- + .../bindings/net/wireless/siliabs,wfx.txt | 97 ++ + drivers/staging/wfx/Kconfig | 8 + + drivers/staging/wfx/Makefile | 24 + + drivers/staging/wfx/TODO | 17 + + drivers/staging/wfx/bh.c | 321 ++++ + drivers/staging/wfx/bh.h | 32 + + drivers/staging/wfx/bus.h | 36 + + drivers/staging/wfx/bus_sdio.c | 269 ++++ + drivers/staging/wfx/bus_spi.c | 267 ++++ + drivers/staging/wfx/data_rx.c | 213 +++ + drivers/staging/wfx/data_rx.h | 18 + + drivers/staging/wfx/data_tx.c | 837 ++++++++++ + drivers/staging/wfx/data_tx.h | 93 ++ + drivers/staging/wfx/debug.c | 306 ++++ + drivers/staging/wfx/debug.h | 19 + + drivers/staging/wfx/fwio.c | 388 +++++ + drivers/staging/wfx/fwio.h | 15 + + drivers/staging/wfx/hif_api_cmd.h | 681 ++++++++ + drivers/staging/wfx/hif_api_general.h | 437 ++++++ + drivers/staging/wfx/hif_api_mib.h | 558 +++++++ + drivers/staging/wfx/hif_rx.c | 336 ++++ + drivers/staging/wfx/hif_rx.h | 18 + + drivers/staging/wfx/hif_tx.c | 470 ++++++ + drivers/staging/wfx/hif_tx.h | 67 + + drivers/staging/wfx/hif_tx_mib.h | 290 ++++ + drivers/staging/wfx/hwio.c | 338 ++++ + drivers/staging/wfx/hwio.h | 75 + + drivers/staging/wfx/key.c | 258 +++ + drivers/staging/wfx/key.h | 22 + + drivers/staging/wfx/main.c | 470 ++++++ + drivers/staging/wfx/main.h | 47 + + drivers/staging/wfx/queue.c | 608 ++++++++ + drivers/staging/wfx/queue.h | 59 + + drivers/staging/wfx/scan.c | 289 ++++ + drivers/staging/wfx/scan.h | 42 + + drivers/staging/wfx/secure_link.h | 55 + + drivers/staging/wfx/sta.c | 1639 ++++++++++++++++++++ + drivers/staging/wfx/sta.h | 101 ++ + drivers/staging/wfx/traces.h | 434 ++++++ + drivers/staging/wfx/wfx.h | 206 +++ + drivers/staging/wilc1000/wilc_hif.c | 10 +- + drivers/staging/wilc1000/wilc_netdev.c | 142 +- + drivers/staging/wilc1000/wilc_spi.c | 11 + + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 244 +-- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.h | 2 + + drivers/staging/wilc1000/wilc_wfi_netdevice.h | 5 +- + drivers/staging/wlan-ng/hfa384x.h | 18 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 2 - + drivers/staging/wlan-ng/p80211wep.c | 64 +- + drivers/staging/wlan-ng/prism2usb.c | 6 +- + include/dt-bindings/iio/adc/ingenic,adc.h | 1 + + include/linux/counter.h | 76 +- + include/linux/iio/adc/ad_sigma_delta.h | 2 + + include/linux/iio/iio.h | 2 + + include/linux/platform_data/st_sensors_pdata.h | 2 + + 309 files changed, 20803 insertions(+), 5340 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-ad7192 + create mode 100644 Documentation/devicetree/bindings/counter/ti-eqep.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/adc/max1027-adc.txt + create mode 100644 Documentation/devicetree/bindings/iio/imu/nxp,fxos8700.yaml + create mode 100644 Documentation/devicetree/bindings/iio/light/adux1020.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/light/bh1750.txt + create mode 100644 Documentation/devicetree/bindings/iio/light/bh1750.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.txt + create mode 100644 Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.yaml + create mode 100644 Documentation/devicetree/bindings/iio/temperature/adi,ltc2983.yaml + rename drivers/{pwm/pwm-tipwmss.c => bus/ti-pwmss.c} (100%) + create mode 100644 drivers/counter/ti-eqep.c + create mode 100644 drivers/iio/adc/intel_mrfld_adc.c + create mode 100644 drivers/iio/imu/fxos8700.h + create mode 100644 drivers/iio/imu/fxos8700_core.c + create mode 100644 drivers/iio/imu/fxos8700_i2c.c + create mode 100644 drivers/iio/imu/fxos8700_spi.c + create mode 100644 drivers/iio/imu/inv_mpu6050/inv_mpu_aux.c + create mode 100644 drivers/iio/imu/inv_mpu6050/inv_mpu_aux.h + create mode 100644 drivers/iio/imu/inv_mpu6050/inv_mpu_magn.c + create mode 100644 drivers/iio/imu/inv_mpu6050/inv_mpu_magn.h + create mode 100644 drivers/iio/light/adux1020.c + create mode 100644 drivers/iio/temperature/ltc2983.c + create mode 100644 drivers/staging/fbtft/fb_seps525.c + create mode 100644 drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/siliabs,wfx.txt + create mode 100644 drivers/staging/wfx/Kconfig + create mode 100644 drivers/staging/wfx/Makefile + create mode 100644 drivers/staging/wfx/TODO + create mode 100644 drivers/staging/wfx/bh.c + create mode 100644 drivers/staging/wfx/bh.h + create mode 100644 drivers/staging/wfx/bus.h + create mode 100644 drivers/staging/wfx/bus_sdio.c + create mode 100644 drivers/staging/wfx/bus_spi.c + create mode 100644 drivers/staging/wfx/data_rx.c + create mode 100644 drivers/staging/wfx/data_rx.h + create mode 100644 drivers/staging/wfx/data_tx.c + create mode 100644 drivers/staging/wfx/data_tx.h + create mode 100644 drivers/staging/wfx/debug.c + create mode 100644 drivers/staging/wfx/debug.h + create mode 100644 drivers/staging/wfx/fwio.c + create mode 100644 drivers/staging/wfx/fwio.h + create mode 100644 drivers/staging/wfx/hif_api_cmd.h + create mode 100644 drivers/staging/wfx/hif_api_general.h + create mode 100644 drivers/staging/wfx/hif_api_mib.h + create mode 100644 drivers/staging/wfx/hif_rx.c + create mode 100644 drivers/staging/wfx/hif_rx.h + create mode 100644 drivers/staging/wfx/hif_tx.c + create mode 100644 drivers/staging/wfx/hif_tx.h + create mode 100644 drivers/staging/wfx/hif_tx_mib.h + create mode 100644 drivers/staging/wfx/hwio.c + create mode 100644 drivers/staging/wfx/hwio.h + create mode 100644 drivers/staging/wfx/key.c + create mode 100644 drivers/staging/wfx/key.h + create mode 100644 drivers/staging/wfx/main.c + create mode 100644 drivers/staging/wfx/main.h + create mode 100644 drivers/staging/wfx/queue.c + create mode 100644 drivers/staging/wfx/queue.h + create mode 100644 drivers/staging/wfx/scan.c + create mode 100644 drivers/staging/wfx/scan.h + create mode 100644 drivers/staging/wfx/secure_link.h + create mode 100644 drivers/staging/wfx/sta.c + create mode 100644 drivers/staging/wfx/sta.h + create mode 100644 drivers/staging/wfx/traces.h + create mode 100644 drivers/staging/wfx/wfx.h +Merging mux/for-next (05fb8284a417 Merge branch 'i2c-mux/for-next' into for-next) +$ git merge mux/for-next +Merge made by the 'recursive' strategy. +Merging icc/icc-next (0bf9146d94a0 docs: driver-api: make interconnect title quieter) +$ git merge icc/icc-next +Merge made by the 'recursive' strategy. + .../bindings/interconnect/qcom,msm8974.yaml | 62 ++ + Documentation/driver-api/interconnect.rst | 2 +- + drivers/interconnect/Kconfig | 2 +- + drivers/interconnect/core.c | 7 +- + drivers/interconnect/qcom/Kconfig | 9 + + drivers/interconnect/qcom/Makefile | 2 + + drivers/interconnect/qcom/msm8974.c | 796 +++++++++++++++++++++ + drivers/interconnect/qcom/qcs404.c | 14 +- + drivers/interconnect/qcom/sdm845.c | 13 +- + include/dt-bindings/interconnect/qcom,msm8974.h | 146 ++++ + 10 files changed, 1043 insertions(+), 10 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,msm8974.yaml + create mode 100644 drivers/interconnect/qcom/msm8974.c + create mode 100644 include/dt-bindings/interconnect/qcom,msm8974.h +Merging slave-dma/next (7208474d1c7a dmaengine: fsl-dpaa2-qdma: Remove unnecessary local variables in DPDMAI_CMD_CREATE macro) +$ git merge slave-dma/next +Auto-merging drivers/dma/xilinx/xilinx_dma.c +Auto-merging drivers/dma/sprd-dma.c +Merge made by the 'recursive' strategy. + .../bindings/dma/milbeaut-m10v-hdmac.txt | 32 + + .../bindings/dma/milbeaut-m10v-xdmac.txt | 24 + + .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 1 + + drivers/dma/Kconfig | 22 + + drivers/dma/Makefile | 3 + + drivers/dma/at_xdmac.c | 7 +- + drivers/dma/dma-jz4780.c | 8 +- + 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 | 8 +- + drivers/dma/k3dma.c | 7 +- + drivers/dma/mediatek/mtk-cqdma.c | 10 +- + drivers/dma/mediatek/mtk-uart-apdma.c | 9 +- + drivers/dma/milbeaut-hdmac.c | 581 +++++++++++++++ + drivers/dma/milbeaut-xdmac.c | 418 +++++++++++ + drivers/dma/owl-dma.c | 7 +- + drivers/dma/sh/rcar-dmac.c | 47 +- + drivers/dma/sprd-dma.c | 4 +- + drivers/dma/ti/edma.c | 12 +- + drivers/dma/uniphier-mdmac.c | 4 +- + drivers/dma/xilinx/xilinx_dma.c | 134 +++- + drivers/dma/zx_dma.c | 7 +- + 28 files changed, 2780 insertions(+), 113 deletions(-) + 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 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 +Merging cgroup/for-next (8c26b3a71bdf Merge branch 'for-5.5' into for-next) +$ git merge cgroup/for-next +Auto-merging kernel/cgroup/cpuset.c +Merge made by the 'recursive' strategy. + include/linux/cgroup.h | 1 - + kernel/cgroup/cgroup-internal.h | 5 +- + kernel/cgroup/cgroup-v1.c | 5 +- + kernel/cgroup/cgroup.c | 244 ++++++++------------------ + kernel/cgroup/cpuset.c | 2 - + kernel/cgroup/pids.c | 11 +- + kernel/signal.c | 2 +- + tools/testing/selftests/cgroup/Makefile | 4 +- + tools/testing/selftests/cgroup/cgroup_util.c | 42 ++++- + tools/testing/selftests/cgroup/cgroup_util.h | 6 +- + tools/testing/selftests/cgroup/test_core.c | 146 +++++++++++++++ + tools/testing/selftests/cgroup/test_freezer.c | 2 +- + tools/testing/selftests/cgroup/test_stress.sh | 4 + + tools/testing/selftests/cgroup/with_stress.sh | 101 +++++++++++ + 14 files changed, 385 insertions(+), 190 deletions(-) + create mode 100755 tools/testing/selftests/cgroup/test_stress.sh + create mode 100755 tools/testing/selftests/cgroup/with_stress.sh +Merging scsi/for-next (4b9029e0a68d Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/scsi_sysfs.c +CONFLICT (content): Merge conflict in drivers/scsi/scsi_sysfs.c +Auto-merging drivers/scsi/scsi.c +Resolved 'drivers/scsi/scsi_sysfs.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 83fc352798b0] Merge remote-tracking branch 'scsi/for-next' +$ git diff -M --stat --summary HEAD^.. + 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/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/arm/acornscsi.c | 4 +- + drivers/scsi/bfa/bfad.c | 3 +- + drivers/scsi/bfa/bfad_attr.c | 4 +- + drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h | 2 +- + drivers/scsi/csiostor/csio_hw.c | 20 +- + drivers/scsi/csiostor/csio_lnode.c | 15 +- + 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/vnic_dev.c | 2 +- + drivers/scsi/hisi_sas/hisi_sas.h | 67 +++- + drivers/scsi/hisi_sas/hisi_sas_main.c | 371 ++++++++++++++------- + 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 | 26 +- + drivers/scsi/ips.c | 2 +- + drivers/scsi/isci/port_config.c | 2 +- + drivers/scsi/isci/remote_device.c | 2 +- + drivers/scsi/lpfc/lpfc.h | 12 +- + drivers/scsi/lpfc/lpfc_attr.c | 126 ++++++- + drivers/scsi/lpfc/lpfc_bsg.c | 18 +- + drivers/scsi/lpfc/lpfc_crtn.h | 1 + + drivers/scsi/lpfc/lpfc_ct.c | 28 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 118 ++++++- + drivers/scsi/lpfc/lpfc_els.c | 34 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 183 ++++++++--- + drivers/scsi/lpfc/lpfc_hw4.h | 21 +- + drivers/scsi/lpfc/lpfc_init.c | 313 ++++++++++++------ + 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 | 145 ++++++-- + drivers/scsi/lpfc/lpfc_nvme.c | 75 +++-- + drivers/scsi/lpfc/lpfc_nvmet.c | 103 ++---- + drivers/scsi/lpfc/lpfc_nvmet.h | 2 - + drivers/scsi/lpfc/lpfc_scsi.c | 45 +-- + drivers/scsi/lpfc/lpfc_sli.c | 189 +++++++---- + drivers/scsi/lpfc/lpfc_sli.h | 3 +- + drivers/scsi/lpfc/lpfc_sli4.h | 2 + + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/megaraid/megaraid_sas.h | 3 + + drivers/scsi/megaraid/megaraid_sas_base.c | 8 +- + drivers/scsi/megaraid/megaraid_sas_fp.c | 7 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 36 +- + drivers/scsi/mpt3sas/mpt3sas_base.h | 15 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 344 ++++++++++++++++--- + drivers/scsi/mpt3sas/mpt3sas_ctl.h | 9 + + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 4 +- + drivers/scsi/mpt3sas/mpt3sas_trigger_diag.c | 12 +- + drivers/scsi/mvsas/mv_sas.c | 2 +- + drivers/scsi/ncr53c8xx.c | 2 +- + drivers/scsi/nsp32.c | 2 +- + drivers/scsi/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 | 26 +- + drivers/scsi/qla2xxx/qla_fw.h | 2 + + drivers/scsi/qla2xxx/qla_gs.c | 64 ++-- + drivers/scsi/qla2xxx/qla_init.c | 64 ++-- + drivers/scsi/qla2xxx/qla_inline.h | 12 + + drivers/scsi/qla2xxx/qla_iocb.c | 95 +++++- + drivers/scsi/qla2xxx/qla_isr.c | 31 +- + drivers/scsi/qla2xxx/qla_mbx.c | 11 +- + drivers/scsi/qla2xxx/qla_os.c | 47 ++- + drivers/scsi/qla2xxx/qla_target.c | 2 +- + drivers/scsi/qla2xxx/qla_tmpl.c | 29 +- + drivers/scsi/qla2xxx/qla_version.h | 2 +- + drivers/scsi/scsi.c | 4 + + drivers/scsi/scsi_logging.c | 10 +- + drivers/scsi/scsi_sysfs.c | 22 +- + drivers/scsi/sd.c | 4 + + drivers/scsi/smartpqi/smartpqi.h | 77 +++-- + drivers/scsi/smartpqi/smartpqi_init.c | 437 ++++++++++++++----------- + drivers/scsi/smartpqi/smartpqi_sas_transport.c | 22 +- + drivers/scsi/ufs/ufs-hisi.c | 5 +- + drivers/scsi/ufs/ufs-mediatek.c | 3 + + drivers/scsi/ufs/ufshcd-dwc.c | 2 +- + drivers/scsi/ufs/ufshcd.c | 9 + + drivers/scsi/ufs/ufshcd.h | 10 + + drivers/target/iscsi/cxgbit/cxgbit_ddp.c | 3 - + drivers/target/iscsi/iscsi_target.c | 14 +- + drivers/target/iscsi/iscsi_target_auth.c | 2 +- + drivers/target/iscsi/iscsi_target_parameters.h | 3 - + drivers/target/target_core_tpg.c | 12 - + drivers/target/target_core_xcopy.c | 1 - + include/scsi/scsi_device.h | 5 +- + include/scsi/scsi_host.h | 3 + + include/target/target_core_base.h | 1 - + include/uapi/linux/chio.h | 11 +- + 110 files changed, 3218 insertions(+), 1112 deletions(-) + create mode 100644 drivers/s390/scsi/zfcp_diag.c + create mode 100644 drivers/s390/scsi/zfcp_diag.h +Merging scsi-mkp/for-next (c2a18e314332 Merge branch '5.4/scsi-fixes' into 5.5/scsi-next) +$ git merge scsi-mkp/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging vhost/linux-next (8766aecd61f7 vhost: last descriptor must have NEXT clear) +$ git merge vhost/linux-next +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 ++- + include/linux/ptr_ring.h | 79 +++++++++++- + 5 files changed, 460 insertions(+), 18 deletions(-) +Merging rpmsg/for-next (1587a11907d8 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 6 +++ + MAINTAINERS | 2 +- + drivers/hwspinlock/sprd_hwspinlock.c | 33 +++++++++----- + drivers/hwspinlock/u8500_hsem.c | 46 ++++++------------- + drivers/remoteproc/qcom_q6v5_mss.c | 52 ++++++++++++++++++--- + drivers/remoteproc/remoteproc_core.c | 2 - + drivers/remoteproc/remoteproc_debugfs.c | 3 -- + drivers/rpmsg/qcom_glink_native.c | 53 +++++++++++++++++----- + drivers/rpmsg/qcom_glink_smem.c | 2 +- + drivers/rpmsg/rpmsg_char.c | 6 ++- + 10 files changed, 135 insertions(+), 70 deletions(-) +Merging gpio/for-next (1723e834a4aa Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Auto-merging drivers/gpio/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/driver-api/index.rst +Auto-merging Documentation/driver-api/gpio/driver.rst +Merge made by the 'recursive' strategy. + .../bindings/gpio/brcm,xgs-iproc-gpio.yaml | 70 +++++ + .../devicetree/bindings/gpio/gpio-rda.yaml | 50 ++++ + .../devicetree/bindings/gpio/renesas,gpio-rcar.txt | 1 + + Documentation/driver-api/{ => gpio}/bt8xxgpio.rst | 2 +- + Documentation/driver-api/gpio/driver.rst | 4 + + Documentation/driver-api/gpio/index.rst | 1 + + Documentation/driver-api/index.rst | 1 - + MAINTAINERS | 2 + + drivers/ata/ahci_imx.c | 25 +- + drivers/gpio/Kconfig | 29 +- + drivers/gpio/Makefile | 3 + + drivers/gpio/gpio-104-idi-48.c | 2 +- + .../gpio/{sgpio-aspeed.c => gpio-aspeed-sgpio.c} | 0 + drivers/gpio/gpio-ath79.c | 10 +- + drivers/gpio/gpio-em.c | 20 +- + drivers/gpio/gpio-htc-egpio.c | 37 +-- + drivers/gpio/gpio-max77620.c | 231 +++++++-------- + drivers/gpio/gpio-merrifield.c | 33 +-- + drivers/gpio/gpio-mpc8xxx.c | 30 +- + drivers/gpio/gpio-mxc.c | 13 +- + drivers/gpio/gpio-rda.c | 294 +++++++++++++++++++ + drivers/gpio/gpio-tegra186.c | 97 +++++-- + drivers/gpio/gpio-xgene.c | 27 +- + drivers/gpio/gpio-xgs-iproc.c | 321 +++++++++++++++++++++ + drivers/gpio/gpiolib-of.c | 11 +- + drivers/gpio/gpiolib.c | 54 ++-- + include/uapi/linux/gpio.h | 4 + + tools/gpio/Makefile | 6 +- + 28 files changed, 1098 insertions(+), 280 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/brcm,xgs-iproc-gpio.yaml + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-rda.yaml + rename Documentation/driver-api/{ => gpio}/bt8xxgpio.rst (98%) + 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 +Merging gpio-brgl/gpio/for-next (2b9f48e93407 gpio: rcar: Use proper irq_chip name) +$ git merge gpio-brgl/gpio/for-next +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-bd70528.c | 1 + + drivers/gpio/gpio-em.c | 2 +- + drivers/gpio/gpio-rcar.c | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) +Merging gpio-intel/for-next (7d194c2100ad Linux 5.4-rc4) +$ git merge gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (bf74543583fa Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/qcom,msm8976-pinctrl.txt | 183 ++++ + .../devicetree/bindings/pinctrl/qcom,pmic-gpio.txt | 4 + + .../bindings/pinctrl/renesas,pfc-pinctrl.txt | 4 +- + .../bindings/pinctrl/rockchip,pinctrl.txt | 1 + + arch/sh/include/cpu-sh4/cpu/sh7734.h | 2 +- + drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 2 +- + drivers/pinctrl/devicetree.c | 40 +- + drivers/pinctrl/devicetree.h | 7 - + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 4 +- + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 34 +- + drivers/pinctrl/mvebu/pinctrl-mvebu.c | 4 +- + drivers/pinctrl/mvebu/pinctrl-orion.c | 7 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 81 +- + drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 32 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 62 ++ + drivers/pinctrl/pinctrl-at91.c | 47 +- + drivers/pinctrl/pinctrl-coh901.c | 50 +- + drivers/pinctrl/pinctrl-ingenic.c | 22 +- + drivers/pinctrl/pinctrl-ocelot.c | 23 +- + drivers/pinctrl/pinctrl-oxnas.c | 25 +- + drivers/pinctrl/pinctrl-pic32.c | 25 +- + drivers/pinctrl/pinctrl-pistachio.c | 26 +- + drivers/pinctrl/pinctrl-rockchip.c | 382 ++++++- + drivers/pinctrl/pinctrl-rza2.c | 4 +- + drivers/pinctrl/pinctrl-rzn1.c | 2 +- + drivers/pinctrl/pinctrl-st.c | 53 +- + drivers/pinctrl/pinctrl-stmfx.c | 21 + + drivers/pinctrl/qcom/Kconfig | 11 + + drivers/pinctrl/qcom/Makefile | 1 + + drivers/pinctrl/qcom/pinctrl-msm8976.c | 1127 ++++++++++++++++++++ + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 2 + + drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 121 +-- + drivers/pinctrl/sh-pfc/Kconfig | 12 +- + drivers/pinctrl/sh-pfc/Makefile | 4 +- + drivers/pinctrl/sh-pfc/core.c | 32 +- + drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c | 2 +- + drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 2 +- + drivers/pinctrl/sh-pfc/pfc-r8a7796.c | 35 +- + drivers/pinctrl/sh-pfc/pfc-r8a77965.c | 863 ++++++++------- + drivers/pinctrl/sh-pfc/pfc-r8a77990.c | 57 +- + drivers/pinctrl/sh-pfc/pfc-sh7734.c | 4 +- + drivers/pinctrl/sh-pfc/sh_pfc.h | 8 +- + drivers/pinctrl/sirf/pinctrl-atlas7.c | 41 +- + drivers/pinctrl/sirf/pinctrl-sirf.c | 43 +- + drivers/pinctrl/spear/pinctrl-plgpio.c | 47 +- + drivers/pinctrl/sprd/pinctrl-sprd.c | 23 +- + drivers/pinctrl/tegra/pinctrl-tegra-xusb.c | 6 + + drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 2 +- + 48 files changed, 2708 insertions(+), 882 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8976-pinctrl.txt + create mode 100644 drivers/pinctrl/qcom/pinctrl-msm8976.c +Merging pinctrl-intel/for-next (c9ccf71fc807 pinctrl: intel: Add Intel Tiger Lake pin controller support) +$ git merge pinctrl-intel/for-next +Auto-merging drivers/pinctrl/intel/pinctrl-intel.c +Auto-merging drivers/pinctrl/intel/pinctrl-cherryview.c +Merge made by the 'recursive' strategy. + drivers/pinctrl/intel/Kconfig | 7 + + drivers/pinctrl/intel/Makefile | 1 + + drivers/pinctrl/intel/pinctrl-cherryview.c | 2 +- + drivers/pinctrl/intel/pinctrl-intel.c | 115 ++++---- + drivers/pinctrl/intel/pinctrl-tigerlake.c | 454 +++++++++++++++++++++++++++++ + 5 files changed, 524 insertions(+), 55 deletions(-) + create mode 100644 drivers/pinctrl/intel/pinctrl-tigerlake.c +Merging pinctrl-samsung/for-next (a322b3377f4b pinctrl: samsung: Fix device node refcount leaks in init code) +$ git merge pinctrl-samsung/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/samsung/pinctrl-exynos.c | 14 +++++++++++--- + drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 6 +++++- + drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 6 +++++- + drivers/pinctrl/samsung/pinctrl-samsung.c | 10 ++++++++-- + 4 files changed, 29 insertions(+), 7 deletions(-) +Merging pwm/for-next (9e1b4999a169 pwm: stm32: Pass breakinput instead of its values) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pwm/pwm-mediatek.txt | 2 +- + .../devicetree/bindings/pwm/pwm-stm32.txt | 8 +- + drivers/pwm/pwm-stm32.c | 112 +++++++++++++++------ + drivers/pwm/pwm-sun4i.c | 5 +- + include/linux/mfd/stm32-timers.h | 12 +-- + include/linux/pwm.h | 5 +- + 6 files changed, 95 insertions(+), 49 deletions(-) +Merging userns/for-next (318759b4737c signal/x86: Move tsk inside of CONFIG_MEMORY_FAILURE in do_sigbus) +$ git merge userns/for-next +Already up to date. +Merging ktest/for-next (aecea57f84b0 ktest: Fix some typos in config-bisect.pl) +$ git merge ktest/for-next +Already up to date. +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 (0682b746099a Merge tag 'compat-ioctl-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground into y2038) +$ git merge y2038/y2038 +Auto-merging net/unix/af_unix.c +Auto-merging net/socket.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/falloc.h +Auto-merging include/linux/blkdev.h +Auto-merging fs/ocfs2/ioctl.c +Auto-merging fs/ioctl.c +Auto-merging fs/gfs2/file.c +Auto-merging fs/fuse/dev.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/compat_ioctl.c +CONFLICT (content): Merge conflict in fs/compat_ioctl.c +Auto-merging fs/ceph/dir.c +Auto-merging fs/btrfs/super.c +Auto-merging drivers/vhost/test.c +Auto-merging drivers/vhost/net.c +Auto-merging drivers/usb/core/devio.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/scsi/cxlflash/main.c +Auto-merging drivers/rpmsg/rpmsg_char.c +Auto-merging drivers/pci/switch/switchtec.c +Auto-merging drivers/nvme/host/core.c +Auto-merging drivers/net/ppp/ppp_generic.c +Auto-merging drivers/isdn/capi/capi.c +Auto-merging drivers/infiniband/core/uverbs_main.c +Auto-merging drivers/iio/industrialio-core.c +Auto-merging drivers/hwmon/w83793.c +Auto-merging drivers/hid/hidraw.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +Auto-merging drivers/dma-buf/dma-buf.c +Auto-merging drivers/android/binder.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 502567bb0e5f] Merge remote-tracking branch 'y2038/y2038' +$ git diff -M --stat --summary HEAD^.. + Documentation/networking/ppp_generic.txt | 2 + + arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 1 + + arch/um/drivers/harddog_kern.c | 1 + + arch/um/drivers/hostaudio_kern.c | 1 + + block/scsi_ioctl.c | 132 +++- + drivers/android/binder.c | 2 +- + drivers/block/pktcdvd.c | 25 + + 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/crypto/qat/qat_common/adf_ctl_drv.c | 2 +- + drivers/dma-buf/dma-buf.c | 4 +- + drivers/dma-buf/sw_sync.c | 2 +- + drivers/dma-buf/sync_file.c | 2 +- + drivers/firewire/core-cdev.c | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 +- + drivers/hid/hidraw.c | 4 +- + drivers/hid/usbhid/hiddev.c | 11 +- + drivers/hwmon/fschmd.c | 1 + + drivers/hwmon/w83793.c | 1 + + drivers/hwtracing/stm/core.c | 12 +- + drivers/ide/ide-tape.c | 27 +- + drivers/iio/industrialio-core.c | 2 +- + drivers/infiniband/core/uverbs_main.c | 4 +- + drivers/isdn/capi/capi.c | 31 + + drivers/media/rc/lirc_dev.c | 4 +- + drivers/misc/cxl/flash.c | 8 +- + drivers/misc/genwqe/card_dev.c | 23 +- + drivers/misc/mei/main.c | 22 +- + drivers/misc/vmw_vmci/vmci_host.c | 2 +- + drivers/mtd/ubi/cdev.c | 36 +- + drivers/net/ppp/ppp_generic.c | 245 +++++--- + drivers/net/tap.c | 12 +- + drivers/nvdimm/bus.c | 4 +- + drivers/nvme/host/core.c | 2 +- + drivers/pci/switch/switchtec.c | 2 +- + drivers/platform/x86/wmi.c | 2 +- + drivers/rpmsg/rpmsg_char.c | 4 +- + drivers/rtc/dev.c | 33 +- + drivers/rtc/rtc-ds1374.c | 1 + + drivers/rtc/rtc-m41t80.c | 1 + + 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/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/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/fbdev/aty/atyfb_base.c | 12 +- + drivers/virt/fsl_hypervisor.c | 2 +- + 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/at91rm9200_wdt.c | 1 + + drivers/watchdog/ath79_wdt.c | 1 + + drivers/watchdog/bcm63xx_wdt.c | 1 + + 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/indydog.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/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 | 1 + + 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/w83877f_wdt.c | 1 + + drivers/watchdog/w83977f_wdt.c | 1 + + drivers/watchdog/wafer5823wdt.c | 1 + + drivers/watchdog/watchdog_dev.c | 1 + + 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 + + fs/btrfs/super.c | 2 +- + fs/ceph/dir.c | 1 + + fs/ceph/file.c | 2 +- + fs/compat_ioctl.c | 917 ++-------------------------- + 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/ioctl.c | 80 ++- + fs/nilfs2/ioctl.c | 1 + + fs/notify/fanotify/fanotify_user.c | 2 +- + fs/ocfs2/ioctl.c | 1 + + fs/userfaultfd.c | 2 +- + include/linux/blkdev.h | 2 + + include/linux/falloc.h | 20 + + include/linux/fs.h | 7 + + include/linux/mtio.h | 60 ++ + include/uapi/linux/ppp-ioctl.h | 2 + + include/uapi/linux/ppp_defs.h | 14 + + lib/iov_iter.c | 1 + + net/bluetooth/hci_sock.c | 21 +- + net/bluetooth/rfcomm/sock.c | 14 +- + net/rfkill/core.c | 2 +- + net/socket.c | 3 + + net/unix/af_unix.c | 19 + + sound/core/oss/pcm_oss.c | 4 + + sound/oss/dmasound/dmasound_core.c | 2 + + 156 files changed, 953 insertions(+), 1395 deletions(-) + create mode 100644 include/linux/mtio.h +$ 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 c9029f913b45] Merge remote-tracking branch 'y2038/y2038' + Date: Tue Nov 5 17:49:48 2019 +1100 +Merging livepatching/for-next (8b65d6ab9d70 Merge remote-tracking branch 'for-5.5/system-state' into for-next) +$ git merge livepatching/for-next +Merge made by the 'recursive' strategy. + Documentation/livepatch/index.rst | 1 + + Documentation/livepatch/system-state.rst | 167 +++++++++++++++++++++ + include/linux/livepatch.h | 17 +++ + kernel/livepatch/Makefile | 2 +- + kernel/livepatch/core.c | 44 ++++-- + kernel/livepatch/core.h | 5 +- + kernel/livepatch/state.c | 119 +++++++++++++++ + kernel/livepatch/state.h | 9 ++ + kernel/livepatch/transition.c | 12 +- + lib/livepatch/Makefile | 5 +- + lib/livepatch/test_klp_state.c | 162 ++++++++++++++++++++ + lib/livepatch/test_klp_state2.c | 191 ++++++++++++++++++++++++ + lib/livepatch/test_klp_state3.c | 5 + + tools/testing/selftests/livepatch/Makefile | 3 +- + tools/testing/selftests/livepatch/settings | 1 + + tools/testing/selftests/livepatch/test-state.sh | 180 ++++++++++++++++++++++ + 16 files changed, 902 insertions(+), 21 deletions(-) + create mode 100644 Documentation/livepatch/system-state.rst + create mode 100644 kernel/livepatch/state.c + create mode 100644 kernel/livepatch/state.h + create mode 100644 lib/livepatch/test_klp_state.c + create mode 100644 lib/livepatch/test_klp_state2.c + create mode 100644 lib/livepatch/test_klp_state3.c + create mode 100644 tools/testing/selftests/livepatch/settings + create mode 100755 tools/testing/selftests/livepatch/test-state.sh +Merging coresight/next (d87f04ffb55b coresight: etm4x: Fix BMVAL misuse) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/coresight.txt | 9 + + drivers/hwtracing/coresight/Kconfig | 1 + + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 312 ++++++++++++++++-- + drivers/hwtracing/coresight/coresight-etm4x.c | 351 ++++++++++++++++++++- + drivers/hwtracing/coresight/coresight-etm4x.h | 81 ++++- + drivers/hwtracing/coresight/coresight-funnel.c | 36 ++- + drivers/hwtracing/coresight/coresight-replicator.c | 35 +- + drivers/hwtracing/coresight/coresight-tmc-etf.c | 26 +- + drivers/hwtracing/coresight/coresight.c | 51 ++- + include/linux/coresight.h | 6 + + 10 files changed, 825 insertions(+), 83 deletions(-) +Merging rtc/rtc-next (c6c2d36bc46f rtc: fsl-ftm-alarm: Fix build error without PM_SLEEP) +$ git merge rtc/rtc-next +Auto-merging drivers/rtc/rtc-m41t80.c +Merge made by the 'recursive' strategy. + arch/mips/sgi-ip32/ip32-platform.c | 2 +- + drivers/rtc/Kconfig | 26 ++-- + drivers/rtc/interface.c | 37 ++++- + 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-brcmstb-waketimer.c | 4 +- + 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-ds1343.c | 297 ++++++++++-------------------------- + drivers/rtc/rtc-ds1347.c | 102 +++++++------ + drivers/rtc/rtc-ds1511.c | 4 +- + drivers/rtc/rtc-ds1553.c | 4 +- + drivers/rtc/rtc-ds1685.c | 104 +++++++------ + 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 | 5 +- + drivers/rtc/rtc-m48t86.c | 11 +- + drivers/rtc/rtc-meson.c | 4 +- + 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-pic32.c | 4 +- + drivers/rtc/rtc-r7301.c | 7 +- + drivers/rtc/rtc-rtd119x.c | 4 +- + drivers/rtc/rtc-rv3028.c | 146 ++++++++++++++++++ + 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 | 4 +- + drivers/rtc/rtc-stk17ta8.c | 4 +- + drivers/rtc/rtc-stm32.c | 4 +- + drivers/rtc/rtc-sunxi.c | 4 +- + drivers/rtc/rtc-tegra.c | 4 +- + drivers/rtc/rtc-tx4939.c | 4 +- + drivers/rtc/rtc-vt8500.c | 32 ++-- + drivers/rtc/rtc-wilco-ec.c | 8 +- + drivers/rtc/rtc-xgene.c | 4 +- + drivers/rtc/rtc-zynqmp.c | 7 +- + include/linux/rtc.h | 5 + + include/linux/rtc/ds1685.h | 12 +- + 58 files changed, 494 insertions(+), 584 deletions(-) +Merging nvdimm/libnvdimm-for-next (4c806b897d60 libnvdimm/region: Enable MAP_SYNC for volatile regions) +$ 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 +Merge made by the 'recursive' strategy. + drivers/misc/eeprom/at24.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) +Merging ntb/ntb-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge ntb/ntb-next +Already up to date. +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 net/unix/af_unix.c +Auto-merging net/sctp/socket.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/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/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 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/hyperv/netvsc_drv.c +Auto-merging drivers/net/ethernet/ti/netcp_ethss.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/marvell/mv643xx_eth.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/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 block/blk-core.c +Auto-merging arch/arm64/include/asm/processor.h +Auto-merging Documentation/process/coding-style.rst +Merge made by the 'recursive' strategy. + 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 | 2 +- + 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, 340 insertions(+), 336 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 (ca9902e3140e fsi: core: Fix small accesses and unaligned offsets via sysfs) +$ git merge fsi/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/fsi/fsi-master-aspeed.txt | 24 + + drivers/fsi/Kconfig | 6 + + drivers/fsi/Makefile | 1 + + drivers/fsi/fsi-core.c | 67 ++- + drivers/fsi/fsi-master-aspeed.c | 550 +++++++++++++++++++++ + drivers/fsi/fsi-master-hub.c | 46 -- + drivers/fsi/fsi-master.h | 71 +++ + include/trace/events/fsi.h | 6 +- + include/trace/events/fsi_master_aspeed.h | 77 +++ + 9 files changed, 781 insertions(+), 67 deletions(-) + create mode 100644 Documentation/devicetree/bindings/fsi/fsi-master-aspeed.txt + create mode 100644 drivers/fsi/fsi-master-aspeed.c + create mode 100644 include/trace/events/fsi_master_aspeed.h +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. + .../devicetree/bindings/nvmem/rockchip-otp.txt | 25 ++ + .../devicetree/bindings/nvmem/sprd-efuse.txt | 39 ++ + drivers/nvmem/Kconfig | 23 ++ + drivers/nvmem/Makefile | 4 + + drivers/nvmem/imx-ocotp-scu.c | 120 +++++- + drivers/nvmem/imx-ocotp.c | 4 + + drivers/nvmem/rockchip-otp.c | 268 +++++++++++++ + drivers/nvmem/sc27xx-efuse.c | 13 +- + drivers/nvmem/sprd-efuse.c | 424 +++++++++++++++++++++ + include/linux/nvmem-consumer.h | 2 +- + 10 files changed, 903 insertions(+), 19 deletions(-) + create mode 100644 Documentation/devicetree/bindings/nvmem/rockchip-otp.txt + create mode 100644 Documentation/devicetree/bindings/nvmem/sprd-efuse.txt + create mode 100644 drivers/nvmem/rockchip-otp.c + create mode 100644 drivers/nvmem/sprd-efuse.c +Merging xarray/xarray (b7e9728f3d7f idr: Fix idr_alloc_u32 on 32-bit systems) +$ git merge xarray/xarray +Auto-merging include/linux/idr.h +Merge made by the 'recursive' strategy. + include/linux/idr.h | 2 +- + include/linux/radix-tree.h | 18 ------------------ + lib/idr.c | 31 +++++++++++-------------------- + lib/radix-tree.c | 2 +- + lib/test_xarray.c | 24 ++++++++++++++++++++++++ + lib/xarray.c | 4 ++++ + 6 files changed, 41 insertions(+), 40 deletions(-) +Merging hyperv/hyperv-next (94f90545a08f Drivers: hv: balloon: Remove dependencies on guest page size) +$ git merge hyperv/hyperv-next +Auto-merging net/vmw_vsock/hyperv_transport.c +Auto-merging lib/Kconfig.debug +Auto-merging drivers/scsi/storvsc_drv.c +Auto-merging drivers/net/hyperv/netvsc_drv.c +Auto-merging drivers/hv/vmbus_drv.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/debugfs-hyperv | 23 ++ + MAINTAINERS | 1 + + arch/x86/hyperv/hv_init.c | 8 + + arch/x86/include/asm/mshyperv.h | 1 + + drivers/hv/Makefile | 1 + + drivers/hv/connection.c | 87 ++++--- + drivers/hv/hv_balloon.c | 25 +- + drivers/hv/hv_debugfs.c | 178 +++++++++++++ + drivers/hv/hv_fcopy.c | 3 +- + drivers/hv/hv_kvp.c | 3 +- + drivers/hv/hv_snapshot.c | 3 +- + drivers/hv/hv_util.c | 13 +- + drivers/hv/hyperv_vmbus.h | 31 +++ + drivers/hv/ring_buffer.c | 2 + + drivers/hv/vmbus_drv.c | 15 +- + drivers/net/hyperv/hyperv_net.h | 3 + + drivers/net/hyperv/netvsc_drv.c | 57 ++++ + drivers/scsi/storvsc_drv.c | 41 +++ + drivers/video/fbdev/Kconfig | 1 + + drivers/video/fbdev/hyperv_fb.c | 428 ++++++++++++++++++++++++++++--- + include/linux/hyperv.h | 31 ++- + lib/Kconfig.debug | 7 + + net/vmw_vsock/hyperv_transport.c | 20 ++ + tools/hv/vmbus_testing | 376 +++++++++++++++++++++++++++ + 24 files changed, 1251 insertions(+), 107 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-hyperv + create mode 100644 drivers/hv/hv_debugfs.c + create mode 100755 tools/hv/vmbus_testing +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 +Merge made by the 'recursive' strategy. + kernel/debug/debug_core.c | 34 ++++++ + kernel/debug/debug_core.h | 3 +- + kernel/debug/kdb/kdb_bt.c | 116 +++++++++++---------- + kernel/debug/kdb/kdb_io.c | 231 ++++++++++++++++++++--------------------- + kernel/debug/kdb/kdb_private.h | 1 + + 5 files changed, 208 insertions(+), 177 deletions(-) +Merging pidfd/for-next (1282387e9dca Merge branch 'pidfd' into for-next) +$ git merge pidfd/for-next +Auto-merging tools/testing/selftests/Makefile +Auto-merging kernel/fork.c +Auto-merging include/uapi/linux/sched.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + include/linux/pid.h | 4 + + include/uapi/linux/sched.h | 3 + + kernel/exit.c | 2 +- + kernel/fork.c | 76 +++++- + kernel/pid.c | 14 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/clone3/.gitignore | 1 + + tools/testing/selftests/clone3/Makefile | 6 + + .../selftests/clone3/clone3_clear_sighand.c | 172 ++++++++++++ + tools/testing/selftests/pidfd/Makefile | 2 +- + tools/testing/selftests/pidfd/pidfd_fdinfo_test.c | 296 +++++++++++++++++++++ + 12 files changed, 561 insertions(+), 17 deletions(-) + create mode 100644 tools/testing/selftests/clone3/.gitignore + create mode 100644 tools/testing/selftests/clone3/Makefile + create mode 100644 tools/testing/selftests/clone3/clone3_clear_sighand.c + create mode 100644 tools/testing/selftests/pidfd/pidfd_fdinfo_test.c +Merging devfreq/for-next (d2f5fccd1ac9 PM / devfreq: Make log message more explicit when devfreq device already exists) +$ git merge devfreq/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/devfreq/devfreq.c | 2 +- + include/dt-bindings/pmu/exynos_ppmu.h | 25 +++++++++++++++++++++++++ + 3 files changed, 27 insertions(+), 1 deletion(-) + create mode 100644 include/dt-bindings/pmu/exynos_ppmu.h +Merging hmm/hmm (bbe3329e354d mm/hmm: remove hmm_mirror and related) +$ git merge hmm/hmm +Auto-merging kernel/fork.c +Auto-merging include/rdma/ib_verbs.h +Auto-merging drivers/infiniband/hw/mlx5/odp.c +CONFLICT (content): Merge conflict in drivers/infiniband/hw/mlx5/odp.c +Auto-merging drivers/infiniband/hw/mlx5/mr.c +Auto-merging drivers/infiniband/hw/mlx5/mlx5_ib.h +Auto-merging drivers/infiniband/core/device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.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 +Recorded preimage for 'drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c' +Recorded preimage for 'drivers/infiniband/hw/mlx5/odp.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/amdgpu_mn.c'. +Recorded resolution for 'drivers/infiniband/hw/mlx5/odp.c'. +[master 4093854be908] Merge remote-tracking branch 'hmm/hmm' +$ git diff -M --stat --summary HEAD^.. + Documentation/vm/hmm.rst | 105 +---- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 440 +++--------------- + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h | 53 --- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 145 +++--- + drivers/gpu/drm/nouveau/nouveau_svm.c | 231 ++++++---- + drivers/gpu/drm/radeon/radeon.h | 9 +- + drivers/gpu/drm/radeon/radeon_mn.c | 219 ++------- + drivers/infiniband/core/device.c | 1 - + drivers/infiniband/core/umem_odp.c | 288 ++---------- + drivers/infiniband/hw/hfi1/file_ops.c | 2 +- + drivers/infiniband/hw/hfi1/hfi.h | 2 +- + drivers/infiniband/hw/hfi1/user_exp_rcv.c | 146 +++--- + drivers/infiniband/hw/hfi1/user_exp_rcv.h | 3 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 7 +- + drivers/infiniband/hw/mlx5/mr.c | 3 +- + drivers/infiniband/hw/mlx5/odp.c | 50 +-- + include/linux/hmm.h | 195 ++------ + include/linux/mmu_notifier.h | 144 ++++-- + include/rdma/ib_umem_odp.h | 65 +-- + include/rdma/ib_verbs.h | 2 - + kernel/fork.c | 1 - + mm/Kconfig | 2 +- + mm/hmm.c | 285 +----------- + mm/mmu_notifier.c | 540 +++++++++++++++++++++-- + 29 files changed, 1189 insertions(+), 1788 deletions(-) +Merging fpga/for-next (fddc9fcbe69a fpga: dfl: fme: add power management support) +$ git merge fpga/for-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-platform-dfl-fme | 132 ++++++++ + Documentation/fpga/dfl.rst | 10 + + drivers/fpga/Kconfig | 2 +- + drivers/fpga/dfl-fme-main.c | 385 +++++++++++++++++++++++ + drivers/fpga/zynq-fpga.c | 4 +- + 5 files changed, 529 insertions(+), 4 deletions(-) +Merging kunit/test (ea2dd7c0875e lib/list-test: add a test for the 'list' doubly linked list) +$ git merge kunit/test +Auto-merging tools/objtool/check.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/dev-tools/index.rst | 1 + + Documentation/dev-tools/kunit/api/index.rst | 16 + + Documentation/dev-tools/kunit/api/test.rst | 11 + + Documentation/dev-tools/kunit/faq.rst | 62 + + Documentation/dev-tools/kunit/index.rst | 79 ++ + Documentation/dev-tools/kunit/start.rst | 180 +++ + Documentation/dev-tools/kunit/usage.rst | 576 ++++++++ + MAINTAINERS | 20 + + arch/um/configs/kunit_defconfig | 3 + + fs/ext4/Kconfig | 17 + + fs/ext4/Makefile | 1 + + fs/ext4/inode-test.c | 272 ++++ + include/kunit/assert.h | 356 +++++ + include/kunit/string-stream.h | 51 + + include/kunit/test.h | 1490 ++++++++++++++++++++ + include/kunit/try-catch.h | 75 + + kernel/Makefile | 2 + + kernel/sysctl-test.c | 392 +++++ + lib/Kconfig.debug | 31 + + lib/Makefile | 5 + + lib/kunit/Kconfig | 36 + + lib/kunit/Makefile | 9 + + lib/kunit/assert.c | 141 ++ + lib/kunit/example-test.c | 88 ++ + lib/kunit/string-stream-test.c | 52 + + lib/kunit/string-stream.c | 217 +++ + lib/kunit/test-test.c | 331 +++++ + lib/kunit/test.c | 478 +++++++ + lib/kunit/try-catch.c | 118 ++ + lib/list-test.c | 746 ++++++++++ + tools/objtool/check.c | 1 + + tools/testing/kunit/.gitignore | 3 + + tools/testing/kunit/configs/all_tests.config | 3 + + tools/testing/kunit/kunit.py | 138 ++ + tools/testing/kunit/kunit_config.py | 66 + + tools/testing/kunit/kunit_kernel.py | 149 ++ + tools/testing/kunit/kunit_parser.py | 310 ++++ + tools/testing/kunit/kunit_tool_test.py | 206 +++ + .../test_data/test_is_test_passed-all_passed.log | 32 + + .../kunit/test_data/test_is_test_passed-crash.log | 69 + + .../test_data/test_is_test_passed-failure.log | 36 + + .../test_data/test_is_test_passed-no_tests_run.log | 75 + + .../test_data/test_output_isolated_correctly.log | 106 ++ + .../kunit/test_data/test_read_from_file.kconfig | 17 + + 44 files changed, 7067 insertions(+) + create mode 100644 Documentation/dev-tools/kunit/api/index.rst + create mode 100644 Documentation/dev-tools/kunit/api/test.rst + create mode 100644 Documentation/dev-tools/kunit/faq.rst + create mode 100644 Documentation/dev-tools/kunit/index.rst + create mode 100644 Documentation/dev-tools/kunit/start.rst + create mode 100644 Documentation/dev-tools/kunit/usage.rst + create mode 100644 arch/um/configs/kunit_defconfig + create mode 100644 fs/ext4/inode-test.c + create mode 100644 include/kunit/assert.h + create mode 100644 include/kunit/string-stream.h + create mode 100644 include/kunit/test.h + create mode 100644 include/kunit/try-catch.h + create mode 100644 kernel/sysctl-test.c + create mode 100644 lib/kunit/Kconfig + create mode 100644 lib/kunit/Makefile + create mode 100644 lib/kunit/assert.c + create mode 100644 lib/kunit/example-test.c + create mode 100644 lib/kunit/string-stream-test.c + create mode 100644 lib/kunit/string-stream.c + create mode 100644 lib/kunit/test-test.c + create mode 100644 lib/kunit/test.c + create mode 100644 lib/kunit/try-catch.c + create mode 100644 lib/list-test.c + create mode 100644 tools/testing/kunit/.gitignore + create mode 100644 tools/testing/kunit/configs/all_tests.config + create mode 100755 tools/testing/kunit/kunit.py + create mode 100644 tools/testing/kunit/kunit_config.py + create mode 100644 tools/testing/kunit/kunit_kernel.py + create mode 100644 tools/testing/kunit/kunit_parser.py + create mode 100755 tools/testing/kunit/kunit_tool_test.py + create mode 100644 tools/testing/kunit/test_data/test_is_test_passed-all_passed.log + create mode 100644 tools/testing/kunit/test_data/test_is_test_passed-crash.log + create mode 100644 tools/testing/kunit/test_data/test_is_test_passed-failure.log + create mode 100644 tools/testing/kunit/test_data/test_is_test_passed-no_tests_run.log + create mode 100644 tools/testing/kunit/test_data/test_output_isolated_correctly.log + create mode 100644 tools/testing/kunit/test_data/test_read_from_file.kconfig +Merging cel/cel-next (fd86460a2c94 xprtrdma: Replace dprintk in xprt_rdma_set_port) +$ git merge cel/cel-next +Auto-merging net/sunrpc/xprtrdma/backchannel.c +Auto-merging net/sunrpc/xprt.c +Auto-merging include/trace/events/rpcrdma.h +Auto-merging include/rdma/ib_verbs.h +Auto-merging drivers/infiniband/core/Makefile +CONFLICT (content): Merge conflict in drivers/infiniband/core/Makefile +Recorded preimage for 'drivers/infiniband/core/Makefile' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/infiniband/core/Makefile'. +[master 39268bf3d88c] Merge remote-tracking branch 'cel/cel-next' +$ git diff -M --stat --summary HEAD^.. + drivers/infiniband/core/Makefile | 3 +- + drivers/infiniband/core/cq.c | 27 ++- + drivers/infiniband/core/trace.c | 14 ++ + include/rdma/ib_verbs.h | 5 + + include/trace/events/rdma_core.h | 251 +++++++++++++++++++++++ + include/trace/events/rpcrdma.h | 198 ++++++++++++------ + include/trace/events/sunrpc.h | 93 +++++++++ + net/sunrpc/clnt.c | 14 +- + 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 +- + 15 files changed, 942 insertions(+), 398 deletions(-) + create mode 100644 drivers/infiniband/core/trace.c + create mode 100644 include/trace/events/rdma_core.h +$ git am -3 ../patches/0001-fix-up-for-net-of_get_phy_mode-Change-API-to-solve-i.patch +Applying: fix up for "net: of_get_phy_mode: Change API to solve int/unit warnings" +Merging akpm-current/current (867a29bb95b6 ipc/msg.c: consolidate all xxxctl_down() functions) +$ git merge --no-ff akpm-current/current +Auto-merging tools/testing/selftests/Makefile +Auto-merging scripts/checkpatch.pl +Auto-merging mm/mmu_notifier.c +Auto-merging mm/memory.c +Auto-merging mm/memcontrol.c +Auto-merging lib/ubsan.c +CONFLICT (content): Merge conflict in lib/ubsan.c +Auto-merging lib/Kconfig.debug +Auto-merging include/linux/slab.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/mmzone.h +Auto-merging include/linux/gfp.h +Auto-merging fs/userfaultfd.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 drivers/hv/hv_balloon.c +Auto-merging arch/s390/mm/init.c +Auto-merging arch/powerpc/mm/mem.c +Auto-merging arch/arc/include/asm/pgtable.h +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Resolved 'lib/ubsan.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 09fdceebe99f] 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 +- + MAINTAINERS | 5 + + arch/arc/include/asm/pgtable.h | 1 - + arch/arc/mm/fault.c | 10 +- + arch/arc/mm/highmem.c | 4 +- + 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/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/base/memory.c | 7 +- + drivers/base/node.c | 18 +- + drivers/hv/hv_balloon.c | 4 +- + drivers/usb/core/hub.c | 5 + + drivers/vhost/vhost.c | 6 + + drivers/vhost/vhost.h | 1 + + drivers/xen/balloon.c | 1 - + fs/aio.c | 9 +- + fs/binfmt_elf.c | 56 +- + fs/buffer.c | 56 +- + fs/eventpoll.c | 52 +- + fs/hugetlbfs/inode.c | 60 +- + fs/ocfs2/acl.c | 4 +- + fs/ocfs2/file.c | 134 +- + fs/proc/generic.c | 37 +- + fs/proc/internal.h | 2 +- + fs/proc/page.c | 40 +- + fs/ramfs/inode.c | 12 + + fs/sysfs/symlink.c | 21 + + fs/userfaultfd.c | 3 +- + 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 | 11 + + include/asm-generic/tlb.h | 4 - + include/linux/build_bug.h | 4 +- + include/linux/gfp.h | 2 + + include/linux/hugetlb.h | 140 +- + include/linux/kcov.h | 23 + + include/linux/memblock.h | 3 + + include/linux/memcontrol.h | 44 +- + include/linux/memory_hotplug.h | 12 +- + include/linux/memremap.h | 6 + + include/linux/mm.h | 24 +- + include/linux/mm_types.h | 5 + + include/linux/mmzone.h | 30 +- + include/linux/node.h | 7 + + include/linux/notifier.h | 4 - + include/linux/page-flags.h | 20 +- + include/linux/page-isolation.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/slab.h | 20 - + include/linux/string.h | 45 + + include/linux/sysctl.h | 6 +- + include/linux/sysfs.h | 6 + + include/linux/thread_info.h | 2 + + include/linux/vmstat.h | 50 + + include/linux/wait.h | 4 +- + include/trace/events/kmem.h | 21 + + include/trace/events/vmscan.h | 71 +- + include/uapi/asm-generic/ipcbuf.h | 2 + + include/uapi/asm-generic/msgbuf.h | 2 + + include/uapi/asm-generic/sembuf.h | 1 + + include/uapi/linux/kcov.h | 28 + + ipc/mqueue.c | 105 +- + ipc/msg.c | 61 +- + ipc/sem.c | 66 +- + kernel/events/uprobes.c | 2 +- + kernel/hung_task.c | 94 +- + kernel/kcov.c | 547 +++- + kernel/notifier.c | 41 +- + kernel/profile.c | 6 +- + kernel/sys.c | 4 +- + kernel/sysctl.c | 8 + + lib/Kconfig.debug | 6 + + lib/dump_stack.c | 7 +- + lib/math/rational.c | 63 +- + lib/ubsan.c | 64 +- + mm/cma.c | 6 +- + mm/cma_debug.c | 10 +- + mm/filemap.c | 21 - + mm/gup.c | 8 +- + mm/huge_memory.c | 8 +- + mm/hugetlb.c | 284 +- + mm/hwpoison-inject.c | 4 +- + mm/internal.h | 27 +- + mm/khugepaged.c | 56 +- + mm/madvise.c | 2 +- + mm/memblock.c | 65 +- + mm/memcontrol.c | 242 +- + mm/memory-failure.c | 59 +- + mm/memory.c | 46 +- + mm/memory_hotplug.c | 224 +- + mm/mempolicy.c | 24 +- + mm/memremap.c | 36 +- + mm/mmap.c | 106 +- + mm/mmu_notifier.c | 2 +- + mm/mremap.c | 4 +- + mm/nommu.c | 10 +- + mm/oom_kill.c | 67 +- + mm/page_alloc.c | 184 +- + mm/page_io.c | 15 +- + mm/page_isolation.c | 12 +- + mm/pgtable-generic.c | 9 + + mm/rmap.c | 58 +- + mm/shmem.c | 13 +- + mm/slab.c | 7 +- + mm/slab.h | 10 +- + mm/slab_common.c | 99 +- + mm/slub.c | 15 +- + mm/sparse.c | 8 +- + mm/swap.c | 29 +- + mm/swapfile.c | 7 + + mm/userfaultfd.c | 73 +- + mm/util.c | 22 +- + mm/vmalloc.c | 140 +- + mm/vmscan.c | 433 ++- + mm/vmstat.c | 85 +- + mm/workingset.c | 8 +- + mm/z3fold.c | 357 ++- + net/sunrpc/rpc_pipe.c | 2 +- + scripts/checkpatch.pl | 29 +- + scripts/gdb/linux/symbols.py | 3 +- + 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 ++++++++++++++++++++ + tools/testing/selftests/vm/config | 1 + + tools/testing/selftests/vm/gup_benchmark.c | 2 +- + usr/include/Makefile | 3 - + 157 files changed, 6654 insertions(+), 1892 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 +Using index info to reconstruct a base tree... +M lib/Kconfig.debug +Falling back to patching base and 3-way merge... +Auto-merging lib/Kconfig.debug +CONFLICT (content): Merge conflict in lib/Kconfig.debug +error: Failed to merge in the changes. +hint: Use 'git am --show-current-patch' to see the failed patch +Patch failed at 0010 kernel-hacking: create submenu for arch special debugging options +Resolve all conflicts manually, mark them as resolved with +"git add/rm <conflicted_files>", then run "git rebase --continue". +You can instead skip this commit: run "git rebase --skip". +To abort and get back to the state before "git rebase", run "git rebase --abort". +Applying: kernel-hacking: group kernel data structures debugging together +Applying: kernel-hacking: move kernel testing and coverage options to same submenu +Using index info to reconstruct a base tree... +M lib/Kconfig.debug +Falling back to patching base and 3-way merge... +Auto-merging lib/Kconfig.debug +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: add test_p?d callbacks +Applying: mm: pagewalk: add 'depth' parameter to pte_hole +Applying: x86: mm: point to struct seq_file from struct pg_state +Applying: x86: mm+efi: convert ptdump_walk_pgd_level() to take a mm_struct +Applying: x86: mm: convert ptdump_walk_pgd_level_debugfs() to take an mm_struct +Applying: x86: mm: convert ptdump_walk_pgd_level_core() to take an mm_struct +Applying: mm: add generic ptdump +Applying: x86: mm: convert dump_pagetables to use walk_page_range +Applying: arm64: mm: convert mm/dump.c to use walk_page_range() +Applying: arm64: mm: display non-present entries in ptdump +Applying: 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 + + 761ec7226c18...ba0a1688b438 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (ba0a1688b438 drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + Documentation/core-api/genalloc.rst | 2 +- + 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/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 | 142 +++--- + arch/arm64/mm/mmu.c | 4 +- + arch/arm64/mm/ptdump_debugfs.c | 2 +- + arch/mips/include/asm/pgtable.h | 5 + + arch/powerpc/include/asm/book3s/64/pgtable.h | 30 +- + arch/riscv/include/asm/pgtable-64.h | 7 + + arch/riscv/include/asm/pgtable.h | 7 + + arch/s390/include/asm/pgtable.h | 2 + + arch/sparc/include/asm/pgtable_64.h | 2 + + arch/x86/Kconfig | 1 + + arch/x86/Kconfig.debug | 20 +- + arch/x86/include/asm/pgtable.h | 10 +- + arch/x86/mm/Makefile | 4 +- + arch/x86/mm/debug_pagetables.c | 8 +- + arch/x86/mm/dump_pagetables.c | 332 ++++---------- + arch/x86/platform/efi/efi_32.c | 2 +- + arch/x86/platform/efi/efi_64.c | 4 +- + drivers/block/null_blk_main.c | 56 +-- + drivers/firmware/efi/arm-runtime.c | 2 +- + drivers/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/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/pagewalk.h | 37 +- + include/linux/ptdump.h | 21 + + kernel/dma/remap.c | 2 +- + lib/Kconfig.debug | 663 ++++++++++++++------------- + 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/migrate.c | 5 +- + mm/mincore.c | 1 + + mm/pagewalk.c | 107 ++++- + mm/ptdump.c | 150 ++++++ + 67 files changed, 1458 insertions(+), 1317 deletions(-) + create mode 100644 include/linux/ptdump.h + create mode 100644 mm/ptdump.c +$ git am -3 ../patches/0001-Revert-hugetlbfs-convert-macros-to-static-inline-fix.patch +Applying: Revert "hugetlbfs: convert macros to static inline, fix sparse warning" 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..5c156b9414f8 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20191105 |