diff options
| -rw-r--r-- | Next/SHA1s | 328 | ||||
| -rw-r--r-- | Next/Trees | 330 | ||||
| -rw-r--r-- | Next/merge.log | 5856 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 6515 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..f04840f605e5 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,328 @@ +Name SHA1 +---- ---- +origin 4ef8451b332662d004df269d4cdeb7d9f31419b5 +fixes 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +kbuild-current d1889589a4f54b2d1d7075d608b596d6fcfd3d96 +arc-current 3b57533b460c8dc22a432684b7e8d22571f34d2e +arm-current 9fa2e7af3d53a4b769136eccc32c02e128a4ee51 +arm64-fixes 7ee31a3aa8f490c6507bc4294df6b70bed1c593e +arm-soc-fixes 3d696f42c7f4bfcc54bde545898d4b89a74f9cc0 +drivers-memory-fixes 3650b228f83adda7e5ee532e2b90429c03f7b9ec +m68k-current 50c5feeea0af99a4401fd54fd72bec1333a496ca +powerpc-fixes 99f070b62322a4b8c1252952735806d09eb44b68 +s390-fixes 0b2ca2c7d0c9e2731d01b6c862375d44a7e13923 +sparc 0a95a6d1a4cd6e10e70f8a6c93dc2ecd02e7d6ab +fscrypt-current 2b4eae95c7361e0a147b838715c8baa1380a428f +net ac6f929d74bad5e9e352aec936aeba0638bf560c +bpf 25cf73b9ff88fd4608699a0313f820758b4c252d +ipsec a779d91314ca7208b7feb3ad817b62904397c56d +netfilter fea07a487c6dd422dc8837237c9d2bc7c33119af +ipvs 859191b234f86b5f36cbe384baca1067a2221eb7 +wireless-drivers 04516706bb99889986ddfa3a769ed50d2dc7ac13 +mac80211 fea07a487c6dd422dc8837237c9d2bc7c33119af +rdma-fixes 00469c97ef64f6b7e3ab08c5eeb0378260baf983 +sound-current 26201ddc1373c99b2a67c5774da2f0eecd749b93 +sound-asoc-fixes 961ed2ad57fda626fbc2d573c087f29f2bc680b0 +regmap-fixes 780f88b04704264a12a2ca36819dafc43885f677 +regulator-fixes cf1ad559a20d1930aa7b47a52f54e1f8718de301 +spi-fixes ae36bbe9efb09a9d75a17c98bea56c9db7f27480 +pci-current 832ea234277a2465ec6602fa6a4db5cd9ee87ae3 +driver-core.current d181bfe36715a1834958cf2d62253b624adfae51 +tty.current 3cea11cd5e3b00d91caf0b4730194039b45c5891 +usb.current afaa2e745a246c5ab95103a65b1ed00101e1bc63 +usb-gadget-fixes 129aa9734559a17990ee933351c7b6956f1dba62 +usb-serial-fixes db0362eeb22992502764e825c79b922d7467e0eb +usb-chipidea-fixes e11d2bf271589e70ea80a2ee3e116c40fcac62c2 +phy 25d76fed7ffecca47be0249a5d5ec0a5dd92af67 +staging.current 3cea11cd5e3b00d91caf0b4730194039b45c5891 +char-misc.current a8643626d84b8f2b56cc72b804b5e78a5d1b9672 +soundwire-fixes 3650b228f83adda7e5ee532e2b90429c03f7b9ec +thunderbolt-fixes 7342ca34d931a357d408aaa25fadd031e46af137 +input-current b1884583fcd17d6a1b1bba94bbb5826e6b5c6e17 +crypto-current c3a98c3ad5c0dc60a1ac66bf91147a3f39cac96b +ide 6800cd8cbc6e35989f8d1aa20fac58031231b90f +vfio-fixes e4eccb853664de7bcf9518fb658f35e748bf1f68 +kselftest-fixes 1488472e712dc77ce796c767f53450f89a51712d +modules-fixes 57baec7b1b0459ef885e816d8c28a9d9a62bb8de +dmaengine-fixes 768664114b1ac9184f1dc6217d9c930a08ffbfa8 +backlight-fixes 219d54332a09e8d8741c1e1982f5eae56099de85 +mtd-fixes 9efac6ce7f621c405d49a091e3e367be4250a27a +mfd-fixes 22380b65dc70f5b132c5afdf6b4011e2a84ec34a +v4l-dvb-fixes d0254f82d702a1d0d92e42f87676111de88846cf +reset-fixes b460e0a9e2404450a0cc4c5e6476483d6cda1b26 +mips-fixes 31b4d8e172f614adc53ddecb4b6b2f6411a49b84 +at91-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +omap-fixes 8f04aea048d56f3e39a7e543939450246542a6fc +kvm-fixes 9478dec3b5e79a1431e2e2b911e32e52a11c6320 +kvms390-fixes f20d4e924b4465822c4a35290b85aadf88ddf466 +hwmon-fixes 18e8db7f6526928858dfa99b49d831497f0f8df8 +nvdimm-fixes 88b67edd7247466bc47f01e1dc539b0d0d4b931e +btrfs-fixes 45d8f990a77f25bf17e9e3de25be9933e1d10498 +vfs-fixes 77f6ab8b7768cf5e6bdd0e72499270a0671506ee +dma-mapping-fixes 892fc9f6835ecf075efac20789b012c5c9997fcc +i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +drivers-x86-fixes 3650b228f83adda7e5ee532e2b90429c03f7b9ec +samsung-krzk-fixes cd12e4f14f7cca7d04fbcf0da2dc116070d7f26f +pinctrl-samsung-fixes 3650b228f83adda7e5ee532e2b90429c03f7b9ec +devicetree-fixes f84e2c5c528d937564e4a9e3411418e4c914b1fb +scsi-fixes 5feed64f9199ff90c4239971733f23f30aeb2484 +drm-fixes 3cea11cd5e3b00d91caf0b4730194039b45c5891 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 537457a979a02a410b555fab289dcb28b588f33b +mmc-fixes 011fde48394b7dc8dfd6660d1013b26a00157b80 +rtc-fixes 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +gnss-fixes 48778464bb7d346b47157d21ffde2af6b2d39110 +hyperv-fixes dbf563eee0b8cc056744514d91c5ffc2fa6c0982 +soc-fsl-fixes fe8fe7723a3a824790bda681b40efd767e2251a7 +risc-v-fixes 3650b228f83adda7e5ee532e2b90429c03f7b9ec +pidfd-fixes bda4c60d02e9ceeee726f73250b808fad0663dd6 +fpga-fixes 8614afd689df59d9ce019439389be20bd788a897 +spdx 3cea11cd5e3b00d91caf0b4730194039b45c5891 +gpio-intel-fixes 3650b228f83adda7e5ee532e2b90429c03f7b9ec +pinctrl-intel-fixes 3650b228f83adda7e5ee532e2b90429c03f7b9ec +erofs-fixes a30573b3cdc77b8533d004ece1ea7c0146b437a0 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 0d0d245104a42e593adcf11396017a6420c08ba8 +ubifs-fixes 78c7d49f55d8631b67c09f9bfbe8155211a9ea06 +memblock-fixes b9bc36704cca500e2b41be4c5bf615c1d7ddc3ce +drm-misc-fixes 9522750c66c689b739e151fcdf895420dc81efc0 +kspp-gustavo 3650b228f83adda7e5ee532e2b90429c03f7b9ec +kbuild 729e39a558eb5cde61b80941bdfa54fdc2e11d1d +compiler-attributes bbf5c979011a099af5dc76498918ed7df445635b +dma-mapping 48ab6d5d1f096d6fac5b59f94af0aa394115a001 +asm-generic 78d127fd689200ff1d62d1f24f6be8dd68250764 +arc def9d2780727cec3313ed3522d0123158d87224d +arm 20f96e606509ee5084690179afe1810b95617a92 +arm64 66dd3474702aa98d5844367e1577cdad78ef7c65 +arm-perf 887e2cff0f8dc4dac4c35e631b711325c6dd65b8 +arm-soc 36ab3c32cafc42bf3886b20c5933ef4a72145105 +amlogic 4393916840fccc0bb996a68d4fe086b1e9aa7739 +aspeed 93db293b2ababd0e9f060b7d36afb2e46867d80a +at91 0698efbb33eff3d71273bba402dc4e3f971d22b9 +drivers-memory 5ddebb22417b9ca24a6adc70a8a1f4fec0fc43f1 +imx-mxs 5f8fb90aea46dc37438ec7b2b948fedfe5c702f5 +keystone a5e886fb26f2b05e575a635af4d2b65b49d96598 +mediatek 9c6658a0dd4f3183403b284e10f74b11d58cdab0 +mvebu f89c9685f6a1782c3e4c86aca636036009d22efd +omap 7a159a1ad494f85a655802dc423a684786a6d468 +qcom c732298127a906349b47e6f142d4749e48dd2f56 +raspberrypi 4564363351e2680e55edc23c7953aebd2acb4ab7 +realtek 486f29df69413411a205d3101bae0427a892bee4 +renesas b860052992d74dfec4f75aec8050b099956c54c6 +reset da8c0e4ee95a78878093ab5aaa3bdfce4c05ac63 +rockchip 1fdc65a3eb8229ea756b2dd81db1ad3281e80f17 +samsung-krzk 59f129f534cae951a3c438b8b2fcd185978b2694 +scmi 3cea11cd5e3b00d91caf0b4730194039b45c5891 +sunxi 2f098e04ce1676c23a02ba226d3aa45a52d2f733 +tegra 9ea55312ba1093068cf81f5899fadcaf61bf60b2 +ti-k3 1e3d655fe7b48c2341d63f981774742e21744f53 +ti-k3-new 9dcd17be61e4b6343cc612a3f6c30512acee60b9 +clk 3650b228f83adda7e5ee532e2b90429c03f7b9ec +clk-samsung ff8e0ff9b99643a32f7e33a96867e76d0fa10f76 +csky afe14a3eb45dcd68ba5abb4f0a6e410bba603952 +h8300 8808515be0ed4e33de9bfdc65f4c1b547ee11065 +ia64 c331649e637152788b0ca1c857d0c2eaf34fcbc3 +m68k 1fe9bacab2ac5cca29b360e1032e6f7533fbdc78 +m68knommu ce93d1c29c02baec69049e972065dabe525643da +microblaze 4a17e8513376bb23f814d3e340a5692a12c69369 +mips ab7cffb8d2367e5b088c7c14452724e719a10eba +nds32 54bde873682b467f781f352effdb52d24e0a0c30 +nios2 6b57fa4d374bb8c005dee396c56598c14b9c01a6 +openrisc 55b2662ec665cc8b592809a011fe807b05370ab8 +parisc-hd 3b7ab4a74a2d1972dbeb33285d85f1500b2ff96a +powerpc 3cea11cd5e3b00d91caf0b4730194039b45c5891 +fsl a76bea0287ce13d28494b19649d80d8ee5e7b757 +soc-fsl d97b957e32b1e7527a9b6652fa6e795f2861df7d +risc-v f69e1c7418b1034c5b2964adacfc72f4da8aa30c +s390 97822baa4e8b73a33808a7c4daad7b91c1369f75 +sh b0cfc315ff38c423a5ce9ce159bd5baa4135e688 +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml f06885b3f3e3884f98351d7b72a4fc8400911cde +xtensa 4ca4c562efb67cd4e224ff560f4b1f2c86314906 +fscrypt 5b2a828b98ec1872799b1b4d82113c76a12d594f +afs 8409f67b6437c4b327ee95a71081b9c7bfee0b00 +btrfs e3f243e7ac2e0dc81e2c55c01580caff1204036e +ceph 62575e270f661aba64778cbc5f354511cf9abb21 +cifs 3cea11cd5e3b00d91caf0b4730194039b45c5891 +configfs 76ecfcb0852eb0390881a695a2f349b804d80147 +ecryptfs 8b614cb8f1dcac8ca77cf4dd85f46ef3055f8238 +erofs 915f4c9358db6f96f08934dd683ae297aaa0fb91 +exfat f9893351acaecf0a414baf9942b48d5bb5c688c6 +ext3 11c514a99bb960941535134f0587102855e8ddee +ext4 00c69f98e83d3cdb8910e0d4d4c89fc41a3a05d1 +f2fs aabe197f7422bbf4875c05f874c5147ea289fe6f +fsverity f3db0bed458314a835ccef5ccb130270c5b2cf04 +fuse 42d3e2d041f08d1f8f078da005c936648ba77405 +jfs 7aba5dcc234635b44b2781dbc268048cfba388ad +nfs 3cea11cd5e3b00d91caf0b4730194039b45c5891 +nfs-anna 7302e49ff190acf903d1c14a8427b14ca38f06f6 +nfsd 856deb866d16e29bd65952e0289066f6078af773 +cel a826e2b2dd6138d5fc677d265cca0687f782beee +orangefs e848643b524be9c10826c2cf36eebb74eef643d2 +overlayfs be4df0cea08a8b59eb38d73de988b7ba8022df41 +ubifs e2a05cc7f8229e150243cdae40f2af9021d67a4a +v9fs 7ca1db21ef8e0e6725b4d25deed1ca196f7efb28 +xfs c1f6b1ac00756a7108e5fcb849a2f8230c0b62a5 +zonefs 48bfd5c6fac10e10b7066bf4aeb919ed9a4e87d3 +iomap 1a31182edd0083bb9f26e582ed39f92f898c4d0a +djw-vfs 407e9c63ee571f44a2dfb0828fc30daa02abb6dc +file-locks 529adfe8f131c60938ece113379f1a07640aefb1 +vfs 8853bf827ca8c28756cc1ddd2f04a1e4beedb3da +printk de6e7a24979b499fa118a5f156490b575b79abf3 +pci 3650b228f83adda7e5ee532e2b90429c03f7b9ec +pstore 137c6236aeec43c45c8f3b2e54b1dee50fd2010e +hid d0a19d03cbb8b178807fec3e1c568384730cae9f +i2c 47480e8745ac951ac5225ffdfbef9d903631116e +i3c abea14bfdebbe9bd02f2ad24a1f3a878ed21c8f0 +dmi 3cb4d29a2633170208c96240c7e85148679ceee3 +hwmon-staging ce15cd2cee8bd802c47ec37bf93e640d594ede71 +jc_docs 6fee9372e0af63f557ad234663d8248f3caefc37 +v4l-dvb dfe3d19bd092cefb184c6e65b881602c793edd33 +v4l-dvb-next d0a9fffedca102633c168adaf157f34288a4ea67 +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm dddc237beebb79a67a6e2cc18b6a0a29a3a7a89c +cpufreq-arm a43128837003af389fb652680db66c1c050495f9 +cpupower 748f0d70087c56226bf1df1f91a00b7ab4c8f883 +devfreq 09d56d92ad25b58113f4ec677e9b1ac1e2c3072b +opp b0756034202a9e8016ddbc1e5697afddc0e887c6 +thermal 703456ba76e9449b5ade6597c04a90ee3421cd94 +thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 67f8e65e4fc19e24993e8780f41279eeffbd0610 +dlm 4f2b30fd9b4bd6e3620fe55786df7fc5f89ad526 +swiotlb fc0021aa340af65a0a37d77be39e22aa886a6132 +rdma 32053e584e4a342be37a0932ffc1f9b13e914515 +net-next 3fb6928b56f67167406daefa13ca9d2b94d48eb0 +bpf-next f4c3881edbcc0befd658b6d448e9ac08709dd3f8 +ipsec-next 68bb4665a2ce1338a74867e71bd5182f5b214a91 +mlx5-next 3650b228f83adda7e5ee532e2b90429c03f7b9ec +netfilter-next 117ca1f8920cf4087bf82f44bd2a51b49d6aae63 +ipvs-next 35b7ee34abdb722192635528f162ddd8cac25765 +wireless-drivers-next 3650b228f83adda7e5ee532e2b90429c03f7b9ec +bluetooth 44d59235ace59f8b493044d693174e60b571e2e1 +mac80211-next 3fb6928b56f67167406daefa13ca9d2b94d48eb0 +gfs2 da7d554f7c62d0c17c1ac3cc2586473c2d99f0bd +mtd 232b67c399424948107fbffe4402a102121a2622 +nand 3ebbdef13f82d7ea1b9fcaa1792461bc6b6fb02c +spi-nor 3650b228f83adda7e5ee532e2b90429c03f7b9ec +crypto 18d05ca4486fe38991c3166b1f4df26b8a029665 +drm e047c7be173caab95f3876ab30c03ebcf654c300 +amdgpu 57673be0a9f5ef814f8a9699abdb480886fa4c0c +drm-intel ba8a5cb234ba3bf0a585fd38e5f36d7e7ce33661 +drm-tegra d9f980ebcd01d90a2a76ea2383c925abf9223cab +drm-misc 24e146cdf9f5a8fb464dd98ba8357d662d37d22f +drm-msm cf11c1f89d5209d20cdf4040f5b26253014026ad +mali-dp f634c6a8028789b05a9277a3d51303829ae29547 +imx-drm 36fba366cf9fa386e5905976e68380061feabd2e +etnaviv 4612bad5701e158f3c40951f2c7aa8e64b3445eb +regmap f243af4d473ba590a043a4ee878df983d523014f +sound 1a6a071f51a5373de21edd34f9b79610be2d02e3 +sound-asoc 939b46f5a6bca8bc0a72a6d395b7230f8511d487 +modules 076aa52e402185e1e347bf5c62c61c6388fce4c7 +input 8a30c6eb29e036f729b4dd6982462ca15d062087 +block bc2e353de6e851be98db82c710c3c65e90ab24ec +device-mapper 681cc5e8667e8579a2da8fa4090c48a2d73fc3bb +pcmcia 46d0797906633d82bd50ef26780ee39fac5d27d6 +mmc cc85a5ef3c8388f1629b7fe83a90560d5d03913c +mfd 6d81dc3c79d46b66b29712eb1ac5ad2cbe4231d2 +backlight 789eb04b6c569e3e5007afd040bef5d7216d2f3a +battery 7007fab4ae82c092cb52691c338f1b776005e32b +regulator 2eb816d54b88b169c6f448bdce800438e8d2e4fa +security bc62d68e2a0a69fcdcf28aca8edb01abf306b698 +apparmor e37986097ba63c94b1af9d5ad5486d120a809f72 +integrity b000d5cb954fe25ac1ea929ae6da321033ace927 +keys b6f61c31464940513ef4eccb3a030a405b4256d6 +safesetid 03ca0ec138927b16fab0dad7b869f42eb2849c94 +selinux 44141f58e14317853698f994ca5c3785a0c230d0 +smack edd615371b668404d06699c04f5f90c4f438814a +tomoyo e991a40b3d0000a2f48729aea4ce03acf679b5ee +tpmdd bbd521ce63abf549925330c4d8221c3b1e4bb17c +watchdog 3650b228f83adda7e5ee532e2b90429c03f7b9ec +iommu 4dd6ce478003525df8618750d30f0b90380047a7 +audit 6d915476e67d99b73a57bceb83cff1cf153d8bf6 +devicetree 3cea11cd5e3b00d91caf0b4730194039b45c5891 +mailbox c7dacf5b0f32957b24ef29df1207dc2cd8307743 +spi 3419e5593af13eb4948070f170b5d9c8d904b819 +tip 6f72faf4a32303c8bdc6491186b79391e9cf0c7e +clockevents f087e452f27e6342f938b92b2254b077bf1d9145 +edac 24269999027e6b161c0078ad9c1557f9a1575128 +irqchip d95bdca75b3fb41bf185efe164e05aed820081a5 +ftrace e1981f75d398c0afe83c8ffa4e5864f037967409 +rcu d77ef2684cbff728c14b3c84a356139c52ca3a5e +kvm e792415c5d3e0eb52527cce228a72e4392f8cae2 +kvm-arm 22f553842b14a1289c088a79a67fb479d3fa2a4e +kvm-ppc cf59eb13e151ef42c37ae31864046c17e481ed8f +kvms390 23a60f834406c8e3805328b630d09d5546b460c1 +xen-tip 1a89c1dc9520b908e7894652ee2b19db9de37b64 +percpu eb4c8d15efdaf1661759d8da2c7bfffe5d881343 +workqueues 10cdb15759540f03d056e2f73fe26377ed7dcfda +drivers-x86 5c54cb6c627e8f50f490e6b5656051a5ac29eab4 +chrome-platform 3650b228f83adda7e5ee532e2b90429c03f7b9ec +hsi bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +leds 6c3e42616bf23539d99af91e83f532575f018eac +ipmi 0df7b988d9df24d1ea120fde69b3e9cbd2555597 +driver-core 3cea11cd5e3b00d91caf0b4730194039b45c5891 +usb 35ad0d901eac56ac6af2e4d726f255486c1ee36c +usb-gadget b2c586eb07efab982419f32b7c3bd96829bc8bcd +usb-serial 179dfb954790410f65605f1c479c029c2cd73c55 +usb-chipidea-next eba15877284150c4d6c63058908401bbb01984f8 +phy-next c36f74566cef6b2a377c8830ee216677ddb12706 +tty 724ec7c190c1893ea55fd7143e7e1c8c5b61a0e7 +char-misc c2192bbc3c507b33dda5858049e0493c073d29fb +extcon 54589b557a8dd21c735dbef6a8e0995ef5a11145 +soundwire 3650b228f83adda7e5ee532e2b90429c03f7b9ec +thunderbolt 3cea11cd5e3b00d91caf0b4730194039b45c5891 +vfio 2e6cfd496f5b57034cf2aec738799571b5a52124 +staging 83e63b2cc416904b50895eeee8d8e0d7ea0418fe +mux 05f19f7f8944b6a269b2ac152bceaa322138be6b +icc fce52ad3483281930dc9215a68d69837f219f889 +dmaengine 4749f51ddd8aee5c7aa11e6593a54f96374a77ad +cgroup 65026da59cda16baf6c3e98b74ec439f366e468f +scsi af61bc1e33d2c0ec22612b46050f5b58ac56a962 +scsi-mkp d90196317484b69bb46b7144c6e0e1a4f581200d +vhost 29ea7644edd23695e40022b2d3593e94494090f8 +rpmsg 3e53119a25212015d256729eb955734b75c2fe45 +gpio 50afb29ae41368d750cf46bece2b13065b0e9cef +gpio-brgl 183245c4f204bc1458163388c8de8ddfc032a607 +gpio-intel 3650b228f83adda7e5ee532e2b90429c03f7b9ec +pinctrl 1f955a68d179cdbad083d85e0fbb6ec7360a03d1 +pinctrl-intel 0ddebf8580fa32b1827dcc5230a6db6260096f5e +pinctrl-samsung c5564a50d99019f3c713fa306d5feecc3e909b10 +pwm 3b1954cd57bf7648417c593d60eac1ec661ad514 +userns 7fce69dff8db30cb93aace0bbebda09972027af7 +ktest ff131efff141fc679cccde28bc265f4c79cbe329 +random ab9a7e27044b87ff2be47b8f8e095400e7fccc44 +kselftest b2f1c3db28870d88d1a19aa86a8374e7725d62c5 +y2038 c4e71212a245017d2ab05f322f7722f0b87a55da +livepatching 59fc1e476962eff9ef259355a9daf912b563aac0 +coresight b5882e904ce1eaf07cf3699c4b889b82628a5750 +rtc 28d211919e422f58c1e6c900e5810eee4f1ce4c8 +nvdimm a1b8638ba1320e6684aa98233c15255eb803fac7 +at24 3650b228f83adda7e5ee532e2b90429c03f7b9ec +ntb 3650b228f83adda7e5ee532e2b90429c03f7b9ec +seccomp 38c37e8fd3d2590c4234d8cfbc22158362f0eb04 +kspp 9b80e4c4ddaca3501177ed41e49d0928ba2122a8 +gnss 48778464bb7d346b47157d21ffde2af6b2d39110 +fsi 4a851d714eadeabd65c7e321a2e7830f77d945c4 +slimbus c3e02abdf9afdef213530970ab015b64b0f8bbb8 +nvmem 436d15fbeaee5d16fc41211849a9ce53a241ce44 +xarray fb11305101c217e1cba2e1b48326901e8e3c39d7 +hyperv 626b901f60446355e35e8c76c6b391a7d7491203 +auxdisplay 8c9108d014c5bd0f0da2e3544eb45dc56a6da92b +kgdb d081a6e353168f15e63eb9e9334757f20343319f +pidfd e06ce5515b74f628b78677e6736f66f6abb89b00 +hmm 3650b228f83adda7e5ee532e2b90429c03f7b9ec +fpga cbadbf5a53b5ca892132ca91dc60b24c80dc6fa8 +kunit 3650b228f83adda7e5ee532e2b90429c03f7b9ec +generic-ioremap 4bdc0d676a643140bdf17dbf7eafedee3d496a3c +cfi 5de15b610f785f0e188fefb707f0b19de156968a +kunit-next 3650b228f83adda7e5ee532e2b90429c03f7b9ec +trivial 9ff9b0d392ea08090cd1780fb196f36dbb586529 +zx2c4 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e +mhi 3650b228f83adda7e5ee532e2b90429c03f7b9ec +notifications 841a0dfa511364fa9a8d67512e0643669f1f03e3 +memblock 762d4d1a174c2b2f1181ef284769e4cba7d2b11c +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters 3650b228f83adda7e5ee532e2b90429c03f7b9ec +akpm-current abae383d7829045fbd5b18e120e6b8617765695d +akpm a8489dae981f9b18eed8a797c474c4cf723e048a diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..de95d7107bd8 --- /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#for-usb-fixes +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#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#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..88497eb603a9 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,5856 @@ +$ date -R +Thu, 05 Nov 2020 08:39:19 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 4ef8451b3326 Merge tag 'perf-tools-for-v5.10-2020-11-03' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux +Merging origin/master (4ef8451b3326 Merge tag 'perf-tools-for-v5.10-2020-11-03' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux) +$ git merge origin/master +Already up to date. +Merging fixes/fixes (9123e3a74ec7 Linux 5.9-rc1) +$ git merge fixes/fixes +Already up to date. +Merging kbuild-current/fixes (d1889589a4f5 builddeb: Fix rootless build in setuid/setgid directory) +$ git merge kbuild-current/fixes +Merge made by the 'recursive' strategy. + Documentation/kbuild/llvm.rst | 5 ++--- + Makefile | 4 +--- + scripts/package/builddeb | 2 ++ + 3 files changed, 5 insertions(+), 6 deletions(-) +Merging arc-current/for-curr (3b57533b460c ARC: [plat-hsdk] Remap CCMs super early in asm boot trampoline) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/kernel/head.S | 17 ++++++++++++++++- + arch/arc/kernel/stacktrace.c | 7 ++++++- + arch/arc/plat-hsdk/platform.c | 17 ----------------- + 3 files changed, 22 insertions(+), 19 deletions(-) +Merging arm-current/fixes (9fa2e7af3d53 ARM: 9019/1: kprobes: Avoid fortify_panic() when copying optprobe template) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/include/asm/kprobes.h | 22 +++++++++++----------- + arch/arm/probes/kprobes/opt-arm.c | 18 +++++++++--------- + 2 files changed, 20 insertions(+), 20 deletions(-) +Merging arm64-fixes/for-next/fixes (7ee31a3aa8f4 arm64: kprobes: Use BRK instead of single-step when executing instructions out-of-line) +$ git merge arm64-fixes/for-next/fixes +Merge made by the 'recursive' strategy. + arch/arm64/Kconfig | 2 +- + arch/arm64/include/asm/brk-imm.h | 2 + + arch/arm64/include/asm/debug-monitors.h | 1 + + arch/arm64/include/asm/kprobes.h | 2 +- + arch/arm64/kernel/probes/kprobes.c | 69 +++++++++++---------------------- + 5 files changed, 28 insertions(+), 48 deletions(-) +Merging arm-soc-fixes/arm/fixes (3d696f42c7f4 soc: ti: ti_sci_pm_domains: check for proper args count in xlate) +$ git merge arm-soc-fixes/arm/fixes +Already up to date. +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 (99f070b62322 powerpc/smp: Call rcu_cpu_starting() earlier) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/kernel/eeh_cache.c | 5 +++-- + arch/powerpc/kernel/smp.c | 3 ++- + 2 files changed, 5 insertions(+), 3 deletions(-) +Merging s390-fixes/fixes (0b2ca2c7d0c9 s390/pci: fix hot-plug of PCI function missing bus) +$ git merge s390-fixes/fixes +Removing arch/s390/include/asm/vdso/vdso.h +Merge made by the 'recursive' strategy. + arch/s390/configs/debug_defconfig | 10 ++++--- + arch/s390/configs/defconfig | 9 ++++--- + arch/s390/configs/zfcpdump_defconfig | 2 +- + arch/s390/include/asm/pgtable.h | 52 +++++++++++++++++++++--------------- + arch/s390/include/asm/vdso/vdso.h | 0 + arch/s390/kernel/asm-offsets.c | 8 ------ + arch/s390/kernel/smp.c | 3 ++- + arch/s390/pci/pci_event.c | 4 +++ + drivers/s390/crypto/ap_bus.c | 14 ++++++++-- + drivers/s390/crypto/pkey_api.c | 30 +++++++++++---------- + drivers/s390/crypto/zcrypt_card.c | 13 +++++---- + drivers/s390/crypto/zcrypt_queue.c | 6 +---- + 12 files changed, 85 insertions(+), 66 deletions(-) + delete mode 100644 arch/s390/include/asm/vdso/vdso.h +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 (ac6f929d74ba Merge tag 'linux-can-fixes-for-5.10-20201103' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can) +$ git merge net/master +Removing Documentation/devicetree/bindings/net/can/fsl-flexcan.txt +Merge made by the 'recursive' strategy. + .../bindings/net/can/can-controller.yaml | 18 +++ + .../devicetree/bindings/net/can/fsl,flexcan.yaml | 135 +++++++++++++++++++++ + .../devicetree/bindings/net/can/fsl-flexcan.txt | 57 --------- + Documentation/networking/j1939.rst | 120 +++++++++--------- + drivers/net/can/dev.c | 14 ++- + drivers/net/can/flexcan.c | 12 +- + drivers/net/can/peak_canfd/peak_canfd.c | 11 +- + drivers/net/can/rx-offload.c | 4 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 22 ++-- + drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c | 18 +-- + drivers/net/can/ti_hecc.c | 8 +- + drivers/net/can/usb/peak_usb/pcan_usb_core.c | 51 +++++++- + drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 48 ++++++-- + drivers/net/can/xilinx_can.c | 6 +- + drivers/net/dsa/qca8k.c | 4 +- + drivers/net/ethernet/cadence/macb_main.c | 3 +- + .../chelsio/inline_crypto/chtls/chtls_cm.c | 2 +- + .../chelsio/inline_crypto/chtls/chtls_hw.c | 3 + + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 28 +++-- + drivers/net/ethernet/freescale/fec.h | 6 + + drivers/net/ethernet/freescale/fec_main.c | 29 +++-- + drivers/net/ethernet/freescale/gianfar.c | 14 +-- + drivers/net/ethernet/ibm/ibmvnic.c | 36 +++++- + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 14 +-- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1 + + drivers/net/ethernet/ti/cpsw_ethtool.c | 1 - + drivers/net/ethernet/ti/cpsw_priv.c | 5 +- + drivers/net/phy/sfp.c | 3 +- + drivers/net/usb/qmi_wwan.c | 1 + + include/linux/can/skb.h | 20 ++- + include/linux/netfilter/nfnetlink.h | 9 +- + include/linux/netfilter_ipv4.h | 2 +- + include/linux/netfilter_ipv6.h | 10 +- + include/net/cfg80211.h | 9 +- + include/net/mac80211.h | 7 +- + include/uapi/linux/icmpv6.h | 1 + + net/atm/lec.c | 5 +- + net/can/Kconfig | 5 +- + net/can/isotp.c | 26 ++-- + net/can/j1939/socket.c | 6 + + net/can/proc.c | 6 +- + net/ipv4/ip_tunnel.c | 3 - + net/ipv4/netfilter.c | 8 +- + net/ipv4/netfilter/iptable_mangle.c | 2 +- + net/ipv4/netfilter/nf_reject_ipv4.c | 2 +- + net/ipv4/xfrm4_tunnel.c | 4 +- + net/ipv6/icmp.c | 8 +- + net/ipv6/ip6_tunnel.c | 4 +- + net/ipv6/netfilter.c | 6 +- + net/ipv6/netfilter/ip6table_mangle.c | 2 +- + net/ipv6/reassembly.c | 33 ++++- + net/ipv6/xfrm6_tunnel.c | 4 +- + net/mac80211/mlme.c | 3 +- + net/mac80211/sta_info.c | 18 +++ + net/mac80211/sta_info.h | 9 +- + net/mac80211/tx.c | 44 ++++--- + net/mptcp/token.c | 2 +- + net/netfilter/ipset/ip_set_core.c | 3 +- + net/netfilter/ipvs/ip_vs_core.c | 4 +- + net/netfilter/nf_nat_proto.c | 4 +- + net/netfilter/nf_synproxy_core.c | 2 +- + net/netfilter/nf_tables_api.c | 19 +-- + net/netfilter/nfnetlink.c | 22 +++- + net/netfilter/nft_chain_route.c | 4 +- + net/netfilter/utils.c | 4 +- + net/openvswitch/datapath.c | 14 +-- + net/openvswitch/flow_table.c | 2 +- + net/sctp/sm_sideeffect.c | 4 +- + net/wireless/core.c | 57 +++++---- + net/wireless/core.h | 5 +- + net/wireless/nl80211.c | 3 +- + net/wireless/reg.c | 2 +- + net/xfrm/xfrm_interface.c | 8 +- + net/xfrm/xfrm_state.c | 8 +- + tools/testing/selftests/wireguard/netns.sh | 8 ++ + .../testing/selftests/wireguard/qemu/kernel.config | 2 + + 76 files changed, 728 insertions(+), 379 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/can/can-controller.yaml + create mode 100644 Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml + delete mode 100644 Documentation/devicetree/bindings/net/can/fsl-flexcan.txt +Merging bpf/master (25cf73b9ff88 libbpf: Fix possible use after free in xsk_socket__delete) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + include/linux/compiler-gcc.h | 2 -- + include/linux/compiler_types.h | 4 ---- + include/linux/filter.h | 22 +++++++++++----------- + include/net/xsk_buff_pool.h | 2 +- + kernel/bpf/Makefile | 6 +++++- + kernel/bpf/core.c | 2 +- + net/xdp/xsk.c | 3 ++- + net/xdp/xsk_buff_pool.c | 7 +++++-- + samples/bpf/task_fd_query_user.c | 2 +- + samples/bpf/tracex2_user.c | 2 +- + samples/bpf/tracex3_user.c | 2 +- + samples/bpf/xdp_redirect_cpu_user.c | 2 +- + samples/bpf/xdp_rxq_info_user.c | 2 +- + scripts/bpf_helpers_doc.py | 1 + + tools/bpf/bpftool/feature.c | 7 ++++++- + tools/bpf/bpftool/skeleton/profiler.bpf.c | 4 ++-- + tools/lib/bpf/hashmap.h | 15 +++++++++------ + tools/lib/bpf/xsk.c | 9 ++++++--- + tools/testing/selftests/bpf/progs/profiler.inc.h | 11 ++++++++--- + 19 files changed, 62 insertions(+), 43 deletions(-) +Merging ipsec/master (a779d91314ca net: xfrm: fix a race condition during allocing spi) +$ git merge ipsec/master +Already up to date. +Merging netfilter/master (fea07a487c6d net: openvswitch: silence suspicious RCU usage warning) +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (859191b234f8 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (04516706bb99 iwlwifi: pcie: limit memory read spin time) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 36 ++++++++++++++++++------- + drivers/net/wireless/realtek/rtw88/fw.c | 2 +- + 2 files changed, 28 insertions(+), 10 deletions(-) +Merging mac80211/master (fea07a487c6d net: openvswitch: silence suspicious RCU usage warning) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (00469c97ef64 RDMA/vmw_pvrdma: Fix the active_speed and phys_state value) +$ git merge rdma-fixes/for-rc +Merge made by the 'recursive' strategy. + drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h | 2 +- + drivers/infiniband/sw/rdmavt/vt.c | 7 +++++-- + drivers/infiniband/sw/rxe/rxe_verbs.c | 6 +++++- + drivers/infiniband/sw/siw/siw_main.c | 7 +++++-- + drivers/infiniband/ulp/srpt/ib_srpt.c | 13 ++++++++----- + 5 files changed, 24 insertions(+), 11 deletions(-) +Merging sound-current/for-linus (26201ddc1373 ALSA: usb-audio: Add implicit feedback quirk for MODX) +$ 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/hda/ext/hdac_ext_controller.c | 2 ++ + sound/pci/hda/hda_codec.c | 45 ++++++++++++++--------- + sound/pci/hda/hda_controller.h | 3 +- + sound/pci/hda/hda_intel.c | 63 +++++++++++++++++--------------- + sound/pci/hda/patch_realtek.c | 67 +++++++++++++++++++++++++++++------ + sound/soc/soc-core.c | 2 +- + sound/soc/soc-dapm.c | 2 +- + sound/usb/pcm.c | 5 +++ + sound/usb/quirks.c | 1 + + 17 files changed, 145 insertions(+), 69 deletions(-) +Merging sound-asoc-fixes/for-linus (961ed2ad57fd Merge remote-tracking branch 'asoc/for-5.10' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + sound/soc/atmel/mchp-spdiftx.c | 1 - + sound/soc/codecs/cs42l51.c | 22 +++++++++++- + sound/soc/codecs/wcd9335.c | 2 +- + sound/soc/codecs/wcd934x.c | 2 +- + 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/lpass-cpu.c | 14 +++++--- + sound/soc/qcom/lpass-sc7180.c | 2 +- + sound/soc/qcom/sdm845.c | 2 ++ + sound/soc/sof/loader.c | 5 +++ + 16 files changed, 119 insertions(+), 48 deletions(-) +Merging regmap-fixes/for-linus (780f88b04704 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 (cf1ad559a20d regulator: defer probe when trying to get voltage from unresolved supply) +$ git merge regulator-fixes/for-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 8 ++++++++ + drivers/regulator/core.c | 2 ++ + 2 files changed, 10 insertions(+) +Merging spi-fixes/for-linus (ae36bbe9efb0 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-bcm2835.c | 12 ------------ + drivers/spi/spi-fsl-dspi.c | 10 ++++------ + drivers/spi/spi-imx.c | 23 +++++++++++++++-------- + 3 files changed, 19 insertions(+), 26 deletions(-) +Merging pci-current/for-linus (832ea234277a PCI: mvebu: Fix duplicate resource requests) +$ git merge pci-current/for-linus +Merge made by the 'recursive' strategy. + drivers/pci/controller/dwc/pcie-designware-host.c | 8 ++++++-- + drivers/pci/controller/pci-mvebu.c | 23 ++++++++++------------- + drivers/pci/pci.c | 9 +++++++-- + 3 files changed, 23 insertions(+), 17 deletions(-) +Merging driver-core.current/driver-core-linus (d181bfe36715 Documentation: remove mic/index from misc-devices/index.rst) +$ git merge driver-core.current/driver-core-linus +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-driver-dma-ioatdma | 10 +++++----- + Documentation/ABI/testing/sysfs-class-net | 2 +- + Documentation/leds/index.rst | 1 + + Documentation/misc-devices/index.rst | 1 - + scripts/get_abi.pl | 23 +++++++++++++++++++++++ + 5 files changed, 30 insertions(+), 7 deletions(-) +Merging tty.current/tty-linus (3cea11cd5e3b Linux 5.10-rc2) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (afaa2e745a24 USB: Add NO_LPM quirk for Kingston flash drive) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/core/quirks.c | 3 +++ + drivers/usb/dwc2/platform.c | 3 +++ + drivers/usb/dwc3/dwc3-pci.c | 4 ++++ + drivers/usb/dwc3/ep0.c | 3 ++- + drivers/usb/gadget/legacy/raw_gadget.c | 5 ++++- + drivers/usb/gadget/udc/fsl_udc_core.c | 2 +- + drivers/usb/gadget/udc/goku_udc.c | 2 +- + 7 files changed, 18 insertions(+), 4 deletions(-) +Merging usb-gadget-fixes/fixes (129aa9734559 usb: raw-gadget: fix memory leak in gadget_setup) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (db0362eeb229 USB: serial: option: add Telit FN980 composition 0x1055) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/cyberjack.c | 7 ++++++- + drivers/usb/serial/option.c | 10 ++++++++++ + 2 files changed, 16 insertions(+), 1 deletion(-) +Merging usb-chipidea-fixes/for-usb-fixes (e11d2bf27158 usb: cdns3: gadget: own the lock wrongly at the suspend routine) +$ git merge usb-chipidea-fixes/for-usb-fixes +Already up to date. +Merging phy/fixes (25d76fed7ffe phy: cpcap-usb: Use IRQF_ONESHOT) +$ git merge phy/fixes +Merge made by the 'recursive' strategy. + drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c | 5 ----- + drivers/phy/motorola/phy-cpcap-usb.c | 3 ++- + drivers/phy/qualcomm/phy-qcom-qmp.c | 2 +- + drivers/phy/tegra/xusb.c | 1 + + 4 files changed, 4 insertions(+), 7 deletions(-) +Merging staging.current/staging-linus (3cea11cd5e3b Linux 5.10-rc2) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (a8643626d84b Merge tag 'misc-habanalabs-fixes-2020-11-04' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux into char-misc-next) +$ git merge char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + drivers/misc/habanalabs/common/command_buffer.c | 9 +++-- + drivers/misc/habanalabs/common/habanalabs.h | 14 ++++---- + drivers/misc/habanalabs/common/hw_queue.c | 19 +++++------ + drivers/misc/habanalabs/common/irq.c | 17 +++++----- + drivers/misc/habanalabs/gaudi/gaudi.c | 38 +++++++++------------- + drivers/misc/habanalabs/gaudi/gaudiP.h | 1 + + drivers/misc/habanalabs/gaudi/gaudi_coresight.c | 5 +++ + drivers/misc/habanalabs/goya/goya.c | 26 +++++++-------- + drivers/misc/habanalabs/goya/goyaP.h | 2 +- + .../misc/habanalabs/include/gaudi/gaudi_masks.h | 1 - + drivers/misc/mei/client.h | 4 +-- + 11 files changed, 64 insertions(+), 72 deletions(-) +Merging soundwire-fixes/fixes (3650b228f83a Linux 5.10-rc1) +$ 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 (b1884583fcd1 Input: i8042 - allow insmod to succeed on devices without an i8042 controller) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/misc/adxl34x.c | 2 +- + drivers/input/serio/i8042.c | 12 +++++++++++- + 2 files changed, 12 insertions(+), 2 deletions(-) +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 (e4eccb853664 vfio/pci: Bypass IGD init in case of -ENODEV) +$ git merge vfio-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/vfio/fsl-mc/vfio_fsl_mc.c | 10 +++++-- + drivers/vfio/fsl-mc/vfio_fsl_mc_intr.c | 2 +- + drivers/vfio/pci/vfio_pci.c | 2 +- + drivers/vfio/pci/vfio_pci_rdwr.c | 43 ++++++++++++++++++++++------ + drivers/vfio/platform/vfio_platform_common.c | 3 +- + drivers/vfio/vfio_iommu_type1.c | 17 ++++------- + 6 files changed, 50 insertions(+), 27 deletions(-) +Merging kselftest-fixes/fixes (1488472e712d selftests: binderfs: use SKIP instead of XFAIL) +$ git merge kselftest-fixes/fixes +Auto-merging tools/testing/selftests/kselftest_harness.h +Merge made by the 'recursive' strategy. + tools/testing/selftests/android/ion/ipcsocket.c | 1 + + tools/testing/selftests/android/ion/ipcsocket.h | 2 -- + .../selftests/clone3/clone3_cap_checkpoint_restore.c | 2 +- + tools/testing/selftests/core/close_range_test.c | 8 ++++---- + .../testing/selftests/filesystems/binderfs/binderfs_test.c | 8 ++++---- + .../selftests/ftrace/test.d/dynevent/add_remove_kprobe.tc | 2 +- + .../ftrace/test.d/dynevent/clear_select_events.tc | 2 +- + .../ftrace/test.d/dynevent/generic_clear_event.tc | 2 +- + .../ftrace/test.d/ftrace/func-filter-notrace-pid.tc | 2 +- + .../selftests/ftrace/test.d/ftrace/func-filter-pid.tc | 2 +- + .../ftrace/test.d/ftrace/func-filter-stacktrace.tc | 4 ++-- + tools/testing/selftests/ftrace/test.d/functions | 7 +++++++ + .../selftests/ftrace/test.d/kprobe/add_and_remove.tc | 2 +- + tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc | 2 +- + .../testing/selftests/ftrace/test.d/kprobe/kprobe_args.tc | 4 ++-- + .../selftests/ftrace/test.d/kprobe/kprobe_args_comm.tc | 2 +- + .../selftests/ftrace/test.d/kprobe/kprobe_args_string.tc | 4 ++-- + .../selftests/ftrace/test.d/kprobe/kprobe_args_symbol.tc | 10 +++++----- + .../selftests/ftrace/test.d/kprobe/kprobe_args_type.tc | 2 +- + .../selftests/ftrace/test.d/kprobe/kprobe_args_user.tc | 4 ++++ + .../selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc | 14 +++++++------- + .../selftests/ftrace/test.d/kprobe/kprobe_multiprobe.tc | 2 +- + .../selftests/ftrace/test.d/kprobe/kprobe_syntax_errors.tc | 12 ++++++------ + .../selftests/ftrace/test.d/kprobe/kretprobe_args.tc | 4 ++-- + tools/testing/selftests/ftrace/test.d/kprobe/profile.tc | 2 +- + tools/testing/selftests/kselftest_harness.h | 2 +- + tools/testing/selftests/lib.mk | 2 +- + tools/testing/selftests/pidfd/config | 1 + + tools/testing/selftests/pidfd/pidfd_getfd_test.c | 5 ++++- + tools/testing/selftests/pidfd/pidfd_open_test.c | 1 - + tools/testing/selftests/pidfd/pidfd_poll_test.c | 1 - + tools/testing/selftests/pidfd/pidfd_setns_test.c | 1 - + tools/testing/selftests/pidfd/pidfd_test.c | 2 +- + tools/testing/selftests/proc/proc-loadavg-001.c | 1 - + tools/testing/selftests/proc/proc-self-syscall.c | 1 - + tools/testing/selftests/proc/proc-uptime-002.c | 1 - + 36 files changed, 66 insertions(+), 58 deletions(-) +Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (768664114b1a dmaengine: ti: k3-udma: fix -Wenum-conversion warning) +$ git merge dmaengine-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/dma/idxd/device.c | 29 ++++++++++++++--------------- + drivers/dma/idxd/idxd.h | 3 ++- + drivers/dma/idxd/init.c | 5 +++++ + drivers/dma/idxd/registers.h | 23 ++++++++++++++++++++++- + drivers/dma/ti/k3-udma-private.c | 2 +- + 5 files changed, 44 insertions(+), 18 deletions(-) +Merging backlight-fixes/for-backlight-fixes (219d54332a09 Linux 5.4) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (9efac6ce7f62 mtd: rawnand: stm32_fmc2: fix broken ECC) +$ 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 ++++---------- + drivers/mtd/nand/raw/stm32_fmc2_nand.c | 15 ++++++------ + drivers/mtd/spi-nor/core.c | 13 +++++----- + 4 files changed, 44 insertions(+), 44 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 (31b4d8e172f6 MIPS: export has_transparent_hugepage() for modules) +$ git merge mips-fixes/mips-fixes +Merge made by the 'recursive' strategy. + arch/mips/mm/tlb-r4k.c | 1 + + 1 file changed, 1 insertion(+) +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 (9478dec3b5e7 KVM: vmx: remove unused variable) +$ 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 (18e8db7f6526 hwmon: (pmbus) Add mutex locking for sysfs reads) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + drivers/hwmon/pmbus/max20730.c | 26 +++++++++++++------------- + drivers/hwmon/pmbus/pmbus_core.c | 13 ++++++++++--- + 2 files changed, 23 insertions(+), 16 deletions(-) +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 (45d8f990a77f Merge branch 'misc-5.10' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Already up to date! +Merge made by the 'recursive' strategy. +Merging vfs-fixes/fixes (77f6ab8b7768 don't dump the threads that had been already exiting when zapped.) +$ git merge vfs-fixes/fixes +Merge made by the 'recursive' strategy. + kernel/exit.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) +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 (cd12e4f14f7c CREDITS: remove trailing white spaces) +$ git merge samsung-krzk-fixes/fixes +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging CREDITS +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master bc6406abfffb] Merge remote-tracking branch 'samsung-krzk-fixes/fixes' into master +$ git diff -M --stat --summary HEAD^.. + CREDITS | 62 +++++++++++++++++++++++++++++++++++-------------------------- + MAINTAINERS | 18 +----------------- + 2 files changed, 37 insertions(+), 43 deletions(-) +Merging pinctrl-samsung-fixes/fixes (3650b228f83a Linux 5.10-rc1) +$ git merge pinctrl-samsung-fixes/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 +Already up to date. +Merging scsi-fixes/fixes (5feed64f9199 scsi: mpt3sas: Fix timeouts observed while reenabling IRQ) +$ git merge scsi-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/scsi/device_handler/scsi_dh_alua.c | 9 +++++---- + drivers/scsi/hpsa.c | 4 +++- + drivers/scsi/mpt3sas/mpt3sas_base.c | 7 +++++++ + 3 files changed, 15 insertions(+), 5 deletions(-) +Merging drm-fixes/drm-fixes (3cea11cd5e3b Linux 5.10-rc2) +$ git merge drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) +$ git merge amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (537457a979a0 drm/i915: Hold onto an explicit ref to i915_vma_work.pinned) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/display/intel_psr.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 28 ++++++------- + drivers/gpu/drm/i915/gt/intel_engine.h | 55 ++++++++++++++++---------- + drivers/gpu/drm/i915/gt/intel_lrc.c | 31 ++++++++++----- + drivers/gpu/drm/i915/gt/intel_timeline.c | 18 +++++---- + drivers/gpu/drm/i915/gt/intel_timeline_types.h | 2 + + drivers/gpu/drm/i915/gvt/handlers.c | 47 ++++++++++++++++++++-- + drivers/gpu/drm/i915/gvt/scheduler.c | 15 +++---- + drivers/gpu/drm/i915/i915_vma.c | 6 ++- + 9 files changed, 139 insertions(+), 65 deletions(-) +Merging mmc-fixes/fixes (011fde48394b mmc: sdhci-of-esdhc: make sure delay chain locked for HS400) +$ git merge mmc-fixes/fixes +Already up to date. +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 (3650b228f83a Linux 5.10-rc1) +$ 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/signal.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 (3cea11cd5e3b Linux 5.10-rc2) +$ 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 (a30573b3cdc7 erofs: fix setting up pcluster for temporary pages) +$ git merge erofs-fixes/fixes +Merge made by the 'recursive' strategy. + fs/erofs/inode.c | 21 +++++++++++---------- + fs/erofs/zdata.c | 7 +++++-- + 2 files changed, 16 insertions(+), 12 deletions(-) +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 (b9bc36704cca ARM, xtensa: highmem: avoid clobbering non-page aligned memory reservations) +$ git merge memblock-fixes/fixes +Merge made by the 'recursive' strategy. + arch/arm/mm/init.c | 4 ++-- + arch/xtensa/mm/init.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (9522750c66c6 Fonts: Replace discarded const qualifier) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/panfrost/panfrost_drv.c | 5 +- + drivers/gpu/drm/panfrost/panfrost_gem.c | 4 +- + drivers/gpu/drm/panfrost/panfrost_gem.h | 2 +- + drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c | 14 ++++- + drivers/gpu/drm/vc4/vc4_bo.c | 9 +-- + drivers/gpu/drm/vc4/vc4_drv.c | 41 +++++------- + drivers/gpu/drm/vc4/vc4_drv.h | 9 ++- + drivers/gpu/drm/vc4/vc4_gem.c | 19 +++--- + drivers/gpu/drm/vc4/vc4_hvs.c | 4 +- + drivers/gpu/drm/vc4/vc4_kms.c | 80 +++++++++++++++++------- + drivers/gpu/drm/vc4/vc4_v3d.c | 12 ++-- + lib/fonts/font_10x18.c | 2 +- + lib/fonts/font_6x10.c | 2 +- + lib/fonts/font_6x11.c | 2 +- + lib/fonts/font_6x8.c | 2 +- + lib/fonts/font_7x14.c | 2 +- + lib/fonts/font_8x16.c | 2 +- + lib/fonts/font_8x8.c | 2 +- + lib/fonts/font_acorn_8x8.c | 2 +- + lib/fonts/font_mini_4x6.c | 2 +- + lib/fonts/font_pearl_8x8.c | 2 +- + lib/fonts/font_sun12x22.c | 2 +- + lib/fonts/font_sun8x16.c | 2 +- + lib/fonts/font_ter16x32.c | 2 +- + 24 files changed, 128 insertions(+), 97 deletions(-) +Merging kspp-gustavo/for-next/kspp (3650b228f83a Linux 5.10-rc1) +$ git merge kspp-gustavo/for-next/kspp +Already up to date. +Merging kbuild/for-next (729e39a558eb kconfig: qconf: convert to Qt5 new signal/slot connection syntax) +$ git merge kbuild/for-next +Merge made by the 'recursive' strategy. + scripts/kconfig/qconf-cfg.sh | 14 +---- + scripts/kconfig/qconf.cc | 136 +++++++++++++++++++++++++------------------ + 2 files changed, 81 insertions(+), 69 deletions(-) +Merging compiler-attributes/compiler-attributes (bbf5c979011a Linux 5.9) +$ git merge compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/for-next (48ab6d5d1f09 dma-mapping: fix 32-bit overflow with CONFIG_ARM_LPAE=n) +$ git merge dma-mapping/for-next +Already up to date. +Merging asm-generic/master (78d127fd6892 Merge branch 'asm-generic-timers' into asm-generic) +$ git merge asm-generic/master +Auto-merging include/linux/compiler_types.h +Removing drivers/net/ethernet/amd/am79c961a.h +Removing drivers/net/ethernet/amd/am79c961a.c +Auto-merging arch/sparc/Kconfig +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging arch/arm64/Kconfig +Removing arch/arm/mach-ebsa110/leds.c +Removing arch/arm/mach-ebsa110/io.c +Removing arch/arm/mach-ebsa110/include/mach/uncompress.h +Removing arch/arm/mach-ebsa110/include/mach/memory.h +Removing arch/arm/mach-ebsa110/include/mach/irqs.h +Removing arch/arm/mach-ebsa110/include/mach/io.h +Removing arch/arm/mach-ebsa110/include/mach/hardware.h +Removing arch/arm/mach-ebsa110/include/mach/entry-macro.S +Removing arch/arm/mach-ebsa110/core.h +Removing arch/arm/mach-ebsa110/core.c +Removing arch/arm/mach-ebsa110/Makefile.boot +Removing arch/arm/mach-ebsa110/Makefile +Removing arch/arm/configs/ebsa110_defconfig +Auto-merging MAINTAINERS +Removing Documentation/features/time/modern-timekeeping/arch-support.txt +Merge made by the 'recursive' strategy. + .../features/time/clockevents/arch-support.txt | 8 +- + .../time/modern-timekeeping/arch-support.txt | 33 - + MAINTAINERS | 8 - + arch/alpha/Kconfig | 1 - + arch/alpha/include/asm/mmu_context.h | 12 +- + arch/arc/Kconfig | 1 - + arch/arc/include/asm/mmu_context.h | 17 +- + arch/arm/Kconfig | 37 +- + arch/arm/Kconfig.debug | 6 +- + arch/arm/Makefile | 8 - + arch/arm/configs/ebsa110_defconfig | 74 -- + arch/arm/include/asm/mach/time.h | 2 - + arch/arm/include/asm/mmu_context.h | 26 +- + arch/arm/kernel/Makefile | 6 +- + arch/arm/kernel/time.c | 14 - + arch/arm/mach-ebsa110/Makefile | 8 - + arch/arm/mach-ebsa110/Makefile.boot | 5 - + arch/arm/mach-ebsa110/core.c | 323 --------- + arch/arm/mach-ebsa110/core.h | 38 - + arch/arm/mach-ebsa110/include/mach/entry-macro.S | 33 - + arch/arm/mach-ebsa110/include/mach/hardware.h | 21 - + arch/arm/mach-ebsa110/include/mach/io.h | 89 --- + arch/arm/mach-ebsa110/include/mach/irqs.h | 17 - + arch/arm/mach-ebsa110/include/mach/memory.h | 22 - + arch/arm/mach-ebsa110/include/mach/uncompress.h | 41 -- + arch/arm/mach-ebsa110/io.c | 440 ------------ + arch/arm/mach-ebsa110/leds.c | 71 -- + arch/arm/mach-rpc/time.c | 2 +- + arch/arm64/Kconfig | 1 - + arch/arm64/Kconfig.platforms | 1 - + arch/arm64/include/asm/mmu_context.h | 8 +- + arch/c6x/Kconfig | 1 - + arch/c6x/include/asm/mmu_context.h | 6 + + arch/csky/Kconfig | 1 - + arch/csky/include/asm/mmu_context.h | 8 +- + arch/h8300/Kconfig | 1 - + arch/hexagon/Kconfig | 1 - + arch/hexagon/include/asm/mmu_context.h | 33 +- + arch/ia64/Kconfig | 1 + + arch/ia64/include/asm/mmu_context.h | 17 +- + arch/ia64/kernel/time.c | 36 +- + arch/m68k/68000/timers.c | 7 +- + arch/m68k/Kconfig.cpu | 37 +- + arch/m68k/Kconfig.machine | 11 + + arch/m68k/amiga/config.c | 11 +- + arch/m68k/apollo/config.c | 11 +- + arch/m68k/atari/config.c | 2 +- + arch/m68k/atari/time.c | 9 +- + arch/m68k/bvme6000/config.c | 9 +- + arch/m68k/coldfire/Makefile | 32 +- + arch/m68k/coldfire/pit.c | 2 +- + arch/m68k/coldfire/sltimers.c | 8 +- + arch/m68k/coldfire/timers.c | 8 +- + arch/m68k/hp300/time.c | 8 +- + arch/m68k/hp300/time.h | 2 +- + arch/m68k/include/asm/machdep.h | 12 +- + arch/m68k/include/asm/mmu_context.h | 38 +- + arch/m68k/kernel/setup_mm.c | 2 +- + arch/m68k/kernel/setup_no.c | 2 +- + arch/m68k/kernel/time.c | 18 +- + arch/m68k/mac/config.c | 6 +- + arch/m68k/mac/via.c | 8 +- + arch/m68k/mvme147/config.c | 9 +- + arch/m68k/mvme16x/config.c | 9 +- + arch/m68k/q40/config.c | 2 +- + arch/m68k/q40/q40ints.c | 10 +- + arch/m68k/sun3/config.c | 4 +- + arch/m68k/sun3/sun3ints.c | 3 +- + arch/m68k/sun3x/time.c | 5 +- + arch/m68k/sun3x/time.h | 2 +- + arch/microblaze/Kconfig | 1 - + 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/Kconfig | 1 - + arch/mips/include/asm/mmu_context.h | 11 +- + arch/nds32/Kconfig | 1 - + arch/nds32/include/asm/mmu_context.h | 10 +- + arch/nios2/Kconfig | 1 - + arch/nios2/include/asm/mmu_context.h | 21 +- + arch/openrisc/Kconfig | 1 - + arch/openrisc/include/asm/mmu_context.h | 8 +- + arch/parisc/Kconfig | 2 +- + arch/parisc/include/asm/mmu_context.h | 12 +- + arch/parisc/kernel/time.c | 9 +- + arch/powerpc/Kconfig | 1 - + arch/powerpc/include/asm/mmu_context.h | 13 +- + arch/riscv/Kconfig | 1 - + arch/riscv/include/asm/mmu_context.h | 22 +- + arch/s390/Kconfig | 1 - + arch/s390/include/asm/mmu_context.h | 9 +- + arch/sh/Kconfig | 1 - + arch/sh/include/asm/mmu_context.h | 7 +- + arch/sh/include/asm/mmu_context_32.h | 9 - + arch/sparc/Kconfig | 1 - + arch/sparc/include/asm/mmu_context_32.h | 10 +- + arch/sparc/include/asm/mmu_context_64.h | 10 +- + arch/um/Kconfig | 1 - + arch/um/include/asm/mmu_context.h | 12 +- + arch/x86/Kconfig | 1 - + arch/x86/include/asm/mmu_context.h | 6 + + arch/xtensa/Kconfig | 1 - + arch/xtensa/include/asm/mmu_context.h | 11 +- + arch/xtensa/include/asm/nommu_context.h | 26 +- + drivers/Makefile | 2 - + drivers/clocksource/Kconfig | 2 +- + drivers/net/ethernet/amd/Kconfig | 10 +- + drivers/net/ethernet/amd/Makefile | 1 - + drivers/net/ethernet/amd/am79c961a.c | 763 --------------------- + drivers/net/ethernet/amd/am79c961a.h | 143 ---- + drivers/watchdog/Kconfig | 2 +- + 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/asm-generic/qrwlock.h | 8 +- + include/asm-generic/qspinlock.h | 4 +- + include/linux/compiler_types.h | 11 + + include/linux/ctype.h | 15 +- + include/linux/time.h | 13 - + include/linux/timekeeping.h | 3 +- + include/uapi/asm-generic/sembuf.h | 6 +- + kernel/time/Kconfig | 18 +- + kernel/time/Makefile | 1 + + kernel/time/clocksource.c | 8 - + kernel/time/tick-legacy.c | 37 + + kernel/time/timekeeping.c | 41 +- + kernel/time/timekeeping.h | 1 + + kernel/trace/Kconfig | 2 - + 129 files changed, 435 insertions(+), 2755 deletions(-) + delete mode 100644 Documentation/features/time/modern-timekeeping/arch-support.txt + delete mode 100644 arch/arm/configs/ebsa110_defconfig + delete mode 100644 arch/arm/mach-ebsa110/Makefile + delete mode 100644 arch/arm/mach-ebsa110/Makefile.boot + delete mode 100644 arch/arm/mach-ebsa110/core.c + delete mode 100644 arch/arm/mach-ebsa110/core.h + delete mode 100644 arch/arm/mach-ebsa110/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-ebsa110/include/mach/hardware.h + delete mode 100644 arch/arm/mach-ebsa110/include/mach/io.h + delete mode 100644 arch/arm/mach-ebsa110/include/mach/irqs.h + delete mode 100644 arch/arm/mach-ebsa110/include/mach/memory.h + delete mode 100644 arch/arm/mach-ebsa110/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-ebsa110/io.c + delete mode 100644 arch/arm/mach-ebsa110/leds.c + create mode 100644 arch/c6x/include/asm/mmu_context.h + delete mode 100644 drivers/net/ethernet/amd/am79c961a.c + delete mode 100644 drivers/net/ethernet/amd/am79c961a.h + create mode 100644 include/asm-generic/nommu_context.h + create mode 100644 kernel/time/tick-legacy.c +Merging arc/for-next (def9d2780727 Linux 5.5-rc7) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (20f96e606509 Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Auto-merging arch/arm/mm/init.c +Auto-merging arch/arm/Kconfig +Auto-merging Documentation/dev-tools/kasan.rst +Merge made by the 'recursive' strategy. + Documentation/arm/memory.rst | 12 +- + Documentation/dev-tools/kasan.rst | 4 +- + .../features/debug/KASAN/arch-support.txt | 2 +- + arch/arm/Kconfig | 10 + + arch/arm/boot/compressed/Makefile | 1 + + arch/arm/boot/compressed/string.c | 19 ++ + arch/arm/include/asm/fixmap.h | 2 +- + arch/arm/include/asm/kasan.h | 33 +++ + arch/arm/include/asm/kasan_def.h | 81 ++++++ + arch/arm/include/asm/memory.h | 10 + + arch/arm/include/asm/pgalloc.h | 8 +- + arch/arm/include/asm/prom.h | 4 +- + arch/arm/include/asm/string.h | 26 ++ + arch/arm/include/asm/thread_info.h | 8 + + arch/arm/include/asm/uaccess-asm.h | 2 +- + arch/arm/kernel/atags.h | 4 +- + arch/arm/kernel/atags_parse.c | 6 +- + arch/arm/kernel/devtree.c | 6 +- + arch/arm/kernel/entry-armv.S | 3 +- + arch/arm/kernel/entry-common.S | 9 +- + arch/arm/kernel/head-common.S | 7 +- + arch/arm/kernel/head.S | 5 +- + arch/arm/kernel/setup.c | 21 +- + arch/arm/kernel/unwind.c | 6 +- + arch/arm/lib/memcpy.S | 3 + + arch/arm/lib/memmove.S | 5 +- + arch/arm/lib/memset.S | 3 + + arch/arm/mm/Makefile | 5 + + arch/arm/mm/init.c | 1 - + arch/arm/mm/kasan_init.c | 291 +++++++++++++++++++++ + arch/arm/mm/mmu.c | 38 ++- + arch/arm/mm/pgd.c | 16 +- + arch/arm/mm/pv-fixup-asm.S | 4 +- + arch/arm/vdso/Makefile | 2 + + 34 files changed, 614 insertions(+), 43 deletions(-) + create mode 100644 arch/arm/include/asm/kasan.h + create mode 100644 arch/arm/include/asm/kasan_def.h + create mode 100644 arch/arm/mm/kasan_init.c +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 (36ab3c32cafc ARM: SoC: document merges) +$ git merge arm-soc/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + arch/arm/arm-soc-for-next-contents.txt | 45 ++++++++++++++++++++++ + 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-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 +- + .../dts/allwinner/sun50i-h5-orangepi-prime.dts | 2 +- + .../boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 2 +- + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 2 +- + drivers/tee/optee/device.c | 2 +- + 23 files changed, 65 insertions(+), 27 deletions(-) + 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 -- + 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 ++++- + 8 files changed, 26 insertions(+), 14 deletions(-) +Merging aspeed/for-next (93db293b2aba Merge branch 'soc-for-v5.11' 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/Makefile | 1 + + arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts | 33 +- + arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts | 924 +++++++++++++++ + .../arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts | 5 - + arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts | 4 +- + arch/arm/boot/dts/aspeed-g4.dtsi | 5 + + arch/arm/boot/dts/aspeed-g5.dtsi | 5 + + arch/arm/boot/dts/aspeed-g6.dtsi | 7 +- + arch/arm/boot/dts/openbmc-flash-layout-64.dtsi | 35 + + 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 + + 21 files changed, 2608 insertions(+), 32 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soc/aspeed/xdma.yaml + create mode 100644 arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts + create mode 100644 arch/arm/boot/dts/openbmc-flash-layout-64.dtsi + 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 (0698efbb33ef Merge branches 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next) +$ git merge at91/at91-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/at91-kizbox.dts | 10 +++++----- + arch/arm/boot/dts/at91-kizbox2-common.dtsi | 8 ++++---- + arch/arm/boot/dts/at91-kizbox3-hs.dts | 16 ++++++++-------- + arch/arm/boot/dts/at91-kizbox3_common.dtsi | 10 +++++----- + arch/arm/boot/dts/at91-kizboxmini-common.dtsi | 8 ++++---- + arch/arm/boot/dts/at91-sama5d27_som1.dtsi | 2 +- + arch/arm/boot/dts/at91-smartkiz.dts | 6 ++---- + arch/arm/boot/dts/at91sam9m10g45ek.dts | 10 +++++----- + arch/arm/boot/dts/at91sam9rlek.dts | 10 +++++----- + arch/arm/configs/at91_dt_defconfig | 5 +++++ + arch/arm/configs/sama5_defconfig | 9 +++++++++ + drivers/soc/atmel/soc.c | 6 ++++++ + drivers/soc/atmel/soc.h | 3 +++ + 13 files changed, 62 insertions(+), 41 deletions(-) +Merging drivers-memory/for-next (5ddebb22417b Merge branch 'for-v5.11/tegra-mc' into for-next) +$ 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 (5f8fb90aea46 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Auto-merging Documentation/devicetree/bindings/arm/fsl.yaml +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/freescale/fsl,scu.txt | 12 +- + Documentation/devicetree/bindings/arm/fsl.yaml | 334 +++++++++++++++++++-- + .../devicetree/bindings/clock/imx8qxp-lpcg.yaml | 79 +++-- + .../bindings/net/ethernet-controller.yaml | 1 + + .../bindings/net/fsl,qoriq-mc-dpmac.yaml | 60 ++++ + .../devicetree/bindings/vendor-prefixes.yaml | 10 + + .../devicetree/bindings/watchdog/fsl-imx-wdt.yaml | 16 + + arch/arm/boot/dts/imx25.dtsi | 2 +- + arch/arm/boot/dts/imx27.dtsi | 2 +- + arch/arm/boot/dts/imx31.dtsi | 3 +- + arch/arm/boot/dts/imx35.dtsi | 2 +- + arch/arm/boot/dts/imx50.dtsi | 2 +- + arch/arm/boot/dts/imx51-zii-rdu1.dts | 2 +- + arch/arm/boot/dts/imx51.dtsi | 4 +- + arch/arm/boot/dts/imx53-ppd.dts | 15 +- + arch/arm/boot/dts/imx53.dtsi | 4 +- + arch/arm/boot/dts/imx6dl-aristainetos2_4.dts | 2 +- + arch/arm/boot/dts/imx6dl-aristainetos2_7.dts | 2 +- + arch/arm/boot/dts/imx6dl-aristainetos_4.dts | 2 +- + arch/arm/boot/dts/imx6dl-aristainetos_7.dts | 2 +- + arch/arm/boot/dts/imx6dl-pico-dwarf.dts | 2 +- + arch/arm/boot/dts/imx6dl-pico-hobbit.dts | 2 +- + arch/arm/boot/dts/imx6dl-pico-nymph.dts | 2 +- + arch/arm/boot/dts/imx6dl-pico-pi.dts | 2 +- + arch/arm/boot/dts/imx6q-icore-ofcap10.dts | 28 +- + arch/arm/boot/dts/imx6q-prti6q.dts | 4 +- + arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 3 +- + arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi | 3 +- + arch/arm/boot/dts/imx6qdl-udoo.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 8 +- + arch/arm/boot/dts/imx6qdl.dtsi | 8 +- + arch/arm/boot/dts/imx6sl-warp.dts | 4 +- + arch/arm/boot/dts/imx6sl.dtsi | 3 + + arch/arm/boot/dts/imx6sll.dtsi | 2 + + arch/arm/boot/dts/imx6sx-softing-vining-2000.dts | 8 +- + arch/arm/boot/dts/imx6sx.dtsi | 7 +- + arch/arm/boot/dts/imx6ul-ccimx6ulsbcpro.dts | 2 +- + arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi | 1 + + arch/arm/boot/dts/imx6ul-phytec-segin.dtsi | 2 +- + arch/arm/boot/dts/imx6ul.dtsi | 6 +- + arch/arm/boot/dts/imx7-mba7.dtsi | 69 ++++- + arch/arm/boot/dts/imx7d-mba7.dts | 7 +- + arch/arm/boot/dts/imx7d.dtsi | 6 + + arch/arm/boot/dts/imx7s-mba7.dts | 2 +- + arch/arm/boot/dts/imx7s-warp.dts | 4 +- + arch/arm/boot/dts/imx7s.dtsi | 6 +- + arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 3 + + arch/arm/boot/dts/vfxxx.dtsi | 2 +- + arch/arm/mach-imx/mach-imx7ulp.c | 3 + + arch/arm64/boot/dts/freescale/Makefile | 2 + + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 8 +- + .../dts/freescale/fsl-ls1028a-kontron-sl28.dts | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 21 ++ + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 8 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts | 119 ++++++++ + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 137 ++++++++- + arch/arm64/boot/dts/freescale/fsl-ls2088a-rdb.dts | 120 ++++++++ + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 279 +++++++++++++++-- + arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts | 32 ++ + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 290 ++++++++++++++++-- + arch/arm64/boot/dts/freescale/fsl-lx2162a-qds.dts | 334 +++++++++++++++++++++ + .../boot/dts/freescale/imx8mm-beacon-som.dtsi | 317 ++++++++++--------- + arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi | 3 +- + .../boot/dts/freescale/imx8mm-kontron-n801x-s.dts | 322 ++++++++++++++++++++ + .../dts/freescale/imx8mm-kontron-n801x-som.dtsi | 294 ++++++++++++++++++ + arch/arm64/boot/dts/freescale/imx8mm-var-som.dtsi | 11 +- + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 53 +++- + arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts | 1 + + arch/arm64/boot/dts/freescale/imx8mn-evk.dts | 33 +- + arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mn-var-som.dtsi | 11 +- + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 45 +-- + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 15 +- + arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 38 +++ + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 68 ++++- + arch/arm64/boot/dts/freescale/qoriq-fman3-0.dtsi | 1 + + arch/arm64/configs/defconfig | 6 + + drivers/clk/imx/clk-gate2.c | 65 ++-- + drivers/clk/imx/clk-imx8mp.c | 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-pll14xx.c | 2 +- + drivers/clk/imx/clk-scu.c | 234 ++++++++++++++- + drivers/clk/imx/clk-scu.h | 56 +++- + drivers/clk/imx/clk.h | 27 +- + include/dt-bindings/clock/imx8-lpcg.h | 14 + + include/linux/firmware/imx/ipc.h | 13 + + include/linux/firmware/imx/sci.h | 27 ++ + include/linux/firmware/imx/svc/misc.h | 19 ++ + 93 files changed, 3591 insertions(+), 535 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml + create mode 100644 arch/arm64/boot/dts/freescale/fsl-lx2162a-qds.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-kontron-n801x-s.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-kontron-n801x-som.dtsi + create mode 100644 include/dt-bindings/clock/imx8-lpcg.h +Merging keystone/next (a5e886fb26f2 Merge branch 'for_5.11/drivers-soc' into next) +$ git merge keystone/next +Merge made by the 'recursive' strategy. + drivers/firmware/ti_sci.c | 213 +++++++++++---------------------- + drivers/firmware/ti_sci.h | 72 ++++------- + drivers/soc/ti/k3-ringacc.c | 97 +++++++-------- + drivers/soc/ti/k3-socinfo.c | 1 + + drivers/soc/ti/ti_sci_inta_msi.c | 12 ++ + include/linux/soc/ti/k3-ringacc.h | 5 + + include/linux/soc/ti/ti_sci_protocol.h | 85 ++++++++----- + 7 files changed, 214 insertions(+), 271 deletions(-) +Merging mediatek/for-next (9c6658a0dd4f Merge branch 'v5.10-next/soc' into for-next) +$ git merge mediatek/for-next +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 | 28 +-- + drivers/soc/mediatek/mtk-scpsys.c | 5 +- + 10 files changed, 355 insertions(+), 20 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 (c732298127a9 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-trogdor.dtsi | 19 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 108 +++++++- + drivers/i2c/busses/i2c-qcom-geni.c | 6 +- + drivers/soc/qcom/Kconfig | 5 +- + 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 ++ + include/linux/qcom-geni-se.h | 2 - + 20 files changed, 709 insertions(+), 120 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 (b860052992d7 Merge branch 'renesas-dt-bindings-for-v5.11' into renesas-next) +$ git merge renesas/next +Auto-merging Documentation/devicetree/bindings/arm/renesas.yaml +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/renesas.yaml | 1 + + 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 | 4 + + .../dts/renesas/aistarvision-mipi-adapter-2.1.dtsi | 4 +- + .../boot/dts/renesas/beacon-renesom-baseboard.dtsi | 67 +++++-- + .../arm64/boot/dts/renesas/beacon-renesom-som.dtsi | 3 +- + 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 | 3 +- + .../renesas/r8a774a1-hihope-rzg2m-ex-mipi-2.1.dts | 29 +++ + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 2 + + .../renesas/r8a774b1-hihope-rzg2n-ex-mipi-2.1.dts | 16 ++ + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 2 + + arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts | 67 +++++-- + .../boot/dts/renesas/r8a774c0-ek874-mipi-2.1.dts | 3 +- + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 1 + + .../renesas/r8a774e1-hihope-rzg2h-ex-mipi-2.1.dts | 16 ++ + arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 2 + + .../boot/dts/renesas/r8a77951-salvator-xs.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 2 + + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 2 + + arch/arm64/boot/dts/renesas/r8a77961-ulcb-kf.dts | 15 ++ + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 74 +++++++ + .../boot/dts/renesas/r8a77965-salvator-xs.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 122 +++++++++++ + arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 3 +- + arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 3 +- + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 2 + + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 2 + + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 1 + + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 2 +- + arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 14 +- + arch/arm64/boot/dts/renesas/ulcb.dtsi | 2 +- + drivers/soc/renesas/rmobile-sysc.c | 1 + + 36 files changed, 848 insertions(+), 53 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 + create mode 100644 arch/arm64/boot/dts/renesas/r8a77961-ulcb-kf.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 (1fdc65a3eb82 Merge branch 'v5.11-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm/boot/dts/rk3288-veyron-jaq.dts | 2 +- + arch/arm/boot/dts/rk3288-veyron-minnie.dts | 2 +- + arch/arm/boot/dts/rk3288-veyron-tiger.dts | 2 +- + arch/arm64/boot/dts/rockchip/Makefile | 1 + + arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts | 2 +- + .../boot/dts/rockchip/rk3399-kobol-helios64.dts | 372 +++++++++++++++++++++ + drivers/clk/rockchip/Kconfig | 12 +- + 9 files changed, 390 insertions(+), 6 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts +Merging samsung-krzk/for-next (59f129f534ca Merge branch 'next/drivers' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 2 +- + Documentation/arm/samsung-s3c24xx/gpio.rst | 4 +- + Documentation/arm/samsung-s3c24xx/overview.rst | 22 +-- + Documentation/arm/samsung-s3c24xx/usb-host.rst | 6 +- + Documentation/arm/samsung/gpio.rst | 3 +- + .../device_drivers/ethernet/davicom/dm9000.rst | 2 +- + arch/arm/boot/dts/exynos3250-artik5.dtsi | 2 +- + arch/arm/boot/dts/exynos3250-monk.dts | 8 +- + arch/arm/boot/dts/exynos3250-rinato.dts | 8 +- + arch/arm/boot/dts/exynos3250.dtsi | 5 - + arch/arm/boot/dts/exynos4210-i9100.dts | 6 +- + arch/arm/boot/dts/exynos4210-origen.dts | 4 +- + arch/arm/boot/dts/exynos4210-smdkv310.dts | 22 +-- + arch/arm/boot/dts/exynos4210-trats.dts | 35 +++- + arch/arm/boot/dts/exynos4210-universal_c210.dts | 29 +++ + arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 9 +- + arch/arm/boot/dts/exynos4412-itop-elite.dts | 2 +- + arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi | 2 +- + arch/arm/boot/dts/exynos4412-midas.dtsi | 45 +++-- + arch/arm/boot/dts/exynos4412-n710x.dts | 2 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 11 +- + arch/arm/boot/dts/exynos4412-odroidx.dts | 28 +-- + arch/arm/boot/dts/exynos4412-origen.dts | 14 +- + arch/arm/boot/dts/exynos4412-smdk4412.dts | 20 +-- + arch/arm/boot/dts/exynos4412.dtsi | 6 - + arch/arm/boot/dts/exynos5250-arndale.dts | 6 +- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 4 +- + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 4 +- + arch/arm/boot/dts/exynos5250-snow-rev5.dts | 2 +- + arch/arm/boot/dts/exynos5250-snow.dts | 2 +- + arch/arm/boot/dts/exynos5250-spring.dts | 2 +- + arch/arm/boot/dts/exynos5250.dtsi | 4 +- + arch/arm/boot/dts/exynos5410-odroidxu.dts | 18 +- + arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 28 +++ + arch/arm/boot/dts/exynos5410.dtsi | 4 + + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 4 +- + arch/arm/boot/dts/exynos5420-peach-pit.dts | 6 +- + arch/arm/boot/dts/exynos5420-smdk5420.dts | 2 +- + arch/arm/boot/dts/exynos5420.dtsi | 3 - + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 2 +- + arch/arm/boot/dts/exynos5422-odroidhc1.dts | 4 +- + arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi | 2 +- + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 4 +- + arch/arm/boot/dts/exynos5422-odroidxu3.dts | 26 ++- + 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/boot/dts/exynos5800-peach-pi.dts | 4 +- + arch/arm/boot/dts/s5pv210-aquila.dts | 12 +- + arch/arm/boot/dts/s5pv210-aries.dtsi | 4 +- + arch/arm/boot/dts/s5pv210-goni.dts | 14 +- + arch/arm/boot/dts/s5pv210-smdkv210.dts | 20 +-- + arch/arm/configs/exynos_defconfig | 1 + + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/mach-exynos/exynos.c | 4 +- + arch/arm/mach-exynos/platsmp.c | 2 +- + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 11 +- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 4 +- + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 2 +- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 2 +- + drivers/clk/samsung/clk-exynos-clkout.c | 198 +++++++++++++++------ + drivers/cpuidle/cpuidle-big_little.c | 3 +- + drivers/soc/samsung/exynos-pmu.c | 11 ++ + drivers/soc/samsung/exynos5422-asv.c | 2 +- + drivers/soc/samsung/s3c-pm-check.c | 2 +- + include/linux/serial_s3c.h | 2 +- + 66 files changed, 480 insertions(+), 262 deletions(-) +Merging scmi/for-linux-next (3cea11cd5e3b Linux 5.10-rc2) +$ git merge scmi/for-linux-next +Already up to date. +Merging sunxi/sunxi/for-next (2f098e04ce16 Merge branch 'sunxi/fixes-for-5.10' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging Documentation/devicetree/bindings/arm/sunxi.yaml +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/sunxi.yaml | 5 ++ + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/sun8i-h3-zeropi.dts | 85 ++++++++++++++++++++++++ + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 2 +- + 4 files changed, 92 insertions(+), 1 deletion(-) + create mode 100644 arch/arm/boot/dts/sun8i-h3-zeropi.dts +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 (3650b228f83a Linux 5.10-rc1) +$ 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 (afe14a3eb45d csky: Fixup show_regs doesn't contain regs->usp) +$ git merge csky/linux-next +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/ptrace.c | 5 +- + 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 +- + drivers/net/ethernet/stmicro/stmmac/Makefile | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-thead.c | 606 ++++++++++++++++++++++ + 22 files changed, 723 insertions(+), 54 deletions(-) + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-thead.c +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 (1fe9bacab2ac m68k: Remove unused mach_max_dma_address) +$ git merge m68k/for-next +Auto-merging arch/m68k/q40/config.c +Auto-merging arch/m68k/mvme16x/config.c +Auto-merging arch/m68k/mvme147/config.c +Auto-merging arch/m68k/mac/config.c +Auto-merging arch/m68k/kernel/setup_mm.c +Auto-merging arch/m68k/include/asm/machdep.h +Auto-merging arch/m68k/bvme6000/config.c +Auto-merging arch/m68k/atari/config.c +Auto-merging arch/m68k/apollo/config.c +Auto-merging arch/m68k/amiga/config.c +Merge made by the 'recursive' strategy. + arch/m68k/amiga/config.c | 8 -------- + arch/m68k/apollo/config.c | 1 - + arch/m68k/atari/config.c | 1 - + arch/m68k/bvme6000/config.c | 1 - + arch/m68k/hp300/config.c | 1 - + arch/m68k/include/asm/cmpxchg.h | 10 +++++----- + arch/m68k/include/asm/machdep.h | 1 - + arch/m68k/kernel/setup_mm.c | 1 - + arch/m68k/mac/config.c | 1 - + arch/m68k/mvme147/config.c | 1 - + arch/m68k/mvme16x/config.c | 1 - + arch/m68k/q40/config.c | 5 ----- + arch/m68k/sun3x/config.c | 2 -- + 13 files changed, 5 insertions(+), 29 deletions(-) +Merging m68knommu/for-next (ce93d1c29c02 m68k: m68328: remove duplicate code) +$ git merge m68knommu/for-next +Auto-merging arch/m68k/kernel/setup_no.c +Auto-merging arch/m68k/Kconfig.machine +Auto-merging arch/m68k/Kconfig.cpu +Removing arch/m68k/68000/m68VZ328.c +Removing arch/m68k/68000/m68EZ328.c +Merge made by the 'recursive' strategy. + arch/m68k/68000/Makefile | 9 +- + arch/m68k/68000/dragen2.c | 100 ++++++++++++++++++++ + arch/m68k/68000/m68328.c | 32 ++++--- + arch/m68k/68000/m68328.h | 5 + + arch/m68k/68000/m68EZ328.c | 77 --------------- + arch/m68k/68000/m68VZ328.c | 189 ------------------------------------- + arch/m68k/68000/ucsimm.c | 38 ++++++++ + arch/m68k/Kconfig.cpu | 8 +- + arch/m68k/Kconfig.machine | 16 ++-- + arch/m68k/kernel/setup_no.c | 9 ++ + arch/m68k/kernel/vmlinux-nommu.lds | 2 +- + 11 files changed, 192 insertions(+), 293 deletions(-) + create mode 100644 arch/m68k/68000/dragen2.c + create mode 100644 arch/m68k/68000/m68328.h + delete mode 100644 arch/m68k/68000/m68EZ328.c + delete mode 100644 arch/m68k/68000/m68VZ328.c + create mode 100644 arch/m68k/68000/ucsimm.c +Merging microblaze/next (4a17e8513376 microblaze: fix kbuild redundant file warning) +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (ab7cffb8d236 MIPS: ingenic: remove unused platform_data header file) +$ git merge mips/mips-next +Removing include/linux/platform_data/jz4740/jz4740_nand.h +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-firmware-lefi-boardinfo | 35 ++++++++++++++++ + arch/mips/include/asm/mach-loongson64/boot_param.h | 4 ++ + arch/mips/loongson64/Makefile | 1 + + arch/mips/loongson64/boardinfo.c | 48 ++++++++++++++++++++++ + arch/mips/loongson64/env.c | 10 +++++ + include/linux/platform_data/jz4740/jz4740_nand.h | 25 ----------- + 6 files changed, 98 insertions(+), 25 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-firmware-lefi-boardinfo + create mode 100644 arch/mips/loongson64/boardinfo.c + delete mode 100644 include/linux/platform_data/jz4740/jz4740_nand.h +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 +Auto-merging arch/parisc/kernel/time.c +CONFLICT (content): Merge conflict in arch/parisc/kernel/time.c +Resolved 'arch/parisc/kernel/time.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f29b055d2bb4] Merge remote-tracking branch 'parisc-hd/for-next' into master +$ git diff -M --stat --summary HEAD^.. + arch/parisc/include/asm/processor.h | 2 - + arch/parisc/kernel/irq.c | 7 +- + arch/parisc/kernel/processor.c | 5 +- + arch/parisc/kernel/time.c | 161 +++++++++++++++++++----------------- + 4 files changed, 90 insertions(+), 85 deletions(-) +$ git am -3 ../patches/0001-revert-the-rest-of-parisc-use-legacy_timer_tick.patch +Applying: revert the rest of "parisc: use legacy_timer_tick" +$ git reset HEAD^ +Unstaged changes after reset: +M Documentation/features/time/clockevents/arch-support.txt +M arch/parisc/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master c10ec0c021da] Merge remote-tracking branch 'parisc-hd/for-next' into master + Date: Thu Nov 5 09:40:28 2020 +1100 +Merging powerpc/next (3cea11cd5e3b Linux 5.10-rc2) +$ 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 206b46dfe610] 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 (97822baa4e8b 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 (e3f243e7ac2e Merge branch 'for-next-next-v5.10-20201104' into for-next-20201104) +$ git merge btrfs/for-next +Merge made by the 'recursive' strategy. + fs/btrfs/backref.c | 13 +- + fs/btrfs/block-group.c | 254 ++++++++++------------- + fs/btrfs/block-rsv.c | 11 +- + fs/btrfs/btrfs_inode.h | 13 +- + fs/btrfs/check-integrity.c | 8 +- + fs/btrfs/compression.c | 25 +-- + fs/btrfs/ctree.c | 94 ++------- + fs/btrfs/ctree.h | 43 +++- + fs/btrfs/delayed-inode.c | 11 - + fs/btrfs/dev-replace.c | 26 ++- + fs/btrfs/dir-item.c | 1 - + fs/btrfs/discard.c | 7 +- + fs/btrfs/discard.h | 3 +- + fs/btrfs/disk-io.c | 404 ++++++++++++++++++++---------------- + fs/btrfs/disk-io.h | 13 +- + fs/btrfs/export.c | 1 - + fs/btrfs/extent-io-tree.h | 17 +- + fs/btrfs/extent-tree.c | 87 ++------ + fs/btrfs/extent_io.c | 321 ++++++++++++++-------------- + fs/btrfs/extent_io.h | 31 +-- + fs/btrfs/file-item.c | 58 +++--- + fs/btrfs/file.c | 473 ++++++++++++++++++++++-------------------- + fs/btrfs/free-space-cache.c | 292 +++++++++++++++++--------- + fs/btrfs/free-space-cache.h | 9 +- + fs/btrfs/free-space-tree.c | 26 +-- + fs/btrfs/inode-item.c | 6 - + fs/btrfs/inode.c | 286 +++++++++---------------- + fs/btrfs/ioctl.c | 11 +- + fs/btrfs/locking.c | 444 ++++++--------------------------------- + fs/btrfs/locking.h | 13 +- + fs/btrfs/ordered-data.c | 24 +-- + fs/btrfs/ordered-data.h | 3 +- + fs/btrfs/print-tree.c | 14 +- + fs/btrfs/qgroup.c | 23 +- + fs/btrfs/reada.c | 2 + + fs/btrfs/ref-verify.c | 9 +- + fs/btrfs/reflink.c | 3 - + fs/btrfs/relocation.c | 18 +- + fs/btrfs/scrub.c | 56 ++--- + fs/btrfs/send.c | 6 +- + fs/btrfs/space-info.c | 274 +++++++++++++++++++----- + fs/btrfs/space-info.h | 3 + + fs/btrfs/super.c | 141 ++++++++----- + fs/btrfs/sysfs.c | 103 +++++++++ + fs/btrfs/tests/btrfs-tests.c | 2 +- + fs/btrfs/tests/qgroup-tests.c | 4 - + fs/btrfs/transaction.c | 96 ++++----- + fs/btrfs/transaction.h | 1 - + fs/btrfs/tree-checker.c | 6 +- + fs/btrfs/tree-defrag.c | 1 - + fs/btrfs/tree-log.c | 19 +- + fs/btrfs/uuid-tree.c | 3 +- + fs/btrfs/volumes.c | 53 +++-- + fs/btrfs/volumes.h | 13 ++ + include/trace/events/btrfs.h | 104 +++++++++- + 55 files changed, 2000 insertions(+), 1982 deletions(-) +Merging ceph/master (62575e270f66 ceph: check session state after bumping session->s_seq) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + fs/ceph/caps.c | 2 +- + fs/ceph/mds_client.c | 50 +++++++++++++++++++++++++++++++++++--------------- + fs/ceph/mds_client.h | 1 + + fs/ceph/quota.c | 2 +- + fs/ceph/snap.c | 2 +- + 5 files changed, 39 insertions(+), 18 deletions(-) +Merging cifs/for-next (3cea11cd5e3b Linux 5.10-rc2) +$ 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 (11c514a99bb9 quota: Sanity-check quota file headers on load) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/ext2/super.c | 2 +- + fs/quota/quota_tree.c | 8 ++++---- + fs/quota/quota_v2.c | 19 +++++++++++++++++++ + include/linux/quota.h | 15 ++++++++------- + 4 files changed, 32 insertions(+), 12 deletions(-) +Merging ext4/dev (00c69f98e83d ext4: use IS_ERR() for error checking of path) +$ git merge ext4/dev +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/ext4.h +Merge made by the 'recursive' strategy. +Merging f2fs/dev (aabe197f7422 f2fs: add F2FS_IOC_SET_COMPRESS_OPTION ioctl) +$ git merge f2fs/dev +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + fs/f2fs/compress.c | 5 +++ + fs/f2fs/f2fs.h | 84 +++------------------------------------ + fs/f2fs/file.c | 96 +++++++++++++++++++++++++++++++++++++++++++-- + fs/f2fs/node.c | 2 +- + include/trace/events/f2fs.h | 1 + + include/uapi/linux/f2fs.h | 96 +++++++++++++++++++++++++++++++++++++++++++++ + 7 files changed, 202 insertions(+), 83 deletions(-) + create mode 100644 include/uapi/linux/f2fs.h +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 (3cea11cd5e3b Linux 5.10-rc2) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (7302e49ff190 NFS: Remove unnecessary inode lock in nfs_fsync_dir()) +$ git merge nfs-anna/linux-next +Merge made by the 'recursive' strategy. + fs/nfs/dir.c | 15 +++++---------- + fs/nfs/nfs42xattr.c | 2 ++ + fs/nfs/nfs42xdr.c | 4 ++-- + fs/nfs/nfsroot.c | 6 ++++++ + 4 files changed, 15 insertions(+), 12 deletions(-) +Merging nfsd/nfsd-next (856deb866d16 Linux 5.9-rc5) +$ git merge nfsd/nfsd-next +Already up to date. +Merging cel/cel-next (a826e2b2dd61 NFSD: A semicolon is not needed after a switch statement.) +$ git merge cel/cel-next +Merge made by the 'recursive' strategy. + fs/nfsd/nfs3proc.c | 6 +- + fs/nfsd/nfs3xdr.c | 7 + + fs/nfsd/nfs4xdr.c | 45 ++- + fs/nfsd/nfsxdr.c | 6 + + include/linux/sunrpc/svc.h | 6 +- + include/linux/sunrpc/svc_rdma.h | 36 +- + include/linux/sunrpc/svc_rdma_pcl.h | 128 ++++++ + include/linux/sunrpc/svc_xprt.h | 4 +- + include/linux/sunrpc/xdr.h | 3 +- + include/trace/events/rpcrdma.h | 143 ++++--- + include/trace/events/sunrpc.h | 8 +- + net/sunrpc/socklib.c | 5 +- + net/sunrpc/svc.c | 11 +- + net/sunrpc/svcsock.c | 9 +- + net/sunrpc/xdr.c | 5 +- + net/sunrpc/xprtrdma/Makefile | 2 +- + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 14 +- + net/sunrpc/xprtrdma/svc_rdma_pcl.c | 306 +++++++++++++++ + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 314 ++++++++------- + net/sunrpc/xprtrdma/svc_rdma_rw.c | 598 +++++++++++++++++++++-------- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 561 ++++++++++++++------------- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 2 +- + net/sunrpc/xprtsock.c | 1 + + 23 files changed, 1535 insertions(+), 685 deletions(-) + create mode 100644 include/linux/sunrpc/svc_rdma_pcl.h + create mode 100644 net/sunrpc/xprtrdma/svc_rdma_pcl.c +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 (c1f6b1ac0075 xfs: fix scrub flagging rtinherit even if there is no rt device) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/iomap/buffered-io.c | 30 ++++++++++-------------------- + fs/xfs/libxfs/xfs_alloc.c | 1 + + fs/xfs/libxfs/xfs_bmap.h | 2 +- + fs/xfs/scrub/inode.c | 3 +-- + fs/xfs/xfs_aops.c | 20 ++++++++++++-------- + fs/xfs/xfs_iops.c | 10 ++++++++++ + include/linux/iomap.h | 2 +- + 7 files changed, 36 insertions(+), 32 deletions(-) +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 +$ 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 +$ git reset HEAD^ +Unstaged changes after reset: +M arch/sparc/lib/memset.S +$ git add -A . +$ git commit -v -a --amend +[master 7190fe64713d] Merge remote-tracking branch 'vfs/for-next' into master + Date: Thu Nov 5 10:06:22 2020 +1100 +Merging printk/for-next (de6e7a24979b Merge branch 'for-5.10-trivial' into for-next) +$ git merge printk/for-next +Merge made by the 'recursive' strategy. + init/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 fd21ab6a79db] Merge remote-tracking branch 'pstore/for-next/pstore' into master +$ git diff -M --stat --summary HEAD^.. +Merging hid/for-next (d0a19d03cbb8 Merge branch 'for-5.11/amd-sfh-hid' into for-next) +$ git merge hid/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/hid/amd-sfh-hid.rst | 145 +++++ + Documentation/hid/index.rst | 1 + + MAINTAINERS | 8 + + drivers/hid/Kconfig | 2 + + drivers/hid/Makefile | 2 + + drivers/hid/amd-sfh-hid/Kconfig | 18 + + drivers/hid/amd-sfh-hid/Makefile | 13 + + drivers/hid/amd-sfh-hid/amd_sfh_client.c | 246 ++++++++ + drivers/hid/amd-sfh-hid/amd_sfh_hid.c | 174 ++++++ + drivers/hid/amd-sfh-hid/amd_sfh_hid.h | 67 +++ + drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 152 +++++ + drivers/hid/amd-sfh-hid/amd_sfh_pcie.h | 79 +++ + .../amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.c | 224 +++++++ + .../amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.h | 107 ++++ + .../hid_descriptor/amd_sfh_hid_report_desc.h | 645 +++++++++++++++++++++ + drivers/hid/hid-asus.c | 123 +++- + drivers/hid/hid-cypress.c | 44 +- + drivers/hid/hid-ids.h | 5 + + drivers/hid/hid-input.c | 5 +- + drivers/hid/hid-ite.c | 61 +- + drivers/hid/hid-logitech-hidpp.c | 1 + + drivers/hid/hid-quirks.c | 1 + + drivers/hid/hid-uclogic-core.c | 2 + + drivers/hid/hid-uclogic-params.c | 2 + + drivers/hid/i2c-hid/i2c-hid-core.c | 14 +- + include/linux/hid.h | 1 + + 26 files changed, 2120 insertions(+), 22 deletions(-) + create mode 100644 Documentation/hid/amd-sfh-hid.rst + create mode 100644 drivers/hid/amd-sfh-hid/Kconfig + create mode 100644 drivers/hid/amd-sfh-hid/Makefile + create mode 100644 drivers/hid/amd-sfh-hid/amd_sfh_client.c + create mode 100644 drivers/hid/amd-sfh-hid/amd_sfh_hid.c + create mode 100644 drivers/hid/amd-sfh-hid/amd_sfh_hid.h + create mode 100644 drivers/hid/amd-sfh-hid/amd_sfh_pcie.c + create mode 100644 drivers/hid/amd-sfh-hid/amd_sfh_pcie.h + create mode 100644 drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.c + create mode 100644 drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.h + create mode 100644 drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_report_desc.h +Merging i2c/i2c/for-next (47480e8745ac Merge branch 'i2c/for-current' into i2c/for-next) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + drivers/i2c/busses/i2c-at91-master.c | 1 - + drivers/i2c/busses/i2c-at91.h | 2 - + drivers/i2c/busses/i2c-exynos5.c | 5 +-- + drivers/i2c/busses/i2c-mt65xx.c | 8 ++-- + drivers/i2c/busses/i2c-ocores.c | 23 ++++++----- + drivers/i2c/busses/i2c-owl.c | 74 +++++++++++++++++++++++++++--------- + 6 files changed, 71 insertions(+), 42 deletions(-) +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 (3cb4d29a2633 MAINTAINERS: The DMI/SMBIOS tree has moved) +$ git merge dmi/dmi-for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/firmware/dmi-id.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging hwmon-staging/hwmon-next (ce15cd2cee8b hwmon: add Corsair PSU HID controller driver) +$ git merge hwmon-staging/hwmon-next +Auto-merging MAINTAINERS +Auto-merging Documentation/hwmon/index.rst +Merge made by the 'recursive' strategy. + Documentation/hwmon/corsair-psu.rst | 82 +++++ + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/pmbus-core.rst | 6 - + Documentation/hwmon/pmbus.rst | 6 - + MAINTAINERS | 7 + + drivers/hwmon/Kconfig | 13 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/acpi_power_meter.c | 9 +- + drivers/hwmon/adt7470.c | 154 ++++++--- + drivers/hwmon/corsair-psu.c | 605 ++++++++++++++++++++++++++++++++++++ + drivers/hwmon/pmbus/adm1266.c | 1 - + drivers/hwmon/pmbus/adm1275.c | 1 - + drivers/hwmon/pmbus/bel-pfe.c | 1 - + drivers/hwmon/pmbus/ibm-cffps.c | 1 - + drivers/hwmon/pmbus/inspur-ipsps.c | 1 - + drivers/hwmon/pmbus/ir35221.c | 1 - + drivers/hwmon/pmbus/ir38064.c | 1 - + drivers/hwmon/pmbus/irps5401.c | 1 - + drivers/hwmon/pmbus/isl68137.c | 1 - + drivers/hwmon/pmbus/lm25066.c | 1 - + drivers/hwmon/pmbus/ltc2978.c | 1 - + drivers/hwmon/pmbus/ltc3815.c | 1 - + drivers/hwmon/pmbus/max16064.c | 1 - + drivers/hwmon/pmbus/max16601.c | 1 - + drivers/hwmon/pmbus/max20730.c | 3 - + drivers/hwmon/pmbus/max20751.c | 1 - + drivers/hwmon/pmbus/max31785.c | 1 - + drivers/hwmon/pmbus/max34440.c | 1 - + drivers/hwmon/pmbus/max8688.c | 1 - + drivers/hwmon/pmbus/mp2975.c | 1 - + drivers/hwmon/pmbus/pmbus.c | 1 - + drivers/hwmon/pmbus/pmbus.h | 1 - + drivers/hwmon/pmbus/pmbus_core.c | 20 +- + drivers/hwmon/pmbus/pxe1610.c | 1 - + drivers/hwmon/pmbus/tps40422.c | 1 - + drivers/hwmon/pmbus/tps53679.c | 1 - + drivers/hwmon/pmbus/ucd9000.c | 1 - + drivers/hwmon/pmbus/ucd9200.c | 1 - + drivers/hwmon/pmbus/xdpe12284.c | 1 - + drivers/hwmon/pmbus/zl6100.c | 1 - + 40 files changed, 840 insertions(+), 95 deletions(-) + create mode 100644 Documentation/hwmon/corsair-psu.rst + create mode 100644 drivers/hwmon/corsair-psu.c +Merging jc_docs/docs-next (6fee9372e0af Merge branch 'mauro-warnings' into docs-next) +$ git merge jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (dfe3d19bd092 Merge tag 'v5.10-rc1' into patchwork) +$ git merge v4l-dvb/master +Auto-merging include/linux/refcount.h +Merge made by the 'recursive' strategy. + include/linux/refcount.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging v4l-dvb-next/master (d0a9fffedca1 docs: fs: api-summary.rst: get rid of kernel-doc include) +$ git merge v4l-dvb-next/master +Auto-merging scripts/kernel-doc +Auto-merging include/linux/refcount.h +Auto-merging MAINTAINERS +Auto-merging Documentation/hwmon/index.rst +Auto-merging Documentation/dev-tools/kasan.rst +Auto-merging Documentation/conf.py +Merge made by the 'recursive' strategy. +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 (dddc237beebb Merge branch 'pm-cpufreq-next' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + Documentation/admin-guide/pm/cpuidle.rst | 4 +-- + drivers/base/core.c | 6 ++-- + drivers/base/dd.c | 9 ++--- + drivers/base/power/runtime.c | 57 +++++++++++--------------------- + drivers/cpufreq/cpufreq.c | 10 +++--- + drivers/opp/core.c | 9 ++--- + drivers/opp/of.c | 2 ++ + drivers/powercap/intel_rapl_common.c | 2 +- + include/linux/cpufreq.h | 5 --- + include/linux/pm_runtime.h | 6 ++-- + kernel/sched/cpufreq_schedutil.c | 22 ++++++------ + 11 files changed, 54 insertions(+), 78 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (a43128837003 cpufreq: mediatek: add missing platform_driver_unregister() on error in mtk_cpufreq_driver_init) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Merge made by the 'recursive' strategy. + drivers/cpufreq/cpufreq-dt-platdev.c | 2 ++ + drivers/cpufreq/mediatek-cpufreq.c | 2 ++ + drivers/cpufreq/sti-cpufreq.c | 7 +++- + drivers/cpufreq/tegra194-cpufreq.c | 62 ++++++++++++++++++++++++++++++------ + 4 files changed, 63 insertions(+), 10 deletions(-) +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 +Auto-merging Documentation/ABI/testing/sysfs-class-devfreq +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 (b0756034202a opp: Don't return opp_dev from _find_opp_dev()) +$ git merge opp/opp/linux-next +Merge made by the 'recursive' strategy. + drivers/opp/core.c | 89 ++++++++++++++++++++++++++++++++++-------------------- + 1 file changed, 57 insertions(+), 32 deletions(-) +Merging thermal/thermal/linux-next (703456ba76e9 thermal: mtk_thermal: make device_reset optional) +$ git merge thermal/thermal/linux-next +Merge made by the 'recursive' strategy. + .../bindings/thermal/mediatek-thermal.txt | 3 +- + drivers/thermal/gov_power_allocator.c | 40 ++++++++- + drivers/thermal/mtk_thermal.c | 2 +- + drivers/thermal/rcar_thermal.c | 5 +- + drivers/thermal/thermal_core.c | 97 +--------------------- + drivers/thermal/thermal_core.h | 6 -- + 6 files changed, 46 insertions(+), 107 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 (fc0021aa340a swiotlb: remove the tbl_dma_addr argument to swiotlb_tbl_map_single) +$ git merge swiotlb/linux-next +Merge made by the 'recursive' strategy. + drivers/iommu/intel/iommu.c | 5 ++--- + drivers/xen/swiotlb-xen.c | 3 +-- + include/linux/swiotlb.h | 10 +++------- + kernel/dma/swiotlb.c | 22 +++++++++++----------- + 4 files changed, 17 insertions(+), 23 deletions(-) +Merging rdma/for-next (32053e584e4a RDMA/hns: Add support for filling GMV table) +$ git merge rdma/for-next +Auto-merging drivers/infiniband/ulp/rtrs/rtrs-clt.c +Auto-merging drivers/infiniband/sw/siw/siw_main.c +Auto-merging drivers/infiniband/sw/rxe/rxe_verbs.c +Auto-merging drivers/infiniband/sw/rdmavt/vt.c +Auto-merging drivers/infiniband/hw/mlx5/main.c +Merge made by the 'recursive' strategy. + drivers/infiniband/core/device.c | 33 ++++ + drivers/infiniband/core/sysfs.c | 47 +++-- + drivers/infiniband/core/ucma.c | 2 +- + drivers/infiniband/core/user_mad.c | 4 +- + drivers/infiniband/core/uverbs_cmd.c | 26 ++- + drivers/infiniband/core/uverbs_main.c | 4 +- + drivers/infiniband/core/uverbs_uapi.c | 5 +- + drivers/infiniband/core/verbs.c | 9 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 15 +- + drivers/infiniband/hw/bnxt_re/main.c | 34 +--- + drivers/infiniband/hw/cxgb4/cq.c | 2 +- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 2 - + drivers/infiniband/hw/cxgb4/mem.c | 84 -------- + drivers/infiniband/hw/cxgb4/provider.c | 35 +--- + drivers/infiniband/hw/cxgb4/qp.c | 8 +- + drivers/infiniband/hw/efa/efa_main.c | 22 +-- + drivers/infiniband/hw/efa/efa_verbs.c | 6 + + drivers/infiniband/hw/hfi1/sysfs.c | 16 +- + drivers/infiniband/hw/hns/hns_roce_cq.c | 3 + + drivers/infiniband/hw/hns/hns_roce_device.h | 14 +- + drivers/infiniband/hw/hns/hns_roce_hem.c | 15 ++ + drivers/infiniband/hw/hns/hns_roce_hem.h | 1 + + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 9 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 253 +++++++++++++++++++------ + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 60 +++++- + drivers/infiniband/hw/hns/hns_roce_main.c | 61 +++--- + drivers/infiniband/hw/hns/hns_roce_qp.c | 17 +- + drivers/infiniband/hw/hns/hns_roce_srq.c | 4 + + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 35 +--- + drivers/infiniband/hw/mlx4/main.c | 59 +----- + drivers/infiniband/hw/mlx4/qp.c | 5 +- + drivers/infiniband/hw/mlx4/srq.c | 4 + + drivers/infiniband/hw/mlx4/sysfs.c | 30 +-- + drivers/infiniband/hw/mlx5/main.c | 67 +------ + drivers/infiniband/hw/mlx5/qp.c | 10 +- + drivers/infiniband/hw/mlx5/srq.c | 5 + + drivers/infiniband/hw/mthca/mthca_provider.c | 42 +--- + drivers/infiniband/hw/mthca/mthca_qp.c | 3 + + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 42 +--- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 11 +- + drivers/infiniband/hw/qedr/main.c | 38 +--- + drivers/infiniband/hw/qedr/verbs.c | 13 ++ + drivers/infiniband/hw/qib/qib_sysfs.c | 30 +-- + drivers/infiniband/hw/usnic/usnic_ib_main.c | 19 -- + drivers/infiniband/hw/usnic/usnic_ib_sysfs.c | 15 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 7 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c | 3 + + drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 34 +--- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c | 5 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c | 2 +- + drivers/infiniband/sw/rdmavt/ah.c | 1 - + drivers/infiniband/sw/rdmavt/cq.c | 2 +- + drivers/infiniband/sw/rdmavt/qp.c | 10 +- + drivers/infiniband/sw/rdmavt/vt.c | 28 +-- + drivers/infiniband/sw/rxe/rxe_mr.c | 1 - + drivers/infiniband/sw/rxe/rxe_req.c | 3 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 47 ++--- + drivers/infiniband/sw/rxe/rxe_verbs.h | 1 - + drivers/infiniband/sw/siw/siw_main.c | 24 --- + drivers/infiniband/sw/siw/siw_verbs.c | 12 ++ + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 4 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 7 +- + drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 2 +- + drivers/infiniband/ulp/isert/ib_isert.c | 27 ++- + drivers/infiniband/ulp/isert/ib_isert.h | 6 + + drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c | 44 ++--- + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 74 ++++---- + drivers/infiniband/ulp/rtrs/rtrs-clt.h | 1 + + drivers/infiniband/ulp/rtrs/rtrs-pri.h | 3 +- + drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c | 12 +- + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 119 +++++------- + drivers/infiniband/ulp/rtrs/rtrs-srv.h | 2 +- + drivers/infiniband/ulp/rtrs/rtrs.c | 61 +++--- + drivers/infiniband/ulp/srp/ib_srp.c | 40 ++-- + include/rdma/ib_verbs.h | 5 +- + include/rdma/uverbs_ioctl.h | 15 +- + include/uapi/rdma/ib_user_verbs.h | 14 -- + 77 files changed, 832 insertions(+), 1003 deletions(-) +Merging net-next/master (3fb6928b56f6 net: ipa: restrict special reset to IPA v3.5.1) +$ git merge net-next/master +Auto-merging net/smc/smc_clc.h +Auto-merging net/ipv6/ip6_tunnel.c +Auto-merging lib/Kconfig.debug +Removing drivers/net/wimax/Makefile +Removing drivers/net/wimax/Kconfig +Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +Auto-merging drivers/net/ethernet/ibm/ibmvnic.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/ibm/ibmvnic.c +Auto-merging drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +Auto-merging drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c +Auto-merging drivers/net/ethernet/cadence/macb_main.c +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/index.rst +Resolved 'drivers/net/ethernet/ibm/ibmvnic.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 21b8dbf804ce] Merge remote-tracking branch 'net-next/master' into master +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/index.rst | 1 - + .../devicetree/bindings/net/ftgmac100.txt | 25 + + Documentation/networking/ip-sysctl.rst | 31 + + Documentation/networking/kapi.rst | 21 - + .../translations/zh_CN/admin-guide/index.rst | 1 - + MAINTAINERS | 22 - + drivers/crypto/caam/qi.c | 15 +- + drivers/net/Kconfig | 2 - + drivers/net/Makefile | 1 - + drivers/net/bonding/bond_main.c | 11 +- + drivers/net/dsa/mt7530.c | 2 +- + drivers/net/dsa/mv88e6xxx/chip.c | 1 + + drivers/net/dsa/ocelot/felix.c | 27 +- + drivers/net/dummy.c | 2 +- + drivers/net/ethernet/8390/mac8390.c | 7 - + drivers/net/ethernet/8390/ne.c | 2 +- + drivers/net/ethernet/8390/ne2k-pci.c | 2 +- + drivers/net/ethernet/cadence/macb.h | 44 ++ + drivers/net/ethernet/cadence/macb_main.c | 128 ++- + .../net/ethernet/cavium/liquidio/cn68xx_device.c | 1 - + .../ethernet/chelsio/inline_crypto/chtls/chtls.h | 1 + + .../chelsio/inline_crypto/chtls/chtls_cm.c | 3 +- + drivers/net/ethernet/davicom/Kconfig | 2 +- + drivers/net/ethernet/davicom/dm9000.c | 9 +- + drivers/net/ethernet/dec/tulip/de2104x.c | 10 + + drivers/net/ethernet/dec/tulip/tulip_core.c | 4 + + drivers/net/ethernet/faraday/ftgmac100.c | 122 +-- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 24 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 1 - + drivers/net/ethernet/ibm/ibmvnic.c | 148 ++-- + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 13 +- + drivers/net/ethernet/marvell/octeontx2/af/cgx.h | 5 + + drivers/net/ethernet/marvell/octeontx2/af/common.h | 10 +- + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 19 +- + .../ethernet/marvell/octeontx2/af/npc_profile.h | 2 +- + drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 361 +++++++-- + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 26 +- + .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 15 + + .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 223 ++++-- + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 199 +++-- + .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 328 ++++++-- + .../net/ethernet/marvell/octeontx2/af/rvu_reg.c | 2 +- + .../net/ethernet/marvell/octeontx2/af/rvu_reg.h | 87 ++- + .../net/ethernet/marvell/octeontx2/af/rvu_struct.h | 6 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 10 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 2 + + .../net/ethernet/mellanox/mlx4/resource_tracker.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 83 ++ + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 120 ++- + .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 11 + + drivers/net/ethernet/microchip/lan743x_ethtool.c | 9 +- + drivers/net/ethernet/microchip/lan743x_main.c | 3 +- + drivers/net/ethernet/mscc/ocelot.c | 294 ++++--- + drivers/net/ethernet/mscc/ocelot.h | 31 +- + drivers/net/ethernet/mscc/ocelot_net.c | 38 +- + drivers/net/ethernet/neterion/s2io.c | 41 +- + drivers/net/ethernet/neterion/s2io.h | 4 +- + drivers/net/ethernet/neterion/vxge/vxge-config.c | 2 +- + drivers/net/ethernet/nvidia/forcedeth.c | 9 +- + drivers/net/ethernet/realtek/r8169_main.c | 62 +- + drivers/net/ethernet/sfc/bitfield.h | 42 +- + drivers/net/ethernet/sfc/ef100_nic.c | 17 +- + drivers/net/ethernet/sfc/ef100_tx.c | 58 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 1 + + .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 2 + + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 24 + + drivers/net/ethernet/stmicro/stmmac/hwif.h | 3 + + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 + + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 31 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 355 +++++---- + drivers/net/ethernet/ti/am65-cpsw-nuss.h | 5 + + drivers/net/ethernet/ti/cpsw_ale.c | 41 +- + drivers/net/ethernet/ti/cpsw_ale.h | 1 + + drivers/net/ethernet/ti/cpsw_switchdev.c | 2 +- + drivers/net/ethernet/ti/tlan.c | 98 ++- + drivers/net/ethernet/xilinx/xilinx_axienet.h | 3 + + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 94 ++- + drivers/net/fddi/skfp/drvfbi.c | 4 - + drivers/net/fddi/skfp/ecm.c | 7 +- + drivers/net/fddi/skfp/ess.c | 1 - + drivers/net/fddi/skfp/hwt.c | 4 - + drivers/net/fddi/skfp/pcmplc.c | 4 - + drivers/net/fddi/skfp/pmf.c | 4 - + drivers/net/fddi/skfp/queue.c | 4 - + drivers/net/fddi/skfp/rmt.c | 4 - + drivers/net/fddi/skfp/smtdef.c | 4 - + drivers/net/fddi/skfp/smtinit.c | 4 - + drivers/net/fddi/skfp/smttimer.c | 4 - + drivers/net/fddi/skfp/srf.c | 5 - + drivers/net/hamradio/hdlcdrv.c | 2 +- + drivers/net/ieee802154/ca8210.c | 22 +- + drivers/net/ifb.c | 3 +- + drivers/net/ipa/ipa_data-sc7180.c | 4 + + drivers/net/ipa/ipa_data-sdm845.c | 4 + + drivers/net/ipa/ipa_data.h | 12 +- + drivers/net/ipa/ipa_endpoint.c | 13 +- + drivers/net/ipa/ipa_main.c | 121 +-- + drivers/net/ipa/ipa_mem.c | 2 +- + drivers/net/ipa/ipa_reg.h | 48 +- + drivers/net/macsec.c | 1 + + drivers/net/macvlan.c | 2 +- + drivers/net/mii.c | 20 +- + drivers/net/net_failover.c | 2 +- + drivers/net/netconsole.c | 1 + + drivers/net/phy/marvell.c | 102 ++- + drivers/net/phy/phy_led_triggers.c | 16 +- + drivers/net/phy/phylink.c | 3 +- + drivers/net/phy/realtek.c | 40 + + drivers/net/team/team.c | 9 +- + drivers/net/usb/lan78xx.c | 168 ++-- + drivers/net/usb/r8152.c | 10 +- + drivers/net/vxlan.c | 15 +- + drivers/net/wan/hdlc_fr.c | 118 +-- + drivers/net/wan/lmc/lmc_main.c | 9 +- + drivers/net/wimax/Kconfig | 18 - + drivers/net/wimax/Makefile | 2 - + drivers/net/xen-netfront.c | 3 +- + drivers/soc/fsl/qbman/qman.c | 12 +- + drivers/soc/fsl/qbman/qman_test_api.c | 6 +- + drivers/soc/fsl/qbman/qman_test_stash.c | 6 +- + drivers/staging/Kconfig | 2 + + drivers/staging/Makefile | 1 + + .../staging/wimax/Documentation}/i2400m.rst | 0 + .../staging/wimax/Documentation}/index.rst | 0 + .../staging/wimax/Documentation}/wimax.rst | 0 + {net => drivers/staging}/wimax/Kconfig | 6 + + {net => drivers/staging}/wimax/Makefile | 2 + + drivers/staging/wimax/TODO | 18 + + {net => drivers/staging}/wimax/debug-levels.h | 2 +- + {net => drivers/staging}/wimax/debugfs.c | 2 +- + drivers/{net => staging}/wimax/i2400m/Kconfig | 0 + drivers/{net => staging}/wimax/i2400m/Makefile | 0 + drivers/{net => staging}/wimax/i2400m/control.c | 2 +- + .../{net => staging}/wimax/i2400m/debug-levels.h | 2 +- + drivers/{net => staging}/wimax/i2400m/debugfs.c | 0 + drivers/{net => staging}/wimax/i2400m/driver.c | 2 +- + drivers/{net => staging}/wimax/i2400m/fw.c | 0 + drivers/{net => staging}/wimax/i2400m/i2400m-usb.h | 0 + drivers/{net => staging}/wimax/i2400m/i2400m.h | 4 +- + .../staging/wimax/i2400m/linux-wimax-i2400m.h | 0 + drivers/{net => staging}/wimax/i2400m/netdev.c | 0 + drivers/{net => staging}/wimax/i2400m/op-rfkill.c | 2 +- + drivers/{net => staging}/wimax/i2400m/rx.c | 0 + drivers/{net => staging}/wimax/i2400m/sysfs.c | 0 + drivers/{net => staging}/wimax/i2400m/tx.c | 0 + .../wimax/i2400m/usb-debug-levels.h | 2 +- + drivers/{net => staging}/wimax/i2400m/usb-fw.c | 0 + drivers/{net => staging}/wimax/i2400m/usb-notif.c | 0 + drivers/{net => staging}/wimax/i2400m/usb-rx.c | 0 + drivers/{net => staging}/wimax/i2400m/usb-tx.c | 0 + drivers/{net => staging}/wimax/i2400m/usb.c | 2 +- + {net => drivers/staging}/wimax/id-table.c | 2 +- + .../staging/wimax/linux-wimax-debug.h | 2 +- + .../wimax.h => drivers/staging/wimax/linux-wimax.h | 0 + .../wimax.h => drivers/staging/wimax/net-wimax.h | 2 +- + {net => drivers/staging}/wimax/op-msg.c | 2 +- + {net => drivers/staging}/wimax/op-reset.c | 4 +- + {net => drivers/staging}/wimax/op-rfkill.c | 4 +- + {net => drivers/staging}/wimax/op-state-get.c | 4 +- + {net => drivers/staging}/wimax/stack.c | 29 +- + {net => drivers/staging}/wimax/wimax-internal.h | 2 +- + include/linux/if_bridge.h | 1 + + include/linux/marvell_phy.h | 3 + + include/linux/netdev_features.h | 4 +- + include/linux/netdevice.h | 26 + + include/linux/sctp.h | 20 + + include/linux/skbuff.h | 33 + + include/net/dst.h | 12 +- + include/net/netns/sctp.h | 8 + + include/net/sctp/constants.h | 2 + + include/net/sctp/sctp.h | 9 +- + include/net/sctp/sm.h | 4 + + include/net/sctp/structs.h | 14 +- + include/net/tcp.h | 2 +- + include/soc/fsl/qman.h | 3 +- + include/soc/mscc/ocelot.h | 18 +- + include/uapi/linux/cfm_bridge.h | 64 ++ + include/uapi/linux/if_bridge.h | 126 +++ + include/uapi/linux/if_ether.h | 1 + + include/uapi/linux/rtnetlink.h | 2 + + include/uapi/linux/sctp.h | 7 + + kernel/kcov.c | 2 + + lib/Kconfig.debug | 1 + + net/9p/client.c | 6 +- + net/9p/trans_common.c | 4 +- + net/9p/trans_fd.c | 4 +- + net/9p/trans_rdma.c | 2 + + net/9p/trans_virtio.c | 9 +- + net/Kconfig | 2 - + net/Makefile | 1 - + net/appletalk/aarp.c | 18 +- + net/appletalk/ddp.c | 7 +- + net/bridge/Kconfig | 11 + + net/bridge/Makefile | 2 + + net/bridge/br_cfm.c | 867 +++++++++++++++++++++ + net/bridge/br_cfm_netlink.c | 726 +++++++++++++++++ + net/bridge/br_device.c | 6 +- + net/bridge/br_if.c | 1 + + net/bridge/br_input.c | 35 +- + net/bridge/br_mdb.c | 30 +- + net/bridge/br_mrp.c | 19 +- + net/bridge/br_multicast.c | 13 +- + net/bridge/br_netlink.c | 115 ++- + net/bridge/br_private.h | 90 ++- + net/bridge/br_private_cfm.h | 147 ++++ + net/core/dev.c | 4 +- + net/core/dev_ioctl.c | 2 +- + net/core/skbuff.c | 11 + + net/dcb/dcbnl.c | 16 +- + net/dccp/ackvec.c | 5 + + net/dccp/ccid.c | 2 +- + net/dccp/ccids/ccid2.c | 5 + + net/dccp/ccids/ccid3.c | 6 + + net/dccp/ccids/lib/loss_interval.c | 3 + + net/dccp/ccids/lib/packet_history.c | 3 + + net/dccp/feat.c | 6 + + net/dccp/output.c | 9 + + net/dccp/qpolicy.c | 6 +- + net/dsa/slave.c | 45 ++ + net/dsa/tag_ar9331.c | 3 - + net/dsa/tag_brcm.c | 3 - + net/dsa/tag_dsa.c | 5 - + net/dsa/tag_edsa.c | 4 - + net/dsa/tag_gswip.c | 5 - + net/dsa/tag_ksz.c | 73 +- + net/dsa/tag_lan9303.c | 9 - + net/dsa/tag_mtk.c | 3 - + net/dsa/tag_ocelot.c | 7 - + net/dsa/tag_qca.c | 3 - + net/dsa/tag_trailer.c | 31 +- + net/ethtool/ioctl.c | 2 +- + net/ipv4/tcp_input.c | 9 +- + net/ipv4/tcp_lp.c | 7 + + net/ipv4/tcp_recovery.c | 3 +- + net/ipv4/udp.c | 2 +- + net/ipv4/udp_offload.c | 3 + + net/ipv6/addrconf.c | 1 + + net/ipv6/calipso.c | 4 +- + net/ipv6/ip6_tunnel.c | 15 +- + net/ipv6/ip6_vti.c | 1 + + net/ipv6/mcast.c | 2 +- + net/ipv6/rpl.c | 2 +- + net/ipv6/rpl_iptunnel.c | 2 +- + net/ipv6/udp.c | 2 +- + net/ipv6/udp_offload.c | 8 +- + net/l3mdev/l3mdev.c | 1 + + net/llc/llc_conn.c | 2 + + net/mac80211/iface.c | 2 + + net/mac80211/rx.c | 16 +- + net/mpls/af_mpls.c | 2 + + net/netlabel/netlabel_calipso.c | 1 + + net/nfc/core.c | 10 +- + net/nfc/digital_core.c | 3 + + net/nfc/nci/core.c | 2 + + net/openvswitch/flow.c | 4 + + net/openvswitch/meter.c | 2 +- + net/openvswitch/vport.c | 4 +- + net/sched/cls_api.c | 16 +- + net/sctp/Kconfig | 1 + + net/sctp/associola.c | 4 + + net/sctp/ipv6.c | 44 +- + net/sctp/offload.c | 6 +- + net/sctp/output.c | 22 +- + net/sctp/protocol.c | 143 +++- + net/sctp/sm_make_chunk.c | 21 + + net/sctp/sm_statefuns.c | 52 ++ + net/sctp/socket.c | 116 +++ + net/sctp/sysctl.c | 62 ++ + net/smc/af_smc.c | 61 +- + net/smc/smc_clc.h | 5 + + net/smc/smc_core.h | 1 + + net/tipc/core.c | 2 - + net/tipc/core.h | 3 - + net/tipc/link.c | 2 +- + net/tipc/name_distr.c | 19 - + net/tipc/netlink_compat.c | 5 +- + net/tipc/node.c | 2 +- + net/tipc/socket.c | 27 +- + net/tipc/socket.h | 2 +- + net/tipc/topsrv.c | 4 +- + net/vmw_vsock/af_vsock.c | 3 +- + tools/testing/selftests/net/Makefile | 1 + + tools/testing/selftests/net/bareudp.sh | 538 +++++++++++++ + tools/testing/selftests/net/config | 7 + + .../selftests/net/forwarding/bridge_igmp.sh | 532 ++++++++++++- + tools/testing/selftests/net/timestamping.c | 47 +- + 287 files changed, 7184 insertions(+), 1832 deletions(-) + delete mode 100644 drivers/net/wimax/Kconfig + delete mode 100644 drivers/net/wimax/Makefile + rename {Documentation/admin-guide/wimax => drivers/staging/wimax/Documentation}/i2400m.rst (100%) + rename {Documentation/admin-guide/wimax => drivers/staging/wimax/Documentation}/index.rst (100%) + rename {Documentation/admin-guide/wimax => drivers/staging/wimax/Documentation}/wimax.rst (100%) + rename {net => drivers/staging}/wimax/Kconfig (94%) + rename {net => drivers/staging}/wimax/Makefile (83%) + create mode 100644 drivers/staging/wimax/TODO + rename {net => drivers/staging}/wimax/debug-levels.h (96%) + rename {net => drivers/staging}/wimax/debugfs.c (97%) + rename drivers/{net => staging}/wimax/i2400m/Kconfig (100%) + rename drivers/{net => staging}/wimax/i2400m/Makefile (100%) + rename drivers/{net => staging}/wimax/i2400m/control.c (99%) + rename drivers/{net => staging}/wimax/i2400m/debug-levels.h (96%) + rename drivers/{net => staging}/wimax/i2400m/debugfs.c (100%) + rename drivers/{net => staging}/wimax/i2400m/driver.c (99%) + rename drivers/{net => staging}/wimax/i2400m/fw.c (100%) + rename drivers/{net => staging}/wimax/i2400m/i2400m-usb.h (100%) + rename drivers/{net => staging}/wimax/i2400m/i2400m.h (99%) + rename include/uapi/linux/wimax/i2400m.h => drivers/staging/wimax/i2400m/linux-wimax-i2400m.h (100%) + rename drivers/{net => staging}/wimax/i2400m/netdev.c (100%) + rename drivers/{net => staging}/wimax/i2400m/op-rfkill.c (99%) + rename drivers/{net => staging}/wimax/i2400m/rx.c (100%) + rename drivers/{net => staging}/wimax/i2400m/sysfs.c (100%) + rename drivers/{net => staging}/wimax/i2400m/tx.c (100%) + rename drivers/{net => staging}/wimax/i2400m/usb-debug-levels.h (95%) + rename drivers/{net => staging}/wimax/i2400m/usb-fw.c (100%) + rename drivers/{net => staging}/wimax/i2400m/usb-notif.c (100%) + rename drivers/{net => staging}/wimax/i2400m/usb-rx.c (100%) + rename drivers/{net => staging}/wimax/i2400m/usb-tx.c (100%) + rename drivers/{net => staging}/wimax/i2400m/usb.c (99%) + rename {net => drivers/staging}/wimax/id-table.c (99%) + rename include/linux/wimax/debug.h => drivers/staging/wimax/linux-wimax-debug.h (99%) + rename include/uapi/linux/wimax.h => drivers/staging/wimax/linux-wimax.h (100%) + rename include/net/wimax.h => drivers/staging/wimax/net-wimax.h (99%) + rename {net => drivers/staging}/wimax/op-msg.c (99%) + rename {net => drivers/staging}/wimax/op-reset.c (98%) + rename {net => drivers/staging}/wimax/op-rfkill.c (99%) + rename {net => drivers/staging}/wimax/op-state-get.c (96%) + rename {net => drivers/staging}/wimax/stack.c (97%) + rename {net => drivers/staging}/wimax/wimax-internal.h (99%) + create mode 100644 include/uapi/linux/cfm_bridge.h + create mode 100644 net/bridge/br_cfm.c + create mode 100644 net/bridge/br_cfm_netlink.c + create mode 100644 net/bridge/br_private_cfm.h + create mode 100755 tools/testing/selftests/net/bareudp.sh +Merging bpf-next/for-next (f4c3881edbcc Merge branch 'bpf-migrate-tcp-bpf') +$ git merge bpf-next/for-next +Removing tools/testing/selftests/bpf/test_tcpbpf_user.c +Removing tools/testing/selftests/bpf/tcp_server.py +Removing tools/testing/selftests/bpf/tcp_client.py +Merge made by the 'recursive' strategy. + include/linux/bpf.h | 5 + + kernel/bpf/bpf_iter.c | 14 ++ + kernel/bpf/hashtab.c | 128 +++++++++++----- + kernel/bpf/task_iter.c | 2 + + tools/testing/selftests/bpf/.gitignore | 1 - + tools/testing/selftests/bpf/Makefile | 3 +- + .../testing/selftests/bpf/prog_tests/tcpbpf_user.c | 143 ++++++++++++++++++ + .../testing/selftests/bpf/progs/test_tcpbpf_kern.c | 86 ++--------- + tools/testing/selftests/bpf/tcp_client.py | 50 ------- + tools/testing/selftests/bpf/tcp_server.py | 80 ---------- + tools/testing/selftests/bpf/test_tcpbpf.h | 2 + + tools/testing/selftests/bpf/test_tcpbpf_user.c | 165 --------------------- + 12 files changed, 274 insertions(+), 405 deletions(-) + create mode 100644 tools/testing/selftests/bpf/prog_tests/tcpbpf_user.c + delete mode 100755 tools/testing/selftests/bpf/tcp_client.py + delete mode 100755 tools/testing/selftests/bpf/tcp_server.py + delete mode 100644 tools/testing/selftests/bpf/test_tcpbpf_user.c +Merging ipsec-next/master (68bb4665a2ce Merge branch 'l2-multicast-forwarding-for-ocelot-switch') +$ 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 (117ca1f8920c netfilter: nft_reject_inet: allow to use reject from inet ingress) +$ git merge netfilter-next/master +Auto-merging net/netfilter/nf_tables_api.c +Auto-merging net/netfilter/ipset/ip_set_core.c +Auto-merging net/ipv4/netfilter/nf_reject_ipv4.c +Merge made by the 'recursive' strategy. + include/linux/netfilter/ipset/ip_set.h | 5 + + include/net/netfilter/ipv4/nf_reject.h | 10 ++ + include/net/netfilter/ipv6/nf_reject.h | 9 + + include/uapi/linux/netfilter/ipset/ip_set.h | 6 +- + net/bridge/netfilter/Kconfig | 2 +- + net/bridge/netfilter/nft_reject_bridge.c | 255 +-------------------------- + net/ipv4/netfilter/nf_reject_ipv4.c | 128 +++++++++++++- + net/ipv6/netfilter/nf_reject_ipv6.c | 139 ++++++++++++++- + net/netfilter/Kconfig | 10 ++ + net/netfilter/Makefile | 1 + + net/netfilter/ipset/ip_set_core.c | 6 +- + net/netfilter/ipset/ip_set_hash_gen.h | 45 +++-- + net/netfilter/ipset/ip_set_hash_ip.c | 7 +- + net/netfilter/ipset/ip_set_hash_ipmac.c | 6 +- + net/netfilter/ipset/ip_set_hash_ipmark.c | 7 +- + net/netfilter/ipset/ip_set_hash_ipport.c | 7 +- + net/netfilter/ipset/ip_set_hash_ipportip.c | 7 +- + net/netfilter/ipset/ip_set_hash_ipportnet.c | 7 +- + net/netfilter/ipset/ip_set_hash_mac.c | 6 +- + net/netfilter/ipset/ip_set_hash_net.c | 7 +- + net/netfilter/ipset/ip_set_hash_netiface.c | 7 +- + net/netfilter/ipset/ip_set_hash_netnet.c | 7 +- + net/netfilter/ipset/ip_set_hash_netport.c | 7 +- + net/netfilter/ipset/ip_set_hash_netportnet.c | 7 +- + net/netfilter/nf_tables_api.c | 3 +- + net/netfilter/nft_reject.c | 12 +- + net/netfilter/nft_reject_inet.c | 68 ++----- + net/netfilter/nft_reject_netdev.c | 189 ++++++++++++++++++++ + 28 files changed, 615 insertions(+), 355 deletions(-) + create mode 100644 net/netfilter/nft_reject_netdev.c +Merging ipvs-next/master (35b7ee34abdb netfilter: nftables: Add __printf() attribute) +$ 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 (3fb6928b56f6 net: ipa: restrict special reset to IPA v3.5.1) +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (da7d554f7c62 gfs2: Wake up when sd_glock_disposal becomes zero) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/glock.c | 3 ++- + fs/gfs2/glops.c | 56 +++++++++++++++++++++++++++++++++++++++++----------- + fs/gfs2/glops.h | 1 + + fs/gfs2/inode.c | 3 ++- + fs/gfs2/lops.c | 31 +++++------------------------ + fs/gfs2/lops.h | 2 -- + fs/gfs2/ops_fstype.c | 14 ++++++++----- + fs/gfs2/recovery.c | 2 +- + fs/gfs2/rgrp.c | 5 ++++- + fs/gfs2/super.c | 1 + + 10 files changed, 70 insertions(+), 48 deletions(-) +Merging mtd/mtd/next (232b67c39942 mtd: remove unneeded break) +$ git merge mtd/mtd/next +Merge made by the 'recursive' strategy. + drivers/mtd/mtdchar.c | 2 -- + 1 file changed, 2 deletions(-) +Merging nand/nand/next (3ebbdef13f82 mtd: rawnand: sunxi: Add MDMA support) +$ git merge nand/nand/next +Removing include/linux/mtd/nand_ecc.h +Removing include/linux/mtd/nand_bch.h +Removing drivers/mtd/nand/raw/nand_bch.c +Auto-merging drivers/mtd/nand/raw/fsl_ifc_nand.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/nand-controller.yaml | 11 +- + .../devicetree/bindings/mtd/qcom_nandc.txt | 2 + + drivers/mtd/Kconfig | 1 + + drivers/mtd/nand/Kconfig | 31 ++ + drivers/mtd/nand/Makefile | 2 + + drivers/mtd/nand/core.c | 124 +++++++ + drivers/mtd/nand/ecc-sw-bch.c | 404 +++++++++++++++++++++ + .../mtd/nand/{raw/nand_ecc.c => ecc-sw-hamming.c} | 308 ++++++++++++---- + drivers/mtd/nand/ecc.c | 140 ++++++- + drivers/mtd/nand/raw/Kconfig | 23 +- + drivers/mtd/nand/raw/Makefile | 2 - + drivers/mtd/nand/raw/cs553x_nand.c | 3 +- + drivers/mtd/nand/raw/fsl_elbc_nand.c | 1 - + drivers/mtd/nand/raw/fsl_ifc_nand.c | 1 - + drivers/mtd/nand/raw/fsl_upm.c | 1 - + drivers/mtd/nand/raw/fsmc_nand.c | 5 +- + drivers/mtd/nand/raw/gpmi-nand/Makefile | 3 +- + drivers/mtd/nand/raw/lpc32xx_mlc.c | 1 - + drivers/mtd/nand/raw/lpc32xx_slc.c | 3 +- + drivers/mtd/nand/raw/meson_nand.c | 2 +- + drivers/mtd/nand/raw/mxic_nand.c | 2 +- + drivers/mtd/nand/raw/nand_base.c | 204 ++++++++--- + drivers/mtd/nand/raw/nand_bbt.c | 2 +- + drivers/mtd/nand/raw/nand_bch.c | 219 ----------- + drivers/mtd/nand/raw/nandsim.c | 3 +- + drivers/mtd/nand/raw/ndfc.c | 3 +- + drivers/mtd/nand/raw/omap2.c | 31 +- + drivers/mtd/nand/raw/pasemi_nand.c | 1 - + drivers/mtd/nand/raw/qcom_nandc.c | 6 + + drivers/mtd/nand/raw/s3c2410.c | 1 - + drivers/mtd/nand/raw/sharpsl.c | 3 +- + drivers/mtd/nand/raw/sunxi_nand.c | 148 +++++--- + drivers/mtd/nand/raw/tmio_nand.c | 7 +- + drivers/mtd/nand/raw/txx9ndfmc.c | 5 +- + drivers/mtd/nand/spi/Kconfig | 1 + + drivers/mtd/nand/spi/core.c | 286 +++++++++------ + drivers/mtd/sm_ftl.c | 30 +- + drivers/mtd/tests/mtd_nandecctest.c | 31 +- + include/linux/mtd/nand-ecc-sw-bch.h | 73 ++++ + include/linux/mtd/nand-ecc-sw-hamming.h | 91 +++++ + include/linux/mtd/nand.h | 56 +++ + include/linux/mtd/nand_bch.h | 66 ---- + include/linux/mtd/nand_ecc.h | 39 -- + include/linux/mtd/rawnand.h | 19 +- + include/linux/mtd/sharpsl.h | 1 - + include/linux/mtd/spinand.h | 9 + + 46 files changed, 1675 insertions(+), 730 deletions(-) + create mode 100644 drivers/mtd/nand/ecc-sw-bch.c + rename drivers/mtd/nand/{raw/nand_ecc.c => ecc-sw-hamming.c} (61%) + delete mode 100644 drivers/mtd/nand/raw/nand_bch.c + create mode 100644 include/linux/mtd/nand-ecc-sw-bch.h + create mode 100644 include/linux/mtd/nand-ecc-sw-hamming.h + delete mode 100644 include/linux/mtd/nand_bch.h + delete mode 100644 include/linux/mtd/nand_ecc.h +Merging spi-nor/spi-nor/next (3650b228f83a Linux 5.10-rc1) +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (18d05ca4486f crypto: lib/sha256 - Unroll LOAD and BLEND loops) +$ git merge crypto/master +Auto-merging arch/x86/crypto/poly1305_glue.c +Removing arch/x86/crypto/aes_glue.c +Merge made by the 'recursive' strategy. + arch/arm64/crypto/ghash-ce-glue.c | 2 +- + arch/arm64/crypto/poly1305-glue.c | 2 +- + arch/arm64/crypto/sha3-ce-glue.c | 2 +- + arch/x86/crypto/aes_glue.c | 1 - + arch/x86/crypto/poly1305_glue.c | 2 +- + crypto/sm2.c | 75 +++----- + drivers/crypto/hisilicon/qm.c | 13 ++ + drivers/crypto/hisilicon/sec2/sec.h | 2 - + drivers/crypto/hisilicon/sec2/sec_crypto.c | 17 +- + drivers/crypto/hisilicon/sec2/sec_main.c | 30 ++- + drivers/crypto/hisilicon/sgl.c | 2 - + drivers/crypto/inside-secure/safexcel.c | 2 +- + drivers/crypto/omap-aes.c | 1 + + drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.c | 49 ++++- + drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.h | 5 + + drivers/crypto/qat/qat_c3xxx/adf_drv.c | 11 +- + .../crypto/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c | 7 +- + drivers/crypto/qat/qat_c3xxxvf/adf_drv.c | 4 +- + drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.c | 49 ++++- + drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.h | 5 + + drivers/crypto/qat/qat_c62x/adf_drv.c | 11 +- + drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.c | 7 +- + drivers/crypto/qat/qat_c62xvf/adf_drv.c | 4 +- + drivers/crypto/qat/qat_common/Makefile | 1 + + drivers/crypto/qat/qat_common/adf_accel_devices.h | 58 +++++- + drivers/crypto/qat/qat_common/adf_admin.c | 77 ++++---- + drivers/crypto/qat/qat_common/adf_cfg.c | 4 +- + drivers/crypto/qat/qat_common/adf_cfg_strings.h | 3 +- + drivers/crypto/qat/qat_common/adf_gen2_hw_data.c | 181 ++++++++++++++++++ + drivers/crypto/qat/qat_common/adf_gen2_hw_data.h | 123 ++++++++++++ + drivers/crypto/qat/qat_common/adf_hw_arbiter.c | 94 ++++----- + drivers/crypto/qat/qat_common/adf_isr.c | 4 +- + drivers/crypto/qat/qat_common/adf_sriov.c | 74 ++----- + drivers/crypto/qat/qat_common/adf_transport.c | 130 +++++++++---- + .../qat/qat_common/adf_transport_access_macros.h | 67 ------- + .../crypto/qat/qat_common/adf_transport_debug.c | 32 ++-- + .../crypto/qat/qat_common/adf_transport_internal.h | 2 +- + drivers/crypto/qat/qat_common/adf_vf_isr.c | 5 +- + .../crypto/qat/qat_common/icp_qat_fw_init_admin.h | 6 +- + drivers/crypto/qat/qat_common/icp_qat_hw.h | 23 +++ + drivers/crypto/qat/qat_common/qat_algs.c | 136 +++++++------ + drivers/crypto/qat/qat_common/qat_asym_algs.c | 5 - + drivers/crypto/qat/qat_common/qat_crypto.c | 162 ++++++++++------ + drivers/crypto/qat/qat_common/qat_crypto.h | 26 ++- + drivers/crypto/qat/qat_common/qat_hal.c | 27 +-- + .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c | 60 +++++- + .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h | 5 + + drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 9 +- + .../qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c | 7 +- + drivers/crypto/qat/qat_dh895xccvf/adf_drv.c | 4 +- + drivers/crypto/sa2ul.c | 118 ++++++------ + drivers/crypto/sa2ul.h | 6 +- + drivers/crypto/talitos.c | 10 +- + include/crypto/sha1_base.h | 3 +- + include/crypto/sha256_base.h | 3 +- + include/crypto/sha512_base.h | 3 +- + include/crypto/sm3_base.h | 3 +- + lib/crypto/sha256.c | 212 +++++++-------------- + lib/mpi/ec.c | 3 - + 59 files changed, 1230 insertions(+), 759 deletions(-) + delete mode 100644 arch/x86/crypto/aes_glue.c + create mode 100644 drivers/crypto/qat/qat_common/adf_gen2_hw_data.c + create mode 100644 drivers/crypto/qat/qat_common/adf_gen2_hw_data.h +Merging drm/drm-next (e047c7be173c Merge tag 'drm-intel-next-queued-2020-11-03' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) +$ git merge drm/drm-next +Removing drivers/gpu/drm/vkms/vkms_gem.c +Auto-merging drivers/gpu/drm/vc4/vc4_drv.h +Auto-merging drivers/gpu/drm/vc4/vc4_drv.c +Auto-merging drivers/gpu/drm/vc4/vc4_bo.c +Auto-merging drivers/gpu/drm/i915/gvt/handlers.c +Auto-merging drivers/gpu/drm/i915/display/intel_psr.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + .../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/i915.rst | 6 + + 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_atomic_uapi.c | 8 + + drivers/gpu/drm/drm_blend.c | 13 + + drivers/gpu/drm/drm_connector.c | 5 + + drivers/gpu/drm/drm_crtc.c | 40 + + drivers/gpu/drm/drm_crtc_internal.h | 3 + + drivers/gpu/drm/drm_dp_aux_dev.c | 2 +- + drivers/gpu/drm/drm_dp_helper.c | 233 ++- + 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_plane.c | 73 + + 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/display/icl_dsi.c | 74 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 7 +- + drivers/gpu/drm/i915/display/intel_bios.c | 58 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 52 +- + drivers/gpu/drm/i915/display/intel_color.c | 124 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 13 +- + drivers/gpu/drm/i915/display/intel_csr.c | 12 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 770 ++++---- + drivers/gpu/drm/i915/display/intel_ddi.h | 11 +- + drivers/gpu/drm/i915/display/intel_display.c | 488 +++++- + drivers/gpu/drm/i915/display/intel_display.h | 34 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 9 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 77 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 3 + + drivers/gpu/drm/i915/display/intel_display_types.h | 57 +- + drivers/gpu/drm/i915/display/intel_dp.c | 682 +++++--- + drivers/gpu/drm/i915/display/intel_dp.h | 22 +- + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 3 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 554 +++++- + .../gpu/drm/i915/display/intel_dp_link_training.h | 17 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 38 +- + drivers/gpu/drm/i915/display/intel_dpio_phy.c | 23 +- + drivers/gpu/drm/i915/display/intel_dpio_phy.h | 2 + + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 118 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 17 + + drivers/gpu/drm/i915/display/intel_dsi.h | 1 + + drivers/gpu/drm/i915/display/intel_fbc.c | 7 + + drivers/gpu/drm/i915/display/intel_gmbus.c | 15 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 89 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 18 +- + drivers/gpu/drm/i915/display/intel_hotplug.c | 64 +- + drivers/gpu/drm/i915/display/intel_hotplug.h | 3 +- + drivers/gpu/drm/i915/display/intel_lspcon.c | 97 +- + drivers/gpu/drm/i915/display/intel_lspcon.h | 5 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 10 + + drivers/gpu/drm/i915/display/intel_opregion.c | 6 +- + drivers/gpu/drm/i915/display/intel_psr.c | 208 ++- + drivers/gpu/drm/i915/display/intel_psr.h | 10 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 74 +- + drivers/gpu/drm/i915/display/intel_tc.c | 8 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 13 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 8 + + 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/gt/intel_ggtt.c | 2 +- + drivers/gpu/drm/i915/gt/intel_mocs.c | 41 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 56 +- + drivers/gpu/drm/i915/gt/intel_sseu.c | 2 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 143 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 6 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 1 + + drivers/gpu/drm/i915/gvt/display.c | 15 +- + drivers/gpu/drm/i915/gvt/handlers.c | 14 +- + drivers/gpu/drm/i915/gvt/reg.h | 4 +- + drivers/gpu/drm/i915/i915_debugfs.c | 3 +- + drivers/gpu/drm/i915/i915_drv.c | 68 +- + drivers/gpu/drm/i915/i915_drv.h | 12 +- + drivers/gpu/drm/i915/i915_irq.c | 770 +++++--- + drivers/gpu/drm/i915/i915_irq.h | 3 + + drivers/gpu/drm/i915/i915_pci.c | 21 + + drivers/gpu/drm/i915/i915_reg.h | 430 +++-- + drivers/gpu/drm/i915/i915_suspend.c | 80 +- + drivers/gpu/drm/i915/i915_suspend.h | 4 +- + drivers/gpu/drm/i915/intel_device_info.c | 1 + + drivers/gpu/drm/i915/intel_device_info.h | 1 + + drivers/gpu/drm/i915/intel_dram.c | 23 +- + drivers/gpu/drm/i915/intel_pch.c | 6 +- + drivers/gpu/drm/i915/intel_pm.c | 64 +- + drivers/gpu/drm/i915/intel_pm.h | 2 - + drivers/gpu/drm/i915/intel_sideband.c | 15 + + drivers/gpu/drm/i915/intel_sideband.h | 2 + + drivers/gpu/drm/i915/intel_uncore.c | 207 ++- + drivers/gpu/drm/i915/intel_uncore.h | 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 | 156 +- + 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/matrox/matroxfb_base.c | 8 +- + 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_crtc.h | 16 + + include/drm/drm_dp_helper.h | 134 +- + 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_plane.h | 21 + + include/drm/drm_prime.h | 5 +- + include/drm/i915_pciids.h | 141 +- + 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 + + 371 files changed, 12169 insertions(+), 5124 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 amdgpu/drm-next (57673be0a9f5 drm/amdgpu: Enable GPU reset for vangogh) +$ git merge amdgpu/drm-next +Auto-merging include/uapi/drm/drm_fourcc.h +Auto-merging drivers/gpu/drm/radeon/radeon.h +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +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/powerplay/hwmgr/smu7_hwmgr.c +Auto-merging drivers/gpu/drm/amd/pm/inc/smu_types.h +Auto-merging drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_factory_dcn30.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.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/dce/dce_clock_source.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 +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/Kconfig +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_priv.h +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/nv.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/nv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/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.h +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_ras.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_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_gmc.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_display.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_debugfs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +Auto-merging MAINTAINERS +Auto-merging Documentation/gpu/amdgpu.rst +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/nv.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c' using previous resolution. +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 +[master 6a1de7d70e94] Merge remote-tracking branch 'amdgpu/drm-next' into master +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 2 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 56 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 27 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 34 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 43 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_df.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 173 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 61 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 1 + + 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 | 69 +- + 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 | 27 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 11 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 3 + + 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 | 115 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 10 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 167 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 38 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 51 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vf_error.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 284 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 10 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 108 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 2 +- + drivers/gpu/drm/amd/amdgpu/athub_v2_1.c | 1 + + drivers/gpu/drm/amd/amdgpu/atom.c | 24 +- + drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 6 - + drivers/gpu/drm/amd/amdgpu/atombios_i2c.c | 2 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 4 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 29 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/df_v1_7.c | 2 +- + 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 | 279 +- + 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 | 19 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 23 +- + 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 | 49 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 24 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 193 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 4 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 4 +- + 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_v6_1.c | 4 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 4 +- + 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 | 179 +- + 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 | 56 +- + drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 29 +- + drivers/gpu/drm/amd/amdgpu/si.c | 2 +- + drivers/gpu/drm/amd/amdgpu/si_ih.c | 2 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 31 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 4 +- + drivers/gpu/drm/amd/amdgpu/umc_v8_7.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vangogh_reg_init.c | 50 + + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 12 +- + drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 43 +- + .../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_priv.h | 3 - + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 4 +- + drivers/gpu/drm/amd/display/Kconfig | 10 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 950 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 3 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 2 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 126 +- + .../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 | 39 +- + .../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/dce_calcs.c | 13 +- + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 8 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 36 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 32 +- + .../amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c | 3 +- + .../amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.c | 7 +- + .../drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 30 +- + .../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 | 14 +- + .../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 | 94 +- + drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 4 + + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 24 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 13 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 115 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 13 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 47 +- + 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 | 43 +- + 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 | 10 +- + 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 +- + drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c | 4 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 24 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 51 +- + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 306 +- + 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 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 16 +- + .../drm/amd/display/dc/dce110/dce110_resource.c | 11 +- + .../drm/amd/display/dc/dce112/dce112_resource.c | 11 +- + .../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 | 59 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 9 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 2 +- + .../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 | 3 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 300 +- + drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 2 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c | 7 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.h | 2 +- + .../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 | 116 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h | 10 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 5 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 56 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.h | 9 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 124 +- + 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 | 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 | 13 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 6 +- + .../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/dsc/rc_calc.c | 6 +- + drivers/gpu/drm/amd/display/dc/dsc/rc_calc.h | 4 +- + drivers/gpu/drm/amd/display/dc/gpio/Makefile | 5 +- + .../amd/display/dc/gpio/dcn30/hw_factory_dcn30.c | 2 +- + .../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/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 | 3 + + 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 | 15 +- + drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 1 + + 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 | 6 +- + .../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/dmub/dmub_srv.h | 4 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 54 +- + 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 | 124 +- + .../drm/amd/display/modules/color/color_gamma.h | 6 +- + .../drm/amd/display/modules/freesync/freesync.c | 55 +- + .../amd/display/modules/hdcp/hdcp1_transition.c | 2 +- + .../gpu/drm/amd/display/modules/hdcp/hdcp_log.c | 2 +- + .../drm/amd/display/modules/power/power_helpers.c | 8 +- + drivers/gpu/drm/amd/include/amd_shared.h | 3 + + .../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/atombios.h | 20 +- + 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 | 16 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 49 +- + drivers/gpu/drm/amd/pm/inc/hwmgr.h | 22 +- + .../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/smu74_discrete.h | 3 +- + drivers/gpu/drm/amd/pm/inc/smu7_ppsmc.h | 6 + + drivers/gpu/drm/amd/pm/inc/smu_types.h | 74 +- + 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 | 108 + + drivers/gpu/drm/amd/pm/inc/smumgr.h | 2 + + drivers/gpu/drm/amd/pm/powerplay/hwmgr/ci_baco.c | 7 +- + drivers/gpu/drm/amd/pm/powerplay/hwmgr/hwmgr.c | 10 +- + drivers/gpu/drm/amd/pm/powerplay/hwmgr/hwmgr_ppt.h | 8 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c | 123 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.h | 28 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h | 66 + + .../amd/pm/powerplay/hwmgr/process_pptables_v1_0.c | 192 +- + .../drm/amd/pm/powerplay/hwmgr/processpptables.c | 85 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 605 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.h | 20 + + .../drm/amd/pm/powerplay/hwmgr/smu7_powertune.c | 34 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_thermal.c | 11 + + .../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.c | 23 +- + .../pm/powerplay/hwmgr/vega10_processpptables.c | 88 +- + .../gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c | 29 +- + .../gpu/drm/amd/pm/powerplay/smumgr/fiji_smumgr.c | 3 +- + .../drm/amd/pm/powerplay/smumgr/polaris10_smumgr.c | 356 +- + .../drm/amd/pm/powerplay/smumgr/polaris10_smumgr.h | 1 + + drivers/gpu/drm/amd/pm/powerplay/smumgr/smumgr.c | 8 + + .../gpu/drm/amd/pm/powerplay/smumgr/vegam_smumgr.c | 3 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 219 +- + 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 | 23 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 27 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 625 + + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 35 + + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 55 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 4 + + drivers/gpu/drm/amd/pm/swsmu/smu_internal.h | 8 +- + drivers/gpu/drm/radeon/radeon.h | 1 + + drivers/gpu/drm/radeon/radeon_asic.c | 1 + + drivers/gpu/drm/radeon/radeon_asic.h | 1 + + drivers/gpu/drm/radeon/radeon_pm.c | 29 +- + drivers/gpu/drm/radeon/sumo_dpm.c | 20 + + drivers/pci/pcie/err.c | 41 +- + include/drm/amd_asic_type.h | 2 + + include/uapi/drm/amdgpu_drm.h | 6 +- + include/uapi/drm/drm_fourcc.h | 115 + + 373 files changed, 286490 insertions(+), 3046 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 am -3 ../patches/0001-merge-fix-up-for-drm-amdgpu-Add-debugfs-entry-for-pr.patch +Applying: merge fix up for "drm/amdgpu: Add debugfs entry for printing VM info" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +$ git add -A . +$ git commit -v -a --amend +[master e06a42906ab7] Merge remote-tracking branch 'amdgpu/drm-next' into master + Date: Thu Nov 5 11:23:11 2020 +1100 +Merging drm-intel/for-linux-next (ba8a5cb234ba drm/i915/tgl: Fix typo during output setup) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/display/intel_display.c | 2 +- + include/drm/i915_pciids.h | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) +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 (24e146cdf9f5 drm: unify formatting for color management documentation) +$ git merge drm-misc/for-linux-next +Removing include/drm/ttm/ttm_page_alloc.h +Auto-merging include/drm/drm_dp_helper.h +Auto-merging drivers/gpu/drm/vc4/vc4_hvs.c +Auto-merging drivers/gpu/drm/vc4/vc4_drv.h +Removing drivers/gpu/drm/ttm/ttm_set_memory.h +Removing drivers/gpu/drm/ttm/ttm_page_alloc_dma.c +Removing drivers/gpu/drm/ttm/ttm_page_alloc.c +Auto-merging drivers/gpu/drm/panfrost/panfrost_gem.c +Auto-merging drivers/gpu/drm/panfrost/panfrost_drv.c +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +Auto-merging drivers/gpu/drm/ingenic/ingenic-drm-drv.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.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_cs.c +Resolved 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f24e4894ed37] Merge remote-tracking branch 'drm-misc/for-linux-next' into master +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/todo.rst | 4 + + arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 4 + + drivers/gpu/drm/Kconfig | 7 - + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 52 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 16 +- + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 14 +- + drivers/gpu/drm/arm/hdlcd_crtc.c | 2 +- + drivers/gpu/drm/arm/malidp_crtc.c | 20 +- + drivers/gpu/drm/armada/armada_crtc.c | 14 +- + drivers/gpu/drm/ast/ast_mode.c | 17 +- + drivers/gpu/drm/ast/ast_tables.h | 2 + + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 7 +- + drivers/gpu/drm/drm_atomic_helper.c | 10 +- + drivers/gpu/drm/drm_bridge_connector.c | 2 +- + drivers/gpu/drm/drm_color_mgmt.c | 4 +- + drivers/gpu/drm/drm_edid.c | 4 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 5 +- + drivers/gpu/drm/drm_prime.c | 4 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 10 +- + drivers/gpu/drm/exynos/exynos_drm_crtc.c | 12 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 6 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 2 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 4 +- + drivers/gpu/drm/i915/i915_scatterlist.h | 2 +- + drivers/gpu/drm/imx/dcss/dcss-crtc.c | 4 +- + drivers/gpu/drm/imx/ipuv3-crtc.c | 10 +- + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 36 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 16 +- + drivers/gpu/drm/meson/meson_crtc.c | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 27 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 6 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 17 +- + drivers/gpu/drm/mxsfb/mxsfb_kms.c | 12 +- + drivers/gpu/drm/nouveau/dispnv50/head.c | 11 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 31 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 1 - + drivers/gpu/drm/nouveau/nouveau_ttm.c | 18 +- + drivers/gpu/drm/omapdrm/omap_crtc.c | 17 +- + drivers/gpu/drm/panfrost/panfrost_device.c | 2 +- + drivers/gpu/drm/panfrost/panfrost_device.h | 1 + + drivers/gpu/drm/panfrost/panfrost_drv.c | 2 + + drivers/gpu/drm/panfrost/panfrost_gem.c | 2 + + drivers/gpu/drm/panfrost/panfrost_job.c | 13 +- + drivers/gpu/drm/panfrost/panfrost_mmu.c | 1 + + drivers/gpu/drm/qxl/qxl_display.c | 2 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 6 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 56 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 15 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 12 +- + drivers/gpu/drm/sti/sti_crtc.c | 2 +- + drivers/gpu/drm/stm/ltdc.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_crtc.c | 13 +- + drivers/gpu/drm/tegra/dc.c | 10 +- + drivers/gpu/drm/tidss/tidss_crtc.c | 14 +- + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 14 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 4 +- + drivers/gpu/drm/ttm/Makefile | 5 +- + drivers/gpu/drm/ttm/ttm_agp_backend.c | 1 - + drivers/gpu/drm/ttm/ttm_bo.c | 9 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 3 +- + drivers/gpu/drm/ttm/ttm_memory.c | 11 +- + drivers/gpu/drm/ttm/ttm_page_alloc.c | 1176 -------------------- + drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 1226 --------------------- + drivers/gpu/drm/ttm/ttm_pool.c | 667 +++++++++++ + drivers/gpu/drm/ttm/ttm_resource.c | 2 +- + drivers/gpu/drm/ttm/ttm_set_memory.h | 84 -- + drivers/gpu/drm/ttm/ttm_tt.c | 16 +- + drivers/gpu/drm/vboxvideo/vbox_mode.c | 2 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 11 +- + drivers/gpu/drm/vc4/vc4_drv.h | 3 +- + drivers/gpu/drm/vc4/vc4_hvs.c | 4 +- + drivers/gpu/drm/vc4/vc4_txp.c | 10 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 4 +- + drivers/gpu/drm/vkms/vkms_crtc.c | 20 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 12 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 36 +- + drivers/gpu/drm/xlnx/zynqmp_disp.c | 12 +- + drivers/gpu/drm/zte/zx_vou.c | 2 +- + drivers/iommu/io-pgtable-arm.c | 11 +- + drivers/video/console/sticore.c | 2 +- + drivers/video/fbdev/atafb.c | 8 - + drivers/video/fbdev/sh_mobile_lcdcfb.c | 1 - + drivers/video/hdmi.c | 8 +- + include/drm/drm_atomic.h | 12 +- + include/drm/drm_modeset_helper_vtables.h | 9 +- + include/drm/ttm/ttm_bo_api.h | 15 +- + include/drm/ttm/ttm_bo_driver.h | 16 +- + include/drm/ttm/ttm_caching.h | 2 + + include/drm/ttm/ttm_page_alloc.h | 122 -- + include/drm/ttm/ttm_pool.h | 91 ++ + include/drm/ttm/ttm_tt.h | 2 - + include/linux/font.h | 2 +- + include/linux/scatterlist.h | 6 - + tools/testing/scatterlist/main.c | 2 +- + 99 files changed, 1190 insertions(+), 3066 deletions(-) + delete mode 100644 drivers/gpu/drm/ttm/ttm_page_alloc.c + delete mode 100644 drivers/gpu/drm/ttm/ttm_page_alloc_dma.c + create mode 100644 drivers/gpu/drm/ttm/ttm_pool.c + delete mode 100644 drivers/gpu/drm/ttm/ttm_set_memory.h + delete mode 100644 include/drm/ttm/ttm_page_alloc.h + create mode 100644 include/drm/ttm/ttm_pool.h +$ git am -3 ../patches/0001-swiotlb-using-SIZE_MAX-needs-limits.h-included.patch +Applying: swiotlb: using SIZE_MAX needs limits.h included +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/swiotlb.h +$ git add -A . +$ git commit -v -a --amend +[master 164be16bfd59] Merge remote-tracking branch 'drm-misc/for-linux-next' into master + Date: Thu Nov 5 11:41:18 2020 +1100 +Merging drm-msm/msm-next (cf11c1f89d52 drm/msm: Drop struct_mutex in shrinker path) +$ git merge drm-msm/msm-next +Auto-merging include/drm/drm_crtc.h +CONFLICT (content): Merge conflict in include/drm/drm_crtc.h +Auto-merging drivers/gpu/drm/msm/msm_gem.c +Auto-merging drivers/gpu/drm/msm/msm_drv.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_drv.h +Auto-merging drivers/gpu/drm/msm/msm_drv.c +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c +Auto-merging drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.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 +Recorded preimage for 'drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c' +Recorded preimage for 'drivers/gpu/drm/msm/msm_drv.h' +Recorded preimage for 'include/drm/drm_crtc.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c'. +Recorded resolution for 'drivers/gpu/drm/msm/msm_drv.h'. +Recorded resolution for 'include/drm/drm_crtc.h'. +[master fedd3bf6648b] Merge remote-tracking branch 'drm-msm/msm-next' into master +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/msm/Makefile | 1 + + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 21 +- + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 20 +- + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 9 +- + drivers/gpu/drm/msm/adreno/a5xx_preempt.c | 18 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 4 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 10 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 6 + + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 32 +-- + drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 6 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 4 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 4 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 27 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 53 ++-- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 18 ++ + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 56 ++--- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h | 37 ++- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 7 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 8 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c | 94 +++++++ + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.h | 68 ++++++ + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h | 1 + + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 22 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 1 - + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 29 +++ + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 1 + + drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 1 + + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 8 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 1 + + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 11 +- + drivers/gpu/drm/msm/disp/mdp_kms.h | 9 +- + drivers/gpu/drm/msm/dp/dp_ctrl.c | 31 ++- + drivers/gpu/drm/msm/dp/dp_display.c | 3 +- + drivers/gpu/drm/msm/dp/dp_link.c | 12 +- + drivers/gpu/drm/msm/dp/dp_link.h | 1 + + drivers/gpu/drm/msm/dp/dp_power.c | 44 +++- + drivers/gpu/drm/msm/dp/dp_power.h | 2 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 9 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 22 ++ + drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 23 +- + drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c | 8 + + drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c | 5 +- + drivers/gpu/drm/msm/dsi/pll/dsi_pll_7nm.c | 8 + + drivers/gpu/drm/msm/msm_atomic.c | 62 +++-- + drivers/gpu/drm/msm/msm_debugfs.c | 7 + + drivers/gpu/drm/msm/msm_drv.c | 21 +- + drivers/gpu/drm/msm/msm_drv.h | 80 ++---- + drivers/gpu/drm/msm/msm_fbdev.c | 1 + + drivers/gpu/drm/msm/msm_gem.c | 271 ++++++++++----------- + drivers/gpu/drm/msm/msm_gem.h | 133 ++++++++-- + drivers/gpu/drm/msm/msm_gem_shrinker.c | 81 ++---- + drivers/gpu/drm/msm/msm_gem_submit.c | 157 +++++++----- + drivers/gpu/drm/msm/msm_gpu.c | 147 +++++++---- + drivers/gpu/drm/msm/msm_gpu.h | 18 +- + drivers/gpu/drm/msm/msm_kms.h | 33 ++- + drivers/gpu/drm/msm/msm_rd.c | 2 +- + drivers/gpu/drm/msm/msm_ringbuffer.c | 3 +- + drivers/gpu/drm/msm/msm_ringbuffer.h | 13 +- + include/drm/drm_crtc.h | 10 + + 59 files changed, 1180 insertions(+), 614 deletions(-) + create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c + create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.h +$ git am -3 ../patches/0001-drm-msm-gem-fix-up-for-drm-msm-Introduce-GEM-object-.patch +Applying: drm/msm/gem: fix up for "drm/msm: Introduce GEM object funcs" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/msm/msm_gem.h +$ git add -A . +$ git commit -v -a --amend +[master bbaf8d1d229c] Merge remote-tracking branch 'drm-msm/msm-next' into master + Date: Thu Nov 5 12:08:54 2020 +1100 +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 (36fba366cf9f drm/imx: tve remove extraneous type qualifier) +$ git merge imx-drm/imx-drm/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/dw_hdmi-imx.c | 17 ++------- + drivers/gpu/drm/imx/imx-drm-core.c | 10 ++--- + drivers/gpu/drm/imx/imx-ldb.c | 10 ++--- + drivers/gpu/drm/imx/imx-tve.c | 40 +++----------------- + drivers/gpu/drm/imx/parallel-display.c | 20 ++-------- + drivers/gpu/ipu-v3/ipu-common.c | 67 ---------------------------------- + include/video/imx-ipu-v3.h | 3 -- + 7 files changed, 21 insertions(+), 146 deletions(-) +Merging etnaviv/etnaviv/next (4612bad5701e drm/etnaviv: Add lockdep annotations for context lock) +$ git merge etnaviv/etnaviv/next +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_mmu.c +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_mmu.c | 4 ++ + drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 78 ++++++++++++++++++++++--------- + 4 files changed, 59 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 (1a6a071f51a5 ALSA: seq: remove useless function) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + sound/core/seq/seq_clientmgr.c | 1 - + sound/core/seq/seq_queue.c | 27 --------------------------- + sound/core/seq/seq_queue.h | 3 --- + 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 - + 10 files changed, 51 deletions(-) +Merging sound-asoc/for-next (939b46f5a6bc Merge remote-tracking branch 'asoc/for-5.11' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging sound/soc/ti/davinci-mcasp.c +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 +- + .../bindings/sound/allwinner,sun4i-a10-i2s.yaml | 6 +- + .../devicetree/bindings/sound/fsl,spdif.yaml | 1 + + .../devicetree/bindings/sound/fsl,xcvr.yaml | 104 + + .../bindings/sound/google,sc7180-trogdor.yaml | 130 + + .../devicetree/bindings/sound/mt8192-afe-pcm.yaml | 100 + + .../sound/mt8192-mt6359-rt1015-rt5682.yaml | 42 + + .../devicetree/bindings/sound/qcom,sm8250.yaml | 159 + + .../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-topology.h | 13 +- + include/sound/soc.h | 7 +- + sound/soc/amd/raven/pci-acp3x.c | 4 +- + sound/soc/atmel/atmel-i2s.c | 4 +- + sound/soc/bcm/bcm2835-i2s.c | 4 +- + sound/soc/codecs/Kconfig | 2 +- + sound/soc/codecs/adau1977.c | 9 +- + sound/soc/codecs/madera.c | 4 +- + sound/soc/codecs/mt6359.c | 110 + + sound/soc/codecs/mt6359.h | 7 + + sound/soc/codecs/rt1015.c | 101 + + sound/soc/codecs/rt1015.h | 42 + + sound/soc/codecs/tscs42xx.c | 6 +- + sound/soc/codecs/tscs454.c | 8 +- + 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/atom/sst/sst.c | 2 +- + sound/soc/intel/boards/bytcr_rt5651.c | 2 +- + sound/soc/intel/boards/sof_rt5682.c | 65 +- + sound/soc/intel/catpt/loader.c | 2 +- + sound/soc/intel/catpt/pcm.c | 4 +- + sound/soc/intel/common/soc-acpi-intel-cml-match.c | 13 + + sound/soc/intel/skylake/skl-topology.c | 9 +- + sound/soc/jz4740/jz4740-i2s.c | 5 - + sound/soc/mediatek/Kconfig | 23 + + sound/soc/mediatek/Makefile | 1 + + sound/soc/mediatek/common/mtk-afe-fe-dai.c | 13 +- + sound/soc/mediatek/common/mtk-base-afe.h | 1 + + sound/soc/mediatek/mt8192/Makefile | 16 + + sound/soc/mediatek/mt8192/mt8192-afe-clk.c | 669 +++++ + sound/soc/mediatek/mt8192/mt8192-afe-clk.h | 244 ++ + sound/soc/mediatek/mt8192/mt8192-afe-common.h | 170 ++ + sound/soc/mediatek/mt8192/mt8192-afe-control.c | 163 + + sound/soc/mediatek/mt8192/mt8192-afe-gpio.c | 306 ++ + sound/soc/mediatek/mt8192/mt8192-afe-gpio.h | 19 + + sound/soc/mediatek/mt8192/mt8192-afe-pcm.c | 2389 +++++++++++++++ + sound/soc/mediatek/mt8192/mt8192-dai-adda.c | 1471 +++++++++ + sound/soc/mediatek/mt8192/mt8192-dai-i2s.c | 2110 +++++++++++++ + sound/soc/mediatek/mt8192/mt8192-dai-pcm.c | 409 +++ + sound/soc/mediatek/mt8192/mt8192-dai-tdm.c | 778 +++++ + sound/soc/mediatek/mt8192/mt8192-interconnection.h | 65 + + .../mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 1058 +++++++ + sound/soc/mediatek/mt8192/mt8192-reg.h | 3131 ++++++++++++++++++++ + sound/soc/qcom/Kconfig | 23 + + sound/soc/qcom/Makefile | 4 + + sound/soc/qcom/lpass-hdmi.c | 2 +- + sound/soc/qcom/lpass-sc7180.c | 4 +- + sound/soc/qcom/qdsp6/q6adm.c | 10 +- + sound/soc/qcom/qdsp6/q6afe.c | 10 +- + sound/soc/qcom/qdsp6/q6asm.c | 10 +- + sound/soc/qcom/sc7180.c | 266 ++ + sound/soc/qcom/sm8250.c | 227 ++ + 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/soc-topology.c | 302 +- + sound/soc/sof/control.c | 20 +- + sound/soc/sof/intel/hda-dsp.c | 2 +- + sound/soc/sof/pcm.c | 2 +- + sound/soc/sof/sof-audio.c | 10 +- + sound/soc/sof/topology.c | 6 +- + sound/soc/sunxi/Kconfig | 1 + + sound/soc/sunxi/sun4i-i2s.c | 388 ++- + sound/soc/sunxi/sun8i-codec.c | 834 +++++- + sound/soc/tegra/Kconfig | 1 - + sound/soc/tegra/tegra186_dspk.c | 6 +- + sound/soc/tegra/tegra210_dmic.c | 6 +- + sound/soc/tegra/tegra210_i2s.c | 6 +- + sound/soc/ti/davinci-evm.c | 3 +- + sound/soc/ti/davinci-mcasp.c | 10 +- + 95 files changed, 17598 insertions(+), 914 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/fsl,xcvr.yaml + create mode 100644 Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml + create mode 100644 Documentation/devicetree/bindings/sound/mt8192-afe-pcm.yaml + create mode 100644 Documentation/devicetree/bindings/sound/mt8192-mt6359-rt1015-rt5682.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/mediatek/mt8192/Makefile + create mode 100644 sound/soc/mediatek/mt8192/mt8192-afe-clk.c + create mode 100644 sound/soc/mediatek/mt8192/mt8192-afe-clk.h + create mode 100644 sound/soc/mediatek/mt8192/mt8192-afe-common.h + create mode 100644 sound/soc/mediatek/mt8192/mt8192-afe-control.c + create mode 100644 sound/soc/mediatek/mt8192/mt8192-afe-gpio.c + create mode 100644 sound/soc/mediatek/mt8192/mt8192-afe-gpio.h + create mode 100644 sound/soc/mediatek/mt8192/mt8192-afe-pcm.c + create mode 100644 sound/soc/mediatek/mt8192/mt8192-dai-adda.c + create mode 100644 sound/soc/mediatek/mt8192/mt8192-dai-i2s.c + create mode 100644 sound/soc/mediatek/mt8192/mt8192-dai-pcm.c + create mode 100644 sound/soc/mediatek/mt8192/mt8192-dai-tdm.c + create mode 100644 sound/soc/mediatek/mt8192/mt8192-interconnection.h + create mode 100644 sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c + create mode 100644 sound/soc/mediatek/mt8192/mt8192-reg.h + create mode 100644 sound/soc/qcom/sc7180.c + create mode 100644 sound/soc/qcom/sm8250.c +Merging modules/modules-next (076aa52e4021 module: only handle errors with the *switch* statement in module_sig_check()) +$ git merge modules/modules-next +Merge made by the 'recursive' strategy. + kernel/module.c | 52 ++++++++++++++++++++++++++++------------------------ + 1 file changed, 28 insertions(+), 24 deletions(-) +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 (bc2e353de6e8 Merge branch 'for-5.11/io_uring' into for-next) +$ git merge block/for-next +Auto-merging arch/sparc/include/asm/thread_info_64.h +Auto-merging arch/ia64/kernel/process.c +Auto-merging arch/arm/kernel/entry-common.S +Auto-merging arch/arm/include/asm/thread_info.h +Merge made by the 'recursive' strategy. + arch/alpha/include/asm/thread_info.h | 2 + + arch/alpha/kernel/entry.S | 2 +- + arch/alpha/kernel/signal.c | 2 +- + arch/arc/include/asm/thread_info.h | 4 +- + arch/arc/kernel/entry.S | 3 +- + arch/arc/kernel/signal.c | 2 +- + arch/arm/include/asm/thread_info.h | 7 +- + arch/arm/kernel/entry-common.S | 6 +- + arch/arm/kernel/entry-v7m.S | 2 +- + arch/arm/kernel/signal.c | 2 +- + arch/arm64/include/asm/thread_info.h | 5 +- + arch/arm64/kernel/signal.c | 2 +- + arch/c6x/include/asm/thread_info.h | 1 + + arch/c6x/kernel/asm-offsets.c | 1 + + arch/c6x/kernel/signal.c | 2 +- + arch/csky/include/asm/thread_info.h | 5 +- + arch/csky/kernel/signal.c | 2 +- + arch/h8300/include/asm/thread_info.h | 4 +- + arch/h8300/kernel/signal.c | 2 +- + arch/hexagon/include/asm/thread_info.h | 2 + + arch/hexagon/kernel/process.c | 2 +- + arch/ia64/include/asm/thread_info.h | 4 +- + arch/ia64/kernel/process.c | 3 +- + arch/m68k/include/asm/thread_info.h | 1 + + arch/m68k/kernel/signal.c | 3 +- + arch/microblaze/include/asm/thread_info.h | 2 + + arch/microblaze/kernel/signal.c | 3 +- + arch/mips/include/asm/thread_info.h | 4 +- + arch/mips/kernel/signal.c | 2 +- + arch/nds32/include/asm/thread_info.h | 2 + + arch/nds32/kernel/ex-exit.S | 2 +- + arch/nds32/kernel/signal.c | 2 +- + arch/nios2/include/asm/thread_info.h | 2 + + arch/nios2/kernel/signal.c | 3 +- + arch/openrisc/include/asm/thread_info.h | 2 + + arch/openrisc/kernel/signal.c | 2 +- + arch/parisc/include/asm/thread_info.h | 4 +- + arch/parisc/kernel/signal.c | 3 +- + arch/powerpc/include/asm/thread_info.h | 5 +- + arch/powerpc/kernel/signal.c | 2 +- + arch/riscv/include/asm/thread_info.h | 5 +- + arch/riscv/kernel/signal.c | 2 +- + arch/s390/include/asm/thread_info.h | 2 + + arch/s390/kernel/entry.S | 11 +- + arch/s390/kernel/signal.c | 2 +- + arch/sh/include/asm/thread_info.h | 4 +- + arch/sh/kernel/signal_32.c | 7 +- + arch/sparc/include/asm/thread_info_32.h | 4 +- + arch/sparc/include/asm/thread_info_64.h | 6 +- + arch/sparc/kernel/signal_32.c | 2 +- + arch/sparc/kernel/signal_64.c | 2 +- + arch/um/include/asm/thread_info.h | 2 + + arch/um/kernel/process.c | 3 +- + arch/x86/include/asm/thread_info.h | 2 + + arch/x86/kernel/signal.c | 4 +- + arch/xtensa/include/asm/thread_info.h | 2 + + arch/xtensa/kernel/entry.S | 1 + + arch/xtensa/kernel/signal.c | 3 +- + fs/internal.h | 2 + + fs/io-wq.c | 4 + + fs/io_uring.c | 754 ++++++++++++++++++++++-------- + fs/namei.c | 37 +- + include/linux/entry-common.h | 7 +- + include/linux/entry-kvm.h | 4 +- + include/linux/io_uring.h | 3 +- + include/linux/sched/jobctl.h | 4 +- + include/linux/sched/signal.h | 18 +- + include/linux/socket.h | 1 + + include/linux/syscalls.h | 2 +- + include/linux/tracehook.h | 23 + + include/uapi/linux/io_uring.h | 15 + + kernel/entry/common.c | 14 +- + kernel/entry/kvm.c | 3 + + kernel/events/uprobes.c | 2 +- + kernel/signal.c | 40 +- + kernel/task_work.c | 13 +- + net/socket.c | 15 +- + 77 files changed, 813 insertions(+), 323 deletions(-) +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 (cc85a5ef3c83 mmc: rtsx_pci: Add SD Express mode support for RTS5261) +$ git merge mmc/next +Removing Documentation/devicetree/bindings/mmc/mtk-sd.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mmc/mtk-sd.txt | 75 --------- + Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 176 ++++++++++++++++++++++ + drivers/misc/cardreader/rts5261.c | 4 + + drivers/misc/cardreader/rts5261.h | 23 --- + drivers/misc/cardreader/rtsx_pcr.c | 5 + + drivers/mmc/core/core.c | 15 +- + drivers/mmc/core/host.h | 6 + + drivers/mmc/core/sd_ops.c | 49 +++++- + drivers/mmc/core/sd_ops.h | 1 + + drivers/mmc/host/Kconfig | 4 +- + drivers/mmc/host/mtk-sd.c | 79 +++++++--- + drivers/mmc/host/rtsx_pci_sdmmc.c | 58 +++++++ + drivers/mmc/host/s3cmci.c | 2 +- + drivers/mmc/host/sdhci-acpi.c | 38 ++++- + drivers/mmc/host/sunxi-mmc.c | 3 +- + include/linux/mmc/host.h | 7 + + include/linux/rtsx_pci.h | 23 +++ + 17 files changed, 438 insertions(+), 130 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mmc/mtk-sd.txt + create mode 100644 Documentation/devicetree/bindings/mmc/mtk-sd.yaml +Merging mfd/for-mfd-next (bb6f6c10a8b0 mfd: madera: Add special errata reset handling for cs47l15) +$ git merge mfd/for-mfd-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-intel_pmt | 119 ++++ + .../devicetree/bindings/mfd/rohm,bd71837-pmic.yaml | 6 + + MAINTAINERS | 6 + + drivers/mfd/88pm800.c | 2 +- + drivers/mfd/88pm860x-core.c | 50 +- + drivers/mfd/Kconfig | 10 + + drivers/mfd/Makefile | 1 + + drivers/mfd/da9055-core.c | 8 +- + drivers/mfd/da9062-core.c | 24 +- + drivers/mfd/da9063-core.c | 8 +- + drivers/mfd/da9150-core.c | 6 +- + drivers/mfd/hi655x-pmic.c | 2 +- + drivers/mfd/intel_msic.c | 18 +- + drivers/mfd/intel_pmt.c | 223 ++++++++ + drivers/mfd/intel_quark_i2c_gpio.c | 4 +- + drivers/mfd/intel_soc_pmic_bxtwc.c | 14 +- + drivers/mfd/intel_soc_pmic_chtdc_ti.c | 10 +- + drivers/mfd/intel_soc_pmic_chtwc.c | 4 +- + drivers/mfd/intel_soc_pmic_crc.c | 10 +- + drivers/mfd/ioc3.c | 16 +- + drivers/mfd/lp8788.c | 4 +- + drivers/mfd/madera-core.c | 35 +- + drivers/mfd/max8925-core.c | 56 +- + drivers/mfd/qcom-spmi-pmic.c | 4 + + drivers/mfd/rdc321x-southbridge.c | 4 +- + drivers/mfd/retu-mfd.c | 4 +- + drivers/mfd/rk808.c | 8 +- + drivers/mfd/stmpe.c | 10 +- + drivers/mfd/sun4i-gpadc.c | 2 +- + drivers/mfd/tc3589x.c | 4 +- + drivers/mfd/tc6387xb.c | 2 +- + drivers/mfd/tc6393xb.c | 6 +- + drivers/mfd/tps65090.c | 2 +- + drivers/mfd/tps65217.c | 4 +- + drivers/mfd/tps6586x.c | 2 +- + drivers/mfd/tps65910.c | 40 +- + drivers/mfd/tps65911-comparator.c | 4 +- + drivers/mfd/tps80031.c | 2 +- + drivers/mfd/wm831x-core.c | 52 +- + drivers/mfd/wm8994-core.c | 4 +- + drivers/platform/x86/Kconfig | 34 ++ + drivers/platform/x86/Makefile | 3 + + drivers/platform/x86/intel_pmt_class.c | 297 ++++++++++ + drivers/platform/x86/intel_pmt_class.h | 52 ++ + drivers/platform/x86/intel_pmt_crashlog.c | 328 +++++++++++ + drivers/platform/x86/intel_pmt_telemetry.c | 160 ++++++ + include/linux/mfd/madera/core.h | 1 + + include/linux/mfd/madera/registers.h | 635 --------------------- + include/linux/mfd/tps65910.h | 40 -- + include/uapi/linux/pci_regs.h | 5 + + 50 files changed, 1474 insertions(+), 871 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-intel_pmt + create mode 100644 drivers/mfd/intel_pmt.c + create mode 100644 drivers/platform/x86/intel_pmt_class.c + create mode 100644 drivers/platform/x86/intel_pmt_class.h + create mode 100644 drivers/platform/x86/intel_pmt_crashlog.c + create mode 100644 drivers/platform/x86/intel_pmt_telemetry.c +$ git reset --hard HEAD^ +HEAD is now at 85bc6811bd18 Merge remote-tracking branch 'mmc/next' into master +Merging next-20201104 version of mfd +$ git merge -m next-20201104/mfd 6d81dc3c79d46b66b29712eb1ac5ad2cbe4231d2 +Already up to date. +Merging backlight/for-backlight-next (789eb04b6c56 backlight: pwm_bl: Fix interpolation) +$ git merge backlight/for-backlight-next +Merge made by the 'recursive' strategy. + drivers/video/backlight/pwm_bl.c | 70 ++++++++++++++++++---------------------- + 1 file changed, 31 insertions(+), 39 deletions(-) +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 (2eb816d54b88 Merge remote-tracking branch 'regulator/for-5.11' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regulator/dlg,da9121.yaml | 47 +++++++++ + .../bindings/regulator/fixed-regulator.yaml | 47 +++++++++ + drivers/regulator/Kconfig | 12 +++ + drivers/regulator/Makefile | 1 + + drivers/regulator/core.c | 2 +- + drivers/regulator/da9121-regulator.c | 108 +++++++++++++++++++++ + drivers/regulator/fixed.c | 63 ++++++++++-- + drivers/regulator/lp872x.c | 2 +- + 8 files changed, 274 insertions(+), 8 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/dlg,da9121.yaml + create mode 100644 drivers/regulator/da9121-regulator.c +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 (b000d5cb954f ima: defer arch_ima_get_secureboot() call to IMA init time) +$ git merge integrity/next-integrity +Merge made by the 'recursive' strategy. + include/linux/ima.h | 6 ++++++ + security/integrity/ima/ima_appraise.c | 17 +++++++++++------ + security/integrity/ima/ima_main.c | 1 + + 3 files changed, 18 insertions(+), 6 deletions(-) +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 (44141f58e143 selinux: allow dontauditx and auditallowx rules to take effect without allowx) +$ git merge selinux/next +Merge made by the 'recursive' strategy. + security/selinux/hooks.c | 19 ++++++++++++++++--- + security/selinux/ss/services.c | 4 +--- + 2 files changed, 17 insertions(+), 6 deletions(-) +Merging smack/next (edd615371b66 Smack: Remove unnecessary variable initialization) +$ git merge smack/next +Already up to date. +Merging tomoyo/master (e991a40b3d00 tomoyo: Limit wildcard recursion depth.) +$ git merge tomoyo/master +Merge made by the 'recursive' strategy. + security/tomoyo/securityfs_if.c | 6 ++--- + security/tomoyo/util.c | 55 ++++++++++++++++++++++------------------- + 2 files changed, 33 insertions(+), 28 deletions(-) +Merging tpmdd/next (bbd521ce63ab tpm: efi: Don't create binary_bios_measurements file for an empty log) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + drivers/char/tpm/eventlog/efi.c | 5 +++++ + drivers/char/tpm/tpm_tis.c | 29 +++++++++++++++++++++++++++-- + 2 files changed, 32 insertions(+), 2 deletions(-) +Merging watchdog/master (3650b228f83a Linux 5.10-rc1) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (4dd6ce478003 iommu: Fix a check in iommu_check_bind_data()) +$ git merge iommu/next +Auto-merging drivers/iommu/intel/iommu.c +Merge made by the 'recursive' strategy. + drivers/iommu/amd/amd_iommu_types.h | 6 +++++- + drivers/iommu/intel/iommu.c | 3 +++ + drivers/iommu/intel/svm.c | 8 +++++++- + drivers/iommu/iommu.c | 2 +- + 4 files changed, 16 insertions(+), 3 deletions(-) +Merging audit/next (6d915476e67d audit: trigger accompanying records when no rules present) +$ git merge audit/next +Merge made by the 'recursive' strategy. + include/linux/audit.h | 8 -------- + kernel/audit.c | 5 ++++- + kernel/auditsc.c | 27 +++++++-------------------- + security/lsm_audit.c | 5 ----- + 4 files changed, 11 insertions(+), 34 deletions(-) +Merging devicetree/for-next (3cea11cd5e3b Linux 5.10-rc2) +$ 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 (3419e5593af1 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-atmel.c | 6 +- + drivers/spi/spi-img-spfi.c | 4 +- + drivers/spi/spi-mem.c | 3 +- + drivers/spi/spi-rockchip.c | 4 + + drivers/spi/spi-sun6i.c | 199 ++++++++++++++++++++++++++++++++++++++++----- + drivers/spi/spi.c | 6 +- + 6 files changed, 195 insertions(+), 27 deletions(-) +Merging tip/auto-latest (6f72faf4a323 Merge branch 'locking/urgent') +$ git merge tip/auto-latest +Auto-merging kernel/time/timekeeping.h +Auto-merging fs/binfmt_elf.c +Auto-merging arch/x86/include/asm/thread_info.h +Auto-merging arch/x86/include/asm/mmu_context.h +Removing arch/x86/include/asm/copy_mc_test.h +Auto-merging MAINTAINERS +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 + + Documentation/x86/index.rst | 2 +- + Documentation/x86/{resctrl_ui.rst => resctrl.rst} | 93 +++++++ + MAINTAINERS | 6 +- + arch/um/include/asm/cacheflush.h | 9 + + arch/x86/Kconfig.debug | 3 - + arch/x86/entry/vdso/vma.c | 4 +- + arch/x86/entry/vsyscall/vsyscall_64.c | 2 +- + arch/x86/events/core.c | 2 +- + arch/x86/events/intel/ds.c | 2 +- + arch/x86/events/intel/lbr.c | 2 +- + 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/compat.h | 15 +- + arch/x86/include/asm/copy_mc_test.h | 75 ------ + arch/x86/include/asm/elf.h | 13 +- + arch/x86/include/asm/mmu.h | 9 +- + arch/x86/include/asm/mmu_context.h | 2 +- + arch/x86/include/asm/processor.h | 2 + + arch/x86/include/asm/thread_info.h | 13 +- + arch/x86/include/asm/tlbflush.h | 2 +- + arch/x86/kernel/cpu/bugs.c | 54 ++++ + arch/x86/kernel/cpu/mce/core.c | 2 - + arch/x86/kernel/cpu/microcode/amd.c | 1 - + arch/x86/kernel/cpu/resctrl/core.c | 4 + + arch/x86/kernel/cpu/resctrl/internal.h | 1 + + arch/x86/kernel/cpu/resctrl/monitor.c | 82 ++++++- + arch/x86/kernel/perf_regs.c | 2 +- + arch/x86/kernel/process_64.c | 28 +-- + arch/x86/kernel/smpboot.c | 11 +- + arch/x86/lib/copy_mc.c | 4 - + arch/x86/lib/copy_mc_64.S | 10 - + arch/x86/mm/tlb.c | 100 ++++++-- + arch/x86/oprofile/backtrace.c | 2 +- + fs/binfmt_elf.c | 4 +- + fs/compat_binfmt_elf.c | 20 +- + include/asm-generic/atomic-instrumented.h | 216 +++++++++------- + include/linux/atomic-arch-fallback.h | 90 ++++++- + include/linux/atomic-fallback.h | 90 ++++++- + include/linux/elf.h | 10 + + 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/time/jiffies.c | 3 +- + kernel/time/timekeeping.h | 2 +- + kernel/trace/trace_kprobe.c | 3 +- + scripts/atomic/gen-atomic-fallback.sh | 63 ++++- + scripts/atomic/gen-atomic-instrumented.sh | 29 ++- + tools/testing/nvdimm/test/nfit.c | 103 -------- + 58 files changed, 1166 insertions(+), 606 deletions(-) + create mode 100644 Documentation/admin-guide/hw-vuln/l1d_flush.rst + rename Documentation/x86/{resctrl_ui.rst => resctrl.rst} (90%) + create mode 100644 arch/um/include/asm/cacheflush.h + delete mode 100644 arch/x86/include/asm/copy_mc_test.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 (24269999027e EDAC: Fix some kernel-doc markups) +$ git merge edac/edac-for-next +Merge made by the 'recursive' strategy. + drivers/edac/amd64_edac.c | 8 -------- + drivers/edac/amd76x_edac.c | 1 - + drivers/edac/e752x_edac.c | 1 - + drivers/edac/e7xxx_edac.c | 1 - + drivers/edac/edac_device.h | 11 +++++------ + drivers/edac/i3000_edac.c | 1 - + drivers/edac/i3200_edac.c | 1 - + drivers/edac/i5000_edac.c | 2 +- + drivers/edac/i5400_edac.c | 2 +- + drivers/edac/i82443bxgx_edac.c | 1 - + drivers/edac/i82860_edac.c | 1 - + drivers/edac/i82875p_edac.c | 1 - + drivers/edac/i82975x_edac.c | 1 - + drivers/edac/ie31200_edac.c | 1 - + drivers/edac/r82600_edac.c | 1 - + drivers/edac/x38_edac.c | 1 - + include/linux/edac.h | 4 ++-- + 17 files changed, 9 insertions(+), 30 deletions(-) +Merging irqchip/irq/irqchip-next (d95bdca75b3f irqchip/ti-sci-inta: Add support for unmapped event handling) +$ git merge irqchip/irq/irqchip-next +Auto-merging drivers/irqchip/Kconfig +Auto-merging Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.yaml +Merge made by the 'recursive' strategy. + .../bindings/interrupt-controller/ti,sci-inta.yaml | 10 +++ + drivers/irqchip/Kconfig | 3 +- + drivers/irqchip/irq-bcm2836.c | 2 +- + drivers/irqchip/irq-mst-intc.c | 4 +- + drivers/irqchip/irq-renesas-intc-irqpin.c | 8 +-- + drivers/irqchip/irq-sifive-plic.c | 10 +-- + drivers/irqchip/irq-stm32-exti.c | 4 ++ + drivers/irqchip/irq-ti-sci-inta.c | 83 +++++++++++++++++++++- + kernel/irq/Kconfig | 1 + + 9 files changed, 107 insertions(+), 18 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 (d77ef2684cbf rcu/tree: Make rcu_do_batch count how many callbacks were executed) +$ git merge rcu/rcu/next +Auto-merging lib/Kconfig.debug +Auto-merging kernel/rcu/tree.c +Auto-merging include/linux/pagemap.h +Auto-merging arch/xtensa/kernel/entry.S +Auto-merging arch/x86/kernel/smpboot.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + .../RCU/Design/Requirements/Requirements.rst | 50 +- + Documentation/RCU/checklist.rst | 7 + + Documentation/RCU/rcu_dereference.rst | 6 + + Documentation/RCU/whatisRCU.rst | 3 +- + Documentation/admin-guide/kernel-parameters.txt | 8 + + .../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 ++ + Documentation/memory-barriers.txt | 2 +- + arch/arm/include/asm/assembler.h | 11 - + arch/arm/kernel/iwmmxt.S | 2 - + arch/arm/mach-ep93xx/crunch-bits.S | 2 - + arch/x86/kernel/cpu/aperfmperf.c | 16 +- + arch/x86/kernel/cpu/mtrr/mtrr.c | 2 - + arch/x86/kernel/smpboot.c | 1 + + 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/kernel.h | 1 + + include/linux/list.h | 2 +- + include/linux/lockdep.h | 12 +- + include/linux/pagemap.h | 4 +- + include/linux/preempt.h | 37 +- + include/linux/rcupdate.h | 11 +- + include/linux/rcupdate_trace.h | 4 +- + include/linux/rcutiny.h | 2 + + include/linux/rcutree.h | 1 + + include/linux/sched/task.h | 2 - + include/linux/uaccess.h | 6 +- + include/net/sch_generic.h | 12 - + include/net/sock.h | 2 - + kernel/Kconfig.preempt | 4 - + kernel/kcsan/encoding.h | 20 +- + kernel/kcsan/selftest.c | 3 + + kernel/locking/locktorture.c | 36 +- + kernel/rcu/Kconfig | 20 +- + kernel/rcu/rcu.h | 16 + + kernel/rcu/rcu_segcblist.c | 2 +- + kernel/rcu/rcu_segcblist.h | 3 +- + kernel/rcu/rcuscale.c | 37 +- + kernel/rcu/rcutorture.c | 235 ++++++++- + kernel/rcu/refscale.c | 11 +- + kernel/rcu/srcutree.c | 6 +- + kernel/rcu/tasks.h | 49 +- + kernel/rcu/tree.c | 207 +++++--- + kernel/rcu/tree.h | 2 + + kernel/rcu/tree_plugin.h | 2 +- + kernel/rcu/tree_stall.h | 28 +- + kernel/scftorture.c | 49 +- + kernel/sched/core.c | 6 +- + kernel/sysctl.c | 11 + + kernel/torture.c | 34 +- + lib/Kconfig.debug | 3 - + tools/include/nolibc/nolibc.h | 4 +- + tools/memory-model/Documentation/README | 76 +++ + .../Documentation/control-dependencies.txt | 258 ++++++++++ + tools/memory-model/Documentation/glossary.txt | 155 ++++++ + tools/memory-model/Documentation/litmus-tests.txt | 17 + + tools/memory-model/Documentation/locking.txt | 320 ++++++++++++ + tools/memory-model/Documentation/ordering.txt | 557 +++++++++++++++++++++ + 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/bin/console-badness.sh | 3 +- + .../testing/selftests/rcutorture/bin/functions.sh | 1 + + .../selftests/rcutorture/bin/kvm-check-branches.sh | 5 +- + .../rcutorture/bin/kvm-recheck-rcuscale.sh | 2 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 19 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 29 +- + .../selftests/rcutorture/bin/parse-console.sh | 2 +- + .../selftests/rcutorture/configs/rcu/SRCU-t | 4 +- + .../selftests/rcutorture/configs/rcu/SRCU-u | 4 +- + .../selftests/rcutorture/configs/rcu/TINY01 | 1 - + .../selftests/rcutorture/configs/rcu/TRACE01 | 6 +- + .../selftests/rcutorture/configs/rcu/TRACE02 | 6 +- + .../selftests/rcutorture/configs/rcuscale/CFcommon | 3 + + .../selftests/rcutorture/configs/rcuscale/TRACE01 | 15 + + .../rcutorture/configs/rcuscale/TRACE01.boot | 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 - + 97 files changed, 2765 insertions(+), 435 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/glossary.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 + create mode 100644 tools/testing/selftests/rcutorture/configs/rcuscale/TRACE01 + create mode 100644 tools/testing/selftests/rcutorture/configs/rcuscale/TRACE01.boot +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 (22f553842b14 KVM: arm64: Handle Asymmetric AArch32 systems) +$ 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 (eb4c8d15efda Merge branch 'for-5.11' into for-next) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + mm/percpu.c | 40 ++++++++++++++++++++++------------------ + 1 file changed, 22 insertions(+), 18 deletions(-) +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 (5c54cb6c627e platform/x86: acer-wmi: Add support for SW_TABLET_MODE on Switch devices) +$ git merge drivers-x86/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-class-firmware-attributes | 224 +++ + MAINTAINERS | 19 +- + drivers/platform/Kconfig | 2 + + drivers/platform/Makefile | 1 + + drivers/platform/mellanox/Kconfig | 10 + + drivers/platform/mellanox/Makefile | 1 + + drivers/platform/mellanox/mlxbf-pmc.c | 1478 ++++++++++++++++++++ + drivers/platform/surface/Kconfig | 49 + + drivers/platform/surface/Makefile | 10 + + drivers/platform/{x86 => surface}/surface3-wmi.c | 0 + .../platform/{x86 => surface}/surface3_button.c | 0 + drivers/platform/{x86 => surface}/surface3_power.c | 0 + .../platform/{x86 => surface}/surfacepro3_button.c | 0 + drivers/platform/x86/Kconfig | 43 +- + drivers/platform/x86/Makefile | 7 +- + drivers/platform/x86/acer-wmi.c | 166 ++- + drivers/platform/x86/asus-nb-wmi.c | 15 + + drivers/platform/x86/asus-wmi.c | 40 + + drivers/platform/x86/asus-wmi.h | 1 + + drivers/platform/x86/dell-wmi-sysman/Makefile | 8 + + .../x86/dell-wmi-sysman/biosattr-interface.c | 186 +++ + .../platform/x86/dell-wmi-sysman/dell-wmi-sysman.h | 191 +++ + .../platform/x86/dell-wmi-sysman/enum-attributes.c | 189 +++ + .../platform/x86/dell-wmi-sysman/int-attributes.c | 173 +++ + .../x86/dell-wmi-sysman/passobj-attributes.c | 194 +++ + .../x86/dell-wmi-sysman/passwordattr-interface.c | 153 ++ + .../x86/dell-wmi-sysman/string-attributes.c | 159 +++ + drivers/platform/x86/dell-wmi-sysman/sysman.c | 625 +++++++++ + drivers/platform/x86/sony-laptop.c | 3 - + drivers/platform/x86/touchscreen_dmi.c | 27 + + drivers/platform/x86/wmi.c | 7 +- + include/linux/platform_data/x86/asus-wmi.h | 1 + + 32 files changed, 3901 insertions(+), 81 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-firmware-attributes + create mode 100644 drivers/platform/mellanox/mlxbf-pmc.c + create mode 100644 drivers/platform/surface/Kconfig + create mode 100644 drivers/platform/surface/Makefile + rename drivers/platform/{x86 => surface}/surface3-wmi.c (100%) + rename drivers/platform/{x86 => surface}/surface3_button.c (100%) + rename drivers/platform/{x86 => surface}/surface3_power.c (100%) + rename drivers/platform/{x86 => surface}/surfacepro3_button.c (100%) + create mode 100644 drivers/platform/x86/dell-wmi-sysman/Makefile + create mode 100644 drivers/platform/x86/dell-wmi-sysman/biosattr-interface.c + create mode 100644 drivers/platform/x86/dell-wmi-sysman/dell-wmi-sysman.h + create mode 100644 drivers/platform/x86/dell-wmi-sysman/enum-attributes.c + create mode 100644 drivers/platform/x86/dell-wmi-sysman/int-attributes.c + create mode 100644 drivers/platform/x86/dell-wmi-sysman/passobj-attributes.c + create mode 100644 drivers/platform/x86/dell-wmi-sysman/passwordattr-interface.c + create mode 100644 drivers/platform/x86/dell-wmi-sysman/string-attributes.c + create mode 100644 drivers/platform/x86/dell-wmi-sysman/sysman.c +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 (6c3e42616bf2 leds: various: add missing put_device() call in netxbig_leds_get_of_pdata()) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + Documentation/leds/leds-class.rst | 10 ---------- + drivers/leds/leds-netxbig.c | 35 ++++++++++++++++++++++++----------- + 2 files changed, 24 insertions(+), 21 deletions(-) +Merging ipmi/for-next (0df7b988d9df char: ipmi: remove unneeded break) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_devintf.c | 1 - + 1 file changed, 1 deletion(-) +Merging driver-core/driver-core-next (3cea11cd5e3b Linux 5.10-rc2) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (35ad0d901eac usb: misc: brcmstb-usb-pinmap: Fix an IS_ERR() vs NULL check) +$ git merge usb/usb-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/connector/usb-connector.yaml | 19 ++ + .../devicetree/bindings/usb/brcm,usb-pinmap.yaml | 70 ++++ + MAINTAINERS | 8 + + drivers/usb/atm/usbatm.c | 2 +- + drivers/usb/core/buffer.c | 6 +- + drivers/usb/core/hcd-pci.c | 6 +- + drivers/usb/core/hcd.c | 37 ++- + drivers/usb/core/hub.c | 3 +- + drivers/usb/core/message.c | 35 +- + drivers/usb/core/usb.c | 4 +- + drivers/usb/gadget/udc/core.c | 2 - + drivers/usb/gadget/udc/dummy_hcd.c | 6 +- + drivers/usb/gadget/udc/pxa27x_udc.c | 19 +- + drivers/usb/host/ehci-fsl.c | 9 +- + drivers/usb/host/ehci-pmcmsp.c | 15 +- + drivers/usb/host/ehci-sched.c | 12 + + drivers/usb/host/isp1362.h | 54 ---- + drivers/usb/host/ohci-at91.c | 11 +- + drivers/usb/host/ohci-omap.c | 9 +- + drivers/usb/host/ohci-pxa27x.c | 11 +- + drivers/usb/host/ohci-s3c2410.c | 12 +- + drivers/usb/host/xhci-mem.c | 3 +- + drivers/usb/host/xhci.c | 6 +- + drivers/usb/misc/Kconfig | 9 + + drivers/usb/misc/Makefile | 1 + + drivers/usb/misc/brcmstb-usb-pinmap.c | 351 +++++++++++++++++++++ + drivers/usb/misc/iowarrior.c | 3 - + drivers/usb/misc/sisusbvga/Kconfig | 2 +- + drivers/usb/storage/freecom.c | 1 - + drivers/usb/usbip/usbip_common.c | 5 - + include/dt-bindings/usb/pd.h | 8 + + 31 files changed, 596 insertions(+), 143 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/brcm,usb-pinmap.yaml + create mode 100644 drivers/usb/misc/brcmstb-usb-pinmap.c +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 (179dfb954790 USB: serial: remove write wait queue) +$ git merge usb-serial/usb-next +Merge made by the 'recursive' strategy. + arch/arm/configs/badge4_defconfig | 1 - + arch/arm/configs/corgi_defconfig | 1 - + arch/arm/configs/pxa_defconfig | 1 - + arch/arm/configs/spitz_defconfig | 1 - + arch/mips/configs/mtx1_defconfig | 1 - + arch/mips/configs/rm200_defconfig | 1 - + arch/powerpc/configs/g5_defconfig | 1 - + arch/powerpc/configs/ppc6xx_defconfig | 1 - + drivers/usb/serial/Kconfig | 19 +- + drivers/usb/serial/Makefile | 1 - + drivers/usb/serial/digi_acceleport.c | 62 ++-- + drivers/usb/serial/iuu_phoenix.c | 2 - + drivers/usb/serial/keyspan_pda.c | 548 +++++++++++++++------------------- + include/linux/usb/serial.h | 2 - + 14 files changed, 262 insertions(+), 380 deletions(-) +Merging usb-chipidea-next/for-usb-next (eba158772841 usb: cdns3: Rids of duplicate error message) +$ git merge usb-chipidea-next/for-usb-next +Auto-merging drivers/usb/cdns3/gadget.c +Merge made by the 'recursive' strategy. + drivers/usb/cdns3/core.c | 12 ++---------- + drivers/usb/cdns3/gadget-export.h | 3 --- + drivers/usb/cdns3/gadget.c | 2 +- + 3 files changed, 3 insertions(+), 14 deletions(-) +Merging phy-next/next (c36f74566cef MAINTAINERS: Add entry for Qualcomm IPQ4019 USB PHY) +$ git merge phy-next/next +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7718f1a85ce4] Merge remote-tracking branch 'phy-next/next' into master +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 8 ++++++++ + drivers/phy/freescale/phy-fsl-imx8mq-usb.c | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) +Merging tty/tty-next (724ec7c190c1 Merge 5.10-rc2 into tty-next) +$ git merge tty/tty-next +Merge made by the 'recursive' strategy. + drivers/tty/goldfish.c | 18 +++++++------- + drivers/tty/nozomi.c | 5 +--- + drivers/tty/serial/max310x.c | 57 +++++++++++++++++++------------------------- + include/linux/goldfish.h | 8 +++---- + 4 files changed, 38 insertions(+), 50 deletions(-) +Merging char-misc/char-misc-next (c2192bbc3c50 mei: bus: deinitialize callback functions on init failure) +$ git merge char-misc/char-misc-next +Merge made by the 'recursive' strategy. + drivers/char/misc.c | 2 +- + drivers/misc/c2port/core.c | 2 +- + drivers/misc/hisi_hikey_usb.c | 5 +---- + drivers/misc/mei/bus.c | 18 ++++++++++++++---- + drivers/misc/mei/hbm.c | 1 - + drivers/misc/ocxl/config.c | 2 +- + drivers/misc/pci_endpoint_test.c | 2 +- + drivers/misc/ti-st/st_core.c | 2 +- + drivers/misc/xilinx_sdfec.c | 28 ++++------------------------ + 9 files changed, 24 insertions(+), 38 deletions(-) +Merging extcon/extcon-next (54589b557a8d extcon: fsa9480: Support TI TSU6111 variant) +$ git merge extcon/extcon-next +Removing Documentation/devicetree/bindings/extcon/extcon-fsa9480.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/extcon/extcon-fsa9480.txt | 21 --- + .../bindings/extcon/extcon-usbc-tusb320.yaml | 41 +++++ + .../devicetree/bindings/extcon/fcs,fsa880.yaml | 52 ++++++ + drivers/extcon/Kconfig | 8 + + drivers/extcon/Makefile | 1 + + drivers/extcon/extcon-fsa9480.c | 1 + + drivers/extcon/extcon-usbc-tusb320.c | 184 +++++++++++++++++++++ + 7 files changed, 287 insertions(+), 21 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/extcon/extcon-fsa9480.txt + create mode 100644 Documentation/devicetree/bindings/extcon/extcon-usbc-tusb320.yaml + create mode 100644 Documentation/devicetree/bindings/extcon/fcs,fsa880.yaml + create mode 100644 drivers/extcon/extcon-usbc-tusb320.c +Merging soundwire/next (3650b228f83a Linux 5.10-rc1) +$ git merge soundwire/next +Already up to date. +Merging thunderbolt/next (3cea11cd5e3b Linux 5.10-rc2) +$ 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 (83e63b2cc416 Merge 5.10-rc2 into staging-next) +$ git merge staging/staging-next +Removing tools/testing/selftests/android/run.sh +CONFLICT (modify/delete): tools/testing/selftests/android/ion/ipcsocket.h deleted in staging/staging-next and modified in HEAD. Version HEAD of tools/testing/selftests/android/ion/ipcsocket.h left in tree. +CONFLICT (modify/delete): tools/testing/selftests/android/ion/ipcsocket.c deleted in staging/staging-next and modified in HEAD. Version HEAD of tools/testing/selftests/android/ion/ipcsocket.c left in tree. +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 +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f tools/testing/selftests/android/ion/ipcsocket.c tools/testing/selftests/android/ion/ipcsocket.h +rm 'tools/testing/selftests/android/ion/ipcsocket.c' +rm 'tools/testing/selftests/android/ion/ipcsocket.h' +$ git commit --no-edit -v -a +[master 8660baf0b28d] Merge remote-tracking branch 'staging/staging-next' into master +$ git diff -M --stat --summary HEAD^.. + 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/fieldbus/anybuss/hms-profinet.c | 5 +- + 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/kpc2000/kpc_dma/dma.c | 21 +- + drivers/staging/kpc2000/kpc_dma/fileops.c | 28 +- + drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.c | 13 +- + 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 | 21 +- + 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_ap.c | 6 +- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 33 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 5 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 24 +- + drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 6 +- + drivers/staging/rtl8723bs/core/rtw_recv.c | 3 +- + drivers/staging/rtl8723bs/core/rtw_security.c | 4 +- + drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 3 +- + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 6 +- + drivers/staging/rtl8723bs/core/rtw_xmit.c | 14 +- + drivers/staging/rtl8723bs/hal/hal_intf.c | 4 +- + drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 56 +- + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 116 ++-- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 16 +- + drivers/staging/rtl8723bs/os_dep/recv_linux.c | 2 +- + drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 2 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 189 +++--- + .../vc04_services/interface/vchiq_arm/vchiq_arm.h | 27 +- + .../vc04_services/interface/vchiq_arm/vchiq_cfg.h | 6 +- + .../interface/vchiq_arm/vchiq_connected.c | 3 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 277 +++++---- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 55 +- + .../interface/vchiq_arm/vchiq_debugfs.c | 8 +- + drivers/staging/vt6655/card.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 | 228 -------- + tools/testing/selftests/android/ion/ipcsocket.h | 33 -- + tools/testing/selftests/android/run.sh | 3 - + 91 files changed, 797 insertions(+), 4139 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 (fce52ad34832 interconnect: qcom: use icc_sync state for sm8[12]50) +$ git merge icc/icc-next +Already up to date. +Merging dmaengine/next (4749f51ddd8a dmaengine: idxd: Add ABI documentation for shared wq) +$ git merge dmaengine/next +Auto-merging drivers/dma/idxd/registers.h +CONFLICT (content): Merge conflict in drivers/dma/idxd/registers.h +Auto-merging drivers/dma/idxd/init.c +Auto-merging drivers/dma/idxd/idxd.h +Auto-merging drivers/dma/idxd/device.c +CONFLICT (content): Merge conflict in drivers/dma/idxd/device.c +Auto-merging drivers/dma/Kconfig +Resolved 'drivers/dma/idxd/device.c' using previous resolution. +Resolved 'drivers/dma/idxd/registers.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f34cf763ab26] Merge remote-tracking branch 'dmaengine/next' into master +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/stable/sysfs-driver-dma-idxd | 14 ++ + .../devicetree/bindings/dma/atmel-xdma.txt | 3 +- + drivers/dma/Kconfig | 10 ++ + drivers/dma/at_xdmac.c | 163 +++++++++++++++++---- + drivers/dma/idxd/cdev.c | 49 ++++++- + drivers/dma/idxd/device.c | 90 +++++++++++- + drivers/dma/idxd/dma.c | 9 -- + drivers/dma/idxd/idxd.h | 33 ++++- + drivers/dma/idxd/init.c | 92 +++++++++--- + drivers/dma/idxd/irq.c | 146 ++++++++++++++++-- + drivers/dma/idxd/registers.h | 2 + + drivers/dma/idxd/submit.c | 35 ++++- + drivers/dma/idxd/sysfs.c | 127 ++++++++++++++++ + drivers/dma/pl330.c | 2 - + drivers/dma/ppc4xx/adma.c | 4 +- + drivers/dma/stm32-mdma.c | 2 +- + 16 files changed, 690 insertions(+), 91 deletions(-) +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 (af61bc1e33d2 scsi: hpsa: Fix memory leak in hpsa_init_one()) +$ git merge scsi/for-next +Already up to date. +Merging scsi-mkp/for-next (d90196317484 scsi: zfcp: Handle event-lost notification for Version Change events) +$ git merge scsi-mkp/for-next +Auto-merging drivers/target/target_core_user.c +Auto-merging drivers/scsi/hpsa.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/s390/scsi/zfcp_aux.c | 11 + + drivers/s390/scsi/zfcp_def.h | 1 + + drivers/s390/scsi/zfcp_ext.h | 2 - + drivers/s390/scsi/zfcp_fsf.c | 19 + + drivers/s390/scsi/zfcp_fsf.h | 11 + + drivers/s390/scsi/zfcp_qdio.c | 47 +++ + drivers/s390/scsi/zfcp_qdio.h | 2 + + drivers/scsi/aic94xx/aic94xx_task.c | 1 - + drivers/scsi/arcmsr/arcmsr.h | 1 + + drivers/scsi/arcmsr/arcmsr_hba.c | 20 +- + drivers/scsi/be2iscsi/be_mgmt.c | 4 - + drivers/scsi/bnx2fc/bnx2fc.h | 1 - + 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/ipr.c | 1 - + drivers/scsi/isci/phy.c | 2 - + drivers/scsi/iscsi_tcp.c | 4 +- + drivers/scsi/libfc/fc_elsct.c | 2 +- + {include/scsi => drivers/scsi/libfc}/fc_encode.h | 60 +-- + drivers/scsi/libfc/fc_exch.c | 3 +- + drivers/scsi/libfc/fc_fcp.c | 2 +- + drivers/scsi/libfc/fc_libfc.c | 2 +- + drivers/scsi/libfc/fc_lport.c | 2 +- + drivers/scsi/libfc/fc_rport.c | 2 +- + 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/qedf/qedf.h | 1 - + 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/scsi/ufs/ufs-qcom.c | 1 + + drivers/scsi/ufs/ufshcd.c | 9 +- + drivers/scsi/ufs/ufshcd.h | 13 + + drivers/target/target_core_user.c | 164 ++++---- + drivers/target/tcm_fc/tfc_cmd.c | 1 - + drivers/target/tcm_fc/tfc_io.c | 1 - + include/scsi/fc_frame.h | 30 ++ + include/scsi/scsi_transport_fc.h | 36 ++ + include/uapi/scsi/fc/fc_els.h | 114 +++++- + 65 files changed, 1449 insertions(+), 296 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-fc_host + create mode 100644 Documentation/ABI/testing/sysfs-class-fc_remote_ports + rename {include/scsi => drivers/scsi/libfc}/fc_encode.h (94%) +Merging vhost/linux-next (29ea7644edd2 swiotlb: using SIZE_MAX needs limits.h included) +$ git merge vhost/linux-next +Auto-merging include/linux/swiotlb.h +Merge made by the 'recursive' strategy. +Merging rpmsg/for-next (3e53119a2521 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Merge made by the 'recursive' strategy. + .../bindings/arm/stm32/st,stm32-syscon.yaml | 1 + + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 12 +-- + .../bindings/remoteproc/qcom,wcnss-pil.txt | 20 +++- + .../bindings/remoteproc/st,stm32-rproc.yaml | 21 ++-- + drivers/hwspinlock/sprd_hwspinlock.c | 15 +-- + drivers/remoteproc/qcom_q6v5_mss.c | 68 ++++++++++--- + drivers/remoteproc/qcom_wcnss.c | 109 ++++++++++++++++++--- + drivers/remoteproc/ti_k3_r5_remoteproc.c | 18 ++-- + 8 files changed, 194 insertions(+), 70 deletions(-) +Merging gpio/for-next (50afb29ae413 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Merge made by the 'recursive' strategy. + Documentation/driver-api/gpio/driver.rst | 67 +++++++----- + drivers/gpio/TODO | 49 --------- + drivers/gpio/gpio-omap.c | 12 ++- + drivers/gpio/gpio-stmpe.c | 10 +- + drivers/gpio/gpiolib-cdev.c | 24 ++--- + drivers/gpio/gpiolib.c | 168 ++----------------------------- + include/linux/gpio/driver.h | 71 ------------- + include/uapi/linux/gpio.h | 106 +++++++++---------- + 8 files changed, 126 insertions(+), 381 deletions(-) +Merging gpio-brgl/gpio/for-next (183245c4f204 gpio: rcar: Implement gpio_chip.get_multiple()) +$ git merge gpio-brgl/gpio/for-next +Auto-merging drivers/gpio/gpiolib.c +Auto-merging drivers/gpio/gpiolib-cdev.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-pca95xx.yaml | 1 + + drivers/gpio/gpio-mockup.c | 11 ++- + drivers/gpio/gpio-rcar.c | 87 ++++++++++++++-------- + drivers/gpio/gpiolib-cdev.c | 33 +++++--- + 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 + + 9 files changed, 118 insertions(+), 71 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 (1f955a68d179 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/pinctrl-ingenic.c | 72 +++++++++++++++++----------------- + drivers/pinctrl/pinctrl-mcp23s08_spi.c | 4 +- + drivers/pinctrl/pinctrl-rockchip.c | 30 +++++++------- + 3 files changed, 53 insertions(+), 53 deletions(-) +$ git am -3 ../patches/0001-Revert-pinctrl-rockchip-make-driver-be-tristate-modu.patch +Applying: Revert "pinctrl: rockchip: make driver be tristate module" +Using index info to reconstruct a base tree... +M drivers/pinctrl/Kconfig +M drivers/pinctrl/pinctrl-rockchip.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging pinctrl-intel/for-next (0ddebf8580fa pinctrl: lynxpoint: Unify initcall location in the code) +$ git merge pinctrl-intel/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/intel/Kconfig | 25 ++ + drivers/pinctrl/intel/Makefile | 3 + + drivers/pinctrl/intel/pinctrl-alderlake.c | 437 ++++++++++++++++++++++++ + drivers/pinctrl/intel/pinctrl-elkhartlake.c | 513 ++++++++++++++++++++++++++++ + drivers/pinctrl/intel/pinctrl-intel.c | 40 ++- + drivers/pinctrl/intel/pinctrl-lakefield.c | 375 ++++++++++++++++++++ + drivers/pinctrl/intel/pinctrl-lynxpoint.c | 3 +- + 7 files changed, 1384 insertions(+), 12 deletions(-) + create mode 100644 drivers/pinctrl/intel/pinctrl-alderlake.c + create mode 100644 drivers/pinctrl/intel/pinctrl-elkhartlake.c + create mode 100644 drivers/pinctrl/intel/pinctrl-lakefield.c +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 (b2f1c3db2887 kselftest: Extend vdso correctness test to clock_gettime64) +$ git merge kselftest/next +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'recursive' strategy. + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/vDSO/Makefile | 16 +- + tools/testing/selftests/vDSO/vdso_config.h | 92 ++++++++ + tools/testing/selftests/vDSO/vdso_test_abi.c | 244 +++++++++++++++++++++ + .../selftests/vDSO/vdso_test_clock_getres.c | 124 +++++++++++ + .../test_vdso.c => vDSO/vdso_test_correctness.c} | 115 +++++++++- + tools/testing/selftests/x86/Makefile | 2 +- + 7 files changed, 586 insertions(+), 8 deletions(-) + create mode 100644 tools/testing/selftests/vDSO/vdso_config.h + create mode 100644 tools/testing/selftests/vDSO/vdso_test_abi.c + create mode 100644 tools/testing/selftests/vDSO/vdso_test_clock_getres.c + rename tools/testing/selftests/{x86/test_vdso.c => vDSO/vdso_test_correctness.c} (73%) +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 (b5882e904ce1 coresight: etb10: Fix possible NULL ptr dereference in etb_enable_perf()) +$ git merge coresight/next +Auto-merging drivers/hwtracing/coresight/coresight-core.c +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight-core.c | 2 +- + drivers/hwtracing/coresight/coresight-etb10.c | 4 +- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 50 ++++++++++++++-------- + drivers/hwtracing/coresight/coresight-funnel.c | 2 +- + drivers/hwtracing/coresight/coresight-priv.h | 2 + + drivers/hwtracing/coresight/coresight-replicator.c | 2 +- + drivers/hwtracing/coresight/coresight-tmc-etf.c | 4 +- + 7 files changed, 44 insertions(+), 22 deletions(-) +Merging rtc/rtc-next (28d211919e42 rtc: sun6i: Fix memleak in sun6i_rtc_clk_init) +$ git merge rtc/rtc-next +Merge made by the 'recursive' strategy. + drivers/rtc/rtc-pcf2127.c | 68 ++++++++++++++++++++++++----------------------- + drivers/rtc/rtc-sun6i.c | 8 +++--- + 2 files changed, 40 insertions(+), 36 deletions(-) +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 (38c37e8fd3d2 arm: Enable seccomp architecture tracking) +$ git merge seccomp/for-next/seccomp +Merge made by the 'recursive' strategy. + arch/arm/include/asm/Kbuild | 1 - + arch/arm/include/asm/seccomp.h | 11 + + arch/arm64/include/asm/seccomp.h | 15 ++ + arch/x86/include/asm/seccomp.h | 20 ++ + kernel/seccomp.c | 233 ++++++++++++++++++++- + .../testing/selftests/seccomp/seccomp_benchmark.c | 151 +++++++++++-- + tools/testing/selftests/seccomp/settings | 2 +- + 7 files changed, 408 insertions(+), 25 deletions(-) + create mode 100644 arch/arm/include/asm/seccomp.h +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 (436d15fbeaee nvmem: qfprom: Don't touch certain fuses) +$ git merge nvmem/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/nvmem/mtk-efuse.txt | 1 + + .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 17 ++- + drivers/nvmem/core.c | 153 ++++++++++++++++++++- + drivers/nvmem/qfprom.c | 30 ++++ + include/linux/nvmem-provider.h | 17 +++ + 5 files changed, 211 insertions(+), 7 deletions(-) +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 (8c9108d014c5 auxdisplay: add a driver for lcd2s character display) +$ git merge auxdisplay/auxdisplay +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + .../bindings/auxdisplay/modtronix,lcd2s.yaml | 58 +++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + drivers/auxdisplay/Kconfig | 30 ++ + drivers/auxdisplay/Makefile | 2 + + drivers/auxdisplay/charlcd.c | 412 ++++++--------------- + drivers/auxdisplay/charlcd.h | 86 ++++- + drivers/auxdisplay/hd44780.c | 120 ++++-- + drivers/auxdisplay/hd44780_common.c | 361 ++++++++++++++++++ + drivers/auxdisplay/hd44780_common.h | 33 ++ + drivers/auxdisplay/lcd2s.c | 403 ++++++++++++++++++++ + drivers/auxdisplay/panel.c | 180 ++++----- + 11 files changed, 1237 insertions(+), 450 deletions(-) + create mode 100644 Documentation/devicetree/bindings/auxdisplay/modtronix,lcd2s.yaml + create mode 100644 drivers/auxdisplay/hd44780_common.c + create mode 100644 drivers/auxdisplay/hd44780_common.h + create mode 100644 drivers/auxdisplay/lcd2s.c +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 (3650b228f83a Linux 5.10-rc1) +$ git merge mhi/mhi-next +Already up to date. +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 2d71c0ca9770] 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 ad7a208a0ffe] Merge remote-tracking branch 'notifications/notifications-pipe-core' into master + Date: Thu Nov 5 14:48:36 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 (3650b228f83a Linux 5.10-rc1) +$ git merge counters/counters +Already up to date. +Merging akpm-current/current (abae383d7829 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 kernel/sysctl.c +Auto-merging kernel/fork.c +Auto-merging include/linux/sched.h +CONFLICT (content): Merge conflict in include/linux/sched.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/dcache.h +Auto-merging include/linux/compiler-gcc.h +Auto-merging fs/iomap/buffered-io.c +Auto-merging arch/x86/entry/vdso/vma.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/sparc/Kconfig +Auto-merging arch/s390/configs/defconfig +Auto-merging arch/s390/configs/debug_defconfig +Auto-merging arch/s390/Kconfig +Auto-merging arch/riscv/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/m68k/Kconfig.cpu +Auto-merging arch/ia64/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/mm/init.c +Auto-merging arch/arm/Kconfig +Auto-merging arch/arc/Kconfig +Auto-merging arch/alpha/Kconfig +Auto-merging MAINTAINERS +Resolved 'include/linux/sched.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7e862491dc63] Merge branch 'akpm-current/current' into master +$ git diff -M --stat --summary HEAD^.. + .mailmap | 5 +- + 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 +- + Documentation/dev-tools/index.rst | 1 + + Documentation/dev-tools/kfence.rst | 297 +++++++++ + Documentation/filesystems/proc.rst | 2 + + Documentation/vm/memory-model.rst | 3 +- + MAINTAINERS | 12 + + arch/Kconfig | 13 + + arch/alpha/Kconfig | 8 + + arch/alpha/include/asm/mmzone.h | 14 +- + arch/alpha/include/asm/page.h | 7 +- + arch/alpha/include/asm/pgtable.h | 12 +- + arch/alpha/include/asm/sparsemem.h | 18 + + arch/alpha/kernel/setup.c | 1 + + arch/arc/Kconfig | 3 +- + arch/arc/include/asm/page.h | 20 +- + arch/arc/mm/init.c | 29 +- + arch/arm/Kconfig | 10 +- + arch/arm/kernel/vdso.c | 9 - + arch/arm/mach-bcm/Kconfig | 1 - + arch/arm/mach-davinci/Kconfig | 1 - + arch/arm/mach-exynos/Kconfig | 1 - + arch/arm/mach-highbank/Kconfig | 1 - + arch/arm/mach-omap2/Kconfig | 1 - + arch/arm/mach-s5pv210/Kconfig | 1 - + arch/arm/mach-tango/Kconfig | 1 - + arch/arm/mm/init.c | 78 --- + arch/arm64/Kconfig | 10 +- + arch/arm64/include/asm/cacheflush.h | 1 + + arch/arm64/include/asm/kfence.h | 19 + + arch/arm64/include/asm/pgtable.h | 1 + + arch/arm64/kernel/vdso.c | 39 +- + arch/arm64/mm/fault.c | 4 + + arch/arm64/mm/init.c | 68 -- + arch/arm64/mm/mmu.c | 7 +- + arch/arm64/mm/pageattr.c | 6 +- + arch/ia64/Kconfig | 11 +- + arch/ia64/include/asm/meminit.h | 2 - + arch/ia64/include/asm/sparsemem.h | 6 + + arch/ia64/mm/contig.c | 58 +- + arch/ia64/mm/discontig.c | 44 +- + arch/ia64/mm/init.c | 14 - + arch/ia64/mm/numa.c | 30 - + arch/m68k/Kconfig.cpu | 31 +- + arch/m68k/include/asm/page.h | 2 + + arch/m68k/include/asm/page_mm.h | 7 +- + arch/m68k/include/asm/virtconvert.h | 5 - + arch/m68k/mm/init.c | 8 +- + arch/mips/mm/pgtable-32.c | 1 - + arch/mips/mm/pgtable-64.c | 1 - + arch/mips/vdso/genvdso.c | 4 - + arch/powerpc/Kconfig | 5 +- + arch/powerpc/include/asm/sparsemem.h | 3 +- + arch/riscv/Kconfig | 4 +- + arch/riscv/include/asm/pgtable.h | 2 - + arch/riscv/include/asm/set_memory.h | 1 + + arch/riscv/mm/pageattr.c | 31 + + arch/s390/Kconfig | 4 +- + arch/s390/configs/debug_defconfig | 2 +- + arch/s390/configs/defconfig | 2 +- + arch/s390/kernel/vdso.c | 11 +- + arch/sparc/Kconfig | 4 +- + arch/x86/Kconfig | 6 +- + arch/x86/boot/compressed/string.c | 6 +- + arch/x86/entry/vdso/vma.c | 17 - + arch/x86/include/asm/kfence.h | 65 ++ + arch/x86/include/asm/set_memory.h | 1 + + arch/x86/include/asm/sparsemem.h | 10 + + arch/x86/include/asm/syscall_wrapper.h | 2 +- + arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 2 +- + arch/x86/mm/fault.c | 5 + + arch/x86/mm/numa.c | 2 + + arch/x86/mm/pat/set_memory.c | 4 +- + drivers/block/zram/zram_drv.c | 21 +- + drivers/dax/Kconfig | 1 - + drivers/dax/device.c | 4 +- + drivers/dax/kmem.c | 2 +- + drivers/firmware/efi/runtime-wrappers.c | 2 +- + drivers/gpio/gpio-thunderx.c | 11 +- + drivers/gpio/gpio-xilinx.c | 65 +- + drivers/virtio/virtio_balloon.c | 4 +- + drivers/xen/unpopulated-alloc.c | 14 +- + fs/aio.c | 14 +- + fs/buffer.c | 58 +- + fs/dax.c | 9 +- + fs/iomap/buffered-io.c | 2 +- + fs/nfs/callback_proc.c | 5 + + fs/ocfs2/cluster/tcp.c | 1 - + fs/ocfs2/namei.c | 21 +- + fs/proc/array.c | 28 + + fs/proc/base.c | 2 +- + fs/proc/kcore.c | 2 - + fs/proc/page.c | 40 +- + fs/proc/proc_net.c | 4 +- + fs/ramfs/inode.c | 12 + + fs/reiserfs/stree.c | 6 + + include/asm-generic/barrier.h | 1 + + include/asm-generic/bitops/find.h | 19 + + include/asm-generic/getorder.h | 2 +- + include/linux/bitmap.h | 65 +- + include/linux/bitops.h | 24 +- + include/linux/compiler-clang.h | 6 - + include/linux/compiler-gcc.h | 19 - + include/linux/compiler.h | 18 +- + include/linux/compiler_attributes.h | 2 +- + include/linux/dcache.h | 1 + + include/linux/iommu-helper.h | 4 +- + include/linux/kernel.h | 173 +----- + include/linux/kfence.h | 201 ++++++ + include/linux/math.h | 177 ++++++ + include/linux/memcontrol.h | 221 ++++++- + include/linux/memory_hotplug.h | 14 - + include/linux/memremap.h | 6 + + include/linux/mm.h | 118 ++-- + include/linux/mm_types.h | 5 +- + include/linux/mmdebug.h | 13 + + include/linux/mmzone.h | 42 -- + include/linux/nmi.h | 1 + + include/linux/numa.h | 30 +- + include/linux/page-flags.h | 14 +- + include/linux/page_ext.h | 8 + + include/linux/pagemap.h | 2 + + include/linux/poison.h | 4 - + include/linux/rcu_node_tree.h | 2 + + include/linux/sched.h | 8 + + include/linux/set_memory.h | 5 + + include/linux/slab_def.h | 3 + + include/linux/slub_def.h | 3 + + include/linux/units.h | 2 +- + include/linux/wait.h | 4 +- + include/trace/events/sched.h | 84 +++ + include/trace/events/writeback.h | 2 +- + 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 | 7 +- + ipc/shm.c | 8 +- + kernel/acct.c | 7 +- + kernel/crash_core.c | 1 + + kernel/fail_function.c | 6 +- + kernel/fork.c | 7 +- + kernel/hung_task.c | 44 ++ + kernel/kcsan/core.c | 10 +- + kernel/kthread.c | 29 +- + kernel/power/hibernate.c | 2 +- + kernel/power/power.h | 2 +- + kernel/power/snapshot.c | 46 +- + kernel/ptrace.c | 2 +- + kernel/reboot.c | 30 +- + kernel/sysctl.c | 8 +- + kernel/watchdog.c | 21 + + kernel/watchdog_hld.c | 1 + + lib/Kconfig | 9 + + lib/Kconfig.debug | 7 + + lib/Kconfig.kfence | 72 +++ + lib/cpumask.c | 66 +- + lib/crc32.c | 4 +- + lib/crypto/aes.c | 4 +- + lib/errname.c | 1 + + lib/error-inject.c | 2 + + lib/errseq.c | 1 + + lib/find_bit.c | 17 +- + lib/lzo/lzo1x_compress.c | 2 +- + lib/math/div64.c | 4 +- + lib/math/int_pow.c | 2 +- + lib/math/int_sqrt.c | 3 +- + lib/math/reciprocal_div.c | 9 +- + lib/stackdepot.c | 14 +- + lib/test_bitmap.c | 143 +++++ + lib/test_free_pages.c | 5 + + lib/test_lockup.c | 16 + + mm/Kconfig | 21 +- + mm/Kconfig.debug | 28 +- + mm/Makefile | 3 +- + mm/cma.c | 4 +- + mm/compaction.c | 19 +- + mm/debug.c | 4 +- + mm/filemap.c | 576 +++++++++-------- + mm/gup.c | 14 +- + mm/{gup_benchmark.c => gup_test.c} | 111 ++-- + mm/gup_test.h | 32 + + mm/huge_memory.c | 10 +- + mm/hugetlb.c | 5 +- + mm/kasan/common.c | 19 + + mm/kasan/generic.c | 11 +- + mm/kfence/Makefile | 6 + + mm/kfence/core.c | 826 +++++++++++++++++++++++++ + mm/kfence/kfence.h | 107 ++++ + mm/kfence/kfence_test.c | 823 ++++++++++++++++++++++++ + mm/kfence/report.c | 235 +++++++ + mm/khugepaged.c | 4 +- + mm/memblock.c | 80 +++ + mm/memcontrol.c | 182 +++--- + mm/memory.c | 47 +- + mm/memory_hotplug.c | 21 +- + mm/memremap.c | 20 + + mm/migrate.c | 11 +- + mm/mmap.c | 65 +- + mm/mmzone.c | 14 - + mm/mremap.c | 280 +++++++-- + mm/msync.c | 6 +- + mm/nommu.c | 8 +- + mm/oom_kill.c | 14 +- + mm/page_alloc.c | 156 ++--- + mm/page_ext.c | 10 +- + mm/page_io.c | 6 +- + mm/page_poison.c | 56 +- + mm/process_vm_access.c | 2 +- + mm/shmem.c | 2 +- + mm/slab.c | 46 +- + mm/slab.h | 42 +- + mm/slab_common.c | 9 +- + mm/slub.c | 66 +- + mm/swap.c | 3 + + mm/swap_state.c | 4 +- + mm/swapfile.c | 14 +- + mm/vmalloc.c | 6 +- + mm/vmscan.c | 7 +- + mm/vmstat.c | 36 +- + mm/workingset.c | 2 +- + mm/zsmalloc.c | 11 +- + mm/zswap.c | 8 +- + scripts/checkpatch.pl | 171 +++-- + tools/include/linux/poison.h | 6 +- + 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 ++++++++++ + tools/testing/selftests/vm/run_vmtests | 43 +- + 242 files changed, 6415 insertions(+), 2079 deletions(-) + create mode 100644 Documentation/dev-tools/kfence.rst + create mode 100644 arch/alpha/include/asm/sparsemem.h + create mode 100644 arch/arm64/include/asm/kfence.h + create mode 100644 arch/x86/include/asm/kfence.h + create mode 100644 include/linux/kfence.h + create mode 100644 include/linux/math.h + create mode 100644 lib/Kconfig.kfence + rename mm/{gup_benchmark.c => gup_test.c} (60%) + create mode 100644 mm/gup_test.h + create mode 100644 mm/kfence/Makefile + create mode 100644 mm/kfence/core.c + create mode 100644 mm/kfence/kfence.h + create mode 100644 mm/kfence/kfence_test.c + create mode 100644 mm/kfence/report.c + 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 +$ git am -3 ../patches/0001-Revert-mm-fix-phys_to_target_node-and-memory_add_phy.patch +Applying: Revert "mm: fix phys_to_target_node() and memory_add_physaddr_to_nid() exports" +$ 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 + + 615cb57db17a...a8489dae981f akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (a8489dae981f 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..6ed6fe7c4a26 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20201105 |