diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-12-18 16:31:10 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-12-18 16:31:10 +1100 |
| commit | 0d52778b8710eb11cb616761a02aee0a7fd60425 (patch) | |
| tree | 1373db30f94d6e31ab659070fb1f008e5ec18a35 | |
| parent | cf0b0ebcd9f997695737fa4433758e04e8f7665a (diff) | |
Add linux-next specific files for 20201218next-20201218
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 | 5827 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 6486 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..c06fc4bc60d5 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,328 @@ +Name SHA1 +---- ---- +origin 6daa90439e91bb9a71864b02f7d0af8587ea889a +fixes 9223e74f9960778bd3edd39e15edd5532708b7fb +kbuild-current 7d32358be8acb119dcfe39b6cf67ec6d94bf1fe7 +arc-current 3a71e423133a4b1166ffafcb4a7cfa87ddecb910 +arm-current e64ab473dddaffdfc4bd0b385204f472f2cb00d6 +arm64-fixes 9fd339a45be5c06e239d45a042eab9d25de87882 +arm-soc-fixes 43ffe817bfe3871ffbaa1e98952a2a01b140e71e +drivers-memory-fixes 3650b228f83adda7e5ee532e2b90429c03f7b9ec +m68k-current 2ae92e8b9b7eb042ccb7e9fc7ea9431f211a1bd3 +powerpc-fixes 5eedf9fe8db23313df104576845cec5f481b9b60 +s390-fixes 586592478b1fa8bb8cd6875a9191468e9b1a8b13 +sparc 0a95a6d1a4cd6e10e70f8a6c93dc2ecd02e7d6ab +fscrypt-current d19d8d345eecd9247cbe6cbf27aef271bd88aba7 +net 44d4775ca51805b376a8db5b34f650434a08e556 +bpf 1a3449c19407a28f7019a887cdf0d6ba2444751a +ipsec 7f376f1917d7461e05b648983e8d2aea9d0712b2 +netfilter 3db1a3fa98808aa90f95ec3e0fa2fc7abf28f5c9 +ipvs 3db1a3fa98808aa90f95ec3e0fa2fc7abf28f5c9 +wireless-drivers 4dfde294b9792dcf8615b55c58f093d544f472f0 +mac80211 2c85ebc57b3e1817b6ce1a6b703928e113a90442 +rdma-fixes 340b940ea0ed12d9adbb8f72dea17d516b2019e8 +sound-current 725124d10d00b2f56bb5bd08b431cc74ab3b3ace +sound-asoc-fixes 20b7445d8aa13e233a738d43c6f84b461e5cf591 +regmap-fixes e6e9354b58307c120afbdc2719a6093638c37446 +regulator-fixes 87a96de608de4fa642ce3d82aa404f77a6ff5701 +spi-fixes 58f7553fa424fd0fd74e8b796d50c66014cebebe +pci-current f8394f232b1eab649ce2df5c5f15b0e528c92091 +driver-core.current accefff5b547a9a1d959c7e76ad539bf2480e78b +tty.current 5e60366d56c630e32befce7ef05c569e04391ca3 +usb.current 5e60366d56c630e32befce7ef05c569e04391ca3 +usb-gadget-fixes 129aa9734559a17990ee933351c7b6956f1dba62 +usb-serial-fixes 0477e92881850d44910a7e94fc2c46f96faa131f +usb-chipidea-fixes e6c11a2dcaec6dfaf99c9c02500abf80c4bdba1f +phy fb89b2544b645527b3a359176999a416e65f5ada +staging.current 5e60366d56c630e32befce7ef05c569e04391ca3 +char-misc.current accefff5b547a9a1d959c7e76ad539bf2480e78b +soundwire-fixes 3650b228f83adda7e5ee532e2b90429c03f7b9ec +thunderbolt-fixes 2c85ebc57b3e1817b6ce1a6b703928e113a90442 +input-current 4b4193256c8d3bc3a5397b5cd9494c2ad386317d +crypto-current 93cebeb1c21a65b92636aaa278a32fbc0415ec67 +ide 6800cd8cbc6e35989f8d1aa20fac58031231b90f +vfio-fixes e4eccb853664de7bcf9518fb658f35e748bf1f68 +kselftest-fixes 5f24433c4a68ca5f9aa0b8567b9f56315d316369 +modules-fixes 57baec7b1b0459ef885e816d8c28a9d9a62bb8de +dmaengine-fixes 418baf2c28f3473039f2f7377760bd8f6897ae18 +backlight-fixes bbf5c979011a099af5dc76498918ed7df445635b +mtd-fixes 33d974e76e21e9da8a36b14d2dce6394c36c3e30 +mfd-fixes bbf5c979011a099af5dc76498918ed7df445635b +v4l-dvb-fixes 3d1387b3b8f6cc1ccdbb5f0d7af24df02f4baef9 +reset-fixes b460e0a9e2404450a0cc4c5e6476483d6cda1b26 +mips-fixes ac3b57adf87ad9bac7e33ca26bbbb13fae1ed62b +at91-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +omap-fixes c0bc969c176b10598b31d5d1a5edf9a5261f0a9f +kvm-fixes 111d0bda8eeb4b54e0c63897b071effbf9fd9251 +kvms390-fixes 735931f9a51ab09cf795721b37696b420484625f +hwmon-fixes 5a531c7907ab854b3b524e57cc5d1463bed38b45 +nvdimm-fixes 88b67edd7247466bc47f01e1dc539b0d0d4b931e +btrfs-fixes 462b8e885b92459dcca35f5df9266190b89c7da1 +vfs-fixes 6220e48d9640538ff700f2e7d24c2f9277555fd6 +dma-mapping-fixes 892fc9f6835ecf075efac20789b012c5c9997fcc +i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +drivers-x86-fixes c9aa128080cbce92f8715a9328f88d8ca3134279 +samsung-krzk-fixes cd12e4f14f7cca7d04fbcf0da2dc116070d7f26f +pinctrl-samsung-fixes 3650b228f83adda7e5ee532e2b90429c03f7b9ec +devicetree-fixes bdac39a3bd28891fb0ded91c9152459c57773462 +scsi-fixes 4da3a54f5a025846f9930354cfb80f075b9952e0 +drm-fixes 2c85ebc57b3e1817b6ce1a6b703928e113a90442 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 7c5c15dffe1e3c42f44735ce9552afb7207f1584 +mmc-fixes c0d638a03bc5dfdb08fb95d0a79ecada25f40da8 +rtc-fixes 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +gnss-fixes 48778464bb7d346b47157d21ffde2af6b2d39110 +hyperv-fixes 5f1251a48c17b54939d7477305e39679a565382c +soc-fsl-fixes 2663b3388551230cbc4606a40fabf3331ceb59e4 +risc-v-fixes ccbbfd1cbf365b38d014351d1482fedd26282041 +pidfd-fixes aabe19b8279340c43294688b4d9527a893c60463 +fpga-fixes 8614afd689df59d9ce019439389be20bd788a897 +spdx 5e60366d56c630e32befce7ef05c569e04391ca3 +gpio-intel-fixes 3650b228f83adda7e5ee532e2b90429c03f7b9ec +pinctrl-intel-fixes 5f714771d01e0e0d410f06d4d192fb27b1ca0edd +erofs-fixes a30573b3cdc77b8533d004ece1ea7c0146b437a0 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 3084db0e0d5076cd48408274ab0911cd3ccdae88 +ubifs-fixes 78c7d49f55d8631b67c09f9bfbe8155211a9ea06 +memblock-fixes b9bc36704cca500e2b41be4c5bf615c1d7ddc3ce +drm-misc-fixes fd4e788e971ce763e50762d7b1a0048992949dd0 +kspp-gustavo 36f9ff9e03de89691274a6aec45aa079bd3ae405 +kbuild 6c02f6f4124b45faa4c07e2b1c7bd96823289831 +compiler-attributes 1967939462641d8b36bcb3fcf06d48e66cd67a4f +dma-mapping f726c72d6c059c1a6db425108cd6c220fb95cbf4 +asm-generic 8eb42bcea5aeb292101a9e4fd4becdc9f4728bb1 +arc def9d2780727cec3313ed3522d0123158d87224d +arm 54ef31c76628b4d1570870ef807bc7432bf06c03 +arm64 95d1718c961e49cfa02995ce1587a22cd7e2fbf5 +arm-perf 881b0520504a2e028a28ddacc05c26e46f21d483 +arm-soc 95c708fe26d2a0d8b33e1ef0e28dd81563209400 +amlogic 517c49f849d72d1dde30c725f50c2e15b4f9553e +aspeed 41707a524026f9575d6f3a1162cc138f26fa5ca6 +at91 e77be1651978417a548b8f10475bae4b9262d8c3 +drivers-memory 1133e15678afd27a9abcdc1bcf85a690e4c948fd +imx-mxs 09690c0e0d1c94614178f298ac91334e803bcaf7 +keystone b2a8f6ce4bdcc33b8286a2a85b07edbdc778393b +mediatek 727bfb2c55b0838d09e9578abd9feca1d31438b4 +mvebu dc14300bb67b23d4debe159db0df637993f195e0 +omap 792952314166a6b030c360250337f793e50e7b37 +qcom d7288346e0a40053d8b2d300f477e55a874e4355 +raspberrypi 278407a53c3b33fb820332c4d39eb39316c3879a +realtek 486f29df69413411a205d3101bae0427a892bee4 +renesas c51a6c86347a721c328a37adf4c3f8892aa10330 +reset 69e392526dc2b94089c28fe159172669f741b19c +rockchip e15c5c9836dc3d5e78da744a3765d9437fc69694 +samsung-krzk 72f4b57a4d4bd8f1c067af3652fd061ee32fbe1e +scmi 0477e92881850d44910a7e94fc2c46f96faa131f +stm32 814fddb955f8b655057ba70cf676b1db66281c76 +sunxi 9e3b3fad35794ad087eb77eb9ba1b3e982be4d77 +tegra b11a0dfbd31639724176a1820e34bd6d8c168022 +ti-k3 1e3d655fe7b48c2341d63f981774742e21744f53 +ti-k3-new de7caab0974f3fd3e8ae3f355854dd993b84494a +clk 83f01c0a3f871ebdf5b2ae7e79c625f6e9cdac40 +clk-samsung 44a9e78f9242872c889f176782777fa2ed535650 +csky ba3b26607f55dce39fedd99e6823ef78101fc4a2 +h8300 8808515be0ed4e33de9bfdc65f4c1b547ee11065 +ia64 c331649e637152788b0ca1c857d0c2eaf34fcbc3 +m68k 2ae92e8b9b7eb042ccb7e9fc7ea9431f211a1bd3 +m68knommu 8b22820efb35f93d98638563b0a8f4094e8ee399 +microblaze 05cdf457477d6603b207d91873f0a3d4c7f8c1cd +mips ad4fddef5f2345aa9214e979febe2f47639c10d9 +nds32 54bde873682b467f781f352effdb52d24e0a0c30 +nios2 6b57fa4d374bb8c005dee396c56598c14b9c01a6 +openrisc d8398bf840f8964220508aff7901c924e322f5e8 +parisc-hd 2c85ebc57b3e1817b6ce1a6b703928e113a90442 +powerpc c1bea0a840ac75dca19bc6aa05575a33eb9fd058 +fsl a76bea0287ce13d28494b19649d80d8ee5e7b757 +soc-fsl e95f287deed2454b8cad5b27859271db30130b2b +risc-v 7d95a88f9254b711a3a95106fc73f6a3a9866a40 +s390 93f57c5f66e642c465e659e3ae0b8840e7068995 +sh b0cfc315ff38c423a5ce9ce159bd5baa4135e688 +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml 1fb1abc83636f5329c26cd29f0f19f3faeb697a5 +xtensa 7b79eba1d0d186de94ba661c499326e1b6071be5 +fscrypt a14d0b6764917b21ee6fdfd2a8a4c2920fbefcce +afs 8409f67b6437c4b327ee95a71081b9c7bfee0b00 +btrfs 97847e06525b51ea44ddfc850f9aec422bfcc845 +ceph 2f0df6cfa325d7106b8a65bc0e02db1086e3f73b +cifs afee4410bc6c50e1422c5a45d633ad0e478ea960 +configfs 65cdb4a214c0015c19fc1876896746c05396f45d +ecryptfs 8b614cb8f1dcac8ca77cf4dd85f46ef3055f8238 +erofs d8b3df8b1048405e73558b88cba2adf29490d468 +exfat bad62714b7e09026aae2d589ed744e1e15a41902 +ext3 bdcfc08b8b5bd2eecfc9b878094d9a1e8cd9070f +ext4 739c541bd3ea1f5943284542abb855116632a84b +f2fs 75e91c888989cf2df5c78b251b07de1f5052e30e +fsverity bde493349025ca0559e2fff88592935af3b8df19 +fuse 5d069dbe8aaf2a197142558b6fb2978189ba3454 +jfs c61b3e4839007668360ed8b87d7da96d2e59fc6c +nfs 52104f274e2d7f134d34bab11cada8913d4544e2 +nfs-anna 11392155f2bd3d54a8ed5a4fcf8b81ee21435f7f +nfsd c3213d260a23e263ef85ba21ac68c9e7578020b5 +cel 6d589dcf10f53301db8d72c652e00e561e100428 +orangefs c1048828c3dbd96c7e371fae658e5f40e6a45e99 +overlayfs 459c7c565ac36ba09ffbf24231147f408fde4203 +ubifs b80a974b8c58164ed57b0f025a47b8f003198d9e +v9fs 324a158fe535839227395aa3a919027f3b01e7a2 +xfs e82226138b20d4f638426413e83c6b5db532c6a2 +zonefs 6bea0225a4bf14a58af71cb9677a756921469e46 +iomap 1a31182edd0083bb9f26e582ed39f92f898c4d0a +djw-vfs 9b8523423b23ee3dfd88e32f5b7207be56a4e782 +file-locks 8d1ddb5e79374fb277985a6b3faa2ed8631c5b4c +vfs 61c207915a76a32e7ca40dd47e3af4acec896c0d +printk 2e9dda43cb06a5f1f5ebbbef0845a167a1cecf9d +pci 255b2d524884e4ec60333131aa0ca0ef19826dc2 +pstore 26fecbf7602dd69b649914e61526bd67c557fece +hid cdaa1e42b4832bcc7e94994285e3c9be3f56beca +i2c d6da298d1b8b900e7cda5d53e29049154cfbd09f +i3c 95393f3e07ab53855b91881692a4a5b52dcdc03c +dmi 3cb4d29a2633170208c96240c7e85148679ceee3 +hwmon-staging 1a033769a4fe9a86ee791fd553b6a996dd76e026 +jc_docs 47e44ed01434e51e2e42b188482d837c01e5d16e +v4l-dvb fab0fca1da5cdc48be051715cd9787df04fdce3a +v4l-dvb-next d0a9fffedca102633c168adaf157f34288a4ea67 +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm cd83902d91a20987ed73e025f789cfd3f862defe +cpufreq-arm c8bb4520543823a9b3da3861304273dc7232e2c7 +cpupower 748f0d70087c56226bf1df1f91a00b7ab4c8f883 +devfreq 6a575e84f11e15078629f0d16bff2bc354a6bfc0 +opp 2c07b0fd9bf6dfb0bdf05aac018e6b3242d60822 +thermal 67698880ac9d56367ebf22f8336ccab6234f9feb +thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 67f8e65e4fc19e24993e8780f41279eeffbd0610 +dlm 4f19d071f9bee1bb2040ae73436314a5ec9ede44 +swiotlb e998879d4fb7991856916972168cf27c0d86ed12 +rdma e246b7c035d74abfb3507fa10082d0c42cc016c3 +net-next 3db1a3fa98808aa90f95ec3e0fa2fc7abf28f5c9 +bpf-next 3db1a3fa98808aa90f95ec3e0fa2fc7abf28f5c9 +ipsec-next c7a5899eb26e2a4d516d53f65b6dd67be2228041 +mlx5-next 04b222f9577396a8d19bf2937d2a218dc2a3c7ac +netfilter-next efd5a1584537698220578227e6467638307c2a0b +ipvs-next efd5a1584537698220578227e6467638307c2a0b +wireless-drivers-next 13458ffe0a953e17587f172a8e5059c243e6850a +bluetooth 3db1a3fa98808aa90f95ec3e0fa2fc7abf28f5c9 +mac80211-next 13458ffe0a953e17587f172a8e5059c243e6850a +gfs2 6e5c4ea37a99e5b97aba227fc43f3682d4bc0496 +mtd 4c9e94dff65ca75b917ff0b5de2e44881062a8e8 +nand ee4e0eafa43cfd9008722fe15e17b8bf62fb6e8d +spi-nor 31ad3eff093cf21872f385021242c00c7a2abf6b +crypto 93cebeb1c21a65b92636aaa278a32fbc0415ec67 +drm efd3043790c6e92f0bbe1fe385db9b544131c59c +amdgpu 424ff165721e9eb05695cc5c91db0f185c5fa653 +drm-intel 4294fa5f50328eba73a48baf2b4b053e204c68ec +drm-tegra bf3a3cdcad40e5928a22ea0fd200d17fd6d6308d +drm-misc 8075c3005e4b1efa12dbbf6e84bc412a713de92c +drm-msm 57f04815fd95bb8c46f6ec5c9d25430bb52d419f +imx-drm b658e2a1443cda92b851e57c5faf786ae12dee5a +etnaviv 4612bad5701e158f3c40951f2c7aa8e64b3445eb +regmap 4616c509d187d2afda4a8f1121c2a3ef16bbcefe +sound 725124d10d00b2f56bb5bd08b431cc74ab3b3ace +sound-asoc 20b7445d8aa13e233a738d43c6f84b461e5cf591 +modules 38dc717e97153e46375ee21797aa54777e5498f3 +input fafd320ae51b9c72d371585b2501f86640ea7b7d +block 86248e8f6fd62f795c6d789467dc3127c26134a6 +device-mapper a2b8b2d975673b1a50ab0bcce5d146b9335edfad +pcmcia 70d3a462fc244b0580268cc8e6c47ae4463db68a +mmc 72b248cfbf3fd308807afe7cc30d05fefeff7fb1 +mfd 0cd3aa995740eabf8af1c794ac1d9ae314c928c3 +backlight 789eb04b6c569e3e5007afd040bef5d7216d2f3a +battery c2362519a04a7307e386e43bc567780d0d7631c7 +regulator 87a96de608de4fa642ce3d82aa404f77a6ff5701 +security 9dcd47fc1f7dd8bed24d83802f91e02ec55f0c23 +apparmor e37986097ba63c94b1af9d5ad5486d120a809f72 +integrity 207cdd565dfc95a0a5185263a567817b7ebf5467 +keys 6b8945603d05364bca1c8fa6ab86fe105e5c46f4 +safesetid 03ca0ec138927b16fab0dad7b869f42eb2849c94 +selinux 3df98d79215ace13d1e91ddfc5a67a0f5acbd83f +smack 9b0072e2b2b588ad75c94f2c6e6c52c8f4bd2657 +tomoyo ff6135959a9150ad45cb92ca38da270903a74343 +tpmdd 148842c98a24e508aecb929718818fbf4c2a6ff3 +watchdog 0b9491b621196a5d7f163dde81d98e0687bdba97 +iommu 4dd6ce478003525df8618750d30f0b90380047a7 +audit 6b3211842a115d697fbf78d09f3e83852200e413 +devicetree e33dc2f3636749c2f949a59c2ff8acd4a69c9c78 +mailbox 5a6338cce9f4133c478d3b10b300f96dd644379a +spi 3e98a021cc85e7d52acdd1eae8a988e975ec5bf9 +tip d1c29f5debd4633eb0e9ea1bc00aaad48b077a9b +clockevents 8ae954caf49ac403c177d117fb8e05cbc866aa3c +edac f4161dcc4e2cb700209e81eed09927bcbbfe0465 +irqchip 2f5fbc4305d07725bfebaedb09e57271315691ef +ftrace f6a694665f132cbf6e2222dd2f173dc35330a8aa +rcu ae5633d5117d6ddae554584ec47dd008e9b68667 +kvm d45f89f7437d0f2c8275b4434096164db106384d +kvm-arm 3a514592b698588326924625b6948a10c35fadd5 +kvm-ppc dc924b062488a0376aae41d3e0a27dc99f852a5e +kvms390 50a05be484cb70d9dfb55fa5a6ed57eab193901f +xen-tip 5e65f524ed25a124e68bab511a3372821c7dd966 +percpu eb4c8d15efdaf1661759d8da2c7bfffe5d881343 +workqueues ac87f8ff6cf1bd974de00a27699791bbc2a4a925 +drivers-x86 0cd3f561efa9adce840140720e0581355db3e554 +chrome-platform 6ae9b5ffcaeba64c290dfb8bd7b0194b1fdf0c92 +hsi 8a77ed6d1fdda752f6b3203391a099f590a9454f +leds 232aa16455db7fc1edb61878853d620067a30fe5 +ipmi fad0319cacdf02a8d4d31aa1d8dc18c5bd5e397e +driver-core accefff5b547a9a1d959c7e76ad539bf2480e78b +usb 5e60366d56c630e32befce7ef05c569e04391ca3 +usb-gadget b2c586eb07efab982419f32b7c3bd96829bc8bcd +usb-serial fddd408ad448efc49c67f8dfdc4e86b31c683a0c +usb-chipidea-next fe3defba436f8915baeaab6d562378ded7984ef8 +phy-next b097efba9580d1f7cbc80cda84e768983e3de541 +tty 5e60366d56c630e32befce7ef05c569e04391ca3 +char-misc accefff5b547a9a1d959c7e76ad539bf2480e78b +extcon e1efdb604f5c9903a5d92ef42244009d3c04880f +soundwire 17e0da0b8979a53977f684813f5c9db817d170e2 +thunderbolt db0746e3399ee87ee5f957880811da16faa89fb8 +vfio bdfae1c9a913930eae5ea506733aa7c285e12a06 +staging 5e60366d56c630e32befce7ef05c569e04391ca3 +mux 05f19f7f8944b6a269b2ac152bceaa322138be6b +icc abb888d86f62e78c66f1ff09db70ce7026ab1e04 +dmaengine 115ff12aecfd55376d704fa2c0a2d117e5827f9f +cgroup 2d18e54dd8662442ef5898c6bdadeaf90b3cebbc +scsi aa86f5b4a90be0c96eb68f3f4da2ac972f7131b9 +scsi-mkp cb5253198f10a4cd79b7523c581e6173c7d49ddb +vhost 5e6a378bf7eb723ecf3cf2d1733dfbc1c9a6b048 +rpmsg 4c0943255805ef68a2f2be8c615aa852c3d2bfde +gpio 7ac554888233468a9fd7c4f28721396952dd9959 +gpio-brgl b5252196d08abd82f3b21532354f71a40dd2801d +gpio-intel e709a7b5a066362b697d65dda90edc71f913df70 +pinctrl 3df09cb8c92e2bdfb78c81f678f6990bd780f09a +pinctrl-intel 0b74e40a4e41f3cbad76dff4c50850d47b525b26 +pinctrl-samsung c5564a50d99019f3c713fa306d5feecc3e909b10 +pwm 6eefb79d6f5bc4086bd02c76f1072dd4a8d9d9f6 +userns 498a1acd9ccf7c3c9beecd06b7354183f5e10531 +ktest 271e0c9dce1b02a825b3cc1a7aa1fab7c381d44b +random ab9a7e27044b87ff2be47b8f8e095400e7fccc44 +kselftest 63df571c37d9c047c78126a5815cbad8b8954199 +y2038 c4e71212a245017d2ab05f322f7722f0b87a55da +livepatching 59fc1e476962eff9ef259355a9daf912b563aac0 +coresight 1efbcec2ef8c037f1e801c76e4b9434ee2400be7 +rtc f70cc33029fca3cf62bffb15102ea42eb4d097ac +nvdimm a1b8638ba1320e6684aa98233c15255eb803fac7 +at24 3650b228f83adda7e5ee532e2b90429c03f7b9ec +ntb 75b6f6487cedd0e4c8e07d68b68b8f85cd352bfe +seccomp 2c07343abd8932200a45ff7b10950e71081e9e77 +kspp 09162bc32c880a791c6c0668ce0745cf7958f576 +gnss 48778464bb7d346b47157d21ffde2af6b2d39110 +fsi 4a851d714eadeabd65c7e321a2e7830f77d945c4 +slimbus 6790dc4a58f30bdba2f2d3bbc0a92e27df8cdd31 +nvmem 292b72c982a628bbaa2c9f11adf0aeb41980f9b0 +xarray 80c1dbebf308a41badb8f1628247fe94dda99bfe +hyperv d1df458cbfdb0c3384c03c7fbcb1689bc02a746c +auxdisplay 351dcacc6d774258be9fec6f51c14f8ff38243f6 +kgdb d081a6e353168f15e63eb9e9334757f20343319f +pidfd 7abe0224623f35529f8017da896e8234650b29ca +hmm 3650b228f83adda7e5ee532e2b90429c03f7b9ec +fpga aaf8fe39c9521bfb42a6bd7da419186627c32e17 +kunit 3650b228f83adda7e5ee532e2b90429c03f7b9ec +generic-ioremap 4bdc0d676a643140bdf17dbf7eafedee3d496a3c +cfi 5de15b610f785f0e188fefb707f0b19de156968a +kunit-next 5f6b99d0287de2c2d0b5e7abcb0092d553ad804a +trivial 9ff9b0d392ea08090cd1780fb196f36dbb586529 +zx2c4 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e +mhi 4ea6fa2cb921cb17812501a27c3761037d64a217 +notifications 841a0dfa511364fa9a8d67512e0643669f1f03e3 +memblock 5bdba520c1b318578caffd325515b35d187f8a0e +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters 3650b228f83adda7e5ee532e2b90429c03f7b9ec +akpm-current 9254986bd749b045c3acb9dff58b602608904bac +akpm 1c5b0b60b03f67ab0495e013b64bde6a24b6b1db diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..307f42b420a1 --- /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.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#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..202bde49ddc1 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,5827 @@ +$ date -R +Fri, 18 Dec 2020 08:04:29 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 69f637c33560 Merge tag 'for-5.11/drivers-2020-12-14' of git://git.kernel.dk/linux-block +Merging origin/master (6daa90439e91 Merge tag 'dmaengine-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine) +$ git merge origin/master +Updating 69f637c33560..6daa90439e91 +Fast-forward + .mailmap | 1 + + Documentation/ABI/stable/sysfs-driver-dma-idxd | 21 + + Documentation/ABI/testing/sysfs-class-fc_host | 23 + + .../ABI/testing/sysfs-class-fc_remote_ports | 23 + + Documentation/ABI/testing/sysfs-fs-f2fs | 7 + + .../ABI/testing/sysfs-kernel-iommu_groups | 30 + + Documentation/admin-guide/kernel-parameters.txt | 7 +- + 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 +- + Documentation/devicetree/bindings/Makefile | 10 +- + .../devicetree/bindings/arm/bcm/brcm,bcm4908.yaml | 38 + + .../devicetree/bindings/arm/freescale/fsl,scu.txt | 12 +- + Documentation/devicetree/bindings/arm/fsl.yaml | 360 +- + .../devicetree/bindings/arm/mediatek.yaml | 4 + + .../devicetree/bindings/arm/msm/qcom,llcc.yaml | 1 + + .../bindings/arm/mstar/mstar,smpctrl.yaml | 40 + + .../devicetree/bindings/arm/mstar/mstar.yaml | 6 + + .../devicetree/bindings/arm/picoxcell.txt | 24 - + Documentation/devicetree/bindings/arm/renesas.yaml | 1 + + .../devicetree/bindings/arm/rockchip.yaml | 23 + + .../bindings/arm/samsung/samsung-boards.yaml | 21 + + .../bindings/arm/stm32/st,stm32-syscon.yaml | 4 + + .../devicetree/bindings/arm/stm32/stm32.yaml | 23 +- + Documentation/devicetree/bindings/arm/sunxi.yaml | 23 + + Documentation/devicetree/bindings/arm/tegra.yaml | 3 + + .../bindings/arm/tegra/nvidia,tegra30-actmon.txt | 25 + + Documentation/devicetree/bindings/arm/vt8500.yaml | 3 +- + .../bindings/bus/nvidia,tegra210-aconnect.txt | 44 - + .../bindings/bus/nvidia,tegra210-aconnect.yaml | 82 + + .../devicetree/bindings/clock/imx8qxp-lpcg.yaml | 79 +- + .../bindings/connector/usb-connector.yaml | 24 + + .../devicetree/bindings/crypto/picochip-spacc.txt | 21 - + .../bindings/display/imx/fsl-imx-drm.txt | 2 +- + .../display/tegra/nvidia,tegra20-host1x.txt | 68 + + .../bindings/dma/allwinner,sun50i-a64-dma.yaml | 5 +- + .../devicetree/bindings/dma/atmel-xdma.txt | 3 +- + .../devicetree/bindings/dma/mtk-uart-apdma.txt | 1 + + .../bindings/dma/nvidia,tegra210-adma.txt | 56 - + .../bindings/dma/nvidia,tegra210-adma.yaml | 99 + + .../devicetree/bindings/dma/qcom,gpi.yaml | 88 + + .../devicetree/bindings/dma/ti/k3-bcdma.yaml | 164 + + .../devicetree/bindings/dma/ti/k3-pktdma.yaml | 172 + + .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 17 + + .../devicetree/bindings/gpu/arm,mali-midgard.yaml | 17 + + .../devicetree/bindings/gpu/nvidia,gk20a.txt | 4 +- + Documentation/devicetree/bindings/i2c/i2c-gate.txt | 41 - + .../devicetree/bindings/i2c/i2c-gate.yaml | 39 + + .../bindings/i2c/snps,designware-i2c.yaml | 8 - + .../bindings/interrupt-controller/arm,gic.yaml | 9 +- + .../devicetree/bindings/iommu/arm,smmu.yaml | 9 +- + .../devicetree/bindings/leds/leds-pwm.txt | 50 - + .../devicetree/bindings/leds/leds-pwm.yaml | 70 + + .../devicetree/bindings/mailbox/arm,mhuv2.yaml | 209 + + .../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 | 28 +- + .../memory-controllers/nvidia,tegra20-mc.txt | 3 + + .../memory-controllers/nvidia,tegra30-emc.yaml | 18 + + .../memory-controllers/nvidia,tegra30-mc.yaml | 5 + + .../devicetree/bindings/mfd/aspeed-lpc.txt | 8 +- + .../devicetree/bindings/mfd/aspeed-scu.txt | 26 + + .../devicetree/bindings/mfd/rohm,bd71837-pmic.yaml | 6 + + .../devicetree/bindings/mfd/st,stm32-timers.yaml | 6 +- + Documentation/devicetree/bindings/mfd/syscon.yaml | 4 + + .../devicetree/bindings/misc/fsl,dpaa2-console.txt | 11 - + .../bindings/misc/fsl,dpaa2-console.yaml | 25 + + .../devicetree/bindings/mtd/gpmi-nand.yaml | 76 +- + .../devicetree/bindings/mtd/intel,lgm-nand.yaml | 99 + + .../devicetree/bindings/mtd/nand-controller.yaml | 11 +- + .../devicetree/bindings/mtd/partition.txt | 131 +- + .../bindings/mtd/partitions/fixed-partitions.yaml | 152 + + .../devicetree/bindings/mtd/qcom_nandc.txt | 4 + + .../bindings/mtd/rockchip,nand-controller.yaml | 161 + + Documentation/devicetree/bindings/net/dsa/b53.txt | 149 - + .../devicetree/bindings/net/dsa/brcm,b53.yaml | 249 ++ + Documentation/devicetree/bindings/net/dsa/dsa.yaml | 6 +- + .../bindings/net/ethernet-controller.yaml | 1 + + .../bindings/net/fsl,qoriq-mc-dpmac.yaml | 60 + + Documentation/devicetree/bindings/net/macb.txt | 2 - + .../devicetree/bindings/pci/rcar-pci-ep.yaml | 9 + + .../bindings/pinctrl/microchip,sparx5-sgpio.yaml | 161 + + .../bindings/pinctrl/mscc,ocelot-pinctrl.txt | 3 +- + .../bindings/pinctrl/nvidia,tegra194-pinmux.txt | 2 +- + .../bindings/pinctrl/qcom,lpass-lpi-pinctrl.yaml | 130 + + .../bindings/pinctrl/qcom,msm8953-pinctrl.yaml | 167 + + .../devicetree/bindings/pinctrl/qcom,pmic-gpio.txt | 3 + + .../bindings/pinctrl/qcom,sc7280-pinctrl.yaml | 158 + + .../bindings/pinctrl/qcom,sdx55-pinctrl.yaml | 154 + + .../bindings/power/mediatek,power-controller.yaml | 293 ++ + .../devicetree/bindings/power/qcom,rpmpd.yaml | 4 + + .../devicetree/bindings/reset/snps,dw-reset.txt | 2 +- + .../devicetree/bindings/soc/mediatek/devapc.yaml | 58 + + .../bindings/soc/xilinx/xlnx,vcu-settings.yaml | 34 + + .../devicetree/bindings/soc/xilinx/xlnx,vcu.txt | 9 +- + .../bindings/timer/snps,dw-apb-timer.yaml | 7 - + .../devicetree/bindings/trivial-devices.yaml | 8 + + .../devicetree/bindings/usb/st,stusb160x.yaml | 87 + + .../devicetree/bindings/vendor-prefixes.yaml | 34 +- + .../devicetree/bindings/watchdog/fsl-imx-wdt.yaml | 16 + + Documentation/driver-api/dmaengine/client.rst | 4 +- + Documentation/driver-api/mtd/nand_ecc.rst | 2 +- + Documentation/driver-api/mtdnand.rst | 3 - + Documentation/filesystems/ext2.rst | 1 + + Documentation/filesystems/f2fs.rst | 36 + + Documentation/filesystems/overlayfs.rst | 36 +- + Documentation/hid/amd-sfh-hid.rst | 145 + + Documentation/hid/hidraw.rst | 45 +- + Documentation/hid/index.rst | 1 + + Documentation/leds/leds-class.rst | 10 - + .../device_drivers/ethernet/davicom/dm9000.rst | 2 +- + MAINTAINERS | 51 +- + arch/arm/boot/dts/Makefile | 31 +- + arch/arm/boot/dts/am335x-baltos.dtsi | 2 +- + arch/arm/boot/dts/am335x-boneblue.dts | 54 + + arch/arm/boot/dts/am335x-cm-t335.dts | 2 +- + arch/arm/boot/dts/am335x-evm.dts | 2 +- + arch/arm/boot/dts/am335x-igep0033.dtsi | 2 +- + arch/arm/boot/dts/am335x-nano.dts | 1 - + arch/arm/boot/dts/am33xx-l4.dtsi | 102 +- + arch/arm/boot/dts/am33xx.dtsi | 185 +- + arch/arm/boot/dts/am4372.dtsi | 175 +- + arch/arm/boot/dts/am437x-l4.dtsi | 83 +- + arch/arm/boot/dts/armada-375.dtsi | 2 +- + arch/arm/boot/dts/armada-382-rd-ac3x-48g4x2xl.dts | 112 + + arch/arm/boot/dts/armada-385-turris-omnia.dts | 179 +- + 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/aspeed-ast2600-evb.dts | 20 + + 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 + + arch/arm/boot/dts/aspeed-bmc-facebook-minipack.dts | 888 ++++ + .../arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts | 13 +- + 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-facebook-wedge400.dts | 4 +- + arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts | 37 + + arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 39 +- + arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts | 4 +- + arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 11 +- + 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/at91-kizbox.dts | 55 +- + 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-sam9x60ek.dts | 13 +- + arch/arm/boot/dts/at91-sama5d27_som1.dtsi | 2 +- + arch/arm/boot/dts/at91-sama5d3_xplained.dts | 7 + + arch/arm/boot/dts/at91-sama5d4_xplained.dts | 7 + + arch/arm/boot/dts/at91-smartkiz.dts | 6 +- + arch/arm/boot/dts/at91sam9260.dtsi | 25 - + arch/arm/boot/dts/at91sam9g45.dtsi | 27 - + arch/arm/boot/dts/at91sam9m10g45ek.dts | 10 +- + arch/arm/boot/dts/at91sam9rl.dtsi | 25 - + arch/arm/boot/dts/at91sam9rlek.dts | 10 +- + arch/arm/boot/dts/at91sam9x5.dtsi | 28 - + arch/arm/boot/dts/bcm-cygnus.dtsi | 1 - + arch/arm/boot/dts/bcm-nsp.dtsi | 8 +- + arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 2 + + arch/arm/boot/dts/bcm283x-rpi-usb-otg.dtsi | 2 +- + arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi | 2 +- + arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 7 - + arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 7 - + arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 3 - + arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 4 - + arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 7 - + arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 7 - + arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 4 - + arch/arm/boot/dts/bcm4709.dtsi | 4 + + arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 94 +- + arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts | 3 - + arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts | 3 - + arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 3 - + arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts | 7 +- + arch/arm/boot/dts/bcm47094.dtsi | 13 + + arch/arm/boot/dts/bcm5301x.dtsi | 67 +- + arch/arm/boot/dts/bcm53573.dtsi | 4 +- + arch/arm/boot/dts/bcm953012er.dts | 3 - + arch/arm/boot/dts/bcm958522er.dts | 4 + + arch/arm/boot/dts/bcm958525er.dts | 4 + + arch/arm/boot/dts/bcm958525xmc.dts | 4 + + arch/arm/boot/dts/bcm958622hr.dts | 3 - + arch/arm/boot/dts/bcm958623hr.dts | 3 - + arch/arm/boot/dts/bcm958625hr.dts | 3 - + arch/arm/boot/dts/bcm958625k.dts | 3 - + arch/arm/boot/dts/bcm988312hr.dts | 3 - + arch/arm/boot/dts/dove-sbc-a510.dts | 1 + + arch/arm/boot/dts/dra7.dtsi | 185 +- + arch/arm/boot/dts/dra7xx-clocks.dtsi | 14 + + arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi | 4 +- + arch/arm/boot/dts/exynos3250-artik5-eval.dts | 26 + + 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 | 54 +- + 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 | 11 +- + 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-p4note-n8010.dts | 17 + + arch/arm/boot/dts/exynos4412-p4note.dtsi | 1132 +++++ + arch/arm/boot/dts/exynos4412-smdk4412.dts | 20 +- + arch/arm/boot/dts/exynos4412.dtsi | 32 +- + 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 | 7 +- + 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 | 30 +- + arch/arm/boot/dts/exynos5422-odroidxu4.dts | 4 +- + arch/arm/boot/dts/exynos54xx-odroidxu-leds.dtsi | 11 +- + arch/arm/boot/dts/exynos54xx.dtsi | 5 +- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 4 +- + arch/arm/boot/dts/hi3519-demb.dts | 2 +- + arch/arm/boot/dts/hi3519.dtsi | 32 +- + arch/arm/boot/dts/hi3620-hi4511.dts | 24 +- + arch/arm/boot/dts/hi3620.dtsi | 32 +- + arch/arm/boot/dts/hip01-ca9x2.dts | 2 +- + arch/arm/boot/dts/hip01.dtsi | 26 +- + arch/arm/boot/dts/hip04-d01.dts | 2 +- + arch/arm/boot/dts/hip04.dtsi | 6 +- + arch/arm/boot/dts/hisi-x5hd2-dkb.dts | 2 +- + arch/arm/boot/dts/hisi-x5hd2.dtsi | 42 +- + arch/arm/boot/dts/imx25.dtsi | 2 +- + arch/arm/boot/dts/imx27.dtsi | 2 +- + arch/arm/boot/dts/imx28.dtsi | 2 +- + arch/arm/boot/dts/imx31.dtsi | 3 +- + arch/arm/boot/dts/imx35.dtsi | 2 +- + arch/arm/boot/dts/imx50-kobo-aura.dts | 41 +- + 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-pico-dwarf.dts | 2 +- + arch/arm/boot/dts/imx6q-pico-hobbit.dts | 2 +- + arch/arm/boot/dts/imx6q-pico-nymph.dts | 2 +- + arch/arm/boot/dts/imx6q-pico-pi.dts | 2 +- + arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 3 +- + arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi | 3 +- + arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 8 +- + arch/arm/boot/dts/imx6qdl.dtsi | 12 +- + arch/arm/boot/dts/imx6qp-prtwd3.dts | 553 +++ + 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 | 10 +- + .../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-flex-concentrator-mfg.dts | 25 + + arch/arm/boot/dts/imx7d-flex-concentrator.dts | 314 ++ + 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/keystone-k2g-evm.dts | 112 + + 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 +- + arch/arm/boot/dts/lpc32xx.dtsi | 3 - + arch/arm/boot/dts/ls1021a.dtsi | 81 +- + arch/arm/boot/dts/meson8b-odroidc1.dts | 2 +- + arch/arm/boot/dts/meson8m2-mxiii-plus.dts | 2 +- + arch/arm/boot/dts/motorola-mapphone-common.dtsi | 141 +- + arch/arm/boot/dts/mstar-infinity.dtsi | 7 + + .../dts/mstar-infinity2m-ssd202d-ssd201htv2.dts | 25 + + arch/arm/boot/dts/mstar-infinity2m-ssd202d.dtsi | 14 + + arch/arm/boot/dts/mstar-infinity2m-ssd20xd.dtsi | 12 + + arch/arm/boot/dts/mstar-infinity2m.dtsi | 22 + + arch/arm/boot/dts/mstar-v7.dtsi | 12 +- + arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi | 967 ++++- + arch/arm/boot/dts/nuvoton-npcm730-gsj-gpio.dtsi | 477 +++ + arch/arm/boot/dts/nuvoton-npcm730-gsj.dts | 490 +++ + arch/arm/boot/dts/nuvoton-npcm730-kudo.dts | 826 ++++ + arch/arm/boot/dts/nuvoton-npcm730.dtsi | 44 + + arch/arm/boot/dts/nuvoton-npcm750-evb.dts | 367 +- + arch/arm/boot/dts/nuvoton-npcm750-pincfg-evb.dtsi | 157 + + .../dts/nuvoton-npcm750-runbmc-olympus-pincfg.dtsi | 517 +++ + .../boot/dts/nuvoton-npcm750-runbmc-olympus.dts | 1052 +++++ + arch/arm/boot/dts/nuvoton-npcm750.dtsi | 24 +- + 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-l4.dtsi | 1 + + arch/arm/boot/dts/omap4-panda-es.dts | 34 +- + arch/arm/boot/dts/omap4-sdp.dts | 26 +- + arch/arm/boot/dts/omap4.dtsi | 150 +- + arch/arm/boot/dts/omap5-l4.dtsi | 2 +- + arch/arm/boot/dts/omap5.dtsi | 58 + + arch/arm/boot/dts/openbmc-flash-layout-64.dtsi | 35 + + .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 25 + + arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts | 340 +- + arch/arm/boot/dts/qcom-pma8084.dtsi | 1 - + arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ca.dts | 222 + + arch/arm/boot/dts/r8a7742-iwg21d-q7.dts | 99 + + 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/arm/boot/dts/rk3288-vmarc-som.dtsi | 40 + + .../boot/dts/rockchip-radxa-dalang-carrier.dtsi | 21 + + arch/arm/boot/dts/rv1108.dtsi | 2 +- + arch/arm/boot/dts/s3c2416-smdk2416.dts | 2 +- + arch/arm/boot/dts/s3c6410-smdk6410.dts | 2 +- + arch/arm/boot/dts/s5pv210-aquila.dts | 12 +- + arch/arm/boot/dts/s5pv210-aries.dtsi | 5 +- + arch/arm/boot/dts/s5pv210-goni.dts | 14 +- + arch/arm/boot/dts/s5pv210-smdkv210.dts | 20 +- + arch/arm/boot/dts/s5pv210.dtsi | 1 - + arch/arm/boot/dts/sama5d2.dtsi | 7 +- + arch/arm/boot/dts/sama5d3.dtsi | 26 +- + arch/arm/boot/dts/sama5d4.dtsi | 22 - + arch/arm/boot/dts/ste-ab8500.dtsi | 6 +- + arch/arm/boot/dts/ste-ab8505.dtsi | 6 +- + arch/arm/boot/dts/ste-dbx5x0.dtsi | 6 +- + arch/arm/boot/dts/ste-href-stuib.dtsi | 2 +- + arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi | 2 +- + arch/arm/boot/dts/ste-href-tvk1281618-r3.dtsi | 2 +- + arch/arm/boot/dts/ste-ux500-samsung-golden.dts | 9 +- + arch/arm/boot/dts/ste-ux500-samsung-skomer.dts | 12 +- + arch/arm/boot/dts/stm32429i-eval.dts | 1 + + arch/arm/boot/dts/stm32h743.dtsi | 2 +- + arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 90 +- + arch/arm/boot/dts/stm32mp151.dtsi | 41 +- + arch/arm/boot/dts/stm32mp157c-dhcom-picoitx.dts | 35 + + 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/stm32mp157c-lxa-mc1.dts | 2 +- + arch/arm/boot/dts/stm32mp15xx-dhcom-picoitx.dtsi | 143 + + arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 37 + + arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 38 + + .../boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts | 64 + + 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-v3.dtsi | 5 + + arch/arm/boot/dts/sun8i-v3s.dtsi | 6 + + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 13 + + arch/arm/boot/dts/tegra124-apalis-emc.dtsi | 8 + + arch/arm/boot/dts/tegra124-jetson-tk1-emc.dtsi | 8 + + arch/arm/boot/dts/tegra124-nyan-big-emc.dtsi | 10 + + arch/arm/boot/dts/tegra124-nyan-blaze-emc.dtsi | 10 + + arch/arm/boot/dts/tegra124-peripherals-opp.dtsi | 419 ++ + arch/arm/boot/dts/tegra124.dtsi | 54 +- + arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 27 +- + arch/arm/boot/dts/tegra20-colibri.dtsi | 4 + + arch/arm/boot/dts/tegra20-paz00.dts | 4 + + arch/arm/boot/dts/tegra20-peripherals-opp.dtsi | 109 + + arch/arm/boot/dts/tegra20-ventana.dts | 11 + + arch/arm/boot/dts/tegra20.dtsi | 33 +- + .../dts/tegra30-asus-nexus7-grouper-common.dtsi | 27 +- + .../tegra30-asus-nexus7-grouper-maxim-pmic.dtsi | 2 +- + ...tegra30-asus-nexus7-grouper-memory-timings.dtsi | 12 + + arch/arm/boot/dts/tegra30-asus-nexus7-tilapia.dtsi | 2 +- + arch/arm/boot/dts/tegra30-ouya.dts | 4519 ++++++++++++++++++++ + arch/arm/boot/dts/tegra30-peripherals-opp.dtsi | 383 ++ + arch/arm/boot/dts/tegra30.dtsi | 33 +- + arch/arm/boot/dts/vfxxx.dtsi | 6 +- + arch/arm/boot/dts/zynq-7000.dtsi | 2 +- + arch/arm/boot/dts/zynq-zc702.dts | 8 +- + arch/arm/boot/dts/zynq-zc770-xm011.dts | 2 +- + arch/arm/boot/dts/zynq-zc770-xm013.dts | 7 +- + arch/arm/boot/dts/zynq-zturn-common.dtsi | 112 + + arch/arm/boot/dts/zynq-zturn-v5.dts | 15 + + arch/arm/boot/dts/zynq-zturn.dts | 101 +- + arch/arm/boot/dts/zynq-zybo-z7.dts | 2 +- + arch/arm/configs/at91_dt_defconfig | 6 +- + arch/arm/configs/cm_x300_defconfig | 1 - + arch/arm/configs/colibri_pxa300_defconfig | 1 - + arch/arm/configs/exynos_defconfig | 8 +- + arch/arm/configs/jornada720_defconfig | 1 - + arch/arm/configs/magician_defconfig | 1 - + arch/arm/configs/mini2440_defconfig | 1 - + arch/arm/configs/multi_v7_defconfig | 26 +- + arch/arm/configs/omap2plus_defconfig | 6 +- + arch/arm/configs/pxa3xx_defconfig | 1 - + arch/arm/configs/qcom_defconfig | 1 - + arch/arm/configs/sama5_defconfig | 10 +- + arch/arm/configs/shmobile_defconfig | 22 +- + arch/arm/configs/sunxi_defconfig | 2 +- + arch/arm/configs/tegra_defconfig | 1 - + arch/arm/configs/u8500_defconfig | 10 +- + arch/arm/mach-exynos/exynos.c | 7 +- + arch/arm/mach-exynos/platsmp.c | 2 +- + arch/arm/mach-imx/mach-imx6q.c | 9 +- + arch/arm/mach-imx/mach-imx7ulp.c | 4 + + arch/arm/mach-keystone/keystone.c | 2 +- + arch/arm/mach-mstar/mstarv7.c | 49 + + arch/arm/mach-mxs/mach-mxs.c | 19 + + arch/arm/mach-omap1/clock.c | 14 +- + arch/arm/mach-omap1/usb.c | 2 +- + arch/arm/mach-omap2/Kconfig | 8 + + arch/arm/mach-omap2/Makefile | 19 +- + arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 11 +- + arch/arm/mach-omap2/display.c | 6 +- + arch/arm/mach-omap2/io.c | 4 - + arch/arm/mach-omap2/omap_device.c | 5 +- + arch/arm/mach-omap2/omap_hwmod.c | 6 + + .../mach-omap2/omap_hwmod_33xx_43xx_common_data.h | 57 - + .../omap_hwmod_33xx_43xx_interconnect_data.c | 90 - + .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 290 -- + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 294 -- + arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 167 - + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 114 - + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 49 - + arch/arm/mach-omap2/pdata-quirks.c | 33 +- + arch/arm/mach-s3c/common-smdk-s3c24xx.c | 2 +- + arch/arm/mach-s3c/mach-anubis.c | 2 +- + arch/arm/mach-s3c/mach-at2440evb.c | 2 +- + arch/arm/mach-s3c/mach-bast.c | 2 +- + arch/arm/mach-s3c/mach-gta02.c | 2 +- + arch/arm/mach-s3c/mach-jive.c | 2 +- + arch/arm/mach-s3c/mach-mini2440.c | 2 +- + arch/arm/mach-s3c/mach-osiris.c | 2 +- + arch/arm/mach-s3c/mach-qt2410.c | 2 +- + arch/arm/mach-s3c/mach-rx3715.c | 2 +- + arch/arm/mach-s3c/mach-vstms.c | 2 +- + arch/arm/mach-shmobile/platsmp-scu.c | 2 +- + arch/arm/mach-shmobile/setup-r8a7778.c | 12 +- + arch/arm/mach-shmobile/setup-r8a7779.c | 56 +- + arch/arm/mach-shmobile/setup-sh73a0.c | 21 +- + arch/arm/mach-shmobile/smp-r8a7779.c | 12 +- + arch/arm/mach-shmobile/smp-sh73a0.c | 33 +- + arch/arm64/Kconfig.platforms | 13 +- + .../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-pine-h64-model-b.dts | 15 + + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 15 +- + arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 10 + + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 131 + + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 6 + + arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 2 +- + .../boot/dts/amlogic/meson-g12b-gtking-pro.dts | 17 + + arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts | 18 + + .../boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 2 +- + arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi | 2 +- + .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 42 +- + .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 40 + + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 42 +- + .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 2 +- + .../boot/dts/amlogic/meson-gxbb-wetek-hub.dts | 40 + + .../boot/dts/amlogic/meson-gxbb-wetek-play2.dts | 61 + + arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 2 +- + .../boot/dts/amlogic/meson-gxl-s905d-p230.dts | 2 +- + .../boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dts | 4 + + .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 46 +- + .../amlogic/meson-gxl-s905x-libretech-cc-v2.dts | 4 - + .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 51 +- + .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 2 +- + arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts | 2 +- + arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 2 +- + arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 20 + + arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 15 +- + arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 2 +- + arch/arm64/boot/dts/broadcom/Makefile | 1 + + arch/arm64/boot/dts/broadcom/bcm4908/Makefile | 2 + + .../broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts | 66 + + arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | 187 + + 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 | 49 +- + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 2 +- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 15 +- + arch/arm64/boot/dts/freescale/Makefile | 2 + + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 69 +- + .../dts/freescale/fsl-ls1028a-kontron-sl28.dts | 18 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 2 + + arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 2 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 30 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 86 +- + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 72 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts | 119 + + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 136 +- + arch/arm64/boot/dts/freescale/fsl-ls2088a-rdb.dts | 120 + + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 278 +- + arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts | 32 + + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 288 +- + arch/arm64/boot/dts/freescale/fsl-lx2162a-qds.dts | 334 ++ + .../boot/dts/freescale/imx8mm-beacon-som.dtsi | 326 +- + arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi | 16 +- + .../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 | 2 +- + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 53 +- + arch/arm64/boot/dts/freescale/imx8mn-evk.dts | 32 +- + arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 16 +- + arch/arm64/boot/dts/freescale/imx8mn-var-som.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 158 +- + 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/hisilicon/hi3660.dtsi | 13 +- + arch/arm64/boot/dts/hisilicon/hi3670.dtsi | 5 +- + arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi | 27 +- + arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 4 +- + arch/arm64/boot/dts/hisilicon/hip05.dtsi | 24 +- + arch/arm64/boot/dts/hisilicon/hip06.dtsi | 14 +- + arch/arm64/boot/dts/hisilicon/hip07.dtsi | 178 +- + arch/arm64/boot/dts/marvell/Makefile | 2 + + .../dts/marvell/armada-3720-espressobin-emmc.dts | 18 - + .../dts/marvell/armada-3720-espressobin-ultra.dts | 165 + + .../marvell/armada-3720-espressobin-v7-emmc.dts | 40 +- + .../dts/marvell/armada-3720-espressobin-v7.dts | 24 +- + .../boot/dts/marvell/armada-3720-espressobin.dtsi | 39 +- + .../boot/dts/marvell/armada-3720-turris-mox.dts | 3 +- + arch/arm64/boot/dts/marvell/armada-7040.dtsi | 4 - + .../dts/marvell/armada-8040-mcbin-singleshot.dts | 22 + + .../boot/dts/marvell/armada-8040-puzzle-m801.dts | 523 +++ + arch/arm64/boot/dts/marvell/armada-8040.dtsi | 4 - + arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 10 +- + arch/arm64/boot/dts/mediatek/Makefile | 3 + + arch/arm64/boot/dts/mediatek/mt6779-evb.dts | 31 + + arch/arm64/boot/dts/mediatek/mt6779.dtsi | 271 ++ + .../boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 13 +- + arch/arm64/boot/dts/mediatek/mt8167-pinfunc.h | 744 ++++ + arch/arm64/boot/dts/mediatek/mt8167-pumpkin.dts | 20 + + arch/arm64/boot/dts/mediatek/mt8167.dtsi | 61 + + arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 1 - + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 164 +- + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 28 + + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 408 +- + arch/arm64/boot/dts/mediatek/mt8192-evb.dts | 29 + + arch/arm64/boot/dts/mediatek/mt8192.dtsi | 512 +++ + arch/arm64/boot/dts/mediatek/mt8516.dtsi | 40 +- + arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi | 28 +- + arch/arm64/boot/dts/microchip/sparx5.dtsi | 96 + + arch/arm64/boot/dts/microchip/sparx5_pcb125.dts | 5 + + .../boot/dts/microchip/sparx5_pcb134_board.dtsi | 258 ++ + .../boot/dts/microchip/sparx5_pcb135_board.dtsi | 55 + + arch/arm64/boot/dts/nvidia/tegra132.dtsi | 20 +- + arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 4 + + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 61 +- + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 17 +- + 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 | 22 +- + arch/arm64/boot/dts/qcom/Makefile | 6 + + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 10 - + arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts | 16 + + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 51 +- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 4 +- + .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 181 +- + arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi | 7 +- + .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 21 +- + .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts | 29 + + 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/pm6150.dtsi | 10 + + arch/arm64/boot/dts/qcom/pm6150l.dtsi | 24 + + 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 | 108 + + arch/arm64/boot/dts/qcom/sc7180-lite.dtsi | 18 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r0.dts | 11 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r1-kb.dts | 4 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r1-lte.dts | 12 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 15 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts | 17 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts | 26 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r3.dts | 15 + + arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 7 +- + .../boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi | 4 + + arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 16 +- + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 106 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 281 +- + arch/arm64/boot/dts/qcom/sdm630.dtsi | 4 +- + arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 11 + + arch/arm64/boot/dts/qcom/sdm845.dtsi | 206 +- + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 183 +- + arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 463 ++ + arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 17 + + arch/arm64/boot/dts/qcom/sm8150.dtsi | 801 ++++ + arch/arm64/boot/dts/qcom/sm8250-hdk.dts | 454 ++ + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 6 +- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 491 ++- + 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 | 2 + + .../boot/dts/renesas/r8a77951-salvator-xs.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 40 + + 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/boot/dts/rockchip/Makefile | 4 + + .../boot/dts/rockchip/px30-engicam-common.dtsi | 124 + + .../boot/dts/rockchip/px30-engicam-ctouch2.dtsi | 30 + + .../boot/dts/rockchip/px30-engicam-edimm2.2.dtsi | 66 + + .../px30-engicam-px30-core-ctouch2-of10.dts | 77 + + .../rockchip/px30-engicam-px30-core-ctouch2.dts | 22 + + .../rockchip/px30-engicam-px30-core-edimm2.2.dts | 43 + + .../boot/dts/rockchip/px30-engicam-px30-core.dtsi | 237 + + arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts | 24 + + arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 21 + + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 16 +- + .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 74 + + .../boot/dts/rockchip/rk3399-kobol-helios64.dts | 372 ++ + arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts | 62 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 15 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 28 +- + .../boot/dts/rockchip/rk3399pro-vmarc-som.dtsi | 16 + + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 13 +- + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 43 +- + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 71 +- + .../boot/dts/ti/k3-j7200-common-proc-board.dts | 33 +- + arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 114 + + arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 19 + + arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi | 94 + + .../boot/dts/ti/k3-j721e-common-proc-board.dts | 83 +- + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 135 +- + arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 42 +- + arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi | 110 +- + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 60 +- + arch/arm64/configs/defconfig | 38 +- + arch/arm64/include/asm/thread_info.h | 2 +- + arch/parisc/configs/generic-64bit_defconfig | 1 - + arch/powerpc/configs/powernv_defconfig | 1 - + arch/sh/drivers/pci/pcie-sh7786.c | 2 +- + arch/x86/include/asm/mem_encrypt.h | 2 + + arch/x86/kernel/setup.c | 6 + + arch/x86/mm/mem_encrypt.c | 31 + + arch/x86/pci/sta2x11-fixup.c | 3 +- + block/blk-mq.c | 2 +- + drivers/block/rbd.c | 8 +- + drivers/bus/ti-sysc.c | 41 +- + drivers/char/ipmi/bt-bmc.c | 6 +- + drivers/char/ipmi/ipmi_devintf.c | 1 - + drivers/char/ipmi/ipmi_msghandler.c | 3 +- + drivers/char/ipmi/ipmi_watchdog.c | 8 +- + drivers/clk/samsung/Kconfig | 10 + + drivers/clk/samsung/Makefile | 2 +- + drivers/clk/samsung/clk-exynos-clkout.c | 199 +- + drivers/clk/ti/clk-33xx.c | 2 + + drivers/clk/ti/clk-43xx.c | 8 + + drivers/clk/ti/clk-44xx.c | 2 +- + drivers/clk/ti/clk-7xx.c | 7 + + drivers/cpuidle/cpuidle-big_little.c | 3 +- + drivers/dma/Kconfig | 10 + + drivers/dma/at_xdmac.c | 163 +- + drivers/dma/dma-jz4780.c | 2 +- + drivers/dma/dmatest.c | 13 +- + drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 2 +- + drivers/dma/dw/core.c | 6 + + drivers/dma/hisi_dma.c | 5 +- + drivers/dma/idma64.c | 8 +- + drivers/dma/idxd/cdev.c | 50 +- + drivers/dma/idxd/device.c | 143 +- + drivers/dma/idxd/dma.c | 9 - + drivers/dma/idxd/idxd.h | 58 +- + drivers/dma/idxd/init.c | 123 +- + drivers/dma/idxd/irq.c | 146 +- + drivers/dma/idxd/registers.h | 28 +- + drivers/dma/idxd/submit.c | 37 +- + drivers/dma/idxd/sysfs.c | 207 +- + drivers/dma/imx-dma.c | 33 +- + drivers/dma/imx-sdma.c | 38 +- + 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/mv_xor.c | 2 +- + drivers/dma/mv_xor_v2.c | 4 +- + drivers/dma/mxs-dma.c | 37 +- + drivers/dma/of-dma.c | 10 + + drivers/dma/pl330.c | 2 - + drivers/dma/ppc4xx/adma.c | 4 +- + drivers/dma/pxa_dma.c | 5 +- + drivers/dma/qcom/Kconfig | 23 + + drivers/dma/qcom/Makefile | 2 + + drivers/dma/qcom/bam_dma.c | 2 +- + drivers/dma/qcom/gpi.c | 2303 ++++++++++ + drivers/dma/qcom/qcom_adm.c | 905 ++++ + drivers/dma/sf-pdma/sf-pdma.c | 12 +- + drivers/dma/ste_dma40.c | 5 +- + drivers/dma/stm32-dma.c | 47 +- + drivers/dma/stm32-dmamux.c | 2 +- + drivers/dma/stm32-mdma.c | 66 +- + drivers/dma/sun6i-dma.c | 25 + + drivers/dma/tegra210-adma.c | 7 +- + drivers/dma/ti/Makefile | 3 +- + drivers/dma/ti/dma-crossbar.c | 6 +- + drivers/dma/ti/k3-psil-am64.c | 158 + + drivers/dma/ti/k3-psil-priv.h | 1 + + drivers/dma/ti/k3-psil.c | 1 + + drivers/dma/ti/k3-udma-glue.c | 383 +- + drivers/dma/ti/k3-udma-private.c | 45 + + drivers/dma/ti/k3-udma.c | 1966 ++++++++- + drivers/dma/ti/k3-udma.h | 28 +- + drivers/firmware/arm_scmi/notify.c | 10 +- + drivers/firmware/arm_scmi/sensors.c | 720 +++- + drivers/firmware/imx/imx-dsp.c | 72 +- + drivers/firmware/imx/scu-pd.c | 12 + + drivers/firmware/meson/Kconfig | 5 +- + drivers/firmware/meson/meson_sm.c | 1 + + drivers/firmware/tegra/bpmp-debugfs.c | 6 +- + drivers/firmware/ti_sci.c | 213 +- + drivers/firmware/ti_sci.h | 72 +- + drivers/firmware/xilinx/zynqmp.c | 46 +- + drivers/gpio/gpio-tps65910.c | 12 +- + drivers/gpu/drm/drm_edid.c | 4 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 3 +- + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 34 +- + drivers/gpu/drm/msm/msm_iommu.c | 1 - + drivers/gpu/drm/panfrost/panfrost_mmu.c | 7 - + drivers/gpu/drm/sun4i/sun4i_backend.c | 19 - + drivers/hid/Kconfig | 3 + + 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-elecom.c | 51 +- + drivers/hid/hid-ids.h | 7 + + drivers/hid/hid-input.c | 6 +- + drivers/hid/hid-ite.c | 13 +- + drivers/hid/hid-logitech-hidpp.c | 2 + + drivers/hid/hid-mf.c | 2 + + drivers/hid/hid-quirks.c | 3 + + drivers/hid/hid-sony.c | 247 +- + drivers/hid/hidraw.c | 24 +- + drivers/hid/i2c-hid/i2c-hid-core.c | 5 +- + drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c | 8 + + drivers/hid/intel-ish-hid/ishtp-hid.c | 6 +- + drivers/hid/usbhid/hid-core.c | 2 + + drivers/hid/wacom_sys.c | 16 +- + drivers/hwmon/scmi-hwmon.c | 2 +- + drivers/infiniband/core/cm.c | 9 +- + drivers/infiniband/core/cma.c | 195 +- + drivers/infiniband/core/cma_configfs.c | 4 +- + drivers/infiniband/core/core_priv.h | 28 +- + drivers/infiniband/core/counters.c | 138 +- + drivers/infiniband/core/cq.c | 16 +- + drivers/infiniband/core/device.c | 92 +- + drivers/infiniband/core/iwpm_util.h | 2 +- + drivers/infiniband/core/rdma_core.c | 101 +- + drivers/infiniband/core/restrack.c | 23 +- + drivers/infiniband/core/rw.c | 5 +- + drivers/infiniband/core/sa_query.c | 3 +- + drivers/infiniband/core/sysfs.c | 166 +- + drivers/infiniband/core/ucma.c | 2 +- + drivers/infiniband/core/umem.c | 17 +- + drivers/infiniband/core/user_mad.c | 6 +- + drivers/infiniband/core/uverbs_cmd.c | 149 +- + drivers/infiniband/core/uverbs_main.c | 4 +- + drivers/infiniband/core/uverbs_std_types.c | 18 +- + .../infiniband/core/uverbs_std_types_async_fd.c | 5 +- + .../infiniband/core/uverbs_std_types_counters.c | 5 +- + drivers/infiniband/core/uverbs_std_types_cq.c | 4 +- + drivers/infiniband/core/uverbs_std_types_device.c | 14 +- + drivers/infiniband/core/uverbs_std_types_dm.c | 6 +- + .../infiniband/core/uverbs_std_types_flow_action.c | 6 +- + drivers/infiniband/core/uverbs_std_types_mr.c | 6 +- + drivers/infiniband/core/uverbs_std_types_qp.c | 8 +- + drivers/infiniband/core/uverbs_std_types_srq.c | 4 +- + drivers/infiniband/core/uverbs_std_types_wq.c | 4 +- + drivers/infiniband/core/uverbs_uapi.c | 5 +- + drivers/infiniband/core/verbs.c | 27 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 15 +- + drivers/infiniband/hw/bnxt_re/main.c | 34 +- + drivers/infiniband/hw/bnxt_re/qplib_sp.c | 2 +- + drivers/infiniband/hw/cxgb4/cq.c | 3 + + 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 | 34 +- + drivers/infiniband/hw/efa/efa_verbs.c | 6 + + drivers/infiniband/hw/hfi1/qp.c | 1 + + drivers/infiniband/hw/hfi1/sysfs.c | 62 +- + drivers/infiniband/hw/hfi1/tid_rdma.c | 5 + + drivers/infiniband/hw/hns/hns_roce_ah.c | 55 +- + drivers/infiniband/hw/hns/hns_roce_alloc.c | 132 +- + drivers/infiniband/hw/hns/hns_roce_cmd.c | 37 +- + drivers/infiniband/hw/hns/hns_roce_cmd.h | 6 +- + drivers/infiniband/hw/hns/hns_roce_common.h | 26 +- + drivers/infiniband/hw/hns/hns_roce_cq.c | 46 +- + drivers/infiniband/hw/hns/hns_roce_db.c | 8 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 178 +- + drivers/infiniband/hw/hns/hns_roce_hem.c | 59 +- + drivers/infiniband/hw/hns/hns_roce_hem.h | 3 +- + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 50 +- + drivers/infiniband/hw/hns/hns_roce_hw_v1.h | 2 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 554 +-- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 265 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 82 +- + drivers/infiniband/hw/hns/hns_roce_mr.c | 79 +- + drivers/infiniband/hw/hns/hns_roce_pd.c | 14 +- + drivers/infiniband/hw/hns/hns_roce_qp.c | 300 +- + drivers/infiniband/hw/hns/hns_roce_srq.c | 53 +- + drivers/infiniband/hw/i40iw/i40iw.h | 1 - + drivers/infiniband/hw/i40iw/i40iw_cm.c | 6 +- + drivers/infiniband/hw/i40iw/i40iw_ctrl.c | 72 +- + drivers/infiniband/hw/i40iw/i40iw_d.h | 35 +- + drivers/infiniband/hw/i40iw/i40iw_status.h | 1 - + drivers/infiniband/hw/i40iw/i40iw_type.h | 38 +- + drivers/infiniband/hw/i40iw/i40iw_uk.c | 41 +- + drivers/infiniband/hw/i40iw/i40iw_user.h | 8 - + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 121 +- + drivers/infiniband/hw/mlx4/mad.c | 1 + + drivers/infiniband/hw/mlx4/main.c | 64 +- + drivers/infiniband/hw/mlx4/mcg.c | 82 +- + drivers/infiniband/hw/mlx4/mlx4_ib.h | 8 +- + drivers/infiniband/hw/mlx4/mr.c | 16 +- + drivers/infiniband/hw/mlx4/qp.c | 14 +- + drivers/infiniband/hw/mlx4/srq.c | 4 + + drivers/infiniband/hw/mlx4/sysfs.c | 66 +- + drivers/infiniband/hw/mlx5/cq.c | 77 +- + drivers/infiniband/hw/mlx5/devx.c | 90 +- + drivers/infiniband/hw/mlx5/fs.c | 6 +- + drivers/infiniband/hw/mlx5/main.c | 105 +- + drivers/infiniband/hw/mlx5/mem.c | 192 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 102 +- + drivers/infiniband/hw/mlx5/mr.c | 960 +++-- + drivers/infiniband/hw/mlx5/odp.c | 56 +- + drivers/infiniband/hw/mlx5/qp.c | 197 +- + drivers/infiniband/hw/mlx5/restrack.c | 2 +- + drivers/infiniband/hw/mlx5/srq.c | 34 +- + drivers/infiniband/hw/mlx5/srq.h | 1 + + drivers/infiniband/hw/mlx5/srq_cmd.c | 80 +- + drivers/infiniband/hw/mthca/mthca_cq.c | 2 +- + drivers/infiniband/hw/mthca/mthca_dev.h | 1 - + 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 | 39 +- + drivers/infiniband/hw/qedr/verbs.c | 13 + + drivers/infiniband/hw/qib/qib_pcie.c | 11 +- + 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/Kconfig | 1 - + drivers/infiniband/sw/rdmavt/ah.c | 3 +- + drivers/infiniband/sw/rdmavt/cq.c | 2 +- + drivers/infiniband/sw/rdmavt/mcast.c | 12 +- + drivers/infiniband/sw/rdmavt/mr.c | 6 +- + drivers/infiniband/sw/rdmavt/qp.c | 18 +- + drivers/infiniband/sw/rdmavt/vt.c | 36 +- + drivers/infiniband/sw/rxe/Kconfig | 1 - + drivers/infiniband/sw/rxe/rxe_cq.c | 5 - + drivers/infiniband/sw/rxe/rxe_mr.c | 1 - + drivers/infiniband/sw/rxe/rxe_net.c | 18 - + drivers/infiniband/sw/rxe/rxe_queue.h | 94 +- + drivers/infiniband/sw/rxe/rxe_req.c | 3 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 5 - + drivers/infiniband/sw/rxe/rxe_verbs.c | 67 +- + drivers/infiniband/sw/rxe/rxe_verbs.h | 2 - + drivers/infiniband/sw/siw/Kconfig | 1 - + drivers/infiniband/sw/siw/siw.h | 1 - + drivers/infiniband/sw/siw/siw_cm.c | 2 +- + drivers/infiniband/sw/siw/siw_main.c | 52 +- + 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_verbs.c | 4 +- + drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 2 +- + drivers/infiniband/ulp/iser/iscsi_iser.c | 24 +- + drivers/infiniband/ulp/isert/ib_isert.c | 35 +- + drivers/infiniband/ulp/isert/ib_isert.h | 6 + + drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.h | 2 +- + .../infiniband/ulp/opa_vnic/opa_vnic_vema_iface.c | 2 +- + 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 | 16 +- + drivers/infiniband/ulp/srpt/ib_srpt.h | 2 +- + drivers/interconnect/qcom/sdm845.c | 3 + + drivers/iommu/Kconfig | 7 + + drivers/iommu/Makefile | 1 + + drivers/iommu/amd/amd_iommu_types.h | 19 +- + drivers/iommu/amd/init.c | 6 +- + drivers/iommu/amd/iommu.c | 2 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 244 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 59 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 30 + + drivers/iommu/arm/arm-smmu/arm-smmu-impl.c | 13 +- + drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c | 17 +- + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 270 +- + drivers/iommu/arm/arm-smmu/arm-smmu.c | 76 +- + drivers/iommu/arm/arm-smmu/arm-smmu.h | 5 +- + drivers/iommu/arm/arm-smmu/qcom_iommu.c | 8 - + drivers/iommu/dma-iommu.c | 244 +- + drivers/iommu/intel/Kconfig | 1 + + drivers/iommu/intel/iommu.c | 918 +--- + drivers/iommu/intel/svm.c | 6 +- + drivers/iommu/io-pgtable-arm-v7s.c | 11 +- + drivers/iommu/io-pgtable-arm.c | 19 +- + drivers/iommu/ioasid.c | 38 +- + drivers/iommu/iommu-sva-lib.c | 86 + + drivers/iommu/iommu-sva-lib.h | 15 + + drivers/iommu/iommu.c | 276 +- + drivers/iommu/iova.c | 100 +- + drivers/iommu/ipmmu-vmsa.c | 1 - + drivers/iommu/msm_iommu.c | 7 - + drivers/iommu/mtk_iommu.c | 1 - + drivers/iommu/tegra-smmu.c | 240 +- + drivers/leds/leds-lp50xx.c | 6 +- + drivers/leds/leds-netxbig.c | 35 +- + drivers/leds/leds-turris-omnia.c | 85 +- + drivers/mailbox/Kconfig | 9 +- + drivers/mailbox/Makefile | 2 + + drivers/mailbox/arm_mhu_db.c | 2 +- + drivers/mailbox/arm_mhuv2.c | 1136 +++++ + drivers/mailbox/stm32-ipcc.c | 15 +- + drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c | 27 - + drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 17 - + drivers/media/platform/sunxi/sun8i-di/sun8i-di.c | 4 - + drivers/memory/Kconfig | 6 +- + drivers/memory/jz4780-nemc.c | 6 +- + drivers/memory/mtk-smi.c | 19 + + drivers/memory/renesas-rpc-if.c | 18 +- + drivers/memory/tegra/Kconfig | 10 +- + drivers/memory/tegra/mc.c | 155 +- + 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 | 520 ++- + drivers/memory/tegra/tegra20.c | 77 + + drivers/memory/tegra/tegra210-emc-core.c | 39 +- + drivers/memory/tegra/tegra210.c | 60 +- + drivers/memory/tegra/tegra30-emc.c | 411 +- + drivers/memory/tegra/tegra30.c | 245 +- + drivers/message/fusion/mptbase.c | 15 +- + drivers/message/fusion/mptfc.c | 2 +- + drivers/message/fusion/mptsas.c | 45 +- + drivers/message/fusion/mptsas.h | 1 + + drivers/message/fusion/mptscsih.c | 2 +- + drivers/message/fusion/mptspi.c | 2 +- + drivers/mfd/88pm800.c | 2 +- + drivers/mfd/88pm860x-core.c | 50 +- + drivers/mfd/Kconfig | 32 +- + drivers/mfd/altera-sysmgr.c | 2 +- + drivers/mfd/at91-usart.c | 12 +- + drivers/mfd/axp20x-i2c.c | 2 + + drivers/mfd/bcm590xx.c | 2 +- + drivers/mfd/da9055-core.c | 8 +- + drivers/mfd/da9055-i2c.c | 2 +- + drivers/mfd/da9062-core.c | 26 +- + drivers/mfd/da9063-core.c | 8 +- + drivers/mfd/da9063-i2c.c | 2 +- + drivers/mfd/da9150-core.c | 8 +- + drivers/mfd/ene-kb3930.c | 2 +- + drivers/mfd/fsl-imx25-tsadc.c | 2 +- + drivers/mfd/hi655x-pmic.c | 2 +- + drivers/mfd/htc-i2cpld.c | 2 + + drivers/mfd/intel_msic.c | 18 +- + 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/kempld-core.c | 100 +- + drivers/mfd/lp8788.c | 4 +- + drivers/mfd/madera-core.c | 35 +- + drivers/mfd/max77650.c | 2 +- + drivers/mfd/max77686.c | 2 +- + drivers/mfd/max8925-core.c | 56 +- + drivers/mfd/motorola-cpcap.c | 6 +- + drivers/mfd/mt6397-core.c | 2 +- + 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/rt5033.c | 2 +- + drivers/mfd/stmfx.c | 12 +- + drivers/mfd/stmpe.c | 10 +- + drivers/mfd/sun4i-gpadc.c | 4 +- + drivers/mfd/syscon.c | 18 + + 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 | 46 +- + drivers/mfd/tps65911-comparator.c | 4 +- + drivers/mfd/tps80031.c | 2 +- + drivers/mfd/twl6030-irq.c | 2 +- + drivers/mfd/wm831x-core.c | 52 +- + drivers/mfd/wm8994-core.c | 6 +- + drivers/mtd/Kconfig | 1 + + drivers/mtd/devices/docg3.c | 5 +- + drivers/mtd/devices/phram.c | 54 +- + drivers/mtd/devices/powernv_flash.c | 5 +- + drivers/mtd/maps/physmap-bt1-rom.c | 8 +- + drivers/mtd/maps/plat-ram.c | 11 +- + drivers/mtd/mtdchar.c | 2 - + drivers/mtd/mtdcore.c | 6 +- + drivers/mtd/mtdpart.c | 2 +- + drivers/mtd/nand/Kconfig | 33 +- + drivers/mtd/nand/Makefile | 2 + + drivers/mtd/nand/core.c | 124 + + drivers/mtd/nand/ecc-sw-bch.c | 406 ++ + .../mtd/nand/{raw/nand_ecc.c => ecc-sw-hamming.c} | 311 +- + drivers/mtd/nand/ecc.c | 140 +- + drivers/mtd/nand/onenand/onenand_base.c | 444 +- + drivers/mtd/nand/onenand/onenand_bbt.c | 32 +- + drivers/mtd/nand/onenand/onenand_omap2.c | 16 +- + drivers/mtd/nand/raw/Kconfig | 45 +- + drivers/mtd/nand/raw/Makefile | 4 +- + drivers/mtd/nand/raw/arasan-nand-controller.c | 1 + + drivers/mtd/nand/raw/au1550nd.c | 1 + + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 6 +- + drivers/mtd/nand/raw/cafe_nand.c | 2 +- + drivers/mtd/nand/raw/cs553x_nand.c | 3 +- + drivers/mtd/nand/raw/davinci_nand.c | 38 +- + drivers/mtd/nand/raw/diskonchip.c | 4 +- + 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/gpmi-nand/gpmi-nand.c | 76 +- + drivers/mtd/nand/raw/gpmi-nand/gpmi-regs.h | 1 + + drivers/mtd/nand/raw/ingenic/ingenic_ecc.c | 2 - + drivers/mtd/nand/raw/intel-nand-controller.c | 721 ++++ + drivers/mtd/nand/raw/lpc32xx_mlc.c | 1 - + drivers/mtd/nand/raw/lpc32xx_slc.c | 3 +- + drivers/mtd/nand/raw/marvell_nand.c | 6 - + drivers/mtd/nand/raw/meson_nand.c | 7 +- + drivers/mtd/nand/raw/mxc_nand.c | 94 +- + 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/nand_legacy.c | 9 +- + drivers/mtd/nand/raw/nandsim.c | 3 +- + drivers/mtd/nand/raw/ndfc.c | 3 +- + drivers/mtd/nand/raw/omap2.c | 49 +- + drivers/mtd/nand/raw/omap_elm.c | 7 +- + drivers/mtd/nand/raw/pasemi_nand.c | 1 - + drivers/mtd/nand/raw/qcom_nandc.c | 74 +- + drivers/mtd/nand/raw/rockchip-nand-controller.c | 1495 +++++++ + drivers/mtd/nand/raw/s3c2410.c | 5 +- + drivers/mtd/nand/raw/sharpsl.c | 3 +- + drivers/mtd/nand/raw/sunxi_nand.c | 149 +- + 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/nand/spi/macronix.c | 47 + + drivers/mtd/nand/spi/micron.c | 124 +- + drivers/mtd/nand/spi/toshiba.c | 2 +- + drivers/mtd/parsers/cmdlinepart.c | 14 +- + drivers/mtd/sm_ftl.c | 30 +- + drivers/mtd/spi-nor/Kconfig | 44 + + drivers/mtd/spi-nor/atmel.c | 191 +- + drivers/mtd/spi-nor/controllers/hisi-sfc.c | 2 +- + drivers/mtd/spi-nor/core.c | 595 ++- + drivers/mtd/spi-nor/core.h | 38 + + drivers/mtd/spi-nor/esmt.c | 2 +- + drivers/mtd/spi-nor/intel.c | 19 +- + drivers/mtd/spi-nor/micron-st.c | 115 +- + drivers/mtd/spi-nor/sfdp.c | 172 +- + drivers/mtd/spi-nor/sfdp.h | 8 + + drivers/mtd/spi-nor/spansion.c | 172 + + drivers/mtd/spi-nor/sst.c | 32 +- + drivers/mtd/tests/mtd_nandecctest.c | 31 +- + drivers/mtd/ubi/build.c | 1 + + drivers/mtd/ubi/eba.c | 3 +- + drivers/mtd/ubi/gluebi.c | 2 +- + drivers/mtd/ubi/kapi.c | 2 +- + drivers/mtd/ubi/wl.c | 3 +- + drivers/nvme/host/rdma.c | 2 +- + drivers/nvme/target/rdma.c | 3 +- + drivers/pci/p2pdma.c | 25 +- + drivers/pcmcia/Kconfig | 1 + + drivers/pcmcia/at91_cf.c | 50 +- + drivers/pinctrl/Kconfig | 20 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/actions/pinctrl-s500.c | 2 +- + drivers/pinctrl/core.c | 2 + + drivers/pinctrl/freescale/Kconfig | 7 - + drivers/pinctrl/freescale/Makefile | 1 - + drivers/pinctrl/freescale/pinctrl-imx21.c | 330 -- + 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 | 10 +- + drivers/pinctrl/mediatek/pinctrl-mt7622.c | 13 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 10 +- + drivers/pinctrl/mediatek/pinctrl-paris.c | 8 +- + 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 | 43 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 22 +- + drivers/pinctrl/pinctrl-falcon.c | 14 +- + drivers/pinctrl/pinctrl-ingenic.c | 1267 ++---- + drivers/pinctrl/pinctrl-microchip-sgpio.c | 892 ++++ + drivers/pinctrl/pinctrl-ocelot.c | 186 +- + drivers/pinctrl/qcom/Kconfig | 88 +- + drivers/pinctrl/qcom/Makefile | 4 + + drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 695 +++ + drivers/pinctrl/qcom/pinctrl-msm.c | 2 + + drivers/pinctrl/qcom/pinctrl-msm8953.c | 1844 ++++++++ + drivers/pinctrl/qcom/pinctrl-sc7280.c | 1495 +++++++ + drivers/pinctrl/qcom/pinctrl-sdx55.c | 1018 +++++ + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 2 + + drivers/pinctrl/renesas/core.c | 2 + + drivers/pinctrl/renesas/core.h | 4 + + drivers/pinctrl/renesas/gpio.c | 2 +- + drivers/pinctrl/renesas/pfc-r8a7778.c | 55 +- + drivers/pinctrl/renesas/pfc-r8a7790.c | 146 +- + drivers/pinctrl/renesas/pfc-r8a7791.c | 18 + + drivers/pinctrl/renesas/pfc-r8a77950.c | 45 +- + drivers/pinctrl/renesas/pfc-r8a77951.c | 134 +- + drivers/pinctrl/renesas/pfc-r8a7796.c | 132 +- + drivers/pinctrl/renesas/pfc-r8a77965.c | 132 +- + drivers/pinctrl/renesas/pfc-r8a77990.c | 132 +- + drivers/pinctrl/renesas/pfc-sh73a0.c | 2 +- + drivers/pinctrl/renesas/pinctrl-rza1.c | 1 + + drivers/pinctrl/renesas/pinctrl.c | 68 +- + drivers/pinctrl/renesas/sh_pfc.h | 12 +- + drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 5 - + drivers/pinctrl/spear/pinctrl-spear300.c | 8 +- + drivers/pinctrl/sunxi/pinctrl-sun50i-a100.c | 2 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 9 +- + drivers/remoteproc/wkup_m3_rproc.c | 41 +- + drivers/reset/Kconfig | 3 +- + drivers/reset/core.c | 73 + + drivers/reset/reset-meson.c | 8 +- + drivers/reset/reset-socfpga.c | 11 +- + drivers/reset/reset-ti-syscon.c | 4 +- + drivers/s390/cio/vfio_ccw_ops.c | 26 + + drivers/s390/cio/vfio_ccw_private.h | 4 + + 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/3w-9xxx.c | 30 +- + drivers/scsi/3w-sas.c | 32 +- + drivers/scsi/NCR5380.c | 92 +- + drivers/scsi/NCR5380.h | 3 +- + drivers/scsi/aacraid/commctrl.c | 22 +- + drivers/scsi/aacraid/commsup.c | 1 + + drivers/scsi/aacraid/linit.c | 95 +- + drivers/scsi/advansys.c | 16 +- + drivers/scsi/aha1740.c | 1 + + drivers/scsi/aic7xxx/aic79xx.h | 12 +- + drivers/scsi/aic7xxx/aic79xx_core.c | 12 +- + drivers/scsi/aic7xxx/aic79xx_osm.c | 3 +- + drivers/scsi/aic7xxx/aic79xx_osm_pci.c | 43 +- + drivers/scsi/aic7xxx/aic79xx_pci.c | 6 +- + drivers/scsi/aic7xxx/aic7xxx.h | 10 +- + drivers/scsi/aic7xxx/aic7xxx_core.c | 10 +- + drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | 46 +- + drivers/scsi/aic7xxx/aic7xxx_pci.c | 4 +- + drivers/scsi/aic94xx/aic94xx_scb.c | 2 + + drivers/scsi/aic94xx/aic94xx_task.c | 3 +- + drivers/scsi/arcmsr/arcmsr.h | 1 + + drivers/scsi/arcmsr/arcmsr_hba.c | 55 +- + drivers/scsi/atari_scsi.c | 10 +- + drivers/scsi/be2iscsi/be_main.c | 2 +- + drivers/scsi/be2iscsi/be_mgmt.c | 4 - + drivers/scsi/bfa/bfa_fcs_lport.c | 2 +- + drivers/scsi/bfa/bfa_ioc.c | 6 +- + drivers/scsi/bnx2fc/bnx2fc.h | 1 - + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 6 +- + drivers/scsi/bnx2fc/bnx2fc_hwi.c | 1 - + drivers/scsi/csiostor/csio_wr.c | 1 + + drivers/scsi/dc395x.c | 15 +- + drivers/scsi/device_handler/scsi_dh_alua.c | 10 +- + drivers/scsi/esas2r/esas2r.h | 5 +- + drivers/scsi/esas2r/esas2r_disc.c | 3 +- + drivers/scsi/esas2r/esas2r_init.c | 53 +- + drivers/scsi/esas2r/esas2r_int.c | 8 +- + drivers/scsi/esas2r/esas2r_main.c | 11 +- + drivers/scsi/fcoe/fcoe.c | 3 +- + drivers/scsi/fcoe/fcoe_sysfs.c | 4 +- + drivers/scsi/fnic/fnic.h | 3 +- + drivers/scsi/fnic/fnic_fcs.c | 10 +- + drivers/scsi/fnic/fnic_main.c | 3 + + drivers/scsi/fnic/fnic_scsi.c | 17 +- + drivers/scsi/g_NCR5380.c | 12 +- + drivers/scsi/hisi_sas/hisi_sas.h | 28 - + drivers/scsi/hisi_sas/hisi_sas_main.c | 1390 +----- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 1295 +++++- + drivers/scsi/hpsa.c | 38 +- + drivers/scsi/hptiop.c | 1 - + drivers/scsi/ibmvscsi/ibmvfc.c | 195 +- + drivers/scsi/ibmvscsi/ibmvfc.h | 28 +- + drivers/scsi/ipr.c | 1 - + drivers/scsi/isci/init.c | 18 +- + 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 | 15 +- + drivers/scsi/lpfc/lpfc_attr.c | 89 +- + drivers/scsi/lpfc/lpfc_bsg.c | 139 +- + drivers/scsi/lpfc/lpfc_crtn.h | 18 +- + drivers/scsi/lpfc/lpfc_ct.c | 452 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 23 +- + drivers/scsi/lpfc/lpfc_disc.h | 47 +- + drivers/scsi/lpfc/lpfc_els.c | 1298 +++--- + drivers/scsi/lpfc/lpfc_hbadisc.c | 797 ++-- + drivers/scsi/lpfc/lpfc_hw.h | 7 +- + drivers/scsi/lpfc/lpfc_hw4.h | 22 +- + drivers/scsi/lpfc/lpfc_init.c | 290 +- + drivers/scsi/lpfc/lpfc_mem.c | 11 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 215 +- + drivers/scsi/lpfc/lpfc_nvme.c | 381 +- + drivers/scsi/lpfc/lpfc_nvme.h | 4 +- + drivers/scsi/lpfc/lpfc_nvmet.c | 77 +- + drivers/scsi/lpfc/lpfc_scsi.c | 1177 +++-- + drivers/scsi/lpfc/lpfc_sli.c | 744 +++- + drivers/scsi/lpfc/lpfc_sli.h | 7 +- + drivers/scsi/lpfc/lpfc_sli4.h | 14 +- + drivers/scsi/lpfc/lpfc_version.h | 4 +- + drivers/scsi/lpfc/lpfc_vport.c | 128 +- + drivers/scsi/mac_scsi.c | 10 +- + drivers/scsi/megaraid/megaraid_sas.h | 2 - + drivers/scsi/megaraid/megaraid_sas_base.c | 188 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 437 +- + drivers/scsi/mpt3sas/mpt3sas_base.h | 145 +- + drivers/scsi/mpt3sas/mpt3sas_config.c | 760 ++++ + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 6 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 1285 +++++- + drivers/scsi/mpt3sas/mpt3sas_transport.c | 312 +- + drivers/scsi/mpt3sas/mpt3sas_trigger_pages.h | 94 + + drivers/scsi/mvumi.c | 50 +- + drivers/scsi/myrb.c | 1 - + drivers/scsi/myrs.c | 1 - + drivers/scsi/pcmcia/nsp_cs.c | 2 - + drivers/scsi/pm8001/pm8001_ctl.c | 7 +- + drivers/scsi/pm8001/pm8001_hwi.c | 1456 +++---- + drivers/scsi/pm8001/pm8001_init.c | 164 +- + drivers/scsi/pm8001/pm8001_sas.c | 149 +- + drivers/scsi/pm8001/pm8001_sas.h | 47 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 1728 ++++---- + drivers/scsi/pm8001/pm80xx_hwi.h | 6 + + drivers/scsi/pmcraid.c | 44 +- + drivers/scsi/qedf/qedf.h | 1 - + drivers/scsi/qedi/qedi_main.c | 4 +- + drivers/scsi/qla2xxx/qla_def.h | 10 +- + drivers/scsi/qla2xxx/qla_gs.c | 8 +- + drivers/scsi/qla2xxx/qla_init.c | 77 +- + drivers/scsi/qla2xxx/qla_isr.c | 34 +- + drivers/scsi/qla2xxx/qla_mbx.c | 10 +- + drivers/scsi/qla2xxx/qla_nvme.c | 14 +- + drivers/scsi/qla2xxx/qla_nx.c | 27 +- + drivers/scsi/qla2xxx/qla_nx2.c | 4 +- + drivers/scsi/qla2xxx/qla_os.c | 53 +- + drivers/scsi/qla2xxx/qla_sup.c | 10 +- + drivers/scsi/qla2xxx/qla_target.c | 24 +- + drivers/scsi/qla2xxx/qla_target.h | 1 + + drivers/scsi/qla2xxx/qla_tmpl.c | 9 +- + drivers/scsi/qla2xxx/qla_tmpl.h | 2 +- + drivers/scsi/qla2xxx/qla_version.h | 4 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 72 +- + drivers/scsi/qla4xxx/ql4_def.h | 4 +- + drivers/scsi/qla4xxx/ql4_glbl.h | 1 - + drivers/scsi/qla4xxx/ql4_nx.c | 95 +- + drivers/scsi/qla4xxx/ql4_os.c | 3 - + drivers/scsi/scsi_devinfo.c | 3 +- + drivers/scsi/scsi_lib.c | 149 +- + drivers/scsi/scsi_sysfs.c | 2 +- + drivers/scsi/scsi_transport_fc.c | 417 +- + drivers/scsi/scsi_transport_iscsi.c | 4 +- + drivers/scsi/smartpqi/smartpqi_init.c | 14 +- + drivers/scsi/smartpqi/smartpqi_sas_transport.c | 1 - + drivers/scsi/st.c | 1 - + drivers/scsi/stex.c | 1 + + drivers/scsi/sym53c8xx_2/sym_hipd.c | 1 - + drivers/scsi/ufs/Kconfig | 2 +- + drivers/scsi/ufs/cdns-pltfrm.c | 3 +- + drivers/scsi/ufs/ufs-exynos.c | 15 +- + drivers/scsi/ufs/ufs-exynos.h | 13 - + drivers/scsi/ufs/ufs-hisi.c | 13 +- + drivers/scsi/ufs/ufs-hisi.h | 13 - + drivers/scsi/ufs/ufs-mediatek-trace.h | 36 + + drivers/scsi/ufs/ufs-mediatek.c | 265 +- + drivers/scsi/ufs/ufs-mediatek.h | 34 +- + drivers/scsi/ufs/ufs-qcom.c | 40 +- + drivers/scsi/ufs/ufs-qcom.h | 11 - + drivers/scsi/ufs/ufs-sysfs.c | 7 + + drivers/scsi/ufs/ufs.h | 1 + + drivers/scsi/ufs/ufshcd-dwc.c | 11 +- + drivers/scsi/ufs/ufshcd-pltfrm.c | 38 +- + drivers/scsi/ufs/ufshcd-pltfrm.h | 1 + + drivers/scsi/ufs/ufshcd.c | 500 ++- + drivers/scsi/ufs/ufshcd.h | 151 +- + drivers/scsi/ufs/unipro.h | 6 +- + drivers/soc/Makefile | 2 +- + drivers/soc/amlogic/Kconfig | 12 +- + drivers/soc/amlogic/meson-canvas.c | 4 +- + drivers/soc/amlogic/meson-clk-measure.c | 5 +- + drivers/soc/amlogic/meson-ee-pwrc.c | 8 +- + drivers/soc/amlogic/meson-gx-pwrc-vpu.c | 7 +- + drivers/soc/amlogic/meson-secure-pwrc.c | 5 +- + drivers/soc/aspeed/Kconfig | 47 +- + drivers/soc/aspeed/Makefile | 1 + + drivers/soc/aspeed/aspeed-lpc-ctrl.c | 37 +- + drivers/soc/aspeed/aspeed-lpc-snoop.c | 2 + + drivers/soc/aspeed/aspeed-socinfo.c | 135 + + drivers/soc/atmel/soc.c | 6 + + drivers/soc/atmel/soc.h | 3 + + drivers/soc/bcm/brcmstb/pm/pm-arm.c | 2 + + drivers/soc/fsl/dpio/qbman-portal.c | 18 +- + drivers/soc/fsl/qbman/qman.c | 8 +- + drivers/soc/fsl/qe/qe_common.c | 2 +- + drivers/soc/fsl/rcpm.c | 35 +- + drivers/soc/mediatek/Kconfig | 22 + + drivers/soc/mediatek/Makefile | 2 + + drivers/soc/mediatek/mt8173-pm-domains.h | 94 + + drivers/soc/mediatek/mt8183-pm-domains.h | 221 + + drivers/soc/mediatek/mt8192-pm-domains.h | 292 ++ + drivers/soc/mediatek/mtk-cmdq-helper.c | 41 +- + drivers/soc/mediatek/mtk-devapc.c | 308 ++ + drivers/soc/mediatek/mtk-infracfg.c | 5 - + drivers/soc/mediatek/mtk-mmsys.c | 11 +- + drivers/soc/mediatek/mtk-pm-domains.c | 614 +++ + drivers/soc/mediatek/mtk-pm-domains.h | 102 + + drivers/soc/mediatek/mtk-scpsys.c | 5 +- + 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 | 147 +- + drivers/soc/qcom/pdr_interface.c | 8 +- + drivers/soc/qcom/qcom-geni-se.c | 9 +- + drivers/soc/qcom/qcom_aoss.c | 4 +- + drivers/soc/qcom/rpmh-rsc.c | 7 +- + drivers/soc/qcom/rpmh.c | 14 +- + drivers/soc/qcom/rpmhpd.c | 16 + + 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/socinfo.c | 6 + + drivers/soc/qcom/wcnss_ctrl.c | 8 +- + drivers/soc/renesas/rmobile-sysc.c | 17 +- + drivers/soc/rockchip/io-domain.c | 4 +- + drivers/soc/samsung/exynos-chipid.c | 11 +- + drivers/soc/samsung/exynos-pmu.c | 11 + + drivers/soc/samsung/exynos5422-asv.c | 2 +- + drivers/soc/samsung/s3c-pm-check.c | 2 +- + drivers/soc/sunxi/Kconfig | 8 + + drivers/soc/sunxi/Makefile | 1 + + drivers/soc/sunxi/sunxi_mbus.c | 132 + + drivers/soc/tegra/fuse/speedo-tegra124.c | 21 +- + drivers/soc/tegra/fuse/speedo-tegra210.c | 8 +- + drivers/soc/ti/Kconfig | 18 - + drivers/soc/ti/k3-ringacc.c | 423 +- + drivers/soc/ti/k3-socinfo.c | 1 + + drivers/soc/ti/knav_dma.c | 15 +- + drivers/soc/ti/knav_qmss_queue.c | 66 +- + drivers/soc/ti/omap_prm.c | 358 +- + drivers/soc/ti/pm33xx.c | 21 +- + drivers/soc/ti/pruss.c | 6 - + drivers/soc/ti/ti_sci_inta_msi.c | 12 + + drivers/soc/ti/wkup_m3_ipc.c | 8 +- + drivers/soc/xilinx/Kconfig | 1 + + drivers/soc/xilinx/xlnx_vcu.c | 96 +- + drivers/staging/media/sunxi/cedrus/cedrus.c | 1 - + drivers/staging/media/sunxi/cedrus/cedrus.h | 3 - + drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 18 - + drivers/target/loopback/tcm_loop.c | 14 +- + drivers/target/target_core_device.c | 59 +- + drivers/target/target_core_iblock.c | 1 + + drivers/target/target_core_pr.c | 1 + + 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 +- + drivers/tee/optee/device.c | 2 +- + drivers/vfio/mdev/mdev_core.c | 4 + + drivers/vfio/mdev/vfio_mdev.c | 13 + + drivers/vfio/pci/vfio_pci.c | 7 +- + drivers/vfio/pci/vfio_pci_nvlink2.c | 7 +- + drivers/vfio/vfio.c | 18 + + drivers/vfio/vfio_iommu_type1.c | 24 + + drivers/video/backlight/pwm_bl.c | 70 +- + fs/ceph/addr.c | 6 +- + fs/ceph/caps.c | 27 +- + fs/ceph/debugfs.c | 20 + + fs/ceph/dir.c | 9 +- + fs/ceph/inode.c | 41 +- + fs/ceph/locks.c | 8 +- + fs/ceph/mds_client.c | 280 +- + fs/ceph/mds_client.h | 3 +- + fs/ceph/mdsmap.c | 25 +- + fs/ceph/metric.c | 18 +- + fs/ceph/metric.h | 14 + + fs/ceph/quota.c | 58 +- + fs/ceph/super.c | 14 +- + fs/ceph/super.h | 7 +- + fs/ceph/xattr.c | 81 +- + fs/crypto/fname.c | 4 - + fs/crypto/fscrypt_private.h | 1 - + fs/crypto/hooks.c | 1 - + fs/ext2/dir.c | 14 +- + fs/ext2/ext2.h | 7 + + fs/ext2/inode.c | 1 + + fs/ext2/namei.c | 15 +- + fs/ext2/super.c | 2 +- + fs/ext4/dir.c | 7 - + fs/ext4/ext4.h | 4 - + fs/ext4/namei.c | 1 + + fs/ext4/super.c | 5 - + fs/f2fs/acl.c | 2 +- + fs/f2fs/checkpoint.c | 37 +- + fs/f2fs/compress.c | 26 +- + fs/f2fs/compress.h | 0 + fs/f2fs/data.c | 211 +- + fs/f2fs/debug.c | 11 +- + fs/f2fs/dir.c | 105 +- + fs/f2fs/f2fs.h | 181 +- + fs/f2fs/file.c | 422 +- + fs/f2fs/gc.c | 4 +- + fs/f2fs/hash.c | 11 +- + fs/f2fs/inline.c | 11 +- + fs/f2fs/inode.c | 3 + + fs/f2fs/namei.c | 1 + + fs/f2fs/node.c | 41 +- + fs/f2fs/node.h | 4 +- + fs/f2fs/recovery.c | 16 +- + fs/f2fs/segment.c | 51 +- + fs/f2fs/shrinker.c | 4 +- + fs/f2fs/super.c | 68 +- + fs/f2fs/sysfs.c | 5 +- + fs/fs-writeback.c | 4 - + fs/fuse/acl.c | 6 + + fs/fuse/dir.c | 60 +- + fs/fuse/file.c | 41 +- + fs/fuse/fuse_i.h | 41 +- + fs/fuse/inode.c | 61 +- + fs/fuse/readdir.c | 4 +- + fs/fuse/virtio_fs.c | 47 +- + fs/fuse/xattr.c | 9 + + fs/libfs.c | 70 + + fs/lockd/host.c | 22 +- + fs/nfs/client.c | 8 +- + fs/nfs/dir.c | 719 ++-- + fs/nfs/flexfilelayout/flexfilelayout.c | 17 +- + fs/nfs/fs_context.c | 21 +- + fs/nfs/inode.c | 9 +- + fs/nfs/internal.h | 6 - + fs/nfs/nfs2xdr.c | 19 +- + fs/nfs/nfs3proc.c | 83 +- + fs/nfs/nfs3xdr.c | 29 +- + fs/nfs/nfs42proc.c | 48 +- + fs/nfs/nfs42xdr.c | 101 +- + fs/nfs/nfs4client.c | 2 +- + fs/nfs/nfs4proc.c | 71 +- + fs/nfs/nfs4session.h | 2 +- + fs/nfs/nfs4super.c | 2 +- + fs/nfs/nfs4trace.h | 75 + + fs/nfs/nfs4xdr.c | 48 +- + fs/nfs/pnfs.c | 33 +- + fs/nfs/pnfs.h | 7 + + fs/nfs/pnfs_dev.c | 23 +- + fs/nfs/pnfs_nfs.c | 105 +- + fs/nfs/proc.c | 18 +- + fs/nfsd/filecache.c | 2 +- + fs/notify/dnotify/dnotify.c | 2 +- + fs/notify/fanotify/fanotify.c | 7 +- + fs/notify/fsnotify.c | 107 +- + fs/notify/inotify/inotify.h | 9 +- + fs/notify/inotify/inotify_fsnotify.c | 51 +- + fs/notify/inotify/inotify_user.c | 31 +- + fs/overlayfs/copy_up.c | 28 +- + fs/overlayfs/export.c | 10 +- + fs/overlayfs/file.c | 144 +- + fs/overlayfs/inode.c | 14 +- + fs/overlayfs/namei.c | 28 +- + fs/overlayfs/overlayfs.h | 22 +- + fs/overlayfs/ovl_entry.h | 2 + + fs/overlayfs/super.c | 95 +- + fs/overlayfs/util.c | 18 +- + fs/quota/dquot.c | 2 +- + fs/quota/quota_tree.c | 8 +- + fs/quota/quota_v2.c | 19 + + fs/reiserfs/stree.c | 6 + + fs/remap_range.c | 10 +- + fs/ubifs/dir.c | 1 + + fs/xattr.c | 17 +- + include/dt-bindings/clock/axg-clkc.h | 25 + + include/dt-bindings/clock/dra7.h | 4 + + include/dt-bindings/clock/imx8-lpcg.h | 14 + + include/dt-bindings/dma/jz4775-dma.h | 44 + + include/dt-bindings/dma/qcom-gpi.h | 11 + + include/dt-bindings/dma/x2000-dma.h | 54 + + include/dt-bindings/gpio/msc313-gpio.h | 53 + + include/dt-bindings/interconnect/qcom,sdm845.h | 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/dt-bindings/power/mt8183-power.h | 26 + + include/dt-bindings/power/mt8192-power.h | 32 + + include/dt-bindings/power/qcom-rpmpd.h | 34 + + include/linux/capability.h | 2 +- + include/linux/ceph/auth.h | 68 +- + include/linux/ceph/ceph_features.h | 11 +- + include/linux/ceph/ceph_fs.h | 44 +- + include/linux/ceph/decode.h | 8 + + include/linux/ceph/libceph.h | 11 +- + include/linux/ceph/mdsmap.h | 2 +- + include/linux/ceph/messenger.h | 285 +- + include/linux/ceph/msgr.h | 66 +- + include/linux/ceph/osdmap.h | 4 +- + include/linux/dma-iommu.h | 8 + + include/linux/dma-map-ops.h | 3 + + include/linux/dma-mapping.h | 9 - + include/linux/dma/k3-event-router.h | 16 + + include/linux/dma/k3-psil.h | 16 + + include/linux/dma/k3-udma-glue.h | 12 + + include/linux/dma/qcom-gpi-dma.h | 83 + + include/linux/dmaengine.h | 19 + + include/linux/f2fs_fs.h | 2 +- + include/linux/firmware/imx/dsp.h | 10 + + include/linux/firmware/imx/ipc.h | 13 + + include/linux/firmware/imx/sci.h | 27 + + include/linux/firmware/imx/svc/misc.h | 19 + + include/linux/firmware/xlnx-zynqmp.h | 45 +- + include/linux/fs.h | 1 + + include/linux/fscrypt.h | 7 +- + include/linux/fsnotify_backend.h | 9 +- + include/linux/hid.h | 3 +- + include/linux/io-pgtable.h | 11 - + include/linux/ioasid.h | 10 +- + include/linux/iommu.h | 1 + + include/linux/iova.h | 21 - + include/linux/mailbox/arm_mhuv2_message.h | 20 + + include/linux/mdev.h | 4 + + include/linux/memblock.h | 18 +- + include/linux/mfd/madera/core.h | 1 + + include/linux/mfd/madera/registers.h | 635 --- + include/linux/mfd/rt5033-private.h | 28 +- + include/linux/mfd/si476x-core.h | 2 +- + include/linux/mfd/syscon.h | 11 + + include/linux/mfd/syscon/xlnx-vcu.h | 39 + + include/linux/mfd/tps65910.h | 40 - + 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/spi-nor.h | 55 +- + include/linux/mtd/spinand.h | 9 + + include/linux/nfs_fs.h | 9 +- + include/linux/nfs_xdr.h | 17 +- + include/linux/pinctrl/pinctrl.h | 4 +- + include/linux/platform_data/atmel.h | 12 - + include/linux/platform_data/mtd-mxc_nand.h | 19 - + include/linux/platform_data/ti-sysc.h | 1 + + include/linux/qcom-geni-se.h | 2 - + include/linux/quota.h | 15 +- + include/linux/reset.h | 1 + + include/linux/scmi_protocol.h | 288 +- + include/linux/serial_s3c.h | 2 +- + include/linux/soc/mediatek/infracfg.h | 107 + + include/linux/soc/mediatek/mtk-cmdq.h | 10 +- + include/linux/soc/mediatek/mtk-mmsys.h | 33 + + include/linux/soc/qcom/llcc-qcom.h | 6 + + include/linux/soc/ti/k3-ringacc.h | 22 + + include/linux/soc/ti/ti_sci_protocol.h | 85 +- + include/linux/sunrpc/xdr.h | 27 +- + include/linux/sunrpc/xprt.h | 3 +- + include/linux/swiotlb.h | 8 + + include/linux/vfio.h | 4 + + include/memory/renesas-rpc-if.h | 13 +- + include/rdma/ib_umem.h | 42 + + include/rdma/ib_verbs.h | 198 +- + include/rdma/restrack.h | 24 + + include/rdma/uverbs_ioctl.h | 25 +- + include/rdma/uverbs_types.h | 9 +- + include/scsi/fc_frame.h | 30 + + include/scsi/scsi_transport_fc.h | 36 + + include/soc/tegra/mc.h | 27 + + include/target/target_core_base.h | 22 +- + include/target/target_core_fabric.h | 2 +- + include/trace/events/f2fs.h | 1 + + include/trace/events/rpcrdma.h | 450 +- + include/trace/events/ufs.h | 24 +- + include/uapi/linux/f2fs.h | 98 + + include/uapi/linux/fuse.h | 30 +- + include/uapi/linux/hidraw.h | 6 + + include/uapi/linux/idxd.h | 79 + + include/uapi/linux/vfio.h | 1 + + include/uapi/rdma/hns-abi.h | 10 + + include/uapi/rdma/ib_user_verbs.h | 14 - + include/uapi/rdma/rdma_user_rxe.h | 21 + + include/uapi/scsi/fc/fc_els.h | 114 +- + kernel/audit_fsnotify.c | 2 +- + kernel/audit_tree.c | 2 +- + kernel/audit_watch.c | 2 +- + kernel/dma/Kconfig | 5 - + kernel/dma/Makefile | 1 - + kernel/dma/direct.c | 1 - + kernel/dma/swiotlb.c | 20 +- + kernel/dma/virt.c | 61 - + mm/memblock.c | 3 + + net/ceph/Kconfig | 3 + + net/ceph/Makefile | 3 +- + net/ceph/auth.c | 408 +- + net/ceph/auth_none.c | 5 +- + net/ceph/auth_x.c | 298 +- + net/ceph/auth_x_protocol.h | 3 +- + net/ceph/ceph_common.c | 63 + + net/ceph/ceph_strings.c | 28 + + net/ceph/crypto.h | 3 + + net/ceph/decode.c | 101 + + net/ceph/messenger.c | 2252 ++-------- + net/ceph/messenger_v1.c | 1506 +++++++ + net/ceph/messenger_v2.c | 3443 +++++++++++++++ + net/ceph/mon_client.c | 320 +- + net/ceph/osd_client.c | 111 +- + net/ceph/osdmap.c | 45 +- + net/rds/ib.c | 10 - + net/rds/ib.h | 13 - + net/rds/ib_cm.c | 128 +- + net/rds/ib_recv.c | 18 +- + net/rds/ib_send.c | 8 + + net/sunrpc/clnt.c | 5 +- + net/sunrpc/debugfs.c | 4 +- + net/sunrpc/sched.c | 65 +- + net/sunrpc/xdr.c | 817 ++-- + net/sunrpc/xprt.c | 117 +- + net/sunrpc/xprtrdma/backchannel.c | 6 +- + net/sunrpc/xprtrdma/frwr_ops.c | 81 +- + net/sunrpc/xprtrdma/module.c | 1 + + net/sunrpc/xprtrdma/rpc_rdma.c | 72 +- + net/sunrpc/xprtrdma/transport.c | 8 +- + net/sunrpc/xprtrdma/verbs.c | 30 +- + net/sunrpc/xprtrdma/xprt_rdma.h | 9 +- + net/sunrpc/xprtsock.c | 7 +- + samples/hidraw/hid-example.c | 2 +- + samples/qmi/qmi_sample_client.c | 4 +- + security/commoncap.c | 3 +- + tools/testing/scatterlist/main.c | 64 +- + 1795 files changed, 100402 insertions(+), 28581 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-fc_host + create mode 100644 Documentation/ABI/testing/sysfs-class-fc_remote_ports + create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm4908.yaml + create mode 100644 Documentation/devicetree/bindings/arm/mstar/mstar,smpctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/picoxcell.txt + 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/crypto/picochip-spacc.txt + 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 Documentation/devicetree/bindings/dma/qcom,gpi.yaml + create mode 100644 Documentation/devicetree/bindings/dma/ti/k3-bcdma.yaml + create mode 100644 Documentation/devicetree/bindings/dma/ti/k3-pktdma.yaml + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-gate.txt + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-gate.yaml + delete mode 100644 Documentation/devicetree/bindings/leds/leds-pwm.txt + create mode 100644 Documentation/devicetree/bindings/leds/leds-pwm.yaml + create mode 100644 Documentation/devicetree/bindings/mailbox/arm,mhuv2.yaml + 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 + delete mode 100644 Documentation/devicetree/bindings/misc/fsl,dpaa2-console.txt + create mode 100644 Documentation/devicetree/bindings/misc/fsl,dpaa2-console.yaml + create mode 100644 Documentation/devicetree/bindings/mtd/intel,lgm-nand.yaml + create mode 100644 Documentation/devicetree/bindings/mtd/partitions/fixed-partitions.yaml + create mode 100644 Documentation/devicetree/bindings/mtd/rockchip,nand-controller.yaml + delete mode 100644 Documentation/devicetree/bindings/net/dsa/b53.txt + create mode 100644 Documentation/devicetree/bindings/net/dsa/brcm,b53.yaml + create mode 100644 Documentation/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/microchip,sparx5-sgpio.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,lpass-lpi-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8953-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sc7280-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sdx55-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/power/mediatek,power-controller.yaml + create mode 100644 Documentation/devicetree/bindings/soc/mediatek/devapc.yaml + create mode 100644 Documentation/devicetree/bindings/soc/xilinx/xlnx,vcu-settings.yaml + create mode 100644 Documentation/devicetree/bindings/usb/st,stusb160x.yaml + create mode 100644 Documentation/hid/amd-sfh-hid.rst + create mode 100644 arch/arm/boot/dts/armada-382-rd-ac3x-48g4x2xl.dts + 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 + 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/aspeed-bmc-ibm-rainier-4u.dts + create mode 100644 arch/arm/boot/dts/ast2400-facebook-netbmc-common.dtsi + create mode 100644 arch/arm/boot/dts/exynos4412-p4note-n8010.dts + create mode 100644 arch/arm/boot/dts/exynos4412-p4note.dtsi + 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/imx6qp-prtwd3.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/arm/boot/dts/imx7d-flex-concentrator-mfg.dts + create mode 100644 arch/arm/boot/dts/imx7d-flex-concentrator.dts + create mode 100644 arch/arm/boot/dts/mstar-infinity2m-ssd202d-ssd201htv2.dts + create mode 100644 arch/arm/boot/dts/mstar-infinity2m-ssd202d.dtsi + create mode 100644 arch/arm/boot/dts/mstar-infinity2m-ssd20xd.dtsi + create mode 100644 arch/arm/boot/dts/mstar-infinity2m.dtsi + create mode 100644 arch/arm/boot/dts/nuvoton-npcm730-gsj-gpio.dtsi + create mode 100644 arch/arm/boot/dts/nuvoton-npcm730-gsj.dts + create mode 100644 arch/arm/boot/dts/nuvoton-npcm730-kudo.dts + create mode 100644 arch/arm/boot/dts/nuvoton-npcm730.dtsi + create mode 100644 arch/arm/boot/dts/nuvoton-npcm750-pincfg-evb.dtsi + create mode 100644 arch/arm/boot/dts/nuvoton-npcm750-runbmc-olympus-pincfg.dtsi + create mode 100644 arch/arm/boot/dts/nuvoton-npcm750-runbmc-olympus.dts + create mode 100644 arch/arm/boot/dts/openbmc-flash-layout-64.dtsi + create mode 100644 arch/arm/boot/dts/stm32mp157c-dhcom-picoitx.dts + create mode 100644 arch/arm/boot/dts/stm32mp15xx-dhcom-picoitx.dtsi + 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 + create mode 100644 arch/arm/boot/dts/tegra124-peripherals-opp.dtsi + create mode 100644 arch/arm/boot/dts/tegra20-peripherals-opp.dtsi + create mode 100644 arch/arm/boot/dts/tegra30-ouya.dts + create mode 100644 arch/arm/boot/dts/tegra30-peripherals-opp.dtsi + create mode 100644 arch/arm/boot/dts/zynq-zturn-common.dtsi + create mode 100644 arch/arm/boot/dts/zynq-zturn-v5.dts + delete mode 100644 arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h + delete mode 100644 arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c + delete mode 100644 arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c + delete mode 100644 arch/arm/mach-omap2/omap_hwmod_33xx_data.c + delete mode 100644 arch/arm/mach-omap2/omap_hwmod_43xx_data.c + create mode 100644 arch/arm64/boot/dts/broadcom/bcm4908/Makefile + create mode 100644 arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts + create mode 100644 arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.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 arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts + create mode 100644 arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt6779-evb.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt6779.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8167-pinfunc.h + create mode 100644 arch/arm64/boot/dts/mediatek/mt8167-pumpkin.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8167.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8192-evb.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8192.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8994-msft-lumia-cityman.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-lite.dtsi + 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 + create mode 100644 arch/arm64/boot/dts/qcom/sm8150-hdk.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8250-hdk.dts + 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 + 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-of10.dts + 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 + create mode 100644 drivers/dma/qcom/gpi.c + create mode 100644 drivers/dma/qcom/qcom_adm.c + create mode 100644 drivers/dma/ti/k3-psil-am64.c + 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 + create mode 100644 drivers/iommu/iommu-sva-lib.c + create mode 100644 drivers/iommu/iommu-sva-lib.h + create mode 100644 drivers/mailbox/arm_mhuv2.c + create mode 100644 drivers/mtd/nand/ecc-sw-bch.c + rename drivers/mtd/nand/{raw/nand_ecc.c => ecc-sw-hamming.c} (61%) + create mode 100644 drivers/mtd/nand/raw/intel-nand-controller.c + delete mode 100644 drivers/mtd/nand/raw/nand_bch.c + create mode 100644 drivers/mtd/nand/raw/rockchip-nand-controller.c + delete mode 100644 drivers/pinctrl/freescale/pinctrl-imx21.c + 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 + create mode 100644 drivers/pinctrl/pinctrl-microchip-sgpio.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-lpass-lpi.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-msm8953.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sc7280.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sdx55.c + rename {include/scsi => drivers/scsi/libfc}/fc_encode.h (94%) + create mode 100644 drivers/scsi/mpt3sas/mpt3sas_trigger_pages.h + create mode 100644 drivers/scsi/ufs/ufs-mediatek-trace.h + create mode 100644 drivers/soc/aspeed/aspeed-socinfo.c + create mode 100644 drivers/soc/mediatek/mt8173-pm-domains.h + create mode 100644 drivers/soc/mediatek/mt8183-pm-domains.h + create mode 100644 drivers/soc/mediatek/mt8192-pm-domains.h + create mode 100644 drivers/soc/mediatek/mtk-devapc.c + create mode 100644 drivers/soc/mediatek/mtk-pm-domains.c + create mode 100644 drivers/soc/mediatek/mtk-pm-domains.h + create mode 100644 drivers/soc/sunxi/sunxi_mbus.c + create mode 100644 fs/f2fs/compress.h + create mode 100644 include/dt-bindings/clock/imx8-lpcg.h + create mode 100644 include/dt-bindings/dma/jz4775-dma.h + create mode 100644 include/dt-bindings/dma/qcom-gpi.h + create mode 100644 include/dt-bindings/dma/x2000-dma.h + create mode 100644 include/dt-bindings/gpio/msc313-gpio.h + create mode 100644 include/dt-bindings/power/mt8183-power.h + create mode 100644 include/dt-bindings/power/mt8192-power.h + create mode 100644 include/linux/dma/k3-event-router.h + create mode 100644 include/linux/dma/qcom-gpi-dma.h + create mode 100644 include/linux/mailbox/arm_mhuv2_message.h + create mode 100644 include/linux/mfd/syscon/xlnx-vcu.h + 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 + delete mode 100644 include/linux/platform_data/mtd-mxc_nand.h + create mode 100644 include/uapi/linux/f2fs.h + delete mode 100644 kernel/dma/virt.c + create mode 100644 net/ceph/messenger_v1.c + create mode 100644 net/ceph/messenger_v2.c +Merging fixes/fixes (9223e74f9960 Merge tag 'io_uring-5.10-2020-11-27' of git://git.kernel.dk/linux-block) +$ git merge fixes/fixes +Already up to date. +Merging kbuild-current/fixes (7d32358be8ac kbuild: avoid split lines in .mod files) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (3a71e423133a ARC: build: use $(READELF) instead of hard-coded readelf) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/Makefile | 20 +++++++++++++------- + arch/arc/boot/Makefile | 18 ++++-------------- + 2 files changed, 17 insertions(+), 21 deletions(-) +Merging arm-current/fixes (e64ab473ddda ARM: 9034/1: __div64_32(): straighten up inline asm constraints) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/include/asm/div64.h | 21 ++++++--------------- + 1 file changed, 6 insertions(+), 15 deletions(-) +Merging arm64-fixes/for-next/fixes (9fd339a45be5 arm64: Work around broken GCC 4.9 handling of "S" constraint) +$ git merge arm64-fixes/for-next/fixes +Auto-merging arch/arm64/mm/init.c +Auto-merging arch/arm64/kernel/topology.c +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/exception.h | 4 ++++ + arch/arm64/include/asm/kvm_asm.h | 8 +++++++- + arch/arm64/kernel/topology.c | 6 +----- + arch/arm64/mm/init.c | 3 +++ + 4 files changed, 15 insertions(+), 6 deletions(-) +Merging arm-soc-fixes/arm/fixes (43ffe817bfe3 arm64: dts: bitmain: Use generic "ngpios" rather than "snps,nr-gpios") +$ git merge arm-soc-fixes/arm/fixes +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/bitmain/bm1880.dtsi | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging drivers-memory-fixes/fixes (3650b228f83a Linux 5.10-rc1) +$ git merge drivers-memory-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (2ae92e8b9b7e MAINTAINERS: Update m68k Mac entry) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (5eedf9fe8db2 powerpc/mm: Fix KUAP warning by providing copy_from_kernel_nofault_allowed()) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (586592478b1f Merge tag 's390-5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) +$ git merge s390-fixes/fixes +Already up to date. +Merging sparc/master (0a95a6d1a4cd sparc: use for_each_child_of_node() macro) +$ git merge sparc/master +Auto-merging arch/sparc/mm/srmmu.c +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 +Already up to date. +Merging net/master (44d4775ca518 net/sched: sch_taprio: reset child qdiscs before freeing them) +$ git merge net/master +Merge made by the 'recursive' strategy. + Documentation/driver-api/connector.rst | 2 +- + drivers/connector/cn_queue.c | 8 ++-- + drivers/connector/connector.c | 4 +- + drivers/net/dsa/qca/ar9331.c | 33 ++++++++++++----- + drivers/net/ethernet/allwinner/sun4i-emac.c | 7 +++- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 2 +- + drivers/net/ethernet/ibm/ibmvnic.c | 9 ++--- + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 5 ++- + drivers/net/ethernet/intel/ice/ice_xsk.c | 5 ++- + drivers/net/ethernet/korina.c | 2 +- + .../ethernet/marvell/octeontx2/af/rvu_devlink.c | 3 +- + drivers/net/ethernet/microchip/lan743x_main.c | 43 ++++++++++++---------- + drivers/net/ethernet/mscc/ocelot_vsc7514.c | 8 +++- + drivers/net/ethernet/netronome/nfp/flower/main.c | 6 +-- + drivers/net/ethernet/ni/Kconfig | 2 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 1 + + drivers/net/hyperv/netvsc_drv.c | 11 ++---- + drivers/nfc/s3fwrn5/nci.c | 25 ------------- + drivers/nfc/s3fwrn5/nci.h | 22 ----------- + drivers/nfc/s3fwrn5/phy_common.c | 3 +- + include/linux/connector.h | 10 ++--- + include/linux/mlx5/mlx5_ifc.h | 6 +-- + include/linux/netdevice.h | 1 + + include/linux/phy.h | 3 +- + include/uapi/linux/devlink.h | 2 +- + net/core/dev.c | 22 ++++++++++- + net/ethtool/channels.c | 6 ++- + net/ethtool/strset.c | 2 +- + net/mptcp/options.c | 15 +++++--- + net/mptcp/protocol.c | 11 +++--- + net/mptcp/protocol.h | 2 +- + net/sched/sch_taprio.c | 17 ++++++++- + net/smc/smc_ib.c | 36 +++++++++++------- + net/tipc/netlink_compat.c | 12 +++--- + tools/testing/selftests/net/mptcp/simult_flows.sh | 6 +-- + 36 files changed, 198 insertions(+), 158 deletions(-) +Merging bpf/master (1a3449c19407 selftests/bpf: Clarify build error if no vmlinux) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + tools/testing/selftests/bpf/Makefile | 3 +++ + 1 file changed, 3 insertions(+) +Merging ipsec/master (7f376f1917d7 Merge tag 'mtd/fixes-for-5.10-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux) +$ git merge ipsec/master +Already up to date. +Merging netfilter/master (3db1a3fa9880 Merge tag 'staging-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging) +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (3db1a3fa9880 Merge tag 'staging-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (4dfde294b979 rtlwifi: rise completion at the last step of firmware callback) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/mediatek/mt76/usb.c | 2 ++ + drivers/net/wireless/realtek/rtlwifi/core.c | 8 +++++--- + 2 files changed, 7 insertions(+), 3 deletions(-) +Merging mac80211/master (2c85ebc57b3e Linux 5.10) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (340b940ea0ed RDMA/cm: Fix an attempt to use non-valid pointer when cleaning timewait) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (725124d10d00 ALSA: usb-audio: Add VID to support native DSD reproduction on FiiO devices) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/core/memalloc.c | 3 ++- + sound/pci/hda/patch_realtek.c | 28 ++++++++++++++++++++++++++++ + sound/usb/quirks.c | 1 + + 3 files changed, 31 insertions(+), 1 deletion(-) +Merging sound-asoc-fixes/for-linus (20b7445d8aa1 Merge remote-tracking branch 'asoc/for-5.11' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Auto-merging sound/soc/codecs/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/ti,j721e-cpb-audio.yaml | 4 +++- + Documentation/devicetree/bindings/sound/ti,j721e-cpb-ivi-audio.yaml | 4 +++- + MAINTAINERS | 6 +++--- + sound/soc/atmel/Kconfig | 4 ++-- + sound/soc/codecs/Kconfig | 2 +- + sound/soc/fsl/imx-hdmi.c | 1 + + sound/soc/intel/skylake/cnl-sst.c | 1 + + sound/soc/soc-dapm.c | 1 + + sound/soc/sof/Kconfig | 2 +- + 9 files changed, 16 insertions(+), 9 deletions(-) +Merging regmap-fixes/for-linus (e6e9354b5830 regmap: Remove duplicate `type` field from regmap `regcache_sync` trace event) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (87a96de608de Merge remote-tracking branch 'regulator/for-5.11' into regulator-linus) +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml | 6 ++++-- + drivers/regulator/pf8x00-regulator.c | 8 ++++++-- + 2 files changed, 10 insertions(+), 4 deletions(-) +Merging spi-fixes/for-linus (58f7553fa424 Merge remote-tracking branch 'spi/for-5.10' into spi-linus) +$ git merge spi-fixes/for-linus +Already up to date. +Merging pci-current/for-linus (f8394f232b1e Linux 5.10-rc3) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (accefff5b547 Merge tag 'arm-soc-omap-genpd-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (5e60366d56c6 Merge tag 'fallthrough-fixes-clang-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (5e60366d56c6 Merge tag 'fallthrough-fixes-clang-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux) +$ git merge usb.current/usb-linus +Already up to date. +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 (0477e9288185 Linux 5.10-rc7) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/for-usb-fixes (e6c11a2dcaec usb: chipidea: ci_hdrc_imx: Pass DISABLE_DEVICE_STREAMING flag to imx6ul) +$ git merge usb-chipidea-fixes/for-usb-fixes +Auto-merging drivers/usb/chipidea/ci_hdrc_imx.c +Merge made by the 'recursive' strategy. +Merging phy/fixes (fb89b2544b64 phy: mediatek: fix spelling mistake in Kconfig "veriosn" -> "version") +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (5e60366d56c6 Merge tag 'fallthrough-fixes-clang-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (accefff5b547 Merge tag 'arm-soc-omap-genpd-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (3650b228f83a Linux 5.10-rc1) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (2c85ebc57b3e Linux 5.10) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (4b4193256c8d Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up to date. +Merging crypto-current/master (93cebeb1c21a crypto: qat - add capability detection logic in qat_4xxx) +$ 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 (5f24433c4a68 selftests: Skip BPF seftests by default) +$ git merge kselftest-fixes/fixes +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'recursive' strategy. + tools/testing/selftests/Makefile | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) +Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (418baf2c28f3 Linux 5.10-rc5) +$ git merge dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (bbf5c979011a Linux 5.9) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (33d974e76e21 mtd: rawnand: xway: Do not force a particular software ECC engine) +$ git merge mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (bbf5c979011a Linux 5.9) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (3d1387b3b8f6 media: vidtv: fix some warnings) +$ git merge v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (ac3b57adf87a MIPS: Alchemy: Fix memleak in alchemy_clk_setup_cpu) +$ git merge mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (c0bc969c176b ARM: omap2: pmic-cpcap: fix maximum voltage to be consistent with defaults on xt875) +$ git merge omap-fixes/fixes +Auto-merging arch/arm/mach-omap2/omap_device.c +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/omap3-n950-n9.dtsi | 8 ++++++++ + arch/arm/mach-omap2/omap_device.c | 8 +++++--- + arch/arm/mach-omap2/pmic-cpcap.c | 2 +- + 3 files changed, 14 insertions(+), 4 deletions(-) +Merging kvm-fixes/master (111d0bda8eeb tools/kvm_stat: Exempt time-based counters) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (735931f9a51a MAINTAINERS: add uv.c also to KVM/s390) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (5a531c7907ab hwmon: (k10temp) Remove support for displaying voltage and current on Zen CPUs) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + drivers/hwmon/k10temp.c | 98 ------------------------------------------------- + 1 file changed, 98 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 (462b8e885b92 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 (6220e48d9640 [regression fix] really dumb fuckup in sparc64 __csum_partial_copy() changes) +$ git merge vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (892fc9f6835e dma-pool: Fix an uninitialized variable bug in atomic_pool_expand()) +$ git merge dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7) +$ git merge i3c-fixes/master +Already up to date. +Merging drivers-x86-fixes/fixes (c9aa128080cb platform/x86: touchscreen_dmi: Add info for the Irbis TW118 tablet) +$ 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 +Already up to date. +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 (bdac39a3bd28 dt-bindings: clock: imx5: fix example) +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (4da3a54f5a02 Revert "scsi: storvsc: Validate length of incoming packet in storvsc_on_channel_callback()") +$ git merge scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (2c85ebc57b3e Linux 5.10) +$ 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 (7c5c15dffe1e drm/i915/gt: Declare gen9 has 64 mocs entries!) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (c0d638a03bc5 mmc: mediatek: mark PM functions as __maybe_unused) +$ git merge mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (9123e3a74ec7 Linux 5.9-rc1) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (48778464bb7d Linux 5.8-rc2) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (5f1251a48c17 video: hyperv_fb: Fix the cache type when mapping the VRAM) +$ git merge hyperv-fixes/hyperv-fixes +Already up to date. +Merging soc-fsl-fixes/fix (2663b3388551 soc: fsl: dpio: Get the cpumask through cpumask_of(cpu)) +$ git merge soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (ccbbfd1cbf36 RISC-V: Define get_cycles64() regardless of M-mode) +$ git merge risc-v-fixes/fixes +Already up to date. +Merging pidfd-fixes/fixes (aabe19b82793 nsproxy: use put_nsproxy() in switch_task_namespaces()) +$ git merge pidfd-fixes/fixes +Already up to date. +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 (5e60366d56c6 Merge tag 'fallthrough-fixes-clang-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux) +$ 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 (5f714771d01e pinctrl: baytrail: Avoid clearing debounce value when turning it off) +$ git merge pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (a30573b3cdc7 erofs: fix setting up pcluster for temporary pages) +$ git merge erofs-fixes/fixes +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 +Already up to date. +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 (fd4e788e971c drm/omap: sdi: fix bridge enable/disable) +$ git merge drm-misc-fixes/for-linux-next-fixes +Already up to date. +Merging kspp-gustavo/for-next/kspp (36f9ff9e03de lib: Fix fall-through warnings for Clang) +$ git merge kspp-gustavo/for-next/kspp +Already up to date. +Merging kbuild/for-next (6c02f6f4124b Merge branch 'kconfig' into for-next) +$ git merge kbuild/for-next +Auto-merging tools/testing/selftests/bpf/test_offload.py +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/kbuild/makefiles.rst | 365 ++++++++++++--------- + Documentation/kbuild/modules.rst | 2 +- + Documentation/sphinx/parse-headers.pl | 2 +- + Documentation/target/tcm_mod_builder.py | 2 +- + Documentation/trace/postprocess/decode_msr.py | 2 +- + .../postprocess/trace-pagealloc-postprocess.pl | 2 +- + .../trace/postprocess/trace-vmscan-postprocess.pl | 2 +- + Makefile | 4 +- + arch/ia64/scripts/unwcheck.py | 2 +- + scripts/Makefile.extrawarn | 1 - + scripts/bloat-o-meter | 2 +- + scripts/config | 2 +- + scripts/diffconfig | 2 +- + scripts/get_abi.pl | 2 +- + scripts/kconfig/conf.c | 1 - + scripts/kconfig/confdata.c | 1 + + scripts/kconfig/lexer.l | 1 - + scripts/kconfig/lkc.h | 4 + + scripts/kconfig/qconf-cfg.sh | 14 +- + scripts/kconfig/qconf.cc | 145 ++++---- + scripts/kconfig/symbol.c | 2 +- + scripts/show_delta | 2 +- + scripts/sphinx-pre-install | 2 +- + scripts/split-man.pl | 2 +- + scripts/tracing/draw_functrace.py | 2 +- + tools/perf/python/tracepoint.py | 2 +- + tools/perf/python/twatch.py | 2 +- + .../x86/intel_pstate_tracer/intel_pstate_tracer.py | 2 +- + tools/testing/ktest/compare-ktest-sample.pl | 2 +- + tools/testing/kunit/kunit.py | 2 +- + tools/testing/kunit/kunit_tool_test.py | 2 +- + tools/testing/selftests/bpf/test_offload.py | 2 +- + .../net/mlxsw/sharedbuffer_configuration.py | 2 +- + tools/testing/selftests/kselftest/prefix.pl | 2 +- + tools/testing/selftests/net/devlink_port_split.py | 2 +- + tools/testing/selftests/tc-testing/tdc_batch.py | 2 +- + .../testing/selftests/tc-testing/tdc_multibatch.py | 2 +- + 37 files changed, 333 insertions(+), 259 deletions(-) +Merging compiler-attributes/compiler-attributes (196793946264 Compiler Attributes: remove CONFIG_ENABLE_MUST_CHECK) +$ git merge compiler-attributes/compiler-attributes +Auto-merging lib/Kconfig.debug +Auto-merging include/linux/compiler_types.h +Merge made by the 'recursive' strategy. + include/linux/compiler_attributes.h | 6 ++++++ + include/linux/compiler_types.h | 6 ------ + lib/Kconfig.debug | 8 -------- + tools/testing/selftests/wireguard/qemu/debug.config | 1 - + 4 files changed, 6 insertions(+), 15 deletions(-) +Merging dma-mapping/for-next (f726c72d6c05 dma-mapping: benchmark: check the validity of dma mask bits) +$ git merge dma-mapping/for-next +Auto-merging kernel/dma/Makefile +Auto-merging kernel/dma/Kconfig +Auto-merging include/linux/dma-map-ops.h +Auto-merging arch/powerpc/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 + + arch/powerpc/Kconfig | 1 + + arch/powerpc/kernel/dma-iommu.c | 71 ++++- + arch/powerpc/platforms/pseries/iommu.c | 51 +++- + include/linux/dma-map-ops.h | 14 + + kernel/dma/Kconfig | 13 + + kernel/dma/Makefile | 1 + + kernel/dma/contiguous.c | 2 +- + kernel/dma/map_benchmark.c | 367 ++++++++++++++++++++++++ + kernel/dma/mapping.c | 12 +- + kernel/dma/pool.c | 3 - + tools/testing/selftests/dma/Makefile | 6 + + tools/testing/selftests/dma/config | 1 + + tools/testing/selftests/dma/dma_map_benchmark.c | 123 ++++++++ + 14 files changed, 651 insertions(+), 20 deletions(-) + create mode 100644 kernel/dma/map_benchmark.c + create mode 100644 tools/testing/selftests/dma/Makefile + create mode 100644 tools/testing/selftests/dma/config + create mode 100644 tools/testing/selftests/dma/dma_map_benchmark.c +Merging asm-generic/master (8eb42bcea5ae Merge branch 'asm-generic-fixes' into asm-generic) +$ git merge asm-generic/master +Already up to date! +Merge made by the 'recursive' strategy. +Merging arc/for-next (def9d2780727 Linux 5.5-rc7) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (54ef31c76628 Merge branch 'devel-stable' into for-next) +$ git merge arm/for-next +Auto-merging arch/arm/mm/init.c +Auto-merging arch/arm/mm/Makefile +Auto-merging arch/arm/kernel/entry-common.S +Auto-merging arch/arm/kernel/Makefile +Auto-merging arch/arm/include/asm/thread_info.h +Auto-merging arch/arm/include/asm/pgtable-2level.h +Auto-merging arch/arm/include/asm/fixmap.h +Auto-merging arch/arm/include/asm/elf.h +Auto-merging arch/arm/boot/compressed/head.S +Auto-merging arch/arm/boot/compressed/Makefile +Auto-merging arch/arm/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/Makefile | 2 +- + arch/arm/boot/compressed/Makefile | 1 + + arch/arm/boot/compressed/head.S | 60 ++--- + 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/pgtable-2level.h | 27 +- + 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 | 4 + + 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 | 28 +- + arch/arm/kernel/entry-common.S | 9 +- + arch/arm/kernel/head-common.S | 29 +- + arch/arm/kernel/head.S | 214 ++------------- + arch/arm/kernel/hyp-stub.S | 33 +-- + arch/arm/kernel/iwmmxt.S | 89 +++---- + arch/arm/kernel/iwmmxt.h | 47 ++++ + 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/smp.c | 15 +- + arch/arm/kernel/unwind.c | 9 +- + arch/arm/lib/memcpy.S | 4 +- + arch/arm/lib/memmove.S | 6 +- + arch/arm/lib/memset.S | 4 +- + arch/arm/mm/Kconfig | 1 + + 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 + + arch/arm/vfp/vfphw.S | 5 - + arch/arm/vfp/vfpmodule.c | 49 +++- + 51 files changed, 1245 insertions(+), 441 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/iwmmxt.h + create mode 100644 arch/arm/kernel/phys2virt.S + create mode 100644 arch/arm/mm/kasan_init.c +Merging arm64/for-next/core (95d1718c961e Merge remote-tracking branch 'arm64/for-next/iommu/core' into for-next/core) +$ git merge arm64/for-next/core +Already up to date! +Merge made by the 'recursive' strategy. +Merging arm-perf/for-next/perf (881b0520504a perf/imx_ddr: Add system PMU identifier for userspace) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (95c708fe26d2 Merge branch 'arm/fixes' into for-next) +$ git merge arm-soc/for-next +Auto-merging arch/mips/configs/mtx1_defconfig +Auto-merging arch/mips/configs/gpr_defconfig +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 235 +++++++++++++++++++++++++++++++++ + 1 file changed, 235 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging amlogic/for-next (517c49f849d7 Merge branch 'v5.11/soc' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging aspeed/for-next (41707a524026 Merge branches 'soc-for-v5.11' and 'defconfig-for-v5.11' into for-next) +$ git merge aspeed/for-next +Merge made by the 'recursive' strategy. + arch/arm/configs/aspeed_g5_defconfig | 4 ++++ + 1 file changed, 4 insertions(+) +Merging at91/at91-next (e77be1651978 Merge branches 'at91-drivers', 'at91-dt' and 'at91-defconfig' into at91-next) +$ git merge at91/at91-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging drivers-memory/for-next (1133e15678af Merge branch 'mem-ctrl-next' into for-next) +$ git merge drivers-memory/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (09690c0e0d1c Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-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. + 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 | 227 ++++++++++++++++++++++++++++++++++++- + drivers/clk/imx/clk-scu.h | 56 +++++++-- + drivers/clk/imx/clk.h | 27 ++--- + 12 files changed, 582 insertions(+), 136 deletions(-) +Merging keystone/next (b2a8f6ce4bdc Merge branch 'for_5.11/drivers-soc' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (727bfb2c55b0 Merge branch 'v5.10-next/soc' into for-next) +$ git merge mediatek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (dc14300bb67b Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (792952314166 Merge branch 'omap-for-v5.11/dt' into for-next) +$ git merge omap/for-next +Auto-merging arch/arm/configs/omap2plus_defconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am335x-evm.dts | 13 ++++++---- + arch/arm/boot/dts/am335x-evmsk.dts | 14 +++++------ + arch/arm/boot/dts/am335x-icev2.dts | 14 +++++------ + arch/arm/boot/dts/am33xx-l4.dtsi | 49 ++++++++++++++++++++++++++++++++++++ + arch/arm/boot/dts/am574x-idk.dts | 4 +++ + arch/arm/boot/dts/dra71-evm.dts | 2 ++ + arch/arm/boot/dts/dra76x.dtsi | 36 ++++++++++++++++++++++++++ + arch/arm/boot/dts/omap3-gta04.dtsi | 4 +-- + arch/arm/configs/omap2plus_defconfig | 2 +- + 9 files changed, 114 insertions(+), 24 deletions(-) +Merging qcom/for-next (d7288346e0a4 Merge branches 'arm64-for-5.11', 'arm64-defconfig-for-5.11', 'drivers-for-5.11' and 'dts-for-5.11' into for-next) +$ git merge qcom/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging raspberrypi/for-next (278407a53c3b ARM: dts: bcm283x: increase dwc2's RX FIFO size) +$ 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 (c51a6c86347a Merge branch 'renesas-drivers-for-v5.11' into renesas-next) +$ git merge renesas/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging reset/reset/next (69e392526dc2 dt-bindings: reset: convert Hisilicon reset controller bindings to json-schema) +$ git merge reset/reset/next +Auto-merging drivers/reset/Kconfig +Removing Documentation/devicetree/bindings/reset/hisilicon,hi3660-reset.txt +Merge made by the 'recursive' strategy. + .../reset/brcm,bcm4908-misc-pcie-reset.yaml | 39 +++++++++++ + .../bindings/reset/hisilicon,hi3660-reset.txt | 44 ------------- + .../bindings/reset/hisilicon,hi3660-reset.yaml | 77 ++++++++++++++++++++++ + drivers/reset/Kconfig | 2 +- + drivers/reset/hisilicon/reset-hi3660.c | 9 ++- + drivers/reset/reset-simple.c | 2 + + 6 files changed, 126 insertions(+), 47 deletions(-) + create mode 100644 Documentation/devicetree/bindings/reset/brcm,bcm4908-misc-pcie-reset.yaml + delete mode 100644 Documentation/devicetree/bindings/reset/hisilicon,hi3660-reset.txt + create mode 100644 Documentation/devicetree/bindings/reset/hisilicon,hi3660-reset.yaml +Merging rockchip/for-next (e15c5c9836dc Merge branch 'v5.11-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + drivers/clk/rockchip/Kconfig | 12 +++++++++++- + drivers/clk/rockchip/clk-rk3188.c | 35 ++++++++++++++++++----------------- + drivers/clk/rockchip/clk.c | 3 +-- + 3 files changed, 30 insertions(+), 20 deletions(-) +Merging samsung-krzk/for-next (72f4b57a4d4b Merge branch 'next/drivers' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. +Merging scmi/for-linux-next (0477e9288185 Linux 5.10-rc7) +$ git merge scmi/for-linux-next +Already up to date. +Merging stm32/stm32-next (814fddb955f8 ARM: multi_v7_defconfig: enable STM32 dfsdm audio support) +$ git merge stm32/stm32-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging Documentation/devicetree/bindings/connector/usb-connector.yaml +Auto-merging Documentation/devicetree/bindings/arm/stm32/stm32.yaml +Auto-merging Documentation/devicetree/bindings/arm/stm32/st,stm32-syscon.yaml +Merge made by the 'recursive' strategy. +Merging sunxi/sunxi/for-next (9e3b3fad3579 Merge branch 'sunxi/fixes-for-5.10' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging tegra/for-next (b11a0dfbd316 Merge branch for-5.11/arm64/defconfig into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + drivers/clk/tegra/clk-bpmp.c | 6 +++--- + drivers/clk/tegra/clk-dfll.c | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) +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 (de7caab0974f Merge branch 'ti-k3-dts-next' into ti-k3-next) +$ git merge ti-k3-new/ti-k3-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging clk/clk-next (83f01c0a3f87 Merge branch 'clk-trace' into clk-next) +$ git merge clk/clk-next +Auto-merging drivers/clk/samsung/Makefile +Auto-merging drivers/clk/samsung/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/clock/renesas,rcar-usb2-clock-sel.txt +Removing Documentation/devicetree/bindings/clock/axi-clkgen.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/adi,axi-clkgen.yaml | 53 + + .../devicetree/bindings/clock/axi-clkgen.txt | 25 - + .../bindings/clock/fsl,flexspi-clock.yaml | 55 + + .../bindings/clock/qcom,aoncc-sm8250.yaml | 58 + + .../bindings/clock/qcom,audiocc-sm8250.yaml | 58 + + .../devicetree/bindings/clock/qcom,gcc-sdx55.yaml | 77 + + .../devicetree/bindings/clock/qcom,rpmhcc.yaml | 2 + + .../bindings/clock/qcom,sc7180-camcc.yaml | 73 + + .../bindings/clock/renesas,rcar-usb2-clock-sel.txt | 68 - + .../clock/renesas,rcar-usb2-clock-sel.yaml | 100 ++ + .../bindings/clock/sifive/fu740-prci.yaml | 60 + + MAINTAINERS | 2 +- + arch/riscv/Kconfig.socs | 2 +- + arch/sh/boards/of-generic.c | 2 +- + arch/xtensa/kernel/time.c | 2 +- + drivers/clk/Kconfig | 11 +- + drivers/clk/Makefile | 1 + + drivers/clk/clk-axi-clkgen.c | 64 +- + drivers/clk/clk-composite.c | 50 + + drivers/clk/clk-divider.c | 34 + + drivers/clk/clk-fsl-flexspi.c | 106 ++ + drivers/clk/clk-fsl-sai.c | 14 +- + drivers/clk/clk-pwm.c | 2 +- + drivers/clk/clk-qoriq.c | 13 +- + drivers/clk/clk-scpi.c | 2 +- + drivers/clk/clk.c | 132 +- + drivers/clk/mediatek/clk-mux.c | 2 +- + drivers/clk/mediatek/clk-mux.h | 4 - + drivers/clk/meson/Kconfig | 7 +- + drivers/clk/meson/axg-aoclk.c | 5 +- + drivers/clk/meson/axg.c | 824 +++++++++- + drivers/clk/meson/axg.h | 23 +- + drivers/clk/meson/g12a-aoclk.c | 5 +- + drivers/clk/meson/g12a.c | 181 +- + drivers/clk/meson/g12a.h | 3 +- + drivers/clk/meson/gxbb-aoclk.c | 5 +- + drivers/clk/meson/gxbb.c | 5 +- + drivers/clk/meson/meson-aoclk.c | 4 + + drivers/clk/meson/meson-eeclk.c | 3 + + drivers/clk/qcom/Kconfig | 25 +- + drivers/clk/qcom/Makefile | 3 + + drivers/clk/qcom/camcc-sc7180.c | 1732 ++++++++++++++++++++ + drivers/clk/qcom/clk-alpha-pll.c | 217 ++- + drivers/clk/qcom/clk-alpha-pll.h | 4 + + drivers/clk/qcom/clk-rpmh.c | 56 + + drivers/clk/qcom/dispcc-sm8250.c | 1 + + drivers/clk/qcom/gcc-sc7180.c | 5 +- + drivers/clk/qcom/gcc-sdx55.c | 1659 +++++++++++++++++++ + drivers/clk/qcom/lpass-gfm-sm8250.c | 320 ++++ + drivers/clk/qcom/lpasscorecc-sc7180.c | 135 +- + drivers/clk/renesas/clk-sh73a0.c | 2 +- + drivers/clk/renesas/r8a774a1-cpg-mssr.c | 8 + + drivers/clk/renesas/r8a774b1-cpg-mssr.c | 8 + + drivers/clk/renesas/r8a774c0-cpg-mssr.c | 9 + + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 51 +- + drivers/clk/renesas/rcar-gen3-cpg.c | 79 +- + drivers/clk/renesas/rcar-gen3-cpg.h | 5 + + drivers/clk/renesas/rcar-usb2-clock-sel.c | 2 +- + drivers/clk/renesas/renesas-cpg-mssr.c | 3 +- + drivers/clk/samsung/Kconfig | 67 +- + drivers/clk/samsung/Makefile | 22 +- + drivers/clk/samsung/clk-pll.c | 147 +- + drivers/clk/sifive/Kconfig | 8 +- + drivers/clk/sifive/Makefile | 2 +- + drivers/clk/sifive/fu540-prci.c | 599 +------ + drivers/clk/sifive/fu540-prci.h | 21 + + drivers/clk/sifive/fu740-prci.c | 123 ++ + drivers/clk/sifive/fu740-prci.h | 21 + + drivers/clk/sifive/sifive-prci.c | 574 +++++++ + drivers/clk/sifive/sifive-prci.h | 299 ++++ + drivers/clk/tegra/clk-id.h | 1 + + drivers/clk/tegra/clk-tegra-periph.c | 2 +- + drivers/clk/ti/clk-54xx.c | 12 +- + drivers/clk/ti/fapll.c | 11 +- + include/dt-bindings/clock/fsl,qoriq-clockgen.h | 15 + + include/dt-bindings/clock/g12a-clkc.h | 2 + + include/dt-bindings/clock/qcom,camcc-sc7180.h | 121 ++ + include/dt-bindings/clock/qcom,gcc-sdx55.h | 117 ++ + include/dt-bindings/clock/qcom,rpmh.h | 10 + + .../dt-bindings/clock/qcom,sm8250-lpass-aoncc.h | 11 + + .../dt-bindings/clock/qcom,sm8250-lpass-audiocc.h | 13 + + include/dt-bindings/clock/sifive-fu740-prci.h | 23 + + include/linux/clk-provider.h | 39 + + include/linux/clk.h | 20 +- + include/linux/clk/samsung.h | 4 +- + include/trace/events/clk.h | 44 + + 86 files changed, 7732 insertions(+), 1057 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/adi,axi-clkgen.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/axi-clkgen.txt + create mode 100644 Documentation/devicetree/bindings/clock/fsl,flexspi-clock.yaml + 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,gcc-sdx55.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-camcc.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/renesas,rcar-usb2-clock-sel.txt + create mode 100644 Documentation/devicetree/bindings/clock/renesas,rcar-usb2-clock-sel.yaml + create mode 100644 Documentation/devicetree/bindings/clock/sifive/fu740-prci.yaml + create mode 100644 drivers/clk/clk-fsl-flexspi.c + create mode 100644 drivers/clk/qcom/camcc-sc7180.c + create mode 100644 drivers/clk/qcom/gcc-sdx55.c + create mode 100644 drivers/clk/qcom/lpass-gfm-sm8250.c + create mode 100644 drivers/clk/sifive/fu540-prci.h + create mode 100644 drivers/clk/sifive/fu740-prci.c + create mode 100644 drivers/clk/sifive/fu740-prci.h + create mode 100644 drivers/clk/sifive/sifive-prci.c + create mode 100644 drivers/clk/sifive/sifive-prci.h + create mode 100644 include/dt-bindings/clock/fsl,qoriq-clockgen.h + create mode 100644 include/dt-bindings/clock/qcom,camcc-sc7180.h + create mode 100644 include/dt-bindings/clock/qcom,gcc-sdx55.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 + create mode 100644 include/dt-bindings/clock/sifive-fu740-prci.h +Merging clk-samsung/for-next (44a9e78f9242 clk: samsung: Prevent potential endless loop in the PLL ops) +$ git merge clk-samsung/for-next +Already up to date. +Merging csky/linux-next (ba3b26607f55 csky: Optimize atomic operations with correct barrier usage) +$ git merge csky/linux-next +Auto-merging include/linux/cpuhotplug.h +Auto-merging arch/csky/include/asm/mmu_context.h +Auto-merging arch/csky/include/asm/Kbuild +CONFLICT (content): Merge conflict in arch/csky/include/asm/Kbuild +Auto-merging arch/csky/Kconfig +Resolved 'arch/csky/include/asm/Kbuild' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b5dbf1fa39c3] Merge remote-tracking branch 'csky/linux-next' +$ git diff -M --stat --summary HEAD^.. + arch/csky/Kconfig | 19 ++- + 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/Kbuild | 2 + + arch/csky/include/asm/atomic.h | 203 +-------------------------- + arch/csky/include/asm/barrier.h | 64 +++++++-- + arch/csky/include/asm/cmpxchg.h | 124 +++++++++++++++-- + 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/include/asm/spinlock.h | 246 +-------------------------------- + arch/csky/include/asm/spinlock_types.h | 28 +--- + arch/csky/kernel/atomic.S | 4 + + arch/csky/kernel/entry.S | 10 +- + arch/csky/kernel/head.S | 10 +- + arch/csky/kernel/perf_event.c | 2 +- + 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 +++- + include/linux/cpuhotplug.h | 1 + + 28 files changed, 291 insertions(+), 551 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 (2ae92e8b9b7e MAINTAINERS: Update m68k Mac entry) +$ git merge m68k/for-next +Already up to date. +Merging m68knommu/for-next (8b22820efb35 m68k: m68328: remove duplicate code) +$ git merge m68knommu/for-next +Auto-merging arch/m68k/kernel/vmlinux-nommu.lds +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 (05cdf457477d microblaze: Remove noMMU code) +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (ad4fddef5f23 mips: fix Section mismatch in reference) +$ git merge mips/mips-next +Already up to date. +Merging nds32/next (54bde873682b nds32: Fix bogus reference to <asm/procinfo.h>) +$ git merge nds32/next +Auto-merging arch/nds32/kernel/setup.c +Merge made by the 'recursive' strategy. + arch/nds32/configs/defconfig | 1 - + arch/nds32/kernel/setup.c | 2 +- + arch/nds32/kernel/time.c | 2 +- + arch/nds32/kernel/traps.c | 50 +++----------------------------------------- + 4 files changed, 5 insertions(+), 50 deletions(-) +Merging nios2/for-next (6b57fa4d374b nios2: signal: Mark expected switch fall-through) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (d8398bf840f8 openrisc: add local64.h to fix blk-iocost build) +$ git merge openrisc/for-next +Auto-merging drivers/tty/serial/Makefile +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 | 10 + + arch/openrisc/boot/dts/or1klitex.dts | 55 +++ + arch/openrisc/configs/or1klitex_defconfig | 18 + + arch/openrisc/include/asm/Kbuild | 1 + + arch/openrisc/kernel/traps.c | 4 +- + 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 ++++++ + 17 files changed, 903 insertions(+), 3 deletions(-) + 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 arch/openrisc/boot/dts/or1klitex.dts + create mode 100644 arch/openrisc/configs/or1klitex_defconfig + 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 (2c85ebc57b3e Linux 5.10) +$ git merge parisc-hd/for-next +Already up to date. +Merging powerpc/next (c1bea0a840ac powerpc/32s: Fix cleanup_cpu_mmu_context() compile bug) +$ git merge powerpc/next +Auto-merging tools/testing/selftests/lkdtm/tests.txt +CONFLICT (content): Merge conflict in tools/testing/selftests/lkdtm/tests.txt +Auto-merging sound/ppc/snd_ps3.c +Auto-merging include/linux/memory_hotplug.h +Auto-merging drivers/misc/lkdtm/lkdtm.h +CONFLICT (content): Merge conflict in drivers/misc/lkdtm/lkdtm.h +Auto-merging drivers/misc/lkdtm/core.c +Auto-merging drivers/misc/lkdtm/Makefile +CONFLICT (content): Merge conflict in drivers/misc/lkdtm/Makefile +Auto-merging arch/powerpc/platforms/pseries/hotplug-cpu.c +Auto-merging arch/powerpc/perf/core-book3s.c +Auto-merging arch/powerpc/mm/mem.c +Auto-merging arch/powerpc/kvm/book3s_xive.c +Auto-merging arch/powerpc/kernel/vmlinux.lds.S +Auto-merging arch/powerpc/kernel/time.c +Auto-merging arch/powerpc/kernel/signal.c +Removing arch/powerpc/kernel/cpu_setup_power.S +Auto-merging arch/powerpc/include/asm/thread_info.h +Auto-merging arch/powerpc/include/asm/mmu_context.h +Removing arch/powerpc/include/asm/mm-arch-hooks.h +Auto-merging arch/powerpc/include/asm/book3s/64/mmu.h +Removing arch/powerpc/include/asm/book3s/64/kup-radix.h +Auto-merging arch/powerpc/include/asm/book3s/32/pgtable.h +Auto-merging arch/powerpc/boot/Makefile +Auto-merging arch/powerpc/Makefile +Auto-merging arch/powerpc/Kconfig +Resolved 'drivers/misc/lkdtm/Makefile' using previous resolution. +Resolved 'drivers/misc/lkdtm/lkdtm.h' using previous resolution. +Resolved 'tools/testing/selftests/lkdtm/tests.txt' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 063a350eaadf] Merge remote-tracking branch 'powerpc/next' +$ git diff -M --stat --summary HEAD^.. + arch/powerpc/Kconfig | 26 +- + arch/powerpc/Makefile | 29 +- + arch/powerpc/boot/Makefile | 4 + + arch/powerpc/boot/ps3.c | 7 - + arch/powerpc/boot/util.S | 9 +- + arch/powerpc/boot/wrapper | 6 +- + arch/powerpc/boot/zImage.lds.S | 21 +- + arch/powerpc/configs/disable-werror.config | 1 + + arch/powerpc/configs/ppc64le.config | 2 + + arch/powerpc/configs/security.config | 15 + + arch/powerpc/include/asm/atomic.h | 9 +- + arch/powerpc/include/asm/barrier.h | 2 +- + arch/powerpc/include/asm/bitops.h | 23 +- + arch/powerpc/include/asm/book3s/32/kup.h | 6 +- + arch/powerpc/include/asm/book3s/32/mmu-hash.h | 3 +- + arch/powerpc/include/asm/book3s/32/pgtable.h | 21 +- + arch/powerpc/include/asm/book3s/32/tlbflush.h | 69 ++- + arch/powerpc/include/asm/book3s/64/hash-pkey.h | 25 +- + arch/powerpc/include/asm/book3s/64/hash.h | 2 +- + arch/powerpc/include/asm/book3s/64/kexec.h | 5 + + arch/powerpc/include/asm/book3s/64/kup-radix.h | 205 ------ + arch/powerpc/include/asm/book3s/64/kup.h | 442 +++++++++++++ + arch/powerpc/include/asm/book3s/64/mmu-hash.h | 29 +- + arch/powerpc/include/asm/book3s/64/mmu.h | 4 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 17 +- + arch/powerpc/include/asm/book3s/64/pkeys.h | 2 + + arch/powerpc/include/asm/bug.h | 9 +- + arch/powerpc/include/asm/checksum.h | 2 +- + arch/powerpc/include/asm/clocksource.h | 7 + + arch/powerpc/include/asm/cpm1.h | 1 + + arch/powerpc/include/asm/cpu_setup_power.h | 12 + + arch/powerpc/include/asm/cputable.h | 76 +-- + arch/powerpc/include/asm/elf.h | 4 +- + arch/powerpc/include/asm/feature-fixups.h | 25 +- + arch/powerpc/include/asm/firmware.h | 6 - + arch/powerpc/include/asm/hvcall.h | 9 + + arch/powerpc/include/asm/io.h | 158 ++++- + arch/powerpc/include/asm/kup.h | 15 +- + arch/powerpc/include/asm/kvm_guest.h | 25 + + arch/powerpc/include/asm/kvm_para.h | 2 +- + arch/powerpc/include/asm/machdep.h | 1 - + arch/powerpc/include/asm/mce.h | 1 + + arch/powerpc/include/asm/mm-arch-hooks.h | 25 - + arch/powerpc/include/asm/mmu.h | 71 ++- + arch/powerpc/include/asm/mmu_context.h | 8 +- + arch/powerpc/include/asm/nohash/32/kup-8xx.h | 3 +- + arch/powerpc/include/asm/nohash/32/mmu-40x.h | 2 +- + arch/powerpc/include/asm/nohash/32/mmu-44x.h | 2 +- + arch/powerpc/include/asm/nohash/32/mmu-8xx.h | 2 +- + arch/powerpc/include/asm/nohash/mmu-book3e.h | 2 +- + arch/powerpc/include/asm/nohash/pgtable.h | 4 +- + arch/powerpc/include/asm/nohash/tlbflush.h | 1 - + arch/powerpc/include/asm/opal-api.h | 6 +- + arch/powerpc/include/asm/page_32.h | 6 - + arch/powerpc/include/asm/paravirt.h | 18 + + arch/powerpc/include/asm/perf_event_server.h | 1 + + arch/powerpc/include/asm/pnv-ocxl.h | 54 ++ + arch/powerpc/include/asm/ppc-opcode.h | 16 +- + arch/powerpc/include/asm/ppc_asm.h | 8 +- + arch/powerpc/include/asm/processor.h | 33 +- + arch/powerpc/include/asm/ps3.h | 4 +- + arch/powerpc/include/asm/ptrace.h | 18 +- + arch/powerpc/include/asm/reg.h | 44 +- + arch/powerpc/include/asm/reg_booke.h | 12 - + arch/powerpc/include/asm/rtas-types.h | 8 - + arch/powerpc/include/asm/rtas.h | 17 +- + arch/powerpc/include/asm/smp.h | 6 + + arch/powerpc/include/asm/thread_info.h | 2 - + arch/powerpc/include/asm/time.h | 33 +- + arch/powerpc/include/asm/timex.h | 2 +- + arch/powerpc/include/asm/tlb.h | 3 - + arch/powerpc/include/asm/vdso.h | 29 +- + arch/powerpc/include/asm/vdso/clocksource.h | 7 + + arch/powerpc/include/asm/vdso/gettimeofday.h | 201 ++++++ + arch/powerpc/include/asm/vdso/processor.h | 23 + + arch/powerpc/include/asm/vdso/timebase.h | 79 +++ + arch/powerpc/include/asm/vdso/vsyscall.h | 25 + + arch/powerpc/include/asm/vdso_datapage.h | 57 +- + arch/powerpc/include/asm/xive.h | 8 +- + arch/powerpc/kernel/Makefile | 3 + + arch/powerpc/kernel/asm-offsets.c | 58 +- + arch/powerpc/kernel/cacheinfo.c | 30 +- + arch/powerpc/kernel/cpu_setup_fsl_booke.S | 9 - + arch/powerpc/kernel/cpu_setup_power.S | 252 -------- + arch/powerpc/kernel/cpu_setup_power.c | 272 ++++++++ + arch/powerpc/kernel/cputable.c | 175 +++--- + arch/powerpc/kernel/dt_cpu_ftrs.c | 31 +- + arch/powerpc/kernel/entry_32.S | 49 +- + arch/powerpc/kernel/entry_64.S | 8 +- + arch/powerpc/kernel/exceptions-64e.S | 2 +- + arch/powerpc/kernel/exceptions-64s.S | 6 +- + arch/powerpc/kernel/firmware.c | 11 +- + arch/powerpc/kernel/head_32.h | 37 +- + arch/powerpc/kernel/head_64.S | 22 +- + arch/powerpc/kernel/head_8xx.S | 59 +- + arch/powerpc/kernel/head_book3s_32.S | 96 +-- + arch/powerpc/kernel/head_booke.h | 5 +- + arch/powerpc/kernel/head_fsl_booke.S | 57 +- + arch/powerpc/kernel/hw_breakpoint.c | 67 +- + arch/powerpc/kernel/iomap.c | 166 ----- + arch/powerpc/kernel/irq.c | 53 +- + arch/powerpc/kernel/mce.c | 4 +- + arch/powerpc/kernel/mce_power.c | 98 +-- + arch/powerpc/kernel/paca.c | 4 +- + arch/powerpc/kernel/pci-common.c | 82 ++- + arch/powerpc/kernel/process.c | 108 ++-- + arch/powerpc/kernel/prom.c | 1 - + arch/powerpc/kernel/ptrace/Makefile | 3 +- + arch/powerpc/kernel/ptrace/ptrace-decl.h | 21 + + arch/powerpc/kernel/ptrace/ptrace-fpu.c | 40 ++ + arch/powerpc/kernel/ptrace/ptrace-tm.c | 19 +- + arch/powerpc/kernel/ptrace/ptrace-view.c | 26 +- + arch/powerpc/kernel/ptrace/ptrace.c | 54 +- + arch/powerpc/kernel/ptrace/ptrace32.c | 2 + + arch/powerpc/kernel/rtas.c | 245 +++----- + arch/powerpc/kernel/setup-common.c | 8 +- + arch/powerpc/kernel/setup.h | 6 - + arch/powerpc/kernel/setup_32.c | 3 - + arch/powerpc/kernel/setup_64.c | 2 +- + arch/powerpc/kernel/signal.c | 59 +- + arch/powerpc/kernel/signal.h | 115 +++- + arch/powerpc/kernel/signal_32.c | 602 +++++++++--------- + arch/powerpc/kernel/signal_64.c | 25 +- + arch/powerpc/kernel/smp.c | 241 +++++--- + arch/powerpc/kernel/syscall_64.c | 38 +- + arch/powerpc/kernel/time.c | 100 +-- + arch/powerpc/kernel/traps.c | 33 +- + arch/powerpc/kernel/vdso.c | 688 +++------------------ + arch/powerpc/kernel/vdso32/Makefile | 53 +- + arch/powerpc/kernel/vdso32/cacheflush.S | 19 +- + arch/powerpc/kernel/vdso32/datapage.S | 7 +- + arch/powerpc/kernel/vdso32/gen_vdso_offsets.sh | 16 + + arch/powerpc/kernel/vdso32/gettimeofday.S | 300 +-------- + arch/powerpc/kernel/vdso32/vdso32.lds.S | 68 +- + arch/powerpc/kernel/vdso32/vgettimeofday.c | 34 + + arch/powerpc/kernel/vdso64/Makefile | 48 +- + arch/powerpc/kernel/vdso64/cacheflush.S | 18 +- + arch/powerpc/kernel/vdso64/datapage.S | 7 +- + arch/powerpc/kernel/vdso64/gen_vdso_offsets.sh | 16 + + arch/powerpc/kernel/vdso64/gettimeofday.S | 242 +------- + arch/powerpc/kernel/vdso64/vdso64.lds.S | 67 +- + arch/powerpc/kernel/vdso64/vgettimeofday.c | 29 + + arch/powerpc/kernel/vmlinux.lds.S | 19 +- + arch/powerpc/kvm/book3s_emulate.c | 6 + + arch/powerpc/kvm/book3s_hv.c | 33 +- + arch/powerpc/kvm/book3s_hv_builtin.c | 11 +- + arch/powerpc/kvm/book3s_hv_ras.c | 23 +- + arch/powerpc/kvm/book3s_pr.c | 2 +- + arch/powerpc/kvm/book3s_rmhandlers.S | 4 +- + arch/powerpc/kvm/book3s_xics.c | 4 +- + arch/powerpc/kvm/book3s_xive.c | 134 ++-- + arch/powerpc/kvm/book3s_xive.h | 13 + + arch/powerpc/kvm/book3s_xive_native.c | 24 +- + arch/powerpc/kvm/book3s_xive_template.c | 5 - + arch/powerpc/kvm/booke.c | 6 +- + arch/powerpc/kvm/powerpc.c | 4 +- + arch/powerpc/lib/feature-fixups.c | 8 +- + arch/powerpc/lib/sstep.c | 160 ++++- + arch/powerpc/lib/test_emulate_step.c | 270 ++++++++ + arch/powerpc/mm/book3s32/Makefile | 2 +- + arch/powerpc/mm/book3s32/hash_low.S | 169 ++--- + arch/powerpc/mm/book3s32/mmu.c | 30 +- + arch/powerpc/mm/book3s32/nohash_low.S | 80 +++ + arch/powerpc/mm/book3s32/tlb.c | 89 +-- + arch/powerpc/mm/book3s64/Makefile | 2 +- + arch/powerpc/mm/book3s64/hash_4k.c | 2 +- + arch/powerpc/mm/book3s64/hash_64k.c | 4 +- + arch/powerpc/mm/book3s64/hash_hugepage.c | 2 +- + arch/powerpc/mm/book3s64/hash_hugetlbpage.c | 2 +- + arch/powerpc/mm/book3s64/hash_pgtable.c | 2 +- + arch/powerpc/mm/book3s64/hash_utils.c | 12 +- + arch/powerpc/mm/book3s64/iommu_api.c | 2 +- + arch/powerpc/mm/book3s64/pgtable.c | 8 +- + arch/powerpc/mm/book3s64/pkeys.c | 151 +++-- + arch/powerpc/mm/book3s64/radix_pgtable.c | 45 +- + arch/powerpc/mm/book3s64/radix_tlb.c | 23 +- + arch/powerpc/mm/book3s64/slb.c | 66 +- + arch/powerpc/mm/fault.c | 79 ++- + arch/powerpc/mm/hugetlbpage.c | 64 +- + arch/powerpc/mm/init-common.c | 10 +- + arch/powerpc/mm/mem.c | 60 +- + arch/powerpc/mm/mmu_decl.h | 6 - + arch/powerpc/mm/nohash/8xx.c | 3 +- + arch/powerpc/mm/nohash/fsl_booke.c | 12 +- + arch/powerpc/mm/nohash/tlb_low.S | 29 +- + arch/powerpc/mm/pgtable_32.c | 6 +- + arch/powerpc/perf/8xx-pmu.c | 16 +- + arch/powerpc/perf/callchain.h | 2 +- + arch/powerpc/perf/callchain_32.c | 8 +- + arch/powerpc/perf/callchain_64.c | 7 +- + arch/powerpc/perf/core-book3s.c | 65 +- + arch/powerpc/perf/isa207-common.c | 38 +- + arch/powerpc/perf/isa207-common.h | 20 +- + arch/powerpc/perf/power10-events-list.h | 9 + + arch/powerpc/perf/power10-pmu.c | 184 +++++- + arch/powerpc/platforms/85xx/corenet_generic.c | 3 +- + arch/powerpc/platforms/8xx/Kconfig | 7 - + arch/powerpc/platforms/8xx/micropatch.c | 11 + + arch/powerpc/platforms/Kconfig.cputype | 57 +- + arch/powerpc/platforms/powermac/sleep.S | 132 ++-- + arch/powerpc/platforms/powernv/Kconfig | 8 +- + arch/powerpc/platforms/powernv/idle.c | 3 + + arch/powerpc/platforms/powernv/memtrace.c | 175 +++--- + arch/powerpc/platforms/powernv/npu-dma.c | 16 +- + arch/powerpc/platforms/powernv/ocxl.c | 114 ++++ + arch/powerpc/platforms/powernv/opal-elog.c | 4 +- + arch/powerpc/platforms/powernv/opal-hmi.c | 29 +- + arch/powerpc/platforms/powernv/opal.c | 2 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 4 +- + arch/powerpc/platforms/powernv/pci-sriov.c | 2 +- + arch/powerpc/platforms/ps3/system-bus.c | 5 +- + arch/powerpc/platforms/pseries/hotplug-cpu.c | 1 + + arch/powerpc/platforms/pseries/hotplug-memory.c | 12 +- + arch/powerpc/platforms/pseries/mobility.c | 358 +++++++++-- + arch/powerpc/platforms/pseries/pci.c | 51 +- + arch/powerpc/platforms/pseries/ras.c | 5 +- + arch/powerpc/platforms/pseries/smp.c | 3 +- + arch/powerpc/platforms/pseries/suspend.c | 79 +-- + arch/powerpc/sysdev/mpic_msgr.c | 2 +- + arch/powerpc/sysdev/xive/common.c | 207 +++---- + arch/powerpc/sysdev/xive/native.c | 46 +- + arch/powerpc/sysdev/xive/spapr.c | 8 +- + arch/powerpc/sysdev/xive/xive-internal.h | 7 +- + arch/powerpc/xmon/nonstdio.c | 2 +- + arch/powerpc/xmon/xmon.c | 6 +- + drivers/block/ps3disk.c | 3 +- + drivers/block/ps3vram.c | 3 +- + drivers/char/ps3flash.c | 3 +- + drivers/misc/lkdtm/Makefile | 1 + + drivers/misc/lkdtm/core.c | 3 + + drivers/misc/lkdtm/lkdtm.h | 3 + + drivers/misc/lkdtm/powerpc.c | 120 ++++ + drivers/misc/ocxl/context.c | 4 +- + drivers/misc/ocxl/link.c | 70 ++- + drivers/misc/ocxl/ocxl_internal.h | 9 +- + drivers/misc/ocxl/trace.h | 64 ++ + drivers/net/ethernet/toshiba/ps3_gelic_net.c | 3 +- + drivers/ps3/ps3-lpm.c | 3 +- + drivers/ps3/ps3-vuart.c | 10 +- + drivers/ps3/ps3stor_lib.c | 2 +- + drivers/scsi/cxlflash/ocxl_hw.c | 6 +- + drivers/scsi/ps3rom.c | 3 +- + drivers/usb/host/ehci-ps3.c | 4 +- + drivers/usb/host/ohci-ps3.c | 4 +- + drivers/video/fbdev/ps3fb.c | 4 +- + include/linux/compat.h | 32 + + include/linux/memory_hotplug.h | 3 + + include/linux/regset.h | 12 + + include/misc/ocxl.h | 2 +- + sound/ppc/snd_ps3.c | 3 +- + tools/testing/selftests/lkdtm/tests.txt | 1 + + tools/testing/selftests/powerpc/eeh/Makefile | 2 +- + tools/testing/selftests/powerpc/eeh/settings | 1 + + tools/testing/selftests/powerpc/mm/bad_accesses.c | 2 +- + tools/testing/selftests/powerpc/nx-gzip/.gitignore | 3 + + .../testing/selftests/powerpc/security/.gitignore | 1 + + tools/testing/selftests/powerpc/signal/.gitignore | 1 + + .../testing/selftests/powerpc/syscalls/.gitignore | 1 + + 258 files changed, 6011 insertions(+), 4965 deletions(-) + create mode 100644 arch/powerpc/configs/disable-werror.config + create mode 100644 arch/powerpc/configs/ppc64le.config + create mode 100644 arch/powerpc/configs/security.config + delete mode 100644 arch/powerpc/include/asm/book3s/64/kup-radix.h + create mode 100644 arch/powerpc/include/asm/book3s/64/kup.h + create mode 100644 arch/powerpc/include/asm/clocksource.h + create mode 100644 arch/powerpc/include/asm/cpu_setup_power.h + create mode 100644 arch/powerpc/include/asm/kvm_guest.h + delete mode 100644 arch/powerpc/include/asm/mm-arch-hooks.h + create mode 100644 arch/powerpc/include/asm/vdso/clocksource.h + create mode 100644 arch/powerpc/include/asm/vdso/gettimeofday.h + create mode 100644 arch/powerpc/include/asm/vdso/processor.h + create mode 100644 arch/powerpc/include/asm/vdso/timebase.h + create mode 100644 arch/powerpc/include/asm/vdso/vsyscall.h + delete mode 100644 arch/powerpc/kernel/cpu_setup_power.S + create mode 100644 arch/powerpc/kernel/cpu_setup_power.c + create mode 100644 arch/powerpc/kernel/ptrace/ptrace-fpu.c + create mode 100755 arch/powerpc/kernel/vdso32/gen_vdso_offsets.sh + create mode 100644 arch/powerpc/kernel/vdso32/vgettimeofday.c + create mode 100755 arch/powerpc/kernel/vdso64/gen_vdso_offsets.sh + create mode 100644 arch/powerpc/kernel/vdso64/vgettimeofday.c + create mode 100644 arch/powerpc/mm/book3s32/nohash_low.S + create mode 100644 drivers/misc/lkdtm/powerpc.c + create mode 100644 tools/testing/selftests/powerpc/eeh/settings + create mode 100644 tools/testing/selftests/powerpc/nx-gzip/.gitignore +Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges) +$ git merge fsl/next +Already up to date. +Merging soc-fsl/next (e95f287deed2 soc: fsl: handle RCPM errata A-008646 on SoC LS1021A) +$ git merge soc-fsl/next +Already up to date. +Merging risc-v/for-next (7d95a88f9254 Add and use a generic version of devmem_is_allowed()) +$ git merge risc-v/for-next +Auto-merging lib/Makefile +CONFLICT (content): Merge conflict in lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging arch/riscv/mm/pageattr.c +Auto-merging arch/riscv/mm/init.c +Auto-merging arch/riscv/kernel/setup.c +Auto-merging arch/riscv/kernel/head.S +Auto-merging arch/riscv/include/asm/set_memory.h +Auto-merging arch/riscv/Kconfig +CONFLICT (content): Merge conflict in arch/riscv/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/Kconfig +Resolved 'arch/riscv/Kconfig' using previous resolution. +Resolved 'lib/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 30712f9595db] Merge remote-tracking branch 'risc-v/for-next' +$ git diff -M --stat --summary HEAD^.. + .../features/time/irq-time-acct/arch-support.txt | 2 +- + arch/arm/Kconfig | 2 +- + arch/arm/include/asm/io.h | 1 - + arch/arm/mm/mmap.c | 22 --- + arch/arm64/Kconfig | 2 +- + arch/arm64/include/asm/io.h | 2 - + arch/arm64/mm/mmap.c | 21 --- + arch/riscv/Kconfig | 3 + + arch/riscv/Makefile | 6 + + arch/riscv/boot/.gitignore | 3 +- + arch/riscv/boot/Makefile | 2 +- + arch/riscv/include/asm/sections.h | 2 + + arch/riscv/include/asm/set_memory.h | 4 + + arch/riscv/include/asm/stacktrace.h | 17 ++ + arch/riscv/include/asm/string.h | 8 +- + arch/riscv/kernel/Makefile | 2 - + arch/riscv/kernel/asm-offsets.c | 2 + + arch/riscv/kernel/head.S | 1 - + arch/riscv/kernel/perf_callchain.c | 10 +- + arch/riscv/kernel/riscv_ksyms.c | 2 + + arch/riscv/kernel/setup.c | 179 ++++++++++++++++++++- + arch/riscv/kernel/stacktrace.c | 62 ++----- + arch/riscv/kernel/vmlinux.lds.S | 63 +++++--- + arch/riscv/lib/Makefile | 1 + + arch/riscv/lib/memmove.S | 64 ++++++++ + arch/riscv/mm/init.c | 52 +++--- + arch/riscv/mm/pageattr.c | 6 + + include/asm-generic/io.h | 4 + + lib/Kconfig | 3 + + lib/Kconfig.debug | 2 +- + lib/Makefile | 3 +- + lib/devmem_is_allowed.c | 27 ++++ + 32 files changed, 402 insertions(+), 178 deletions(-) + create mode 100644 arch/riscv/include/asm/stacktrace.h + create mode 100644 arch/riscv/lib/memmove.S + create mode 100644 lib/devmem_is_allowed.c +Merging s390/for-next (93f57c5f66e6 Merge branch 'features' into for-next) +$ git merge s390/for-next +Auto-merging drivers/s390/cio/device.c +Auto-merging arch/s390/kernel/entry.S +Auto-merging arch/s390/Kconfig +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 1 + + arch/s390/include/asm/delay.h | 12 ++--- + arch/s390/include/asm/processor.h | 7 --- + arch/s390/kernel/entry.S | 16 +++--- + arch/s390/kernel/idle.c | 18 ++----- + arch/s390/kernel/ipl.c | 2 +- + arch/s390/kernel/setup.c | 1 - + arch/s390/lib/delay.c | 105 ++++--------------------------------- + arch/s390/lib/test_unwind.c | 31 ++++++----- + drivers/s390/cio/device.c | 2 +- + drivers/s390/crypto/zcrypt_cex2a.c | 2 +- + drivers/s390/crypto/zcrypt_cex4.c | 2 +- + 12 files changed, 44 insertions(+), 155 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 (1fb1abc83636 um: Fix build w/o CONFIG_PM_SLEEP) +$ git merge uml/linux-next +Auto-merging drivers/char/hw_random/Kconfig +Auto-merging arch/um/kernel/process.c +Auto-merging arch/um/Kconfig +Merge made by the 'recursive' strategy. + arch/um/Kconfig | 6 + + arch/um/drivers/chan_user.c | 4 +- + arch/um/drivers/line.c | 30 +- + arch/um/drivers/mconsole_kern.c | 2 +- + arch/um/drivers/net_kern.c | 2 +- + arch/um/drivers/port_kern.c | 4 +- + arch/um/drivers/random.c | 105 ++----- + arch/um/drivers/ubd_kern.c | 273 ++++++++++------ + arch/um/drivers/vector_kern.c | 10 +- + arch/um/drivers/virtio_uml.c | 31 +- + arch/um/drivers/xterm.c | 5 + + arch/um/drivers/xterm_kern.c | 2 +- + arch/um/include/asm/irq.h | 9 +- + arch/um/include/asm/pgtable.h | 3 + + arch/um/include/asm/set_memory.h | 1 + + arch/um/include/linux/time-internal.h | 4 +- + arch/um/include/shared/common-offsets.h | 3 + + arch/um/include/shared/irq_kern.h | 13 +- + arch/um/include/shared/irq_user.h | 21 +- + arch/um/include/shared/kern_util.h | 5 +- + arch/um/include/shared/os.h | 23 +- + arch/um/kernel/irq.c | 534 +++++++++++++++++--------------- + arch/um/kernel/process.c | 24 +- + arch/um/kernel/sigio.c | 2 +- + arch/um/kernel/time.c | 97 +++++- + arch/um/kernel/tlb.c | 54 ++++ + arch/um/kernel/um_arch.c | 67 ++++ + arch/um/os-Linux/Makefile | 2 + + arch/um/os-Linux/helper.c | 4 +- + arch/um/os-Linux/irq.c | 4 +- + arch/um/os-Linux/sigio.c | 70 +++-- + arch/um/os-Linux/signal.c | 22 +- + arch/um/os-Linux/skas/process.c | 15 +- + arch/um/os-Linux/time.c | 17 +- + arch/um/os-Linux/umid.c | 17 +- + drivers/char/hw_random/Kconfig | 16 +- + 36 files changed, 905 insertions(+), 596 deletions(-) + create mode 100644 arch/um/include/asm/set_memory.h +Merging xtensa/xtensa-for-next (7b79eba1d0d1 xtensa: fix spelling mistake in Kconfig "wont" -> "won't") +$ git merge xtensa/xtensa-for-next +Auto-merging arch/xtensa/Kconfig +Merge made by the 'recursive' strategy. + arch/xtensa/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging fscrypt/master (a14d0b676491 fscrypt: allow deleting files with unsupported encryption policy) +$ 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 (97847e06525b Merge branch 'for-next-next-v5.10-20201211' into for-next-20201211) +$ git merge btrfs/for-next +Auto-merging fs/btrfs/ctree.h +Merge made by the 'recursive' strategy. + fs/btrfs/block-group.c | 11 +- + fs/btrfs/btrfs_inode.h | 9 ++ + fs/btrfs/ctree.c | 24 +++- + fs/btrfs/ctree.h | 13 +- + fs/btrfs/delayed-ref.h | 12 +- + fs/btrfs/dev-replace.c | 2 +- + fs/btrfs/disk-io.c | 9 +- + fs/btrfs/extent-tree.c | 4 +- + fs/btrfs/file-item.c | 2 + + fs/btrfs/free-space-cache.c | 6 +- + fs/btrfs/inode.c | 15 ++- + fs/btrfs/ioctl.c | 2 +- + fs/btrfs/ordered-data.c | 13 +- + fs/btrfs/qgroup.c | 30 +++-- + fs/btrfs/reflink.c | 15 +++ + fs/btrfs/space-info.c | 276 +++++++++++++++++++++++++++++++++++-------- + fs/btrfs/space-info.h | 3 + + fs/btrfs/transaction.c | 85 ++++++------- + include/trace/events/btrfs.h | 104 +++++++++++++++- + 19 files changed, 486 insertions(+), 149 deletions(-) +Merging ceph/master (2f0df6cfa325 libceph: drop ceph_auth_{create,update}_authorizer()) +$ git merge ceph/master +Already up to date. +Merging cifs/for-next (afee4410bc6c cifs: update internal module version number) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/Kconfig | 25 +- + fs/cifs/Makefile | 4 +- + fs/cifs/cache.c | 24 - + fs/cifs/cifs_debug.c | 13 + + fs/cifs/cifs_dfs_ref.c | 19 +- + fs/cifs/cifs_fs_sb.h | 12 +- + fs/cifs/cifs_swn.c | 694 +++++++++++ + fs/cifs/cifs_swn.h | 25 + + fs/cifs/cifsacl.c | 238 ++-- + fs/cifs/cifsacl.h | 4 + + fs/cifs/cifsencrypt.c | 5 + + fs/cifs/cifsfs.c | 174 +-- + fs/cifs/cifsfs.h | 6 +- + fs/cifs/cifsglob.h | 106 +- + fs/cifs/cifspdu.h | 2 +- + fs/cifs/cifsproto.h | 39 +- + fs/cifs/connect.c | 2125 +++++++------------------------- + fs/cifs/dfs_cache.c | 115 +- + fs/cifs/dfs_cache.h | 2 +- + fs/cifs/dir.c | 7 +- + fs/cifs/file.c | 26 +- + fs/cifs/fs_context.c | 1529 +++++++++++++++++++++-- + fs/cifs/fs_context.h | 225 +++- + fs/cifs/fscache.c | 1 + + fs/cifs/fscache.h | 1 - + fs/cifs/inode.c | 74 +- + fs/cifs/misc.c | 5 +- + fs/cifs/netlink.c | 89 ++ + fs/cifs/netlink.h | 16 + + fs/cifs/readdir.c | 19 +- + fs/cifs/sess.c | 71 +- + fs/cifs/smb1ops.c | 13 +- + fs/cifs/smb2misc.c | 31 +- + fs/cifs/smb2ops.c | 63 +- + fs/cifs/smb2pdu.c | 7 +- + fs/cifs/smb2pdu.h | 14 +- + fs/cifs/smbdirect.c | 1 + + fs/cifs/trace.h | 4 + + fs/cifs/transport.c | 15 + + fs/cifs/unc.c | 71 ++ + include/uapi/linux/cifs/cifs_netlink.h | 63 + + 41 files changed, 3623 insertions(+), 2354 deletions(-) + create mode 100644 fs/cifs/cifs_swn.c + create mode 100644 fs/cifs/cifs_swn.h + create mode 100644 fs/cifs/netlink.c + create mode 100644 fs/cifs/netlink.h + create mode 100644 fs/cifs/unc.c + create mode 100644 include/uapi/linux/cifs/cifs_netlink.h +$ git am -3 ../patches/0001-fixup-for-treewide-rename-nla_strlcpy-to-nla_strscpy.patch +Applying: fixup for "treewide: rename nla_strlcpy to nla_strscpy." +$ git reset HEAD^ +Unstaged changes after reset: +M fs/cifs/cifs_swn.c +$ git add -A . +$ git commit -v -a --amend +[master 3436e6a383c9] Merge remote-tracking branch 'cifs/for-next' + Date: Fri Dec 18 09:53:18 2020 +1100 +Merging configfs/for-next (65cdb4a214c0 configfs: fix kernel-doc markup issue) +$ git merge configfs/for-next +Merge made by the 'recursive' strategy. + fs/configfs/dir.c | 1 + + 1 file changed, 1 insertion(+) +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 (d8b3df8b1048 erofs: avoid using generic_block_bmap) +$ git merge erofs/dev +Already up to date. +Merging exfat/dev (bad62714b7e0 exfat: Avoid allocating upcase table using kcalloc()) +$ git merge exfat/dev +Merge made by the 'recursive' strategy. + fs/exfat/nls.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging ext3/for_next (bdcfc08b8b5b Pull warning fix from Christoph) +$ git merge ext3/for_next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ext4/dev (739c541bd3ea ext4: don't leak old mountpoint samples) +$ git merge ext4/dev +Auto-merging fs/ext4/super.c +CONFLICT (content): Merge conflict in fs/ext4/super.c +Auto-merging fs/ext4/namei.c +Auto-merging fs/ext4/ioctl.c +Auto-merging fs/ext4/ext4.h +Recorded preimage for 'fs/ext4/super.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'fs/ext4/super.c'. +[master 13b0027e5953] Merge remote-tracking branch 'ext4/dev' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/ext4/journal.rst | 50 +++ + fs/ext4/balloc.c | 2 +- + fs/ext4/block_validity.c | 16 +- + fs/ext4/ext4.h | 77 +++- + fs/ext4/ext4_jbd2.c | 21 +- + fs/ext4/ext4_jbd2.h | 14 +- + fs/ext4/extents.c | 5 +- + fs/ext4/fast_commit.c | 99 ++++-- + fs/ext4/fast_commit.h | 78 +++- + fs/ext4/file.c | 7 +- + fs/ext4/fsync.c | 2 +- + fs/ext4/indirect.c | 4 +- + fs/ext4/inode.c | 41 ++- + fs/ext4/ioctl.c | 3 + + fs/ext4/mballoc.c | 39 +- + fs/ext4/namei.c | 22 +- + fs/ext4/page-io.c | 5 +- + fs/ext4/resize.c | 20 +- + fs/ext4/super.c | 549 +++++++++++++++-------------- + fs/ext4/xattr.c | 6 +- + fs/jbd2/journal.c | 8 +- + include/linux/jbd2.h | 14 +- + 22 files changed, 631 insertions(+), 451 deletions(-) +Merging f2fs/dev (75e91c888989 f2fs: compress: fix compression chksum) +$ git merge f2fs/dev +Already up to date. +Merging fsverity/fsverity (bde493349025 fs-verity: move structs needed for file signing to UAPI header) +$ git merge fsverity/fsverity +Already up to date. +Merging fuse/for-next (5d069dbe8aaf fuse: fix bad inode) +$ git merge fuse/for-next +Already up to date. +Merging jfs/jfs-next (c61b3e483900 jfs: Fix array index bounds check in dbAdjTree) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (52104f274e2d NFS/pNFS: Fix a typo in ff_layout_resend_pnfs_read()) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (11392155f2bd NFS: Disable READ_PLUS by default) +$ git merge nfs-anna/linux-next +Auto-merging fs/nfs/nfs4proc.c +CONFLICT (content): Merge conflict in fs/nfs/nfs4proc.c +Resolved 'fs/nfs/nfs4proc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4909e2c98244] Merge remote-tracking branch 'nfs-anna/linux-next' +$ git diff -M --stat --summary HEAD^.. +Merging nfsd/nfsd-next (c3213d260a23 SUNRPC: Fix oops in the rpc_xdr_buf event class) +$ git merge nfsd/nfsd-next +Already up to date. +Merging cel/cel-next (6d589dcf10f5 nfsd: Don't set eof on a truncated READ_PLUS) +$ git merge cel/cel-next +Merge made by the 'recursive' strategy. + fs/nfsd/nfs4xdr.c | 14 ++++++++++---- + fs/nfsd/nfssvc.c | 1 + + 2 files changed, 11 insertions(+), 4 deletions(-) +Merging orangefs/for-next (c1048828c3db orangefs: add splice file operations) +$ git merge orangefs/for-next +Merge made by the 'recursive' strategy. + fs/orangefs/file.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging overlayfs/overlayfs-next (459c7c565ac3 ovl: unprivieged mounts) +$ git merge overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (b80a974b8c58 ubifs: ubifs_dump_node: Dump all branches of the index node) +$ git merge ubifs/next +Auto-merging fs/ubifs/dir.c +Auto-merging fs/ubifs/auth.c +Auto-merging drivers/mtd/ubi/build.c +Merge made by the 'recursive' strategy. + drivers/mtd/ubi/build.c | 6 +-- + drivers/mtd/ubi/io.c | 9 +++- + fs/jffs2/debug.h | 23 +++++----- + fs/jffs2/jffs2_fs_sb.h | 1 + + fs/jffs2/nodelist.h | 4 +- + fs/jffs2/readinode.c | 16 +++++++ + fs/jffs2/super.c | 32 ++++++++++--- + fs/ubifs/auth.c | 4 +- + fs/ubifs/commit.c | 4 +- + fs/ubifs/debug.c | 116 ++++++++++++++++++++++++++++-------------------- + fs/ubifs/debug.h | 5 +-- + fs/ubifs/dir.c | 4 +- + fs/ubifs/file.c | 8 +--- + fs/ubifs/io.c | 52 ++++++++++------------ + fs/ubifs/journal.c | 3 +- + fs/ubifs/lpt.c | 4 +- + fs/ubifs/master.c | 4 +- + fs/ubifs/orphan.c | 6 ++- + fs/ubifs/recovery.c | 6 +-- + fs/ubifs/replay.c | 6 +-- + fs/ubifs/sb.c | 2 +- + fs/ubifs/scan.c | 4 +- + fs/ubifs/super.c | 6 +-- + fs/ubifs/tnc.c | 10 ++--- + fs/ubifs/tnc_misc.c | 7 ++- + fs/ubifs/ubifs.h | 10 +++-- + 26 files changed, 203 insertions(+), 149 deletions(-) +Merging v9fs/9p-next (324a158fe535 fs: 9p: add generic splice_write file operation) +$ git merge v9fs/9p-next +Auto-merging net/9p/client.c +Auto-merging fs/9p/vfs_file.c +Merge made by the 'recursive' strategy. + fs/9p/fid.c | 65 +++++++++++++++++++++++++++++++++++++++++++++---- + fs/9p/fid.h | 11 ++++++++- + fs/9p/vfs_dentry.c | 2 ++ + fs/9p/vfs_dir.c | 6 ++++- + fs/9p/vfs_file.c | 7 +++--- + fs/9p/vfs_inode.c | 47 ++++++++++++++++++++++++++++------- + fs/9p/vfs_inode_dotl.c | 35 +++++++++++++++++++++----- + fs/9p/vfs_super.c | 1 + + fs/9p/xattr.c | 16 +++++++++--- + include/net/9p/client.h | 7 ++++++ + net/9p/client.c | 14 +++++++---- + 11 files changed, 178 insertions(+), 33 deletions(-) +Merging xfs/for-next (e82226138b20 xfs: remove xfs_buf_t typedef) +$ git merge xfs/for-next +Auto-merging fs/xfs/xfs_fsops.c +Merge made by the 'recursive' strategy. + fs/xfs/libxfs/xfs_alloc.c | 16 +-- + fs/xfs/libxfs/xfs_bmap.c | 28 ++--- + fs/xfs/libxfs/xfs_bmap_btree.c | 2 - + fs/xfs/libxfs/xfs_btree.c | 12 +- + fs/xfs/libxfs/xfs_format.h | 11 +- + fs/xfs/libxfs/xfs_ialloc.c | 170 +++++++++++++------------- + fs/xfs/libxfs/xfs_ialloc.h | 36 +++--- + fs/xfs/libxfs/xfs_ialloc_btree.c | 5 - + fs/xfs/libxfs/xfs_inode_buf.c | 4 - + fs/xfs/libxfs/xfs_refcount.c | 9 -- + fs/xfs/libxfs/xfs_rmap.c | 9 -- + fs/xfs/libxfs/xfs_rtbitmap.c | 22 ++-- + fs/xfs/libxfs/xfs_sb.c | 104 ++++++++++------ + fs/xfs/libxfs/xfs_sb.h | 3 + + fs/xfs/libxfs/xfs_shared.h | 1 - + fs/xfs/libxfs/xfs_types.c | 64 ++++++++++ + fs/xfs/libxfs/xfs_types.h | 7 ++ + fs/xfs/scrub/agheader_repair.c | 2 - + fs/xfs/scrub/bmap.c | 22 +--- + fs/xfs/scrub/common.c | 14 --- + fs/xfs/scrub/dir.c | 21 +++- + fs/xfs/scrub/inode.c | 4 - + fs/xfs/scrub/parent.c | 10 +- + fs/xfs/scrub/rtbitmap.c | 4 +- + fs/xfs/xfs_acl.c | 40 ++++--- + fs/xfs/xfs_bmap_item.c | 65 +++++----- + fs/xfs/xfs_buf.c | 24 ++-- + fs/xfs/xfs_buf.h | 14 +-- + fs/xfs/xfs_buf_item.c | 4 +- + fs/xfs/xfs_extfree_item.c | 23 ++-- + fs/xfs/xfs_fsops.c | 2 +- + fs/xfs/xfs_inode.c | 249 +++++++++------------------------------ + fs/xfs/xfs_inode.h | 6 +- + fs/xfs/xfs_iops.c | 41 ++----- + fs/xfs/xfs_iops.h | 8 -- + fs/xfs/xfs_iwalk.c | 2 +- + fs/xfs/xfs_log_recover.c | 13 +- + fs/xfs/xfs_qm.c | 26 ++-- + fs/xfs/xfs_refcount_item.c | 52 ++++---- + fs/xfs/xfs_rmap_item.c | 67 +++++++---- + fs/xfs/xfs_rtalloc.c | 20 ++-- + fs/xfs/xfs_rtalloc.h | 4 +- + fs/xfs/xfs_super.c | 77 +++++++++--- + fs/xfs/xfs_symlink.c | 4 +- + fs/xfs/xfs_trace.h | 18 +++ + fs/xfs/xfs_trans.c | 2 +- + fs/xfs/xfs_trans_buf.c | 16 +-- + fs/xfs/xfs_trans_dquot.c | 43 ++----- + 48 files changed, 695 insertions(+), 705 deletions(-) +Merging zonefs/for-next (6bea0225a4bf zonefs: fix page reference and BIO leak) +$ 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 +Already up to date. +Merging file-locks/locks-next (8d1ddb5e7937 fcntl: Fix potential deadlock in send_sig{io, urg}()) +$ git merge file-locks/locks-next +Already up to date. +Merging vfs/for-next (61c207915a76 Merge branches 'work.sparc', 'work.epoll', 'work.sparc32' and 'regset.followup' into for-next) +$ git merge vfs/for-next +Removing arch/sparc/mm/extable.c +Auto-merging arch/sparc/mm/Makefile +Auto-merging arch/sparc/kernel/process_32.c +Auto-merging arch/sparc/include/asm/thread_info_64.h +Merge made by the 'recursive' strategy. + 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 - + lib/extable.c | 5 - + 21 files changed, 198 insertions(+), 647 deletions(-) + rename arch/sparc/include/asm/{extable_64.h => extable.h} (92%) + delete mode 100644 arch/sparc/mm/extable.c +Merging printk/for-next (2e9dda43cb06 Merge branch 'printk-rework' into for-next) +$ git merge printk/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging pci/next (255b2d524884 Merge branch 'remotes/lorenzo/pci/misc') +$ git merge pci/next +Already up to date. +Merging pstore/for-next/pstore (26fecbf7602d pstore: Move kmsg_bytes default into Kconfig) +$ git merge pstore/for-next/pstore +Already up to date. +Merging hid/for-next (cdaa1e42b483 Merge branch 'for-5.10/upstream-fixes' into for-next) +$ git merge hid/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging i2c/i2c/for-next (d6da298d1b8b Merge branch 'i2c/for-current' into i2c/for-next) +$ git merge i2c/i2c/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging i3c/i3c/next (95393f3e07ab i3c/master/mipi-i3c-hci: quiet maybe-unused variable warning) +$ git merge i3c/i3c/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i3c/mipi-i3c-hci.yaml | 47 + + MAINTAINERS | 2 +- + drivers/i3c/master.c | 5 +- + drivers/i3c/master/Kconfig | 13 + + drivers/i3c/master/Makefile | 1 + + drivers/i3c/master/mipi-i3c-hci/Makefile | 6 + + drivers/i3c/master/mipi-i3c-hci/cmd.h | 67 ++ + drivers/i3c/master/mipi-i3c-hci/cmd_v1.c | 378 +++++++ + drivers/i3c/master/mipi-i3c-hci/cmd_v2.c | 316 ++++++ + drivers/i3c/master/mipi-i3c-hci/core.c | 798 +++++++++++++++ + drivers/i3c/master/mipi-i3c-hci/dat.h | 32 + + drivers/i3c/master/mipi-i3c-hci/dat_v1.c | 184 ++++ + drivers/i3c/master/mipi-i3c-hci/dct.h | 16 + + drivers/i3c/master/mipi-i3c-hci/dct_v1.c | 36 + + drivers/i3c/master/mipi-i3c-hci/dma.c | 784 +++++++++++++++ + drivers/i3c/master/mipi-i3c-hci/ext_caps.c | 308 ++++++ + drivers/i3c/master/mipi-i3c-hci/ext_caps.h | 19 + + drivers/i3c/master/mipi-i3c-hci/hci.h | 144 +++ + drivers/i3c/master/mipi-i3c-hci/ibi.h | 42 + + drivers/i3c/master/mipi-i3c-hci/pio.c | 1041 ++++++++++++++++++++ + drivers/i3c/master/mipi-i3c-hci/xfer_mode_rate.h | 79 ++ + 21 files changed, 4316 insertions(+), 2 deletions(-) + create mode 100644 Documentation/devicetree/bindings/i3c/mipi-i3c-hci.yaml + create mode 100644 drivers/i3c/master/mipi-i3c-hci/Makefile + create mode 100644 drivers/i3c/master/mipi-i3c-hci/cmd.h + create mode 100644 drivers/i3c/master/mipi-i3c-hci/cmd_v1.c + create mode 100644 drivers/i3c/master/mipi-i3c-hci/cmd_v2.c + create mode 100644 drivers/i3c/master/mipi-i3c-hci/core.c + create mode 100644 drivers/i3c/master/mipi-i3c-hci/dat.h + create mode 100644 drivers/i3c/master/mipi-i3c-hci/dat_v1.c + create mode 100644 drivers/i3c/master/mipi-i3c-hci/dct.h + create mode 100644 drivers/i3c/master/mipi-i3c-hci/dct_v1.c + create mode 100644 drivers/i3c/master/mipi-i3c-hci/dma.c + create mode 100644 drivers/i3c/master/mipi-i3c-hci/ext_caps.c + create mode 100644 drivers/i3c/master/mipi-i3c-hci/ext_caps.h + create mode 100644 drivers/i3c/master/mipi-i3c-hci/hci.h + create mode 100644 drivers/i3c/master/mipi-i3c-hci/ibi.h + create mode 100644 drivers/i3c/master/mipi-i3c-hci/pio.c + create mode 100644 drivers/i3c/master/mipi-i3c-hci/xfer_mode_rate.h +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 (1a033769a4fe dt-bindings: (hwmon/sbtsi_temp) Add SB-TSI hwmon driver bindings) +$ git merge hwmon-staging/hwmon-next +Already up to date. +Merging jc_docs/docs-next (47e44ed01434 docs: fix broken cross reference in translations/zh_CN) +$ git merge jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (fab0fca1da5c Merge tag 'media/v5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media) +$ git merge v4l-dvb/master +Already up to date. +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 include/linux/phy.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/blk-mq.h +Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.h +Auto-merging drivers/gpu/drm/drm_edid.c +Auto-merging drivers/gpu/drm/drm_dp_helper.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_dp_helper.c +Auto-merging drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c +Auto-merging MAINTAINERS +Auto-merging Documentation/hwmon/index.rst +Auto-merging Documentation/dev-tools/kasan.rst +Auto-merging Documentation/conf.py +Resolved 'drivers/gpu/drm/drm_dp_helper.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 17305c56b169] Merge remote-tracking branch 'v4l-dvb-next/master' +$ git diff -M --stat --summary HEAD^.. +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 (cd83902d91a2 Merge branch 'pm-cpufreq' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-devices-system-cpu | 3 +- + drivers/acpi/acpi_pnp.c | 3 + + drivers/acpi/cppc_acpi.c | 141 ++++++-------- + drivers/acpi/processor_perflib.c | 2 +- + drivers/acpi/scan.c | 143 +++++++++++---- + drivers/cpufreq/cppc_cpufreq.c | 204 ++++++++++++--------- + drivers/cpufreq/cpufreq.c | 40 ++++ + drivers/cpufreq/intel_pstate.c | 70 +++++-- + include/acpi/cppc_acpi.h | 6 +- + include/linux/cpufreq.h | 14 ++ + include/linux/sched/cpufreq.h | 5 + + kernel/sched/cpufreq_schedutil.c | 106 ++++++++--- + 12 files changed, 484 insertions(+), 253 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (c8bb45205438 Merge branch 'cpufreq/scmi' into cpufreq/arm/linux-next) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (748f0d70087c cpupower: Provide online and offline CPU information) +$ git merge cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (6a575e84f11e PM / devfreq: tegra30: Separate configurations per-SoC generation) +$ git merge devfreq/devfreq-next +Already up to date. +Merging opp/opp/linux-next (2c07b0fd9bf6 Merge branch 'opp/empty' into opp/linux-next) +$ git merge opp/opp/linux-next +Already up to date. +Merging thermal/thermal/linux-next (67698880ac9d thermal: int340x: Support Alder Lake) +$ git merge thermal/thermal/linux-next +Merge made by the 'recursive' strategy. + drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 1 + + drivers/thermal/intel/int340x_thermal/int3403_thermal.c | 1 + + 2 files changed, 2 insertions(+) +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 +Already up to date. +Merging swiotlb/linux-next (e998879d4fb7 x86,swiotlb: Adjust SWIOTLB bounce buffer size for SEV guests) +$ git merge swiotlb/linux-next +Already up to date. +Merging rdma/for-next (e246b7c035d7 RDMA/cma: Don't overwrite sgid_attr after device is released) +$ git merge rdma/for-next +Already up to date. +Merging net-next/master (3db1a3fa9880 Merge tag 'staging-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging) +$ git merge net-next/master +Already up to date. +Merging bpf-next/for-next (3db1a3fa9880 Merge tag 'staging-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging) +$ git merge bpf-next/for-next +Already up to date. +Merging ipsec-next/master (c7a5899eb26e xfrm: redact SA secret with lockdown confidentiality) +$ git merge ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (04b222f95773 RDMA/mlx5: Remove IB representors dead code) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (efd5a1584537 net: hns3: fix expression that is currently always true) +$ git merge netfilter-next/master +Already up to date. +Merging ipvs-next/master (efd5a1584537 net: hns3: fix expression that is currently always true) +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (13458ffe0a95 net: x25: Remove unimplemented X.25-over-LLC code stubs) +$ git merge wireless-drivers-next/master +Already up to date. +Merging bluetooth/master (3db1a3fa9880 Merge tag 'staging-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging) +$ git merge bluetooth/master +Already up to date. +Merging mac80211-next/master (13458ffe0a95 net: x25: Remove unimplemented X.25-over-LLC code stubs) +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (6e5c4ea37a99 gfs2: in signal_our_withdraw wait for unfreeze of _this_ fs only) +$ git merge gfs2/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/filesystems/gfs2.rst | 37 ++++++++++++++++++------------------- + MAINTAINERS | 2 +- + fs/gfs2/glock.c | 8 -------- + fs/gfs2/incore.h | 1 - + fs/gfs2/inode.c | 16 ++++++++-------- + fs/gfs2/inode.h | 3 --- + fs/gfs2/super.c | 2 -- + fs/gfs2/util.c | 2 +- + fs/gfs2/util.h | 6 +++--- + 9 files changed, 31 insertions(+), 46 deletions(-) +Merging mtd/mtd/next (4c9e94dff65c Merge tags 'spi-nor/for-5.11' and 'nand/for-5.11' into mtd/next) +$ git merge mtd/mtd/next +Already up to date. +Merging nand/nand/next (ee4e0eafa43c mtd: spinand: macronix: Add support for MX35LFxG24AD) +$ git merge nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (31ad3eff093c mtd: spi-nor: keep lock bits if they are non-volatile) +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (93cebeb1c21a crypto: qat - add capability detection logic in qat_4xxx) +$ git merge crypto/master +Already up to date. +Merging drm/drm-next (efd3043790c6 Merge tag 'amd-drm-fixes-5.11-2020-12-16' of git://people.freedesktop.org/~agd5f/linux into drm-next) +$ git merge drm/drm-next +Auto-merging mm/mmap.c +Auto-merging include/linux/mm.h +Removing drivers/dma-buf/heaps/heap-helpers.h +Removing drivers/dma-buf/heaps/heap-helpers.c +Merge made by the 'recursive' strategy. + .../bindings/display/panel/panel-simple.yaml | 2 + + Documentation/driver-api/dma-buf.rst | 2 +- + drivers/char/agp/Makefile | 6 +- + drivers/char/agp/agp.h | 5 + + drivers/dma-buf/dma-buf.c | 19 +- + drivers/dma-buf/dma-resv.c | 2 +- + drivers/dma-buf/heaps/Makefile | 1 - + drivers/dma-buf/heaps/cma_heap.c | 329 ++++++++++++--- + drivers/dma-buf/heaps/heap-helpers.c | 274 ------------- + drivers/dma-buf/heaps/heap-helpers.h | 53 --- + drivers/dma-buf/heaps/system_heap.c | 414 ++++++++++++++++--- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 43 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 4 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 11 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h | 3 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 11 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h | 1 + + drivers/gpu/drm/amd/amdgpu/nv.c | 1 + + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 42 +- + drivers/gpu/drm/amd/amdkfd/Kconfig | 2 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 4 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 29 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 21 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 13 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 5 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 12 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 20 + + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 3 - + drivers/gpu/drm/amd/display/dc/dc.h | 2 +- + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 44 +- + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 2 + + .../display/dc/dce120/dce120_timing_generator.c | 2 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 6 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 15 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 2 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 6 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 29 +- + .../amd/display/dc/dcn20/dcn20_stream_encoder.h | 2 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_dccg.h | 1 + + .../amd/display/dc/dcn30/dcn30_dio_link_encoder.c | 2 +- + .../amd/display/dc/dcn30/dcn30_dio_link_encoder.h | 4 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 2 +- + .../drm/amd/display/dc/inc/hw/timing_generator.h | 2 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 62 +-- + .../drm/amd/display/modules/color/color_gamma.c | 22 +- + drivers/gpu/drm/amd/include/atomfirmware.h | 1 + + drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 1 + + drivers/gpu/drm/amd/pm/inc/smu_types.h | 4 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_0_7_ppsmc.h | 6 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h | 2 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 10 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 287 ++++++++----- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.h | 4 + + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 46 ++- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 9 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 4 + + drivers/gpu/drm/drm_atomic_helper.c | 8 +- + drivers/gpu/drm/drm_blend.c | 2 +- + drivers/gpu/drm/drm_bufs.c | 1 + + drivers/gpu/drm/drm_client.c | 4 - + drivers/gpu/drm/drm_crtc.c | 12 +- + drivers/gpu/drm/drm_fb_helper.c | 155 ++++--- + drivers/gpu/drm/drm_gem_shmem_helper.c | 40 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 4 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 7 +- + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 5 +- + drivers/gpu/drm/imx/dcss/dcss-dev.h | 3 + + drivers/gpu/drm/imx/dcss/dcss-plane.c | 24 +- + drivers/gpu/drm/imx/dcss/dcss-scaler.c | 47 ++- + drivers/gpu/drm/lima/lima_gem.c | 2 +- + drivers/gpu/drm/mcde/Kconfig | 1 + + drivers/gpu/drm/mcde/Makefile | 2 +- + drivers/gpu/drm/mcde/mcde_clk_div.c | 192 +++++++++ + drivers/gpu/drm/mcde/mcde_display.c | 456 ++++++++++++++++----- + drivers/gpu/drm/mcde/mcde_display_regs.h | 91 +++- + drivers/gpu/drm/mcde/mcde_drm.h | 10 + + drivers/gpu/drm/mcde/mcde_drv.c | 46 ++- + drivers/gpu/drm/meson/meson_dw_hdmi.c | 51 ++- + drivers/gpu/drm/mgag200/mgag200_drv.c | 1 - + drivers/gpu/drm/msm/msm_gem.c | 4 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 10 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 5 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 3 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 345 ++++++++++++---- + drivers/gpu/drm/panel/panel-simple.c | 28 ++ + drivers/gpu/drm/panfrost/panfrost_gem.c | 2 +- + drivers/gpu/drm/radeon/radeon_uvd.c | 2 +- + drivers/gpu/drm/radeon/radeon_vce.c | 2 +- + drivers/gpu/drm/ttm/ttm_pool.c | 22 + + drivers/gpu/drm/udl/udl_drv.c | 2 - + drivers/gpu/drm/v3d/v3d_bo.c | 2 +- + drivers/gpu/drm/vc4/vc4_txp.c | 4 +- + drivers/gpu/drm/vgem/vgem_drv.c | 3 +- + drivers/gpu/drm/via/via_irq.c | 1 + + drivers/gpu/drm/via/via_verifier.c | 7 +- + drivers/gpu/drm/virtio/virtgpu_debugfs.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 8 +- + drivers/gpu/drm/virtio/virtgpu_fence.c | 13 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 7 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 1 - + drivers/gpu/drm/vkms/vkms_drv.c | 1 - + drivers/gpu/drm/vkms/vkms_writeback.c | 7 +- + drivers/staging/android/ashmem.c | 6 +- + drivers/video/fbdev/geode/lxfb_ops.c | 1 + + drivers/video/fbdev/pm2fb.c | 1 + + include/drm/drm_fb_helper.h | 14 +- + include/drm/drm_gem_shmem_helper.h | 7 +- + include/drm/drm_modes.h | 3 + + include/drm/drm_modeset_helper_vtables.h | 13 +- + include/linux/dma-buf-map.h | 2 +- + include/linux/mm.h | 2 + + include/uapi/drm/drm_mode.h | 165 ++++++-- + include/uapi/linux/virtio_gpu.h | 4 + + mm/mmap.c | 2 +- + mm/util.c | 12 + + 128 files changed, 2719 insertions(+), 1159 deletions(-) + delete mode 100644 drivers/dma-buf/heaps/heap-helpers.c + delete mode 100644 drivers/dma-buf/heaps/heap-helpers.h + create mode 100644 drivers/gpu/drm/mcde/mcde_clk_div.c +Merging amdgpu/drm-next (424ff165721e drm/amdgpu: only set DP subconnector type on DP and eDP connectors) +$ git merge amdgpu/drm-next +Auto-merging sound/pci/hda/hda_intel.c +Auto-merging drivers/usb/typec/ucsi/ucsi.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 10 +++--- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 16 +++++++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 ++ + drivers/gpu/drm/amd/amdgpu/nv.c | 46 ++++++++++++++++++++++-- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 12 +++---- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 15 ++++++-- + drivers/usb/typec/ucsi/ucsi.c | 2 +- + sound/pci/hda/hda_intel.c | 9 +++-- + 10 files changed, 95 insertions(+), 21 deletions(-) +Merging drm-intel/for-linux-next (4294fa5f5032 drm/i915: Reduce duplicated switch cases in hpd code) +$ git merge drm-intel/for-linux-next +Auto-merging include/drm/drm_dsc.h +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_perf.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/i915_debugfs.c +Auto-merging drivers/gpu/drm/i915/gvt/handlers.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_dsc.c | 30 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 7 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 3 + + drivers/gpu/drm/i915/display/intel_bios.c | 11 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 7 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 20 +- + drivers/gpu/drm/i915/display/intel_connector.c | 29 +- + drivers/gpu/drm/i915/display/intel_connector.h | 3 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 83 +-- + drivers/gpu/drm/i915/display/intel_display.c | 193 +++---- + drivers/gpu/drm/i915/display/intel_display.h | 2 + + .../gpu/drm/i915/display/intel_display_debugfs.c | 124 +++++ + .../gpu/drm/i915/display/intel_display_debugfs.h | 3 + + drivers/gpu/drm/i915/display/intel_display_power.c | 127 +++-- + drivers/gpu/drm/i915/display/intel_display_power.h | 37 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 42 +- + drivers/gpu/drm/i915/display/intel_dp.c | 52 +- + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 14 +- + .../gpu/drm/i915/display/intel_dsi_dcs_backlight.c | 14 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 4 - + drivers/gpu/drm/i915/display/intel_fbc.c | 19 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 26 +- + drivers/gpu/drm/i915/display/intel_lspcon.c | 162 +++++- + drivers/gpu/drm/i915/display/intel_lspcon.h | 12 + + drivers/gpu/drm/i915/display/intel_panel.c | 153 ++++-- + drivers/gpu/drm/i915/display/intel_psr.c | 22 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 49 +- + drivers/gpu/drm/i915/display/intel_sprite.h | 10 + + drivers/gpu/drm/i915/display/intel_tc.c | 2 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 4 +- + drivers/gpu/drm/i915/gvt/handlers.c | 2 +- + drivers/gpu/drm/i915/i915_debugfs.c | 582 ++------------------- + drivers/gpu/drm/i915/i915_drv.c | 3 +- + drivers/gpu/drm/i915/i915_drv.h | 38 +- + drivers/gpu/drm/i915/i915_irq.c | 382 +++++++------- + drivers/gpu/drm/i915/i915_perf.c | 2 +- + drivers/gpu/drm/i915/i915_reg.h | 7 +- + drivers/gpu/drm/i915/i915_suspend.c | 33 +- + drivers/gpu/drm/i915/intel_device_info.c | 2 +- + drivers/gpu/drm/i915/intel_pm.c | 552 +++++++++---------- + drivers/gpu/drm/i915/intel_sideband.c | 4 +- + drivers/gpu/drm/i915/intel_uncore.c | 4 +- + drivers/gpu/drm/i915/intel_uncore.h | 6 +- + include/drm/drm_dsc.h | 1 + + 44 files changed, 1428 insertions(+), 1454 deletions(-) +Merging drm-tegra/drm/tegra/for-next (bf3a3cdcad40 drm/tegra: sor: Disable clocks on error in tegra_sor_init()) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (8075c3005e4b dma-buf: cma_heap: Include linux/vmalloc.h to fix build failures on MIPS) +$ git merge drm-misc/for-linux-next +Merge made by the 'recursive' strategy. + drivers/dma-buf/heaps/cma_heap.c | 1 + + drivers/gpu/drm/ttm/ttm_pool.c | 29 ++++++++++++++--------------- + 2 files changed, 15 insertions(+), 15 deletions(-) +Merging drm-msm/msm-next (57f04815fd95 drm/msm: Fix WARN_ON() splat in _free_object()) +$ git merge drm-msm/msm-next +Auto-merging drivers/gpu/drm/msm/msm_gem.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/msm/msm_gem.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +Merging imx-drm/imx-drm/next (b658e2a1443c gpu: drm: imx: convert comma to semicolon) +$ git merge imx-drm/imx-drm/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/Kconfig | 1 + + drivers/gpu/drm/imx/parallel-display.c | 2 +- + drivers/gpu/ipu-v3/ipu-di.c | 4 ---- + 3 files changed, 2 insertions(+), 5 deletions(-) +Merging etnaviv/etnaviv/next (4612bad5701e drm/etnaviv: Add lockdep annotations for context lock) +$ git merge etnaviv/etnaviv/next +Already up to date. +Merging regmap/for-next (4616c509d187 Merge remote-tracking branch 'regmap/for-5.11' into regmap-next) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (725124d10d00 ALSA: usb-audio: Add VID to support native DSD reproduction on FiiO devices) +$ git merge sound/for-next +Already up to date. +Merging sound-asoc/for-next (20b7445d8aa1 Merge remote-tracking branch 'asoc/for-5.11' into asoc-linus) +$ git merge sound-asoc/for-next +Already up to date. +Merging modules/modules-next (38dc717e9715 module: delay kobject uevent until after module init call) +$ git merge modules/modules-next +Auto-merging kernel/params.c +Auto-merging kernel/module.c +Auto-merging include/linux/module.h +Merge made by the 'recursive' strategy. + include/linux/init.h | 2 +- + include/linux/module.h | 28 +++---- + include/linux/moduleparam.h | 12 +-- + kernel/module.c | 200 ++++++++++++++++++++++++++------------------ + kernel/params.c | 10 +-- + 5 files changed, 142 insertions(+), 110 deletions(-) +Merging input/next (fafd320ae51b Input: raydium_ts_i2c - do not send zero length) +$ git merge input/next +Auto-merging drivers/input/touchscreen/raydium_i2c_ts.c +Merge made by the 'recursive' strategy. + drivers/input/misc/da7280.c | 1 + + drivers/input/touchscreen/raydium_i2c_ts.c | 3 ++- + 2 files changed, 3 insertions(+), 1 deletion(-) +Merging block/for-next (86248e8f6fd6 Merge branch 'block-5.11' into for-next) +$ git merge block/for-next +Merge made by the 'recursive' strategy. + block/blk-iocost.c | 3 + + block/blk-mq.c | 142 ++++++++++++--------------------- + drivers/block/nbd.c | 9 ++- + drivers/block/rnbd/rnbd-clt-sysfs.c | 5 +- + drivers/block/rnbd/rnbd-clt.c | 94 +++++++++++++--------- + drivers/block/rnbd/rnbd-clt.h | 12 ++- + drivers/block/rnbd/rnbd-proto.h | 9 ++- + drivers/block/rnbd/rnbd-srv.c | 12 ++- + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 6 -- + drivers/infiniband/ulp/rtrs/rtrs.h | 7 -- + drivers/s390/block/dasd_alias.c | 22 ++++- + fs/io_uring.c | 75 ++++++++--------- + include/linux/blkdev.h | 2 +- + include/trace/events/iocost.h | 16 +++- + 14 files changed, 219 insertions(+), 195 deletions(-) +Merging device-mapper/for-next (a2b8b2d97567 dm crypt: export sysfs of kcryptd workqueue) +$ git merge device-mapper/for-next +Auto-merging drivers/md/dm.c +Auto-merging Documentation/admin-guide/device-mapper/verity.rst +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-crypt.c | 13 +- + drivers/md/dm-ioctl.c | 1 + + ...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-stripe.c | 2 +- + drivers/md/dm-switch.c | 1 + + drivers/md/dm-unstripe.c | 1 + + drivers/md/dm-verity-verify-sig.c | 9 +- + drivers/md/dm-zero.c | 1 + + drivers/md/dm.c | 2 +- + 16 files changed, 332 insertions(+), 19 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 (70d3a462fc24 pcmcia: omap: Fix error return code in omap_cf_probe()) +$ git merge pcmcia/pcmcia-next +Removing drivers/pcmcia/vrc4173_cardu.h +Removing drivers/pcmcia/vrc4173_cardu.c +Auto-merging drivers/pcmcia/Kconfig +Merge made by the 'recursive' strategy. + drivers/pcmcia/Kconfig | 4 - + drivers/pcmcia/Makefile | 1 - + drivers/pcmcia/db1xxx_ss.c | 2 +- + drivers/pcmcia/electra_cf.c | 2 + + drivers/pcmcia/omap_cf.c | 8 +- + drivers/pcmcia/vrc4173_cardu.c | 591 ----------------------------------------- + drivers/pcmcia/vrc4173_cardu.h | 247 ----------------- + 7 files changed, 9 insertions(+), 846 deletions(-) + delete mode 100644 drivers/pcmcia/vrc4173_cardu.c + delete mode 100644 drivers/pcmcia/vrc4173_cardu.h +Merging mmc/next (72b248cfbf3f dt-bindings: mmc: eliminate yamllint warnings) +$ git merge mmc/next +Already up to date. +Merging mfd/for-mfd-next (0cd3aa995740 mfd: kempld-core: Add support for additional devices) +$ git merge mfd/for-mfd-next +Already up to date. +Merging backlight/for-backlight-next (789eb04b6c56 backlight: pwm_bl: Fix interpolation) +$ git merge backlight/for-backlight-next +Already up to date. +Merging battery/for-next (c2362519a04a power: supply: Fix a typo in warning message) +$ git merge battery/for-next +Merge made by the 'recursive' strategy. + .../bindings/power/reset/ocelot-reset.txt | 4 +- + .../bindings/power/reset/regulator-poweroff.yaml | 37 +++++ + arch/arm/mach-s3c/mach-h1940.c | 12 +- + arch/arm/mach-s3c/mach-rx1950.c | 11 +- + arch/arm/mach-sa1100/collie.c | 21 +++ + drivers/power/reset/Kconfig | 7 + + drivers/power/reset/Makefile | 1 + + drivers/power/reset/ocelot-reset.c | 30 +++- + drivers/power/reset/qnap-poweroff.c | 8 +- + drivers/power/reset/regulator-poweroff.c | 82 +++++++++++ + drivers/power/reset/syscon-poweroff.c | 8 +- + drivers/power/supply/ab8500_btemp.c | 68 ++++------ + drivers/power/supply/ab8500_charger.c | 99 ++++++-------- + drivers/power/supply/ab8500_fg.c | 106 +++++---------- + drivers/power/supply/abx500_chargalg.c | 19 +-- + drivers/power/supply/axp20x_usb_power.c | 10 +- + drivers/power/supply/axp288_charger.c | 28 ++-- + drivers/power/supply/bq24190_charger.c | 21 ++- + drivers/power/supply/bq24735-charger.c | 1 - + drivers/power/supply/bq25890_charger.c | 2 +- + drivers/power/supply/collie_battery.c | 151 +++++++++++++++------ + drivers/power/supply/generic-adc-battery.c | 31 ++--- + drivers/power/supply/max17042_battery.c | 23 +++- + drivers/power/supply/max8997_charger.c | 67 +++++---- + drivers/power/supply/pm2301_charger.c | 3 +- + drivers/power/supply/power_supply_sysfs.c | 2 +- + drivers/power/supply/s3c_adc_battery.c | 57 ++++---- + drivers/power/supply/wm831x_power.c | 1 - + include/linux/power/generic-adc-battery.h | 4 - + include/linux/s3c_adc_battery.h | 3 - + 30 files changed, 562 insertions(+), 355 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/reset/regulator-poweroff.yaml + create mode 100644 drivers/power/reset/regulator-poweroff.c +Merging regulator/for-next (87a96de608de Merge remote-tracking branch 'regulator/for-5.11' into regulator-linus) +$ git merge regulator/for-next +Already up to date. +Merging security/next-testing (9dcd47fc1f7d Merge branch 'fixes-v5.10' into next-testing) +$ git merge security/next-testing +Already up to date! +Merge made by the 'recursive' strategy. +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 (207cdd565dfc ima: Don't modify file descriptor mode on the fly) +$ git merge integrity/next-integrity +Already up to date. +Merging keys/keys-next (6b8945603d05 certs: Replace K{U,G}IDT_INIT() with GLOBAL_ROOT_{U,G}ID) +$ git merge keys/keys-next +Auto-merging security/keys/key.c +Merge made by the 'recursive' strategy. + Documentation/security/keys/core.rst | 4 ++-- + certs/blacklist.c | 10 +++++----- + certs/system_keyring.c | 5 +++-- + crypto/asymmetric_keys/asymmetric_type.c | 6 ++++-- + crypto/asymmetric_keys/pkcs7_parser.h | 5 ++--- + crypto/asymmetric_keys/pkcs7_trust.c | 2 +- + crypto/asymmetric_keys/pkcs7_verify.c | 9 ++++----- + include/crypto/public_key.h | 1 - + include/keys/encrypted-type.h | 2 +- + include/linux/key.h | 5 +++-- + include/linux/verification.h | 2 ++ + samples/Kconfig | 2 +- + samples/watch_queue/watch_test.c | 2 +- + security/integrity/ima/ima_mok.c | 5 ++--- + security/keys/Kconfig | 8 ++++---- + security/keys/big_key.c | 9 +++------ + security/keys/key.c | 2 ++ + security/keys/keyctl.c | 2 +- + security/keys/keyctl_pkey.c | 2 -- + security/keys/keyring.c | 10 +++++----- + security/keys/process_keys.c | 1 + + 21 files changed, 47 insertions(+), 47 deletions(-) +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 (3df98d79215a lsm,selinux: pass flowi_common instead of flowi to the LSM hooks) +$ git merge selinux/next +Already up to date. +Merging smack/next (9b0072e2b2b5 security/smack: remove unused varible 'rc') +$ git merge smack/next +Already up to date. +Merging tomoyo/master (ff6135959a91 Merge tag 'docs-5.11' of git://git.lwn.net/linux) +$ git merge tomoyo/master +Already up to date. +Merging tpmdd/next (148842c98a24 Merge tag 'x86-apic-2020-12-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge tpmdd/next +Already up to date. +Merging watchdog/master (0b9491b62119 watchdog: convert comma to semicolon) +$ git merge watchdog/master +Removing drivers/watchdog/pnx833x_wdt.c +Auto-merging drivers/watchdog/Kconfig +Merge made by the 'recursive' strategy. + .../bindings/watchdog/allwinner,sun4i-a10-wdt.yaml | 3 + + .../devicetree/bindings/watchdog/snps,dw-wdt.yaml | 10 +- + drivers/watchdog/Kconfig | 14 +- + drivers/watchdog/Makefile | 1 - + drivers/watchdog/geodewdt.c | 2 - + drivers/watchdog/hpwdt.c | 8 +- + drivers/watchdog/iTCO_wdt.c | 34 +-- + drivers/watchdog/mpc8xxx_wdt.c | 4 +- + drivers/watchdog/pnx833x_wdt.c | 277 --------------------- + drivers/watchdog/qcom-wdt.c | 20 +- + drivers/watchdog/rti_wdt.c | 4 +- + drivers/watchdog/sbc_fitpc2_wdt.c | 12 +- + drivers/watchdog/sp805_wdt.c | 1 + + drivers/watchdog/sprd_wdt.c | 43 ++-- + drivers/watchdog/stm32_iwdg.c | 13 +- + drivers/watchdog/watchdog_core.c | 22 +- + drivers/watchdog/wdat_wdt.c | 6 +- + 17 files changed, 104 insertions(+), 370 deletions(-) + delete mode 100644 drivers/watchdog/pnx833x_wdt.c +Merging iommu/next (4dd6ce478003 iommu: Fix a check in iommu_check_bind_data()) +$ git merge iommu/next +Already up to date. +Merging audit/next (6b3211842a11 audit: replace atomic_add_return()) +$ git merge audit/next +Already up to date. +Merging devicetree/for-next (e33dc2f36367 dt-bindings: mali-bifrost: Add dynamic-power-coefficient) +$ git merge devicetree/for-next +Already up to date. +Merging mailbox/mailbox-for-next (5a6338cce9f4 mailbox: arm_mhuv2: Add driver) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (3e98a021cc85 Merge remote-tracking branch 'spi/for-5.11' into spi-next) +$ git merge spi/for-next +Already up to date. +Merging tip/auto-latest (d1c29f5debd4 Merge branch 'efi/core') +$ git merge tip/auto-latest +Auto-merging arch/arm64/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/include/asm/efi.h | 24 ++++++------ + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/efi.h | 11 +++--- + arch/riscv/include/asm/efi.h | 6 --- + arch/x86/boot/compressed/Makefile | 2 +- + arch/x86/include/asm/efi.h | 5 ++- + arch/x86/kernel/Makefile | 2 - + arch/x86/xen/efi.c | 37 +++++------------- + drivers/firmware/efi/Kconfig | 4 +- + drivers/firmware/efi/Makefile | 5 ++- + drivers/firmware/efi/capsule.c | 16 +++++++- + drivers/firmware/efi/libstub/efi-stub.c | 1 - + drivers/firmware/efi/libstub/efistub.h | 3 +- + drivers/firmware/efi/libstub/fdt.c | 3 +- + drivers/firmware/efi/libstub/secureboot.c | 44 ++++++++------------- + drivers/firmware/efi/libstub/x86-stub.c | 5 ++- + drivers/firmware/efi/test/efi_test.c | 16 ++++++++ + drivers/firmware/efi/test/efi_test.h | 3 ++ + include/linux/efi.h | 33 ++++++++++++---- + security/integrity/ima/Makefile | 4 ++ + .../ima_arch.c => security/integrity/ima/ima_efi.c | 45 ++++++---------------- + 21 files changed, 133 insertions(+), 137 deletions(-) + rename arch/x86/kernel/ima_arch.c => security/integrity/ima/ima_efi.c (60%) +Merging clockevents/timers/drivers/next (8ae954caf49a clocksource/drivers/sh_cmt: Fix potential deadlock when calling runtime PM) +$ git merge clockevents/timers/drivers/next +Already up to date. +Merging edac/edac-for-next (f4161dcc4e2c Merge branch 'edac-drivers' into edac-for-next) +$ git merge edac/edac-for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging irqchip/irq/irqchip-next (2f5fbc4305d0 irqchip/qcom-pdc: Fix phantom irq when changing between rising/falling) +$ git merge irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (f6a694665f13 tracing: Offload eval map updates to a work queue) +$ git merge ftrace/for-next +Auto-merging kernel/trace/trace_kprobe.c +Auto-merging kernel/trace/trace_hwlat.c +Auto-merging kernel/trace/trace_events.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/trace/ring_buffer.c +CONFLICT (content): Merge conflict in kernel/trace/ring_buffer.c +Auto-merging kernel/trace/ftrace.c +Auto-merging kernel/trace/bpf_trace.c +Auto-merging kernel/trace/blktrace.c +Auto-merging kernel/trace/Kconfig +Auto-merging include/linux/kprobes.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/kernel/ftrace.c +Auto-merging arch/Kconfig +Auto-merging MAINTAINERS +Resolved 'kernel/trace/ring_buffer.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a5fd57151fef] Merge remote-tracking branch 'ftrace/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/trace/ftrace-uses.rst | 90 +++++++++---- + MAINTAINERS | 1 + + arch/Kconfig | 16 +++ + arch/csky/kernel/probes/ftrace.c | 16 ++- + arch/nds32/kernel/ftrace.c | 4 +- + arch/parisc/kernel/ftrace.c | 24 +++- + arch/powerpc/include/asm/livepatch.h | 4 +- + arch/powerpc/kernel/kprobes-ftrace.c | 15 ++- + arch/s390/include/asm/livepatch.h | 5 +- + arch/s390/kernel/ftrace.c | 20 ++- + arch/x86/Kconfig | 1 + + arch/x86/include/asm/ftrace.h | 18 +++ + arch/x86/include/asm/livepatch.h | 4 +- + arch/x86/kernel/ftrace_64.S | 15 ++- + arch/x86/kernel/kprobes/ftrace.c | 15 ++- + fs/pstore/ftrace.c | 8 +- + include/linux/ftrace.h | 45 +++++-- + include/linux/kprobes.h | 2 +- + include/linux/seq_buf.h | 2 +- + include/linux/trace_recursion.h | 232 +++++++++++++++++++++++++++++++++ + include/linux/trace_seq.h | 4 +- + kernel/livepatch/Kconfig | 2 +- + kernel/livepatch/patch.c | 15 ++- + kernel/trace/Kconfig | 68 ++++++++++ + kernel/trace/Makefile | 1 + + kernel/trace/blktrace.c | 4 +- + kernel/trace/bpf_trace.c | 2 +- + kernel/trace/fgraph.c | 3 +- + kernel/trace/ftrace.c | 57 ++++---- + kernel/trace/ring_buffer.c | 223 +++++++++++++++++++++++++++----- + kernel/trace/synth_event_gen_test.c | 2 +- + kernel/trace/trace.c | 53 ++++++-- + kernel/trace/trace.h | 182 +------------------------- + kernel/trace/trace_benchmark.c | 6 +- + kernel/trace/trace_boot.c | 2 + + kernel/trace/trace_dynevent.c | 2 +- + kernel/trace/trace_dynevent.h | 6 +- + kernel/trace/trace_entries.h | 6 +- + kernel/trace/trace_event_perf.c | 15 ++- + kernel/trace/trace_events.c | 9 +- + kernel/trace/trace_events_filter.c | 23 +--- + kernel/trace/trace_events_hist.c | 2 +- + kernel/trace/trace_events_synth.c | 4 +- + kernel/trace/trace_export.c | 2 +- + kernel/trace/trace_functions.c | 23 ++-- + kernel/trace/trace_functions_graph.c | 2 +- + kernel/trace/trace_hwlat.c | 4 +- + kernel/trace/trace_irqsoff.c | 2 +- + kernel/trace/trace_kprobe.c | 9 +- + kernel/trace/trace_output.c | 6 +- + kernel/trace/trace_output.h | 1 + + kernel/trace/trace_recursion_record.c | 236 ++++++++++++++++++++++++++++++++++ + kernel/trace/trace_sched_wakeup.c | 2 +- + kernel/trace/trace_selftest.c | 29 ++--- + kernel/trace/trace_stack.c | 3 +- + kernel/trace/tracing_map.c | 6 +- + kernel/trace/tracing_map.h | 2 +- + 57 files changed, 1140 insertions(+), 415 deletions(-) + create mode 100644 include/linux/trace_recursion.h + create mode 100644 kernel/trace/trace_recursion_record.c +Merging rcu/rcu/next (ae5633d5117d Merge branch 'rcu/urgent' into HEAD) +$ git merge rcu/rcu/next +Auto-merging init/main.c +Merge made by the 'recursive' strategy. + include/linux/rcupdate.h | 6 ++++++ + init/main.c | 1 + + kernel/rcu/tasks.h | 25 +++++++++++++++++++++---- + 3 files changed, 28 insertions(+), 4 deletions(-) +Merging kvm/next (d45f89f7437d KVM: SVM: fix 32-bit compilation) +$ git merge kvm/next +Removing tools/testing/selftests/kvm/x86_64/user_msr_test.c +Auto-merging tools/testing/selftests/kvm/set_memory_region_test.c +Auto-merging drivers/irqchip/irq-gic-v3-its.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/svm/svm.c +CONFLICT (content): Merge conflict in arch/x86/kvm/svm/svm.c +Auto-merging arch/x86/kvm/svm/sev.c +Auto-merging arch/x86/kvm/mmu/tdp_mmu.c +Auto-merging arch/x86/kvm/mmu/mmu.c +Auto-merging arch/x86/kvm/lapic.c +Auto-merging arch/x86/include/asm/msr-index.h +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/x86/include/asm/cpufeatures.h +Auto-merging arch/s390/mm/gmap.c +Auto-merging arch/s390/kvm/pv.c +Auto-merging arch/s390/kvm/kvm-s390.c +Removing arch/arm64/kvm/regmap.c +Auto-merging arch/arm64/kvm/mmu.c +Removing arch/arm64/kvm/hyp/smccc_wa.S +Auto-merging arch/arm64/kvm/hyp/nvhe/hyp.lds.S +Removing arch/arm64/kvm/aarch32.c +Auto-merging arch/arm64/kernel/vmlinux.lds.S +Auto-merging arch/arm64/kernel/setup.c +Auto-merging arch/arm64/kernel/head.S +Auto-merging arch/arm64/kernel/cpufeature.c +Auto-merging arch/arm64/include/asm/sysreg.h +Auto-merging arch/arm64/include/asm/kvm_emulate.h +Removing arch/arm64/include/asm/kvm_coproc.h +Auto-merging arch/arm64/include/asm/kvm_asm.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/kvm_asm.h +Auto-merging arch/arm64/include/asm/cpufeature.h +Auto-merging Documentation/arm64/memory.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Recorded preimage for 'arch/arm64/include/asm/kvm_asm.h' +Resolved 'arch/x86/kvm/svm/svm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/arm64/include/asm/kvm_asm.h'. +[master 18ab26fc6b6b] Merge remote-tracking branch 'kvm/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 10 + + Documentation/arm64/memory.rst | 2 +- + Documentation/virt/kvm/api.rst | 116 ++- + Documentation/virt/kvm/arm/pvtime.rst | 4 +- + arch/arm64/include/asm/cpucaps.h | 5 +- + arch/arm64/include/asm/cpufeature.h | 5 + + arch/arm64/include/asm/el2_setup.h | 181 ++++ + arch/arm64/include/asm/kvm_arm.h | 1 + + arch/arm64/include/asm/kvm_asm.h | 17 +- + arch/arm64/include/asm/kvm_coproc.h | 38 - + arch/arm64/include/asm/kvm_emulate.h | 70 +- + arch/arm64/include/asm/kvm_host.h | 206 +++-- + arch/arm64/include/asm/kvm_hyp.h | 4 +- + arch/arm64/include/asm/kvm_mmu.h | 110 +-- + arch/arm64/include/asm/mmu.h | 29 - + arch/arm64/include/asm/percpu.h | 6 + + arch/arm64/include/asm/sections.h | 1 + + arch/arm64/include/asm/smp.h | 4 +- + arch/arm64/include/asm/spectre.h | 65 ++ + arch/arm64/include/asm/sysreg.h | 1 + + arch/arm64/include/asm/virt.h | 26 + + arch/arm64/include/uapi/asm/kvm.h | 3 - + arch/arm64/kernel/asm-offsets.c | 5 + + arch/arm64/kernel/cpu_errata.c | 19 +- + arch/arm64/kernel/cpufeature.c | 42 +- + arch/arm64/kernel/head.S | 135 +-- + arch/arm64/kernel/image-vars.h | 11 +- + arch/arm64/kernel/proton-pack.c | 84 +- + arch/arm64/kernel/setup.c | 2 +- + arch/arm64/kernel/vmlinux.lds.S | 10 + + arch/arm64/kvm/Makefile | 4 +- + arch/arm64/kvm/aarch32.c | 232 ------ + arch/arm64/kvm/arm.c | 281 +++++-- + arch/arm64/kvm/guest.c | 29 +- + arch/arm64/kvm/handle_exit.c | 24 +- + arch/arm64/kvm/hyp/Makefile | 2 +- + arch/arm64/kvm/hyp/aarch32.c | 4 +- + arch/arm64/kvm/hyp/exception.c | 331 ++++++++ + arch/arm64/kvm/hyp/hyp-entry.S | 71 +- + arch/arm64/kvm/hyp/include/hyp/adjust_pc.h | 62 ++ + arch/arm64/kvm/hyp/include/hyp/switch.h | 17 + + arch/arm64/kvm/hyp/include/nvhe/trap_handler.h | 18 + + arch/arm64/kvm/hyp/nvhe/Makefile | 5 +- + arch/arm64/kvm/hyp/nvhe/host.S | 58 +- + arch/arm64/kvm/hyp/nvhe/hyp-init.S | 152 +++- + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 243 ++++-- + arch/arm64/kvm/hyp/nvhe/hyp-smp.c | 40 + + arch/arm64/kvm/hyp/nvhe/hyp.lds.S | 1 + + arch/arm64/kvm/hyp/nvhe/psci-relay.c | 324 ++++++++ + arch/arm64/kvm/hyp/nvhe/switch.c | 8 +- + arch/arm64/kvm/hyp/nvhe/sysreg-sr.c | 11 - + arch/arm64/kvm/hyp/smccc_wa.S | 32 - + arch/arm64/kvm/hyp/vgic-v2-cpuif-proxy.c | 2 + + arch/arm64/kvm/hyp/vgic-v3-sr.c | 2 + + arch/arm64/kvm/hyp/vhe/Makefile | 2 +- + arch/arm64/kvm/hyp/vhe/switch.c | 3 + + arch/arm64/kvm/inject_fault.c | 167 ++-- + arch/arm64/kvm/mmio.c | 2 +- + arch/arm64/kvm/mmu.c | 2 +- + arch/arm64/kvm/pmu-emul.c | 19 +- + arch/arm64/kvm/pvtime.c | 6 +- + arch/arm64/kvm/regmap.c | 224 ----- + arch/arm64/kvm/reset.c | 57 +- + arch/arm64/kvm/sys_regs.c | 390 +++------ + arch/arm64/kvm/sys_regs.h | 9 +- + arch/arm64/kvm/va_layout.c | 104 ++- + arch/arm64/kvm/vgic-sys-reg-v3.c | 4 - + arch/arm64/kvm/vgic/vgic-v4.c | 12 + + arch/arm64/kvm/vgic/vgic.c | 3 + + arch/s390/include/asm/kvm_host.h | 1 + + arch/s390/kvm/guestdbg.c | 8 +- + arch/s390/kvm/intercept.c | 2 +- + arch/s390/kvm/interrupt.c | 10 +- + arch/s390/kvm/kvm-s390.c | 22 +- + arch/s390/kvm/priv.c | 4 +- + arch/s390/kvm/pv.c | 6 +- + arch/s390/kvm/vsie.c | 4 +- + arch/s390/mm/gmap.c | 30 +- + arch/x86/include/asm/cpufeatures.h | 2 + + arch/x86/include/asm/kvm_host.h | 20 +- + arch/x86/include/asm/msr-index.h | 1 + + arch/x86/include/asm/svm.h | 40 +- + arch/x86/include/asm/vmx.h | 1 + + arch/x86/include/uapi/asm/kvm.h | 1 + + arch/x86/include/uapi/asm/svm.h | 28 + + arch/x86/include/uapi/asm/vmx.h | 2 + + arch/x86/kernel/cpu/cpuid-deps.c | 1 + + arch/x86/kernel/cpu/scattered.c | 1 + + arch/x86/kernel/cpu/vmware.c | 12 +- + arch/x86/kernel/kvmclock.c | 1 - + arch/x86/kvm/Kconfig | 3 +- + arch/x86/kvm/Makefile | 3 +- + arch/x86/kvm/cpuid.c | 3 +- + arch/x86/kvm/cpuid.h | 14 + + arch/x86/kvm/hyperv.c | 6 +- + arch/x86/kvm/hyperv.h | 4 +- + arch/x86/kvm/kvm_cache_regs.h | 51 +- + arch/x86/kvm/lapic.c | 45 +- + arch/x86/kvm/mmu/mmu.c | 10 +- + arch/x86/kvm/mmu/mmutrace.h | 29 + + arch/x86/kvm/mmu/tdp_mmu.c | 16 +- + arch/x86/kvm/mtrr.c | 6 +- + arch/x86/kvm/svm/avic.c | 9 +- + arch/x86/kvm/svm/nested.c | 11 +- + arch/x86/kvm/svm/sev.c | 915 ++++++++++++++++++++- + arch/x86/kvm/svm/svm.c | 469 ++++++++--- + arch/x86/kvm/svm/svm.h | 167 +++- + arch/x86/kvm/svm/vmenter.S | 50 ++ + arch/x86/kvm/trace.h | 97 +++ + arch/x86/kvm/vmx/evmcs.c | 3 +- + arch/x86/kvm/vmx/nested.c | 57 +- + arch/x86/kvm/vmx/vmenter.S | 2 +- + arch/x86/kvm/vmx/vmx.c | 171 ++-- + arch/x86/kvm/vmx/vmx.h | 2 +- + arch/x86/kvm/x86.c | 511 +++++++++--- + arch/x86/kvm/x86.h | 31 +- + drivers/firmware/psci/psci.c | 126 +-- + drivers/irqchip/irq-gic-v3-its.c | 12 +- + drivers/irqchip/irq-gic-v4.c | 19 + + drivers/vfio/virqfd.c | 3 + + fs/eventfd.c | 5 +- + include/kvm/arm_pmu.h | 3 - + include/kvm/arm_vgic.h | 1 + + include/linux/eventfd.h | 6 + + include/linux/irqchip/arm-gic-v4.h | 4 + + include/linux/kvm_dirty_ring.h | 103 +++ + include/linux/kvm_host.h | 21 +- + include/linux/psci.h | 9 + + include/linux/wait.h | 12 +- + include/trace/events/kvm.h | 63 ++ + include/uapi/linux/kvm.h | 56 +- + kernel/sched/wait.c | 17 +- + tools/testing/selftests/kvm/.gitignore | 6 +- + tools/testing/selftests/kvm/Makefile | 5 +- + tools/testing/selftests/kvm/aarch64/get-reg-list.c | 39 +- + tools/testing/selftests/kvm/dirty_log_perf_test.c | 55 +- + tools/testing/selftests/kvm/dirty_log_test.c | 344 +++++++- + tools/testing/selftests/kvm/include/kvm_util.h | 38 +- + .../testing/selftests/kvm/include/perf_test_util.h | 4 - + .../kvm/include/s390x/diag318_test_handler.h | 13 + + .../selftests/kvm/include/x86_64/processor.h | 17 + + tools/testing/selftests/kvm/include/x86_64/vmx.h | 4 - + .../testing/selftests/kvm/lib/aarch64/processor.c | 17 - + tools/testing/selftests/kvm/lib/kvm_util.c | 158 +++- + .../testing/selftests/kvm/lib/kvm_util_internal.h | 4 + + .../selftests/kvm/lib/s390x/diag318_test_handler.c | 82 ++ + tools/testing/selftests/kvm/lib/s390x/processor.c | 22 - + tools/testing/selftests/kvm/lib/x86_64/processor.c | 32 - + tools/testing/selftests/kvm/s390x/sync_regs_test.c | 16 +- + .../testing/selftests/kvm/set_memory_region_test.c | 2 - + .../selftests/kvm/x86_64/cr4_cpuid_sync_test.c | 1 - + tools/testing/selftests/kvm/x86_64/debug_regs.c | 1 - + tools/testing/selftests/kvm/x86_64/evmcs_test.c | 2 - + tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c | 87 +- + tools/testing/selftests/kvm/x86_64/kvm_pv_test.c | 4 +- + .../testing/selftests/kvm/x86_64/set_sregs_test.c | 92 ++- + tools/testing/selftests/kvm/x86_64/smm_test.c | 2 - + tools/testing/selftests/kvm/x86_64/state_test.c | 1 - + .../testing/selftests/kvm/x86_64/svm_vmcall_test.c | 1 - + tools/testing/selftests/kvm/x86_64/tsc_msrs_test.c | 1 - + tools/testing/selftests/kvm/x86_64/user_msr_test.c | 248 ------ + .../selftests/kvm/x86_64/userspace_msr_exit_test.c | 770 +++++++++++++++++ + .../selftests/kvm/x86_64/vmx_apic_access_test.c | 1 - + .../kvm/x86_64/vmx_close_while_nested_test.c | 1 - + .../selftests/kvm/x86_64/vmx_dirty_log_test.c | 1 - + .../kvm/x86_64/vmx_preemption_timer_test.c | 15 +- + .../kvm/x86_64/vmx_set_nested_state_test.c | 21 + + .../selftests/kvm/x86_64/vmx_tsc_adjust_test.c | 1 - + virt/kvm/dirty_ring.c | 194 +++++ + virt/kvm/eventfd.c | 9 +- + virt/kvm/kvm_main.c | 170 +++- + 171 files changed, 7242 insertions(+), 2750 deletions(-) + create mode 100644 arch/arm64/include/asm/el2_setup.h + delete mode 100644 arch/arm64/include/asm/kvm_coproc.h + delete mode 100644 arch/arm64/kvm/aarch32.c + create mode 100644 arch/arm64/kvm/hyp/exception.c + create mode 100644 arch/arm64/kvm/hyp/include/hyp/adjust_pc.h + create mode 100644 arch/arm64/kvm/hyp/include/nvhe/trap_handler.h + create mode 100644 arch/arm64/kvm/hyp/nvhe/hyp-smp.c + create mode 100644 arch/arm64/kvm/hyp/nvhe/psci-relay.c + delete mode 100644 arch/arm64/kvm/hyp/smccc_wa.S + delete mode 100644 arch/arm64/kvm/regmap.c + create mode 100644 include/linux/kvm_dirty_ring.h + create mode 100644 tools/testing/selftests/kvm/include/s390x/diag318_test_handler.h + create mode 100644 tools/testing/selftests/kvm/lib/s390x/diag318_test_handler.c + delete mode 100644 tools/testing/selftests/kvm/x86_64/user_msr_test.c + create mode 100644 tools/testing/selftests/kvm/x86_64/userspace_msr_exit_test.c + create mode 100644 virt/kvm/dirty_ring.c +Merging kvm-arm/next (3a514592b698 Merge remote-tracking branch 'origin/kvm-arm64/psci-relay' into kvmarm-master/next) +$ git merge kvm-arm/next +Already up to date. +Merging kvm-ppc/kvm-ppc-next (dc924b062488 KVM: SVM: check CR4 changes against vcpu->arch) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (50a05be484cb KVM: s390: track synchronous pfault events in kvm_stat) +$ git merge kvms390/next +Already up to date. +Merging xen-tip/linux-next (5e65f524ed25 xen/manage: Fix fall-through warnings for Clang) +$ git merge xen-tip/linux-next +Auto-merging drivers/block/xen-blkfront.c +Merge made by the 'recursive' strategy. + arch/x86/include/asm/xen/page.h | 2 +- + arch/x86/xen/Kconfig | 38 ++++++++++++++++++++++---------------- + arch/x86/xen/p2m.c | 12 +----------- + drivers/block/xen-blkfront.c | 1 + + drivers/xen/Makefile | 2 +- + drivers/xen/manage.c | 1 + + 6 files changed, 27 insertions(+), 29 deletions(-) +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 | 32 ++++++++++++++++++-------------- + 1 file changed, 18 insertions(+), 14 deletions(-) +Merging workqueues/for-next (ac87f8ff6cf1 workqueue: Kick a worker based on the actual activation of delayed works) +$ git merge workqueues/for-next +Auto-merging kernel/workqueue.c +Merge made by the 'recursive' strategy. + kernel/workqueue.c | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) +Merging drivers-x86/for-next (0cd3f561efa9 platform/x86: ISST: Mark mmio_range_devid_0 and mmio_range_devid_1 with static keyword) +$ git merge drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (6ae9b5ffcaeb platform/chrome: cros_ec_typec: Tolerate unrecognized mux flags) +$ git merge chrome-platform/for-next +Auto-merging include/linux/platform_data/cros_ec_commands.h +Auto-merging drivers/platform/chrome/cros_ec_typec.c +Merge made by the 'recursive' strategy. + drivers/platform/chrome/cros_ec_proto.c | 14 +- + drivers/platform/chrome/cros_ec_typec.c | 336 +++++++++++++++++++------ + include/linux/platform_data/cros_ec_commands.h | 155 ++++++++++++ + 3 files changed, 427 insertions(+), 78 deletions(-) +Merging hsi/for-next (8a77ed6d1fdd HSI: core: fix a kernel-doc markup) +$ git merge hsi/for-next +Merge made by the 'recursive' strategy. + drivers/hsi/controllers/omap_ssi_core.c | 2 +- + drivers/hsi/hsi_core.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging leds/for-next (232aa16455db leds: leds-ariel: convert comma to semicolon) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + drivers/leds/leds-ariel.c | 6 +++--- + drivers/leds/leds-blinkm.c | 24 ++++++++++++------------ + drivers/leds/leds-lm3530.c | 10 +++++----- + drivers/leds/leds-lm3533.c | 2 +- + drivers/leds/leds-lm355x.c | 8 ++++---- + drivers/leds/leds-lm3642.c | 16 ++++++++-------- + drivers/leds/leds-max8997.c | 12 ++++++------ + drivers/leds/leds-netxbig.c | 12 ++++++------ + drivers/leds/leds-ss4200.c | 18 +++++++----------- + drivers/leds/leds-wm831x-status.c | 12 ++++++------ + 10 files changed, 58 insertions(+), 62 deletions(-) +Merging ipmi/for-next (fad0319cacdf char: ipmi: convert comma to semicolon) +$ git merge ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (accefff5b547 Merge tag 'arm-soc-omap-genpd-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (5e60366d56c6 Merge tag 'fallthrough-fixes-clang-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux) +$ git merge usb/usb-next +Already up to date. +Merging usb-gadget/next (b2c586eb07ef usb: dwc2: Fix INTR OUT transfers in DDMA mode.) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (fddd408ad448 USB: serial: ftdi_sio: log the CBUS GPIO validity) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/for-usb-next (fe3defba436f usb: cdnsp: Fix for undefined reference to `usb_hcd_is_primary_hcd') +$ git merge usb-chipidea-next/for-usb-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 9 + + drivers/usb/Makefile | 2 + + drivers/usb/cdns3/Kconfig | 60 +- + drivers/usb/cdns3/Makefile | 35 +- + drivers/usb/cdns3/{debug.h => cdns3-debug.h} | 0 + drivers/usb/cdns3/{ep0.c => cdns3-ep0.c} | 8 +- + drivers/usb/cdns3/{gadget.c => cdns3-gadget.c} | 34 +- + drivers/usb/cdns3/{gadget.h => cdns3-gadget.h} | 0 + drivers/usb/cdns3/cdns3-imx.c | 2 +- + drivers/usb/cdns3/cdns3-plat.c | 315 +++ + drivers/usb/cdns3/{trace.c => cdns3-trace.c} | 2 +- + drivers/usb/cdns3/{trace.h => cdns3-trace.h} | 6 +- + drivers/usb/cdns3/cdnsp-debug.h | 583 ++++++ + drivers/usb/cdns3/cdnsp-ep0.c | 494 +++++ + drivers/usb/cdns3/cdnsp-gadget.c | 2011 +++++++++++++++++++ + drivers/usb/cdns3/cdnsp-gadget.h | 1601 ++++++++++++++++ + drivers/usb/cdns3/cdnsp-mem.c | 1336 +++++++++++++ + drivers/usb/cdns3/cdnsp-pci.c | 254 +++ + drivers/usb/cdns3/cdnsp-ring.c | 2439 ++++++++++++++++++++++++ + drivers/usb/cdns3/cdnsp-trace.c | 12 + + drivers/usb/cdns3/cdnsp-trace.h | 840 ++++++++ + drivers/usb/cdns3/core.c | 455 ++--- + drivers/usb/cdns3/core.h | 59 +- + drivers/usb/cdns3/drd.c | 222 ++- + drivers/usb/cdns3/drd.h | 94 +- + drivers/usb/cdns3/gadget-export.h | 22 +- + drivers/usb/cdns3/host-export.h | 18 +- + drivers/usb/cdns3/host.c | 26 +- + 28 files changed, 10420 insertions(+), 519 deletions(-) + rename drivers/usb/cdns3/{debug.h => cdns3-debug.h} (100%) + rename drivers/usb/cdns3/{ep0.c => cdns3-ep0.c} (99%) + rename drivers/usb/cdns3/{gadget.c => cdns3-gadget.c} (99%) + rename drivers/usb/cdns3/{gadget.h => cdns3-gadget.h} (100%) + create mode 100644 drivers/usb/cdns3/cdns3-plat.c + rename drivers/usb/cdns3/{trace.c => cdns3-trace.c} (89%) + rename drivers/usb/cdns3/{trace.h => cdns3-trace.h} (99%) + create mode 100644 drivers/usb/cdns3/cdnsp-debug.h + create mode 100644 drivers/usb/cdns3/cdnsp-ep0.c + create mode 100644 drivers/usb/cdns3/cdnsp-gadget.c + create mode 100644 drivers/usb/cdns3/cdnsp-gadget.h + create mode 100644 drivers/usb/cdns3/cdnsp-mem.c + create mode 100644 drivers/usb/cdns3/cdnsp-pci.c + create mode 100644 drivers/usb/cdns3/cdnsp-ring.c + create mode 100644 drivers/usb/cdns3/cdnsp-trace.c + create mode 100644 drivers/usb/cdns3/cdnsp-trace.h +Merging phy-next/next (b097efba9580 drm/mediatek: avoid dereferencing a null hdmi_phy on an error message) +$ git merge phy-next/next +Already up to date. +Merging tty/tty-next (5e60366d56c6 Merge tag 'fallthrough-fixes-clang-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux) +$ git merge tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (accefff5b547 Merge tag 'arm-soc-omap-genpd-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc) +$ git merge char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (e1efdb604f5c extcon: max77693: Fix modalias string) +$ git merge extcon/extcon-next +Already up to date. +Merging soundwire/next (17e0da0b8979 soundwire: intel: fix another unused-function warning) +$ git merge soundwire/next +Already up to date. +Merging thunderbolt/next (db0746e3399e thunderbolt: Add support for Intel Maple Ridge) +$ git merge thunderbolt/next +Already up to date. +Merging vfio/next (bdfae1c9a913 vfio/type1: Add vfio_group_iommu_domain()) +$ git merge vfio/next +Already up to date. +Merging staging/staging-next (5e60366d56c6 Merge tag 'fallthrough-fixes-clang-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux) +$ git merge staging/staging-next +Already up to date. +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 (abb888d86f62 Merge branch 'icc-5.11' into HEAD) +$ git merge icc/icc-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging dmaengine/next (115ff12aecfd soc: ti: k3-ringacc: Use correct error casting in k3_ringacc_dmarings_init) +$ git merge dmaengine/next +Already up to date. +Merging cgroup/for-next (2d18e54dd866 cgroup: Fix memory leak when parsing multiple source parameters) +$ git merge cgroup/for-next +Auto-merging kernel/cgroup/cgroup.c +Merge made by the 'recursive' strategy. + kernel/cgroup/cgroup-v1.c | 2 ++ + kernel/cgroup/cgroup.c | 30 +++++++++++++++--------------- + 2 files changed, 17 insertions(+), 15 deletions(-) +Merging scsi/for-next (aa86f5b4a90b Merge branch 'fixes' into for-next) +$ git merge scsi/for-next +Merge made by the 'recursive' strategy. + drivers/scsi/ses.c | 5 +++++ + 1 file changed, 5 insertions(+) +Merging scsi-mkp/for-next (cb5253198f10 scsi: cxgb4i: Fix TLS dependency) +$ git merge scsi-mkp/for-next +Auto-merging include/linux/blkdev.h +Auto-merging include/linux/blk-mq.h +Auto-merging drivers/scsi/ufs/ufshcd.h +Auto-merging drivers/scsi/ufs/ufshcd.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/mpt3sas/mpt3sas_base.c +Auto-merging block/blk-mq.c +Auto-merging block/blk-core.c +Merge made by the 'recursive' strategy. + block/blk-core.c | 13 ++++--- + block/blk-mq-debugfs.c | 1 - + block/blk-mq.c | 4 +- + block/blk-pm.c | 15 ++++--- + block/blk-pm.h | 14 ++++--- + drivers/ide/ide-atapi.c | 1 - + drivers/ide/ide-io.c | 7 +--- + drivers/ide/ide-pm.c | 2 +- + drivers/scsi/cxgbi/cxgb4i/Kconfig | 1 + + drivers/scsi/mpt3sas/mpt3sas_base.c | 2 +- + drivers/scsi/scsi_lib.c | 27 ++++++------- + drivers/scsi/scsi_transport_spi.c | 27 +++++++++---- + drivers/scsi/ufs/ufs-mediatek-trace.h | 2 +- + drivers/scsi/ufs/ufs-mediatek.c | 21 ++++++++++ + drivers/scsi/ufs/ufs-mediatek.h | 1 + + drivers/scsi/ufs/ufs.h | 2 +- + drivers/scsi/ufs/ufshcd-pci.c | 73 ++++++++++++++++++++++++++++++++++- + drivers/scsi/ufs/ufshcd.c | 45 +++++++++++++-------- + drivers/scsi/ufs/ufshcd.h | 14 +++---- + include/linux/blk-mq.h | 4 +- + include/linux/blkdev.h | 18 ++++++--- + 21 files changed, 208 insertions(+), 86 deletions(-) +Merging vhost/linux-next (5e6a378bf7eb vdpa: Use simpler version of ida allocation) +$ git merge vhost/linux-next +Auto-merging mm/memory_hotplug.c +Auto-merging drivers/vdpa/mlx5/net/mlx5_vnet.c +Auto-merging drivers/net/virtio_net.c +Merge made by the 'recursive' strategy. + drivers/net/virtio_net.c | 1 + + drivers/vdpa/Kconfig | 16 +- + drivers/vdpa/ifcvf/ifcvf_main.c | 11 +- + drivers/vdpa/mlx5/net/mlx5_vnet.c | 5 + + drivers/vdpa/vdpa.c | 2 +- + drivers/vdpa/vdpa_sim/Makefile | 1 + + drivers/vdpa/vdpa_sim/vdpa_sim.c | 298 ++---- + drivers/vdpa/vdpa_sim/vdpa_sim.h | 105 ++ + drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 177 ++++ + drivers/vhost/scsi.c | 3 +- + drivers/vhost/vdpa.c | 10 +- + drivers/virtio/virtio_mem.c | 1789 ++++++++++++++++++++++++---------- + drivers/virtio/virtio_ring.c | 8 +- + include/linux/vdpa.h | 1 + + include/uapi/linux/virtio_ids.h | 44 +- + mm/memory_hotplug.c | 105 +- + tools/virtio/asm/barrier.h | 10 + + tools/virtio/linux/bug.h | 2 + + tools/virtio/linux/kernel.h | 13 +- + 19 files changed, 1817 insertions(+), 784 deletions(-) + create mode 100644 drivers/vdpa/vdpa_sim/vdpa_sim.h + create mode 100644 drivers/vdpa/vdpa_sim/vdpa_sim_net.c +Merging rpmsg/for-next (4c0943255805 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file) +$ git merge gpio/for-next +Auto-merging drivers/gpio/gpiolib.c +Auto-merging drivers/gpio/gpio-mvebu.c +Auto-merging drivers/gpio/gpio-dwapb.c +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Removing Documentation/devicetree/bindings/gpio/mediatek,mt7621-gpio.txt +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 50e1cc7ffb2a] Merge remote-tracking branch 'gpio/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/gpio/gpio-pca95xx.yaml | 1 + + .../devicetree/bindings/gpio/gpio-xilinx.txt | 2 + + .../bindings/gpio/mediatek,mt7621-gpio.txt | 35 -- + .../bindings/gpio/mediatek,mt7621-gpio.yaml | 72 ++++ + .../bindings/gpio/mstar,msc313-gpio.yaml | 59 +++ + Documentation/driver-api/gpio/consumer.rst | 18 +- + Documentation/driver-api/gpio/driver.rst | 67 +-- + MAINTAINERS | 19 + + drivers/gpio/Kconfig | 30 +- + drivers/gpio/Makefile | 2 + + drivers/gpio/TODO | 85 ++-- + drivers/gpio/gpio-104-idi-48.c | 6 +- + drivers/gpio/gpio-amd8111.c | 11 +- + drivers/gpio/gpio-ath79.c | 1 + + drivers/gpio/gpio-bt8xx.c | 8 +- + drivers/gpio/gpio-cs5535.c | 8 +- + drivers/gpio/gpio-dwapb.c | 7 +- + drivers/gpio/gpio-exar.c | 155 ++++--- + drivers/gpio/gpio-hisi.c | 323 +++++++++++++++ + drivers/gpio/gpio-mockup.c | 11 +- + drivers/gpio/gpio-msc313.c | 460 +++++++++++++++++++++ + drivers/gpio/gpio-mvebu.c | 71 ++-- + drivers/gpio/gpio-mxc.c | 102 +---- + drivers/gpio/gpio-mxs.c | 14 - + drivers/gpio/gpio-omap.c | 7 +- + drivers/gpio/gpio-rcar.c | 87 ++-- + drivers/gpio/gpio-sifive.c | 25 +- + drivers/gpio/gpio-stmpe.c | 10 +- + drivers/gpio/gpio-tegra.c | 22 +- + drivers/gpio/gpio-tegra186.c | 11 + + drivers/gpio/gpio-xilinx.c | 49 ++- + drivers/gpio/gpio-xra1403.c | 10 +- + drivers/gpio/gpiolib-acpi.c | 139 ++++--- + drivers/gpio/gpiolib-acpi.h | 2 + + drivers/gpio/gpiolib-cdev.c | 79 ++-- + drivers/gpio/gpiolib-devres.c | 27 +- + drivers/gpio/gpiolib-of.c | 14 +- + drivers/gpio/gpiolib-sysfs.c | 2 +- + drivers/gpio/gpiolib.c | 301 ++++---------- + drivers/gpio/gpiolib.h | 4 + + include/dt-bindings/gpio/tegra186-gpio.h | 4 +- + include/linux/gpio/consumer.h | 4 +- + include/linux/gpio/driver.h | 71 ---- + include/uapi/linux/gpio.h | 12 +- + tools/gpio/gpio-event-mon.c | 6 +- + tools/gpio/lsgpio.c | 4 + + 46 files changed, 1631 insertions(+), 826 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/gpio/mediatek,mt7621-gpio.txt + create mode 100644 Documentation/devicetree/bindings/gpio/mediatek,mt7621-gpio.yaml + create mode 100644 Documentation/devicetree/bindings/gpio/mstar,msc313-gpio.yaml + create mode 100644 drivers/gpio/gpio-hisi.c + create mode 100644 drivers/gpio/gpio-msc313.c +Merging gpio-brgl/gpio/for-next (b5252196d08a gpio: put virtual gpio device into their own submenu) +$ git merge gpio-brgl/gpio/for-next +Already up to date. +Merging gpio-intel/for-next (e709a7b5a066 gpiolib: acpi: Make Intel GPIO tree official for GPIO ACPI work) +$ git merge gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (3df09cb8c92e pinctrl/spear: simplify the return expression of spear300_pinctrl_probe()) +$ git merge pinctrl/for-next +Already up to date. +Merging pinctrl-intel/for-next (0b74e40a4e41 pinctrl: baytrail: Avoid clearing debounce value when turning it off) +$ git merge pinctrl-intel/for-next +Already up to date. +Merging pinctrl-samsung/for-next (c5564a50d990 pinctrl: samsung: s3c24xx: remove unneeded break) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (6eefb79d6f5b pwm: sun4i: Remove erroneous else branch) +$ git merge pwm/for-next +Auto-merging drivers/pwm/pwm-sl28cpld.c +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 | 71 ++++- + drivers/pwm/Makefile | 3 + + drivers/pwm/core.c | 2 +- + 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 | 73 ++--- + 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 | 28 +- + drivers/pwm/pwm-intel-lgm.c | 244 ++++++++++++++++ + drivers/pwm/pwm-iqs620a.c | 2 +- + drivers/pwm/pwm-keembay.c | 245 ++++++++++++++++ + 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-sl28cpld.c | 4 +- + drivers/pwm/pwm-spear.c | 4 +- + drivers/pwm/pwm-sti.c | 54 ++-- + drivers/pwm/pwm-sun4i.c | 10 +- + 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 +- + include/linux/pwm.h | 5 - + 54 files changed, 1307 insertions(+), 393 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 (498a1acd9ccf Merge of signal-for-v5.11, exec-for-v5.11, and exec-update-lock-for-v5.11 for testing in linux-next) +$ git merge userns/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ktest/for-next (271e0c9dce1b ktest.pl: Fix incorrect reboot for grub2bls) +$ 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 (63df571c37d9 selftests/vDSO: fix -Wformat warning in vdso_test_correctness) +$ git merge kselftest/next +Merge made by the 'recursive' strategy. + tools/testing/selftests/vDSO/.gitignore | 3 +++ + tools/testing/selftests/vDSO/vdso_test_correctness.c | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) +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 (1efbcec2ef8c coresight: cti: Reduce scope for the variable “cs_fwnode” in cti_plat_create_connection()) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight-cti-platform.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging rtc/rtc-next (f70cc33029fc rtc: fix RTC removal) +$ git merge rtc/rtc-next +Auto-merging include/linux/rtc.h +CONFLICT (content): Merge conflict in include/linux/rtc.h +Auto-merging drivers/rtc/rtc-cmos.c +Auto-merging drivers/rtc/class.c +Auto-merging MAINTAINERS +Resolved 'include/linux/rtc.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 03040f606518] Merge remote-tracking branch 'rtc/rtc-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/driver-api/driver-model/devres.rst | 6 + + MAINTAINERS | 2 +- + arch/alpha/kernel/rtc.c | 2 +- + drivers/mfd/menelaus.c | 2 +- + drivers/rtc/Kconfig | 33 ++-- + drivers/rtc/class.c | 52 ++--- + drivers/rtc/nvmem.c | 91 +-------- + drivers/rtc/rtc-88pm80x.c | 2 +- + drivers/rtc/rtc-88pm860x.c | 2 +- + drivers/rtc/rtc-ab-b5ze-s3.c | 2 +- + drivers/rtc/rtc-ab-eoz9.c | 2 +- + drivers/rtc/rtc-ab3100.c | 2 +- + drivers/rtc/rtc-ab8500.c | 2 +- + drivers/rtc/rtc-abx80x.c | 2 +- + drivers/rtc/rtc-ac100.c | 2 +- + drivers/rtc/rtc-armada38x.c | 2 +- + drivers/rtc/rtc-aspeed.c | 2 +- + drivers/rtc/rtc-at91rm9200.c | 108 ++++++++++- + drivers/rtc/rtc-at91sam9.c | 2 +- + drivers/rtc/rtc-au1xxx.c | 2 +- + drivers/rtc/rtc-bd70528.c | 2 +- + drivers/rtc/rtc-brcmstb-waketimer.c | 5 +- + drivers/rtc/rtc-cadence.c | 2 +- + drivers/rtc/rtc-cmos.c | 6 +- + drivers/rtc/rtc-coh901331.c | 2 +- + drivers/rtc/rtc-cpcap.c | 8 +- + drivers/rtc/rtc-cros-ec.c | 2 +- + drivers/rtc/rtc-da9052.c | 2 +- + drivers/rtc/rtc-da9063.c | 4 +- + drivers/rtc/rtc-davinci.c | 2 +- + drivers/rtc/rtc-digicolor.c | 2 +- + drivers/rtc/rtc-dm355evm.c | 2 +- + drivers/rtc/rtc-ds1305.c | 5 +- + drivers/rtc/rtc-ds1307.c | 83 +++----- + drivers/rtc/rtc-ds1343.c | 5 +- + drivers/rtc/rtc-ds1347.c | 2 +- + drivers/rtc/rtc-ds1374.c | 2 +- + drivers/rtc/rtc-ds1511.c | 6 +- + drivers/rtc/rtc-ds1553.c | 6 +- + drivers/rtc/rtc-ds1672.c | 2 +- + drivers/rtc/rtc-ds1685.c | 5 +- + drivers/rtc/rtc-ds1742.c | 6 +- + drivers/rtc/rtc-ds2404.c | 2 +- + drivers/rtc/rtc-ds3232.c | 2 +- + drivers/rtc/rtc-ep93xx.c | 8 +- + drivers/rtc/rtc-fsl-ftm-alarm.c | 2 +- + drivers/rtc/rtc-ftrtc010.c | 2 +- + drivers/rtc/rtc-goldfish.c | 2 +- + drivers/rtc/rtc-hym8563.c | 7 +- + drivers/rtc/rtc-imx-sc.c | 2 +- + drivers/rtc/rtc-imxdi.c | 2 +- + drivers/rtc/rtc-isl12026.c | 4 +- + drivers/rtc/rtc-isl1208.c | 4 +- + drivers/rtc/rtc-jz4740.c | 2 +- + drivers/rtc/rtc-lpc32xx.c | 2 +- + drivers/rtc/rtc-ls1x.c | 2 +- + drivers/rtc/rtc-m41t80.c | 2 +- + drivers/rtc/rtc-m48t59.c | 5 +- + drivers/rtc/rtc-m48t86.c | 5 +- + drivers/rtc/rtc-mc13xxx.c | 2 +- + drivers/rtc/rtc-meson-vrtc.c | 2 +- + drivers/rtc/rtc-meson.c | 4 +- + drivers/rtc/rtc-mpc5121.c | 2 +- + drivers/rtc/rtc-mrst.c | 2 +- + drivers/rtc/rtc-mt2712.c | 2 +- + drivers/rtc/rtc-mt6397.c | 2 +- + drivers/rtc/rtc-mv.c | 2 +- + drivers/rtc/rtc-mxc.c | 25 +-- + drivers/rtc/rtc-mxc_v2.c | 2 +- + drivers/rtc/rtc-omap.c | 13 +- + drivers/rtc/rtc-pcap.c | 2 +- + drivers/rtc/rtc-pcf2123.c | 2 +- + drivers/rtc/rtc-pcf2127.c | 72 +++---- + drivers/rtc/rtc-pcf85063.c | 4 +- + drivers/rtc/rtc-pcf8523.c | 34 ++-- + drivers/rtc/rtc-pcf85363.c | 4 +- + drivers/rtc/rtc-pcf8563.c | 2 +- + drivers/rtc/rtc-pic32.c | 2 +- + drivers/rtc/rtc-pl030.c | 2 +- + drivers/rtc/rtc-pl031.c | 8 +- + drivers/rtc/rtc-pm8xxx.c | 2 +- + drivers/rtc/rtc-ps3.c | 2 +- + drivers/rtc/rtc-r9701.c | 2 +- + drivers/rtc/rtc-rc5t619.c | 2 +- + drivers/rtc/rtc-rk808.c | 2 +- + drivers/rtc/rtc-rp5c01.c | 5 +- + drivers/rtc/rtc-rs5c348.c | 2 +- + drivers/rtc/rtc-rv3028.c | 6 +- + drivers/rtc/rtc-rv3029c2.c | 4 +- + drivers/rtc/rtc-rv3032.c | 8 +- + drivers/rtc/rtc-rv8803.c | 5 +- + drivers/rtc/rtc-rx6110.c | 165 +++++++++++++--- + drivers/rtc/rtc-rx8010.c | 2 +- + drivers/rtc/rtc-rx8581.c | 4 +- + drivers/rtc/rtc-s35390a.c | 2 +- + drivers/rtc/rtc-s3c.c | 230 +---------------------- + drivers/rtc/rtc-sa1100.c | 2 +- + drivers/rtc/rtc-sc27xx.c | 42 +---- + drivers/rtc/rtc-sd3078.c | 2 +- + drivers/rtc/rtc-sh.c | 2 +- + drivers/rtc/rtc-sirfsoc.c | 2 +- + drivers/rtc/rtc-snvs.c | 69 +++---- + drivers/rtc/rtc-st-lpc.c | 2 +- + drivers/rtc/rtc-starfire.c | 2 +- + drivers/rtc/rtc-stk17ta8.c | 5 +- + drivers/rtc/rtc-stmp3xxx.c | 2 +- + drivers/rtc/rtc-sun4v.c | 2 +- + drivers/rtc/rtc-sun6i.c | 10 +- + drivers/rtc/rtc-sunxi.c | 2 +- + drivers/rtc/rtc-tegra.c | 2 +- + drivers/rtc/rtc-test.c | 3 +- + drivers/rtc/rtc-tps6586x.c | 2 +- + drivers/rtc/rtc-tps65910.c | 2 +- + drivers/rtc/rtc-tx4939.c | 5 +- + drivers/rtc/rtc-vr41xx.c | 2 +- + drivers/rtc/rtc-vt8500.c | 2 +- + drivers/rtc/rtc-wilco-ec.c | 2 +- + drivers/rtc/rtc-wm831x.c | 2 +- + drivers/rtc/rtc-xgene.c | 2 +- + drivers/rtc/rtc-zynqmp.c | 2 +- + drivers/rtc/sysfs.c | 2 - + include/linux/rtc.h | 22 +-- + 122 files changed, 573 insertions(+), 790 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 (75b6f6487ced ntb: intel: add Intel NTB LTR vendor support for gen4 NTB) +$ git merge ntb/ntb-next +Merge made by the 'recursive' strategy. + drivers/ntb/hw/idt/ntb_hw_idt.c | 4 ++-- + drivers/ntb/hw/intel/ntb_hw_gen1.h | 1 + + drivers/ntb/hw/intel/ntb_hw_gen4.c | 27 ++++++++++++++++++++++++++- + drivers/ntb/hw/intel/ntb_hw_gen4.h | 15 +++++++++++++++ + 4 files changed, 44 insertions(+), 3 deletions(-) +Merging seccomp/for-next/seccomp (2c07343abd89 selftests/seccomp: Update kernel config) +$ git merge seccomp/for-next/seccomp +Already up to date. +Merging kspp/for-next/kspp (09162bc32c88 Linux 5.10-rc4) +$ 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 (6790dc4a58f3 slimbus: qcom-ngd-ctrl: fix SSR dependencies) +$ git merge slimbus/for-next +Merge made by the 'recursive' strategy. +Merging nvmem/for-next (292b72c982a6 nvmem: imx-ocotp: add support for the unaliged word count) +$ git merge nvmem/for-next +Merge made by the 'recursive' strategy. +Merging xarray/main (80c1dbebf308 XArray: Fix splitting to non-zero orders) +$ git merge xarray/main +Merge made by the 'recursive' strategy. + lib/test_xarray.c | 26 ++++++++++++++------------ + lib/xarray.c | 11 ++++++----- + 2 files changed, 20 insertions(+), 17 deletions(-) +Merging hyperv/hyperv-next (d1df458cbfdb hv_balloon: do adjust_managed_page_count() when ballooning/un-ballooning) +$ git merge hyperv/hyperv-next +Already up to date. +Merging auxdisplay/auxdisplay (351dcacc6d77 auxdisplay: panel: Remove redundant charlcd_ops structures) +$ git merge auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (d081a6e35316 kdb: Fix pager search for multi-line strings) +$ git merge kgdb/kgdb/for-next +Already up to date. +Merging pidfd/for-next (7abe0224623f Merge tag 'time-namespace-v5.11' of gitolite.kernel.org:pub/scm/linux/kernel/git/brauner/linux 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 (aaf8fe39c952 Revert "fpga: dfl: fix the definitions of type & feature_id for dfl devices") +$ git merge fpga/for-next +Merge made by the 'recursive' strategy. +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 (5f6b99d0287d fs: ext4: Modify inode-test.c to use KUnit parameterized testing feature) +$ 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 (4ea6fa2cb921 mhi: pci_generic: Fix implicit conversion warning) +$ git merge mhi/mhi-next +Already up to date. +Merging notifications/notifications-pipe-core (841a0dfa5113 watch_queue: sample: Display mount tree change notifications) +$ git merge notifications/notifications-pipe-core +Auto-merging security/security.c +Auto-merging samples/watch_queue/watch_test.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 f226a95d4cc6] Merge remote-tracking branch 'notifications/notifications-pipe-core' +$ 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 d6f56d2cee4a] Merge remote-tracking branch 'notifications/notifications-pipe-core' + Date: Fri Dec 18 14:39:29 2020 +1100 +Merging memblock/for-next (5bdba520c1b3 mm: memblock: drop __init from memblock functions to make it inline) +$ git merge memblock/for-next +Already up to date. +Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) +$ git merge init/init-user-pointers +Already up to date. +Merging counters/counters (3650b228f83a Linux 5.10-rc1) +$ git merge counters/counters +Already up to date. +Merging akpm-current/current (9254986bd749 aio: simplify read_events()) +$ git merge --no-ff akpm-current/current +Auto-merging mm/mmap.c +Auto-merging mm/memblock.c +Auto-merging mm/filemap.c +Auto-merging lib/Kconfig.debug +Auto-merging init/main.c +Auto-merging include/linux/wait.h +Auto-merging include/linux/memblock.h +Auto-merging fs/buffer.c +Auto-merging drivers/gpio/gpio-xilinx.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/admin-guide/sysctl/vm.rst | 4 +- + Documentation/dev-tools/index.rst | 1 + + Documentation/dev-tools/kfence.rst | 297 ++++++++++++ + MAINTAINERS | 12 + + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/kfence.h | 17 + + arch/arm64/mm/fault.c | 4 + + arch/arm64/mm/mmu.c | 7 +- + arch/mips/mm/pgtable-32.c | 1 - + arch/mips/mm/pgtable-64.c | 1 - + arch/x86/Kconfig | 1 + + arch/x86/include/asm/kfence.h | 59 +++ + arch/x86/mm/fault.c | 5 + + drivers/gpio/gpio-thunderx.c | 11 +- + drivers/gpio/gpio-xilinx.c | 65 ++- + fs/aio.c | 9 +- + fs/buffer.c | 56 ++- + fs/iomap/seek.c | 125 +---- + fs/ocfs2/namei.c | 17 +- + fs/proc/page.c | 40 +- + fs/ramfs/inode.c | 12 + + include/asm-generic/bitops/find.h | 19 + + include/linux/bitmap.h | 61 +++ + include/linux/bitops.h | 13 + + include/linux/gfp.h | 2 + + include/linux/kfence.h | 202 ++++++++ + include/linux/khugepaged.h | 2 + + include/linux/memblock.h | 1 + + include/linux/memremap.h | 6 + + include/linux/nmi.h | 1 + + include/linux/pagemap.h | 6 +- + include/linux/pagevec.h | 4 - + include/linux/sched.h | 8 + + include/linux/slab_def.h | 3 + + include/linux/slub_def.h | 3 + + include/linux/swap.h | 2 +- + include/linux/wait.h | 4 +- + init/main.c | 3 + + kernel/hung_task.c | 44 ++ + kernel/sysctl.c | 8 +- + kernel/watchdog.c | 21 + + kernel/watchdog_hld.c | 1 + + lib/Kconfig.debug | 7 + + lib/Kconfig.kfence | 72 +++ + lib/cpumask.c | 60 ++- + lib/find_bit.c | 14 + + lib/test_bitmap.c | 143 ++++++ + mm/Makefile | 1 + + mm/compaction.c | 2 +- + mm/filemap.c | 343 ++++++++----- + mm/huge_memory.c | 8 +- + mm/internal.h | 4 +- + 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 | 22 +- + mm/memblock.c | 24 + + mm/memremap.c | 20 + + mm/mmap.c | 43 +- + mm/msync.c | 6 +- + mm/page_alloc.c | 159 +++--- + mm/shmem.c | 150 ++---- + mm/slab.c | 38 +- + mm/slab_common.c | 5 +- + mm/slub.c | 60 ++- + mm/swap.c | 38 +- + mm/swap_state.c | 8 +- + mm/truncate.c | 131 +---- + mm/vmscan.c | 68 ++- + mm/vmstat.c | 32 +- + tools/testing/selftests/vm/Makefile | 2 +- + 75 files changed, 3878 insertions(+), 773 deletions(-) + create mode 100644 Documentation/dev-tools/kfence.rst + 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 lib/Kconfig.kfence + 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 +$ 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/101)
Rebasing (2/101)
Rebasing (3/101)
Rebasing (4/101)
Rebasing (5/101)
Rebasing (6/101)
Rebasing (7/101)
Rebasing (8/101)
Rebasing (9/101)
Rebasing (10/101)
Rebasing (11/101)
Rebasing (12/101)
Rebasing (13/101)
Rebasing (14/101)
Rebasing (15/101)
Rebasing (16/101)
Rebasing (17/101)
Rebasing (18/101)
Rebasing (19/101)
Rebasing (20/101)
Rebasing (21/101)
Rebasing (22/101)
Rebasing (23/101)
Rebasing (24/101)
Rebasing (25/101)
Rebasing (26/101)
Rebasing (27/101)
Rebasing (28/101)
Rebasing (29/101)
Rebasing (30/101)
Rebasing (31/101)
Rebasing (32/101)
Rebasing (33/101)
Rebasing (34/101)
Rebasing (35/101)
Rebasing (36/101)
Rebasing (37/101)
Rebasing (38/101)
Rebasing (39/101)
Rebasing (40/101)
Rebasing (41/101)
Rebasing (42/101)
Rebasing (43/101)
Rebasing (44/101)
Rebasing (45/101)
Rebasing (46/101)
Rebasing (47/101)
Rebasing (48/101)
Rebasing (49/101)
Rebasing (50/101)
Rebasing (51/101)
Rebasing (52/101)
Rebasing (53/101)
Rebasing (54/101)
Rebasing (55/101)
Rebasing (56/101)
Rebasing (57/101)
Rebasing (58/101)
Rebasing (59/101)
Rebasing (60/101)
Rebasing (61/101)
Rebasing (62/101)
Rebasing (63/101)
Rebasing (64/101)
Rebasing (65/101)
Rebasing (66/101)
Rebasing (67/101)
Rebasing (68/101)
Rebasing (69/101)
Rebasing (70/101)
Rebasing (71/101)
Rebasing (72/101)
Rebasing (73/101)
Rebasing (74/101)
Rebasing (75/101)
Rebasing (76/101)
Rebasing (77/101)
Rebasing (78/101)
Rebasing (79/101)
Rebasing (80/101)
Rebasing (81/101)
Rebasing (82/101)
Rebasing (83/101)
Rebasing (84/101)
Rebasing (85/101)
Rebasing (86/101)
Rebasing (87/101)
Rebasing (88/101)
Rebasing (89/101)
Rebasing (90/101)
Rebasing (91/101)
Rebasing (92/101)
Rebasing (93/101)
Rebasing (94/101)
Rebasing (95/101)
Rebasing (96/101)
Rebasing (97/101)
Rebasing (98/101)
Rebasing (99/101)
Rebasing (100/101)
Rebasing (101/101)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 7fbee6eb4238...1c5b0b60b03f akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (1c5b0b60b03f secretmem-test-add-basic-selftest-for-memfd_secret2-fix) +$ git merge --no-ff akpm/master +Removing mm/kasan/generic_report.c +Merge made by the 'recursive' strategy. + Documentation/dev-tools/kasan.rst | 262 ++++--- + arch/Kconfig | 8 +- + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/Kconfig | 9 +- + arch/arm64/Makefile | 7 +- + arch/arm64/include/asm/Kbuild | 1 - + arch/arm64/include/asm/assembler.h | 2 +- + arch/arm64/include/asm/cache.h | 3 + + arch/arm64/include/asm/cacheflush.h | 6 - + arch/arm64/include/asm/esr.h | 1 + + arch/arm64/include/asm/kasan.h | 5 +- + arch/arm64/include/asm/kfence.h | 2 +- + 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/set_memory.h | 17 + + 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/machine_kexec.c | 1 + + 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 | 9 + + arch/arm64/mm/fault.c | 59 ++ + arch/arm64/mm/kasan_init.c | 19 +- + arch/arm64/mm/mmu.c | 6 +- + arch/arm64/mm/mteswap.c | 9 + + arch/arm64/mm/pageattr.c | 23 +- + arch/arm64/mm/proc.S | 23 +- + arch/arm64/mm/ptdump.c | 6 +- + 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/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/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/Kconfig | 2 +- + arch/x86/boot/compressed/misc.h | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 2 + + arch/x86/entry/syscalls/syscall_64.tbl | 2 + + arch/x86/include/asm/set_memory.h | 4 +- + arch/x86/kernel/acpi/wakeup_64.S | 2 +- + arch/x86/kvm/x86.c | 2 +- + arch/x86/mm/pat/set_memory.c | 8 +- + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + fs/dax.c | 11 +- + fs/eventpoll.c | 287 ++++--- + include/linux/compat.h | 6 + + include/linux/kasan-checks.h | 2 +- + include/linux/kasan.h | 359 ++++++--- + include/linux/memcontrol.h | 156 +--- + include/linux/mm.h | 24 +- + include/linux/mmdebug.h | 13 + + 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 | 16 +- + include/linux/string.h | 2 +- + include/linux/syscalls.h | 6 + + include/uapi/asm-generic/unistd.h | 8 +- + include/uapi/linux/magic.h | 1 + + init/init_task.c | 2 +- + kernel/fork.c | 7 +- + kernel/power/hibernate.c | 5 +- + kernel/power/snapshot.c | 4 +- + kernel/sched/core.c | 8 +- + kernel/sys_ni.c | 4 + + lib/Kconfig.kasan | 65 +- + lib/test_kasan.c | 2 +- + lib/test_kasan_module.c | 2 +- + mm/Kconfig | 5 + + mm/Makefile | 1 + + mm/filemap.c | 3 +- + mm/gup.c | 10 + + mm/internal.h | 3 + + mm/kasan/Makefile | 25 +- + mm/kasan/common.c | 834 +++++---------------- + mm/kasan/generic.c | 72 +- + mm/kasan/generic_report.c | 165 ---- + mm/kasan/hw_tags.c | 204 +++++ + mm/kasan/init.c | 17 +- + mm/kasan/kasan.h | 182 ++++- + mm/kasan/quarantine.c | 31 +- + mm/kasan/report.c | 317 +++----- + mm/kasan/report_generic.c | 327 ++++++++ + mm/kasan/report_hw_tags.c | 42 ++ + mm/kasan/{tags_report.c => report_sw_tags.c} | 29 +- + mm/kasan/shadow.c | 517 +++++++++++++ + mm/kasan/{tags.c => sw_tags.c} | 39 +- + mm/memcontrol.c | 74 +- + mm/mempool.c | 4 +- + mm/mmap.c | 5 +- + mm/page_alloc.c | 9 +- + mm/page_poison.c | 2 +- + mm/ptdump.c | 13 +- + mm/secretmem.c | 439 +++++++++++ + mm/slab.c | 2 +- + mm/slab.h | 14 +- + mm/slab_common.c | 5 +- + mm/slub.c | 34 +- + 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 | 155 ++++ + .../filesystems/epoll/epoll_wakeup_test.c | 72 ++ + tools/testing/selftests/vm/.gitignore | 1 + + tools/testing/selftests/vm/Makefile | 3 +- + tools/testing/selftests/vm/memfd_secret.c | 296 ++++++++ + tools/testing/selftests/vm/run_vmtests | 17 + + virt/kvm/coalesced_mmio.c | 2 +- + virt/kvm/kvm_main.c | 2 +- + 139 files changed, 4070 insertions(+), 1832 deletions(-) + create mode 100644 arch/arm64/include/asm/mte-def.h + create mode 100644 arch/arm64/include/asm/mte-kasan.h + create mode 100644 arch/arm64/include/asm/set_memory.h + create mode 100644 include/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 diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..e9a9f93b2791 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20201218 |