diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-10-27 16:20:34 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-10-27 16:20:34 +1100 |
| commit | 0dec50edcc9216535f82b1987c0a51efb3e23674 (patch) | |
| tree | beae7cae6466c8934a4d15c9d261bd856dfa81e9 | |
| parent | e4bc71ca7ad3dbd0aaf8ae08213e3878b6f8d555 (diff) | |
Add linux-next specific files for 20201027next-20201027
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 328 | ||||
| -rw-r--r-- | Next/Trees | 330 | ||||
| -rw-r--r-- | Next/merge.log | 3731 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 4390 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..20a8dd850c2c --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,328 @@ +Name SHA1 +---- ---- +origin 41ba50b0572e90ed3d24fe4def54567e9050bc47 +fixes 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +kbuild-current f11901ed723d1351843771c3a84b03a253bbf8b2 +arc-current 3650b228f83adda7e5ee532e2b90429c03f7b9ec +arm-current 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +arm64-fixes 0fa97e9403c767a4af63cfb5a3badbbe69426085 +arm-soc-fixes dff61e683e744675ee5ad83f23ff71701c830d45 +drivers-memory-fixes 3650b228f83adda7e5ee532e2b90429c03f7b9ec +m68k-current 50c5feeea0af99a4401fd54fd72bec1333a496ca +powerpc-fixes 4ff753feab021242144818b9a3ba011238218145 +s390-fixes 8e90b4b1305a80b1d7712370a163eff269ac1ba2 +sparc 0a95a6d1a4cd6e10e70f8a6c93dc2ecd02e7d6ab +fscrypt-current 2b4eae95c7361e0a147b838715c8baa1380a428f +net 435ccfa894e35e3d4a1799e6ac030e48a7b69ef5 +bpf 472547778de24e2764ab325268dd5b77e6923939 +ipsec a779d91314ca7208b7feb3ad817b62904397c56d +netfilter c77761c8a59405cb7aa44188b30fffe13fbdd02d +ipvs 48d072c4e8cdb542ade06727c31d7851bcc40a89 +wireless-drivers 3650b228f83adda7e5ee532e2b90429c03f7b9ec +mac80211 435ccfa894e35e3d4a1799e6ac030e48a7b69ef5 +rdma-fixes 3650b228f83adda7e5ee532e2b90429c03f7b9ec +sound-current 2a6eca16f376f6b83aaf73c57f0b6547907a5ed3 +sound-asoc-fixes 8099fe48df2c723e60b1e5ee842feb7f9f9f689b +regmap-fixes 3493d90df3aaef8b8494724c11bdf9066e56c7d2 +regulator-fixes dc3afaa95f47a46bb0797649599cb9f79f3bc87e +spi-fixes 91cbcc28a2ee9be65b7cd074df93b597983c0181 +pci-current 3650b228f83adda7e5ee532e2b90429c03f7b9ec +driver-core.current 3650b228f83adda7e5ee532e2b90429c03f7b9ec +tty.current 3650b228f83adda7e5ee532e2b90429c03f7b9ec +usb.current 3650b228f83adda7e5ee532e2b90429c03f7b9ec +usb-gadget-fixes 51609fba0cca69206a213171ce0cdf2dfc9cb21d +usb-serial-fixes 3650b228f83adda7e5ee532e2b90429c03f7b9ec +usb-chipidea-fixes 2d79b3360dcc0a842398e2231d5cffb2c5d60cac +phy 850280156f6421a404f2351bee07a0e7bedfd4c6 +staging.current 3650b228f83adda7e5ee532e2b90429c03f7b9ec +char-misc.current 3650b228f83adda7e5ee532e2b90429c03f7b9ec +soundwire-fixes 3fbbf2148a406b3e350fe91e6fdd78eb42ecad24 +thunderbolt-fixes 7342ca34d931a357d408aaa25fadd031e46af137 +input-current bb0bc0cfeabc0d6865865e8d3a601bea6711f951 +crypto-current c3a98c3ad5c0dc60a1ac66bf91147a3f39cac96b +ide 6800cd8cbc6e35989f8d1aa20fac58031231b90f +vfio-fixes aae7a75a821a793ed6b8ad502a5890fb8e8f172d +kselftest-fixes 3650b228f83adda7e5ee532e2b90429c03f7b9ec +modules-fixes 57baec7b1b0459ef885e816d8c28a9d9a62bb8de +dmaengine-fixes 549738f15da0e5a00275977623be199fbbf7df50 +backlight-fixes 219d54332a09e8d8741c1e1982f5eae56099de85 +mtd-fixes 3aee8a3a88fa533b74fb75640ca23001358e5476 +mfd-fixes 22380b65dc70f5b132c5afdf6b4011e2a84ec34a +v4l-dvb-fixes d0254f82d702a1d0d92e42f87676111de88846cf +reset-fixes b460e0a9e2404450a0cc4c5e6476483d6cda1b26 +mips-fixes 3650b228f83adda7e5ee532e2b90429c03f7b9ec +at91-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +omap-fixes 8f04aea048d56f3e39a7e543939450246542a6fc +kvm-fixes 77377064c3a94911339f13ce113b3abf265e06da +kvms390-fixes f20d4e924b4465822c4a35290b85aadf88ddf466 +hwmon-fixes 18360b33a071e5883250fd1e04bfdeff8c3887a3 +nvdimm-fixes 88b67edd7247466bc47f01e1dc539b0d0d4b931e +btrfs-fixes 03625d96c8296fe2f7892099dd5716770ed9b311 +vfs-fixes 8a018eb55e3ac033592afbcb476b0ffe64465b12 +dma-mapping-fixes 892fc9f6835ecf075efac20789b012c5c9997fcc +i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +drivers-x86-fixes 3650b228f83adda7e5ee532e2b90429c03f7b9ec +samsung-krzk-fixes 3650b228f83adda7e5ee532e2b90429c03f7b9ec +pinctrl-samsung-fixes 3650b228f83adda7e5ee532e2b90429c03f7b9ec +devicetree-fixes f84e2c5c528d937564e4a9e3411418e4c914b1fb +scsi-fixes bcf3a2953d36bbfb9bd44ccb3db0897d935cc485 +drm-fixes 3650b228f83adda7e5ee532e2b90429c03f7b9ec +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes bbf5c979011a099af5dc76498918ed7df445635b +mmc-fixes 0add6e9b88d0632a25323aaf4987dbacb0e4ae64 +rtc-fixes 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +gnss-fixes 48778464bb7d346b47157d21ffde2af6b2d39110 +hyperv-fixes dbf563eee0b8cc056744514d91c5ffc2fa6c0982 +soc-fsl-fixes fe8fe7723a3a824790bda681b40efd767e2251a7 +risc-v-fixes 84814460eef9af0fb56a4698341c9cb7996a6312 +pidfd-fixes bda4c60d02e9ceeee726f73250b808fad0663dd6 +fpga-fixes 8614afd689df59d9ce019439389be20bd788a897 +spdx 3650b228f83adda7e5ee532e2b90429c03f7b9ec +gpio-intel-fixes 3650b228f83adda7e5ee532e2b90429c03f7b9ec +pinctrl-intel-fixes 3650b228f83adda7e5ee532e2b90429c03f7b9ec +erofs-fixes 9ebcfadb0610322ac537dd7aa5d9cbc2b2894c68 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 0d0d245104a42e593adcf11396017a6420c08ba8 +ubifs-fixes 78c7d49f55d8631b67c09f9bfbe8155211a9ea06 +memblock-fixes 5f7b81c18366c38446f6eedab570b98dbdc07cff +drm-misc-fixes 897dbea6b716c0f2c5bcd4ba1eb4d809caba290c +kspp-gustavo 736116436e5b99b46e1a49c17cae6f6ee0a30e84 +kbuild f11901ed723d1351843771c3a84b03a253bbf8b2 +compiler-attributes bbf5c979011a099af5dc76498918ed7df445635b +dma-mapping 6857a5ebaabc5b9d989872700b4b71dd2a6d6453 +asm-generic a259218ae60de9d1442c74728fe3a615cd435a19 +arc def9d2780727cec3313ed3522d0123158d87224d +arm adc5f7029376049873289be305d507022281b8dd +arm64 66dd3474702aa98d5844367e1577cdad78ef7c65 +arm-perf 887e2cff0f8dc4dac4c35e631b711325c6dd65b8 +arm-soc aaa52e967409c4163537379976d009df9463c82d +amlogic 4393916840fccc0bb996a68d4fe086b1e9aa7739 +aspeed 48127d01a153e6121cbe17379dec36fb0615a4a4 +at91 d1f170f8447df1fed9c6c8ce9789724ee972c8bb +drivers-memory 1b322cb9bb5cb05e7b3ef70baa22280004e9cc96 +imx-mxs 77c83159331938fcd24537a121ddd7514d3f86fb +keystone 703dff8cb900d84bf95bf046114f8eefc95e8943 +mediatek 6c7949eccdbd4e0716ad0035f844b956e04eb8b4 +mvebu f89c9685f6a1782c3e4c86aca636036009d22efd +omap 7a159a1ad494f85a655802dc423a684786a6d468 +qcom a9e0b8bf59c8a4985b047ea2d6f03e8f04d42f0e +raspberrypi 4564363351e2680e55edc23c7953aebd2acb4ab7 +realtek 486f29df69413411a205d3101bae0427a892bee4 +renesas 97fc35aeb7972f323f99555b338011609999b24e +reset da8c0e4ee95a78878093ab5aaa3bdfce4c05ac63 +rockchip ba0ceb95f560011db6a5181441b57d8b3db8be34 +samsung-krzk dc8fd3769e15b0f65d4978e1c7e01592c73a045c +scmi 3650b228f83adda7e5ee532e2b90429c03f7b9ec +sunxi 33dbcde6368cba3953c68dd394e906723b93d83d +tegra 9ea55312ba1093068cf81f5899fadcaf61bf60b2 +ti-k3 1e3d655fe7b48c2341d63f981774742e21744f53 +ti-k3-new 9dcd17be61e4b6343cc612a3f6c30512acee60b9 +clk 5f56888fad46812bab9ecb455d92da675ef4fbd0 +clk-samsung ff8e0ff9b99643a32f7e33a96867e76d0fa10f76 +csky 1c8499089bc6bc17ad2cb85d0441587d962d06f6 +h8300 8808515be0ed4e33de9bfdc65f4c1b547ee11065 +ia64 c331649e637152788b0ca1c857d0c2eaf34fcbc3 +m68k 50c5feeea0af99a4401fd54fd72bec1333a496ca +m68knommu 02a0b3141ed99c85b15690278d22aa847711355b +microblaze 4a17e8513376bb23f814d3e340a5692a12c69369 +mips 3650b228f83adda7e5ee532e2b90429c03f7b9ec +nds32 54bde873682b467f781f352effdb52d24e0a0c30 +nios2 6b57fa4d374bb8c005dee396c56598c14b9c01a6 +openrisc 55b2662ec665cc8b592809a011fe807b05370ab8 +parisc-hd 3b7ab4a74a2d1972dbeb33285d85f1500b2ff96a +powerpc ffd0b25ca049a477cb757e5bcf2d5e1664d12e5d +fsl a76bea0287ce13d28494b19649d80d8ee5e7b757 +soc-fsl d97b957e32b1e7527a9b6652fa6e795f2861df7d +risc-v f69e1c7418b1034c5b2964adacfc72f4da8aa30c +s390 00be34947616fbf5ede502ea05a1023dfb024472 +sh b0cfc315ff38c423a5ce9ce159bd5baa4135e688 +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml f06885b3f3e3884f98351d7b72a4fc8400911cde +xtensa 4ca4c562efb67cd4e224ff560f4b1f2c86314906 +fscrypt 5b2a828b98ec1872799b1b4d82113c76a12d594f +afs 8409f67b6437c4b327ee95a71081b9c7bfee0b00 +btrfs c4795f038f2eb930a83c37e7ec5167be54993c63 +ceph 28e1581c3b4ea5f98530064a103c6217bedeea73 +cifs 3650b228f83adda7e5ee532e2b90429c03f7b9ec +configfs 76ecfcb0852eb0390881a695a2f349b804d80147 +ecryptfs 8b614cb8f1dcac8ca77cf4dd85f46ef3055f8238 +erofs 915f4c9358db6f96f08934dd683ae297aaa0fb91 +exfat f9893351acaecf0a414baf9942b48d5bb5c688c6 +ext3 e44b86917b3fec1a26753135360ca326d6be1e22 +ext4 1322181170bb01bce3c228b82ae3d5c6b793164f +f2fs bcfd79928961791d592adb8a84acd017d0f4583d +fsverity f3db0bed458314a835ccef5ccb130270c5b2cf04 +fuse 42d3e2d041f08d1f8f078da005c936648ba77405 +jfs 7aba5dcc234635b44b2781dbc268048cfba388ad +nfs 40a03b750bb3ded71a0f21a0b7dfbf3b24068dcb +nfs-anna 8c39076c276be0b31982e44654e2c2357473258a +nfsd 856deb866d16e29bd65952e0289066f6078af773 +cel 13a9a9d74d4d9689ad65938966dbc66386063648 +orangefs e848643b524be9c10826c2cf36eebb74eef643d2 +overlayfs be4df0cea08a8b59eb38d73de988b7ba8022df41 +ubifs e2a05cc7f8229e150243cdae40f2af9021d67a4a +v9fs 7ca1db21ef8e0e6725b4d25deed1ca196f7efb28 +xfs 2e76f188fd90d9ac29adbb82c30345f84d04bfa4 +zonefs 48bfd5c6fac10e10b7066bf4aeb919ed9a4e87d3 +iomap 1a31182edd0083bb9f26e582ed39f92f898c4d0a +djw-vfs 407e9c63ee571f44a2dfb0828fc30daa02abb6dc +file-locks 529adfe8f131c60938ece113379f1a07640aefb1 +vfs 8853bf827ca8c28756cc1ddd2f04a1e4beedb3da +printk 26911e6b1302714956e166d9aad95a429900349f +pci 3650b228f83adda7e5ee532e2b90429c03f7b9ec +pstore 137c6236aeec43c45c8f3b2e54b1dee50fd2010e +hid f5795950202d1da56468736e0eb35397d3b766c3 +i2c 3650b228f83adda7e5ee532e2b90429c03f7b9ec +i3c abea14bfdebbe9bd02f2ad24a1f3a878ed21c8f0 +dmi a3d13a0a23ea20a83d7148279a0ab68cc9a5962c +hwmon-staging 9b20aec24b8ab2860ea41182ba554dfcc444c0c8 +jc_docs 62af696471e58bdfcf416fd56f032a60853c2bae +v4l-dvb c386e0797d26a32e354daf4480c5d40165db66a1 +v4l-dvb-next cafcadac71cb4fd022318e3824a3bb60d99ba915 +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm 54e1ca2a19234787050e494833aad6800f8ee645 +cpufreq-arm bc9b9c5ab9d8d16157737db539929d57562926e9 +cpupower 748f0d70087c56226bf1df1f91a00b7ab4c8f883 +devfreq 09d56d92ad25b58113f4ec677e9b1ac1e2c3072b +opp a5663c9b1e31c00e0bdfaf4d92eb51358fc3950f +thermal ee7e92c62370a85841e6e1704aa4c3d5d8f47d4f +thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 67f8e65e4fc19e24993e8780f41279eeffbd0610 +dlm 4f2b30fd9b4bd6e3620fe55786df7fc5f89ad526 +swiotlb b51e627158cb0f67569aa46b5a08b568d20a81a4 +rdma 3650b228f83adda7e5ee532e2b90429c03f7b9ec +net-next 3cb12d27ff655e57e8efe3486dca2a22f4e30578 +bpf-next 3cb12d27ff655e57e8efe3486dca2a22f4e30578 +ipsec-next 61e7113e48d3ca1ea692b5c6376a4b545b312166 +mlx5-next 3650b228f83adda7e5ee532e2b90429c03f7b9ec +netfilter-next 3cb12d27ff655e57e8efe3486dca2a22f4e30578 +ipvs-next c2568c8c9e636a56abf31da4b28b65d3ded02524 +wireless-drivers-next 3650b228f83adda7e5ee532e2b90429c03f7b9ec +bluetooth 44d59235ace59f8b493044d693174e60b571e2e1 +mac80211-next 3cb12d27ff655e57e8efe3486dca2a22f4e30578 +gfs2 bedb0f056faa94e953e7b3da5a77d25e0008364b +mtd 6402f4ce95811db7df72244ca84860332e4c2518 +nand 88e315d12fbb50c0bd12549bb04a051a4b4bc744 +spi-nor 9a3422a110c868e511387a81df25a315eaa3a7b8 +crypto 3093e7c16e12d729c325adb3c53dde7308cefbd8 +drm b45b6fbc671c60f56fd119c443e5570f83175928 +amdgpu 02c3d98ce25b3e4f0b8e830be054c8f4f7f944c1 +drm-intel 5c6c13cd1102caf92d006a3cf4591c0229019daf +drm-tegra d9f980ebcd01d90a2a76ea2383c925abf9223cab +drm-misc 70bb9193728627e84e02eb0960b0aa138ae2cef5 +drm-msm d1ea914925856d397b0b3241428f20b945e31434 +mali-dp f634c6a8028789b05a9277a3d51303829ae29547 +imx-drm a67d5088ceb8c6143110c46ef1bd2d126dc1ac36 +etnaviv 3136fed4f91e02ad754464bf1ec15e22b800cc69 +regmap f243af4d473ba590a043a4ee878df983d523014f +sound ad26098970b637f4565b110df929d74eb2c2652e +sound-asoc 9f5beb42260c4cda64b2594f1a04b987f97dd84f +modules fdf09ab887829cd1b671e45d9549f8ec1ffda0fa +input 8a30c6eb29e036f729b4dd6982462ca15d062087 +block 2120d12a2ad30f1c0f0fc108338d499a735504fc +device-mapper 681cc5e8667e8579a2da8fa4090c48a2d73fc3bb +pcmcia 46d0797906633d82bd50ef26780ee39fac5d27d6 +mmc 3e4fb4346c781068610d03c12b16c0cfb0fd24a3 +mfd 6d81dc3c79d46b66b29712eb1ac5ad2cbe4231d2 +backlight 97ecfda1a8ffc5ffc9681d0dfa65fd5b39839dfe +battery 7007fab4ae82c092cb52691c338f1b776005e32b +regulator 4a65ab4941e73b31573a48e58e5d269f2730fcf3 +security bc62d68e2a0a69fcdcf28aca8edb01abf306b698 +apparmor e37986097ba63c94b1af9d5ad5486d120a809f72 +integrity aa662fc04f5b290b3979332588bf8d812b189962 +keys b6f61c31464940513ef4eccb3a030a405b4256d6 +safesetid 03ca0ec138927b16fab0dad7b869f42eb2849c94 +selinux 0d50f059c4cdc9e436f6f4db8779ac0795bfdadf +smack edd615371b668404d06699c04f5f90c4f438814a +tomoyo ae7e63d1e34a6df87ef68692593d6d6f89448739 +tpmdd d3b03163a328f8680119bf93c9534e0f018e2a0b +watchdog 3650b228f83adda7e5ee532e2b90429c03f7b9ec +iommu 7e3c3883c381aeda903778d7e99fc4cd523be610 +audit c07203516439b9cd9f7b3cbed82a77164de5af40 +devicetree bd36e51d10e7c2b7d39ffa7d075aed98a8e7473c +mailbox c7dacf5b0f32957b24ef29df1207dc2cd8307743 +spi e00ee68dc1f7ac4efc748c9258defa9fce2ba3a0 +tip 65609b26b21a169a05d1482db6c1b52d8a4abe0d +clockevents f087e452f27e6342f938b92b2254b077bf1d9145 +edac f09056c1decec889721c24c72f99730376918044 +irqchip a7480c5d725c4ecfc627e70960f249c34f5d13e8 +ftrace e1981f75d398c0afe83c8ffa4e5864f037967409 +rcu a9863c90f5031a8fde56351f09fade3cec3ea4f0 +kvm e792415c5d3e0eb52527cce228a72e4392f8cae2 +kvm-arm 4e5dc64c43192b4fd4c96ac150a8f013065f5f5b +kvm-ppc cf59eb13e151ef42c37ae31864046c17e481ed8f +kvms390 23a60f834406c8e3805328b630d09d5546b460c1 +xen-tip 1a89c1dc9520b908e7894652ee2b19db9de37b64 +percpu 38cabe062b968251c24e7147fc0bde095e3ecb38 +workqueues 10cdb15759540f03d056e2f73fe26377ed7dcfda +drivers-x86 3650b228f83adda7e5ee532e2b90429c03f7b9ec +chrome-platform 3650b228f83adda7e5ee532e2b90429c03f7b9ec +hsi bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +leds 3650b228f83adda7e5ee532e2b90429c03f7b9ec +ipmi 9ff9b0d392ea08090cd1780fb196f36dbb586529 +driver-core 3650b228f83adda7e5ee532e2b90429c03f7b9ec +usb 3650b228f83adda7e5ee532e2b90429c03f7b9ec +usb-gadget b2c586eb07efab982419f32b7c3bd96829bc8bcd +usb-serial 3650b228f83adda7e5ee532e2b90429c03f7b9ec +usb-chipidea-next 71ac680e6339e744d87647a1ca27b2e87dba2eac +phy-next 60f5a24c11f7fa0c8c74018cfd4c25a3f432fdaf +tty 3650b228f83adda7e5ee532e2b90429c03f7b9ec +char-misc 3650b228f83adda7e5ee532e2b90429c03f7b9ec +extcon ca26071da1bbdb2a8c1317201e93b53b3da850c3 +soundwire 0173f525b2c1b02a51784e2119d434593235aed1 +thunderbolt 3650b228f83adda7e5ee532e2b90429c03f7b9ec +vfio 2e6cfd496f5b57034cf2aec738799571b5a52124 +staging 9ab476ba001ead1f64430a3a61c9466ac0fa91ed +mux 05f19f7f8944b6a269b2ac152bceaa322138be6b +icc 266cd33b59138501579c64648f54b93eab2e5adf +dmaengine fc143e38ddd47d3b01ac276786ee78edf053bf5d +cgroup 65026da59cda16baf6c3e98b74ec439f366e468f +scsi 9dcbbd959cef85b74ec52d83bc0129244c519ae2 +scsi-mkp f24a69a43c951fc9e73998ee614ddfa2e04a7912 +vhost 70a62fce262854c4aabaa47e46e82fce9f3f3938 +rpmsg 49a29612d7cfd0365d257a7a81914227878bebdd +gpio 3d6e8262d3c09479c65e59939df6ca3c0ad7f750 +gpio-brgl 95d9f84fca1ef1bbbc2be6313e29181c7f0de99f +gpio-intel 3650b228f83adda7e5ee532e2b90429c03f7b9ec +pinctrl c348abca14dc51890bc07ce8f63538dea6d0bc3c +pinctrl-intel 3650b228f83adda7e5ee532e2b90429c03f7b9ec +pinctrl-samsung c5564a50d99019f3c713fa306d5feecc3e909b10 +pwm 3b1954cd57bf7648417c593d60eac1ec661ad514 +userns 7fce69dff8db30cb93aace0bbebda09972027af7 +ktest ff131efff141fc679cccde28bc265f4c79cbe329 +random ab9a7e27044b87ff2be47b8f8e095400e7fccc44 +kselftest 3650b228f83adda7e5ee532e2b90429c03f7b9ec +y2038 c4e71212a245017d2ab05f322f7722f0b87a55da +livepatching 59fc1e476962eff9ef259355a9daf912b563aac0 +coresight 4e96d5cc25f398e2b085091bb5d94c01f6d66c8d +rtc 3650b228f83adda7e5ee532e2b90429c03f7b9ec +nvdimm a1b8638ba1320e6684aa98233c15255eb803fac7 +at24 3650b228f83adda7e5ee532e2b90429c03f7b9ec +ntb 3650b228f83adda7e5ee532e2b90429c03f7b9ec +seccomp dfe719fef03d752f1682fa8aeddf30ba501c8555 +kspp 9b80e4c4ddaca3501177ed41e49d0928ba2122a8 +gnss 48778464bb7d346b47157d21ffde2af6b2d39110 +fsi 4a851d714eadeabd65c7e321a2e7830f77d945c4 +slimbus c3e02abdf9afdef213530970ab015b64b0f8bbb8 +nvmem d9dc6001196e268449b3be4d955f2aefc338324c +xarray fb11305101c217e1cba2e1b48326901e8e3c39d7 +hyperv 626b901f60446355e35e8c76c6b391a7d7491203 +auxdisplay bbf5c979011a099af5dc76498918ed7df445635b +kgdb d081a6e353168f15e63eb9e9334757f20343319f +pidfd e06ce5515b74f628b78677e6736f66f6abb89b00 +hmm 3650b228f83adda7e5ee532e2b90429c03f7b9ec +fpga cbadbf5a53b5ca892132ca91dc60b24c80dc6fa8 +kunit 3650b228f83adda7e5ee532e2b90429c03f7b9ec +generic-ioremap 4bdc0d676a643140bdf17dbf7eafedee3d496a3c +cfi 5de15b610f785f0e188fefb707f0b19de156968a +kunit-next 3650b228f83adda7e5ee532e2b90429c03f7b9ec +trivial 9ff9b0d392ea08090cd1780fb196f36dbb586529 +zx2c4 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e +mhi 298edb32160f6ae0595ec05a1cc4fdd1d4d8db18 +notifications 841a0dfa511364fa9a8d67512e0643669f1f03e3 +memblock 762d4d1a174c2b2f1181ef284769e4cba7d2b11c +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters 2095725c325bed4fde39f5be20c46f618e934c9d +akpm-current c8a1d90e0bddc20caf26f2b4cdef60cb526e45bf +akpm 046effab9e3ff6fb737167639088e4e873c8afbb diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..d0164da5c4be --- /dev/null +++ b/Next/Trees @@ -0,0 +1,330 @@ +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#fixes +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#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/netdev/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/phy/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 +dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.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.kernel.org/pub/scm/linux/kernel/git/pdx86/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 +integrity-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#fixes +kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +ubifs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#fixes +memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.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 +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 +drivers-memory git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.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.kernel.org/pub/scm/linux/kernel/git/gclement/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 +raspberrypi git git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.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 +ti-k3 git git://git.kernel.org/pub/scm/linux/kernel/git/kristo/linux.git#ti-k3-next +ti-k3-new git git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux.git#ti-k3-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 +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 +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh git git://git.libc.org/linux-sh#for-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 +exfat git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.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 +cel git git://git.linux-nfs.org/projects/cel/cel-2.6.git#cel-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.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#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 +zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.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/printk/linux.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 git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +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 +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +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/netdev/net-next.git#master +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +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 +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.git#drm-next +amdgpu git git://people.freedesktop.org/~agd5f/linux#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +mali-dp git git://linux-arm.org/linux-ld#for-upstream/mali-dp +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +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 +safesetid git https://github.com/micah-morton/linux.git#safesetid-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#next +tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master +tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/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 +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.kernel.org/pub/scm/linux/kernel/git/pdx86/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/phy/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 +vfio git git://github.com/awilliam/linux-vfio.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 +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.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 +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +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/xarray.git#main +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 +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 +generic-ioremap git git://git.infradead.org/users/hch/ioremap.git#for-next +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +zx2c4 git git://git.kernel.org/pub/scm/linux/kernel/git/zx2c4/linux.git#for-next +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +notifications git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#notifications-pipe-core +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +init git git://git.infradead.org/users/hch/misc.git#init-user-pointers +counters git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#counters +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..e744ff636864 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3731 @@ +$ date -R +Tue, 27 Oct 2020 08:48:02 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 986b9eacb259 kernel/sys.c: fix prototype of prctl_get_tid_address() +Merging origin/master (41ba50b0572e Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge origin/master +Updating 986b9eacb259..41ba50b0572e +Fast-forward + Makefile | 4 ++-- + arch/arc/include/asm/linkage.h | 8 ++++---- + arch/arc/include/asm/mach_desc.h | 2 +- + arch/arc/plat-hsdk/platform.c | 2 +- + arch/arm/include/asm/cache.h | 2 +- + arch/arm/include/asm/cpuidle.h | 2 +- + arch/arm/include/asm/idmap.h | 2 +- + arch/arm/include/asm/mach/arch.h | 4 ++-- + arch/arm/include/asm/setup.h | 2 +- + arch/arm/include/asm/smp.h | 2 +- + arch/arm/include/asm/tcm.h | 8 ++++---- + arch/arm/kernel/cpuidle.c | 2 +- + arch/arm/kernel/devtree.c | 2 +- + arch/arm64/include/asm/cache.h | 2 +- + arch/arm64/kernel/efi.c | 2 +- + arch/arm64/kernel/smp_spin_table.c | 2 +- + arch/arm64/mm/mmu.c | 2 +- + arch/csky/include/asm/tcm.h | 8 ++++---- + arch/ia64/include/asm/cache.h | 2 +- + arch/microblaze/kernel/setup.c | 2 +- + arch/mips/include/asm/cache.h | 2 +- + arch/mips/include/asm/machine.h | 2 +- + arch/mips/kernel/setup.c | 2 +- + arch/mips/mm/init.c | 2 +- + arch/parisc/include/asm/cache.h | 2 +- + arch/parisc/include/asm/ldcw.h | 2 +- + arch/parisc/kernel/ftrace.c | 2 +- + arch/parisc/mm/init.c | 6 +++--- + arch/powerpc/include/asm/cache.h | 2 +- + arch/powerpc/include/asm/machdep.h | 2 +- + arch/powerpc/kernel/btext.c | 2 +- + arch/powerpc/kernel/prom_init.c | 2 +- + arch/powerpc/kvm/book3s_64_vio_hv.c | 2 +- + arch/riscv/include/asm/soc.h | 4 ++-- + arch/riscv/kernel/cpu_ops.c | 4 ++-- + arch/riscv/kernel/setup.c | 4 ++-- + arch/s390/boot/startup.c | 2 +- + arch/s390/include/asm/cache.h | 2 +- + arch/s390/include/asm/sections.h | 4 ++-- + arch/s390/mm/init.c | 2 +- + arch/sh/boards/of-generic.c | 2 +- + arch/sh/include/asm/cache.h | 2 +- + arch/sh/include/asm/machvec.h | 2 +- + arch/sh/include/asm/smp.h | 2 +- + arch/sparc/include/asm/cache.h | 2 +- + arch/sparc/kernel/btext.c | 2 +- + arch/um/include/shared/init.h | 22 +++++++++++----------- + arch/um/kernel/skas/clone.c | 2 +- + arch/um/kernel/um_arch.c | 2 +- + arch/x86/boot/compressed/pgtable_64.c | 8 ++++---- + arch/x86/boot/tty.c | 8 ++++---- + arch/x86/boot/video.h | 2 +- + arch/x86/crypto/poly1305_glue.c | 1 + + arch/x86/include/asm/apic.h | 4 ++-- + arch/x86/include/asm/cache.h | 2 +- + arch/x86/include/asm/intel-mid.h | 2 +- + arch/x86/include/asm/irqflags.h | 2 +- + arch/x86/include/asm/mem_encrypt.h | 2 +- + arch/x86/include/asm/setup.h | 2 +- + arch/x86/kernel/cpu/cpu.h | 2 +- + arch/x86/kernel/head64.c | 2 +- + arch/x86/mm/mem_encrypt.c | 6 +++--- + arch/x86/mm/mem_encrypt_identity.c | 2 +- + arch/x86/platform/pvh/enlighten.c | 4 ++-- + arch/x86/purgatory/purgatory.c | 4 ++-- + arch/x86/um/stub_segv.c | 2 +- + arch/x86/xen/enlighten.c | 2 +- + arch/x86/xen/enlighten_pvh.c | 2 +- + arch/xtensa/kernel/setup.c | 2 +- + drivers/clk/clk.c | 2 +- + drivers/clocksource/timer-probe.c | 2 +- + drivers/irqchip/irqchip.c | 2 +- + drivers/of/of_reserved_mem.c | 2 +- + drivers/thermal/thermal_core.h | 2 +- + fs/cachefiles/rdwr.c | 3 ++- + fs/xfs/xfs_message.h | 2 +- + include/asm-generic/bug.h | 6 +++--- + include/asm-generic/error-injection.h | 2 +- + include/asm-generic/kprobes.h | 4 ++-- + include/kunit/test.h | 2 +- + include/linux/acpi.h | 4 ++-- + include/linux/cache.h | 2 +- + include/linux/compiler.h | 8 ++++---- + include/linux/compiler_attributes.h | 2 +- + include/linux/cpu.h | 2 +- + include/linux/dynamic_debug.h | 2 +- + include/linux/export.h | 2 +- + include/linux/firmware.h | 2 +- + include/linux/init.h | 34 +++++++++++++++++----------------- + include/linux/init_task.h | 4 ++-- + include/linux/interrupt.h | 4 ++-- + include/linux/kernel.h | 6 +++--- + include/linux/linkage.h | 4 ++-- + include/linux/lsm_hooks.h | 4 ++-- + include/linux/module.h | 2 +- + include/linux/moduleparam.h | 4 ++-- + include/linux/mtd/xip.h | 2 +- + include/linux/objtool.h | 2 +- + include/linux/of.h | 2 +- + include/linux/percpu-defs.h | 2 +- + include/linux/printk.h | 4 ++-- + include/linux/rcupdate.h | 2 +- + include/linux/sched/debug.h | 2 +- + include/linux/serial_core.h | 2 +- + include/linux/spinlock.h | 2 +- + include/linux/syscalls.h | 6 +++--- + include/linux/trace_events.h | 2 +- + include/linux/tracepoint.h | 8 ++++---- + include/trace/bpf_probe.h | 2 +- + include/trace/trace_events.h | 10 +++++----- + kernel/kallsyms.c | 4 ++-- + kernel/sched/deadline.c | 2 +- + kernel/sched/fair.c | 2 +- + kernel/sched/idle.c | 2 +- + kernel/sched/rt.c | 2 +- + kernel/sched/stop_task.c | 2 +- + kernel/trace/trace.h | 2 +- + kernel/trace/trace_export.c | 2 +- + scripts/mod/modpost.c | 4 ++-- + tools/include/linux/objtool.h | 2 +- + 120 files changed, 201 insertions(+), 199 deletions(-) +Merging fixes/fixes (9123e3a74ec7 Linux 5.9-rc1) +$ git merge fixes/fixes +Already up to date. +Merging kbuild-current/fixes (f11901ed723d Merge tag 'xfs-5.10-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (3650b228f83a Linux 5.10-rc1) +$ git merge arc-current/for-curr +Already up to date. +Merging arm-current/fixes (9123e3a74ec7 Linux 5.9-rc1) +$ git merge arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (0fa97e9403c7 arm64: vdso32: Allow ld.lld to properly link the VDSO) +$ git merge arm64-fixes/for-next/fixes +Merge made by the 'recursive' strategy. + arch/arm64/kernel/vdso32/Makefile | 23 ++++++++++++----------- + 1 file changed, 12 insertions(+), 11 deletions(-) +Merging arm-soc-fixes/arm/fixes (dff61e683e74 Merge tag 'imx-fixes-5.10' 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. + CREDITS | 9 +++++++++ + .../sram/allwinner,sun4i-a10-system-control.yaml | 3 +++ + MAINTAINERS | 11 ++--------- + arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts | 4 ++-- + arch/arm/boot/dts/mmp3.dtsi | 2 ++ + arch/arm/boot/dts/sun4i-a10.dtsi | 2 +- + arch/arm/configs/imx_v6_v7_defconfig | 1 + + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/mach-mvebu/coherency_ll.S | 7 +------ + arch/arm64/Kconfig.platforms | 1 + + .../marvell/armada-3720-espressobin-v7-emmc.dts | 10 ++++++++-- + .../dts/marvell/armada-3720-espressobin-v7.dts | 10 ++++++++-- + .../boot/dts/marvell/armada-3720-espressobin.dtsi | 12 ++++++++---- + arch/arm64/configs/defconfig | 1 + + drivers/firmware/arm_scmi/base.c | 2 ++ + drivers/firmware/arm_scmi/clock.c | 2 ++ + drivers/firmware/arm_scmi/common.h | 2 ++ + drivers/firmware/arm_scmi/driver.c | 8 ++++++++ + drivers/firmware/arm_scmi/notify.c | 22 ++++++++++++++-------- + drivers/firmware/arm_scmi/perf.c | 2 ++ + drivers/firmware/arm_scmi/reset.c | 4 +--- + drivers/firmware/arm_scmi/sensors.c | 2 ++ + drivers/firmware/arm_scmi/smc.c | 2 +- + drivers/tee/tee_core.c | 3 ++- + 24 files changed, 84 insertions(+), 39 deletions(-) +Merging drivers-memory-fixes/fixes (3650b228f83a Linux 5.10-rc1) +$ git merge drivers-memory-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (50c5feeea0af ide/macide: Convert Mac IDE driver to platform driver) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (4ff753feab02 powerpc/pseries: Avoid using addr_to_pfn in real mode) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (8e90b4b1305a s390: correct __bootdata / __bootdata_preserved macros) +$ git merge s390-fixes/fixes +Already up to date. +Merging sparc/master (0a95a6d1a4cd sparc: use for_each_child_of_node() macro) +$ git merge sparc/master +Auto-merging arch/sparc/kernel/signal_64.c +Auto-merging arch/sparc/kernel/signal_32.c +Auto-merging arch/sparc/Kconfig +Merge made by the 'recursive' strategy. + arch/sparc/Kconfig | 2 +- + arch/sparc/boot/piggyback.c | 4 ++++ + arch/sparc/include/asm/backoff.h | 2 +- + arch/sparc/include/asm/pgtsrmmu.h | 2 +- + arch/sparc/kernel/pci.c | 3 +-- + arch/sparc/kernel/viohs.c | 6 ++---- + arch/sparc/lib/memset.S | 1 + + arch/sparc/mm/srmmu.c | 18 +++++++++--------- + 8 files changed, 20 insertions(+), 18 deletions(-) +Merging fscrypt-current/for-stable (2b4eae95c736 fscrypt: don't evict dirty inodes after removing key) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (435ccfa894e3 tcp: Prevent low rmem stalls with SO_RCVLOWAT.) +$ git merge net/master +Merge made by the 'recursive' strategy. + .../chelsio/inline_crypto/chtls/chtls_io.c | 7 +++- + drivers/net/ethernet/freescale/ucc_geth.c | 2 +- + drivers/net/ethernet/pensando/ionic/ionic_dev.c | 4 +- + drivers/net/ethernet/pensando/ionic/ionic_dev.h | 2 + + drivers/net/ethernet/pensando/ionic/ionic_fw.c | 6 +-- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 29 +++++++------ + drivers/net/ethernet/pensando/ionic/ionic_main.c | 4 +- + drivers/net/ethernet/pensando/ionic/ionic_stats.h | 2 +- + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 47 ++++++++-------------- + drivers/net/ethernet/pensando/ionic/ionic_txrx.h | 1 - + drivers/net/ipa/gsi_trans.c | 21 +++++++--- + net/ipv4/tcp.c | 2 + + net/ipv4/tcp_input.c | 3 +- + 13 files changed, 65 insertions(+), 65 deletions(-) +Merging bpf/master (472547778de2 selftest/bpf: Fix profiler test using CO-RE relocation for enums) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + tools/testing/selftests/bpf/progs/profiler.inc.h | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) +Merging ipsec/master (a779d91314ca net: xfrm: fix a race condition during allocing spi) +$ git merge ipsec/master +Auto-merging net/xfrm/xfrm_state.c +Auto-merging net/xfrm/xfrm_interface.c +Merge made by the 'recursive' strategy. + net/ipv4/xfrm4_tunnel.c | 4 ++-- + net/ipv6/xfrm6_tunnel.c | 4 ++-- + net/xfrm/xfrm_interface.c | 8 ++++---- + net/xfrm/xfrm_state.c | 8 +++++--- + 4 files changed, 13 insertions(+), 11 deletions(-) +Merging netfilter/master (c77761c8a594 netfilter: nf_fwd_netdev: clear timestamp in forwarding path) +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (48d072c4e8cd selftests: netfilter: add time counter check) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (3650b228f83a Linux 5.10-rc1) +$ git merge wireless-drivers/master +Already up to date. +Merging mac80211/master (435ccfa894e3 tcp: Prevent low rmem stalls with SO_RCVLOWAT.) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (3650b228f83a Linux 5.10-rc1) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (2a6eca16f376 ALSA: make snd_kcontrol_new name a normal string) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + include/sound/control.h | 2 +- + include/sound/core.h | 3 ++- + include/sound/pcm.h | 4 ++-- + include/uapi/sound/compress_offload.h | 2 +- + sound/core/control.c | 4 ++-- + sound/core/pcm_dmaengine.c | 3 ++- + sound/core/pcm_lib.c | 2 +- + sound/core/pcm_native.c | 4 ++-- + sound/soc/soc-core.c | 2 +- + sound/soc/soc-dapm.c | 2 +- + 10 files changed, 15 insertions(+), 13 deletions(-) +Merging sound-asoc-fixes/for-linus (8099fe48df2c Merge remote-tracking branch 'asoc/for-5.10' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Auto-merging sound/soc/codecs/wsa881x.c +Merge made by the 'recursive' strategy. + sound/soc/codecs/cs42l51.c | 22 +++++++++++- + sound/soc/codecs/wsa881x.c | 2 ++ + sound/soc/intel/Kconfig | 18 ---------- + sound/soc/intel/atom/Makefile | 2 +- + sound/soc/intel/atom/sst/Makefile | 6 ++-- + sound/soc/intel/boards/kbl_rt5663_max98927.c | 39 +++++++++++++++++----- + sound/soc/intel/catpt/dsp.c | 9 +++-- + sound/soc/intel/catpt/pcm.c | 10 ++++++ + sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 31 +++++++++++++---- + sound/soc/qcom/sdm845.c | 2 ++ + sound/soc/sof/loader.c | 5 +++ + 11 files changed, 106 insertions(+), 40 deletions(-) +Merging regmap-fixes/for-linus (3493d90df3aa Merge remote-tracking branch 'regmap/for-5.10' into regmap-linus) +$ git merge regmap-fixes/for-linus +Already up to date! +Merge made by the 'recursive' strategy. +Merging regulator-fixes/for-linus (dc3afaa95f47 Merge remote-tracking branch 'regulator/for-5.10' into regulator-linus) +$ git merge regulator-fixes/for-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 8 ++++++++ + 1 file changed, 8 insertions(+) +Merging spi-fixes/for-linus (91cbcc28a2ee Merge remote-tracking branch 'spi/for-5.10' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/spi/spi-imx.c | 23 +++++++++++++++-------- + 1 file changed, 15 insertions(+), 8 deletions(-) +Merging pci-current/for-linus (3650b228f83a Linux 5.10-rc1) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (3650b228f83a Linux 5.10-rc1) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (3650b228f83a Linux 5.10-rc1) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (3650b228f83a Linux 5.10-rc1) +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (51609fba0cca usb: dwc3: simple: add support for Hikey 970) +$ git merge usb-gadget-fixes/fixes +Auto-merging drivers/usb/dwc3/gadget.h +Auto-merging drivers/usb/dwc3/gadget.c +CONFLICT (content): Merge conflict in drivers/usb/dwc3/gadget.c +Auto-merging drivers/usb/dwc3/ep0.c +Auto-merging drivers/usb/dwc3/dwc3-of-simple.c +CONFLICT (content): Merge conflict in drivers/usb/dwc3/dwc3-of-simple.c +Auto-merging drivers/usb/dwc3/core.h +Auto-merging drivers/usb/cdns3/gadget.c +CONFLICT (content): Merge conflict in drivers/usb/cdns3/gadget.c +Resolved 'drivers/usb/cdns3/gadget.c' using previous resolution. +Resolved 'drivers/usb/dwc3/dwc3-of-simple.c' using previous resolution. +Resolved 'drivers/usb/dwc3/gadget.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4c9177b52d5f] Merge remote-tracking branch 'usb-gadget-fixes/fixes' into master +$ git diff -M --stat --summary HEAD^.. +Merging usb-serial-fixes/usb-linus (3650b228f83a Linux 5.10-rc1) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/ci-for-usb-stable (2d79b3360dcc usb: chipidea: core: add wakeup support for extcon) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Auto-merging drivers/usb/chipidea/core.c +Merge made by the 'recursive' strategy. +Merging phy/fixes (850280156f64 phy: ti: am654: Fix a leak in serdes_am654_probe()) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (3650b228f83a Linux 5.10-rc1) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (3650b228f83a Linux 5.10-rc1) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (3fbbf2148a40 soundwire: fix double free of dangling pointer) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (7342ca34d931 thunderbolt: Add the missed ida_simple_remove() in ring_request_msix()) +$ git merge thunderbolt-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/thunderbolt/nhi.c | 19 +++++++++++++++---- + 1 file changed, 15 insertions(+), 4 deletions(-) +Merging input-current/for-linus (bb0bc0cfeabc Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up to date. +Merging crypto-current/master (c3a98c3ad5c0 crypto: x86/poly1305 - add back a needed assignment) +$ git merge crypto-current/master +Already up to date. +Merging ide/master (6800cd8cbc6e ide-acpi: use %*ph to print small buffer) +$ git merge ide/master +Auto-merging include/linux/ide.h +Auto-merging drivers/ide/sis5513.c +Auto-merging drivers/ide/ide-acpi.c +Auto-merging drivers/ide/hpt366.c +Auto-merging drivers/ide/Kconfig +Merge made by the 'recursive' strategy. + drivers/ide/Kconfig | 2 +- + drivers/ide/aec62xx.c | 3 +-- + drivers/ide/alim15x3.c | 3 +-- + drivers/ide/amd74xx.c | 3 +-- + drivers/ide/atiixp.c | 3 +-- + drivers/ide/cmd64x.c | 3 +-- + drivers/ide/cs5520.c | 3 +-- + drivers/ide/cs5530.c | 3 +-- + drivers/ide/cs5535.c | 3 +-- + drivers/ide/cs5536.c | 3 +-- + drivers/ide/cy82c693.c | 3 +-- + drivers/ide/delkin_cb.c | 32 ++++++-------------------------- + drivers/ide/hpt366.c | 5 ++--- + drivers/ide/ide-acpi.c | 5 +---- + drivers/ide/ide-pci-generic.c | 3 +-- + drivers/ide/it8172.c | 3 +-- + drivers/ide/it8213.c | 3 +-- + drivers/ide/it821x.c | 3 +-- + drivers/ide/jmicron.c | 3 +-- + drivers/ide/ns87415.c | 3 +-- + drivers/ide/opti621.c | 3 +-- + drivers/ide/pdc202xx_new.c | 3 +-- + drivers/ide/pdc202xx_old.c | 3 +-- + drivers/ide/piix.c | 3 +-- + drivers/ide/sc1200.c | 43 ++++++++++++++----------------------------- + drivers/ide/serverworks.c | 3 +-- + drivers/ide/setup-pci.c | 29 ++++++----------------------- + drivers/ide/siimage.c | 3 +-- + drivers/ide/sis5513.c | 3 +-- + drivers/ide/sl82c105.c | 3 +-- + drivers/ide/slc90e66.c | 3 +-- + drivers/ide/triflex.c | 24 ++++++++---------------- + drivers/ide/via82cxxx.c | 3 +-- + include/linux/ide.h | 8 +------- + 34 files changed, 65 insertions(+), 161 deletions(-) +Merging vfio-fixes/for-linus (aae7a75a821a vfio/type1: Add proper error unwind for vfio_iommu_replay()) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (3650b228f83a Linux 5.10-rc1) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (549738f15da0 Linux 5.9-rc8) +$ git merge dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (219d54332a09 Linux 5.4) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (3aee8a3a88fa mtd: rawnand: ifc: Move the ECC engine initialization to the right place) +$ git merge mtd-fixes/mtd/fixes +Merge made by the 'recursive' strategy. + drivers/mtd/nand/raw/fsl_ifc_nand.c | 43 +++++++++++++++++++++---------------- + drivers/mtd/nand/raw/mxc_nand.c | 17 +++++---------- + 2 files changed, 29 insertions(+), 31 deletions(-) +Merging mfd-fixes/for-mfd-fixes (22380b65dc70 mfd: mfd-core: Ensure disabled devices are ignored without error) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (d0254f82d702 media: dt-bindings: media: imx274: Convert to json-schema) +$ git merge v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (3650b228f83a Linux 5.10-rc1) +$ git merge mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (8f04aea048d5 ARM: OMAP2+: Restore MPU power domain if cpu_cluster_pm_enter() fails) +$ git merge omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (77377064c3a9 KVM: ioapic: break infinite recursion on lazy EOI) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (f20d4e924b44 docs: kvm: add documentation for KVM_CAP_S390_DIAG318) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (18360b33a071 hwmon: (w83627ehf) Fix a resource leak in probe) +$ git merge hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (88b67edd7247 dax: Fix compilation for CONFIG_DAX && !CONFIG_FS_DAX) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging btrfs-fixes/next-fixes (03625d96c829 Merge branch 'misc-5.10' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Auto-merging fs/btrfs/disk-io.c +Merge made by the 'recursive' strategy. + fs/btrfs/backref.c | 13 ++++- + fs/btrfs/block-group.c | 1 + + fs/btrfs/ctree.h | 2 + + fs/btrfs/dev-replace.c | 5 ++ + fs/btrfs/disk-io.c | 139 ++++++++++++++++++++++++++++++++++-------------- + fs/btrfs/disk-io.h | 3 ++ + fs/btrfs/extent-tree.c | 2 +- + fs/btrfs/file.c | 3 +- + fs/btrfs/inode.c | 8 ++- + fs/btrfs/qgroup.c | 18 +++++++ + fs/btrfs/reada.c | 47 ++++++++++++++++ + fs/btrfs/tree-checker.c | 18 +++++++ + fs/btrfs/volumes.c | 5 +- + fs/btrfs/volumes.h | 12 ++--- + 14 files changed, 225 insertions(+), 51 deletions(-) +Merging vfs-fixes/fixes (8a018eb55e3a pipe: Fix memory leaks in create_pipe_files()) +$ git merge vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (892fc9f6835e dma-pool: Fix an uninitialized variable bug in atomic_pool_expand()) +$ 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 (3650b228f83a Linux 5.10-rc1) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (3650b228f83a Linux 5.10-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/pinctrl-fixes (3650b228f83a Linux 5.10-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (f84e2c5c528d dt-bindings: Another round of adding missing 'additionalProperties/unevalutatedProperties') +$ git merge devicetree-fixes/dt/linus +Removing Documentation/devicetree/bindings/input/cros-ec-keyb.txt +Removing Documentation/devicetree/bindings/i2c/i2c-cros-ec-tunnel.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/actions.yaml | 2 + + Documentation/devicetree/bindings/arm/altera.yaml | 3 + + .../devicetree/bindings/arm/amazon,al.yaml | 2 + + Documentation/devicetree/bindings/arm/amlogic.yaml | 3 + + .../devicetree/bindings/arm/arm,integrator.yaml | 2 + + .../devicetree/bindings/arm/arm,realview.yaml | 2 + + .../devicetree/bindings/arm/arm,versatile.yaml | 2 + + .../devicetree/bindings/arm/arm,vexpress-juno.yaml | 2 + + .../devicetree/bindings/arm/atmel-at91.yaml | 2 + + Documentation/devicetree/bindings/arm/axxia.yaml | 2 + + .../devicetree/bindings/arm/bcm/bcm2835.yaml | 2 + + .../devicetree/bindings/arm/bcm/brcm,bcm11351.yaml | 2 + + .../devicetree/bindings/arm/bcm/brcm,bcm21664.yaml | 2 + + .../devicetree/bindings/arm/bcm/brcm,bcm23550.yaml | 2 + + .../devicetree/bindings/arm/bcm/brcm,bcm4708.yaml | 3 + + .../devicetree/bindings/arm/bcm/brcm,cygnus.yaml | 2 + + .../devicetree/bindings/arm/bcm/brcm,hr2.yaml | 2 + + .../devicetree/bindings/arm/bcm/brcm,ns2.yaml | 2 + + .../devicetree/bindings/arm/bcm/brcm,nsp.yaml | 2 + + .../devicetree/bindings/arm/bcm/brcm,stingray.yaml | 2 + + .../bindings/arm/bcm/brcm,vulcan-soc.yaml | 2 + + Documentation/devicetree/bindings/arm/bitmain.yaml | 3 + + Documentation/devicetree/bindings/arm/calxeda.yaml | 2 + + .../devicetree/bindings/arm/digicolor.yaml | 2 + + Documentation/devicetree/bindings/arm/fsl.yaml | 2 + + .../bindings/arm/hisilicon/hisilicon.yaml | 3 + + .../devicetree/bindings/arm/intel,keembay.yaml | 3 + + .../devicetree/bindings/arm/intel-ixp4xx.yaml | 2 + + .../bindings/arm/keystone/ti,k3-sci-common.yaml | 2 + + .../bindings/arm/marvell/armada-7k-8k.yaml | 2 + + .../devicetree/bindings/arm/mediatek.yaml | 3 + + .../devicetree/bindings/arm/microchip,sparx5.yaml | 2 + + Documentation/devicetree/bindings/arm/moxart.yaml | 1 + + .../devicetree/bindings/arm/mrvl/mrvl.yaml | 3 + + .../devicetree/bindings/arm/mstar/mstar.yaml | 2 + + .../devicetree/bindings/arm/nxp/lpc32xx.yaml | 2 + + Documentation/devicetree/bindings/arm/qcom.yaml | 2 + + Documentation/devicetree/bindings/arm/rda.yaml | 2 + + Documentation/devicetree/bindings/arm/realtek.yaml | 3 + + Documentation/devicetree/bindings/arm/renesas.yaml | 2 + + .../devicetree/bindings/arm/rockchip.yaml | 3 + + .../bindings/arm/samsung/samsung-boards.yaml | 2 + + Documentation/devicetree/bindings/arm/sirf.yaml | 3 + + .../bindings/arm/socionext/milbeaut.yaml | 3 + + .../bindings/arm/socionext/uniphier.yaml | 2 + + Documentation/devicetree/bindings/arm/spear.yaml | 3 + + .../devicetree/bindings/arm/sprd/sprd.yaml | 2 + + Documentation/devicetree/bindings/arm/sti.yaml | 3 + + .../devicetree/bindings/arm/stm32/stm32.yaml | 11 ++- + Documentation/devicetree/bindings/arm/sunxi.yaml | 2 + + Documentation/devicetree/bindings/arm/tegra.yaml | 2 + + Documentation/devicetree/bindings/arm/ti/k3.yaml | 3 + + .../devicetree/bindings/arm/ti/nspire.yaml | 3 + + .../devicetree/bindings/arm/ti/ti,davinci.yaml | 3 + + Documentation/devicetree/bindings/arm/toshiba.yaml | 3 + + Documentation/devicetree/bindings/arm/ux500.yaml | 2 + + Documentation/devicetree/bindings/arm/vt8500.yaml | 3 + + Documentation/devicetree/bindings/arm/xilinx.yaml | 2 + + Documentation/devicetree/bindings/arm/zte.yaml | 2 + + .../bindings/display/bridge/toshiba,tc358775.yaml | 38 ++++---- + .../bindings/display/panel/ilitek,ili9881c.yaml | 5 +- + .../bindings/edac/amazon,al-mc-edac.yaml | 1 + + Documentation/devicetree/bindings/eeprom/at25.yaml | 6 +- + .../bindings/gpio/kontron,sl28cpld-gpio.yaml | 4 +- + .../bindings/i2c/google,cros-ec-i2c-tunnel.yaml | 66 +++++++++++++ + .../devicetree/bindings/i2c/i2c-cros-ec-tunnel.txt | 39 -------- + .../devicetree/bindings/i2c/ingenic,i2c.yaml | 8 +- + .../devicetree/bindings/iio/adc/adi,ad7291.yaml | 3 +- + .../devicetree/bindings/iio/adc/adi,ad7768-1.yaml | 3 +- + .../bindings/iio/adc/cosmic,10001-adc.yaml | 4 +- + .../devicetree/bindings/iio/adc/holt,hi8435.yaml | 2 +- + .../devicetree/bindings/iio/adc/lltc,ltc2497.yaml | 2 + + .../bindings/iio/humidity/ti,hdc2010.yaml | 2 + + .../devicetree/bindings/input/cros-ec-keyb.txt | 72 --------------- + .../bindings/input/google,cros-ec-keyb.yaml | 92 +++++++++++++++++++ + .../interrupt-controller/ti,pruss-intc.yaml | 12 +-- + .../bindings/interrupt-controller/ti,sci-inta.yaml | 2 + + .../bindings/interrupt-controller/ti,sci-intr.yaml | 2 + + .../devicetree/bindings/leds/backlight/common.yaml | 2 + + Documentation/devicetree/bindings/leds/common.yaml | 2 +- + .../bindings/leds/leds-class-multicolor.yaml | 9 +- + .../devicetree/bindings/leds/leds-lp50xx.yaml | 8 ++ + .../devicetree/bindings/mailbox/mtk-gce.txt | 2 +- + .../devicetree/bindings/mfd/ene-kb3930.yaml | 2 +- + .../devicetree/bindings/mfd/google,cros-ec.yaml | 56 +++++++++++ + .../devicetree/bindings/mips/ingenic/devices.yaml | 3 + + .../devicetree/bindings/mips/loongson/devices.yaml | 3 + + .../devicetree/bindings/mmc/arasan,sdhci.yaml | 8 +- + .../bindings/mmc/microchip,dw-sparx5-sdhci.yaml | 2 + + .../devicetree/bindings/mmc/sdhci-am654.yaml | 17 ++-- + .../devicetree/bindings/net/intel,dwmac-plat.yaml | 2 + + .../devicetree/bindings/net/ti,dp83822.yaml | 2 + + .../bindings/pci/socionext,uniphier-pcie-ep.yaml | 18 ++-- + .../bindings/phy/socionext,uniphier-ahci-phy.yaml | 6 +- + .../devicetree/bindings/phy/ti,omap-usb2.yaml | 22 +++-- + .../bindings/pinctrl/actions,s500-pinctrl.yaml | 102 ++++++++++----------- + .../bindings/pinctrl/pinctrl-mt8192.yaml | 2 +- + .../bindings/pinctrl/qcom,msm8226-pinctrl.yaml | 6 +- + .../bindings/pinctrl/toshiba,visconti-pinctrl.yaml | 24 ++--- + .../bindings/power/reset/reboot-mode.yaml | 8 +- + .../bindings/power/supply/ingenic,battery.yaml | 8 +- + .../power/supply/summit,smb347-charger.yaml | 16 ++-- + .../devicetree/bindings/regulator/mps,mp886x.yaml | 2 + + .../devicetree/bindings/regulator/pfuze100.yaml | 2 + + .../devicetree/bindings/riscv/sifive-l2-cache.yaml | 4 +- + .../devicetree/bindings/riscv/sifive.yaml | 3 + + Documentation/devicetree/bindings/rng/imx-rng.yaml | 6 +- + .../devicetree/bindings/serial/fsl-imx-uart.yaml | 34 +++---- + .../bindings/sound/google,cros-ec-codec.yaml | 26 ++++-- + .../devicetree/bindings/sound/mchp,spdifrx.yaml | 4 +- + .../devicetree/bindings/sound/mchp,spdiftx.yaml | 4 +- + .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 40 ++++---- + .../devicetree/bindings/sound/realtek,rt1015p.yaml | 2 + + .../devicetree/bindings/timer/arm,sp804.yaml | 12 +-- + .../devicetree/bindings/usb/cdns,usb3.yaml | 4 +- + .../devicetree/bindings/usb/ti,hd3ss3220.yaml | 2 +- + .../devicetree/bindings/w1/fsl-imx-owire.yaml | 8 +- + drivers/of/of_reserved_mem.c | 13 ++- + 118 files changed, 656 insertions(+), 348 deletions(-) + create mode 100644 Documentation/devicetree/bindings/i2c/google,cros-ec-i2c-tunnel.yaml + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-cros-ec-tunnel.txt + delete mode 100644 Documentation/devicetree/bindings/input/cros-ec-keyb.txt + create mode 100644 Documentation/devicetree/bindings/input/google,cros-ec-keyb.yaml +Merging scsi-fixes/fixes (bcf3a2953d36 scsi: iscsi: iscsi_tcp: Avoid holding spinlock while calling getpeername()) +$ git merge scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (3650b228f83a Linux 5.10-rc1) +$ git merge drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) +$ git merge amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (bbf5c979011a Linux 5.9) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (0add6e9b88d0 mmc: sdhci-of-esdhc: set timeout to max before tuning) +$ git merge mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mmc/host/sdhci-of-esdhc.c | 11 +++++++++++ + drivers/mmc/host/sdhci.c | 6 ++++-- + 2 files changed, 15 insertions(+), 2 deletions(-) +Merging rtc-fixes/rtc-fixes (9123e3a74ec7 Linux 5.9-rc1) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (48778464bb7d Linux 5.8-rc2) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (dbf563eee0b8 x86/hyperv: Clarify comment on x2apic mode) +$ git merge hyperv-fixes/hyperv-fixes +Auto-merging drivers/hv/hv_balloon.c +Merge made by the 'recursive' strategy. + arch/x86/hyperv/hv_apic.c | 14 +++++++++----- + drivers/hv/hv_balloon.c | 2 +- + 2 files changed, 10 insertions(+), 6 deletions(-) +Merging soc-fsl-fixes/fix (fe8fe7723a3a soc: fsl: dpio: register dpio irq handlers after dpio create) +$ git merge soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (84814460eef9 riscv: Fixup bootup failure with HARDENED_USERCOPY) +$ git merge risc-v-fixes/fixes +Already up to date. +Merging pidfd-fixes/fixes (bda4c60d02e9 sys: Convert to the new fallthrough notation) +$ git merge pidfd-fixes/fixes +Auto-merging net/ipv4/tcp_metrics.c +Auto-merging net/core/net_namespace.c +Auto-merging net/core/net-sysfs.c +Auto-merging kernel/user_namespace.c +Auto-merging kernel/sys.c +Auto-merging kernel/pid_namespace.c +Auto-merging kernel/pid.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging include/net/net_namespace.h +Auto-merging fs/namespace.c +Merge made by the 'recursive' strategy. + fs/mount.h | 3 +-- + fs/namespace.c | 4 ++-- + include/linux/cgroup.h | 5 ++--- + include/linux/ipc_namespace.h | 3 +-- + include/linux/ns_common.h | 3 +++ + include/linux/pid_namespace.h | 4 +--- + include/linux/time_namespace.h | 9 ++++----- + include/linux/user_namespace.h | 5 ++--- + include/linux/utsname.h | 9 ++++----- + include/net/net_namespace.h | 11 ++++------- + include/uapi/linux/ptrace.h | 3 ++- + init/version.c | 2 +- + ipc/msgutil.c | 2 +- + ipc/namespace.c | 4 ++-- + kernel/cgroup/cgroup.c | 2 +- + kernel/cgroup/namespace.c | 2 +- + kernel/pid.c | 2 +- + kernel/pid_namespace.c | 13 +++---------- + kernel/time/namespace.c | 9 +++------ + kernel/user.c | 2 +- + kernel/user_namespace.c | 4 ++-- + kernel/utsname.c | 7 ++----- + net/core/net-sysfs.c | 6 +++--- + net/core/net_namespace.c | 6 +++--- + net/ipv4/inet_timewait_sock.c | 4 ++-- + net/ipv4/tcp_metrics.c | 2 +- + 26 files changed, 53 insertions(+), 73 deletions(-) +Merging fpga-fixes/fixes (8614afd689df fpga: dfl: fix bug in port reset handshake) +$ git merge fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (3650b228f83a Linux 5.10-rc1) +$ git merge spdx/spdx-linus +Already up to date. +Merging gpio-intel-fixes/fixes (3650b228f83a Linux 5.10-rc1) +$ git merge gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (3650b228f83a Linux 5.10-rc1) +$ git merge pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (9ebcfadb0610 Linux 5.8-rc3) +$ git merge erofs-fixes/fixes +Already up to date. +Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) +$ git merge integrity-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (0d0d245104a4 kunit: tools: fix kunit_tool tests for parsing test plans) +$ git merge kunit-fixes/kunit-fixes +Merge made by the 'recursive' strategy. + Documentation/dev-tools/kunit/start.rst | 2 +- + Documentation/dev-tools/kunit/usage.rst | 5 ++++ + include/kunit/test.h | 16 +++++------ + tools/testing/kunit/kunit_parser.py | 3 +- + tools/testing/kunit/kunit_tool_test.py | 32 ++++++++++++++++----- + .../kunit/test_data/test_config_printk_time.log | Bin 1584 -> 1605 bytes + .../test_data/test_interrupted_tap_output.log | Bin 1982 -> 2003 bytes + .../test_data/test_kernel_panic_interrupt.log | Bin 1321 -> 1342 bytes + .../kunit/test_data/test_multiple_prefixes.log | Bin 1832 -> 1861 bytes + .../kunit/test_data/test_pound_no_prefix.log | Bin 1193 -> 1200 bytes + tools/testing/kunit/test_data/test_pound_sign.log | Bin 1656 -> 1676 bytes + 11 files changed, 40 insertions(+), 18 deletions(-) +Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes) +$ git merge ubifs-fixes/fixes +Already up to date. +Merging memblock-fixes/fixes (5f7b81c18366 ia64: fix min_low_pfn/max_low_pfn build errors) +$ git merge memblock-fixes/fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (897dbea6b716 drm/v3d: Fix double free in v3d_submit_cl_ioctl()) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + .../display/panel/mantix,mlaf057we51-x.yaml | 4 +++ + drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c | 25 ++++++++++----- + drivers/gpu/drm/sun4i/sun4i_frontend.c | 36 ++++++---------------- + drivers/gpu/drm/sun4i/sun4i_frontend.h | 6 +--- + drivers/gpu/drm/v3d/v3d_gem.c | 1 - + 5 files changed, 32 insertions(+), 40 deletions(-) +Merging kspp-gustavo/for-next/kspp (736116436e5b include: jhash/signal: Fix fall-through warnings for Clang) +$ git merge kspp-gustavo/for-next/kspp +Auto-merging kernel/tracepoint.c +Auto-merging kernel/params.c +Auto-merging include/linux/fs.h +Auto-merging fs/binfmt_elf.c +Auto-merging drivers/target/target_core_user.c +Auto-merging drivers/net/ethernet/freescale/enetc/enetc_qos.c +Merge made by the 'recursive' strategy. + drivers/net/ethernet/freescale/enetc/enetc_qos.c | 2 +- + drivers/target/target_core_user.c | 2 +- + fs/binfmt_elf.c | 2 +- + fs/hfs/btree.h | 2 +- + fs/hfsplus/hfsplus_fs.h | 2 +- + fs/isofs/rock.h | 8 ++++---- + fs/select.c | 4 ++-- + include/linux/dma/ti-cppi5.h | 4 ++-- + include/linux/fs.h | 2 +- + include/linux/jhash.h | 2 ++ + include/linux/mailbox/zynqmp-ipi-message.h | 2 +- + include/linux/platform_data/cros_ec_commands.h | 14 +++++++------- + include/linux/platform_data/cros_ec_proto.h | 2 +- + include/linux/signal.h | 2 ++ + kernel/params.c | 2 +- + kernel/tracepoint.c | 2 +- + net/bluetooth/msft.c | 3 ++- + security/integrity/ima/ima.h | 2 +- + 18 files changed, 32 insertions(+), 27 deletions(-) +Merging kbuild/for-next (f11901ed723d Merge tag 'xfs-5.10-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge kbuild/for-next +Already up to date. +Merging compiler-attributes/compiler-attributes (bbf5c979011a Linux 5.9) +$ git merge compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/for-next (6857a5ebaabc dma-mapping: document dma_{alloc,free}_pages) +$ git merge dma-mapping/for-next +Already up to date. +Merging asm-generic/master (a259218ae60d Merge branch 'asm-generic-cleanup' into asm-generic) +$ git merge asm-generic/master +Merge made by the 'recursive' strategy. + arch/alpha/include/asm/mmu_context.h | 12 ++---- + arch/arc/include/asm/mmu_context.h | 17 ++++---- + arch/arm/include/asm/mmu_context.h | 26 ++----------- + arch/arm64/include/asm/mmu_context.h | 7 ++-- + arch/c6x/include/asm/mmu_context.h | 6 +++ + arch/csky/include/asm/mmu_context.h | 8 ++-- + arch/hexagon/include/asm/mmu_context.h | 33 +++------------- + arch/ia64/include/asm/mmu_context.h | 17 ++------ + arch/m68k/include/asm/mmu_context.h | 37 +++++------------- + arch/microblaze/include/asm/mmu_context.h | 2 +- + arch/microblaze/include/asm/mmu_context_mm.h | 8 ++-- + arch/microblaze/include/asm/processor.h | 3 -- + arch/mips/include/asm/mmu_context.h | 11 ++---- + arch/nds32/include/asm/mmu_context.h | 10 +---- + arch/nios2/include/asm/mmu_context.h | 21 ++-------- + arch/openrisc/include/asm/mmu_context.h | 8 ++-- + arch/parisc/include/asm/mmu_context.h | 12 +++--- + arch/powerpc/include/asm/mmu_context.h | 13 ++++--- + arch/riscv/include/asm/mmu_context.h | 22 +---------- + arch/s390/include/asm/mmu_context.h | 9 ++--- + arch/sh/include/asm/mmu_context.h | 7 ++-- + arch/sh/include/asm/mmu_context_32.h | 9 ----- + arch/sparc/include/asm/mmu_context_32.h | 10 ++--- + arch/sparc/include/asm/mmu_context_64.h | 10 ++--- + arch/um/include/asm/mmu_context.h | 12 +++--- + arch/x86/include/asm/mmu_context.h | 6 +++ + arch/xtensa/include/asm/mmu_context.h | 11 ++---- + arch/xtensa/include/asm/nommu_context.h | 26 +------------ + include/asm-generic/bitops/builtin-ffs.h | 5 +-- + include/asm-generic/mmu_context.h | 58 +++++++++++++++++++++------- + include/asm-generic/nommu_context.h | 19 +++++++++ + include/asm-generic/percpu.h | 18 ++++----- + include/uapi/asm-generic/sembuf.h | 6 +-- + 33 files changed, 187 insertions(+), 292 deletions(-) + create mode 100644 arch/c6x/include/asm/mmu_context.h + create mode 100644 include/asm-generic/nommu_context.h +Merging arc/for-next (def9d2780727 Linux 5.5-rc7) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (adc5f7029376 ARM: add malloc size to decompressor kexec size structure) +$ git merge arm/for-next +Already up to date. +Merging arm64/for-next/core (66dd3474702a arm64: proton-pack: Update comment to reflect new function name) +$ git merge arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (887e2cff0f8d perf: arm-cmn: Fix conversion specifiers for node type) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (aaa52e967409 ARM: SoC: document merges) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 35 ++++++++++++++++++++++++++++++++++ + drivers/tee/optee/device.c | 2 +- + 2 files changed, 36 insertions(+), 1 deletion(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging amlogic/for-next (4393916840fc Merge branch 'v5.11/soc' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Auto-merging arch/arm64/Kconfig.platforms +Merge made by the 'recursive' strategy. + arch/arm64/Kconfig.platforms | 2 - + arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 6 +++ + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 52 ++++++++++++++++++++++ + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 6 ++- + .../boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts | 2 +- + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 3 ++ + drivers/firmware/meson/Kconfig | 5 ++- + drivers/firmware/meson/meson_sm.c | 1 + + drivers/soc/amlogic/Kconfig | 12 ++--- + drivers/soc/amlogic/meson-clk-measure.c | 5 ++- + drivers/soc/amlogic/meson-ee-pwrc.c | 5 ++- + drivers/soc/amlogic/meson-gx-pwrc-vpu.c | 5 ++- + drivers/soc/amlogic/meson-secure-pwrc.c | 5 ++- + 13 files changed, 93 insertions(+), 16 deletions(-) +Merging aspeed/for-next (48127d01a153 Merge branch 'soc-for-v5.10' into for-next) +$ git merge aspeed/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mfd/aspeed-lpc.txt | 8 +- + .../devicetree/bindings/mfd/aspeed-scu.txt | 26 + + .../devicetree/bindings/soc/aspeed/xdma.yaml | 103 ++ + MAINTAINERS | 8 + + arch/arm/boot/dts/aspeed-g4.dtsi | 5 + + arch/arm/boot/dts/aspeed-g5.dtsi | 5 + + arch/arm/boot/dts/aspeed-g6.dtsi | 5 + + drivers/soc/Makefile | 2 +- + drivers/soc/aspeed/Kconfig | 53 +- + drivers/soc/aspeed/Makefile | 2 + + drivers/soc/aspeed/aspeed-lpc-ctrl.c | 37 +- + drivers/soc/aspeed/aspeed-lpc-snoop.c | 2 + + drivers/soc/aspeed/aspeed-socinfo.c | 133 +++ + drivers/soc/aspeed/aspeed-xdma.c | 1205 ++++++++++++++++++++ + include/uapi/linux/aspeed-xdma.h | 42 + + 15 files changed, 1615 insertions(+), 21 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soc/aspeed/xdma.yaml + create mode 100644 drivers/soc/aspeed/aspeed-socinfo.c + create mode 100644 drivers/soc/aspeed/aspeed-xdma.c + create mode 100644 include/uapi/linux/aspeed-xdma.h +Merging at91/at91-next (d1f170f8447d Merge branches 'at91-soc' and 'at91-dt' into at91-next) +$ git merge at91/at91-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging drivers-memory/for-next (1b322cb9bb5c memory: tegra: Sort tegra210_swgroups by reg address) +$ git merge drivers-memory/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/memory/jz4780-nemc.c | 4 ++-- + drivers/memory/tegra/tegra210.c | 50 ++++++++++++++++++++--------------------- + 3 files changed, 28 insertions(+), 27 deletions(-) +Merging imx-mxs/for-next (77c831593319 Merge branch 'imx/dt64' into for-next) +$ git merge imx-mxs/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/freescale/fsl,scu.txt | 12 +- + .../devicetree/bindings/clock/imx8qxp-lpcg.yaml | 79 +++++-- + arch/arm/boot/dts/imx51-zii-rdu1.dts | 2 +- + arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 8 +- + arch/arm/boot/dts/imx6ul-ccimx6ulsbcpro.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 2 +- + drivers/clk/imx/clk-imx8qxp-lpcg.c | 139 ++++++++++++ + drivers/clk/imx/clk-imx8qxp.c | 136 ++++++------ + drivers/clk/imx/clk-lpcg-scu.c | 53 ++++- + drivers/clk/imx/clk-scu.c | 234 ++++++++++++++++++++- + drivers/clk/imx/clk-scu.h | 56 ++++- + include/dt-bindings/clock/imx8-lpcg.h | 14 ++ + 12 files changed, 627 insertions(+), 110 deletions(-) + create mode 100644 include/dt-bindings/clock/imx8-lpcg.h +Merging keystone/next (703dff8cb900 Merge branch 'for_5.10/drivers-soc' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (6c7949eccdbd Merge branch 'v5.10-tmp/soc' into for-next) +$ git merge mediatek/for-next +Auto-merging arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi +Auto-merging arch/arm64/boot/dts/mediatek/mt8183.dtsi +Auto-merging arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/iio/adc/mt6577_auxadc.txt | 1 + + MAINTAINERS | 2 +- + arch/arm64/boot/dts/mediatek/Makefile | 1 + + arch/arm64/boot/dts/mediatek/mt6779-evb.dts | 31 +++ + arch/arm64/boot/dts/mediatek/mt6779.dtsi | 271 +++++++++++++++++++++ + arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 1 - + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt8516.dtsi | 33 ++- + arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi | 2 +- + drivers/soc/mediatek/mtk-scpsys.c | 5 +- + 10 files changed, 342 insertions(+), 7 deletions(-) + create mode 100644 arch/arm64/boot/dts/mediatek/mt6779-evb.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt6779.dtsi +Merging mvebu/for-next (f89c9685f6a1 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 15 ++- + arch/arm/boot/dts/Makefile | 6 ++ + arch/arm/boot/dts/armada-388-clearfog.dts | 4 +- + arch/arm/boot/dts/armada-388-clearfog.dtsi | 10 +- + arch/arm/boot/dts/armada-388-helios4.dts | 6 +- + arch/arm/boot/dts/armada-xp-98dx3236.dtsi | 12 ++- + arch/arm/boot/dts/armada-xp-crs305-1g-4s-bit.dts | 43 +++++++++ + arch/arm/boot/dts/armada-xp-crs305-1g-4s.dts | 17 ++++ + arch/arm/boot/dts/armada-xp-crs305-1g-4s.dtsi | 104 +++++++++++++++++++++ + arch/arm/boot/dts/armada-xp-crs326-24g-2s-bit.dts | 43 +++++++++ + arch/arm/boot/dts/armada-xp-crs326-24g-2s.dts | 17 ++++ + arch/arm/boot/dts/armada-xp-crs326-24g-2s.dtsi | 104 +++++++++++++++++++++ + .../boot/dts/armada-xp-crs328-4c-20s-4s-bit.dts | 43 +++++++++ + arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s.dts | 17 ++++ + arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s.dtsi | 104 +++++++++++++++++++++ + arch/arm/boot/dts/dove-sbc-a510.dts | 1 + + arch/arm/boot/dts/kirkwood-dockstar.dts | 2 +- + arch/arm/boot/dts/kirkwood-dreamplug.dts | 2 +- + arch/arm/boot/dts/kirkwood-goflexnet.dts | 2 +- + .../arm/boot/dts/kirkwood-guruplug-server-plus.dts | 2 +- + arch/arm/boot/dts/kirkwood-iconnect.dts | 2 +- + arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 2 +- + arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi | 2 +- + arch/arm/boot/dts/kirkwood.dtsi | 4 +- + .../dts/marvell/armada-3720-espressobin-emmc.dts | 18 ---- + .../marvell/armada-3720-espressobin-v7-emmc.dts | 36 +------ + .../dts/marvell/armada-3720-espressobin-v7.dts | 18 +--- + .../boot/dts/marvell/armada-3720-espressobin.dtsi | 26 +++++- + 28 files changed, 572 insertions(+), 90 deletions(-) + create mode 100644 arch/arm/boot/dts/armada-xp-crs305-1g-4s-bit.dts + create mode 100644 arch/arm/boot/dts/armada-xp-crs305-1g-4s.dts + create mode 100644 arch/arm/boot/dts/armada-xp-crs305-1g-4s.dtsi + create mode 100644 arch/arm/boot/dts/armada-xp-crs326-24g-2s-bit.dts + create mode 100644 arch/arm/boot/dts/armada-xp-crs326-24g-2s.dts + create mode 100644 arch/arm/boot/dts/armada-xp-crs326-24g-2s.dtsi + create mode 100644 arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s-bit.dts + create mode 100644 arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s.dts + create mode 100644 arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s.dtsi +Merging omap/for-next (7a159a1ad494 Merge branch 'fixes' into for-next) +$ git merge omap/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging qcom/for-next (a9e0b8bf59c8 Merge branches 'arm64-for-5.11', 'drivers-for-5.11' and 'dts-for-5.11' into for-next) +$ git merge qcom/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/qcom,rpmpd.yaml | 3 + + arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts | 301 ++++++++++++++++++++- + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 10 - + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 6 +- + .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 10 - + arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi | 7 +- + .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 10 - + arch/arm64/boot/dts/qcom/msm8916.dtsi | 38 +++ + arch/arm64/boot/dts/qcom/sc7180.dtsi | 2 +- + drivers/i2c/busses/i2c-qcom-geni.c | 6 +- + drivers/soc/qcom/Kconfig | 4 +- + drivers/soc/qcom/cmd-db.c | 8 +- + drivers/soc/qcom/llcc-qcom.c | 115 +++++--- + drivers/soc/qcom/qcom-geni-se.c | 55 +++- + drivers/soc/qcom/rpmh-rsc.c | 7 +- + drivers/soc/qcom/rpmpd.c | 85 +++++- + drivers/soc/qcom/smp2p.c | 5 +- + include/dt-bindings/power/qcom-rpmpd.h | 29 ++ + 18 files changed, 587 insertions(+), 114 deletions(-) +Merging raspberrypi/for-next (4564363351e2 ARM: dts: bcm2711: Enable the display pipeline) +$ git merge raspberrypi/for-next +Already up to date. +Merging realtek/for-next (486f29df6941 Merge branch 'v5.8/dt' into next) +$ git merge realtek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging renesas/next (97fc35aeb797 Merge branches 'renesas-arm-dt-for-v5.11' and 'renesas-drivers-for-v5.11' into renesas-next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ca.dts | 222 +++++++++++++++++++++ + arch/arm/boot/dts/r8a7742-iwg21d-q7.dts | 99 +++++++++ + arch/arm64/boot/dts/renesas/Makefile | 3 + + .../dts/renesas/aistarvision-mipi-adapter-2.1.dtsi | 4 +- + arch/arm64/boot/dts/renesas/cat875.dtsi | 1 - + ...hope-rzg2-ex-aistarvision-mipi-adapter-2.1.dtsi | 109 ++++++++++ + arch/arm64/boot/dts/renesas/hihope-rzg2-ex.dtsi | 1 - + .../renesas/r8a774a1-hihope-rzg2m-ex-mipi-2.1.dts | 29 +++ + .../renesas/r8a774b1-hihope-rzg2n-ex-mipi-2.1.dts | 16 ++ + .../boot/dts/renesas/r8a774c0-ek874-mipi-2.1.dts | 3 +- + .../renesas/r8a774e1-hihope-rzg2h-ex-mipi-2.1.dts | 16 ++ + .../boot/dts/renesas/r8a77951-salvator-xs.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 62 ++++++ + .../boot/dts/renesas/r8a77965-salvator-xs.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 120 +++++++++++ + arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 14 +- + drivers/soc/renesas/rmobile-sysc.c | 1 + + 17 files changed, 691 insertions(+), 13 deletions(-) + create mode 100644 arch/arm64/boot/dts/renesas/hihope-rzg2-ex-aistarvision-mipi-adapter-2.1.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-ex-mipi-2.1.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-ex-mipi-2.1.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774e1-hihope-rzg2h-ex-mipi-2.1.dts +Merging reset/reset/next (da8c0e4ee95a reset: meson: make it possible to build as a module) +$ git merge reset/reset/next +Merge made by the 'recursive' strategy. + drivers/reset/Kconfig | 3 ++- + drivers/reset/reset-meson.c | 8 +++++++- + 2 files changed, 9 insertions(+), 2 deletions(-) +Merging rockchip/for-next (ba0ceb95f560 Merge branch 'v5.10-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging samsung-krzk/for-next (dc8fd3769e15 Merge branch 'next/dt' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos5250.dtsi | 4 ++-- + arch/arm/boot/dts/exynos5410-odroidxu.dts | 16 ++++++++++++-- + arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 28 +++++++++++++++++++++++++ + arch/arm/boot/dts/exynos5410.dtsi | 4 ++++ + arch/arm/boot/dts/exynos5420.dtsi | 3 --- + arch/arm/boot/dts/exynos5422-odroidhc1.dts | 4 ++-- + arch/arm/boot/dts/exynos5422-odroidxu4.dts | 4 ++-- + arch/arm/boot/dts/exynos54xx-odroidxu-leds.dtsi | 11 +++++----- + arch/arm/boot/dts/exynos54xx.dtsi | 4 ++-- + arch/arm/configs/exynos_defconfig | 1 + + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 4 ++-- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 2 +- + drivers/cpuidle/cpuidle-big_little.c | 3 +-- + 14 files changed, 66 insertions(+), 23 deletions(-) +Merging scmi/for-linux-next (3650b228f83a Linux 5.10-rc1) +$ git merge scmi/for-linux-next +Already up to date. +Merging sunxi/sunxi/for-next (33dbcde6368c Merge branches 'sunxi/dt-for-5.11' and 'sunxi/fixes-for-5.10' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/arm/sunxi.yaml +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/sunxi.yaml | 5 ++ + MAINTAINERS | 1 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 2 +- + arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts | 2 +- + arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts | 2 +- + arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts | 5 -- + arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts | 2 +- + arch/arm/boot/dts/sun8i-h3-zeropi.dts | 87 ++++++++++++++++++++++ + arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts | 2 +- + arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 2 +- + arch/arm/boot/dts/sun9i-a80-optimus.dts | 2 +- + arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi | 2 +- + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-pine64-plus.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-pinetab.dts | 3 - + .../allwinner/sun50i-h5-libretech-all-h5-cc.dts | 2 +- + .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 2 +- + .../boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 2 +- + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 2 +- + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 2 +- + 24 files changed, 112 insertions(+), 26 deletions(-) + create mode 100644 arch/arm/boot/dts/sun8i-h3-zeropi.dts +$ git am -3 ../patches/0001-Revert-ARM-dts-sun8i-add-FriendlyArm-ZeroPi-support.patch +Applying: Revert "ARM: dts: sun8i: add FriendlyArm ZeroPi support" +$ git reset HEAD^ +Unstaged changes after reset: +M Documentation/devicetree/bindings/arm/sunxi.yaml +M arch/arm/boot/dts/Makefile +D arch/arm/boot/dts/sun8i-h3-zeropi.dts +$ git add -A . +$ git commit -v -a --amend +[master f3fec8f6ec42] Merge remote-tracking branch 'sunxi/sunxi/for-next' into master + Date: Tue Oct 27 09:52:21 2020 +1100 +Merging tegra/for-next (9ea55312ba10 Merge branch for-5.10/arm64/defconfig into for-next) +$ git merge tegra/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' into ti-k3-next) +$ git merge ti-k3/ti-k3-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ti-k3-new/ti-k3-next (9dcd17be61e4 arm64: dts: ti: k3-am65: ringacc: drop ti, dma-ring-reset-quirk) +$ git merge ti-k3-new/ti-k3-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 1 - + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 1 - + 2 files changed, 2 deletions(-) +Merging clk/clk-next (5f56888fad46 Merge branches 'clk-ingenic', 'clk-at91', 'clk-kconfig', 'clk-imx', 'clk-qcom', 'clk-prima2' and 'clk-bcm' into clk-next) +$ git merge clk/clk-next +Already up to date. +Merging clk-samsung/for-next (ff8e0ff9b996 clk: samsung: Use cached clk_hws instead of __clk_lookup() calls) +$ git merge clk-samsung/for-next +Already up to date. +Merging csky/linux-next (1c8499089bc6 csky: Add memory layout 2.5G(user):1.5G(kernel)) +$ git merge csky/linux-next +Auto-merging arch/csky/kernel/vmlinux.lds.S +Auto-merging arch/csky/kernel/setup.c +Auto-merging arch/csky/include/asm/mmu_context.h +Auto-merging arch/csky/Kconfig +Merge made by the 'recursive' strategy. + arch/csky/Kconfig | 16 ++++++++++++++++ + arch/csky/abiv1/inc/abi/ckmmu.h | 8 ++++---- + arch/csky/abiv2/inc/abi/ckmmu.h | 14 +++++++------- + arch/csky/abiv2/inc/abi/entry.h | 19 ++++++++++++++++--- + arch/csky/include/asm/memory.h | 2 +- + arch/csky/include/asm/mmu_context.h | 8 +------- + arch/csky/include/asm/page.h | 2 +- + arch/csky/include/asm/pgalloc.h | 2 +- + arch/csky/include/asm/pgtable.h | 2 +- + arch/csky/include/asm/processor.h | 2 +- + arch/csky/include/asm/segment.h | 2 +- + arch/csky/kernel/atomic.S | 4 ++++ + arch/csky/kernel/entry.S | 10 ++++++++-- + arch/csky/kernel/head.S | 10 ++++++++-- + arch/csky/kernel/setup.c | 18 ++++++++++++++++-- + arch/csky/kernel/smp.c | 7 +++---- + arch/csky/kernel/vmlinux.lds.S | 2 +- + arch/csky/mm/fault.c | 7 +------ + arch/csky/mm/init.c | 29 ++++++++++++++++++++++------- + 19 files changed, 113 insertions(+), 51 deletions(-) +Merging h8300/h8300-next (8808515be0ed h8300: Replace <linux/clk-provider.h> by <linux/of_clk.h>) +$ git merge h8300/h8300-next +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Auto-merging drivers/net/ethernet/smsc/Kconfig +Auto-merging drivers/clocksource/h8300_timer8.c +Auto-merging arch/h8300/kernel/setup.c +Merge made by the 'recursive' strategy. + arch/h8300/Kconfig.cpu | 4 ++ + arch/h8300/boot/dts/edosk2674.dts | 10 ++++- + arch/h8300/boot/dts/h8300h_sim.dts | 2 +- + arch/h8300/boot/dts/h8s_sim.dts | 2 +- + arch/h8300/configs/edosk2674_defconfig | 10 ++--- + arch/h8300/configs/h8300h-sim_defconfig | 8 +--- + arch/h8300/configs/h8s-sim_defconfig | 8 +--- + arch/h8300/kernel/setup.c | 2 +- + arch/h8300/lib/memset.S | 17 +++++---- + drivers/clocksource/h8300_timer8.c | 20 +++++----- + drivers/irqchip/irq-renesas-h8300h.c | 19 +++++++++- + drivers/irqchip/irq-renesas-h8s.c | 67 +++++++++++++++++++++++++-------- + drivers/net/ethernet/smsc/Kconfig | 1 - + drivers/net/ethernet/smsc/smc91x.c | 10 +++++ + drivers/tty/serial/sh-sci.c | 5 +-- + 15 files changed, 123 insertions(+), 62 deletions(-) +Merging ia64/next (c331649e6371 ia64: Use libata instead of the legacy ide driver in defconfigs) +$ git merge ia64/next +Already up to date. +Merging m68k/for-next (50c5feeea0af ide/macide: Convert Mac IDE driver to platform driver) +$ git merge m68k/for-next +Already up to date. +Merging m68knommu/for-next (02a0b3141ed9 m68knommu: align BSS section to 4-byte boundaries) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/kernel/vmlinux-nommu.lds | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging microblaze/next (4a17e8513376 microblaze: fix kbuild redundant file warning) +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (3650b228f83a Linux 5.10-rc1) +$ git merge mips/mips-next +Already up to date. +Merging nds32/next (54bde873682b nds32: Fix bogus reference to <asm/procinfo.h>) +$ git merge nds32/next +Auto-merging arch/nds32/kernel/setup.c +Merge made by the 'recursive' strategy. + arch/nds32/configs/defconfig | 1 - + arch/nds32/kernel/setup.c | 2 +- + arch/nds32/kernel/time.c | 2 +- + arch/nds32/kernel/traps.c | 50 +++----------------------------------------- + 4 files changed, 5 insertions(+), 50 deletions(-) +Merging nios2/for-next (6b57fa4d374b nios2: signal: Mark expected switch fall-through) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (55b2662ec665 openrisc: uaccess: Add user address space check to access_ok) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (3b7ab4a74a2d parisc: Switch to clockevent based timers) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/include/asm/processor.h | 2 - + arch/parisc/kernel/irq.c | 7 +- + arch/parisc/kernel/processor.c | 5 +- + arch/parisc/kernel/time.c | 164 +++++++++++++++++++----------------- + 4 files changed, 90 insertions(+), 88 deletions(-) +Merging powerpc/next (ffd0b25ca049 Revert "powerpc/pci: unmap legacy INTx interrupts when a PHB is removed") +$ git merge powerpc/next +Already up to date. +Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges) +$ git merge fsl/next +Already up to date. +Merging soc-fsl/next (d97b957e32b1 soc: fsl: qe: Remove unnessesary check in ucc_set_tdm_rxtx_clk) +$ git merge soc-fsl/next +Already up to date. +Merging risc-v/for-next (f69e1c7418b1 RISC-V: Fix the VDSO symbol generaton for binutils-2.35+) +$ git merge risc-v/for-next +Auto-merging arch/riscv/kernel/vdso/Makefile +CONFLICT (content): Merge conflict in arch/riscv/kernel/vdso/Makefile +Resolved 'arch/riscv/kernel/vdso/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c28309fafe75] Merge remote-tracking branch 'risc-v/for-next' into master +$ git diff -M --stat --summary HEAD^.. + arch/riscv/kernel/vdso/.gitignore | 1 + + arch/riscv/kernel/vdso/Makefile | 17 ++++++++--------- + arch/riscv/kernel/vdso/so2s.sh | 6 ++++++ + 3 files changed, 15 insertions(+), 9 deletions(-) + create mode 100755 arch/riscv/kernel/vdso/so2s.sh +Merging s390/for-next (00be34947616 Merge branch 'fixes' into for-next) +$ git merge s390/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging sh/for-next (b0cfc315ff38 sh: fix syscall tracing) +$ git merge sh/for-next +Already up to date. +Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge sparc-next/master +Already up to date. +Merging uml/linux-next (f06885b3f3e3 um: vector: Add dynamic tap interfaces and scripting) +$ git merge uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (4ca4c562efb6 xtensa: uaccess: Add missing __user to strncpy_from_user() prototype) +$ git merge xtensa/xtensa-for-next +Merge made by the 'recursive' strategy. + arch/xtensa/include/asm/uaccess.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging fscrypt/master (5b2a828b98ec fscrypt: export fscrypt_d_revalidate()) +$ git merge fscrypt/master +Already up to date. +Merging afs/afs-next (8409f67b6437 afs: Adjust the fileserver rotation algorithm to reprobe/retry more quickly) +$ git merge afs/afs-next +Already up to date. +Merging btrfs/for-next (c4795f038f2e Merge branch 'for-next-current-v5.9-20201015' into for-next-20201015) +$ git merge btrfs/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ceph/master (28e1581c3b4e libceph: clear con->out_msg on Policy::stateful_server faults) +$ git merge ceph/master +Already up to date. +Merging cifs/for-next (3650b228f83a Linux 5.10-rc1) +$ git merge cifs/for-next +Already up to date. +Merging configfs/for-next (76ecfcb0852e samples: configfs: prefer pr_err() over bare printk(KERN_ERR) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (8b614cb8f1dc Merge tag '5.6-rc4-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6) +$ git merge ecryptfs/next +Already up to date. +Merging erofs/dev (915f4c9358db erofs: remove unnecessary enum entries) +$ git merge erofs/dev +Already up to date. +Merging exfat/dev (f9893351acae Merge tag 'kconfig-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) +$ git merge exfat/dev +Already up to date. +Merging ext3/for_next (e44b86917b3f Pull direct IO fix from Gabriel Krisman.) +$ git merge ext3/for_next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ext4/dev (1322181170bb ext4: fix invalid inode checksum) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (bcfd79928961 f2fs: call f2fs_get_meta_page_retry for nat page) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + fs/f2fs/node.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging fsverity/fsverity (f3db0bed4583 fs-verity: use smp_load_acquire() for ->i_verity_info) +$ git merge fsverity/fsverity +Already up to date. +Merging fuse/for-next (42d3e2d041f0 virtiofs: calculate number of scatter-gather elements accurately) +$ git merge fuse/for-next +Already up to date. +Merging jfs/jfs-next (7aba5dcc2346 jfs: Replace zero-length array with flexible-array member) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (40a03b750bb3 Merge tag 'sound-fix-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (8c39076c276b NFSv4.2: support EXCHGID4_FLAG_SUPP_FENCE_OPS 4.2 EXCHANGE_ID flag) +$ git merge nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (856deb866d16 Linux 5.9-rc5) +$ git merge nfsd/nfsd-next +Already up to date. +Merging cel/cel-next (13a9a9d74d4d SUNRPC: Fix svc_flush_dcache()) +$ git merge cel/cel-next +Already up to date. +Merging orangefs/for-next (e848643b524b orangefs: remove unnecessary assignment to variable ret) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (be4df0cea08a ovl: use generic vfs_ioc_setflags_prepare() helper) +$ git merge overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (e2a05cc7f822 ubifs: mount_ubifs: Release authentication resource in error handling path) +$ git merge ubifs/next +Already up to date. +Merging v9fs/9p-next (7ca1db21ef8e net: 9p: initialize sun_server.sun_path to have addr's value only when addr is valid) +$ git merge v9fs/9p-next +Already up to date. +Merging xfs/for-next (2e76f188fd90 xfs: cancel intents immediately if process_intents fails) +$ git merge xfs/for-next +Already up to date. +Merging zonefs/for-next (48bfd5c6fac1 zonefs: document the explicit-open mount option) +$ git merge zonefs/for-next +Already up to date. +Merging iomap/iomap-for-next (1a31182edd00 iomap: Call inode_dio_end() before generic_write_sync()) +$ git merge iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (407e9c63ee57 vfs: move the generic write and copy checks out of mm) +$ git merge djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (529adfe8f131 locks: fix a typo at a kernel-doc markup) +$ git merge file-locks/locks-next +Merge made by the 'recursive' strategy. + fs/locks.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging vfs/for-next (8853bf827ca8 Merge branches 'work.sparc', 'work.epoll', 'work.sparc32' and 'regset.followup' into for-next) +$ git merge vfs/for-next +Auto-merging include/linux/fs.h +Removing arch/sparc/mm/extable.c +Auto-merging arch/sparc/lib/memset.S +Merge made by the 'recursive' strategy. + arch/arm/include/asm/elf.h | 4 - + arch/arm/kernel/process.c | 9 - + arch/c6x/include/asm/elf.h | 3 - + arch/csky/include/asm/elf.h | 1 - + arch/hexagon/include/asm/elf.h | 1 - + arch/ia64/kernel/process.c | 2 +- + arch/ia64/kernel/ptrace.c | 51 +- + arch/nds32/include/asm/elf.h | 1 - + arch/sparc/include/asm/elf_64.h | 1 - + arch/sparc/include/asm/{extable_64.h => extable.h} | 4 +- + arch/sparc/include/asm/processor_32.h | 6 +- + arch/sparc/include/asm/thread_info_64.h | 1 + + arch/sparc/include/asm/uaccess.h | 3 + + arch/sparc/include/asm/uaccess_32.h | 38 -- + arch/sparc/include/asm/uaccess_64.h | 1 - + arch/sparc/kernel/head_32.S | 2 +- + arch/sparc/kernel/head_64.S | 2 +- + arch/sparc/kernel/process_32.c | 12 - + arch/sparc/kernel/setup_32.c | 3 - + arch/sparc/kernel/setup_64.c | 4 - + arch/sparc/kernel/unaligned_32.c | 106 +-- + arch/sparc/lib/checksum_32.S | 64 +- + arch/sparc/lib/copy_user.S | 315 ++++----- + arch/sparc/lib/memset.S | 86 +-- + arch/sparc/mm/Makefile | 2 +- + arch/sparc/mm/extable.c | 107 --- + arch/sparc/mm/fault_32.c | 80 +-- + arch/sparc/mm/mm_32.h | 2 - + fs/eventpoll.c | 717 +++++++++------------ + fs/file_table.c | 1 - + include/linux/eventpoll.h | 11 +- + include/linux/fs.h | 5 +- + lib/extable.c | 5 - + 33 files changed, 531 insertions(+), 1119 deletions(-) + rename arch/sparc/include/asm/{extable_64.h => extable.h} (92%) + delete mode 100644 arch/sparc/mm/extable.c +Merging printk/for-next (26911e6b1302 Merge branch 'for-5.10-fixup' into for-next) +$ git merge printk/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging pci/next (3650b228f83a Linux 5.10-rc1) +$ git merge pci/next +Already up to date. +Merging pstore/for-next/pstore (137c6236aeec mailmap: Add WeiXiong Liao) +$ git merge pstore/for-next/pstore +Auto-merging .mailmap +CONFLICT (content): Merge conflict in .mailmap +Resolved '.mailmap' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 439d3280eb4f] Merge remote-tracking branch 'pstore/for-next/pstore' into master +$ git diff -M --stat --summary HEAD^.. +Merging hid/for-next (f5795950202d Merge branch 'for-5.10/vivaldi' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. +Merging i2c/i2c/for-next (3650b228f83a Linux 5.10-rc1) +$ git merge i2c/i2c/for-next +Already up to date. +Merging i3c/i3c/next (abea14bfdebb i3c: master: Fix error return in cdns_i3c_master_probe()) +$ git merge i3c/i3c/next +Already up to date. +Merging dmi/dmi-for-next (a3d13a0a23ea Replace HTTP links with HTTPS ones: DMI/SMBIOS SUPPORT) +$ git merge dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (9b20aec24b8a hwmon: (pmbus/max20730) adjust the vout reading given voltage divider) +$ git merge hwmon-staging/hwmon-next +Already up to date. +Merging jc_docs/docs-next (62af696471e5 docs: Add two missing entries in vm sysctl index) +$ git merge jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (c386e0797d26 media: dvb-frontends/drxk_hard.c: fix uninitialized variable warning) +$ git merge v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (cafcadac71cb docs: fs: api-summary.rst: get rid of kernel-doc include) +$ git merge v4l-dvb-next/master +Auto-merging include/kunit/test.h +CONFLICT (content): Merge conflict in include/kunit/test.h +Auto-merging MAINTAINERS +Recorded preimage for 'include/kunit/test.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'include/kunit/test.h'. +[master 4a60b9424289] Merge remote-tracking branch 'v4l-dvb-next/master' into master +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/sysctl/net.rst | 1 + + Documentation/conf.py | 2 +- + Documentation/dev-tools/kasan.rst | 2 + + .../devicetree/bindings/clock/hi6220-clock.txt | 2 +- + Documentation/filesystems/api-summary.rst | 3 - + Documentation/hwmon/adm1266.rst | 2 +- + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/mp2975.rst | 14 ++- + Documentation/locking/lockdep-design.rst | 51 ++++---- + Documentation/networking/devlink/ice.rst | 1 + + Documentation/networking/statistics.rst | 3 +- + Documentation/userspace-api/index.rst | 1 + + MAINTAINERS | 9 +- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c | 2 +- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-prng.c | 2 +- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-trng.c | 2 +- + drivers/gpu/drm/drm_dp_helper.c | 12 +- + drivers/gpu/drm/drm_edid.c | 2 +- + drivers/infiniband/ulp/srpt/ib_srpt.h | 1 + + .../bindings/net/wireless/silabs,wfx.yaml | 2 +- + include/linux/blk-mq.h | 2 + + include/linux/pagemap.h | 8 +- + include/linux/phy.h | 40 +------ + include/linux/refcount.h | 130 ++++++++++----------- + scripts/kernel-doc | 6 +- + 25 files changed, 156 insertions(+), 145 deletions(-) +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 (54e1ca2a1923 Merge branch 'acpi-utils' into linux-next) +$ git merge pm/linux-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging cpufreq-arm/cpufreq/arm/linux-next (bc9b9c5ab9d8 cpufreq: qcom: Don't add frequencies without an OPP) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (748f0d70087c cpupower: Provide online and offline CPU information) +$ git merge cpupower/cpupower +Merge made by the 'recursive' strategy. + tools/power/cpupower/utils/cpufreq-set.c | 3 ++ + tools/power/cpupower/utils/cpuidle-set.c | 4 ++ + tools/power/cpupower/utils/cpupower.c | 8 ++++ + tools/power/cpupower/utils/helpers/helpers.h | 12 +++++ + tools/power/cpupower/utils/helpers/misc.c | 66 +++++++++++++++++++++++++++- + 5 files changed, 92 insertions(+), 1 deletion(-) +Merging devfreq/devfreq-next (09d56d92ad25 PM / devfreq: tegra30: Silence deferred probe error) +$ git merge devfreq/devfreq-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-devfreq | 54 +++--- + drivers/devfreq/Kconfig | 2 +- + drivers/devfreq/devfreq.c | 242 +++++++++++++++++--------- + drivers/devfreq/governor.h | 33 +++- + drivers/devfreq/governor_passive.c | 44 ++--- + drivers/devfreq/governor_simpleondemand.c | 2 + + drivers/devfreq/tegra20-devfreq.c | 8 +- + drivers/devfreq/tegra30-devfreq.c | 12 +- + include/linux/devfreq.h | 4 - + include/trace/events/devfreq.h | 30 +++- + 10 files changed, 274 insertions(+), 157 deletions(-) +Merging opp/opp/linux-next (a5663c9b1e31 opp: Allow opp-level to be set to 0) +$ git merge opp/opp/linux-next +Already up to date. +Merging thermal/thermal/linux-next (ee7e92c62370 drivers/thermal: Remove unnecessary structure members allocated_tzp) +$ git merge thermal/thermal/linux-next +Merge made by the 'recursive' strategy. + drivers/thermal/gov_power_allocator.c | 11 ++--------- + drivers/thermal/thermal_core.c | 2 +- + 2 files changed, 3 insertions(+), 10 deletions(-) +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 (67f8e65e4fc1 firewire: net: remove set but not used variable 'guid') +$ git merge ieee1394/for-next +Auto-merging drivers/firewire/net.c +Merge made by the 'recursive' strategy. + drivers/firewire/net.c | 2 -- + 1 file changed, 2 deletions(-) +Merging dlm/next (4f2b30fd9b4b fs: dlm: fix race in nodeid2con) +$ git merge dlm/next +Already up to date. +Merging swiotlb/linux-next (b51e627158cb swiotlb: Mark max_segment with static keyword) +$ git merge swiotlb/linux-next +Already up to date. +Merging rdma/for-next (3650b228f83a Linux 5.10-rc1) +$ git merge rdma/for-next +Already up to date. +Merging net-next/master (3cb12d27ff65 Merge tag 'net-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge net-next/master +Already up to date. +Merging bpf-next/for-next (3cb12d27ff65 Merge tag 'net-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge bpf-next/for-next +Already up to date. +Merging ipsec-next/master (61e7113e48d3 Merge 'xfrm: Add compat layer') +$ git merge ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (3650b228f83a Linux 5.10-rc1) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (3cb12d27ff65 Merge tag 'net-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge netfilter-next/master +Already up to date. +Merging ipvs-next/master (c2568c8c9e63 Merge branch 'net-Constify-struct-genl_small_ops') +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (3650b228f83a Linux 5.10-rc1) +$ git merge wireless-drivers-next/master +Already up to date. +Merging bluetooth/master (44d59235ace5 Bluetooth: hci_h5: close serdev device and free hu in h5_close) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/hci_h5.c | 8 ++++++-- + drivers/bluetooth/hci_qca.c | 19 +++++++++++++------ + net/bluetooth/hci_event.c | 5 +++++ + 3 files changed, 24 insertions(+), 8 deletions(-) +Merging mac80211-next/master (3cb12d27ff65 Merge tag 'net-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (bedb0f056faa gfs2: Recover statfs info in journal head) +$ git merge gfs2/for-next +Already up to date. +Merging mtd/mtd/next (6402f4ce9581 mtd: hyperbus: Fix build failure when only RPCIF_HYPERBUS is enabled) +$ git merge mtd/mtd/next +Already up to date. +Merging nand/nand/next (88e315d12fbb mtd: onenand: simplify the return expression of onenand_transfer_auto_oob) +$ git merge nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (9a3422a110c8 Revert "mtd: spi-nor: Prefer asynchronous probe") +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (3093e7c16e12 X.509: Fix modular build of public_key_sm2) +$ git merge crypto/master +Already up to date. +Merging drm/drm-next (b45b6fbc671c Merge tag 'drm-intel-next-fixes-2020-10-22' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) +$ git merge drm/drm-next +Already up to date. +Merging amdgpu/drm-next (bbca2300b3f6 drm/amdgpu/display: fix indentation in defer_delay_converter_wa()) +$ git merge amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +Auto-merging drivers/gpu/drm/amd/pm/inc/smu_types.h +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c +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.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_crat.c +Auto-merging drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c +Auto-merging drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +Recorded preimage for 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c' +Recorded preimage for 'drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c' +Recorded preimage for 'drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c' +Recorded preimage for 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h' +Recorded preimage for 'drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c' +Resolved 'drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c' 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/amdgpu/amdgpu_device.c'. +Recorded resolution for 'drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c'. +Recorded resolution for 'drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c'. +Recorded resolution for 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h'. +Recorded resolution for 'drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c'. +[master 7648dcc3a315] Merge remote-tracking branch 'amdgpu/drm-next' into master +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/amd/amdgpu/Makefile | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 7 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 33 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 68 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_df.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_fw_attestation.c | 142 + + drivers/gpu/drm/amd/amdgpu/amdgpu_fw_attestation.h | 30 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 79 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 11 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 11 + + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 75 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c | 523 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.h | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 82 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 10 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 284 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 2 +- + drivers/gpu/drm/amd/amdgpu/athub_v2_1.c | 1 + + drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 6 - + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 4 - + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 7 - + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 180 +- + drivers/gpu/drm/amd/amdgpu/df_v3_6.h | 9 - + .../gpu/drm/amd/amdgpu/dimgrey_cavefish_reg_init.c | 54 + + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 214 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 17 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c | 13 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.h | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 47 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 6 + + drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 589 + + drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.h | 28 + + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 9 +- + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 39 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c | 341 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_2.h | 32 + + drivers/gpu/drm/amd/amdgpu/nv.c | 173 +- + drivers/gpu/drm/amd/amdgpu/nv.h | 2 + + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 54 +- + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 54 +- + drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 23 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 11 +- + drivers/gpu/drm/amd/amdgpu/vangogh_reg_init.c | 50 + + drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 6 + + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 41 + + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 2 + + drivers/gpu/drm/amd/display/Kconfig | 11 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 198 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 6 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 - + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 4 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 23 - + .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 17 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_trace.h | 565 +- + drivers/gpu/drm/amd/display/dc/Makefile | 5 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 187 +- + .../amd/display/dc/bios/command_table_helper2.c | 7 +- + .../dc/bios/dce112/command_table_helper2_dce112.c | 40 - + .../dc/bios/dce112/command_table_helper2_dce112.h | 3 - + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 2 - + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 10 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 32 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 2 +- + .../gpu/drm/amd/display/dc/clk_mgr/dcn30/dalsmc.h | 1 + + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 10 + + .../dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.c | 9 + + .../dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.h | 2 + + .../drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c | 241 + + .../drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.h | 164 + + .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 834 + + .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.h | 43 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 77 +- + drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 2 + + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 9 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 13 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 39 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 43 +- + drivers/gpu/drm/amd/display/dc/core/dc_sink.c | 1 - + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 12 +- + drivers/gpu/drm/amd/display/dc/dc.h | 34 +- + drivers/gpu/drm/amd/display/dc/dc_dsc.h | 10 +- + drivers/gpu/drm/amd/display/dc/dc_helper.c | 26 - + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 18 - + drivers/gpu/drm/amd/display/dc/dc_stream.h | 9 +- + drivers/gpu/drm/amd/display/dc/dc_trace.h | 39 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 12 +- + drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 20 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 4 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 27 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 51 +- + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 298 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 9 +- + drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 1 - + .../drm/amd/display/dc/dce100/dce100_resource.c | 9 +- + .../drm/amd/display/dc/dce110/dce110_resource.c | 11 +- + .../drm/amd/display/dc/dce112/dce112_resource.c | 9 +- + .../drm/amd/display/dc/dce120/dce120_resource.c | 9 +- + .../gpu/drm/amd/display/dc/dce60/dce60_resource.c | 7 - + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 13 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 2 - + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 153 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 1 - + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 13 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 5 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 31 - + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 2 + + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 8 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 8 - + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 4 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 6 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h | 18 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 17 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 1 - + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.h | 2 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.c | 12 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.h | 4 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 41 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 3 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c | 15 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.h | 2 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 2 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 296 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c | 7 - + .../gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.c | 54 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.h | 5 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.h | 3 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 98 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h | 2 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 4 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 51 +- + drivers/gpu/drm/amd/display/dc/dcn301/Makefile | 47 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_dccg.c | 75 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_dccg.h | 65 + + .../display/dc/dcn301/dcn301_dio_link_encoder.c | 192 + + .../display/dc/dcn301/dcn301_dio_link_encoder.h | 82 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_hubbub.c | 81 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_hubbub.h | 60 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_hwseq.c | 42 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_hwseq.h | 32 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_init.c | 144 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_init.h | 33 + + .../drm/amd/display/dc/dcn301/dcn301_panel_cntl.c | 218 + + .../drm/amd/display/dc/dcn301/dcn301_panel_cntl.h | 97 + + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 2011 + + .../drm/amd/display/dc/dcn301/dcn301_resource.h | 42 + + drivers/gpu/drm/amd/display/dc/dcn302/Makefile | 46 + + .../gpu/drm/amd/display/dc/dcn302/dcn302_dccg.h | 41 + + .../gpu/drm/amd/display/dc/dcn302/dcn302_hwseq.c | 233 + + .../gpu/drm/amd/display/dc/dcn302/dcn302_hwseq.h | 35 + + .../gpu/drm/amd/display/dc/dcn302/dcn302_init.c | 39 + + .../gpu/drm/amd/display/dc/dcn302/dcn302_init.h | 33 + + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 1563 + + .../drm/amd/display/dc/dcn302/dcn302_resource.h | 33 + + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 2 - + drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 24 +- + drivers/gpu/drm/amd/display/dc/dm_services.h | 42 +- + drivers/gpu/drm/amd/display/dc/dml/Makefile | 5 - + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 4 +- + .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 2 +- + .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 10 +- + .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 4 - + .../drm/amd/display/dc/dml/display_mode_structs.h | 2 - + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 2 - + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 2 - + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 24 +- + drivers/gpu/drm/amd/display/dc/gpio/Makefile | 5 +- + .../amd/display/dc/gpio/dcn30/hw_factory_dcn30.c | 14 +- + .../amd/display/dc/gpio/dcn30/hw_factory_dcn30.h | 2 +- + .../amd/display/dc/gpio/dcn30/hw_translate_dcn30.c | 2 +- + .../amd/display/dc/gpio/dcn30/hw_translate_dcn30.h | 2 +- + drivers/gpu/drm/amd/display/dc/gpio/gpio_base.c | 4 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 7 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 7 +- + drivers/gpu/drm/amd/display/dc/inc/core_status.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 8 +- + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 41 +- + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 7 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 8 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 2 - + drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h | 6 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 5 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 2 - + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 3 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mcif_wb.h | 4 - + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 19 +- + drivers/gpu/drm/amd/display/dc/inc/hw/opp.h | 5 + + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 2 - + .../drm/amd/display/dc/inc/hw/timing_generator.h | 6 - + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 7 +- + drivers/gpu/drm/amd/display/dc/inc/resource.h | 2 - + drivers/gpu/drm/amd/display/dc/irq/Makefile | 10 +- + .../amd/display/dc/irq/dcn30/irq_service_dcn30.c | 2 +- + .../amd/display/dc/irq/dcn30/irq_service_dcn30.h | 2 +- + .../amd/display/dc/irq/dcn302/irq_service_dcn302.c | 344 + + .../amd/display/dc/irq/dcn302/irq_service_dcn302.h | 33 + + drivers/gpu/drm/amd/display/dc/os_types.h | 33 +- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 4 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 47 +- + drivers/gpu/drm/amd/display/dmub/src/Makefile | 5 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn301.c | 55 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn301.h | 37 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn302.c | 55 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn302.h | 37 + + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 39 +- + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 16 +- + drivers/gpu/drm/amd/display/include/dal_types.h | 2 + + .../drm/amd/display/include/ddc_service_types.h | 2 + + drivers/gpu/drm/amd/display/include/dpcd_defs.h | 1 + + .../amd/display/include/grph_object_ctrl_defs.h | 13 + + .../drm/amd/display/modules/color/color_gamma.c | 122 +- + .../drm/amd/display/modules/color/color_gamma.h | 6 +- + .../drm/amd/display/modules/freesync/freesync.c | 55 +- + .../drm/amd/display/modules/power/power_helpers.c | 11 +- + drivers/gpu/drm/amd/include/amd_shared.h | 1 + + .../amd/include/asic_reg/clk/clk_11_5_0_offset.h | 50 + + .../amd/include/asic_reg/clk/clk_11_5_0_sh_mask.h | 70 + + .../amd/include/asic_reg/dcn/dcn_3_0_1_offset.h | 13271 ++ + .../amd/include/asic_reg/dcn/dcn_3_0_1_sh_mask.h | 53357 ++++++ + .../amd/include/asic_reg/gc/gc_10_3_0_default.h | 1 + + .../drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 2 + + .../amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h | 33 + + .../drm/amd/include/asic_reg/gc/gc_9_4_1_sh_mask.h | 2 +- + .../include/asic_reg/mmhub/mmhub_2_3_0_default.h | 1253 + + .../include/asic_reg/mmhub/mmhub_2_3_0_offset.h | 2439 + + .../include/asic_reg/mmhub/mmhub_2_3_0_sh_mask.h | 10331 ++ + .../drm/amd/include/asic_reg/mp/mp_11_5_0_offset.h | 400 + + .../amd/include/asic_reg/mp/mp_11_5_0_sh_mask.h | 942 + + .../amd/include/asic_reg/nbio/nbio_7_2_0_offset.h | 31873 ++++ + .../amd/include/asic_reg/nbio/nbio_7_2_0_sh_mask.h | 152495 ++++++++++++++++++ + drivers/gpu/drm/amd/include/atomfirmware.h | 63 +- + .../drm/amd/include/dimgrey_cavefish_ip_offset.h | 1049 + + drivers/gpu/drm/amd/include/vangogh_ip_offset.h | 1516 + + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 11 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 49 +- + drivers/gpu/drm/amd/pm/inc/hwmgr.h | 20 +- + .../amd/pm/inc/smu11_driver_if_sienna_cichlid.h | 14 +- + .../gpu/drm/amd/pm/inc/smu11_driver_if_vangogh.h | 239 + + drivers/gpu/drm/amd/pm/inc/smu_types.h | 54 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 4 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_5_pmfw.h | 120 + + drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h | 86 + + drivers/gpu/drm/amd/pm/powerplay/hwmgr/hwmgr_ppt.h | 8 +- + .../amd/pm/powerplay/hwmgr/process_pptables_v1_0.c | 85 +- + .../drm/amd/pm/powerplay/hwmgr/processpptables.c | 85 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.c | 5 +- + .../pm/powerplay/hwmgr/vega10_processpptables.c | 88 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 222 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/Makefile | 1 + + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 18 + + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 33 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 26 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 360 + + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 30 + + drivers/gpu/drm/amd/pm/swsmu/smu_internal.h | 8 +- + drivers/pci/pcie/err.c | 41 +- + include/drm/amd_asic_type.h | 2 + + include/uapi/drm/amdgpu_drm.h | 6 +- + 288 files changed, 282818 insertions(+), 2110 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fw_attestation.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fw_attestation.h + create mode 100755 drivers/gpu/drm/amd/amdgpu/dimgrey_cavefish_reg_init.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_2.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vangogh_reg_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dc_trace.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_dccg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_dccg.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_dio_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_dio_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_hubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_hubbub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_hwseq.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_hwseq.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_init.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_panel_cntl.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_panel_cntl.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_dccg.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_hwseq.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_hwseq.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_init.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.h + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn302/irq_service_dcn302.c + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn302/irq_service_dcn302.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn301.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn301.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn302.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn302.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/clk/clk_11_5_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/clk/clk_11_5_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_1_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_1_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_2_3_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_2_3_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_2_3_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_11_5_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_11_5_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_2_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_2_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/dimgrey_cavefish_ip_offset.h + create mode 100644 drivers/gpu/drm/amd/include/vangogh_ip_offset.h + create mode 100644 drivers/gpu/drm/amd/pm/inc/smu11_driver_if_vangogh.h + create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v11_5_pmfw.h + create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h +$ git reset --hard HEAD^ +HEAD is now at 417389e690a5 Merge remote-tracking branch 'bluetooth/master' into master +Merging next-20201026 version of amdgpu +$ git merge -m next-20201026/amdgpu 02c3d98ce25b3e4f0b8e830be054c8f4f7f944c1 +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +Auto-merging drivers/gpu/drm/amd/pm/inc/smu_types.h +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_crat.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Resolved 'drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5c16024f47f9] next-20201026/amdgpu +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/amd/amdgpu/Makefile | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 13 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_df.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 11 + + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c | 525 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.h | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 46 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 2 +- + drivers/gpu/drm/amd/amdgpu/athub_v2_1.c | 1 + + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 180 +- + drivers/gpu/drm/amd/amdgpu/df_v3_6.h | 9 - + .../gpu/drm/amd/amdgpu/dimgrey_cavefish_reg_init.c | 54 + + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 172 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 38 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 6 + + drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 589 + + drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.h | 28 + + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 9 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c | 341 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_2.h | 32 + + drivers/gpu/drm/amd/amdgpu/nv.c | 116 +- + drivers/gpu/drm/amd/amdgpu/nv.h | 2 + + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 54 +- + drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 21 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 11 +- + drivers/gpu/drm/amd/amdgpu/vangogh_reg_init.c | 50 + + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 6 + + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 41 + + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 2 + + drivers/gpu/drm/amd/display/Kconfig | 24 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 63 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 23 - + drivers/gpu/drm/amd/display/dc/Makefile | 9 + + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 187 + + .../amd/display/dc/bios/command_table_helper2.c | 11 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 10 + + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 34 +- + .../drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c | 241 + + .../drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.h | 164 + + .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 834 + + .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.h | 43 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 18 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 31 + + drivers/gpu/drm/amd/display/dc/dc.h | 6 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 1 + + drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 18 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 18 + + .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 49 + + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 325 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 9 +- + .../drm/amd/display/dc/dce100/dce100_resource.c | 1 + + .../drm/amd/display/dc/dce110/dce110_resource.c | 3 +- + .../drm/amd/display/dc/dce112/dce112_resource.c | 1 + + .../drm/amd/display/dc/dce120/dce120_resource.c | 1 + + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 3 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 164 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 2 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 18 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 2 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c | 15 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.h | 2 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 1 + + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 120 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.c | 54 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.h | 5 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.h | 5 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 16 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h | 2 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 3 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn301/Makefile | 47 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_dccg.c | 75 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_dccg.h | 65 + + .../display/dc/dcn301/dcn301_dio_link_encoder.c | 192 + + .../display/dc/dcn301/dcn301_dio_link_encoder.h | 82 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_hubbub.c | 81 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_hubbub.h | 60 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_hwseq.c | 42 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_hwseq.h | 32 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_init.c | 145 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_init.h | 33 + + .../drm/amd/display/dc/dcn301/dcn301_panel_cntl.c | 218 + + .../drm/amd/display/dc/dcn301/dcn301_panel_cntl.h | 97 + + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 2011 + + .../drm/amd/display/dc/dcn301/dcn301_resource.h | 42 + + drivers/gpu/drm/amd/display/dc/dcn302/Makefile | 17 + + .../gpu/drm/amd/display/dc/dcn302/dcn302_dccg.h | 41 + + .../gpu/drm/amd/display/dc/dcn302/dcn302_hwseq.c | 233 + + .../gpu/drm/amd/display/dc/dcn302/dcn302_hwseq.h | 35 + + .../gpu/drm/amd/display/dc/dcn302/dcn302_init.c | 39 + + .../gpu/drm/amd/display/dc/dcn302/dcn302_init.h | 33 + + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 1619 + + .../drm/amd/display/dc/dcn302/dcn302_resource.h | 33 + + drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 26 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 6 + + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 6 + + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 33 + + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 6 + + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 5 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 7 +- + drivers/gpu/drm/amd/display/dc/irq/Makefile | 10 + + .../amd/display/dc/irq/dcn302/irq_service_dcn302.c | 344 + + .../amd/display/dc/irq/dcn302/irq_service_dcn302.h | 33 + + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 6 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 4 +- + drivers/gpu/drm/amd/display/dmub/src/Makefile | 5 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn301.c | 55 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn301.h | 37 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn302.c | 55 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn302.h | 37 + + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 45 +- + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 22 +- + drivers/gpu/drm/amd/display/include/dal_types.h | 8 + + .../amd/display/include/grph_object_ctrl_defs.h | 17 + + .../drm/amd/display/modules/freesync/freesync.c | 55 +- + drivers/gpu/drm/amd/include/amd_shared.h | 1 + + .../amd/include/asic_reg/clk/clk_11_5_0_offset.h | 50 + + .../amd/include/asic_reg/clk/clk_11_5_0_sh_mask.h | 70 + + .../amd/include/asic_reg/dcn/dcn_3_0_1_offset.h | 13271 ++ + .../amd/include/asic_reg/dcn/dcn_3_0_1_sh_mask.h | 53357 ++++++ + .../include/asic_reg/mmhub/mmhub_2_3_0_default.h | 1253 + + .../include/asic_reg/mmhub/mmhub_2_3_0_offset.h | 2439 + + .../include/asic_reg/mmhub/mmhub_2_3_0_sh_mask.h | 10331 ++ + .../drm/amd/include/asic_reg/mp/mp_11_5_0_offset.h | 400 + + .../amd/include/asic_reg/mp/mp_11_5_0_sh_mask.h | 942 + + .../amd/include/asic_reg/nbio/nbio_7_2_0_offset.h | 31873 ++++ + .../amd/include/asic_reg/nbio/nbio_7_2_0_sh_mask.h | 152495 ++++++++++++++++++ + drivers/gpu/drm/amd/include/atomfirmware.h | 67 +- + .../drm/amd/include/dimgrey_cavefish_ip_offset.h | 1049 + + drivers/gpu/drm/amd/include/vangogh_ip_offset.h | 1516 + + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 8 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 47 +- + drivers/gpu/drm/amd/pm/inc/hwmgr.h | 20 +- + .../gpu/drm/amd/pm/inc/smu11_driver_if_vangogh.h | 239 + + drivers/gpu/drm/amd/pm/inc/smu_types.h | 53 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 2 + + drivers/gpu/drm/amd/pm/inc/smu_v11_5_pmfw.h | 120 + + drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h | 86 + + drivers/gpu/drm/amd/pm/powerplay/hwmgr/hwmgr_ppt.h | 8 +- + .../amd/pm/powerplay/hwmgr/process_pptables_v1_0.c | 85 +- + .../drm/amd/pm/powerplay/hwmgr/processpptables.c | 85 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.c | 5 +- + .../pm/powerplay/hwmgr/vega10_processpptables.c | 88 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 218 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/Makefile | 1 + + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 22 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 354 + + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 30 + + drivers/gpu/drm/amd/pm/swsmu/smu_internal.h | 7 - + drivers/pci/pcie/err.c | 41 +- + include/drm/amd_asic_type.h | 2 + + include/uapi/drm/amdgpu_drm.h | 4 + + 171 files changed, 280766 insertions(+), 1005 deletions(-) + create mode 100755 drivers/gpu/drm/amd/amdgpu/dimgrey_cavefish_reg_init.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_2.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vangogh_reg_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_dccg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_dccg.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_dio_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_dio_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_hubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_hubbub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_hwseq.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_hwseq.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_init.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_panel_cntl.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_panel_cntl.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_dccg.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_hwseq.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_hwseq.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_init.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.h + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn302/irq_service_dcn302.c + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn302/irq_service_dcn302.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn301.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn301.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn302.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn302.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/clk/clk_11_5_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/clk/clk_11_5_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_1_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_1_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_2_3_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_2_3_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_2_3_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_11_5_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_11_5_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_2_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_2_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/dimgrey_cavefish_ip_offset.h + create mode 100644 drivers/gpu/drm/amd/include/vangogh_ip_offset.h + create mode 100644 drivers/gpu/drm/amd/pm/inc/smu11_driver_if_vangogh.h + create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v11_5_pmfw.h + create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h +Merging drm-intel/for-linux-next (5c6c13cd1102 drm/i915: Drop runtime-pm assert from vgpu io accessors) +$ git merge drm-intel/for-linux-next +Already up to date. +Merging drm-tegra/drm/tegra/for-next (d9f980ebcd01 drm/tegra: output: rgb: Wrap directly-connected panel into DRM bridge) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (70bb91937286 drm: deprecate DRM_FORMAT_MOD_NONE) +$ git merge drm-misc/for-linux-next +Auto-merging include/drm/drm_prime.h +Auto-merging include/drm/drm_dp_helper.h +CONFLICT (content): Merge conflict in include/drm/drm_dp_helper.h +Auto-merging drivers/misc/fastrpc.c +Auto-merging drivers/media/common/videobuf2/videobuf2-vmalloc.c +Auto-merging drivers/media/common/videobuf2/videobuf2-dma-sg.c +Auto-merging drivers/media/common/videobuf2/videobuf2-dma-contig.c +Auto-merging drivers/gpu/drm/xen/xen_drm_front_gem.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_thp.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c +Removing drivers/gpu/drm/vkms/vkms_gem.c +Auto-merging drivers/gpu/drm/virtio/virtgpu_vq.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/virtio/virtgpu_vq.c +Auto-merging drivers/gpu/drm/virtio/virtgpu_object.c +Auto-merging drivers/gpu/drm/vc4/vc4_drv.h +Auto-merging drivers/gpu/drm/vc4/vc4_crtc.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +Auto-merging drivers/gpu/drm/tegra/gem.c +Auto-merging drivers/gpu/drm/rockchip/rockchip_drm_gem.c +Auto-merging drivers/gpu/drm/radeon/radeon_display.c +Auto-merging drivers/gpu/drm/omapdrm/omap_gem.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_mem.c +Auto-merging drivers/gpu/drm/msm/msm_gem.c +Auto-merging drivers/gpu/drm/msm/msm_drv.h +Auto-merging drivers/gpu/drm/msm/msm_drv.c +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +Auto-merging drivers/gpu/drm/mediatek/mtk_drm_gem.c +Auto-merging drivers/gpu/drm/mediatek/mtk_drm_drv.c +Auto-merging drivers/gpu/drm/mediatek/mtk_drm_crtc.c +Auto-merging drivers/gpu/drm/ingenic/ingenic-drm.h +Auto-merging drivers/gpu/drm/ingenic/ingenic-drm-drv.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/ingenic/ingenic-drm-drv.c +Auto-merging drivers/gpu/drm/i915/selftests/mock_gem_device.c +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +Auto-merging drivers/gpu/drm/exynos/exynos_drm_gem.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem.c +Auto-merging drivers/gpu/drm/drm_prime.c +Auto-merging drivers/gpu/drm/drm_gem_shmem_helper.c +Auto-merging drivers/gpu/drm/drm_gem_cma_helper.c +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/drm_dp_mst_topology.c +Auto-merging drivers/gpu/drm/armada/armada_gem.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_object.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Auto-merging drivers/dma-buf/heaps/heap-helpers.c +Auto-merging drivers/dma-buf/dma-buf.c +Auto-merging MAINTAINERS +Auto-merging Documentation/driver-api/dma-buf.rst +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Recorded preimage for 'drivers/gpu/drm/ingenic/ingenic-drm-drv.c' +Recorded preimage for 'drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c' +Recorded preimage for 'drivers/gpu/drm/virtio/virtgpu_vq.c' +Recorded preimage for 'include/drm/drm_dp_helper.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/ingenic/ingenic-drm-drv.c'. +Recorded resolution for 'drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c'. +Recorded resolution for 'drivers/gpu/drm/virtio/virtgpu_vq.c'. +Recorded resolution for 'include/drm/drm_dp_helper.h'. +[master c34b3c2988cb] Merge remote-tracking branch 'drm-misc/for-linux-next' into master +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/bridge/analogix,anx7625.yaml | 95 + + .../bindings/display/panel/novatek,nt36672a.yaml | 87 + + .../bindings/display/panel/panel-simple-dsi.yaml | 3 + + .../bindings/display/panel/panel-simple.yaml | 2 + + .../bindings/display/ti/ti,am65x-dss.yaml | 11 + + .../bindings/display/ti/ti,j721e-dss.yaml | 11 + + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + Documentation/driver-api/dma-buf.rst | 9 + + Documentation/gpu/drm-mm.rst | 4 +- + Documentation/gpu/todo.rst | 12 +- + Documentation/gpu/vkms.rst | 99 +- + MAINTAINERS | 11 +- + drivers/dma-buf/dma-buf.c | 63 +- + drivers/dma-buf/dma-resv.c | 2 +- + drivers/dma-buf/heaps/heap-helpers.c | 10 +- + drivers/gpu/drm/Kconfig | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h | 5 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 87 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 157 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 2 +- + drivers/gpu/drm/arc/arcpgu_crtc.c | 4 +- + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 8 +- + drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 16 +- + drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 2 - + drivers/gpu/drm/arm/hdlcd_crtc.c | 4 +- + drivers/gpu/drm/arm/malidp_crtc.c | 6 +- + drivers/gpu/drm/armada/armada_crtc.c | 8 +- + drivers/gpu/drm/armada/armada_drv.c | 3 - + drivers/gpu/drm/armada/armada_gem.c | 12 +- + drivers/gpu/drm/armada/armada_gem.h | 2 - + drivers/gpu/drm/aspeed/Kconfig | 1 + + drivers/gpu/drm/aspeed/aspeed_gfx.h | 2 +- + drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 78 +- + drivers/gpu/drm/ast/ast_mode.c | 23 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 4 +- + drivers/gpu/drm/bridge/adv7511/adv7511_audio.c | 6 +- + drivers/gpu/drm/bridge/analogix/Kconfig | 9 + + drivers/gpu/drm/bridge/analogix/Makefile | 1 + + drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 2 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 1850 ++++++++++++++++++++ + drivers/gpu/drm/bridge/analogix/anx7625.h | 390 +++++ + .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 2 +- + drivers/gpu/drm/bridge/tc358764.c | 107 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 43 +- + drivers/gpu/drm/drm_atomic.c | 39 +- + drivers/gpu/drm/drm_atomic_helper.c | 24 +- + drivers/gpu/drm/drm_connector.c | 5 + + drivers/gpu/drm/drm_dp_aux_dev.c | 2 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 7 +- + drivers/gpu/drm/drm_fb_helper.c | 26 +- + drivers/gpu/drm/drm_fourcc.c | 1 + + drivers/gpu/drm/drm_gem.c | 53 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 28 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 17 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 175 +- + drivers/gpu/drm/drm_internal.h | 8 +- + drivers/gpu/drm/drm_ioctl.c | 2 +- + drivers/gpu/drm/drm_pci.c | 6 +- + drivers/gpu/drm/drm_prime.c | 29 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 4 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 13 - + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 1 - + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 19 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 13 +- + drivers/gpu/drm/exynos/exynos_drm_crtc.c | 4 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 10 - + drivers/gpu/drm/exynos/exynos_drm_gem.c | 15 + + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 6 +- + drivers/gpu/drm/gma500/cdv_intel_dp.c | 7 +- + drivers/gpu/drm/gma500/framebuffer.c | 2 + + drivers/gpu/drm/gma500/gem.c | 18 +- + drivers/gpu/drm/gma500/gem.h | 3 + + drivers/gpu/drm/gma500/psb_drv.c | 9 - + drivers/gpu/drm/gma500/psb_drv.h | 2 - + drivers/gpu/drm/hisilicon/hibmc/Makefile | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 87 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 18 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 33 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c | 99 ++ + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 42 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 13 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 21 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 3 - + .../gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 18 +- + drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c | 14 +- + drivers/gpu/drm/i915/i915_drv.c | 4 - + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 3 - + drivers/gpu/drm/imx/dcss/dcss-crtc.c | 9 +- + drivers/gpu/drm/imx/dcss/dcss-kms.c | 14 +- + drivers/gpu/drm/imx/dcss/dcss-plane.c | 2 - + drivers/gpu/drm/imx/ipuv3-crtc.c | 6 +- + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 272 ++- + drivers/gpu/drm/ingenic/ingenic-drm.h | 3 + + drivers/gpu/drm/mcde/mcde_drv.c | 4 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 4 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 5 - + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 11 + + drivers/gpu/drm/meson/meson_crtc.c | 8 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 7 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 4 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 4 +- + drivers/gpu/drm/msm/msm_drv.c | 13 - + drivers/gpu/drm/msm/msm_drv.h | 1 - + drivers/gpu/drm/msm/msm_gem.c | 19 +- + drivers/gpu/drm/mxsfb/mxsfb_kms.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 266 +-- + drivers/gpu/drm/nouveau/nouveau_bo.h | 4 +- + drivers/gpu/drm/nouveau/nouveau_chan.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 14 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 14 +- + drivers/gpu/drm/nouveau/nouveau_gem.h | 2 + + drivers/gpu/drm/nouveau/nouveau_mem.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_mem.h | 4 +- + drivers/gpu/drm/nouveau/nouveau_prime.c | 2 + + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 19 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 16 +- + drivers/gpu/drm/omapdrm/omap_crtc.c | 4 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 9 - + drivers/gpu/drm/omapdrm/omap_gem.c | 18 +- + drivers/gpu/drm/omapdrm/omap_gem.h | 2 - + drivers/gpu/drm/panel/Kconfig | 21 + + drivers/gpu/drm/panel/Makefile | 2 + + drivers/gpu/drm/panel/panel-novatek-nt36672a.c | 711 ++++++++ + drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 20 +- + drivers/gpu/drm/panel/panel-raydium-rm68200.c | 14 +- + drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 7 +- + drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 2 +- + drivers/gpu/drm/panel/panel-simple.c | 29 + + drivers/gpu/drm/panel/panel-sitronix-st7703.c | 2 +- + drivers/gpu/drm/panel/panel-tdo-tl070wsh30.c | 250 +++ + drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 7 +- + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 7 +- + drivers/gpu/drm/panfrost/panfrost_device.c | 8 +- + drivers/gpu/drm/panfrost/panfrost_job.c | 62 +- + drivers/gpu/drm/pl111/pl111_drv.c | 5 +- + drivers/gpu/drm/qxl/qxl_debugfs.c | 2 +- + drivers/gpu/drm/qxl/qxl_display.c | 11 +- + drivers/gpu/drm/qxl/qxl_drv.h | 1 - + drivers/gpu/drm/qxl/qxl_ioctl.c | 4 +- + drivers/gpu/drm/qxl/qxl_object.c | 72 +- + drivers/gpu/drm/qxl/qxl_object.h | 25 +- + drivers/gpu/drm/qxl/qxl_release.c | 4 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 104 +- + drivers/gpu/drm/radeon/radeon.h | 1 - + drivers/gpu/drm/radeon/radeon_display.c | 9 +- + drivers/gpu/drm/radeon/radeon_drv.c | 23 +- + drivers/gpu/drm/radeon/radeon_gem.c | 31 +- + drivers/gpu/drm/radeon/radeon_object.c | 126 +- + drivers/gpu/drm/radeon/radeon_object.h | 7 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 176 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 6 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 5 - + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 13 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 6 +- + drivers/gpu/drm/scheduler/sched_entity.c | 3 + + drivers/gpu/drm/sti/sti_crtc.c | 4 +- + drivers/gpu/drm/stm/ltdc.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_crtc.c | 4 +- + drivers/gpu/drm/tegra/dc.c | 8 +- + drivers/gpu/drm/tegra/drm.c | 4 - + drivers/gpu/drm/tegra/gem.c | 31 +- + drivers/gpu/drm/tidss/tidss_crtc.c | 6 +- + drivers/gpu/drm/tidss/tidss_plane.c | 2 + + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 56 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 38 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.h | 7 +- + drivers/gpu/drm/ttm/ttm_agp_backend.c | 4 +- + drivers/gpu/drm/ttm/ttm_bo.c | 192 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 103 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 40 +- + drivers/gpu/drm/ttm/ttm_memory.c | 2 +- + drivers/gpu/drm/ttm/ttm_page_alloc.c | 89 +- + drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 77 +- + drivers/gpu/drm/ttm/ttm_range_manager.c | 2 +- + drivers/gpu/drm/ttm/ttm_resource.c | 10 +- + {include => drivers/gpu}/drm/ttm/ttm_set_memory.h | 66 - + drivers/gpu/drm/ttm/ttm_tt.c | 250 +-- + drivers/gpu/drm/tve200/tve200_drv.c | 4 +- + drivers/gpu/drm/vboxvideo/vbox_mode.c | 4 +- + drivers/gpu/drm/vc4/vc4_bo.c | 21 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 8 +- + drivers/gpu/drm/vc4/vc4_drv.c | 12 - + drivers/gpu/drm/vc4/vc4_drv.h | 1 - + drivers/gpu/drm/vc4/vc4_dsi.c | 25 +- + drivers/gpu/drm/vc4/vc4_txp.c | 9 +- + drivers/gpu/drm/vgem/vgem_drv.c | 21 +- + drivers/gpu/drm/via/via_mm.c | 2 +- + drivers/gpu/drm/virtio/Makefile | 2 +- + drivers/gpu/drm/virtio/virtgpu_debugfs.c | 26 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 79 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 185 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 34 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 37 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 23 +- + drivers/gpu/drm/virtio/virtgpu_prime.c | 46 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 157 +- + drivers/gpu/drm/virtio/virtgpu_vram.c | 164 ++ + drivers/gpu/drm/vkms/Makefile | 1 - + drivers/gpu/drm/vkms/vkms_composer.c | 17 +- + drivers/gpu/drm/vkms/vkms_crtc.c | 4 +- + drivers/gpu/drm/vkms/vkms_drv.c | 30 +- + drivers/gpu/drm/vkms/vkms_drv.h | 29 - + drivers/gpu/drm/vkms/vkms_gem.c | 248 --- + drivers/gpu/drm/vkms/vkms_plane.c | 13 +- + drivers/gpu/drm/vkms/vkms_writeback.c | 17 +- + drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 95 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 20 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 12 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 197 +-- + drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 2 +- + drivers/gpu/drm/xen/xen_drm_front.c | 44 +- + drivers/gpu/drm/xen/xen_drm_front.h | 2 + + drivers/gpu/drm/xen/xen_drm_front_gem.c | 15 + + drivers/gpu/drm/xlnx/zynqmp_disp.c | 6 +- + drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 14 +- + drivers/gpu/drm/zte/zx_vou.c | 4 +- + drivers/gpu/vga/vga_switcheroo.c | 7 +- + .../media/common/videobuf2/videobuf2-dma-contig.c | 17 +- + drivers/media/common/videobuf2/videobuf2-dma-sg.c | 19 +- + drivers/media/common/videobuf2/videobuf2-vmalloc.c | 21 +- + drivers/misc/fastrpc.c | 6 +- + drivers/video/fbdev/aty/radeon_base.c | 4 +- + drivers/video/fbdev/cirrusfb.c | 3 +- + drivers/video/fbdev/core/fbmem.c | 44 +- + drivers/video/fbdev/fsl-diu-fb.c | 3 +- + drivers/video/fbdev/mx3fb.c | 2 - + drivers/video/fbdev/nvidia/nv_of.c | 3 +- + .../omap2/omapfb/displays/connector-analog-tv.c | 7 +- + .../fbdev/omap2/omapfb/displays/connector-dvi.c | 7 +- + .../fbdev/omap2/omapfb/displays/connector-hdmi.c | 7 +- + .../video/fbdev/omap2/omapfb/displays/panel-dpi.c | 7 +- + .../omapfb/displays/panel-sharp-ls037v7dw01.c | 7 +- + .../omap2/omapfb/displays/panel-sony-acx565akm.c | 7 +- + .../omap2/omapfb/displays/panel-tpo-td043mtea1.c | 7 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c | 10 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c | 10 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c | 10 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c | 16 +- + drivers/video/fbdev/omap2/omapfb/dss/venc.c | 6 +- + drivers/video/fbdev/omap2/omapfb/dss/video-pll.c | 20 +- + drivers/video/fbdev/sbuslib.c | 124 +- + drivers/video/fbdev/sh_mobile_lcdcfb.c | 6 +- + drivers/video/fbdev/sis/300vtbl.h | 2 - + drivers/video/fbdev/sis/sis_accel.h | 14 +- + include/drm/drm_dp_helper.h | 72 +- + include/drm/drm_drv.h | 85 +- + include/drm/drm_gem.h | 2 +- + include/drm/drm_gem_vram_helper.h | 3 - + include/drm/drm_mode_config.h | 13 + + include/drm/drm_modeset_helper_vtables.h | 13 +- + include/drm/drm_prime.h | 5 +- + include/drm/ttm/ttm_bo_api.h | 83 +- + include/drm/ttm/ttm_bo_driver.h | 91 +- + include/drm/ttm/ttm_caching.h | 34 + + include/drm/ttm/ttm_page_alloc.h | 12 +- + include/drm/ttm/ttm_placement.h | 15 - + include/drm/ttm/ttm_resource.h | 12 +- + include/drm/ttm/ttm_tt.h | 82 +- + include/linux/dma-buf-map.h | 193 ++ + include/linux/dma-buf.h | 14 +- + include/linux/platform_data/shmob_drm.h | 2 - + include/uapi/drm/drm_fourcc.h | 41 +- + include/uapi/drm/virtgpu_drm.h | 39 +- + include/uapi/linux/virtio_gpu.h | 78 + + 290 files changed, 7522 insertions(+), 3251 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/novatek,nt36672a.yaml + create mode 100644 drivers/gpu/drm/bridge/analogix/anx7625.c + create mode 100644 drivers/gpu/drm/bridge/analogix/anx7625.h + create mode 100644 drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c + create mode 100644 drivers/gpu/drm/panel/panel-novatek-nt36672a.c + create mode 100644 drivers/gpu/drm/panel/panel-tdo-tl070wsh30.c + rename {include => drivers/gpu}/drm/ttm/ttm_set_memory.h (66%) + create mode 100644 drivers/gpu/drm/virtio/virtgpu_vram.c + delete mode 100644 drivers/gpu/drm/vkms/vkms_gem.c + create mode 100644 include/drm/ttm/ttm_caching.h + create mode 100644 include/linux/dma-buf-map.h +Merging drm-msm/msm-next (d1ea91492585 drm/msm/dp: fix incorrect function prototype of dp_debug_get()) +$ git merge drm-msm/msm-next +Already up to date. +Merging mali-dp/for-upstream/mali-dp (f634c6a80287 dt/bindings: display: Add optional property node define for Mali DP500) +$ git merge mali-dp/for-upstream/mali-dp +Merge made by the 'recursive' strategy. +Merging imx-drm/imx-drm/next (a67d5088ceb8 drm/imx: drop explicit drm_mode_config_cleanup) +$ git merge imx-drm/imx-drm/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/dw_hdmi-imx.c | 12 ++----- + drivers/gpu/drm/imx/imx-drm-core.c | 10 +++--- + drivers/gpu/drm/imx/imx-tve.c | 38 +++------------------ + drivers/gpu/ipu-v3/ipu-common.c | 67 -------------------------------------- + include/video/imx-ipu-v3.h | 3 -- + 5 files changed, 13 insertions(+), 117 deletions(-) +Merging etnaviv/etnaviv/next (3136fed4f91e drm/etnaviv: Drop local dma_parms) +$ git merge etnaviv/etnaviv/next +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_drv.h +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_drv.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 3 -- + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 1 - + drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 78 ++++++++++++++++++++++--------- + 3 files changed, 55 insertions(+), 27 deletions(-) +Merging regmap/for-next (f243af4d473b Merge remote-tracking branch 'regmap/for-5.11' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-mmio.c | 90 +++++++++++++++++++++++++++++++++++---- + include/linux/regmap.h | 5 +++ + 2 files changed, 87 insertions(+), 8 deletions(-) +Merging sound/for-next (ad26098970b6 ALSA: remove unneeded break) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + sound/pci/rme32.c | 1 - + sound/pci/rme9652/hdspm.c | 8 -------- + sound/pci/rme9652/rme9652.c | 7 ------- + sound/soc/codecs/wcd-clsh-v2.c | 1 - + sound/soc/codecs/wl1273.c | 1 - + sound/soc/intel/skylake/skl-pcm.c | 1 - + sound/soc/ti/davinci-mcasp.c | 1 - + 7 files changed, 20 deletions(-) +Merging sound-asoc/for-next (9f5beb42260c Merge remote-tracking branch 'asoc/for-5.11' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging sound/soc/soc-dapm.c +Removing include/linux/platform_data/adau1977.h +Removing Documentation/devicetree/bindings/sound/st,stm32-sai.txt +Removing Documentation/devicetree/bindings/sound/st,stm32-adfsdm.txt +Merge made by the 'recursive' strategy. + .../bindings/iio/adc/st,stm32-dfsdm-adc.yaml | 7 +- + .../devicetree/bindings/sound/fsl,spdif.yaml | 1 + + .../devicetree/bindings/sound/fsl,xcvr.yaml | 104 ++ + .../devicetree/bindings/sound/qcom,sm8250.yaml | 161 +++ + .../devicetree/bindings/sound/st,stm32-adfsdm.txt | 63 - + .../devicetree/bindings/sound/st,stm32-sai.txt | 107 -- + .../devicetree/bindings/sound/st,stm32-sai.yaml | 200 +++ + include/dt-bindings/sound/adi,adau1977.h | 15 + + include/linux/platform_data/adau1977.h | 44 - + include/sound/soc-component.h | 6 +- + include/sound/soc-dai.h | 4 +- + include/sound/soc-link.h | 3 +- + include/sound/soc.h | 7 +- + sound/soc/amd/raven/pci-acp3x.c | 4 +- + sound/soc/codecs/Kconfig | 2 +- + sound/soc/codecs/adau1977.c | 9 +- + sound/soc/codecs/madera.c | 4 +- + sound/soc/codecs/wm5102.c | 4 +- + sound/soc/codecs/wm8350.c | 3 +- + sound/soc/fsl/Kconfig | 10 + + sound/soc/fsl/Makefile | 2 + + sound/soc/fsl/fsl_spdif.c | 73 +- + sound/soc/fsl/fsl_spdif.h | 9 +- + sound/soc/fsl/fsl_xcvr.c | 1359 ++++++++++++++++++++ + sound/soc/fsl/fsl_xcvr.h | 266 ++++ + sound/soc/intel/boards/bytcr_rt5651.c | 2 +- + sound/soc/jz4740/jz4740-i2s.c | 5 - + sound/soc/qcom/Kconfig | 11 + + sound/soc/qcom/Makefile | 2 + + sound/soc/qcom/sm8250.c | 228 ++++ + sound/soc/samsung/snow.c | 2 +- + sound/soc/soc-component.c | 19 +- + sound/soc/soc-dai.c | 13 +- + sound/soc/soc-dapm.c | 6 +- + sound/soc/soc-link.c | 12 +- + sound/soc/soc-pcm.c | 131 +- + sound/soc/sof/control.c | 20 +- + sound/soc/sof/intel/hda-dsp.c | 2 +- + sound/soc/sof/sof-audio.c | 10 +- + sound/soc/sof/topology.c | 2 +- + sound/soc/sunxi/Kconfig | 1 + + sound/soc/sunxi/sun8i-codec.c | 834 ++++++++++-- + 42 files changed, 3256 insertions(+), 511 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/fsl,xcvr.yaml + create mode 100644 Documentation/devicetree/bindings/sound/qcom,sm8250.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/st,stm32-adfsdm.txt + delete mode 100644 Documentation/devicetree/bindings/sound/st,stm32-sai.txt + create mode 100644 Documentation/devicetree/bindings/sound/st,stm32-sai.yaml + create mode 100644 include/dt-bindings/sound/adi,adau1977.h + delete mode 100644 include/linux/platform_data/adau1977.h + create mode 100644 sound/soc/fsl/fsl_xcvr.c + create mode 100644 sound/soc/fsl/fsl_xcvr.h + create mode 100644 sound/soc/qcom/sm8250.c +Merging modules/modules-next (fdf09ab88782 module: statically initialize init section freeing data) +$ git merge modules/modules-next +Already up to date. +Merging input/next (8a30c6eb29e0 Input: Add MAINTAINERS entry for SiS i2c touch input driver) +$ git merge input/next +Already up to date. +Merging block/for-next (2120d12a2ad3 Merge branch 'libata-5.10' into for-next) +$ git merge block/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging device-mapper/for-next (681cc5e8667e dm: fix request-based DM to not bounce through indirect dm_submit_bio) +$ git merge device-mapper/for-next +Already up to date. +Merging pcmcia/pcmcia-next (46d079790663 pcmcia: make pccard_loop_tuple() static) +$ git merge pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (3e4fb4346c78 Merge tag 'spdx-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx) +$ git merge mmc/next +Already up to date. +Merging mfd/for-mfd-next (6d81dc3c79d4 mfd: kempld-core: Fix unused variable 'kempld_acpi_table' when !ACPI) +$ git merge mfd/for-mfd-next +Already up to date. +Merging backlight/for-backlight-next (97ecfda1a8ff backlight: tosa_bl: Include the right header) +$ git merge backlight/for-backlight-next +Already up to date. +Merging battery/for-next (7007fab4ae82 power: reset: POWER_RESET_OCELOT_RESET should depend on Ocelot or Sparx5) +$ git merge battery/for-next +Already up to date. +Merging regulator/for-next (4a65ab4941e7 Merge remote-tracking branch 'regulator/for-5.11' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + .../bindings/regulator/fixed-regulator.yaml | 47 ++++++++++++++++ + drivers/regulator/fixed.c | 63 +++++++++++++++++++--- + drivers/regulator/lp872x.c | 2 +- + 3 files changed, 105 insertions(+), 7 deletions(-) +Merging security/next-testing (bc62d68e2a0a device_cgroup: Fix RCU list debugging warning) +$ git merge security/next-testing +Already up to date. +Merging apparmor/apparmor-next (e37986097ba6 apparmor: Use true and false for bool variable) +$ git merge apparmor/apparmor-next +Already up to date. +Merging integrity/next-integrity (aa662fc04f5b ima: Fix NULL pointer dereference in ima_file_hash) +$ git merge integrity/next-integrity +Already up to date. +Merging keys/keys-next (b6f61c314649 keys: Implement update for the big_key type) +$ git merge keys/keys-next +Already up to date. +Merging safesetid/safesetid-next (03ca0ec13892 LSM: SafeSetID: Fix warnings reported by test bot) +$ git merge safesetid/safesetid-next +Already up to date. +Merging selinux/next (0d50f059c4cd selinux: provide a "no sooner than" date for the checkreqprot removal) +$ git merge selinux/next +Already up to date. +Merging smack/next (edd615371b66 Smack: Remove unnecessary variable initialization) +$ git merge smack/next +Already up to date. +Merging tomoyo/master (ae7e63d1e34a Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1) +$ git merge tomoyo/master +Merge made by the 'recursive' strategy. + arch/um/kernel/skas/clone.c | 2 +- + arch/x86/um/stub_segv.c | 2 +- + drivers/scsi/qla2xxx/qla_tmpl.c | 4 ---- + 3 files changed, 2 insertions(+), 6 deletions(-) +Merging tpmdd/next (d3b03163a328 tpm_tis: Disable interrupts on ThinkPad T490s) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + drivers/char/tpm/tpm_tis.c | 29 +++++++++++++++++++++++++++-- + 1 file changed, 27 insertions(+), 2 deletions(-) +Merging watchdog/master (3650b228f83a Linux 5.10-rc1) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (7e3c3883c381 Merge branches 'arm/allwinner', 'arm/mediatek', 'arm/renesas', 'arm/tegra', 'arm/qcom', 'arm/smmu', 'ppc/pamu', 'x86/amd', 'x86/vt-d' and 'core' into next) +$ git merge iommu/next +Already up to date. +Merging audit/next (c07203516439 audit: Remove redundant null check) +$ git merge audit/next +Already up to date. +Merging devicetree/for-next (bd36e51d10e7 dt-bindings: misc: explicitly add #address-cells for slave mode) +$ git merge devicetree/for-next +Already up to date. +Merging mailbox/mailbox-for-next (c7dacf5b0f32 mailbox: avoid timer start from callback) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (e00ee68dc1f7 Merge remote-tracking branch 'spi/for-5.11' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + drivers/spi/spi-rockchip.c | 4 + + drivers/spi/spi-sun6i.c | 199 ++++++++++++++++++++++++++++++++++++++++----- + 2 files changed, 184 insertions(+), 19 deletions(-) +Merging tip/auto-latest (65609b26b21a Merge branch 'locking/urgent') +$ git merge tip/auto-latest +Auto-merging arch/x86/include/asm/thread_info.h +Auto-merging arch/x86/include/asm/processor.h +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/hw-vuln/index.rst | 1 + + Documentation/admin-guide/hw-vuln/l1d_flush.rst | 70 ++++++ + Documentation/admin-guide/kernel-parameters.txt | 17 ++ + Documentation/userspace-api/spec_ctrl.rst | 8 + + arch/um/include/asm/cacheflush.h | 9 + + arch/x86/entry/syscalls/syscall_64.tbl | 10 +- + arch/x86/include/asm/atomic.h | 2 +- + arch/x86/include/asm/atomic64_64.h | 2 +- + arch/x86/include/asm/cacheflush.h | 8 + + arch/x86/include/asm/cmpxchg.h | 2 +- + arch/x86/include/asm/processor.h | 2 + + arch/x86/include/asm/thread_info.h | 9 +- + arch/x86/include/asm/tlbflush.h | 2 +- + arch/x86/kernel/cpu/bugs.c | 54 +++++ + arch/x86/kernel/kexec-bzimage64.c | 3 +- + arch/x86/kernel/smpboot.c | 11 +- + arch/x86/kernel/unwind_orc.c | 9 +- + arch/x86/mm/tlb.c | 100 +++++++-- + drivers/video/fbdev/hyperv_fb.c | 9 +- + include/asm-generic/atomic-instrumented.h | 216 +++++++++++------- + include/linux/atomic-arch-fallback.h | 90 +++++++- + include/linux/atomic-fallback.h | 90 +++++++- + include/linux/freelist.h | 129 +++++++++++ + include/linux/kprobes.h | 25 ++- + include/linux/llist.h | 23 ++ + include/linux/sched.h | 4 + + include/uapi/linux/prctl.h | 1 + + kernel/fork.c | 4 + + kernel/kprobes.c | 286 ++++++++---------------- + kernel/trace/trace_kprobe.c | 3 +- + scripts/atomic/gen-atomic-fallback.sh | 63 +++++- + scripts/atomic/gen-atomic-instrumented.sh | 29 ++- + 32 files changed, 925 insertions(+), 366 deletions(-) + create mode 100644 Documentation/admin-guide/hw-vuln/l1d_flush.rst + create mode 100644 arch/um/include/asm/cacheflush.h + create mode 100644 include/linux/freelist.h +Merging clockevents/timers/drivers/next (f087e452f27e clocksource: sp804: enable Hisilicon sp804 timer 64bit mode) +$ git merge clockevents/timers/drivers/next +Merge made by the 'recursive' strategy. +Merging edac/edac-for-next (f09056c1dece EDAC/amd64: Remove unneeded breaks) +$ git merge edac/edac-for-next +Merge made by the 'recursive' strategy. + drivers/edac/amd64_edac.c | 8 -------- + 1 file changed, 8 deletions(-) +Merging irqchip/irq/irqchip-next (a7480c5d725c irqchip/sifive-plic: Fix broken irq_set_affinity() callback) +$ git merge irqchip/irq/irqchip-next +Auto-merging drivers/irqchip/Kconfig +Merge made by the 'recursive' strategy. + drivers/irqchip/Kconfig | 3 +-- + drivers/irqchip/irq-bcm2836.c | 2 +- + drivers/irqchip/irq-mst-intc.c | 4 ++-- + drivers/irqchip/irq-sifive-plic.c | 2 +- + drivers/irqchip/irq-stm32-exti.c | 4 ++++ + kernel/irq/Kconfig | 1 + + 6 files changed, 10 insertions(+), 6 deletions(-) +Merging ftrace/for-next (e1981f75d398 ring-buffer: Update the description for ring_buffer_wait) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (a9863c90f503 Merge branch 'urezki-pcount.2020.10.01a' into HEAD) +$ git merge rcu/rcu/next +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sched/core.c +Auto-merging kernel/rcu/tree.c +Auto-merging include/linux/uaccess.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/lockdep.h +CONFLICT (content): Merge conflict in include/linux/lockdep.h +Auto-merging drivers/gpu/drm/i915/Kconfig.debug +Auto-merging arch/x86/kernel/kvm.c +Resolved 'include/linux/lockdep.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4613081b7c14] Merge remote-tracking branch 'rcu/rcu/next' into master +$ git diff -M --stat --summary HEAD^.. + .../litmus-tests/locking/DCL-broken.litmus | 55 +++ + .../litmus-tests/locking/DCL-fixed.litmus | 56 +++ + .../litmus-tests/locking/RM-broken.litmus | 42 ++ + Documentation/litmus-tests/locking/RM-fixed.litmus | 42 ++ + arch/arm/include/asm/assembler.h | 11 - + arch/arm/kernel/iwmmxt.S | 2 - + arch/arm/mach-ep93xx/crunch-bits.S | 2 - + arch/xtensa/kernel/entry.S | 2 +- + drivers/gpu/drm/i915/Kconfig.debug | 1 - + drivers/gpu/drm/i915/i915_utils.h | 3 +- + include/linux/bit_spinlock.h | 4 +- + include/linux/lockdep.h | 6 +- + include/linux/pagemap.h | 4 +- + include/linux/preempt.h | 37 +- + include/linux/uaccess.h | 6 +- + kernel/Kconfig.preempt | 4 - + kernel/rcu/tree.c | 79 ++-- + kernel/sched/core.c | 6 +- + lib/Kconfig.debug | 3 - + tools/memory-model/Documentation/README | 82 ++++ + .../Documentation/control-dependencies.txt | 256 ++++++++++++ + tools/memory-model/Documentation/litmus-tests.txt | 17 + + tools/memory-model/Documentation/locking.txt | 320 ++++++++++++++ + tools/memory-model/Documentation/ordering.txt | 461 +++++++++++++++++++++ + tools/memory-model/README | 22 +- + tools/memory-model/litmus-tests/.gitignore | 2 +- + tools/memory-model/scripts/README | 16 +- + tools/memory-model/scripts/checkalllitmus.sh | 29 +- + tools/memory-model/scripts/checkghlitmus.sh | 11 +- + tools/memory-model/scripts/checklitmus.sh | 25 +- + tools/memory-model/scripts/checklitmushist.sh | 2 +- + tools/memory-model/scripts/checktheselitmus.sh | 43 ++ + tools/memory-model/scripts/cmplitmushist.sh | 49 ++- + tools/memory-model/scripts/hwfnseg.sh | 20 + + tools/memory-model/scripts/initlitmushist.sh | 2 +- + tools/memory-model/scripts/judgelitmus.sh | 120 +++++- + tools/memory-model/scripts/newlitmushist.sh | 4 +- + tools/memory-model/scripts/parseargs.sh | 21 +- + tools/memory-model/scripts/runlitmus.sh | 80 ++++ + tools/memory-model/scripts/runlitmushist.sh | 29 +- + tools/memory-model/scripts/simpletest.sh | 35 ++ + .../selftests/rcutorture/configs/rcu/SRCU-t | 1 - + .../selftests/rcutorture/configs/rcu/SRCU-u | 1 - + .../selftests/rcutorture/configs/rcu/TINY01 | 1 - + .../testing/selftests/rcutorture/doc/TINY_RCU.txt | 5 +- + .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 1 - + .../rcutorture/formal/srcu-cbmc/src/config.h | 1 - + 47 files changed, 1777 insertions(+), 244 deletions(-) + create mode 100644 Documentation/litmus-tests/locking/DCL-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/DCL-fixed.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-fixed.litmus + create mode 100644 tools/memory-model/Documentation/README + create mode 100644 tools/memory-model/Documentation/control-dependencies.txt + create mode 100644 tools/memory-model/Documentation/locking.txt + create mode 100644 tools/memory-model/Documentation/ordering.txt + create mode 100755 tools/memory-model/scripts/checktheselitmus.sh + create mode 100755 tools/memory-model/scripts/hwfnseg.sh + create mode 100755 tools/memory-model/scripts/runlitmus.sh + create mode 100755 tools/memory-model/scripts/simpletest.sh +Merging kvm/linux-next (e792415c5d3e KVM: MIPS/VZ: Fix build error caused by 'kvm_run' cleanup) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (4e5dc64c4319 Merge branches 'kvm-arm64/pt-new' and 'kvm-arm64/pmu-5.9' into kvmarm-master/next) +$ git merge kvm-arm/next +Already up to date. +Merging kvm-ppc/kvm-ppc-next (cf59eb13e151 KVM: PPC: Book3S: Fix symbol undeclared warnings) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (23a60f834406 s390/kvm: diagnose 0x318 sync and reset) +$ git merge kvms390/next +Already up to date. +Merging xen-tip/linux-next (1a89c1dc9520 Documentation: add xen.fifo_events kernel parameter description) +$ git merge xen-tip/linux-next +Already up to date. +Merging percpu/for-next (38cabe062b96 Merge branch 'for-5.10-fixes' into for-next) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (10cdb1575954 workqueue: use BUILD_BUG_ON() for compile time test instead of WARN_ON()) +$ git merge workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (3650b228f83a Linux 5.10-rc1) +$ git merge drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (3650b228f83a Linux 5.10-rc1) +$ git merge chrome-platform/for-next +Already up to date. +Merging hsi/for-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (3650b228f83a Linux 5.10-rc1) +$ git merge leds/for-next +Already up to date. +Merging ipmi/for-next (9ff9b0d392ea Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (3650b228f83a Linux 5.10-rc1) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (3650b228f83a Linux 5.10-rc1) +$ git merge usb/usb-next +Already up to date. +Merging usb-gadget/next (b2c586eb07ef usb: dwc2: Fix INTR OUT transfers in DDMA mode.) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (3650b228f83a Linux 5.10-rc1) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/ci-for-usb-next (71ac680e6339 usb: chipidea: ci_hdrc_imx: restore pinctrl) +$ git merge usb-chipidea-next/ci-for-usb-next +Already up to date. +Merging phy-next/next (60f5a24c11f7 phy: qcom-qmp: initialize the pointer to NULL) +$ git merge phy-next/next +Already up to date. +Merging tty/tty-next (3650b228f83a Linux 5.10-rc1) +$ git merge tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (3650b228f83a Linux 5.10-rc1) +$ git merge char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (ca26071da1bb dt-bindings: extcon: add binding for TUSB320) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + .../bindings/extcon/extcon-usbc-tusb320.yaml | 41 +++++ + drivers/extcon/Kconfig | 8 + + drivers/extcon/Makefile | 1 + + drivers/extcon/extcon-usbc-tusb320.c | 184 +++++++++++++++++++++ + 4 files changed, 234 insertions(+) + create mode 100644 Documentation/devicetree/bindings/extcon/extcon-usbc-tusb320.yaml + create mode 100644 drivers/extcon/extcon-usbc-tusb320.c +Merging soundwire/next (0173f525b2c1 soundwire: sysfs: add slave status and device number before probe) +$ git merge soundwire/next +Already up to date. +Merging thunderbolt/next (3650b228f83a Linux 5.10-rc1) +$ git merge thunderbolt/next +Already up to date. +Merging vfio/next (2e6cfd496f5b vfio iommu type1: Fix memory leak in vfio_iommu_type1_pin_pages) +$ git merge vfio/next +Already up to date. +Merging staging/staging-next (9ab476ba001e staging: r8188eu: inline rtw_init_netdev_name()) +$ git merge staging/staging-next +Removing tools/testing/selftests/android/run.sh +Removing tools/testing/selftests/android/ion/ipcsocket.h +Removing tools/testing/selftests/android/ion/ipcsocket.c +Removing tools/testing/selftests/android/ion/ionutils.h +Removing tools/testing/selftests/android/ion/ionutils.c +Removing tools/testing/selftests/android/ion/ionmap_test.c +Removing tools/testing/selftests/android/ion/ionapp_import.c +Removing tools/testing/selftests/android/ion/ionapp_export.c +Removing tools/testing/selftests/android/ion/ion_test.sh +Removing tools/testing/selftests/android/ion/ion.h +Removing tools/testing/selftests/android/ion/README +Removing tools/testing/selftests/android/ion/Makefile +Removing tools/testing/selftests/android/ion/.gitignore +Removing tools/testing/selftests/android/config +Removing tools/testing/selftests/android/Makefile +Removing drivers/staging/android/uapi/ion.h +Removing drivers/staging/android/ion/ion_system_heap.c +Removing drivers/staging/android/ion/ion_page_pool.c +Removing drivers/staging/android/ion/ion_heap.c +Removing drivers/staging/android/ion/ion_cma_heap.c +Removing drivers/staging/android/ion/ion.h +Removing drivers/staging/android/ion/ion.c +Removing drivers/staging/android/ion/Makefile +Removing drivers/staging/android/ion/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 10 - + drivers/staging/android/Kconfig | 2 - + drivers/staging/android/Makefile | 2 - + drivers/staging/android/TODO | 5 - + drivers/staging/android/ion/Kconfig | 27 - + drivers/staging/android/ion/Makefile | 4 - + drivers/staging/android/ion/ion.c | 649 --------------------- + drivers/staging/android/ion/ion.h | 302 ---------- + drivers/staging/android/ion/ion_cma_heap.c | 138 ----- + drivers/staging/android/ion/ion_heap.c | 286 --------- + drivers/staging/android/ion/ion_page_pool.c | 155 ----- + drivers/staging/android/ion/ion_system_heap.c | 377 ------------ + drivers/staging/android/uapi/ion.h | 127 ---- + drivers/staging/comedi/drivers/ni_mio_common.c | 3 +- + .../staging/comedi/drivers/tests/ni_routes_test.c | 8 +- + drivers/staging/gdm724x/gdm_mux.c | 10 +- + drivers/staging/greybus/audio_codec.c | 109 ++-- + drivers/staging/greybus/audio_manager_module.c | 3 +- + drivers/staging/iio/accel/adis16240.c | 1 + + drivers/staging/kpc2000/kpc2000/cell_probe.c | 71 ++- + drivers/staging/kpc2000/kpc2000/core.c | 3 +- + drivers/staging/kpc2000/kpc2000/dma_common_defs.h | 17 +- + drivers/staging/qlge/qlge_ethtool.c | 1 + + drivers/staging/qlge/qlge_main.c | 9 - + drivers/staging/qlge/qlge_mpi.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_ap.c | 54 +- + drivers/staging/rtl8188eu/core/rtw_cmd.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_debug.c | 18 +- + drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 36 +- + drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_mlme.c | 18 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 122 ++-- + drivers/staging/rtl8188eu/core/rtw_recv.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 24 +- + drivers/staging/rtl8188eu/core/rtw_xmit.c | 10 +- + drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 10 +- + drivers/staging/rtl8188eu/include/osdep_intf.h | 1 - + drivers/staging/rtl8188eu/include/rtw_security.h | 3 - + drivers/staging/rtl8188eu/include/wifi.h | 34 -- + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 10 +- + drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 2 +- + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 9 - + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 6 +- + drivers/staging/rtl8192u/ieee80211/dot11d.c | 12 +- + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 6 +- + drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 50 +- + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 116 ++-- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 12 +- + drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 2 +- + drivers/staging/vt6655/device_main.c | 11 +- + drivers/staging/wfx/sta.c | 2 +- + tools/testing/selftests/Makefile | 3 +- + tools/testing/selftests/android/Makefile | 39 -- + tools/testing/selftests/android/config | 5 - + tools/testing/selftests/android/ion/.gitignore | 4 - + tools/testing/selftests/android/ion/Makefile | 20 - + tools/testing/selftests/android/ion/README | 101 ---- + tools/testing/selftests/android/ion/ion.h | 134 ----- + tools/testing/selftests/android/ion/ion_test.sh | 58 -- + .../testing/selftests/android/ion/ionapp_export.c | 127 ---- + .../testing/selftests/android/ion/ionapp_import.c | 79 --- + tools/testing/selftests/android/ion/ionmap_test.c | 136 ----- + tools/testing/selftests/android/ion/ionutils.c | 253 -------- + tools/testing/selftests/android/ion/ionutils.h | 55 -- + tools/testing/selftests/android/ion/ipcsocket.c | 227 ------- + tools/testing/selftests/android/ion/ipcsocket.h | 35 -- + tools/testing/selftests/android/run.sh | 3 - + 68 files changed, 390 insertions(+), 3788 deletions(-) + delete mode 100644 drivers/staging/android/ion/Kconfig + delete mode 100644 drivers/staging/android/ion/Makefile + delete mode 100644 drivers/staging/android/ion/ion.c + delete mode 100644 drivers/staging/android/ion/ion.h + delete mode 100644 drivers/staging/android/ion/ion_cma_heap.c + delete mode 100644 drivers/staging/android/ion/ion_heap.c + delete mode 100644 drivers/staging/android/ion/ion_page_pool.c + delete mode 100644 drivers/staging/android/ion/ion_system_heap.c + delete mode 100644 drivers/staging/android/uapi/ion.h + delete mode 100644 tools/testing/selftests/android/Makefile + delete mode 100644 tools/testing/selftests/android/config + delete mode 100644 tools/testing/selftests/android/ion/.gitignore + delete mode 100644 tools/testing/selftests/android/ion/Makefile + delete mode 100644 tools/testing/selftests/android/ion/README + delete mode 100644 tools/testing/selftests/android/ion/ion.h + delete mode 100755 tools/testing/selftests/android/ion/ion_test.sh + delete mode 100644 tools/testing/selftests/android/ion/ionapp_export.c + delete mode 100644 tools/testing/selftests/android/ion/ionapp_import.c + delete mode 100644 tools/testing/selftests/android/ion/ionmap_test.c + delete mode 100644 tools/testing/selftests/android/ion/ionutils.c + delete mode 100644 tools/testing/selftests/android/ion/ionutils.h + delete mode 100644 tools/testing/selftests/android/ion/ipcsocket.c + delete mode 100644 tools/testing/selftests/android/ion/ipcsocket.h + delete mode 100755 tools/testing/selftests/android/run.sh +Merging mux/for-next (05f19f7f8944 mux: adgs1408: Add mod_devicetable.h and remove of_match_ptr) +$ git merge mux/for-next +Auto-merging drivers/mux/adgs1408.c +Merge made by the 'recursive' strategy. +Merging icc/icc-next (266cd33b5913 interconnect: qcom: Ensure that the floor bandwidth value is enforced) +$ git merge icc/icc-next +Merge made by the 'recursive' strategy. + drivers/interconnect/core.c | 3 +++ + drivers/interconnect/qcom/icc-rpmh.c | 7 +++++++ + drivers/interconnect/qcom/sc7180.c | 6 +++--- + drivers/interconnect/qcom/sdm845.c | 8 ++++---- + 4 files changed, 17 insertions(+), 7 deletions(-) +Merging dmaengine/next (fc143e38ddd4 dmaengine: owl-dma: fix kernel-doc style for enum) +$ git merge dmaengine/next +Already up to date. +Merging cgroup/for-next (65026da59cda cgroup: Zero sized write should be no-op) +$ git merge cgroup/for-next +Already up to date. +Merging scsi/for-next (9dcbbd959cef Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Merge made by the 'recursive' strategy. + drivers/scsi/ufs/ufshcd.h | 1 - + 1 file changed, 1 deletion(-) +Merging scsi-mkp/for-next (f24a69a43c95 scsi: aic7xxx: aic79xx: Return negative error when register access fails) +$ git merge scsi-mkp/for-next +Auto-merging drivers/target/target_core_user.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-fc_host | 23 ++ + .../ABI/testing/sysfs-class-fc_remote_ports | 23 ++ + drivers/message/fusion/mptbase.c | 1 - + drivers/scsi/aic7xxx/aic79xx_pci.c | 2 +- + drivers/scsi/aic7xxx/aic7xxx_pci.c | 2 +- + drivers/scsi/aic94xx/aic94xx_task.c | 1 - + drivers/scsi/be2iscsi/be_mgmt.c | 4 - + drivers/scsi/bnx2fc/bnx2fc_hwi.c | 1 - + drivers/scsi/fcoe/fcoe.c | 1 - + drivers/scsi/hpsa.c | 1 - + drivers/scsi/hptiop.c | 1 - + drivers/scsi/ibmvscsi/ibmvfc.h | 22 +- + drivers/scsi/ipr.c | 1 - + drivers/scsi/isci/phy.c | 2 - + drivers/scsi/iscsi_tcp.c | 4 +- + drivers/scsi/libiscsi.c | 2 +- + drivers/scsi/lpfc/lpfc.h | 6 +- + drivers/scsi/lpfc/lpfc_attr.c | 14 +- + drivers/scsi/lpfc/lpfc_bsg.c | 21 +- + drivers/scsi/lpfc/lpfc_ct.c | 371 +++++++++++++++++- + drivers/scsi/lpfc/lpfc_debugfs.c | 12 +- + drivers/scsi/lpfc/lpfc_disc.h | 2 + + drivers/scsi/lpfc/lpfc_els.c | 6 + + drivers/scsi/lpfc/lpfc_hbadisc.c | 41 +- + drivers/scsi/lpfc/lpfc_hw.h | 7 +- + drivers/scsi/lpfc/lpfc_hw4.h | 10 +- + drivers/scsi/lpfc/lpfc_init.c | 67 ++-- + drivers/scsi/lpfc/lpfc_mem.c | 11 +- + drivers/scsi/lpfc/lpfc_nvme.c | 18 +- + drivers/scsi/lpfc/lpfc_scsi.c | 5 +- + drivers/scsi/lpfc/lpfc_sli.c | 83 ++-- + drivers/scsi/lpfc/lpfc_sli4.h | 14 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/mvumi.c | 1 - + drivers/scsi/pcmcia/nsp_cs.c | 2 - + drivers/scsi/qla2xxx/qla_mbx.c | 1 - + drivers/scsi/scsi_devinfo.c | 3 +- + drivers/scsi/scsi_lib.c | 6 +- + drivers/scsi/scsi_transport_fc.c | 417 ++++++++++++++++++++- + drivers/scsi/st.c | 1 - + drivers/scsi/sym53c8xx_2/sym_hipd.c | 1 - + drivers/target/target_core_user.c | 164 ++++---- + include/scsi/scsi_transport_fc.h | 36 ++ + include/uapi/scsi/fc/fc_els.h | 114 +++++- + 44 files changed, 1279 insertions(+), 248 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-fc_host + create mode 100644 Documentation/ABI/testing/sysfs-class-fc_remote_ports +Merging vhost/linux-next (70a62fce2628 vdpa_sim: implement get_iova_range()) +$ git merge vhost/linux-next +Auto-merging drivers/vdpa/vdpa_sim/vdpa_sim.c +Merge made by the 'recursive' strategy. + drivers/vdpa/vdpa_sim/vdpa_sim.c | 12 ++++++++++++ + drivers/vhost/vdpa.c | 41 ++++++++++++++++++++++++++++++++++++++++ + include/linux/vdpa.h | 15 +++++++++++++++ + include/uapi/linux/vhost.h | 4 ++++ + include/uapi/linux/vhost_types.h | 9 +++++++++ + 5 files changed, 81 insertions(+) +Merging rpmsg/for-next (49a29612d7cf Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 12 +-- + .../bindings/remoteproc/qcom,wcnss-pil.txt | 20 +++- + drivers/hwspinlock/sprd_hwspinlock.c | 2 - + drivers/remoteproc/qcom_q6v5_mss.c | 68 ++++++++++--- + drivers/remoteproc/qcom_wcnss.c | 109 ++++++++++++++++++--- + 5 files changed, 171 insertions(+), 40 deletions(-) +Merging gpio/for-next (3d6e8262d3c0 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Merge made by the 'recursive' strategy. +Merging gpio-brgl/gpio/for-next (95d9f84fca1e gpiolib: split error path in gpiod_request_commit()) +$ git merge gpio-brgl/gpio/for-next +Merge made by the 'recursive' strategy. + drivers/gpio/gpiolib-cdev.c | 32 +++++++++++++++++++++----------- + drivers/gpio/gpiolib-devres.c | 8 +++----- + drivers/gpio/gpiolib-of.c | 14 +++++++------- + drivers/gpio/gpiolib-sysfs.c | 2 +- + drivers/gpio/gpiolib.c | 31 +++++++++++++++---------------- + drivers/gpio/gpiolib.h | 2 ++ + 6 files changed, 49 insertions(+), 40 deletions(-) +Merging gpio-intel/for-next (3650b228f83a Linux 5.10-rc1) +$ git merge gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (c348abca14dc Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging pinctrl-intel/for-next (3650b228f83a Linux 5.10-rc1) +$ git merge pinctrl-intel/for-next +Already up to date. +Merging pinctrl-samsung/for-next (c5564a50d990 pinctrl: samsung: s3c24xx: remove unneeded break) +$ git merge pinctrl-samsung/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 5 ----- + 1 file changed, 5 deletions(-) +Merging pwm/for-next (3b1954cd57bf dt-bindings: pwm: renesas,pwm-rcar: Add r8a7742 support) +$ git merge pwm/for-next +Already up to date. +Merging userns/for-next (7fce69dff8db Implement kernel_execve) +$ git merge userns/for-next +Already up to date. +Merging ktest/for-next (ff131efff141 ktest.pl: Fix spelling mistake "Cant" -> "Can't") +$ git merge ktest/for-next +Already up to date. +Merging random/dev (ab9a7e27044b random: avoid warnings for !CONFIG_NUMA builds) +$ git merge random/dev +Already up to date. +Merging kselftest/next (3650b228f83a Linux 5.10-rc1) +$ git merge kselftest/next +Already up to date. +Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC") +$ git merge y2038/y2038 +Already up to date. +Merging livepatching/for-next (59fc1e476962 Merge branch 'for-5.10/flive-patching' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (4e96d5cc25f3 coresight: etm4x: Skip setting LPOVERRIDE bit for qcom,skip-power-up) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight-etm4x-core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging rtc/rtc-next (3650b228f83a Linux 5.10-rc1) +$ git merge rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (a1b8638ba132 Linux 5.9-rc7) +$ git merge nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (3650b228f83a Linux 5.10-rc1) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (3650b228f83a Linux 5.10-rc1) +$ git merge ntb/ntb-next +Already up to date. +Merging seccomp/for-next/seccomp (dfe719fef03d seccomp: Make duplicate listener detection non-racy) +$ git merge seccomp/for-next/seccomp +Already up to date. +Merging kspp/for-next/kspp (9b80e4c4ddac overflow: Add __must_check attribute to check_*() helpers) +$ git merge kspp/for-next/kspp +Already up to date. +Merging gnss/gnss-next (48778464bb7d Linux 5.8-rc2) +$ git merge gnss/gnss-next +Already up to date. +Merging fsi/next (4a851d714ead fsi: aspeed: Support CFAM reset GPIO) +$ git merge fsi/next +Already up to date. +Merging slimbus/for-next (c3e02abdf9af slimbus: fix a kernel-doc markup) +$ git merge slimbus/for-next +Merge made by the 'recursive' strategy. + drivers/slimbus/slimbus.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging nvmem/for-next (d9dc6001196e dt-bindings: nvmem: mtk-efuse: add documentation for MT8516 SoC) +$ git merge nvmem/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/nvmem/mtk-efuse.txt | 1 + + 1 file changed, 1 insertion(+) +Merging xarray/main (fb11305101c2 XArray: Fix split documentation) +$ git merge xarray/main +Merge made by the 'recursive' strategy. + lib/xarray.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) +Merging hyperv/hyperv-next (626b901f6044 Drivers: hv: vmbus: Add parsing of VMbus interrupt in ACPI DSDT) +$ git merge hyperv/hyperv-next +Already up to date. +Merging auxdisplay/auxdisplay (bbf5c979011a Linux 5.9) +$ git merge auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (d081a6e35316 kdb: Fix pager search for multi-line strings) +$ git merge kgdb/kgdb/for-next +Already up to date. +Merging pidfd/for-next (e06ce5515b74 Merge branch 'pidfd_o_nonblock' into for-next) +$ git merge pidfd/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging hmm/hmm (3650b228f83a Linux 5.10-rc1) +$ git merge hmm/hmm +Already up to date. +Merging fpga/for-next (cbadbf5a53b5 Merge branch 'dfl_modularization' into for-next) +$ git merge fpga/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/fpga/altera-pr-ip-core-plat.c | 10 ---- + drivers/fpga/altera-pr-ip-core.c | 4 +- + drivers/fpga/altera-ps-spi.c | 14 +----- + drivers/fpga/dfl-fme-mgr.c | 13 +----- + drivers/fpga/dfl.c | 4 +- + drivers/fpga/dfl.h | 85 +--------------------------------- + drivers/fpga/fpga-mgr.c | 81 ++++++++++++++++++++++++++++----- + drivers/fpga/ice40-spi.c | 14 +----- + drivers/fpga/machxo2-spi.c | 14 +----- + drivers/fpga/socfpga.c | 14 +----- + drivers/fpga/ts73xx-fpga.c | 14 +----- + drivers/fpga/xilinx-spi.c | 14 +----- + drivers/fpga/zynqmp-fpga.c | 21 +-------- + include/linux/dfl.h | 86 +++++++++++++++++++++++++++++++++++ + include/linux/fpga/fpga-mgr.h | 2 + + include/linux/mod_devicetable.h | 24 ++++++++++ + scripts/mod/devicetable-offsets.c | 4 ++ + scripts/mod/file2alias.c | 13 ++++++ + 19 files changed, 211 insertions(+), 221 deletions(-) + create mode 100644 include/linux/dfl.h +Merging kunit/test (3650b228f83a Linux 5.10-rc1) +$ git merge kunit/test +Already up to date. +Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and devm_ioremap_nocache) +$ git merge generic-ioremap/for-next +Already up to date. +Merging cfi/cfi/next (5de15b610f78 mtd: hyperbus: add Renesas RPC-IF driver) +$ git merge cfi/cfi/next +Already up to date. +Merging kunit-next/kunit (3650b228f83a Linux 5.10-rc1) +$ git merge kunit-next/kunit +Already up to date. +Merging trivial/for-next (9ff9b0d392ea Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge trivial/for-next +Already up to date. +Merging zx2c4/for-next (16fbf79b0f83 Linux 5.6-rc7) +$ git merge zx2c4/for-next +Already up to date. +Merging mhi/mhi-next (298edb32160f bus: mhi: debugfs: Print channel context read-pointer) +$ git merge mhi/mhi-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. +Merging notifications/notifications-pipe-core (841a0dfa5113 watch_queue: sample: Display mount tree change notifications) +$ git merge notifications/notifications-pipe-core +Auto-merging security/security.c +Auto-merging kernel/sys_ni.c +Auto-merging include/uapi/asm-generic/unistd.h +CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h +Auto-merging include/linux/watch_queue.h +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/lsm_hook_defs.h +Auto-merging include/linux/dcache.h +Auto-merging fs/namespace.c +Auto-merging fs/mount.h +Auto-merging fs/Makefile +Auto-merging fs/Kconfig +Auto-merging arch/xtensa/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/xtensa/kernel/syscalls/syscall.tbl +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/sparc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/sparc/kernel/syscalls/syscall.tbl +Auto-merging arch/sh/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/sh/kernel/syscalls/syscall.tbl +Auto-merging arch/s390/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/s390/kernel/syscalls/syscall.tbl +Auto-merging arch/powerpc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/powerpc/kernel/syscalls/syscall.tbl +Auto-merging arch/parisc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/parisc/kernel/syscalls/syscall.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_o32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_o32.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n64.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n64.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n32.tbl +Auto-merging arch/microblaze/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/microblaze/kernel/syscalls/syscall.tbl +Auto-merging arch/m68k/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/m68k/kernel/syscalls/syscall.tbl +Auto-merging arch/ia64/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/ia64/kernel/syscalls/syscall.tbl +Auto-merging arch/arm64/include/asm/unistd32.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd32.h +Auto-merging arch/arm/tools/syscall.tbl +CONFLICT (content): Merge conflict in arch/arm/tools/syscall.tbl +Auto-merging arch/alpha/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/alpha/kernel/syscalls/syscall.tbl +Auto-merging Documentation/watch_queue.rst +Resolved 'arch/alpha/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/arm/tools/syscall.tbl' using previous resolution. +Resolved 'arch/arm64/include/asm/unistd32.h' using previous resolution. +Resolved 'arch/ia64/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/m68k/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/microblaze/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n32.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n64.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_o32.tbl' using previous resolution. +Resolved 'arch/parisc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/powerpc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/s390/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/sh/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/sparc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_32.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_64.tbl' using previous resolution. +Resolved 'arch/xtensa/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'include/uapi/asm-generic/unistd.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3cab94f7b1f0] Merge remote-tracking branch 'notifications/notifications-pipe-core' into master +$ git diff -M --stat --summary HEAD^.. + Documentation/watch_queue.rst | 12 +- + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd32.h | 2 + + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + fs/Kconfig | 9 ++ + fs/Makefile | 1 + + fs/mount.h | 18 +++ + fs/mount_notify.c | 222 ++++++++++++++++++++++++++++ + fs/namespace.c | 22 +++ + include/linux/dcache.h | 1 + + include/linux/lsm_hook_defs.h | 3 + + include/linux/lsm_hooks.h | 6 + + include/linux/security.h | 8 + + include/linux/syscalls.h | 2 + + include/linux/watch_queue.h | 7 +- + include/uapi/asm-generic/unistd.h | 2 + + include/uapi/linux/watch_queue.h | 31 +++- + kernel/sys_ni.c | 3 + + samples/watch_queue/watch_test.c | 41 ++++- + security/security.c | 7 + + 34 files changed, 409 insertions(+), 4 deletions(-) + create mode 100644 fs/mount_notify.c +$ git am -3 ../patches/0001-rest-of-merge-fix-up-for-syscall-conflict.patch +Applying: rest of merge fix up for syscall conflict +$ git reset HEAD^ +Unstaged changes after reset: +M arch/arm64/include/asm/unistd.h +M include/uapi/asm-generic/unistd.h +$ git add -A . +$ git commit -v -a --amend +[master f9ba126480fc] Merge remote-tracking branch 'notifications/notifications-pipe-core' into master + Date: Tue Oct 27 13:40:41 2020 +1100 +Merging memblock/for-next (762d4d1a174c arch/ia64: Restore arch-specific pgd_offset_k implementation) +$ git merge memblock/for-next +Auto-merging include/linux/pgtable.h +Merge made by the 'recursive' strategy. +Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) +$ git merge init/init-user-pointers +Already up to date. +Merging counters/counters (2095725c325b drivers/edac: convert pci counters to counter_atomic32) +$ git merge counters/counters +Auto-merging lib/Makefile +CONFLICT (content): Merge conflict in lib/Makefile +Auto-merging lib/Kconfig +Auto-merging drivers/char/ipmi/ipmi_si_intf.c +Auto-merging drivers/char/ipmi/ipmi_msghandler.c +CONFLICT (content): Merge conflict in drivers/char/ipmi/ipmi_msghandler.c +Auto-merging drivers/base/devcoredump.c +Auto-merging drivers/base/dd.c +Auto-merging drivers/android/binder.c +Auto-merging drivers/acpi/apei/ghes.c +Auto-merging drivers/acpi/acpi_extlog.c +Auto-merging MAINTAINERS +Resolved 'drivers/char/ipmi/ipmi_msghandler.c' using previous resolution. +Resolved 'lib/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 561f1c5d548d] Merge remote-tracking branch 'counters/counters' into master +$ git diff -M --stat --summary HEAD^.. + Documentation/core-api/counters.rst | 109 +++++++++++++++++ + MAINTAINERS | 8 ++ + drivers/acpi/acpi_extlog.c | 5 +- + drivers/acpi/apei/ghes.c | 5 +- + drivers/android/binder.c | 41 ++++--- + drivers/android/binder_internal.h | 3 +- + drivers/base/dd.c | 19 +-- + drivers/base/devcoredump.c | 5 +- + drivers/base/test/test_async_driver_probe.c | 26 ++-- + drivers/char/ipmi/ipmi_msghandler.c | 9 +- + drivers/char/ipmi/ipmi_si_intf.c | 9 +- + drivers/edac/edac_pci.h | 5 +- + drivers/edac/edac_pci_sysfs.c | 28 ++--- + drivers/misc/vmw_vmci/vmci_guest.c | 9 +- + include/linux/counters.h | 176 +++++++++++++++++++++++++++ + lib/Kconfig | 9 ++ + lib/Makefile | 1 + + lib/test_counters.c | 162 ++++++++++++++++++++++++ + tools/testing/selftests/lib/Makefile | 1 + + tools/testing/selftests/lib/config | 1 + + tools/testing/selftests/lib/test_counters.sh | 10 ++ + 21 files changed, 567 insertions(+), 74 deletions(-) + create mode 100644 Documentation/core-api/counters.rst + create mode 100644 include/linux/counters.h + create mode 100644 lib/test_counters.c + create mode 100755 tools/testing/selftests/lib/test_counters.sh +$ git am -3 ../patches/0001-fix-up-for-merge-of-arch-sparc-lib-memset.S.patch +Applying: fix up for merge of arch/sparc/lib/memset.S +Merging akpm-current/current (c8a1d90e0bdd lib/lzo/lzo1x_compress.c: make lzogeneric1x_1_compress() static) +$ git merge --no-ff akpm-current/current +Removing tools/testing/selftests/vm/gup_benchmark.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/Kconfig +Auto-merging include/linux/sched.h +CONFLICT (content): Merge conflict in include/linux/sched.h +Resolved 'include/linux/sched.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b94e1b51e546] Merge branch 'akpm-current/current' into master +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/blockdev/zram.rst | 5 + + Documentation/admin-guide/cgroup-v2.rst | 8 + + Documentation/admin-guide/kdump/vmcoreinfo.rst | 6 + + Documentation/admin-guide/sysctl/vm.rst | 4 +- + Documentation/core-api/pin_user_pages.rst | 6 +- + arch/Kconfig | 7 + + arch/arm/kernel/vdso.c | 9 - + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/pgtable.h | 1 + + arch/arm64/kernel/vdso.c | 39 +- + arch/mips/mm/pgtable-32.c | 1 - + arch/mips/mm/pgtable-64.c | 1 - + arch/mips/vdso/genvdso.c | 4 - + arch/s390/configs/debug_defconfig | 2 +- + arch/s390/configs/defconfig | 2 +- + arch/s390/kernel/vdso.c | 11 +- + arch/x86/Kconfig | 1 + + arch/x86/entry/vdso/vma.c | 17 - + arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 2 +- + drivers/block/zram/zram_drv.c | 21 +- + drivers/dax/device.c | 4 +- + drivers/dax/kmem.c | 2 +- + drivers/gpio/gpio-thunderx.c | 11 +- + drivers/gpio/gpio-xilinx.c | 65 ++- + drivers/virtio/virtio_balloon.c | 2 +- + drivers/xen/unpopulated-alloc.c | 14 +- + fs/aio.c | 14 +- + fs/buffer.c | 56 +- + fs/ocfs2/cluster/tcp.c | 1 - + fs/ocfs2/namei.c | 17 +- + fs/proc/base.c | 2 + + fs/proc/page.c | 40 +- + fs/ramfs/inode.c | 12 + + include/asm-generic/bitops/find.h | 19 + + include/asm-generic/getorder.h | 2 +- + include/linux/bitmap.h | 61 +++ + include/linux/bitops.h | 13 + + include/linux/compiler-clang.h | 6 - + include/linux/compiler-gcc.h | 19 - + include/linux/compiler.h | 18 +- + include/linux/memcontrol.h | 6 - + include/linux/memremap.h | 6 + + include/linux/mm.h | 45 +- + include/linux/nmi.h | 1 + + include/linux/page-flags.h | 3 +- + include/linux/page_ext.h | 8 + + include/linux/sched.h | 8 + + include/linux/wait.h | 4 +- + include/trace/events/sched.h | 84 +++ + include/uapi/linux/const.h | 5 + + include/uapi/linux/ethtool.h | 2 +- + include/uapi/linux/kernel.h | 9 +- + include/uapi/linux/lightnvm.h | 2 +- + include/uapi/linux/mroute6.h | 2 +- + include/uapi/linux/netfilter/x_tables.h | 2 +- + include/uapi/linux/netlink.h | 2 +- + include/uapi/linux/sysctl.h | 2 +- + init/main.c | 4 +- + ipc/shm.c | 8 +- + kernel/acct.c | 7 +- + kernel/crash_core.c | 1 + + kernel/fail_function.c | 6 +- + kernel/hung_task.c | 44 ++ + kernel/kthread.c | 12 +- + kernel/ptrace.c | 2 +- + kernel/signal.c | 19 +- + kernel/sysctl.c | 8 +- + kernel/watchdog.c | 21 + + kernel/watchdog_hld.c | 1 + + lib/Kconfig | 9 + + lib/Kconfig.debug | 6 + + lib/crc32test.c | 4 - + lib/error-inject.c | 2 + + lib/find_bit.c | 14 + + lib/lzo/lzo1x_compress.c | 2 +- + lib/stackdepot.c | 14 +- + lib/test_bitmap.c | 143 +++++ + lib/test_free_pages.c | 5 + + lib/test_kasan.c | 149 ++++-- + mm/Kconfig | 21 +- + mm/Makefile | 2 +- + mm/cma.c | 4 +- + mm/compaction.c | 7 +- + mm/filemap.c | 576 ++++++++++++--------- + mm/{gup_benchmark.c => gup_test.c} | 111 ++-- + mm/gup_test.h | 32 ++ + mm/huge_memory.c | 6 +- + mm/hugetlb.c | 25 +- + mm/khugepaged.c | 4 +- + mm/memcontrol.c | 38 +- + mm/memory.c | 11 +- + mm/mempolicy.c | 6 +- + mm/memremap.c | 59 ++- + mm/migrate.c | 11 +- + mm/mmap.c | 65 ++- + mm/mremap.c | 280 +++++++--- + mm/msync.c | 6 +- + mm/nommu.c | 8 +- + mm/oom_kill.c | 4 +- + mm/page_alloc.c | 139 ++--- + mm/page_ext.c | 10 +- + mm/page_poison.c | 40 +- + mm/shmem.c | 2 +- + mm/slab.h | 4 +- + mm/slab_common.c | 4 +- + mm/slub.c | 4 +- + mm/swap.c | 3 + + mm/swap_state.c | 4 +- + mm/swapfile.c | 14 +- + mm/truncate.c | 2 +- + mm/vmscan.c | 2 +- + mm/vmstat.c | 32 +- + mm/zsmalloc.c | 11 +- + mm/zswap.c | 6 +- + scripts/checkpatch.pl | 173 +++++-- + tools/testing/selftests/vm/.gitignore | 4 +- + tools/testing/selftests/vm/Makefile | 39 +- + tools/testing/selftests/vm/check_config.sh | 31 ++ + tools/testing/selftests/vm/config | 2 +- + tools/testing/selftests/vm/gup_benchmark.c | 143 ----- + tools/testing/selftests/vm/gup_test.c | 194 +++++++ + tools/testing/selftests/vm/hmm-tests.c | 10 +- + tools/testing/selftests/vm/mremap_test.c | 344 ++++++++++++ + .../selftests/vm/{run_vmtests => run_vmtests.sh} | 43 +- + 124 files changed, 2597 insertions(+), 1137 deletions(-) + rename mm/{gup_benchmark.c => gup_test.c} (60%) + create mode 100644 mm/gup_test.h + create mode 100644 tools/testing/selftests/vm/check_config.sh + delete mode 100644 tools/testing/selftests/vm/gup_benchmark.c + create mode 100644 tools/testing/selftests/vm/gup_test.c + create mode 100644 tools/testing/selftests/vm/mremap_test.c + rename tools/testing/selftests/vm/{run_vmtests => run_vmtests.sh} (86%) +$ 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 +Rebasing (1/2)
Rebasing (2/2)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 2f59e91983b3...046effab9e3f akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (046effab9e3f mm/gup: assert that the mmap lock is held in __get_user_pages()) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + fs/exec.c | 8 ++++++++ + include/linux/mm_types.h | 10 ++++++++++ + include/linux/mmap_lock.h | 16 ++++++++++++---- + mm/gup.c | 2 ++ + 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..1dbd069d5162 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20201027 |