diff options
| -rw-r--r-- | Next/SHA1s | 333 | ||||
| -rw-r--r-- | Next/Trees | 335 | ||||
| -rw-r--r-- | Next/merge.log | 4907 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 5576 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..ba6eecf890ef --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,333 @@ +Name SHA1 +---- ---- +origin a74e6a014c9d4d4161061f770c9b4f98372ac778 +fixes e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +kbuild-current 4fb90e13d159311ce5956bb217be80b275b02b7b +arc-current 7c53f6b671f4aba70ff15e1b05148b10d58c2837 +arm-current a38fd8748464831584a19438cbb3082b5a2dab15 +arm64-fixes 7bb8bc6eb550116c504fb25af8678b9d7ca2abc5 +arm-soc-fixes 090e502e4e63c608ef8497d295feeb9743ef67b7 +drivers-memory-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +m68k-current a65a802aadba072ca7514fc0c301fd7fdc6fc6cb +powerpc-fixes bd73758803c2eedc037c2268b65a19542a832594 +s390-fixes 78c7cccaab9d5f9ead44579d79dd7d13a05aec7e +sparc 05a59d79793d482f628a31753c671f2e92178a21 +fscrypt-current d19d8d345eecd9247cbe6cbf27aef271bd88aba7 +net 28259bac7f1dde06d8ba324e222bbec9d4e92f2b +bpf de920fc64cbaa031f947e9be964bda05fd090380 +ipsec 9ab1265d52314fce1b51e8665ea6dbc9ac1a027c +netfilter 9270bbe258c8d1e22fadf4839e762ac937d1ec62 +ipvs 44a674d6f79867d5652026f1cc11f7ba8a390183 +wireless-drivers 05a59d79793d482f628a31753c671f2e92178a21 +mac80211 8811f4a9836e31c14ecdf79d9f3cb7c5d463265d +rdma-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +sound-current eea46a0879bcca23e15071f9968c0f6e6596e470 +sound-asoc-fixes e92a309be437b761c6972502386ea717c6fed027 +regmap-fixes e41a962f82e7afb5b1ee644f48ad0b3aee656268 +regulator-fixes e9e7fce0384b43f9b6c42dee1a79c0a1c332f326 +spi-fixes ffb597b2bd3cd78b9bfb68f536743cd46dbb2cc4 +pci-current 12f6db15c40e6b0f846120f1f9548d278f12f370 +driver-core.current a38fd8748464831584a19438cbb3082b5a2dab15 +tty.current c776b77a279c327fe9e7710e71a3400766554255 +usb.current 46613c9dfa964c0c60b5385dbdf5aaa18be52a9c +usb-gadget-fixes 129aa9734559a17990ee933351c7b6956f1dba62 +usb-serial-fixes cfdc67acc785e01a8719eeb7012709d245564701 +usb-chipidea-fixes 491b1bea00040233b791dc8fea1608ac6a7003bc +phy c92e72ae9e0e5f7be9fa733abd14e7b47e98377e +staging.current 16d7586dccf83785819f5b66f4d20fac9bfcd644 +char-misc.current 65527a51c66f4edfa28602643d7dd4fa366eb826 +soundwire-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +thunderbolt-fixes c94732bda079ee66b5c3904cbb628d0cb218ab39 +input-current 2d8aaa1720c6128ce263a2afcd3f8ee2e5551af8 +crypto-current 0de9dc80625b0ca1cb9730c5ed1c5a8cab538369 +ide 6800cd8cbc6e35989f8d1aa20fac58031231b90f +vfio-fixes e4eccb853664de7bcf9518fb658f35e748bf1f68 +kselftest-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +modules-fixes 57baec7b1b0459ef885e816d8c28a9d9a62bb8de +dmaengine-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +mtd-fixes b135b3358d73aa2a8b2be35d08e422421d1c609e +mfd-fixes 5c8fe583cce542aa0b84adc939ce85293de36e5e +v4l-dvb-fixes dd2ce6ea601b190a455b9b5689ffbbb970e0e16a +reset-fixes b460e0a9e2404450a0cc4c5e6476483d6cda1b26 +mips-fixes bd67b711bfaa02cf19e88aa2d9edae5c1c1d2739 +at91-fixes 2c69c8a1736eace8de491d480e6e577a27c2087c +omap-fixes 4c9f4865f4604744d4f1a43db22ac6ec9dc8e587 +kvm-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +kvms390-fixes 735931f9a51ab09cf795721b37696b420484625f +hwmon-fixes 4008bc7d39537bb3be166d8a3129c4980e1dd7dc +nvdimm-fixes 7018c897c2f243d4b5f1b94bc6b4831a7eab80fb +btrfs-fixes 026fb436af2ecbb9a264fdc306182789d2b99b45 +vfs-fixes d36a1dd9f77ae1e72da48f4123ed35627848507d +dma-mapping-fixes d17405d52bacd14fe7fdbb10c0434934ea496914 +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes 56678a5f44ef5f0ad9a67194bbee2280c6286534 +samsung-krzk-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +pinctrl-samsung-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +devicetree-fixes 8242ff9ea9f0dc0fde5f61faca538d1bf00f5f82 +scsi-fixes 1112963427d6d186f8729cf36fefb70d5ca5a84a +drm-fixes a1f1054124936c717a64e47862e3d0d820f67a87 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes c3d2c6770b4bc34f4de9f4097e5f0ded75d6b98d +mmc-fixes f06391c45e83f9a731045deb23df7cc3814fd795 +rtc-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +gnss-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +hyperv-fixes a226621384779d010fa54f6d9eab4aa60f923621 +soc-fsl-fixes 2663b3388551230cbc4606a40fabf3331ceb59e4 +risc-v-fixes 0d7588ab9ef98bad3b52ad0b91291e8258853cc1 +pidfd-fixes ee2e3f50629f17b0752b55b2566c15ce8dafb557 +fpga-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +spdx a38fd8748464831584a19438cbb3082b5a2dab15 +gpio-brgl-fixes b41ba2ec54a70908067034f139aa23d0dd2985ce +gpio-intel-fixes b41ba2ec54a70908067034f139aa23d0dd2985ce +pinctrl-intel-fixes 77e141266c8e72e4a586fe42eaab1b4b047655ed +erofs-fixes 9f377622a484de0818c49ee01e0ab4eedf6acd81 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes d50ffcd2c371fa3468fd44b22b021d5a50caf880 +ubifs-fixes 78c7d49f55d8631b67c09f9bfbe8155211a9ea06 +memblock-fixes 17cbe03872be8878e2f84047424350d036915df1 +cel-fixes 614c9750173e412663728215152cc6d12bcb3425 +drm-misc-fixes adcbb6f5113c83f74312e54c3a6bfe03a3382e66 +kspp-gustavo 36f9ff9e03de89691274a6aec45aa079bd3ae405 +kbuild 6fbd6cf85a3be127454a1ad58525a3adcf8612ab +compiler-attributes 19c329f6808995b142b3966301f217c831e7cf31 +dma-mapping fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +asm-generic 38489db09b109c22eedf6cd3846ef742bceb45fe +arc def9d2780727cec3313ed3522d0123158d87224d +arm 08cbcb9702566a3c2c2af3a1e5899b72c162f45d +arm64 a38fd8748464831584a19438cbb3082b5a2dab15 +arm-perf f0c140481d1b807217cacdcf11d24cfa407a7a53 +arm-soc e6c44b8c57c95131a217170b982531cd14556da8 +actions 006828d706fda3c729ccc32e3e6ecda6dd05b299 +amlogic 1c459c4d568dc37c9bbc58465e3b39194ff020b8 +aspeed 697dabd5d3700e23d8cbd86e4cb8a49744766b48 +at91 b95bbae19954b1cfaa2fb92f91b02f956ab3b197 +drivers-memory 7db9ddae13712e5ac35637754e19388ead845578 +imx-mxs 2ec23a93ffc7685b40fbd9dd7e73297036d94719 +keystone 9d2e21ed98a24584daa3c90698ce81f5cc307a27 +mediatek e6468af3b590a8d3970cf17fce3f58ab8f465f22 +mvebu 8e03d45cb7de0258f357fbfb2c0e6c5fd9c1d364 +omap 01e73147cbf8160cc395a78d00fd1c345053fbc5 +qcom ab054d004d438f5e478777c9441cacdda1dbe8be +raspberrypi fbdcf1d2012639e3abdbb97bb6dea9105673d57e +realtek 486f29df69413411a205d3101bae0427a892bee4 +renesas 604bd2d4786e902a90a56db9427d5563bdf8c529 +reset d4e4dffec50bb7ea20f9a72a273582efe23769cb +rockchip 38051549ac387948eb3819af47a3fe909640428e +samsung-krzk e52a6d1c770f4ad895b25e4e800a1485d0afe00a +scmi 1b07e14dc045dc39cccab3aff7421eb9363e4f9b +stm32 a9c92a9671d7e1fc4fdba7c6eb868a37242838f0 +sunxi 582cfdb9d206cd513048d79b272a22d48982ef1e +tegra b62f4a3fbb22f2e8f3422366a3a6f48faa7ed867 +ti-k3 1e3d655fe7b48c2341d63f981774742e21744f53 +ti-k3-new 4c842af368398ad061ba5c8fc4855f5d251d370b +clk a38fd8748464831584a19438cbb3082b5a2dab15 +clk-renesas c66424ea75640a205c34d0ba6986307179516fd4 +clk-samsung 44a9e78f9242872c889f176782777fa2ed535650 +csky 74cdb26644775597974a3c6d56c7212f60a9fcb1 +h8300 6e5e55227c959716103945e7140614c4c2faf439 +m68k f2e7e4bf38fd95aa8c0fdb8b2ad4104a9fc96d64 +m68knommu f81e12646946b665bf32cf8c3e7479f46da7af79 +microblaze 9dc12e4ccd97c07d5c9ed9ea4a75a5e16bc3700e +mips 043d7f9713b765f26b4341528d96931eb5446653 +nds32 40e0dd851e7b7afe219820fb270b09016e41d4fc +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 8f722f67452f4b28cd8d7acf1658daa5796437c2 +parisc-hd 711d090f0e021c2fdffc247c43350ebc9be51953 +powerpc fbda7904302499dd7ffc073a3c84eb7c9275db0a +fsl a76bea0287ce13d28494b19649d80d8ee5e7b757 +soc-fsl e95f287deed2454b8cad5b27859271db30130b2b +risc-v 9530141455c968938a913d602a236c2a7b0322e1 +s390 755d91f36dab69c647f15e561d663b7d148b2199 +sh 2882b7626f4903a8e9250b328cdf7396a6deecac +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml ddad5187fc2a12cb84c9d1ac8ecb816708a2986b +xtensa ab5eb336411f18fd449a1fb37d36a55ec422603f +pidfd f69e8091c4a2ae291e1f55225e8116fef05dc156 +fscrypt a14d0b6764917b21ee6fdfd2a8a4c2920fbefcce +fscache 42587ccf2ed511378e8f0ab52903d492981ba6a6 +afs 8409f67b6437c4b327ee95a71081b9c7bfee0b00 +btrfs c4e9b6a42a436828de92d982b58add382fe3df3f +ceph 558b4510f622a3d96cf9d95050a04e7793d343c7 +cifs a3ef62ddbeab0e269ee5a2ac0be412dcf55586c3 +configfs 65cdb4a214c0015c19fc1876896746c05396f45d +ecryptfs 902af369942f8d0a6bdaa8466ff0d84d3d9b03a8 +erofs ce063129181312f8781a047a50be439c5859747b +exfat a403e793cb41399129aab23287973e18d5cb0ea0 +ext3 c5b8ccc3da766549a4464b6a30cec755c2a1d393 +ext4 73648622c60a7bd556d84a6cecd3b225eb39c1f8 +f2fs e489f1ca49b36696041a16cf3e7291739d47250d +fsverity 07c99001312cbf90a357d4877a358f796eede65b +fuse 166ddcdeea0bb0498a87e6418f8b2332a1cd0d56 +jfs c03c21ba6f4e95e406a1a7b4c34ef334b977c194 +nfs 144c79ef33536b4ecb4951e07dbc1f2b7fa99d32 +nfs-anna 7ae017c7322e2b12472033e65a48aa25cde2fb22 +nfsd c3213d260a23e263ef85ba21ac68c9e7578020b5 +cel e0924d9bf4840152194cca6fb984e41882f61760 +orangefs c1048828c3dbd96c7e371fae658e5f40e6a45e99 +overlayfs d46b7cd683366b8f59cb898c1bae6cff38d7f8f3 +ubifs 42119dbe571eb419dae99b81dd20fa42f47464e1 +v9fs 324a158fe535839227395aa3a919027f3b01e7a2 +xfs 756b1c343333a5aefcc26b0409f3fd16f72281bf +zonefs 059c01039c0185dbee7ed080f1f2bd22cb1e4dab +iomap ed1128c2d0c87e5ff49c40f5529f06bc35f4251b +djw-vfs 9b8523423b23ee3dfd88e32f5b7207be56a4e782 +file-locks cc4a3f885e8f2bc3c86a265972e94fef32d68f67 +vfs 1f081146def47ee60cd711194f18a98c9b851cac +printk 4e16cd8fae2f70a155fe6c43a2aab1888243cbbf +pci a38fd8748464831584a19438cbb3082b5a2dab15 +pstore 7db688e99c0f770ae73e0f1f3fb67f9b64266445 +hid e453304975b0973fb2447305263f27ea00bf4f23 +i2c fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +i3c 436cb709f8a9fd1a52e00e830e715c63191c2e63 +dmi 3cb4d29a2633170208c96240c7e85148679ceee3 +hwmon-staging 6ab3332cc692ad04dfa30c92d3391aea8b971ef2 +jc_docs a5907065ac1ab5cbcceea2a9ac0c40c1bef255fa +v4l-dvb 1c5ab1e2286f4ca6347744e9d4cace5fad5ffa39 +v4l-dvb-next d0a9fffedca102633c168adaf157f34288a4ea67 +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm 8608bdeb4cdb5608b4073077e6e5d7bdedefd169 +cpufreq-arm ce4e7ba5489187d9dc4490987aff833eeb9c9987 +cpupower a38fd8748464831584a19438cbb3082b5a2dab15 +devfreq 03efd953fe1b20b846624deaabd6c51417bf95ae +opp 6e1cb1b154bd1ec34bd2c6538ad39a5959b81564 +thermal a51afb13311cd85b2f638c691b2734622277d8f5 +thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 67f8e65e4fc19e24993e8780f41279eeffbd0610 +dlm 9d232469bcd772dbedb9e75a165c681b920524ee +swiotlb a38fd8748464831584a19438cbb3082b5a2dab15 +rdma a38fd8748464831584a19438cbb3082b5a2dab15 +net-next 34bb975126419e86bc3b95e200dc41de6c6ca69c +bpf-next d310ec03a34e92a77302edb804f7d68ee4f01ba0 +ipsec-next d310ec03a34e92a77302edb804f7d68ee4f01ba0 +mlx5-next a38fd8748464831584a19438cbb3082b5a2dab15 +netfilter-next 05a59d79793d482f628a31753c671f2e92178a21 +ipvs-next a61e4b60761fa7fa2cfde6682760763537ce5549 +wireless-drivers-next 05a59d79793d482f628a31753c671f2e92178a21 +bluetooth d00745da644d42c2f97293eb3fe19cfd5c0b073c +mac80211-next 38b5133ad607ecdcc8d24906d1ac9cc8df41acd5 +gfs2 1a5a2cfd34c17db73c53ef127272c8c1ae220485 +mtd 457da931b60868580d878c0b683df6114870042d +nand 99a8e1154eb121e3d1535d578b9466c307a94097 +spi-nor 47f25032c0e34ea492e88a68db373c92eae1d70a +crypto 1406f0f3440265deec6932fd611549b07ac76e89 +drm a38fd8748464831584a19438cbb3082b5a2dab15 +drm-misc 5fd3de7a51855e086d9ce9d2d752489e9c15b850 +amdgpu 05d726b6a58d479c5f2cc78279958b9faed821a3 +drm-intel aaca50ef45ed247d98a66c0a754d1be93ff35dde +drm-tegra dcdfe2712b68f1e9dbf4f1a96ad59b80e5cc0ef7 +drm-msm 7bf168c8fe8c6166b5dc10005fe7f250164da0ad +imx-drm 82581fcf070b68a91fb3a3ade08d9a76380a4789 +etnaviv 7d614ab2f20503ed8766363d41f8607337571adf +regmap e41a962f82e7afb5b1ee644f48ad0b3aee656268 +sound b9dd23bb03fe241ccb774c59b05d5cbac07895dc +sound-asoc 64682e1b774475c9f156163ca2ab39cc36f60254 +modules 1e80d9cb579ed7edd121753eeccce82ff82521b4 +input ea16ef967ec88bd67466d564d461c3fdf7f85bd9 +block 72dd7a4f28d5ba104212941c5fa62fc412abb8cf +device-mapper 8416f5edbcf73733ae21ffbc936d53c01168d007 +pcmcia 4ce6b242b78d355ba899f1b16c6bfcd43df155a0 +mmc a592fb89354c124ca252fb2294fac06e41661b8d +mfd fea19b6e80a1aac9a013caee240cfd777074af75 +backlight 225be60f3853572f682b7ad3d0c1d4008edb6c6b +battery 2552e38dc8ad601ff8defb8051126277a165a991 +regulator 45ee8b79d67905ac57408b30314757981531def9 +security 9dcd47fc1f7dd8bed24d83802f91e02ec55f0c23 +apparmor d108370c644b153382632b3e5511ade575c91c86 +integrity f6692213b5045dc461ce0858fb18cf46f328c202 +keys e377c31f788fc98815e1ab90b5a35704ce35843a +safesetid 03ca0ec138927b16fab0dad7b869f42eb2849c94 +selinux 431c3be16bd08728325814320e3603ec3284d542 +smack 7ef4c19d245f3dc233fd4be5acea436edd1d83d8 +tomoyo fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +tpmdd a8bba9247eb32e58aa7fd9c5c76da13e127a0399 +watchdog a4f3407c41605d14f09e490045d0609990cd5d94 +iommu be575abcf7996e79f976570c68d75985d58431cb +audit a38fd8748464831584a19438cbb3082b5a2dab15 +devicetree dce92f6b11c3174737bd65eaf933458909b633ff +mailbox 6b50df2b8c208a04d44b8df5b7baaf668ceb8fc3 +spi 31890269c0a031e704f995bbd39e1fd77a381207 +tip ea5c764c6e8e1e01f4275b24e2d1a11bd7503fe8 +clockevents e85c1d21b16b278f50d191155bc674633270e9c6 +edac faf042d15093164879f1a5d9b9805190ac6f7d40 +irqchip 5fbecd2389f48e1415799c63130d0cdce1cf3f60 +ftrace f9f344479d8b40b3b001c913fb992d85d19261d0 +rcu 7836d7be2d23267d6aa9b3bf1474146f6e9e28fd +kvm 357ad203d45c0f9d76a8feadbd5a1c5d460c638b +kvm-arm 58c71cd7cac68b573e038926a5e9917cc24120b7 +kvm-ppc 72476aaa469179222b92c380de60c76b4cb9a318 +kvms390 20eff2c93a2d4758ab1989d2d71fecc26b64cb7e +xen-tip f1d20d8643e54dcde242fd2c8748063ed75702a8 +percpu df1c002198a80b89b8b18ccf219456d95483d4a1 +workqueues a7347aa8e0610b0858803a5afaa5bc6b8e78820b +drivers-x86 87eaede45385e384faf5b15d9c718a951667bdd0 +chrome-platform a38fd8748464831584a19438cbb3082b5a2dab15 +hsi aa57e77b3d28f0df07149d88c47bc0f3aa77330b +leds 34731ed13e8a8ca95fa0dca466537396b5f2d1af +ipmi c053c4eb5a0f010fcd301cf764b59cb783b4979b +driver-core a38fd8748464831584a19438cbb3082b5a2dab15 +usb 60a35ba9141f06b67150ce3544bc595d049b0d83 +usb-gadget b2c586eb07efab982419f32b7c3bd96829bc8bcd +usb-serial a38fd8748464831584a19438cbb3082b5a2dab15 +usb-chipidea-next 67982dfa59debe6c5d7feb55ef2e8a94889565c2 +tty 3d82be8be6fdf38543fa3ae9c35beda4a8a8d067 +char-misc f8096ff38d5f62d8a2c473e1bec0163a1b2b86d8 +extcon b906ab5498369f23a5c490fa39582df81141049c +phy-next 8e6b3a78eddde51d5a30dd431718eaaea529484b +soundwire fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +thunderbolt d59b8faa047ead7187e333ac967b8df40870ce2c +vfio 4d83de6da265cd84e74c19d876055fa5f261cde4 +staging c972c2d821ca3eda001a20dbe2ca0b4718838caf +mux 3516bd729358a2a9b090c1905bd2a3fa926e24c6 +icc 3ffdec2843e13e5abcbf20c7afe306b6fef0c335 +dmaengine fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +cgroup 00bfa16052cd66855de9bee66d7a5468f4fdc850 +scsi f88dfeea18aa4d88d2e4418d3d94ee6237070281 +scsi-mkp 18956295fea61e6a08a15d829b06e744830ae236 +vhost 59a47ca88484894794d2bae6d4d03d66954ed727 +rpmsg fcb4c469244ba9934c3594755b04aca79efc5932 +gpio 7ac554888233468a9fd7c4f28721396952dd9959 +gpio-brgl 79bdf5472bab803c1cae9e4dff0ae78a2766ec7c +gpio-intel 488d05fe25a65200e486e8ca684fd40ac4a08aa0 +pinctrl a0686a4cdfad967e991618d3c35608f1903dfcaf +pinctrl-intel 9d8c5b0d2e099a4a625cd283375f7dd1acd3d329 +pinctrl-renesas f7adcca27edf05fc1f061a9e5de059fe179f0e1c +pinctrl-samsung a38fd8748464831584a19438cbb3082b5a2dab15 +pwm 9a9dd7e473517b68412fd2da3da8a4aeb4ecb38a +userns 95ebabde382c371572297915b104e55403674e73 +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +random ab9a7e27044b87ff2be47b8f8e095400e7fccc44 +kselftest fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +y2038 c4e71212a245017d2ab05f322f7722f0b87a55da +livepatching 81840f21d4164e0db5162ccc736c65b369883cc9 +coresight 1efbcec2ef8c037f1e801c76e4b9434ee2400be7 +rtc a38fd8748464831584a19438cbb3082b5a2dab15 +nvdimm 30c10d32152dd09c2158e9cab8a6c7adaa09278e +at24 fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +ntb 5c8fe583cce542aa0b84adc939ce85293de36e5e +seccomp a381b70a1cf88e4a2d54f24d59abdcad0ff2dfe6 +kspp 414eece95b98b209cef0f49cfcac108fd00b8ced +gnss 994adcbd37148acfa593c9ec2880a81ef97c7041 +fsi 4a851d714eadeabd65c7e321a2e7830f77d945c4 +slimbus 0320ed0a82364b3b175ab83ad11c7e4d9ad828a9 +nvmem 097eb1136ebb4b8fcf2bea3cf7e29d1c3e7a2542 +xarray 80c1dbebf308a41badb8f1628247fe94dda99bfe +hyperv ec866be6ec547c9e1cc4451f04250e08b5fe67c7 +auxdisplay b45616445a6e346daf8a173a0c51413aec067ebb +kgdb f11e2bc682cc197e33bfd118178cadb61326dc0e +hmm fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +fpga 6f1e376cfc6864a2f46538db909bbd5253c3c146 +kunit fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +generic-ioremap 4bdc0d676a643140bdf17dbf7eafedee3d496a3c +cfi 5de15b610f785f0e188fefb707f0b19de156968a +kunit-next fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +trivial 9ff9b0d392ea08090cd1780fb196f36dbb586529 +zx2c4 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e +mhi 4d5f52838d11981c4d76cdc4e73230120de1ac85 +memblock 097d43d8570457c1af9b09fab15412697b177f35 +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +iomem-mmap-vs-gup fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +akpm-current c661e4987275c5d7ee11c8fd5b640e3234ab6892 +akpm d2a15e88783ea81eaef47a90d494322783535cf5 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..bb9607055750 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,335 @@ +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#i3c/fixes +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-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +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 +cel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-rc +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 +actions git git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.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-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +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 +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 +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#master +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache-next +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.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-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 +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +amdgpu git https://gitlab.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-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 +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 +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#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-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +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 +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 +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 +iomem-mmap-vs-gup git git://anongit.freedesktop.org/drm/drm#topic/iomem-mmap-vs-gup +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..74d817940f30 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4907 @@ +$ date -R +Thu, 11 Mar 2021 09:03:23 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 4b3d9f9cf108 Merge tag 'gpio-fixes-for-v5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux +Merging origin/master (a74e6a014c9d Merge tag 's390-5.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) +$ git merge origin/master +Updating 4b3d9f9cf108..a74e6a014c9d +Fast-forward + Documentation/networking/bonding.rst | 2 +- + Documentation/networking/netdev-FAQ.rst | 72 +-------- + Documentation/process/stable-kernel-rules.rst | 6 - + Documentation/process/submitting-patches.rst | 5 - + MAINTAINERS | 3 +- + arch/s390/configs/debug_defconfig | 16 +- + arch/s390/configs/defconfig | 11 +- + arch/s390/configs/zfcpdump_defconfig | 3 - + arch/s390/include/asm/idle.h | 12 +- + arch/s390/include/asm/timex.h | 36 ++--- + .../uapi/asm/{perf_cpum_cf_diag.h => hwctrset.h} | 0 + arch/s390/kernel/idle.c | 12 +- + arch/s390/kernel/perf_cpum_cf.c | 2 +- + arch/s390/kernel/perf_cpum_cf_diag.c | 20 +-- + arch/s390/kernel/time.c | 28 ++-- + arch/s390/kernel/topology.c | 2 - + arch/s390/kvm/interrupt.c | 2 +- + arch/sparc/configs/sparc64_defconfig | 4 +- + arch/sparc/kernel/traps_64.c | 13 +- + arch/x86/net/bpf_jit_comp.c | 10 +- + drivers/atm/eni.c | 3 +- + drivers/atm/idt77105.c | 4 +- + drivers/atm/lanai.c | 5 +- + drivers/atm/uPD98402.c | 2 +- + drivers/net/bonding/bond_main.c | 8 +- + drivers/net/can/flexcan.c | 24 +-- + drivers/net/can/m_can/tcan4x5x-core.c | 6 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 21 +-- + drivers/net/dsa/bcm_sf2.c | 6 +- + drivers/net/dsa/mt7530.c | 4 + + drivers/net/dsa/sja1105/sja1105_main.c | 6 +- + drivers/net/dsa/xrs700x/xrs700x.c | 10 +- + drivers/net/ethernet/atheros/alx/main.c | 7 +- + drivers/net/ethernet/broadcom/bcm4908_enet.c | 3 + + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 17 ++- + drivers/net/ethernet/cadence/macb_main.c | 15 +- + .../chelsio/inline_crypto/ch_ktls/chcr_ktls.c | 8 +- + drivers/net/ethernet/davicom/dm9000.c | 23 ++- + drivers/net/ethernet/freescale/enetc/enetc.c | 93 ++++++------ + drivers/net/ethernet/freescale/enetc/enetc.h | 5 + + drivers/net/ethernet/freescale/enetc/enetc_hw.h | 20 ++- + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 104 ++++++++++--- + drivers/net/ethernet/freescale/enetc/enetc_vf.c | 7 + + drivers/net/ethernet/freescale/fec_ptp.c | 7 + + drivers/net/ethernet/freescale/gianfar.c | 15 ++ + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 4 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 6 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 7 +- + drivers/net/ethernet/ibm/ibmvnic.c | 17 +-- + drivers/net/ethernet/intel/iavf/iavf_main.c | 3 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 5 + + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 6 +- + drivers/net/ethernet/intel/ixgbevf/ipsec.c | 5 + + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 4 +- + drivers/net/ethernet/mediatek/mtk_star_emac.c | 5 +- + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 + + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 1 + + drivers/net/ethernet/mellanox/mlxsw/reg.h | 1 + + .../net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 5 + + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 7 + + drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 3 +- + drivers/net/ethernet/microchip/lan743x_main.c | 2 +- + drivers/net/ethernet/mscc/Kconfig | 1 + + drivers/net/ethernet/mscc/ocelot_flower.c | 3 +- + drivers/net/ethernet/realtek/r8169_main.c | 2 +- + drivers/net/ethernet/renesas/sh_eth.c | 7 + + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 59 ++++++-- + drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 59 ++++++-- + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 19 ++- + drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c | 4 - + .../net/ethernet/stmicro/stmmac/dwxgmac2_descs.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 9 +- + drivers/net/ethernet/stmicro/stmmac/hwif.h | 5 +- + drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 9 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 160 ++++++++++++++++---- + drivers/net/ethernet/sun/niu.c | 2 - + drivers/net/ethernet/tehuti/tehuti.c | 1 + + drivers/net/hamradio/6pack.c | 5 - + drivers/net/hyperv/hyperv_net.h | 2 +- + drivers/net/hyperv/netvsc_drv.c | 13 +- + drivers/net/hyperv/rndis_filter.c | 2 +- + drivers/net/netdevsim/netdev.c | 1 + + drivers/net/phy/dp83822.c | 9 +- + drivers/net/phy/dp83tc811.c | 11 +- + drivers/net/phy/phy.c | 6 +- + drivers/net/phy/phy_device.c | 6 +- + drivers/net/usb/cdc_ncm.c | 10 +- + drivers/net/usb/qmi_wwan.c | 14 -- + drivers/net/usb/r8152.c | 35 +---- + drivers/net/usb/usbnet.c | 2 +- + drivers/net/wan/fsl_ucc_hdlc.c | 8 +- + drivers/net/wan/lapbether.c | 3 - + drivers/net/wireless/ath/ath11k/mac.c | 4 +- + drivers/net/wireless/ath/ath11k/qmi.c | 4 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 3 +- + drivers/net/wireless/ath/ath9k/xmit.c | 6 + + drivers/net/wireless/intel/iwlwifi/fw/pnvm.c | 4 +- + drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h | 2 + + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 1 + + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 3 +- + drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 3 +- + drivers/net/wireless/mediatek/mt76/dma.c | 26 ++-- + drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 10 +- + .../net/wireless/mediatek/mt76/mt7915/testmode.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 4 +- + drivers/net/xen-netback/netback.c | 4 +- + drivers/s390/char/tty3270.c | 6 +- + drivers/s390/char/zcore.c | 44 +++--- + drivers/s390/cio/device_fsm.c | 2 +- + drivers/s390/cio/vfio_ccw_ops.c | 6 +- + drivers/s390/crypto/vfio_ap_ops.c | 2 +- + drivers/s390/net/qeth_core.h | 3 +- + drivers/s390/net/qeth_core_main.c | 128 ++++++++-------- + fs/Kconfig | 2 +- + fs/cifs/cifs_debug.c | 2 +- + fs/cifs/cifsfs.c | 2 +- + fs/cifs/cifsglob.h | 19 +-- + fs/cifs/connect.c | 14 +- + fs/cifs/sess.c | 1 + + fs/cifs/smb2inode.c | 1 + + fs/cifs/smb2misc.c | 10 +- + fs/cifs/smb2ops.c | 10 +- + fs/cifs/smb2pdu.c | 6 +- + fs/cifs/smb2proto.h | 3 +- + fs/cifs/transport.c | 4 +- + fs/pnode.h | 2 +- + include/linux/atmdev.h | 2 +- + include/linux/can/skb.h | 8 +- + include/linux/netdevice.h | 2 - + include/linux/textsearch.h | 2 +- + include/linux/virtio_net.h | 7 +- + include/uapi/linux/bpf.h | 1 - + include/uapi/linux/l2tp.h | 1 + + include/uapi/linux/netfilter/nfnetlink_cthelper.h | 2 +- + kernel/bpf/btf.c | 2 - + kernel/bpf/core.c | 6 + + kernel/bpf/verifier.c | 91 +++++++----- + mm/slub.c | 2 +- + net/9p/client.c | 4 - + net/core/rtnetlink.c | 2 +- + net/core/skbuff.c | 2 + + net/dsa/Kconfig | 2 + + net/dsa/dsa_priv.h | 25 ++-- + net/dsa/slave.c | 59 ++++++-- + net/dsa/tag_mtk.c | 19 ++- + net/dsa/tag_rtl4_a.c | 12 +- + net/ethtool/channels.c | 26 ++-- + net/ipv4/cipso_ipv4.c | 13 +- + net/ipv4/inetpeer.c | 21 +-- + net/ipv4/ip_tunnel.c | 5 +- + net/ipv4/ip_vti.c | 6 +- + net/ipv4/nexthop.c | 10 +- + net/ipv4/tcp.c | 26 ++-- + net/ipv4/udp_offload.c | 2 +- + net/ipv6/calipso.c | 14 +- + net/ipv6/ip6_gre.c | 16 +- + net/ipv6/ip6_tunnel.c | 10 +- + net/ipv6/ip6_vti.c | 6 +- + net/ipv6/sit.c | 2 +- + net/l2tp/l2tp_core.c | 41 ++--- + net/l2tp/l2tp_core.h | 1 + + net/l2tp/l2tp_netlink.c | 6 + + net/mpls/mpls_gso.c | 3 + + net/mptcp/protocol.c | 165 +++++++++++++-------- + net/mptcp/protocol.h | 14 +- + net/mptcp/subflow.c | 14 +- + net/netfilter/nf_conntrack_helper.c | 3 +- + net/netfilter/nf_conntrack_proto_tcp.c | 6 +- + net/netfilter/nf_nat_proto.c | 25 +++- + net/netfilter/nf_tables_api.c | 19 ++- + net/netfilter/x_tables.c | 6 +- + net/netlabel/netlabel_cipso_v4.c | 3 + + net/qrtr/qrtr.c | 6 +- + net/sched/sch_api.c | 8 +- + net/sctp/tsnmap.c | 2 +- + samples/bpf/xdpsock_user.c | 2 + + tools/bpf/resolve_btfids/main.c | 5 + + tools/include/uapi/linux/bpf.h | 1 - + tools/lib/bpf/xsk.c | 5 +- + .../selftests/bpf/progs/netif_receive_skb.c | 13 +- + .../selftests/bpf/progs/test_global_func11.c | 2 +- + .../testing/selftests/bpf/progs/test_tunnel_kern.c | 6 +- + .../testing/selftests/bpf/verifier/array_access.c | 3 +- + tools/testing/selftests/bpf/verifier/atomic_and.c | 23 +++ + .../selftests/bpf/verifier/atomic_cmpxchg.c | 25 ++++ + tools/testing/selftests/bpf/verifier/atomic_or.c | 25 ++++ + tools/testing/selftests/net/fib_nexthops.sh | 8 + + .../net/forwarding/mirror_gre_bridge_1d_vlan.sh | 9 ++ + tools/testing/selftests/net/ipsec.c | 2 +- + tools/testing/selftests/netfilter/Makefile | 2 +- + tools/testing/selftests/netfilter/nf_nat_edemux.sh | 99 +++++++++++++ + 192 files changed, 1592 insertions(+), 949 deletions(-) + rename arch/s390/include/uapi/asm/{perf_cpum_cf_diag.h => hwctrset.h} (100%) + create mode 100755 tools/testing/selftests/netfilter/nf_nat_edemux.sh +Merging fixes/fixes (e71ba9452f0b Linux 5.11-rc2) +$ git merge fixes/fixes +Already up to date. +Merging kbuild-current/fixes (4fb90e13d159 kbuild: Allow LTO to be selected with KASAN_HW_TAGS) +$ git merge kbuild-current/fixes +Merge made by the 'recursive' strategy. + Makefile | 8 +++----- + arch/Kconfig | 2 +- + include/linux/compiler-version.h | 14 ++++++++++++++ + include/linux/kconfig.h | 2 -- + init/Kconfig | 8 ++++---- + scripts/dummy-tools/gcc | 14 ++++++++++++++ + scripts/gcc-plugins/Makefile | 1 + + scripts/ld-version.sh | 20 +++++++++++++------- + 8 files changed, 50 insertions(+), 19 deletions(-) + create mode 100644 include/linux/compiler-version.h +Merging arc-current/for-curr (7c53f6b671f4 Linux 5.11-rc3) +$ git merge arc-current/for-curr +Already up to date. +Merging arm-current/fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (7bb8bc6eb550 arm64: perf: Fix 64-bit event counter read truncation) +$ git merge arm64-fixes/for-next/fixes +Merge made by the 'recursive' strategy. + arch/arm64/Kconfig | 12 ++------ + arch/arm64/include/asm/memory.h | 5 ++++ + arch/arm64/include/asm/pgtable-prot.h | 1 - + arch/arm64/include/asm/pgtable.h | 3 ++ + arch/arm64/include/asm/sysreg.h | 20 +++++++++---- + arch/arm64/kernel/head.S | 6 ++-- + arch/arm64/kernel/idreg-override.c | 43 ++++++++++++++------------- + arch/arm64/kernel/perf_event.c | 2 +- + arch/arm64/kvm/reset.c | 10 ++++--- + arch/arm64/mm/init.c | 29 ++++++++++++++++-- + arch/arm64/mm/mmu.c | 3 +- + drivers/firmware/efi/libstub/arm64-stub.c | 2 +- + include/linux/pgtable.h | 4 +++ + mm/memory_hotplug.c | 2 +- + tools/testing/selftests/arm64/fp/sve-ptrace.c | 2 +- + 15 files changed, 93 insertions(+), 51 deletions(-) +Merging arm-soc-fixes/arm/fixes (090e502e4e63 Merge tag 'socfpga_dts_fix_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into arm/fixes) +$ git merge arm-soc-fixes/arm/fixes +Already up to date. +Merging drivers-memory-fixes/fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge drivers-memory-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (a65a802aadba m68k: Fix virt_addr_valid() W=1 compiler warnings) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (bd73758803c2 powerpc: Fix missing declaration of [en/dis]able_kernel_vsx()) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/code-patching.h | 7 ++++--- + arch/powerpc/include/asm/ptrace.h | 4 ++-- + arch/powerpc/include/asm/switch_to.h | 10 ++++++++++ + arch/powerpc/kernel/exceptions-64s.S | 2 +- + 4 files changed, 17 insertions(+), 6 deletions(-) +Merging s390-fixes/fixes (78c7cccaab9d s390: remove IBM_PARTITION and CONFIGFS_FS from zfcpdump defconfig) +$ git merge s390-fixes/fixes +Already up to date. +Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net) +$ git merge sparc/master +Already up to date. +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 (28259bac7f1d ipv6: fix suspecious RCU usage warning) +$ git merge net/master +Merge made by the 'recursive' strategy. + include/net/dst.h | 11 ++++++++++ + include/net/nexthop.h | 24 +++++++++++++++++++++ + net/core/dst.c | 59 ++++++++++++++++++++++++++++++++++++--------------- + net/ipv4/route.c | 45 +++++++-------------------------------- + net/ipv6/ip6_fib.c | 2 +- + net/ipv6/route.c | 36 ++++++++----------------------- + 6 files changed, 95 insertions(+), 82 deletions(-) +Merging bpf/master (de920fc64cba bpf, x86: Use kvmalloc_array instead kmalloc_array in bpf_jit_comp) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + arch/x86/net/bpf_jit_comp.c | 4 +- + drivers/net/veth.c | 3 +- + include/linux/bpf.h | 9 ++- + include/uapi/linux/bpf.h | 16 ++-- + kernel/bpf/bpf_inode_storage.c | 2 +- + kernel/bpf/syscall.c | 5 ++ + kernel/bpf/verifier.c | 4 + + net/core/filter.c | 12 ++- + tools/lib/bpf/Makefile | 2 +- + tools/testing/selftests/bpf/prog_tests/check_mtu.c | 4 + + tools/testing/selftests/bpf/progs/test_check_mtu.c | 92 ++++++++++++++++++++++ + 11 files changed, 136 insertions(+), 17 deletions(-) +Merging ipsec/master (9ab1265d5231 xfrm: Use actual socket sk instead of skb socket for xfrm_output_resume) +$ git merge ipsec/master +Auto-merging net/ipv6/ip6_vti.c +CONFLICT (content): Merge conflict in net/ipv6/ip6_vti.c +Auto-merging net/ipv4/ip_vti.c +CONFLICT (content): Merge conflict in net/ipv4/ip_vti.c +Resolved 'net/ipv4/ip_vti.c' using previous resolution. +Resolved 'net/ipv6/ip6_vti.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5dd7af72ad20] Merge remote-tracking branch 'ipsec/master' +$ git diff -M --stat --summary HEAD^.. + include/net/xfrm.h | 2 +- + net/ipv4/ah4.c | 2 +- + net/ipv4/esp4.c | 2 +- + net/ipv4/ip_vti.c | 6 ++++-- + net/ipv6/ah6.c | 2 +- + net/ipv6/esp6.c | 2 +- + net/ipv6/ip6_vti.c | 6 ++++-- + net/xfrm/xfrm_interface.c | 3 +++ + net/xfrm/xfrm_output.c | 10 +++++----- + 9 files changed, 21 insertions(+), 14 deletions(-) +Merging netfilter/master (9270bbe258c8 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf) +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (44a674d6f798 Merge tag 'mlx5-fixes-2021-01-26' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net) +$ git merge wireless-drivers/master +Already up to date. +Merging mac80211/master (8811f4a9836e tcp: add sanity tests to TCP_QUEUE_SEQ) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (a38fd8748464 Linux 5.12-rc2) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (eea46a0879bc ALSA: hda/hdmi: Cancel pending works before suspend) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/hda/intel-nhlt.c | 5 ++++ + sound/pci/hda/hda_bind.c | 4 +++ + sound/pci/hda/hda_controller.c | 7 ----- + sound/pci/hda/hda_intel.c | 2 ++ + sound/pci/hda/patch_ca0132.c | 1 + + sound/pci/hda/patch_conexant.c | 62 ++++++++++++++++++++++++++++++------------ + sound/pci/hda/patch_hdmi.c | 13 +++++++++ + sound/usb/card.c | 6 ++++ + sound/usb/quirks.c | 11 +++++++- + sound/usb/usbaudio.h | 1 + + 10 files changed, 87 insertions(+), 25 deletions(-) +Merging sound-asoc-fixes/for-linus (e92a309be437 Merge series "ASoC: sdm845: array out of bound issues" from Srinivas Kandagatla <srinivas.kandagatla@linaro.org>:) +$ git merge sound-asoc-fixes/for-linus +Removing sound/soc/codecs/sirf-audio-codec.h +Merge made by the 'recursive' strategy. + sound/soc/codecs/Kconfig | 5 -- + sound/soc/codecs/ak4458.c | 1 + + sound/soc/codecs/ak5558.c | 1 + + sound/soc/codecs/cs42l42.c | 112 ++++++++++-------------------- + sound/soc/codecs/cs42l42.h | 13 ++-- + sound/soc/codecs/es8316.c | 9 +-- + sound/soc/codecs/lpass-rx-macro.c | 2 +- + sound/soc/codecs/lpass-va-macro.c | 28 ++++---- + sound/soc/codecs/lpass-wsa-macro.c | 20 +++--- + sound/soc/codecs/rt1015.c | 2 + + sound/soc/codecs/rt5640.c | 4 +- + sound/soc/codecs/rt5651.c | 4 +- + sound/soc/codecs/rt5670.c | 110 ++++++++++++++++++++++++++---- + sound/soc/codecs/rt5670.h | 9 +-- + sound/soc/codecs/sgtl5000.c | 2 +- + sound/soc/codecs/sirf-audio-codec.h | 124 ---------------------------------- + sound/soc/codecs/wcd934x.c | 6 ++ + sound/soc/fsl/fsl_ssi.c | 6 +- + sound/soc/intel/boards/bytcr_rt5640.c | 2 +- + sound/soc/qcom/sdm845.c | 6 +- + sound/soc/soc-core.c | 4 ++ + sound/soc/sof/intel/hda-dsp.c | 2 +- + sound/soc/sof/intel/hda.c | 1 + + 23 files changed, 198 insertions(+), 275 deletions(-) + delete mode 100644 sound/soc/codecs/sirf-audio-codec.h +Merging regmap-fixes/for-linus (e41a962f82e7 regmap: set debugfs_name to NULL after it is freed) +$ git merge regmap-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-debugfs.c | 1 + + 1 file changed, 1 insertion(+) +Merging regulator-fixes/for-linus (e9e7fce0384b regulator: rt4831: Fix return value check in rt4831_regulator_probe()) +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/regulator/mt6315-regulator.c | 2 +- + drivers/regulator/pca9450-regulator.c | 10 +++++++++- + drivers/regulator/qcom-rpmh-regulator.c | 6 +++--- + drivers/regulator/rt4831-regulator.c | 4 ++-- + include/linux/regulator/pca9450.h | 3 +++ + 5 files changed, 18 insertions(+), 7 deletions(-) +Merging spi-fixes/for-linus (ffb597b2bd3c spi: ath79: remove spi-master setup and cleanup assignment) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/spi/spi-ath79.c | 3 +-- + drivers/spi/spi-bcm63xx-hsspi.c | 7 ++++++- + drivers/spi/spi-bcm63xx.c | 6 +++++- + drivers/spi/spi-ti-qspi.c | 20 ++++++++++++++------ + 4 files changed, 26 insertions(+), 10 deletions(-) +Merging pci-current/for-linus (12f6db15c40e PCI: Avoid building empty drivers) +$ git merge pci-current/for-linus +Merge made by the 'recursive' strategy. + drivers/pci/controller/Makefile | 7 ++++++- + drivers/pci/controller/dwc/Kconfig | 1 + + drivers/pci/controller/dwc/Makefile | 7 ++++++- + drivers/pci/controller/pci-thunder-ecam.c | 2 +- + drivers/pci/controller/pci-thunder-pem.c | 13 +++++++------ + drivers/pci/pci.h | 6 ++++++ + 6 files changed, 27 insertions(+), 9 deletions(-) +Merging driver-core.current/driver-core-linus (a38fd8748464 Linux 5.12-rc2) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (c776b77a279c Revert "drivers:tty:pty: Fix a race causing data loss on close") +$ git merge tty.current/tty-linus +Merge made by the 'recursive' strategy. + drivers/leds/trigger/ledtrig-tty.c | 11 ++++------- + drivers/tty/pty.c | 15 ++------------- + drivers/tty/serial/max310x.c | 29 +++++------------------------ + drivers/tty/tty_io.c | 5 ++--- + 4 files changed, 13 insertions(+), 47 deletions(-) +Merging usb.current/usb-linus (46613c9dfa96 usbip: fix vudc usbip_sockfd_store races leading to gpf) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/class/cdc-acm.c | 5 +++ + drivers/usb/class/usblp.c | 16 ++++++--- + drivers/usb/dwc3/dwc3-qcom.c | 18 +++++++--- + drivers/usb/gadget/function/f_uac1.c | 1 + + drivers/usb/gadget/function/f_uac2.c | 2 +- + drivers/usb/gadget/function/u_ether_configfs.h | 5 ++- + drivers/usb/gadget/udc/s3c2410_udc.c | 4 +-- + drivers/usb/renesas_usbhs/pipe.c | 2 ++ + drivers/usb/usbip/stub_dev.c | 42 ++++++++++++++++++---- + drivers/usb/usbip/vhci_sysfs.c | 39 +++++++++++++++++--- + drivers/usb/usbip/vudc_sysfs.c | 49 ++++++++++++++++++++++---- + 11 files changed, 149 insertions(+), 34 deletions(-) +Merging usb-gadget-fixes/fixes (129aa9734559 usb: raw-gadget: fix memory leak in gadget_setup) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (cfdc67acc785 USB: serial: io_edgeport: fix memory leak in edge_startup) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/ch341.c | 1 + + drivers/usb/serial/cp210x.c | 3 +++ + drivers/usb/serial/io_edgeport.c | 26 ++++++++++++++++---------- + drivers/usb/serial/xr_serial.c | 25 ------------------------- + 4 files changed, 20 insertions(+), 35 deletions(-) +Merging usb-chipidea-fixes/for-usb-fixes (491b1bea0004 MAINTAINERS: update Peter Chen's email address) +$ git merge usb-chipidea-fixes/for-usb-fixes +Already up to date. +Merging phy/fixes (c92e72ae9e0e phy: ti: j721e-wiz: add missing call to of_node_put()) +$ git merge phy/fixes +Merge made by the 'recursive' strategy. + drivers/phy/ralink/phy-mt7621-pci.c | 2 +- + drivers/phy/ti/phy-j721e-wiz.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging staging.current/staging-linus (16d7586dccf8 Revert "staging: wfx: remove unused included header files") +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/staging/comedi/drivers/addi_apci_1032.c | 4 +++- + drivers/staging/comedi/drivers/addi_apci_1500.c | 18 +++++++++--------- + drivers/staging/comedi/drivers/adv_pci1710.c | 10 +++++----- + drivers/staging/comedi/drivers/amplc_pc236_common.c | 4 +++- + drivers/staging/comedi/drivers/comedi_parport.c | 3 ++- + drivers/staging/comedi/drivers/das6402.c | 2 +- + drivers/staging/comedi/drivers/das800.c | 2 +- + drivers/staging/comedi/drivers/dmm32at.c | 2 +- + drivers/staging/comedi/drivers/me4000.c | 2 +- + drivers/staging/comedi/drivers/ni_6527.c | 4 +++- + drivers/staging/comedi/drivers/ni_65xx.c | 3 ++- + drivers/staging/comedi/drivers/pcl711.c | 2 +- + drivers/staging/comedi/drivers/pcl726.c | 4 +++- + drivers/staging/comedi/drivers/pcl818.c | 2 +- + drivers/staging/ks7010/ks_wlan_net.c | 6 ++++-- + drivers/staging/rtl8188eu/core/rtw_ap.c | 5 +++++ + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 6 ++++-- + drivers/staging/rtl8192e/Kconfig | 1 + + drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 7 ++++--- + drivers/staging/rtl8192u/r8192U_wx.c | 6 ++++-- + drivers/staging/rtl8712/rtl871x_cmd.c | 6 ++++-- + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 2 +- + drivers/staging/wfx/bh.c | 1 + + drivers/staging/wfx/bh.h | 4 ++++ + drivers/staging/wfx/bus.h | 3 +++ + drivers/staging/wfx/bus_sdio.c | 6 ++++++ + drivers/staging/wfx/bus_spi.c | 7 +++++++ + drivers/staging/wfx/data_rx.c | 5 +++++ + drivers/staging/wfx/data_tx.c | 5 +++++ + drivers/staging/wfx/data_tx.h | 3 +++ + drivers/staging/wfx/debug.c | 6 ++++++ + drivers/staging/wfx/fwio.c | 2 ++ + drivers/staging/wfx/hif_api_cmd.h | 4 ++++ + drivers/staging/wfx/hif_api_general.h | 9 +++++++++ + drivers/staging/wfx/hif_tx.c | 4 ++++ + drivers/staging/wfx/hif_tx_mib.c | 5 +++++ + drivers/staging/wfx/hwio.c | 3 +++ + drivers/staging/wfx/hwio.h | 2 ++ + drivers/staging/wfx/key.c | 2 ++ + drivers/staging/wfx/key.h | 2 ++ + drivers/staging/wfx/main.c | 7 +++++++ + drivers/staging/wfx/main.h | 3 +++ + drivers/staging/wfx/queue.c | 4 ++++ + drivers/staging/wfx/queue.h | 3 +++ + drivers/staging/wfx/scan.h | 2 ++ + drivers/staging/wfx/sta.c | 6 ++++++ + drivers/staging/wfx/sta.h | 2 ++ + drivers/staging/wfx/traces.h | 3 +++ + drivers/staging/wfx/wfx.h | 3 +++ + 49 files changed, 169 insertions(+), 38 deletions(-) +Merging char-misc.current/char-misc-linus (65527a51c66f misc/pvpanic: Export module FDT device table) +$ git merge char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + drivers/misc/fastrpc.c | 5 +++ + drivers/misc/habanalabs/common/debugfs.c | 5 +-- + drivers/misc/habanalabs/common/device.c | 40 ++++++++++++++++++++--- + drivers/misc/habanalabs/common/habanalabs.h | 2 -- + drivers/misc/habanalabs/common/habanalabs_ioctl.c | 12 +++++++ + drivers/misc/habanalabs/common/irq.c | 2 +- + drivers/misc/habanalabs/common/mmu/mmu.c | 38 ++++++++++++++------- + drivers/misc/pvpanic.c | 1 + + drivers/virt/acrn/hsm.c | 11 ++++++- + drivers/virt/acrn/irqfd.c | 6 ++-- + include/linux/cpu.h | 3 ++ + 11 files changed, 97 insertions(+), 28 deletions(-) +Merging soundwire-fixes/fixes (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (c94732bda079 thunderbolt: Increase runtime PM reference count on DP tunnel discovery) +$ git merge thunderbolt-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/thunderbolt/switch.c | 18 ++++++++---------- + drivers/thunderbolt/tb.c | 4 ++++ + 2 files changed, 12 insertions(+), 10 deletions(-) +Merging input-current/for-linus (2d8aaa1720c6 Input: n64joy - fix return value check in n64joy_probe()) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/joystick/n64joy.c | 4 ++-- + drivers/input/touchscreen/s6sy761.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging crypto-current/master (0de9dc80625b hwrng: timeriomem - Use device-managed registration API) +$ 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 (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (b135b3358d73 mtd: rawnand: omap: Use BCH private fields in the specific OOB layout) +$ git merge mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (5c8fe583cce5 Linux 5.11-rc1) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (dd2ce6ea601b media: rkisp1: params: fix wrong bits settings) +$ git merge v4l-dvb-fixes/fixes +Merge made by the 'recursive' strategy. + .../media/platform/rockchip/rkisp1/rkisp1-params.c | 1 - + drivers/media/platform/vsp1/vsp1_drm.c | 6 ++--- + drivers/media/rc/Makefile | 1 + + drivers/media/rc/keymaps/Makefile | 1 - + drivers/media/rc/keymaps/rc-cec.c | 28 +++++++++------------- + drivers/media/rc/rc-main.c | 6 +++++ + drivers/media/usb/usbtv/usbtv-audio.c | 2 +- + include/media/rc-map.h | 7 ++++++ + 8 files changed, 29 insertions(+), 23 deletions(-) +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 (bd67b711bfaa MIPS: kernel: Reserve exception base early to prevent corruption) +$ git merge mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (2c69c8a1736e ARM: dts: at91: sam9x60: fix mux-mask to match product's datasheet) +$ git merge at91-fixes/at91-fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/at91-sam9x60ek.dts | 8 -------- + arch/arm/boot/dts/at91-sama5d27_som1.dtsi | 4 ++-- + arch/arm/boot/dts/sam9x60.dtsi | 9 +++++++++ + 3 files changed, 11 insertions(+), 10 deletions(-) +Merging omap-fixes/fixes (4c9f4865f460 Merge branch 'fixes-rc2' into fixes) +$ git merge omap-fixes/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am33xx.dtsi | 3 ++ + arch/arm/boot/dts/omap4.dtsi | 5 +++ + arch/arm/boot/dts/omap44xx-clocks.dtsi | 8 ---- + arch/arm/boot/dts/omap5.dtsi | 5 +++ + arch/arm/mach-omap2/sr_device.c | 75 ++++++++++++++++++++++++++-------- + drivers/bus/omap_l3_noc.c | 4 +- + drivers/bus/ti-sysc.c | 4 +- + drivers/soc/ti/omap_prm.c | 8 +++- + 8 files changed, 82 insertions(+), 30 deletions(-) +Merging kvm-fixes/master (fe07bfda2fb9 Linux 5.12-rc1) +$ 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 (4008bc7d3953 hwmon: (dell-smm) Add XPS 15 L502X to fan control blacklist) +$ git merge hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (7018c897c2f2 libnvdimm/dimm: Avoid race between probe and available_slots_show()) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging btrfs-fixes/next-fixes (026fb436af2e Merge branch 'misc-5.12' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Already up to date! +Merge made by the 'recursive' strategy. +Merging vfs-fixes/fixes (d36a1dd9f77a dump_common_audit_data(): fix racy accesses to ->d_name) +$ git merge vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (d17405d52bac dma-mapping: benchmark: fix kernel crash when dma_map_single fails) +$ git merge dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge i3c-fixes/i3c/fixes +Already up to date. +Merging drivers-x86-fixes/fixes (56678a5f44ef platform/x86: intel-hid: Support Lenovo ThinkPad X1 Tablet Gen 2) +$ git merge drivers-x86-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/platform/x86/intel-hid.c | 7 +++++++ + 1 file changed, 7 insertions(+) +Merging samsung-krzk-fixes/fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (8242ff9ea9f0 dt-bindings: display: mediatek,dpi: Convert to use graph schema) +$ git merge devicetree-fixes/dt/linus +Merge made by the 'recursive' strategy. + .../devicetree/bindings/display/mediatek/mediatek,dpi.yaml | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) +Merging scsi-fixes/fixes (1112963427d6 scsi: vmw_pvscsi: MAINTAINERS: Update maintainer) +$ git merge scsi-fixes/fixes +Auto-merging drivers/scsi/ibmvscsi/ibmvfc.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 62 ++++++++++++++++++++++++------------------ + drivers/scsi/ufs/ufs-qcom.c | 10 +++++++ + drivers/scsi/ufs/ufshcd.c | 41 +++++++++------------------- + drivers/scsi/vmw_pvscsi.c | 2 -- + drivers/scsi/vmw_pvscsi.h | 2 -- + 6 files changed, 60 insertions(+), 59 deletions(-) +Merging drm-fixes/drm-fixes (a1f105412493 Merge tag 'amd-drm-fixes-5.12-2021-03-03' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes) +$ 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 (c3d2c6770b4b drm/i915: Wedge the GPU if command parser setup fails) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 7 ++++++- + drivers/gpu/drm/i915/i915_cmd_parser.c | 19 +++++++++++++------ + drivers/gpu/drm/i915/i915_drv.h | 2 +- + 3 files changed, 20 insertions(+), 8 deletions(-) +Merging mmc-fixes/fixes (f06391c45e83 mmc: cqhci: Fix random crash when remove mmc module/card) +$ git merge mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mmc/core/bus.c | 11 +++++------ + drivers/mmc/core/mmc.c | 15 +++++++++++---- + drivers/mmc/host/mmci.c | 10 +++++++++- + 3 files changed, 25 insertions(+), 11 deletions(-) +Merging rtc-fixes/rtc-fixes (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (a38fd8748464 Linux 5.12-rc2) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (a22662138477 Drivers: hv: vmbus: Drop error message when 'No request id available') +$ git merge hyperv-fixes/hyperv-fixes +Merge made by the 'recursive' strategy. + drivers/hv/ring_buffer.c | 1 - + 1 file changed, 1 deletion(-) +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 (0d7588ab9ef9 riscv: process: Fix no prototype for arch_dup_task_struct) +$ git merge risc-v-fixes/fixes +Merge made by the 'recursive' strategy. + arch/riscv/include/asm/asm-prototypes.h | 16 ++++++++++++++++ + arch/riscv/include/asm/irq.h | 2 ++ + arch/riscv/include/asm/processor.h | 1 + + arch/riscv/include/asm/ptrace.h | 5 +++++ + arch/riscv/include/asm/sbi.h | 4 ++-- + arch/riscv/include/asm/timex.h | 2 ++ + arch/riscv/kernel/Makefile | 1 + + arch/riscv/kernel/probes/ftrace.c | 16 +++++++++------- + arch/riscv/kernel/process.c | 1 + + arch/riscv/kernel/sbi.c | 2 +- + arch/riscv/kernel/time.c | 1 + + arch/riscv/kernel/traps.c | 1 + + 12 files changed, 42 insertions(+), 10 deletions(-) +Merging pidfd-fixes/fixes (ee2e3f50629f mount: fix mounting of detached mounts onto targets that reside on shared mounts) +$ git merge pidfd-fixes/fixes +Already up to date. +Merging fpga-fixes/fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (a38fd8748464 Linux 5.12-rc2) +$ git merge spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (b41ba2ec54a7 gpiolib: Read "gpio-line-names" from a firmware node) +$ git merge gpio-brgl-fixes/gpio/for-current +Already up to date. +Merging gpio-intel-fixes/fixes (b41ba2ec54a7 gpiolib: Read "gpio-line-names" from a firmware node) +$ git merge gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (77e141266c8e pinctrl: intel: Show the GPIO base calculation explicitly) +$ git merge pinctrl-intel-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/pinctrl/intel/pinctrl-intel.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging erofs-fixes/fixes (9f377622a484 erofs: fix bio->bi_max_vecs behavior change) +$ git merge erofs-fixes/fixes +Merge made by the 'recursive' strategy. + fs/erofs/data.c | 28 +++++++++++----------------- + 1 file changed, 11 insertions(+), 17 deletions(-) +Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) +$ git merge integrity-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (d50ffcd2c371 kunit: tool: Disable PAGE_POISONING under --alltests) +$ git merge kunit-fixes/kunit-fixes +Merge made by the 'recursive' strategy. + tools/testing/kunit/configs/broken_on_uml.config | 2 ++ + tools/testing/kunit/kunit_config.py | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) +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 (17cbe03872be mm/memblock: Fix typo in comment of memblock_phys_alloc_try_nid()) +$ git merge memblock-fixes/fixes +Already up to date. +Merging cel-fixes/for-rc (614c9750173e NFSD: fix dest to src mount in inter-server COPY) +$ git merge cel-fixes/for-rc +Merge made by the 'recursive' strategy. + fs/locks.c | 3 -- + fs/nfsd/Kconfig | 1 + + fs/nfsd/filecache.c | 2 ++ + fs/nfsd/nfs4proc.c | 2 +- + fs/nfsd/nfs4state.c | 55 ++++++++---------------------- + net/sunrpc/auth_gss/svcauth_gss.c | 11 +++--- + net/sunrpc/svc.c | 6 ++-- + net/sunrpc/svc_xprt.c | 4 +-- + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 6 ++-- + 9 files changed, 35 insertions(+), 55 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (adcbb6f5113c drm: meson_drv add shutdown function) +$ git merge drm-misc-fixes/for-linux-next-fixes +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/gpu/todo.rst | 21 ++++++++++++++++ + MAINTAINERS | 2 +- + drivers/gpu/drm/drm_fb_helper.c | 2 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 25 +++++++++++++------ + drivers/gpu/drm/meson/meson_drv.c | 11 +++++++++ + drivers/gpu/drm/qxl/qxl_display.c | 1 + + drivers/gpu/drm/qxl/qxl_release.c | 12 ++++++++-- + drivers/gpu/drm/tiny/gm12u320.c | 44 +++++++++++++++++++++++++++------- + drivers/gpu/drm/ttm/ttm_bo.c | 8 +++++-- + drivers/gpu/drm/ttm/ttm_pool.c | 4 ++-- + drivers/gpu/drm/udl/udl_drv.c | 17 +++++++++++++ + drivers/gpu/drm/udl/udl_drv.h | 1 + + drivers/gpu/drm/udl/udl_main.c | 10 ++++++++ + drivers/usb/core/usb.c | 32 +++++++++++++++++++++++++ + drivers/video/fbdev/aty/atyfb.h | 3 --- + drivers/video/fbdev/aty/atyfb_base.c | 9 +++---- + include/linux/usb.h | 2 ++ + 17 files changed, 174 insertions(+), 30 deletions(-) +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 (6fbd6cf85a3b Merge tag 'kbuild-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) +$ git merge kbuild/for-next +Already up to date. +Merging compiler-attributes/compiler-attributes (19c329f68089 Linux 5.11-rc4) +$ git merge compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/for-next (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge dma-mapping/for-next +Already up to date. +Merging asm-generic/master (38489db09b10 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 (08cbcb970256 ARM: 9060/1: kexec: Remove unused kexec_reinit callback) +$ git merge arm/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/compressed/Makefile | 4 +-- + arch/arm/include/asm/kexec.h | 3 -- + arch/arm/include/asm/memory.h | 15 ---------- + arch/arm/kernel/machine_kexec.c | 8 ------ + arch/arm/mm/cache-v7.S | 58 +++++++++++++++++++-------------------- + arch/arm/mm/proc-v7.S | 39 ++++++++++++-------------- + 6 files changed, 49 insertions(+), 78 deletions(-) +Merging arm64/for-next/core (a38fd8748464 Linux 5.12-rc2) +$ git merge arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (f0c140481d1b perf: Constify static struct attribute_group) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (e6c44b8c57c9 soc: document merges) +$ git merge arm-soc/for-next +Auto-merging drivers/reset/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 219 +++++++++++++++++++++++++++++++++ + 1 file changed, 219 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging actions/for-next (006828d706fd Merge branch 'v5.12/defconfig' into for-next) +$ git merge actions/for-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. +Merging amlogic/for-next (1c459c4d568d Merge branch 'v5.13/dt64' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/amlogic.yaml | 1 + + arch/arm64/boot/dts/amlogic/Makefile | 1 + + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 6 ++ + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 6 ++ + .../boot/dts/amlogic/meson-gxm-minix-neo-u9h.dts | 120 +++++++++++++++++++++ + 5 files changed, 134 insertions(+) + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dts +Merging aspeed/for-next (697dabd5d370 Merge branches 'soc-for-v5.12' and 'dt-for-v5.12' into for-next) +$ git merge aspeed/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging at91/at91-next (b95bbae19954 Merge branch 'at91-fixes' into at91-next) +$ git merge at91/at91-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging drivers-memory/for-next (7db9ddae1371 memory: tegra: replace DEFINE_SIMPLE_ATTRIBUTE with DEFINE_DEBUGFS_ATTRIBUTE) +$ git merge drivers-memory/for-next +Merge made by the 'recursive' strategy. + drivers/memory/omap-gpmc.c | 7 +++++-- + drivers/memory/tegra/tegra124-emc.c | 4 ++-- + 2 files changed, 7 insertions(+), 4 deletions(-) +Merging imx-mxs/for-next (2ec23a93ffc7 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 15 + + .../devicetree/bindings/clock/imx8qxp-lpcg.yaml | 6 +- + .../devicetree/bindings/mailbox/fsl,mu.yaml | 5 +- + arch/arm/boot/dts/imx50-kobo-aura.dts | 16 +- + arch/arm/boot/dts/imx51.dtsi | 2 +- + arch/arm/boot/dts/imx53-qsb-common.dtsi | 2 + + arch/arm/boot/dts/imx53.dtsi | 2 +- + arch/arm/boot/dts/imx6dl-plybas.dts | 6 +- + arch/arm/boot/dts/imx6q-ba16.dtsi | 9 + + arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi | 5 +- + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 30 +- + arch/arm/boot/dts/imx6qdl-ts7970.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 24 +- + arch/arm/boot/dts/imx6sl-tolino-shine2hd.dts | 7 +- + arch/arm/boot/dts/imx6ull-colibri.dtsi | 12 +- + arch/arm/boot/dts/ls1021a.dtsi | 2 +- + arch/arm/mach-imx/Kconfig | 2 +- + arch/arm/mach-imx/avic.c | 16 +- + arch/arm/mach-imx/common.h | 1 - + arch/arm/mach-imx/mach-imx1.c | 11 - + arch/arm/mach-imx/mach-imx25.c | 12 - + arch/arm/mach-imx/mach-imx27.c | 12 - + arch/arm/mach-imx/mach-imx31.c | 1 - + arch/arm/mach-imx/mach-imx35.c | 1 - + arch/arm/mach-imx/mm-imx3.c | 24 - + arch/arm/mach-imx/pm-imx5.c | 2 +- + arch/arm64/boot/dts/freescale/Makefile | 3 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 6 + + .../dts/freescale/imx8mm-icore-mx8mm-ctouch2.dts | 97 ++++ + .../dts/freescale/imx8mm-icore-mx8mm-edimm2.2.dts | 97 ++++ + .../boot/dts/freescale/imx8mm-icore-mx8mm.dtsi | 232 ++++++++ + .../boot/dts/freescale/imx8mm-nitrogen-r2.dts | 294 +++++++++- + .../boot/dts/freescale/imx8mn-beacon-som.dtsi | 6 +- + .../dts/freescale/imx8mp-phyboard-pollux-rdk.dts | 44 ++ + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 39 ++ + .../dts/freescale/imx8mq-kontron-pitx-imx8m.dts | 611 +++++++++++++++++++++ + .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 70 ++- + .../arm64/boot/dts/freescale/imx8mq-librem5-r2.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 21 +- + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 18 +- + arch/arm64/configs/defconfig | 5 + + drivers/firmware/imx/scu-pd.c | 28 +- + drivers/soc/imx/soc-imx.c | 12 + + 43 files changed, 1672 insertions(+), 139 deletions(-) + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-icore-mx8mm-ctouch2.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-icore-mx8mm-edimm2.2.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-icore-mx8mm.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-kontron-pitx-imx8m.dts +Merging keystone/next (9d2e21ed98a2 Merge branch 'for_5.12/drivers-soc' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (e6468af3b590 Merge branch 'v5.11-next/soc' into for-next) +$ git merge mediatek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (8e03d45cb7de 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 (01e73147cbf8 Merge branch 'fixes' into for-next) +$ git merge omap/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging qcom/for-next (ab054d004d43 Merge branches 'arm64-defconfig-for-5.13', 'arm64-for-5.13' and 'drivers-for-5.13' into for-next) +$ git merge qcom/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/qcom,rpmpd.yaml | 2 + + arch/arm64/boot/dts/qcom/Makefile | 11 + + .../boot/dts/qcom/sc7180-trogdor-coachz-r1-lte.dts | 18 + + .../boot/dts/qcom/sc7180-trogdor-coachz-r1.dts | 154 +++++ + .../boot/dts/qcom/sc7180-trogdor-coachz-r2-lte.dts | 18 + + .../boot/dts/qcom/sc7180-trogdor-coachz-r2.dts | 15 + + .../arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 240 +++++++ + .../qcom/sc7180-trogdor-lazor-limozeen-nots-r4.dts | 34 + + .../qcom/sc7180-trogdor-lazor-limozeen-nots.dts | 26 + + .../dts/qcom/sc7180-trogdor-lazor-limozeen.dts | 42 ++ + .../boot/dts/qcom/sc7180-trogdor-lazor-r0.dts | 9 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 9 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts | 5 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts | 4 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r3.dts | 10 + + arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 39 +- + .../boot/dts/qcom/sc7180-trogdor-pompom-r1-lte.dts | 14 + + .../boot/dts/qcom/sc7180-trogdor-pompom-r1.dts | 26 + + .../boot/dts/qcom/sc7180-trogdor-pompom-r2-lte.dts | 14 + + .../boot/dts/qcom/sc7180-trogdor-pompom-r2.dts | 44 ++ + .../arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 288 +++++++++ + arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 35 +- + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 148 +++-- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 51 +- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 6 +- + arch/arm64/boot/dts/qcom/sm8350-mtp.dts | 110 ++++ + arch/arm64/boot/dts/qcom/sm8350.dtsi | 706 ++++++++++++++++++++- + arch/arm64/configs/defconfig | 2 + + drivers/soc/qcom/qcom-geni-se.c | 3 + + drivers/soc/qcom/qmi_encdec.c | 8 +- + drivers/soc/qcom/rpmhpd.c | 56 ++ + include/dt-bindings/power/qcom-rpmpd.h | 26 + + 33 files changed, 2036 insertions(+), 139 deletions(-) + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1-lte.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r2-lte.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r2.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r4.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1-lte.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2-lte.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi +Merging raspberrypi/for-next (fbdcf1d20126 ARM: dts: bcm2711: Add the CEC interrupt controller) +$ git merge raspberrypi/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. +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 (604bd2d4786e Merge branch 'renesas-arm-dt-for-v5.13' into renesas-next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/iwg20d-q7-common.dtsi | 4 +- + arch/arm/boot/dts/r7s9210-rza2mevb.dts | 55 ++++--- + arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ca.dts | 159 ++++++++++----------- + .../dts/r8a7742-iwg21d-q7-dbcm-ov5640-single.dtsi | 32 +++++ + .../dts/r8a7742-iwg21d-q7-dbcm-ov7725-single.dtsi | 29 ++++ + arch/arm/boot/dts/r8a7742-iwg21d-q7.dts | 4 +- + arch/arm/boot/dts/r8a7742.dtsi | 4 +- + arch/arm/boot/dts/r8a7743-sk-rzg1m.dts | 2 +- + arch/arm/boot/dts/r8a7743.dtsi | 2 +- + arch/arm/boot/dts/r8a7744.dtsi | 2 +- + arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts | 4 +- + arch/arm/boot/dts/r8a7745-sk-rzg1e.dts | 2 +- + arch/arm/boot/dts/r8a7745.dtsi | 2 +- + arch/arm/boot/dts/r8a77470.dtsi | 2 +- + arch/arm/boot/dts/r8a7790-lager.dts | 11 +- + arch/arm/boot/dts/r8a7790-stout.dts | 4 +- + arch/arm/boot/dts/r8a7790.dtsi | 4 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 11 +- + arch/arm/boot/dts/r8a7791-porter.dts | 6 +- + arch/arm/boot/dts/r8a7791.dtsi | 2 +- + arch/arm/boot/dts/r8a7792-blanche.dts | 2 +- + arch/arm/boot/dts/r8a7792-wheat.dts | 2 +- + arch/arm/boot/dts/r8a7792.dtsi | 2 +- + arch/arm/boot/dts/r8a7793-gose.dts | 11 +- + arch/arm/boot/dts/r8a7793.dtsi | 2 +- + arch/arm/boot/dts/r8a7794-alt.dts | 5 +- + arch/arm/boot/dts/r8a7794-silk.dts | 8 +- + arch/arm/boot/dts/r8a7794.dtsi | 2 +- + .../boot/dts/renesas/beacon-renesom-baseboard.dtsi | 4 +- + arch/arm64/boot/dts/renesas/hihope-common.dtsi | 3 + + arch/arm64/boot/dts/renesas/hihope-rev4.dtsi | 2 +- + .../boot/dts/renesas/r8a774a1-beacon-rzg2m-kit.dts | 3 + + .../boot/dts/renesas/r8a774b1-beacon-rzg2n-kit.dts | 3 + + arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts | 6 +- + .../boot/dts/renesas/r8a774e1-beacon-rzg2h-kit.dts | 3 + + .../arm64/boot/dts/renesas/r8a77950-salvator-x.dts | 37 +---- + .../arm64/boot/dts/renesas/r8a77951-salvator-x.dts | 37 +---- + .../boot/dts/renesas/r8a77951-salvator-xs.dts | 37 +---- + .../arm64/boot/dts/renesas/r8a77960-salvator-x.dts | 46 ------ + .../boot/dts/renesas/r8a77960-salvator-xs.dts | 46 ------ + .../boot/dts/renesas/r8a77961-salvator-xs.dts | 46 ------ + arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts | 11 ++ + .../arm64/boot/dts/renesas/r8a77965-salvator-x.dts | 45 ------ + .../boot/dts/renesas/r8a77965-salvator-xs.dts | 45 ------ + arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 9 +- + .../boot/dts/renesas/r8a779a0-falcon-cpu.dtsi | 7 + + .../boot/dts/renesas/r8a779a0-falcon-csi-dsi.dtsi | 15 ++ + .../boot/dts/renesas/r8a779a0-falcon-ethernet.dtsi | 15 ++ + arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts | 11 ++ + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 65 +++++++++ + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 48 ++++++- + arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 1 + + arch/arm64/boot/dts/renesas/ulcb.dtsi | 8 +- + drivers/soc/renesas/rmobile-sysc.c | 4 +- + 54 files changed, 434 insertions(+), 498 deletions(-) + create mode 100644 arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ov5640-single.dtsi + create mode 100644 arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ov7725-single.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779a0-falcon-csi-dsi.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779a0-falcon-ethernet.dtsi +Merging reset/reset/next (d4e4dffec50b reset: oxnas: replace file name with short description) +$ git merge reset/reset/next +Merge made by the 'recursive' strategy. + drivers/reset/reset-bcm6345.c | 2 +- + drivers/reset/reset-oxnas.c | 2 +- + drivers/reset/reset-zynqmp.c | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) +Merging rockchip/for-next (38051549ac38 Merge branch 'v5.12-clk/next' into for-next) +$ git merge rockchip/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging samsung-krzk/for-next (e52a6d1c770f Merge branch 'next/soc' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 24 ++++++++++++------------ + arch/arm/boot/dts/exynos4210-i9100.dts | 4 +++- + arch/arm/boot/dts/exynos4412-midas.dtsi | 6 +++--- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 3 ++- + arch/arm/boot/dts/exynos4412-p4note.dtsi | 4 ++-- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 2 +- + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 2 +- + arch/arm/boot/dts/s5pv210-fascinate4g.dts | 2 +- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 6 +++--- + 9 files changed, 28 insertions(+), 25 deletions(-) +Merging scmi/for-linux-next (1b07e14dc045 Merge branch 'for-next/juno' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge scmi/for-linux-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/arm/juno-base.dtsi | 5 ++- + arch/arm64/boot/dts/arm/juno-r1.dts | 4 ++ + arch/arm64/boot/dts/arm/juno-r2.dts | 4 ++ + drivers/cpufreq/scmi-cpufreq.c | 72 +++++++++++++++++++++++++--------- + 4 files changed, 66 insertions(+), 19 deletions(-) +Merging stm32/stm32-next (a9c92a9671d7 ARM: dts: stm32: add #clock-cells property to usbphyc node on stm32mp151) +$ git merge stm32/stm32-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. +Merging sunxi/sunxi/for-next (582cfdb9d206 Merge branch 'sunxi/clk-for-5.13' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/sunxi.yaml | 5 + + arch/arm/boot/dts/Makefile | 3 +- + arch/arm/boot/dts/sun4i-a10-topwise-a721.dts | 242 +++++++++++++++++++++ + arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 2 +- + arch/arm/boot/dts/sun6i-a31-m9.dts | 2 +- + arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts | 2 +- + arch/arm/boot/dts/sun6i-a31.dtsi | 6 +- + arch/arm/boot/dts/sun6i-a31s-primo81.dts | 2 +- + arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi | 2 +- + arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 2 +- + .../dts/sun6i-a31s-yones-toptech-bs1078-v2.dts | 2 +- + .../boot/dts/sun6i-reference-design-tablet.dtsi | 2 +- + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 6 +- + arch/arm/boot/dts/sun8i-a33-olinuxino.dts | 2 +- + arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 2 +- + .../boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts | 4 +- + arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts | 4 +- + arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts | 4 +- + arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 4 +- + arch/arm/boot/dts/sun8i-a83t.dtsi | 5 +- + .../boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts | 25 +++ + arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts | 2 +- + arch/arm/boot/dts/sun8i-r16-parrot.dts | 2 +- + .../boot/dts/sun8i-reference-design-tablet.dtsi | 2 +- + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 12 + + .../dts/allwinner/sun50i-a64-amarula-relic.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-nanopi-a64.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-olinuxino.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 2 +- + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 2 +- + .../boot/dts/allwinner/sun50i-a64-pinetab.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 2 +- + .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 2 +- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 6 +- + .../boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 40 ++-- + .../boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 16 +- + .../boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 24 +- + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 4 +- + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 8 +- + drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 33 ++- + drivers/clk/sunxi/clk-sun6i-ar100.c | 2 +- + drivers/clk/sunxi/clk-sun9i-core.c | 8 +- + drivers/clk/sunxi/clk-usb.c | 2 +- + 46 files changed, 412 insertions(+), 99 deletions(-) + create mode 100644 arch/arm/boot/dts/sun4i-a10-topwise-a721.dts +Merging tegra/for-next (b62f4a3fbb22 Merge branch for-5.12/arm64/defconfig into for-next) +$ git merge tegra/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' into ti-k3-next) +$ git merge ti-k3/ti-k3-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ti-k3-new/ti-k3-next (4c842af36839 arm64: dts: ti: k3-j721e-main: Add ICSSG nodes) +$ git merge ti-k3-new/ti-k3-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/ti/k3.yaml | 7 + + arch/arm64/boot/dts/ti/Makefile | 6 +- + arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 494 +++++++++++++++++++++++ + arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi | 76 ++++ + arch/arm64/boot/dts/ti/k3-am64.dtsi | 105 +++++ + arch/arm64/boot/dts/ti/k3-am642-evm.dts | 339 ++++++++++++++++ + arch/arm64/boot/dts/ti/k3-am642-sk.dts | 246 +++++++++++ + arch/arm64/boot/dts/ti/k3-am642.dtsi | 65 +++ + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 395 ++++++++++++++++++ + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 262 ++++++++++++ + include/dt-bindings/pinctrl/k3.h | 5 +- + 11 files changed, 1998 insertions(+), 2 deletions(-) + create mode 100644 arch/arm64/boot/dts/ti/k3-am64-main.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am64.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am642-evm.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am642-sk.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am642.dtsi +Merging clk/clk-next (a38fd8748464 Linux 5.12-rc2) +$ git merge clk/clk-next +Already up to date. +Merging clk-renesas/renesas-clk (c66424ea7564 clk: renesas: r8a779a0: Add TSC clock) +$ git merge clk-renesas/renesas-clk +Merge made by the 'recursive' strategy. + drivers/clk/renesas/r8a77965-cpg-mssr.c | 1 + + drivers/clk/renesas/r8a77990-cpg-mssr.c | 1 + + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 7 +++++++ + 3 files changed, 9 insertions(+) +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 (74cdb2664477 csky: Fixup typos) +$ git merge csky/linux-next +Merge made by the 'recursive' strategy. + arch/csky/include/asm/asid.h | 2 +- + arch/csky/include/asm/barrier.h | 2 +- + arch/csky/include/asm/vdso.h | 2 +- + arch/csky/kernel/entry.S | 1 - + 4 files changed, 3 insertions(+), 4 deletions(-) +Merging h8300/h8300-next (6e5e55227c95 Merge tag 'v5.11' into h8300-next) +$ git merge h8300/h8300-next +Auto-merging drivers/net/ethernet/smsc/smc91x.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 m68k/for-next (f2e7e4bf38fd m68k: syscalls: switch to generic syscallhdr.sh) +$ git merge m68k/for-next +Removing arch/m68k/kernel/syscalls/syscalltbl.sh +Removing arch/m68k/kernel/syscalls/syscallhdr.sh +Merge made by the 'recursive' strategy. + arch/m68k/kernel/syscalls/Makefile | 14 ++++--------- + arch/m68k/kernel/syscalls/syscallhdr.sh | 36 --------------------------------- + arch/m68k/kernel/syscalls/syscalltbl.sh | 32 ----------------------------- + arch/m68k/kernel/syscalltable.S | 3 +-- + 4 files changed, 5 insertions(+), 80 deletions(-) + delete mode 100644 arch/m68k/kernel/syscalls/syscallhdr.sh + delete mode 100644 arch/m68k/kernel/syscalls/syscalltbl.sh +Merging m68knommu/for-next (f81e12646946 m68k: fix flatmem memory model setup) +$ git merge m68knommu/for-next +Auto-merging arch/m68k/include/asm/page_mm.h +Merge made by the 'recursive' strategy. + arch/m68k/include/asm/page_mm.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging microblaze/next (9dc12e4ccd97 microblaze: tag highmem_setup() with __meminit) +$ git merge microblaze/next +Removing arch/microblaze/kernel/syscalls/syscalltbl.sh +Removing arch/microblaze/kernel/syscalls/syscallhdr.sh +Merge made by the 'recursive' strategy. + arch/microblaze/kernel/syscall_table.S | 3 +-- + arch/microblaze/kernel/syscalls/Makefile | 14 +++-------- + arch/microblaze/kernel/syscalls/syscallhdr.sh | 36 --------------------------- + arch/microblaze/kernel/syscalls/syscalltbl.sh | 32 ------------------------ + arch/microblaze/mm/init.c | 2 +- + 5 files changed, 6 insertions(+), 81 deletions(-) + delete mode 100644 arch/microblaze/kernel/syscalls/syscallhdr.sh + delete mode 100644 arch/microblaze/kernel/syscalls/syscalltbl.sh +Merging mips/mips-next (043d7f9713b7 MIPS: Enable some missed configs in loongson3_defconfig to support bpftrace) +$ git merge mips/mips-next +Removing arch/mips/kvm/trap_emul.c +Removing arch/mips/kvm/dyntrans.c +Removing arch/mips/kvm/commpage.h +Removing arch/mips/kvm/commpage.c +Removing arch/mips/kernel/syscalls/syscalltbl.sh +Removing arch/mips/kernel/syscalls/syscallhdr.sh +Removing arch/mips/configs/malta_kvm_guest_defconfig +Merge made by the 'recursive' strategy. + arch/mips/Kconfig | 22 +- + arch/mips/bcm63xx/clk.c | 2 +- + arch/mips/bmips/dma.c | 2 +- + arch/mips/cavium-octeon/oct_ilm.c | 2 +- + arch/mips/configs/loongson3_defconfig | 8 +- + arch/mips/configs/malta_kvm_guest_defconfig | 436 ------- + arch/mips/include/asm/Kbuild | 7 +- + arch/mips/include/asm/kvm_host.h | 238 ---- + arch/mips/include/asm/mach-generic/spaces.h | 12 - + arch/mips/include/asm/octeon/cvmx-bootinfo.h | 2 + + arch/mips/include/asm/processor.h | 5 - + arch/mips/include/asm/uaccess.h | 9 - + arch/mips/kernel/cevt-r4k.c | 4 - + arch/mips/kernel/scall32-o32.S | 4 +- + arch/mips/kernel/scall64-n32.S | 3 +- + arch/mips/kernel/scall64-n64.S | 3 +- + arch/mips/kernel/scall64-o32.S | 4 +- + arch/mips/kernel/smp-bmips.c | 27 +- + arch/mips/kernel/syscalls/Makefile | 41 +- + arch/mips/kernel/syscalls/syscallhdr.sh | 36 - + arch/mips/kernel/syscalls/syscalltbl.sh | 36 - + arch/mips/kvm/Kconfig | 34 - + arch/mips/kvm/Makefile | 7 +- + arch/mips/kvm/commpage.c | 32 - + arch/mips/kvm/commpage.h | 24 - + arch/mips/kvm/dyntrans.c | 143 --- + arch/mips/kvm/emulate.c | 1688 +------------------------- + arch/mips/kvm/entry.c | 33 - + arch/mips/kvm/interrupt.c | 123 +- + arch/mips/kvm/interrupt.h | 20 - + arch/mips/kvm/mips.c | 68 +- + arch/mips/kvm/mmu.c | 405 ------ + arch/mips/kvm/tlb.c | 174 --- + arch/mips/kvm/trap_emul.c | 1306 -------------------- + arch/mips/kvm/vz.c | 5 +- + arch/mips/mti-malta/Platform | 6 +- + arch/mips/mti-malta/malta-time.c | 5 - + arch/mips/pci/pci-ar2315.c | 1 + + arch/mips/sgi-ip27/ip27-timer.c | 4 +- + 39 files changed, 86 insertions(+), 4895 deletions(-) + delete mode 100644 arch/mips/configs/malta_kvm_guest_defconfig + delete mode 100644 arch/mips/kernel/syscalls/syscallhdr.sh + delete mode 100644 arch/mips/kernel/syscalls/syscalltbl.sh + delete mode 100644 arch/mips/kvm/commpage.c + delete mode 100644 arch/mips/kvm/commpage.h + delete mode 100644 arch/mips/kvm/dyntrans.c + delete mode 100644 arch/mips/kvm/trap_emul.c +Merging nds32/next (40e0dd851e7b nds32: Fix bogus reference to <asm/procinfo.h>) +$ git merge nds32/next +Already up to date. +Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (8f722f67452f openrisc: Use devicetree to determine present cpus) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (711d090f0e02 parisc: syscalls: switch to generic syscallhdr.sh) +$ git merge parisc-hd/for-next +Removing arch/parisc/kernel/syscalls/syscalltbl.sh +Removing arch/parisc/kernel/syscalls/syscallhdr.sh +Merge made by the 'recursive' strategy. + arch/parisc/include/asm/Kbuild | 1 - + arch/parisc/kernel/syscall.S | 16 ++++++-------- + arch/parisc/kernel/syscalls/Makefile | 30 ++++++++------------------ + arch/parisc/kernel/syscalls/syscallhdr.sh | 36 ------------------------------- + arch/parisc/kernel/syscalls/syscalltbl.sh | 36 ------------------------------- + 5 files changed, 16 insertions(+), 103 deletions(-) + delete mode 100644 arch/parisc/kernel/syscalls/syscallhdr.sh + delete mode 100644 arch/parisc/kernel/syscalls/syscalltbl.sh +Merging powerpc/next (fbda79043024 Merge tag 'powerpc-5.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge powerpc/next +Already up to date. +Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges) +$ git merge fsl/next +Already up to date. +Merging soc-fsl/next (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 (9530141455c9 riscv: Add ARCH_HAS_FORTIFY_SOURCE) +$ git merge risc-v/for-next +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 2 +- + arch/riscv/Kconfig | 1 + + arch/riscv/include/asm/string.h | 5 +++++ + arch/riscv/mm/init.c | 6 ++++-- + 4 files changed, 11 insertions(+), 3 deletions(-) +Merging s390/for-next (755d91f36dab Merge branch 'fixes' into for-next) +$ git merge s390/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging sh/for-next (2882b7626f49 sh: kernel: traps: remove unused variable) +$ git merge sh/for-next +Merge made by the 'recursive' strategy. + arch/sh/boards/mach-landisk/irq.c | 4 ++-- + arch/sh/boot/Makefile | 4 ++-- + arch/sh/boot/compressed/.gitignore | 5 ----- + arch/sh/boot/compressed/Makefile | 32 +++++++++++++------------------- + arch/sh/boot/compressed/ashiftrt.S | 2 ++ + arch/sh/boot/compressed/ashldi3.c | 2 ++ + arch/sh/boot/compressed/ashlsi3.S | 2 ++ + arch/sh/boot/compressed/ashrsi3.S | 2 ++ + arch/sh/boot/compressed/lshrsi3.S | 2 ++ + arch/sh/include/asm/checksum_32.h | 5 +++-- + arch/sh/include/asm/uaccess.h | 4 ++-- + arch/sh/kernel/cpu/sh4a/smp-shx3.c | 5 +++-- + arch/sh/kernel/crash_dump.c | 4 ++-- + arch/sh/kernel/traps.c | 1 - + arch/sh/kernel/traps_32.c | 8 ++++---- + arch/sh/math-emu/math.c | 4 ++-- + arch/sh/mm/nommu.c | 4 ++-- + drivers/sh/maple/maple.c | 5 ++++- + 18 files changed, 49 insertions(+), 46 deletions(-) + create mode 100644 arch/sh/boot/compressed/ashiftrt.S + create mode 100644 arch/sh/boot/compressed/ashldi3.c + create mode 100644 arch/sh/boot/compressed/ashlsi3.S + create mode 100644 arch/sh/boot/compressed/ashrsi3.S + create mode 100644 arch/sh/boot/compressed/lshrsi3.S +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 (ddad5187fc2a um: irq.h: include <asm-generic/irq.h>) +$ git merge uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (ab5eb336411f xtensa: move coprocessor_flush to the .text section) +$ git merge xtensa/xtensa-for-next +Merge made by the 'recursive' strategy. + arch/xtensa/kernel/coprocessor.S | 64 +++++++++++++++++++++------------------- + 1 file changed, 33 insertions(+), 31 deletions(-) +Merging pidfd/for-next (f69e8091c4a2 xfs: remove the possibly unused mp variable in xfs_file_compat_ioctl) +$ git merge pidfd/for-next +Already up to date. +Merging fscrypt/master (a14d0b676491 fscrypt: allow deleting files with unsupported encryption policy) +$ git merge fscrypt/master +Already up to date. +Merging fscache/fscache-next (42587ccf2ed5 afs: Use the fscache_write_begin() helper) +$ git merge fscache/fscache-next +Auto-merging fs/Kconfig +Merge made by the 'recursive' strategy. + Documentation/filesystems/index.rst | 1 + + Documentation/filesystems/netfs_library.rst | 526 ++++++++++++ + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/afs/Kconfig | 1 + + fs/afs/dir.c | 225 +++-- + fs/afs/file.c | 483 +++-------- + fs/afs/fs_operation.c | 4 +- + fs/afs/fsclient.c | 108 +-- + fs/afs/inode.c | 7 +- + fs/afs/internal.h | 59 +- + fs/afs/rxrpc.c | 150 ++-- + fs/afs/write.c | 656 +++++++-------- + fs/afs/yfsclient.c | 82 +- + fs/cachefiles/Makefile | 1 + + fs/cachefiles/interface.c | 5 +- + fs/cachefiles/internal.h | 9 + + fs/cachefiles/rdwr2.c | 403 +++++++++ + fs/fscache/Kconfig | 1 + + fs/fscache/Makefile | 1 + + fs/fscache/internal.h | 4 + + fs/fscache/io.c | 116 +++ + fs/fscache/page.c | 2 +- + fs/fscache/stats.c | 1 + + fs/netfs/Kconfig | 23 + + fs/netfs/Makefile | 5 + + fs/netfs/internal.h | 97 +++ + fs/netfs/read_helper.c | 1180 +++++++++++++++++++++++++++ + fs/netfs/stats.c | 59 ++ + include/linux/fscache-cache.h | 4 + + include/linux/fscache.h | 50 +- + include/linux/netfs.h | 200 +++++ + include/linux/pagemap.h | 3 + + include/linux/uio.h | 11 + + include/net/af_rxrpc.h | 2 +- + include/trace/events/afs.h | 74 +- + include/trace/events/netfs.h | 201 +++++ + lib/iov_iter.c | 313 ++++++- + mm/filemap.c | 20 + + mm/readahead.c | 70 ++ + net/rxrpc/recvmsg.c | 9 +- + 41 files changed, 4075 insertions(+), 1093 deletions(-) + create mode 100644 Documentation/filesystems/netfs_library.rst + create mode 100644 fs/cachefiles/rdwr2.c + create mode 100644 fs/fscache/io.c + create mode 100644 fs/netfs/Kconfig + create mode 100644 fs/netfs/Makefile + create mode 100644 fs/netfs/internal.h + create mode 100644 fs/netfs/read_helper.c + create mode 100644 fs/netfs/stats.c + create mode 100644 include/linux/netfs.h + create mode 100644 include/trace/events/netfs.h +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 (c4e9b6a42a43 Merge branch 'for-next-next-v5.12-20210308' into for-next-20210308) +$ git merge btrfs/for-next +Merge made by the 'recursive' strategy. + fs/btrfs/block-group.c | 42 ++--- + fs/btrfs/btrfs_inode.h | 33 ++-- + fs/btrfs/ctree.h | 27 ++- + fs/btrfs/delayed-inode.c | 35 +--- + fs/btrfs/disk-io.c | 143 ++++++++++++---- + fs/btrfs/extent-tree.c | 13 -- + fs/btrfs/extent_io.c | 436 ++++++++++++++++++++++++++++++++++++++++------- + fs/btrfs/file.c | 106 ++++++------ + fs/btrfs/inode.c | 124 +++++++++----- + fs/btrfs/ioctl.c | 33 ++-- + fs/btrfs/ordered-data.c | 19 +-- + fs/btrfs/ordered-data.h | 4 +- + fs/btrfs/qgroup.c | 38 +---- + fs/btrfs/reflink.c | 40 +++-- + fs/btrfs/relocation.c | 418 +++++++++++++++++++++++++++++++++++---------- + fs/btrfs/scrub.c | 8 - + fs/btrfs/send.c | 43 ++++- + fs/btrfs/subpage.c | 72 ++++++++ + fs/btrfs/subpage.h | 17 ++ + fs/btrfs/super.c | 26 +++ + fs/btrfs/transaction.c | 37 ++-- + fs/btrfs/transaction.h | 2 +- + fs/btrfs/tree-checker.c | 5 + + fs/btrfs/tree-log.c | 8 +- + fs/btrfs/volumes.c | 57 ++++++- + 25 files changed, 1317 insertions(+), 469 deletions(-) +Merging ceph/master (558b4510f622 ceph: defer flushing the capsnap if the Fb is used) +$ git merge ceph/master +Already up to date. +Merging cifs/for-next (a3ef62ddbeab cifs: Fix preauth hash corruption) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifsacl.c | 9 ++++++--- + fs/cifs/transport.c | 7 ++++++- + 2 files changed, 12 insertions(+), 4 deletions(-) +Merging configfs/for-next (65cdb4a214c0 configfs: fix kernel-doc markup issue) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (902af369942f ecryptfs: use DEFINE_MUTEX() for mutex lock) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/crypto.c +Merge made by the 'recursive' strategy. + fs/ecryptfs/crypto.c | 3 +-- + fs/ecryptfs/ecryptfs_kernel.h | 2 +- + fs/ecryptfs/keystore.c | 2 +- + 3 files changed, 3 insertions(+), 4 deletions(-) +Merging erofs/dev (ce0631291813 erofs: initialized fields can only be observed after bit is set) +$ git merge erofs/dev +Already up to date. +Merging exfat/dev (a403e793cb41 exfat: add support ioctl and FITRIM function) +$ git merge exfat/dev +Merge made by the 'recursive' strategy. + fs/exfat/balloc.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++------ + fs/exfat/dir.c | 5 +++ + fs/exfat/exfat_fs.h | 5 +++ + fs/exfat/fatent.c | 37 +++++++++++++++++----- + fs/exfat/file.c | 53 +++++++++++++++++++++++++++++++ + fs/exfat/super.c | 1 + + 6 files changed, 174 insertions(+), 18 deletions(-) +Merging ext3/for_next (c5b8ccc3da76 Pull udf & isofs UID/GID parsing fixes.) +$ git merge ext3/for_next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ext4/dev (73648622c60a ext4: fix bh ref count on error paths) +$ git merge ext4/dev +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/ext4.h +Merge made by the 'recursive' strategy. + fs/ext4/balloc.c | 38 ++++++++++++++++++++++++++------------ + fs/ext4/ext4.h | 1 + + fs/ext4/inode.c | 6 +++--- + fs/ext4/mballoc.c | 11 +++++++++-- + fs/ext4/super.c | 5 +++++ + fs/ext4/sysfs.c | 7 +++++++ + fs/ext4/xattr.c | 4 ++++ + 7 files changed, 55 insertions(+), 17 deletions(-) +Merging f2fs/dev (e489f1ca49b3 f2fs: fix to align to section for fallocate() on pinned file) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 7 +- + fs/f2fs/Kconfig | 16 ++--- + fs/f2fs/checkpoint.c | 8 ++- + fs/f2fs/data.c | 113 +++++++++++++++++++++++++------- + fs/f2fs/f2fs.h | 23 ++++--- + fs/f2fs/file.c | 11 ++-- + fs/f2fs/gc.c | 34 +++++++--- + fs/f2fs/inline.c | 3 +- + fs/f2fs/segment.c | 44 ++++++++++--- + fs/f2fs/segment.h | 2 - + fs/f2fs/super.c | 4 +- + fs/f2fs/sysfs.c | 9 +++ + fs/f2fs/verity.c | 75 +++++++++++++++------ + include/linux/f2fs_fs.h | 2 +- + 14 files changed, 257 insertions(+), 94 deletions(-) +Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl) +$ git merge fsverity/fsverity +Already up to date. +Merging fuse/for-next (166ddcdeea0b fuse: 32-bit user space ioctl compat for fuse device) +$ git merge fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/dev.c | 26 ++++++++++++++++---------- + fs/fuse/fuse_i.h | 1 + + fs/fuse/virtio_fs.c | 9 ++++++++- + fs/overlayfs/file.c | 23 +++++------------------ + include/linux/fs.h | 5 +++++ + include/uapi/linux/fuse.h | 3 ++- + 6 files changed, 37 insertions(+), 30 deletions(-) +Merging jfs/jfs-next (c03c21ba6f4e Merge tag 'keys-misc-20210126' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (144c79ef3353 Merge tag 'perf-tools-fixes-for-v5.12-2020-03-07' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (7ae017c7322e NFS: Support the '-owrite=' option in /proc/self/mounts and mountinfo) +$ git merge nfs-anna/linux-next +Already up to date. +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/for-next (e0924d9bf484 svcrdma: Retain the page backing rq_res.head[0].iov_base) +$ git merge cel/for-next +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/nfsd/nfs4proc.c +Merge made by the 'recursive' strategy. + fs/nfs_common/nfsacl.c | 71 ++ + fs/nfsd/nfs2acl.c | 87 +-- + fs/nfsd/nfs3acl.c | 39 +- + fs/nfsd/nfs3proc.c | 97 +-- + fs/nfsd/nfs3xdr.c | 1043 +++++++++++++++++----------- + fs/nfsd/nfs4proc.c | 38 +- + fs/nfsd/nfs4state.c | 55 +- + fs/nfsd/nfs4xdr.c | 110 +-- + fs/nfsd/nfsfh.c | 2 +- + fs/nfsd/nfsfh.h | 2 +- + fs/nfsd/nfsproc.c | 53 +- + fs/nfsd/nfssvc.c | 4 +- + fs/nfsd/nfsxdr.c | 413 ++++++----- + fs/nfsd/trace.h | 24 + + fs/nfsd/vfs.c | 9 +- + fs/nfsd/vfs.h | 2 +- + fs/nfsd/xdr.h | 23 +- + fs/nfsd/xdr3.h | 37 +- + fs/nfsd/xdr4.h | 2 +- + include/linux/nfsacl.h | 3 + + include/linux/sunrpc/svc.h | 25 + + include/linux/sunrpc/svc_rdma.h | 4 +- + include/linux/sunrpc/svc_xprt.h | 1 + + include/linux/sunrpc/xdr.h | 34 + + net/sunrpc/svc_xprt.c | 14 + + net/sunrpc/svcsock.c | 15 +- + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 8 +- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 5 +- + net/sunrpc/xprtrdma/svc_rdma_rw.c | 5 +- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 69 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 9 +- + 31 files changed, 1370 insertions(+), 933 deletions(-) +Merging orangefs/for-next (c1048828c3db orangefs: add splice file operations) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (d46b7cd68336 ovl: plumb through flush method) +$ git merge overlayfs/overlayfs-next +Auto-merging fs/overlayfs/file.c +Merge made by the 'recursive' strategy. + fs/overlayfs/file.c | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) +Merging ubifs/next (42119dbe571e ubifs: Fix error return code in alloc_wbufs()) +$ git merge ubifs/next +Already up to date. +Merging v9fs/9p-next (324a158fe535 fs: 9p: add generic splice_write file operation) +$ git merge v9fs/9p-next +Merge made by the 'recursive' strategy. +Merging xfs/for-next (756b1c343333 xfs: use current->journal_info for detecting transaction recursion) +$ git merge xfs/for-next +Already up to date. +Merging zonefs/for-next (059c01039c01 zonefs: Fix file size of zones in full condition) +$ git merge zonefs/for-next +Already up to date. +Merging iomap/iomap-for-next (ed1128c2d0c8 xfs: reduce exclusive locking on unaligned dio) +$ 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 (cc4a3f885e8f fcntl: make F_GETOWN(EX) return 0 on dead owner task) +$ git merge file-locks/locks-next +Already up to date. +Merging vfs/for-next (1f081146def4 Merge branches 'work.recursive_removal' and 'work.coredump' into for-next) +$ git merge vfs/for-next +Merge made by the 'recursive' strategy. + arch/powerpc/platforms/cell/spufs/coredump.c | 3 +- + drivers/infiniband/hw/qib/qib_fs.c | 68 ++------------------------ + fs/binfmt_elf.c | 4 +- + fs/binfmt_elf_fdpic.c | 3 +- + fs/coredump.c | 72 +++++++++++++++++----------- + include/linux/binfmts.h | 1 + + include/linux/coredump.h | 14 +++--- + 7 files changed, 59 insertions(+), 106 deletions(-) +Merging printk/for-next (4e16cd8fae2f Merge branch 'printk-rework' into for-next) +$ git merge printk/for-next +Auto-merging arch/powerpc/xmon/xmon.c +Merge made by the 'recursive' strategy. + arch/powerpc/kernel/nvram_64.c | 8 +- + arch/powerpc/xmon/xmon.c | 6 +- + arch/um/kernel/kmsg_dump.c | 13 +- + drivers/hv/vmbus_drv.c | 4 +- + drivers/mtd/mtdoops.c | 17 +- + fs/pstore/platform.c | 5 +- + include/linux/kmsg_dump.h | 47 ++--- + kernel/debug/kdb/kdb_main.c | 10 +- + kernel/printk/internal.h | 4 +- + kernel/printk/printk.c | 464 +++++++++++++++++++++-------------------- + kernel/printk/printk_safe.c | 27 +-- + 11 files changed, 310 insertions(+), 295 deletions(-) +Merging pci/next (a38fd8748464 Linux 5.12-rc2) +$ git merge pci/next +Already up to date. +Merging pstore/for-next/pstore (7db688e99c0f pstore/ram: Rate-limit "uncorrectable error in header" message) +$ git merge pstore/for-next/pstore +Already up to date. +Merging hid/for-next (e453304975b0 Merge branch 'for-5.13/intel-ish' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 40 +++++++- + drivers/hid/amd-sfh-hid/amd_sfh_pcie.h | 1 - + drivers/hid/hid-alps.c | 1 + + drivers/hid/hid-asus.c | 3 + + drivers/hid/hid-cp2112.c | 22 ++--- + drivers/hid/hid-google-hammer.c | 2 + + drivers/hid/hid-ids.h | 14 ++- + drivers/hid/hid-lg.c | 24 ----- + drivers/hid/hid-logitech-dj.c | 131 +++++++++++++++++++++++---- + drivers/hid/hid-plantronics.c | 60 +++++++++++- + drivers/hid/hid-quirks.c | 2 - + drivers/hid/i2c-hid/i2c-hid-acpi.c | 52 +++++------ + drivers/hid/intel-ish-hid/ishtp-fw-loader.c | 4 +- + drivers/hid/intel-ish-hid/ishtp-hid-client.c | 4 +- + drivers/hid/intel-ish-hid/ishtp/bus.c | 15 +-- + drivers/hid/usbhid/hiddev.c | 6 +- + drivers/hid/wacom_wac.c | 2 +- + drivers/platform/chrome/cros_ec_ishtp.c | 4 +- + include/linux/hid.h | 2 + + include/linux/intel-ish-client-if.h | 2 +- + 20 files changed, 274 insertions(+), 117 deletions(-) +Merging i2c/i2c/for-next (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge i2c/i2c/for-next +Already up to date. +Merging i3c/i3c/next (436cb709f8a9 i3c: master: svc: remove redundant assignment to cmd->read_len) +$ git merge i3c/i3c/next +Merge made by the 'recursive' strategy. + drivers/i3c/master/svc-i3c-master.c | 1 - + 1 file changed, 1 deletion(-) +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 (6ab3332cc692 MAINTAINERS: Add entry for Texas Instruments TPS23861 PoE PSE) +$ git merge hwmon-staging/hwmon-next +Already up to date. +Merging jc_docs/docs-next (a5907065ac1a docs: livepatch: Fix a typo and remove the unnecessary gaps in a sentence) +$ git merge jc_docs/docs-next +Auto-merging MAINTAINERS +Auto-merging Documentation/process/submitting-patches.rst +Removing Documentation/driver-api/driver-model/class.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + CREDITS | 2 +- + Documentation/admin-guide/cgroup-v1/memory.rst | 3 + + Documentation/admin-guide/dynamic-debug-howto.rst | 2 +- + Documentation/admin-guide/kernel-parameters.rst | 1 + + Documentation/admin-guide/kernel-parameters.txt | 3 +- + Documentation/admin-guide/reporting-issues.rst | 81 +++- + Documentation/arm/marvell.rst | 159 +++---- + Documentation/arm/uefi.rst | 7 + + Documentation/conf.py | 31 +- + Documentation/dev-tools/checkpatch.rst | 513 +++++++++++++++++++++ + Documentation/dev-tools/index.rst | 1 + + Documentation/driver-api/driver-model/class.rst | 149 ------ + Documentation/driver-api/driver-model/device.rst | 23 +- + Documentation/driver-api/driver-model/index.rst | 1 - + Documentation/filesystems/api-summary.rst | 6 + + Documentation/filesystems/proc.rst | 4 + + Documentation/input/event-codes.rst | 10 +- + Documentation/input/ff.rst | 6 +- + Documentation/input/gameport-programming.rst | 35 +- + Documentation/input/input-programming.rst | 20 +- + Documentation/input/input.rst | 8 +- + Documentation/input/multi-touch-protocol.rst | 8 +- + Documentation/input/notifier.rst | 3 +- + Documentation/input/uinput.rst | 2 +- + Documentation/livepatch/shadow-vars.rst | 4 +- + Documentation/process/submitting-patches.rst | 91 ++-- + Documentation/sphinx/rstFlatTable.py | 4 +- + .../translations/zh_CN/admin-guide/README.rst | 347 ++++++++++++++ + .../translations/zh_CN/admin-guide/index.rst | 8 +- + .../translations/zh_CN/admin-guide/unicode.rst | 170 +++++++ + Documentation/translations/zh_CN/index.rst | 1 + + .../translations/zh_CN/process/1.Intro.rst | 195 ++++---- + .../translations/zh_CN/process/2.Process.rst | 345 +++++++------- + .../translations/zh_CN/process/3.Early-stage.rst | 139 +++--- + .../translations/zh_CN/process/4.Coding.rst | 279 +++++------ + .../translations/zh_CN/process/5.Posting.rst | 243 +++++----- + .../translations/zh_CN/process/6.Followthrough.rst | 165 +++---- + .../zh_CN/process/7.AdvancedTopics.rst | 141 +++--- + .../translations/zh_CN/process/8.Conclusion.rst | 60 +-- + Documentation/translations/zh_CN/process/index.rst | 10 +- + .../translations/zh_CN/riscv/boot-image-header.rst | 67 +++ + Documentation/translations/zh_CN/riscv/index.rst | 28 ++ + .../translations/zh_CN/riscv/patch-acceptance.rst | 31 ++ + Documentation/translations/zh_CN/riscv/pmu.rst | 233 ++++++++++ + .../translations/zh_CN/sound/hd-audio/controls.rst | 102 ++++ + .../translations/zh_CN/sound/hd-audio/index.rst | 14 + + Documentation/translations/zh_CN/sound/index.rst | 22 + + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + + Documentation/virt/kvm/api.rst | 2 +- + Documentation/watchdog/pcwd-watchdog.rst | 2 +- + MAINTAINERS | 9 + + fs/eventpoll.c | 52 +-- + scripts/checkpatch.pl | 133 +++++- + scripts/kernel-doc | 28 +- + tools/scripts/Makefile.include | 3 +- + 55 files changed, 2839 insertions(+), 1168 deletions(-) + create mode 100644 Documentation/dev-tools/checkpatch.rst + delete mode 100644 Documentation/driver-api/driver-model/class.rst + create mode 100644 Documentation/translations/zh_CN/admin-guide/README.rst + create mode 100644 Documentation/translations/zh_CN/admin-guide/unicode.rst + create mode 100644 Documentation/translations/zh_CN/riscv/boot-image-header.rst + create mode 100644 Documentation/translations/zh_CN/riscv/index.rst + create mode 100644 Documentation/translations/zh_CN/riscv/patch-acceptance.rst + create mode 100644 Documentation/translations/zh_CN/riscv/pmu.rst + create mode 100644 Documentation/translations/zh_CN/sound/hd-audio/controls.rst + create mode 100644 Documentation/translations/zh_CN/sound/hd-audio/index.rst + create mode 100644 Documentation/translations/zh_CN/sound/index.rst +Merging v4l-dvb/master (1c5ab1e2286f Merge tag 'v5.12-rc2' into patchwork) +$ git merge v4l-dvb/master +Auto-merging include/media/rc-map.h +Auto-merging drivers/media/rc/keymaps/Makefile +Auto-merging drivers/media/platform/rockchip/rkisp1/rkisp1-params.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/media/rc.yaml | 2 + + Documentation/driver-api/media/v4l2-subdev.rst | 2 +- + .../media/cec/cec-ioc-adap-g-caps.rst | 4 +- + .../media/cec/cec-ioc-adap-g-conn-info.rst | 6 +- + .../media/cec/cec-ioc-adap-g-log-addrs.rst | 12 +- + .../userspace-api/media/cec/cec-ioc-dqevent.rst | 10 +- + .../userspace-api/media/cec/cec-ioc-g-mode.rst | 4 +- + .../userspace-api/media/cec/cec-ioc-receive.rst | 8 +- + .../userspace-api/media/dvb/fe-type-t.rst | 2 +- + .../media/mediactl/media-ioc-device-info.rst | 2 +- + .../media/mediactl/media-ioc-enum-entities.rst | 2 +- + .../media/mediactl/media-ioc-enum-links.rst | 6 +- + .../media/mediactl/media-ioc-g-topology.rst | 12 +- + .../userspace-api/media/mediactl/media-types.rst | 4 +- + Documentation/userspace-api/media/rc/rc-tables.rst | 2 +- + Documentation/userspace-api/media/v4l/buffer.rst | 22 +- + .../media/v4l/colorspaces-details.rst | 31 - + Documentation/userspace-api/media/v4l/control.rst | 13 +- + Documentation/userspace-api/media/v4l/dev-meta.rst | 2 +- + .../userspace-api/media/v4l/dev-overlay.rst | 9 +- + .../userspace-api/media/v4l/dev-raw-vbi.rst | 4 +- + Documentation/userspace-api/media/v4l/dev-rds.rst | 4 +- + Documentation/userspace-api/media/v4l/dev-sdr.rst | 2 +- + .../userspace-api/media/v4l/dev-sliced-vbi.rst | 50 +- + .../userspace-api/media/v4l/dev-subdev.rst | 6 +- + Documentation/userspace-api/media/v4l/diff-v4l.rst | 10 +- + .../userspace-api/media/v4l/ext-ctrls-camera.rst | 14 +- + .../media/v4l/ext-ctrls-codec-stateless.rst | 185 +++- + .../userspace-api/media/v4l/ext-ctrls-codec.rst | 292 ++++-- + .../userspace-api/media/v4l/ext-ctrls-dv.rst | 2 +- + .../userspace-api/media/v4l/ext-ctrls-flash.rst | 7 +- + .../userspace-api/media/v4l/ext-ctrls-jpeg.rst | 13 +- + .../userspace-api/media/v4l/field-order.rst | 2 +- + .../userspace-api/media/v4l/pixfmt-compressed.rst | 12 +- + .../userspace-api/media/v4l/pixfmt-packed-yuv.rst | 26 +- + .../userspace-api/media/v4l/pixfmt-reserved.rst | 10 +- + .../userspace-api/media/v4l/pixfmt-rgb.rst | 9 +- + .../media/v4l/pixfmt-srggb10-ipu3.rst | 12 +- + .../userspace-api/media/v4l/pixfmt-srggb10p.rst | 2 +- + .../userspace-api/media/v4l/pixfmt-srggb12p.rst | 2 +- + .../userspace-api/media/v4l/pixfmt-srggb14.rst | 2 + + .../userspace-api/media/v4l/pixfmt-srggb14p.rst | 6 +- + .../userspace-api/media/v4l/pixfmt-srggb16.rst | 2 + + .../userspace-api/media/v4l/pixfmt-srggb8.rst | 3 +- + .../userspace-api/media/v4l/pixfmt-v4l2-mplane.rst | 4 +- + .../userspace-api/media/v4l/pixfmt-v4l2.rst | 4 +- + .../userspace-api/media/v4l/pixfmt-yuv-luma.rst | 10 + + .../userspace-api/media/v4l/pixfmt-yuv-planar.rst | 34 +- + .../userspace-api/media/v4l/subdev-formats.rst | 26 +- + .../media/v4l/v4l2-selection-flags.rst | 14 +- + .../media/v4l/v4l2-selection-targets.rst | 12 +- + Documentation/userspace-api/media/v4l/vbi_525.svg | 4 +- + Documentation/userspace-api/media/v4l/vbi_625.svg | 4 +- + .../userspace-api/media/v4l/vbi_hsync.svg | 4 +- + .../userspace-api/media/v4l/vidioc-create-bufs.rst | 2 +- + .../userspace-api/media/v4l/vidioc-cropcap.rst | 4 +- + .../media/v4l/vidioc-dbg-g-chip-info.rst | 6 +- + .../media/v4l/vidioc-dbg-g-register.rst | 4 +- + .../userspace-api/media/v4l/vidioc-decoder-cmd.rst | 6 +- + .../userspace-api/media/v4l/vidioc-dqevent.rst | 21 +- + .../media/v4l/vidioc-dv-timings-cap.rst | 6 +- + .../userspace-api/media/v4l/vidioc-encoder-cmd.rst | 6 +- + .../media/v4l/vidioc-enum-dv-timings.rst | 2 +- + .../userspace-api/media/v4l/vidioc-enum-fmt.rst | 10 +- + .../media/v4l/vidioc-enum-frameintervals.rst | 7 +- + .../media/v4l/vidioc-enum-framesizes.rst | 8 +- + .../media/v4l/vidioc-enum-freq-bands.rst | 4 +- + .../userspace-api/media/v4l/vidioc-enuminput.rst | 8 +- + .../userspace-api/media/v4l/vidioc-enumoutput.rst | 6 +- + .../userspace-api/media/v4l/vidioc-enumstd.rst | 6 +- + .../userspace-api/media/v4l/vidioc-expbuf.rst | 2 +- + .../userspace-api/media/v4l/vidioc-g-audio.rst | 6 +- + .../userspace-api/media/v4l/vidioc-g-audioout.rst | 2 +- + .../userspace-api/media/v4l/vidioc-g-crop.rst | 2 +- + .../userspace-api/media/v4l/vidioc-g-ctrl.rst | 2 +- + .../media/v4l/vidioc-g-dv-timings.rst | 18 +- + .../userspace-api/media/v4l/vidioc-g-edid.rst | 2 +- + .../userspace-api/media/v4l/vidioc-g-enc-index.rst | 6 +- + .../userspace-api/media/v4l/vidioc-g-ext-ctrls.rst | 18 +- + .../userspace-api/media/v4l/vidioc-g-fbuf.rst | 6 +- + .../userspace-api/media/v4l/vidioc-g-fmt.rst | 2 +- + .../userspace-api/media/v4l/vidioc-g-frequency.rst | 2 +- + .../userspace-api/media/v4l/vidioc-g-jpegcomp.rst | 4 +- + .../userspace-api/media/v4l/vidioc-g-modulator.rst | 5 +- + .../userspace-api/media/v4l/vidioc-g-parm.rst | 11 +- + .../userspace-api/media/v4l/vidioc-g-priority.rst | 2 +- + .../userspace-api/media/v4l/vidioc-g-selection.rst | 2 +- + .../media/v4l/vidioc-g-sliced-vbi-cap.rst | 29 +- + .../userspace-api/media/v4l/vidioc-g-tuner.rst | 10 +- + .../userspace-api/media/v4l/vidioc-querycap.rst | 8 +- + .../userspace-api/media/v4l/vidioc-queryctrl.rst | 21 +- + .../userspace-api/media/v4l/vidioc-reqbufs.rst | 14 +- + .../media/v4l/vidioc-s-hw-freq-seek.rst | 2 +- + .../v4l/vidioc-subdev-enum-frame-interval.rst | 2 +- + .../media/v4l/vidioc-subdev-enum-frame-size.rst | 2 +- + .../media/v4l/vidioc-subdev-enum-mbus-code.rst | 12 +- + .../media/v4l/vidioc-subdev-g-crop.rst | 2 +- + .../media/v4l/vidioc-subdev-g-fmt.rst | 4 +- + .../media/v4l/vidioc-subdev-g-frame-interval.rst | 2 +- + .../media/v4l/vidioc-subdev-g-selection.rst | 2 +- + .../media/v4l/vidioc-subdev-querycap.rst | 4 +- + .../media/v4l/vidioc-subscribe-event.rst | 4 +- + drivers/clk/clk-ast2600.c | 4 +- + drivers/media/cec/core/cec-notifier.c | 33 +- + drivers/media/common/b2c2/flexcop-hw-filter.c | 2 +- + drivers/media/common/saa7146/saa7146_core.c | 2 +- + drivers/media/common/saa7146/saa7146_video.c | 3 +- + drivers/media/common/siano/smscoreapi.c | 42 +- + drivers/media/common/siano/smscoreapi.h | 5 - + drivers/media/common/siano/smsdvb-main.c | 14 +- + drivers/media/common/videobuf2/frame_vector.c | 1 - + drivers/media/dvb-core/dvb_ca_en50221.c | 32 +- + drivers/media/dvb-frontends/drx39xyj/drxj.c | 2 +- + drivers/media/i2c/adv7511-v4l2.c | 58 +- + drivers/media/i2c/imx274.c | 7 +- + drivers/media/i2c/max2175.c | 3 +- + drivers/media/i2c/s5k6aa.c | 2 +- + drivers/media/pci/cx18/cx18-av-audio.c | 2 +- + drivers/media/pci/cx18/cx18-av-core.c | 4 +- + drivers/media/pci/cx18/cx18-firmware.c | 2 +- + drivers/media/pci/cx23885/cx23885-cards.c | 28 +- + drivers/media/pci/cx23885/cx23885-core.c | 9 + + drivers/media/pci/ivtv/ivtv-driver.c | 2 +- + drivers/media/pci/ngene/ngene-cards.c | 6 +- + drivers/media/pci/ngene/ngene-core.c | 56 +- + drivers/media/pci/saa7134/saa7134-core.c | 2 +- + drivers/media/pci/solo6x10/solo6x10-core.c | 2 +- + drivers/media/pci/sta2x11/Kconfig | 1 + + drivers/media/platform/Kconfig | 3 + + drivers/media/platform/aspeed-video.c | 9 +- + drivers/media/platform/exynos4-is/media-dev.c | 2 +- + drivers/media/platform/fsl-viu.c | 6 +- + .../media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 4 +- + drivers/media/platform/mtk-vpu/mtk_vpu.c | 4 +- + drivers/media/platform/pxa_camera.c | 4 +- + drivers/media/platform/qcom/camss/camss-csid.c | 20 +- + .../platform/qcom/camss/camss-csiphy-2ph-1-0.c | 22 +- + .../platform/qcom/camss/camss-csiphy-3ph-1-0.c | 22 +- + drivers/media/platform/qcom/camss/camss-csiphy.c | 36 +- + drivers/media/platform/qcom/camss/camss-csiphy.h | 2 +- + drivers/media/platform/qcom/camss/camss-vfe.c | 4 +- + drivers/media/platform/qcom/camss/camss.c | 25 +- + drivers/media/platform/qcom/camss/camss.h | 4 +- + .../media/platform/rockchip/rkisp1/rkisp1-params.c | 445 ++++----- + .../platform/rockchip/rkisp1/rkisp1-resizer.c | 9 +- + drivers/media/platform/sti/hva/hva-h264.c | 10 +- + drivers/media/platform/ti-vpe/vpdma.c | 3 +- + drivers/media/platform/vsp1/vsp1_dl.c | 2 +- + drivers/media/radio/radio-maxiradio.c | 2 +- + drivers/media/rc/img-ir/img-ir-hw.c | 2 +- + drivers/media/rc/ite-cir.c | 349 ++----- + drivers/media/rc/ite-cir.h | 51 +- + drivers/media/rc/keymaps/Makefile | 2 + + drivers/media/rc/keymaps/rc-minix-neo.c | 55 ++ + drivers/media/rc/keymaps/rc-xbox-360.c | 83 ++ + drivers/media/spi/cxd2880-spi.c | 4 +- + drivers/media/test-drivers/vivid/vivid-vid-out.c | 2 +- + drivers/media/tuners/mt2063.c | 6 +- + drivers/media/usb/dvb-usb-v2/anysee.c | 21 +- + drivers/media/usb/dvb-usb/dvb-usb-init.c | 70 +- + drivers/media/usb/em28xx/em28xx-cards.c | 4 + + drivers/media/usb/pwc/pwc-dec23.c | 2 +- + drivers/media/usb/pwc/pwc-if.c | 8 - + drivers/media/usb/ttusb-dec/ttusb_dec.c | 4 - + drivers/media/usb/usbtv/usbtv-video.c | 6 +- + drivers/media/usb/zr364xx/zr364xx.c | 13 +- + drivers/media/v4l2-core/v4l2-common.c | 5 + + drivers/media/v4l2-core/v4l2-jpeg.c | 2 +- + drivers/media/v4l2-core/v4l2-mc.c | 6 +- + drivers/staging/media/imx/Kconfig | 9 +- + drivers/staging/media/imx/Makefile | 6 +- + drivers/staging/media/imx/TODO | 9 +- + drivers/staging/media/imx/imx-ic-prp.c | 4 +- + drivers/staging/media/imx/imx-ic-prpencvf.c | 24 +- + drivers/staging/media/imx/imx-media-capture.c | 687 ++++++++----- + drivers/staging/media/imx/imx-media-csc-scaler.c | 2 +- + drivers/staging/media/imx/imx-media-csi.c | 33 +- + drivers/staging/media/imx/imx-media-dev-common.c | 4 + + drivers/staging/media/imx/imx-media-utils.c | 23 +- + drivers/staging/media/imx/imx-media-vdic.c | 7 +- + drivers/staging/media/imx/imx-media.h | 12 +- + drivers/staging/media/imx/imx6-mipi-csi2.c | 6 +- + drivers/staging/media/imx/imx7-media-csi.c | 1014 +++++++++----------- + drivers/staging/media/imx/imx7-mipi-csis.c | 400 ++++---- + drivers/staging/media/omap4iss/iss.c | 4 +- + include/media/davinci/isif.h | 8 +- + include/media/dvbdev.h | 2 +- + include/media/rc-map.h | 2 + + include/media/v4l2-mc.h | 8 +- + include/uapi/linux/v4l2-controls.h | 2 +- + 190 files changed, 2817 insertions(+), 2370 deletions(-) + create mode 100644 drivers/media/rc/keymaps/rc-minix-neo.c + create mode 100644 drivers/media/rc/keymaps/rc-xbox-360.c +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/userspace-api/index.rst +Auto-merging Documentation/hwmon/index.rst +Auto-merging Documentation/filesystems/api-summary.rst +Auto-merging Documentation/dev-tools/kasan.rst +CONFLICT (content): Merge conflict in Documentation/dev-tools/kasan.rst +Auto-merging Documentation/conf.py +CONFLICT (content): Merge conflict in Documentation/conf.py +Resolved 'Documentation/conf.py' using previous resolution. +Resolved 'Documentation/dev-tools/kasan.rst' using previous resolution. +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 260716a3c6b6] 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 (8608bdeb4cdb Merge branch 'devprop' into linux-next) +$ git merge pm/linux-next +Auto-merging include/linux/acpi.h +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 4 +- + Documentation/firmware-guide/acpi/debug.rst | 36 ++---- + drivers/acpi/acpi_processor.c | 33 ++--- + drivers/acpi/hed.c | 1 - + drivers/acpi/pci_irq.c | 34 ++--- + drivers/acpi/pci_link.c | 164 +++++++++++------------- + drivers/acpi/processor_driver.c | 6 +- + drivers/acpi/processor_idle.c | 38 +++--- + drivers/acpi/processor_pdc.c | 7 +- + drivers/acpi/processor_perflib.c | 48 ++++--- + drivers/acpi/processor_throttling.c | 102 +++++++-------- + drivers/acpi/sysfs.c | 14 +- + drivers/acpi/utils.c | 14 ++ + drivers/base/swnode.c | 29 +++-- + drivers/cpufreq/cpufreq-dt-platdev.c | 2 + + drivers/cpufreq/qcom-cpufreq-hw.c | 6 +- + drivers/hwmon/acpi_power_meter.c | 29 +++-- + drivers/iio/light/acpi-als.c | 4 +- + include/acpi/acpi_drivers.h | 12 -- + include/linux/acpi.h | 5 + + include/linux/property.h | 2 +- + 21 files changed, 265 insertions(+), 325 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (ce4e7ba54891 cpufreq: CPPC: Add support for frequency invariance) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/topology.h | 10 +- + arch/arm64/kernel/topology.c | 109 +++++++---------- + drivers/base/arch_topology.c | 89 +++++++++++++- + drivers/cpufreq/Kconfig.arm | 10 ++ + drivers/cpufreq/cppc_cpufreq.c | 245 ++++++++++++++++++++++++++++++++++++-- + include/linux/arch_topology.h | 19 ++- + kernel/sched/core.c | 1 + + 7 files changed, 385 insertions(+), 98 deletions(-) +Merging cpupower/cpupower (a38fd8748464 Linux 5.12-rc2) +$ git merge cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (03efd953fe1b PM / devfreq: Fix the wrong set_freq path for userspace governor in Kconfig) +$ git merge devfreq/devfreq-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/devfreq/rk3399_dmc.txt | 75 +++++++++++----------- + drivers/devfreq/Kconfig | 2 +- + drivers/devfreq/devfreq.c | 9 +++ + drivers/devfreq/rk3399_dmc.c | 20 ++---- + include/linux/devfreq.h | 9 +++ + 5 files changed, 61 insertions(+), 54 deletions(-) +Merging opp/opp/linux-next (6e1cb1b154bd opp: Don't drop extra references to OPPs accidentally) +$ git merge opp/opp/linux-next +Merge made by the 'recursive' strategy. + drivers/opp/core.c | 48 +++++++++++++++++++++++++----------------------- + drivers/opp/opp.h | 2 ++ + 2 files changed, 27 insertions(+), 23 deletions(-) +Merging thermal/thermal/linux-next (a51afb13311c thermal: cpufreq_cooling: freq_qos_update_request() returns < 0 on error) +$ git merge thermal/thermal/linux-next +Already up to date. +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 (9d232469bcd7 fs: dlm: add shutdown hook) +$ git merge dlm/next +Merge made by the 'recursive' strategy. + fs/dlm/config.c | 86 ++++++++++++++++-------- + fs/dlm/config.h | 1 - + fs/dlm/debug_fs.c | 1 + + fs/dlm/lock.c | 2 - + fs/dlm/lockspace.c | 20 +++--- + fs/dlm/lowcomms.c | 193 ++++++++++++++++++++++++++++++----------------------- + fs/dlm/lowcomms.h | 5 ++ + fs/dlm/midcomms.c | 33 +++++---- + fs/dlm/rcom.c | 2 - + 9 files changed, 201 insertions(+), 142 deletions(-) +Merging swiotlb/linux-next (a38fd8748464 Linux 5.12-rc2) +$ git merge swiotlb/linux-next +Already up to date. +Merging rdma/for-next (a38fd8748464 Linux 5.12-rc2) +$ git merge rdma/for-next +Already up to date. +Merging net-next/master (34bb97512641 net: fddi: skfp: Mundane typo fixes throughout the file smt.h) +$ git merge net-next/master +Auto-merging tools/lib/bpf/Makefile +Removing tools/bpf/Makefile.helpers +Auto-merging net/ipv6/route.c +Auto-merging net/ipv4/route.c +Auto-merging net/core/filter.c +Auto-merging kernel/bpf/verifier.c +Auto-merging kernel/bpf/bpf_inode_storage.c +Auto-merging init/Kconfig +Auto-merging include/uapi/linux/bpf.h +Auto-merging include/linux/bpf.h +Removing drivers/staging/fsl-dpaa2/ethsw/ethsw.h +Removing drivers/staging/fsl-dpaa2/ethsw/TODO +Removing drivers/staging/fsl-dpaa2/ethsw/README +Removing drivers/staging/fsl-dpaa2/ethsw/Makefile +Removing drivers/staging/fsl-dpaa2/Makefile +Removing drivers/staging/fsl-dpaa2/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/bpf/btf.rst | 17 +- + Documentation/bpf/index.rst | 9 +- + .../networking/device_drivers/fddi/defza.rst | 2 +- + Documentation/userspace-api/ebpf/index.rst | 17 + + Documentation/userspace-api/ebpf/syscall.rst | 24 + + Documentation/userspace-api/index.rst | 1 + + MAINTAINERS | 8 +- + drivers/isdn/mISDN/dsp_core.c | 3 +- + drivers/isdn/mISDN/l1oip_core.c | 2 +- + drivers/net/ethernet/3com/3c509.c | 1 + + drivers/net/ethernet/broadcom/bcm4908_enet.c | 8 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 2 +- + drivers/net/ethernet/freescale/dpaa2/Kconfig | 8 + + drivers/net/ethernet/freescale/dpaa2/Makefile | 2 + + .../freescale/dpaa2/dpaa2-switch-ethtool.c} | 2 +- + .../ethernet/freescale/dpaa2/dpaa2-switch.c} | 1704 ++++++++++++++++---- + .../net/ethernet/freescale/dpaa2/dpaa2-switch.h | 178 ++ + .../ethernet/freescale/dpaa2}/dpsw-cmd.h | 128 +- + .../ethsw => net/ethernet/freescale/dpaa2}/dpsw.c | 328 +++- + .../ethsw => net/ethernet/freescale/dpaa2}/dpsw.h | 199 ++- + drivers/net/ethernet/freescale/enetc/enetc.c | 292 ++-- + drivers/net/ethernet/freescale/enetc/enetc.h | 34 +- + drivers/net/ethernet/freescale/enetc/enetc_cbdr.c | 82 +- + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 56 +- + drivers/net/ethernet/freescale/enetc/enetc_vf.c | 7 + + drivers/net/ethernet/intel/igb/igb_main.c | 2 +- + drivers/net/ethernet/intel/igc/igc_main.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/core.c | 6 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 13 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 8 +- + drivers/net/ethernet/mscc/ocelot_vcap.c | 1 + + drivers/net/ethernet/pensando/ionic/ionic_dev.c | 4 +- + drivers/net/ethernet/pensando/ionic/ionic_dev.h | 19 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 6 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.h | 22 +- + drivers/net/ethernet/pensando/ionic/ionic_main.c | 4 +- + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 374 +++-- + drivers/net/ethernet/qlogic/qed/qed_l2.c | 1 + + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 1 + + drivers/net/ethernet/sun/cassini.c | 1 + + drivers/net/fddi/Kconfig | 16 - + drivers/net/fddi/defxx.c | 96 +- + drivers/net/fddi/defxx.h | 5 +- + drivers/net/fddi/defza.c | 2 +- + drivers/net/fddi/skfp/h/smt.h | 12 +- + drivers/net/fddi/skfp/smt.c | 4 +- + drivers/net/plip/plip.c | 2 + + drivers/net/virtio_net.c | 65 +- + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/fsl-dpaa2/Kconfig | 19 - + drivers/staging/fsl-dpaa2/Makefile | 6 - + drivers/staging/fsl-dpaa2/ethsw/Makefile | 10 - + drivers/staging/fsl-dpaa2/ethsw/README | 106 -- + drivers/staging/fsl-dpaa2/ethsw/TODO | 13 - + drivers/staging/fsl-dpaa2/ethsw/ethsw.h | 80 - + include/linux/bpf.h | 94 +- + include/linux/bpf_local_storage.h | 3 +- + include/linux/bpf_lsm.h | 22 - + include/linux/bpf_types.h | 8 +- + include/linux/bpf_verifier.h | 3 + + include/linux/filter.h | 31 +- + include/linux/netdevice.h | 5 + + include/linux/sched.h | 5 + + include/linux/skbuff.h | 4 + + include/linux/skmsg.h | 82 +- + include/linux/socket.h | 71 +- + include/net/pkt_sched.h | 9 + + include/net/tcp.h | 41 +- + include/net/udp.h | 4 +- + include/net/xdp_sock.h | 19 - + include/trace/events/xdp.h | 62 +- + include/uapi/linux/bpf.h | 762 ++++++++- + include/uapi/linux/btf.h | 5 +- + include/uapi/linux/if_fddi.h | 2 +- + init/Kconfig | 1 + + kernel/bpf/Makefile | 3 +- + kernel/bpf/arraymap.c | 40 + + kernel/bpf/bpf_inode_storage.c | 2 +- + kernel/bpf/bpf_iter.c | 16 + + kernel/bpf/bpf_local_storage.c | 39 +- + kernel/bpf/bpf_lsm.c | 4 - + kernel/bpf/bpf_task_storage.c | 100 +- + kernel/bpf/btf.c | 108 +- + kernel/bpf/cpumap.c | 9 +- + kernel/bpf/devmap.c | 17 +- + kernel/bpf/hashtab.c | 65 + + kernel/bpf/helpers.c | 2 + + kernel/bpf/verifier.c | 393 ++++- + kernel/fork.c | 5 + + kernel/trace/bpf_trace.c | 6 + + net/Kconfig | 6 +- + net/ax25/af_ax25.c | 1 + + net/bpf/test_run.c | 244 ++- + net/bridge/br_input.c | 1 + + net/core/Makefile | 6 +- + net/core/bpf_sk_storage.c | 2 +- + net/core/dev.c | 1 + + net/core/filter.c | 269 ++- + net/core/skbuff.c | 15 +- + net/core/skmsg.c | 212 ++- + net/core/sock_map.c | 77 +- + net/decnet/dn_route.c | 2 +- + net/ipv4/Makefile | 2 +- + net/ipv4/route.c | 10 +- + net/ipv4/tcp_bpf.c | 4 +- + net/ipv6/route.c | 26 +- + net/rds/recv.c | 4 - + net/rose/rose_route.c | 2 + + net/sched/act_sample.c | 11 + + net/xdp/xsk.c | 114 +- + net/xdp/xsk_queue.h | 30 +- + net/xdp/xskmap.c | 17 +- + scripts/{bpf_helpers_doc.py => bpf_doc.py} | 191 ++- + tools/bpf/Makefile.helpers | 60 - + tools/bpf/bpf_dbg.c | 2 +- + tools/bpf/bpf_exp.y | 14 +- + tools/bpf/bpftool/.gitignore | 1 - + tools/bpf/bpftool/Documentation/Makefile | 11 +- + tools/bpf/bpftool/btf.c | 8 + + tools/bpf/bpftool/btf_dumper.c | 1 + + tools/bpf/bpftool/feature.c | 4 + + tools/bpf/bpftool/xlated_dumper.c | 3 + + tools/bpf/runqslower/Makefile | 9 +- + tools/bpf/runqslower/runqslower.bpf.c | 33 +- + tools/include/uapi/linux/bpf.h | 762 ++++++++- + tools/include/uapi/linux/btf.h | 5 +- + tools/lib/bpf/Makefile | 2 +- + tools/lib/bpf/btf.c | 51 +- + tools/lib/bpf/btf.h | 6 + + tools/lib/bpf/btf_dump.c | 4 + + tools/lib/bpf/libbpf.c | 105 +- + tools/lib/bpf/libbpf.map | 5 + + tools/lib/bpf/libbpf_internal.h | 2 + + tools/lib/bpf/libbpf_util.h | 72 +- + tools/lib/bpf/xsk.h | 17 +- + tools/perf/MANIFEST | 2 +- + tools/testing/selftests/bpf/.gitignore | 2 + + tools/testing/selftests/bpf/Makefile | 27 +- + tools/testing/selftests/bpf/Makefile.docs | 82 + + tools/testing/selftests/bpf/README.rst | 48 + + tools/testing/selftests/bpf/btf_helpers.c | 4 + + .../selftests/bpf/prog_tests/attach_probe.c | 40 +- + .../selftests/bpf/prog_tests/bpf_verif_scale.c | 1 + + tools/testing/selftests/bpf/prog_tests/btf.c | 176 +- + .../testing/selftests/bpf/prog_tests/core_reloc.c | 1 + + tools/testing/selftests/bpf/prog_tests/for_each.c | 130 ++ + .../selftests/bpf/prog_tests/prog_run_xattr.c | 51 +- + tools/testing/selftests/bpf/prog_tests/sk_lookup.c | 83 +- + .../selftests/bpf/prog_tests/sockmap_listen.c | 8 +- + .../selftests/bpf/prog_tests/task_local_storage.c | 92 ++ + .../bpf/progs/btf_dump_test_case_syntax.c | 7 + + .../testing/selftests/bpf/progs/core_reloc_types.h | 5 + + .../selftests/bpf/progs/for_each_array_map_elem.c | 61 + + .../selftests/bpf/progs/for_each_hash_map_elem.c | 95 ++ + tools/testing/selftests/bpf/progs/loop6.c | 99 ++ + .../selftests/bpf/progs/task_local_storage.c | 64 + + .../bpf/progs/task_local_storage_exit_creds.c | 32 + + .../selftests/bpf/progs/task_ls_recursion.c | 70 + + .../selftests/bpf/progs/test_core_reloc_size.c | 3 + + tools/testing/selftests/bpf/progs/test_sk_lookup.c | 62 +- + .../selftests/bpf/progs/test_sockmap_listen.c | 4 +- + tools/testing/selftests/bpf/progs/test_tc_tunnel.c | 113 +- + tools/testing/selftests/bpf/test_bpftool_build.sh | 21 - + tools/testing/selftests/bpf/test_btf.h | 3 + + tools/testing/selftests/bpf/test_doc_build.sh | 13 + + tools/testing/selftests/bpf/test_progs.h | 11 + + tools/testing/selftests/bpf/test_sockmap.c | 2 +- + tools/testing/selftests/bpf/test_tc_tunnel.sh | 15 +- + tools/testing/selftests/bpf/test_verifier.c | 4 +- + tools/testing/selftests/bpf/test_xsk.sh | 135 +- + .../testing/selftests/bpf/verifier/ctx_sk_lookup.c | 1 + + tools/testing/selftests/bpf/vmtest.sh | 26 +- + tools/testing/selftests/bpf/xdpxceiver.c | 380 +++-- + tools/testing/selftests/bpf/xdpxceiver.h | 57 +- + tools/testing/selftests/bpf/xsk_prereqs.sh | 30 +- + 176 files changed, 7928 insertions(+), 2615 deletions(-) + create mode 100644 Documentation/userspace-api/ebpf/index.rst + create mode 100644 Documentation/userspace-api/ebpf/syscall.rst + rename drivers/{staging/fsl-dpaa2/ethsw/ethsw-ethtool.c => net/ethernet/freescale/dpaa2/dpaa2-switch-ethtool.c} (99%) + rename drivers/{staging/fsl-dpaa2/ethsw/ethsw.c => net/ethernet/freescale/dpaa2/dpaa2-switch.c} (51%) + create mode 100644 drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.h + rename drivers/{staging/fsl-dpaa2/ethsw => net/ethernet/freescale/dpaa2}/dpsw-cmd.h (76%) + rename drivers/{staging/fsl-dpaa2/ethsw => net/ethernet/freescale/dpaa2}/dpsw.c (83%) + rename drivers/{staging/fsl-dpaa2/ethsw => net/ethernet/freescale/dpaa2}/dpsw.h (73%) + delete mode 100644 drivers/staging/fsl-dpaa2/Kconfig + delete mode 100644 drivers/staging/fsl-dpaa2/Makefile + delete mode 100644 drivers/staging/fsl-dpaa2/ethsw/Makefile + delete mode 100644 drivers/staging/fsl-dpaa2/ethsw/README + delete mode 100644 drivers/staging/fsl-dpaa2/ethsw/TODO + delete mode 100644 drivers/staging/fsl-dpaa2/ethsw/ethsw.h + rename scripts/{bpf_helpers_doc.py => bpf_doc.py} (82%) + delete mode 100644 tools/bpf/Makefile.helpers + create mode 100644 tools/testing/selftests/bpf/Makefile.docs + create mode 100644 tools/testing/selftests/bpf/prog_tests/for_each.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/task_local_storage.c + create mode 100644 tools/testing/selftests/bpf/progs/for_each_array_map_elem.c + create mode 100644 tools/testing/selftests/bpf/progs/for_each_hash_map_elem.c + create mode 100644 tools/testing/selftests/bpf/progs/loop6.c + create mode 100644 tools/testing/selftests/bpf/progs/task_local_storage.c + create mode 100644 tools/testing/selftests/bpf/progs/task_local_storage_exit_creds.c + create mode 100644 tools/testing/selftests/bpf/progs/task_ls_recursion.c + create mode 100755 tools/testing/selftests/bpf/test_doc_build.sh +Merging bpf-next/for-next (1211f4e9ae13 Merge branch 'libbpf/xsk cleanups') +$ git merge bpf-next/for-next +Removing tools/lib/bpf/libbpf_util.h +Auto-merging tools/lib/bpf/Makefile +Merge made by the 'recursive' strategy. + tools/lib/bpf/Makefile | 1 - + tools/lib/bpf/libbpf_util.h | 75 ---------------------- + tools/lib/bpf/xsk.h | 70 +++++++++++++++++++- + tools/testing/selftests/bpf/progs/fentry_test.c | 2 +- + .../selftests/bpf/progs/test_global_func10.c | 2 +- + 5 files changed, 70 insertions(+), 80 deletions(-) + delete mode 100644 tools/lib/bpf/libbpf_util.h +$ git reset --hard HEAD^ +HEAD is now at 570aa977bd59 Merge remote-tracking branch 'net-next/master' +Merging next-20210310 version of bpf-next +$ git merge -m next-20210310/bpf-next d310ec03a34e92a77302edb804f7d68ee4f01ba0 +Already up to date. +Merging ipsec-next/master (d310ec03a34e Merge tag 'perf-core-2021-02-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (a38fd8748464 Linux 5.12-rc2) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net) +$ git merge netfilter-next/master +Already up to date. +Merging ipvs-next/master (a61e4b60761f Merge branch 'net-dsa-hellcreek-add-taprio-offloading') +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net) +$ git merge wireless-drivers-next/master +Already up to date. +Merging bluetooth/master (d00745da644d Bluetooth: btintel: Fix offset calculation boot address parameter) +$ git merge bluetooth/master +Removing Documentation/devicetree/bindings/net/broadcom-bluetooth.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/broadcom-bluetooth.txt | 56 ---------- + .../bindings/net/broadcom-bluetooth.yaml | 117 +++++++++++++++++++++ + .../devicetree/bindings/serial/ingenic,uart.yaml | 2 +- + drivers/bluetooth/btintel.c | 3 +- + drivers/bluetooth/btusb.c | 16 +-- + drivers/bluetooth/hci_bcm.c | 17 +++ + include/net/bluetooth/hci.h | 1 + + include/net/bluetooth/mgmt.h | 1 + + net/bluetooth/hci_conn.c | 10 ++ + net/bluetooth/hci_event.c | 27 +++++ + net/bluetooth/hci_request.c | 47 +++++---- + net/bluetooth/mgmt.c | 1 + + 12 files changed, 216 insertions(+), 82 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/net/broadcom-bluetooth.txt + create mode 100644 Documentation/devicetree/bindings/net/broadcom-bluetooth.yaml +Merging mac80211-next/master (38b5133ad607 octeontx2-pf: Fix otx2_get_fecparam()) +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (1a5a2cfd34c1 gfs2: fix use-after-free in trans_drain) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/log.c | 4 ++++ + fs/gfs2/ops_fstype.c | 4 +--- + fs/gfs2/super.c | 10 ++-------- + fs/gfs2/super.h | 2 +- + fs/gfs2/trans.c | 2 ++ + fs/gfs2/util.c | 2 +- + 6 files changed, 11 insertions(+), 13 deletions(-) +Merging mtd/mtd/next (457da931b608 mtd: parsers: ofpart: support BCM4908 fixed partitions) +$ git merge mtd/mtd/next +Merge made by the 'recursive' strategy. + drivers/mtd/ftl.c | 14 +----- + drivers/mtd/inftlcore.c | 13 +---- + drivers/mtd/maps/physmap-bt1-rom.c | 2 +- + drivers/mtd/mtdblock.c | 14 +----- + drivers/mtd/mtdblock_ro.c | 13 +---- + drivers/mtd/mtdchar.c | 24 ++++------ + drivers/mtd/mtdcore.c | 3 +- + drivers/mtd/mtdpart.c | 2 +- + drivers/mtd/mtdswap.c | 14 +----- + drivers/mtd/nftlcore.c | 13 +---- + drivers/mtd/parsers/Kconfig | 14 ++++-- + drivers/mtd/parsers/Makefile | 2 + + drivers/mtd/parsers/ofpart_bcm4908.c | 64 +++++++++++++++++++++++++ + drivers/mtd/parsers/ofpart_bcm4908.h | 15 ++++++ + drivers/mtd/parsers/{ofpart.c => ofpart_core.c} | 28 ++++++++++- + drivers/mtd/rfd_ftl.c | 13 +---- + include/linux/mtd/blktrans.h | 11 +++++ + include/linux/mtd/mtd.h | 1 + + 18 files changed, 151 insertions(+), 109 deletions(-) + create mode 100644 drivers/mtd/parsers/ofpart_bcm4908.c + create mode 100644 drivers/mtd/parsers/ofpart_bcm4908.h + rename drivers/mtd/parsers/{ofpart.c => ofpart_core.c} (88%) +Merging nand/nand/next (99a8e1154eb1 mtd: rawnand: qcom: Return actual error code instead of -ENODEV) +$ git merge nand/nand/next +Auto-merging drivers/mtd/mtdcore.c +Merge made by the 'recursive' strategy. + drivers/mtd/mtdcore.c | 3 + + drivers/mtd/nand/ecc-sw-bch.c | 10 +- + drivers/mtd/nand/ecc-sw-hamming.c | 10 +- + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 6 + + drivers/mtd/nand/raw/fsmc_nand.c | 2 + + drivers/mtd/nand/raw/nand_base.c | 45 +++--- + drivers/mtd/nand/raw/omap2.c | 14 +- + drivers/mtd/nand/raw/qcom_nandc.c | 262 +++++++++++++++++++------------ + drivers/mtd/nand/spi/gigadevice.c | 69 ++++++-- + include/linux/mtd/nand-ecc-sw-bch.h | 2 - + include/linux/mtd/nand-ecc-sw-hamming.h | 2 - + include/linux/mtd/nand.h | 22 +++ + 12 files changed, 293 insertions(+), 154 deletions(-) +Merging spi-nor/spi-nor/next (47f25032c0e3 MAINTAINERS: Add Michael and Pratyush as designated reviewers for SPI NOR) +$ git merge spi-nor/spi-nor/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 ++ + drivers/mtd/spi-nor/controllers/intel-spi.c | 1 - + drivers/mtd/spi-nor/controllers/intel-spi.h | 2 +- + drivers/mtd/spi-nor/core.c | 5 +---- + drivers/mtd/spi-nor/winbond.c | 2 ++ + include/linux/mfd/lpc_ich.h | 2 +- + include/linux/platform_data/{ => x86}/intel-spi.h | 0 + 7 files changed, 7 insertions(+), 7 deletions(-) + rename include/linux/platform_data/{ => x86}/intel-spi.h (100%) +Merging crypto/master (1406f0f34402 crypto: nx - add missing call to of_node_put()) +$ git merge crypto/master +Merge made by the 'recursive' strategy. + arch/arm/crypto/blake2b-neon-glue.c | 4 +- + arch/powerpc/crypto/sha1-spe-glue.c | 2 +- + crypto/serpent_generic.c | 39 +++--- + crypto/testmgr.c | 11 +- + drivers/char/hw_random/ba431-rng.c | 12 +- + drivers/char/hw_random/bcm2835-rng.c | 17 ++- + drivers/char/hw_random/omap-rng.c | 3 +- + drivers/char/hw_random/xiphera-trng.c | 4 +- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c | 2 +- + drivers/crypto/amlogic/amlogic-gxl-core.c | 3 - + drivers/crypto/keembay/keembay-ocs-aes-core.c | 4 +- + drivers/crypto/keembay/keembay-ocs-hcu-core.c | 4 +- + drivers/crypto/nx/nx-common-powernv.c | 4 +- + drivers/crypto/qat/qat_common/adf_pf2vf_msg.c | 2 +- + drivers/crypto/qat/qat_common/adf_vf2pf_msg.c | 4 +- + drivers/crypto/qce/cipher.h | 1 - + drivers/crypto/qce/common.c | 25 ++-- + drivers/crypto/qce/common.h | 3 +- + drivers/crypto/qce/sha.c | 143 ++++++++-------------- + drivers/crypto/qce/skcipher.c | 69 +++++++++-- + drivers/crypto/s5p-sss.c | 2 +- + 21 files changed, 181 insertions(+), 177 deletions(-) +Merging drm/drm-next (a38fd8748464 Linux 5.12-rc2) +$ git merge drm/drm-next +Already up to date. +Merging drm-misc/for-linux-next (5fd3de7a5185 drm/compat: Clear bounce structures) +$ git merge drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/drm_gem_shmem_helper.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_gem_shmem_helper.c | 7 ++++--- + drivers/gpu/drm/drm_ioc32.c | 11 +++++++++++ + 2 files changed, 15 insertions(+), 3 deletions(-) +Merging amdgpu/drm-next (05d726b6a58d drm/amdgpu/smu8: return an error rather than 50% if busy query fails) +$ git merge amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/dc_stream.h +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/nv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Auto-merging drivers/gpu/drm/Kconfig +Recorded preimage for 'drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c' +Recorded preimage for 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c' +Recorded preimage for 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c' +Recorded preimage for 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h' +Resolved 'drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c'. +Recorded resolution for 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c'. +Recorded resolution for 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c'. +Recorded resolution for 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h'. +[master 35fa30bfdfc6] Merge remote-tracking branch 'amdgpu/drm-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/Kconfig | 1 + + drivers/gpu/drm/amd/amdgpu/Kconfig | 9 - + drivers/gpu/drm/amd/amdgpu/Makefile | 14 +- + drivers/gpu/drm/amd/amdgpu/aldebaran_reg_init.c | 54 + + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 53 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 + + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_aldebaran.c | 47 + + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 16 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.h | 30 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 37 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 41 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 184 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 358 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 156 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 178 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 51 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | 3 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 150 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 31 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 23 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 49 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 37 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 149 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 90 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rap.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 165 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 38 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 205 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 100 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 17 +- + drivers/gpu/drm/amd/amdgpu/athub_v2_1.c | 6 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 77 + + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 15 +- + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 2 + + .../gpu/drm/amd/amdgpu/dimgrey_cavefish_reg_init.c | 0 + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 161 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 1286 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.h | 40 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 75 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c | 58 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 151 +- + drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 3 + + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 65 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.h | 1 + + drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 1329 + + drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.h | 28 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 48 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 221 +- + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 1 + + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 378 + + drivers/gpu/drm/amd/amdgpu/psp_v13_0.h | 30 + + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 181 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4.c | 232 + + drivers/gpu/drm/amd/amdgpu/sdma_v4_4.h | 28 + + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 4 +- + drivers/gpu/drm/amd/amdgpu/si.c | 111 + + drivers/gpu/drm/amd/amdgpu/smuio_v13_0.c | 121 + + drivers/gpu/drm/amd/amdgpu/smuio_v13_0.h | 30 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 360 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 12 + + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 48 + + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 99 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.h | 1 + + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 24 +- + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 32 +- + drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 49 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 190 + + drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 5 +- + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 492 + + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx8.asm | 1 + + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm | 204 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 17 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 25 + + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 57 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 5 - + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 8 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 8 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 8 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 8 + + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 9 + + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 66 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 5 +- + drivers/gpu/drm/amd/display/Kconfig | 14 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 362 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 63 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 293 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h | 37 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 441 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.h | 5 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 44 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 113 +- + .../amd/display/amdgpu_dm/amdgpu_dm_irq_params.h | 9 + + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 17 +- + drivers/gpu/drm/amd/display/dc/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/basics/dc_common.c | 20 +- + drivers/gpu/drm/amd/display/dc/basics/dc_common.h | 4 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 5 +- + .../gpu/drm/amd/display/dc/bios/command_table.c | 21 + + .../gpu/drm/amd/display/dc/bios/command_table2.c | 93 +- + .../gpu/drm/amd/display/dc/bios/command_table2.h | 3 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 17 +- + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 2 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 48 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 279 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 27 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 5 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 16 + + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 43 + + drivers/gpu/drm/amd/display/dc/core/dc_stat.c | 64 + + drivers/gpu/drm/amd/display/dc/dc.h | 22 +- + drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 3 +- + drivers/gpu/drm/amd/display/dc/dc_ddc_types.h | 10 - + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 34 + + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 8 + + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_link.h | 19 +- + drivers/gpu/drm/amd/display/dc/dc_stat.h | 42 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 21 +- + drivers/gpu/drm/amd/display/dc/dce/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 40 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.h | 4 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 52 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 84 + + drivers/gpu/drm/amd/display/dc/dce/dce_opp.c | 4 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 10 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_outbox.c | 60 + + drivers/gpu/drm/amd/display/dc/dce/dmub_outbox.h | 33 + + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 19 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 89 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 11 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 6 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 307 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 8 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 1 - + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 2 + + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 1 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 21 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 2 +- + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.c | 3 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 124 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 8 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 1 - + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 18 +- + .../display/dc/dcn30/dcn30_dio_stream_encoder.c | 1 - + .../gpu/drm/amd/display/dc/dcn30/dcn30_dpp_cm.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 100 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h | 4 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 1 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 24 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 33 +- + .../gpu/drm/amd/display/dc/dcn301/dcn301_init.c | 1 - + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 96 +- + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 2 + + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 2 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 3 - + .../amd/display/dc/gpio/dce110/hw_factory_dce110.c | 4 - + drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c | 9 +- + drivers/gpu/drm/amd/display/dc/inc/clock_source.h | 5 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 13 + + drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h | 3 +- + drivers/gpu/drm/amd/display/dc/inc/hw/aux_engine.h | 4 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h | 21 + + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 1 + + .../drm/amd/display/dc/inc/hw/timing_generator.h | 12 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 7 +- + drivers/gpu/drm/amd/display/dc/inc/resource.h | 5 + + drivers/gpu/drm/amd/display/dc/irq_types.h | 3 +- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 55 + + drivers/gpu/drm/amd/display/dmub/dmub_srv_stat.h | 41 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 847 +- + .../drm/amd/display/dmub/inc/dmub_trace_buffer.h | 3 +- + drivers/gpu/drm/amd/display/dmub/src/Makefile | 2 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 57 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 35 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c | 7 + + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 84 +- + .../gpu/drm/amd/display/dmub/src/dmub_srv_stat.c | 105 + + .../drm/amd/display/modules/freesync/freesync.c | 28 +- + .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 3 +- + drivers/gpu/drm/amd/include/aldebaran_ip_offset.h | 1738 + + .../amd/include/asic_reg/dcn/dcn_3_0_0_offset.h | 2 +- + .../drm/amd/include/asic_reg/gc/gc_9_4_2_offset.h | 7683 +++++ + .../drm/amd/include/asic_reg/gc/gc_9_4_2_sh_mask.h | 32949 +++++++++++++++++++ + .../amd/include/asic_reg/mmhub/mmhub_1_7_offset.h | 5125 +++ + .../amd/include/asic_reg/mmhub/mmhub_1_7_sh_mask.h | 32178 ++++++++++++++++++ + .../drm/amd/include/asic_reg/mp/mp_13_0_2_offset.h | 361 + + .../amd/include/asic_reg/mp/mp_13_0_2_sh_mask.h | 531 + + .../amd/include/asic_reg/sdma/sdma_4_4_0_offset.h | 5224 +++ + .../amd/include/asic_reg/sdma/sdma_4_4_0_sh_mask.h | 13922 ++++++++ + .../include/asic_reg/smuio/smuio_13_0_2_offset.h | 516 + + .../include/asic_reg/smuio/smuio_13_0_2_sh_mask.h | 1163 + + .../amd/include/asic_reg/thm/thm_13_0_2_offset.h | 346 + + .../amd/include/asic_reg/thm/thm_13_0_2_sh_mask.h | 1297 + + .../amd/include/asic_reg/umc/umc_6_7_0_offset.h | 2620 ++ + .../amd/include/asic_reg/umc/umc_6_7_0_sh_mask.h | 10796 ++++++ + .../amd/include/asic_reg/vcn/vcn_2_6_0_offset.h | 1462 + + .../amd/include/asic_reg/vcn/vcn_2_6_0_sh_mask.h | 4535 +++ + drivers/gpu/drm/amd/include/atomfirmware.h | 116 +- + .../drm/amd/include/ivsrcid/dcn/irqsrcs_dcn_1_0.h | 2 + + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 124 + + drivers/gpu/drm/amd/include/soc15_ih_clientid.h | 9 +- + drivers/gpu/drm/amd/include/vi_structs.h | 32 +- + drivers/gpu/drm/amd/pm/Makefile | 1 + + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 228 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 737 +- + drivers/gpu/drm/amd/pm/inc/aldebaran_ppsmc.h | 126 + + drivers/gpu/drm/amd/pm/inc/amdgpu_pm.h | 2 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 82 +- + drivers/gpu/drm/amd/pm/inc/rv_ppsmc.h | 1 + + .../gpu/drm/amd/pm/inc/smu11_driver_if_navi10.h | 98 +- + .../gpu/drm/amd/pm/inc/smu13_driver_if_aldebaran.h | 512 + + drivers/gpu/drm/amd/pm/inc/smu_types.h | 29 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 16 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h | 2 +- + drivers/gpu/drm/amd/pm/inc/smu_v13_0.h | 272 + + drivers/gpu/drm/amd/pm/inc/smu_v13_0_pptable.h | 165 + + .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 46 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 10 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 4 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 50 +- + .../drm/amd/pm/powerplay/hwmgr/vega10_pptable.h | 6 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 68 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 50 +- + drivers/gpu/drm/amd/pm/powerplay/kv_dpm.c | 2 +- + drivers/gpu/drm/amd/pm/powerplay/si_dpm.c | 8 +- + drivers/gpu/drm/amd/pm/powerplay/sislands_smc.h | 10 +- + drivers/gpu/drm/amd/pm/swsmu/Makefile | 2 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 456 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 14 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 619 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 42 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 14 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 58 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 1 - + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 30 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile | 30 + + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 1530 + + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.h | 72 + + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 1811 + + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 18 +- + drivers/gpu/drm/radeon/nislands_smc.h | 10 +- + drivers/gpu/drm/radeon/r100.c | 84 +- + drivers/gpu/drm/radeon/r300.c | 33 +- + drivers/gpu/drm/radeon/r420.c | 28 +- + drivers/gpu/drm/radeon/r600.c | 27 +- + drivers/gpu/drm/radeon/radeon.h | 27 +- + drivers/gpu/drm/radeon/radeon_asic.h | 8 +- + drivers/gpu/drm/radeon/radeon_cs.c | 8 +- + drivers/gpu/drm/radeon/radeon_device.c | 47 +- + drivers/gpu/drm/radeon/radeon_dp_mst.c | 20 +- + drivers/gpu/drm/radeon/radeon_fence.c | 42 +- + drivers/gpu/drm/radeon/radeon_gem.c | 24 +- + drivers/gpu/drm/radeon/radeon_ib.c | 26 +- + drivers/gpu/drm/radeon/radeon_kms.c | 1 + + drivers/gpu/drm/radeon/radeon_mode.h | 2 +- + drivers/gpu/drm/radeon/radeon_pm.c | 32 +- + drivers/gpu/drm/radeon/radeon_prime.c | 2 + + drivers/gpu/drm/radeon/radeon_ring.c | 80 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 88 +- + drivers/gpu/drm/radeon/rs400.c | 25 +- + drivers/gpu/drm/radeon/rs600.c | 8 +- + drivers/gpu/drm/radeon/rv515.c | 56 +- + drivers/gpu/drm/radeon/si_dpm.c | 5 +- + drivers/gpu/drm/radeon/sislands_smc.h | 10 +- + drivers/usb/host/xhci-pci.c | 3 + + include/drm/amd_asic_type.h | 15 +- + include/uapi/drm/amdgpu_drm.h | 34 + + include/uapi/linux/kfd_ioctl.h | 1 + + 313 files changed, 141131 insertions(+), 3345 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/aldebaran_reg_init.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_aldebaran.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.h + mode change 100755 => 100644 drivers/gpu/drm/amd/amdgpu/dimgrey_cavefish_reg_init.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v13_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v13_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v4_4.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v4_4.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v13_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v13_0.h + create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_stat.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dc_stat.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dmub_outbox.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dmub_outbox.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/dmub_srv_stat.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_srv_stat.c + create mode 100644 drivers/gpu/drm/amd/include/aldebaran_ip_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_4_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_4_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_1_7_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_1_7_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma/sdma_4_4_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma/sdma_4_4_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_13_0_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_13_0_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/thm/thm_13_0_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/thm/thm_13_0_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_7_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_7_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_2_6_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_2_6_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/pm/inc/aldebaran_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/pm/inc/smu13_driver_if_aldebaran.h + create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v13_0.h + create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v13_0_pptable.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +Merging drm-intel/for-linux-next (aaca50ef45ed drm/i915: Extend icl_sanitize_encoder_pll_mapping() to all DDI platforms) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_pci.c +Auto-merging drivers/gpu/drm/i915/i915_params.h +Auto-merging drivers/gpu/drm/i915/i915_gpu_error.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/kvmgt.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +Auto-merging drivers/gpu/drm/i915/gt/intel_workarounds.c +Auto-merging drivers/gpu/drm/i915/gt/intel_reset.c +Auto-merging drivers/gpu/drm/i915/gt/intel_region_lmem.c +Auto-merging drivers/gpu/drm/i915/gt/intel_rc6.c +Auto-merging drivers/gpu/drm/i915/gt/intel_ppgtt.c +Auto-merging drivers/gpu/drm/i915/gt/intel_ggtt.c +Auto-merging drivers/gpu/drm/i915/gt/intel_engine_cs.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_shmem.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_phys.c +Auto-merging drivers/gpu/drm/i915/display/intel_overlay.c +Auto-merging drivers/gpu/drm/i915/display/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/display/intel_frontbuffer.c +Auto-merging drivers/gpu/drm/i915/display/intel_fbdev.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h +Auto-merging drivers/gpu/drm/i915/display/intel_display.h +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/display/intel_crtc.c +Auto-merging drivers/gpu/drm/i915/display/i9xx_plane.c +Auto-merging drivers/gpu/drm/i915/Makefile +Resolved 'drivers/gpu/drm/i915/display/intel_ddi.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 147f6195fdc4] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/kernel/early-quirks.c | 1 + + drivers/gpu/drm/i915/Makefile | 5 +- + drivers/gpu/drm/i915/display/i9xx_plane.c | 123 +- + drivers/gpu/drm/i915/display/i9xx_plane.h | 4 + + drivers/gpu/drm/i915/display/icl_dsi.c | 28 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 2 +- + drivers/gpu/drm/i915/display/intel_bios.c | 166 +- + drivers/gpu/drm/i915/display/intel_bios.h | 2 + + drivers/gpu/drm/i915/display/intel_bw.c | 22 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 22 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 23 +- + drivers/gpu/drm/i915/display/intel_crt.c | 6 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 276 +- + drivers/gpu/drm/i915/display/intel_csr.c | 12 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 4815 ++++++++------------ + drivers/gpu/drm/i915/display/intel_ddi.h | 23 +- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 1394 ++++++ + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h | 100 + + drivers/gpu/drm/i915/display/intel_display.c | 2637 +---------- + drivers/gpu/drm/i915/display/intel_display.h | 54 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 132 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 231 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 32 + + drivers/gpu/drm/i915/display/intel_display_types.h | 111 +- + drivers/gpu/drm/i915/display/intel_dp.c | 134 +- + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 31 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 3 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 509 +++ + drivers/gpu/drm/i915/display/intel_dpll.h | 18 + + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 95 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 9 +- + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 2 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 2 +- + drivers/gpu/drm/i915/display/intel_fdi.c | 138 + + drivers/gpu/drm/i915/display/intel_fdi.h | 3 + + drivers/gpu/drm/i915/display/intel_frontbuffer.c | 2 + + drivers/gpu/drm/i915/display/intel_gmbus.c | 2 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 67 +- + drivers/gpu/drm/i915/display/intel_lpe_audio.c | 5 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 6 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 2 +- + drivers/gpu/drm/i915/display/intel_panel.c | 4 +- + drivers/gpu/drm/i915/display/intel_pps.c | 1 + + drivers/gpu/drm/i915/display/intel_psr.c | 611 +-- + drivers/gpu/drm/i915/display/intel_psr.h | 10 +- + drivers/gpu/drm/i915/display/intel_quirks.c | 2 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 1718 +------ + drivers/gpu/drm/i915/display/intel_sprite.h | 7 - + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 27 +- + drivers/gpu/drm/i915/display/intel_vga.c | 8 +- + drivers/gpu/drm/i915/display/skl_scaler.c | 556 +++ + drivers/gpu/drm/i915/display/skl_scaler.h | 29 + + drivers/gpu/drm/i915/display/skl_universal_plane.c | 2266 +++++++++ + drivers/gpu/drm/i915/display/skl_universal_plane.h | 37 + + drivers/gpu/drm/i915/display/vlv_dsi.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 6 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 2 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 10 +- + drivers/gpu/drm/i915/gt/intel_ppgtt.c | 2 +- + drivers/gpu/drm/i915/gt/intel_rc6.c | 4 +- + drivers/gpu/drm/i915/gt/intel_region_lmem.c | 8 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 6 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 68 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 4 +- + drivers/gpu/drm/i915/gvt/cfg_space.c | 5 +- + drivers/gpu/drm/i915/gvt/firmware.c | 10 +- + drivers/gpu/drm/i915/gvt/gtt.c | 12 +- + drivers/gpu/drm/i915/gvt/gvt.c | 6 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 4 +- + drivers/gpu/drm/i915/i915_debugfs.c | 2 +- + drivers/gpu/drm/i915/i915_drv.c | 84 +- + drivers/gpu/drm/i915/i915_drv.h | 130 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 5 +- + drivers/gpu/drm/i915/i915_getparam.c | 5 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- + drivers/gpu/drm/i915/i915_irq.c | 106 +- + drivers/gpu/drm/i915/i915_params.h | 4 +- + drivers/gpu/drm/i915/i915_pci.c | 18 +- + drivers/gpu/drm/i915/i915_perf.c | 84 +- + drivers/gpu/drm/i915/i915_perf_types.h | 8 + + drivers/gpu/drm/i915/i915_pmu.c | 2 +- + drivers/gpu/drm/i915/i915_reg.h | 53 +- + drivers/gpu/drm/i915/i915_suspend.c | 4 +- + drivers/gpu/drm/i915/i915_switcheroo.c | 4 +- + drivers/gpu/drm/i915/i915_vgpu.c | 2 +- + drivers/gpu/drm/i915/intel_device_info.c | 11 +- + drivers/gpu/drm/i915/intel_device_info.h | 3 +- + drivers/gpu/drm/i915/intel_dram.c | 6 + + drivers/gpu/drm/i915/intel_pch.c | 11 +- + drivers/gpu/drm/i915/intel_pch.h | 3 + + drivers/gpu/drm/i915/intel_pm.c | 178 +- + drivers/gpu/drm/i915/intel_pm.h | 5 + + drivers/gpu/drm/i915/intel_runtime_pm.c | 2 +- + drivers/gpu/drm/i915/intel_uncore.c | 20 +- + drivers/gpu/drm/i915/selftests/mock_gtt.c | 2 +- + include/drm/drm_dp_helper.h | 5 + + include/drm/i915_pciids.h | 11 + + 99 files changed, 9431 insertions(+), 8016 deletions(-) + create mode 100644 drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c + create mode 100644 drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h + create mode 100644 drivers/gpu/drm/i915/display/skl_scaler.c + create mode 100644 drivers/gpu/drm/i915/display/skl_scaler.h + create mode 100644 drivers/gpu/drm/i915/display/skl_universal_plane.c + create mode 100644 drivers/gpu/drm/i915/display/skl_universal_plane.h +Merging drm-tegra/drm/tegra/for-next (dcdfe2712b68 drm/tegra: Fix reference leak when pm_runtime_get_sync() fails) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-msm/msm-next (7bf168c8fe8c drm/msm: Fix speed-bin support not to access outside valid memory) +$ git merge drm-msm/msm-next +Auto-merging drivers/gpu/drm/msm/adreno/a6xx_gmu.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 2 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 108 ++++++++++++++++++++++------------ + drivers/gpu/drm/msm/msm_atomic.c | 7 ++- + drivers/gpu/drm/msm/msm_kms.h | 8 +-- + 4 files changed, 80 insertions(+), 45 deletions(-) +Merging imx-drm/imx-drm/next (82581fcf070b drm/modes: add non-OF stub for of_get_drm_display_mode) +$ git merge imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (7d614ab2f205 drm/etnaviv: fix NULL check before some freeing functions is not needed) +$ git merge etnaviv/etnaviv/next +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/etnaviv/etnaviv_dump.c | 8 ++++---- + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 3 +-- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 12 ++++++++++++ + include/uapi/drm/etnaviv_drm.h | 3 +++ + 4 files changed, 20 insertions(+), 6 deletions(-) +Merging regmap/for-next (e41a962f82e7 regmap: set debugfs_name to NULL after it is freed) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (b9dd23bb03fe ALSA: hda/cirrus: Add Headphone and Headset MIC Volume Control) +$ git merge sound/for-next +Auto-merging sound/usb/quirks.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 9 + + include/uapi/linux/virtio_ids.h | 1 + + include/uapi/linux/virtio_snd.h | 334 ++++++++++++ + sound/Kconfig | 2 + + sound/Makefile | 3 +- + sound/drivers/vx/vx_core.c | 2 +- + sound/pci/hda/hda_auto_parser.h | 2 +- + sound/pci/hda/hda_jack.c | 73 ++- + sound/pci/hda/hda_jack.h | 8 + + sound/pci/hda/hda_local.h | 2 +- + sound/pci/hda/patch_cirrus.c | 1081 +++++++++++++++++++++++++++++++++++++++ + sound/pci/hda/patch_realtek.c | 15 +- + sound/pci/mixart/mixart_hwdep.c | 3 +- + sound/pci/vx222/vx222_ops.c | 10 +- + sound/ppc/snd_ps3_reg.h | 2 +- + sound/usb/midi.c | 123 ++++- + sound/usb/midi.h | 2 + + sound/usb/mixer_quirks.c | 60 ++- + sound/usb/quirks-table.h | 63 +++ + sound/usb/quirks.c | 3 + + sound/virtio/Kconfig | 10 + + sound/virtio/Makefile | 13 + + sound/virtio/virtio_card.c | 449 ++++++++++++++++ + sound/virtio/virtio_card.h | 111 ++++ + sound/virtio/virtio_chmap.c | 219 ++++++++ + sound/virtio/virtio_ctl_msg.c | 310 +++++++++++ + sound/virtio/virtio_ctl_msg.h | 78 +++ + sound/virtio/virtio_jack.c | 233 +++++++++ + sound/virtio/virtio_pcm.c | 513 +++++++++++++++++++ + sound/virtio/virtio_pcm.h | 124 +++++ + sound/virtio/virtio_pcm_msg.c | 414 +++++++++++++++ + sound/virtio/virtio_pcm_ops.c | 464 +++++++++++++++++ + 32 files changed, 4690 insertions(+), 46 deletions(-) + create mode 100644 include/uapi/linux/virtio_snd.h + create mode 100644 sound/virtio/Kconfig + create mode 100644 sound/virtio/Makefile + create mode 100644 sound/virtio/virtio_card.c + create mode 100644 sound/virtio/virtio_card.h + create mode 100644 sound/virtio/virtio_chmap.c + create mode 100644 sound/virtio/virtio_ctl_msg.c + create mode 100644 sound/virtio/virtio_ctl_msg.h + create mode 100644 sound/virtio/virtio_jack.c + create mode 100644 sound/virtio/virtio_pcm.c + create mode 100644 sound/virtio/virtio_pcm.h + create mode 100644 sound/virtio/virtio_pcm_msg.c + create mode 100644 sound/virtio/virtio_pcm_ops.c +Merging sound-asoc/for-next (64682e1b7744 Merge series "Report jack and button detection + Capture Support" from Lucas Tanure <tanureal@opensource.cirrus.com>:) +$ git merge sound-asoc/for-next +Removing include/sound/rt5645.h +Removing Documentation/devicetree/bindings/sound/mchp-i2s-mcc.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/mchp,i2s-mcc.yaml | 108 ++ + .../devicetree/bindings/sound/mchp-i2s-mcc.txt | 43 - + include/sound/rt5645.h | 32 - + include/sound/soc-component.h | 4 +- + include/sound/soc.h | 2 +- + sound/soc/amd/renoir/rn-pci-acp3x.c | 2 +- + sound/soc/atmel/Kconfig | 3 + + sound/soc/atmel/mchp-i2s-mcc.c | 161 ++- + sound/soc/codecs/Kconfig | 20 + + sound/soc/codecs/Makefile | 6 + + sound/soc/codecs/cs4270.c | 1 + + sound/soc/codecs/cs42l42.c | 323 +++-- + sound/soc/codecs/cs42l42.h | 28 +- + sound/soc/codecs/jz4760.c | 11 +- + sound/soc/codecs/jz4770.c | 7 +- + sound/soc/codecs/lpass-rx-macro.c | 3 +- + sound/soc/codecs/lpass-wsa-macro.c | 2 + + sound/soc/codecs/nau8825.c | 9 +- + sound/soc/codecs/rt1011.c | 49 +- + sound/soc/codecs/rt1015.c | 9 +- + sound/soc/codecs/rt1016.c | 11 +- + sound/soc/codecs/rt1305.c | 6 +- + sound/soc/codecs/rt1308-sdw.c | 2 +- + sound/soc/codecs/rt1308.c | 10 +- + sound/soc/codecs/rt1316-sdw.c | 744 ++++++++++ + sound/soc/codecs/rt1316-sdw.h | 55 + + sound/soc/codecs/rt5631.c | 4 +- + sound/soc/codecs/rt5640.c | 6 +- + sound/soc/codecs/rt5645.c | 47 +- + sound/soc/codecs/rt5645.h | 2 - + sound/soc/codecs/rt5651.c | 6 +- + sound/soc/codecs/rt5659.c | 4 +- + sound/soc/codecs/rt5660.c | 4 +- + sound/soc/codecs/rt5663.c | 4 +- + sound/soc/codecs/rt5665.c | 4 +- + sound/soc/codecs/rt5668.c | 8 +- + sound/soc/codecs/rt5670.c | 4 +- + sound/soc/codecs/rt5677.c | 6 +- + sound/soc/codecs/rt5682-i2c.c | 2 +- + sound/soc/codecs/rt5682-sdw.c | 6 +- + sound/soc/codecs/rt5682.c | 14 +- + sound/soc/codecs/rt5682.h | 1 + + sound/soc/codecs/rt700-sdw.c | 2 +- + sound/soc/codecs/rt700.c | 2 +- + sound/soc/codecs/rt711-sdca-sdw.c | 425 ++++++ + sound/soc/codecs/rt711-sdca-sdw.h | 99 ++ + sound/soc/codecs/rt711-sdca.c | 1492 ++++++++++++++++++++ + sound/soc/codecs/rt711-sdca.h | 238 ++++ + sound/soc/codecs/rt711-sdw.c | 2 +- + sound/soc/codecs/rt711.c | 2 +- + sound/soc/codecs/rt715-sdca-sdw.c | 278 ++++ + sound/soc/codecs/rt715-sdca-sdw.h | 170 +++ + sound/soc/codecs/rt715-sdca.c | 1075 ++++++++++++++ + sound/soc/codecs/rt715-sdca.h | 136 ++ + sound/soc/codecs/rt715-sdw.c | 2 +- + sound/soc/codecs/rt715.c | 2 +- + sound/soc/codecs/sgtl5000.c | 6 +- + sound/soc/codecs/sigmadsp-regmap.c | 2 +- + sound/soc/codecs/wcd-clsh-v2.h | 6 +- + sound/soc/codecs/wcd9335.c | 2 +- + sound/soc/codecs/wcd934x.c | 2 - + sound/soc/codecs/wm8524.c | 2 +- + sound/soc/codecs/wm8962.c | 23 +- + sound/soc/fsl/fsl_asrc.c | 2 +- + sound/soc/fsl/fsl_dma.c | 3 - + sound/soc/fsl/fsl_easrc.c | 6 +- + sound/soc/fsl/fsl_esai.c | 2 +- + sound/soc/fsl/fsl_micfil.c | 2 - + sound/soc/fsl/fsl_sai.c | 14 +- + sound/soc/fsl/fsl_sai.h | 4 + + sound/soc/fsl/fsl_ssi.c | 7 +- + sound/soc/fsl/fsl_xcvr.c | 19 +- + sound/soc/fsl/imx-hdmi.c | 4 - + sound/soc/fsl/mpc5200_dma.c | 2 +- + sound/soc/fsl/mpc8610_hpcd.c | 2 +- + sound/soc/fsl/p1022_ds.c | 2 +- + sound/soc/generic/simple-card-utils.c | 2 +- + sound/soc/intel/Makefile | 2 +- + sound/soc/intel/atom/sst/sst_acpi.c | 2 +- + sound/soc/intel/atom/sst/sst_loader.c | 2 +- + sound/soc/intel/boards/bytcr_wm5102.c | 8 - + sound/soc/intel/boards/sof_wm8804.c | 6 +- + sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 23 - + sound/soc/intel/skylake/Makefile | 2 +- + sound/soc/meson/aiu-acodec-ctrl.c | 2 +- + sound/soc/meson/aiu-codec-ctrl.c | 2 +- + sound/soc/meson/aiu.c | 4 +- + sound/soc/meson/aiu.h | 2 +- + sound/soc/mxs/mxs-saif.c | 10 - + sound/soc/pxa/mmp-sspa.c | 1 - + sound/soc/qcom/lpass-cpu.c | 2 +- + sound/soc/qcom/lpass-hdmi.c | 4 - + sound/soc/qcom/lpass-platform.c | 2 +- + sound/soc/qcom/qdsp6/q6afe-dai.c | 4 +- + sound/soc/qcom/qdsp6/q6afe.c | 7 +- + sound/soc/qcom/qdsp6/q6afe.h | 2 +- + sound/soc/qcom/qdsp6/q6asm.h | 6 +- + sound/soc/samsung/i2s.c | 3 +- + sound/soc/samsung/s3c24xx_simtec.c | 5 + + sound/soc/samsung/smdk_wm8994.c | 1 + + sound/soc/samsung/snow.c | 5 +- + sound/soc/sh/dma-sh7760.c | 1 - + sound/soc/sh/rcar/adg.c | 15 +- + sound/soc/sh/rcar/cmd.c | 15 +- + sound/soc/sh/rcar/core.c | 34 +- + sound/soc/sh/rcar/ctu.c | 2 + + sound/soc/sh/rcar/rsnd.h | 6 +- + sound/soc/sh/rcar/ssi.c | 46 +- + sound/soc/sh/rcar/ssiu.c | 22 +- + sound/soc/sh/siu_pcm.c | 6 +- + sound/soc/soc-component.c | 2 +- + sound/soc/soc-core.c | 2 +- + sound/soc/soc-dai.c | 2 +- + sound/soc/soc-ops.c | 2 +- + sound/soc/soc-pcm.c | 83 +- + sound/soc/soc-topology.c | 16 +- + sound/soc/sof/intel/hda-dsp.c | 6 +- + sound/soc/sof/intel/hda.c | 2 - + sound/soc/sunxi/sun4i-i2s.c | 2 - + sound/soc/uniphier/aio-cpu.c | 7 +- + 120 files changed, 5595 insertions(+), 595 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/mchp,i2s-mcc.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/mchp-i2s-mcc.txt + delete mode 100644 include/sound/rt5645.h + create mode 100644 sound/soc/codecs/rt1316-sdw.c + create mode 100644 sound/soc/codecs/rt1316-sdw.h + create mode 100644 sound/soc/codecs/rt711-sdca-sdw.c + create mode 100644 sound/soc/codecs/rt711-sdca-sdw.h + create mode 100644 sound/soc/codecs/rt711-sdca.c + create mode 100644 sound/soc/codecs/rt711-sdca.h + create mode 100644 sound/soc/codecs/rt715-sdca-sdw.c + create mode 100644 sound/soc/codecs/rt715-sdca-sdw.h + create mode 100644 sound/soc/codecs/rt715-sdca.c + create mode 100644 sound/soc/codecs/rt715-sdca.h +Merging modules/modules-next (1e80d9cb579e module: potential uninitialized return in module_kallsyms_on_each_symbol()) +$ git merge modules/modules-next +Already up to date. +Merging input/next (ea16ef967ec8 Input: elan_i2c - reduce the resume time for new devices) +$ git merge input/next +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-driver-input-exc3000 | 9 + + drivers/input/mouse/elan_i2c.h | 5 + + drivers/input/mouse/elan_i2c_core.c | 58 ++++- + drivers/input/touchscreen/exc3000.c | 253 +++++++++++---------- + 4 files changed, 201 insertions(+), 124 deletions(-) +Merging block/for-next (72dd7a4f28d5 Merge branch 'for-5.13/io_uring' into for-next) +$ git merge block/for-next +Auto-merging kernel/fork.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ata/ahci-ceva.txt | 4 + + block/blk-cgroup-rwstat.c | 3 +- + drivers/ata/ahci_ceva.c | 43 +- + drivers/ata/ahci_xgene.c | 2 +- + drivers/ata/libata-pmp.c | 2 +- + drivers/ata/libata-sata.c | 4 +- + drivers/ata/libata-transport.c | 6 +- + drivers/ata/pata_ali.c | 6 +- + drivers/ata/pata_amd.c | 6 +- + drivers/ata/pata_artop.c | 4 +- + drivers/ata/pata_atiixp.c | 3 +- + drivers/ata/pata_cs5520.c | 2 + + drivers/ata/pata_hpt366.c | 1 + + drivers/ata/pata_hpt37x.c | 6 +- + drivers/ata/pata_hpt3x2n.c | 2 +- + drivers/ata/pata_jmicron.c | 2 +- + drivers/ata/pata_marvell.c | 2 +- + drivers/ata/pata_optidma.c | 5 +- + drivers/ata/pata_pdc2027x.c | 10 +- + drivers/ata/sata_dwc_460ex.c | 10 + + drivers/ata/sata_mv.c | 12 +- + drivers/s390/block/dasd.c | 6 +- + fs/block_dev.c | 11 +- + fs/io-wq.c | 25 +- + fs/io-wq.h | 2 +- + fs/io_uring.c | 888 ++++++++++----------- + include/linux/io_uring.h | 2 +- + kernel/fork.c | 1 + + 28 files changed, 557 insertions(+), 513 deletions(-) +Merging device-mapper/for-next (8416f5edbcf7 dm: remove useless loop in __split_and_process_bio) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + drivers/md/dm-writecache.c | 2 +- + drivers/md/dm.c | 61 ++++++++++++++++++++++------------------------ + 2 files changed, 30 insertions(+), 33 deletions(-) +Merging pcmcia/pcmcia-next (4ce6b242b78d pcmcia: Switch to using the new API kobj_to_dev()) +$ git merge pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (a592fb89354c Merge branch 'fixes' into next) +$ git merge mmc/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 20 ++++ + drivers/memstick/core/mspro_block.c | 3 +- + drivers/mmc/core/block.c | 58 +++++------ + drivers/mmc/core/core.c | 112 ++------------------- + drivers/mmc/core/mmc_ops.c | 39 ++----- + drivers/mmc/core/queue.c | 11 +- + drivers/mmc/core/queue.h | 1 - + drivers/mmc/core/sd.c | 6 ++ + drivers/mmc/host/dw_mmc.c | 16 +-- + drivers/mmc/host/renesas_sdhi_core.c | 3 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 2 +- + drivers/mmc/host/sdhci-pci-gli.c | 8 ++ + drivers/mmc/host/sdhci-pci-o2micro.c | 8 ++ + drivers/mmc/host/sdhci-st.c | 19 ++-- + drivers/mmc/host/sdhci.c | 60 +++++------ + drivers/mmc/host/tmio_mmc.h | 3 +- + drivers/mmc/host/tmio_mmc_core.c | 17 +--- + drivers/mmc/host/uniphier-sd.c | 5 +- + drivers/mmc/host/via-sdmmc.c | 3 +- + include/linux/mmc/host.h | 2 - + 20 files changed, 152 insertions(+), 244 deletions(-) +Merging mfd/for-mfd-next (fea19b6e80a1 mfd: lm3533: Switch to using the new API kobj_to_dev()) +$ git merge mfd/for-mfd-next +Removing include/linux/mfd/ab3100.h +Removing drivers/mfd/ab3100-otp.c +Removing drivers/mfd/ab3100-core.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/mfd/rn5t618.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/input/input.yaml | 7 + + .../devicetree/bindings/mfd/actions,atc260x.yaml | 183 ++++ + .../devicetree/bindings/mfd/netronix,ntxec.yaml | 76 ++ + .../devicetree/bindings/mfd/ricoh,rn5t618.yaml | 111 +++ + Documentation/devicetree/bindings/mfd/rn5t618.txt | 52 -- + .../devicetree/bindings/mfd/rohm,bd9576-pmic.yaml | 123 +++ + .../devicetree/bindings/mfd/ti,lp87524-q1.yaml | 4 + + .../devicetree/bindings/mfd/ti,lp87561-q1.yaml | 4 + + .../devicetree/bindings/mfd/ti,lp87565-q1.yaml | 4 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 35 + + drivers/input/misc/Kconfig | 11 + + drivers/input/misc/Makefile | 2 +- + drivers/input/misc/atc260x-onkey.c | 305 +++++++ + drivers/mfd/Kconfig | 66 +- + drivers/mfd/Makefile | 7 +- + drivers/mfd/ab3100-core.c | 929 --------------------- + drivers/mfd/ab3100-otp.c | 240 ------ + drivers/mfd/ab8500-core.c | 20 +- + drivers/mfd/arizona-spi.c | 4 +- + drivers/mfd/atc260x-core.c | 310 +++++++ + drivers/mfd/atc260x-i2c.c | 64 ++ + drivers/mfd/ene-kb3930.c | 2 +- + drivers/mfd/intel_pmt.c | 112 ++- + drivers/mfd/lm3533-core.c | 2 +- + drivers/mfd/ntxec.c | 221 +++++ + drivers/mfd/rohm-bd9576.c | 189 +++++ + drivers/mfd/stmpe.c | 14 +- + drivers/platform/x86/intel_pmt_class.c | 46 + + drivers/platform/x86/intel_pmt_class.h | 1 + + drivers/platform/x86/intel_pmt_telemetry.c | 20 - + drivers/pwm/Kconfig | 8 + + drivers/pwm/Makefile | 1 + + drivers/pwm/pwm-ntxec.c | 184 ++++ + drivers/rtc/Kconfig | 8 + + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-ntxec.c | 145 ++++ + drivers/watchdog/Kconfig | 13 + + drivers/watchdog/Makefile | 1 + + drivers/watchdog/bd9576_wdt.c | 291 +++++++ + include/linux/mfd/ab3100.h | 128 --- + include/linux/mfd/atc260x/atc2603c.h | 281 +++++++ + include/linux/mfd/atc260x/atc2609a.h | 308 +++++++ + include/linux/mfd/atc260x/core.h | 58 ++ + include/linux/mfd/db8500-prcmu.h | 2 +- + include/linux/mfd/lp87565.h | 3 - + include/linux/mfd/ntxec.h | 37 + + include/linux/mfd/rohm-bd957x.h | 140 ++++ + include/linux/mfd/rohm-generic.h | 2 + + 49 files changed, 3316 insertions(+), 1461 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/actions,atc260x.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/netronix,ntxec.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/ricoh,rn5t618.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/rn5t618.txt + create mode 100644 Documentation/devicetree/bindings/mfd/rohm,bd9576-pmic.yaml + create mode 100644 drivers/input/misc/atc260x-onkey.c + delete mode 100644 drivers/mfd/ab3100-core.c + delete mode 100644 drivers/mfd/ab3100-otp.c + create mode 100644 drivers/mfd/atc260x-core.c + create mode 100644 drivers/mfd/atc260x-i2c.c + create mode 100644 drivers/mfd/ntxec.c + create mode 100644 drivers/mfd/rohm-bd9576.c + create mode 100644 drivers/pwm/pwm-ntxec.c + create mode 100644 drivers/rtc/rtc-ntxec.c + create mode 100644 drivers/watchdog/bd9576_wdt.c + delete mode 100644 include/linux/mfd/ab3100.h + create mode 100644 include/linux/mfd/atc260x/atc2603c.h + create mode 100644 include/linux/mfd/atc260x/atc2609a.h + create mode 100644 include/linux/mfd/atc260x/core.h + create mode 100644 include/linux/mfd/ntxec.h + create mode 100644 include/linux/mfd/rohm-bd957x.h +Merging backlight/for-backlight-next (225be60f3853 dt-bindings: backlight: qcom-wled: Add PMI8994 compatible) +$ git merge backlight/for-backlight-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml | 1 + + 1 file changed, 1 insertion(+) +Merging battery/for-next (2552e38dc8ad power: supply: smb347-charger: Clean up whitespaces in the code) +$ git merge battery/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 7 ++++ + drivers/power/supply/cw2015_battery.c | 6 ++++ + drivers/power/supply/max8997_charger.c | 2 +- + drivers/power/supply/s3c_adc_battery.c | 19 +++------- + drivers/power/supply/smb347-charger.c | 65 ++++++++++++++++++++-------------- + 5 files changed, 58 insertions(+), 41 deletions(-) +Merging regulator/for-next (45ee8b79d679 regulator: add missing call to of_node_put()) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + drivers/regulator/pf8x00-regulator.c | 1 + + drivers/regulator/qcom_spmi-regulator.c | 2 ++ + drivers/regulator/scmi-regulator.c | 4 +++- + 3 files changed, 6 insertions(+), 1 deletion(-) +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 (d108370c644b apparmor: fix error check) +$ git merge apparmor/apparmor-next +Auto-merging security/apparmor/policy_unpack.c +Auto-merging security/apparmor/policy.c +Auto-merging security/apparmor/lsm.c +Auto-merging security/apparmor/label.c +Auto-merging security/apparmor/include/label.h +Auto-merging security/apparmor/include/file.h +Auto-merging security/apparmor/apparmorfs.c +Merge made by the 'recursive' strategy. + security/apparmor/apparmorfs.c | 4 +-- + security/apparmor/include/file.h | 2 +- + security/apparmor/include/label.h | 1 + + security/apparmor/include/policy.h | 6 ++-- + security/apparmor/label.c | 4 +-- + security/apparmor/lsm.c | 22 +++++++------- + security/apparmor/path.c | 2 +- + security/apparmor/policy.c | 59 ++++++++++++++++++++++++++++++++------ + security/apparmor/policy_unpack.c | 2 +- + 9 files changed, 73 insertions(+), 29 deletions(-) +Merging integrity/next-integrity (f6692213b504 integrity: Make function integrity_add_key() static) +$ git merge integrity/next-integrity +Already up to date. +Merging keys/keys-next (e377c31f788f integrity: Load mokx variables into the blacklist keyring) +$ git merge keys/keys-next +Auto-merging scripts/Makefile +Merge made by the 'recursive' strategy. + certs/Kconfig | 17 ++++++ + certs/Makefile | 21 ++++++- + certs/blacklist.c | 64 ++++++++++++++++++++++ + certs/blacklist.h | 2 + + certs/common.c | 57 +++++++++++++++++++ + certs/common.h | 9 +++ + certs/revocation_certificates.S | 21 +++++++ + certs/system_keyring.c | 55 +++---------------- + include/keys/system_keyring.h | 15 +++++ + scripts/Makefile | 1 + + .../integrity/platform_certs/keyring_handler.c | 11 ++++ + security/integrity/platform_certs/load_uefi.c | 20 ++++++- + 12 files changed, 242 insertions(+), 51 deletions(-) + create mode 100644 certs/common.c + create mode 100644 certs/common.h + create mode 100644 certs/revocation_certificates.S +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 (431c3be16bd0 selinux: fix misspellings using codespell tool) +$ git merge selinux/next +Merge made by the 'recursive' strategy. + security/selinux/hooks.c | 3 +- + security/selinux/ima.c | 87 +++++++++++++++++++++++++++++++++++-- + security/selinux/include/ima.h | 6 +++ + security/selinux/include/security.h | 2 +- + security/selinux/selinuxfs.c | 6 +++ + security/selinux/ss/hashtab.c | 2 +- + security/selinux/ss/services.c | 2 +- + 7 files changed, 100 insertions(+), 8 deletions(-) +Merging smack/next (7ef4c19d245f smackfs: restrict bytes count in smackfs write functions) +$ git merge smack/next +Already up to date. +Merging tomoyo/master (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge tomoyo/master +Already up to date. +Merging tpmdd/next (a8bba9247eb3 tpm: vtpm_proxy: Avoid reading host log when using a virtual device) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + drivers/char/tpm/eventlog/acpi.c | 33 ++++++++++++++++++++++++++++++++- + drivers/char/tpm/eventlog/common.c | 3 +++ + drivers/char/tpm/eventlog/efi.c | 29 +++++++++++++++++++++-------- + 3 files changed, 56 insertions(+), 9 deletions(-) +Merging watchdog/master (a4f3407c4160 watchdog: qcom: Remove incorrect usage of QCOM_WDT_ENABLE_IRQ) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (be575abcf799 Merge branch 'iommu/fixes' into next) +$ git merge iommu/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging audit/next (a38fd8748464 Linux 5.12-rc2) +$ git merge audit/next +Already up to date. +Merging devicetree/for-next (dce92f6b11c3 arm64: Enable passing IMA log to next kernel on kexec) +$ git merge devicetree/for-next +Removing arch/powerpc/kexec/ima.c +Removing arch/powerpc/include/asm/ima.h +Auto-merging arch/arm64/Kconfig +Merge made by the 'recursive' strategy. + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/kexec.h | 4 - + arch/arm64/kernel/machine_kexec_file.c | 196 ++------------ + arch/powerpc/Kconfig | 2 +- + arch/powerpc/include/asm/ima.h | 30 --- + arch/powerpc/include/asm/kexec.h | 14 +- + arch/powerpc/kexec/Makefile | 7 - + arch/powerpc/kexec/elf_64.c | 30 ++- + arch/powerpc/kexec/file_load.c | 183 +------------ + arch/powerpc/kexec/file_load_64.c | 21 +- + arch/powerpc/kexec/ima.c | 219 ---------------- + arch/x86/include/asm/kexec.h | 5 - + arch/x86/kernel/crash.c | 14 +- + arch/x86/kernel/kexec-bzimage64.c | 2 +- + arch/x86/kernel/machine_kexec_64.c | 4 +- + drivers/of/Makefile | 6 + + drivers/of/kexec.c | 458 +++++++++++++++++++++++++++++++++ + include/linux/kexec.h | 8 + + include/linux/of.h | 7 + + security/integrity/ima/ima.h | 4 - + security/integrity/ima/ima_kexec.c | 9 +- + 21 files changed, 539 insertions(+), 685 deletions(-) + delete mode 100644 arch/powerpc/include/asm/ima.h + delete mode 100644 arch/powerpc/kexec/ima.c + create mode 100644 drivers/of/kexec.c +Merging mailbox/mailbox-for-next (6b50df2b8c20 mailbox: arm_mhuv2: Skip calling kfree() with invalid pointer) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (31890269c0a0 spi: cadence-quadspi: Silence shiftTooManyBitsSigned warning) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/spi-mt65xx.txt | 1 + + .../devicetree/bindings/spi/spi-nxp-fspi.txt | 1 + + drivers/spi/spi-atmel.c | 4 - + drivers/spi/spi-butterfly.c | 13 +-- + drivers/spi/spi-cadence-quadspi.c | 8 +- + drivers/spi/spi-lm70llp.c | 13 +-- + drivers/spi/spi-nxp-fspi.c | 114 +++++++++++++++++++-- + drivers/spi/spi-omap2-mcspi.c | 24 +++-- + drivers/spi/spi-rockchip.c | 13 ++- + include/linux/parport.h | 12 ++- + 10 files changed, 152 insertions(+), 51 deletions(-) +Merging tip/auto-latest (ea5c764c6e8e Merge branch 'efi/urgent') +$ git merge tip/auto-latest +Auto-merging net/core/skbuff.c +Auto-merging kernel/sched/core.c +Auto-merging include/linux/sched.h +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-firmware-sgi_uv | 2 +- + Documentation/admin-guide/kernel-parameters.txt | 10 + + arch/s390/kernel/stacktrace.c | 6 - + arch/x86/Kconfig | 8 +- + arch/x86/Makefile | 8 + + arch/x86/entry/common.c | 3 +- + arch/x86/entry/entry_32.S | 95 +--- + arch/x86/entry/entry_64_compat.S | 2 + + arch/x86/entry/vdso/vdso2c.h | 2 +- + arch/x86/events/intel/core.c | 5 +- + arch/x86/hyperv/mmu.c | 10 +- + arch/x86/include/asm/alternative.h | 14 +- + arch/x86/include/asm/insn-eval.h | 2 + + arch/x86/include/asm/jump_label.h | 4 +- + arch/x86/include/asm/msr-index.h | 2 - + arch/x86/include/asm/paravirt.h | 6 +- + arch/x86/include/asm/paravirt_types.h | 4 +- + arch/x86/include/asm/processor.h | 15 +- + arch/x86/include/asm/proto.h | 1 + + arch/x86/include/asm/ptrace.h | 20 +- + arch/x86/include/asm/segment.h | 30 +- + arch/x86/include/asm/stackprotector.h | 79 +-- + arch/x86/include/asm/suspend_32.h | 6 +- + arch/x86/include/asm/tlbflush.h | 48 +- + arch/x86/include/asm/trace/hyperv.h | 2 +- + arch/x86/kernel/alternative.c | 2 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 3 + + arch/x86/kernel/asm-offsets_32.c | 5 - + arch/x86/kernel/cpu/common.c | 5 +- + arch/x86/kernel/cpu/hygon.c | 4 +- + arch/x86/kernel/doublefault_32.c | 4 +- + arch/x86/kernel/head_32.S | 18 +- + arch/x86/kernel/kvm.c | 11 +- + arch/x86/kernel/paravirt.c | 2 +- + arch/x86/kernel/setup_percpu.c | 1 - + arch/x86/kernel/sev-es.c | 24 +- + arch/x86/kernel/stacktrace.c | 6 - + arch/x86/kernel/tls.c | 8 +- + arch/x86/kernel/traps.c | 3 +- + arch/x86/kernel/unwind_orc.c | 14 +- + arch/x86/kvm/x86.c | 8 +- + arch/x86/lib/insn-eval.c | 70 ++- + arch/x86/mm/init.c | 2 +- + arch/x86/mm/mem_encrypt.c | 6 + + arch/x86/mm/tlb.c | 176 ++++--- + arch/x86/platform/pvh/head.S | 14 - + arch/x86/power/cpu.c | 6 +- + arch/x86/xen/enlighten_pv.c | 1 - + arch/x86/xen/mmu_pv.c | 11 +- + drivers/firmware/efi/libstub/efi-stub.c | 16 + + drivers/net/wireless/ath/ath10k/mac.c | 2 + + drivers/usb/usbip/usbip_common.h | 1 + + include/linux/cpumask.h | 6 +- + include/linux/interrupt.h | 4 + + include/linux/kcov.h | 1 + + include/linux/lockdep.h | 18 +- + include/linux/perf_event.h | 2 + + include/linux/psi.h | 1 - + include/linux/psi_types.h | 3 +- + include/linux/sched.h | 1 - + include/linux/seqlock.h | 5 +- + include/linux/smp.h | 50 +- + include/linux/stacktrace.h | 19 + + include/linux/u64_stats_sync.h | 7 +- + include/trace/events/xen.h | 2 +- + kernel/cpu.c | 194 ++++--- + kernel/events/core.c | 42 +- + kernel/irq/manage.c | 11 +- + kernel/locking/lockdep.c | 15 +- + kernel/sched/core.c | 148 +++--- + kernel/sched/fair.c | 181 +++---- + kernel/sched/idle.c | 6 + + kernel/sched/membarrier.c | 4 +- + kernel/sched/psi.c | 122 ++--- + kernel/sched/sched.h | 15 + + kernel/sched/stats.h | 37 +- + kernel/sched/topology.c | 91 ++-- + kernel/smp.c | 464 ++++++++++++----- + kernel/static_call.c | 7 +- + kernel/time/hrtimer.c | 60 ++- + kernel/up.c | 38 +- + net/core/skbuff.c | 1 + + net/mac80211/iface.c | 1 + + net/mac80211/rx.c | 1 + + scripts/gcc-x86_32-has-stack-protector.sh | 6 +- + tools/arch/x86/include/asm/msr-index.h | 2 - + tools/arch/x86/kcpuid/Makefile | 24 + + tools/arch/x86/kcpuid/cpuid.csv | 380 ++++++++++++++ + tools/arch/x86/kcpuid/kcpuid.c | 655 ++++++++++++++++++++++++ + tools/objtool/arch/x86/decode.c | 282 +++++----- + tools/objtool/arch/x86/include/arch/cfi_regs.h | 12 +- + tools/objtool/builtin-check.c | 43 +- + tools/objtool/builtin-orc.c | 5 +- + tools/objtool/check.c | 39 +- + tools/objtool/include/objtool/arch.h | 1 - + tools/objtool/include/objtool/builtin.h | 5 +- + tools/objtool/objtool.c | 64 +++ + tools/perf/trace/beauty/tracepoints/x86_msr.sh | 2 +- + 98 files changed, 2705 insertions(+), 1179 deletions(-) + create mode 100644 tools/arch/x86/kcpuid/Makefile + create mode 100644 tools/arch/x86/kcpuid/cpuid.csv + create mode 100644 tools/arch/x86/kcpuid/kcpuid.c +Merging clockevents/timers/drivers/next (e85c1d21b16b clocksource/drivers/timer-microchip-pit64b: Add clocksource suspend/resume) +$ git merge clockevents/timers/drivers/next +Already up to date. +Merging edac/edac-for-next (faf042d15093 Merge branch 'edac-amd64' 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 (5fbecd2389f4 irqchip/ingenic: Add support for the JZ4760) +$ git merge irqchip/irq/irqchip-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/interrupt-controller/ingenic,intc.yaml | 1 + + arch/arm/Kconfig | 1 + + drivers/irqchip/Kconfig | 9 --------- + drivers/irqchip/irq-ingenic-tcu.c | 1 + + drivers/irqchip/irq-ingenic.c | 1 + + include/linux/irqdomain.h | 4 ---- + kernel/irq/irqdomain.c | 9 ++++----- + 7 files changed, 8 insertions(+), 18 deletions(-) +Merging ftrace/for-next (f9f344479d8b tracing: Fix comment about the trace_event_call flags) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (7836d7be2d23 EXP net: phy: make mdio_bus_phy_suspend/resume as __maybe_unused) +$ git merge rcu/rcu/next +Auto-merging mm/slub.c +Auto-merging kernel/sched/core.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/kernel-parameters.rst +Merge made by the 'recursive' strategy. + Documentation/RCU/RTFP.txt | 2 +- + Documentation/admin-guide/kernel-parameters.rst | 7 + + Documentation/admin-guide/kernel-parameters.txt | 16 +- + Documentation/dev-tools/kcsan.rst | 7 +- + .../litmus-tests/locking/DCL-broken.litmus | 55 +++ + .../litmus-tests/locking/DCL-fixed.litmus | 56 +++ + .../litmus-tests/locking/RM-broken.litmus | 42 ++ + Documentation/litmus-tests/locking/RM-fixed.litmus | 42 ++ + include/linux/kcsan-checks.h | 6 + + include/linux/kcsan.h | 7 + + include/linux/mm.h | 4 + + include/linux/rcu_segcblist.h | 7 +- + include/linux/rculist_nulls.h | 2 +- + include/linux/rcupdate.h | 2 +- + include/linux/rcutiny.h | 11 +- + include/linux/rcutree.h | 2 + + include/linux/slab.h | 2 + + include/linux/vmalloc.h | 2 +- + include/trace/events/rcu.h | 28 ++ + kernel/kcsan/Makefile | 4 +- + kernel/kcsan/atomic.h | 5 + + kernel/kcsan/core.c | 7 +- + kernel/kcsan/debugfs.c | 9 +- + kernel/kcsan/encoding.h | 5 + + kernel/kcsan/kcsan.h | 8 +- + kernel/kcsan/{kcsan-test.c => kcsan_test.c} | 118 +++-- + kernel/kcsan/report.c | 5 + + kernel/kcsan/selftest.c | 5 + + kernel/rcu/rcu_segcblist.c | 3 +- + kernel/rcu/rcuscale.c | 15 +- + kernel/rcu/rcutorture.c | 93 ++-- + kernel/rcu/tasks.h | 89 +++- + kernel/rcu/tiny.c | 40 ++ + kernel/rcu/tree.c | 164 +++++-- + kernel/rcu/tree_exp.h | 1 + + kernel/rcu/tree_plugin.h | 263 +++++++---- + kernel/rcu/tree_stall.h | 2 + + kernel/sched/core.c | 24 +- + kernel/softirq.c | 2 +- + kernel/torture.c | 6 +- + lib/Kconfig.kcsan | 5 +- + lib/bitmap.c | 49 ++- + lib/test_bitmap.c | 46 +- + mm/slab.c | 2 + + mm/slab.h | 2 + + mm/slab_common.c | 4 + + mm/slob.c | 2 + + mm/slub.c | 2 + + mm/util.c | 3 + + mm/vmalloc.c | 2 + + .../memory-model/Documentation/access-marking.txt | 479 +++++++++++++++++++++ + tools/memory-model/Documentation/explanation.txt | 2 +- + tools/memory-model/Documentation/glossary.txt | 2 +- + tools/memory-model/Documentation/locking.txt | 320 ++++++++++++++ + tools/memory-model/Documentation/simple.txt | 1 - + tools/memory-model/litmus-tests/.gitignore | 2 +- + tools/memory-model/scripts/README | 16 +- + tools/memory-model/scripts/checkalllitmus.sh | 29 +- + tools/memory-model/scripts/checkghlitmus.sh | 11 +- + tools/memory-model/scripts/checklitmus.sh | 25 +- + tools/memory-model/scripts/checklitmushist.sh | 2 +- + tools/memory-model/scripts/checktheselitmus.sh | 43 ++ + tools/memory-model/scripts/cmplitmushist.sh | 49 ++- + tools/memory-model/scripts/hwfnseg.sh | 20 + + tools/memory-model/scripts/initlitmushist.sh | 2 +- + tools/memory-model/scripts/judgelitmus.sh | 120 +++++- + tools/memory-model/scripts/newlitmushist.sh | 4 +- + tools/memory-model/scripts/parseargs.sh | 21 +- + tools/memory-model/scripts/runlitmus.sh | 80 ++++ + tools/memory-model/scripts/runlitmushist.sh | 29 +- + tools/memory-model/scripts/simpletest.sh | 35 ++ + tools/testing/selftests/rcutorture/bin/cpus2use.sh | 1 - + tools/testing/selftests/rcutorture/bin/jitter.sh | 20 +- + .../selftests/rcutorture/bin/jitterstart.sh | 37 ++ + .../testing/selftests/rcutorture/bin/jitterstop.sh | 23 + + .../testing/selftests/rcutorture/bin/kvm-again.sh | 189 ++++++++ + .../selftests/rcutorture/bin/kvm-recheck.sh | 2 +- + .../testing/selftests/rcutorture/bin/kvm-remote.sh | 280 ++++++++++++ + .../rcutorture/bin/kvm-test-1-run-batch.sh | 67 +++ + .../rcutorture/bin/kvm-test-1-run-qemu.sh | 176 ++++++++ + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 218 +++------- + .../selftests/rcutorture/bin/kvm-transform.sh | 54 ++- + tools/testing/selftests/rcutorture/bin/kvm.sh | 126 ++++-- + tools/testing/selftests/rcutorture/bin/torture.sh | 4 +- + .../selftests/rcutorture/configs/rcu/CFLIST | 4 +- + .../rcutorture/configs/rcu/{SRCU-t => SRCU-T} | 0 + .../configs/rcu/{SRCU-t.boot => SRCU-T.boot} | 0 + .../rcutorture/configs/rcu/{SRCU-u => SRCU-U} | 0 + .../configs/rcu/{SRCU-u.boot => SRCU-U.boot} | 0 + .../selftests/rcutorture/configs/rcu/TREE03.boot | 1 + + .../selftests/rcutorture/configs/rcu/TREE04.boot | 2 +- + .../selftests/rcutorture/configs/rcu/TREE08.boot | 2 +- + .../selftests/rcutorture/configs/rcuscale/TREE | 2 +- + .../selftests/rcutorture/configs/rcuscale/TREE54 | 2 +- + .../rcutorture/configs/rcuscale/ver_functions.sh | 2 +- + .../rcutorture/configs/refscale/NOPREEMPT | 2 +- + .../selftests/rcutorture/configs/refscale/PREEMPT | 2 +- + .../rcutorture/configs/refscale/ver_functions.sh | 2 +- + 98 files changed, 3196 insertions(+), 599 deletions(-) + create mode 100644 Documentation/litmus-tests/locking/DCL-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/DCL-fixed.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-fixed.litmus + rename kernel/kcsan/{kcsan-test.c => kcsan_test.c} (94%) + create mode 100644 tools/memory-model/Documentation/access-marking.txt + create mode 100644 tools/memory-model/Documentation/locking.txt + create mode 100755 tools/memory-model/scripts/checktheselitmus.sh + create mode 100755 tools/memory-model/scripts/hwfnseg.sh + create mode 100755 tools/memory-model/scripts/runlitmus.sh + create mode 100755 tools/memory-model/scripts/simpletest.sh + create mode 100644 tools/testing/selftests/rcutorture/bin/jitterstart.sh + create mode 100644 tools/testing/selftests/rcutorture/bin/jitterstop.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-again.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-remote.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-test-1-run-batch.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-test-1-run-qemu.sh + rename tools/testing/selftests/rcutorture/configs/rcu/{SRCU-t => SRCU-T} (100%) + rename tools/testing/selftests/rcutorture/configs/rcu/{SRCU-t.boot => SRCU-T.boot} (100%) + rename tools/testing/selftests/rcutorture/configs/rcu/{SRCU-u => SRCU-U} (100%) + rename tools/testing/selftests/rcutorture/configs/rcu/{SRCU-u.boot => SRCU-U.boot} (100%) +Merging kvm/next (357ad203d45c KVM: arm64: Fix range alignment when walking page tables) +$ git merge kvm/next +Auto-merging arch/x86/kvm/x86.c +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/kvm_asm.h | 4 ++-- + arch/arm64/include/asm/kvm_hyp.h | 8 ++++++- + arch/arm64/kernel/image-vars.h | 3 +++ + arch/arm64/kvm/hyp/entry.S | 2 +- + arch/arm64/kvm/hyp/include/hyp/switch.h | 9 +++++--- + arch/arm64/kvm/hyp/nvhe/debug-sr.c | 12 ++++++++-- + arch/arm64/kvm/hyp/nvhe/host.S | 15 +++++++------ + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 6 ++--- + arch/arm64/kvm/hyp/nvhe/switch.c | 14 +++++++++--- + arch/arm64/kvm/hyp/pgtable.c | 1 + + arch/arm64/kvm/hyp/vgic-v3-sr.c | 40 +++++++++++++++++++++++++++++++-- + arch/arm64/kvm/perf.c | 10 +++++++++ + arch/arm64/kvm/pmu-emul.c | 10 --------- + arch/arm64/kvm/vgic/vgic-v3.c | 12 +++++++--- + arch/x86/kvm/lapic.c | 11 ++++++++- + arch/x86/kvm/svm/svm.c | 25 +++++++++++---------- + arch/x86/kvm/x86.c | 2 +- + include/kvm/arm_pmu.h | 9 ++++++-- + 18 files changed, 140 insertions(+), 53 deletions(-) +Merging kvm-arm/next (58c71cd7cac6 Merge branch 'kvmarm-master/fixes' into kvmarm-master/next) +$ git merge kvm-arm/next +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/kvm_asm.h | 4 ++-- + arch/arm64/kvm/arm.c | 7 ++++++- + arch/arm64/kvm/hyp/entry.S | 6 ++++-- + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 6 +++--- + arch/arm64/kvm/hyp/nvhe/tlb.c | 3 ++- + arch/arm64/kvm/hyp/vhe/tlb.c | 3 ++- + 6 files changed, 19 insertions(+), 10 deletions(-) +Merging kvm-ppc/kvm-ppc-next (72476aaa4691 KVM: PPC: Book3S HV: Fix host radix SLB optimisation with hash guests) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (20eff2c93a2d KVM: s390: VSIE: correctly handle MVPG when in VSIE) +$ git merge kvms390/next +Merge made by the 'recursive' strategy. + Documentation/virt/kvm/s390-diag.rst | 33 +++++++++++ + arch/s390/include/asm/kvm_host.h | 1 + + arch/s390/include/asm/smp.h | 1 + + arch/s390/kernel/smp.c | 1 + + arch/s390/kvm/diag.c | 31 +++++++++- + arch/s390/kvm/gaccess.c | 30 ++++++++-- + arch/s390/kvm/gaccess.h | 37 +++++++++--- + arch/s390/kvm/kvm-s390.c | 8 ++- + arch/s390/kvm/kvm-s390.h | 8 +++ + arch/s390/kvm/vsie.c | 106 ++++++++++++++++++++++++++++++++--- + 10 files changed, 230 insertions(+), 26 deletions(-) +Merging xen-tip/linux-next (f1d20d8643e5 Xen/gntdev: don't needlessly use kvcalloc()) +$ git merge xen-tip/linux-next +Merge made by the 'recursive' strategy. + arch/arm/xen/p2m.c | 5 +- + arch/x86/xen/p2m.c | 6 +- + drivers/pci/xen-pcifront.c | 4 +- + drivers/xen/events/events_2l.c | 22 ++++-- + drivers/xen/events/events_base.c | 130 +++++++++++++++++++++++++++-------- + drivers/xen/events/events_fifo.c | 7 -- + drivers/xen/events/events_internal.h | 14 ++-- + drivers/xen/gntdev.c | 54 +++++++++------ + include/xen/grant_table.h | 7 ++ + include/xen/xenbus.h | 1 - + 10 files changed, 169 insertions(+), 81 deletions(-) +Merging percpu/for-next (df1c002198a8 Merge branch 'for-5.12' into for-next) +$ git merge percpu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (a7347aa8e061 workqueue: Move the position of debug_work_activate() in __queue_work()) +$ git merge workqueues/for-next +Merge made by the 'recursive' strategy. + kernel/workqueue.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging drivers-x86/for-next (87eaede45385 platform/x86: touchscreen_dmi: Handle device properties with software node API) +$ git merge drivers-x86/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../driver-api/surface_aggregator/client.rst | 4 +- + MAINTAINERS | 11 +- + drivers/platform/surface/Kconfig | 49 ++ + drivers/platform/surface/Makefile | 2 + + drivers/platform/surface/aggregator/controller.c | 10 +- + .../platform/surface/surface_aggregator_registry.c | 641 +++++++++++++++++++++ + .../platform/surface/surface_platform_profile.c | 190 ++++++ + drivers/platform/surface/surfacepro3_button.c | 2 - + drivers/platform/x86/Kconfig | 3 +- + drivers/platform/x86/dell/dell-smbios-wmi.c | 3 +- + drivers/platform/x86/dell/dell-wmi-descriptor.c | 3 +- + .../x86/dell/dell-wmi-sysman/biosattr-interface.c | 3 +- + .../dell/dell-wmi-sysman/passwordattr-interface.c | 3 +- + drivers/platform/x86/dell/dell-wmi.c | 3 +- + drivers/platform/x86/hp-wmi.c | 101 +++- + drivers/platform/x86/intel-wmi-sbl-fw-update.c | 3 +- + drivers/platform/x86/intel-wmi-thunderbolt.c | 3 +- + drivers/platform/x86/lg-laptop.c | 2 +- + drivers/platform/x86/thinkpad_acpi.c | 23 + + drivers/platform/x86/touchscreen_dmi.c | 2 +- + drivers/platform/x86/wmi-bmof.c | 3 +- + drivers/platform/x86/wmi.c | 6 +- + drivers/platform/x86/xo15-ebook.c | 6 +- + include/linux/surface_aggregator/controller.h | 74 +-- + include/linux/surface_aggregator/device.h | 31 +- + include/linux/wmi.h | 2 +- + 26 files changed, 1085 insertions(+), 98 deletions(-) + create mode 100644 drivers/platform/surface/surface_aggregator_registry.c + create mode 100644 drivers/platform/surface/surface_platform_profile.c +Merging chrome-platform/for-next (a38fd8748464 Linux 5.12-rc2) +$ git merge chrome-platform/for-next +Already up to date. +Merging hsi/for-next (aa57e77b3d28 HSI: Fix PM usage counter unbalance in ssi_hw_init) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (34731ed13e8a leds: lgm: fix gpiolib dependency) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + drivers/leds/blink/Kconfig | 1 + + 1 file changed, 1 insertion(+) +Merging ipmi/for-next (c053c4eb5a0f ipmi: Handle device properties with software node API) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_msghandler.c | 6 +-- + drivers/char/ipmi/ipmi_plat_data.c | 2 +- + drivers/char/ipmi/ipmi_si_intf.c | 6 +-- + drivers/char/ipmi/ipmi_ssif.c | 81 +++++++++---------------------------- + 4 files changed, 25 insertions(+), 70 deletions(-) +Merging driver-core/driver-core-next (a38fd8748464 Linux 5.12-rc2) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (60a35ba9141f usb: usb-mx2: Remove unused file) +$ git merge usb/usb-next +Auto-merging include/linux/usb.h +Removing include/linux/platform_data/usb-mx2.h +Auto-merging drivers/usb/core/usb.c +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/host.c | 2 +- + drivers/usb/common/common.c | 76 ++++++ + drivers/usb/common/debug.c | 22 +- + drivers/usb/core/devices.c | 21 +- + drivers/usb/core/endpoint.c | 35 +-- + drivers/usb/core/usb.c | 8 +- + drivers/usb/dwc2/debugfs.c | 2 + + drivers/usb/dwc3/core.c | 15 ++ + drivers/usb/dwc3/core.h | 5 + + drivers/usb/dwc3/gadget.c | 10 +- + drivers/usb/gadget/function/f_mass_storage.c | 2 - + drivers/usb/gadget/function/f_printer.c | 2 +- + drivers/usb/gadget/udc/dummy_hcd.c | 2 +- + drivers/usb/host/Makefile | 6 +- + drivers/usb/host/isp116x-hcd.c | 7 +- + drivers/usb/host/isp116x.h | 1 - + drivers/usb/host/isp1362-hcd.c | 8 +- + drivers/usb/host/isp1362.h | 1 - + drivers/usb/host/sl811-hcd.c | 7 +- + drivers/usb/host/sl811.h | 1 - + drivers/usb/host/uhci-hcd.c | 12 +- + drivers/usb/host/uhci-hcd.h | 4 - + drivers/usb/host/xhci-mem.c | 2 +- + drivers/usb/host/xhci-mtk-sch.c | 360 ++++++++++++++++++--------- + drivers/usb/host/xhci-mtk.c | 19 +- + drivers/usb/host/xhci-mtk.h | 46 +--- + drivers/usb/host/xhci-ring.c | 1 - + drivers/usb/host/xhci.c | 30 +-- + drivers/usb/host/xhci.h | 8 + + drivers/usb/typec/Makefile | 3 + + drivers/usb/typec/stusb160x.c | 4 +- + drivers/usb/typec/tcpm/fusb302.c | 5 +- + drivers/usb/typec/tcpm/tcpci.c | 21 +- + drivers/usb/typec/tcpm/tcpm.c | 86 +++++-- + drivers/usb/typec/tps6598x.c | 70 +++--- + drivers/usb/typec/tps6598x.h | 189 ++++++++++++++ + drivers/usb/typec/tps6598x_trace.h | 283 +++++++++++++++++++++ + include/linux/platform_data/usb-mx2.h | 29 --- + include/linux/usb.h | 2 - + include/linux/usb/ch9.h | 62 +---- + 40 files changed, 1047 insertions(+), 422 deletions(-) + create mode 100644 drivers/usb/typec/tps6598x.h + create mode 100644 drivers/usb/typec/tps6598x_trace.h + delete mode 100644 include/linux/platform_data/usb-mx2.h +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 (a38fd8748464 Linux 5.12-rc2) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/for-usb-next (67982dfa59de usb: cdns3: imx: add power lost support for system resume) +$ git merge usb-chipidea-next/for-usb-next +Auto-merging include/linux/usb.h +Auto-merging drivers/usb/typec/tps6598x.c +Auto-merging drivers/usb/typec/tcpm/tcpm.c +Auto-merging drivers/usb/core/usb.c +Merge made by the 'recursive' strategy. + drivers/usb/cdns3/cdns3-gadget.c | 2 ++ + drivers/usb/cdns3/cdns3-imx.c | 34 ++++++++++++++++++++++++++++++++++ + drivers/usb/cdns3/cdns3-plat.c | 23 ++++++++++++++++++++++- + drivers/usb/cdns3/core.c | 29 ++++++++++++++++++++++++++++- + drivers/usb/cdns3/drd.c | 15 +++++++++++++++ + drivers/usb/cdns3/drd.h | 2 +- + 6 files changed, 102 insertions(+), 3 deletions(-) +Merging tty/tty-next (3d82be8be6fd serial: stm32: add support for "flush_buffer" ops) +$ git merge tty/tty-next +Removing include/uapi/linux/cyclades.h +Removing include/linux/isicom.h +Removing include/linux/cyclades.h +Auto-merging drivers/tty/tty_io.c +Removing drivers/tty/rocket_int.h +Removing drivers/tty/rocket.h +Removing drivers/tty/rocket.c +Removing drivers/tty/isicom.c +Auto-merging drivers/tty/hvc/hvcs.c +CONFLICT (content): Merge conflict in drivers/tty/hvc/hvcs.c +Removing drivers/tty/cyclades.c +Auto-merging drivers/net/hamradio/6pack.c +Auto-merging MAINTAINERS +Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst +Removing Documentation/driver-api/serial/rocket.rst +Removing Documentation/driver-api/serial/cyclades_z.rst +Resolved 'drivers/tty/hvc/hvcs.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c32264b331ac] Merge remote-tracking branch 'tty/tty-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/devices.txt | 12 +- + .../devicetree/bindings/serial/samsung_uart.yaml | 14 +- + Documentation/driver-api/serial/cyclades_z.rst | 11 - + Documentation/driver-api/serial/index.rst | 1 - + Documentation/driver-api/serial/rocket.rst | 185 - + Documentation/process/magic-number.rst | 4 - + .../translations/it_IT/process/magic-number.rst | 4 - + .../translations/zh_CN/process/magic-number.rst | 4 - + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 - + MAINTAINERS | 22 +- + arch/powerpc/configs/ppc6xx_defconfig | 1 - + arch/xtensa/platforms/iss/console.c | 45 +- + drivers/accessibility/speakup/spk_ttyio.c | 1 - + drivers/bluetooth/hci_ldisc.c | 1 - + drivers/misc/ti-st/st_core.c | 1 - + drivers/net/caif/caif_serial.c | 18 +- + drivers/net/can/slcan.c | 1 - + drivers/net/hamradio/6pack.c | 1 - + drivers/net/hamradio/mkiss.c | 1 - + drivers/net/ppp/ppp_async.c | 1 - + drivers/net/ppp/ppp_synctty.c | 1 - + drivers/net/slip/slip.c | 1 - + drivers/pps/clients/pps-ldisc.c | 3 - + drivers/s390/char/con3215.c | 56 +- + drivers/staging/gdm724x/gdm_tty.c | 2 +- + drivers/tty/Kconfig | 56 +- + drivers/tty/Makefile | 3 - + drivers/tty/amiserial.c | 8 +- + drivers/tty/cyclades.c | 4119 -------------------- + drivers/tty/hvc/hvcs.c | 24 - + drivers/tty/ipwireless/tty.c | 11 +- + drivers/tty/isicom.c | 1699 -------- + drivers/tty/moxa.c | 4 +- + drivers/tty/n_gsm.c | 18 +- + drivers/tty/n_hdlc.c | 1 - + drivers/tty/n_null.c | 1 - + drivers/tty/n_r3964.c | 1 - + drivers/tty/n_tty.c | 2 +- + drivers/tty/nozomi.c | 26 +- + drivers/tty/rocket.c | 3127 --------------- + drivers/tty/rocket.h | 111 - + drivers/tty/rocket_int.h | 1214 ------ + drivers/tty/serial/8250/8250_exar.c | 17 +- + drivers/tty/serial/8250/8250_port.c | 24 +- + drivers/tty/serial/8250/Kconfig | 5 +- + drivers/tty/serial/8250/serial_cs.c | 12 +- + drivers/tty/serial/Kconfig | 3 +- + drivers/tty/serial/imx.c | 6 +- + drivers/tty/serial/jsm/jsm_tty.c | 24 +- + drivers/tty/serial/kgdb_nmi.c | 4 +- + drivers/tty/serial/liteuart.c | 4 +- + drivers/tty/serial/pch_uart.c | 19 +- + drivers/tty/serial/samsung_tty.c | 496 ++- + drivers/tty/serial/stm32-usart.c | 198 +- + drivers/tty/serial/stm32-usart.h | 3 - + drivers/tty/synclink_gt.c | 62 +- + drivers/tty/tty_io.c | 12 +- + drivers/tty/tty_ioctl.c | 3 +- + drivers/tty/vcc.c | 72 +- + drivers/usb/serial/mos7720.c | 2 +- + drivers/video/console/vgacon.c | 2 +- + include/linux/cyclades.h | 364 -- + include/linux/isicom.h | 85 - + include/linux/pci_ids.h | 31 - + include/linux/serial_s3c.h | 16 + + include/linux/tty.h | 2 +- + include/linux/tty_ldisc.h | 3 - + include/net/nfc/nci_core.h | 2 - + include/uapi/linux/cyclades.h | 494 --- + include/uapi/linux/major.h | 2 - + include/uapi/linux/serial.h | 4 +- + net/nfc/nci/uart.c | 148 +- + sound/soc/codecs/cx20442.c | 1 - + sound/soc/ti/ams-delta.c | 1 - + 74 files changed, 740 insertions(+), 12198 deletions(-) + delete mode 100644 Documentation/driver-api/serial/cyclades_z.rst + delete mode 100644 Documentation/driver-api/serial/rocket.rst + delete mode 100644 drivers/tty/cyclades.c + delete mode 100644 drivers/tty/isicom.c + delete mode 100644 drivers/tty/rocket.c + delete mode 100644 drivers/tty/rocket.h + delete mode 100644 drivers/tty/rocket_int.h + delete mode 100644 include/linux/cyclades.h + delete mode 100644 include/linux/isicom.h + delete mode 100644 include/uapi/linux/cyclades.h +Merging char-misc/char-misc-next (f8096ff38d5f drivers: misc: ad525x_dpot: Add missing check in dpot_read_spi) +$ git merge char-misc/char-misc-next +Merge made by the 'recursive' strategy. + drivers/char/virtio_console.c | 23 +++++++++-------------- + drivers/misc/ad525x_dpot.c | 3 +++ + drivers/misc/vmw_balloon.c | 11 +++-------- + 3 files changed, 15 insertions(+), 22 deletions(-) +Merging extcon/extcon-next (b906ab549836 extcon: qcom-spmi: Add support for VBUS detection) +$ git merge extcon/extcon-next +Removing Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.txt +Merge made by the 'recursive' strategy. + .../bindings/extcon/qcom,pm8941-misc.txt | 41 --------- + .../bindings/extcon/qcom,pm8941-misc.yaml | 62 ++++++++++++++ + drivers/extcon/extcon-max8997.c | 4 + + drivers/extcon/extcon-qcom-spmi-misc.c | 99 +++++++++++++++++----- + drivers/extcon/extcon-sm5502.c | 22 ++++- + drivers/extcon/extcon.c | 1 + + include/linux/extcon.h | 23 +++++ + 7 files changed, 190 insertions(+), 62 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.txt + create mode 100644 Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml +Merging phy-next/next (8e6b3a78eddd phy: tusb1210: use bitmasks to set VENDOR_SPECIFIC2) +$ git merge phy-next/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 ++- + drivers/phy/ti/phy-tusb1210.c | 27 ++++++++++++++------------- + 2 files changed, 16 insertions(+), 14 deletions(-) +Merging soundwire/next (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge soundwire/next +Already up to date. +Merging thunderbolt/next (d59b8faa047e thunderbolt: Drop unused functions tb_switch_is_[ice|tiger]_lake()) +$ git merge thunderbolt/next +Merge made by the 'recursive' strategy. + drivers/thunderbolt/debugfs.c | 39 ++++++++++++++++++++++++++------------- + drivers/thunderbolt/tb.h | 26 -------------------------- + 2 files changed, 26 insertions(+), 39 deletions(-) +Merging vfio/next (4d83de6da265 vfio/type1: Batch page pinning) +$ git merge vfio/next +Already up to date. +Merging staging/staging-next (c972c2d821ca staging: unisys: visornic: Fix repeated words in comments) +$ git merge staging/staging-next +Auto-merging drivers/staging/wfx/sta.c +Auto-merging drivers/staging/rtl8192u/r8192U_wx.c +Merge made by the 'recursive' strategy. + drivers/staging/android/uapi/ashmem.h | 2 - + .../clocking-wizard/clk-xlnx-clock-wizard.c | 369 +++++++++++++++++++-- + drivers/staging/comedi/drivers/dt2814.c | 152 +++++++-- + drivers/staging/emxx_udc/emxx_udc.c | 1 - + drivers/staging/fwserial/fwserial.c | 6 +- + drivers/staging/gasket/gasket_page_table.c | 2 - + drivers/staging/gasket/gasket_sysfs.c | 2 +- + drivers/staging/greybus/audio_module.c | 4 +- + drivers/staging/greybus/audio_topology.c | 12 +- + drivers/staging/greybus/sdio.c | 1 - + drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 8 +- + drivers/staging/kpc2000/kpc2000_i2c.c | 6 +- + drivers/staging/kpc2000/kpc2000_spi.c | 2 +- + drivers/staging/mt7621-pci/pci-mt7621.c | 1 - + drivers/staging/octeon/ethernet-spi.c | 2 +- + drivers/staging/qlge/qlge_main.c | 3 +- + drivers/staging/ralink-gdma/ralink-gdma.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_security.c | 72 ++-- + drivers/staging/rtl8188eu/hal/odm_hwconfig.c | 11 +- + drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c | 4 +- + drivers/staging/rtl8188eu/include/odm_hwconfig.h | 8 +- + drivers/staging/rtl8188eu/include/wlan_bssdef.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 8 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 5 +- + drivers/staging/rtl8192e/rtl819x_BA.h | 40 +-- + drivers/staging/rtl8192e/rtl819x_BAProc.c | 127 ++++--- + drivers/staging/rtl8192e/rtl819x_HT.h | 23 +- + drivers/staging/rtl8192e/rtl819x_HTProc.c | 58 ++-- + drivers/staging/rtl8192e/rtl819x_TS.h | 18 +- + drivers/staging/rtl8192e/rtl819x_TSProc.c | 62 ++-- + drivers/staging/rtl8192e/rtllib_rx.c | 170 +++++----- + drivers/staging/rtl8192e/rtllib_softmac.c | 14 +- + drivers/staging/rtl8192e/rtllib_tx.c | 8 +- + drivers/staging/rtl8192e/rtllib_wx.c | 76 ++--- + drivers/staging/rtl8192u/r8190_rtl8256.c | 7 +- + drivers/staging/rtl8192u/r8192U_wx.c | 2 +- + drivers/staging/rtl8712/ieee80211.c | 6 +- + drivers/staging/rtl8712/rtl871x_recv.c | 4 +- + drivers/staging/rtl8712/wifi.h | 178 ++-------- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 3 +- + drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 4 +- + drivers/staging/rtl8723bs/core/rtw_recv.c | 44 +-- + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_xmit.c | 44 +-- + drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 8 +- + drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.h | 24 +- + drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 8 +- + drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.h | 20 +- + drivers/staging/rtl8723bs/hal/HalPhyRf.c | 4 +- + drivers/staging/rtl8723bs/hal/HalPhyRf.h | 16 +- + drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 4 +- + drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.h | 4 +- + drivers/staging/rtl8723bs/hal/hal_com.c | 45 +-- + drivers/staging/rtl8723bs/hal/odm.c | 2 - + drivers/staging/rtl8723bs/include/drv_types.h | 131 -------- + drivers/staging/rtl8723bs/include/rtw_debug.h | 6 - + drivers/staging/rtl8723bs/include/rtw_mp.h | 2 - + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 23 +- + drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 6 +- + drivers/staging/rtl8723bs/os_dep/recv_linux.c | 15 +- + drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 20 +- + drivers/staging/sm750fb/sm750.h | 29 +- + drivers/staging/unisys/visornic/visornic_main.c | 34 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 8 +- + .../interface/vchiq_arm/vchiq_debugfs.h | 2 +- + drivers/staging/vt6656/card.c | 3 +- + drivers/staging/wfx/hif_rx.c | 6 +- + drivers/staging/wfx/sta.c | 2 +- + drivers/staging/wimax/i2400m/control.c | 4 +- + drivers/staging/wimax/i2400m/fw.c | 10 +- + drivers/staging/wimax/i2400m/netdev.c | 2 +- + drivers/staging/wimax/i2400m/op-rfkill.c | 6 +- + drivers/staging/wimax/stack.c | 16 +- + drivers/staging/wlan-ng/p80211conv.h | 3 - + drivers/staging/wlan-ng/p80211netdev.c | 2 +- + 75 files changed, 1002 insertions(+), 1040 deletions(-) +Merging mux/for-next (3516bd729358 Merge tag 's390-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) +$ git merge mux/for-next +Already up to date. +Merging icc/icc-next (3ffdec2843e1 Merge branch 'icc-fixes' into HEAD) +$ git merge icc/icc-next +Merge made by the 'recursive' strategy. + .../bindings/interconnect/qcom,sdm660.yaml | 147 ++++ + drivers/interconnect/qcom/Kconfig | 9 + + drivers/interconnect/qcom/Makefile | 2 + + drivers/interconnect/qcom/icc-rpm.c | 4 +- + drivers/interconnect/qcom/msm8939.c | 16 +- + drivers/interconnect/qcom/sdm660.c | 922 +++++++++++++++++++++ + include/dt-bindings/interconnect/qcom,sdm660.h | 116 +++ + 7 files changed, 1206 insertions(+), 10 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sdm660.yaml + create mode 100644 drivers/interconnect/qcom/sdm660.c + create mode 100644 include/dt-bindings/interconnect/qcom,sdm660.h +Merging dmaengine/next (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge dmaengine/next +Already up to date. +Merging cgroup/for-next (00bfa16052cd Merge branch 'for-5.11-fixes' into for-next) +$ git merge cgroup/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging scsi/for-next (f88dfeea18aa Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c +Auto-merging block/blk-mq-sched.c +Merge made by the 'recursive' strategy. + block/blk-mq-sched.c | 17 +- + block/blk-mq.c | 38 ++-- + block/blk-mq.h | 25 ++- + block/kyber-iosched.c | 3 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 14 +- + drivers/message/fusion/mptsas.c | 2 +- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 15 +- + drivers/scsi/megaraid/megaraid_sas.h | 2 + + drivers/scsi/megaraid/megaraid_sas_fusion.c | 47 ++++- + drivers/scsi/mpt3sas/mpt3sas_base.c | 3 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 17 +- + drivers/scsi/scsi.c | 13 ++ + drivers/scsi/scsi_lib.c | 71 ++++--- + drivers/scsi/scsi_priv.h | 3 + + drivers/scsi/scsi_scan.c | 23 ++- + drivers/scsi/scsi_sysfs.c | 4 +- + drivers/scsi/sg.c | 2 +- + drivers/scsi/ufs/ufs-debugfs.c | 90 ++++++++ + drivers/scsi/ufs/ufs-debugfs.h | 2 + + drivers/scsi/ufs/ufs.h | 10 +- + drivers/scsi/ufs/ufshcd.c | 87 +++++--- + drivers/scsi/ufs/ufshcd.h | 26 ++- + drivers/target/iscsi/iscsi_target.c | 19 +- + drivers/target/loopback/tcm_loop.c | 60 +++--- + drivers/target/loopback/tcm_loop.h | 1 - + drivers/target/sbp/sbp_target.c | 8 +- + drivers/target/target_core_device.c | 10 +- + drivers/target/target_core_fabric_configfs.c | 58 ++++++ + drivers/target/target_core_iblock.c | 44 +++- + drivers/target/target_core_iblock.h | 10 + + drivers/target/target_core_internal.h | 2 + + drivers/target/target_core_tmr.c | 4 + + drivers/target/target_core_transport.c | 299 +++++++++++++++++++-------- + drivers/target/target_core_user.c | 27 ++- + drivers/target/target_core_xcopy.c | 10 +- + drivers/target/tcm_fc/tfc_cmd.c | 14 +- + drivers/usb/gadget/function/f_tcm.c | 36 ++-- + drivers/vhost/scsi.c | 58 ++---- + drivers/xen/xen-scsiback.c | 21 +- + include/linux/blk-mq.h | 13 +- + include/linux/sbitmap.h | 85 +++++--- + include/scsi/scsi_cmnd.h | 2 + + include/scsi/scsi_device.h | 8 +- + include/scsi/scsi_host.h | 72 ++++--- + include/target/target_core_backend.h | 2 + + include/target/target_core_base.h | 59 ++++-- + include/target/target_core_fabric.h | 21 +- + include/trace/events/ufs.h | 21 ++ + lib/sbitmap.c | 210 ++++++++++--------- + 50 files changed, 1166 insertions(+), 524 deletions(-) +Merging scsi-mkp/for-next (18956295fea6 Merge branch '5.13/sg' into 5.13/scsi-staging) +$ git merge scsi-mkp/for-next +Auto-merging drivers/scsi/ufs/ufshcd.c +Auto-merging drivers/scsi/ibmvscsi/ibmvfc.c +Merge made by the 'recursive' strategy. + drivers/scsi/FlashPoint.c | 2 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 2 +- + drivers/scsi/lpfc/lpfc.h | 3 +- + drivers/scsi/lpfc/lpfc_attr.c | 2 +- + drivers/scsi/lpfc/lpfc_crtn.h | 4 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 13 +- + drivers/scsi/lpfc/lpfc_disc.h | 3 +- + drivers/scsi/lpfc/lpfc_els.c | 639 ++- + drivers/scsi/lpfc/lpfc_hbadisc.c | 6 +- + drivers/scsi/lpfc/lpfc_init.c | 2 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 272 +- + drivers/scsi/lpfc/lpfc_nvme.c | 2 +- + drivers/scsi/lpfc/lpfc_nvmet.c | 5 +- + drivers/scsi/lpfc/lpfc_scsi.c | 98 +- + drivers/scsi/lpfc/lpfc_sli.c | 29 +- + drivers/scsi/lpfc/lpfc_version.h | 6 +- + drivers/scsi/lpfc/lpfc_vport.c | 10 +- + drivers/scsi/megaraid/megaraid_sas.h | 3 + + drivers/scsi/megaraid/megaraid_sas_base.c | 87 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 42 +- + drivers/scsi/megaraid/megaraid_sas_fusion.h | 2 + + drivers/scsi/pm8001/pm8001_sas.c | 8 +- + drivers/scsi/pm8001/pm8001_sas.h | 1 - + drivers/scsi/qla4xxx/ql4_os.c | 2 +- + drivers/scsi/scsi_debug.c | 229 +- + drivers/scsi/scsi_lib.c | 29 +- + drivers/scsi/sg.c | 5393 ++++++++++++++++++-------- + drivers/scsi/storvsc_drv.c | 18 +- + drivers/scsi/ufs/ufshcd.c | 1 - + drivers/target/iscsi/iscsi_target_configfs.c | 3 +- + drivers/target/iscsi/iscsi_target_nego.c | 1 - + drivers/target/iscsi/iscsi_target_stat.c | 1 - + drivers/target/iscsi/iscsi_target_util.c | 17 - + drivers/target/target_core_configfs.c | 25 +- + drivers/target/target_core_file.c | 3 +- + drivers/target/target_core_iblock.c | 37 +- + drivers/target/target_core_pr.c | 36 +- + drivers/target/target_core_pscsi.c | 5 +- + drivers/target/target_core_sbc.c | 4 +- + drivers/target/target_core_stat.c | 3 - + drivers/target/target_core_user.c | 66 +- + include/scsi/scsi_cmnd.h | 1 + + include/scsi/scsi_host.h | 11 + + include/scsi/sg.h | 273 +- + include/uapi/scsi/sg.h | 375 ++ + 45 files changed, 5075 insertions(+), 2699 deletions(-) + create mode 100644 include/uapi/scsi/sg.h +Merging vhost/linux-next (59a47ca88484 vhost_vdpa: fix the missing irq_bypass_unregister_producer() invocation) +$ git merge vhost/linux-next +Merge made by the 'recursive' strategy. + drivers/vdpa/Kconfig | 7 + + drivers/vdpa/Makefile | 1 + + drivers/vdpa/ifcvf/ifcvf_main.c | 5 +- + drivers/vdpa/mlx5/net/mlx5_vnet.c | 4 +- + drivers/vdpa/vdpa.c | 18 +- + drivers/vdpa/vdpa_sim/vdpa_sim.c | 2 +- + drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 5 +- + drivers/vdpa/virtio_pci/Makefile | 2 + + drivers/vdpa/virtio_pci/vp_vdpa.c | 458 +++++++++++++++++++++++++++++++++++ + drivers/vhost/vdpa.c | 8 +- + drivers/virtio/virtio.c | 6 +- + drivers/virtio/virtio_mmio.c | 3 +- + include/linux/vdpa.h | 10 +- + include/linux/virtio.h | 2 - + 14 files changed, 495 insertions(+), 36 deletions(-) + create mode 100644 drivers/vdpa/virtio_pci/Makefile + create mode 100644 drivers/vdpa/virtio_pci/vp_vdpa.c +Merging rpmsg/for-next (fcb4c469244b Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 ++ + drivers/remoteproc/pru_rproc.c | 18 ++++++++++++++++++ + drivers/remoteproc/qcom_pil_info.c | 2 +- + 3 files changed, 21 insertions(+), 1 deletion(-) +Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file) +$ git merge gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (79bdf5472bab docs: driver-api: gpio: consumer: Mark another line of code as such) +$ git merge gpio-brgl/gpio/for-next +Merge made by the 'recursive' strategy. + Documentation/driver-api/gpio/consumer.rst | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging gpio-intel/for-next (488d05fe25a6 gpiolib: Fold conditionals into a simple ternary operator) +$ git merge gpio-intel/for-next +Auto-merging kernel/irq/irqdomain.c +Auto-merging include/linux/irqdomain.h +Merge made by the 'recursive' strategy. + Documentation/core-api/irq/irq-domain.rst | 22 ++++++----- + drivers/gpio/gpio-aggregator.c | 39 +++---------------- + drivers/gpio/gpiolib-acpi.c | 7 ++++ + drivers/gpio/gpiolib-acpi.h | 4 ++ + drivers/gpio/gpiolib-of.c | 6 ++- + drivers/gpio/gpiolib.c | 62 ++++++++++++------------------- + include/linux/irqdomain.h | 19 +++++++--- + kernel/irq/irqdomain.c | 20 +++++----- + lib/cmdline.c | 1 + + 9 files changed, 81 insertions(+), 99 deletions(-) +Merging pinctrl/for-next (a0686a4cdfad Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../arm/marvell/cp110-system-controller.txt | 4 +- + .../devicetree/bindings/pinctrl/qcom,pmic-gpio.txt | 12 +++ + Documentation/driver-api/gpio/legacy.rst | 2 +- + Documentation/driver-api/index.rst | 2 +- + .../driver-api/{pinctl.rst => pin-control.rst} | 37 +++++++ + MAINTAINERS | 2 +- + drivers/pinctrl/core.c | 35 +++++-- + drivers/pinctrl/mvebu/pinctrl-armada-cp110.c | 4 +- + drivers/pinctrl/pinconf.c | 4 +- + drivers/pinctrl/pinctrl-equilibrium.c | 16 +++- + drivers/pinctrl/pinctrl-ingenic.c | 4 +- + drivers/pinctrl/pinctrl-microchip-sgpio.c | 2 +- + drivers/pinctrl/pinctrl-rockchip.c | 14 ++- + drivers/pinctrl/pinmux.c | 106 ++++++++++++++++++++- + drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm.c | 15 +++ + drivers/pinctrl/qcom/pinctrl-sc7280.c | 40 ++++++-- + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 6 ++ + drivers/pinctrl/stm32/pinctrl-stm32.c | 5 +- + 19 files changed, 274 insertions(+), 38 deletions(-) + rename Documentation/driver-api/{pinctl.rst => pin-control.rst} (97%) +Merging pinctrl-intel/for-next (9d8c5b0d2e09 pinctrl: intel: Show the GPIO base calculation explicitly) +$ git merge pinctrl-intel/for-next +Auto-merging drivers/pinctrl/intel/pinctrl-intel.c +Merge made by the 'recursive' strategy. + drivers/pinctrl/intel/pinctrl-intel.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +Merging pinctrl-renesas/renesas-pinctrl (f7adcca27edf pinctrl: renesas: r8a77965: Add vin4_g8 and vin5_high8 pins) +$ git merge pinctrl-renesas/renesas-pinctrl +Merge made by the 'recursive' strategy. + drivers/pinctrl/renesas/pfc-r8a77951.c | 30 +++++++++++++++++++++++++++++- + drivers/pinctrl/renesas/pfc-r8a7796.c | 30 +++++++++++++++++++++++++++++- + drivers/pinctrl/renesas/pfc-r8a77965.c | 34 +++++++++++++++++++++++++++++++++- + drivers/pinctrl/renesas/pfc-r8a77990.c | 34 +++++++++++++++++++++++++++++++++- + 4 files changed, 124 insertions(+), 4 deletions(-) +Merging pinctrl-samsung/for-next (a38fd8748464 Linux 5.12-rc2) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (9a9dd7e47351 pwm: lpc18xx-sct: remove unneeded semicolon) +$ git merge pwm/for-next +Already up to date. +Merging userns/for-next (95ebabde382c capabilities: Don't allow writing ambiguous v3 file capabilities) +$ git merge userns/for-next +Already up to date. +Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) +$ 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 (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge kselftest/next +Already up to date. +Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC") +$ git merge y2038/y2038 +Already up to date. +Merging livepatching/for-next (81840f21d416 Merge branch 'for-5.12/doc' 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. +Merging rtc/rtc-next (a38fd8748464 Linux 5.12-rc2) +$ git merge rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (30c10d32152d Merge branch 'for-5.12/cxl' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging at24/at24/for-next (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (5c8fe583cce5 Linux 5.11-rc1) +$ git merge ntb/ntb-next +Already up to date. +Merging seccomp/for-next/seccomp (a381b70a1cf8 seccomp: Improve performace by optimizing rmb()) +$ git merge seccomp/for-next/seccomp +Already up to date. +Merging kspp/for-next/kspp (414eece95b98 Merge tag 'clang-lto-v5.12-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux) +$ git merge kspp/for-next/kspp +Already up to date. +Merging gnss/gnss-next (994adcbd3714 gnss: drop stray semicolons) +$ git merge gnss/gnss-next +Merge made by the 'recursive' strategy. + drivers/gnss/mtk.c | 2 +- + drivers/gnss/serial.c | 2 +- + drivers/gnss/sirf.c | 2 +- + drivers/gnss/ubx.c | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) +Merging fsi/next (4a851d714ead fsi: aspeed: Support CFAM reset GPIO) +$ git merge fsi/next +Already up to date. +Merging slimbus/for-next (0320ed0a8236 drivers: slimbus: Fix word resposible -> responsible in slimbus.h) +$ git merge slimbus/for-next +Auto-merging drivers/of/platform.c +Auto-merging drivers/nvmem/Kconfig +CONFLICT (content): Merge conflict in drivers/nvmem/Kconfig +Resolved 'drivers/nvmem/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b686eb625272] Merge remote-tracking branch 'slimbus/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/slimbus/slimbus.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging nvmem/for-next (097eb1136ebb nvmem: core: Add functions to make number reading easy) +$ git merge nvmem/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/nvmem/brcm,nvram.yaml | 34 ++++++++ + .../devicetree/bindings/nvmem/mtk-efuse.txt | 1 + + drivers/nvmem/Kconfig | 9 ++ + drivers/nvmem/Makefile | 2 + + drivers/nvmem/brcm_nvram.c | 78 ++++++++++++++++++ + drivers/nvmem/core.c | 95 ++++++++++++++++++++++ + drivers/nvmem/qcom-spmi-sdam.c | 2 +- + drivers/nvmem/qfprom.c | 21 +++++ + drivers/nvmem/snvs_lpgpr.c | 2 +- + include/linux/nvmem-consumer.h | 4 + + 10 files changed, 246 insertions(+), 2 deletions(-) + create mode 100644 Documentation/devicetree/bindings/nvmem/brcm,nvram.yaml + create mode 100644 drivers/nvmem/brcm_nvram.c +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 (ec866be6ec54 clocksource/drivers/hyper-v: Move handling of STIMER0 interrupts) +$ git merge hyperv/hyperv-next +Auto-merging drivers/hv/vmbus_drv.c +Merge made by the 'recursive' strategy. + arch/x86/hyperv/hv_init.c | 53 +------- + arch/x86/include/asm/hyperv-tlfs.h | 131 ++++++++++--------- + arch/x86/include/asm/mshyperv.h | 67 ++-------- + arch/x86/kernel/cpu/mshyperv.c | 23 ++-- + drivers/clocksource/hyperv_timer.c | 249 +++++++++++++++++++++++++------------ + drivers/hv/channel.c | 2 +- + drivers/hv/connection.c | 2 +- + drivers/hv/hv.c | 93 +++++++++++--- + drivers/hv/vmbus_drv.c | 89 +++++++++++-- + include/asm-generic/hyperv-tlfs.h | 35 ++++++ + include/asm-generic/mshyperv.h | 19 ++- + include/clocksource/hyperv_timer.h | 3 +- + 12 files changed, 451 insertions(+), 315 deletions(-) +Merging auxdisplay/auxdisplay (b45616445a6e auxdisplay: Fix duplicate CHARLCD config symbol) +$ git merge auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (f11e2bc682cc kgdb: Remove kgdb_schedule_breakpoint()) +$ git merge kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge hmm/hmm +Already up to date. +Merging fpga/for-next (6f1e376cfc68 fpga: Add support for Xilinx DFX AXI Shutdown manager) +$ git merge fpga/for-next +Merge made by the 'recursive' strategy. + .../bindings/fpga/xilinx-pr-decoupler.txt | 24 +++++++++++- + drivers/fpga/Kconfig | 9 ++++- + drivers/fpga/xilinx-pr-decoupler.c | 45 +++++++++++++++++----- + drivers/fpga/xilinx-spi.c | 24 +++++------- + 4 files changed, 75 insertions(+), 27 deletions(-) +Merging kunit/test (fe07bfda2fb9 Linux 5.12-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 (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge kunit-next/kunit +Already up to date. +Merging trivial/for-next (9ff9b0d392ea Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge trivial/for-next +Already up to date. +Merging zx2c4/for-next (16fbf79b0f83 Linux 5.6-rc7) +$ git merge zx2c4/for-next +Already up to date. +Merging mhi/mhi-next (4d5f52838d11 bus: mhi: Make firmware image optional for controller) +$ git merge mhi/mhi-next +Merge made by the 'recursive' strategy. + drivers/bus/mhi/core/boot.c | 51 +++++---- + drivers/bus/mhi/core/debugfs.c | 2 +- + drivers/bus/mhi/core/init.c | 13 +-- + drivers/bus/mhi/core/internal.h | 1 + + drivers/bus/mhi/core/main.c | 84 +++++++++------ + drivers/bus/mhi/core/pm.c | 15 ++- + drivers/bus/mhi/pci_generic.c | 228 +++++++++++++++++++++++++++++++++++----- + include/linux/mhi.h | 2 +- + 8 files changed, 298 insertions(+), 98 deletions(-) +Merging memblock/for-next (097d43d85704 mm: memblock: remove return value of memblock_free_all()) +$ 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 (e71ba9452f0b Linux 5.11-rc2) +$ git merge counters/counters +Already up to date. +Merging iomem-mmap-vs-gup/topic/iomem-mmap-vs-gup (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge iomem-mmap-vs-gup/topic/iomem-mmap-vs-gup +Already up to date. +Merging akpm-current/current (c661e4987275 gdb: lx-symbols: store the abspath()) +$ git merge --no-ff akpm-current/current +Auto-merging mm/vmalloc.c +Auto-merging mm/util.c +Auto-merging mm/slab.c +Auto-merging mm/memory_hotplug.c +Auto-merging mm/filemap.c +Auto-merging kernel/fork.c +Auto-merging init/Kconfig +Auto-merging include/linux/sched.h +Auto-merging include/linux/pgtable.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/fs.h +Auto-merging fs/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/filesystems/proc.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kdump/kdump.rst | 3 +- + Documentation/admin-guide/kernel-parameters.txt | 20 + + Documentation/admin-guide/mm/hugetlbpage.rst | 11 + + Documentation/admin-guide/mm/memory-hotplug.rst | 9 + + Documentation/admin-guide/mm/transhuge.rst | 2 +- + Documentation/admin-guide/mm/userfaultfd.rst | 107 +++-- + Documentation/core-api/mm-api.rst | 1 + + Documentation/filesystems/proc.rst | 37 +- + Documentation/vm/page_owner.rst | 2 +- + MAINTAINERS | 4 +- + arch/Kconfig | 20 + + arch/arm64/Kconfig | 1 + + arch/arm64/kernel/sleep.S | 2 +- + arch/arm64/mm/hugetlbpage.c | 7 +- + arch/ia64/Kconfig | 6 +- + arch/ia64/include/asm/syscall.h | 2 +- + arch/ia64/kernel/head.S | 1 - + arch/ia64/kernel/ptrace.c | 24 +- + arch/ia64/mm/hugetlbpage.c | 3 +- + arch/mips/mm/hugetlbpage.c | 4 +- + arch/parisc/mm/hugetlbpage.c | 2 +- + arch/powerpc/Kconfig | 6 +- + arch/powerpc/mm/hugetlbpage.c | 3 +- + arch/s390/mm/hugetlbpage.c | 2 +- + arch/sh/include/asm/tlb.h | 10 +- + arch/sh/mm/hugetlbpage.c | 2 +- + arch/sparc/mm/hugetlbpage.c | 2 +- + arch/sparc/mm/init_64.c | 1 + + arch/x86/Kconfig | 1 + + arch/x86/kernel/acpi/wakeup_64.S | 2 +- + arch/x86/mm/init_64.c | 202 +++++--- + arch/x86/mm/pat/set_memory.c | 8 + + block/blk-cgroup.c | 17 +- + drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c | 2 +- + fs/Kconfig | 6 + + fs/aio.c | 9 +- + fs/binfmt_misc.c | 29 +- + fs/buffer.c | 56 ++- + fs/fat/fatent.c | 2 +- + fs/hugetlbfs/inode.c | 6 +- + fs/iomap/direct-io.c | 24 +- + fs/ocfs2/blockcheck.c | 2 +- + fs/ocfs2/namei.c | 17 +- + fs/proc/base.c | 4 +- + fs/proc/fd.c | 20 +- + fs/proc/page.c | 40 +- + fs/proc/task_mmu.c | 5 +- + fs/userfaultfd.c | 149 ++++-- + include/linux/bootmem_info.h | 65 +++ + include/linux/compaction.h | 1 - + include/linux/compat.h | 1 - + include/linux/compiler-clang.h | 6 + + include/linux/compiler-gcc.h | 8 +- + include/linux/fs.h | 2 + + include/linux/gfp.h | 21 +- + include/linux/highmem.h | 28 +- + include/linux/hugetlb.h | 72 ++- + include/linux/hugetlb_cgroup.h | 34 +- + include/linux/kasan.h | 5 +- + include/linux/memblock.h | 4 +- + include/linux/memcontrol.h | 146 +++--- + include/linux/memory_hotplug.h | 27 -- + include/linux/memremap.h | 6 + + include/linux/migrate.h | 1 + + include/linux/mm.h | 52 +++ + include/linux/mm_types.h | 1 + + include/linux/mmzone.h | 13 +- + include/linux/nmi.h | 1 + + include/linux/page-flags-layout.h | 62 ++- + include/linux/pgtable.h | 12 + + include/linux/sched.h | 10 +- + include/linux/sched/mm.h | 30 +- + include/linux/shmem_fs.h | 26 +- + include/linux/stop_machine.h | 11 +- + include/linux/swap.h | 7 + + include/linux/userfaultfd_k.h | 49 +- + include/linux/vm_event_item.h | 8 + + include/linux/vmstat.h | 24 +- + include/linux/wait.h | 4 +- + include/trace/events/migrate.h | 3 +- + include/trace/events/mmflags.h | 7 + + include/uapi/linux/mempolicy.h | 7 + + include/uapi/linux/userfaultfd.h | 38 +- + init/Kconfig | 8 +- + kernel/async.c | 2 +- + kernel/cgroup/cgroup.c | 34 +- + kernel/cgroup/rstat.c | 63 +-- + kernel/crash_core.c | 7 + + kernel/fork.c | 36 +- + kernel/hung_task.c | 44 ++ + kernel/sysctl.c | 10 +- + kernel/watchdog.c | 21 + + kernel/watchdog_hld.c | 1 + + lib/Kconfig.debug | 6 + + lib/Kconfig.kasan | 6 +- + lib/bch.c | 2 +- + lib/decompress_unlzma.c | 2 +- + mm/Kconfig | 7 + + mm/Makefile | 2 + + mm/bootmem_info.c | 127 +++++ + mm/cma.c | 12 +- + mm/compaction.c | 13 +- + mm/dmapool.c | 2 +- + mm/filemap.c | 67 ++- + mm/frontswap.c | 12 +- + mm/gup.c | 174 ++++--- + mm/gup_test.c | 29 +- + mm/gup_test.h | 3 +- + mm/highmem.c | 17 +- + mm/huge_memory.c | 18 +- + mm/hugetlb.c | 585 ++++++++++++++++++------ + mm/hugetlb_cgroup.c | 12 +- + mm/hugetlb_vmemmap.c | 293 ++++++++++++ + mm/hugetlb_vmemmap.h | 51 +++ + mm/internal.h | 9 +- + mm/interval_tree.c | 2 +- + mm/kasan/common.c | 2 +- + mm/kasan/kasan.h | 2 +- + mm/kasan/report_generic.c | 4 +- + mm/kfence/report.c | 30 +- + mm/khugepaged.c | 45 +- + mm/madvise.c | 13 +- + mm/memcontrol.c | 480 ++++++++++--------- + mm/memory-failure.c | 38 +- + mm/memory.c | 42 +- + mm/memory_hotplug.c | 118 +---- + mm/mempolicy.c | 80 ++-- + mm/mempool.c | 2 +- + mm/memremap.c | 22 +- + mm/migrate.c | 2 +- + mm/mlock.c | 4 +- + mm/mm_init.c | 4 - + mm/mmap.c | 18 +- + mm/mremap.c | 3 +- + mm/msync.c | 6 +- + mm/oom_kill.c | 2 +- + mm/page-writeback.c | 9 +- + mm/page_alloc.c | 285 ++++++------ + mm/page_owner.c | 12 +- + mm/process_vm_access.c | 1 - + mm/shmem.c | 94 ++-- + mm/slab.c | 2 +- + mm/sparse-vmemmap.c | 280 ++++++++++++ + mm/sparse.c | 3 +- + mm/swap_state.c | 13 +- + mm/swapfile.c | 4 +- + mm/userfaultfd.c | 62 +-- + mm/util.c | 24 +- + mm/vmalloc.c | 8 +- + mm/vmscan.c | 10 +- + mm/vmstat.c | 35 +- + mm/zswap.c | 2 +- + samples/vfio-mdev/mdpy.c | 4 +- + scripts/Makefile.kasan | 10 +- + scripts/gdb/linux/symbols.py | 3 +- + scripts/spelling.txt | 3 + + security/Kconfig.hardening | 4 +- + tools/testing/selftests/cgroup/test_kmem.c | 22 +- + tools/testing/selftests/vm/gup_test.c | 36 +- + tools/testing/selftests/vm/userfaultfd.c | 444 ++++++++++++++---- + 161 files changed, 3823 insertions(+), 1832 deletions(-) + create mode 100644 include/linux/bootmem_info.h + create mode 100644 mm/bootmem_info.c + create mode 100644 mm/hugetlb_vmemmap.c + create mode 100644 mm/hugetlb_vmemmap.h +$ git am -3 ../patches/0001-Revert-userfaultfd-selftests-exercise-minor-fault-ha.patch +Applying: Revert "userfaultfd/selftests: exercise minor fault handling shmem support" +$ git reset HEAD^ +Unstaged changes after reset: +M tools/testing/selftests/vm/userfaultfd.c +$ git add -A . +$ git commit -v -a --amend +[master c349a239aa23] Merge branch 'akpm-current/current' + Date: Thu Mar 11 15:03:38 2021 +1100 +$ git am -3 ../patches/0002-Revert-userfaultfd-selftests-reinitialize-test-conte.patch +Applying: Revert "userfaultfd/selftests: reinitialize test context in each test" +$ git reset HEAD^ +Unstaged changes after reset: +M tools/testing/selftests/vm/userfaultfd.c +$ git add -A . +$ git commit -v -a --amend +[master 53620b2a1bb8] Merge branch 'akpm-current/current' + Date: Thu Mar 11 15:03:38 2021 +1100 +$ git am -3 ../patches/0003-Revert-userfaultfd-selftests-create-alias-mappings-i.patch +Applying: Revert "userfaultfd/selftests: create alias mappings in the shmem test" +$ git reset HEAD^ +Unstaged changes after reset: +M tools/testing/selftests/vm/userfaultfd.c +$ git add -A . +$ git commit -v -a --amend +[master c88835e0fd71] Merge branch 'akpm-current/current' + Date: Thu Mar 11 15:03:38 2021 +1100 +$ git am -3 ../patches/0004-Revert-userfaultfd-selftests-use-memfd_create-for-sh.patch +Applying: Revert "userfaultfd/selftests: use memfd_create for shmem test type" +$ git reset HEAD^ +Unstaged changes after reset: +M tools/testing/selftests/vm/userfaultfd.c +$ git add -A . +$ git commit -v -a --amend +[master ea5d8dee5961] Merge branch 'akpm-current/current' + Date: Thu Mar 11 15:03:38 2021 +1100 +$ git am -3 ../patches/0005-Revert-userfaultfd-support-minor-fault-handling-for-.patch +Applying: Revert "userfaultfd: support minor fault handling for shmem" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/userfaultfd.c +M include/linux/shmem_fs.h +M include/uapi/linux/userfaultfd.h +M mm/memory.c +M mm/shmem.c +M mm/userfaultfd.c +$ git add -A . +$ git commit -v -a --amend +[master d2a15e88783e] Merge branch 'akpm-current/current' + Date: Thu Mar 11 15:03:38 2021 +1100 +$ 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 +
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 620e981d0da6...d2a15e88783e akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (d2a15e88783e Merge branch 'akpm-current/current') +$ git merge --no-ff akpm/master +Already up to date. diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..9adaec8c9683 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20210311 |