diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-11-13 18:05:26 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-11-13 18:05:26 +1100 |
| commit | 92edc4aef86780a8ad01b092c6d6630bb3cb423d (patch) | |
| tree | 297ac2f5ec9d0e0c6c337ad796fbd43683f25692 | |
| parent | c5e552e0a50bd742de4dd7f8d5478ae511f065c9 (diff) | |
Add linux-next specific files for 20201113next-20201113
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 328 | ||||
| -rw-r--r-- | Next/Trees | 330 | ||||
| -rw-r--r-- | Next/merge.log | 8141 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 8800 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..98c59ce6fabb --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,328 @@ +Name SHA1 +---- ---- +origin af5043c89a8ef6b6949a245fff355a552eaed240 +fixes 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +kbuild-current d1889589a4f54b2d1d7075d608b596d6fcfd3d96 +arc-current 3b57533b460c8dc22a432684b7e8d22571f34d2e +arm-current 9fa2e7af3d53a4b769136eccc32c02e128a4ee51 +arm64-fixes 04e613ded8c26489b3e0f9101b44462f780d1a35 +arm-soc-fixes 3d696f42c7f4bfcc54bde545898d4b89a74f9cc0 +drivers-memory-fixes 3650b228f83adda7e5ee532e2b90429c03f7b9ec +m68k-current 50c5feeea0af99a4401fd54fd72bec1333a496ca +powerpc-fixes 01776f070ffcbf336be3bf1672bd3c589548d6c4 +s390-fixes 78d732e1f326f74f240d416af9484928303d9951 +sparc 0a95a6d1a4cd6e10e70f8a6c93dc2ecd02e7d6ab +fscrypt-current d19d8d345eecd9247cbe6cbf27aef271bd88aba7 +net edbc21113bde13ca3d06eec24b621b1f628583dd +bpf 9602182810cc15e241f06c63c90b828ef63d0507 +ipsec 48f486e13ffdb49fbb9b38c21d0e108ed60ab1a2 +netfilter fea07a487c6dd422dc8837237c9d2bc7c33119af +ipvs fea07a487c6dd422dc8837237c9d2bc7c33119af +wireless-drivers fe56d05ee6c87f6a1a8c7267affd92c9438249cc +mac80211 b2911a84396f72149dce310a3b64d8948212c1b3 +rdma-fixes f8394f232b1eab649ce2df5c5f15b0e528c92091 +sound-current b5acfe152abaa2721c9ca8aa67f941d7de55d24e +sound-asoc-fixes 016af47764cd2836e1c446faea659f35dfdca6fa +regmap-fixes 3650b228f83adda7e5ee532e2b90429c03f7b9ec +regulator-fixes 365ec8b61689bd64d6a61e129e0319bf71336407 +spi-fixes 5900ea64d9eefb67cfed08ea6969864b2f44bd5e +pci-current 832ea234277a2465ec6602fa6a4db5cd9ee87ae3 +driver-core.current f8394f232b1eab649ce2df5c5f15b0e528c92091 +tty.current 425af483523b76bc78e14674a430579d38b2a593 +usb.current 368183029cc4055c571ed19ceaa49c35de996611 +usb-gadget-fixes 129aa9734559a17990ee933351c7b6956f1dba62 +usb-serial-fixes f8394f232b1eab649ce2df5c5f15b0e528c92091 +usb-chipidea-fixes e136009ab0e45218faa99a8921e1c303b6979f15 +phy 25d76fed7ffecca47be0249a5d5ec0a5dd92af67 +staging.current aee9dccc5b64e878cf1b18207436e73f66d74157 +char-misc.current 092561f06702dd4fdd7fb74dd3a838f1818529b7 +soundwire-fixes 3650b228f83adda7e5ee532e2b90429c03f7b9ec +thunderbolt-fixes f6439c531d52193f890807958aaec52905bc0f2e +input-current ae3d6083acf60116d4f409677452399547ed2009 +crypto-current c3a98c3ad5c0dc60a1ac66bf91147a3f39cac96b +ide 6800cd8cbc6e35989f8d1aa20fac58031231b90f +vfio-fixes e4eccb853664de7bcf9518fb658f35e748bf1f68 +kselftest-fixes 7d764b685ee1bc73a9fa2b6cb4d42fa72b943145 +modules-fixes 57baec7b1b0459ef885e816d8c28a9d9a62bb8de +dmaengine-fixes 29a25b9246f7f24203d30d59424cbe22bd905dfc +backlight-fixes 219d54332a09e8d8741c1e1982f5eae56099de85 +mtd-fixes 9efac6ce7f621c405d49a091e3e367be4250a27a +mfd-fixes 22380b65dc70f5b132c5afdf6b4011e2a84ec34a +v4l-dvb-fixes 9ac924b98728c3733c91c6c59fc410827d0da49f +reset-fixes b460e0a9e2404450a0cc4c5e6476483d6cda1b26 +mips-fixes 31b4d8e172f614adc53ddecb4b6b2f6411a49b84 +at91-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +omap-fixes 99fba3205cd499255a36fd87f1d6064adc622a5b +kvm-fixes 6d6a18fdde8b86b919b740ad629153de432d12a8 +kvms390-fixes 6cbf1e960fa52e4c63a6dfa4cda8736375b34ccc +hwmon-fixes 4d64bb4ba5ecf4831448cdb2fe16d0ae91b2b40b +nvdimm-fixes 88b67edd7247466bc47f01e1dc539b0d0d4b931e +btrfs-fixes 6ce53ec0aba79a194fc00ccd1cf77feebc36eb6d +vfs-fixes 6a9f696d1627bacc91d1cebcfb177f474484e8ba +dma-mapping-fixes 892fc9f6835ecf075efac20789b012c5c9997fcc +i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +drivers-x86-fixes 3650b228f83adda7e5ee532e2b90429c03f7b9ec +samsung-krzk-fixes cd12e4f14f7cca7d04fbcf0da2dc116070d7f26f +pinctrl-samsung-fixes 3650b228f83adda7e5ee532e2b90429c03f7b9ec +devicetree-fixes 49c3e714ff4391144d8bb3fa99d0b460f8dbfd86 +scsi-fixes 2e6f11a797a24d1e2141a214a6dd6dfbe709f55d +drm-fixes f8394f232b1eab649ce2df5c5f15b0e528c92091 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes a4264790f4c2f0062d27d8173344c914bc7884e0 +mmc-fixes 03d80e042a8e3248163a38f74b43809f8079d652 +rtc-fixes 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +gnss-fixes 48778464bb7d346b47157d21ffde2af6b2d39110 +hyperv-fixes 92e4dc8b05663d6539b1b8375f3b1cf7b204cfe9 +soc-fsl-fixes fe8fe7723a3a824790bda681b40efd767e2251a7 +risc-v-fixes c2c81bb2f69138f902e1a58d3bef6ad97fb8a92c +pidfd-fixes bda4c60d02e9ceeee726f73250b808fad0663dd6 +fpga-fixes 8614afd689df59d9ce019439389be20bd788a897 +spdx 3cea11cd5e3b00d91caf0b4730194039b45c5891 +gpio-intel-fixes 3650b228f83adda7e5ee532e2b90429c03f7b9ec +pinctrl-intel-fixes f3c75e7a9349d1d33eb53ddc1b31640994969f73 +erofs-fixes a30573b3cdc77b8533d004ece1ea7c0146b437a0 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 3084db0e0d5076cd48408274ab0911cd3ccdae88 +ubifs-fixes 78c7d49f55d8631b67c09f9bfbe8155211a9ea06 +memblock-fixes b9bc36704cca500e2b41be4c5bf615c1d7ddc3ce +drm-misc-fixes bc551d776b691022f49b5bb5379bd58f7c4eb76a +kspp-gustavo 3650b228f83adda7e5ee532e2b90429c03f7b9ec +kbuild 729e39a558eb5cde61b80941bdfa54fdc2e11d1d +compiler-attributes bbf5c979011a099af5dc76498918ed7df445635b +dma-mapping 48ab6d5d1f096d6fac5b59f94af0aa394115a001 +asm-generic 78d127fd689200ff1d62d1f24f6be8dd68250764 +arc def9d2780727cec3313ed3522d0123158d87224d +arm 40bd54f129026a114a76cd6e756659373cf40151 +arm64 37ba024c56af74001082b073bd1bc8bc056c4675 +arm-perf 887e2cff0f8dc4dac4c35e631b711325c6dd65b8 +arm-soc 36ab3c32cafc42bf3886b20c5933ef4a72145105 +amlogic 84a1411c7549ef515a4ac18b1820ccd50959ecd2 +aspeed fc6fd3e6ac5a7f00c53842aee2ef7647785cbc88 +at91 0698efbb33eff3d71273bba402dc4e3f971d22b9 +drivers-memory 0afa08cf8706289e0ff9cadd5eec5607fb90e83a +imx-mxs c37ca3890c0cc3c0ca3edb6e7b7ecd39d4ec46ad +keystone a5e886fb26f2b05e575a635af4d2b65b49d96598 +mediatek 9c6658a0dd4f3183403b284e10f74b11d58cdab0 +mvebu f89c9685f6a1782c3e4c86aca636036009d22efd +omap 2565feb3ad188d65510bffc6c1b8f29d162d22d7 +qcom 5e6cb9811a9cfd288e5d5457cddfa3336b3b8c0e +raspberrypi 3650b228f83adda7e5ee532e2b90429c03f7b9ec +realtek 486f29df69413411a205d3101bae0427a892bee4 +renesas 6215772bbe58aaac8953da48a085a684724d3bcf +reset da8c0e4ee95a78878093ab5aaa3bdfce4c05ac63 +rockchip db4d9df435338f468a5f22fc96025195cc23633a +samsung-krzk ca6d22ed16ebe4b8d7bd23d59d9efdd6740e533e +scmi 3cea11cd5e3b00d91caf0b4730194039b45c5891 +stm32 a41ee1a9bf6d5ceaffe72a1237c5117ef63cf4d4 +sunxi 12f6c7209fc3ba613bbb58e32c318c285e641d23 +tegra 08f3ad8c86b0ff1ea26b2ef3e5bf0607ab1b224c +ti-k3 1e3d655fe7b48c2341d63f981774742e21744f53 +ti-k3-new 9b3ed160462296f39a5f61ef806d3e61c8d67634 +clk f1b6e57d4e4b70f61455f65950583666fb275478 +clk-samsung 3650b228f83adda7e5ee532e2b90429c03f7b9ec +csky d09101cb3c226e17b1aeedada4ca7a8a1202aa88 +h8300 8808515be0ed4e33de9bfdc65f4c1b547ee11065 +ia64 c331649e637152788b0ca1c857d0c2eaf34fcbc3 +m68k 1fe9bacab2ac5cca29b360e1032e6f7533fbdc78 +m68knommu 4f39612a50c725ed270e65b75da98c1dafe7cf03 +microblaze e167a59c654a788cacbb0c2dd93859a715824d5c +mips a3fb655027c33a9281d3b813798b15bdf1e75d43 +nds32 54bde873682b467f781f352effdb52d24e0a0c30 +nios2 6b57fa4d374bb8c005dee396c56598c14b9c01a6 +openrisc 1da81e5562fac8286567422cc56a7fbd0dc646d4 +parisc-hd 19621e5fd02b07c14f0ea172aaa58a2f524391b3 +powerpc 3cea11cd5e3b00d91caf0b4730194039b45c5891 +fsl a76bea0287ce13d28494b19649d80d8ee5e7b757 +soc-fsl d97b957e32b1e7527a9b6652fa6e795f2861df7d +risc-v ae386e9d809c6c7990c5414ea9ae035731ca0f81 +s390 94192be7c0ce324a60ba3c249007c0b331b8b893 +sh b0cfc315ff38c423a5ce9ce159bd5baa4135e688 +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml 9a5085b3fad5d5d6019a3d160cdd70357d35c8b1 +xtensa 4ca4c562efb67cd4e224ff560f4b1f2c86314906 +fscrypt 5b2a828b98ec1872799b1b4d82113c76a12d594f +afs 8409f67b6437c4b327ee95a71081b9c7bfee0b00 +btrfs a12315094469d573e41fe3eee91c99a83cec02df +ceph 62575e270f661aba64778cbc5f354511cf9abb21 +cifs 830c9f9cf885a96e81a380719486ef42f41a6f86 +configfs 76ecfcb0852eb0390881a695a2f349b804d80147 +ecryptfs 8b614cb8f1dcac8ca77cf4dd85f46ef3055f8238 +erofs 915f4c9358db6f96f08934dd683ae297aaa0fb91 +exfat f9893351acaecf0a414baf9942b48d5bb5c688c6 +ext3 22435b28172848b24f66d6955658442b5f2bf744 +ext4 d196e229a80c39254f4adbc312f55f5198e98941 +f2fs a945d4f0d38cf6e9a85c98161f53e916fe4be889 +fsverity f3db0bed458314a835ccef5ccb130270c5b2cf04 +fuse 9d769e6aa2524e1762e3b8681e0ed78f8acf6cad +jfs 7aba5dcc234635b44b2781dbc268048cfba388ad +nfs f8394f232b1eab649ce2df5c5f15b0e528c92091 +nfs-anna 11decaf8127b035242cb55de2fc6946f8961f671 +nfsd c3213d260a23e263ef85ba21ac68c9e7578020b5 +cel dc4152fc512eed64657fce408a656ae5e311b060 +orangefs e848643b524be9c10826c2cf36eebb74eef643d2 +overlayfs c11faf32599fee59f33896c8d59f9b3c17ca76fc +ubifs e2a05cc7f8229e150243cdae40f2af9021d67a4a +v9fs 7ca1db21ef8e0e6725b4d25deed1ca196f7efb28 +xfs 2bd3fa793aaa7e98b74e3653fdcc72fa753913b5 +zonefs 48bfd5c6fac10e10b7066bf4aeb919ed9a4e87d3 +iomap 1a31182edd0083bb9f26e582ed39f92f898c4d0a +djw-vfs 9b8523423b23ee3dfd88e32f5b7207be56a4e782 +file-locks 8d1ddb5e79374fb277985a6b3faa2ed8631c5b4c +vfs 61c207915a76a32e7ca40dd47e3af4acec896c0d +printk 9194df34b8b85be2360a5986c1c208cdae7b7e3e +pci 405196258f54f039b7520b14d30737cca6529452 +pstore 137c6236aeec43c45c8f3b2e54b1dee50fd2010e +hid e76f0c214c41b2d9e3c1ab3600d6c90a36a8dce3 +i2c c97e7615c15bd2c1237796cd877b56bd197c50d1 +i3c abea14bfdebbe9bd02f2ad24a1f3a878ed21c8f0 +dmi 3cb4d29a2633170208c96240c7e85148679ceee3 +hwmon-staging d7e445a92e1bea606ba0e8a9fdb31ca7831efb81 +jc_docs f8394f232b1eab649ce2df5c5f15b0e528c92091 +v4l-dvb 0ab4f9087ea94ff92dc2ae68180faaf6bd443021 +v4l-dvb-next d0a9fffedca102633c168adaf157f34288a4ea67 +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm 52d108cd060dea3403c01d460c2ffbc7eaaf4a9c +cpufreq-arm 32c855670808fdd5b2fa6b4b4217a24f2edeee32 +cpupower 748f0d70087c56226bf1df1f91a00b7ab4c8f883 +devfreq 09d56d92ad25b58113f4ec677e9b1ac1e2c3072b +opp 4e6fe1a4123c8a010ab9c36f52552789cb45587e +thermal ce7c01557465e920f5bccc5878b8dec165eeb80b +thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 67f8e65e4fc19e24993e8780f41279eeffbd0610 +dlm 4f19d071f9bee1bb2040ae73436314a5ec9ede44 +swiotlb fc0021aa340af65a0a37d77be39e22aa886a6132 +rdma f946e45f59ef01ff54ffb3b1eba3a8e7915e7326 +net-next e865802357086b36632acf3e629f726f089a6769 +bpf-next c36538798fc6c80bd8bdaddad803b0c86dc13d7c +ipsec-next 8be33ecfc1ffd2da20cc29e957e4cb6eb99310cb +mlx5-next 3650b228f83adda7e5ee532e2b90429c03f7b9ec +netfilter-next 70408949a35f1a31c327c69b6a187635cb0305fa +ipvs-next c9448e828d113cd7eafe77c414127e877ca88b20 +wireless-drivers-next 1ccaa898868d1971a6480d7d55668de522f5847f +bluetooth 22fbcfc54705213fa358bcc1349db8bbdf398ddc +mac80211-next da1e9dd3a11cda85b58dafe64f091734934b2f6c +gfs2 4e79e3f08e576acd51dffb4520037188703238b3 +mtd 232b67c399424948107fbffe4402a102121a2622 +nand 3ebbdef13f82d7ea1b9fcaa1792461bc6b6fb02c +spi-nor ad624dfd7bb69a20ff06804ece25bc27200f2ea2 +crypto ab95bd2aa904e4f53b7358efeea1d57693fb7889 +drm 512bce50a41c528fa15c4c014293e7bebf018658 +amdgpu 6f60b0ddcfa01f5362e5a0d25803148b96e41dbf +drm-intel 6ec29d2bb060442315f6c11b0af02ad5da085287 +drm-tegra 41f71629b4c432f8dd47d70ace813be5f79d4d75 +drm-misc 2c686404012accc010693fd5c112943c4f0b9dbb +drm-msm e8c765811b1064c200829eacf237ac8c25e79cd0 +imx-drm 36fba366cf9fa386e5905976e68380061feabd2e +etnaviv 4612bad5701e158f3c40951f2c7aa8e64b3445eb +regmap f7d01359b0d96331fce7bd4051d3b68a4bb5ea83 +sound 8461352ddf076712350eeded350c13385c80ff38 +sound-asoc e2e99930ec006c6fe1d62af339a765ade71a0d9a +modules 24b9f0d22081455b6fd739c8365958c207a69973 +input 3a54a215410b1650798dc09d051806b1f900142d +block 05f40074d9ea2ac7c599705e5ff549e9557d6d82 +device-mapper 98d2720eb186b575693acc0e00ab3b4e3649d29b +pcmcia 46d0797906633d82bd50ef26780ee39fac5d27d6 +mmc fc69b6a3113a33fd0da0455b7c8b915bd836459d +mfd 394a569203fcdb1653a24c1ce858de3d4b9e399b +backlight 789eb04b6c569e3e5007afd040bef5d7216d2f3a +battery 7007fab4ae82c092cb52691c338f1b776005e32b +regulator 95e7956eb099fff8c200180aadce46c5b2388740 +security bc62d68e2a0a69fcdcf28aca8edb01abf306b698 +apparmor e37986097ba63c94b1af9d5ad5486d120a809f72 +integrity b000d5cb954fe25ac1ea929ae6da321033ace927 +keys b6f61c31464940513ef4eccb3a030a405b4256d6 +safesetid 03ca0ec138927b16fab0dad7b869f42eb2849c94 +selinux b159e86b5a2ab826b3a292756072f4cc523675ab +smack edd615371b668404d06699c04f5f90c4f438814a +tomoyo e991a40b3d0000a2f48729aea4ce03acf679b5ee +tpmdd 8ffd778aff45be760292225049e0141255d4ad6e +watchdog 3650b228f83adda7e5ee532e2b90429c03f7b9ec +iommu 4dd6ce478003525df8618750d30f0b90380047a7 +audit 6d915476e67d99b73a57bceb83cff1cf153d8bf6 +devicetree 616fde2dd60f9f956dc77ed7e284129de6dc97d2 +mailbox c7dacf5b0f32957b24ef29df1207dc2cd8307743 +spi e972eab056537dd77c9976b2fd4e5cf3c6442e48 +tip c3c30db1b191bb1640a08bbcc593c212affcab75 +clockevents 4576f62086eb05a918175ede024acbcabd4dbade +edac 82b9c922783e0c1c1dd5c321a2fc849ae1037106 +irqchip d95bdca75b3fb41bf185efe164e05aed820081a5 +ftrace e1981f75d398c0afe83c8ffa4e5864f037967409 +rcu bf6a52d6ce5f1c297fa5c26066739745d51c1b15 +kvm e792415c5d3e0eb52527cce228a72e4392f8cae2 +kvm-arm ed4ffaf49bf9ce1002b516d8c6aa04937b7950bc +kvm-ppc cf59eb13e151ef42c37ae31864046c17e481ed8f +kvms390 23a60f834406c8e3805328b630d09d5546b460c1 +xen-tip 65cae18882f943215d0505ddc7e70495877308e6 +percpu eb4c8d15efdaf1661759d8da2c7bfffe5d881343 +workqueues 10cdb15759540f03d056e2f73fe26377ed7dcfda +drivers-x86 97ab4516205eedde0b6565e47175d825b88d6759 +chrome-platform 3650b228f83adda7e5ee532e2b90429c03f7b9ec +hsi bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +leds 6c3e42616bf23539d99af91e83f532575f018eac +ipmi 0df7b988d9df24d1ea120fde69b3e9cbd2555597 +driver-core 33c0c9bdf7a59051a654cd98b7d2b48ce0080967 +usb 57cde551225bb09fa40ca3938e06d59fc529ff90 +usb-gadget b2c586eb07efab982419f32b7c3bd96829bc8bcd +usb-serial 975323ab8f116667676c30ca3502a6757bd89e8d +usb-chipidea-next 87a6b8617a72754e38a666c9bf3bad275e1442cd +phy-next c36f74566cef6b2a377c8830ee216677ddb12706 +tty 9b085d6e889076928d307f05cabf76e35db1e63b +char-misc 1987f112f1425cba2671d878f6952087e9456a0a +extcon 54589b557a8dd21c735dbef6a8e0995ef5a11145 +soundwire 3650b228f83adda7e5ee532e2b90429c03f7b9ec +thunderbolt 4e58171aa93fe8caf4f6e5e9972b7abe117c0014 +vfio 2e6cfd496f5b57034cf2aec738799571b5a52124 +staging f4acd33c446b2ba97f1552a4da90050109d01ca7 +mux 05f19f7f8944b6a269b2ac152bceaa322138be6b +icc fce52ad3483281930dc9215a68d69837f219f889 +dmaengine 0e15ca5fe2240e9f1e4c408a29505b60dbdfaddd +cgroup 65026da59cda16baf6c3e98b74ec439f366e468f +scsi 9cdcab394724bc629a94331ff61eb5db35de9f0a +scsi-mkp cb2b4e8f5ea69b6dc0a37ace8c6ffb1854c1f9e5 +vhost 29ea7644edd23695e40022b2d3593e94494090f8 +rpmsg 3e53119a25212015d256729eb955734b75c2fe45 +gpio 27b5ea2fcb90d2dbc3be03e3a171bc28117eef14 +gpio-brgl 37174f3341306eaea7b7f4f5cc624e0040305a98 +gpio-intel 3650b228f83adda7e5ee532e2b90429c03f7b9ec +pinctrl 722491772123510eabd2b380f1bd905ed2ecc13b +pinctrl-intel 0ddebf8580fa32b1827dcc5230a6db6260096f5e +pinctrl-samsung c5564a50d99019f3c713fa306d5feecc3e909b10 +pwm 08b82e2bc5f394cbca8f4c8241d2629c79131c74 +userns 7fce69dff8db30cb93aace0bbebda09972027af7 +ktest ff131efff141fc679cccde28bc265f4c79cbe329 +random ab9a7e27044b87ff2be47b8f8e095400e7fccc44 +kselftest c2e46f6b3e3551558d44c4dc518b9667cb0d5f8b +y2038 c4e71212a245017d2ab05f322f7722f0b87a55da +livepatching 59fc1e476962eff9ef259355a9daf912b563aac0 +coresight c04e5d7bbf6f92a346d6b36770705e7f034df42d +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 2cfd72f81cf69c2659c6d2121308b55416229beb +kgdb d081a6e353168f15e63eb9e9334757f20343319f +pidfd e06ce5515b74f628b78677e6736f66f6abb89b00 +hmm 3650b228f83adda7e5ee532e2b90429c03f7b9ec +fpga cbadbf5a53b5ca892132ca91dc60b24c80dc6fa8 +kunit 3650b228f83adda7e5ee532e2b90429c03f7b9ec +generic-ioremap 4bdc0d676a643140bdf17dbf7eafedee3d496a3c +cfi 5de15b610f785f0e188fefb707f0b19de156968a +kunit-next 3650b228f83adda7e5ee532e2b90429c03f7b9ec +trivial 9ff9b0d392ea08090cd1780fb196f36dbb586529 +zx2c4 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e +mhi 666dc267e0056c3e458fb78527618764a6f53d8c +notifications 841a0dfa511364fa9a8d67512e0643669f1f03e3 +memblock 762d4d1a174c2b2f1181ef284769e4cba7d2b11c +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters 3650b228f83adda7e5ee532e2b90429c03f7b9ec +akpm-current 999f12a02d925caa0cf9f935ecced9b37b04d022 +akpm 0678bf154d02bea147bc97c3ff4b88144b57ea89 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..d738cd9fa450 --- /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 +stm32 git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-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 +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..2dd73afeb679 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,8141 @@ +$ date -R +Fri, 13 Nov 2020 08:41:33 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 94% (4802/5100)
Updating files: 95% (4845/5100)
Updating files: 96% (4896/5100)
Updating files: 97% (4947/5100)
Updating files: 98% (4998/5100)
Updating files: 99% (5049/5100)
Updating files: 100% (5100/5100)
Updating files: 100% (5100/5100), done. +HEAD is now at eccc87672492 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs +Merging origin/master (af5043c89a8e Merge tag 'acpi-5.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) +$ git merge origin/master +Updating eccc87672492..af5043c89a8e +Fast-forward + Documentation/firmware-guide/acpi/acpi-lid.rst | 8 ++-- + .../firmware-guide/acpi/gpio-properties.rst | 55 ++++++++++++++++------ + .../firmware-guide/acpi/method-tracing.rst | 2 +- + drivers/acpi/acpi_video.c | 6 +-- + drivers/acpi/battery.c | 2 +- + drivers/acpi/button.c | 13 ++++- + drivers/acpi/dptf/dptf_pch_fivr.c | 1 + + drivers/acpi/dptf/dptf_power.c | 2 + + drivers/acpi/dptf/int340x_thermal.c | 6 +++ + drivers/acpi/event.c | 2 +- + drivers/acpi/evged.c | 2 +- + drivers/acpi/fan.c | 1 + + drivers/acpi/internal.h | 2 +- + drivers/acpi/nfit/core.c | 10 ++-- + drivers/acpi/pci_irq.c | 2 +- + drivers/acpi/pci_link.c | 12 ++--- + drivers/acpi/pci_mcfg.c | 2 +- + drivers/acpi/power.c | 6 +-- + drivers/acpi/processor_perflib.c | 6 +-- + drivers/acpi/sbs.c | 2 +- + drivers/acpi/sbshc.c | 2 +- + drivers/acpi/sbshc.h | 6 +-- + drivers/acpi/scan.c | 2 +- + drivers/acpi/video_detect.c | 16 +++---- + drivers/acpi/wakeup.c | 4 +- + drivers/cpufreq/cpufreq.c | 4 +- + drivers/cpufreq/cpufreq_governor.h | 2 +- + drivers/cpufreq/cpufreq_performance.c | 1 + + drivers/cpufreq/cpufreq_powersave.c | 1 + + drivers/cpufreq/intel_pstate.c | 16 ++++--- + drivers/iommu/intel/iommu.c | 5 +- + drivers/xen/swiotlb-xen.c | 3 +- + include/linux/cpufreq.h | 18 ++++++- + include/linux/swiotlb.h | 10 ++-- + kernel/dma/swiotlb.c | 22 ++++----- + kernel/sched/cpufreq_schedutil.c | 2 +- + 36 files changed, 159 insertions(+), 97 deletions(-) +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 +Auto-merging Makefile +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 +Already up to date. +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 (04e613ded8c2 arm64: smp: Tell RCU about CPUs that fail to come online) +$ git merge arm64-fixes/for-next/fixes +Auto-merging kernel/rcu/tree.c +Auto-merging arch/arm64/include/asm/cpufeature.h +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/cpufeature.h | 2 ++ + arch/arm64/kernel/kexec_image.c | 2 +- + arch/arm64/kernel/process.c | 5 ++--- + arch/arm64/kernel/psci.c | 5 +---- + arch/arm64/kernel/smp.c | 1 + + kernel/rcu/tree.c | 2 +- + 6 files changed, 8 insertions(+), 9 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 (01776f070ffc powerpc/32s: Use relocation offset when setting early hash table) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/kernel/head_book3s_32.S | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging s390-fixes/fixes (78d732e1f326 s390/cpum_sf.c: fix file permission for cpum_sfb_size) +$ git merge s390-fixes/fixes +Merge made by the 'recursive' strategy. + arch/s390/configs/debug_defconfig | 1 + + arch/s390/kernel/entry.S | 2 ++ + arch/s390/kernel/perf_cpum_sf.c | 2 +- + 3 files changed, 4 insertions(+), 1 deletion(-) +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 (d19d8d345eec fscrypt: fix inline encryption not used on new files) +$ git merge fscrypt-current/for-stable +Merge made by the 'recursive' strategy. + fs/crypto/inline_crypt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging net/master (edbc21113bde lan743x: fix use of uninitialized variable) +$ git merge net/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/networking/netdev-FAQ.rst | 4 +- + Documentation/networking/phy.rst | 4 +- + Documentation/process/stable-kernel-rules.rst | 2 +- + .../it_IT/process/stable-kernel-rules.rst | 2 +- + MAINTAINERS | 27 +- + .../dts/freescale/fsl-ls1028a-kontron-sl28.dts | 1 + + drivers/net/dsa/mv88e6xxx/devlink.c | 4 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 3 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 2 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 1 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 6 + + drivers/net/ethernet/chelsio/cxgb4/sge.c | 111 +++- + .../chelsio/inline_crypto/ch_ktls/chcr_ktls.c | 582 +++++++++++++-------- + .../chelsio/inline_crypto/ch_ktls/chcr_ktls.h | 1 + + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 26 +- + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 2 +- + drivers/net/ethernet/intel/igc/igc_main.c | 14 +- + drivers/net/ethernet/marvell/prestera/Kconfig | 1 + + .../net/ethernet/mellanox/mlx5/core/en/rep/tc.c | 6 +- + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 72 ++- + .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 4 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/tx.c | 4 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c | 14 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en_rep.h | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 2 + + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 2 - + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 7 +- + .../net/ethernet/mellanox/mlx5/core/lib/vxlan.c | 23 +- + .../net/ethernet/mellanox/mlx5/core/lib/vxlan.h | 2 + + drivers/net/ethernet/microchip/lan743x_main.c | 24 +- + drivers/net/ethernet/microchip/lan743x_main.h | 3 - + drivers/net/ethernet/realtek/r8169_main.c | 18 +- + drivers/net/phy/realtek.c | 2 + + drivers/net/vrf.c | 92 +++- + drivers/net/wan/cosa.c | 1 + + 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/bpf_lsm.c | 10 +- + kernel/bpf/core.c | 2 +- + kernel/bpf/hashtab.c | 30 +- + kernel/bpf/preload/Kconfig | 1 + + net/core/devlink.c | 8 +- + net/ethtool/features.c | 2 +- + net/ipv4/ip_tunnel_core.c | 4 +- + net/ipv4/syncookies.c | 9 +- + net/ipv4/udp_offload.c | 19 +- + net/ipv6/sit.c | 2 - + net/ipv6/syncookies.c | 10 +- + net/ipv6/udp_offload.c | 17 +- + net/iucv/af_iucv.c | 3 +- + net/mptcp/protocol.c | 1 + + net/netlabel/netlabel_unlabeled.c | 17 +- + net/tipc/topsrv.c | 10 +- + net/x25/af_x25.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/prog.c | 2 +- + tools/bpf/bpftool/skeleton/profiler.bpf.c | 4 +- + tools/lib/bpf/hashmap.h | 15 +- + tools/lib/bpf/xsk.c | 9 +- + tools/testing/selftests/bpf/prog_tests/map_init.c | 214 ++++++++ + tools/testing/selftests/bpf/progs/profiler.inc.h | 11 +- + tools/testing/selftests/bpf/progs/test_map_init.c | 33 ++ + .../tc-testing/tc-tests/filters/tests.json | 4 +- + 76 files changed, 1138 insertions(+), 439 deletions(-) + create mode 100644 tools/testing/selftests/bpf/prog_tests/map_init.c + create mode 100644 tools/testing/selftests/bpf/progs/test_map_init.c +Merging bpf/master (9602182810cc MAINTAINERS/bpf: Update Andrii's entry.) +$ git merge bpf/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + kernel/bpf/verifier.c | 3 ++- + kernel/trace/bpf_trace.c | 2 +- + tools/lib/bpf/libbpf.c | 23 ++++++++++++---------- + tools/testing/selftests/bpf/prog_tests/subprogs.c | 6 ++++++ + .../selftests/bpf/progs/test_subprogs_unused.c | 21 ++++++++++++++++++++ + 6 files changed, 44 insertions(+), 13 deletions(-) + create mode 100644 tools/testing/selftests/bpf/progs/test_subprogs_unused.c +Merging ipsec/master (48f486e13ffd net: xfrm: fix memory leak in xfrm_user_policy()) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/xfrm/xfrm_compat.c | 5 +++-- + net/xfrm/xfrm_state.c | 4 +++- + 2 files changed, 6 insertions(+), 3 deletions(-) +Merging netfilter/master (fea07a487c6d net: openvswitch: silence suspicious RCU usage warning) +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (fea07a487c6d net: openvswitch: silence suspicious RCU usage warning) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (fe56d05ee6c8 iwlwifi: mvm: fix kernel panic in case of assert during CSA) +$ git merge wireless-drivers/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 9 +- + drivers/net/wireless/intel/iwlwifi/fw/api/sta.h | 10 +- + .../net/wireless/intel/iwlwifi/fw/api/time-event.h | 8 +- + drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 10 ++ + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 5 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 18 ++++ + .../net/wireless/intel/iwlwifi/mvm/time-event.c | 103 ++++++++++++++------- + .../wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c | 20 ++++ + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 36 +++++-- + drivers/net/wireless/realtek/rtw88/fw.c | 2 +- + 10 files changed, 164 insertions(+), 57 deletions(-) +Merging mac80211/master (b2911a84396f mac80211: minstrel: fix tx status processing corner case) +$ git merge mac80211/master +Merge made by the 'recursive' strategy. + net/mac80211/rc80211_minstrel.c | 27 +++++---------------------- + net/mac80211/rc80211_minstrel.h | 1 - + net/mac80211/status.c | 18 ++++++++---------- + net/rfkill/core.c | 3 +++ + 4 files changed, 16 insertions(+), 33 deletions(-) +Merging rdma-fixes/for-rc (f8394f232b1e Linux 5.10-rc3) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (b5acfe152aba ALSA: hda/realtek: Add some Clove SSID in the ALC293(ALC1220)) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/hda/patch_realtek.c | 59 ++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 58 insertions(+), 1 deletion(-) +Merging sound-asoc-fixes/for-linus (016af47764cd Merge remote-tracking branch 'asoc/for-5.10' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/rt1015.txt | 6 ++++++ + include/sound/rt1015.h | 15 +++++++++++++++ + sound/soc/codecs/rt1015.c | 20 ++++++++++++++++++++ + sound/soc/codecs/rt1015.h | 2 ++ + 4 files changed, 43 insertions(+) + create mode 100644 include/sound/rt1015.h +Merging regmap-fixes/for-linus (3650b228f83a Linux 5.10-rc1) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (365ec8b61689 regulator: pfuze100: limit pfuze-support-disable-sw to pfuze{100,200}) +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/regulator/core.c | 5 +++-- + drivers/regulator/pfuze100-regulator.c | 13 ++++++++----- + 2 files changed, 11 insertions(+), 7 deletions(-) +Merging spi-fixes/for-linus (5900ea64d9ee 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-bcm-qspi.c | 34 +++++++------------ + drivers/spi/spi-bcm2835.c | 24 +++++-------- + drivers/spi/spi-bcm2835aux.c | 21 ++++-------- + drivers/spi/spi-fsi.c | 2 +- + drivers/spi/spi-fsl-lpspi.c | 3 -- + drivers/spi/spi.c | 81 ++++++++++++++++++++++++++++++++++---------- + include/linux/spi/spi.h | 19 +++++++++++ + 7 files changed, 110 insertions(+), 74 deletions(-) +Merging pci-current/for-linus (832ea234277a PCI: mvebu: Fix duplicate resource requests) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (f8394f232b1e Linux 5.10-rc3) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (425af483523b serial: ar933x_uart: disable clk on error handling path in probe) +$ git merge tty.current/tty-linus +Merge made by the 'recursive' strategy. + drivers/accessibility/speakup/spk_ttyio.c | 12 +++++++++++- + drivers/tty/serial/ar933x_uart.c | 6 ++++-- + drivers/tty/serial/imx.c | 30 +++++++++++------------------- + 3 files changed, 26 insertions(+), 22 deletions(-) +Merging usb.current/usb-linus (368183029cc4 Merge tag 'thunderbolt-for-v5.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/thunderbolt/debugfs.c | 1 + + drivers/thunderbolt/icm.c | 2 ++ + drivers/thunderbolt/nhi.c | 23 +++++++++++++++++++---- + drivers/thunderbolt/nhi.h | 2 ++ + drivers/thunderbolt/tb.h | 2 ++ + drivers/thunderbolt/usb4.c | 4 ++++ + drivers/thunderbolt/xdomain.c | 1 + + 7 files changed, 31 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 (f8394f232b1e Linux 5.10-rc3) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/for-usb-fixes (e136009ab0e4 usb: cdns3: gadget: calculate TD_SIZE based on TD) +$ git merge usb-chipidea-fixes/for-usb-fixes +Merge made by the 'recursive' strategy. + drivers/usb/cdns3/gadget.c | 26 ++++++++++++++------------ + 1 file changed, 14 insertions(+), 12 deletions(-) +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 (aee9dccc5b64 staging: rtl8723bs: Add 024c:0627 to the list of SDIO device-ids) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/staging/mt7621-pci/pci-mt7621.c | 15 +++------------ + drivers/staging/ralink-gdma/Kconfig | 1 + + drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 1 + + 3 files changed, 5 insertions(+), 12 deletions(-) +Merging char-misc.current/char-misc-linus (092561f06702 uio: Fix use-after-free in uio_unregister_device()) +$ git merge char-misc.current/char-misc-linus +Auto-merging drivers/accessibility/speakup/spk_ttyio.c +Merge made by the 'recursive' strategy. + drivers/accessibility/speakup/main.c | 1 - + drivers/accessibility/speakup/selection.c | 11 +++---- + drivers/accessibility/speakup/speakup.h | 1 - + drivers/accessibility/speakup/spk_ttyio.c | 10 +++--- + drivers/accessibility/speakup/spk_types.h | 8 +++-- + drivers/char/virtio_console.c | 8 ++--- + drivers/firmware/xilinx/zynqmp.c | 3 ++ + 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 +-- + drivers/uio/uio.c | 10 +++--- + drivers/virt/nitro_enclaves/ne_misc_dev.c | 6 ++-- + 20 files changed, 95 insertions(+), 99 deletions(-) +Merging soundwire-fixes/fixes (3650b228f83a Linux 5.10-rc1) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (f6439c531d52 thunderbolt: Add support for Intel Tiger Lake-H) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (ae3d6083acf6 Input: elan_i2c - fix firmware update on newer ICs) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/keyboard/sunkbd.c | 41 +++++++++++++++++++++++++++++------- + drivers/input/misc/adxl34x.c | 2 +- + drivers/input/mouse/elan_i2c.h | 2 +- + drivers/input/mouse/elan_i2c_core.c | 3 ++- + drivers/input/mouse/elan_i2c_i2c.c | 10 ++++----- + drivers/input/mouse/elan_i2c_smbus.c | 2 +- + drivers/input/serio/i8042.c | 12 ++++++++++- + drivers/input/touchscreen/Kconfig | 1 + + 8 files changed, 55 insertions(+), 18 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 +Already up to date. +Merging kselftest-fixes/fixes (7d764b685ee1 selftests: binderfs: use SKIP instead of XFAIL) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (29a25b9246f7 dmaengine: ti: omap-dma: Block PM if SDMA is busy to fix audio) +$ 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 +- + drivers/dma/ti/omap-dma.c | 37 ++++++++++++++++++++++++------------- + drivers/dma/xilinx/xilinx_dma.c | 40 ++++++++++++++++++++++++++++++---------- + 7 files changed, 98 insertions(+), 41 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 +Already up to date. +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 (9ac924b98728 media: cedrus: h264: Fix check for presence of scaling matrix) +$ git merge v4l-dvb-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/media/platform/Kconfig | 28 +++- + drivers/media/platform/marvell-ccic/mmp-driver.c | 2 + + drivers/media/platform/mtk-vcodec/Makefile | 10 +- + .../media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 2 +- + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 2 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.c | 174 +-------------------- + drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.h | 7 +- + .../media/platform/mtk-vcodec/mtk_vcodec_fw_priv.h | 52 ++++++ + .../media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c | 73 +++++++++ + .../media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c | 110 +++++++++++++ + drivers/staging/media/sunxi/cedrus/cedrus_h264.c | 2 +- + 11 files changed, 281 insertions(+), 181 deletions(-) + create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_priv.h + create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c + create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c +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 (99fba3205cd4 ARM: dts: am437x-l4: fix compatible for cpsw switch dt node) +$ git merge omap-fixes/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am437x-l4.dtsi | 2 +- + arch/arm/mach-omap2/cpuidle44xx.c | 8 +++++--- + 2 files changed, 6 insertions(+), 4 deletions(-) +Merging kvm-fixes/master (6d6a18fdde8b KVM: selftests: allow two iterations of dirty_log_perf_test) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (6cbf1e960fa5 KVM: s390: remove diag318 reset code) +$ git merge kvms390-fixes/master +Merge made by the 'recursive' strategy. + arch/s390/kvm/kvm-s390.c | 4 +--- + arch/s390/kvm/pv.c | 3 ++- + arch/s390/mm/gmap.c | 2 ++ + 3 files changed, 5 insertions(+), 4 deletions(-) +Merging hwmon-fixes/hwmon (4d64bb4ba5ec hwmon: (applesmc) Re-work SMC comms) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + drivers/hwmon/applesmc.c | 130 ++++++++++++++++++++++++--------------- + drivers/hwmon/pmbus/max20730.c | 26 ++++---- + drivers/hwmon/pmbus/pmbus_core.c | 13 +++- + drivers/hwmon/pwm-fan.c | 16 ++--- + 4 files changed, 114 insertions(+), 71 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 (6ce53ec0aba7 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 (6a9f696d1627 fix return values of seq_read_iter()) +$ git merge vfs-fixes/fixes +Merge made by the 'recursive' strategy. + fs/seq_file.c | 24 ++++++++---------------- + 1 file changed, 8 insertions(+), 16 deletions(-) +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 5824d4330f80] 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 (49c3e714ff43 dt-bindings: can: fsl,flexcan.yaml: fix fsl,stop-mode) +$ git merge devicetree-fixes/dt/linus +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml | 11 ++++++----- + drivers/of/address.c | 4 +++- + 2 files changed, 9 insertions(+), 6 deletions(-) +Merging scsi-fixes/fixes (2e6f11a797a2 scsi: ufshcd: Fix missing destroy_workqueue()) +$ git merge scsi-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/scsi/ufs/ufshcd.c | 34 +++++++++++++++++++++++++++++----- + drivers/scsi/ufs/ufshcd.h | 2 ++ + 2 files changed, 31 insertions(+), 5 deletions(-) +Merging drm-fixes/drm-fixes (f8394f232b1e Linux 5.10-rc3) +$ 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 (a4264790f4c2 drm/i915: Correctly set SFC capability for video engines) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 2 + + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 55 ++++++++++++++++++++++++ + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 3 +- + drivers/gpu/drm/i915/i915_gem.c | 32 +++----------- + 4 files changed, 65 insertions(+), 27 deletions(-) +Merging mmc-fixes/fixes (03d80e042a8e Revert "mmc: renesas_sdhi: workaround a regression when reinserting SD cards") +$ git merge mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mmc/host/renesas_sdhi_core.c | 14 +------------- + drivers/mmc/host/sdhci-of-esdhc.c | 2 ++ + drivers/mmc/host/tmio_mmc_core.c | 7 +++++-- + 3 files changed, 8 insertions(+), 15 deletions(-) +Merging rtc-fixes/rtc-fixes (9123e3a74ec7 Linux 5.9-rc1) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (48778464bb7d Linux 5.8-rc2) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (92e4dc8b0566 Drivers: hv: vmbus: Allow cleanup of VMBUS_CONNECT_CPU if disconnected) +$ git merge hyperv-fixes/hyperv-fixes +Auto-merging drivers/hv/hv.c +Merge made by the 'recursive' strategy. + drivers/hv/hv.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 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 (c2c81bb2f691 RISC-V: Fix the VDSO symbol generaton for binutils-2.35+) +$ 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 (f3c75e7a9349 pinctrl: intel: Set default bias in case no particular value given) +$ git merge pinctrl-intel-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/pinctrl/intel/pinctrl-intel.c | 40 ++++++++++++++++++++++++++--------- + 1 file changed, 30 insertions(+), 10 deletions(-) +Merging erofs-fixes/fixes (a30573b3cdc7 erofs: fix setting up pcluster for temporary pages) +$ git merge erofs-fixes/fixes +Already up to date. +Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) +$ git merge integrity-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (3084db0e0d50 kunit: fix display of failed expectations for strings) +$ git merge kunit-fixes/kunit-fixes +Removing tools/testing/kunit/.gitattributes +Merge made by the 'recursive' strategy. + Documentation/dev-tools/kunit/faq.rst | 2 +- + Documentation/dev-tools/kunit/style.rst | 18 +++++------ + Documentation/dev-tools/kunit/usage.rst | 10 +++---- + include/kunit/test.h | 2 +- + tools/testing/kunit/.gitattributes | 1 - + tools/testing/kunit/kunit.py | 27 ++++++++--------- + tools/testing/kunit/kunit_kernel.py | 53 +++++++++++++++++++++++++-------- + tools/testing/kunit/kunit_parser.py | 17 ++++++----- + tools/testing/kunit/kunit_tool_test.py | 4 +-- + 9 files changed, 80 insertions(+), 54 deletions(-) + delete mode 100644 tools/testing/kunit/.gitattributes +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 +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (bc551d776b69 drm: bridge: dw-hdmi: Avoid resetting force in the detect function) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/bridge/cadence/Kconfig | 2 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 6 ------ + drivers/gpu/drm/gma500/psb_irq.c | 34 +++++++++++-------------------- + drivers/gpu/drm/mcde/mcde_drv.c | 8 +++++++- + drivers/video/fbdev/hyperv_fb.c | 1 + + 5 files changed, 21 insertions(+), 30 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 (40bd54f12902 Merge branch 'devel-stable' into for-next) +$ git merge arm/for-next +Auto-merging arch/arm/mm/init.c +Auto-merging arch/arm/kernel/Makefile +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 | 12 +- + arch/arm/boot/compressed/Makefile | 1 + + arch/arm/boot/compressed/head.S | 18 +- + arch/arm/boot/compressed/string.c | 19 ++ + arch/arm/include/asm/assembler.h | 88 ++++++- + arch/arm/include/asm/elf.h | 5 + + 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 | 67 +++-- + arch/arm/include/asm/pgalloc.h | 8 +- + arch/arm/include/asm/processor.h | 2 +- + 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/Makefile | 1 + + 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 | 29 +- + arch/arm/kernel/head.S | 210 ++------------- + arch/arm/kernel/hyp-stub.S | 27 +- + arch/arm/kernel/module.c | 20 +- + arch/arm/kernel/phys2virt.S | 238 +++++++++++++++++ + arch/arm/kernel/setup.c | 25 +- + arch/arm/kernel/sleep.S | 19 +- + arch/arm/kernel/unwind.c | 6 +- + arch/arm/lib/memcpy.S | 4 +- + arch/arm/lib/memmove.S | 6 +- + arch/arm/lib/memset.S | 4 +- + 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 + + 43 files changed, 1047 insertions(+), 321 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/kernel/phys2virt.S + create mode 100644 arch/arm/mm/kasan_init.c +Merging arm64/for-next/core (37ba024c56af Merge branch 'for-next/kvm-build-fix' into for-next/core) +$ git merge arm64/for-next/core +Auto-merging arch/arm64/kernel/smp.c +Auto-merging arch/arm64/include/asm/mmu_context.h +Auto-merging arch/arm64/include/asm/cpufeature.h +Auto-merging arch/arm64/Kconfig +Merge made by the 'recursive' strategy. + Documentation/arm64/kasan-offsets.sh | 3 +- + Documentation/arm64/memory.rst | 45 +++-- + arch/arm64/Kconfig | 23 +-- + arch/arm64/include/asm/alternative-macros.h | 217 ++++++++++++++++++++++ + arch/arm64/include/asm/alternative.h | 267 +--------------------------- + arch/arm64/include/asm/asm-uaccess.h | 65 ++++++- + arch/arm64/include/asm/cpucaps.h | 3 +- + arch/arm64/include/asm/cpufeature.h | 8 + + arch/arm64/include/asm/insn.h | 3 +- + arch/arm64/include/asm/kernel-pgtable.h | 6 - + arch/arm64/include/asm/kprobes.h | 7 - + arch/arm64/include/asm/memory.h | 22 ++- + arch/arm64/include/asm/mmu_context.h | 6 +- + arch/arm64/include/asm/pgtable.h | 3 +- + arch/arm64/include/asm/rwonce.h | 73 ++++++++ + arch/arm64/include/asm/topology.h | 4 +- + arch/arm64/include/asm/uaccess.h | 4 +- + arch/arm64/kernel/alternative.c | 7 +- + arch/arm64/kernel/cpufeature.c | 23 ++- + arch/arm64/kernel/entry.S | 6 +- + arch/arm64/kernel/probes/kprobes.c | 53 ++---- + arch/arm64/kernel/proton-pack.c | 1 + + arch/arm64/kernel/setup.c | 2 +- + arch/arm64/kernel/smp.c | 15 +- + arch/arm64/kernel/topology.c | 129 +++++++++++--- + arch/arm64/kernel/vdso/Makefile | 2 +- + arch/arm64/kernel/vdso32/Makefile | 2 +- + arch/arm64/kernel/vmlinux.lds.S | 10 +- + arch/arm64/lib/mte.S | 2 +- + arch/arm64/mm/init.c | 15 +- + arch/arm64/mm/mmu.c | 95 +++++++++- + arch/arm64/mm/proc.S | 2 +- + 32 files changed, 680 insertions(+), 443 deletions(-) + create mode 100644 arch/arm64/include/asm/alternative-macros.h + create mode 100644 arch/arm64/include/asm/rwonce.h +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 (84a1411c7549 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 | 3 --- + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 6 ++++++ + .../boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts | 4 ---- + 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 ++++- + 10 files changed, 32 insertions(+), 19 deletions(-) +Merging aspeed/for-next (fc6fd3e6ac5a 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 | 2 + + arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts | 77 +- + arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts | 924 +++++++++++++++ + .../arm/boot/dts/aspeed-bmc-facebook-galaxy100.dts | 57 + + .../arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts | 5 - + arch/arm/boot/dts/aspeed-bmc-facebook-wedge100.dts | 120 +- + arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts | 112 +- + 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 +- + .../boot/dts/ast2400-facebook-netbmc-common.dtsi | 117 ++ + 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 + + 25 files changed, 2843 insertions(+), 248 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/aspeed-bmc-facebook-galaxy100.dts + create mode 100644 arch/arm/boot/dts/ast2400-facebook-netbmc-common.dtsi + 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 (0afa08cf8706 Merge branch 'for-v5.11/tegra-mc' into for-next) +$ git merge drivers-memory/for-next +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.txt +Removing Documentation/devicetree/bindings/memory-controllers/mediatek,smi-common.txt +Merge made by the 'recursive' strategy. + .../bindings/arm/tegra/nvidia,tegra30-actmon.txt | 25 ++ + .../display/tegra/nvidia,tegra20-host1x.txt | 68 ++++ + .../memory-controllers/mediatek,smi-common.txt | 50 --- + .../memory-controllers/mediatek,smi-common.yaml | 142 ++++++++ + .../memory-controllers/mediatek,smi-larb.txt | 50 --- + .../memory-controllers/mediatek,smi-larb.yaml | 132 ++++++++ + .../memory-controllers/nvidia,tegra124-emc.yaml | 19 ++ + .../memory-controllers/nvidia,tegra124-mc.yaml | 5 + + .../memory-controllers/nvidia,tegra20-emc.txt | 22 +- + .../memory-controllers/nvidia,tegra20-mc.txt | 3 + + .../memory-controllers/nvidia,tegra30-emc.yaml | 18 + + .../memory-controllers/nvidia,tegra30-mc.yaml | 5 + + MAINTAINERS | 1 + + drivers/clk/tegra/clk-tegra20-emc.c | 3 + + drivers/memory/jz4780-nemc.c | 4 +- + drivers/memory/mtk-smi.c | 19 ++ + drivers/memory/tegra/Kconfig | 6 +- + drivers/memory/tegra/mc.c | 152 ++++++++- + drivers/memory/tegra/mc.h | 22 ++ + drivers/memory/tegra/tegra114.c | 6 + + drivers/memory/tegra/tegra124-emc.c | 22 +- + drivers/memory/tegra/tegra124.c | 6 + + drivers/memory/tegra/tegra20-emc.c | 366 +++++++++++++++++++-- + drivers/memory/tegra/tegra20.c | 77 +++++ + drivers/memory/tegra/tegra210-emc-core.c | 39 +-- + drivers/memory/tegra/tegra210.c | 50 +-- + drivers/memory/tegra/tegra30-emc.c | 23 +- + drivers/memory/tegra/tegra30.c | 6 + + drivers/soc/tegra/fuse/tegra-apbmisc.c | 2 + + include/dt-bindings/memory/tegra124-mc.h | 68 ++++ + include/dt-bindings/memory/tegra20-mc.h | 53 +++ + include/dt-bindings/memory/tegra210-mc.h | 10 + + include/dt-bindings/memory/tegra30-mc.h | 67 ++++ + include/soc/tegra/fuse.h | 4 + + include/soc/tegra/mc.h | 27 ++ + 35 files changed, 1344 insertions(+), 228 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/mediatek,smi-common.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/mediatek,smi-common.yaml + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml +$ git am -3 ../patches/0001-fix-memory-tegra-Add-and-use-devm_tegra_memory_contr.patch +Applying: fix "memory: tegra: Add and use devm_tegra_memory_controller_get()" +$ git reset HEAD^ +Unstaged changes after reset: +M include/soc/tegra/mc.h +$ git add -A . +$ git commit -v -a --amend +[master 6ac6afff85a4] Merge remote-tracking branch 'drivers-memory/for-next' into master + Date: Fri Nov 13 09:33:51 2020 +1100 +Merging imx-mxs/for-next (c37ca3890c0c Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts +Auto-merging arch/arm/boot/dts/Makefile +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 | 345 ++++++++++++- + .../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 | 12 + + .../devicetree/bindings/watchdog/fsl-imx-wdt.yaml | 16 + + arch/arm/boot/dts/Makefile | 3 + + 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-evk.dts | 2 +- + arch/arm/boot/dts/imx50-kobo-aura.dts | 24 +- + 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-alti6p.dts | 564 +++++++++++++++++++++ + 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-lanmcu.dts | 470 +++++++++++++++++ + 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 + + .../boot/dts/imx6ul-phytec-segin-ff-rdk-emmc.dts | 94 ++++ + .../boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts | 1 + + .../boot/dts/imx6ul-phytec-segin-peb-av-02.dtsi | 151 ++++++ + arch/arm/boot/dts/imx6ul-phytec-segin.dtsi | 43 -- + arch/arm/boot/dts/imx6ul.dtsi | 6 +- + .../boot/dts/imx6ull-phytec-segin-ff-rdk-emmc.dts | 1 + + .../boot/dts/imx6ull-phytec-segin-ff-rdk-nand.dts | 1 + + .../boot/dts/imx6ull-phytec-segin-peb-av-02.dtsi | 26 + + arch/arm/boot/dts/imx6ull-phytec-segin.dtsi | 7 - + 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-imx6q.c | 9 +- + arch/arm/mach-imx/mach-imx7ulp.c | 4 + + 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 | 17 +- + .../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 | 55 +- + 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 | 16 +- + 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 | 64 ++- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 45 +- + arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 39 ++ + 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 | 68 ++- + drivers/clk/imx/clk-imx8mm.c | 2 +- + drivers/clk/imx/clk-imx8mn.c | 2 +- + drivers/clk/imx/clk-imx8mp.c | 4 +- + drivers/clk/imx/clk-imx8mq.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 + + 109 files changed, 5062 insertions(+), 606 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml + create mode 100644 arch/arm/boot/dts/imx6dl-alti6p.dts + create mode 100644 arch/arm/boot/dts/imx6dl-lanmcu.dts + create mode 100644 arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-emmc.dts + create mode 100644 arch/arm/boot/dts/imx6ul-phytec-segin-peb-av-02.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-phytec-segin-peb-av-02.dtsi + 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 (2565feb3ad18 Merge branch 'omap-for-v5.11/dt' into for-next) +$ git merge omap/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am437x-l4.dtsi | 4 +- + arch/arm/boot/dts/motorola-mapphone-common.dtsi | 141 +---------------------- + arch/arm/boot/dts/omap3-beagle-xm.dts | 10 +- + arch/arm/boot/dts/omap3-overo-base.dtsi | 4 +- + arch/arm/boot/dts/omap4-droid-bionic-xt875.dts | 46 ++++++++ + arch/arm/boot/dts/omap4-droid4-xt894.dts | 143 ++++++++++++++++++++++++ + arch/arm/boot/dts/omap4-kc1.dts | 6 +- + arch/arm/boot/dts/omap4-panda-es.dts | 34 +++++- + arch/arm/boot/dts/omap4-sdp.dts | 26 +++-- + arch/arm/boot/dts/omap5-l4.dtsi | 2 +- + 10 files changed, 250 insertions(+), 166 deletions(-) +Merging qcom/for-next (5e6cb9811a9c 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/Makefile | 4 + + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 10 - + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 82 +++--- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 4 +- + .../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 | 40 ++- + .../boot/dts/qcom/msm8992-msft-lumia-talkman.dts | 28 ++ + arch/arm64/boot/dts/qcom/msm8992.dtsi | 120 ++++++++ + .../boot/dts/qcom/msm8994-msft-lumia-cityman.dts | 73 +++++ + arch/arm64/boot/dts/qcom/msm8994.dtsi | 94 ++++++- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm8150.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm8994.dtsi | 96 +++++-- + arch/arm64/boot/dts/qcom/qcs404.dtsi | 4 +- + arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 4 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r1-kb.dts | 4 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r1-lte.dts | 4 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 4 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts | 17 ++ + .../boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts | 18 ++ + .../boot/dts/qcom/sc7180-trogdor-lazor-r3.dts | 15 + + .../boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi | 4 + + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 30 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 152 ++++++++++- + arch/arm64/boot/dts/qcom/sdm630.dtsi | 4 +- + arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 9 + + arch/arm64/boot/dts/qcom/sdm845.dtsi | 7 +- + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 4 + + drivers/i2c/busses/i2c-qcom-geni.c | 6 +- + drivers/soc/qcom/Kconfig | 5 +- + drivers/soc/qcom/cmd-db.c | 8 +- + drivers/soc/qcom/kryo-l2-accessors.c | 2 +- + drivers/soc/qcom/llcc-qcom.c | 117 +++++--- + drivers/soc/qcom/qcom-geni-se.c | 60 ++-- + drivers/soc/qcom/qcom_aoss.c | 4 +- + drivers/soc/qcom/rpmh-rsc.c | 7 +- + drivers/soc/qcom/rpmh.c | 2 +- + drivers/soc/qcom/rpmhpd.c | 3 + + drivers/soc/qcom/rpmpd.c | 85 +++++- + drivers/soc/qcom/smem.c | 3 +- + drivers/soc/qcom/smp2p.c | 6 +- + drivers/soc/qcom/smsm.c | 4 +- + drivers/soc/qcom/wcnss_ctrl.c | 8 +- + include/dt-bindings/power/qcom-rpmpd.h | 29 ++ + include/linux/qcom-geni-se.h | 2 - + 50 files changed, 1294 insertions(+), 225 deletions(-) + create mode 100644 arch/arm64/boot/dts/qcom/msm8994-msft-lumia-cityman.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts +Merging raspberrypi/for-next (3650b228f83a Linux 5.10-rc1) +$ 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 (6215772bbe58 Merge branches 'renesas-arm-defconfig-for-v5.11' and 'renesas-arm-dt-for-v5.11' into renesas-next) +$ git merge renesas/next +Auto-merging arch/arm64/configs/defconfig +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/arm/configs/shmobile_defconfig | 22 +- + 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 - + arch/arm64/boot/dts/renesas/hihope-rev4.dtsi | 6 +- + ...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 | 8 + + .../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 +- + arch/arm64/configs/defconfig | 1 + + drivers/soc/renesas/rmobile-sysc.c | 1 + + 39 files changed, 871 insertions(+), 65 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 (db4d9df43533 Merge branch 'v5.11-armsoc/drivers' into for-next) +$ git merge rockchip/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging Documentation/devicetree/bindings/arm/rockchip.yaml +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 17 + + .../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 | 3 + + .../boot/dts/rockchip/px30-engicam-common.dtsi | 39 +++ + .../boot/dts/rockchip/px30-engicam-ctouch2.dtsi | 8 + + .../boot/dts/rockchip/px30-engicam-edimm2.2.dtsi | 7 + + .../rockchip/px30-engicam-px30-core-ctouch2.dts | 22 ++ + .../rockchip/px30-engicam-px30-core-edimm2.2.dts | 21 ++ + .../boot/dts/rockchip/px30-engicam-px30-core.dtsi | 232 +++++++++++++ + arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts | 25 +- + arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts | 2 +- + .../boot/dts/rockchip/rk3399-kobol-helios64.dts | 372 +++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 4 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 3 + + drivers/clk/rockchip/Kconfig | 12 +- + drivers/soc/rockchip/io-domain.c | 3 - + 19 files changed, 767 insertions(+), 11 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/px30-engicam-common.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/px30-engicam-ctouch2.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/px30-engicam-edimm2.2.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/px30-engicam-px30-core-ctouch2.dts + create mode 100644 arch/arm64/boot/dts/rockchip/px30-engicam-px30-core-edimm2.2.dts + create mode 100644 arch/arm64/boot/dts/rockchip/px30-engicam-px30-core.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts +Merging samsung-krzk/for-next (ca6d22ed16eb 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/exynos-mfc-reserved-memory.dtsi | 4 +- + arch/arm/boot/dts/exynos3250-artik5-eval.dts | 29 +++ + 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 | 53 +++--- + arch/arm/boot/dts/exynos4.dtsi | 26 +-- + 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/exynos4210.dtsi | 36 ++-- + 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 | 47 +++-- + arch/arm/boot/dts/exynos4412-n710x.dts | 2 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 12 +- + arch/arm/boot/dts/exynos4412-odroidu3.dts | 26 +++ + arch/arm/boot/dts/exynos4412-odroidx.dts | 58 ++++-- + arch/arm/boot/dts/exynos4412-origen.dts | 14 +- + arch/arm/boot/dts/exynos4412-smdk4412.dts | 20 +-- + arch/arm/boot/dts/exynos4412.dtsi | 31 ++-- + 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 | 6 +- + arch/arm/boot/dts/exynos5410-odroidxu.dts | 33 +++- + 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 | 39 ++-- + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 34 ++-- + 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-lite.dts | 22 +++ + 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 | 3 + + arch/arm/configs/multi_v7_defconfig | 3 + + arch/arm/mach-exynos/exynos.c | 4 +- + arch/arm/mach-exynos/platsmp.c | 2 +- + arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi | 10 +- + arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi | 2 +- + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 39 +++- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 48 ++++- + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 2 +- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 14 +- + drivers/clk/samsung/Kconfig | 10 ++ + drivers/clk/samsung/Makefile | 2 +- + drivers/clk/samsung/clk-exynos-clkout.c | 199 +++++++++++++++------ + 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 +- + 76 files changed, 802 insertions(+), 387 deletions(-) +Merging scmi/for-linux-next (3cea11cd5e3b Linux 5.10-rc2) +$ git merge scmi/for-linux-next +Already up to date. +Merging stm32/stm32-next (a41ee1a9bf6d ARM: dts: stm32: reorder spi4 within stm32mp15-pinctrl) +$ git merge stm32/stm32-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/stm32429i-eval.dts | 1 + + arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 83 +++++++++++++++++++++++----- + arch/arm/boot/dts/stm32mp151.dtsi | 22 ++++++-- + arch/arm/boot/dts/stm32mp157c-dk2.dts | 4 ++ + arch/arm/boot/dts/stm32mp157c-ed1.dts | 12 ++++ + arch/arm/boot/dts/stm32mp157c-ev1.dts | 1 + + arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 37 +++++++++++++ + arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 8 +++ + arch/arm/configs/multi_v7_defconfig | 6 ++ + 9 files changed, 154 insertions(+), 20 deletions(-) +Merging sunxi/sunxi/for-next (12f6c7209fc3 Merge branch 'sunxi/dt-for-5.11' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging Documentation/devicetree/bindings/arm/sunxi.yaml +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/sunxi.yaml | 23 +++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm/boot/dts/Makefile | 3 + + arch/arm/boot/dts/sun7i-a20-bananapi.dts | 2 +- + arch/arm/boot/dts/sun8i-h3-nanopi-r1.dts | 169 +++++++++++++++++++++ + arch/arm/boot/dts/sun8i-h3-zeropi.dts | 85 +++++++++++ + arch/arm/boot/dts/sun8i-s3-elimo-impetus.dtsi | 44 ++++++ + arch/arm/boot/dts/sun8i-s3-elimo-initium.dts | 29 ++++ + arch/arm/boot/dts/sun8i-s3-pinecube.dts | 2 +- + arch/arm/boot/dts/sun8i-v3.dtsi | 5 + + arch/arm/boot/dts/sun8i-v3s.dtsi | 6 + + arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 12 +- + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 13 ++ + arch/arm/mach-sunxi/sunxi.c | 1 + + .../dts/allwinner/sun50i-a64-pinephone-1.0.dts | 5 + + .../dts/allwinner/sun50i-a64-pinephone-1.1.dts | 5 + + .../dts/allwinner/sun50i-a64-pinephone-1.2.dts | 14 ++ + .../boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 68 ++++++++- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 14 ++ + .../dts/allwinner/sun50i-h6-orangepi-one-plus.dts | 2 +- + .../dts/allwinner/sun50i-h6-pine-h64-model-b.dts | 15 ++ + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 15 +- + arch/arm64/configs/defconfig | 1 + + 23 files changed, 517 insertions(+), 18 deletions(-) + create mode 100644 arch/arm/boot/dts/sun8i-h3-nanopi-r1.dts + create mode 100644 arch/arm/boot/dts/sun8i-h3-zeropi.dts + create mode 100644 arch/arm/boot/dts/sun8i-s3-elimo-impetus.dtsi + create mode 100644 arch/arm/boot/dts/sun8i-s3-elimo-initium.dts +Merging tegra/for-next (08f3ad8c86b0 Merge branch for-5.11/arm64/dt into for-next) +$ git merge tegra/for-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/dma/nvidia,tegra210-adma.txt +Removing Documentation/devicetree/bindings/bus/nvidia,tegra210-aconnect.txt +Auto-merging Documentation/devicetree/bindings/arm/tegra.yaml +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/tegra.yaml | 3 + + .../bindings/bus/nvidia,tegra210-aconnect.txt | 44 - + .../bindings/bus/nvidia,tegra210-aconnect.yaml | 82 + + .../bindings/dma/nvidia,tegra210-adma.txt | 56 - + .../bindings/dma/nvidia,tegra210-adma.yaml | 99 + + .../bindings/interrupt-controller/arm,gic.yaml | 9 +- + .../bindings/pinctrl/nvidia,tegra194-pinmux.txt | 2 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm/boot/dts/Makefile | 3 +- + arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 5 +- + arch/arm/boot/dts/tegra20-ventana.dts | 11 + + .../dts/tegra30-asus-nexus7-grouper-common.dtsi | 27 +- + .../tegra30-asus-nexus7-grouper-maxim-pmic.dtsi | 2 +- + arch/arm/boot/dts/tegra30-asus-nexus7-tilapia.dtsi | 2 +- + arch/arm/boot/dts/tegra30-ouya.dts | 4511 ++++++++++++++++++++ + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 32 +- + .../arm64/boot/dts/nvidia/tegra194-p3668-0000.dtsi | 2 +- + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 6 +- + arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 2 +- + arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 2 +- + arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 2 +- + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 2 +- + drivers/firmware/tegra/bpmp-debugfs.c | 6 +- + drivers/soc/tegra/fuse/speedo-tegra124.c | 21 +- + drivers/soc/tegra/fuse/speedo-tegra210.c | 6 +- + 25 files changed, 4783 insertions(+), 156 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/bus/nvidia,tegra210-aconnect.txt + create mode 100644 Documentation/devicetree/bindings/bus/nvidia,tegra210-aconnect.yaml + delete mode 100644 Documentation/devicetree/bindings/dma/nvidia,tegra210-adma.txt + create mode 100644 Documentation/devicetree/bindings/dma/nvidia,tegra210-adma.yaml + create mode 100644 arch/arm/boot/dts/tegra30-ouya.dts +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 (9b3ed1604622 Merge branches 'ti-k3-dts-next' and 'ti-k3-config-next' into ti-k3-next) +$ git merge ti-k3-new/ti-k3-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 5 +- + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 43 ++++++++- + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 45 +++++++++- + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 84 +++++++++++++++++- + arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 42 ++++++++- + arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi | 110 +++++++++++++++++++++++- + arch/arm64/configs/defconfig | 2 + + 7 files changed, 322 insertions(+), 9 deletions(-) +Merging clk/clk-next (f1b6e57d4e4b Merge branch 'clk-qcom' into clk-next) +$ git merge clk/clk-next +Auto-merging drivers/clk/imx/clk.h +Auto-merging drivers/clk/imx/clk-imx8mq.c +Auto-merging drivers/clk/imx/clk-imx8mp.c +Auto-merging drivers/clk/imx/clk-imx8mn.c +Auto-merging drivers/clk/imx/clk-imx8mm.c +Merge made by the 'recursive' strategy. + .../bindings/clock/qcom,aoncc-sm8250.yaml | 58 + + .../bindings/clock/qcom,audiocc-sm8250.yaml | 58 + + .../bindings/clock/qcom,sc7180-camcc.yaml | 73 + + drivers/clk/imx/clk-imx8mm.c | 10 +- + drivers/clk/imx/clk-imx8mn.c | 6 +- + drivers/clk/imx/clk-imx8mp.c | 10 +- + drivers/clk/imx/clk-imx8mq.c | 8 +- + drivers/clk/imx/clk.h | 5 + + drivers/clk/meson/clk-regmap.h | 5 +- + drivers/clk/qcom/Kconfig | 15 + + drivers/clk/qcom/Makefile | 2 + + drivers/clk/qcom/camcc-sc7180.c | 1736 ++++++++++++++++++++ + drivers/clk/qcom/clk-alpha-pll.c | 217 ++- + drivers/clk/qcom/clk-alpha-pll.h | 4 + + drivers/clk/qcom/clk-regmap.h | 6 +- + drivers/clk/qcom/lpass-gfm-sm8250.c | 320 ++++ + drivers/clk/qcom/lpasscorecc-sc7180.c | 119 +- + include/dt-bindings/clock/qcom,camcc-sc7180.h | 121 ++ + .../dt-bindings/clock/qcom,sm8250-lpass-aoncc.h | 11 + + .../dt-bindings/clock/qcom,sm8250-lpass-audiocc.h | 13 + + include/linux/clk.h | 2 +- + 21 files changed, 2645 insertions(+), 154 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,aoncc-sm8250.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,audiocc-sm8250.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-camcc.yaml + create mode 100644 drivers/clk/qcom/camcc-sc7180.c + create mode 100644 drivers/clk/qcom/lpass-gfm-sm8250.c + create mode 100644 include/dt-bindings/clock/qcom,camcc-sc7180.h + create mode 100644 include/dt-bindings/clock/qcom,sm8250-lpass-aoncc.h + create mode 100644 include/dt-bindings/clock/qcom,sm8250-lpass-audiocc.h +$ git am -3 ../patches/clk-pm_clock-provide-stubs-for-pm_clk_runtime_suspend__resume.patch +Applying: clk: pm_clock: provide stubs for pm_clk_runtime_suspend/_resume +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/pm_clock.h +$ git add -A . +$ git commit -v -a --amend +[master 0c2d9aaccbd7] Merge remote-tracking branch 'clk/clk-next' into master + Date: Fri Nov 13 09:53:52 2020 +1100 +Merging clk-samsung/for-next (3650b228f83a Linux 5.10-rc1) +$ git merge clk-samsung/for-next +Already up to date. +Merging csky/linux-next (d09101cb3c22 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 ++++++++++++++++++++++------- + 20 files changed, 116 insertions(+), 53 deletions(-) +Merging h8300/h8300-next (8808515be0ed h8300: Replace <linux/clk-provider.h> by <linux/of_clk.h>) +$ git merge h8300/h8300-next +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Auto-merging drivers/net/ethernet/smsc/Kconfig +Auto-merging drivers/clocksource/h8300_timer8.c +Auto-merging arch/h8300/kernel/setup.c +Merge made by the 'recursive' strategy. + arch/h8300/Kconfig.cpu | 4 ++ + arch/h8300/boot/dts/edosk2674.dts | 10 ++++- + arch/h8300/boot/dts/h8300h_sim.dts | 2 +- + arch/h8300/boot/dts/h8s_sim.dts | 2 +- + arch/h8300/configs/edosk2674_defconfig | 10 ++--- + arch/h8300/configs/h8300h-sim_defconfig | 8 +--- + arch/h8300/configs/h8s-sim_defconfig | 8 +--- + arch/h8300/kernel/setup.c | 2 +- + arch/h8300/lib/memset.S | 17 +++++---- + drivers/clocksource/h8300_timer8.c | 20 +++++----- + drivers/irqchip/irq-renesas-h8300h.c | 19 +++++++++- + drivers/irqchip/irq-renesas-h8s.c | 67 +++++++++++++++++++++++++-------- + drivers/net/ethernet/smsc/Kconfig | 1 - + drivers/net/ethernet/smsc/smc91x.c | 10 +++++ + drivers/tty/serial/sh-sci.c | 5 +-- + 15 files changed, 123 insertions(+), 62 deletions(-) +Merging ia64/next (c331649e6371 ia64: Use libata instead of the legacy ide driver in defconfigs) +$ git merge ia64/next +Already up to date. +Merging m68k/for-next (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 (4f39612a50c7 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 (e167a59c654a microblaze: Replace <linux/clk-provider.h> by <linux/of_clk.h>) +$ git merge microblaze/next +Merge made by the 'recursive' strategy. + arch/microblaze/kernel/setup.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging mips/mips-next (a3fb655027c3 mips: boot: add support for self-extracting FIT images (vmlinuz.itb)) +$ git merge mips/mips-next +Removing include/linux/platform_data/jz4740/jz4740_nand.h +Auto-merging arch/mips/Kconfig +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-firmware-lefi-boardinfo | 35 +++ + Documentation/devicetree/bindings/mips/mscc.txt | 2 +- + arch/mips/Kconfig | 6 +- + arch/mips/Makefile | 3 +- + arch/mips/ar7/gpio.c | 1 + + arch/mips/bcm47xx/Kconfig | 2 + + arch/mips/boot/.gitignore | 1 + + arch/mips/boot/compressed/Makefile | 96 ++++++-- + arch/mips/boot/compressed/ld.script | 9 +- + arch/mips/boot/dts/Makefile | 2 +- + arch/mips/boot/dts/ingenic/jz4740.dtsi | 2 +- + arch/mips/boot/dts/ingenic/jz4770.dtsi | 2 +- + arch/mips/boot/dts/mscc/Makefile | 11 +- + arch/mips/boot/dts/mscc/jaguar2.dtsi | 167 +++++++++++++ + arch/mips/boot/dts/mscc/jaguar2_common.dtsi | 25 ++ + arch/mips/boot/dts/mscc/jaguar2_pcb110.dts | 267 +++++++++++++++++++++ + arch/mips/boot/dts/mscc/jaguar2_pcb111.dts | 107 +++++++++ + arch/mips/boot/dts/mscc/jaguar2_pcb118.dts | 57 +++++ + arch/mips/boot/dts/mscc/luton.dtsi | 116 +++++++++ + arch/mips/boot/dts/mscc/luton_pcb091.dts | 30 +++ + arch/mips/boot/dts/mscc/serval.dtsi | 153 ++++++++++++ + arch/mips/boot/dts/mscc/serval_common.dtsi | 127 ++++++++++ + arch/mips/boot/dts/mscc/serval_pcb105.dts | 17 ++ + arch/mips/boot/dts/mscc/serval_pcb106.dts | 17 ++ + arch/mips/boot/dts/mti/sead3.dts | 2 +- + arch/mips/boot/dts/ralink/mt7628a.dtsi | 2 +- + arch/mips/generic/Kconfig | 37 ++- + arch/mips/generic/Platform | 3 + + arch/mips/generic/board-jaguar2.its.S | 40 +++ + arch/mips/generic/board-luton.its.S | 23 ++ + arch/mips/generic/board-serval.its.S | 24 ++ + arch/mips/include/asm/compiler.h | 9 +- + arch/mips/include/asm/mach-loongson64/boot_param.h | 4 + + .../asm/mach-loongson64/kernel-entry-init.h | 8 - + .../include/asm/mach-loongson64/loongson_regs.h | 10 + + arch/mips/include/asm/types.h | 1 - + arch/mips/kernel/mips-cm.c | 1 + + arch/mips/loongson64/Makefile | 1 + + arch/mips/loongson64/boardinfo.c | 48 ++++ + arch/mips/loongson64/env.c | 10 + + arch/mips/loongson64/numa.c | 20 +- + arch/mips/loongson64/smp.c | 123 ++++++++-- + arch/mips/pci/pci-vr41xx.c | 4 +- + include/linux/platform_data/jz4740/jz4740_nand.h | 25 -- + 44 files changed, 1533 insertions(+), 117 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-firmware-lefi-boardinfo + create mode 100644 arch/mips/boot/dts/mscc/jaguar2.dtsi + create mode 100644 arch/mips/boot/dts/mscc/jaguar2_common.dtsi + create mode 100644 arch/mips/boot/dts/mscc/jaguar2_pcb110.dts + create mode 100644 arch/mips/boot/dts/mscc/jaguar2_pcb111.dts + create mode 100644 arch/mips/boot/dts/mscc/jaguar2_pcb118.dts + create mode 100644 arch/mips/boot/dts/mscc/luton.dtsi + create mode 100644 arch/mips/boot/dts/mscc/luton_pcb091.dts + create mode 100644 arch/mips/boot/dts/mscc/serval.dtsi + create mode 100644 arch/mips/boot/dts/mscc/serval_common.dtsi + create mode 100644 arch/mips/boot/dts/mscc/serval_pcb105.dts + create mode 100644 arch/mips/boot/dts/mscc/serval_pcb106.dts + create mode 100644 arch/mips/generic/board-jaguar2.its.S + create mode 100644 arch/mips/generic/board-luton.its.S + create mode 100644 arch/mips/generic/board-serval.its.S + 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 (1da81e5562fa drivers/tty/serial: add LiteUART driver) +$ git merge openrisc/for-next +Auto-merging drivers/tty/serial/Kconfig +Auto-merging drivers/soc/Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + .../devicetree/bindings/serial/litex,liteuart.yaml | 38 ++ + .../bindings/soc/litex/litex,soc-controller.yaml | 39 ++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 9 + + drivers/soc/Kconfig | 1 + + drivers/soc/Makefile | 1 + + drivers/soc/litex/Kconfig | 19 + + drivers/soc/litex/Makefile | 3 + + drivers/soc/litex/litex_soc_ctrl.c | 176 +++++++++ + drivers/tty/serial/Kconfig | 32 ++ + drivers/tty/serial/Makefile | 1 + + drivers/tty/serial/liteuart.c | 404 +++++++++++++++++++++ + include/linux/litex.h | 102 ++++++ + 13 files changed, 827 insertions(+) + create mode 100644 Documentation/devicetree/bindings/serial/litex,liteuart.yaml + create mode 100644 Documentation/devicetree/bindings/soc/litex/litex,soc-controller.yaml + create mode 100644 drivers/soc/litex/Kconfig + create mode 100644 drivers/soc/litex/Makefile + create mode 100644 drivers/soc/litex/litex_soc_ctrl.c + create mode 100644 drivers/tty/serial/liteuart.c + create mode 100644 include/linux/litex.h +Merging parisc-hd/for-next (19621e5fd02b 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 +Removing arch/parisc/include/uapi/asm/types.h +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 d91bf91550d4] Merge remote-tracking branch 'parisc-hd/for-next' into master +$ git diff -M --stat --summary HEAD^.. + arch/parisc/include/asm/processor.h | 9 +- + arch/parisc/include/uapi/asm/types.h | 7 -- + arch/parisc/kernel/entry.S | 4 +- + arch/parisc/kernel/irq.c | 7 +- + arch/parisc/kernel/processor.c | 5 +- + arch/parisc/kernel/sys_parisc.c | 23 ++++- + arch/parisc/kernel/time.c | 161 +++++++++++++++++++---------------- + fs/exec.c | 4 +- + mm/Kconfig | 12 ++- + 9 files changed, 122 insertions(+), 110 deletions(-) + delete mode 100644 arch/parisc/include/uapi/asm/types.h +$ 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 69fffbd719de] Merge remote-tracking branch 'parisc-hd/for-next' into master + Date: Fri Nov 13 10:06:32 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 (ae386e9d809c riscv: Ignore Image.* and loader.bin) +$ git merge risc-v/for-next +Auto-merging arch/riscv/mm/init.c +Merge made by the 'recursive' strategy. + arch/riscv/Makefile | 6 ++ + arch/riscv/boot/.gitignore | 3 +- + arch/riscv/boot/Makefile | 2 +- + arch/riscv/kernel/setup.c | 160 +++++++++++++++++++++++++++++++++++++++++++++ + arch/riscv/mm/init.c | 27 -------- + 5 files changed, 169 insertions(+), 29 deletions(-) +Merging s390/for-next (94192be7c0ce Merge branch 'features' into for-next) +$ git merge s390/for-next +Auto-merging arch/s390/include/asm/mmu_context.h +Auto-merging arch/s390/Kconfig +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 3 +- + arch/s390/boot/boot.h | 1 + + arch/s390/boot/compressed/decompressor.h | 4 +- + arch/s390/boot/head.S | 14 ++- + arch/s390/boot/ipl_parm.c | 5 +- + arch/s390/boot/kaslr.c | 30 ++---- + arch/s390/boot/startup.c | 26 +++++ + arch/s390/include/asm/delay.h | 1 + + arch/s390/include/asm/kasan.h | 37 +++++-- + arch/s390/include/asm/mmu_context.h | 7 -- + arch/s390/include/asm/pgtable.h | 12 +-- + arch/s390/include/asm/processor.h | 6 +- + arch/s390/kernel/base.S | 22 ----- + arch/s390/kernel/early.c | 4 +- + arch/s390/kernel/head64.S | 7 +- + arch/s390/kernel/setup.c | 10 +- + arch/s390/lib/delay.c | 13 +++ + arch/s390/mm/init.c | 2 +- + arch/s390/mm/kasan_init.c | 72 ++++---------- + arch/s390/pci/pci_mmio.c | 98 ++++++++++-------- + drivers/char/hw_random/s390-trng.c | 7 +- + drivers/s390/crypto/ap_bus.c | 164 +++++++++++++++++++++++++++++-- + drivers/s390/crypto/ap_bus.h | 12 +++ + drivers/s390/crypto/pkey_api.c | 15 +++ + drivers/s390/crypto/zcrypt_api.c | 66 +++++++++++++ + drivers/s390/crypto/zcrypt_api.h | 2 + + lib/Kconfig.kasan | 9 -- + 27 files changed, 445 insertions(+), 204 deletions(-) +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 (9a5085b3fad5 um: Call pgtable_pmd_page_dtor() in __pmd_free_tlb()) +$ git merge uml/linux-next +Merge made by the 'recursive' strategy. + arch/um/include/asm/pgalloc.h | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) +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 (a12315094469 Merge branch 'for-next-next-v5.10-20201105' into for-next-20201105) +$ git merge btrfs/for-next +Merge made by the 'recursive' strategy. + fs/btrfs/backref.c | 19 +- + fs/btrfs/block-group.c | 254 +++++++-------- + fs/btrfs/block-group.h | 2 + + fs/btrfs/block-rsv.c | 8 + + fs/btrfs/btrfs_inode.h | 16 +- + fs/btrfs/check-integrity.c | 8 +- + fs/btrfs/compression.c | 25 +- + fs/btrfs/ctree.c | 180 ++--------- + fs/btrfs/ctree.h | 117 ++++++- + fs/btrfs/delayed-inode.c | 11 - + fs/btrfs/dir-item.c | 1 - + fs/btrfs/discard.c | 46 ++- + fs/btrfs/discard.h | 3 +- + fs/btrfs/disk-io.c | 443 ++++++++++++++------------ + fs/btrfs/disk-io.h | 21 +- + fs/btrfs/export.c | 1 - + fs/btrfs/extent-io-tree.h | 33 +- + fs/btrfs/extent-tree.c | 112 ++----- + fs/btrfs/extent_io.c | 386 +++++++++++++---------- + fs/btrfs/extent_io.h | 37 +-- + fs/btrfs/file-item.c | 58 ++-- + fs/btrfs/file.c | 717 +++++++++++++++++++++--------------------- + 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 | 519 +++++++++++++++++------------- + fs/btrfs/ioctl.c | 40 ++- + 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 | 15 +- + fs/btrfs/qgroup.c | 54 +--- + fs/btrfs/reada.c | 34 +- + fs/btrfs/ref-verify.c | 27 +- + fs/btrfs/reflink.c | 12 +- + fs/btrfs/relocation.c | 59 +--- + fs/btrfs/scrub.c | 51 +-- + 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 | 108 ++++++- + fs/btrfs/tests/btrfs-tests.c | 2 +- + fs/btrfs/tests/inode-tests.c | 12 +- + fs/btrfs/tests/qgroup-tests.c | 4 - + fs/btrfs/transaction.c | 97 +++--- + fs/btrfs/transaction.h | 1 - + fs/btrfs/tree-checker.c | 6 +- + fs/btrfs/tree-defrag.c | 1 - + fs/btrfs/tree-log.c | 55 ++-- + fs/btrfs/uuid-tree.c | 3 +- + fs/btrfs/volumes.c | 39 ++- + fs/btrfs/volumes.h | 13 + + include/trace/events/btrfs.h | 104 +++++- + 56 files changed, 2606 insertions(+), 2389 deletions(-) +Merging ceph/master (62575e270f66 ceph: check session state after bumping session->s_seq) +$ git merge ceph/master +Already up to date. +Merging cifs/for-next (830c9f9cf885 smb3: Handle error case during offload read path) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifsacl.c | 1 + + fs/cifs/smb2ops.c | 88 +++++++++++++++++++++++++++++++++++++++++++++---------- + 2 files changed, 74 insertions(+), 15 deletions(-) +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 (a85edf52625a Pull kmap cleanup from Ira Weiny.) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + Documentation/filesystems/ext2.rst | 1 + + fs/ext2/dir.c | 33 ++++++++------------------------- + fs/ext2/ext2.h | 27 +++++++++++++++++++++++++++ + fs/ext2/namei.c | 15 +++++---------- + fs/ext2/super.c | 2 +- + fs/notify/fsnotify.c | 12 +++++++----- + fs/notify/inotify/inotify_user.c | 23 ++++++++++++++++++++++- + fs/quota/quota_tree.c | 8 ++++---- + fs/quota/quota_v2.c | 19 +++++++++++++++++++ + include/linux/quota.h | 15 ++++++++------- + 10 files changed, 102 insertions(+), 53 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 007e4f9a2f55 Merge remote-tracking branch 'cifs/for-next' into master +Merging next-20201112 version of ext3 +$ git merge -m next-20201112/ext3 22435b28172848b24f66d6955658442b5f2bf744 +Merge made by the 'recursive' strategy. + Documentation/filesystems/ext2.rst | 1 + + fs/ext2/super.c | 2 +- + fs/notify/fsnotify.c | 12 +++++++----- + fs/notify/inotify/inotify_user.c | 23 ++++++++++++++++++++++- + fs/quota/quota_tree.c | 8 ++++---- + fs/quota/quota_v2.c | 19 +++++++++++++++++++ + include/linux/quota.h | 15 ++++++++------- + 7 files changed, 62 insertions(+), 18 deletions(-) +Merging ext4/dev (d196e229a80c Revert "ext4: fix superblock checksum calculation race") +$ git merge ext4/dev +Merge made by the 'recursive' strategy. + fs/ext4/ext4.h | 6 +++--- + fs/ext4/super.c | 11 ----------- + 2 files changed, 3 insertions(+), 14 deletions(-) +Merging f2fs/dev (a945d4f0d38c f2fs: avoid race condition for shinker count) +$ 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 | 237 ++++++++++++++++++++++++++++++++++++-------- + fs/f2fs/node.c | 2 +- + fs/f2fs/shrinker.c | 6 +- + include/trace/events/f2fs.h | 1 + + include/uapi/linux/f2fs.h | 96 ++++++++++++++++++ + 8 files changed, 310 insertions(+), 122 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 (9d769e6aa252 fuse: support SB_NOSEC flag to improve write performance) +$ git merge fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/dir.c | 23 +++++++++++++++---- + fs/fuse/file.c | 22 ++++++++++++++++-- + fs/fuse/fuse_i.h | 29 +++++++++--------------- + fs/fuse/inode.c | 57 ++++++++++++++++++++++------------------------- + fs/fuse/virtio_fs.c | 47 +++++++++++++++++--------------------- + include/uapi/linux/fuse.h | 30 ++++++++++++++++++++----- + 6 files changed, 121 insertions(+), 87 deletions(-) +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 (f8394f232b1e Linux 5.10-rc3) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (11decaf8127b 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 (c3213d260a23 SUNRPC: Fix oops in the rpc_xdr_buf event class) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + include/trace/events/sunrpc.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging cel/cel-next (dc4152fc512e svcrdma: Catch another Reply chunk overflow case) +$ git merge cel/cel-next +Auto-merging include/trace/events/sunrpc.h +Auto-merging fs/nfsd/nfs3xdr.c +Auto-merging fs/nfsd/nfs3proc.c +Merge made by the 'recursive' strategy. + fs/nfsd/nfs3proc.c | 1 - + fs/nfsd/nfs3xdr.c | 7 + + fs/nfsd/nfs4xdr.c | 45 ++- + fs/nfsd/nfsxdr.c | 6 + + fs/nfsd/trace.c | 1 + + fs/nfsd/trace.h | 48 ++- + 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 | 24 -- + net/sunrpc/svc.c | 11 +- + net/sunrpc/svc_xprt.c | 4 +- + net/sunrpc/svcsock.c | 8 +- + 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 | 600 +++++++++++++++++++++-------- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 562 ++++++++++++++------------- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 2 +- + 24 files changed, 1560 insertions(+), 720 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 (c11faf32599f ovl: fix incorrect extent info in metacopy case) +$ git merge overlayfs/overlayfs-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/overlayfs.rst | 27 +++++++++++++++++++-------- + fs/overlayfs/copy_up.c | 25 ++++++++++++++----------- + fs/overlayfs/export.c | 10 ++++++---- + fs/overlayfs/inode.c | 2 +- + fs/overlayfs/namei.c | 25 +++++++++++++++---------- + fs/overlayfs/overlayfs.h | 14 ++++++++------ + fs/overlayfs/ovl_entry.h | 1 + + fs/overlayfs/super.c | 33 ++++++++++++++++++++++++++++----- + fs/overlayfs/util.c | 3 ++- + 9 files changed, 94 insertions(+), 46 deletions(-) +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 (2bd3fa793aaa xfs: fix a missing unlock on error in xfs_fs_map_blocks) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/xfs/libxfs/xfs_rmap.c | 2 +- + fs/xfs/libxfs/xfs_rmap_btree.c | 16 ++++++++-------- + fs/xfs/scrub/bmap.c | 2 ++ + fs/xfs/scrub/refcount.c | 8 +++----- + fs/xfs/xfs_pnfs.c | 2 +- + 5 files changed, 15 insertions(+), 15 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 (9b8523423b23 vfs: move __sb_{start,end}_write* to fs.h) +$ git merge djw-vfs/vfs-for-next +Auto-merging include/linux/fs.h +Auto-merging fs/io_uring.c +Merge made by the 'recursive' strategy. + fs/aio.c | 2 +- + fs/io_uring.c | 3 +-- + fs/super.c | 49 ------------------------------------------------- + include/linux/fs.h | 38 +++++++++++++++++++++++++++----------- + 4 files changed, 29 insertions(+), 63 deletions(-) +Merging file-locks/locks-next (8d1ddb5e7937 fcntl: Fix potential deadlock in send_sig{io, urg}()) +$ git merge file-locks/locks-next +Merge made by the 'recursive' strategy. + fs/fcntl.c | 10 ++++++---- + fs/locks.c | 4 ++-- + 2 files changed, 8 insertions(+), 6 deletions(-) +Merging vfs/for-next (61c207915a76 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/arm/include/asm/elf.h +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 | 87 +-- + 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(+), 1120 deletions(-) + rename arch/sparc/include/asm/{extable_64.h => extable.h} (92%) + delete mode 100644 arch/sparc/mm/extable.c +Merging printk/for-next (9194df34b8b8 Merge branch 'for-5.10-trivial' into for-next) +$ git merge printk/for-next +Auto-merging kernel/printk/printk_ringbuffer.c +Merge made by the 'recursive' strategy. + init/Kconfig | 2 +- + kernel/printk/printk_ringbuffer.c | 2 -- + 2 files changed, 1 insertion(+), 3 deletions(-) +Merging pci/next (405196258f54 Merge branch 'pci/misc') +$ git merge pci/next +Auto-merging drivers/pci/pci.c +Merge made by the 'recursive' strategy. + drivers/pci/p2pdma.c | 10 +++++----- + drivers/pci/pci-driver.c | 4 ++-- + drivers/pci/pci.c | 2 +- + drivers/pci/probe.c | 4 ++-- + drivers/pci/slot.c | 5 +++-- + 5 files changed, 13 insertions(+), 12 deletions(-) +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 ddf3cf4e02f1] Merge remote-tracking branch 'pstore/for-next/pstore' into master +$ git diff -M --stat --summary HEAD^.. +Merging hid/for-next (e76f0c214c41 Merge branch 'for-5.10/upstream-fixes' into for-next) +$ git merge hid/for-next +Auto-merging drivers/hid/hid-logitech-dj.c +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 | 10 + + drivers/hid/hid-input.c | 8 +- + drivers/hid/hid-ite.c | 61 +- + drivers/hid/hid-logitech-dj.c | 19 + + drivers/hid/hid-logitech-hidpp.c | 7 + + drivers/hid/hid-mcp2221.c | 48 +- + drivers/hid/hid-quirks.c | 5 + + drivers/hid/hid-sensor-hub.c | 3 +- + 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 + + 29 files changed, 2198 insertions(+), 32 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 (c97e7615c15b 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-ocores.c | 23 ++++++----- + drivers/i2c/busses/i2c-owl.c | 74 +++++++++++++++++++++++++++--------- + 5 files changed, 67 insertions(+), 38 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 (d7e445a92e1b hwmon: (ibmpowernv) Silence strncpy() warning) +$ 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/adm1177.c | 10 +- + drivers/hwmon/adt7470.c | 154 ++++++--- + drivers/hwmon/corsair-psu.c | 605 ++++++++++++++++++++++++++++++++++++ + drivers/hwmon/ibmpowernv.c | 2 +- + drivers/hwmon/ina3221.c | 2 +- + 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 - + 43 files changed, 847 insertions(+), 102 deletions(-) + create mode 100644 Documentation/hwmon/corsair-psu.rst + create mode 100644 drivers/hwmon/corsair-psu.c +Merging jc_docs/docs-next (f8394f232b1e Linux 5.10-rc3) +$ git merge jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (0ab4f9087ea9 media: platform: add missing put_device() call in mtk_jpeg_probe() and mtk_jpeg_remove()) +$ git merge v4l-dvb/master +Auto-merging include/linux/refcount.h +Auto-merging drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c +Auto-merging drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c +Auto-merging drivers/media/platform/marvell-ccic/mmp-driver.c +CONFLICT (content): Merge conflict in drivers/media/platform/marvell-ccic/mmp-driver.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/media/i2c/sony,imx214.txt +Removing Documentation/devicetree/bindings/media/i2c/ov772x.txt +Removing Documentation/devicetree/bindings/media/i2c/aptina,mt9v111.txt +Removing Documentation/devicetree/bindings/media/i2c/adv7604.txt +Removing Documentation/devicetree/bindings/media/coda.txt +Resolved 'drivers/media/platform/marvell-ccic/mmp-driver.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 10decbefe7b2] Merge remote-tracking branch 'v4l-dvb/master' into master +$ git diff -M --stat --summary HEAD^.. + .../media/allwinner,sun4i-a10-video-engine.yaml | 1 + + Documentation/devicetree/bindings/media/coda.txt | 31 - + Documentation/devicetree/bindings/media/coda.yaml | 108 ++ + .../devicetree/bindings/media/i2c/adv7604.txt | 88 - + .../devicetree/bindings/media/i2c/adv7604.yaml | 178 ++ + .../bindings/media/i2c/aptina,mt9v111.txt | 46 - + .../bindings/media/i2c/aptina,mt9v111.yaml | 75 + + .../devicetree/bindings/media/i2c/ov772x.txt | 40 - + .../devicetree/bindings/media/i2c/ovti,ov772x.yaml | 134 ++ + .../devicetree/bindings/media/i2c/sony,imx214.txt | 53 - + .../devicetree/bindings/media/i2c/sony,imx214.yaml | 133 ++ + Documentation/driver-api/media/camera-sensor.rst | 13 + + Documentation/driver-api/media/cec-core.rst | 2 +- + Documentation/driver-api/media/csi2.rst | 7 +- + .../userspace-api/media/cec/cec-ioc-g-mode.rst | 2 +- + Documentation/userspace-api/media/v4l/biblio.rst | 12 +- + .../media/v4l/colorspaces-details.rst | 5 +- + .../userspace-api/media/v4l/subdev-formats.rst | 27 + + MAINTAINERS | 24 +- + drivers/media/cec/core/cec-core.c | 4 +- + drivers/media/common/saa7146/saa7146_fops.c | 2 - + drivers/media/common/saa7146/saa7146_video.c | 6 +- + drivers/media/dvb-frontends/drx39xyj/drxj.c | 7 - + drivers/media/dvb-frontends/drxd_hard.c | 1 - + drivers/media/dvb-frontends/m88ds3103.c | 6 +- + drivers/media/dvb-frontends/nxt200x.c | 16 - + drivers/media/dvb-frontends/rtl2832.c | 14 +- + drivers/media/dvb-frontends/si21xx.c | 2 - + drivers/media/dvb-frontends/ts2020.c | 10 +- + drivers/media/i2c/Kconfig | 1 + + drivers/media/i2c/ad5820.c | 6 +- + drivers/media/i2c/adp1653.c | 6 +- + drivers/media/i2c/adv7180.c | 6 +- + drivers/media/i2c/adv748x/adv748x-core.c | 3 +- + drivers/media/i2c/ak7375.c | 7 +- + drivers/media/i2c/dw9768.c | 6 +- + drivers/media/i2c/et8ek8/et8ek8_driver.c | 8 +- + drivers/media/i2c/hi556.c | 6 +- + drivers/media/i2c/imx219.c | 16 +- + drivers/media/i2c/imx258.c | 2 +- + drivers/media/i2c/imx274.c | 280 +++- + drivers/media/i2c/imx290.c | 10 +- + drivers/media/i2c/imx319.c | 8 +- + drivers/media/i2c/imx355.c | 8 +- + drivers/media/i2c/msp3400-kthreads.c | 12 +- + drivers/media/i2c/ov13858.c | 6 +- + drivers/media/i2c/ov2680.c | 6 +- + drivers/media/i2c/ov2685.c | 6 +- + drivers/media/i2c/ov2740.c | 8 +- + drivers/media/i2c/ov5640.c | 108 +- + drivers/media/i2c/ov5670.c | 6 +- + drivers/media/i2c/ov5675.c | 6 +- + drivers/media/i2c/ov5695.c | 6 +- + drivers/media/i2c/ov7670.c | 96 +- + drivers/media/i2c/ov772x.c | 71 +- + drivers/media/i2c/ov7740.c | 6 +- + drivers/media/i2c/ov8856.c | 6 +- + drivers/media/i2c/smiapp/smiapp-core.c | 28 +- + drivers/media/i2c/tvp5150.c | 6 +- + drivers/media/pci/bt8xx/bttv-cards.c | 6 +- + drivers/media/pci/bt8xx/bttv-driver.c | 20 +- + drivers/media/pci/bt8xx/bttv-risc.c | 1 - + drivers/media/pci/cx23885/cx23885-core.c | 1 - + drivers/media/pci/cx25821/cx25821-core.c | 1 - + drivers/media/pci/intel/ipu3/ipu3-cio2.c | 111 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.h | 157 +- + drivers/media/pci/saa7134/saa7134-video.c | 26 +- + drivers/media/pci/saa7164/saa7164-core.c | 17 +- + drivers/media/platform/coda/coda-bit.c | 73 +- + drivers/media/platform/coda/coda-common.c | 35 +- + drivers/media/platform/coda/coda.h | 11 + + drivers/media/platform/davinci/isif.c | 11 +- + drivers/media/platform/exynos4-is/fimc-core.c | 6 +- + drivers/media/platform/fsl-viu.c | 2 - + drivers/media/platform/marvell-ccic/mmp-driver.c | 4 +- + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 9 + + .../media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 9 +- + .../media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 19 +- + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 9 +- + .../media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 28 +- + drivers/media/platform/pxa_camera.c | 4 +- + drivers/media/platform/rcar-vin/rcar-core.c | 67 +- + drivers/media/platform/rcar-vin/rcar-csi2.c | 18 +- + drivers/media/platform/rcar-vin/rcar-dma.c | 129 +- + drivers/media/platform/rcar-vin/rcar-vin.h | 15 +- + drivers/media/platform/s3c-camif/camif-core.c | 6 +- + drivers/media/platform/stm32/stm32-dcmi.c | 26 +- + .../media/platform/sunxi/sun4i-csi/sun4i_v4l2.c | 2 +- + drivers/media/radio/radio-sf16fmr2.c | 2 +- + .../media/test-drivers/vivid/vivid-kthread-cap.c | 6 +- + .../media/test-drivers/vivid/vivid-kthread-out.c | 6 +- + .../media/test-drivers/vivid/vivid-kthread-touch.c | 6 +- + drivers/media/test-drivers/vivid/vivid-sdr-cap.c | 6 +- + drivers/media/test-drivers/vivid/vivid-vid-cap.c | 18 +- + drivers/media/test-drivers/vivid/vivid-vid-out.c | 18 +- + drivers/media/tuners/mt2060.c | 2 +- + drivers/media/tuners/mt2063.c | 1 - + drivers/media/usb/au0828/au0828-video.c | 7 +- + drivers/media/usb/cx231xx/cx231xx-core.c | 10 +- + drivers/media/usb/cx231xx/cx231xx-vbi.c | 5 +- + drivers/media/usb/dvb-usb-v2/dvbsky.c | 22 +- + drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 4 +- + drivers/media/usb/dvb-usb/dib0700_devices.c | 4 +- + drivers/media/usb/em28xx/em28xx-audio.c | 14 +- + drivers/media/usb/gspca/ov534.c | 12 +- + drivers/media/usb/pvrusb2/pvrusb2-devattr.c | 2 +- + drivers/media/usb/tm6000/tm6000-video.c | 7 +- + drivers/media/usb/zr364xx/zr364xx.c | 33 +- + drivers/media/v4l2-core/v4l2-common.c | 33 + + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 1772 +++++++------------- + drivers/media/v4l2-core/v4l2-fwnode.c | 18 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 182 +- + drivers/media/v4l2-core/v4l2-subdev.c | 48 +- + drivers/staging/media/imx/imx-media-csi.c | 10 +- + .../devicetree/bindings/media/rockchip-isp1.yaml | 81 +- + drivers/staging/media/rkisp1/TODO | 5 - + drivers/staging/media/rkisp1/rkisp1-capture.c | 242 +-- + drivers/staging/media/rkisp1/rkisp1-common.h | 12 +- + drivers/staging/media/rkisp1/rkisp1-dev.c | 8 +- + drivers/staging/media/rkisp1/rkisp1-isp.c | 8 +- + drivers/staging/media/rkisp1/rkisp1-params.c | 87 +- + drivers/staging/media/rkisp1/rkisp1-resizer.c | 6 +- + drivers/staging/media/rkisp1/rkisp1-stats.c | 21 - + drivers/staging/media/rkisp1/uapi/rkisp1-config.h | 2 +- + drivers/staging/media/rkvdec/rkvdec.c | 4 +- + drivers/staging/media/sunxi/cedrus/cedrus.c | 9 + + drivers/staging/media/sunxi/cedrus/cedrus_video.c | 4 +- + drivers/staging/media/zoran/zoran_driver.c | 2 +- + include/linux/refcount.h | 2 +- + include/media/h264-ctrls.h | 195 ++- + include/media/v4l2-async.h | 2 +- + include/media/v4l2-common.h | 21 + + include/media/v4l2-fwnode.h | 74 +- + include/media/v4l2-ioctl.h | 10 + + include/media/v4l2-mediabus.h | 2 + + include/uapi/linux/media-bus-format.h | 8 + + include/uapi/linux/v4l2-controls.h | 6 + + include/uapi/linux/videodev2.h | 6 +- + 138 files changed, 3095 insertions(+), 2590 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/media/coda.txt + create mode 100644 Documentation/devicetree/bindings/media/coda.yaml + delete mode 100644 Documentation/devicetree/bindings/media/i2c/adv7604.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/adv7604.yaml + delete mode 100644 Documentation/devicetree/bindings/media/i2c/aptina,mt9v111.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/aptina,mt9v111.yaml + delete mode 100644 Documentation/devicetree/bindings/media/i2c/ov772x.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/ovti,ov772x.yaml + delete mode 100644 Documentation/devicetree/bindings/media/i2c/sony,imx214.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/sony,imx214.yaml +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 (52d108cd060d Merge branch 'powercap' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + .../driver-api/thermal/power_allocator.rst | 12 ++++- + Documentation/power/energy-model.rst | 30 ++++++++++--- + Documentation/scheduler/sched-energy.rst | 5 +++ + arch/x86/include/asm/msr-index.h | 3 +- + drivers/base/power/domain.c | 51 +++++++++++++++------- + drivers/base/power/main.c | 4 +- + drivers/clocksource/sh_cmt.c | 8 ++-- + drivers/clocksource/sh_mtu2.c | 4 +- + drivers/clocksource/sh_tmu.c | 8 ++-- + drivers/cpufreq/cpufreq.c | 10 ++--- + drivers/cpufreq/scmi-cpufreq.c | 3 +- + drivers/cpuidle/cpuidle-psci-domain.c | 2 + + drivers/cpuidle/cpuidle-psci.c | 34 +++++++++++++-- + drivers/opp/of.c | 2 +- + drivers/powercap/intel_rapl_common.c | 7 +++ + drivers/powercap/intel_rapl_msr.c | 51 +++++++++++++++------- + include/linux/cpufreq.h | 5 --- + include/linux/energy_model.h | 20 +++++---- + include/linux/pm_domain.h | 8 ++-- + kernel/power/energy_model.c | 26 ++++++++++- + kernel/reboot.c | 2 + + 21 files changed, 215 insertions(+), 80 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (32c855670808 cpufreq: vexpress-spc: Add missing MODULE_ALIAS) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Merge made by the 'recursive' strategy. + drivers/cpufreq/armada-8k-cpufreq.c | 6 ++++ + drivers/cpufreq/cpufreq-dt-platdev.c | 2 ++ + drivers/cpufreq/highbank-cpufreq.c | 7 ++++ + drivers/cpufreq/loongson1-cpufreq.c | 1 + + drivers/cpufreq/mediatek-cpufreq.c | 3 ++ + drivers/cpufreq/qcom-cpufreq-nvmem.c | 1 + + drivers/cpufreq/scpi-cpufreq.c | 1 + + drivers/cpufreq/sti-cpufreq.c | 14 +++++++- + drivers/cpufreq/sun50i-cpufreq-nvmem.c | 1 + + drivers/cpufreq/tegra194-cpufreq.c | 62 +++++++++++++++++++++++++++++----- + drivers/cpufreq/vexpress-spc-cpufreq.c | 1 + + 11 files changed, 89 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 (4e6fe1a4123c drm/lima: Unconditionally call dev_pm_opp_of_remove_table()) +$ git merge opp/opp/linux-next +Auto-merging drivers/opp/of.c +Auto-merging drivers/cpufreq/qcom-cpufreq-nvmem.c +Auto-merging drivers/base/power/domain.c +Merge made by the 'recursive' strategy. + drivers/base/power/domain.c | 2 +- + drivers/cpufreq/cpufreq-dt.c | 155 +++++++++++-------------- + drivers/cpufreq/qcom-cpufreq-nvmem.c | 15 +-- + drivers/devfreq/exynos-bus.c | 12 +- + drivers/gpu/drm/lima/lima_devfreq.c | 19 +-- + drivers/gpu/drm/lima/lima_devfreq.h | 1 - + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 6 +- + drivers/media/platform/qcom/venus/pm_helpers.c | 3 +- + drivers/opp/core.c | 134 +++++++++++++-------- + drivers/opp/of.c | 9 +- + drivers/opp/opp.h | 1 + + include/linux/pm_opp.h | 1 - + 12 files changed, 179 insertions(+), 179 deletions(-) +Merging thermal/thermal/linux-next (ce7c01557465 docs: thermal: time_in_state is displayed in msec and not usertime) +$ git merge thermal/thermal/linux-next +Merge made by the 'recursive' strategy. + .../bindings/thermal/mediatek-thermal.txt | 3 +- + .../devicetree/bindings/thermal/rcar-thermal.yaml | 48 ++++++----- + Documentation/driver-api/thermal/sysfs-api.rst | 3 +- + drivers/thermal/cpufreq_cooling.c | 4 +- + drivers/thermal/gov_power_allocator.c | 40 ++++++++- + drivers/thermal/intel/intel_pch_thermal.c | 76 +++++++++++++++-- + drivers/thermal/mtk_thermal.c | 2 +- + drivers/thermal/rcar_thermal.c | 5 +- + drivers/thermal/sun8i_thermal.c | 33 ++++---- + drivers/thermal/thermal_core.c | 97 +--------------------- + drivers/thermal/thermal_core.h | 6 -- + drivers/thermal/thermal_hwmon.c | 3 +- + 12 files changed, 165 insertions(+), 155 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 (4f19d071f9be fs: dlm: check on existing node address) +$ git merge dlm/next +Merge made by the 'recursive' strategy. + fs/dlm/lockspace.c | 2 +- + fs/dlm/lowcomms.c | 304 ++++++++++++++++++++++++++++------------------------- + fs/dlm/lowcomms.h | 2 + + fs/dlm/member.c | 2 +- + fs/dlm/rcom.c | 6 +- + 5 files changed, 168 insertions(+), 148 deletions(-) +Merging swiotlb/linux-next (fc0021aa340a swiotlb: remove the tbl_dma_addr argument to swiotlb_tbl_map_single) +$ git merge swiotlb/linux-next +Already up to date. +Merging rdma/for-next (f946e45f59ef IB/mlx5: Add support for NDR link speed) +$ git merge rdma/for-next +Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.c +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/cm.c | 4 +- + drivers/infiniband/core/cma_configfs.c | 4 +- + drivers/infiniband/core/device.c | 33 ++ + drivers/infiniband/core/sysfs.c | 166 +++++---- + drivers/infiniband/core/ucma.c | 2 +- + drivers/infiniband/core/umem.c | 9 + + drivers/infiniband/core/user_mad.c | 6 +- + 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 | 62 ++-- + 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 | 61 +--- + drivers/infiniband/hw/mlx4/mcg.c | 82 +++-- + drivers/infiniband/hw/mlx4/qp.c | 5 +- + drivers/infiniband/hw/mlx4/srq.c | 4 + + drivers/infiniband/hw/mlx4/sysfs.c | 66 ++-- + drivers/infiniband/hw/mlx5/cq.c | 45 +-- + drivers/infiniband/hw/mlx5/devx.c | 24 +- + drivers/infiniband/hw/mlx5/main.c | 105 ++---- + drivers/infiniband/hw/mlx5/mem.c | 103 +----- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 43 ++- + drivers/infiniband/hw/mlx5/mr.c | 482 +++++++++++++++---------- + drivers/infiniband/hw/mlx5/qp.c | 55 +-- + drivers/infiniband/hw/mlx5/srq.c | 15 +- + drivers/infiniband/hw/mthca/mthca_provider.c | 61 ++-- + 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 | 96 +++-- + drivers/infiniband/hw/usnic/usnic_ib_main.c | 19 - + drivers/infiniband/hw/usnic/usnic_ib_sysfs.c | 100 ++--- + 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 | 48 +-- + drivers/infiniband/sw/rxe/rxe_verbs.h | 1 - + drivers/infiniband/sw/siw/siw_cm.c | 2 +- + drivers/infiniband/sw/siw/siw_main.c | 26 +- + drivers/infiniband/sw/siw/siw_verbs.c | 12 + + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 4 +- + drivers/infiniband/ulp/ipoib/ipoib_ethtool.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 | 62 ++-- + 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 | 21 +- + 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 | 48 +-- + drivers/infiniband/ulp/srpt/ib_srpt.c | 14 +- + include/rdma/ib_verbs.h | 5 +- + include/rdma/uverbs_ioctl.h | 15 +- + include/uapi/rdma/ib_user_verbs.h | 14 - + 89 files changed, 1526 insertions(+), 1631 deletions(-) +Merging net-next/master (e86580235708 selftests: set conf.all.rp_filter=0 in bareudp.sh) +$ git merge net-next/master +Auto-merging net/tipc/topsrv.c +Auto-merging net/mptcp/protocol.c +Auto-merging net/ipv6/udp_offload.c +Auto-merging net/ipv6/sit.c +Auto-merging net/ipv4/udp_offload.c +Auto-merging net/ipv4/ip_tunnel_core.c +Removing drivers/net/wimax/Makefile +Removing drivers/net/wimax/Kconfig +Removing drivers/net/wan/x25_asy.h +Removing drivers/net/wan/x25_asy.c +Auto-merging drivers/net/phy/realtek.c +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Auto-merging drivers/net/ethernet/smsc/Kconfig +Auto-merging drivers/net/ethernet/realtek/r8169_main.c +Auto-merging drivers/net/ethernet/microchip/lan743x_main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c +Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c +Auto-merging drivers/net/dsa/mv88e6xxx/devlink.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + Documentation/admin-guide/index.rst | 1 - + .../bindings/net/dsa/hirschmann,hellcreek.yaml | 127 ++ + .../devicetree/bindings/net/ftgmac100.txt | 25 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/networking/devlink/netdevsim.rst | 3 +- + Documentation/networking/index.rst | 1 + + Documentation/networking/ip-sysctl.rst | 34 + + Documentation/networking/kapi.rst | 21 - + Documentation/networking/mptcp-sysctl.rst | 26 + + Documentation/process/magic-number.rst | 1 - + .../translations/it_IT/process/magic-number.rst | 1 - + .../translations/zh_CN/admin-guide/index.rst | 1 - + .../translations/zh_CN/process/magic-number.rst | 1 - + MAINTAINERS | 32 +- + arch/mips/configs/gpr_defconfig | 1 - + arch/mips/configs/mtx1_defconfig | 1 - + drivers/bus/mhi/core/main.c | 11 + + drivers/crypto/caam/qi.c | 15 +- + drivers/infiniband/hw/hfi1/driver.c | 4 +- + drivers/infiniband/hw/hfi1/ipoib.h | 27 - + drivers/infiniband/hw/hfi1/ipoib_main.c | 15 +- + drivers/infiniband/hw/hfi1/ipoib_tx.c | 2 +- + drivers/net/Kconfig | 9 +- + drivers/net/Makefile | 2 +- + drivers/net/bareudp.c | 2 +- + drivers/net/bonding/bond_main.c | 11 +- + drivers/net/dsa/Kconfig | 2 + + drivers/net/dsa/Makefile | 1 + + drivers/net/dsa/hirschmann/Kconfig | 9 + + drivers/net/dsa/hirschmann/Makefile | 5 + + drivers/net/dsa/hirschmann/hellcreek.c | 1339 ++++++++++++++++++++ + drivers/net/dsa/hirschmann/hellcreek.h | 286 +++++ + drivers/net/dsa/hirschmann/hellcreek_hwtstamp.c | 479 +++++++ + drivers/net/dsa/hirschmann/hellcreek_hwtstamp.h | 58 + + drivers/net/dsa/hirschmann/hellcreek_ptp.c | 452 +++++++ + drivers/net/dsa/hirschmann/hellcreek_ptp.h | 76 ++ + drivers/net/dsa/mt7530.c | 51 +- + drivers/net/dsa/mt7530.h | 12 + + drivers/net/dsa/mv88e6xxx/chip.c | 19 +- + drivers/net/dsa/mv88e6xxx/chip.h | 6 + + drivers/net/dsa/mv88e6xxx/devlink.c | 105 +- + drivers/net/dsa/mv88e6xxx/global1.h | 2 + + drivers/net/dsa/mv88e6xxx/global1_vtu.c | 4 +- + 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/aquantia/atlantic/aq_nic.c | 2 +- + drivers/net/ethernet/cadence/macb.h | 44 + + drivers/net/ethernet/cadence/macb_main.c | 141 ++- + .../net/ethernet/cavium/liquidio/cn68xx_device.c | 1 - + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 2 +- + .../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 | 28 +- + drivers/net/ethernet/freescale/enetc/enetc.c | 51 +- + drivers/net/ethernet/freescale/enetc/enetc.h | 5 +- + drivers/net/ethernet/freescale/enetc/enetc_hw.h | 47 +- + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 10 +- + drivers/net/ethernet/freescale/enetc/enetc_vf.c | 10 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 1 - + 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 + + drivers/net/ethernet/marvell/sky2.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/fw_qos.h | 2 +- + .../net/ethernet/mellanox/mlx4/resource_tracker.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +- + .../net/ethernet/mellanox/mlx5/core/en/params.c | 34 + + .../net/ethernet/mellanox/mlx5/core/en/params.h | 4 + + .../ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 8 +- + .../mellanox/mlx5/core/en_accel/ktls_txrx.h | 2 +- + .../mellanox/mlx5/core/en_accel/tls_rxtx.c | 6 +- + .../mellanox/mlx5/core/en_accel/tls_rxtx.h | 4 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 5 + + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 30 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 18 +- + drivers/net/ethernet/mellanox/mlx5/core/fpga/sdk.h | 8 +- + .../mellanox/mlx5/core/steering/dr_buddy.c | 170 +++ + .../ethernet/mellanox/mlx5/core/steering/dr_cmd.c | 4 +- + .../mellanox/mlx5/core/steering/dr_icm_pool.c | 501 +++----- + .../mellanox/mlx5/core/steering/dr_matcher.c | 107 +- + .../ethernet/mellanox/mlx5/core/steering/dr_ste.c | 42 +- + .../mellanox/mlx5/core/steering/dr_types.h | 79 +- + .../ethernet/mellanox/mlx5/core/steering/mlx5dr.h | 32 + + drivers/net/ethernet/mellanox/mlxsw/reg.h | 91 +- + .../net/ethernet/mellanox/mlxsw/spectrum_ipip.c | 34 +- + .../net/ethernet/mellanox/mlxsw/spectrum_ipip.h | 7 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 877 +++++++++---- + .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 70 + + 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/netronome/nfp/nfp_main.c | 4 +- + drivers/net/ethernet/nvidia/forcedeth.c | 9 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 3 +- + 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/smsc/Kconfig | 6 +- + drivers/net/ethernet/smsc/smc911x.c | 17 +- + drivers/net/ethernet/smsc/smc91x.c | 9 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 1 + + .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 46 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 6 +- + .../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/Kconfig | 2 +- + drivers/net/ethernet/xilinx/xilinx_axienet.h | 5 + + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 115 +- + drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 56 +- + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 14 +- + 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/geneve.c | 2 +- + drivers/net/gtp.c | 2 +- + drivers/net/hamradio/hdlcdrv.c | 2 +- + drivers/net/ieee802154/ca8210.c | 22 +- + drivers/net/ifb.c | 3 +- + drivers/net/ipa/gsi.c | 310 +++-- + drivers/net/ipa/gsi.h | 31 +- + drivers/net/ipa/gsi_reg.h | 31 +- + 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 | 25 +- + drivers/net/ipa/ipa_main.c | 141 +-- + drivers/net/ipa/ipa_mem.c | 10 +- + drivers/net/ipa/ipa_reg.h | 48 +- + drivers/net/macsec.c | 1 + + drivers/net/macvlan.c | 4 +- + drivers/net/mhi_net.c | 316 +++++ + drivers/net/mii.c | 20 +- + drivers/net/net_failover.c | 2 +- + drivers/net/netconsole.c | 1 + + drivers/net/netdevsim/dev.c | 6 + + drivers/net/netdevsim/fib.c | 265 +++- + drivers/net/netdevsim/netdevsim.h | 1 + + drivers/net/phy/adin.c | 150 ++- + drivers/net/phy/aquantia_main.c | 59 +- + drivers/net/phy/at803x.c | 50 +- + drivers/net/phy/bcm-cygnus.c | 2 +- + drivers/net/phy/bcm-phy-lib.c | 49 +- + drivers/net/phy/bcm-phy-lib.h | 1 + + drivers/net/phy/bcm54140.c | 46 +- + drivers/net/phy/bcm63xx.c | 20 +- + drivers/net/phy/bcm87xx.c | 50 +- + drivers/net/phy/broadcom.c | 70 +- + drivers/net/phy/cicada.c | 35 +- + drivers/net/phy/davicom.c | 63 +- + drivers/net/phy/marvell.c | 102 +- + drivers/net/phy/microchip_t1.c | 1 - + drivers/net/phy/mscc/mscc_main.c | 70 +- + drivers/net/phy/phy.c | 6 +- + drivers/net/phy/phy_device.c | 23 +- + drivers/net/phy/phy_led_triggers.c | 16 +- + drivers/net/phy/phylink.c | 3 +- + drivers/net/phy/realtek.c | 180 ++- + drivers/net/team/team.c | 9 +- + drivers/net/tun.c | 121 +- + drivers/net/usb/Makefile | 2 +- + drivers/net/usb/aqc111.c | 2 +- + drivers/net/usb/asix_devices.c | 6 +- + drivers/net/usb/ax88172a.c | 2 +- + drivers/net/usb/ax88179_178a.c | 2 +- + drivers/net/usb/cdc_mbim.c | 2 +- + drivers/net/usb/cdc_ncm.c | 4 +- + drivers/net/usb/dm9601.c | 2 +- + drivers/net/usb/int51x1.c | 2 +- + drivers/net/usb/lan78xx.c | 168 ++- + drivers/net/usb/mcs7830.c | 2 +- + drivers/net/usb/qmi_wwan.c | 41 +- + drivers/net/usb/r8152.c | 40 +- + drivers/net/usb/r8153_ecm.c | 162 +++ + drivers/net/usb/rndis_host.c | 2 +- + drivers/net/usb/sierra_net.c | 2 +- + drivers/net/usb/smsc75xx.c | 2 +- + drivers/net/usb/smsc95xx.c | 2 +- + drivers/net/usb/sr9700.c | 2 +- + drivers/net/usb/sr9800.c | 2 +- + drivers/net/usb/usbnet.c | 23 +- + drivers/net/vxlan.c | 29 +- + drivers/net/wan/Kconfig | 15 - + drivers/net/wan/Makefile | 1 - + drivers/net/wan/hdlc_fr.c | 118 +- + drivers/net/wan/lmc/lmc_main.c | 9 +- + drivers/net/wan/x25_asy.c | 836 ------------ + drivers/net/wan/x25_asy.h | 46 - + drivers/net/wimax/Kconfig | 18 - + drivers/net/wimax/Makefile | 2 - + drivers/net/wireguard/device.c | 2 +- + drivers/net/wireless/quantenna/qtnfmac/core.c | 78 +- + drivers/net/wireless/quantenna/qtnfmac/core.h | 4 - + .../wireless/quantenna/qtnfmac/pcie/pearl_pcie.c | 4 +- + .../wireless/quantenna/qtnfmac/pcie/topaz_pcie.c | 4 +- + drivers/net/wireless/rndis_wlan.c | 2 +- + drivers/net/xen-netfront.c | 3 +- + drivers/ptp/ptp_idt82p33.c | 274 ++-- + drivers/ptp/ptp_idt82p33.h | 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/inetdevice.h | 4 +- + include/linux/marvell_phy.h | 3 + + include/linux/mhi.h | 7 + + include/linux/netdev_features.h | 4 +- + include/linux/netdevice.h | 27 + + include/linux/netfilter/ipset/ip_set.h | 5 + + include/linux/phy.h | 3 + + include/linux/platform_data/hirschmann-hellcreek.h | 23 + + include/linux/sctp.h | 20 + + include/linux/skbuff.h | 33 + + include/linux/usb/r8152.h | 37 + + include/linux/usb/usbnet.h | 4 - + include/net/dsa.h | 8 + + include/net/dst.h | 12 +- + include/net/ip.h | 2 +- + include/net/ip_tunnels.h | 2 - + include/net/mptcp.h | 21 +- + include/net/netfilter/ipv4/nf_reject.h | 10 + + include/net/netfilter/ipv6/nf_reject.h | 9 + + include/net/netns/sctp.h | 8 + + include/net/nexthop.h | 42 +- + include/net/pkt_sched.h | 5 + + include/net/sctp/constants.h | 2 + + include/net/sctp/sctp.h | 9 +- + include/net/sctp/sm.h | 4 + + include/net/sctp/structs.h | 12 +- + include/net/tcp.h | 2 +- + include/net/udp.h | 6 +- + 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/if_packet.h | 12 + + include/uapi/linux/netfilter/ipset/ip_set.h | 6 +- + include/uapi/linux/rtnetlink.h | 12 +- + include/uapi/linux/sctp.h | 7 + + include/uapi/linux/snmp.h | 1 + + 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 | 8 +- + net/bridge/br_if.c | 1 + + net/bridge/br_input.c | 35 +- + net/bridge/br_mdb.c | 30 +- + net/bridge/br_mrp.c | 41 +- + net/bridge/br_mrp_netlink.c | 2 +- + net/bridge/br_multicast.c | 13 +- + net/bridge/br_netlink.c | 115 +- + net/bridge/br_private.h | 92 +- + net/bridge/br_private_cfm.h | 147 +++ + net/bridge/br_private_mrp.h | 2 +- + net/bridge/netfilter/Kconfig | 2 +- + net/bridge/netfilter/nft_reject_bridge.c | 255 +--- + net/core/dev.c | 19 +- + net/core/dev_ioctl.c | 2 +- + net/core/flow_dissector.c | 2 +- + net/core/skbuff.c | 14 +- + 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/dccp/timer.c | 12 +- + net/dsa/Kconfig | 6 + + net/dsa/Makefile | 1 + + net/dsa/dsa.c | 7 +- + net/dsa/dsa_priv.h | 2 - + net/dsa/slave.c | 86 +- + 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_hellcreek.c | 66 + + 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/devinet.c | 3 +- + net/ipv4/fib_semantics.c | 5 +- + net/ipv4/fib_trie.c | 9 - + net/ipv4/ip_gre.c | 6 +- + net/ipv4/ip_tunnel_core.c | 9 - + net/ipv4/ip_vti.c | 2 +- + net/ipv4/ipconfig.c | 14 +- + net/ipv4/ipip.c | 2 +- + net/ipv4/netfilter/nf_reject_ipv4.c | 128 +- + net/ipv4/nexthop.c | 255 +++- + net/ipv4/proc.c | 1 + + net/ipv4/route.c | 12 +- + net/ipv4/tcp_input.c | 9 +- + net/ipv4/tcp_lp.c | 7 + + net/ipv4/tcp_output.c | 11 +- + net/ipv4/tcp_recovery.c | 3 +- + net/ipv4/udp.c | 9 +- + net/ipv4/udp_diag.c | 2 +- + net/ipv4/udp_offload.c | 5 +- + net/ipv6/addrconf.c | 1 + + net/ipv6/calipso.c | 4 +- + net/ipv6/ip6_gre.c | 6 +- + net/ipv6/ip6_tunnel.c | 47 +- + net/ipv6/ip6_vti.c | 3 +- + net/ipv6/mcast.c | 2 +- + net/ipv6/netfilter/nf_reject_ipv6.c | 139 +- + net/ipv6/proc.c | 2 + + net/ipv6/route.c | 5 - + net/ipv6/rpl.c | 2 +- + net/ipv6/rpl_iptunnel.c | 2 +- + net/ipv6/sit.c | 2 +- + net/ipv6/udp.c | 7 +- + net/ipv6/udp_offload.c | 8 +- + net/l3mdev/l3mdev.c | 1 + + net/llc/llc_conn.c | 2 + + net/mac80211/ieee80211_i.h | 4 +- + net/mac80211/iface.c | 2 + + net/mac80211/main.c | 14 +- + net/mac80211/rx.c | 16 +- + net/mac80211/tx.c | 5 +- + net/mac80211/util.c | 5 +- + net/mac802154/main.c | 8 +- + net/mpls/af_mpls.c | 2 + + net/mptcp/ctrl.c | 14 + + net/mptcp/pm_netlink.c | 7 +- + net/mptcp/protocol.c | 67 +- + net/mptcp/protocol.h | 1 + + 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 +++ + 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/packet/af_packet.c | 37 +- + net/packet/internal.h | 5 +- + net/qrtr/ns.c | 8 - + net/qrtr/qrtr.c | 49 +- + net/sched/act_api.c | 71 +- + net/sched/act_bpf.c | 2 +- + net/sched/cls_api.c | 16 +- + net/sched/cls_rsvp.h | 2 +- + net/sched/em_cmp.c | 2 +- + net/sched/sch_atm.c | 8 +- + net/sched/sch_pie.c | 2 +- + 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 | 142 ++- + 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_cdc.c | 6 +- + net/smc/smc_clc.h | 5 + + net/smc/smc_core.h | 1 + + net/smc/smc_wr.c | 14 +- + 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 +- + net/xfrm/xfrm_input.c | 7 +- + .../selftests/drivers/net/netdevsim/nexthop.sh | 436 +++++++ + tools/testing/selftests/net/Makefile | 1 + + tools/testing/selftests/net/bareudp.sh | 546 ++++++++ + tools/testing/selftests/net/config | 7 + + .../selftests/net/forwarding/bridge_igmp.sh | 485 ++++++- + .../testing/selftests/net/forwarding/bridge_mld.sh | 558 ++++++++ + tools/testing/selftests/net/forwarding/lib.sh | 107 ++ + tools/testing/selftests/net/mptcp/config | 10 + + tools/testing/selftests/net/mptcp/mptcp_join.sh | 94 +- + tools/testing/selftests/net/pmtu.sh | 79 +- + tools/testing/selftests/net/psock_fanout.c | 72 +- + tools/testing/selftests/net/timestamping.c | 47 +- + 512 files changed, 16218 insertions(+), 4984 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/dsa/hirschmann,hellcreek.yaml + create mode 100644 Documentation/networking/mptcp-sysctl.rst + create mode 100644 drivers/net/dsa/hirschmann/Kconfig + create mode 100644 drivers/net/dsa/hirschmann/Makefile + create mode 100644 drivers/net/dsa/hirschmann/hellcreek.c + create mode 100644 drivers/net/dsa/hirschmann/hellcreek.h + create mode 100644 drivers/net/dsa/hirschmann/hellcreek_hwtstamp.c + create mode 100644 drivers/net/dsa/hirschmann/hellcreek_hwtstamp.h + create mode 100644 drivers/net/dsa/hirschmann/hellcreek_ptp.c + create mode 100644 drivers/net/dsa/hirschmann/hellcreek_ptp.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/steering/dr_buddy.c + create mode 100644 drivers/net/mhi_net.c + create mode 100644 drivers/net/usb/r8153_ecm.c + delete mode 100644 drivers/net/wan/x25_asy.c + delete mode 100644 drivers/net/wan/x25_asy.h + 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/linux/platform_data/hirschmann-hellcreek.h + create mode 100644 include/linux/usb/r8152.h + 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 100644 net/dsa/tag_hellcreek.c + create mode 100644 net/netfilter/nft_reject_netdev.c + create mode 100755 tools/testing/selftests/drivers/net/netdevsim/nexthop.sh + create mode 100755 tools/testing/selftests/net/bareudp.sh + create mode 100755 tools/testing/selftests/net/forwarding/bridge_mld.sh +Merging bpf-next/for-next (c36538798fc6 tools/bpf: Always run the *-clean recipes) +$ 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 +Removing samples/bpf/test_ipip.sh +Auto-merging lib/Kconfig.debug +Auto-merging kernel/trace/bpf_trace.c +Auto-merging kernel/bpf/verifier.c +Auto-merging kernel/bpf/hashtab.c +Auto-merging kernel/bpf/bpf_lsm.c +Auto-merging kernel/bpf/Makefile +Auto-merging include/linux/module.h +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-kernel-btf | 8 + + include/linux/bpf.h | 8 + + include/linux/bpf_lsm.h | 23 + + include/linux/bpf_types.h | 1 + + include/linux/module.h | 4 + + include/uapi/linux/bpf.h | 51 ++ + kernel/bpf/Makefile | 1 + + kernel/bpf/bpf_iter.c | 14 + + kernel/bpf/bpf_lsm.c | 8 + + kernel/bpf/bpf_task_storage.c | 315 ++++++++ + kernel/bpf/btf.c | 411 +++++++++-- + kernel/bpf/hashtab.c | 144 ++-- + kernel/bpf/syscall.c | 3 +- + kernel/bpf/sysfs_btf.c | 2 +- + kernel/bpf/task_iter.c | 2 + + kernel/bpf/verifier.c | 37 +- + kernel/module.c | 32 + + kernel/trace/bpf_trace.c | 16 + + lib/Kconfig.debug | 9 + + samples/bpf/hbm.c | 1 - + samples/bpf/test_ipip.sh | 179 ----- + scripts/Makefile.modfinal | 20 +- + security/bpf/hooks.c | 2 + + tools/bpf/bpftool/.gitignore | 2 +- + tools/bpf/bpftool/Documentation/bpftool-map.rst | 3 +- + tools/bpf/bpftool/Makefile | 44 +- + tools/bpf/bpftool/bash-completion/bpftool | 2 +- + tools/bpf/bpftool/btf.c | 37 +- + tools/bpf/bpftool/main.c | 15 +- + tools/bpf/bpftool/main.h | 1 + + tools/bpf/bpftool/map.c | 4 +- + tools/bpf/resolve_btfids/Makefile | 9 - + tools/bpf/runqslower/Makefile | 55 +- + tools/build/Makefile | 4 - + tools/include/uapi/linux/bpf.h | 51 ++ + tools/lib/bpf/btf.c | 807 ++++++++++++--------- + tools/lib/bpf/btf.h | 8 + + tools/lib/bpf/libbpf.map | 9 + + tools/lib/bpf/libbpf_probes.c | 1 + + tools/objtool/Makefile | 9 - + tools/perf/Makefile.perf | 4 - + tools/power/acpi/Makefile.config | 1 - + tools/scripts/Makefile.include | 10 + + tools/testing/selftests/bpf/.gitignore | 1 - + tools/testing/selftests/bpf/Makefile | 5 +- + tools/testing/selftests/bpf/btf_helpers.c | 259 +++++++ + tools/testing/selftests/bpf/btf_helpers.h | 19 + + tools/testing/selftests/bpf/prog_tests/btf.c | 40 +- + .../selftests/bpf/prog_tests/btf_dedup_split.c | 325 +++++++++ + .../selftests/bpf/prog_tests/btf_skc_cls_ingress.c | 2 +- + tools/testing/selftests/bpf/prog_tests/btf_split.c | 99 +++ + tools/testing/selftests/bpf/prog_tests/btf_write.c | 43 ++ + .../selftests/bpf/prog_tests/hash_large_key.c | 43 ++ + .../selftests/bpf/prog_tests/tcp_hdr_options.c | 12 +- + .../testing/selftests/bpf/prog_tests/tcpbpf_user.c | 141 ++++ + .../selftests/bpf/prog_tests/test_local_storage.c | 204 +++++- + tools/testing/selftests/bpf/progs/local_storage.c | 103 ++- + .../selftests/bpf/progs/test_hash_large_key.c | 44 ++ + .../testing/selftests/bpf/progs/test_tcpbpf_kern.c | 86 +-- + .../testing/selftests/bpf/progs/test_tunnel_kern.c | 42 +- + tools/testing/selftests/bpf/tcp_client.py | 50 -- + tools/testing/selftests/bpf/tcp_server.py | 80 -- + tools/testing/selftests/bpf/test_maps.c | 3 +- + tools/testing/selftests/bpf/test_progs.h | 11 + + tools/testing/selftests/bpf/test_tcpbpf.h | 2 + + tools/testing/selftests/bpf/test_tcpbpf_user.c | 165 ----- + tools/testing/selftests/bpf/test_tunnel.sh | 43 +- + 67 files changed, 3006 insertions(+), 1183 deletions(-) + create mode 100644 kernel/bpf/bpf_task_storage.c + delete mode 100755 samples/bpf/test_ipip.sh + create mode 100644 tools/testing/selftests/bpf/btf_helpers.c + create mode 100644 tools/testing/selftests/bpf/btf_helpers.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/btf_dedup_split.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/btf_split.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/hash_large_key.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/tcpbpf_user.c + create mode 100644 tools/testing/selftests/bpf/progs/test_hash_large_key.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 (8be33ecfc1ff net: skb_vlan_untag(): don't reset transport offset if set by GRO layer) +$ git merge ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (3650b228f83a Linux 5.10-rc1) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (70408949a35f Merge branch 'inet-prevent-skb-changes-in-udp-4-6-_lib_lookup_skb') +$ git merge netfilter-next/master +Already up to date. +Merging ipvs-next/master (c9448e828d11 Merge tag 'mlx5-updates-2020-11-03' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux) +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (1ccaa898868d rtw88: coex: simplify the setting and condition about WLAN TX limitation) +$ git merge wireless-drivers-next/master +Auto-merging drivers/net/wireless/realtek/rtw88/fw.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath10k/htt_rx.c | 1 - + drivers/net/wireless/ath/ath6kl/testmode.c | 1 - + drivers/net/wireless/ath/ath9k/hw.c | 1 - + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/fweh.c | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 7 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 9 +- + drivers/net/wireless/cisco/airo.c | 124 ++-- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 2 - + drivers/net/wireless/intersil/hostap/hostap_hw.c | 17 +- + .../net/wireless/intersil/hostap/hostap_ioctl.c | 15 +- + .../net/wireless/intersil/orinoco/orinoco_usb.c | 4 - + drivers/net/wireless/intersil/prism54/isl_ioctl.c | 5 +- + drivers/net/wireless/marvell/mwifiex/main.c | 6 +- + drivers/net/wireless/marvell/mwifiex/pcie.c | 24 +- + drivers/net/wireless/marvell/mwifiex/pcie.h | 2 + + drivers/net/wireless/mediatek/mt7601u/dma.c | 12 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 62 +- + drivers/net/wireless/ralink/rt2x00/rt2x00.h | 10 + + drivers/net/wireless/ray_cs.c | 6 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 3 + + .../realtek/rtlwifi/btcoexist/halbtc8723b2ant.c | 48 +- + .../realtek/rtlwifi/btcoexist/halbtc8821a1ant.c | 4 +- + .../realtek/rtlwifi/btcoexist/halbtc8821a2ant.c | 27 +- + .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 28 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/hw.c | 1 - + .../net/wireless/realtek/rtlwifi/rtl8188ee/phy.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/mac.c | 7 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/trx.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/hw.c | 1 - + .../net/wireless/realtek/rtlwifi/rtl8723ae/phy.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/phy.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/trx.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 96 ++- + .../net/wireless/realtek/rtlwifi/rtl8821ae/table.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/table.h | 4 +- + drivers/net/wireless/realtek/rtlwifi/usb.c | 1 - + drivers/net/wireless/realtek/rtw88/coex.c | 704 ++++++++++++++++----- + drivers/net/wireless/realtek/rtw88/coex.h | 36 +- + drivers/net/wireless/realtek/rtw88/debug.c | 4 +- + drivers/net/wireless/realtek/rtw88/fw.c | 6 +- + drivers/net/wireless/realtek/rtw88/fw.h | 11 +- + drivers/net/wireless/realtek/rtw88/mac80211.c | 2 +- + drivers/net/wireless/realtek/rtw88/main.c | 54 +- + drivers/net/wireless/realtek/rtw88/main.h | 19 +- + drivers/net/wireless/realtek/rtw88/ps.c | 135 ++-- + drivers/net/wireless/realtek/rtw88/ps.h | 3 +- + drivers/net/wireless/realtek/rtw88/reg.h | 15 +- + drivers/net/wireless/realtek/rtw88/rtw8723d.c | 65 +- + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 3 +- + drivers/net/wireless/realtek/rtw88/rtw8821c.h | 2 - + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 54 +- + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 110 ++-- + drivers/net/wireless/realtek/rtw88/wow.c | 5 +- + drivers/net/wireless/rsi/rsi_91x_hal.c | 3 +- + drivers/net/wireless/rsi/rsi_91x_sdio.c | 6 +- + drivers/net/wireless/rsi/rsi_91x_sdio_ops.c | 173 +++-- + drivers/net/wireless/rsi/rsi_91x_usb.c | 6 +- + drivers/net/wireless/rsi/rsi_91x_usb_ops.c | 2 +- + drivers/net/wireless/rsi/rsi_sdio.h | 8 +- + drivers/net/wireless/ti/wl1251/cmd.c | 2 +- + drivers/net/wireless/ti/wlcore/main.c | 4 +- + drivers/net/wireless/ti/wlcore/spi.c | 3 +- + drivers/net/wireless/wl3501_cs.c | 8 +- + drivers/net/wireless/zydas/zd1211rw/zd_usb.c | 15 - + 65 files changed, 1262 insertions(+), 749 deletions(-) +Merging bluetooth/master (22fbcfc54705 Bluetooth: Replace BT_DBG with bt_dev_dbg in HCI request) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/btrtl.c | 123 +++++++++++++++++++++++++++----------------- + drivers/bluetooth/btusb.c | 27 +++++++++- + drivers/bluetooth/hci_h5.c | 11 +++- + drivers/bluetooth/hci_ll.c | 1 + + drivers/bluetooth/hci_qca.c | 109 ++++++++++++++++++++++++++------------- + net/bluetooth/hci_conn.c | 12 ++++- + net/bluetooth/hci_debugfs.c | 50 ++++++++++++++++++ + net/bluetooth/hci_event.c | 25 +++++---- + net/bluetooth/hci_request.c | 85 +++++++++++++++++------------- + net/bluetooth/hci_request.h | 2 + + net/bluetooth/hidp/core.c | 2 +- + net/bluetooth/l2cap_core.c | 8 ++- + net/bluetooth/smp.c | 44 +--------------- + net/bluetooth/smp.h | 2 + + 14 files changed, 322 insertions(+), 179 deletions(-) +Merging mac80211-next/master (da1e9dd3a11c nl80211: fix kernel-doc warning in the new SAE attribute) +$ git merge mac80211-next/master +Auto-merging net/wireless/nl80211.c +Auto-merging net/wireless/core.c +Auto-merging net/mac80211/util.c +Auto-merging net/mac80211/tx.c +Auto-merging net/mac80211/main.c +Auto-merging net/mac80211/ieee80211_i.h +Auto-merging include/net/mac80211.h +Auto-merging include/net/cfg80211.h +Merge made by the 'recursive' strategy. + drivers/net/wireless/Kconfig | 13 ---- + drivers/net/wireless/ath/ath9k/ath9k.h | 1 - + drivers/net/wireless/ath/ath9k/debug.c | 4 +- + drivers/net/wireless/ath/ath9k/init.c | 19 ----- + drivers/net/wireless/ath/ath9k/main.c | 5 -- + drivers/net/wireless/ath/carl9170/mac.c | 4 -- + drivers/net/wireless/ath/carl9170/main.c | 1 - + drivers/net/wireless/broadcom/b43/main.c | 6 +- + drivers/net/wireless/broadcom/b43legacy/main.c | 6 +- + drivers/net/wireless/ralink/rt2x00/rt2x00config.c | 1 - + drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 6 +- + drivers/net/wireless/ralink/rt2x00/rt2x00mac.c | 3 +- + include/linux/ieee80211.h | 3 + + include/net/cfg80211.h | 21 ++++-- + include/net/ieee80211_radiotap.h | 1 + + include/net/mac80211.h | 7 +- + include/uapi/linux/nl80211.h | 38 +++++++++- + net/mac80211/cfg.c | 11 --- + net/mac80211/chan.c | 3 +- + net/mac80211/debugfs_netdev.c | 11 --- + net/mac80211/debugfs_sta.c | 2 +- + net/mac80211/ieee80211_i.h | 6 -- + net/mac80211/iface.c | 52 ++------------ + net/mac80211/main.c | 8 --- + net/mac80211/mesh.c | 30 ++++++++ + net/mac80211/pm.c | 15 ---- + net/mac80211/rx.c | 5 -- + net/mac80211/tx.c | 39 +++-------- + net/mac80211/util.c | 2 +- + net/mac80211/wme.c | 18 +++-- + net/wireless/chan.c | 6 +- + net/wireless/core.c | 8 +-- + net/wireless/nl80211.c | 85 ++++++++++++----------- + net/wireless/rdev-ops.h | 10 --- + net/wireless/scan.c | 2 +- + net/wireless/trace.h | 5 -- + net/wireless/util.c | 37 +++++----- + net/wireless/wext-compat.c | 51 -------------- + 38 files changed, 198 insertions(+), 347 deletions(-) +Merging gfs2/for-next (4e79e3f08e57 gfs2: Fix case in which ail writes are done to jdata holes) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/aops.c | 2 +- + fs/gfs2/bmap.c | 8 ++------ + fs/gfs2/log.c | 2 ++ + fs/gfs2/rgrp.c | 10 +++++----- + 4 files changed, 10 insertions(+), 12 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 (ad624dfd7bb6 mtd: spi-nor: micron-st: allow using MT35XU512ABA in Octal DTR mode) +$ git merge spi-nor/spi-nor/next +Merge made by the 'recursive' strategy. + drivers/mtd/spi-nor/core.c | 544 +++++++++++++++++++++++++++++++--------- + drivers/mtd/spi-nor/core.h | 26 ++ + drivers/mtd/spi-nor/micron-st.c | 115 ++++++++- + drivers/mtd/spi-nor/sfdp.c | 170 ++++++++++++- + drivers/mtd/spi-nor/sfdp.h | 8 + + drivers/mtd/spi-nor/spansion.c | 171 +++++++++++++ + include/linux/mtd/spi-nor.h | 53 +++- + 7 files changed, 948 insertions(+), 139 deletions(-) +Merging crypto/master (ab95bd2aa904 crypto: caam - fix printing on xts fallback allocation error path) +$ 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/arm/crypto/aes-neonbs-glue.c | 8 +- + arch/arm64/crypto/ghash-ce-glue.c | 2 +- + arch/arm64/crypto/poly1305-armv8.pl | 2 +- + arch/arm64/crypto/poly1305-core.S_shipped | 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/af_alg.c | 10 +- + crypto/sm2.c | 75 +++---- + crypto/testmgr.c | 141 +++++++------ + drivers/char/hw_random/imx-rngc.c | 4 +- + drivers/crypto/atmel-sha.c | 1 - + drivers/crypto/caam/caamalg.c | 4 +- + drivers/crypto/caam/caamalg_qi.c | 4 +- + drivers/crypto/caam/caamalg_qi2.c | 3 +- + drivers/crypto/caam/intern.h | 8 + + drivers/crypto/caam/jr.c | 4 +- + drivers/crypto/cavium/nitrox/nitrox_mbx.c | 2 +- + drivers/crypto/hisilicon/hpre/hpre_main.c | 4 +- + drivers/crypto/hisilicon/qm.c | 220 +++++++++++++-------- + drivers/crypto/hisilicon/qm.h | 2 +- + drivers/crypto/hisilicon/sec2/sec.h | 2 - + drivers/crypto/hisilicon/sec2/sec_crypto.c | 17 +- + drivers/crypto/hisilicon/sec2/sec_main.c | 34 ++-- + drivers/crypto/hisilicon/sgl.c | 2 - + drivers/crypto/hisilicon/zip/zip_main.c | 4 +- + 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 | 138 +++++++------ + drivers/crypto/qat/qat_common/qat_asym_algs.c | 13 +- + 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/aead.h | 5 + + include/crypto/sha1_base.h | 3 +- + include/crypto/sha256_base.h | 3 +- + include/crypto/sha512_base.h | 3 +- + include/crypto/sm3_base.h | 3 +- + include/uapi/linux/if_alg.h | 16 ++ + lib/crypto/sha256.c | 212 ++++++-------------- + lib/mpi/ec.c | 3 - + 77 files changed, 1490 insertions(+), 944 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 (512bce50a41c Merge v5.10-rc3 into drm-next) +$ git merge drm/drm-next +Removing include/drm/ttm/ttm_set_memory.h +Removing include/drm/ttm/ttm_page_alloc.h +Removing drivers/gpu/drm/vkms/vkms_gem.c +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_devfreq.c +Auto-merging drivers/gpu/drm/mcde/mcde_drv.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 | 16 +- + Documentation/gpu/vkms.rst | 99 +- + MAINTAINERS | 11 +- + arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 4 + + 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 | 8 +- + 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 | 30 +- + 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 | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 48 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_df.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 181 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 67 +- + 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 | 92 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h | 5 - + 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 | 39 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 2 +- + 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 | 169 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 6 +- + 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 | 114 +- + 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 | 219 +- + 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 | 45 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vf_error.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 293 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 10 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 110 +- + 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_sdma.c | 2 +- + 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 | 275 +- + 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 | 9 +- + 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 | 154 +- + 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/sdma_v4_0.c | 6 +- + 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 | 17 +- + 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 | 6 + + 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 | 958 +- + 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 | 27 +- + .../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 | 45 +- + 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 | 2 + + .../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 | 21 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 49 +- + drivers/gpu/drm/amd/pm/inc/hwmgr.h | 21 +- + .../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/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 | 571 +- + .../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/fiji_smumgr.c | 3 +- + .../drm/amd/pm/powerplay/smumgr/polaris10_smumgr.c | 356 +- + .../drm/amd/pm/powerplay/smumgr/polaris10_smumgr.h | 1 + + .../gpu/drm/amd/pm/powerplay/smumgr/vegam_smumgr.c | 3 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 208 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/Makefile | 1 + + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 29 +- + .../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 | 619 + + 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/arc/arcpgu_crtc.c | 4 +- + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 22 +- + 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 | 6 +- + drivers/gpu/drm/arm/malidp_crtc.c | 26 +- + drivers/gpu/drm/armada/armada_crtc.c | 22 +- + 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 | 38 +- + drivers/gpu/drm/ast/ast_tables.h | 2 + + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 11 +- + 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 | 34 +- + drivers/gpu/drm/drm_atomic_uapi.c | 8 + + drivers/gpu/drm/drm_blend.c | 13 + + drivers/gpu/drm/drm_bridge_connector.c | 2 +- + drivers/gpu/drm/drm_color_mgmt.c | 4 +- + 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_edid.c | 4 +- + 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 | 180 +- + 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 | 33 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 14 +- + 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 | 16 +- + 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 | 8 +- + 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 | 93 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 20 +- + 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 | 8 +- + 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_scatterlist.h | 2 +- + 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 | 13 +- + 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 | 16 +- + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 304 +- + drivers/gpu/drm/ingenic/ingenic-drm.h | 3 + + drivers/gpu/drm/mcde/mcde_drv.c | 4 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 20 +- + 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 | 12 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 34 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 10 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 21 +- + 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 | 16 +- + drivers/gpu/drm/nouveau/dispnv50/head.c | 11 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 295 +- + 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_drv.h | 1 - + 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 | 34 +- + drivers/gpu/drm/omapdrm/omap_crtc.c | 21 +- + 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 | 10 +- + 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 | 61 +- + drivers/gpu/drm/panfrost/panfrost_mmu.c | 1 + + drivers/gpu/drm/pl111/pl111_drv.c | 5 +- + drivers/gpu/drm/qxl/qxl_debugfs.c | 2 +- + drivers/gpu/drm/qxl/qxl_display.c | 13 +- + 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 | 110 +- + drivers/gpu/drm/radeon/radeon.h | 2 +- + drivers/gpu/drm/radeon/radeon_asic.c | 1 + + drivers/gpu/drm/radeon/radeon_asic.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_pm.c | 29 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 232 +- + drivers/gpu/drm/radeon/sumo_dpm.c | 20 + + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 21 +- + 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 | 18 +- + drivers/gpu/drm/scheduler/sched_entity.c | 3 + + drivers/gpu/drm/sti/sti_crtc.c | 6 +- + drivers/gpu/drm/stm/ltdc.c | 6 +- + drivers/gpu/drm/sun4i/sun4i_crtc.c | 17 +- + drivers/gpu/drm/tegra/dc.c | 18 +- + drivers/gpu/drm/tegra/drm.c | 4 - + drivers/gpu/drm/tegra/gem.c | 31 +- + drivers/gpu/drm/tidss/tidss_crtc.c | 20 +- + drivers/gpu/drm/tidss/tidss_plane.c | 2 + + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 70 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 42 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.h | 7 +- + drivers/gpu/drm/ttm/Makefile | 5 +- + drivers/gpu/drm/ttm/ttm_agp_backend.c | 5 +- + drivers/gpu/drm/ttm/ttm_bo.c | 201 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 103 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 43 +- + drivers/gpu/drm/ttm/ttm_memory.c | 13 +- + drivers/gpu/drm/ttm/ttm_page_alloc.c | 1189 - + drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 1239 - + drivers/gpu/drm/ttm/ttm_pool.c | 667 + + drivers/gpu/drm/ttm/ttm_range_manager.c | 2 +- + drivers/gpu/drm/ttm/ttm_resource.c | 12 +- + drivers/gpu/drm/ttm/ttm_tt.c | 256 +- + drivers/gpu/drm/tve200/tve200_drv.c | 4 +- + drivers/gpu/drm/vboxvideo/vbox_mode.c | 6 +- + drivers/gpu/drm/vc4/vc4_bo.c | 21 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 19 +- + drivers/gpu/drm/vc4/vc4_drv.c | 12 - + drivers/gpu/drm/vc4/vc4_drv.h | 4 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 25 +- + drivers/gpu/drm/vc4/vc4_hvs.c | 4 +- + drivers/gpu/drm/vc4/vc4_txp.c | 19 +- + 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 | 8 +- + 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 | 24 +- + 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 | 32 +- + 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_kms.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 6 +- + 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 | 231 +- + 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 | 18 +- + drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 14 +- + drivers/gpu/drm/zte/zx_vou.c | 6 +- + drivers/gpu/vga/vga_switcheroo.c | 7 +- + drivers/iommu/io-pgtable-arm.c | 11 +- + .../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/console/sticore.c | 2 +- + drivers/video/fbdev/atafb.c | 8 - + 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 | 7 +- + drivers/video/fbdev/sis/300vtbl.h | 2 - + drivers/video/fbdev/sis/sis_accel.h | 14 +- + drivers/video/hdmi.c | 8 +- + include/drm/amd_asic_type.h | 2 + + include/drm/drm_atomic.h | 12 +- + 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 | 22 +- + 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 | 98 +- + include/drm/ttm/ttm_bo_driver.h | 107 +- + include/drm/ttm/ttm_caching.h | 36 + + include/drm/ttm/ttm_page_alloc.h | 122 - + include/drm/ttm/ttm_placement.h | 15 - + include/drm/ttm/ttm_pool.h | 91 + + include/drm/ttm/ttm_resource.h | 12 +- + include/drm/ttm/ttm_set_memory.h | 150 - + include/drm/ttm/ttm_tt.h | 82 +- + include/linux/dma-buf-map.h | 193 + + include/linux/dma-buf.h | 14 +- + include/linux/font.h | 2 +- + include/linux/platform_data/shmob_drm.h | 2 - + include/linux/scatterlist.h | 6 - + include/uapi/drm/amdgpu_drm.h | 6 +- + include/uapi/drm/drm_fourcc.h | 156 +- + include/uapi/drm/virtgpu_drm.h | 39 +- + include/uapi/linux/virtio_gpu.h | 78 + + tools/testing/scatterlist/main.c | 2 +- + 748 files changed, 299556 insertions(+), 11080 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/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 + 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 + 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 + 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 + delete mode 100644 include/drm/ttm/ttm_page_alloc.h + create mode 100644 include/drm/ttm/ttm_pool.h + delete mode 100644 include/drm/ttm/ttm_set_memory.h + create mode 100644 include/linux/dma-buf-map.h +Merging amdgpu/drm-next (6f60b0ddcfa0 drm/amdgpu: Enable GPU reset for vangogh) +$ git merge amdgpu/drm-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 104 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 11 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 17 +- + drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 15 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 16 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 6 +- + drivers/gpu/drm/amd/display/dc/basics/fixpt31_32.c | 5 + + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 5 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 15 +- + .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 8 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 4 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 18 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 4 +- + drivers/gpu/drm/amd/display/dc/dc.h | 5 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 5 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 19 + + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 24 +- + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 82 - + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 111 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.h | 3 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 1 + + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 82 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 35 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 23 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 8 +- + drivers/gpu/drm/amd/display/dc/dcn21/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_dccg.c | 129 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_dccg.h | 36 + + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 60 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.h | 83 - + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 10 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.h | 3 +- + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 1 + + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 5 +- + .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 2 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 3 +- + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 3 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 84 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 4 +- + drivers/gpu/drm/amd/display/include/fixed31_32.h | 6 - + .../amd/include/asic_reg/dcn/dcn_3_0_2_offset.h | 16159 +++++ + .../amd/include/asic_reg/dcn/dcn_3_0_2_sh_mask.h | 62376 +++++++++++++++++++ + .../pm/powerplay/hwmgr/vega12_processpptables.c | 5 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 3 + + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 6 + + drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c | 3 + + drivers/pci/pcie/err.c | 41 +- + 55 files changed, 79201 insertions(+), 464 deletions(-) + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_dccg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_dccg.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_2_sh_mask.h +Merging drm-intel/for-linux-next (6ec29d2bb060 drm/i915/dp: Some reshuffling in mode_valid as prep for bigjoiner modes) +$ git merge drm-intel/for-linux-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/display/intel_atomic.c | 1 - + drivers/gpu/drm/i915/display/intel_ddi.c | 178 ++++++++++++++- + drivers/gpu/drm/i915/display/intel_display.c | 240 +++++++-------------- + drivers/gpu/drm/i915/display/intel_display.h | 4 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 7 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 36 ++-- + drivers/gpu/drm/i915/display/intel_display_types.h | 9 + + drivers/gpu/drm/i915/display/intel_dp.c | 18 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 13 +- + drivers/gpu/drm/i915/display/intel_psr.c | 41 ---- + drivers/gpu/drm/i915/display/intel_psr.h | 4 - + drivers/gpu/drm/i915/display/intel_sprite.c | 140 ++++++++++++ + drivers/gpu/drm/i915/gt/intel_reset.c | 4 +- + drivers/gpu/drm/i915/i915_drv.h | 2 +- + drivers/gpu/drm/i915/i915_irq.c | 38 ++-- + drivers/gpu/drm/i915/i915_reg.h | 24 +++ + include/drm/i915_pciids.h | 15 +- + 17 files changed, 499 insertions(+), 275 deletions(-) +Merging drm-tegra/drm/tegra/for-next (41f71629b4c4 drm/tegra: replace idr_init() by idr_init_base()) +$ git merge drm-tegra/drm/tegra/for-next +Auto-merging drivers/gpu/drm/tegra/drm.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/drm.c | 2 +- + drivers/gpu/drm/tegra/sor.c | 66 +++++++++++++++++++-------------------------- + 2 files changed, 28 insertions(+), 40 deletions(-) +Merging drm-misc/for-linux-next (2c686404012a drm/via/via_dma: Remove set but unused variable 'agp_base') +$ git merge drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/tegra/drm.c +Auto-merging drivers/gpu/drm/mcde/mcde_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/display/bridge/intel,keembay-dsi.yaml | 101 ++ + .../bindings/display/bridge/lontium,lt9611.yaml | 5 +- + .../devicetree/bindings/display/bridge/sii902x.txt | 4 + + .../bindings/display/intel,keembay-display.yaml | 72 + + .../bindings/display/intel,keembay-msscam.yaml | 43 + + Documentation/gpu/todo.rst | 37 +- + MAINTAINERS | 7 + + drivers/dma-buf/dma-buf.c | 2 +- + drivers/gpu/drm/Kconfig | 4 + + drivers/gpu/drm/Makefile | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 36 - + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 31 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 139 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 4 +- + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 4 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 2 +- + drivers/gpu/drm/arm/hdlcd_drv.c | 2 +- + drivers/gpu/drm/arm/malidp_drv.c | 2 +- + drivers/gpu/drm/armada/armada_crtc.c | 8 +- + drivers/gpu/drm/armada/armada_drv.c | 7 +- + drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 2 +- + drivers/gpu/drm/ast/ast_cursor.c | 27 +- + drivers/gpu/drm/ast/ast_drv.c | 2 +- + drivers/gpu/drm/ast/ast_drv.h | 10 +- + drivers/gpu/drm/ast/ast_main.c | 7 +- + drivers/gpu/drm/ast/ast_mode.c | 4 +- + drivers/gpu/drm/ast/ast_tables.h | 4 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 6 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 7 +- + drivers/gpu/drm/bochs/bochs_drv.c | 2 +- + drivers/gpu/drm/bochs/bochs_kms.c | 1 - + drivers/gpu/drm/bridge/Kconfig | 13 + + drivers/gpu/drm/bridge/Makefile | 1 + + drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 88 -- + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 1002 +++++++++++++ + drivers/gpu/drm/bridge/lvds-codec.c | 11 +- + drivers/gpu/drm/bridge/sii902x.c | 100 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 103 +- + drivers/gpu/drm/bridge/ti-tpd12s015.c | 2 +- + drivers/gpu/drm/drm_client.c | 38 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 7 +- + drivers/gpu/drm/drm_drv.c | 17 +- + drivers/gpu/drm/drm_edid.c | 2 + + drivers/gpu/drm/drm_fb_helper.c | 250 +++- + drivers/gpu/drm/drm_file.c | 2 + + drivers/gpu/drm/drm_gem.c | 29 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 74 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 48 +- + drivers/gpu/drm/drm_gem_ttm_helper.c | 37 + + drivers/gpu/drm/drm_gem_vram_helper.c | 120 +- + drivers/gpu/drm/drm_internal.h | 5 +- + drivers/gpu/drm/drm_prime.c | 14 +- + drivers/gpu/drm/drm_vblank.c | 15 +- + drivers/gpu/drm/drm_vm.c | 3 - + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 3 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 1 - + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 14 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 12 - + drivers/gpu/drm/exynos/exynos_drm_gem.h | 2 - + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 5 +- + drivers/gpu/drm/gma500/gem.c | 6 - + drivers/gpu/drm/gma500/psb_drv.c | 4 +- + drivers/gpu/drm/gma500/psb_drv.h | 2 - + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 2 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 2 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 2 +- + drivers/gpu/drm/i915/i915_drv.c | 4 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 2 +- + drivers/gpu/drm/imx/dcss/dcss-kms.c | 2 +- + drivers/gpu/drm/imx/imx-drm-core.c | 2 +- + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 9 +- + drivers/gpu/drm/ingenic/ingenic-ipu.c | 23 +- + drivers/gpu/drm/kmb/Kconfig | 13 + + drivers/gpu/drm/kmb/Makefile | 2 + + drivers/gpu/drm/kmb/kmb_crtc.c | 214 +++ + drivers/gpu/drm/kmb/kmb_drv.c | 602 ++++++++ + drivers/gpu/drm/kmb/kmb_drv.h | 88 ++ + drivers/gpu/drm/kmb/kmb_dsi.c | 1561 ++++++++++++++++++++ + drivers/gpu/drm/kmb/kmb_dsi.h | 387 +++++ + drivers/gpu/drm/kmb/kmb_plane.c | 522 +++++++ + drivers/gpu/drm/kmb/kmb_plane.h | 67 + + drivers/gpu/drm/kmb/kmb_regs.h | 725 +++++++++ + drivers/gpu/drm/lima/lima_drv.c | 2 +- + drivers/gpu/drm/lima/lima_gem.c | 6 +- + drivers/gpu/drm/lima/lima_sched.c | 11 +- + drivers/gpu/drm/mcde/mcde_drv.c | 2 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 15 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +- + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 20 +- + drivers/gpu/drm/mediatek/mtk_drm_gem.h | 4 +- + drivers/gpu/drm/meson/meson_drv.c | 2 +- + drivers/gpu/drm/mga/mga_dma.c | 10 +- + drivers/gpu/drm/mga/mga_state.c | 2 - + drivers/gpu/drm/mgag200/mgag200_drv.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 15 +- + drivers/gpu/drm/msm/msm_drv.c | 4 +- + drivers/gpu/drm/msm/msm_drv.h | 4 +- + drivers/gpu/drm/msm/msm_gem_prime.c | 13 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 2 +- + drivers/gpu/drm/mxsfb/mxsfb_kms.c | 8 + + drivers/gpu/drm/nouveau/Kconfig | 1 + + drivers/gpu/drm/nouveau/nouveau_bo.c | 120 +- + drivers/gpu/drm/nouveau/nouveau_bo.h | 2 - + drivers/gpu/drm/nouveau/nouveau_gem.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_gem.h | 2 - + drivers/gpu/drm/nouveau/nouveau_prime.c | 20 - + drivers/gpu/drm/nouveau/nvkm/subdev/bios/pll.c | 1 - + drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c | 3 - + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv50.c | 1 - + drivers/gpu/drm/nouveau/nvkm/subdev/top/gk104.c | 1 - + drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 2 +- + drivers/gpu/drm/omapdrm/dss/Kconfig | 4 +- + drivers/gpu/drm/omapdrm/dss/base.c | 2 +- + drivers/gpu/drm/omapdrm/dss/dispc.c | 7 +- + drivers/gpu/drm/omapdrm/dss/dispc.h | 2 +- + drivers/gpu/drm/omapdrm/dss/dispc_coefs.c | 2 +- + drivers/gpu/drm/omapdrm/dss/dsi.c | 16 +- + drivers/gpu/drm/omapdrm/dss/dss.c | 7 +- + drivers/gpu/drm/omapdrm/dss/hdmi.h | 2 +- + drivers/gpu/drm/omapdrm/dss/hdmi4.c | 8 +- + drivers/gpu/drm/omapdrm/dss/hdmi4_cec.c | 2 +- + drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 2 +- + drivers/gpu/drm/omapdrm/dss/hdmi4_core.h | 2 +- + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 8 +- + drivers/gpu/drm/omapdrm/dss/hdmi5_core.c | 2 +- + drivers/gpu/drm/omapdrm/dss/hdmi5_core.h | 2 +- + drivers/gpu/drm/omapdrm/dss/hdmi_phy.c | 2 +- + drivers/gpu/drm/omapdrm/dss/hdmi_pll.c | 2 +- + drivers/gpu/drm/omapdrm/dss/hdmi_wp.c | 2 +- + drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c | 2 +- + drivers/gpu/drm/omapdrm/dss/omapdss.h | 2 +- + drivers/gpu/drm/omapdrm/dss/output.c | 2 +- + drivers/gpu/drm/omapdrm/dss/pll.c | 2 +- + drivers/gpu/drm/omapdrm/dss/venc.c | 7 +- + drivers/gpu/drm/omapdrm/dss/video-pll.c | 2 +- + drivers/gpu/drm/omapdrm/omap_connector.c | 2 +- + drivers/gpu/drm/omapdrm/omap_crtc.c | 2 +- + drivers/gpu/drm/omapdrm/omap_debugfs.c | 2 +- + drivers/gpu/drm/omapdrm/omap_dmm_priv.h | 2 +- + drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 8 +- + drivers/gpu/drm/omapdrm/omap_dmm_tiler.h | 2 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 4 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 2 +- + drivers/gpu/drm/omapdrm/omap_encoder.c | 2 +- + drivers/gpu/drm/omapdrm/omap_fb.c | 2 +- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 2 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 5 +- + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 2 +- + drivers/gpu/drm/omapdrm/omap_irq.c | 8 +- + drivers/gpu/drm/omapdrm/omap_plane.c | 2 +- + drivers/gpu/drm/omapdrm/tcm-sita.c | 2 +- + drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 2 +- + drivers/gpu/drm/panel/panel-simple.c | 8 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 2 +- + drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 14 +- + drivers/gpu/drm/pl111/pl111_drv.c | 3 +- + drivers/gpu/drm/qxl/qxl_display.c | 15 +- + drivers/gpu/drm/qxl/qxl_draw.c | 14 +- + drivers/gpu/drm/qxl/qxl_drv.h | 11 +- + drivers/gpu/drm/qxl/qxl_ioctl.c | 1 - + drivers/gpu/drm/qxl/qxl_kms.c | 4 +- + drivers/gpu/drm/qxl/qxl_object.c | 31 +- + drivers/gpu/drm/qxl/qxl_object.h | 2 +- + drivers/gpu/drm/qxl/qxl_prime.c | 12 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 3 +- + drivers/gpu/drm/r128/ati_pcigart.c | 2 +- + drivers/gpu/drm/radeon/radeon.h | 2 +- + drivers/gpu/drm/radeon/radeon_drv.c | 89 +- + drivers/gpu/drm/radeon/radeon_gem.c | 7 +- + drivers/gpu/drm/radeon/radeon_kms.c | 49 +- + drivers/gpu/drm/radeon/radeon_prime.c | 20 - + drivers/gpu/drm/radeon/radeon_ttm.c | 121 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 4 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 22 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.h | 4 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 6 +- + drivers/gpu/drm/savage/savage_bci.c | 11 - + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 2 +- + drivers/gpu/drm/sti/sti_drv.c | 2 +- + drivers/gpu/drm/sti/sti_hdmi.c | 6 + + drivers/gpu/drm/sti/sti_hdmi.h | 6 - + drivers/gpu/drm/stm/drv.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 2 +- + drivers/gpu/drm/tegra/dc.c | 8 +- + drivers/gpu/drm/tegra/drm.c | 5 +- + drivers/gpu/drm/tidss/tidss_dispc.c | 9 +- + drivers/gpu/drm/tidss/tidss_drv.c | 2 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 4 +- + drivers/gpu/drm/tiny/cirrus.c | 12 +- + drivers/gpu/drm/tiny/gm12u320.c | 68 +- + drivers/gpu/drm/tiny/hx8357d.c | 2 +- + drivers/gpu/drm/tiny/ili9225.c | 2 +- + drivers/gpu/drm/tiny/ili9341.c | 2 +- + drivers/gpu/drm/tiny/ili9486.c | 2 +- + drivers/gpu/drm/tiny/mi0283qt.c | 2 +- + drivers/gpu/drm/tiny/repaper.c | 2 +- + drivers/gpu/drm/tiny/st7586.c | 2 +- + drivers/gpu/drm/tiny/st7735r.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 74 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 72 + + drivers/gpu/drm/tve200/tve200_drv.c | 2 +- + drivers/gpu/drm/udl/udl_connector.c | 8 +- + drivers/gpu/drm/udl/udl_drv.c | 5 +- + drivers/gpu/drm/udl/udl_drv.h | 6 +- + drivers/gpu/drm/udl/udl_main.c | 23 +- + drivers/gpu/drm/udl/udl_modeset.c | 8 +- + drivers/gpu/drm/v3d/v3d_drv.c | 2 +- + drivers/gpu/drm/vboxvideo/vbox_drv.c | 4 +- + drivers/gpu/drm/vboxvideo/vbox_mode.c | 11 +- + drivers/gpu/drm/vc4/vc4_bo.c | 7 +- + drivers/gpu/drm/vc4/vc4_drv.h | 2 +- + drivers/gpu/drm/vc4/vc4_perfmon.c | 2 +- + drivers/gpu/drm/vgem/vgem_drv.c | 18 +- + drivers/gpu/drm/vgem/vgem_fence.c | 2 +- + drivers/gpu/drm/via/via_dma.c | 2 - + drivers/gpu/drm/virtio/virtgpu_display.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 5 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 4 +- + drivers/gpu/drm/vkms/vkms_drv.c | 2 +- + drivers/gpu/drm/vkms/vkms_plane.c | 15 +- + drivers/gpu/drm/vkms/vkms_writeback.c | 22 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 3 +- + drivers/gpu/drm/xen/xen_drm_front.c | 2 +- + drivers/gpu/drm/xen/xen_drm_front_gem.c | 18 +- + drivers/gpu/drm/xen/xen_drm_front_gem.h | 6 +- + drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 2 +- + drivers/gpu/drm/zte/zx_drm_drv.c | 2 +- + drivers/gpu/host1x/bus.c | 1 + + drivers/video/fbdev/core/fbmem.c | 5 - + drivers/video/fbdev/riva/riva_hw.c | 14 +- + include/drm/drm_atomic.h | 1 + + include/drm/drm_client.h | 7 +- + include/drm/drm_device.h | 4 + + include/drm/drm_drv.h | 7 +- + include/drm/drm_encoder.h | 1 - + include/drm/drm_gem.h | 5 +- + include/drm/drm_gem_cma_helper.h | 8 +- + include/drm/drm_gem_shmem_helper.h | 4 +- + include/drm/drm_gem_ttm_helper.h | 6 + + include/drm/drm_gem_vram_helper.h | 14 +- + include/drm/drm_mode_config.h | 12 - + include/drm/ttm/ttm_bo_api.h | 28 + + include/drm/ttm/ttm_bo_driver.h | 7 +- + include/linux/dma-buf-map.h | 93 +- + include/linux/dma-buf.h | 4 +- + include/uapi/drm/drm_mode.h | 6 + + 256 files changed, 7037 insertions(+), 1437 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/intel,keembay-dsi.yaml + create mode 100644 Documentation/devicetree/bindings/display/intel,keembay-display.yaml + create mode 100644 Documentation/devicetree/bindings/display/intel,keembay-msscam.yaml + create mode 100644 drivers/gpu/drm/bridge/lontium-lt9611uxc.c + create mode 100644 drivers/gpu/drm/kmb/Kconfig + create mode 100644 drivers/gpu/drm/kmb/Makefile + create mode 100644 drivers/gpu/drm/kmb/kmb_crtc.c + create mode 100644 drivers/gpu/drm/kmb/kmb_drv.c + create mode 100644 drivers/gpu/drm/kmb/kmb_drv.h + create mode 100644 drivers/gpu/drm/kmb/kmb_dsi.c + create mode 100644 drivers/gpu/drm/kmb/kmb_dsi.h + create mode 100644 drivers/gpu/drm/kmb/kmb_plane.c + create mode 100644 drivers/gpu/drm/kmb/kmb_plane.h + create mode 100644 drivers/gpu/drm/kmb/kmb_regs.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 f394df038841] Merge remote-tracking branch 'drm-misc/for-linux-next' into master + Date: Fri Nov 13 13:07:23 2020 +1100 +Merging drm-msm/msm-next (e8c765811b10 drm/msm/dp: do not notify audio subsystem if sink doesn't support audio) +$ 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 +Resolved 'drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c' using previous resolution. +Resolved 'drivers/gpu/drm/msm/msm_drv.h' using previous resolution. +Resolved 'include/drm/drm_crtc.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 91f38c11109e] Merge remote-tracking branch 'drm-msm/msm-next' into master +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/display/msm/gpu.txt | 7 + + 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 | 21 +- + 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 | 21 +- + 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_catalog.c | 13 + + drivers/gpu/drm/msm/dp/dp_catalog.h | 1 + + drivers/gpu/drm/msm/dp/dp_ctrl.c | 96 ++++++-- + drivers/gpu/drm/msm/dp/dp_display.c | 208 +++++++++------- + drivers/gpu/drm/msm/dp/dp_link.c | 41 ++-- + drivers/gpu/drm/msm/dp/dp_link.h | 1 + + drivers/gpu/drm/msm/dp/dp_panel.c | 5 + + drivers/gpu/drm/msm/dp/dp_power.c | 44 +++- + drivers/gpu/drm/msm/dp/dp_power.h | 2 +- + drivers/gpu/drm/msm/dp/dp_reg.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 | 159 ++++++++---- + drivers/gpu/drm/msm/msm_gpu.h | 20 +- + 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 + + 64 files changed, 1430 insertions(+), 728 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 9fe9e8f7dc84] Merge remote-tracking branch 'drm-msm/msm-next' into master + Date: Fri Nov 13 13:10:23 2020 +1100 +Merging imx-drm/imx-drm/next (36fba366cf9f drm/imx: tve remove extraneous type qualifier) +$ git merge imx-drm/imx-drm/next +Already up to date. +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 (f7d01359b0d9 regmap: Fix order of regmap write log) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-mmio.c | 90 +++++++++++++++++++++++++++++++++++---- + drivers/base/regmap/regmap.c | 11 +++-- + include/linux/regmap.h | 5 +++ + 3 files changed, 94 insertions(+), 12 deletions(-) +Merging sound/for-next (8461352ddf07 ALSA: firewire: fix comparison to bool warning) +$ 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/firewire/amdtp-stream.h | 2 +- + 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 - + 11 files changed, 1 insertion(+), 52 deletions(-) +Merging sound-asoc/for-next (e2e99930ec00 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 +Auto-merging sound/soc/soc-core.c +Removing sound/soc/fsl/wm1133-ev1.c +Removing sound/soc/fsl/phycore-ac97.c +Removing sound/soc/fsl/mx27vis-aic32x4.c +Removing sound/soc/fsl/imx-ssi.c +Removing sound/soc/fsl/imx-mc13783.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 +Removing Documentation/devicetree/bindings/sound/audio-graph-card.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/audio-graph-card.txt | 337 --- + .../bindings/sound/audio-graph-card.yaml | 153 + + .../devicetree/bindings/sound/fsl,aud2htx.yaml | 66 + + .../devicetree/bindings/sound/fsl,spdif.yaml | 1 + + .../devicetree/bindings/sound/fsl,xcvr.yaml | 104 + + .../bindings/sound/google,sc7180-trogdor.yaml | 138 + + .../devicetree/bindings/sound/mt6359.yaml | 9 + + .../devicetree/bindings/sound/mt8192-afe-pcm.yaml | 100 + + .../sound/mt8192-mt6359-rt1015-rt5682.yaml | 42 + + .../devicetree/bindings/sound/nau8315.txt | 18 + + .../devicetree/bindings/sound/qcom,sm8250.yaml | 159 + + .../devicetree/bindings/sound/renesas,rsnd.txt | 520 ---- + .../devicetree/bindings/sound/renesas,rsnd.yaml | 451 +++ + .../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/graph_card.h | 16 + + include/sound/simple_card_utils.h | 3 + + 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 | 8 +- + 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 | 7 +- + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/adau1977.c | 9 +- + sound/soc/codecs/madera.c | 4 +- + sound/soc/codecs/max98373-sdw.c | 2 +- + sound/soc/codecs/mt6359.c | 147 +- + sound/soc/codecs/mt6359.h | 15 +- + sound/soc/codecs/nau8315.c | 166 ++ + sound/soc/codecs/rt1015.c | 202 +- + sound/soc/codecs/rt1015.h | 42 + + sound/soc/codecs/rt1308-sdw.c | 2 +- + sound/soc/codecs/rt5682-sdw.c | 2 +- + sound/soc/codecs/rt700.c | 2 +- + sound/soc/codecs/rt711-sdw.c | 15 +- + sound/soc/codecs/rt711.c | 2 +- + sound/soc/codecs/rt715.c | 2 +- + 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/codecs/wm8994.c | 6 +- + sound/soc/codecs/wm8997.c | 2 + + sound/soc/codecs/wm8998.c | 4 +- + sound/soc/fsl/Kconfig | 64 +- + sound/soc/fsl/Makefile | 14 +- + sound/soc/fsl/fsl_aud2htx.c | 308 ++ + sound/soc/fsl/fsl_aud2htx.h | 67 + + 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/fsl/imx-mc13783.c | 156 - + sound/soc/fsl/imx-ssi.c | 651 ---- + sound/soc/fsl/mx27vis-aic32x4.c | 214 -- + sound/soc/fsl/phycore-ac97.c | 121 - + sound/soc/fsl/wm1133-ev1.c | 289 -- + sound/soc/generic/audio-graph-card.c | 175 +- + sound/soc/intel/atom/sst/sst.c | 2 +- + sound/soc/intel/boards/bytcr_rt5651.c | 2 +- + sound/soc/intel/boards/sof_rt5682.c | 67 +- + sound/soc/intel/boards/sof_sdw.c | 10 + + 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 | 24 + + 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 | 308 ++ + 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 | 1060 +++++++ + sound/soc/mediatek/mt8192/mt8192-reg.h | 3131 ++++++++++++++++++++ + sound/soc/pxa/pxa-ssp.c | 6 +- + sound/soc/qcom/Kconfig | 24 + + sound/soc/qcom/Makefile | 4 + + sound/soc/qcom/common.c | 13 +- + sound/soc/qcom/lpass-cpu.c | 2 +- + 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-clocks.c | 2 +- + sound/soc/qcom/qdsp6/q6afe.c | 10 +- + sound/soc/qcom/qdsp6/q6asm.c | 10 +- + sound/soc/qcom/sc7180.c | 388 +++ + sound/soc/qcom/sm8250.c | 227 ++ + sound/soc/samsung/i2s.c | 3 +- + sound/soc/samsung/snow.c | 2 +- + sound/soc/soc-component.c | 19 +- + sound/soc/soc-compress.c | 63 +- + sound/soc/soc-core.c | 3 +- + sound/soc/soc-dai.c | 13 +- + sound/soc/soc-dapm.c | 6 +- + sound/soc/soc-link.c | 12 +- + sound/soc/soc-pcm.c | 136 +- + sound/soc/soc-topology.c | 302 +- + sound/soc/sof/Kconfig | 42 +- + sound/soc/sof/control.c | 20 +- + sound/soc/sof/imx/Kconfig | 10 +- + sound/soc/sof/intel/Kconfig | 64 +- + sound/soc/sof/intel/hda-dsp.c | 2 +- + sound/soc/sof/loader.c | 4 +- + 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/tegra/tegra_alc5632.c | 4 +- + sound/soc/tegra/tegra_max98090.c | 8 +- + sound/soc/tegra/tegra_rt5640.c | 8 +- + sound/soc/tegra/tegra_rt5677.c | 4 +- + sound/soc/tegra/tegra_sgtl5000.c | 4 +- + sound/soc/tegra/tegra_wm8753.c | 8 +- + sound/soc/tegra/tegra_wm8903.c | 8 +- + sound/soc/tegra/tegra_wm9712.c | 4 +- + sound/soc/tegra/trimslice.c | 8 +- + sound/soc/ti/davinci-evm.c | 3 +- + sound/soc/ti/davinci-mcasp.c | 298 +- + 145 files changed, 19452 insertions(+), 3748 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/sound/audio-graph-card.txt + create mode 100644 Documentation/devicetree/bindings/sound/audio-graph-card.yaml + create mode 100644 Documentation/devicetree/bindings/sound/fsl,aud2htx.yaml + 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/nau8315.txt + create mode 100644 Documentation/devicetree/bindings/sound/qcom,sm8250.yaml + create mode 100644 Documentation/devicetree/bindings/sound/renesas,rsnd.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 include/sound/graph_card.h + create mode 100644 sound/soc/codecs/nau8315.c + create mode 100644 sound/soc/fsl/fsl_aud2htx.c + create mode 100644 sound/soc/fsl/fsl_aud2htx.h + create mode 100644 sound/soc/fsl/fsl_xcvr.c + create mode 100644 sound/soc/fsl/fsl_xcvr.h + delete mode 100644 sound/soc/fsl/imx-mc13783.c + delete mode 100644 sound/soc/fsl/imx-ssi.c + delete mode 100644 sound/soc/fsl/mx27vis-aic32x4.c + delete mode 100644 sound/soc/fsl/phycore-ac97.c + delete mode 100644 sound/soc/fsl/wm1133-ev1.c + 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 (24b9f0d22081 module: fix comment style) +$ git merge modules/modules-next +Auto-merging kernel/module.c +Merge made by the 'recursive' strategy. + kernel/module.c | 195 +++++++++++++++++++++++++++++++++----------------------- + 1 file changed, 114 insertions(+), 81 deletions(-) +Merging input/next (3a54a215410b Input: st1232 - add support resolution reading) +$ git merge input/next +Auto-merging drivers/input/keyboard/cros_ec_keyb.c +Merge made by the 'recursive' strategy. + .../bindings/input/touchscreen/ektf2127.txt | 2 +- + drivers/input/joystick/analog.c | 2 +- + drivers/input/keyboard/cros_ec_keyb.c | 9 +- + drivers/input/keyboard/gpio_keys.c | 2 +- + drivers/input/keyboard/nomadik-ske-keypad.c | 2 + + drivers/input/keyboard/pmic8xxx-keypad.c | 22 +- + drivers/input/misc/ab8500-ponkey.c | 2 +- + drivers/input/misc/drv260x.c | 26 +-- + drivers/input/misc/drv2665.c | 10 +- + drivers/input/misc/drv2667.c | 14 +- + drivers/input/mouse/cyapa.c | 2 +- + drivers/input/mouse/cyapa_gen5.c | 4 +- + drivers/input/mouse/elantech.c | 2 +- + drivers/input/rmi4/rmi_bus.c | 2 +- + drivers/input/rmi4/rmi_f01.c | 16 +- + drivers/input/rmi4/rmi_f11.c | 236 +++++++++++---------- + drivers/input/rmi4/rmi_f54.c | 6 + + drivers/input/rmi4/rmi_i2c.c | 4 + + drivers/input/touchscreen/ads7846.c | 2 +- + drivers/input/touchscreen/cyttsp4_core.c | 14 ++ + drivers/input/touchscreen/cyttsp4_core.h | 14 -- + drivers/input/touchscreen/ektf2127.c | 32 ++- + drivers/input/touchscreen/resistive-adc-touch.c | 2 +- + drivers/input/touchscreen/st1232.c | 52 +++-- + 24 files changed, 284 insertions(+), 195 deletions(-) +Merging block/for-next (05f40074d9ea Merge branch 'for-5.11/io_uring' into for-next) +$ git merge block/for-next +Auto-merging include/linux/ide.h +Auto-merging fs/io_uring.c +Auto-merging arch/x86/include/asm/mmu_context.h +Auto-merging arch/sparc/include/asm/thread_info_64.h +Auto-merging arch/s390/kernel/entry.S +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/ccwdev.h | 2 + + arch/s390/include/asm/cio.h | 1 + + 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 | 2 +- + 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/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/compat.h | 15 +- + 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/thread_info.h | 6 +- + arch/x86/kernel/perf_regs.c | 2 +- + arch/x86/kernel/process_64.c | 28 +- + arch/x86/kernel/signal.c | 4 +- + arch/x86/oprofile/backtrace.c | 2 +- + arch/xtensa/include/asm/thread_info.h | 5 +- + arch/xtensa/kernel/entry.S | 4 +- + arch/xtensa/kernel/signal.c | 3 +- + block/genhd.c | 193 +++-- + block/ioctl.c | 62 +- + drivers/block/amiflop.c | 98 +-- + drivers/block/ataflop.c | 135 ++-- + drivers/block/brd.c | 39 +- + drivers/block/floppy.c | 154 ++-- + drivers/block/loop.c | 32 +- + drivers/block/nbd.c | 1 + + drivers/block/pktcdvd.c | 6 +- + drivers/block/rbd.c | 40 +- + drivers/block/swim.c | 17 - + drivers/block/z2ram.c | 547 +++++++------- + drivers/ide/ide-probe.c | 66 +- + drivers/ide/ide-tape.c | 2 - + drivers/md/bcache/request.c | 5 +- + drivers/md/dm.c | 5 +- + drivers/md/md.c | 83 +-- + drivers/mtd/mtd_blkdevs.c | 28 - + drivers/nvme/host/core.c | 2 - + drivers/s390/block/dasd.c | 23 +- + drivers/s390/block/dasd_devmap.c | 109 +++ + drivers/s390/block/dasd_eckd.c | 175 +++-- + drivers/s390/block/dasd_fba.c | 2 +- + drivers/s390/block/dasd_int.h | 114 ++- + drivers/s390/block/dasd_ioctl.c | 27 +- + drivers/s390/cio/chp.c | 15 + + drivers/s390/cio/chp.h | 1 + + drivers/s390/cio/chsc.c | 145 +++- + drivers/s390/cio/chsc.h | 3 +- + drivers/s390/cio/device.c | 15 +- + drivers/scsi/sd.c | 19 +- + fs/binfmt_elf.c | 4 +- + fs/compat_binfmt_elf.c | 20 +- + fs/internal.h | 2 + + fs/io-wq.c | 10 - + fs/io-wq.h | 1 - + fs/io_uring.c | 1115 ++++++++++++++++------------- + fs/namei.c | 40 +- + include/linux/blkdev.h | 3 +- + include/linux/elf.h | 10 + + include/linux/entry-common.h | 7 +- + include/linux/entry-kvm.h | 4 +- + include/linux/genhd.h | 13 +- + include/linux/ide.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 +- + 128 files changed, 2176 insertions(+), 1635 deletions(-) +Merging device-mapper/for-next (98d2720eb186 dm: fix bug with RCU locking in dm_blk_report_zones) +$ git merge device-mapper/for-next +Auto-merging drivers/md/dm.c +Merge made by the 'recursive' strategy. + Documentation/admin-guide/device-mapper/verity.rst | 7 +- + drivers/md/Kconfig | 22 +- + drivers/md/Makefile | 20 +- + drivers/md/dm-cache-target.c | 4 - + drivers/md/dm-integrity.c | 4 +- + ...vice-time.c => dm-ps-historical-service-time.c} | 0 + drivers/md/dm-ps-io-affinity.c | 272 +++++++++++++++++++++ + .../md/{dm-queue-length.c => dm-ps-queue-length.c} | 0 + .../md/{dm-round-robin.c => dm-ps-round-robin.c} | 0 + .../md/{dm-service-time.c => dm-ps-service-time.c} | 0 + drivers/md/dm-verity-verify-sig.c | 9 +- + drivers/md/dm-writecache.c | 4 +- + drivers/md/dm.c | 8 +- + 13 files changed, 329 insertions(+), 21 deletions(-) + rename drivers/md/{dm-historical-service-time.c => dm-ps-historical-service-time.c} (100%) + create mode 100644 drivers/md/dm-ps-io-affinity.c + rename drivers/md/{dm-queue-length.c => dm-ps-queue-length.c} (100%) + rename drivers/md/{dm-round-robin.c => dm-ps-round-robin.c} (100%) + rename drivers/md/{dm-service-time.c => dm-ps-service-time.c} (100%) +Merging pcmcia/pcmcia-next (46d079790663 pcmcia: make pccard_loop_tuple() static) +$ git merge pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (fc69b6a3113a Merge branch 'fixes' into next) +$ 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/memstick/core/mspro_block.c | 2 +- + drivers/memstick/host/jmb38x_ms.c | 2 +- + drivers/memstick/host/tifm_ms.c | 2 +- + drivers/misc/cardreader/rts5261.c | 61 ++++++-- + drivers/misc/cardreader/rts5261.h | 39 +---- + 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/davinci_mmc.c | 2 +- + drivers/mmc/host/dw_mmc.c | 17 +-- + drivers/mmc/host/meson-gx-mmc.c | 2 +- + drivers/mmc/host/meson-mx-sdio.c | 5 +- + drivers/mmc/host/moxart-mmc.c | 5 +- + drivers/mmc/host/mtk-sd.c | 119 ++++++++++++--- + drivers/mmc/host/owl-mmc.c | 5 +- + drivers/mmc/host/rtsx_pci_sdmmc.c | 71 +++++++++ + drivers/mmc/host/s3cmci.c | 2 +- + drivers/mmc/host/sdhci-acpi.c | 38 ++++- + drivers/mmc/host/sdhci-pic32.c | 11 +- + drivers/mmc/host/sunxi-mmc.c | 3 +- + include/linux/mmc/host.h | 7 + + include/linux/rtsx_pci.h | 30 ++++ + 27 files changed, 569 insertions(+), 185 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 (394a569203fc mfd: htc-i2cpld: Add the missed i2c_put_adapter() in htcpld_register_chip_i2c()) +$ 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/gpio/gpio-tps65910.c | 12 +- + drivers/mfd/88pm800.c | 2 +- + drivers/mfd/88pm860x-core.c | 50 +- + drivers/mfd/Kconfig | 10 + + drivers/mfd/Makefile | 1 + + drivers/mfd/at91-usart.c | 12 +- + 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/htc-i2cpld.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 + + 53 files changed, 1486 insertions(+), 885 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 +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 (95e7956eb099 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 ++++++ + .../bindings/regulator/rohm,bd71837-regulator.yaml | 48 ++++++ + .../bindings/regulator/rohm,bd71847-regulator.yaml | 49 ++++++ + drivers/regulator/Kconfig | 12 ++ + drivers/regulator/Makefile | 1 + + drivers/regulator/bd718x7-regulator.c | 164 ++++++++++++++++++++- + drivers/regulator/core.c | 2 +- + drivers/regulator/da9121-regulator.c | 108 ++++++++++++++ + drivers/regulator/fixed.c | 63 +++++++- + drivers/regulator/lp872x.c | 2 +- + 11 files changed, 528 insertions(+), 15 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 (b159e86b5a2a selinux: drop super_block backpointer from superblock_security_struct) +$ git merge selinux/next +Merge made by the 'recursive' strategy. + security/selinux/hooks.c | 21 ++++++++++++++------- + security/selinux/include/objsec.h | 1 - + security/selinux/ss/services.c | 4 +--- + 3 files changed, 15 insertions(+), 11 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 (8ffd778aff45 tpm: efi: Don't create binary_bios_measurements file for an empty log) +$ git merge tpmdd/next +Already up to date. +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 +Already up to date. +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 (616fde2dd60f dt-bindings: misc: convert fsl,dpaa2-console from txt to YAML) +$ git merge devicetree/for-next +Removing Documentation/devicetree/bindings/misc/fsl,dpaa2-console.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/misc/fsl,dpaa2-console.txt | 11 ---------- + .../bindings/misc/fsl,dpaa2-console.yaml | 25 ++++++++++++++++++++++ + 2 files changed, 25 insertions(+), 11 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/misc/fsl,dpaa2-console.txt + create mode 100644 Documentation/devicetree/bindings/misc/fsl,dpaa2-console.yaml +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 (e972eab05653 Merge remote-tracking branch 'spi/for-5.11' into spi-next) +$ git merge spi/for-next +Auto-merging drivers/input/touchscreen/ads7846.c +Merge made by the 'recursive' strategy. + drivers/input/touchscreen/ads7846.c | 3 +- + drivers/spi/atmel-quadspi.c | 2 +- + drivers/spi/spi-atmel.c | 6 +- + drivers/spi/spi-bcm63xx-hsspi.c | 4 +- + drivers/spi/spi-img-spfi.c | 4 +- + drivers/spi/spi-imx.c | 2 + + drivers/spi/spi-mem.c | 3 +- + drivers/spi/spi-mt7621.c | 2 + + drivers/spi/spi-pic32.c | 1 + + drivers/spi/spi-rockchip.c | 4 + + drivers/spi/spi-sprd.c | 1 + + drivers/spi/spi-st-ssc4.c | 5 +- + drivers/spi/spi-stm32-qspi.c | 8 +- + drivers/spi/spi-stm32.c | 1 + + drivers/spi/spi-sun6i.c | 199 ++++++++++++++++++++++++++++++++---- + drivers/spi/spi-synquacer.c | 15 +-- + drivers/spi/spi-tegra114.c | 2 + + drivers/spi/spi-tegra20-sflash.c | 1 + + drivers/spi/spi-tegra20-slink.c | 2 + + drivers/spi/spi-ti-qspi.c | 1 + + drivers/spi/spi.c | 6 +- + include/linux/spi/spi.h | 1 + + 22 files changed, 232 insertions(+), 41 deletions(-) +Merging tip/auto-latest (c3c30db1b191 Merge branch 'x86/fpu') +$ git merge tip/auto-latest +Auto-merging mm/Kconfig +Auto-merging kernel/time/timekeeping.h +Auto-merging include/linux/entry-common.h +Removing include/asm-generic/kmap_types.h +Auto-merging fs/btrfs/ctree.h +Auto-merging fs/aio.c +Auto-merging arch/xtensa/Kconfig +Auto-merging arch/x86/include/asm/msr-index.h +Removing arch/x86/include/asm/msidef.h +Removing arch/x86/include/asm/kmap_types.h +Removing arch/x86/include/asm/copy_mc_test.h +Auto-merging arch/x86/Kconfig +Removing arch/um/include/asm/kmap_types.h +Auto-merging arch/sparc/mm/srmmu.c +Removing arch/sparc/mm/highmem.c +Auto-merging arch/sparc/mm/Makefile +Removing arch/sparc/include/asm/kmap_types.h +Auto-merging arch/sparc/Kconfig +Removing arch/sh/include/asm/kmap_types.h +Auto-merging arch/s390/kernel/perf_cpum_sf.c +Removing arch/powerpc/mm/highmem.c +Removing arch/powerpc/include/asm/kmap_types.h +Auto-merging arch/powerpc/Kconfig +Removing arch/parisc/include/asm/kmap_types.h +Removing arch/nds32/mm/highmem.c +Removing arch/mips/include/asm/kmap_types.h +Auto-merging arch/mips/Kconfig +Removing arch/microblaze/mm/highmem.c +Auto-merging arch/microblaze/Kconfig +Removing arch/ia64/include/asm/kmap_types.h +Auto-merging arch/csky/Kconfig +Removing arch/arm/mm/highmem.c +Auto-merging arch/arm/mm/Makefile +Removing arch/arm/include/asm/kmap_types.h +Auto-merging arch/arm/include/asm/fixmap.h +Auto-merging arch/arm/Kconfig +Removing arch/arc/include/asm/kmap_types.h +Auto-merging arch/arc/Kconfig +Removing arch/alpha/include/asm/kmap_types.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/core-api/irq/irq-domain.rst | 6 + + Documentation/driver-api/io-mapping.rst | 22 - + Documentation/userspace-api/spec_ctrl.rst | 8 + + Documentation/x86/index.rst | 2 +- + Documentation/x86/{resctrl_ui.rst => resctrl.rst} | 93 +++ + MAINTAINERS | 6 +- + arch/alpha/include/asm/kmap_types.h | 15 - + arch/arc/Kconfig | 1 + + arch/arc/include/asm/highmem.h | 26 +- + arch/arc/include/asm/kmap_types.h | 14 - + arch/arc/mm/highmem.c | 54 +- + arch/arm/Kconfig | 1 + + arch/arm/include/asm/fixmap.h | 4 +- + arch/arm/include/asm/highmem.h | 33 +- + arch/arm/include/asm/kmap_types.h | 10 - + arch/arm/kernel/perf_regs.c | 3 +- + arch/arm/mm/Makefile | 1 - + arch/arm/mm/highmem.c | 121 --- + arch/arm64/kernel/perf_regs.c | 3 +- + arch/csky/Kconfig | 1 + + arch/csky/include/asm/fixmap.h | 4 +- + arch/csky/include/asm/highmem.h | 6 +- + arch/csky/kernel/perf_regs.c | 3 +- + arch/csky/mm/highmem.c | 75 +- + arch/ia64/include/asm/kmap_types.h | 13 - + arch/microblaze/Kconfig | 1 + + arch/microblaze/include/asm/fixmap.h | 4 +- + arch/microblaze/include/asm/highmem.h | 6 +- + arch/microblaze/mm/Makefile | 1 - + arch/microblaze/mm/highmem.c | 78 -- + arch/microblaze/mm/init.c | 6 - + arch/mips/Kconfig | 1 + + arch/mips/include/asm/fixmap.h | 4 +- + arch/mips/include/asm/highmem.h | 6 +- + arch/mips/include/asm/kmap_types.h | 13 - + arch/mips/mm/highmem.c | 77 -- + arch/mips/mm/init.c | 4 - + arch/nds32/Kconfig.cpu | 1 + + arch/nds32/include/asm/fixmap.h | 4 +- + arch/nds32/include/asm/highmem.h | 22 +- + arch/nds32/mm/Makefile | 1 - + arch/nds32/mm/highmem.c | 48 -- + arch/openrisc/mm/init.c | 1 - + arch/openrisc/mm/ioremap.c | 1 - + arch/parisc/include/asm/kmap_types.h | 13 - + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/fixmap.h | 4 +- + arch/powerpc/include/asm/highmem.h | 7 +- + arch/powerpc/include/asm/kmap_types.h | 13 - + arch/powerpc/mm/Makefile | 1 - + arch/powerpc/mm/highmem.c | 67 -- + arch/powerpc/mm/mem.c | 7 - + arch/powerpc/perf/core-book3s.c | 6 +- + arch/powerpc/perf/imc-pmu.c | 2 +- + arch/powerpc/perf/perf_regs.c | 3 +- + arch/riscv/kernel/perf_regs.c | 3 +- + arch/s390/kernel/perf_cpum_sf.c | 2 +- + arch/s390/kernel/perf_regs.c | 3 +- + arch/sh/include/asm/fixmap.h | 8 - + arch/sh/include/asm/kmap_types.h | 15 - + arch/sh/mm/init.c | 8 - + arch/sparc/Kconfig | 1 + + arch/sparc/include/asm/highmem.h | 8 +- + arch/sparc/include/asm/kmap_types.h | 11 - + arch/sparc/include/asm/vaddrs.h | 4 +- + arch/sparc/mm/Makefile | 3 - + arch/sparc/mm/highmem.c | 115 --- + arch/sparc/mm/srmmu.c | 2 - + arch/um/include/asm/cacheflush.h | 9 + + arch/um/include/asm/fixmap.h | 1 - + arch/um/include/asm/kmap_types.h | 13 - + arch/x86/Kconfig | 3 +- + arch/x86/Kconfig.debug | 3 - + arch/x86/entry/common.c | 34 - + arch/x86/events/intel/core.c | 16 +- + arch/x86/events/intel/cstate.c | 19 +- + arch/x86/events/intel/ds.c | 64 +- + arch/x86/events/intel/uncore.c | 6 + + arch/x86/events/intel/uncore_snb.c | 22 +- + arch/x86/events/msr.c | 1 + + arch/x86/events/perf_event.h | 5 +- + arch/x86/include/asm/apic.h | 16 +- + arch/x86/include/asm/apicdef.h | 16 +- + 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/copy_mc_test.h | 75 -- + arch/x86/include/asm/fixmap.h | 5 +- + arch/x86/include/asm/fpu/api.h | 23 +- + arch/x86/include/asm/highmem.h | 13 +- + arch/x86/include/asm/hpet.h | 11 - + arch/x86/include/asm/hw_irq.h | 13 +- + arch/x86/include/asm/hyperv-tlfs.h | 7 + + arch/x86/include/asm/idtentry.h | 3 - + arch/x86/include/asm/io_apic.h | 79 +- + arch/x86/include/asm/iomap.h | 13 +- + arch/x86/include/asm/irq_remapping.h | 9 - + arch/x86/include/asm/irqdomain.h | 3 + + arch/x86/include/asm/kmap_types.h | 13 - + arch/x86/include/asm/mce.h | 3 +- + arch/x86/include/asm/msi.h | 50 ++ + arch/x86/include/asm/msidef.h | 57 -- + arch/x86/include/asm/msr-index.h | 1 + + arch/x86/include/asm/page_32_types.h | 8 +- + arch/x86/include/asm/page_64_types.h | 6 +- + arch/x86/include/asm/paravirt_types.h | 1 - + arch/x86/include/asm/perf_event.h | 4 +- + arch/x86/include/asm/pgtable_32.h | 18 +- + arch/x86/include/asm/processor.h | 2 + + arch/x86/include/asm/thread_info.h | 9 +- + arch/x86/include/asm/tlbflush.h | 2 +- + arch/x86/include/asm/uv/uv.h | 10 - + arch/x86/include/asm/x86_init.h | 2 + + arch/x86/kernel/apic/apic.c | 73 +- + arch/x86/kernel/apic/apic_flat_64.c | 18 +- + arch/x86/kernel/apic/apic_noop.c | 10 +- + arch/x86/kernel/apic/apic_numachip.c | 16 +- + arch/x86/kernel/apic/bigsmp_32.c | 9 +- + arch/x86/kernel/apic/io_apic.c | 503 ++++++------ + arch/x86/kernel/apic/ipi.c | 6 +- + arch/x86/kernel/apic/msi.c | 153 +--- + arch/x86/kernel/apic/probe_32.c | 9 +- + arch/x86/kernel/apic/vector.c | 49 ++ + arch/x86/kernel/apic/x2apic_cluster.c | 10 +- + arch/x86/kernel/apic/x2apic_phys.c | 17 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 12 +- + arch/x86/kernel/cpu/bugs.c | 54 ++ + arch/x86/kernel/cpu/mce/core.c | 15 +- + arch/x86/kernel/cpu/mce/intel.c | 20 + + arch/x86/kernel/cpu/microcode/amd.c | 1 - + arch/x86/kernel/cpu/mshyperv.c | 29 + + arch/x86/kernel/cpu/mtrr/mtrr.c | 3 +- + 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/devicetree.c | 30 +- + arch/x86/kernel/head_64.S | 20 +- + arch/x86/kernel/hpet.c | 122 ++- + arch/x86/kernel/kvm.c | 6 + + arch/x86/kernel/nmi.c | 6 +- + arch/x86/kernel/perf_regs.c | 15 +- + arch/x86/kernel/setup.c | 5 - + arch/x86/kernel/smpboot.c | 19 +- + arch/x86/kernel/traps.c | 13 +- + arch/x86/kernel/vmlinux.lds.S | 12 +- + arch/x86/kernel/x86_init.c | 1 + + arch/x86/kvm/cpuid.c | 4 +- + arch/x86/kvm/irq_comm.c | 31 +- + arch/x86/lib/copy_mc.c | 4 - + arch/x86/lib/copy_mc_64.S | 10 - + arch/x86/mm/highmem_32.c | 59 -- + arch/x86/mm/ident_map.c | 12 +- + arch/x86/mm/init_32.c | 15 - + arch/x86/mm/iomap_32.c | 57 +- + arch/x86/mm/tlb.c | 100 ++- + arch/x86/pci/intel_mid_pci.c | 8 +- + arch/x86/pci/xen.c | 26 +- + arch/x86/platform/uv/uv_irq.c | 4 +- + arch/x86/xen/apic.c | 7 +- + arch/xtensa/Kconfig | 1 + + arch/xtensa/include/asm/fixmap.h | 4 +- + arch/xtensa/include/asm/highmem.h | 12 +- + arch/xtensa/mm/highmem.c | 46 +- + drivers/base/regmap/regmap-irq.c | 11 +- + drivers/iommu/amd/amd_iommu_types.h | 2 +- + drivers/iommu/amd/init.c | 46 +- + drivers/iommu/amd/iommu.c | 93 +-- + drivers/iommu/hyperv-iommu.c | 44 +- + drivers/iommu/intel/irq_remapping.c | 102 +-- + drivers/iommu/irq_remapping.c | 14 - + drivers/iommu/irq_remapping.h | 3 - + drivers/pci/controller/pci-hyperv.c | 6 +- + drivers/pci/controller/vmd.c | 9 +- + fs/aio.c | 1 - + fs/btrfs/ctree.h | 1 - + fs/proc/array.c | 4 +- + include/asm-generic/Kbuild | 2 +- + include/asm-generic/atomic-instrumented.h | 216 +++-- + include/asm-generic/kmap_size.h | 12 + + include/asm-generic/kmap_types.h | 11 - + include/asm-generic/msi.h | 4 + + include/linux/atomic-arch-fallback.h | 90 ++- + include/linux/atomic-fallback.h | 90 ++- + include/linux/cpuhotplug.h | 1 + + include/linux/cpumask.h | 6 + + include/linux/entry-common.h | 39 +- + include/linux/freelist.h | 129 +++ + include/linux/highmem-internal.h | 174 ++++ + include/linux/highmem.h | 285 +++---- + include/linux/io-mapping.h | 8 +- + include/linux/irqdomain.h | 8 +- + include/linux/kprobes.h | 25 +- + include/linux/llist.h | 23 + + include/linux/msi.h | 46 +- + include/linux/perf_event.h | 19 +- + include/linux/perf_regs.h | 6 +- + include/linux/preempt.h | 69 ++ + include/linux/sched.h | 9 + + include/linux/sched/hotplug.h | 2 + + include/linux/sched/mm.h | 5 + + include/linux/stop_machine.h | 5 + + include/uapi/linux/perf_event.h | 6 +- + include/uapi/linux/prctl.h | 1 + + kernel/cpu.c | 9 +- + kernel/entry/common.c | 38 +- + kernel/events/core.c | 198 ++++- + kernel/events/internal.h | 16 +- + kernel/events/ring_buffer.c | 20 +- + kernel/exit.c | 16 +- + kernel/fork.c | 4 + + kernel/futex.c | 5 +- + kernel/irq/irqdomain.c | 30 +- + kernel/kprobes.c | 314 +++----- + kernel/kthread.c | 21 + + kernel/locking/lockdep.c | 19 +- + kernel/sched/core.c | 936 +++++++++++++++++----- + kernel/sched/cpudeadline.c | 4 +- + kernel/sched/cpupri.c | 52 +- + kernel/sched/cpupri.h | 8 +- + kernel/sched/deadline.c | 101 ++- + kernel/sched/debug.c | 12 +- + kernel/sched/fair.c | 140 ++-- + kernel/sched/idle.c | 7 +- + kernel/sched/membarrier.c | 147 +++- + kernel/sched/rt.c | 99 ++- + kernel/sched/sched.h | 150 +++- + kernel/sched/stop_task.c | 5 +- + kernel/sched/topology.c | 1 + + kernel/stop_machine.c | 27 +- + kernel/time/jiffies.c | 3 +- + kernel/time/timekeeping.h | 2 +- + kernel/trace/trace_kprobe.c | 3 +- + kernel/workqueue.c | 4 + + lib/cpumask.c | 18 + + lib/dump_stack.c | 2 + + lib/smp_processor_id.c | 5 + + mm/Kconfig | 3 + + mm/highmem.c | 170 +++- + scripts/atomic/gen-atomic-fallback.sh | 63 +- + scripts/atomic/gen-atomic-instrumented.sh | 29 +- + scripts/atomic/gen-atomics.sh | 0 + tools/testing/nvdimm/test/nfit.c | 103 --- + 246 files changed, 4637 insertions(+), 3398 deletions(-) + create mode 100644 Documentation/admin-guide/hw-vuln/l1d_flush.rst + rename Documentation/x86/{resctrl_ui.rst => resctrl.rst} (90%) + delete mode 100644 arch/alpha/include/asm/kmap_types.h + delete mode 100644 arch/arc/include/asm/kmap_types.h + delete mode 100644 arch/arm/include/asm/kmap_types.h + delete mode 100644 arch/arm/mm/highmem.c + delete mode 100644 arch/ia64/include/asm/kmap_types.h + delete mode 100644 arch/microblaze/mm/highmem.c + delete mode 100644 arch/mips/include/asm/kmap_types.h + delete mode 100644 arch/nds32/mm/highmem.c + delete mode 100644 arch/parisc/include/asm/kmap_types.h + delete mode 100644 arch/powerpc/include/asm/kmap_types.h + delete mode 100644 arch/powerpc/mm/highmem.c + delete mode 100644 arch/sh/include/asm/kmap_types.h + delete mode 100644 arch/sparc/include/asm/kmap_types.h + delete mode 100644 arch/sparc/mm/highmem.c + create mode 100644 arch/um/include/asm/cacheflush.h + delete mode 100644 arch/um/include/asm/kmap_types.h + delete mode 100644 arch/x86/include/asm/copy_mc_test.h + delete mode 100644 arch/x86/include/asm/kmap_types.h + delete mode 100644 arch/x86/include/asm/msidef.h + create mode 100644 include/asm-generic/kmap_size.h + delete mode 100644 include/asm-generic/kmap_types.h + create mode 100644 include/linux/freelist.h + create mode 100644 include/linux/highmem-internal.h + mode change 100644 => 100755 scripts/atomic/gen-atomics.sh +Merging clockevents/timers/drivers/next (4576f62086eb dt-bindings: timer: renesas: tmu: Convert to json-schema) +$ git merge clockevents/timers/drivers/next +Removing drivers/clocksource/timer-nps.c +Auto-merging drivers/clocksource/Makefile +Auto-merging drivers/clocksource/Kconfig +Removing Documentation/devicetree/bindings/timer/renesas,tmu.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/timer/renesas,tmu.txt | 49 ---- + .../devicetree/bindings/timer/renesas,tmu.yaml | 99 +++++++ + drivers/clocksource/Kconfig | 10 - + drivers/clocksource/Makefile | 1 - + drivers/clocksource/timer-nps.c | 284 --------------------- + drivers/clocksource/timer-orion.c | 11 +- + drivers/clocksource/timer-sp804.c | 49 ++-- + include/dt-bindings/clock/ingenic,sysost.h | 10 +- + 8 files changed, 131 insertions(+), 382 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/timer/renesas,tmu.txt + create mode 100644 Documentation/devicetree/bindings/timer/renesas,tmu.yaml + delete mode 100644 drivers/clocksource/timer-nps.c +Merging edac/edac-for-next (82b9c922783e Merge branch 'edac-igen6' into edac-for-next) +$ git merge edac/edac-for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 11 +- + drivers/edac/Kconfig | 9 + + drivers/edac/Makefile | 1 + + 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/edac_mc.c | 3 + + 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/igen6_edac.c | 977 +++++++++++++++++++++++++++++++++++++++++ + drivers/edac/r82600_edac.c | 1 - + drivers/edac/x38_edac.c | 1 - + include/linux/edac.h | 13 +- + 22 files changed, 1017 insertions(+), 32 deletions(-) + create mode 100644 drivers/edac/igen6_edac.c +Merging irqchip/irq/irqchip-next (d95bdca75b3f irqchip/ti-sci-inta: Add support for unmapped event handling) +$ git merge irqchip/irq/irqchip-next +Already up to date. +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 (bf6a52d6ce5f fixup! scftorture: Add debug output for wrong-CPU warning) +$ git merge rcu/rcu/next +Auto-merging lib/cpumask.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sched/core.c +Auto-merging kernel/rcu/tree.c +Auto-merging include/linux/preempt.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/cpumask.h +Auto-merging arch/xtensa/kernel/entry.S +Auto-merging arch/x86/kernel/smpboot.c +Auto-merging arch/x86/kernel/cpu/mtrr/mtrr.c +Auto-merging arch/arm/include/asm/assembler.h +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + .../RCU/Design/Requirements/Requirements.rst | 704 +++++++++++---------- + Documentation/RCU/checklist.rst | 7 + + Documentation/RCU/rcu_dereference.rst | 6 + + Documentation/RCU/whatisRCU.rst | 3 +- + Documentation/admin-guide/kernel-parameters.rst | 20 + + Documentation/admin-guide/kernel-parameters.txt | 12 +- + .../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/cpumask.h | 8 + + 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/rcu_segcblist.h | 1 + + 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 | 37 +- + kernel/rcu/Kconfig | 20 +- + kernel/rcu/rcu.h | 16 + + kernel/rcu/rcu_segcblist.c | 191 ++++-- + kernel/rcu/rcu_segcblist.h | 5 +- + kernel/rcu/rcuscale.c | 37 +- + kernel/rcu/rcutorture.c | 239 ++++++- + kernel/rcu/refscale.c | 11 +- + kernel/rcu/srcutree.c | 11 +- + kernel/rcu/tasks.h | 49 +- + kernel/rcu/tree.c | 208 +++--- + kernel/rcu/tree.h | 2 + + kernel/rcu/tree_exp.h | 2 +- + kernel/rcu/tree_plugin.h | 15 +- + kernel/rcu/tree_stall.h | 42 +- + kernel/scftorture.c | 55 +- + kernel/sched/core.c | 6 +- + kernel/sysctl.c | 11 + + kernel/torture.c | 34 +- + lib/Kconfig.debug | 3 - + lib/cpumask.c | 132 ++++ + tools/include/nolibc/nolibc.h | 4 +- + tools/memory-model/Documentation/README | 76 +++ + .../Documentation/control-dependencies.txt | 258 ++++++++ + tools/memory-model/Documentation/glossary.txt | 178 ++++++ + tools/memory-model/Documentation/litmus-tests.txt | 17 + + tools/memory-model/Documentation/locking.txt | 320 ++++++++++ + tools/memory-model/Documentation/ordering.txt | 556 ++++++++++++++++ + tools/memory-model/README | 22 +- + tools/memory-model/litmus-tests/.gitignore | 2 +- + .../litmus-tests/CoRR+poonceonce+Once.litmus | 4 +- + .../litmus-tests/CoRW+poonceonce+Once.litmus | 4 +- + .../litmus-tests/CoWR+poonceonce+Once.litmus | 4 +- + .../litmus-tests/CoWW+poonceonce.litmus | 4 +- + .../IRIW+fencembonceonces+OnceOnce.litmus | 5 +- + .../litmus-tests/IRIW+poonceonces+OnceOnce.litmus | 5 +- + .../ISA2+pooncelock+pooncelock+pombonce.litmus | 7 +- + .../litmus-tests/ISA2+poonceonces.litmus | 6 +- + ...cerelease+poacquirerelease+poacquireonce.litmus | 6 +- + .../LB+fencembonceonce+ctrlonceonce.litmus | 5 +- + .../LB+poacquireonce+pooncerelease.litmus | 5 +- + .../litmus-tests/LB+poonceonces.litmus | 5 +- + .../MP+fencewmbonceonce+fencermbonceonce.litmus | 19 +- + .../litmus-tests/MP+onceassign+derefonce.litmus | 15 +- + .../MP+polockmbonce+poacquiresilsil.litmus | 8 +- + .../MP+polockonce+poacquiresilsil.litmus | 8 +- + tools/memory-model/litmus-tests/MP+polocks.litmus | 20 +- + .../litmus-tests/MP+poonceonces.litmus | 19 +- + .../MP+pooncerelease+poacquireonce.litmus | 19 +- + .../memory-model/litmus-tests/MP+porevlocks.litmus | 20 +- + .../litmus-tests/R+fencembonceonces.litmus | 5 +- + .../memory-model/litmus-tests/R+poonceonces.litmus | 5 +- + .../S+fencewmbonceonce+poacquireonce.litmus | 5 +- + .../memory-model/litmus-tests/S+poonceonces.litmus | 5 +- + .../litmus-tests/SB+fencembonceonces.litmus | 5 +- + .../litmus-tests/SB+poonceonces.litmus | 5 +- + .../litmus-tests/SB+rfionceonce-poonceonces.litmus | 5 +- + .../litmus-tests/WRC+poonceonces+Once.litmus | 5 +- + .../WRC+pooncerelease+fencermbonceonce+Once.litmus | 5 +- + .../Z6.0+pooncelock+poonceLock+pombonce.litmus | 7 +- + .../Z6.0+pooncelock+pooncelock+pombonce.litmus | 7 +- + ...release+poacquirerelease+fencembonceonce.litmus | 6 +- + 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 | 41 +- + .../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/rcu/TREE04.boot | 2 +- + .../selftests/rcutorture/configs/rcu/TREE08.boot | 2 +- + .../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 - + 136 files changed, 3635 insertions(+), 912 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 (ed4ffaf49bf9 KVM: arm64: Handle SCXTNUM_ELx traps) +$ git merge kvm-arm/next +Auto-merging arch/arm64/kvm/sys_regs.c +Auto-merging arch/arm64/kvm/arm.c +Auto-merging arch/arm64/include/asm/sysreg.h +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/kvm_host.h | 2 + + arch/arm64/include/asm/sysreg.h | 4 ++ + arch/arm64/kvm/arm.c | 16 ++++++ + arch/arm64/kvm/sys_regs.c | 111 +++++++++++++++++++++++--------------- + 4 files changed, 89 insertions(+), 44 deletions(-) +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 (65cae18882f9 x86/xen: don't unbind uninitialized lock_kicker_irq) +$ git merge xen-tip/linux-next +Merge made by the 'recursive' strategy. + arch/x86/xen/spinlock.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) +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 (97ab4516205e platform/x86: intel-hid: fix _DSM function index handling) +$ git merge drivers-x86/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-class-firmware-attributes | 258 ++++ + MAINTAINERS | 32 +- + 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 | 59 + + drivers/platform/surface/Makefile | 11 + + drivers/platform/{x86 => surface}/surface3-wmi.c | 0 + .../platform/{x86 => surface}/surface3_button.c | 0 + drivers/platform/{x86 => surface}/surface3_power.c | 0 + drivers/platform/surface/surface_gpe.c | 309 ++++ + .../platform/{x86 => surface}/surfacepro3_button.c | 0 + drivers/platform/x86/Kconfig | 57 +- + drivers/platform/x86/Makefile | 10 +- + drivers/platform/x86/acer-wmi.c | 166 ++- + drivers/platform/x86/amd-pmc.c | 286 ++++ + 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 | 187 +++ + .../x86/dell-wmi-sysman/passwordattr-interface.c | 153 ++ + .../x86/dell-wmi-sysman/string-attributes.c | 159 +++ + drivers/platform/x86/dell-wmi-sysman/sysman.c | 627 +++++++++ + drivers/platform/x86/intel-hid.c | 16 +- + drivers/platform/x86/intel_pmc_core.c | 2 +- + drivers/platform/x86/sony-laptop.c | 3 - + drivers/platform/x86/thinkpad_acpi.c | 11 +- + drivers/platform/x86/touchscreen_dmi.c | 27 + + drivers/platform/x86/wmi.c | 7 +- + include/linux/platform_data/x86/asus-wmi.h | 1 + + 37 files changed, 4591 insertions(+), 85 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%) + create mode 100644 drivers/platform/surface/surface_gpe.c + rename drivers/platform/{x86 => surface}/surfacepro3_button.c (100%) + create mode 100644 drivers/platform/x86/amd-pmc.c + 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 (33c0c9bdf7a5 drivers: base: fix some kernel-doc markups) +$ git merge driver-core/driver-core-next +Merge made by the 'recursive' strategy. + drivers/base/class.c | 2 +- + drivers/base/core.c | 2 -- + drivers/base/devres.c | 2 +- + drivers/base/firmware_loader/fallback.c | 2 +- + fs/kernfs/dir.c | 2 +- + include/linux/device/class.h | 14 ++++++++++++++ + include/linux/kernfs.h | 2 +- + 7 files changed, 19 insertions(+), 7 deletions(-) +Merging usb/usb-next (57cde551225b Merge 5.10-rc3 into usb-next) +$ 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/typec/ucsi/ucsi.c | 125 ++++++-- + drivers/usb/typec/ucsi/ucsi.h | 2 + + drivers/usb/typec/ucsi/ucsi_acpi.c | 5 +- + drivers/usb/usbip/usbip_common.c | 5 - + include/dt-bindings/usb/pd.h | 8 + + 34 files changed, 706 insertions(+), 165 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 (975323ab8f11 USB: serial: mos7720: fix parallel-port state restore) +$ git merge usb-serial/usb-next +Auto-merging arch/mips/configs/mtx1_defconfig +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 +++++++++++++++------------------- + drivers/usb/serial/mos7720.c | 2 + + include/linux/usb/serial.h | 2 - + 15 files changed, 264 insertions(+), 380 deletions(-) +Merging usb-chipidea-next/for-usb-next (87a6b8617a72 usb: chipidea: add tracepoint support for udc) +$ git merge usb-chipidea-next/for-usb-next +Auto-merging drivers/usb/cdns3/gadget.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/usb/cdns,usb3.yaml | 5 ++ + drivers/usb/cdns3/cdns3-imx.c | 2 +- + drivers/usb/cdns3/core.c | 15 +--- + drivers/usb/cdns3/core.h | 4 + + drivers/usb/cdns3/gadget-export.h | 3 - + drivers/usb/cdns3/gadget.c | 2 +- + drivers/usb/cdns3/host-export.h | 6 ++ + drivers/usb/cdns3/host.c | 60 +++++++++++++- + drivers/usb/chipidea/Makefile | 5 +- + drivers/usb/chipidea/trace.c | 23 ++++++ + drivers/usb/chipidea/trace.h | 91 ++++++++++++++++++++++ + drivers/usb/chipidea/udc.c | 10 ++- + 12 files changed, 206 insertions(+), 20 deletions(-) + create mode 100644 drivers/usb/chipidea/trace.c + create mode 100644 drivers/usb/chipidea/trace.h +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 5c3bc264887d] 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 (9b085d6e8890 Merge 5.10-rc3 into tty-next) +$ git merge tty/tty-next +Removing include/linux/serial_pnx8xxx.h +Removing drivers/tty/synclinkmp.c +Removing drivers/tty/synclink.c +Removing drivers/tty/serial/pnx8xxx_uart.c +Auto-merging drivers/tty/serial/Makefile +Auto-merging drivers/tty/serial/Kconfig +Auto-merging arch/powerpc/configs/ppc6xx_defconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/serial/omap_serial.txt | 1 + + arch/powerpc/configs/ppc6xx_defconfig | 2 - + drivers/tty/Kconfig | 27 - + drivers/tty/Makefile | 2 - + drivers/tty/goldfish.c | 18 +- + drivers/tty/hvc/hvc_opal.c | 2 +- + drivers/tty/hvc/hvc_vio.c | 2 +- + drivers/tty/n_gsm.c | 4 +- + drivers/tty/n_tty.c | 2 + + drivers/tty/nozomi.c | 5 +- + drivers/tty/pty.c | 2 + + drivers/tty/serdev/core.c | 6 +- + drivers/tty/serial/8250/8250_omap.c | 42 +- + drivers/tty/serial/8250/serial_cs.c | 9 +- + drivers/tty/serial/Kconfig | 16 - + drivers/tty/serial/Makefile | 1 - + drivers/tty/serial/amba-pl011.c | 2 +- + drivers/tty/serial/fsl_linflexuart.c | 19 +- + drivers/tty/serial/ifx6x60.c | 3 +- + drivers/tty/serial/jsm/jsm_cls.c | 4 +- + drivers/tty/serial/lpc32xx_hs.c | 3 +- + drivers/tty/serial/max310x.c | 57 +- + drivers/tty/serial/msm_serial.c | 5 +- + drivers/tty/serial/pnx8xxx_uart.c | 858 --- + drivers/tty/serial/serial-tegra.c | 7 +- + drivers/tty/serial/serial_mctrl_gpio.c | 2 +- + drivers/tty/serial/sifive.c | 3 +- + drivers/tty/serial/stm32-usart.c | 6 +- + drivers/tty/serial/xilinx_uartps.c | 1 + + drivers/tty/synclink.c | 7898 -------------------- + drivers/tty/synclink_gt.c | 3 +- + drivers/tty/synclinkmp.c | 5579 -------------- + drivers/tty/tty_audit.c | 12 +- + drivers/tty/tty_baudrate.c | 1 + + drivers/tty/tty_buffer.c | 1 + + drivers/tty/tty_io.c | 12 +- + drivers/tty/tty_jobctrl.c | 3 + + drivers/tty/tty_ldisc.c | 1 + + drivers/tty/tty_port.c | 4 +- + drivers/tty/vt/consolemap.c | 3 +- + drivers/tty/vt/keyboard.c | 427 +- + include/linux/goldfish.h | 8 +- + include/linux/kbd_kern.h | 3 - + include/linux/serial_pnx8xxx.h | 67 - + include/linux/tty.h | 1 + + include/uapi/linux/keyboard.h | 2 +- + include/uapi/linux/serial_core.h | 2 - + 47 files changed, 345 insertions(+), 14793 deletions(-) + delete mode 100644 drivers/tty/serial/pnx8xxx_uart.c + delete mode 100644 drivers/tty/synclink.c + delete mode 100644 drivers/tty/synclinkmp.c + delete mode 100644 include/linux/serial_pnx8xxx.h +Merging char-misc/char-misc-next (1987f112f142 binder: add trace at free transaction.) +$ git merge char-misc/char-misc-next +Auto-merging drivers/uio/uio.c +Auto-merging drivers/accessibility/speakup/main.c +Merge made by the 'recursive' strategy. + Documentation/admin-guide/spkguide.txt | 1 + + drivers/accessibility/speakup/i18n.h | 6 + + drivers/accessibility/speakup/main.c | 64 ++-- + drivers/accessibility/speakup/speakup_dummy.c | 7 +- + drivers/android/binder.c | 427 ++------------------------ + drivers/android/binder_internal.h | 406 ++++++++++++++++++++++++ + drivers/android/binder_trace.h | 29 ++ + drivers/char/lp.c | 1 - + drivers/char/misc.c | 2 +- + drivers/char/mwave/mwavedd.c | 1 - + drivers/firmware/google/gsmi.c | 31 +- + drivers/ipack/devices/ipoctal.c | 1 - + drivers/misc/c2port/core.c | 2 +- + drivers/misc/hisi_hikey_usb.c | 5 +- + drivers/misc/mei/bus.c | 20 +- + 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/uacce/uacce.c | 13 +- + drivers/misc/xilinx_sdfec.c | 28 +- + drivers/uio/uio.c | 4 +- + drivers/vme/bridges/vme_tsi148.c | 7 - + drivers/vme/vme.c | 13 +- + include/linux/uio_driver.h | 16 + + 25 files changed, 566 insertions(+), 525 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 (4e58171aa93f MAINTAINERS: Add Isaac as maintainer of Thunderbolt DMA traffic test driver) +$ git merge thunderbolt/next +Auto-merging drivers/thunderbolt/xdomain.c +Auto-merging drivers/thunderbolt/tb.h +Auto-merging drivers/thunderbolt/nhi.c +Auto-merging drivers/thunderbolt/debugfs.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-thunderbolt | 28 + + MAINTAINERS | 6 + + drivers/net/thunderbolt.c | 2 +- + drivers/thunderbolt/Kconfig | 13 + + drivers/thunderbolt/Makefile | 3 + + drivers/thunderbolt/ctl.c | 4 +- + drivers/thunderbolt/debugfs.c | 24 + + drivers/thunderbolt/dma_test.c | 736 ++++++++++++++++++++++++ + drivers/thunderbolt/nhi.c | 36 +- + drivers/thunderbolt/path.c | 13 +- + drivers/thunderbolt/switch.c | 33 +- + drivers/thunderbolt/tb.h | 8 + + drivers/thunderbolt/tunnel.c | 50 +- + drivers/thunderbolt/xdomain.c | 148 ++++- + include/linux/thunderbolt.h | 18 +- + 15 files changed, 1080 insertions(+), 42 deletions(-) + create mode 100644 drivers/thunderbolt/dma_test.c +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 (f4acd33c446b staging: rtl8723bs: replace ieee80211_back_actioncode) +$ git merge staging/staging-next +Removing tools/testing/selftests/android/run.sh +Removing tools/testing/selftests/android/ion/ipcsocket.h +Removing tools/testing/selftests/android/ion/ipcsocket.c +Removing tools/testing/selftests/android/ion/ionutils.h +Removing tools/testing/selftests/android/ion/ionutils.c +Removing tools/testing/selftests/android/ion/ionmap_test.c +Removing tools/testing/selftests/android/ion/ionapp_import.c +Removing tools/testing/selftests/android/ion/ionapp_export.c +Removing tools/testing/selftests/android/ion/ion_test.sh +Removing tools/testing/selftests/android/ion/ion.h +Removing tools/testing/selftests/android/ion/README +Removing tools/testing/selftests/android/ion/Makefile +Removing tools/testing/selftests/android/ion/.gitignore +Removing tools/testing/selftests/android/config +Removing tools/testing/selftests/android/Makefile +Auto-merging drivers/staging/mt7621-pci/pci-mt7621.c +Removing drivers/staging/android/uapi/ion.h +Removing drivers/staging/android/ion/ion_system_heap.c +Removing drivers/staging/android/ion/ion_page_pool.c +Removing drivers/staging/android/ion/ion_heap.c +Removing drivers/staging/android/ion/ion_cma_heap.c +Removing drivers/staging/android/ion/ion.h +Removing drivers/staging/android/ion/ion.c +Removing drivers/staging/android/ion/Makefile +Removing drivers/staging/android/ion/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 10 - + drivers/staging/android/Kconfig | 2 - + drivers/staging/android/Makefile | 2 - + drivers/staging/android/TODO | 5 - + drivers/staging/android/ion/Kconfig | 27 - + drivers/staging/android/ion/Makefile | 4 - + drivers/staging/android/ion/ion.c | 649 --------------------- + drivers/staging/android/ion/ion.h | 302 ---------- + drivers/staging/android/ion/ion_cma_heap.c | 138 ----- + drivers/staging/android/ion/ion_heap.c | 286 --------- + drivers/staging/android/ion/ion_page_pool.c | 155 ----- + drivers/staging/android/ion/ion_system_heap.c | 377 ------------ + drivers/staging/android/uapi/ion.h | 127 ---- + drivers/staging/comedi/drivers/ni_mio_common.c | 3 +- + .../staging/comedi/drivers/tests/ni_routes_test.c | 8 +- + drivers/staging/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/ks7010/ks7010_sdio.c | 4 +- + drivers/staging/most/sound/sound.c | 14 +- + drivers/staging/mt7621-dma/mtk-hsdma.c | 44 +- + drivers/staging/mt7621-pci/pci-mt7621.c | 4 +- + 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/hal/rtl8188e_dm.c | 4 +- + 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/rtl8192u/r8192U_core.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_ap.c | 51 +- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 45 +- + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 6 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 49 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 111 ++-- + drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 6 +- + drivers/staging/rtl8723bs/core/rtw_recv.c | 25 +- + drivers/staging/rtl8723bs/core/rtw_security.c | 8 +- + drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 3 +- + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 22 +- + drivers/staging/rtl8723bs/core/rtw_xmit.c | 24 +- + drivers/staging/rtl8723bs/hal/hal_com.c | 2 +- + drivers/staging/rtl8723bs/hal/hal_intf.c | 4 +- + drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 20 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 2 +- + drivers/staging/rtl8723bs/hal/sdio_halinit.c | 15 +- + drivers/staging/rtl8723bs/include/ieee80211.h | 35 +- + drivers/staging/rtl8723bs/include/osdep_service.h | 3 - + .../rtl8723bs/include/osdep_service_linux.h | 2 - + drivers/staging/rtl8723bs/include/rtw_ht.h | 2 +- + drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +- + drivers/staging/rtl8723bs/include/wifi.h | 16 - + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 72 +-- + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 142 ++--- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 24 +- + drivers/staging/rtl8723bs/os_dep/recv_linux.c | 4 +- + 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 +- + drivers/staging/wimax/Kconfig | 1 + + drivers/staging/wlan-ng/prism2mgmt.c | 4 +- + tools/testing/selftests/Makefile | 3 +- + tools/testing/selftests/android/Makefile | 39 -- + tools/testing/selftests/android/config | 5 - + tools/testing/selftests/android/ion/.gitignore | 4 - + tools/testing/selftests/android/ion/Makefile | 20 - + tools/testing/selftests/android/ion/README | 101 ---- + tools/testing/selftests/android/ion/ion.h | 134 ----- + tools/testing/selftests/android/ion/ion_test.sh | 58 -- + .../testing/selftests/android/ion/ionapp_export.c | 127 ---- + .../testing/selftests/android/ion/ionapp_import.c | 79 --- + tools/testing/selftests/android/ion/ionmap_test.c | 136 ----- + tools/testing/selftests/android/ion/ionutils.c | 253 -------- + tools/testing/selftests/android/ion/ionutils.h | 55 -- + tools/testing/selftests/android/ion/ipcsocket.c | 227 ------- + tools/testing/selftests/android/ion/ipcsocket.h | 35 -- + tools/testing/selftests/android/run.sh | 3 - + 110 files changed, 992 insertions(+), 4419 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 (0e15ca5fe224 dmaengine: pxa_dma: remove redundant irqsave and irqrestore in hardIRQ) +$ 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 9c12f856a947] 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/dw/core.c | 6 + + drivers/dma/hisi_dma.c | 5 +- + drivers/dma/idma64.c | 8 +- + drivers/dma/idxd/cdev.c | 49 ++++++- + drivers/dma/idxd/device.c | 102 +++++++++++-- + drivers/dma/idxd/dma.c | 9 -- + drivers/dma/idxd/idxd.h | 33 ++++- + drivers/dma/idxd/init.c | 109 ++++++++++---- + drivers/dma/idxd/irq.c | 146 ++++++++++++++++-- + drivers/dma/idxd/registers.h | 22 +++ + drivers/dma/idxd/submit.c | 35 ++++- + drivers/dma/idxd/sysfs.c | 127 ++++++++++++++++ + drivers/dma/ipu/ipu_idmac.c | 11 +- + drivers/dma/k3dma.c | 9 +- + drivers/dma/milbeaut-xdmac.c | 5 +- + drivers/dma/moxart-dma.c | 5 +- + drivers/dma/pl330.c | 2 - + drivers/dma/ppc4xx/adma.c | 4 +- + drivers/dma/pxa_dma.c | 5 +- + drivers/dma/sf-pdma/sf-pdma.c | 10 +- + drivers/dma/ste_dma40.c | 5 +- + drivers/dma/stm32-mdma.c | 2 +- + drivers/dma/tegra210-adma.c | 7 +- + drivers/dma/ti/k3-udma-glue.c | 64 ++++---- + drivers/dma/ti/k3-udma.c | 10 +- + 29 files changed, 798 insertions(+), 182 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 (9cdcab394724 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/target/target_core_user.c +Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.c +Auto-merging drivers/infiniband/ulp/isert/ib_isert.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-fc_host | 23 + + .../ABI/testing/sysfs-class-fc_remote_ports | 23 + + drivers/infiniband/ulp/isert/ib_isert.c | 6 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 2 +- + 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/aacraid/commctrl.c | 22 +- + drivers/scsi/aacraid/linit.c | 61 +- + 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_fcoe.c | 2 +- + drivers/scsi/bnx2fc/bnx2fc_hwi.c | 1 - + drivers/scsi/fcoe/fcoe.c | 3 +- + drivers/scsi/fcoe/fcoe_sysfs.c | 4 +- + 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/megaraid/megaraid_sas.h | 2 - + drivers/scsi/megaraid/megaraid_sas_base.c | 134 +-- + drivers/scsi/mpt3sas/mpt3sas_base.h | 102 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 6 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 1238 +++++++++++++++++--- + drivers/scsi/mpt3sas/mpt3sas_transport.c | 312 ++++- + drivers/scsi/mvumi.c | 1 - + drivers/scsi/pcmcia/nsp_cs.c | 2 - + drivers/scsi/pm8001/pm8001_hwi.c | 86 +- + drivers/scsi/pm8001/pm8001_init.c | 2 +- + drivers/scsi/pm8001/pm8001_sas.c | 11 +- + drivers/scsi/pm8001/pm8001_sas.h | 2 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 130 +- + drivers/scsi/pm8001/pm80xx_hwi.h | 6 + + drivers/scsi/qedf/qedf.h | 1 - + drivers/scsi/qla2xxx/qla_def.h | 2 + + drivers/scsi/qla2xxx/qla_init.c | 3 + + drivers/scsi/qla2xxx/qla_mbx.c | 1 - + drivers/scsi/qla2xxx/qla_target.c | 22 +- + drivers/scsi/qla2xxx/qla_target.h | 1 + + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 70 +- + 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-mediatek.c | 4 +- + drivers/scsi/ufs/ufs-qcom.c | 7 +- + drivers/scsi/ufs/ufs-sysfs.c | 7 + + drivers/scsi/ufs/ufs.h | 1 + + drivers/scsi/ufs/ufshcd.c | 48 +- + drivers/scsi/ufs/ufshcd.h | 41 +- + drivers/target/loopback/tcm_loop.c | 14 +- + drivers/target/target_core_device.c | 59 +- + drivers/target/target_core_sbc.c | 139 ++- + drivers/target/target_core_tmr.c | 166 +-- + drivers/target/target_core_tpg.c | 2 +- + drivers/target/target_core_transport.c | 170 ++- + drivers/target/target_core_user.c | 164 ++- + drivers/target/tcm_fc/tfc_cmd.c | 3 +- + drivers/target/tcm_fc/tfc_io.c | 1 - + drivers/target/tcm_fc/tfc_sess.c | 2 +- + include/scsi/fc_frame.h | 30 + + include/scsi/scsi_transport_fc.h | 36 + + include/target/target_core_base.h | 22 +- + include/target/target_core_fabric.h | 2 +- + include/trace/events/ufs.h | 3 +- + include/uapi/scsi/fc/fc_els.h | 114 +- + 101 files changed, 3614 insertions(+), 1025 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 scsi-mkp/for-next (cb2b4e8f5ea6 scsi: bnx2fc: Fix comparison to bool warning) +$ git merge scsi-mkp/for-next +Auto-merging drivers/scsi/ufs/ufshcd.c +Auto-merging drivers/scsi/device_handler/scsi_dh_alua.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 9 ++ + block/blk-mq.c | 2 +- + drivers/scsi/advansys.c | 16 +-- + drivers/scsi/aic7xxx/aic79xx_osm.c | 3 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 6 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 4 +- + drivers/scsi/dc395x.c | 15 +- + drivers/scsi/device_handler/scsi_dh_alua.c | 10 +- + drivers/scsi/esas2r/esas2r_disc.c | 3 +- + drivers/scsi/esas2r/esas2r_init.c | 5 +- + drivers/scsi/esas2r/esas2r_int.c | 8 +- + drivers/scsi/esas2r/esas2r_main.c | 8 +- + drivers/scsi/isci/init.c | 18 +-- + drivers/scsi/lpfc/lpfc_attr.c | 56 +++++--- + drivers/scsi/lpfc/lpfc_bsg.c | 34 ++--- + drivers/scsi/lpfc/lpfc_debugfs.c | 3 +- + drivers/scsi/lpfc/lpfc_nvme.c | 37 ++--- + drivers/scsi/lpfc/lpfc_nvmet.c | 17 ++- + drivers/scsi/lpfc/lpfc_scsi.c | 48 ++++--- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 8 +- + drivers/scsi/pm8001/pm8001_sas.c | 2 +- + drivers/scsi/scsi_lib.c | 8 ++ + drivers/scsi/ufs/ufs-mediatek.c | 218 +++++++++++++++++++++-------- + drivers/scsi/ufs/ufs-mediatek.h | 22 +-- + drivers/scsi/ufs/ufshcd.c | 3 +- + drivers/scsi/ufs/unipro.h | 6 +- + 26 files changed, 347 insertions(+), 222 deletions(-) +Merging vhost/linux-next (29ea7644edd2 swiotlb: using SIZE_MAX needs limits.h included) +$ git merge vhost/linux-next +Auto-merging include/linux/swiotlb.h +CONFLICT (content): Merge conflict in include/linux/swiotlb.h +Resolved 'include/linux/swiotlb.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c475b365d835] Merge remote-tracking branch 'vhost/linux-next' into master +$ git diff -M --stat --summary HEAD^.. +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 (27b5ea2fcb90 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-104-idi-48.c | 6 +- + drivers/gpio/gpio-aspeed.c | 1 + + drivers/gpio/gpio-dwapb.c | 4 +- + drivers/gpio/gpio-omap.c | 12 +- + drivers/gpio/gpio-pcie-idio-24.c | 62 ++++++++++- + drivers/gpio/gpio-sifive.c | 2 +- + drivers/gpio/gpio-stmpe.c | 10 +- + drivers/gpio/gpiolib-cdev.c | 24 ++-- + drivers/gpio/gpiolib-cdev.h | 15 --- + drivers/gpio/gpiolib.c | 186 ++++--------------------------- + include/linux/gpio/driver.h | 71 ------------ + include/uapi/linux/gpio.h | 106 +++++++++--------- + 14 files changed, 203 insertions(+), 412 deletions(-) +Merging gpio-brgl/gpio/for-next (37174f334130 gpio: tegra: Use raw_spinlock) +$ 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/gpio-tegra.c | 22 ++++-- + 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 + + 10 files changed, 135 insertions(+), 76 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 (722491772123 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/mscc,ocelot-pinctrl.txt | 3 +- + .../bindings/pinctrl/qcom,msm8953-pinctrl.yaml | 167 ++ + .../bindings/pinctrl/qcom,sdx55-pinctrl.yaml | 154 ++ + arch/arm64/configs/defconfig | 1 + + drivers/firmware/Kconfig | 4 +- + drivers/firmware/Makefile | 3 +- + drivers/firmware/qcom_scm.c | 4 + + drivers/iommu/Kconfig | 2 + + drivers/net/wireless/ath/ath10k/Kconfig | 1 + + drivers/pinctrl/aspeed/pinctrl-aspeed.c | 7 +- + drivers/pinctrl/core.c | 2 + + drivers/pinctrl/mediatek/pinctrl-mt7622.c | 13 +- + drivers/pinctrl/meson/Kconfig | 17 +- + drivers/pinctrl/meson/pinctrl-meson-a1.c | 4 +- + drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c | 3 + + drivers/pinctrl/meson/pinctrl-meson-axg.c | 4 +- + drivers/pinctrl/meson/pinctrl-meson-g12a.c | 4 +- + drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 4 +- + drivers/pinctrl/meson/pinctrl-meson-gxl.c | 4 +- + drivers/pinctrl/meson/pinctrl-meson.c | 8 + + drivers/pinctrl/meson/pinctrl-meson.h | 1 + + drivers/pinctrl/meson/pinctrl-meson8-pmx.c | 2 + + drivers/pinctrl/nomadik/pinctrl-nomadik-db8500.c | 10 +- + drivers/pinctrl/pinctrl-amd.c | 49 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 4 +- + drivers/pinctrl/pinctrl-ingenic.c | 1339 ++++++-------- + drivers/pinctrl/pinctrl-mcp23s08_spi.c | 4 +- + drivers/pinctrl/pinctrl-ocelot.c | 186 +- + drivers/pinctrl/pinctrl-rockchip.c | 30 +- + drivers/pinctrl/qcom/Kconfig | 68 +- + drivers/pinctrl/qcom/Makefile | 2 + + drivers/pinctrl/qcom/pinctrl-msm.c | 34 +- + drivers/pinctrl/qcom/pinctrl-msm8953.c | 1844 ++++++++++++++++++++ + drivers/pinctrl/qcom/pinctrl-sdx55.c | 1018 +++++++++++ + drivers/pinctrl/qcom/pinctrl-sm8250.c | 18 + + include/linux/pinctrl/pinctrl.h | 4 +- + 36 files changed, 4077 insertions(+), 945 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8953-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sdx55-pinctrl.yaml + create mode 100644 drivers/pinctrl/qcom/pinctrl-msm8953.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sdx55.c +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-lakefield.c | 375 ++++++++++++++++++++ + drivers/pinctrl/intel/pinctrl-lynxpoint.c | 3 +- + 6 files changed, 1354 insertions(+), 2 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 (08b82e2bc5f3 pwm: Add PWM fan controller driver for LGM SoC) +$ git merge pwm/for-next +Removing Documentation/devicetree/bindings/pwm/atmel-tcb-pwm.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pwm/atmel-tcb-pwm.txt | 16 -- + .../devicetree/bindings/pwm/intel,keembay-pwm.yaml | 47 +++ + .../devicetree/bindings/pwm/intel,lgm-pwm.yaml | 44 +++ + .../devicetree/bindings/pwm/pwm-mediatek.txt | 1 + + .../devicetree/bindings/pwm/pwm-mtk-disp.txt | 1 + + .../soc/microchip/atmel,at91rm9200-tcb.yaml | 34 ++- + drivers/pwm/Kconfig | 32 ++- + drivers/pwm/Makefile | 3 + + drivers/pwm/pwm-ab8500.c | 4 +- + drivers/pwm/pwm-atmel-tcb.c | 264 ++++++++++------- + drivers/pwm/pwm-atmel.c | 4 +- + drivers/pwm/pwm-bcm-iproc.c | 4 +- + drivers/pwm/pwm-bcm-kona.c | 4 +- + drivers/pwm/pwm-bcm2835.c | 4 +- + drivers/pwm/pwm-berlin.c | 4 +- + drivers/pwm/pwm-brcmstb.c | 4 +- + drivers/pwm/pwm-clps711x.c | 4 +- + drivers/pwm/pwm-crc.c | 2 +- + drivers/pwm/pwm-dwc.c | 319 +++++++++++++++++++++ + drivers/pwm/pwm-ep93xx.c | 4 +- + drivers/pwm/pwm-fsl-ftm.c | 4 +- + drivers/pwm/pwm-hibvt.c | 7 +- + drivers/pwm/pwm-img.c | 4 +- + drivers/pwm/pwm-imx-tpm.c | 10 +- + drivers/pwm/pwm-imx1.c | 25 +- + drivers/pwm/pwm-imx27.c | 25 +- + drivers/pwm/pwm-intel-lgm.c | 244 ++++++++++++++++ + drivers/pwm/pwm-iqs620a.c | 2 +- + drivers/pwm/pwm-keembay.c | 240 ++++++++++++++++ + drivers/pwm/pwm-lp3943.c | 1 + + drivers/pwm/pwm-lpc18xx-sct.c | 4 +- + drivers/pwm/pwm-lpc32xx.c | 4 +- + drivers/pwm/pwm-lpss-platform.c | 39 ++- + drivers/pwm/pwm-lpss.c | 7 +- + drivers/pwm/pwm-mediatek.c | 23 +- + drivers/pwm/pwm-meson.c | 4 +- + drivers/pwm/pwm-mtk-disp.c | 4 +- + drivers/pwm/pwm-pxa.c | 4 +- + drivers/pwm/pwm-rcar.c | 6 +- + drivers/pwm/pwm-renesas-tpu.c | 4 +- + drivers/pwm/pwm-rockchip.c | 4 +- + drivers/pwm/pwm-samsung.c | 4 +- + drivers/pwm/pwm-sifive.c | 4 +- + drivers/pwm/pwm-spear.c | 4 +- + drivers/pwm/pwm-sti.c | 54 ++-- + drivers/pwm/pwm-sun4i.c | 4 +- + drivers/pwm/pwm-tegra.c | 4 +- + drivers/pwm/pwm-tiecap.c | 4 +- + drivers/pwm/pwm-tiehrpwm.c | 16 +- + drivers/pwm/pwm-vt8500.c | 4 +- + drivers/pwm/pwm-zx.c | 5 +- + 51 files changed, 1242 insertions(+), 325 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/pwm/atmel-tcb-pwm.txt + create mode 100644 Documentation/devicetree/bindings/pwm/intel,keembay-pwm.yaml + create mode 100644 Documentation/devicetree/bindings/pwm/intel,lgm-pwm.yaml + create mode 100644 drivers/pwm/pwm-dwc.c + create mode 100644 drivers/pwm/pwm-intel-lgm.c + create mode 100644 drivers/pwm/pwm-keembay.c +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 (c2e46f6b3e35 selftests/cgroup: Fix build on older distros) +$ git merge kselftest/next +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'recursive' strategy. + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/cgroup/cgroup_util.c | 4 +- + tools/testing/selftests/gpio/Makefile | 25 +-- + tools/testing/selftests/intel_pstate/aperf.c | 22 +- + tools/testing/selftests/memfd/fuse_test.c | 2 +- + tools/testing/selftests/memfd/memfd_test.c | 2 +- + tools/testing/selftests/run_kselftest.sh | 2 +- + 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/vm/userfaultfd.c | 4 +- + tools/testing/selftests/x86/Makefile | 2 +- + 14 files changed, 621 insertions(+), 34 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 (c04e5d7bbf6f coresight: tmc-etr: Assign boolean values to a bool variable) +$ 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 +- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 4 +- + 8 files changed, 46 insertions(+), 24 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 (2cfd72f81cf6 auxdisplay: fix use after free in lcd2s_i2c_remove()) +$ 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 | 33 +- + 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, 1238 insertions(+), 452 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 (666dc267e005 bus: mhi: core: Skip RDDM download for unknown execution environment) +$ git merge mhi/mhi-next +Auto-merging include/linux/mhi.h +Auto-merging drivers/bus/mhi/core/main.c +Merge made by the 'recursive' strategy. + drivers/bus/mhi/Kconfig | 9 ++ + drivers/bus/mhi/Makefile | 4 + + drivers/bus/mhi/core/boot.c | 15 +- + drivers/bus/mhi/core/init.c | 6 +- + drivers/bus/mhi/core/internal.h | 6 +- + drivers/bus/mhi/core/main.c | 5 +- + drivers/bus/mhi/pci_generic.c | 345 ++++++++++++++++++++++++++++++++++++++++ + include/linux/mhi.h | 12 +- + 8 files changed, 384 insertions(+), 18 deletions(-) + create mode 100644 drivers/bus/mhi/pci_generic.c +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 9f53d8df389a] 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 36db89a7a86b] Merge remote-tracking branch 'notifications/notifications-pipe-core' into master + Date: Fri Nov 13 15:56:56 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. +$ git am -3 ../patches/0001-Revert-usb-chipidea-add-tracepoint-support-for-udc.patch +Applying: Revert "usb: chipidea: add tracepoint support for udc" +Merging akpm-current/current (999f12a02d92 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 mm/Kconfig +Auto-merging lib/cpumask.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sysctl.c +Auto-merging kernel/reboot.c +Auto-merging kernel/kthread.c +Auto-merging kernel/fork.c +Auto-merging kernel/cgroup/cgroup.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/proc/array.c +Auto-merging fs/aio.c +Auto-merging drivers/gpu/drm/drm_atomic.c +Auto-merging arch/x86/entry/vdso/vma.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/sparc/Kconfig +Auto-merging arch/s390/kvm/kvm-s390.c +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/mm/mmu.c +Auto-merging arch/arm64/mm/init.c +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/mm/init.c +Auto-merging arch/arm/Kconfig +Auto-merging arch/arc/Kconfig +CONFLICT (content): Merge conflict in arch/arc/Kconfig +Auto-merging arch/alpha/Kconfig +Auto-merging MAINTAINERS +Resolved 'arch/arc/Kconfig' using previous resolution. +Resolved 'include/linux/sched.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c65124b420d3] Merge branch 'akpm-current/current' into master +$ git diff -M --stat --summary HEAD^.. + .mailmap | 5 +- + Documentation/ABI/testing/sysfs-kernel-reboot | 32 + + Documentation/admin-guide/blockdev/zram.rst | 5 + + Documentation/admin-guide/cgroup-v1/memcg_test.rst | 8 +- + Documentation/admin-guide/cgroup-v1/memory.rst | 40 +- + Documentation/admin-guide/cgroup-v2.rst | 8 + + Documentation/admin-guide/kdump/vmcoreinfo.rst | 6 + + Documentation/admin-guide/sysctl/vm.rst | 4 +- + Documentation/core-api/memory-allocation.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 | 17 +- + 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 | 17 + + 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/mmzone.h | 2 + + arch/powerpc/include/asm/sparsemem.h | 5 +- + 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/s390/kvm/kvm-s390.c | 2 +- + arch/sparc/Kconfig | 4 +- + arch/x86/Kconfig | 6 +- + arch/x86/entry/vdso/vma.c | 17 - + arch/x86/include/asm/kfence.h | 59 ++ + arch/x86/include/asm/set_memory.h | 1 + + arch/x86/include/asm/sparsemem.h | 10 + + arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 2 +- + arch/x86/kernel/tboot.c | 1 + + arch/x86/kvm/x86.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/dma-buf/sync_file.c | 3 +- + drivers/edac/ghes_edac.c | 4 +- + drivers/firmware/efi/efi.c | 1 + + drivers/gpio/gpio-thunderx.c | 11 +- + drivers/gpio/gpio-xilinx.c | 65 +- + drivers/gpu/drm/drm_atomic.c | 3 +- + drivers/hwtracing/intel_th/msu.c | 2 +- + drivers/pinctrl/pinctrl-utils.c | 2 +- + drivers/vhost/vringh.c | 3 +- + drivers/xen/unpopulated-alloc.c | 14 +- + fs/aio.c | 14 +- + fs/buffer.c | 58 +- + fs/iomap/buffered-io.c | 2 +- + fs/libfs.c | 4 +- + fs/nfs/callback_proc.c | 5 + + fs/ntfs/file.c | 5 +- + fs/ntfs/inode.c | 2 - + fs/ntfs/logfile.c | 3 +- + fs/ocfs2/cluster/tcp.c | 1 - + fs/ocfs2/namei.c | 21 +- + fs/ocfs2/super.c | 1 + + 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/cgroup-defs.h | 15 - + include/linux/compiler-clang.h | 6 - + include/linux/compiler-gcc.h | 19 - + include/linux/compiler.h | 18 +- + include/linux/dcache.h | 1 + + include/linux/gfp.h | 2 + + include/linux/huge_mm.h | 93 +-- + include/linux/iommu-helper.h | 4 +- + include/linux/kernel.h | 173 +---- + include/linux/kfence.h | 202 +++++ + include/linux/math.h | 177 +++++ + include/linux/memcontrol.h | 344 +++++---- + include/linux/memory_hotplug.h | 14 - + include/linux/memremap.h | 6 + + include/linux/mm.h | 74 +- + include/linux/mm_types.h | 13 +- + include/linux/mmdebug.h | 13 + + include/linux/mmzone.h | 48 +- + include/linux/nmi.h | 1 + + include/linux/numa.h | 30 +- + include/linux/page-flags.h | 17 +- + include/linux/page_ext.h | 8 + + include/linux/pagemap.h | 2 + + include/linux/pagevec.h | 3 - + include/linux/rcu_node_tree.h | 2 + + include/linux/rmap.h | 1 - + include/linux/sched.h | 8 + + include/linux/set_memory.h | 5 + + include/linux/slab.h | 18 + + 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 | 5 + + ipc/shm.c | 8 +- + kernel/acct.c | 7 +- + kernel/cgroup/cgroup.c | 12 - + kernel/crash_core.c | 1 + + kernel/fail_function.c | 6 +- + kernel/fork.c | 8 +- + kernel/gcov/gcc_4_7.c | 4 +- + kernel/hung_task.c | 44 ++ + kernel/kthread.c | 29 +- + kernel/panic.c | 3 +- + kernel/power/snapshot.c | 38 +- + kernel/ptrace.c | 2 +- + kernel/reboot.c | 236 +++++- + kernel/sysctl.c | 8 +- + kernel/watchdog.c | 25 +- + kernel/watchdog_hld.c | 1 + + lib/Kconfig | 9 + + lib/Kconfig.debug | 18 + + lib/Kconfig.kfence | 72 ++ + lib/Makefile | 7 +- + lib/{test_bits.c => bits_kunit.c} | 0 + lib/cmdline.c | 16 +- + lib/cmdline_kunit.c | 98 +++ + lib/cpumask.c | 66 +- + lib/errname.c | 1 + + lib/error-inject.c | 2 + + lib/errseq.c | 1 + + lib/find_bit.c | 17 +- + ...{test_linear_ranges.c => linear_ranges_kunit.c} | 0 + lib/{list-test.c => list_kunit.c} | 0 + 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 | 25 +- + mm/Makefile | 3 +- + mm/cma.c | 4 +- + mm/compaction.c | 19 +- + mm/debug.c | 4 +- + mm/filemap.c | 578 ++++++++------ + mm/gup.c | 131 ++-- + mm/{gup_benchmark.c => gup_test.c} | 111 ++- + mm/gup_test.h | 32 + + mm/huge_memory.c | 27 +- + mm/hugetlb.c | 95 +-- + mm/init-mm.c | 1 + + mm/internal.h | 2 + + mm/kasan/common.c | 19 + + mm/kasan/generic.c | 3 +- + mm/kfence/Makefile | 6 + + mm/kfence/core.c | 830 +++++++++++++++++++++ + mm/kfence/kfence.h | 107 +++ + mm/kfence/kfence_test.c | 823 ++++++++++++++++++++ + mm/kfence/report.c | 244 ++++++ + mm/khugepaged.c | 4 +- + mm/madvise.c | 7 +- + mm/memblock.c | 80 ++ + mm/memcontrol.c | 347 +++------ + mm/memory-failure.c | 108 ++- + mm/memory.c | 24 +- + mm/memory_hotplug.c | 50 +- + mm/memremap.c | 20 + + mm/migrate.c | 59 +- + 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 | 286 ++++--- + mm/page_ext.c | 10 +- + mm/page_io.c | 6 +- + mm/page_isolation.c | 10 +- + mm/process_vm_access.c | 2 +- + mm/rmap.c | 14 +- + mm/shmem.c | 31 +- + mm/slab.c | 42 +- + mm/slab.h | 56 +- + mm/slab_common.c | 15 +- + mm/slub.c | 71 +- + mm/swap.c | 12 +- + mm/swap_state.c | 4 +- + mm/swapfile.c | 14 +- + mm/vmalloc.c | 6 +- + mm/vmscan.c | 21 +- + mm/vmstat.c | 36 +- + mm/workingset.c | 2 +- + mm/zsmalloc.c | 11 +- + mm/zswap.c | 189 +++-- + scripts/checkpatch.pl | 279 +++++-- + sound/core/pcm_lib.c | 4 +- + 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 +- + virt/kvm/coalesced_mmio.c | 2 +- + virt/kvm/kvm_main.c | 2 +- + 271 files changed, 7483 insertions(+), 2670 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-reboot + 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 lib/{test_bits.c => bits_kunit.c} (100%) + create mode 100644 lib/cmdline_kunit.c + rename lib/{test_linear_ranges.c => linear_ranges_kunit.c} (100%) + rename lib/{list-test.c => list_kunit.c} (100%) + 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 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/96)
Rebasing (2/96)
Rebasing (3/96)
Rebasing (4/96)
Rebasing (5/96)
Rebasing (6/96)
Rebasing (7/96)
Rebasing (8/96)
Rebasing (9/96)
Rebasing (10/96)
Rebasing (11/96)
Rebasing (12/96)
Rebasing (13/96)
Rebasing (14/96)
Rebasing (15/96)
Rebasing (16/96)
Rebasing (17/96)
Rebasing (18/96)
Rebasing (19/96)
Rebasing (20/96)
Rebasing (21/96)
Rebasing (22/96)
Rebasing (23/96)
Rebasing (24/96)
Rebasing (25/96)
Rebasing (26/96)
Rebasing (27/96)
Rebasing (28/96)
Rebasing (29/96)
Rebasing (30/96)
Rebasing (31/96)
Rebasing (32/96)
Rebasing (33/96)
Rebasing (34/96)
Rebasing (35/96)
Rebasing (36/96)
Rebasing (37/96)
Rebasing (38/96)
Rebasing (39/96)
Rebasing (40/96)
Rebasing (41/96)
Rebasing (42/96)
Rebasing (43/96)
Rebasing (44/96)
Rebasing (45/96)
Rebasing (46/96)
Rebasing (47/96)
Rebasing (48/96)
Rebasing (49/96)
Rebasing (50/96)
Rebasing (51/96)
Rebasing (52/96)
Rebasing (53/96)
Rebasing (54/96)
Rebasing (55/96)
Rebasing (56/96)
Rebasing (57/96)
Rebasing (58/96)
Rebasing (59/96)
Rebasing (60/96)
Rebasing (61/96)
Rebasing (62/96)
Rebasing (63/96)
Rebasing (64/96)
Rebasing (65/96)
Rebasing (66/96)
Rebasing (67/96)
Rebasing (68/96)
Rebasing (69/96)
Rebasing (70/96)
Rebasing (71/96)
Rebasing (72/96)
Rebasing (73/96)
Rebasing (74/96)
Rebasing (75/96)
Rebasing (76/96)
Rebasing (77/96)
Rebasing (78/96)
Rebasing (79/96)
Rebasing (80/96)
Rebasing (81/96)
Rebasing (82/96)
Rebasing (83/96)
Rebasing (84/96)
Rebasing (85/96)
Rebasing (86/96)
Rebasing (87/96)
Rebasing (88/96)
Rebasing (89/96)
Rebasing (90/96)
Rebasing (91/96)
Rebasing (92/96)
Rebasing (93/96)
Rebasing (94/96)
Rebasing (95/96)
Rebasing (96/96)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + b20578d545c1...0678bf154d02 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (0678bf154d02 mm/gup: assert that the mmap lock is held in __get_user_pages()) +$ git merge --no-ff akpm/master +Removing mm/kasan/generic_report.c +Merge made by the 'recursive' strategy. + Documentation/dev-tools/kasan.rst | 261 ++++--- + arch/Kconfig | 15 +- + arch/arm/boot/compressed/string.c | 6 +- + arch/arm64/Kconfig | 9 +- + arch/arm64/Makefile | 7 +- + arch/arm64/include/asm/assembler.h | 2 +- + arch/arm64/include/asm/cache.h | 3 + + arch/arm64/include/asm/cacheflush.h | 4 +- + arch/arm64/include/asm/esr.h | 1 + + arch/arm64/include/asm/kasan.h | 5 +- + arch/arm64/include/asm/memory.h | 15 +- + arch/arm64/include/asm/mte-def.h | 14 + + arch/arm64/include/asm/mte-kasan.h | 67 ++ + arch/arm64/include/asm/mte.h | 22 +- + arch/arm64/include/asm/processor.h | 2 +- + arch/arm64/include/asm/string.h | 5 +- + arch/arm64/include/asm/uaccess.h | 23 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/arm64/include/uapi/asm/unistd.h | 1 + + arch/arm64/kernel/asm-offsets.c | 3 + + arch/arm64/kernel/cpufeature.c | 3 + + arch/arm64/kernel/entry.S | 41 + + arch/arm64/kernel/head.S | 2 +- + arch/arm64/kernel/hibernate.c | 5 + + arch/arm64/kernel/image-vars.h | 2 +- + arch/arm64/kernel/kaslr.c | 3 +- + arch/arm64/kernel/module.c | 6 +- + arch/arm64/kernel/mte.c | 118 ++- + arch/arm64/kernel/setup.c | 2 +- + arch/arm64/kernel/sleep.S | 2 +- + arch/arm64/kernel/smp.c | 2 + + arch/arm64/lib/mte.S | 16 + + arch/arm64/mm/copypage.c | 1 + + arch/arm64/mm/fault.c | 59 ++ + arch/arm64/mm/kasan_init.c | 19 +- + arch/arm64/mm/mteswap.c | 9 + + arch/arm64/mm/pageattr.c | 10 +- + arch/arm64/mm/proc.S | 23 +- + arch/arm64/mm/ptdump.c | 6 +- + arch/riscv/include/asm/set_memory.h | 4 +- + arch/riscv/include/asm/unistd.h | 1 + + arch/riscv/mm/pageattr.c | 8 +- + arch/s390/boot/string.c | 1 + + arch/s390/include/asm/kasan.h | 2 + + arch/s390/pci/pci_mmio.c | 4 +- + arch/x86/Kconfig | 1 + + arch/x86/boot/compressed/misc.h | 1 + + arch/x86/boot/compressed/string.c | 6 +- + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/include/asm/set_memory.h | 4 +- + arch/x86/include/asm/syscall_wrapper.h | 2 +- + arch/x86/kernel/acpi/wakeup_64.S | 2 +- + arch/x86/mm/pat/set_memory.c | 8 +- + drivers/firmware/efi/runtime-wrappers.c | 2 +- + fs/dax.c | 20 +- + fs/eventpoll.c | 159 ++-- + fs/exec.c | 8 + + include/linux/compiler-clang.h | 2 + + include/linux/compiler_attributes.h | 2 +- + include/linux/kasan-checks.h | 2 +- + include/linux/kasan.h | 364 ++++++--- + include/linux/mm.h | 30 +- + include/linux/mm_types.h | 10 + + include/linux/mmap_lock.h | 16 +- + include/linux/moduleloader.h | 3 +- + include/linux/page-flags-layout.h | 2 +- + include/linux/pgtable.h | 3 + + include/linux/sched.h | 2 +- + include/linux/secretmem.h | 30 + + include/linux/set_memory.h | 4 +- + include/linux/string.h | 2 +- + include/linux/syscalls.h | 1 + + include/uapi/asm-generic/unistd.h | 6 +- + include/uapi/linux/magic.h | 1 + + include/uapi/linux/secretmem.h | 8 + + init/init_task.c | 2 +- + kernel/fork.c | 4 +- + kernel/kcsan/core.c | 10 +- + kernel/power/hibernate.c | 5 +- + kernel/power/snapshot.c | 4 +- + kernel/sys_ni.c | 2 + + lib/Kconfig.kasan | 62 +- + lib/crc32.c | 4 +- + lib/crypto/aes.c | 4 +- + lib/test_kasan.c | 2 +- + lib/test_kasan_module.c | 2 +- + mm/Kconfig | 5 + + mm/Makefile | 1 + + mm/filemap.c | 2 +- + mm/gup.c | 12 + + mm/internal.h | 3 + + mm/kasan/Makefile | 25 +- + mm/kasan/common.c | 826 +++++---------------- + mm/kasan/generic.c | 75 +- + mm/kasan/generic_report.c | 165 ---- + mm/kasan/hw_tags.c | 205 +++++ + mm/kasan/init.c | 17 +- + mm/kasan/kasan.h | 173 ++++- + mm/kasan/quarantine.c | 23 +- + mm/kasan/report.c | 320 +++----- + mm/kasan/report_generic.c | 327 ++++++++ + mm/kasan/report_hw_tags.c | 42 ++ + mm/kasan/{tags_report.c => report_sw_tags.c} | 27 +- + mm/kasan/shadow.c | 517 +++++++++++++ + mm/kasan/{tags.c => sw_tags.c} | 39 +- + mm/memory.c | 36 +- + mm/mempool.c | 2 +- + mm/mmap.c | 5 +- + mm/page_alloc.c | 9 +- + mm/page_poison.c | 2 +- + mm/ptdump.c | 13 +- + mm/secretmem.c | 451 +++++++++++ + mm/slab_common.c | 13 +- + mm/slub.c | 29 +- + mm/vmalloc.c | 5 +- + scripts/Makefile.lib | 2 + + scripts/checksyscalls.sh | 4 + + tools/testing/selftests/arm64/mte/Makefile | 2 +- + .../selftests/arm64/mte/check_gcr_el1_cswitch.c | 152 ++++ + tools/testing/selftests/vm/.gitignore | 1 + + tools/testing/selftests/vm/Makefile | 3 +- + tools/testing/selftests/vm/memfd_secret.c | 298 ++++++++ + tools/testing/selftests/vm/run_vmtests | 17 + + 125 files changed, 3819 insertions(+), 1651 deletions(-) + create mode 100644 arch/arm64/include/asm/mte-def.h + create mode 100644 arch/arm64/include/asm/mte-kasan.h + create mode 100644 include/linux/secretmem.h + create mode 100644 include/uapi/linux/secretmem.h + delete mode 100644 mm/kasan/generic_report.c + create mode 100644 mm/kasan/hw_tags.c + create mode 100644 mm/kasan/report_generic.c + create mode 100644 mm/kasan/report_hw_tags.c + rename mm/kasan/{tags_report.c => report_sw_tags.c} (78%) + create mode 100644 mm/kasan/shadow.c + rename mm/kasan/{tags.c => sw_tags.c} (88%) + create mode 100644 mm/secretmem.c + create mode 100644 tools/testing/selftests/arm64/mte/check_gcr_el1_cswitch.c + create mode 100644 tools/testing/selftests/vm/memfd_secret.c +$ git am -3 ../patches/0001-secretmem-add-memcg-accounting-fix2.patch +Applying: secretmem-add-memcg-accounting-fix2 diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..a289195fbc2e --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20201113 |