diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-11-30 19:32:24 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-11-30 19:32:24 +1100 |
| commit | c6b11acc5f85b6e11d128fad8e0b7b223aa7e33f (patch) | |
| tree | 31c3274e78cd2c25ba692e091f7c1d6fa023c2ac | |
| parent | 726aa9e1bea551e68f01a1045a10ea74a726335c (diff) | |
| download | linux-next-next-20201130.tar.gz | |
Add linux-next specific files for 20201130next-20201130
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 328 | ||||
| -rw-r--r-- | Next/Trees | 330 | ||||
| -rw-r--r-- | Next/merge.log | 12232 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 12891 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..5d3c0e40aa92 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,328 @@ +Name SHA1 +---- ---- +origin f91a3aa6bce480fe6e08df540129f4a923222419 +fixes 168af485621a8a2bc268c3d2b01a0776d8c1d4ff +kbuild-current d1889589a4f54b2d1d7075d608b596d6fcfd3d96 +arc-current f737561c709667013d832316dd3198a7fe3d1260 +arm-current 9fa2e7af3d53a4b769136eccc32c02e128a4ee51 +arm64-fixes ff1712f953e27f0b0718762ec17d0adb15c9fd0b +arm-soc-fixes ae597565d13febc73b9066c05935c1003a57a03e +drivers-memory-fixes 3650b228f83adda7e5ee532e2b90429c03f7b9ec +m68k-current 50c5feeea0af99a4401fd54fd72bec1333a496ca +powerpc-fixes b6b79dd53082db11070b4368d85dd6699ff0b063 +s390-fixes 1179f170b6f0af7bb0b3b7628136eaac450ddf31 +sparc 0a95a6d1a4cd6e10e70f8a6c93dc2ecd02e7d6ab +fscrypt-current d19d8d345eecd9247cbe6cbf27aef271bd88aba7 +net 4d521943f76bd0d1e68ea5e02df7aadd30b2838a +bpf 9a44bc9449cfe7e39dbadf537ff669fb007a9e63 +ipsec 48f486e13ffdb49fbb9b38c21d0e108ed60ab1a2 +netfilter 4d521943f76bd0d1e68ea5e02df7aadd30b2838a +ipvs c0700dfa2cae44c033ed97dade8a2679c7d22a9d +wireless-drivers fe56d05ee6c87f6a1a8c7267affd92c9438249cc +mac80211 849920c703392957f94023f77ec89ca6cf119d43 +rdma-fixes 17475e104dcb74217c282781817f8f52b46130d3 +sound-current aeedad2504997be262c98f6e3228173225a8d868 +sound-asoc-fixes 356c199d0b72f76b254af062e6c1c1e9beac6166 +regmap-fixes e6e9354b58307c120afbdc2719a6093638c37446 +regulator-fixes 34c5aa2666db54c4bd330fb2759f6e4d4544ad7a +spi-fixes 893ff790cf6a4cccc5d168f4cfc1acde9fbdfbfc +pci-current cce14622a7031ec9a9a62cf09edd67dcbfb0d063 +driver-core.current f8394f232b1eab649ce2df5c5f15b0e528c92091 +tty.current 418baf2c28f3473039f2f7377760bd8f6897ae18 +usb.current 484cfbe5fb61469a5f5a276258a8b3973164b56f +usb-gadget-fixes 129aa9734559a17990ee933351c7b6956f1dba62 +usb-serial-fixes 6d6556c04ebaeaf4e7fa8b791c97e2a7c41b38a3 +usb-chipidea-fixes 3ed55d528a5473f2826e8e27cf688c047c6754ae +phy fb89b2544b645527b3a359176999a416e65f5ada +staging.current 418baf2c28f3473039f2f7377760bd8f6897ae18 +char-misc.current c7acb6b9c07b4b75dffadc3b6466b1b43b3fda21 +soundwire-fixes 3650b228f83adda7e5ee532e2b90429c03f7b9ec +thunderbolt-fixes 600c0849cf86b75d86352f59745226273290986a +input-current 855b69857830f8d918d715014f05e59a3f7491a0 +crypto-current c3a98c3ad5c0dc60a1ac66bf91147a3f39cac96b +ide 6800cd8cbc6e35989f8d1aa20fac58031231b90f +vfio-fixes e4eccb853664de7bcf9518fb658f35e748bf1f68 +kselftest-fixes 7d764b685ee1bc73a9fa2b6cb4d42fa72b943145 +modules-fixes 57baec7b1b0459ef885e816d8c28a9d9a62bb8de +dmaengine-fixes 418baf2c28f3473039f2f7377760bd8f6897ae18 +backlight-fixes bbf5c979011a099af5dc76498918ed7df445635b +mtd-fixes b36bf0a0fe5d18561dd98eb774ef61dd396edc42 +mfd-fixes bbf5c979011a099af5dc76498918ed7df445635b +v4l-dvb-fixes 44f28934af141149959c4e6495bb60c1903bda32 +reset-fixes b460e0a9e2404450a0cc4c5e6476483d6cda1b26 +mips-fixes ac3b57adf87ad9bac7e33ca26bbbb13fae1ed62b +at91-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +omap-fixes 05d5de6ba7dbe490dd413b5ca11d0875bd2bc006 +kvm-fixes c2b1209d852fef65dbe13c1eed2c6d7a8cd0d1f8 +kvms390-fixes 735931f9a51ab09cf795721b37696b420484625f +hwmon-fixes 418baf2c28f3473039f2f7377760bd8f6897ae18 +nvdimm-fixes 88b67edd7247466bc47f01e1dc539b0d0d4b931e +btrfs-fixes 462b8e885b92459dcca35f5df9266190b89c7da1 +vfs-fixes 4bbf439b09c5ac3f8b3e9584fe080375d8d0ad2d +dma-mapping-fixes 892fc9f6835ecf075efac20789b012c5c9997fcc +i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +drivers-x86-fixes c9aa128080cbce92f8715a9328f88d8ca3134279 +samsung-krzk-fixes cd12e4f14f7cca7d04fbcf0da2dc116070d7f26f +pinctrl-samsung-fixes 3650b228f83adda7e5ee532e2b90429c03f7b9ec +devicetree-fixes bdac39a3bd28891fb0ded91c9152459c57773462 +scsi-fixes e92643db514803c2c87d72caf5950b4c0a8faf4a +drm-fixes 9595930db4bb91433607441a5f26d90e9c6e34eb +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 280ffdb6ddb5de85eddd476a3bcdc19c9a80f089 +mmc-fixes a42a7ec9bb99a17869c3b9f3d365aaf2bdb1a554 +rtc-fixes 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +gnss-fixes 48778464bb7d346b47157d21ffde2af6b2d39110 +hyperv-fixes 5f1251a48c17b54939d7477305e39679a565382c +soc-fsl-fixes 2663b3388551230cbc4606a40fabf3331ceb59e4 +risc-v-fixes 30aca1bacb398dec6c1ed5eeca33f355bd7b6203 +pidfd-fixes aabe19b8279340c43294688b4d9527a893c60463 +fpga-fixes 8614afd689df59d9ce019439389be20bd788a897 +spdx 3cea11cd5e3b00d91caf0b4730194039b45c5891 +gpio-intel-fixes 3650b228f83adda7e5ee532e2b90429c03f7b9ec +pinctrl-intel-fixes 5f714771d01e0e0d410f06d4d192fb27b1ca0edd +erofs-fixes a30573b3cdc77b8533d004ece1ea7c0146b437a0 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 3084db0e0d5076cd48408274ab0911cd3ccdae88 +ubifs-fixes 78c7d49f55d8631b67c09f9bfbe8155211a9ea06 +memblock-fixes b9bc36704cca500e2b41be4c5bf615c1d7ddc3ce +drm-misc-fixes aec9fe892812ed10d0bffcf309d2a8fc380d8ce6 +kspp-gustavo 36f9ff9e03de89691274a6aec45aa079bd3ae405 +kbuild 0ce21d58b7afbc2ebc65003be65b00fc2dacbe9f +compiler-attributes 971385eae4fc291f5564042b0c505cff18aa9270 +dma-mapping 7679325702c90aecd393cd7cde685576c14489c0 +asm-generic 8eb42bcea5aeb292101a9e4fd4becdc9f4728bb1 +arc def9d2780727cec3313ed3522d0123158d87224d +arm 40bd54f129026a114a76cd6e756659373cf40151 +arm64 78fae44603f14fabff773656d004bd9d39aaa03b +arm-perf 367c820ef08082e68df8a3bc12e62393af21e4b5 +arm-soc 33fa6976a384e255bbd7509b892a28731c3330f2 +amlogic 84a1411c7549ef515a4ac18b1820ccd50959ecd2 +aspeed 41707a524026f9575d6f3a1162cc138f26fa5ca6 +at91 65cc8babccce821c69abbf6aaf4b13d3823a9b51 +drivers-memory a4f11eac544c4e841295236734b7ca35a4d25dcd +imx-mxs 24462a1e187c4797e2ee803f33cc326e8941a336 +keystone b2a8f6ce4bdcc33b8286a2a85b07edbdc778393b +mediatek 727bfb2c55b0838d09e9578abd9feca1d31438b4 +mvebu 5c5bf284e9e46ec7e2c0029b47e0dab70ba3f09b +omap 6a5044c84dfaf157929731176b867acc0639c08c +qcom ab57017c45f24f54f3af70fd04ad4ad7f0e3633f +raspberrypi 278407a53c3b33fb820332c4d39eb39316c3879a +realtek 486f29df69413411a205d3101bae0427a892bee4 +renesas d5360d3b5aeeef32ff4da8648b172ff78c6a35f9 +reset 3bfe8933f9d187f93f0d0910b741a59070f58c4c +rockchip db4d9df435338f468a5f22fc96025195cc23633a +samsung-krzk 4792bcc967710e3ebb61ab77f2dd53f5884b3952 +scmi d07628cb5092356bf0473856a4f252589fd313bf +stm32 814fddb955f8b655057ba70cf676b1db66281c76 +sunxi 8ebd74f80194b918a68ca59e7f1081488dcf24dd +tegra b11a0dfbd31639724176a1820e34bd6d8c168022 +ti-k3 1e3d655fe7b48c2341d63f981774742e21744f53 +ti-k3-new 090f54565722bda792c8ecbab70e68a8f0847ee1 +clk 9dc1f9729380068673914f62ba12469be9f261a2 +clk-samsung 44a9e78f9242872c889f176782777fa2ed535650 +csky ba3b26607f55dce39fedd99e6823ef78101fc4a2 +h8300 8808515be0ed4e33de9bfdc65f4c1b547ee11065 +ia64 c331649e637152788b0ca1c857d0c2eaf34fcbc3 +m68k a7b5458ce73b235be027cf2658c39b19b7e58cf2 +m68knommu d0198645d610dae3e56c7a69a00603bd3c539184 +microblaze ed2124c0b9a8d2c09e3b5b9ca9827187c5fcbe71 +mips 1dac4585f585d3aa1a5af4821128ea2642700e48 +nds32 54bde873682b467f781f352effdb52d24e0a0c30 +nios2 6b57fa4d374bb8c005dee396c56598c14b9c01a6 +openrisc d8398bf840f8964220508aff7901c924e322f5e8 +parisc-hd 19621e5fd02b07c14f0ea172aaa58a2f524391b3 +powerpc 0bd4b96d99108b7ea9bac0573957483be7781d70 +fsl a76bea0287ce13d28494b19649d80d8ee5e7b757 +soc-fsl e95f287deed2454b8cad5b27859271db30130b2b +risc-v b5b11a8ac4b5a997a1b3ae388aea3879e26c857f +s390 b79e43ff5aa08f6ebc8e87f2f55e8d3775d16df5 +sh b0cfc315ff38c423a5ce9ce159bd5baa4135e688 +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml 9a5085b3fad5d5d6019a3d160cdd70357d35c8b1 +xtensa dc293f2106903ab9c24e9cea18c276e32c394c33 +fscrypt 4a4b8721f1a5e4b01e45b3153c68d5a1014b25de +afs 8409f67b6437c4b327ee95a71081b9c7bfee0b00 +btrfs 30da94ea78c2a6b337a7007fe1288ba41c81af52 +ceph 62575e270f661aba64778cbc5f354511cf9abb21 +cifs cab4cc1e5a42fe7272bcb7cd36db87557ed60375 +configfs 65cdb4a214c0015c19fc1876896746c05396f45d +ecryptfs 8b614cb8f1dcac8ca77cf4dd85f46ef3055f8238 +erofs 1b2b66d55670675a96b533cf1076fc38fa8646c2 +exfat f9893351acaecf0a414baf9942b48d5bb5c688c6 +ext3 d2bc88b6e0fd878e89dc5b4e2094e5e35b050023 +ext4 f902b216501094495ff75834035656e8119c537f +f2fs 632cc618fa14e9b36dac2062c4359c97e285ffaa +fsverity bde493349025ca0559e2fff88592935af3b8df19 +fuse 9d769e6aa2524e1762e3b8681e0ed78f8acf6cad +jfs c61b3e4839007668360ed8b87d7da96d2e59fc6c +nfs 418baf2c28f3473039f2f7377760bd8f6897ae18 +nfs-anna 11decaf8127b035242cb55de2fc6946f8961f671 +nfsd c3213d260a23e263ef85ba21ac68c9e7578020b5 +cel e0d8f79730f5df675cb556794271f20a1c8a3648 +orangefs e848643b524be9c10826c2cf36eebb74eef643d2 +overlayfs c11faf32599fee59f33896c8d59f9b3c17ca76fc +ubifs e2a05cc7f8229e150243cdae40f2af9021d67a4a +v9fs 5bfe97d7382b5c1ec351c59a878e742c9fd73d38 +xfs eb8409071a1d47e3593cfe077107ac46853182ab +zonefs 48bfd5c6fac10e10b7066bf4aeb919ed9a4e87d3 +iomap 1a31182edd0083bb9f26e582ed39f92f898c4d0a +djw-vfs 9b8523423b23ee3dfd88e32f5b7207be56a4e782 +file-locks 8d1ddb5e79374fb277985a6b3faa2ed8631c5b4c +vfs 61c207915a76a32e7ca40dd47e3af4acec896c0d +printk eb4e76080fcf0b16f6546cb19c997dc787e96654 +pci 46f821a9cff21f29eec03f589d0131194c1a59f2 +pstore 3cea11cd5e3b00d91caf0b4730194039b45c5891 +hid cdaa1e42b4832bcc7e94994285e3c9be3f56beca +i2c c97e7615c15bd2c1237796cd877b56bd197c50d1 +i3c 015cbe1f05067cb0374514fcf0a45e17a2b39527 +dmi 3cb4d29a2633170208c96240c7e85148679ceee3 +hwmon-staging 439ed83acc19a2cecc64a114b7872217f77b5f81 +jc_docs ac7711427014a84ba08353df2b77f115565216d8 +v4l-dvb a3f132df0e5f25399c9592c2d14997975ddbf290 +v4l-dvb-next d0a9fffedca102633c168adaf157f34288a4ea67 +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm 735f7fba25ec002ec984d45612afaa3a553fe05d +cpufreq-arm 32c855670808fdd5b2fa6b4b4217a24f2edeee32 +cpupower 748f0d70087c56226bf1df1f91a00b7ab4c8f883 +devfreq 98fd9972ed60d26915227a8c7febbd86e262a96b +opp ed40e33c0b912abb271e5b884e4e4e518326ebe0 +thermal 90a996544946d1d4834ec2ec8add586edd905779 +thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 67f8e65e4fc19e24993e8780f41279eeffbd0610 +dlm 4f19d071f9bee1bb2040ae73436314a5ec9ede44 +swiotlb fc0021aa340af65a0a37d77be39e22aa886a6132 +rdma dd37d2f59eb839d51b988f6668ce5f0d533b23fd +net-next e71d2b957ee49fe3ed35a384a4e31774de1316c1 +bpf-next bb1b25cab04324d0749f7ae22653aff58157bf83 +ipsec-next 8be33ecfc1ffd2da20cc29e957e4cb6eb99310cb +mlx5-next 3650b228f83adda7e5ee532e2b90429c03f7b9ec +netfilter-next 988187e8810364dc02f3ceb7cab497f4a2e9003f +ipvs-next 988187e8810364dc02f3ceb7cab497f4a2e9003f +wireless-drivers-next 7ec8a926188eb8e7a3cbaca43ec44f2d7146d71b +bluetooth 7c66018139629bfd16fe09b982916cc6c814c8d6 +mac80211-next 0064c5c1b3bf2a695c772c90e8dea38426a870ff +gfs2 5927aa13822aa2dc23f317b403beb054aeda9f9b +mtd 22ca56a34b32862a7eb621ec1c5b3bd3c6aae7ca +nand 9ec8e263068f2d0ad3c84decdca9d4748a7e1cad +spi-nor ad624dfd7bb69a20ff06804ece25bc27200f2ea2 +crypto 05c2a705917b77e0915cca3551583583f4eafcf8 +drm 22f8c80566c4a29a0d8b5ebf24aa1fd1679b39e5 +amdgpu 7ff818f97c306f3e557d724bcebb1df31685f122 +drm-intel 5cc2b61fb251d06f732b14b04f8f6510f3b31365 +drm-tegra bf3a3cdcad40e5928a22ea0fd200d17fd6d6308d +drm-misc a96ee0f6b58de5c4f627489b2d31a5099a779cb9 +drm-msm ff8b941a39d1d09db0ca51fb479172c7b5b88659 +imx-drm 099e5bde9bd226099781ba5b4f46df62df30cebf +etnaviv 4612bad5701e158f3c40951f2c7aa8e64b3445eb +regmap cc65f43aa88f7951a7ac3a013193ff9f4e875156 +sound 0183a855eeb78c11b45505d72a078c145a71e6fc +sound-asoc 7cd624c7d41a1ebf6af882b4c26de2732f47ab22 +modules 2aec389e19150ed3bf67ab708f2435563f76050f +input f7bda6662fd4f39113b4dee00f7ded44f846b7f4 +block 090a2a2a647cd1df8f01ba868d658fd84ea46f05 +device-mapper 3f5dba110d1241b6e446b7693eeba34e50b73645 +pcmcia 46d0797906633d82bd50ef26780ee39fac5d27d6 +mmc 8223e885e74b6424cd5b0ab1de4581ca017b7a4e +mfd 14639a22de657eabbb776f503a816594393cc935 +backlight 789eb04b6c569e3e5007afd040bef5d7216d2f3a +battery faa2cec66798b17aea9c53756a1354e8a7ea54ef +regulator ec0abec390d42669794b0db01c0e6dc16cefb02d +security 3650b228f83adda7e5ee532e2b90429c03f7b9ec +apparmor e37986097ba63c94b1af9d5ad5486d120a809f72 +integrity b000d5cb954fe25ac1ea929ae6da321033ace927 +keys b6f61c31464940513ef4eccb3a030a405b4256d6 +safesetid 03ca0ec138927b16fab0dad7b869f42eb2849c94 +selinux 3df98d79215ace13d1e91ddfc5a67a0f5acbd83f +smack 9b0072e2b2b588ad75c94f2c6e6c52c8f4bd2657 +tomoyo 1b6b924efeb9e46f0ca2ebe5b9bb6b276defe52d +tpmdd 1ce46c91fdfe5ebf27a6d328b108c630406d1c8c +watchdog 3650b228f83adda7e5ee532e2b90429c03f7b9ec +iommu 4dd6ce478003525df8618750d30f0b90380047a7 +audit ba59eae723857257a791618092d8022ad82efaa4 +devicetree 616fde2dd60f9f956dc77ed7e284129de6dc97d2 +mailbox c7dacf5b0f32957b24ef29df1207dc2cd8307743 +spi 893e98cc5f631b0143262c1b2187f581e2d039a0 +tip c1c38fd953ac77525dc0f302c9f69749ce4832d7 +clockevents e588acdb8087dfe3c524738cb5f8294fc5ca0c22 +edac 8763e5cbb958ab54be29314dadf171673f6ed7c8 +irqchip 74cde1a53368aed4f2b4b54bf7030437f64a534b +ftrace b111545d26c0d66dd9aae668d9373669e752b075 +rcu 5ca88db79d8d7d8fa645caa17173592ca22003b2 +kvm e792415c5d3e0eb52527cce228a72e4392f8cae2 +kvm-arm 90f0e16c649ac3e93094cb491072d6424f53be43 +kvm-ppc cf59eb13e151ef42c37ae31864046c17e481ed8f +kvms390 d121365715a0ea87aacdc7ab01ffd08c0029b5bc +xen-tip 65cae18882f943215d0505ddc7e70495877308e6 +percpu eb4c8d15efdaf1661759d8da2c7bfffe5d881343 +workqueues ac87f8ff6cf1bd974de00a27699791bbc2a4a925 +drivers-x86 912b341585e302ee44fc5a2733f7bcf505e2c86f +chrome-platform de0f49487db3667f5204dcec6d3482c9bd1a0a30 +hsi 41fff6e19bc8d6d8bca79ea388427c426e72e097 +leds 98650b0874171cc443251f7b369d3b1544db9d4e +ipmi 368ffd9adc7a01234c0c68ffd72cc76840f20134 +driver-core 33c0c9bdf7a59051a654cd98b7d2b48ce0080967 +usb ab37fa851c488be805f6568ecaabb67b13cd937c +usb-gadget b2c586eb07efab982419f32b7c3bd96829bc8bcd +usb-serial 053af9e6e817fe58191b0d27bc67ba329d94ced2 +usb-chipidea-next d75fcc0d4da2c815b2ab44357da4f48d9bf81808 +phy-next 768a711e2d4b5e348962254a1c4f9fbfb6f13904 +tty f35a07f92616700733636c06dd6e5b6cdc807fe4 +char-misc f80c21509984190b7fd462ed2c9ac5a294a99dc5 +extcon 54589b557a8dd21c735dbef6a8e0995ef5a11145 +soundwire 47edc0104c61d609b0898a302267b7269d87a6af +thunderbolt 4e58171aa93fe8caf4f6e5e9972b7abe117c0014 +vfio 2e6cfd496f5b57034cf2aec738799571b5a52124 +staging 1de16e38f1fdbfd9d842a06919098813ed93abf7 +mux 05f19f7f8944b6a269b2ac152bceaa322138be6b +icc 8fb0f9de8eaf75c8a4665a1b2d7c72ae8ec0e4dc +dmaengine 5d051f37f49d5bf04dca15fadea3a90a6a6f0f15 +cgroup 5a7b5f32c5aa628841502d19a813c633ff6ecbe4 +scsi f9123bc98a4ffb289491f8726b93f8aff7622175 +scsi-mkp 3256b4682386298ec106c1d1896b064f6a291f88 +vhost 502cb1133adb163aee602b1d8cca4d8bf5b76c96 +rpmsg ca08b94fd5593f453a171c74a6e299d78a4f2f0d +gpio 6c33287665e093cdf885e700487380b65e402d33 +gpio-brgl 5300ebb695fa0672589ab191062392f686fca75d +gpio-intel e709a7b5a066362b697d65dda90edc71f913df70 +pinctrl 8e5008b1a9a03c06dc259d4b25657caccaccd09f +pinctrl-intel 0b74e40a4e41f3cbad76dff4c50850d47b525b26 +pinctrl-samsung c5564a50d99019f3c713fa306d5feecc3e909b10 +pwm 228fe8e4deb27c0ad62c6b15e94dd8cb7aa6e544 +userns 4762edf556adda924ba6df65a4512040272579a4 +ktest ff131efff141fc679cccde28bc265f4c79cbe329 +random ab9a7e27044b87ff2be47b8f8e095400e7fccc44 +kselftest c2e46f6b3e3551558d44c4dc518b9667cb0d5f8b +y2038 c4e71212a245017d2ab05f322f7722f0b87a55da +livepatching 59fc1e476962eff9ef259355a9daf912b563aac0 +coresight c5348c8a239bd6c2c82e5cb68636611ea3fe532a +rtc 673536cc5f21b34785e386dd05510659bf6d92db +nvdimm a1b8638ba1320e6684aa98233c15255eb803fac7 +at24 3650b228f83adda7e5ee532e2b90429c03f7b9ec +ntb 3650b228f83adda7e5ee532e2b90429c03f7b9ec +seccomp 7ef95e3dbcee74caa303fe4b23c451ae4462f609 +kspp f2f20a989227f2dff722cec0ec3237acfa03b175 +gnss 48778464bb7d346b47157d21ffde2af6b2d39110 +fsi 4a851d714eadeabd65c7e321a2e7830f77d945c4 +slimbus 567d838588d8352fe6de37b261b28a8da1704fec +nvmem 292b72c982a628bbaa2c9f11adf0aeb41980f9b0 +xarray 80c1dbebf308a41badb8f1628247fe94dda99bfe +hyperv 206ad34d52a2f1205c84d08c12fc116aad0eb407 +auxdisplay 351dcacc6d774258be9fec6f51c14f8ff38243f6 +kgdb d081a6e353168f15e63eb9e9334757f20343319f +pidfd e06ce5515b74f628b78677e6736f66f6abb89b00 +hmm 3650b228f83adda7e5ee532e2b90429c03f7b9ec +fpga aaf8fe39c9521bfb42a6bd7da419186627c32e17 +kunit 3650b228f83adda7e5ee532e2b90429c03f7b9ec +generic-ioremap 4bdc0d676a643140bdf17dbf7eafedee3d496a3c +cfi 5de15b610f785f0e188fefb707f0b19de156968a +kunit-next 3650b228f83adda7e5ee532e2b90429c03f7b9ec +trivial 9ff9b0d392ea08090cd1780fb196f36dbb586529 +zx2c4 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e +mhi 10ea8bcda5ae5463889e15dfc98aa2a73270ea58 +notifications 841a0dfa511364fa9a8d67512e0643669f1f03e3 +memblock 5bdba520c1b318578caffd325515b35d187f8a0e +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters 3650b228f83adda7e5ee532e2b90429c03f7b9ec +akpm-current ab573a2b40b239a6db9b112568fb54a32cefa491 +akpm 76761ffa9ea1ddca78e817bf7eec5fcb0378a00c diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..c88d49e5525a --- /dev/null +++ b/Next/Trees @@ -0,0 +1,330 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#for-stable +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#master +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master +mac80211 git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git#master +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +usb-chipidea-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#for-usb-fixes +phy git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-linus +dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus +i3c-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#master +drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes git git://git.freedesktop.org/git/drm/drm.git#drm-fixes +amdgpu-fixes git git://people.freedesktop.org/~agd5f/linux#drm-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix +risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +pidfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +integrity-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#fixes +kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +ubifs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#fixes +memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git#for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +drivers-memory git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-next +mvebu git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +raspberrypi git git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git#for-next +realtek git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek.git#for-next +renesas git git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +stm32 git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +ti-k3 git git://git.kernel.org/pub/scm/linux/kernel/git/kristo/linux.git#ti-k3-next +ti-k3-new git git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux.git#ti-k3-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next +csky git git://github.com/c-sky/csky-linux.git#linux-next +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +nds32 git git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git#next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh git git://git.libc.org/linux-sh#for-next +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#master +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#fsverity +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +cel git git://git.linux-nfs.org/projects/cel/cel-2.6.git#cel-next +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +ubifs git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next +v9fs git git://github.com/martinetd/linux#9p-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next +djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +fbdev git git://github.com/bzolnier/linux.git#fbdev-for-next +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +thermal-rzhang git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next +thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#master +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.git#drm-next +amdgpu git git://people.freedesktop.org/~agd5f/linux#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next-testing +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +safesetid git https://github.com/micah-morton/linux.git#safesetid-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#next +tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master +tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvm-ppc git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#kvm-ppc-next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git#for-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#for-usb-next +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +vfio git git://github.com/awilliam/linux-vfio.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +icc git git://git.linaro.org/people/georgi.djakov/linux.git#icc-next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +y2038 git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038 +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +coresight git git://git.linaro.org/kernel/coresight.git#next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/xarray.git#main +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git https://github.com/ojeda/linux.git#auxdisplay +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#for-next +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +generic-ioremap git git://git.infradead.org/users/hch/ioremap.git#for-next +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +zx2c4 git git://git.kernel.org/pub/scm/linux/kernel/git/zx2c4/linux.git#for-next +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +notifications git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#notifications-pipe-core +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +init git git://git.infradead.org/users/hch/misc.git#init-user-pointers +counters git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#counters +akpm-current mmotm https://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm https://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..7ccdb9a55ea8 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,12232 @@ +$ date -R +Mon, 30 Nov 2020 08:02:11 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 73% (5887/7989)
Updating files: 74% (5912/7989)
Updating files: 75% (5992/7989)
Updating files: 76% (6072/7989)
Updating files: 77% (6152/7989)
Updating files: 78% (6232/7989)
Updating files: 79% (6312/7989)
Updating files: 80% (6392/7989)
Updating files: 81% (6472/7989)
Updating files: 82% (6551/7989)
Updating files: 83% (6631/7989)
Updating files: 84% (6711/7989)
Updating files: 85% (6791/7989)
Updating files: 86% (6871/7989)
Updating files: 87% (6951/7989)
Updating files: 88% (7031/7989)
Updating files: 89% (7111/7989)
Updating files: 90% (7191/7989)
Updating files: 91% (7270/7989)
Updating files: 92% (7350/7989)
Updating files: 93% (7430/7989)
Updating files: 94% (7510/7989)
Updating files: 95% (7590/7989)
Updating files: 96% (7670/7989)
Updating files: 97% (7750/7989)
Updating files: 98% (7830/7989)
Updating files: 99% (7910/7989)
Updating files: 100% (7989/7989)
Updating files: 100% (7989/7989), done. +HEAD is now at 85a2c56cb445 Merge tag 'pm-5.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm +Merging origin/master (f91a3aa6bce4 Merge tag 'locking-urgent-2020-11-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge origin/master +Updating 85a2c56cb445..f91a3aa6bce4 +Fast-forward + .mailmap | 1 + + .../bindings/display/brcm,bcm2711-hdmi.yaml | 6 + + Documentation/driver-api/media/drivers/vidtv.rst | 120 +- + Documentation/kbuild/llvm.rst | 5 +- + Documentation/networking/netdev-FAQ.rst | 26 + + MAINTAINERS | 22 +- + Makefile | 4 +- + arch/alpha/kernel/process.c | 2 +- + arch/arc/include/asm/pgtable.h | 2 + + arch/arm/boot/dts/am437x-l4.dtsi | 2 +- + arch/arm/boot/dts/dra76x.dtsi | 4 +- + arch/arm/include/asm/pgtable-2level.h | 2 + + arch/arm/include/asm/pgtable-3level.h | 2 + + arch/arm/kernel/process.c | 2 +- + arch/arm/mach-omap2/Kconfig | 3 +- + arch/arm/mach-omap2/cpuidle44xx.c | 8 +- + .../boot/dts/broadcom/stingray/stingray-usb.dtsi | 20 +- + arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 12 - + .../arm64/boot/dts/nvidia/tegra194-p3668-0000.dtsi | 2 +- + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 2 +- + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 20 +- + arch/arm64/boot/dts/nvidia/tegra234-sim-vdk.dts | 6 +- + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 72 +- + arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 4 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 3 + + arch/arm64/include/asm/pgtable.h | 34 +- + arch/arm64/include/asm/probes.h | 2 + + arch/arm64/kernel/process.c | 2 +- + arch/arm64/kvm/hyp/nvhe/hyp.lds.S | 5 + + arch/arm64/kvm/vgic/vgic-mmio-v3.c | 22 +- + arch/csky/kernel/process.c | 2 +- + arch/h8300/kernel/process.c | 2 +- + arch/hexagon/kernel/process.c | 2 +- + arch/ia64/kernel/process.c | 2 +- + arch/microblaze/kernel/process.c | 2 +- + arch/mips/include/asm/pgtable-32.h | 3 + + arch/mips/kernel/idle.c | 12 +- + arch/nios2/kernel/process.c | 2 +- + arch/openrisc/kernel/process.c | 2 +- + arch/parisc/kernel/process.c | 2 +- + arch/powerpc/Makefile | 1 - + arch/powerpc/include/asm/book3s/32/pgtable.h | 2 + + arch/powerpc/include/asm/book3s/64/kup-radix.h | 2 + + arch/powerpc/include/asm/nohash/32/pgtable.h | 2 + + arch/powerpc/kernel/exceptions-64s.S | 13 +- + arch/powerpc/kernel/head_book3s_32.S | 3 +- + arch/powerpc/kernel/idle.c | 4 +- + arch/powerpc/kvm/book3s_xive_native.c | 7 + + arch/riscv/include/asm/pgtable-32.h | 2 + + arch/riscv/include/asm/vdso/processor.h | 2 + + arch/riscv/kernel/process.c | 2 +- + arch/riscv/kernel/setup.c | 1 + + arch/riscv/kernel/vdso/Makefile | 2 +- + arch/s390/kernel/idle.c | 6 +- + arch/s390/kernel/uv.c | 9 +- + arch/s390/kvm/kvm-s390.c | 4 +- + arch/s390/kvm/pv.c | 3 +- + arch/s390/mm/gmap.c | 2 + + arch/sh/kernel/idle.c | 2 +- + arch/sparc/kernel/leon_pmc.c | 4 +- + arch/sparc/kernel/process_32.c | 2 +- + arch/sparc/kernel/process_64.c | 4 +- + arch/um/kernel/process.c | 2 +- + arch/x86/include/asm/kvm_host.h | 1 + + arch/x86/include/asm/mwait.h | 2 - + arch/x86/kernel/cpu/bugs.c | 4 +- + arch/x86/kernel/cpu/mce/core.c | 6 +- + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 65 +- + arch/x86/kernel/process.c | 12 +- + arch/x86/kernel/tboot.c | 5 +- + arch/x86/kvm/irq.c | 85 +- + arch/x86/kvm/lapic.c | 2 +- + arch/x86/kvm/mmu/mmu.c | 2 +- + arch/x86/kvm/svm/sev.c | 2 +- + arch/x86/kvm/svm/svm.c | 4 +- + arch/x86/kvm/x86.c | 18 +- + block/keyslot-manager.c | 7 + + drivers/acpi/arm64/iort.c | 8 +- + drivers/bus/ti-sysc.c | 29 +- + drivers/firmware/efi/Kconfig | 2 +- + drivers/firmware/efi/efi.c | 2 +- + drivers/firmware/xilinx/zynqmp.c | 65 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 1 + + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 20 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- + drivers/gpu/drm/ast/ast_mode.c | 17 +- + drivers/gpu/drm/exynos/Kconfig | 3 +- + drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 143 +- + drivers/gpu/drm/i915/gt/intel_breadcrumbs_types.h | 2 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 60 +- + drivers/gpu/drm/i915/gvt/gvt.h | 2 +- + drivers/gpu/drm/i915/i915_perf.c | 9 +- + drivers/gpu/drm/i915/i915_reg.h | 2 + + drivers/gpu/drm/i915/i915_request.h | 6 +- + drivers/gpu/drm/mediatek/mtk_dpi.c | 9 - + drivers/gpu/drm/mediatek/mtk_dsi.c | 61 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 8 +- + drivers/gpu/drm/vc4/vc4_drv.h | 4 + + drivers/gpu/drm/vc4/vc4_hdmi.c | 48 + + drivers/gpu/drm/vc4/vc4_hdmi.h | 11 + + drivers/gpu/drm/vc4/vc4_kms.c | 244 +++- + drivers/idle/intel_idle.c | 37 +- + drivers/infiniband/hw/hfi1/file_ops.c | 4 +- + drivers/infiniband/hw/hfi1/hfi.h | 2 +- + drivers/infiniband/hw/hfi1/mmu_rb.c | 68 +- + drivers/infiniband/hw/hfi1/mmu_rb.h | 16 +- + drivers/infiniband/hw/hfi1/user_exp_rcv.c | 12 +- + drivers/infiniband/hw/hfi1/user_exp_rcv.h | 6 + + drivers/infiniband/hw/hfi1/user_sdma.c | 13 +- + drivers/infiniband/hw/hfi1/user_sdma.h | 7 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 9 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 2 +- + drivers/infiniband/hw/i40iw/i40iw_main.c | 5 - + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 37 +- + drivers/infiniband/hw/mthca/mthca_cq.c | 10 +- + drivers/interconnect/core.c | 1 - + drivers/interconnect/qcom/msm8916.c | 12 +- + drivers/interconnect/qcom/msm8974.c | 12 + + drivers/interconnect/qcom/qcs404.c | 4 +- + drivers/iommu/amd/init.c | 27 +- + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 4 + + drivers/iommu/intel/dmar.c | 3 +- + drivers/iommu/intel/iommu.c | 4 +- + drivers/iommu/iommu.c | 10 +- + drivers/irqchip/irq-gic-v3-its.c | 16 +- + drivers/irqchip/irq-sni-exiu.c | 2 +- + drivers/media/test-drivers/vidtv/vidtv_bridge.c | 116 +- + drivers/media/test-drivers/vidtv/vidtv_bridge.h | 4 +- + drivers/media/test-drivers/vidtv/vidtv_channel.c | 312 +++- + drivers/media/test-drivers/vidtv/vidtv_channel.h | 11 +- + drivers/media/test-drivers/vidtv/vidtv_common.h | 1 - + drivers/media/test-drivers/vidtv/vidtv_demod.c | 2 +- + drivers/media/test-drivers/vidtv/vidtv_demod.h | 11 +- + drivers/media/test-drivers/vidtv/vidtv_encoder.h | 9 +- + drivers/media/test-drivers/vidtv/vidtv_mux.c | 248 ++-- + drivers/media/test-drivers/vidtv/vidtv_mux.h | 21 +- + drivers/media/test-drivers/vidtv/vidtv_pes.c | 179 ++- + drivers/media/test-drivers/vidtv/vidtv_pes.h | 8 +- + drivers/media/test-drivers/vidtv/vidtv_psi.c | 1521 ++++++++++++++------ + drivers/media/test-drivers/vidtv/vidtv_psi.h | 282 +++- + drivers/media/test-drivers/vidtv/vidtv_s302m.c | 125 +- + drivers/media/test-drivers/vidtv/vidtv_s302m.h | 9 +- + drivers/media/test-drivers/vidtv/vidtv_ts.c | 5 +- + drivers/media/test-drivers/vidtv/vidtv_ts.h | 5 +- + drivers/media/test-drivers/vidtv/vidtv_tuner.c | 5 +- + drivers/media/test-drivers/vidtv/vidtv_tuner.h | 1 + + drivers/misc/habanalabs/gaudi/gaudi.c | 2 + + drivers/mtd/nand/raw/ams-delta.c | 12 +- + drivers/mtd/nand/raw/au1550nd.c | 11 +- + drivers/mtd/nand/raw/cs553x_nand.c | 24 +- + drivers/mtd/nand/raw/davinci_nand.c | 8 +- + drivers/mtd/nand/raw/diskonchip.c | 29 +- + drivers/mtd/nand/raw/fsmc_nand.c | 30 +- + drivers/mtd/nand/raw/gpio.c | 11 +- + drivers/mtd/nand/raw/lpc32xx_mlc.c | 23 +- + drivers/mtd/nand/raw/lpc32xx_slc.c | 26 +- + drivers/mtd/nand/raw/mpc5121_nfc.c | 19 +- + drivers/mtd/nand/raw/orion_nand.c | 19 +- + drivers/mtd/nand/raw/pasemi_nand.c | 19 +- + drivers/mtd/nand/raw/plat_nand.c | 20 +- + drivers/mtd/nand/raw/r852.c | 40 +- + drivers/mtd/nand/raw/r852.h | 1 + + drivers/mtd/nand/raw/sharpsl.c | 32 +- + drivers/mtd/nand/raw/socrates_nand.c | 21 +- + drivers/mtd/nand/raw/tmio_nand.c | 33 +- + drivers/mtd/nand/raw/txx9ndfmc.c | 14 +- + drivers/mtd/nand/raw/xway_nand.c | 18 +- + drivers/net/bonding/bond_main.c | 61 +- + drivers/net/bonding/bond_sysfs_slave.c | 18 +- + drivers/net/can/m_can/m_can.c | 6 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 4 + + drivers/net/can/usb/gs_usb.c | 131 +- + drivers/net/ethernet/amazon/ena/ena_eth_com.c | 3 + + drivers/net/ethernet/amazon/ena/ena_netdev.c | 80 +- + drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 126 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 +- + drivers/net/ethernet/chelsio/Kconfig | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 3 +- + .../chelsio/inline_crypto/ch_ktls/chcr_ktls.c | 4 +- + drivers/net/ethernet/freescale/dpaa2/Kconfig | 2 + + drivers/net/ethernet/freescale/enetc/enetc_qos.c | 14 +- + drivers/net/ethernet/ibm/ibmvnic.c | 23 +- + drivers/net/ethernet/ibm/ibmvnic.h | 3 +- + drivers/net/ethernet/intel/i40e/i40e.h | 1 + + drivers/net/ethernet/intel/i40e/i40e_main.c | 22 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 26 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 +- + drivers/net/tun.c | 14 +- + drivers/net/usb/ipheth.c | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/api/sta.h | 10 +- + .../net/wireless/intel/iwlwifi/fw/api/time-event.h | 8 +- + drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 10 + + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 5 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 18 + + .../net/wireless/intel/iwlwifi/mvm/time-event.c | 103 +- + .../wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c | 20 + + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 36 +- + drivers/net/wireless/realtek/rtw88/fw.c | 2 +- + drivers/nfc/s3fwrn5/i2c.c | 4 +- + drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c | 5 - + drivers/phy/intel/Kconfig | 2 +- + drivers/phy/mediatek/Kconfig | 2 +- + drivers/phy/motorola/phy-cpcap-usb.c | 3 +- + drivers/phy/qualcomm/Kconfig | 4 +- + drivers/phy/qualcomm/phy-qcom-qmp.c | 2 +- + drivers/phy/tegra/xusb.c | 1 + + drivers/platform/x86/acer-wmi.c | 1 + + drivers/platform/x86/intel-vbtn.c | 6 + + drivers/platform/x86/thinkpad_acpi.c | 13 +- + drivers/platform/x86/toshiba_acpi.c | 3 +- + drivers/platform/x86/touchscreen_dmi.c | 50 + + drivers/ptp/ptp_clockmatrix.c | 49 +- + drivers/s390/net/qeth_core.h | 9 +- + drivers/s390/net/qeth_core_main.c | 82 +- + drivers/s390/net/qeth_l2_main.c | 18 +- + drivers/scsi/ufs/ufshcd.c | 37 +- + drivers/soc/fsl/dpio/dpio-driver.c | 5 +- + drivers/spi/spi-dw-core.c | 3 +- + drivers/spi/spi-imx.c | 1 + + drivers/spi/spi-nxp-fspi.c | 7 + + drivers/spi/spi.c | 5 + + drivers/tee/optee/call.c | 3 +- + drivers/usb/cdns3/gadget.c | 26 +- + drivers/usb/core/devio.c | 14 +- + drivers/usb/core/quirks.c | 10 + + drivers/usb/gadget/function/f_midi.c | 10 +- + drivers/usb/gadget/legacy/inode.c | 3 + + drivers/usb/typec/Kconfig | 1 + + drivers/usb/typec/stusb160x.c | 2 +- + fs/btrfs/ctree.h | 5 +- + fs/btrfs/file.c | 57 - + fs/btrfs/inode.c | 58 + + fs/btrfs/qgroup.c | 88 +- + fs/btrfs/tests/inode-tests.c | 12 +- + fs/btrfs/tree-checker.c | 3 + + fs/btrfs/volumes.c | 8 +- + fs/efivarfs/inode.c | 2 + + fs/efivarfs/super.c | 1 - + fs/io_uring.c | 39 +- + include/linux/firmware/xlnx-zynqmp.h | 4 - + include/linux/netdevice.h | 5 + + include/linux/pgtable.h | 13 + + include/linux/platform_data/ti-sysc.h | 1 + + include/net/bonding.h | 8 + + include/net/inet_hashtables.h | 5 +- + include/net/tls.h | 6 + + include/trace/events/writeback.h | 8 +- + include/uapi/linux/devlink.h | 2 + + include/uapi/linux/openvswitch.h | 2 + + init/Kconfig | 2 +- + kernel/printk/printk.c | 4 +- + kernel/printk/printk_ringbuffer.c | 2 - + kernel/sched/idle.c | 28 +- + net/batman-adv/log.c | 1 + + net/can/af_can.c | 7 +- + net/core/devlink.c | 56 +- + net/core/gro_cells.c | 7 +- + net/core/skbuff.c | 2 +- + net/dccp/ipv4.c | 2 +- + net/dccp/ipv6.c | 2 +- + net/ipv4/inet_connection_sock.c | 2 +- + net/ipv4/inet_hashtables.c | 68 +- + net/ipv4/tcp_cong.c | 5 + + net/ipv4/tcp_ipv4.c | 28 +- + net/ipv6/addrlabel.c | 26 +- + net/ipv6/tcp_ipv6.c | 26 +- + net/iucv/af_iucv.c | 4 +- + net/mptcp/subflow.c | 5 +- + net/openvswitch/actions.c | 7 +- + net/openvswitch/flow_netlink.c | 74 +- + net/packet/af_packet.c | 18 +- + net/rose/rose_loopback.c | 17 +- + net/tls/tls_device.c | 5 +- + net/tls/tls_sw.c | 6 + + net/vmw_vsock/virtio_transport_common.c | 8 +- + scripts/package/builddeb | 2 + + tools/perf/builtin-diff.c | 4 +- + tools/perf/util/dwarf-aux.c | 28 +- + tools/perf/util/hashmap.h | 15 +- + tools/perf/util/probe-finder.c | 3 +- + tools/perf/util/stat-display.c | 5 +- + tools/perf/util/synthetic-events.c | 3 + + 287 files changed, 4814 insertions(+), 2254 deletions(-) +Merging fixes/fixes (168af485621a powerpc: fix the allyesconfig build) +$ git merge fixes/fixes +Merge made by the 'recursive' strategy. + drivers/clk/renesas/Kconfig | 4 ++++ + drivers/net/ethernet/hisilicon/Kconfig | 4 ++++ + 2 files changed, 8 insertions(+) +Merging kbuild-current/fixes (d1889589a4f5 builddeb: Fix rootless build in setuid/setgid directory) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (f737561c7096 ARC: stack unwinding: reorganize how initial register state setup) +$ git merge arc-current/for-curr +Already up to date. +Merging arm-current/fixes (9fa2e7af3d53 ARM: 9019/1: kprobes: Avoid fortify_panic() when copying optprobe template) +$ git merge arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (ff1712f953e2 arm64: pgtable: Ensure dirty bit is preserved across pte_wrprotect()) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (ae597565d13f Merge tag 'optee-valid-memory-type-for-v5.11' of git://git.linaro.org/people/jens.wiklander/linux-tee into arm/fixes) +$ git merge arm-soc-fixes/arm/fixes +Already up to date. +Merging drivers-memory-fixes/fixes (3650b228f83a Linux 5.10-rc1) +$ git merge drivers-memory-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (50c5feeea0af ide/macide: Convert Mac IDE driver to platform driver) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (b6b79dd53082 powerpc/64s: Fix allnoconfig build since uaccess flush) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (1179f170b6f0 s390: fix fpu restore in entry.S) +$ git merge s390-fixes/fixes +Already up to date. +Merging sparc/master (0a95a6d1a4cd sparc: use for_each_child_of_node() macro) +$ git merge sparc/master +Auto-merging arch/sparc/kernel/signal_64.c +Auto-merging arch/sparc/kernel/signal_32.c +Auto-merging arch/sparc/Kconfig +Merge made by the 'recursive' strategy. + arch/sparc/Kconfig | 2 +- + arch/sparc/boot/piggyback.c | 4 ++++ + arch/sparc/include/asm/backoff.h | 2 +- + arch/sparc/include/asm/pgtsrmmu.h | 2 +- + arch/sparc/kernel/pci.c | 3 +-- + arch/sparc/kernel/viohs.c | 6 ++---- + arch/sparc/lib/memset.S | 1 + + arch/sparc/mm/srmmu.c | 18 +++++++++--------- + 8 files changed, 20 insertions(+), 18 deletions(-) +Merging fscrypt-current/for-stable (d19d8d345eec fscrypt: fix inline encryption not used on new files) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (4d521943f76b dt-bindings: net: correct interrupt flags in examples) +$ git merge net/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/can/tcan4x5x.txt | 2 +- + .../devicetree/bindings/net/nfc/nxp-nci.txt | 2 +- + .../devicetree/bindings/net/nfc/pn544.txt | 2 +- + MAINTAINERS | 23 ++- + drivers/net/ethernet/ibm/ibmvnic.c | 168 +++++++++++++-------- + drivers/net/ethernet/ibm/ibmvnic.h | 3 + + include/linux/netdevice.h | 14 +- + include/net/netfilter/nf_tables_offload.h | 7 + + include/net/xdp_sock.h | 1 + + net/batman-adv/fragmentation.c | 26 ++-- + net/batman-adv/hard-interface.c | 3 + + net/bridge/br_netfilter_hooks.c | 7 +- + net/core/dev.c | 8 +- + net/ipv4/route.c | 7 +- + net/netfilter/ipset/ip_set_core.c | 3 +- + net/netfilter/ipvs/ip_vs_ctl.c | 31 +++- + net/netfilter/nf_tables_api.c | 3 +- + net/netfilter/nf_tables_offload.c | 17 +++ + net/netfilter/nft_cmp.c | 8 +- + net/netfilter/nft_meta.c | 16 +- + net/netfilter/nft_payload.c | 70 ++++++--- + net/xdp/xdp_umem.c | 19 ++- + net/xdp/xdp_umem.h | 2 +- + net/xdp/xsk.c | 10 +- + net/xdp/xsk_buff_pool.c | 6 +- + tools/bpf/bpftool/btf.c | 1 + + tools/testing/selftests/tc-testing/config | 1 + + 27 files changed, 316 insertions(+), 144 deletions(-) +Merging bpf/master (9a44bc9449cf bpf: Add MAINTAINERS entry for BPF LSM) +$ git merge bpf/master +Already up to date. +Merging ipsec/master (48f486e13ffd net: xfrm: fix memory leak in xfrm_user_policy()) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/xfrm/xfrm_compat.c | 5 +++-- + net/xfrm/xfrm_state.c | 4 +++- + 2 files changed, 6 insertions(+), 3 deletions(-) +Merging netfilter/master (4d521943f76b dt-bindings: net: correct interrupt flags in examples) +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (c0700dfa2cae netfilter: nf_tables: avoid false-postive lockdep splat) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (fe56d05ee6c8 iwlwifi: mvm: fix kernel panic in case of assert during CSA) +$ git merge wireless-drivers/master +Already up to date. +Merging mac80211/master (849920c70339 devlink: Add missing genlmsg_cancel() in devlink_nl_sb_port_pool_fill()) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (17475e104dcb RDMA/hns: Bugfix for memory window mtpt configuration) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (aeedad250499 ALSA: hda/realtek: Add mute LED quirk to yet another HP x360 model) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/hda/hda_generic.c | 12 ++++-- + sound/pci/hda/hda_generic.h | 1 + + sound/pci/hda/patch_realtek.c | 72 ++++++++++++++++++++++++++++++++--- + sound/soc/codecs/rt5682.c | 1 + + sound/soc/codecs/wm_adsp.c | 1 + + sound/soc/intel/boards/bytcr_rt5640.c | 17 +++++++-- + sound/soc/qcom/lpass-cpu.c | 62 +++++++++++++++--------------- + sound/soc/qcom/lpass-lpaif-reg.h | 7 ++++ + sound/soc/qcom/lpass-platform.c | 20 +++++++++- + sound/soc/qcom/lpass.h | 1 + + sound/usb/mixer_us16x08.c | 2 +- + 11 files changed, 149 insertions(+), 47 deletions(-) +Merging sound-asoc-fixes/for-linus (356c199d0b72 Merge remote-tracking branch 'asoc/for-5.10' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Already up to date! +Merge made by the 'recursive' strategy. +Merging regmap-fixes/for-linus (e6e9354b5830 regmap: Remove duplicate `type` field from regmap `regcache_sync` trace event) +$ git merge regmap-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/base/regmap/trace.h | 1 - + 1 file changed, 1 deletion(-) +Merging regulator-fixes/for-linus (34c5aa2666db regulator: Kconfig: Fix REGULATOR_QCOM_RPMH dependencies to avoid build error) +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/regulator/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging spi-fixes/for-linus (893ff790cf6a Merge remote-tracking branch 'spi/for-5.10' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/spi/Kconfig | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging pci-current/for-linus (cce14622a703 PCI: Add function 1 DMA alias quirk for Marvell 9215 SATA controller) +$ git merge pci-current/for-linus +Merge made by the 'recursive' strategy. + drivers/pci/quirks.c | 3 +++ + 1 file changed, 3 insertions(+) +Merging driver-core.current/driver-core-linus (f8394f232b1e Linux 5.10-rc3) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (418baf2c28f3 Linux 5.10-rc5) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (484cfbe5fb61 usb: typec: stusb160x: fix power-opmode property with typec-power-opmode) +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (129aa9734559 usb: raw-gadget: fix memory leak in gadget_setup) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (6d6556c04eba USB: serial: option: add support for Thales Cinterion EXS82) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/option.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) +Merging usb-chipidea-fixes/for-usb-fixes (3ed55d528a54 usb: cdns3: core: fix goto label for error path) +$ git merge usb-chipidea-fixes/for-usb-fixes +Merge made by the 'recursive' strategy. + drivers/usb/cdns3/core.c | 29 ++++++++++++++++------------- + drivers/usb/cdns3/gadget.c | 1 + + 2 files changed, 17 insertions(+), 13 deletions(-) +Merging phy/fixes (fb89b2544b64 phy: mediatek: fix spelling mistake in Kconfig "veriosn" -> "version") +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (418baf2c28f3 Linux 5.10-rc5) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (c7acb6b9c07b MAINTAINERS: Adding help for coresight subsystem) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (3650b228f83a Linux 5.10-rc1) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (600c0849cf86 thunderbolt: Fix use-after-free in remove_unplugged_switch()) +$ git merge thunderbolt-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/thunderbolt/icm.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) +Merging input-current/for-linus (855b69857830 Input: i8042 - fix error return code in i8042_setup_aux()) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/misc/soc_button_array.c | 1 + + drivers/input/serio/i8042.c | 3 ++- + 2 files changed, 3 insertions(+), 1 deletion(-) +Merging crypto-current/master (c3a98c3ad5c0 crypto: x86/poly1305 - add back a needed assignment) +$ git merge crypto-current/master +Already up to date. +Merging ide/master (6800cd8cbc6e ide-acpi: use %*ph to print small buffer) +$ git merge ide/master +Auto-merging include/linux/ide.h +Auto-merging drivers/ide/sis5513.c +Auto-merging drivers/ide/ide-acpi.c +Auto-merging drivers/ide/hpt366.c +Auto-merging drivers/ide/Kconfig +Merge made by the 'recursive' strategy. + drivers/ide/Kconfig | 2 +- + drivers/ide/aec62xx.c | 3 +-- + drivers/ide/alim15x3.c | 3 +-- + drivers/ide/amd74xx.c | 3 +-- + drivers/ide/atiixp.c | 3 +-- + drivers/ide/cmd64x.c | 3 +-- + drivers/ide/cs5520.c | 3 +-- + drivers/ide/cs5530.c | 3 +-- + drivers/ide/cs5535.c | 3 +-- + drivers/ide/cs5536.c | 3 +-- + drivers/ide/cy82c693.c | 3 +-- + drivers/ide/delkin_cb.c | 32 ++++++-------------------------- + drivers/ide/hpt366.c | 5 ++--- + drivers/ide/ide-acpi.c | 5 +---- + drivers/ide/ide-pci-generic.c | 3 +-- + drivers/ide/it8172.c | 3 +-- + drivers/ide/it8213.c | 3 +-- + drivers/ide/it821x.c | 3 +-- + drivers/ide/jmicron.c | 3 +-- + drivers/ide/ns87415.c | 3 +-- + drivers/ide/opti621.c | 3 +-- + drivers/ide/pdc202xx_new.c | 3 +-- + drivers/ide/pdc202xx_old.c | 3 +-- + drivers/ide/piix.c | 3 +-- + drivers/ide/sc1200.c | 43 ++++++++++++++----------------------------- + drivers/ide/serverworks.c | 3 +-- + drivers/ide/setup-pci.c | 29 ++++++----------------------- + drivers/ide/siimage.c | 3 +-- + drivers/ide/sis5513.c | 3 +-- + drivers/ide/sl82c105.c | 3 +-- + drivers/ide/slc90e66.c | 3 +-- + drivers/ide/triflex.c | 24 ++++++++---------------- + drivers/ide/via82cxxx.c | 3 +-- + include/linux/ide.h | 8 +------- + 34 files changed, 65 insertions(+), 161 deletions(-) +Merging vfio-fixes/for-linus (e4eccb853664 vfio/pci: Bypass IGD init in case of -ENODEV) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (7d764b685ee1 selftests: binderfs: use SKIP instead of XFAIL) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (418baf2c28f3 Linux 5.10-rc5) +$ git merge dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (bbf5c979011a Linux 5.9) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (b36bf0a0fe5d mtd: rawnand: socrates: Move the ECC initialization to ->attach_chip()) +$ git merge mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (bbf5c979011a Linux 5.9) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (44f28934af14 media: vidtv.rst: add kernel-doc markups) +$ git merge v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (ac3b57adf87a MIPS: Alchemy: Fix memleak in alchemy_clk_setup_cpu) +$ git merge mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (05d5de6ba7db ARM: dts: dra76x: m_can: fix order of clocks) +$ git merge omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (c2b1209d852f MAINTAINERS: Update email address for Sean Christopherson) +$ 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 (418baf2c28f3 Linux 5.10-rc5) +$ git merge hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (88b67edd7247 dax: Fix compilation for CONFIG_DAX && !CONFIG_FS_DAX) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging btrfs-fixes/next-fixes (462b8e885b92 Merge branch 'misc-5.10' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Already up to date! +Merge made by the 'recursive' strategy. +Merging vfs-fixes/fixes (4bbf439b09c5 fix return values of seq_read_iter()) +$ git merge vfs-fixes/fixes +Merge made by the 'recursive' strategy. + fs/seq_file.c | 57 +++++++++++++++++++++++++++------------------------------ + 1 file changed, 27 insertions(+), 30 deletions(-) +Merging dma-mapping-fixes/for-linus (892fc9f6835e dma-pool: Fix an uninitialized variable bug in atomic_pool_expand()) +$ git merge dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7) +$ git merge i3c-fixes/master +Already up to date. +Merging drivers-x86-fixes/fixes (c9aa128080cb platform/x86: touchscreen_dmi: Add info for the Irbis TW118 tablet) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (cd12e4f14f7c CREDITS: remove trailing white spaces) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (3650b228f83a Linux 5.10-rc1) +$ git merge pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (bdac39a3bd28 dt-bindings: clock: imx5: fix example) +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (e92643db5148 scsi: ufs: Fix race between shutdown and runtime resume flow) +$ git merge scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (9595930db4bb Merge tag 'drm-misc-fixes-2020-11-26' of ssh://git.freedesktop.org/git/drm/drm-misc 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 (280ffdb6ddb5 drm/i915/gt: Free stale request on destroying the virtual engine) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (a42a7ec9bb99 mmc: sdhci-of-arasan: Fix clock registration error for Keem Bay SOC) +$ git merge mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mmc/host/mtk-sd.c | 33 ++++++++++++++++++++++++++------- + drivers/mmc/host/sdhci-of-arasan.c | 3 +++ + 2 files changed, 29 insertions(+), 7 deletions(-) +Merging rtc-fixes/rtc-fixes (9123e3a74ec7 Linux 5.9-rc1) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (48778464bb7d Linux 5.8-rc2) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (5f1251a48c17 video: hyperv_fb: Fix the cache type when mapping the VRAM) +$ git merge hyperv-fixes/hyperv-fixes +Already up to date. +Merging soc-fsl-fixes/fix (2663b3388551 soc: fsl: dpio: Get the cpumask through cpumask_of(cpu)) +$ git merge soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (30aca1bacb39 RISC-V: fix barrier() use in <vdso/processor.h>) +$ git merge risc-v-fixes/fixes +Already up to date. +Merging pidfd-fixes/fixes (aabe19b82793 nsproxy: use put_nsproxy() in switch_task_namespaces()) +$ git merge pidfd-fixes/fixes +Auto-merging net/ipv4/tcp_metrics.c +Auto-merging net/core/net_namespace.c +Auto-merging net/core/net-sysfs.c +Auto-merging kernel/user_namespace.c +Auto-merging kernel/sys.c +Auto-merging kernel/signal.c +Auto-merging kernel/pid_namespace.c +Auto-merging kernel/pid.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging include/net/net_namespace.h +Auto-merging fs/namespace.c +Merge made by the 'recursive' strategy. + fs/mount.h | 3 +-- + fs/namespace.c | 4 ++-- + include/linux/cgroup.h | 5 ++--- + include/linux/ipc_namespace.h | 3 +-- + include/linux/ns_common.h | 3 +++ + include/linux/pid_namespace.h | 4 +--- + include/linux/time_namespace.h | 9 ++++----- + include/linux/user_namespace.h | 5 ++--- + include/linux/utsname.h | 9 ++++----- + include/net/net_namespace.h | 11 ++++------- + include/uapi/linux/ptrace.h | 3 ++- + init/version.c | 2 +- + ipc/msgutil.c | 2 +- + ipc/namespace.c | 4 ++-- + kernel/cgroup/cgroup.c | 2 +- + kernel/cgroup/namespace.c | 2 +- + kernel/nsproxy.c | 6 +++--- + kernel/pid.c | 2 +- + kernel/pid_namespace.c | 13 +++---------- + kernel/time/namespace.c | 9 +++------ + kernel/user.c | 2 +- + kernel/user_namespace.c | 4 ++-- + kernel/utsname.c | 7 ++----- + net/core/net-sysfs.c | 6 +++--- + net/core/net_namespace.c | 6 +++--- + net/ipv4/inet_timewait_sock.c | 4 ++-- + net/ipv4/tcp_metrics.c | 2 +- + 27 files changed, 56 insertions(+), 76 deletions(-) +Merging fpga-fixes/fixes (8614afd689df fpga: dfl: fix bug in port reset handshake) +$ git merge fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (3cea11cd5e3b Linux 5.10-rc2) +$ git merge spdx/spdx-linus +Already up to date. +Merging gpio-intel-fixes/fixes (3650b228f83a Linux 5.10-rc1) +$ git merge gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (5f714771d01e pinctrl: baytrail: Avoid clearing debounce value when turning it off) +$ git merge pinctrl-intel-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/pinctrl/intel/pinctrl-baytrail.c | 8 +- + drivers/pinctrl/intel/pinctrl-jasperlake.c | 452 +++++++++++++++-------------- + drivers/pinctrl/intel/pinctrl-merrifield.c | 8 + + 3 files changed, 246 insertions(+), 222 deletions(-) +Merging erofs-fixes/fixes (a30573b3cdc7 erofs: fix setting up pcluster for temporary pages) +$ git merge erofs-fixes/fixes +Already up to date. +Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) +$ git merge integrity-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (3084db0e0d50 kunit: fix display of failed expectations for strings) +$ git merge kunit-fixes/kunit-fixes +Already up to date. +Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes) +$ git merge ubifs-fixes/fixes +Already up to date. +Merging memblock-fixes/fixes (b9bc36704cca ARM, xtensa: highmem: avoid clobbering non-page aligned memory reservations) +$ git merge memblock-fixes/fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (aec9fe892812 drm/rockchip: Avoid uninitialized use of endpoint id in LVDS) +$ git merge drm-misc-fixes/for-linux-next-fixes +Auto-merging drivers/gpu/drm/nouveau/nouveau_bo.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/mxsfb/mxsfb_kms.c | 11 +++++++++++ + drivers/gpu/drm/nouveau/nouveau_bo.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_lvds.c | 2 +- + 3 files changed, 13 insertions(+), 2 deletions(-) +Merging kspp-gustavo/for-next/kspp (36f9ff9e03de lib: Fix fall-through warnings for Clang) +$ git merge kspp-gustavo/for-next/kspp +Merge made by the 'recursive' strategy. + arch/powerpc/boot/Makefile | 1 + + arch/powerpc/boot/decompress.c | 1 - + arch/powerpc/kernel/prom_init.c | 1 + + arch/powerpc/kernel/uprobes.c | 1 + + arch/powerpc/perf/imc-pmu.c | 1 + + lib/asn1_decoder.c | 4 ++-- + lib/assoc_array.c | 2 +- + lib/bootconfig.c | 4 ++-- + lib/cmdline.c | 11 ++++++----- + lib/dim/net_dim.c | 2 +- + lib/dim/rdma_dim.c | 4 ++-- + lib/glob.c | 2 +- + lib/kstrtox.c | 1 + + lib/nlattr.c | 2 +- + lib/siphash.c | 36 ++++++++++++++++++------------------ + lib/ts_fsm.c | 2 +- + lib/vsprintf.c | 15 ++++++++------- + lib/xz/xz_dec_lzma2.c | 4 ++-- + lib/xz/xz_dec_stream.c | 16 ++++++++-------- + lib/zlib_inflate/inflate.c | 24 ++++++++++++------------ + lib/zstd/bitstream.h | 11 ++++++----- + lib/zstd/compress.c | 2 +- + lib/zstd/decompress.c | 12 ++++++------ + lib/zstd/huf_compress.c | 5 +++-- + 24 files changed, 86 insertions(+), 78 deletions(-) +Merging kbuild/for-next (0ce21d58b7af kconfig: qconf: show Qt version in the About dialog) +$ git merge kbuild/for-next +Merge made by the 'recursive' strategy. + scripts/kconfig/lkc.h | 4 ++ + scripts/kconfig/qconf-cfg.sh | 14 +---- + scripts/kconfig/qconf.cc | 145 +++++++++++++++++++++++++------------------ + 3 files changed, 91 insertions(+), 72 deletions(-) +Merging compiler-attributes/compiler-attributes (971385eae4fc Compiler Attributes: remove CONFIG_ENABLE_MUST_CHECK) +$ git merge compiler-attributes/compiler-attributes +Merge made by the 'recursive' strategy. + include/linux/compiler_types.h | 4 ---- + lib/Kconfig.debug | 8 -------- + tools/testing/selftests/wireguard/qemu/debug.config | 1 - + 3 files changed, 13 deletions(-) +Merging dma-mapping/for-next (7679325702c9 selftests/dma: add test application for DMA_MAP_BENCHMARK) +$ git merge dma-mapping/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 + + arch/powerpc/Kconfig | 1 + + arch/powerpc/kernel/dma-iommu.c | 71 ++++- + arch/powerpc/platforms/pseries/iommu.c | 51 +++- + include/linux/dma-map-ops.h | 14 + + kernel/dma/Kconfig | 13 + + kernel/dma/Makefile | 1 + + kernel/dma/contiguous.c | 2 +- + kernel/dma/map_benchmark.c | 361 ++++++++++++++++++++++++ + kernel/dma/mapping.c | 12 +- + kernel/dma/pool.c | 3 - + tools/testing/selftests/dma/Makefile | 6 + + tools/testing/selftests/dma/config | 1 + + tools/testing/selftests/dma/dma_map_benchmark.c | 123 ++++++++ + 14 files changed, 645 insertions(+), 20 deletions(-) + create mode 100644 kernel/dma/map_benchmark.c + create mode 100644 tools/testing/selftests/dma/Makefile + create mode 100644 tools/testing/selftests/dma/config + create mode 100644 tools/testing/selftests/dma/dma_map_benchmark.c +Merging asm-generic/master (8eb42bcea5ae Merge branch 'asm-generic-fixes' into asm-generic) +$ git merge asm-generic/master +Auto-merging include/linux/compiler_types.h +Removing drivers/net/ethernet/amd/am79c961a.h +Removing drivers/net/ethernet/amd/am79c961a.c +Auto-merging arch/sparc/Kconfig +Auto-merging arch/powerpc/Kconfig +Removing arch/arm/mach-ebsa110/leds.c +Removing arch/arm/mach-ebsa110/io.c +Removing arch/arm/mach-ebsa110/include/mach/uncompress.h +Removing arch/arm/mach-ebsa110/include/mach/memory.h +Removing arch/arm/mach-ebsa110/include/mach/irqs.h +Removing arch/arm/mach-ebsa110/include/mach/io.h +Removing arch/arm/mach-ebsa110/include/mach/hardware.h +Removing arch/arm/mach-ebsa110/include/mach/entry-macro.S +Removing arch/arm/mach-ebsa110/core.h +Removing arch/arm/mach-ebsa110/core.c +Removing arch/arm/mach-ebsa110/Makefile.boot +Removing arch/arm/mach-ebsa110/Makefile +Removing arch/arm/configs/ebsa110_defconfig +Auto-merging MAINTAINERS +Removing Documentation/features/time/modern-timekeeping/arch-support.txt +Merge made by the 'recursive' strategy. + .../features/time/clockevents/arch-support.txt | 8 +- + .../time/modern-timekeeping/arch-support.txt | 33 - + MAINTAINERS | 8 - + arch/alpha/Kconfig | 1 - + arch/alpha/include/asm/mmu_context.h | 12 +- + arch/arc/Kconfig | 1 - + arch/arc/include/asm/mmu_context.h | 17 +- + arch/arm/Kconfig | 37 +- + arch/arm/Kconfig.debug | 6 +- + arch/arm/Makefile | 8 - + arch/arm/configs/ebsa110_defconfig | 74 -- + arch/arm/include/asm/mach/time.h | 2 - + arch/arm/include/asm/mmu_context.h | 26 +- + arch/arm/kernel/Makefile | 6 +- + arch/arm/kernel/time.c | 14 - + arch/arm/mach-ebsa110/Makefile | 8 - + arch/arm/mach-ebsa110/Makefile.boot | 5 - + arch/arm/mach-ebsa110/core.c | 323 --------- + arch/arm/mach-ebsa110/core.h | 38 - + arch/arm/mach-ebsa110/include/mach/entry-macro.S | 33 - + arch/arm/mach-ebsa110/include/mach/hardware.h | 21 - + arch/arm/mach-ebsa110/include/mach/io.h | 89 --- + arch/arm/mach-ebsa110/include/mach/irqs.h | 17 - + arch/arm/mach-ebsa110/include/mach/memory.h | 22 - + arch/arm/mach-ebsa110/include/mach/uncompress.h | 41 -- + arch/arm/mach-ebsa110/io.c | 440 ------------ + arch/arm/mach-ebsa110/leds.c | 71 -- + arch/arm/mach-rpc/time.c | 2 +- + arch/arm64/Kconfig | 1 - + arch/arm64/Kconfig.platforms | 1 - + arch/arm64/include/asm/mmu_context.h | 8 +- + arch/c6x/Kconfig | 1 - + arch/c6x/include/asm/mmu_context.h | 6 + + arch/csky/Kconfig | 1 - + arch/csky/include/asm/mmu_context.h | 8 +- + arch/h8300/Kconfig | 1 - + arch/h8300/include/asm/mmu_context.h | 6 + + arch/hexagon/Kconfig | 1 - + arch/hexagon/include/asm/mmu_context.h | 33 +- + arch/ia64/Kconfig | 1 + + arch/ia64/include/asm/mmu_context.h | 17 +- + arch/ia64/kernel/time.c | 36 +- + arch/m68k/68000/timers.c | 7 +- + arch/m68k/Kconfig.cpu | 37 +- + arch/m68k/Kconfig.machine | 11 + + arch/m68k/amiga/config.c | 11 +- + arch/m68k/apollo/config.c | 11 +- + arch/m68k/atari/config.c | 2 +- + arch/m68k/atari/time.c | 9 +- + arch/m68k/bvme6000/config.c | 9 +- + arch/m68k/coldfire/Makefile | 32 +- + arch/m68k/coldfire/pit.c | 2 +- + arch/m68k/coldfire/sltimers.c | 8 +- + arch/m68k/coldfire/timers.c | 8 +- + arch/m68k/hp300/time.c | 8 +- + arch/m68k/hp300/time.h | 2 +- + arch/m68k/include/asm/machdep.h | 12 +- + arch/m68k/include/asm/mmu_context.h | 38 +- + arch/m68k/kernel/setup_mm.c | 2 +- + arch/m68k/kernel/setup_no.c | 2 +- + arch/m68k/kernel/time.c | 18 +- + arch/m68k/mac/config.c | 6 +- + arch/m68k/mac/via.c | 8 +- + arch/m68k/mvme147/config.c | 9 +- + arch/m68k/mvme16x/config.c | 9 +- + arch/m68k/q40/config.c | 2 +- + arch/m68k/q40/q40ints.c | 10 +- + arch/m68k/sun3/config.c | 4 +- + arch/m68k/sun3/sun3ints.c | 3 +- + arch/m68k/sun3x/time.c | 5 +- + arch/m68k/sun3x/time.h | 2 +- + arch/microblaze/Kconfig | 1 - + arch/microblaze/include/asm/mmu_context.h | 2 +- + arch/microblaze/include/asm/mmu_context_mm.h | 8 +- + arch/microblaze/include/asm/processor.h | 3 - + arch/mips/Kconfig | 1 - + arch/mips/include/asm/mmu_context.h | 11 +- + arch/nds32/Kconfig | 1 - + arch/nds32/include/asm/mmu_context.h | 10 +- + arch/nios2/Kconfig | 1 - + arch/nios2/include/asm/mmu_context.h | 21 +- + arch/openrisc/Kconfig | 1 - + arch/openrisc/include/asm/mmu_context.h | 8 +- + arch/parisc/Kconfig | 2 +- + arch/parisc/include/asm/mmu_context.h | 12 +- + arch/parisc/kernel/time.c | 9 +- + arch/powerpc/Kconfig | 1 - + arch/powerpc/include/asm/mmu_context.h | 13 +- + arch/riscv/Kconfig | 1 - + arch/riscv/include/asm/mmu_context.h | 22 +- + arch/s390/Kconfig | 1 - + arch/s390/include/asm/mmu_context.h | 9 +- + arch/sh/Kconfig | 1 - + arch/sh/include/asm/mmu_context.h | 7 +- + arch/sh/include/asm/mmu_context_32.h | 9 - + arch/sparc/Kconfig | 1 - + arch/sparc/include/asm/mmu_context_32.h | 10 +- + arch/sparc/include/asm/mmu_context_64.h | 10 +- + arch/um/Kconfig | 1 - + arch/um/include/asm/mmu_context.h | 12 +- + arch/x86/Kconfig | 1 - + arch/x86/include/asm/mmu_context.h | 6 + + arch/xtensa/Kconfig | 1 - + arch/xtensa/include/asm/mmu_context.h | 11 +- + arch/xtensa/include/asm/nommu_context.h | 26 +- + drivers/Makefile | 2 - + drivers/clocksource/Kconfig | 2 +- + drivers/net/ethernet/amd/Kconfig | 10 +- + drivers/net/ethernet/amd/Makefile | 1 - + drivers/net/ethernet/amd/am79c961a.c | 763 --------------------- + drivers/net/ethernet/amd/am79c961a.h | 143 ---- + drivers/watchdog/Kconfig | 2 +- + include/asm-generic/bitops/builtin-ffs.h | 5 +- + include/asm-generic/mmu_context.h | 58 +- + include/asm-generic/nommu_context.h | 19 + + include/asm-generic/qrwlock.h | 8 +- + include/asm-generic/qspinlock.h | 4 +- + include/linux/compiler_types.h | 11 + + include/linux/ctype.h | 15 +- + include/linux/syscalls.h | 2 +- + include/linux/time.h | 13 - + include/linux/timekeeping.h | 3 +- + include/uapi/asm-generic/sembuf.h | 6 +- + include/uapi/asm-generic/unistd.h | 2 +- + kernel/time/Kconfig | 18 +- + kernel/time/Makefile | 1 + + kernel/time/clocksource.c | 8 - + kernel/time/tick-legacy.c | 37 + + kernel/time/timekeeping.c | 41 +- + kernel/time/timekeeping.h | 1 + + kernel/trace/Kconfig | 2 - + 131 files changed, 434 insertions(+), 2748 deletions(-) + delete mode 100644 Documentation/features/time/modern-timekeeping/arch-support.txt + delete mode 100644 arch/arm/configs/ebsa110_defconfig + delete mode 100644 arch/arm/mach-ebsa110/Makefile + delete mode 100644 arch/arm/mach-ebsa110/Makefile.boot + delete mode 100644 arch/arm/mach-ebsa110/core.c + delete mode 100644 arch/arm/mach-ebsa110/core.h + delete mode 100644 arch/arm/mach-ebsa110/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-ebsa110/include/mach/hardware.h + delete mode 100644 arch/arm/mach-ebsa110/include/mach/io.h + delete mode 100644 arch/arm/mach-ebsa110/include/mach/irqs.h + delete mode 100644 arch/arm/mach-ebsa110/include/mach/memory.h + delete mode 100644 arch/arm/mach-ebsa110/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-ebsa110/io.c + delete mode 100644 arch/arm/mach-ebsa110/leds.c + create mode 100644 arch/c6x/include/asm/mmu_context.h + create mode 100644 arch/h8300/include/asm/mmu_context.h + delete mode 100644 drivers/net/ethernet/amd/am79c961a.c + delete mode 100644 drivers/net/ethernet/amd/am79c961a.h + create mode 100644 include/asm-generic/nommu_context.h + create mode 100644 kernel/time/tick-legacy.c +Merging arc/for-next (def9d2780727 Linux 5.5-rc7) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (40bd54f12902 Merge branch 'devel-stable' into for-next) +$ git merge arm/for-next +Auto-merging arch/arm/mm/init.c +Auto-merging arch/arm/kernel/Makefile +Auto-merging arch/arm/boot/compressed/head.S +Auto-merging arch/arm/Kconfig +Auto-merging Documentation/dev-tools/kasan.rst +Merge made by the 'recursive' strategy. + Documentation/arm/memory.rst | 12 +- + Documentation/dev-tools/kasan.rst | 4 +- + .../features/debug/KASAN/arch-support.txt | 2 +- + arch/arm/Kconfig | 12 +- + arch/arm/boot/compressed/Makefile | 1 + + arch/arm/boot/compressed/head.S | 18 +- + arch/arm/boot/compressed/string.c | 19 ++ + arch/arm/include/asm/assembler.h | 88 ++++++- + arch/arm/include/asm/elf.h | 5 + + arch/arm/include/asm/fixmap.h | 2 +- + arch/arm/include/asm/kasan.h | 33 +++ + arch/arm/include/asm/kasan_def.h | 81 ++++++ + arch/arm/include/asm/memory.h | 67 +++-- + arch/arm/include/asm/pgalloc.h | 8 +- + arch/arm/include/asm/processor.h | 2 +- + arch/arm/include/asm/prom.h | 4 +- + arch/arm/include/asm/string.h | 26 ++ + arch/arm/include/asm/thread_info.h | 8 + + arch/arm/include/asm/uaccess-asm.h | 2 +- + arch/arm/kernel/Makefile | 1 + + arch/arm/kernel/atags.h | 4 +- + arch/arm/kernel/atags_parse.c | 6 +- + arch/arm/kernel/devtree.c | 6 +- + arch/arm/kernel/entry-armv.S | 3 +- + arch/arm/kernel/entry-common.S | 9 +- + arch/arm/kernel/head-common.S | 29 +- + arch/arm/kernel/head.S | 210 ++------------- + arch/arm/kernel/hyp-stub.S | 27 +- + arch/arm/kernel/module.c | 20 +- + arch/arm/kernel/phys2virt.S | 238 +++++++++++++++++ + arch/arm/kernel/setup.c | 25 +- + arch/arm/kernel/sleep.S | 19 +- + arch/arm/kernel/unwind.c | 6 +- + arch/arm/lib/memcpy.S | 4 +- + arch/arm/lib/memmove.S | 6 +- + arch/arm/lib/memset.S | 4 +- + arch/arm/mm/Makefile | 5 + + arch/arm/mm/init.c | 1 - + arch/arm/mm/kasan_init.c | 291 +++++++++++++++++++++ + arch/arm/mm/mmu.c | 38 ++- + arch/arm/mm/pgd.c | 16 +- + arch/arm/mm/pv-fixup-asm.S | 4 +- + arch/arm/vdso/Makefile | 2 + + 43 files changed, 1047 insertions(+), 321 deletions(-) + create mode 100644 arch/arm/include/asm/kasan.h + create mode 100644 arch/arm/include/asm/kasan_def.h + create mode 100644 arch/arm/kernel/phys2virt.S + create mode 100644 arch/arm/mm/kasan_init.c +Merging arm64/for-next/core (78fae44603f1 Merge branch 'for-next/misc' into for-next/core) +$ git merge arm64/for-next/core +Auto-merging drivers/of/address.c +Auto-merging drivers/acpi/arm64/iort.c +Auto-merging arch/arm64/mm/mmu.c +Auto-merging arch/arm64/kernel/smp.c +Auto-merging arch/arm64/kernel/proton-pack.c +Auto-merging arch/arm64/kernel/process.c +Auto-merging arch/arm64/kernel/cpufeature.c +Auto-merging arch/arm64/include/asm/sysreg.h +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm64/include/asm/mmu_context.h +Auto-merging arch/arm64/include/asm/cpufeature.h +Auto-merging arch/arm64/Kconfig +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-kernel-iommu_groups | 30 + + Documentation/admin-guide/kernel-parameters.txt | 5 - + Documentation/arm64/kasan-offsets.sh | 3 +- + Documentation/arm64/memory.rst | 45 +- + Documentation/arm64/pointer-authentication.rst | 34 + + Documentation/arm64/tagged-pointers.rst | 25 +- + .../devicetree/bindings/iommu/arm,smmu.yaml | 9 +- + arch/alpha/include/uapi/asm/signal.h | 14 - + arch/arm/include/asm/signal.h | 2 + + arch/arm/include/uapi/asm/signal.h | 27 +- + arch/arm64/Kconfig | 53 +- + arch/arm64/include/asm/alternative-macros.h | 217 +++++ + arch/arm64/include/asm/alternative.h | 267 +----- + arch/arm64/include/asm/asm-uaccess.h | 65 +- + arch/arm64/include/asm/cpucaps.h | 3 +- + arch/arm64/include/asm/cpufeature.h | 8 + + arch/arm64/include/asm/exception.h | 2 +- + arch/arm64/include/asm/insn.h | 3 +- + arch/arm64/include/asm/kernel-pgtable.h | 6 - + arch/arm64/include/asm/kprobes.h | 7 - + arch/arm64/include/asm/memory.h | 22 +- + arch/arm64/include/asm/mmu_context.h | 6 +- + arch/arm64/include/asm/mte.h | 4 +- + arch/arm64/include/asm/pgtable-hwdef.h | 1 + + arch/arm64/include/asm/pgtable.h | 3 +- + arch/arm64/include/asm/pointer_auth.h | 25 +- + arch/arm64/include/asm/processor.h | 17 +- + arch/arm64/include/asm/ptrace.h | 5 + + arch/arm64/include/asm/rwonce.h | 73 ++ + arch/arm64/include/asm/signal.h | 25 + + arch/arm64/include/asm/sysreg.h | 26 +- + arch/arm64/include/asm/system_misc.h | 2 +- + arch/arm64/include/asm/topology.h | 4 +- + arch/arm64/include/asm/traps.h | 6 +- + arch/arm64/include/asm/uaccess.h | 4 +- + arch/arm64/kernel/alternative.c | 7 +- + arch/arm64/kernel/asm-offsets.c | 3 + + arch/arm64/kernel/cpufeature.c | 25 +- + arch/arm64/kernel/debug-monitors.c | 5 +- + arch/arm64/kernel/efi-header.S | 84 +- + arch/arm64/kernel/entry-common.c | 2 - + arch/arm64/kernel/entry.S | 45 +- + arch/arm64/kernel/head.S | 70 +- + arch/arm64/kernel/kaslr.c | 26 +- + arch/arm64/kernel/mte.c | 42 +- + arch/arm64/kernel/perf_event.c | 41 +- + arch/arm64/kernel/pointer_auth.c | 56 ++ + arch/arm64/kernel/probes/kprobes.c | 53 +- + arch/arm64/kernel/process.c | 54 +- + arch/arm64/kernel/proton-pack.c | 5 +- + arch/arm64/kernel/ptrace.c | 48 +- + arch/arm64/kernel/setup.c | 6 +- + arch/arm64/kernel/sleep.S | 2 +- + arch/arm64/kernel/smp.c | 15 +- + arch/arm64/kernel/sys_compat.c | 5 +- + arch/arm64/kernel/syscall.c | 2 +- + arch/arm64/kernel/topology.c | 136 ++- + arch/arm64/kernel/traps.c | 29 +- + arch/arm64/kernel/vdso/Makefile | 2 +- + arch/arm64/kernel/vdso32/Makefile | 2 +- + arch/arm64/kernel/vmlinux.lds.S | 12 +- + arch/arm64/lib/mte.S | 2 +- + arch/arm64/mm/fault.c | 83 +- + arch/arm64/mm/init.c | 56 +- + arch/arm64/mm/mmu.c | 149 +++- + arch/arm64/mm/proc.S | 6 +- + arch/h8300/include/uapi/asm/signal.h | 24 - + arch/ia64/include/uapi/asm/signal.h | 24 - + arch/m68k/include/uapi/asm/signal.h | 24 - + arch/mips/include/uapi/asm/signal.h | 12 - + arch/parisc/include/asm/signal.h | 2 + + arch/parisc/include/uapi/asm/signal.h | 34 +- + arch/powerpc/include/uapi/asm/signal.h | 24 - + arch/s390/include/uapi/asm/signal.h | 24 - + arch/sparc/include/uapi/asm/signal.h | 4 +- + arch/x86/include/uapi/asm/signal.h | 24 - + arch/x86/kernel/signal_compat.c | 7 - + arch/xtensa/include/uapi/asm/signal.h | 24 - + drivers/acpi/arm64/iort.c | 55 ++ + drivers/iommu/Kconfig | 7 + + drivers/iommu/Makefile | 1 + + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 244 +++++- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 52 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 30 + + drivers/iommu/arm/arm-smmu/arm-smmu-impl.c | 13 +- + drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c | 17 +- + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 270 +++++- + drivers/iommu/arm/arm-smmu/arm-smmu.c | 51 +- + drivers/iommu/arm/arm-smmu/arm-smmu.h | 5 +- + drivers/iommu/dma-iommu.c | 227 ++++- + drivers/iommu/intel/Kconfig | 1 + + drivers/iommu/intel/iommu.c | 917 +++------------------ + drivers/iommu/intel/svm.c | 6 +- + drivers/iommu/io-pgtable-arm.c | 10 +- + drivers/iommu/ioasid.c | 38 +- + drivers/iommu/iommu-sva-lib.c | 86 ++ + drivers/iommu/iommu-sva-lib.h | 15 + + drivers/iommu/iommu.c | 254 +++++- + drivers/iommu/iova.c | 45 +- + drivers/iommu/tegra-smmu.c | 240 ++---- + drivers/of/address.c | 42 + + drivers/of/unittest.c | 18 + + drivers/perf/Kconfig | 7 + + drivers/perf/Makefile | 1 + + drivers/perf/arm_dmc620_pmu.c | 748 +++++++++++++++++ + drivers/perf/arm_dsu_pmu.c | 3 - + drivers/perf/arm_pmu.c | 5 + + drivers/perf/arm_smmuv3_pmu.c | 39 + + drivers/perf/fsl_imx8_ddr_perf.c | 80 +- + drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c | 16 + + drivers/perf/hisilicon/hisi_uncore_hha_pmu.c | 16 + + drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c | 16 + + drivers/perf/hisilicon/hisi_uncore_pmu.c | 10 + + drivers/perf/hisilicon/hisi_uncore_pmu.h | 7 + + include/linux/acpi_iort.h | 4 + + include/linux/dma-iommu.h | 8 + + include/linux/io-pgtable.h | 8 + + include/linux/ioasid.h | 10 +- + include/linux/iommu.h | 2 + + include/linux/mmzone.h | 20 - + include/linux/of.h | 7 + + include/linux/perf/arm_pmu.h | 2 + + include/linux/signal.h | 14 + + include/linux/signal_types.h | 12 + + include/uapi/asm-generic/signal-defs.h | 63 ++ + include/uapi/asm-generic/signal.h | 29 - + include/uapi/linux/elf.h | 1 + + include/uapi/linux/prctl.h | 4 + + kernel/signal.c | 40 + + kernel/sys.c | 16 + + 130 files changed, 4073 insertions(+), 2107 deletions(-) + create mode 100644 arch/arm64/include/asm/alternative-macros.h + create mode 100644 arch/arm64/include/asm/rwonce.h + create mode 100644 arch/arm64/include/asm/signal.h + create mode 100644 drivers/iommu/iommu-sva-lib.c + create mode 100644 drivers/iommu/iommu-sva-lib.h + create mode 100644 drivers/perf/arm_dmc620_pmu.c +Merging arm-perf/for-next/perf (367c820ef080 arm64: Enable perf events based hard lockup detector) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (33fa6976a384 soc: document merges) +$ git merge arm-soc/for-next +Auto-merging include/linux/dma-map-ops.h +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.txt +Removing Documentation/devicetree/bindings/memory-controllers/mediatek,smi-common.txt +Removing Documentation/devicetree/bindings/dma/nvidia,tegra210-adma.txt +Removing Documentation/devicetree/bindings/bus/nvidia,tegra210-aconnect.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 2 +- + Documentation/arm/samsung-s3c24xx/gpio.rst | 4 +- + Documentation/arm/samsung-s3c24xx/overview.rst | 22 +- + Documentation/arm/samsung-s3c24xx/usb-host.rst | 6 +- + Documentation/arm/samsung/gpio.rst | 3 +- + Documentation/devicetree/bindings/arm/arm,scmi.txt | 43 + + Documentation/devicetree/bindings/arm/renesas.yaml | 1 + + .../bindings/arm/stm32/st,stm32-syscon.yaml | 4 + + .../devicetree/bindings/arm/stm32/stm32.yaml | 23 +- + Documentation/devicetree/bindings/arm/tegra.yaml | 3 + + .../bindings/arm/tegra/nvidia,tegra30-actmon.txt | 25 + + .../bindings/bus/nvidia,tegra210-aconnect.txt | 44 - + .../bindings/bus/nvidia,tegra210-aconnect.yaml | 82 + + .../bindings/connector/usb-connector.yaml | 24 + + .../display/tegra/nvidia,tegra20-host1x.txt | 68 + + .../bindings/dma/nvidia,tegra210-adma.txt | 56 - + .../bindings/dma/nvidia,tegra210-adma.yaml | 99 + + .../bindings/interrupt-controller/arm,gic.yaml | 9 +- + .../memory-controllers/mediatek,smi-common.txt | 50 - + .../memory-controllers/mediatek,smi-common.yaml | 142 + + .../memory-controllers/mediatek,smi-larb.txt | 50 - + .../memory-controllers/mediatek,smi-larb.yaml | 132 + + .../memory-controllers/nvidia,tegra124-emc.yaml | 19 + + .../memory-controllers/nvidia,tegra124-mc.yaml | 5 + + .../memory-controllers/nvidia,tegra20-emc.txt | 22 +- + .../memory-controllers/nvidia,tegra20-mc.txt | 3 + + .../memory-controllers/nvidia,tegra30-emc.yaml | 18 + + .../memory-controllers/nvidia,tegra30-mc.yaml | 5 + + .../bindings/pinctrl/nvidia,tegra194-pinmux.txt | 2 +- + .../devicetree/bindings/usb/st,stusb160x.yaml | 87 + + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + .../device_drivers/ethernet/davicom/dm9000.rst | 2 +- + MAINTAINERS | 1 + + arch/arm/arm-soc-for-next-contents.txt | 97 + + arch/arm/boot/dts/Makefile | 4 +- + arch/arm/boot/dts/am335x-baltos.dtsi | 2 +- + arch/arm/boot/dts/am335x-boneblue.dts | 54 + + arch/arm/boot/dts/am335x-cm-t335.dts | 2 +- + arch/arm/boot/dts/am335x-evm.dts | 2 +- + arch/arm/boot/dts/am335x-igep0033.dtsi | 2 +- + arch/arm/boot/dts/am33xx-l4.dtsi | 27 + + arch/arm/boot/dts/am437x-l4.dtsi | 4 +- + arch/arm/boot/dts/dra7.dtsi | 34 +- + arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi | 4 +- + arch/arm/boot/dts/exynos3250-artik5-eval.dts | 29 + + arch/arm/boot/dts/exynos3250-artik5.dtsi | 2 +- + arch/arm/boot/dts/exynos3250-monk.dts | 8 +- + arch/arm/boot/dts/exynos3250-rinato.dts | 8 +- + arch/arm/boot/dts/exynos3250.dtsi | 53 +- + arch/arm/boot/dts/exynos4.dtsi | 26 +- + arch/arm/boot/dts/exynos4210-i9100.dts | 6 +- + arch/arm/boot/dts/exynos4210-origen.dts | 4 +- + arch/arm/boot/dts/exynos4210-smdkv310.dts | 22 +- + arch/arm/boot/dts/exynos4210-trats.dts | 35 +- + arch/arm/boot/dts/exynos4210-universal_c210.dts | 29 + + arch/arm/boot/dts/exynos4210.dtsi | 36 +- + arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 9 +- + arch/arm/boot/dts/exynos4412-itop-elite.dts | 2 +- + arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi | 2 +- + arch/arm/boot/dts/exynos4412-midas.dtsi | 47 +- + arch/arm/boot/dts/exynos4412-n710x.dts | 2 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 11 +- + arch/arm/boot/dts/exynos4412-odroidu3.dts | 26 + + arch/arm/boot/dts/exynos4412-odroidx.dts | 58 +- + arch/arm/boot/dts/exynos4412-origen.dts | 14 +- + arch/arm/boot/dts/exynos4412-smdk4412.dts | 20 +- + arch/arm/boot/dts/exynos4412.dtsi | 31 +- + arch/arm/boot/dts/exynos5250-arndale.dts | 6 +- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 4 +- + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 4 +- + arch/arm/boot/dts/exynos5250-snow-rev5.dts | 2 +- + arch/arm/boot/dts/exynos5250-snow.dts | 2 +- + arch/arm/boot/dts/exynos5250-spring.dts | 2 +- + arch/arm/boot/dts/exynos5250.dtsi | 6 +- + arch/arm/boot/dts/exynos5410-odroidxu.dts | 33 +- + arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 28 + + arch/arm/boot/dts/exynos5410.dtsi | 4 + + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 4 +- + arch/arm/boot/dts/exynos5420-peach-pit.dts | 6 +- + arch/arm/boot/dts/exynos5420-smdk5420.dts | 2 +- + arch/arm/boot/dts/exynos5420.dtsi | 39 +- + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 34 +- + arch/arm/boot/dts/exynos5422-odroidhc1.dts | 4 +- + arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi | 2 +- + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 4 +- + arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts | 22 + + arch/arm/boot/dts/exynos5422-odroidxu3.dts | 26 +- + arch/arm/boot/dts/exynos5422-odroidxu4.dts | 4 +- + arch/arm/boot/dts/exynos54xx-odroidxu-leds.dtsi | 11 +- + arch/arm/boot/dts/exynos54xx.dtsi | 4 +- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 4 +- + arch/arm/boot/dts/hi3519-demb.dts | 2 +- + arch/arm/boot/dts/hi3519.dtsi | 32 +- + arch/arm/boot/dts/hi3620-hi4511.dts | 24 +- + arch/arm/boot/dts/hi3620.dtsi | 32 +- + arch/arm/boot/dts/hip01-ca9x2.dts | 2 +- + arch/arm/boot/dts/hip01.dtsi | 26 +- + arch/arm/boot/dts/hip04-d01.dts | 2 +- + arch/arm/boot/dts/hip04.dtsi | 6 +- + arch/arm/boot/dts/hisi-x5hd2-dkb.dts | 2 +- + arch/arm/boot/dts/hisi-x5hd2.dtsi | 42 +- + arch/arm/boot/dts/motorola-mapphone-common.dtsi | 141 +- + arch/arm/boot/dts/nuvoton-npcm730.dtsi | 44 + + arch/arm/boot/dts/omap3-beagle-xm.dts | 10 +- + arch/arm/boot/dts/omap3-overo-base.dtsi | 4 +- + arch/arm/boot/dts/omap4-droid-bionic-xt875.dts | 46 + + arch/arm/boot/dts/omap4-droid4-xt894.dts | 143 + + arch/arm/boot/dts/omap4-kc1.dts | 6 +- + arch/arm/boot/dts/omap4-panda-es.dts | 34 +- + arch/arm/boot/dts/omap4-sdp.dts | 26 +- + arch/arm/boot/dts/omap5-l4.dtsi | 2 +- + arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ca.dts | 222 + + arch/arm/boot/dts/r8a7742-iwg21d-q7.dts | 99 + + arch/arm/boot/dts/s5pv210-aquila.dts | 12 +- + arch/arm/boot/dts/s5pv210-aries.dtsi | 4 +- + arch/arm/boot/dts/s5pv210-goni.dts | 14 +- + arch/arm/boot/dts/s5pv210-smdkv210.dts | 20 +- + arch/arm/boot/dts/ste-ab8500.dtsi | 6 +- + arch/arm/boot/dts/ste-ab8505.dtsi | 6 +- + arch/arm/boot/dts/ste-dbx5x0.dtsi | 6 +- + arch/arm/boot/dts/ste-href-stuib.dtsi | 2 +- + arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi | 2 +- + arch/arm/boot/dts/ste-href-tvk1281618-r3.dtsi | 2 +- + arch/arm/boot/dts/ste-ux500-samsung-golden.dts | 9 +- + arch/arm/boot/dts/ste-ux500-samsung-skomer.dts | 12 +- + arch/arm/boot/dts/stm32429i-eval.dts | 1 + + arch/arm/boot/dts/stm32h743.dtsi | 2 +- + arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 90 +- + arch/arm/boot/dts/stm32mp151.dtsi | 41 +- + arch/arm/boot/dts/stm32mp157c-dhcom-picoitx.dts | 35 + + arch/arm/boot/dts/stm32mp157c-dk2.dts | 4 + + arch/arm/boot/dts/stm32mp157c-ed1.dts | 12 + + arch/arm/boot/dts/stm32mp157c-ev1.dts | 1 + + arch/arm/boot/dts/stm32mp157c-lxa-mc1.dts | 2 +- + arch/arm/boot/dts/stm32mp15xx-dhcom-picoitx.dtsi | 143 + + arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 37 + + arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 38 + + arch/arm/boot/dts/tegra124-apalis-emc.dtsi | 8 + + arch/arm/boot/dts/tegra124-jetson-tk1-emc.dtsi | 8 + + arch/arm/boot/dts/tegra124-nyan-big-emc.dtsi | 10 + + arch/arm/boot/dts/tegra124-nyan-blaze-emc.dtsi | 10 + + arch/arm/boot/dts/tegra124-peripherals-opp.dtsi | 419 ++ + arch/arm/boot/dts/tegra124.dtsi | 54 +- + arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 27 +- + arch/arm/boot/dts/tegra20-colibri.dtsi | 4 + + arch/arm/boot/dts/tegra20-paz00.dts | 4 + + arch/arm/boot/dts/tegra20-peripherals-opp.dtsi | 109 + + arch/arm/boot/dts/tegra20-ventana.dts | 11 + + arch/arm/boot/dts/tegra20.dtsi | 33 +- + .../dts/tegra30-asus-nexus7-grouper-common.dtsi | 27 +- + .../tegra30-asus-nexus7-grouper-maxim-pmic.dtsi | 2 +- + ...tegra30-asus-nexus7-grouper-memory-timings.dtsi | 12 + + arch/arm/boot/dts/tegra30-asus-nexus7-tilapia.dtsi | 2 +- + arch/arm/boot/dts/tegra30-ouya.dts | 4519 ++++++++++++++++++++ + arch/arm/boot/dts/tegra30-peripherals-opp.dtsi | 383 ++ + arch/arm/boot/dts/tegra30.dtsi | 33 +- + arch/arm/configs/multi_v7_defconfig | 15 + + arch/arm/configs/omap2plus_defconfig | 5 + + arch/arm/configs/shmobile_defconfig | 22 +- + arch/arm/configs/u8500_defconfig | 10 +- + arch/arm/mach-keystone/keystone.c | 2 +- + arch/arm/mach-omap1/clock.c | 14 +- + arch/arm/mach-omap1/usb.c | 2 +- + arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 11 +- + arch/arm/mach-omap2/display.c | 6 +- + arch/arm/mach-omap2/omap_device.c | 5 +- + arch/arm/mach-shmobile/platsmp-scu.c | 2 +- + arch/arm/mach-shmobile/setup-r8a7778.c | 12 +- + arch/arm/mach-shmobile/setup-r8a7779.c | 56 +- + arch/arm/mach-shmobile/setup-sh73a0.c | 21 +- + arch/arm/mach-shmobile/smp-r8a7779.c | 12 +- + arch/arm/mach-shmobile/smp-sh73a0.c | 33 +- + arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 13 +- + arch/arm64/boot/dts/hisilicon/hi3670.dtsi | 5 +- + arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi | 27 +- + arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 4 +- + arch/arm64/boot/dts/hisilicon/hip05.dtsi | 24 +- + arch/arm64/boot/dts/hisilicon/hip06.dtsi | 14 +- + arch/arm64/boot/dts/hisilicon/hip07.dtsi | 178 +- + arch/arm64/boot/dts/nvidia/tegra132.dtsi | 20 +- + arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 4 + + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 61 +- + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 17 +- + arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 2 +- + arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 2 +- + arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 2 +- + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 22 +- + arch/arm64/boot/dts/renesas/Makefile | 4 + + .../dts/renesas/aistarvision-mipi-adapter-2.1.dtsi | 4 +- + .../boot/dts/renesas/beacon-renesom-baseboard.dtsi | 67 +- + .../arm64/boot/dts/renesas/beacon-renesom-som.dtsi | 3 +- + arch/arm64/boot/dts/renesas/cat875.dtsi | 1 - + arch/arm64/boot/dts/renesas/hihope-rev4.dtsi | 6 +- + ...hope-rzg2-ex-aistarvision-mipi-adapter-2.1.dtsi | 109 + + arch/arm64/boot/dts/renesas/hihope-rzg2-ex.dtsi | 3 +- + .../renesas/r8a774a1-hihope-rzg2m-ex-mipi-2.1.dts | 29 + + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 2 + + .../renesas/r8a774b1-hihope-rzg2n-ex-mipi-2.1.dts | 16 + + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 2 + + arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts | 67 +- + .../boot/dts/renesas/r8a774c0-ek874-mipi-2.1.dts | 3 +- + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 1 + + .../renesas/r8a774e1-hihope-rzg2h-ex-mipi-2.1.dts | 16 + + arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 2 + + .../boot/dts/renesas/r8a77951-salvator-xs.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 40 + + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 2 + + arch/arm64/boot/dts/renesas/r8a77961-ulcb-kf.dts | 15 + + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 74 + + .../boot/dts/renesas/r8a77965-salvator-xs.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 122 + + arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 3 +- + arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 3 +- + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 2 + + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 2 + + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 1 + + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 2 +- + arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 14 +- + arch/arm64/boot/dts/renesas/ulcb.dtsi | 2 +- + arch/arm64/configs/defconfig | 2 + + arch/sh/drivers/pci/pcie-sh7786.c | 2 +- + arch/x86/pci/sta2x11-fixup.c | 3 +- + drivers/clk/samsung/Kconfig | 10 + + drivers/clk/samsung/Makefile | 2 +- + drivers/clk/samsung/clk-exynos-clkout.c | 199 +- + drivers/clk/tegra/clk-tegra20-emc.c | 3 + + drivers/cpuidle/cpuidle-big_little.c | 3 +- + drivers/firmware/arm_scmi/Makefile | 2 +- + drivers/firmware/arm_scmi/common.h | 1 + + drivers/firmware/arm_scmi/driver.c | 3 + + drivers/firmware/arm_scmi/notify.c | 10 +- + drivers/firmware/arm_scmi/sensors.c | 720 +++- + drivers/firmware/arm_scmi/voltage.c | 380 ++ + drivers/firmware/tegra/bpmp-debugfs.c | 6 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 19 - + drivers/hwmon/scmi-hwmon.c | 2 +- + drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c | 27 - + drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 17 - + drivers/media/platform/sunxi/sun8i-di/sun8i-di.c | 4 - + drivers/memory/Kconfig | 4 +- + drivers/memory/jz4780-nemc.c | 4 +- + drivers/memory/mtk-smi.c | 19 + + drivers/memory/tegra/Kconfig | 9 +- + drivers/memory/tegra/mc.c | 155 +- + drivers/memory/tegra/mc.h | 22 + + drivers/memory/tegra/tegra114.c | 6 + + drivers/memory/tegra/tegra124-emc.c | 22 +- + drivers/memory/tegra/tegra124.c | 6 + + drivers/memory/tegra/tegra20-emc.c | 528 ++- + drivers/memory/tegra/tegra20.c | 77 + + drivers/memory/tegra/tegra210-emc-core.c | 39 +- + drivers/memory/tegra/tegra210.c | 60 +- + drivers/memory/tegra/tegra30-emc.c | 73 +- + drivers/memory/tegra/tegra30.c | 72 + + drivers/soc/fsl/dpio/qbman-portal.c | 18 +- + drivers/soc/fsl/qbman/qman.c | 8 +- + drivers/soc/fsl/qe/qe_common.c | 2 +- + drivers/soc/fsl/rcpm.c | 35 +- + drivers/soc/renesas/rmobile-sysc.c | 17 +- + drivers/soc/samsung/exynos-pmu.c | 11 + + drivers/soc/samsung/exynos5422-asv.c | 2 +- + drivers/soc/samsung/s3c-pm-check.c | 2 +- + drivers/soc/sunxi/Kconfig | 8 + + drivers/soc/sunxi/Makefile | 1 + + drivers/soc/sunxi/sunxi_mbus.c | 132 + + drivers/soc/tegra/fuse/speedo-tegra124.c | 21 +- + drivers/soc/tegra/fuse/speedo-tegra210.c | 8 +- + drivers/soc/tegra/fuse/tegra-apbmisc.c | 2 + + drivers/staging/media/sunxi/cedrus/cedrus.c | 1 - + drivers/staging/media/sunxi/cedrus/cedrus.h | 3 - + drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 18 - + drivers/tee/optee/device.c | 2 +- + include/dt-bindings/memory/tegra124-mc.h | 68 + + include/dt-bindings/memory/tegra20-mc.h | 53 + + include/dt-bindings/memory/tegra210-mc.h | 10 + + include/dt-bindings/memory/tegra30-mc.h | 67 + + include/linux/dma-map-ops.h | 3 + + include/linux/dma-mapping.h | 7 - + include/linux/scmi_protocol.h | 352 +- + include/linux/serial_s3c.h | 2 +- + include/soc/tegra/fuse.h | 4 + + include/soc/tegra/mc.h | 27 + + kernel/dma/direct.c | 1 - + 284 files changed, 12206 insertions(+), 1587 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/bus/nvidia,tegra210-aconnect.txt + create mode 100644 Documentation/devicetree/bindings/bus/nvidia,tegra210-aconnect.yaml + delete mode 100644 Documentation/devicetree/bindings/dma/nvidia,tegra210-adma.txt + create mode 100644 Documentation/devicetree/bindings/dma/nvidia,tegra210-adma.yaml + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/mediatek,smi-common.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/mediatek,smi-common.yaml + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml + create mode 100644 Documentation/devicetree/bindings/usb/st,stusb160x.yaml + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/nuvoton-npcm730.dtsi + create mode 100644 arch/arm/boot/dts/stm32mp157c-dhcom-picoitx.dts + create mode 100644 arch/arm/boot/dts/stm32mp15xx-dhcom-picoitx.dtsi + create mode 100644 arch/arm/boot/dts/tegra124-peripherals-opp.dtsi + create mode 100644 arch/arm/boot/dts/tegra20-peripherals-opp.dtsi + create mode 100644 arch/arm/boot/dts/tegra30-ouya.dts + create mode 100644 arch/arm/boot/dts/tegra30-peripherals-opp.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/hihope-rzg2-ex-aistarvision-mipi-adapter-2.1.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-ex-mipi-2.1.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-ex-mipi-2.1.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774e1-hihope-rzg2h-ex-mipi-2.1.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a77961-ulcb-kf.dts + create mode 100644 drivers/firmware/arm_scmi/voltage.c + create mode 100644 drivers/soc/sunxi/sunxi_mbus.c +Merging amlogic/for-next (84a1411c7549 Merge branch 'v5.11/soc' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Auto-merging arch/arm64/Kconfig.platforms +Merge made by the 'recursive' strategy. + arch/arm64/Kconfig.platforms | 3 --- + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 6 ++++++ + .../boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts | 4 ---- + drivers/firmware/meson/Kconfig | 5 +++-- + drivers/firmware/meson/meson_sm.c | 1 + + drivers/soc/amlogic/Kconfig | 12 ++++++------ + drivers/soc/amlogic/meson-clk-measure.c | 5 ++++- + drivers/soc/amlogic/meson-ee-pwrc.c | 5 ++++- + drivers/soc/amlogic/meson-gx-pwrc-vpu.c | 5 ++++- + drivers/soc/amlogic/meson-secure-pwrc.c | 5 ++++- + 10 files changed, 32 insertions(+), 19 deletions(-) +Merging aspeed/for-next (41707a524026 Merge branches 'soc-for-v5.11' and 'defconfig-for-v5.11' into for-next) +$ git merge aspeed/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mfd/aspeed-lpc.txt | 8 +- + .../devicetree/bindings/mfd/aspeed-scu.txt | 26 + + arch/arm/boot/dts/Makefile | 3 + + arch/arm/boot/dts/aspeed-ast2600-evb.dts | 20 + + arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts | 77 +- + arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts | 924 +++++++++++++++++++++ + .../arm/boot/dts/aspeed-bmc-facebook-galaxy100.dts | 57 ++ + arch/arm/boot/dts/aspeed-bmc-facebook-minipack.dts | 888 ++++++++++++++++++++ + .../arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts | 13 +- + arch/arm/boot/dts/aspeed-bmc-facebook-wedge100.dts | 120 +-- + arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts | 112 +-- + arch/arm/boot/dts/aspeed-bmc-facebook-wedge400.dts | 4 +- + arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts | 37 + + arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 39 +- + arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts | 4 +- + arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 11 +- + arch/arm/boot/dts/aspeed-g4.dtsi | 5 + + arch/arm/boot/dts/aspeed-g5.dtsi | 5 + + arch/arm/boot/dts/aspeed-g6.dtsi | 7 +- + .../boot/dts/ast2400-facebook-netbmc-common.dtsi | 117 +++ + arch/arm/boot/dts/openbmc-flash-layout-64.dtsi | 35 + + arch/arm/configs/aspeed_g5_defconfig | 4 + + drivers/soc/Makefile | 2 +- + drivers/soc/aspeed/Kconfig | 47 +- + drivers/soc/aspeed/Makefile | 1 + + drivers/soc/aspeed/aspeed-lpc-ctrl.c | 37 +- + drivers/soc/aspeed/aspeed-lpc-snoop.c | 2 + + drivers/soc/aspeed/aspeed-socinfo.c | 135 +++ + 28 files changed, 2472 insertions(+), 268 deletions(-) + create mode 100644 arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-galaxy100.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts + create mode 100644 arch/arm/boot/dts/ast2400-facebook-netbmc-common.dtsi + create mode 100644 arch/arm/boot/dts/openbmc-flash-layout-64.dtsi + create mode 100644 drivers/soc/aspeed/aspeed-socinfo.c +Merging at91/at91-next (65cc8babccce Merge branches 'at91-drivers', 'at91-dt' and 'at91-defconfig' into at91-next) +$ git merge at91/at91-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/at91-kizbox.dts | 10 +++--- + arch/arm/boot/dts/at91-kizbox2-common.dtsi | 8 ++--- + arch/arm/boot/dts/at91-kizbox3-hs.dts | 16 ++++----- + arch/arm/boot/dts/at91-kizbox3_common.dtsi | 10 +++--- + arch/arm/boot/dts/at91-kizboxmini-common.dtsi | 8 ++--- + arch/arm/boot/dts/at91-sam9x60ek.dts | 9 +++++ + arch/arm/boot/dts/at91-sama5d27_som1.dtsi | 2 +- + arch/arm/boot/dts/at91-sama5d3_xplained.dts | 7 ++++ + arch/arm/boot/dts/at91-sama5d4_xplained.dts | 7 ++++ + arch/arm/boot/dts/at91-smartkiz.dts | 6 ++-- + arch/arm/boot/dts/at91sam9m10g45ek.dts | 10 +++--- + arch/arm/boot/dts/at91sam9rlek.dts | 10 +++--- + arch/arm/configs/at91_dt_defconfig | 5 +++ + arch/arm/configs/sama5_defconfig | 9 +++++ + drivers/pcmcia/Kconfig | 1 + + drivers/pcmcia/at91_cf.c | 50 ++++++++++----------------- + drivers/soc/atmel/soc.c | 6 ++++ + drivers/soc/atmel/soc.h | 3 ++ + include/linux/platform_data/atmel.h | 12 ------- + 19 files changed, 105 insertions(+), 84 deletions(-) +Merging drivers-memory/for-next (a4f11eac544c Merge branch 'mem-ctrl-next' into for-next) +$ git merge drivers-memory/for-next +Merge made by the 'recursive' strategy. + drivers/memory/renesas-rpc-if.c | 18 ++++-------------- + include/memory/renesas-rpc-if.h | 13 +++++++++++-- + 2 files changed, 15 insertions(+), 16 deletions(-) +Merging imx-mxs/for-next (24462a1e187c Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Auto-merging drivers/clk/imx/clk.h +Auto-merging drivers/clk/imx/clk-imx8mq.c +Auto-merging drivers/clk/imx/clk-imx8mp.c +Auto-merging drivers/clk/imx/clk-imx8mn.c +Auto-merging drivers/clk/imx/clk-imx8mm.c +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging Documentation/devicetree/bindings/arm/fsl.yaml +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/freescale/fsl,scu.txt | 12 +- + Documentation/devicetree/bindings/arm/fsl.yaml | 357 +++++++++++-- + .../devicetree/bindings/clock/imx8qxp-lpcg.yaml | 79 ++- + .../bindings/net/ethernet-controller.yaml | 1 + + .../bindings/net/fsl,qoriq-mc-dpmac.yaml | 60 +++ + .../devicetree/bindings/vendor-prefixes.yaml | 12 + + .../devicetree/bindings/watchdog/fsl-imx-wdt.yaml | 16 + + arch/arm/boot/dts/Makefile | 3 + + arch/arm/boot/dts/imx25.dtsi | 2 +- + arch/arm/boot/dts/imx27.dtsi | 2 +- + arch/arm/boot/dts/imx31.dtsi | 3 +- + arch/arm/boot/dts/imx35.dtsi | 2 +- + arch/arm/boot/dts/imx50-kobo-aura.dts | 41 +- + arch/arm/boot/dts/imx50.dtsi | 2 +- + arch/arm/boot/dts/imx51-zii-rdu1.dts | 2 +- + arch/arm/boot/dts/imx51.dtsi | 4 +- + arch/arm/boot/dts/imx53-ppd.dts | 15 +- + arch/arm/boot/dts/imx53.dtsi | 4 +- + arch/arm/boot/dts/imx6dl-alti6p.dts | 564 +++++++++++++++++++++ + arch/arm/boot/dts/imx6dl-aristainetos2_4.dts | 2 +- + arch/arm/boot/dts/imx6dl-aristainetos2_7.dts | 2 +- + arch/arm/boot/dts/imx6dl-aristainetos_4.dts | 2 +- + arch/arm/boot/dts/imx6dl-aristainetos_7.dts | 2 +- + arch/arm/boot/dts/imx6dl-lanmcu.dts | 470 +++++++++++++++++ + arch/arm/boot/dts/imx6dl-pico-dwarf.dts | 2 +- + arch/arm/boot/dts/imx6dl-pico-hobbit.dts | 2 +- + arch/arm/boot/dts/imx6dl-pico-nymph.dts | 2 +- + arch/arm/boot/dts/imx6dl-pico-pi.dts | 2 +- + arch/arm/boot/dts/imx6q-icore-ofcap10.dts | 28 +- + arch/arm/boot/dts/imx6q-pico-dwarf.dts | 2 +- + arch/arm/boot/dts/imx6q-pico-hobbit.dts | 2 +- + arch/arm/boot/dts/imx6q-pico-nymph.dts | 2 +- + arch/arm/boot/dts/imx6q-pico-pi.dts | 2 +- + arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 3 +- + arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi | 3 +- + arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 8 +- + arch/arm/boot/dts/imx6qdl.dtsi | 12 +- + arch/arm/boot/dts/imx6sl-warp.dts | 4 +- + arch/arm/boot/dts/imx6sl.dtsi | 3 + + arch/arm/boot/dts/imx6sll.dtsi | 2 + + arch/arm/boot/dts/imx6sx-softing-vining-2000.dts | 8 +- + arch/arm/boot/dts/imx6sx.dtsi | 7 +- + arch/arm/boot/dts/imx6ul-ccimx6ulsbcpro.dts | 2 +- + arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi | 1 + + .../boot/dts/imx6ul-phytec-segin-ff-rdk-emmc.dts | 94 ++++ + .../boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts | 1 + + .../boot/dts/imx6ul-phytec-segin-peb-av-02.dtsi | 151 ++++++ + arch/arm/boot/dts/imx6ul-phytec-segin.dtsi | 43 -- + arch/arm/boot/dts/imx6ul.dtsi | 10 +- + .../boot/dts/imx6ull-phytec-segin-ff-rdk-emmc.dts | 1 + + .../boot/dts/imx6ull-phytec-segin-ff-rdk-nand.dts | 1 + + .../boot/dts/imx6ull-phytec-segin-peb-av-02.dtsi | 26 + + arch/arm/boot/dts/imx6ull-phytec-segin.dtsi | 7 - + arch/arm/boot/dts/imx7-mba7.dtsi | 69 ++- + arch/arm/boot/dts/imx7d-mba7.dts | 7 +- + arch/arm/boot/dts/imx7d.dtsi | 6 + + arch/arm/boot/dts/imx7s-mba7.dts | 2 +- + arch/arm/boot/dts/imx7s-warp.dts | 4 +- + arch/arm/boot/dts/imx7s.dtsi | 6 +- + arch/arm/boot/dts/vfxxx.dtsi | 6 +- + arch/arm/mach-imx/mach-imx6q.c | 9 +- + arch/arm/mach-imx/mach-imx7ulp.c | 4 + + arch/arm64/boot/dts/freescale/Makefile | 2 + + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 8 +- + .../dts/freescale/fsl-ls1028a-kontron-sl28.dts | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 20 + + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 8 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts | 119 +++++ + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 136 ++++- + arch/arm64/boot/dts/freescale/fsl-ls2088a-rdb.dts | 120 +++++ + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 278 +++++++++- + arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts | 32 ++ + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 290 ++++++++++- + arch/arm64/boot/dts/freescale/fsl-lx2162a-qds.dts | 334 ++++++++++++ + .../boot/dts/freescale/imx8mm-beacon-som.dtsi | 315 +++++++----- + arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi | 16 +- + .../boot/dts/freescale/imx8mm-kontron-n801x-s.dts | 322 ++++++++++++ + .../dts/freescale/imx8mm-kontron-n801x-som.dtsi | 294 +++++++++++ + arch/arm64/boot/dts/freescale/imx8mm-var-som.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 53 +- + arch/arm64/boot/dts/freescale/imx8mn-evk.dts | 32 +- + arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 16 +- + arch/arm64/boot/dts/freescale/imx8mn-var-som.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 15 +- + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 64 ++- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 45 +- + arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 39 ++ + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 68 ++- + arch/arm64/configs/defconfig | 6 + + drivers/clk/imx/clk-gate2.c | 68 ++- + drivers/clk/imx/clk-imx8mm.c | 2 +- + drivers/clk/imx/clk-imx8mn.c | 2 +- + drivers/clk/imx/clk-imx8mp.c | 4 +- + drivers/clk/imx/clk-imx8mq.c | 2 +- + drivers/clk/imx/clk-imx8qxp-lpcg.c | 139 +++++ + drivers/clk/imx/clk-imx8qxp.c | 136 ++--- + drivers/clk/imx/clk-lpcg-scu.c | 53 +- + drivers/clk/imx/clk-pll14xx.c | 2 +- + drivers/clk/imx/clk-scu.c | 234 ++++++++- + drivers/clk/imx/clk-scu.h | 56 +- + drivers/clk/imx/clk.h | 27 +- + drivers/firmware/imx/imx-dsp.c | 72 ++- + drivers/firmware/imx/scu-pd.c | 6 + + include/dt-bindings/clock/imx8-lpcg.h | 14 + + include/linux/firmware/imx/dsp.h | 10 + + include/linux/firmware/imx/ipc.h | 13 + + include/linux/firmware/imx/sci.h | 27 + + include/linux/firmware/imx/svc/misc.h | 19 + + 110 files changed, 5144 insertions(+), 591 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml + create mode 100644 arch/arm/boot/dts/imx6dl-alti6p.dts + create mode 100644 arch/arm/boot/dts/imx6dl-lanmcu.dts + create mode 100644 arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-emmc.dts + create mode 100644 arch/arm/boot/dts/imx6ul-phytec-segin-peb-av-02.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-phytec-segin-peb-av-02.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/fsl-lx2162a-qds.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-kontron-n801x-s.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-kontron-n801x-som.dtsi + create mode 100644 include/dt-bindings/clock/imx8-lpcg.h +Merging keystone/next (b2a8f6ce4bdc Merge branch 'for_5.11/drivers-soc' into next) +$ git merge keystone/next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/keystone-k2g-evm.dts | 112 +++++++++++++++++ + drivers/firmware/ti_sci.c | 213 +++++++++++---------------------- + drivers/firmware/ti_sci.h | 72 ++++------- + drivers/soc/ti/Kconfig | 18 --- + drivers/soc/ti/k3-ringacc.c | 98 +++++++-------- + drivers/soc/ti/k3-socinfo.c | 1 + + drivers/soc/ti/knav_dma.c | 15 ++- + drivers/soc/ti/knav_qmss_queue.c | 66 +++++----- + drivers/soc/ti/omap_prm.c | 4 + + drivers/soc/ti/pm33xx.c | 4 +- + drivers/soc/ti/pruss.c | 6 - + drivers/soc/ti/ti_sci_inta_msi.c | 12 ++ + drivers/soc/ti/wkup_m3_ipc.c | 8 +- + include/linux/soc/ti/k3-ringacc.h | 5 + + include/linux/soc/ti/ti_sci_protocol.h | 85 ++++++++----- + 15 files changed, 384 insertions(+), 335 deletions(-) +Merging mediatek/for-next (727bfb2c55b0 Merge branch 'v5.10-next/soc' into for-next) +$ git merge mediatek/for-next +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/arm/mediatek.yaml +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/mediatek.yaml | 4 + + .../devicetree/bindings/iio/adc/mt6577_auxadc.txt | 1 + + .../bindings/power/mediatek,power-controller.yaml | 293 ++++++++ + .../devicetree/bindings/soc/mediatek/devapc.yaml | 58 ++ + MAINTAINERS | 2 +- + arch/arm64/boot/dts/mediatek/Makefile | 3 + + arch/arm64/boot/dts/mediatek/mt6779-evb.dts | 31 + + arch/arm64/boot/dts/mediatek/mt6779.dtsi | 271 ++++++++ + .../boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 13 +- + arch/arm64/boot/dts/mediatek/mt8167-pinfunc.h | 744 +++++++++++++++++++++ + arch/arm64/boot/dts/mediatek/mt8167-pumpkin.dts | 20 + + arch/arm64/boot/dts/mediatek/mt8167.dtsi | 61 ++ + arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 1 - + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 164 +++-- + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 28 + + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 408 ++++++++++- + arch/arm64/boot/dts/mediatek/mt8192-evb.dts | 29 + + arch/arm64/boot/dts/mediatek/mt8192.dtsi | 512 ++++++++++++++ + arch/arm64/boot/dts/mediatek/mt8516.dtsi | 40 +- + arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi | 28 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 3 +- + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 34 +- + drivers/mfd/syscon.c | 18 + + drivers/soc/mediatek/Kconfig | 21 + + drivers/soc/mediatek/Makefile | 2 + + drivers/soc/mediatek/mt8173-pm-domains.h | 94 +++ + drivers/soc/mediatek/mt8183-pm-domains.h | 221 ++++++ + drivers/soc/mediatek/mt8192-pm-domains.h | 292 ++++++++ + drivers/soc/mediatek/mtk-cmdq-helper.c | 41 +- + drivers/soc/mediatek/mtk-devapc.c | 308 +++++++++ + drivers/soc/mediatek/mtk-infracfg.c | 5 - + drivers/soc/mediatek/mtk-mmsys.c | 11 +- + drivers/soc/mediatek/mtk-pm-domains.c | 614 +++++++++++++++++ + drivers/soc/mediatek/mtk-pm-domains.h | 102 +++ + drivers/soc/mediatek/mtk-scpsys.c | 5 +- + include/dt-bindings/power/mt8183-power.h | 26 + + include/dt-bindings/power/mt8192-power.h | 32 + + include/linux/mfd/syscon.h | 11 + + include/linux/soc/mediatek/infracfg.h | 107 +++ + include/linux/soc/mediatek/mtk-cmdq.h | 10 +- + include/linux/soc/mediatek/mtk-mmsys.h | 33 + + 41 files changed, 4530 insertions(+), 171 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/mediatek,power-controller.yaml + create mode 100644 Documentation/devicetree/bindings/soc/mediatek/devapc.yaml + create mode 100644 arch/arm64/boot/dts/mediatek/mt6779-evb.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt6779.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8167-pinfunc.h + create mode 100644 arch/arm64/boot/dts/mediatek/mt8167-pumpkin.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8167.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8192-evb.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8192.dtsi + create mode 100644 drivers/soc/mediatek/mt8173-pm-domains.h + create mode 100644 drivers/soc/mediatek/mt8183-pm-domains.h + create mode 100644 drivers/soc/mediatek/mt8192-pm-domains.h + create mode 100644 drivers/soc/mediatek/mtk-devapc.c + create mode 100644 drivers/soc/mediatek/mtk-pm-domains.c + create mode 100644 drivers/soc/mediatek/mtk-pm-domains.h + create mode 100644 include/dt-bindings/power/mt8183-power.h + create mode 100644 include/dt-bindings/power/mt8192-power.h +Merging mvebu/for-next (5c5bf284e9e4 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 15 +- + arch/arm/boot/dts/Makefile | 6 + + arch/arm/boot/dts/armada-388-clearfog.dts | 4 +- + arch/arm/boot/dts/armada-388-clearfog.dtsi | 10 +- + arch/arm/boot/dts/armada-388-helios4.dts | 6 +- + arch/arm/boot/dts/armada-xp-98dx3236.dtsi | 12 +- + arch/arm/boot/dts/armada-xp-crs305-1g-4s-bit.dts | 43 ++ + arch/arm/boot/dts/armada-xp-crs305-1g-4s.dts | 17 + + arch/arm/boot/dts/armada-xp-crs305-1g-4s.dtsi | 104 ++++ + arch/arm/boot/dts/armada-xp-crs326-24g-2s-bit.dts | 43 ++ + arch/arm/boot/dts/armada-xp-crs326-24g-2s.dts | 17 + + arch/arm/boot/dts/armada-xp-crs326-24g-2s.dtsi | 104 ++++ + .../boot/dts/armada-xp-crs328-4c-20s-4s-bit.dts | 43 ++ + arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s.dts | 17 + + arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s.dtsi | 104 ++++ + arch/arm/boot/dts/dove-sbc-a510.dts | 1 + + arch/arm/boot/dts/kirkwood-dockstar.dts | 2 +- + arch/arm/boot/dts/kirkwood-dreamplug.dts | 2 +- + arch/arm/boot/dts/kirkwood-goflexnet.dts | 2 +- + .../arm/boot/dts/kirkwood-guruplug-server-plus.dts | 2 +- + arch/arm/boot/dts/kirkwood-iconnect.dts | 2 +- + arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 2 +- + arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi | 2 +- + arch/arm/boot/dts/kirkwood.dtsi | 4 +- + arch/arm64/boot/dts/marvell/Makefile | 2 + + .../dts/marvell/armada-3720-espressobin-emmc.dts | 18 - + .../dts/marvell/armada-3720-espressobin-ultra.dts | 165 +++++++ + .../marvell/armada-3720-espressobin-v7-emmc.dts | 38 +- + .../dts/marvell/armada-3720-espressobin-v7.dts | 22 +- + .../boot/dts/marvell/armada-3720-espressobin.dtsi | 39 +- + .../boot/dts/marvell/armada-3720-turris-mox.dts | 2 +- + .../boot/dts/marvell/armada-8040-puzzle-m801.dts | 523 +++++++++++++++++++++ + arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 6 +- + 33 files changed, 1286 insertions(+), 93 deletions(-) + create mode 100644 arch/arm/boot/dts/armada-xp-crs305-1g-4s-bit.dts + create mode 100644 arch/arm/boot/dts/armada-xp-crs305-1g-4s.dts + create mode 100644 arch/arm/boot/dts/armada-xp-crs305-1g-4s.dtsi + create mode 100644 arch/arm/boot/dts/armada-xp-crs326-24g-2s-bit.dts + create mode 100644 arch/arm/boot/dts/armada-xp-crs326-24g-2s.dts + create mode 100644 arch/arm/boot/dts/armada-xp-crs326-24g-2s.dtsi + create mode 100644 arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s-bit.dts + create mode 100644 arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s.dts + create mode 100644 arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts + create mode 100644 arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts +Merging omap/for-next (6a5044c84dfa Merge branch 'omap-for-v5.11/genpd' into for-next) +$ git merge omap/for-next +Auto-merging drivers/soc/ti/pm33xx.c +Auto-merging drivers/soc/ti/omap_prm.c +Removing arch/arm/mach-omap2/omap_hwmod_43xx_data.c +Removing arch/arm/mach-omap2/omap_hwmod_33xx_data.c +Removing arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c +Removing arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c +Removing arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am335x-nano.dts | 1 - + arch/arm/boot/dts/am33xx-l4.dtsi | 75 +++-- + arch/arm/boot/dts/am33xx.dtsi | 185 +++++++---- + arch/arm/boot/dts/am4372.dtsi | 175 ++++++---- + arch/arm/boot/dts/am437x-l4.dtsi | 79 +++-- + arch/arm/boot/dts/dra7.dtsi | 151 ++++++++- + arch/arm/boot/dts/dra7xx-clocks.dtsi | 14 + + arch/arm/boot/dts/omap4-l4.dtsi | 1 + + arch/arm/boot/dts/omap4.dtsi | 150 +++++++-- + arch/arm/boot/dts/omap5.dtsi | 58 ++++ + arch/arm/mach-omap2/Kconfig | 8 + + arch/arm/mach-omap2/Makefile | 19 +- + arch/arm/mach-omap2/io.c | 4 - + arch/arm/mach-omap2/omap_hwmod.c | 6 + + .../mach-omap2/omap_hwmod_33xx_43xx_common_data.h | 57 ---- + .../omap_hwmod_33xx_43xx_interconnect_data.c | 90 ------ + .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 290 ----------------- + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 294 ----------------- + arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 167 ---------- + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 114 ------- + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 49 --- + arch/arm/mach-omap2/pdata-quirks.c | 33 +- + drivers/bus/ti-sysc.c | 41 ++- + drivers/clk/ti/clk-33xx.c | 2 + + drivers/clk/ti/clk-43xx.c | 8 + + drivers/clk/ti/clk-44xx.c | 2 +- + drivers/clk/ti/clk-7xx.c | 7 + + drivers/remoteproc/wkup_m3_rproc.c | 41 ++- + drivers/soc/ti/omap_prm.c | 354 +++++++++++++++++++-- + drivers/soc/ti/pm33xx.c | 17 +- + include/dt-bindings/clock/dra7.h | 4 + + include/linux/platform_data/ti-sysc.h | 1 + + 32 files changed, 1160 insertions(+), 1337 deletions(-) + delete mode 100644 arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h + delete mode 100644 arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c + delete mode 100644 arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c + delete mode 100644 arch/arm/mach-omap2/omap_hwmod_33xx_data.c + delete mode 100644 arch/arm/mach-omap2/omap_hwmod_43xx_data.c +Merging qcom/for-next (ab57017c45f2 Merge branches 'arm64-for-5.11', 'arm64-defconfig-for-5.11', 'drivers-for-5.11' and 'dts-for-5.11' into for-next) +$ git merge qcom/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/boot/dts/qcom/ipq6018.dtsi +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/msm/qcom,llcc.yaml | 1 + + .../devicetree/bindings/power/qcom,rpmpd.yaml | 4 + + .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 25 + + arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts | 340 ++++++++- + arch/arm/boot/dts/qcom-pma8084.dtsi | 1 - + arch/arm64/boot/dts/qcom/Makefile | 6 + + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 10 - + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 10 +- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 4 +- + .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 181 ++++- + arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi | 7 +- + .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 21 +- + .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts | 29 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 40 +- + .../boot/dts/qcom/msm8992-msft-lumia-talkman.dts | 28 + + arch/arm64/boot/dts/qcom/msm8992.dtsi | 120 +++ + .../boot/dts/qcom/msm8994-msft-lumia-cityman.dts | 73 ++ + arch/arm64/boot/dts/qcom/msm8994.dtsi | 94 ++- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm6150.dtsi | 10 + + arch/arm64/boot/dts/qcom/pm6150l.dtsi | 24 + + arch/arm64/boot/dts/qcom/pm8150.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm8994.dtsi | 96 ++- + arch/arm64/boot/dts/qcom/qcs404.dtsi | 4 +- + arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 108 +++ + arch/arm64/boot/dts/qcom/sc7180-lite.dtsi | 18 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r0.dts | 11 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r1-kb.dts | 4 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r1-lte.dts | 12 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 15 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts | 17 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts | 26 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r3.dts | 15 + + arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 7 +- + .../boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi | 4 + + arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 16 +- + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 106 ++- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 212 +++++- + arch/arm64/boot/dts/qcom/sdm630.dtsi | 4 +- + arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 11 + + arch/arm64/boot/dts/qcom/sdm845.dtsi | 16 +- + arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 463 ++++++++++++ + arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 17 + + arch/arm64/boot/dts/qcom/sm8150.dtsi | 801 +++++++++++++++++++++ + arch/arm64/boot/dts/qcom/sm8250-hdk.dts | 454 ++++++++++++ + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 6 +- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 491 ++++++++++++- + arch/arm64/configs/defconfig | 4 + + drivers/i2c/busses/i2c-qcom-geni.c | 6 +- + drivers/soc/qcom/Kconfig | 5 +- + drivers/soc/qcom/cmd-db.c | 8 +- + drivers/soc/qcom/kryo-l2-accessors.c | 2 +- + drivers/soc/qcom/llcc-qcom.c | 147 ++-- + drivers/soc/qcom/pdr_interface.c | 8 +- + drivers/soc/qcom/qcom-geni-se.c | 64 +- + drivers/soc/qcom/qcom_aoss.c | 4 +- + drivers/soc/qcom/rpmh-rsc.c | 7 +- + drivers/soc/qcom/rpmh.c | 14 +- + drivers/soc/qcom/rpmhpd.c | 16 + + drivers/soc/qcom/rpmpd.c | 85 ++- + drivers/soc/qcom/smem.c | 3 +- + drivers/soc/qcom/smp2p.c | 6 +- + drivers/soc/qcom/smsm.c | 4 +- + drivers/soc/qcom/socinfo.c | 6 + + drivers/soc/qcom/wcnss_ctrl.c | 8 +- + include/dt-bindings/power/qcom-rpmpd.h | 34 + + include/linux/qcom-geni-se.h | 2 - + include/linux/soc/qcom/llcc-qcom.h | 6 + + samples/qmi/qmi_sample_client.c | 4 +- + 70 files changed, 4143 insertions(+), 268 deletions(-) + create mode 100644 arch/arm64/boot/dts/qcom/msm8994-msft-lumia-cityman.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-lite.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8150-hdk.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8250-hdk.dts +Merging raspberrypi/for-next (278407a53c3b ARM: dts: bcm283x: increase dwc2's RX FIFO size) +$ git merge raspberrypi/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 2 ++ + arch/arm/boot/dts/bcm283x-rpi-usb-otg.dtsi | 2 +- + arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi | 2 +- + 3 files changed, 4 insertions(+), 2 deletions(-) +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 (d5360d3b5aee Merge branch 'renesas-arm-dt-for-v5.11' into renesas-next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. +Merging reset/reset/next (3bfe8933f9d1 reset: meson: make it possible to build as a module) +$ git merge reset/reset/next +Merge made by the 'recursive' strategy. + drivers/reset/Kconfig | 3 +- + drivers/reset/core.c | 73 +++++++++++++++++++++++++++++++++++++++++++++ + drivers/reset/reset-meson.c | 8 ++++- + include/linux/reset.h | 1 + + 4 files changed, 83 insertions(+), 2 deletions(-) +Merging rockchip/for-next (db4d9df43533 Merge branch 'v5.11-armsoc/drivers' into for-next) +$ git merge rockchip/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging Documentation/devicetree/bindings/arm/rockchip.yaml +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 17 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm/boot/dts/rk3288-veyron-jaq.dts | 2 +- + arch/arm/boot/dts/rk3288-veyron-minnie.dts | 2 +- + arch/arm/boot/dts/rk3288-veyron-tiger.dts | 2 +- + arch/arm64/boot/dts/rockchip/Makefile | 3 + + .../boot/dts/rockchip/px30-engicam-common.dtsi | 39 +++ + .../boot/dts/rockchip/px30-engicam-ctouch2.dtsi | 8 + + .../boot/dts/rockchip/px30-engicam-edimm2.2.dtsi | 7 + + .../rockchip/px30-engicam-px30-core-ctouch2.dts | 22 ++ + .../rockchip/px30-engicam-px30-core-edimm2.2.dts | 21 ++ + .../boot/dts/rockchip/px30-engicam-px30-core.dtsi | 232 +++++++++++++ + arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts | 24 ++ + .../boot/dts/rockchip/rk3399-kobol-helios64.dts | 372 +++++++++++++++++++++ + drivers/clk/rockchip/Kconfig | 12 +- + drivers/soc/rockchip/io-domain.c | 3 - + 16 files changed, 761 insertions(+), 7 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/px30-engicam-common.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/px30-engicam-ctouch2.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/px30-engicam-edimm2.2.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/px30-engicam-px30-core-ctouch2.dts + create mode 100644 arch/arm64/boot/dts/rockchip/px30-engicam-px30-core-edimm2.2.dts + create mode 100644 arch/arm64/boot/dts/rockchip/px30-engicam-px30-core.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts +Merging samsung-krzk/for-next (4792bcc96771 Merge branch 'next/defconfig' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging Documentation/devicetree/bindings/arm/samsung/samsung-boards.yaml +Merge made by the 'recursive' strategy. + .../bindings/arm/samsung/samsung-boards.yaml | 8 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/exynos3250.dtsi | 1 - + arch/arm/boot/dts/exynos4412-p4note-n8010.dts | 17 + + arch/arm/boot/dts/exynos4412-p4note.dtsi | 1132 ++++++++++++++++++++ + arch/arm/boot/dts/exynos4412.dtsi | 1 - + arch/arm/boot/dts/exynos5250.dtsi | 1 - + arch/arm/boot/dts/exynos5422-odroidxu3.dts | 8 +- + arch/arm/boot/dts/exynos54xx.dtsi | 1 - + arch/arm/boot/dts/s5pv210-aries.dtsi | 1 - + arch/arm/boot/dts/s5pv210.dtsi | 1 - + arch/arm/configs/exynos_defconfig | 8 +- + arch/arm/configs/multi_v7_defconfig | 7 +- + arch/arm/mach-exynos/exynos.c | 7 +- + arch/arm/mach-exynos/platsmp.c | 2 +- + arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi | 10 +- + arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi | 2 +- + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 39 +- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 49 +- + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 2 +- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 15 +- + 21 files changed, 1266 insertions(+), 47 deletions(-) + create mode 100644 arch/arm/boot/dts/exynos4412-p4note-n8010.dts + create mode 100644 arch/arm/boot/dts/exynos4412-p4note.dtsi +Merging scmi/for-linux-next (d07628cb5092 Merge tag 'scmi-updates-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge scmi/for-linux-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging stm32/stm32-next (814fddb955f8 ARM: multi_v7_defconfig: enable STM32 dfsdm audio support) +$ git merge stm32/stm32-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging Documentation/devicetree/bindings/arm/stm32/stm32.yaml +Merge made by the 'recursive' strategy. +Merging sunxi/sunxi/for-next (8ebd74f80194 Merge branches 'sunxi/dt-for-5.11', 'sunxi/fixes-for-5.10' and 'sunxi/config-for-5.11' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging Documentation/devicetree/bindings/arm/sunxi.yaml +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/sunxi.yaml | 23 +++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm/boot/dts/Makefile | 3 + + arch/arm/boot/dts/sun7i-a20-bananapi.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 4 +- + .../boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts | 64 ++++++++ + arch/arm/boot/dts/sun8i-h3-nanopi-r1.dts | 169 +++++++++++++++++++++ + arch/arm/boot/dts/sun8i-h3-zeropi.dts | 85 +++++++++++ + arch/arm/boot/dts/sun8i-s3-elimo-impetus.dtsi | 44 ++++++ + arch/arm/boot/dts/sun8i-s3-elimo-initium.dts | 29 ++++ + arch/arm/boot/dts/sun8i-s3-pinecube.dts | 2 +- + arch/arm/boot/dts/sun8i-v3.dtsi | 5 + + arch/arm/boot/dts/sun8i-v3s.dtsi | 8 +- + arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 12 +- + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 13 ++ + arch/arm/configs/sunxi_defconfig | 1 + + arch/arm/mach-sunxi/sunxi.c | 1 + + .../dts/allwinner/sun50i-a64-pinephone-1.0.dts | 5 + + .../dts/allwinner/sun50i-a64-pinephone-1.1.dts | 5 + + .../dts/allwinner/sun50i-a64-pinephone-1.2.dts | 14 ++ + .../boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 68 ++++++++- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 14 ++ + .../dts/allwinner/sun50i-h6-orangepi-one-plus.dts | 2 +- + .../dts/allwinner/sun50i-h6-pine-h64-model-b.dts | 15 ++ + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 15 +- + arch/arm64/configs/defconfig | 1 + + 26 files changed, 585 insertions(+), 21 deletions(-) + create mode 100644 arch/arm/boot/dts/sun8i-h3-nanopi-r1.dts + create mode 100644 arch/arm/boot/dts/sun8i-h3-zeropi.dts + create mode 100644 arch/arm/boot/dts/sun8i-s3-elimo-impetus.dtsi + create mode 100644 arch/arm/boot/dts/sun8i-s3-elimo-initium.dts +Merging tegra/for-next (b11a0dfbd316 Merge branch for-5.11/arm64/defconfig into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + drivers/clk/tegra/clk-bpmp.c | 6 +++--- + drivers/clk/tegra/clk-dfll.c | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) +Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' into ti-k3-next) +$ git merge ti-k3/ti-k3-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ti-k3-new/ti-k3-next (090f54565722 Merge branch 'ti-k3-dts-next' into ti-k3-next) +$ git merge ti-k3-new/ti-k3-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 13 +-- + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 43 +++++++- + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 71 +++++++++++-- + .../boot/dts/ti/k3-j7200-common-proc-board.dts | 33 +++--- + arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 114 +++++++++++++++++++++ + arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 19 ++++ + arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi | 94 +++++++++++++++++ + .../boot/dts/ti/k3-j721e-common-proc-board.dts | 50 ++++++++- + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 113 ++++++++++++++------ + arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 42 +++++++- + arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi | 110 +++++++++++++++++++- + arch/arm64/configs/defconfig | 2 + + 12 files changed, 634 insertions(+), 70 deletions(-) +Merging clk/clk-next (9dc1f9729380 Merge branch 'clk-qcom' into clk-next) +$ git merge clk/clk-next +Merge made by the 'recursive' strategy. + .../bindings/clock/qcom,aoncc-sm8250.yaml | 58 + + .../bindings/clock/qcom,audiocc-sm8250.yaml | 58 + + .../bindings/clock/qcom,sc7180-camcc.yaml | 73 + + drivers/clk/clk.c | 111 +- + drivers/clk/meson/g12a.c | 102 +- + drivers/clk/qcom/Kconfig | 15 + + drivers/clk/qcom/Makefile | 2 + + drivers/clk/qcom/camcc-sc7180.c | 1732 ++++++++++++++++++++ + drivers/clk/qcom/clk-alpha-pll.c | 217 ++- + drivers/clk/qcom/clk-alpha-pll.h | 4 + + drivers/clk/qcom/dispcc-sm8250.c | 1 + + drivers/clk/qcom/lpass-gfm-sm8250.c | 320 ++++ + drivers/clk/qcom/lpasscorecc-sc7180.c | 125 +- + include/dt-bindings/clock/qcom,camcc-sc7180.h | 121 ++ + .../dt-bindings/clock/qcom,sm8250-lpass-aoncc.h | 11 + + .../dt-bindings/clock/qcom,sm8250-lpass-audiocc.h | 13 + + include/linux/clk-provider.h | 5 + + include/linux/clk.h | 20 +- + 18 files changed, 2796 insertions(+), 192 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,aoncc-sm8250.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,audiocc-sm8250.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-camcc.yaml + create mode 100644 drivers/clk/qcom/camcc-sc7180.c + create mode 100644 drivers/clk/qcom/lpass-gfm-sm8250.c + create mode 100644 include/dt-bindings/clock/qcom,camcc-sc7180.h + create mode 100644 include/dt-bindings/clock/qcom,sm8250-lpass-aoncc.h + create mode 100644 include/dt-bindings/clock/qcom,sm8250-lpass-audiocc.h +Merging clk-samsung/for-next (44a9e78f9242 clk: samsung: Prevent potential endless loop in the PLL ops) +$ git merge clk-samsung/for-next +Auto-merging drivers/clk/samsung/Makefile +Auto-merging drivers/clk/samsung/Kconfig +Merge made by the 'recursive' strategy. + drivers/clk/samsung/Kconfig | 67 ++++++++++++++++++- + drivers/clk/samsung/Makefile | 22 +++---- + drivers/clk/samsung/clk-pll.c | 147 ++++++++++++++++++++---------------------- + include/linux/clk/samsung.h | 4 +- + 4 files changed, 149 insertions(+), 91 deletions(-) +Merging csky/linux-next (ba3b26607f55 csky: Optimize atomic operations with correct barrier usage) +$ git merge csky/linux-next +Auto-merging arch/csky/include/asm/mmu_context.h +Auto-merging arch/csky/Kconfig +Merge made by the 'recursive' strategy. + arch/csky/Kconfig | 19 ++- + arch/csky/abiv1/inc/abi/ckmmu.h | 8 +- + arch/csky/abiv2/inc/abi/ckmmu.h | 14 +- + arch/csky/abiv2/inc/abi/entry.h | 19 ++- + arch/csky/include/asm/Kbuild | 2 + + arch/csky/include/asm/atomic.h | 203 +-------------------------- + arch/csky/include/asm/barrier.h | 64 +++++++-- + arch/csky/include/asm/cmpxchg.h | 124 +++++++++++++++-- + arch/csky/include/asm/memory.h | 2 +- + arch/csky/include/asm/mmu_context.h | 8 +- + arch/csky/include/asm/page.h | 2 +- + arch/csky/include/asm/pgalloc.h | 2 +- + arch/csky/include/asm/pgtable.h | 2 +- + arch/csky/include/asm/processor.h | 2 +- + arch/csky/include/asm/segment.h | 2 +- + arch/csky/include/asm/spinlock.h | 246 +-------------------------------- + arch/csky/include/asm/spinlock_types.h | 28 +--- + arch/csky/kernel/atomic.S | 4 + + arch/csky/kernel/entry.S | 10 +- + arch/csky/kernel/head.S | 10 +- + arch/csky/kernel/perf_event.c | 2 +- + arch/csky/kernel/ptrace.c | 5 +- + arch/csky/kernel/setup.c | 18 ++- + arch/csky/kernel/smp.c | 7 +- + arch/csky/kernel/vmlinux.lds.S | 2 +- + arch/csky/mm/fault.c | 7 +- + arch/csky/mm/init.c | 29 +++- + include/linux/cpuhotplug.h | 1 + + 28 files changed, 291 insertions(+), 551 deletions(-) +Merging h8300/h8300-next (8808515be0ed h8300: Replace <linux/clk-provider.h> by <linux/of_clk.h>) +$ git merge h8300/h8300-next +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Auto-merging drivers/net/ethernet/smsc/Kconfig +Auto-merging drivers/clocksource/h8300_timer8.c +Auto-merging arch/h8300/kernel/setup.c +Merge made by the 'recursive' strategy. + arch/h8300/Kconfig.cpu | 4 ++ + arch/h8300/boot/dts/edosk2674.dts | 10 ++++- + arch/h8300/boot/dts/h8300h_sim.dts | 2 +- + arch/h8300/boot/dts/h8s_sim.dts | 2 +- + arch/h8300/configs/edosk2674_defconfig | 10 ++--- + arch/h8300/configs/h8300h-sim_defconfig | 8 +--- + arch/h8300/configs/h8s-sim_defconfig | 8 +--- + arch/h8300/kernel/setup.c | 2 +- + arch/h8300/lib/memset.S | 17 +++++---- + drivers/clocksource/h8300_timer8.c | 20 +++++----- + drivers/irqchip/irq-renesas-h8300h.c | 19 +++++++++- + drivers/irqchip/irq-renesas-h8s.c | 67 +++++++++++++++++++++++++-------- + drivers/net/ethernet/smsc/Kconfig | 1 - + drivers/net/ethernet/smsc/smc91x.c | 10 +++++ + drivers/tty/serial/sh-sci.c | 5 +-- + 15 files changed, 123 insertions(+), 62 deletions(-) +Merging ia64/next (c331649e6371 ia64: Use libata instead of the legacy ide driver in defconfigs) +$ git merge ia64/next +Already up to date. +Merging m68k/for-next (a7b5458ce73b m68k: Fix WARNING splat in pmac_zilog driver) +$ git merge m68k/for-next +Auto-merging arch/m68k/q40/config.c +Auto-merging arch/m68k/mvme16x/config.c +Auto-merging arch/m68k/mvme147/config.c +Auto-merging arch/m68k/mac/via.c +Auto-merging arch/m68k/mac/config.c +Auto-merging arch/m68k/kernel/setup_mm.c +Auto-merging arch/m68k/include/asm/machdep.h +Auto-merging arch/m68k/bvme6000/config.c +Auto-merging arch/m68k/atari/config.c +Auto-merging arch/m68k/apollo/config.c +Auto-merging arch/m68k/amiga/config.c +Auto-merging arch/m68k/Kconfig.machine +Merge made by the 'recursive' strategy. + arch/m68k/Kconfig.machine | 8 ++---- + arch/m68k/amiga/config.c | 8 ------ + arch/m68k/apollo/config.c | 1 - + arch/m68k/atari/config.c | 1 - + arch/m68k/bvme6000/config.c | 1 - + arch/m68k/configs/amiga_defconfig | 9 ++++-- + arch/m68k/configs/apollo_defconfig | 9 ++++-- + arch/m68k/configs/atari_defconfig | 9 ++++-- + arch/m68k/configs/bvme6000_defconfig | 9 ++++-- + arch/m68k/configs/hp300_defconfig | 9 ++++-- + arch/m68k/configs/mac_defconfig | 9 ++++-- + arch/m68k/configs/multi_defconfig | 9 ++++-- + arch/m68k/configs/mvme147_defconfig | 9 ++++-- + arch/m68k/configs/mvme16x_defconfig | 9 ++++-- + arch/m68k/configs/q40_defconfig | 9 ++++-- + arch/m68k/configs/sun3_defconfig | 9 ++++-- + arch/m68k/configs/sun3x_defconfig | 9 ++++-- + arch/m68k/hp300/config.c | 1 - + arch/m68k/include/asm/cmpxchg.h | 10 +++---- + arch/m68k/include/asm/machdep.h | 1 - + arch/m68k/kernel/setup_mm.c | 1 - + arch/m68k/kernel/vmlinux-nommu.lds | 3 +- + arch/m68k/kernel/vmlinux-std.lds | 3 +- + arch/m68k/kernel/vmlinux-sun3.lds | 2 +- + arch/m68k/mac/config.c | 26 ++++++----------- + arch/m68k/mac/iop.c | 54 ++++++++++++------------------------ + arch/m68k/mac/via.c | 21 -------------- + arch/m68k/mvme147/config.c | 1 - + arch/m68k/mvme16x/config.c | 1 - + arch/m68k/q40/config.c | 5 ---- + arch/m68k/sun3x/config.c | 2 -- + drivers/tty/serial/pmac_zilog.c | 14 ++++++---- + 32 files changed, 131 insertions(+), 141 deletions(-) +Merging m68knommu/for-next (d0198645d610 m68k: m68328: remove duplicate code) +$ git merge m68knommu/for-next +Auto-merging arch/m68k/kernel/vmlinux-nommu.lds +Auto-merging arch/m68k/kernel/setup_no.c +Auto-merging arch/m68k/Kconfig.machine +Auto-merging arch/m68k/Kconfig.cpu +Removing arch/m68k/68000/m68VZ328.c +Removing arch/m68k/68000/m68EZ328.c +Merge made by the 'recursive' strategy. + arch/m68k/68000/Makefile | 9 +- + arch/m68k/68000/dragen2.c | 100 ++++++++++++++++++++ + arch/m68k/68000/m68328.c | 32 ++++--- + arch/m68k/68000/m68328.h | 5 + + arch/m68k/68000/m68EZ328.c | 77 --------------- + arch/m68k/68000/m68VZ328.c | 189 ------------------------------------- + arch/m68k/68000/ucsimm.c | 38 ++++++++ + arch/m68k/Kconfig.cpu | 8 +- + arch/m68k/Kconfig.machine | 16 ++-- + arch/m68k/kernel/setup_no.c | 9 ++ + arch/m68k/kernel/vmlinux-nommu.lds | 2 +- + 11 files changed, 192 insertions(+), 293 deletions(-) + create mode 100644 arch/m68k/68000/dragen2.c + create mode 100644 arch/m68k/68000/m68328.h + delete mode 100644 arch/m68k/68000/m68EZ328.c + delete mode 100644 arch/m68k/68000/m68VZ328.c + create mode 100644 arch/m68k/68000/ucsimm.c +Merging microblaze/next (ed2124c0b9a8 microblaze: add support for TIF_NOTIFY_SIGNAL) +$ git merge microblaze/next +Merge made by the 'recursive' strategy. + arch/microblaze/include/asm/thread_info.h | 2 ++ + arch/microblaze/kernel/setup.c | 2 +- + arch/microblaze/kernel/signal.c | 3 ++- + 3 files changed, 5 insertions(+), 2 deletions(-) +Merging mips/mips-next (1dac4585f585 MIPS: Loongson64: Fix up reserving kernel memory range) +$ git merge mips/mips-next +Removing include/linux/platform_data/jz4740/jz4740_nand.h +Auto-merging drivers/reset/Kconfig +Auto-merging arch/mips/Kconfig +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-firmware-lefi-boardinfo | 35 +++ + Documentation/devicetree/bindings/mips/mscc.txt | 2 +- + .../bindings/reset/brcm,bcm6345-reset.yaml | 37 +++ + arch/mips/Kconfig | 12 +- + arch/mips/Makefile | 3 +- + arch/mips/ar7/gpio.c | 1 + + arch/mips/bcm47xx/Kconfig | 2 + + arch/mips/boot/.gitignore | 1 + + arch/mips/boot/compressed/Makefile | 96 ++++++-- + arch/mips/boot/compressed/ld.script | 9 +- + arch/mips/boot/dts/Makefile | 2 +- + arch/mips/boot/dts/brcm/bcm63268.dtsi | 6 + + arch/mips/boot/dts/brcm/bcm6328.dtsi | 6 + + arch/mips/boot/dts/brcm/bcm6358.dtsi | 6 + + arch/mips/boot/dts/brcm/bcm6362.dtsi | 6 + + arch/mips/boot/dts/brcm/bcm6368.dtsi | 6 + + arch/mips/boot/dts/ingenic/ci20.dts | 45 +++- + arch/mips/boot/dts/ingenic/cu1000-neo.dts | 62 ++++- + arch/mips/boot/dts/ingenic/cu1830-neo.dts | 66 ++++- + arch/mips/boot/dts/ingenic/jz4740.dtsi | 2 +- + arch/mips/boot/dts/ingenic/jz4770.dtsi | 2 +- + arch/mips/boot/dts/ingenic/jz4780.dtsi | 45 +++- + arch/mips/boot/dts/ingenic/x1000.dtsi | 56 ++++- + arch/mips/boot/dts/ingenic/x1830.dtsi | 58 ++++- + arch/mips/boot/dts/mscc/Makefile | 11 +- + arch/mips/boot/dts/mscc/jaguar2.dtsi | 167 +++++++++++++ + arch/mips/boot/dts/mscc/jaguar2_common.dtsi | 25 ++ + arch/mips/boot/dts/mscc/jaguar2_pcb110.dts | 267 +++++++++++++++++++++ + arch/mips/boot/dts/mscc/jaguar2_pcb111.dts | 107 +++++++++ + arch/mips/boot/dts/mscc/jaguar2_pcb118.dts | 57 +++++ + arch/mips/boot/dts/mscc/luton.dtsi | 116 +++++++++ + arch/mips/boot/dts/mscc/luton_pcb091.dts | 30 +++ + arch/mips/boot/dts/mscc/serval.dtsi | 153 ++++++++++++ + arch/mips/boot/dts/mscc/serval_common.dtsi | 127 ++++++++++ + arch/mips/boot/dts/mscc/serval_pcb105.dts | 17 ++ + arch/mips/boot/dts/mscc/serval_pcb106.dts | 17 ++ + arch/mips/boot/dts/mti/sead3.dts | 2 +- + arch/mips/boot/dts/ralink/mt7628a.dtsi | 2 +- + arch/mips/cavium-octeon/smp.c | 3 - + arch/mips/configs/ci20_defconfig | 15 +- + arch/mips/configs/cu1000-neo_defconfig | 28 ++- + arch/mips/configs/cu1830-neo_defconfig | 32 ++- + arch/mips/generic/Kconfig | 37 ++- + arch/mips/generic/Platform | 3 + + arch/mips/generic/board-jaguar2.its.S | 40 +++ + arch/mips/generic/board-luton.its.S | 23 ++ + arch/mips/generic/board-serval.its.S | 24 ++ + arch/mips/include/asm/compiler.h | 9 +- + arch/mips/include/asm/cpu-features.h | 2 - + arch/mips/include/asm/mach-loongson64/boot_param.h | 4 + + .../asm/mach-loongson64/kernel-entry-init.h | 8 - + .../include/asm/mach-loongson64/loongson_regs.h | 10 + + arch/mips/include/asm/pgtable.h | 8 - + arch/mips/include/asm/types.h | 1 - + arch/mips/kernel/mips-cm.c | 1 + + arch/mips/kernel/relocate.c | 11 +- + arch/mips/kernel/smp-bmips.c | 3 - + arch/mips/kernel/vdso.c | 4 +- + arch/mips/kvm/mmu.c | 4 +- + arch/mips/loongson64/Makefile | 1 + + arch/mips/loongson64/boardinfo.c | 48 ++++ + arch/mips/loongson64/env.c | 10 + + arch/mips/loongson64/numa.c | 27 +-- + arch/mips/loongson64/smp.c | 126 +++++++--- + arch/mips/mm/c-r4k.c | 10 +- + arch/mips/mm/cache.c | 69 ++---- + arch/mips/mm/hugetlbpage.c | 12 - + arch/mips/pci/pci-vr41xx.c | 4 +- + drivers/bus/mips_cdmm.c | 4 +- + drivers/reset/Kconfig | 7 + + drivers/reset/Makefile | 1 + + drivers/reset/reset-bcm6345.c | 135 +++++++++++ + include/dt-bindings/reset/bcm6318-reset.h | 20 ++ + include/dt-bindings/reset/bcm63268-reset.h | 26 ++ + include/dt-bindings/reset/bcm6328-reset.h | 18 ++ + include/dt-bindings/reset/bcm6358-reset.h | 15 ++ + include/dt-bindings/reset/bcm6362-reset.h | 22 ++ + include/dt-bindings/reset/bcm6368-reset.h | 16 ++ + include/linux/platform_data/jz4740/jz4740_nand.h | 25 -- + 79 files changed, 2285 insertions(+), 245 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-firmware-lefi-boardinfo + create mode 100644 Documentation/devicetree/bindings/reset/brcm,bcm6345-reset.yaml + create mode 100644 arch/mips/boot/dts/mscc/jaguar2.dtsi + create mode 100644 arch/mips/boot/dts/mscc/jaguar2_common.dtsi + create mode 100644 arch/mips/boot/dts/mscc/jaguar2_pcb110.dts + create mode 100644 arch/mips/boot/dts/mscc/jaguar2_pcb111.dts + create mode 100644 arch/mips/boot/dts/mscc/jaguar2_pcb118.dts + create mode 100644 arch/mips/boot/dts/mscc/luton.dtsi + create mode 100644 arch/mips/boot/dts/mscc/luton_pcb091.dts + create mode 100644 arch/mips/boot/dts/mscc/serval.dtsi + create mode 100644 arch/mips/boot/dts/mscc/serval_common.dtsi + create mode 100644 arch/mips/boot/dts/mscc/serval_pcb105.dts + create mode 100644 arch/mips/boot/dts/mscc/serval_pcb106.dts + create mode 100644 arch/mips/generic/board-jaguar2.its.S + create mode 100644 arch/mips/generic/board-luton.its.S + create mode 100644 arch/mips/generic/board-serval.its.S + create mode 100644 arch/mips/loongson64/boardinfo.c + create mode 100644 drivers/reset/reset-bcm6345.c + create mode 100644 include/dt-bindings/reset/bcm6318-reset.h + create mode 100644 include/dt-bindings/reset/bcm63268-reset.h + create mode 100644 include/dt-bindings/reset/bcm6328-reset.h + create mode 100644 include/dt-bindings/reset/bcm6358-reset.h + create mode 100644 include/dt-bindings/reset/bcm6362-reset.h + create mode 100644 include/dt-bindings/reset/bcm6368-reset.h + delete mode 100644 include/linux/platform_data/jz4740/jz4740_nand.h +Merging nds32/next (54bde873682b nds32: Fix bogus reference to <asm/procinfo.h>) +$ git merge nds32/next +Auto-merging arch/nds32/kernel/setup.c +Merge made by the 'recursive' strategy. + arch/nds32/configs/defconfig | 1 - + arch/nds32/kernel/setup.c | 2 +- + arch/nds32/kernel/time.c | 2 +- + arch/nds32/kernel/traps.c | 50 +++----------------------------------------- + 4 files changed, 5 insertions(+), 50 deletions(-) +Merging nios2/for-next (6b57fa4d374b nios2: signal: Mark expected switch fall-through) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (d8398bf840f8 openrisc: add local64.h to fix blk-iocost build) +$ git merge openrisc/for-next +Auto-merging drivers/tty/serial/Kconfig +Auto-merging drivers/soc/Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + .../devicetree/bindings/serial/litex,liteuart.yaml | 38 ++ + .../bindings/soc/litex/litex,soc-controller.yaml | 39 ++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 10 + + arch/openrisc/boot/dts/or1klitex.dts | 55 +++ + arch/openrisc/configs/or1klitex_defconfig | 18 + + arch/openrisc/include/asm/Kbuild | 1 + + arch/openrisc/kernel/traps.c | 4 +- + drivers/soc/Kconfig | 1 + + drivers/soc/Makefile | 1 + + drivers/soc/litex/Kconfig | 19 + + drivers/soc/litex/Makefile | 3 + + drivers/soc/litex/litex_soc_ctrl.c | 176 +++++++++ + drivers/tty/serial/Kconfig | 32 ++ + drivers/tty/serial/Makefile | 1 + + drivers/tty/serial/liteuart.c | 404 +++++++++++++++++++++ + include/linux/litex.h | 102 ++++++ + 17 files changed, 903 insertions(+), 3 deletions(-) + create mode 100644 Documentation/devicetree/bindings/serial/litex,liteuart.yaml + create mode 100644 Documentation/devicetree/bindings/soc/litex/litex,soc-controller.yaml + create mode 100644 arch/openrisc/boot/dts/or1klitex.dts + create mode 100644 arch/openrisc/configs/or1klitex_defconfig + create mode 100644 drivers/soc/litex/Kconfig + create mode 100644 drivers/soc/litex/Makefile + create mode 100644 drivers/soc/litex/litex_soc_ctrl.c + create mode 100644 drivers/tty/serial/liteuart.c + create mode 100644 include/linux/litex.h +Merging parisc-hd/for-next (19621e5fd02b parisc: Switch to clockevent based timers) +$ git merge parisc-hd/for-next +Auto-merging arch/parisc/kernel/time.c +CONFLICT (content): Merge conflict in arch/parisc/kernel/time.c +Removing arch/parisc/include/uapi/asm/types.h +Resolved 'arch/parisc/kernel/time.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c41799c635f8] Merge remote-tracking branch 'parisc-hd/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/parisc/include/asm/processor.h | 9 +- + arch/parisc/include/uapi/asm/types.h | 7 -- + arch/parisc/kernel/entry.S | 4 +- + arch/parisc/kernel/irq.c | 7 +- + arch/parisc/kernel/processor.c | 5 +- + arch/parisc/kernel/sys_parisc.c | 23 ++++- + arch/parisc/kernel/time.c | 161 +++++++++++++++++++---------------- + fs/exec.c | 4 +- + mm/Kconfig | 12 ++- + 9 files changed, 122 insertions(+), 110 deletions(-) + delete mode 100644 arch/parisc/include/uapi/asm/types.h +$ git am -3 ../patches/0001-revert-the-rest-of-parisc-use-legacy_timer_tick.patch +Applying: revert the rest of "parisc: use legacy_timer_tick" +$ git reset HEAD^ +Unstaged changes after reset: +M Documentation/features/time/clockevents/arch-support.txt +M arch/parisc/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master e11c850ea52b] Merge remote-tracking branch 'parisc-hd/for-next' + Date: Mon Nov 30 10:07:03 2020 +1100 +Merging powerpc/next (0bd4b96d9910 powernv/memtrace: don't abuse memory hot(un)plug infrastructure for memory allocations) +$ git merge powerpc/next +Auto-merging include/linux/memory_hotplug.h +Auto-merging arch/powerpc/mm/mem.c +Auto-merging arch/powerpc/kernel/vmlinux.lds.S +Auto-merging arch/powerpc/kernel/setup_64.c +Auto-merging arch/powerpc/kernel/head_book3s_32.S +Removing arch/powerpc/kernel/cpu_setup_power.S +Merge made by the 'recursive' strategy. + arch/powerpc/boot/ps3.c | 7 - + arch/powerpc/include/asm/bitops.h | 23 ++- + arch/powerpc/include/asm/book3s/64/pgtable.h | 17 +- + arch/powerpc/include/asm/cpu_setup_power.h | 12 ++ + arch/powerpc/include/asm/cputable.h | 5 - + arch/powerpc/include/asm/perf_event_server.h | 1 + + arch/powerpc/include/asm/ppc_asm.h | 6 - + arch/powerpc/kernel/Makefile | 3 + + arch/powerpc/kernel/cpu_setup_power.S | 252 ------------------------ + arch/powerpc/kernel/cpu_setup_power.c | 271 ++++++++++++++++++++++++++ + arch/powerpc/kernel/cputable.c | 12 +- + arch/powerpc/kernel/entry_32.S | 36 +++- + arch/powerpc/kernel/head_32.h | 5 +- + arch/powerpc/kernel/head_64.S | 17 +- + arch/powerpc/kernel/head_book3s_32.S | 18 +- + arch/powerpc/kernel/head_booke.h | 2 +- + arch/powerpc/kernel/paca.c | 4 +- + arch/powerpc/kernel/setup-common.c | 4 +- + arch/powerpc/kernel/setup.h | 6 - + arch/powerpc/kernel/setup_64.c | 2 +- + arch/powerpc/kernel/vmlinux.lds.S | 19 +- + arch/powerpc/kvm/book3s_hv.c | 7 +- + arch/powerpc/kvm/book3s_hv_builtin.c | 11 +- + arch/powerpc/kvm/book3s_rmhandlers.S | 4 +- + arch/powerpc/mm/book3s64/hash_utils.c | 1 - + arch/powerpc/mm/book3s64/pgtable.c | 8 +- + arch/powerpc/mm/book3s64/radix_tlb.c | 23 ++- + arch/powerpc/mm/mem.c | 53 +++-- + arch/powerpc/mm/pgtable_32.c | 2 +- + arch/powerpc/perf/callchain.h | 2 +- + arch/powerpc/perf/callchain_64.c | 3 +- + arch/powerpc/perf/core-book3s.c | 38 +++- + arch/powerpc/perf/power10-pmu.c | 6 + + arch/powerpc/platforms/85xx/corenet_generic.c | 3 +- + arch/powerpc/platforms/powernv/Kconfig | 8 +- + arch/powerpc/platforms/powernv/memtrace.c | 175 ++++++++--------- + arch/powerpc/platforms/powernv/pci-sriov.c | 2 +- + arch/powerpc/platforms/pseries/hotplug-cpu.c | 1 + + arch/powerpc/sysdev/mpic_msgr.c | 2 +- + include/linux/memory_hotplug.h | 3 + + tools/testing/selftests/powerpc/eeh/Makefile | 2 +- + tools/testing/selftests/powerpc/eeh/settings | 1 + + 42 files changed, 604 insertions(+), 473 deletions(-) + create mode 100644 arch/powerpc/include/asm/cpu_setup_power.h + delete mode 100644 arch/powerpc/kernel/cpu_setup_power.S + create mode 100644 arch/powerpc/kernel/cpu_setup_power.c + create mode 100644 tools/testing/selftests/powerpc/eeh/settings +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 (b5b11a8ac4b5 RISC-V: Move dynamic relocation section under __init) +$ git merge risc-v/for-next +Auto-merging arch/riscv/mm/init.c +Auto-merging arch/riscv/kernel/setup.c +Auto-merging arch/riscv/kernel/head.S +Auto-merging arch/riscv/Kconfig +Merge made by the 'recursive' strategy. + .../features/time/irq-time-acct/arch-support.txt | 2 +- + arch/riscv/Kconfig | 2 + + arch/riscv/Makefile | 6 + + arch/riscv/boot/.gitignore | 3 +- + arch/riscv/boot/Makefile | 2 +- + arch/riscv/include/asm/sections.h | 2 + + arch/riscv/include/asm/set_memory.h | 4 + + arch/riscv/include/asm/stacktrace.h | 17 ++ + arch/riscv/kernel/head.S | 1 - + arch/riscv/kernel/perf_callchain.c | 10 +- + arch/riscv/kernel/setup.c | 179 ++++++++++++++++++++- + arch/riscv/kernel/stacktrace.c | 62 ++----- + arch/riscv/kernel/vmlinux.lds.S | 63 +++++--- + arch/riscv/mm/init.c | 52 +++--- + arch/riscv/mm/pageattr.c | 6 + + 15 files changed, 289 insertions(+), 122 deletions(-) + create mode 100644 arch/riscv/include/asm/stacktrace.h +Merging s390/for-next (b79e43ff5aa0 Merge branch 'features' into for-next) +$ git merge s390/for-next +Auto-merging init/Kconfig +Removing arch/s390/kernel/vdso64/getcpu.S +Auto-merging arch/s390/include/asm/mmu_context.h +CONFLICT (content): Merge conflict in arch/s390/include/asm/mmu_context.h +Auto-merging arch/s390/Kconfig +Resolved 'arch/s390/include/asm/mmu_context.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b8a96e641273] Merge remote-tracking branch 's390/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/s390/Kconfig | 4 +- + arch/s390/Kconfig.debug | 8 + + arch/s390/Makefile | 2 +- + arch/s390/boot/boot.h | 18 ++- + arch/s390/boot/compressed/.gitignore | 1 + + arch/s390/boot/compressed/Makefile | 24 ++- + arch/s390/boot/compressed/decompressor.h | 4 +- + arch/s390/boot/compressed/vmlinux.lds.S | 8 + + arch/s390/boot/head.S | 32 ++-- + arch/s390/boot/head_kdump.S | 8 +- + arch/s390/boot/ipl_parm.c | 49 +++--- + arch/s390/boot/kaslr.c | 33 ++-- + arch/s390/boot/mem_detect.c | 13 +- + arch/s390/boot/pgm_check_info.c | 224 +++++++++++++++++++--------- + arch/s390/boot/startup.c | 70 ++++++++- + arch/s390/configs/debug_defconfig | 1 + + arch/s390/crypto/prng.c | 53 ++----- + arch/s390/include/asm/ccwdev.h | 2 +- + arch/s390/include/asm/cio.h | 2 +- + arch/s390/include/asm/delay.h | 1 + + arch/s390/include/asm/ftrace.h | 31 ++-- + arch/s390/include/asm/futex.h | 6 - + arch/s390/include/asm/kasan.h | 37 ++++- + arch/s390/include/asm/lowcore.h | 4 +- + arch/s390/include/asm/mmu_context.h | 32 +--- + arch/s390/include/asm/pgtable.h | 13 +- + arch/s390/include/asm/processor.h | 13 +- + arch/s390/include/asm/ptrace.h | 1 + + arch/s390/include/asm/sclp.h | 7 +- + arch/s390/include/asm/setup.h | 6 +- + arch/s390/include/asm/thread_info.h | 2 +- + arch/s390/include/asm/timex.h | 7 + + arch/s390/include/asm/uaccess.h | 22 +-- + arch/s390/include/asm/vdso.h | 25 +--- + arch/s390/kernel/asm-offsets.c | 7 +- + arch/s390/kernel/base.S | 22 --- + arch/s390/kernel/early.c | 4 +- + arch/s390/kernel/entry.S | 97 ++++++------ + arch/s390/kernel/entry.h | 1 - + arch/s390/kernel/ftrace.c | 63 ++------ + arch/s390/kernel/head64.S | 7 +- + arch/s390/kernel/mcount.S | 8 - + arch/s390/kernel/process.c | 14 -- + arch/s390/kernel/setup.c | 47 +++--- + arch/s390/kernel/smp.c | 14 +- + arch/s390/kernel/time.c | 44 ++---- + arch/s390/kernel/vdso.c | 58 +------ + arch/s390/kernel/vdso64/Makefile | 5 +- + arch/s390/kernel/vdso64/getcpu.S | 31 ---- + arch/s390/kernel/vdso64/getcpu.c | 20 +++ + arch/s390/kernel/vdso64/vdso64.lds.S | 1 - + arch/s390/kernel/vdso64/vdso_user_wrapper.S | 1 + + arch/s390/kernel/vmlinux.lds.S | 3 +- + arch/s390/lib/delay.c | 13 ++ + arch/s390/lib/uaccess.c | 105 +++---------- + arch/s390/mm/dump_pagetables.c | 2 +- + arch/s390/mm/fault.c | 29 +--- + arch/s390/mm/init.c | 12 +- + arch/s390/mm/kasan_init.c | 93 ++++-------- + arch/s390/mm/pgalloc.c | 13 +- + arch/s390/mm/vmem.c | 38 ++--- + arch/s390/pci/pci.c | 4 +- + arch/s390/pci/pci_mmio.c | 104 +++++++------ + drivers/char/hw_random/s390-trng.c | 7 +- + drivers/s390/char/sclp.h | 10 +- + drivers/s390/char/sclp_cmd.c | 16 +- + drivers/s390/char/sclp_early.c | 59 ++++---- + drivers/s390/char/sclp_early_core.c | 13 +- + drivers/s390/crypto/ap_bus.c | 164 ++++++++++++++++++-- + drivers/s390/crypto/ap_bus.h | 12 ++ + drivers/s390/crypto/pkey_api.c | 15 ++ + drivers/s390/crypto/zcrypt_api.c | 66 ++++++++ + drivers/s390/crypto/zcrypt_api.h | 2 + + init/Kconfig | 2 +- + lib/Kconfig.kasan | 9 -- + scripts/recordmcount.pl | 3 - + 76 files changed, 1043 insertions(+), 958 deletions(-) + delete mode 100644 arch/s390/kernel/vdso64/getcpu.S + create mode 100644 arch/s390/kernel/vdso64/getcpu.c +Merging sh/for-next (b0cfc315ff38 sh: fix syscall tracing) +$ git merge sh/for-next +Already up to date. +Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge sparc-next/master +Already up to date. +Merging uml/linux-next (9a5085b3fad5 um: Call pgtable_pmd_page_dtor() in __pmd_free_tlb()) +$ git merge uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (dc293f210690 xtensa: uaccess: Add missing __user to strncpy_from_user() prototype) +$ git merge xtensa/xtensa-for-next +Already up to date. +Merging fscrypt/master (4a4b8721f1a5 fscrypt: simplify master key locking) +$ git merge fscrypt/master +Merge made by the 'recursive' strategy. + fs/crypto/fscrypt_private.h | 28 ++++++++++++---------------- + fs/crypto/hooks.c | 39 ++++++++++++++++----------------------- + fs/crypto/keyring.c | 10 ++-------- + fs/crypto/keysetup.c | 24 ++++++++++++------------ + fs/crypto/policy.c | 5 ++++- + fs/ext4/namei.c | 3 +++ + fs/f2fs/f2fs.h | 2 ++ + fs/ubifs/dir.c | 17 +++++++++++++---- + include/linux/fscrypt.h | 37 +++++++++++++++++++++++++++++++++++-- + include/uapi/linux/fscrypt.h | 5 ++--- + 10 files changed, 101 insertions(+), 69 deletions(-) +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 (30da94ea78c2 Merge branch 'for-next-next-v5.10-20201127' into for-next-20201127) +$ git merge btrfs/for-next +Removing fs/btrfs/inode-map.h +Removing fs/btrfs/inode-map.c +Merge made by the 'recursive' strategy. + fs/btrfs/Makefile | 3 +- + fs/btrfs/backref.c | 19 +- + fs/btrfs/block-group.c | 279 +++++++------- + fs/btrfs/block-group.h | 2 + + fs/btrfs/block-rsv.c | 8 + + fs/btrfs/btrfs_inode.h | 23 +- + fs/btrfs/check-integrity.c | 11 +- + fs/btrfs/compression.c | 29 +- + fs/btrfs/ctree.c | 252 +++---------- + fs/btrfs/ctree.h | 168 +++++++-- + fs/btrfs/delayed-inode.c | 23 +- + fs/btrfs/delayed-inode.h | 3 +- + fs/btrfs/delayed-ref.h | 12 +- + fs/btrfs/dev-replace.c | 20 +- + fs/btrfs/dir-item.c | 1 - + fs/btrfs/discard.c | 46 ++- + fs/btrfs/discard.h | 3 +- + fs/btrfs/disk-io.c | 690 +++++++++++++++++++--------------- + fs/btrfs/disk-io.h | 25 +- + fs/btrfs/export.c | 1 - + fs/btrfs/extent-io-tree.h | 71 ++-- + fs/btrfs/extent-tree.c | 113 ++---- + fs/btrfs/extent_io.c | 425 ++++++++++++--------- + fs/btrfs/extent_io.h | 32 +- + fs/btrfs/file-item.c | 88 +++-- + fs/btrfs/file.c | 737 ++++++++++++++++++++----------------- + fs/btrfs/free-space-cache.c | 439 +++++++++------------- + fs/btrfs/free-space-cache.h | 21 +- + fs/btrfs/free-space-tree.c | 26 +- + fs/btrfs/inode-item.c | 6 - + fs/btrfs/inode-map.c | 582 ----------------------------- + fs/btrfs/inode-map.h | 16 - + fs/btrfs/inode.c | 774 ++++++++++++++++++++------------------- + fs/btrfs/ioctl.c | 64 +++- + fs/btrfs/locking.c | 459 ++--------------------- + fs/btrfs/locking.h | 24 +- + fs/btrfs/ordered-data.c | 24 +- + fs/btrfs/ordered-data.h | 3 +- + fs/btrfs/print-tree.c | 15 +- + fs/btrfs/qgroup.c | 52 +-- + fs/btrfs/raid56.c | 8 +- + fs/btrfs/reada.c | 34 +- + fs/btrfs/ref-verify.c | 27 +- + fs/btrfs/reflink.c | 18 +- + fs/btrfs/relocation.c | 116 ++---- + fs/btrfs/scrub.c | 237 ++++++------ + fs/btrfs/send.c | 6 +- + fs/btrfs/space-info.c | 274 +++++++++++--- + fs/btrfs/space-info.h | 3 + + fs/btrfs/super.c | 181 +++++---- + fs/btrfs/sysfs.c | 117 +++++- + fs/btrfs/tests/btrfs-tests.c | 3 +- + fs/btrfs/tests/extent-io-tests.c | 26 +- + fs/btrfs/tests/qgroup-tests.c | 4 - + fs/btrfs/transaction.c | 200 +++++----- + fs/btrfs/transaction.h | 3 +- + fs/btrfs/tree-checker.c | 337 +++++++++-------- + fs/btrfs/tree-defrag.c | 1 - + fs/btrfs/tree-log.c | 183 ++++----- + fs/btrfs/uuid-tree.c | 3 +- + fs/btrfs/volumes.c | 143 +++++--- + fs/btrfs/volumes.h | 21 +- + fs/btrfs/xattr.c | 8 +- + fs/btrfs/zoned.c | 616 +++++++++++++++++++++++++++++++ + fs/btrfs/zoned.h | 160 ++++++++ + include/trace/events/btrfs.h | 104 +++++- + include/uapi/linux/btrfs.h | 1 + + 67 files changed, 4368 insertions(+), 4055 deletions(-) + delete mode 100644 fs/btrfs/inode-map.c + delete mode 100644 fs/btrfs/inode-map.h + create mode 100644 fs/btrfs/zoned.c + create mode 100644 fs/btrfs/zoned.h +Merging ceph/master (62575e270f66 ceph: check session state after bumping session->s_seq) +$ git merge ceph/master +Already up to date. +Merging cifs/for-next (cab4cc1e5a42 cifs: fix potential use-after-free in cifs_echo_request()) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/connect.c | 2 ++ + fs/cifs/transport.c | 6 ++---- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging configfs/for-next (65cdb4a214c0 configfs: fix kernel-doc markup issue) +$ git merge configfs/for-next +Merge made by the 'recursive' strategy. + fs/configfs/dir.c | 1 + + 1 file changed, 1 insertion(+) +Merging ecryptfs/next (8b614cb8f1dc Merge tag '5.6-rc4-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6) +$ git merge ecryptfs/next +Already up to date. +Merging erofs/dev (1b2b66d55670 erofs: remove a void EROFS_VERSION macro set in Makefile) +$ git merge erofs/dev +Merge made by the 'recursive' strategy. + fs/erofs/Makefile | 5 ----- + 1 file changed, 5 deletions(-) +Merging exfat/dev (f9893351acae Merge tag 'kconfig-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) +$ git merge exfat/dev +Already up to date. +Merging ext3/for_next (d2bc88b6e0fd Pull reiserfs disk corruption handling fix.) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + Documentation/filesystems/ext2.rst | 1 + + fs/ext2/dir.c | 14 ++++++++------ + fs/ext2/ext2.h | 7 +++++++ + fs/ext2/inode.c | 1 + + fs/ext2/namei.c | 15 +++++---------- + fs/ext2/super.c | 2 +- + fs/notify/inotify/inotify_user.c | 23 ++++++++++++++++++++++- + fs/quota/quota_tree.c | 8 ++++---- + fs/quota/quota_v2.c | 19 +++++++++++++++++++ + fs/reiserfs/stree.c | 6 ++++++ + include/linux/quota.h | 15 ++++++++------- + 11 files changed, 82 insertions(+), 29 deletions(-) +Merging ext4/dev (f902b2165010 ext4: fix bogus warning in ext4_update_dx_flag()) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (632cc618fa14 f2fs: Handle casefolding with Encryption) +$ git merge f2fs/dev +Auto-merging include/linux/fscrypt.h +Auto-merging include/linux/fs.h +Auto-merging fs/ubifs/dir.c +Auto-merging fs/libfs.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/namei.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/crypto/hooks.c +Auto-merging fs/crypto/fscrypt_private.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + fs/crypto/fname.c | 4 - + fs/crypto/fscrypt_private.h | 1 - + fs/crypto/hooks.c | 1 - + fs/ext4/dir.c | 7 -- + fs/ext4/ext4.h | 4 - + fs/ext4/namei.c | 1 + + fs/ext4/super.c | 5 - + fs/f2fs/acl.c | 2 +- + fs/f2fs/checkpoint.c | 2 +- + fs/f2fs/compress.c | 5 + + fs/f2fs/dir.c | 105 ++++++++++++++------ + fs/f2fs/f2fs.h | 95 ++---------------- + fs/f2fs/file.c | 237 ++++++++++++++++++++++++++++++++++++-------- + fs/f2fs/hash.c | 11 +- + fs/f2fs/inline.c | 4 + + fs/f2fs/namei.c | 1 + + fs/f2fs/node.c | 2 +- + fs/f2fs/recovery.c | 12 ++- + fs/f2fs/shrinker.c | 6 +- + fs/f2fs/super.c | 9 +- + fs/libfs.c | 70 +++++++++++++ + fs/ubifs/dir.c | 1 + + include/linux/fs.h | 1 + + include/linux/fscrypt.h | 7 +- + include/trace/events/f2fs.h | 1 + + include/uapi/linux/f2fs.h | 96 ++++++++++++++++++ + 27 files changed, 498 insertions(+), 193 deletions(-) + create mode 100644 include/uapi/linux/f2fs.h +Merging fsverity/fsverity (bde493349025 fs-verity: move structs needed for file signing to UAPI header) +$ git merge fsverity/fsverity +Merge made by the 'recursive' strategy. + Documentation/filesystems/fsverity.rst | 68 ++++++++++++++++------------------ + fs/verity/enable.c | 8 ++-- + fs/verity/fsverity_private.h | 36 ++---------------- + fs/verity/hash_algs.c | 2 +- + fs/verity/init.c | 2 +- + fs/verity/measure.c | 12 +++--- + fs/verity/open.c | 24 ++++++------ + fs/verity/signature.c | 14 +++---- + fs/verity/verify.c | 2 +- + include/uapi/linux/fsverity.h | 49 ++++++++++++++++++++++++ + 10 files changed, 116 insertions(+), 101 deletions(-) +Merging fuse/for-next (9d769e6aa252 fuse: support SB_NOSEC flag to improve write performance) +$ git merge fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/dir.c | 23 +++++++++++++++---- + fs/fuse/file.c | 22 ++++++++++++++++-- + fs/fuse/fuse_i.h | 29 +++++++++--------------- + fs/fuse/inode.c | 57 ++++++++++++++++++++++------------------------- + fs/fuse/virtio_fs.c | 47 +++++++++++++++++--------------------- + include/uapi/linux/fuse.h | 30 ++++++++++++++++++++----- + 6 files changed, 121 insertions(+), 87 deletions(-) +Merging jfs/jfs-next (c61b3e483900 jfs: Fix array index bounds check in dbAdjTree) +$ git merge jfs/jfs-next +Merge made by the 'recursive' strategy. + fs/jfs/jfs_dmap.c | 10 +++++++--- + fs/jfs/jfs_dmap.h | 2 +- + fs/jfs/jfs_extent.c | 2 +- + fs/jfs/jfs_extent.h | 2 +- + fs/jfs/jfs_logmgr.h | 2 +- + fs/jfs/jfs_txnmgr.c | 2 +- + fs/jfs/jfs_xtree.c | 2 +- + 7 files changed, 13 insertions(+), 9 deletions(-) +Merging nfs/linux-next (418baf2c28f3 Linux 5.10-rc5) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (11decaf8127b NFS: Remove unnecessary inode lock in nfs_fsync_dir()) +$ git merge nfs-anna/linux-next +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/cel-next (e0d8f79730f5 Revert "nfsd4: support change_attr_type attribute") +$ git merge cel/cel-next +Auto-merging fs/libfs.c +Auto-merging fs/ext4/super.c +Auto-merging fs/btrfs/export.c +Merge made by the 'recursive' strategy. + fs/btrfs/export.c | 2 + + fs/ext4/super.c | 9 + + fs/libfs.c | 30 + + fs/nfs/blocklayout/blocklayout.c | 2 +- + fs/nfs/blocklayout/dev.c | 2 +- + fs/nfs/dir.c | 2 +- + fs/nfs/export.c | 18 + + fs/nfs/filelayout/filelayout.c | 2 +- + fs/nfs/filelayout/filelayoutdev.c | 2 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 2 +- + fs/nfs/flexfilelayout/flexfilelayoutdev.c | 2 +- + fs/nfs/nfs42xdr.c | 2 +- + fs/nfs/nfs4xdr.c | 6 +- + fs/nfsd/filecache.c | 1 + + fs/nfsd/nfs2acl.c | 21 +- + fs/nfsd/nfs3acl.c | 8 +- + fs/nfsd/nfs3proc.c | 11 +- + fs/nfsd/nfs3xdr.c | 56 +- + fs/nfsd/nfs4proc.c | 27 +- + fs/nfsd/nfs4state.c | 2 +- + fs/nfsd/nfs4xdr.c | 2599 +++++++++++++++------------- + fs/nfsd/nfsd.h | 9 +- + fs/nfsd/nfsfh.h | 27 +- + fs/nfsd/nfsproc.c | 25 +- + fs/nfsd/nfssvc.c | 50 +- + fs/nfsd/nfsxdr.c | 16 +- + fs/nfsd/trace.c | 1 + + fs/nfsd/trace.h | 176 +- + fs/nfsd/xdr.h | 2 - + fs/nfsd/xdr3.h | 2 - + fs/nfsd/xdr4.h | 54 +- + fs/xfs/xfs_export.c | 3 + + include/linux/exportfs.h | 1 + + include/linux/iversion.h | 15 + + include/linux/nfs4.h | 8 - + include/linux/sunrpc/svc.h | 22 +- + include/linux/sunrpc/svc_rdma.h | 36 +- + include/linux/sunrpc/svc_rdma_pcl.h | 128 ++ + include/linux/sunrpc/svc_xprt.h | 4 +- + include/linux/sunrpc/xdr.h | 91 +- + include/trace/events/rpcrdma.h | 143 +- + include/trace/events/sunrpc.h | 24 - + net/sunrpc/auth_gss/gss_rpc_xdr.c | 3 +- + net/sunrpc/cache.c | 41 +- + net/sunrpc/socklib.c | 5 +- + net/sunrpc/svc.c | 16 +- + net/sunrpc/svc_xprt.c | 4 +- + net/sunrpc/svcsock.c | 9 +- + net/sunrpc/xdr.c | 78 +- + net/sunrpc/xprtrdma/Makefile | 2 +- + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 14 +- + net/sunrpc/xprtrdma/svc_rdma_pcl.c | 306 ++++ + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 314 ++-- + net/sunrpc/xprtrdma/svc_rdma_rw.c | 600 +++++-- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 562 +++--- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 2 +- + 56 files changed, 3400 insertions(+), 2199 deletions(-) + create mode 100644 include/linux/sunrpc/svc_rdma_pcl.h + create mode 100644 net/sunrpc/xprtrdma/svc_rdma_pcl.c +Merging orangefs/for-next (e848643b524b orangefs: remove unnecessary assignment to variable ret) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (c11faf32599f ovl: fix incorrect extent info in metacopy case) +$ git merge overlayfs/overlayfs-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/overlayfs.rst | 27 +++++++++++++++++++-------- + fs/overlayfs/copy_up.c | 25 ++++++++++++++----------- + fs/overlayfs/export.c | 10 ++++++---- + fs/overlayfs/inode.c | 2 +- + fs/overlayfs/namei.c | 25 +++++++++++++++---------- + fs/overlayfs/overlayfs.h | 14 ++++++++------ + fs/overlayfs/ovl_entry.h | 1 + + fs/overlayfs/super.c | 33 ++++++++++++++++++++++++++++----- + fs/overlayfs/util.c | 3 ++- + 9 files changed, 94 insertions(+), 46 deletions(-) +Merging ubifs/next (e2a05cc7f822 ubifs: mount_ubifs: Release authentication resource in error handling path) +$ git merge ubifs/next +Already up to date. +Merging v9fs/9p-next (5bfe97d7382b 9p: Fix writeback fid incorrectly being attached to dentry) +$ git merge v9fs/9p-next +Merge made by the 'recursive' strategy. + fs/9p/fid.c | 67 +++++++++++++++++++++++++++++++++++++++++++++---- + fs/9p/fid.h | 11 +++++++- + fs/9p/vfs_dentry.c | 2 ++ + fs/9p/vfs_dir.c | 6 ++++- + fs/9p/vfs_file.c | 7 +++--- + fs/9p/vfs_inode.c | 47 +++++++++++++++++++++++++++------- + fs/9p/vfs_inode_dotl.c | 35 +++++++++++++++++++++----- + fs/9p/vfs_super.c | 1 + + fs/9p/xattr.c | 16 +++++++++--- + include/net/9p/client.h | 7 ++++++ + net/9p/client.c | 14 +++++++---- + 11 files changed, 180 insertions(+), 33 deletions(-) +Merging xfs/for-next (eb8409071a1d xfs: revert "xfs: fix rmap key and record comparison functions") +$ git merge xfs/for-next +Already up to date. +Merging zonefs/for-next (48bfd5c6fac1 zonefs: document the explicit-open mount option) +$ git merge zonefs/for-next +Already up to date. +Merging iomap/iomap-for-next (1a31182edd00 iomap: Call inode_dio_end() before generic_write_sync()) +$ git merge iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (9b8523423b23 vfs: move __sb_{start,end}_write* to fs.h) +$ git merge djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (8d1ddb5e7937 fcntl: Fix potential deadlock in send_sig{io, urg}()) +$ git merge file-locks/locks-next +Merge made by the 'recursive' strategy. + fs/fcntl.c | 10 ++++++---- + fs/locks.c | 4 ++-- + 2 files changed, 8 insertions(+), 6 deletions(-) +Merging vfs/for-next (61c207915a76 Merge branches 'work.sparc', 'work.epoll', 'work.sparc32' and 'regset.followup' into for-next) +$ git merge vfs/for-next +Auto-merging include/linux/fs.h +Removing arch/sparc/mm/extable.c +Auto-merging arch/sparc/kernel/process_32.c +Auto-merging arch/ia64/kernel/process.c +Auto-merging arch/arm/kernel/process.c +Auto-merging arch/arm/include/asm/elf.h +Merge made by the 'recursive' strategy. + arch/arm/include/asm/elf.h | 4 - + arch/arm/kernel/process.c | 9 - + arch/c6x/include/asm/elf.h | 3 - + arch/csky/include/asm/elf.h | 1 - + arch/hexagon/include/asm/elf.h | 1 - + arch/ia64/kernel/process.c | 2 +- + arch/ia64/kernel/ptrace.c | 51 +- + arch/nds32/include/asm/elf.h | 1 - + arch/sparc/include/asm/elf_64.h | 1 - + arch/sparc/include/asm/{extable_64.h => extable.h} | 4 +- + arch/sparc/include/asm/processor_32.h | 6 +- + arch/sparc/include/asm/thread_info_64.h | 1 + + arch/sparc/include/asm/uaccess.h | 3 + + arch/sparc/include/asm/uaccess_32.h | 38 -- + arch/sparc/include/asm/uaccess_64.h | 1 - + arch/sparc/kernel/head_32.S | 2 +- + arch/sparc/kernel/head_64.S | 2 +- + arch/sparc/kernel/process_32.c | 12 - + arch/sparc/kernel/setup_32.c | 3 - + arch/sparc/kernel/setup_64.c | 4 - + arch/sparc/kernel/unaligned_32.c | 106 +-- + arch/sparc/lib/checksum_32.S | 64 +- + arch/sparc/lib/copy_user.S | 315 ++++----- + arch/sparc/lib/memset.S | 87 +-- + arch/sparc/mm/Makefile | 2 +- + arch/sparc/mm/extable.c | 107 --- + arch/sparc/mm/fault_32.c | 80 +-- + arch/sparc/mm/mm_32.h | 2 - + fs/eventpoll.c | 717 +++++++++------------ + fs/file_table.c | 1 - + include/linux/eventpoll.h | 11 +- + include/linux/fs.h | 5 +- + lib/extable.c | 5 - + 33 files changed, 531 insertions(+), 1120 deletions(-) + rename arch/sparc/include/asm/{extable_64.h => extable.h} (92%) + delete mode 100644 arch/sparc/mm/extable.c +Merging printk/for-next (eb4e76080fcf Merge branch 'for-5.10-pr_cont-fixup' into for-next) +$ git merge printk/for-next +Auto-merging kernel/printk/printk_ringbuffer.c +Auto-merging init/main.c +Merge made by the 'recursive' strategy. + drivers/tty/Kconfig | 14 -------------- + drivers/tty/Makefile | 3 +-- + drivers/tty/ttynull.c | 18 ++++++++++++++++++ + include/linux/console.h | 3 +++ + init/main.c | 10 ++++++++-- + kernel/printk/printk.c | 9 ++++++++- + kernel/printk/printk_ringbuffer.c | 32 +++++++++++++++----------------- + 7 files changed, 53 insertions(+), 36 deletions(-) +Merging pci/next (46f821a9cff2 Merge branch 'remotes/lorenzo/pci/misc') +$ git merge pci/next +Auto-merging drivers/pci/quirks.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/pci/samsung,exynos5440-pcie.txt +Removing Documentation/devicetree/bindings/pci/rcar-pci.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pci/cdns-pcie-ep.yaml | 3 - + .../devicetree/bindings/pci/rcar-pci-host.yaml | 115 ++++++ + Documentation/devicetree/bindings/pci/rcar-pci.txt | 72 ---- + .../bindings/pci/samsung,exynos-pcie.yaml | 119 +++++++ + .../bindings/pci/samsung,exynos5440-pcie.txt | 58 --- + .../devicetree/bindings/pci/ti,j721e-pci-ep.yaml | 2 - + .../bindings/phy/samsung,exynos-pcie-phy.yaml | 51 +++ + MAINTAINERS | 2 + + arch/x86/pci/i386.c | 2 +- + drivers/pci/controller/cadence/pcie-cadence-ep.c | 9 +- + drivers/pci/controller/cadence/pcie-cadence.h | 1 + + drivers/pci/controller/dwc/Kconfig | 14 +- + drivers/pci/controller/dwc/pci-dra7xx.c | 141 +------- + drivers/pci/controller/dwc/pci-exynos.c | 389 ++++++++------------- + drivers/pci/controller/dwc/pci-imx6.c | 39 +-- + drivers/pci/controller/dwc/pci-keystone.c | 79 +---- + drivers/pci/controller/dwc/pci-layerscape-ep.c | 37 +- + drivers/pci/controller/dwc/pci-layerscape.c | 67 +--- + drivers/pci/controller/dwc/pci-meson.c | 53 +-- + drivers/pci/controller/dwc/pcie-al.c | 29 +- + drivers/pci/controller/dwc/pcie-armada8k.c | 37 +- + drivers/pci/controller/dwc/pcie-artpec6.c | 76 +--- + drivers/pci/controller/dwc/pcie-designware-ep.c | 58 +-- + drivers/pci/controller/dwc/pcie-designware-host.c | 139 +++++--- + drivers/pci/controller/dwc/pcie-designware-plat.c | 70 +--- + drivers/pci/controller/dwc/pcie-designware.c | 105 +++++- + drivers/pci/controller/dwc/pcie-designware.h | 27 +- + drivers/pci/controller/dwc/pcie-histb.c | 37 +- + drivers/pci/controller/dwc/pcie-intel-gw.c | 67 +--- + drivers/pci/controller/dwc/pcie-kirin.c | 62 +--- + drivers/pci/controller/dwc/pcie-qcom.c | 38 +- + drivers/pci/controller/dwc/pcie-spear13xx.c | 62 ++-- + drivers/pci/controller/dwc/pcie-tegra194.c | 41 +-- + drivers/pci/controller/dwc/pcie-uniphier-ep.c | 38 +- + drivers/pci/controller/dwc/pcie-uniphier.c | 51 +-- + drivers/pci/controller/pcie-brcmstb.c | 1 + + drivers/pci/controller/pcie-rcar-host.c | 2 - + drivers/pci/controller/vmd.c | 37 +- + drivers/pci/hotplug/ibmphp_pci.c | 2 - + drivers/pci/of.c | 5 + + drivers/pci/p2pdma.c | 10 +- + drivers/pci/pci-driver.c | 151 ++++---- + drivers/pci/pci.c | 23 +- + drivers/pci/pci.h | 10 +- + drivers/pci/pcie/aspm.c | 44 +++ + drivers/pci/probe.c | 7 +- + drivers/pci/quirks.c | 24 +- + drivers/pci/slot.c | 5 +- + drivers/phy/samsung/phy-exynos-pcie.c | 304 ++++++---------- + include/linux/pci.h | 1 + + include/uapi/linux/pci_regs.h | 4 + + 51 files changed, 1120 insertions(+), 1700 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pci/rcar-pci-host.yaml + delete mode 100644 Documentation/devicetree/bindings/pci/rcar-pci.txt + create mode 100644 Documentation/devicetree/bindings/pci/samsung,exynos-pcie.yaml + delete mode 100644 Documentation/devicetree/bindings/pci/samsung,exynos5440-pcie.txt + create mode 100644 Documentation/devicetree/bindings/phy/samsung,exynos-pcie-phy.yaml +Merging pstore/for-next/pstore (3cea11cd5e3b Linux 5.10-rc2) +$ git merge pstore/for-next/pstore +Already up to date. +Merging hid/for-next (cdaa1e42b483 Merge branch 'for-5.10/upstream-fixes' into for-next) +$ git merge hid/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/hid/amd-sfh-hid.rst | 145 +++++ + Documentation/hid/hidraw.rst | 45 +- + Documentation/hid/index.rst | 1 + + MAINTAINERS | 8 + + drivers/hid/Kconfig | 3 + + drivers/hid/Makefile | 2 + + drivers/hid/amd-sfh-hid/Kconfig | 18 + + drivers/hid/amd-sfh-hid/Makefile | 13 + + drivers/hid/amd-sfh-hid/amd_sfh_client.c | 246 ++++++++ + drivers/hid/amd-sfh-hid/amd_sfh_hid.c | 174 ++++++ + drivers/hid/amd-sfh-hid/amd_sfh_hid.h | 67 +++ + drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 152 +++++ + drivers/hid/amd-sfh-hid/amd_sfh_pcie.h | 79 +++ + .../amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.c | 224 +++++++ + .../amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.h | 107 ++++ + .../hid_descriptor/amd_sfh_hid_report_desc.h | 645 +++++++++++++++++++++ + drivers/hid/hid-asus.c | 123 +++- + drivers/hid/hid-elecom.c | 51 +- + drivers/hid/hid-ids.h | 7 + + drivers/hid/hid-input.c | 6 +- + drivers/hid/hid-ite.c | 13 +- + drivers/hid/hid-logitech-hidpp.c | 2 + + drivers/hid/hid-mf.c | 2 + + drivers/hid/hid-quirks.c | 3 + + drivers/hid/hid-sony.c | 247 ++++++-- + drivers/hid/hidraw.c | 24 +- + drivers/hid/i2c-hid/i2c-hid-core.c | 5 +- + drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c | 8 + + drivers/hid/intel-ish-hid/ishtp-hid.c | 6 +- + drivers/hid/usbhid/hid-core.c | 2 + + drivers/hid/wacom_sys.c | 16 +- + include/linux/hid.h | 3 +- + include/uapi/linux/hidraw.h | 6 + + samples/hidraw/hid-example.c | 2 +- + 34 files changed, 2360 insertions(+), 95 deletions(-) + create mode 100644 Documentation/hid/amd-sfh-hid.rst + create mode 100644 drivers/hid/amd-sfh-hid/Kconfig + create mode 100644 drivers/hid/amd-sfh-hid/Makefile + create mode 100644 drivers/hid/amd-sfh-hid/amd_sfh_client.c + create mode 100644 drivers/hid/amd-sfh-hid/amd_sfh_hid.c + create mode 100644 drivers/hid/amd-sfh-hid/amd_sfh_hid.h + create mode 100644 drivers/hid/amd-sfh-hid/amd_sfh_pcie.c + create mode 100644 drivers/hid/amd-sfh-hid/amd_sfh_pcie.h + create mode 100644 drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.c + create mode 100644 drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.h + create mode 100644 drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_report_desc.h +Merging i2c/i2c/for-next (c97e7615c15b Merge branch 'i2c/for-current' into i2c/for-next) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + drivers/i2c/busses/i2c-at91-master.c | 1 - + drivers/i2c/busses/i2c-at91.h | 2 - + drivers/i2c/busses/i2c-exynos5.c | 5 +-- + drivers/i2c/busses/i2c-ocores.c | 23 ++++++----- + drivers/i2c/busses/i2c-owl.c | 74 +++++++++++++++++++++++++++--------- + 5 files changed, 67 insertions(+), 38 deletions(-) +Merging i3c/i3c/next (015cbe1f0506 i3c: Resign from my maintainer role) +$ git merge i3c/i3c/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i3c/mipi-i3c-hci.yaml | 47 + + MAINTAINERS | 2 +- + drivers/i3c/master.c | 5 +- + drivers/i3c/master/Kconfig | 13 + + drivers/i3c/master/Makefile | 1 + + drivers/i3c/master/mipi-i3c-hci/Makefile | 6 + + drivers/i3c/master/mipi-i3c-hci/cmd.h | 67 ++ + drivers/i3c/master/mipi-i3c-hci/cmd_v1.c | 378 +++++++ + drivers/i3c/master/mipi-i3c-hci/cmd_v2.c | 316 ++++++ + drivers/i3c/master/mipi-i3c-hci/core.c | 798 +++++++++++++++ + drivers/i3c/master/mipi-i3c-hci/dat.h | 32 + + drivers/i3c/master/mipi-i3c-hci/dat_v1.c | 184 ++++ + drivers/i3c/master/mipi-i3c-hci/dct.h | 16 + + drivers/i3c/master/mipi-i3c-hci/dct_v1.c | 36 + + drivers/i3c/master/mipi-i3c-hci/dma.c | 784 +++++++++++++++ + drivers/i3c/master/mipi-i3c-hci/ext_caps.c | 308 ++++++ + drivers/i3c/master/mipi-i3c-hci/ext_caps.h | 19 + + drivers/i3c/master/mipi-i3c-hci/hci.h | 144 +++ + drivers/i3c/master/mipi-i3c-hci/ibi.h | 42 + + drivers/i3c/master/mipi-i3c-hci/pio.c | 1041 ++++++++++++++++++++ + drivers/i3c/master/mipi-i3c-hci/xfer_mode_rate.h | 79 ++ + 21 files changed, 4316 insertions(+), 2 deletions(-) + create mode 100644 Documentation/devicetree/bindings/i3c/mipi-i3c-hci.yaml + create mode 100644 drivers/i3c/master/mipi-i3c-hci/Makefile + create mode 100644 drivers/i3c/master/mipi-i3c-hci/cmd.h + create mode 100644 drivers/i3c/master/mipi-i3c-hci/cmd_v1.c + create mode 100644 drivers/i3c/master/mipi-i3c-hci/cmd_v2.c + create mode 100644 drivers/i3c/master/mipi-i3c-hci/core.c + create mode 100644 drivers/i3c/master/mipi-i3c-hci/dat.h + create mode 100644 drivers/i3c/master/mipi-i3c-hci/dat_v1.c + create mode 100644 drivers/i3c/master/mipi-i3c-hci/dct.h + create mode 100644 drivers/i3c/master/mipi-i3c-hci/dct_v1.c + create mode 100644 drivers/i3c/master/mipi-i3c-hci/dma.c + create mode 100644 drivers/i3c/master/mipi-i3c-hci/ext_caps.c + create mode 100644 drivers/i3c/master/mipi-i3c-hci/ext_caps.h + create mode 100644 drivers/i3c/master/mipi-i3c-hci/hci.h + create mode 100644 drivers/i3c/master/mipi-i3c-hci/ibi.h + create mode 100644 drivers/i3c/master/mipi-i3c-hci/pio.c + create mode 100644 drivers/i3c/master/mipi-i3c-hci/xfer_mode_rate.h +Merging dmi/dmi-for-next (3cb4d29a2633 MAINTAINERS: The DMI/SMBIOS tree has moved) +$ git merge dmi/dmi-for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/firmware/dmi-id.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging hwmon-staging/hwmon-next (439ed83acc19 hwmon: (pwm-fan) Convert to hwmon_device_register_with_info API) +$ git merge hwmon-staging/hwmon-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwmon/pwm-fan.txt | 28 +- + Documentation/hwmon/amd_energy.rst | 7 +- + Documentation/hwmon/corsair-psu.rst | 92 ++++ + Documentation/hwmon/index.rst | 2 + + Documentation/hwmon/max127.rst | 45 ++ + Documentation/hwmon/pmbus-core.rst | 6 - + Documentation/hwmon/pmbus.rst | 6 - + MAINTAINERS | 7 + + drivers/hwmon/Kconfig | 23 + + drivers/hwmon/Makefile | 2 + + drivers/hwmon/abx500.c | 2 +- + drivers/hwmon/acpi_power_meter.c | 9 +- + drivers/hwmon/adm1177.c | 10 +- + drivers/hwmon/adt7470.c | 154 ++++-- + drivers/hwmon/amd_energy.c | 1 + + drivers/hwmon/corsair-psu.c | 611 +++++++++++++++++++++ + drivers/hwmon/drivetemp.c | 2 +- + drivers/hwmon/ibmpowernv.c | 2 +- + drivers/hwmon/ina3221.c | 2 +- + drivers/hwmon/max127.c | 352 ++++++++++++ + drivers/hwmon/pmbus/adm1266.c | 1 - + drivers/hwmon/pmbus/adm1275.c | 1 - + drivers/hwmon/pmbus/bel-pfe.c | 1 - + drivers/hwmon/pmbus/ibm-cffps.c | 1 - + drivers/hwmon/pmbus/inspur-ipsps.c | 1 - + drivers/hwmon/pmbus/ir35221.c | 1 - + drivers/hwmon/pmbus/ir38064.c | 1 - + drivers/hwmon/pmbus/irps5401.c | 1 - + drivers/hwmon/pmbus/isl68137.c | 1 - + drivers/hwmon/pmbus/lm25066.c | 1 - + drivers/hwmon/pmbus/ltc2978.c | 1 - + drivers/hwmon/pmbus/ltc3815.c | 1 - + drivers/hwmon/pmbus/max16064.c | 1 - + drivers/hwmon/pmbus/max16601.c | 1 - + drivers/hwmon/pmbus/max20730.c | 3 - + drivers/hwmon/pmbus/max20751.c | 1 - + drivers/hwmon/pmbus/max31785.c | 1 - + drivers/hwmon/pmbus/max34440.c | 1 - + drivers/hwmon/pmbus/max8688.c | 1 - + drivers/hwmon/pmbus/mp2975.c | 1 - + drivers/hwmon/pmbus/pmbus.c | 1 - + drivers/hwmon/pmbus/pmbus.h | 1 - + drivers/hwmon/pmbus/pmbus_core.c | 20 +- + drivers/hwmon/pmbus/pxe1610.c | 1 - + drivers/hwmon/pmbus/tps40422.c | 1 - + drivers/hwmon/pmbus/tps53679.c | 1 - + drivers/hwmon/pmbus/ucd9000.c | 1 - + drivers/hwmon/pmbus/ucd9200.c | 1 - + drivers/hwmon/pmbus/xdpe12284.c | 1 - + drivers/hwmon/pmbus/zl6100.c | 1 - + drivers/hwmon/pwm-fan.c | 164 ++++-- + 51 files changed, 1404 insertions(+), 174 deletions(-) + create mode 100644 Documentation/hwmon/corsair-psu.rst + create mode 100644 Documentation/hwmon/max127.rst + create mode 100644 drivers/hwmon/corsair-psu.c + create mode 100644 drivers/hwmon/max127.c +Merging jc_docs/docs-next (ac7711427014 doc:it_IT: align Italian documentation) +$ git merge jc_docs/docs-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/configfs-usb-gadget-ecm | 2 +- + Documentation/ABI/testing/procfs-attr-current | 20 ++ + Documentation/ABI/testing/procfs-attr-exec | 20 ++ + Documentation/ABI/testing/procfs-attr-prev | 19 ++ + Documentation/ABI/testing/sysfs-devices-memory | 2 +- + Documentation/ABI/testing/sysfs-fs-ext4 | 2 +- + Documentation/ABI/testing/sysfs-module | 2 +- + .../ABI/testing/sysfs-platform-renesas_usb3 | 2 +- + Documentation/arm/sunxi.rst | 10 + + Documentation/arm64/perf.rst | 2 + + Documentation/core-api/printk-formats.rst | 4 +- + Documentation/dev-tools/kgdb.rst | 7 +- + Documentation/driver-api/mtd/intel-spi.rst | 4 +- + Documentation/driver-api/mtd/spi-nor.rst | 6 +- + Documentation/filesystems/index.rst | 2 +- + Documentation/process/submitting-patches.rst | 2 + + .../translations/it_IT/doc-guide/kernel-doc.rst | 30 +-- + .../translations/it_IT/doc-guide/sphinx.rst | 20 ++ + .../translations/it_IT/process/2.Process.rst | 4 +- + .../translations/it_IT/process/changes.rst | 22 +- + .../translations/it_IT/process/coding-style.rst | 26 +- + .../translations/it_IT/process/deprecated.rst | 147 +++++++++- + .../translations/it_IT/process/email-clients.rst | 5 + + .../it_IT/process/programming-language.rst | 8 +- + .../it_IT/process/submitting-patches.rst | 297 +++++---------------- + Documentation/translations/zh_CN/arm64/index.rst | 1 + + Documentation/translations/zh_CN/arm64/perf.rst | 86 ++++++ + .../translations/zh_CN/filesystems/index.rst | 1 + + .../translations/zh_CN/filesystems/tmpfs.rst | 146 ++++++++++ + scripts/kernel-doc | 2 +- + 30 files changed, 622 insertions(+), 279 deletions(-) + create mode 100644 Documentation/ABI/testing/procfs-attr-current + create mode 100644 Documentation/ABI/testing/procfs-attr-exec + create mode 100644 Documentation/ABI/testing/procfs-attr-prev + create mode 100644 Documentation/translations/zh_CN/arm64/perf.rst + create mode 100644 Documentation/translations/zh_CN/filesystems/tmpfs.rst +Merging v4l-dvb/master (a3f132df0e5f media: bttv: use generic power management) +$ git merge v4l-dvb/master +Auto-merging drivers/staging/media/sunxi/cedrus/cedrus.c +Removing drivers/staging/media/rkisp1/TODO +Removing drivers/staging/media/rkisp1/Kconfig +Auto-merging drivers/media/platform/qcom/venus/venc.c +Auto-merging drivers/media/platform/qcom/venus/pm_helpers.c +Auto-merging drivers/media/platform/qcom/venus/core.h +Auto-merging drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c +Auto-merging drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c +Auto-merging drivers/media/platform/marvell-ccic/mmp-driver.c +CONFLICT (content): Merge conflict in drivers/media/platform/marvell-ccic/mmp-driver.c +Auto-merging drivers/media/platform/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/media/imx7-mipi-csi2.txt +Removing Documentation/devicetree/bindings/media/imx7-csi.txt +Removing Documentation/devicetree/bindings/media/i2c/sony,imx214.txt +Removing Documentation/devicetree/bindings/media/i2c/ov772x.txt +Removing Documentation/devicetree/bindings/media/i2c/ov2680.txt +Removing Documentation/devicetree/bindings/media/i2c/aptina,mt9v111.txt +Removing Documentation/devicetree/bindings/media/i2c/adv7604.txt +Removing Documentation/devicetree/bindings/media/coda.txt +Resolved 'drivers/media/platform/marvell-ccic/mmp-driver.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 33773239f709] Merge remote-tracking branch 'v4l-dvb/master' +$ git diff -M --stat --summary HEAD^.. + .../media/allwinner,sun4i-a10-video-engine.yaml | 1 + + Documentation/devicetree/bindings/media/coda.txt | 31 - + Documentation/devicetree/bindings/media/coda.yaml | 108 ++ + .../devicetree/bindings/media/i2c/adv7604.txt | 88 - + .../devicetree/bindings/media/i2c/adv7604.yaml | 178 ++ + .../bindings/media/i2c/aptina,mt9v111.txt | 46 - + .../bindings/media/i2c/aptina,mt9v111.yaml | 75 + + .../devicetree/bindings/media/i2c/ov2680.txt | 46 - + .../devicetree/bindings/media/i2c/ov772x.txt | 40 - + .../devicetree/bindings/media/i2c/ovti,ov2680.yaml | 99 ++ + .../devicetree/bindings/media/i2c/ovti,ov772x.yaml | 134 ++ + .../devicetree/bindings/media/i2c/sony,imx214.txt | 53 - + .../devicetree/bindings/media/i2c/sony,imx214.yaml | 133 ++ + .../devicetree/bindings/media/imx7-csi.txt | 42 - + .../devicetree/bindings/media/imx7-mipi-csi2.txt | 90 - + .../devicetree/bindings/media/nxp,imx7-csi.yaml | 71 + + .../bindings/media/nxp,imx7-mipi-csi2.yaml | 173 ++ + .../devicetree/bindings/media/qcom,camss.txt | 7 + + Documentation/devicetree/bindings/media/rc.yaml | 1 + + .../devicetree/bindings/media/rockchip-isp1.yaml | 81 +- + .../devicetree/bindings/media/st,stm32-dcmi.yaml | 38 + + Documentation/driver-api/media/camera-sensor.rst | 13 + + Documentation/driver-api/media/cec-core.rst | 4 +- + Documentation/driver-api/media/csi2.rst | 7 +- + Documentation/driver-api/media/dtv-frontend.rst | 6 +- + Documentation/driver-api/media/v4l2-controls.rst | 4 +- + Documentation/driver-api/media/v4l2-dev.rst | 2 +- + .../userspace-api/media/cec/cec-ioc-g-mode.rst | 2 +- + Documentation/userspace-api/media/dvb/audio.rst | 2 +- + Documentation/userspace-api/media/dvb/ca.rst | 2 +- + Documentation/userspace-api/media/dvb/demux.rst | 2 +- + Documentation/userspace-api/media/dvb/dmx-qbuf.rst | 2 +- + Documentation/userspace-api/media/dvb/net.rst | 2 +- + Documentation/userspace-api/media/dvb/video.rst | 2 +- + .../userspace-api/media/lirc.h.rst.exceptions | 1 + + .../userspace-api/media/rc/keytable.c.rst | 2 +- + .../userspace-api/media/rc/lirc-dev-intro.rst | 13 +- + Documentation/userspace-api/media/rc/lirc-dev.rst | 2 +- + Documentation/userspace-api/media/rc/lirc-func.rst | 2 +- + .../userspace-api/media/rc/lirc-get-features.rst | 2 +- + .../userspace-api/media/rc/lirc-get-rec-mode.rst | 2 +- + .../media/rc/lirc-get-rec-resolution.rst | 2 +- + .../userspace-api/media/rc/lirc-get-send-mode.rst | 2 +- + .../userspace-api/media/rc/lirc-get-timeout.rst | 2 +- + .../userspace-api/media/rc/lirc-header.rst | 2 +- + Documentation/userspace-api/media/rc/lirc-read.rst | 2 +- + .../media/rc/lirc-set-measure-carrier-mode.rst | 2 +- + .../media/rc/lirc-set-rec-carrier-range.rst | 2 +- + .../media/rc/lirc-set-rec-carrier.rst | 2 +- + .../media/rc/lirc-set-rec-timeout-reports.rst | 2 +- + .../media/rc/lirc-set-rec-timeout.rst | 2 +- + .../media/rc/lirc-set-send-carrier.rst | 2 +- + .../media/rc/lirc-set-send-duty-cycle.rst | 2 +- + .../media/rc/lirc-set-transmitter-mask.rst | 2 +- + .../media/rc/lirc-set-wideband-receiver.rst | 2 +- + .../userspace-api/media/rc/lirc-write.rst | 2 +- + Documentation/userspace-api/media/rc/rc-intro.rst | 2 +- + Documentation/userspace-api/media/rc/rc-protos.rst | 2 +- + .../userspace-api/media/rc/rc-sysfs-nodes.rst | 2 +- + .../userspace-api/media/rc/rc-table-change.rst | 2 +- + Documentation/userspace-api/media/rc/rc-tables.rst | 2 +- + .../userspace-api/media/rc/remote_controllers.rst | 2 +- + Documentation/userspace-api/media/v4l/biblio.rst | 12 +- + Documentation/userspace-api/media/v4l/buffer.rst | 2 +- + .../media/v4l/colorspaces-details.rst | 5 +- + .../userspace-api/media/v4l/pixfmt-meta-rkisp1.rst | 2 +- + .../media/v4l/selection-api-configuration.rst | 2 +- + .../userspace-api/media/v4l/subdev-formats.rst | 27 + + .../userspace-api/media/v4l/vidioc-g-ext-ctrls.rst | 2 +- + .../userspace-api/media/v4l/vidioc-g-output.rst | 2 +- + .../userspace-api/media/v4l/vidioc-qbuf.rst | 2 +- + MAINTAINERS | 43 +- + drivers/media/Kconfig | 1 - + drivers/media/cec/core/cec-core.c | 4 +- + drivers/media/common/saa7146/saa7146_fops.c | 2 - + drivers/media/common/saa7146/saa7146_video.c | 6 +- + drivers/media/common/siano/smsdvb-main.c | 5 +- + drivers/media/dvb-core/dvbdev.c | 3 + + drivers/media/dvb-frontends/ascot2e.h | 2 +- + drivers/media/dvb-frontends/cxd2820r.h | 2 +- + drivers/media/dvb-frontends/drx39xyj/drxj.c | 7 - + drivers/media/dvb-frontends/drxd_hard.c | 1 - + drivers/media/dvb-frontends/drxk.h | 2 +- + drivers/media/dvb-frontends/dvb-pll.h | 2 +- + drivers/media/dvb-frontends/helene.h | 4 +- + drivers/media/dvb-frontends/horus3a.h | 2 +- + drivers/media/dvb-frontends/ix2505v.h | 4 +- + drivers/media/dvb-frontends/m88ds3103.c | 6 +- + drivers/media/dvb-frontends/m88ds3103.h | 2 +- + drivers/media/dvb-frontends/mb86a20s.h | 2 +- + drivers/media/dvb-frontends/nxt200x.c | 16 - + drivers/media/dvb-frontends/rtl2832.c | 14 +- + drivers/media/dvb-frontends/si2165.c | 2 +- + drivers/media/dvb-frontends/si2165.h | 2 +- + drivers/media/dvb-frontends/si21xx.c | 2 - + drivers/media/dvb-frontends/stb6000.h | 2 +- + drivers/media/dvb-frontends/tda826x.h | 2 +- + drivers/media/dvb-frontends/ts2020.c | 10 +- + drivers/media/dvb-frontends/zl10036.h | 4 +- + drivers/media/i2c/Kconfig | 15 + + drivers/media/i2c/Makefile | 1 + + drivers/media/i2c/ad5820.c | 6 +- + drivers/media/i2c/adp1653.c | 6 +- + drivers/media/i2c/adv7180.c | 6 +- + drivers/media/i2c/adv748x/adv748x-core.c | 3 +- + drivers/media/i2c/ak7375.c | 7 +- + drivers/media/i2c/dw9768.c | 6 +- + drivers/media/i2c/et8ek8/et8ek8_driver.c | 8 +- + drivers/media/i2c/hi556.c | 6 +- + drivers/media/i2c/imx214.c | 2 +- + drivers/media/i2c/imx219.c | 21 +- + drivers/media/i2c/imx258.c | 2 +- + drivers/media/i2c/imx274.c | 280 ++- + drivers/media/i2c/imx290.c | 10 +- + drivers/media/i2c/imx319.c | 8 +- + drivers/media/i2c/imx355.c | 8 +- + drivers/media/i2c/max2175.c | 2 +- + drivers/media/i2c/msp3400-kthreads.c | 12 +- + drivers/media/i2c/mt9p031.c | 3 +- + drivers/media/i2c/ov13858.c | 6 +- + drivers/media/i2c/ov2680.c | 6 +- + drivers/media/i2c/ov2685.c | 6 +- + drivers/media/i2c/ov2740.c | 211 ++- + drivers/media/i2c/ov5640.c | 108 +- + drivers/media/i2c/ov5670.c | 6 +- + drivers/media/i2c/ov5675.c | 6 +- + drivers/media/i2c/ov5695.c | 6 +- + drivers/media/i2c/ov7670.c | 96 +- + drivers/media/i2c/ov772x.c | 71 +- + drivers/media/i2c/ov7740.c | 6 +- + drivers/media/i2c/ov8856.c | 6 +- + drivers/media/i2c/ov9734.c | 1018 +++++++++++ + drivers/media/i2c/smiapp/smiapp-core.c | 28 +- + drivers/media/i2c/tvp5150.c | 6 +- + drivers/media/pci/b2c2/flexcop-dma.c | 6 +- + drivers/media/pci/bt8xx/bt878.c | 16 +- + drivers/media/pci/bt8xx/btcx-risc.c | 5 +- + drivers/media/pci/bt8xx/bttv-cards.c | 6 +- + drivers/media/pci/bt8xx/bttv-driver.c | 78 +- + drivers/media/pci/bt8xx/bttv-risc.c | 1 - + drivers/media/pci/cx23885/cx23885-core.c | 1 - + drivers/media/pci/cx25821/cx25821-core.c | 1 - + drivers/media/pci/dm1105/dm1105.c | 14 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.c | 119 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.h | 157 +- + drivers/media/pci/mantis/hopper_vp3028.c | 2 +- + drivers/media/pci/saa7134/saa7134-video.c | 30 +- + drivers/media/pci/saa7164/saa7164-core.c | 17 +- + drivers/media/pci/solo6x10/solo6x10-g723.c | 2 +- + drivers/media/platform/Kconfig | 18 + + drivers/media/platform/Makefile | 1 + + drivers/media/platform/coda/coda-bit.c | 73 +- + drivers/media/platform/coda/coda-common.c | 35 +- + drivers/media/platform/coda/coda.h | 11 + + drivers/media/platform/davinci/isif.c | 11 +- + drivers/media/platform/exynos4-is/fimc-core.c | 6 +- + drivers/media/platform/fsl-viu.c | 2 - + drivers/media/platform/marvell-ccic/mmp-driver.c | 4 +- + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 9 + + .../media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 9 +- + .../media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 19 +- + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 9 +- + .../media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 28 +- + drivers/media/platform/pxa_camera.c | 4 +- + drivers/media/platform/qcom/camss/camss-csid.c | 9 +- + .../platform/qcom/camss/camss-csiphy-3ph-1-0.c | 7 +- + drivers/media/platform/qcom/camss/camss-csiphy.c | 25 +- + drivers/media/platform/qcom/camss/camss-csiphy.h | 1 + + drivers/media/platform/qcom/camss/camss-ispif.c | 100 +- + drivers/media/platform/qcom/camss/camss-ispif.h | 2 +- + drivers/media/platform/qcom/camss/camss-vfe-4-7.c | 131 +- + drivers/media/platform/qcom/camss/camss-vfe.c | 19 +- + drivers/media/platform/qcom/camss/camss-vfe.h | 1 + + drivers/media/platform/qcom/camss/camss-video.c | 3 +- + drivers/media/platform/qcom/camss/camss.c | 206 ++- + drivers/media/platform/qcom/camss/camss.h | 1 + + drivers/media/platform/qcom/venus/core.c | 41 +- + drivers/media/platform/qcom/venus/core.h | 1 + + drivers/media/platform/qcom/venus/firmware.c | 17 +- + drivers/media/platform/qcom/venus/hfi.c | 12 + + drivers/media/platform/qcom/venus/pm_helpers.c | 12 +- + drivers/media/platform/qcom/venus/vdec.c | 32 +- + drivers/media/platform/qcom/venus/venc.c | 2 +- + drivers/media/platform/rcar-vin/rcar-core.c | 67 +- + drivers/media/platform/rcar-vin/rcar-csi2.c | 18 +- + drivers/media/platform/rcar-vin/rcar-dma.c | 129 +- + drivers/media/platform/rcar-vin/rcar-vin.h | 15 +- + .../platform/rockchip}/rkisp1/Makefile | 0 + .../platform/rockchip}/rkisp1/rkisp1-capture.c | 242 +-- + .../platform/rockchip}/rkisp1/rkisp1-common.c | 0 + .../platform/rockchip}/rkisp1/rkisp1-common.h | 14 +- + .../platform/rockchip}/rkisp1/rkisp1-dev.c | 11 +- + .../platform/rockchip}/rkisp1/rkisp1-isp.c | 9 +- + .../platform/rockchip}/rkisp1/rkisp1-params.c | 173 +- + .../platform/rockchip}/rkisp1/rkisp1-regs.h | 0 + .../platform/rockchip}/rkisp1/rkisp1-resizer.c | 10 +- + .../platform/rockchip}/rkisp1/rkisp1-stats.c | 21 - + drivers/media/platform/s3c-camif/camif-core.c | 6 +- + .../media/platform/sti/c8sectpfe/c8sectpfe-core.c | 23 +- + drivers/media/platform/stm32/stm32-dcmi.c | 63 +- + .../media/platform/sunxi/sun4i-csi/sun4i_v4l2.c | 2 +- + drivers/media/radio/radio-sf16fmr2.c | 2 +- + drivers/media/rc/keymaps/Makefile | 1 + + drivers/media/rc/keymaps/rc-khamsin.c | 75 + + drivers/media/rc/lirc_dev.c | 3 +- + drivers/media/rc/sunxi-cir.c | 50 +- + drivers/media/test-drivers/vim2m.c | 20 +- + .../media/test-drivers/vivid/vivid-kthread-cap.c | 6 +- + .../media/test-drivers/vivid/vivid-kthread-out.c | 6 +- + .../media/test-drivers/vivid/vivid-kthread-touch.c | 6 +- + drivers/media/test-drivers/vivid/vivid-sdr-cap.c | 6 +- + drivers/media/test-drivers/vivid/vivid-vid-cap.c | 18 +- + drivers/media/test-drivers/vivid/vivid-vid-out.c | 18 +- + drivers/media/tuners/mt2060.c | 2 +- + drivers/media/tuners/mt2063.c | 1 - + drivers/media/tuners/mxl5005s.c | 20 +- + drivers/media/usb/au0828/au0828-video.c | 7 +- + drivers/media/usb/cx231xx/cx231xx-audio.c | 2 +- + drivers/media/usb/cx231xx/cx231xx-core.c | 10 +- + drivers/media/usb/cx231xx/cx231xx-vbi.c | 5 +- + drivers/media/usb/dvb-usb-v2/dvbsky.c | 22 +- + drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 4 +- + drivers/media/usb/dvb-usb-v2/zd1301.c | 2 +- + drivers/media/usb/dvb-usb/dib0700_devices.c | 4 +- + drivers/media/usb/dvb-usb/dw2102.c | 8 +- + drivers/media/usb/dvb-usb/gp8psk.c | 2 +- + drivers/media/usb/em28xx/em28xx-audio.c | 14 +- + drivers/media/usb/gspca/ov534.c | 12 +- + drivers/media/usb/msi2500/msi2500.c | 4 +- + drivers/media/usb/pvrusb2/pvrusb2-devattr.c | 2 +- + drivers/media/usb/tm6000/tm6000-video.c | 7 +- + drivers/media/usb/uvc/uvc_ctrl.c | 4 +- + drivers/media/usb/zr364xx/zr364xx.c | 33 +- + drivers/media/v4l2-core/v4l2-common.c | 33 + + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 1793 +++++++------------- + drivers/media/v4l2-core/v4l2-ctrls.c | 6 +- + drivers/media/v4l2-core/v4l2-fwnode.c | 18 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 184 +- + drivers/media/v4l2-core/v4l2-subdev.c | 48 +- + drivers/staging/media/Kconfig | 2 - + drivers/staging/media/Makefile | 1 - + drivers/staging/media/imx/imx-media-csi.c | 10 +- + drivers/staging/media/ipu3/include/intel-ipu3.h | 8 +- + drivers/staging/media/rkisp1/Kconfig | 19 - + drivers/staging/media/rkisp1/TODO | 13 - + drivers/staging/media/rkvdec/rkvdec.c | 4 +- + drivers/staging/media/sunxi/cedrus/cedrus.c | 9 + + drivers/staging/media/sunxi/cedrus/cedrus_video.c | 4 +- + drivers/staging/media/zoran/zoran_driver.c | 2 +- + include/media/dvbdev.h | 2 +- + include/media/h264-ctrls.h | 195 ++- + include/media/rc-map.h | 1 + + include/media/v4l2-async.h | 2 +- + include/media/v4l2-common.h | 21 + + include/media/v4l2-ctrls.h | 2 +- + include/media/v4l2-dev.h | 4 +- + include/media/v4l2-device.h | 2 +- + include/media/v4l2-dv-timings.h | 2 +- + include/media/v4l2-fwnode.h | 76 +- + include/media/v4l2-ioctl.h | 10 + + include/media/v4l2-mediabus.h | 8 +- + include/media/v4l2-subdev.h | 2 +- + include/media/videobuf2-core.h | 2 +- + include/uapi/linux/lirc.h | 4 +- + include/uapi/linux/media-bus-format.h | 8 + + .../uapi => include/uapi/linux}/rkisp1-config.h | 6 +- + include/uapi/linux/v4l2-controls.h | 6 + + include/uapi/linux/videodev2.h | 10 +- + 268 files changed, 5652 insertions(+), 3219 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/media/coda.txt + create mode 100644 Documentation/devicetree/bindings/media/coda.yaml + delete mode 100644 Documentation/devicetree/bindings/media/i2c/adv7604.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/adv7604.yaml + delete mode 100644 Documentation/devicetree/bindings/media/i2c/aptina,mt9v111.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/aptina,mt9v111.yaml + delete mode 100644 Documentation/devicetree/bindings/media/i2c/ov2680.txt + delete mode 100644 Documentation/devicetree/bindings/media/i2c/ov772x.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/ovti,ov2680.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/ovti,ov772x.yaml + delete mode 100644 Documentation/devicetree/bindings/media/i2c/sony,imx214.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/sony,imx214.yaml + delete mode 100644 Documentation/devicetree/bindings/media/imx7-csi.txt + delete mode 100644 Documentation/devicetree/bindings/media/imx7-mipi-csi2.txt + create mode 100644 Documentation/devicetree/bindings/media/nxp,imx7-csi.yaml + create mode 100644 Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml + rename {drivers/staging/media/rkisp1/Documentation => Documentation}/devicetree/bindings/media/rockchip-isp1.yaml (81%) + create mode 100644 drivers/media/i2c/ov9734.c + rename drivers/{staging/media => media/platform/rockchip}/rkisp1/Makefile (100%) + rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-capture.c (94%) + rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-common.c (100%) + rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-common.h (97%) + rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-dev.c (99%) + rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-isp.c (99%) + rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-params.c (92%) + rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-regs.h (100%) + rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-resizer.c (99%) + rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-stats.c (96%) + create mode 100644 drivers/media/rc/keymaps/rc-khamsin.c + delete mode 100644 drivers/staging/media/rkisp1/Kconfig + delete mode 100644 drivers/staging/media/rkisp1/TODO + rename {drivers/staging/media/rkisp1/uapi => include/uapi/linux}/rkisp1-config.h (98%) +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/pagemap.h +Auto-merging MAINTAINERS +Auto-merging Documentation/hwmon/index.rst +Auto-merging Documentation/dev-tools/kasan.rst +Auto-merging Documentation/conf.py +Merge made by the 'recursive' strategy. +Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe()) +$ git merge fbdev/fbdev-for-next +Already up to date. +Merging pm/linux-next (735f7fba25ec Merge branch 'pm-acpi' into linux-next) +$ git merge pm/linux-next +Auto-merging lib/Kconfig.debug +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-devices-system-cpu | 3 +- + .../driver-api/thermal/power_allocator.rst | 12 +- + Documentation/firmware-guide/acpi/dsd/leds.rst | 8 +- + Documentation/firmware-guide/acpi/enumeration.rst | 154 ++++++++ + .../firmware-guide/acpi/gpio-properties.rst | 56 ++- + Documentation/power/energy-model.rst | 30 +- + Documentation/scheduler/sched-energy.rst | 5 + + arch/x86/include/asm/msr-index.h | 3 +- + drivers/acpi/acpi_dbg.c | 7 - + drivers/acpi/acpi_watchdog.c | 6 +- + drivers/acpi/apei/apei-base.c | 2 +- + drivers/acpi/cppc_acpi.c | 126 +++---- + drivers/acpi/device_pm.c | 62 ++-- + drivers/acpi/ec.c | 117 +++---- + drivers/acpi/pci_root.c | 4 +- + drivers/acpi/processor_idle.c | 1 - + drivers/acpi/processor_perflib.c | 4 +- + drivers/acpi/processor_thermal.c | 2 - + drivers/acpi/processor_throttling.c | 1 - + drivers/acpi/sbs.c | 24 +- + drivers/acpi/tiny-power-button.c | 4 +- + drivers/base/power/domain.c | 55 ++- + drivers/base/power/main.c | 8 +- + drivers/clocksource/sh_cmt.c | 8 +- + drivers/clocksource/sh_mtu2.c | 4 +- + drivers/clocksource/sh_tmu.c | 8 +- + drivers/cpufreq/cppc_cpufreq.c | 307 ++++++++-------- + drivers/cpufreq/cpufreq.c | 80 ++--- + drivers/cpufreq/cpufreq_stats.c | 16 +- + drivers/cpufreq/intel_pstate.c | 9 +- + drivers/cpufreq/scmi-cpufreq.c | 3 +- + drivers/cpuidle/cpuidle-psci-domain.c | 2 + + drivers/cpuidle/cpuidle-psci.c | 34 +- + drivers/i2c/busses/i2c-stm32f7.c | 4 +- + drivers/opp/of.c | 2 +- + drivers/pci/pci-acpi.c | 4 +- + drivers/powercap/intel_rapl_common.c | 7 + + drivers/powercap/intel_rapl_msr.c | 51 ++- + drivers/powercap/powercap_sys.c | 5 +- + include/acpi/acpi_bus.h | 5 - + include/acpi/acpi_drivers.h | 12 +- + include/acpi/cppc_acpi.h | 5 +- + include/linux/cpufreq.h | 5 - + include/linux/energy_model.h | 20 +- + include/linux/ioport.h | 34 +- + include/linux/pm_domain.h | 22 +- + include/linux/pm_wakeup.h | 10 + + kernel/Makefile | 1 + + kernel/power/energy_model.c | 26 +- + kernel/power/suspend.c | 2 + + kernel/reboot.c | 2 + + kernel/resource.c | 10 +- + kernel/resource_kunit.c | 152 ++++++++ + kernel/sched/cpufreq_schedutil.c | 8 +- + lib/Kconfig.debug | 11 + + sound/soc/intel/catpt/core.h | 11 - + sound/soc/intel/catpt/loader.c | 2 +- + tools/power/pm-graph/README | 4 +- + tools/power/pm-graph/sleepgraph.py | 387 ++++++++++++--------- + 59 files changed, 1237 insertions(+), 730 deletions(-) + create mode 100644 kernel/resource_kunit.c +Merging cpufreq-arm/cpufreq/arm/linux-next (32c855670808 cpufreq: vexpress-spc: Add missing MODULE_ALIAS) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Merge made by the 'recursive' strategy. + drivers/cpufreq/armada-8k-cpufreq.c | 6 ++++ + drivers/cpufreq/cpufreq-dt-platdev.c | 2 ++ + drivers/cpufreq/highbank-cpufreq.c | 7 ++++ + drivers/cpufreq/loongson1-cpufreq.c | 1 + + drivers/cpufreq/mediatek-cpufreq.c | 3 ++ + drivers/cpufreq/qcom-cpufreq-nvmem.c | 1 + + drivers/cpufreq/scpi-cpufreq.c | 1 + + drivers/cpufreq/sti-cpufreq.c | 14 +++++++- + drivers/cpufreq/sun50i-cpufreq-nvmem.c | 1 + + drivers/cpufreq/tegra194-cpufreq.c | 62 +++++++++++++++++++++++++++++----- + drivers/cpufreq/vexpress-spc-cpufreq.c | 1 + + 11 files changed, 89 insertions(+), 10 deletions(-) +Merging cpupower/cpupower (748f0d70087c cpupower: Provide online and offline CPU information) +$ git merge cpupower/cpupower +Merge made by the 'recursive' strategy. + tools/power/cpupower/utils/cpufreq-set.c | 3 ++ + tools/power/cpupower/utils/cpuidle-set.c | 4 ++ + tools/power/cpupower/utils/cpupower.c | 8 ++++ + tools/power/cpupower/utils/helpers/helpers.h | 12 +++++ + tools/power/cpupower/utils/helpers/misc.c | 66 +++++++++++++++++++++++++++- + 5 files changed, 92 insertions(+), 1 deletion(-) +Merging devfreq/devfreq-next (98fd9972ed60 PM / devfreq: tegra20: Deprecate in a favor of emc-stat based driver) +$ git merge devfreq/devfreq-next +Removing drivers/devfreq/tegra20-devfreq.c +Auto-merging MAINTAINERS +Auto-merging Documentation/ABI/testing/sysfs-class-devfreq +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-devfreq | 54 +++-- + .../devicetree/bindings/devfreq/exynos-bus.txt | 71 +++++- + MAINTAINERS | 1 - + drivers/devfreq/Kconfig | 10 - + drivers/devfreq/Makefile | 1 - + drivers/devfreq/devfreq.c | 242 ++++++++++++++------- + drivers/devfreq/exynos-bus.c | 17 ++ + drivers/devfreq/governor.h | 33 ++- + drivers/devfreq/governor_passive.c | 44 +--- + drivers/devfreq/governor_simpleondemand.c | 2 + + drivers/devfreq/tegra20-devfreq.c | 212 ------------------ + drivers/devfreq/tegra30-devfreq.c | 12 +- + include/linux/devfreq.h | 4 - + include/trace/events/devfreq.h | 30 ++- + 14 files changed, 356 insertions(+), 377 deletions(-) + delete mode 100644 drivers/devfreq/tegra20-devfreq.c +Merging opp/opp/linux-next (ed40e33c0b91 opp: Reduce the size of critical section in _opp_kref_release()) +$ git merge opp/opp/linux-next +Auto-merging drivers/opp/of.c +Auto-merging drivers/media/platform/qcom/venus/pm_helpers.c +Auto-merging drivers/devfreq/exynos-bus.c +Auto-merging drivers/cpufreq/qcom-cpufreq-nvmem.c +Auto-merging drivers/base/power/domain.c +Merge made by the 'recursive' strategy. + drivers/base/power/domain.c | 2 +- + drivers/cpufreq/cpufreq-dt.c | 155 +++++++---------- + drivers/cpufreq/qcom-cpufreq-nvmem.c | 15 +- + drivers/devfreq/exynos-bus.c | 12 +- + drivers/gpu/drm/lima/lima_devfreq.c | 13 +- + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 6 +- + drivers/media/platform/qcom/venus/pm_helpers.c | 3 +- + drivers/opp/core.c | 228 +++++++++++++++---------- + drivers/opp/of.c | 9 +- + drivers/opp/opp.h | 1 + + include/linux/pm_opp.h | 1 - + 11 files changed, 225 insertions(+), 220 deletions(-) +Merging thermal/thermal/linux-next (90a996544946 thermal: power allocator: change the 'k_*' always in estimate_pid_constants()) +$ git merge thermal/thermal/linux-next +Merge made by the 'recursive' strategy. + .../bindings/thermal/mediatek-thermal.txt | 3 +- + .../devicetree/bindings/thermal/rcar-thermal.yaml | 48 +++++---- + Documentation/driver-api/thermal/sysfs-api.rst | 3 +- + drivers/thermal/amlogic_thermal.c | 4 + + drivers/thermal/cpufreq_cooling.c | 4 +- + drivers/thermal/gov_power_allocator.c | 116 +++++++++++++++------ + drivers/thermal/intel/intel_pch_thermal.c | 90 ++++++++++++++-- + drivers/thermal/mtk_thermal.c | 2 +- + drivers/thermal/rcar_thermal.c | 5 +- + drivers/thermal/sun8i_thermal.c | 33 +++--- + drivers/thermal/thermal_core.c | 97 +---------------- + drivers/thermal/thermal_core.h | 6 -- + drivers/thermal/thermal_hwmon.c | 3 +- + 13 files changed, 231 insertions(+), 183 deletions(-) +Merging thermal-rzhang/next (54ecb8f7028c Linux 5.4-rc1) +$ git merge thermal-rzhang/next +Already up to date. +Merging thermal-soc/next (6c375eccded4 thermal: db8500: Rewrite to be a pure OF sensor) +$ git merge thermal-soc/next +Already up to date. +Merging ieee1394/for-next (67f8e65e4fc1 firewire: net: remove set but not used variable 'guid') +$ git merge ieee1394/for-next +Auto-merging drivers/firewire/net.c +Merge made by the 'recursive' strategy. + drivers/firewire/net.c | 2 -- + 1 file changed, 2 deletions(-) +Merging dlm/next (4f19d071f9be fs: dlm: check on existing node address) +$ git merge dlm/next +Merge made by the 'recursive' strategy. + fs/dlm/lockspace.c | 2 +- + fs/dlm/lowcomms.c | 304 ++++++++++++++++++++++++++++------------------------- + fs/dlm/lowcomms.h | 2 + + fs/dlm/member.c | 2 +- + fs/dlm/rcom.c | 6 +- + 5 files changed, 168 insertions(+), 148 deletions(-) +Merging swiotlb/linux-next (fc0021aa340a swiotlb: remove the tbl_dma_addr argument to swiotlb_tbl_map_single) +$ git merge swiotlb/linux-next +Already up to date. +Merging rdma/for-next (dd37d2f59eb8 RDMA/cma: Fix deadlock on &lock in rdma_cma_listen_on_all() error unwind) +$ git merge rdma/for-next +Removing kernel/dma/virt.c +Auto-merging kernel/dma/Makefile +Auto-merging kernel/dma/Kconfig +Auto-merging include/linux/dma-mapping.h +CONFLICT (content): Merge conflict in include/linux/dma-mapping.h +Auto-merging drivers/pci/p2pdma.c +Auto-merging drivers/infiniband/hw/mthca/mthca_cq.c +Auto-merging drivers/infiniband/hw/i40iw/i40iw_verbs.c +Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v2.h +Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v2.c +Resolved 'include/linux/dma-mapping.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b1da8eff5954] Merge remote-tracking branch 'rdma/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/infiniband/core/cm.c | 4 +- + drivers/infiniband/core/cma.c | 188 ++++---- + drivers/infiniband/core/cma_configfs.c | 4 +- + drivers/infiniband/core/core_priv.h | 2 + + drivers/infiniband/core/counters.c | 136 +++--- + drivers/infiniband/core/device.c | 76 +++- + drivers/infiniband/core/rdma_core.c | 50 +-- + drivers/infiniband/core/restrack.c | 11 +- + drivers/infiniband/core/rw.c | 5 +- + drivers/infiniband/core/sysfs.c | 166 ++++--- + drivers/infiniband/core/ucma.c | 2 +- + drivers/infiniband/core/umem.c | 17 +- + drivers/infiniband/core/user_mad.c | 6 +- + drivers/infiniband/core/uverbs_cmd.c | 31 +- + drivers/infiniband/core/uverbs_main.c | 4 +- + drivers/infiniband/core/uverbs_std_types.c | 18 +- + .../infiniband/core/uverbs_std_types_async_fd.c | 5 +- + .../infiniband/core/uverbs_std_types_counters.c | 5 +- + drivers/infiniband/core/uverbs_std_types_cq.c | 4 +- + drivers/infiniband/core/uverbs_std_types_dm.c | 6 +- + .../infiniband/core/uverbs_std_types_flow_action.c | 6 +- + drivers/infiniband/core/uverbs_std_types_qp.c | 4 +- + drivers/infiniband/core/uverbs_std_types_srq.c | 4 +- + drivers/infiniband/core/uverbs_std_types_wq.c | 4 +- + drivers/infiniband/core/uverbs_uapi.c | 5 +- + drivers/infiniband/core/verbs.c | 11 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 15 +- + drivers/infiniband/hw/bnxt_re/main.c | 34 +- + drivers/infiniband/hw/cxgb4/cq.c | 3 + + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 2 - + drivers/infiniband/hw/cxgb4/mem.c | 84 ---- + drivers/infiniband/hw/cxgb4/provider.c | 35 +- + drivers/infiniband/hw/cxgb4/qp.c | 8 +- + drivers/infiniband/hw/efa/efa_main.c | 23 +- + drivers/infiniband/hw/efa/efa_verbs.c | 6 + + drivers/infiniband/hw/hfi1/qp.c | 1 + + drivers/infiniband/hw/hfi1/sysfs.c | 62 ++- + drivers/infiniband/hw/hfi1/tid_rdma.c | 5 + + drivers/infiniband/hw/hns/hns_roce_alloc.c | 128 +++--- + drivers/infiniband/hw/hns/hns_roce_cq.c | 3 + + drivers/infiniband/hw/hns/hns_roce_device.h | 65 +-- + drivers/infiniband/hw/hns/hns_roce_hem.c | 15 + + drivers/infiniband/hw/hns/hns_roce_hem.h | 1 + + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 9 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 256 ++++++++--- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 60 ++- + drivers/infiniband/hw/hns/hns_roce_main.c | 61 ++- + drivers/infiniband/hw/hns/hns_roce_mr.c | 39 +- + drivers/infiniband/hw/hns/hns_roce_qp.c | 17 +- + drivers/infiniband/hw/hns/hns_roce_srq.c | 4 + + drivers/infiniband/hw/i40iw/i40iw_ctrl.c | 20 +- + drivers/infiniband/hw/i40iw/i40iw_type.h | 20 +- + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 35 +- + drivers/infiniband/hw/mlx4/mad.c | 1 + + drivers/infiniband/hw/mlx4/main.c | 61 +-- + drivers/infiniband/hw/mlx4/mcg.c | 82 ++-- + drivers/infiniband/hw/mlx4/qp.c | 5 +- + drivers/infiniband/hw/mlx4/srq.c | 4 + + drivers/infiniband/hw/mlx4/sysfs.c | 66 ++- + drivers/infiniband/hw/mlx5/cq.c | 77 ++-- + drivers/infiniband/hw/mlx5/devx.c | 88 ++-- + drivers/infiniband/hw/mlx5/fs.c | 6 +- + drivers/infiniband/hw/mlx5/main.c | 105 +---- + drivers/infiniband/hw/mlx5/mem.c | 192 ++------ + drivers/infiniband/hw/mlx5/mlx5_ib.h | 86 +++- + drivers/infiniband/hw/mlx5/mr.c | 482 +++++++++++++-------- + drivers/infiniband/hw/mlx5/qp.c | 189 ++++---- + drivers/infiniband/hw/mlx5/srq.c | 34 +- + drivers/infiniband/hw/mlx5/srq.h | 1 + + drivers/infiniband/hw/mlx5/srq_cmd.c | 80 +++- + drivers/infiniband/hw/mthca/mthca_cq.c | 2 +- + drivers/infiniband/hw/mthca/mthca_dev.h | 1 - + drivers/infiniband/hw/mthca/mthca_provider.c | 61 +-- + drivers/infiniband/hw/mthca/mthca_qp.c | 3 + + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 42 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 11 +- + drivers/infiniband/hw/qedr/main.c | 39 +- + drivers/infiniband/hw/qedr/verbs.c | 13 + + drivers/infiniband/hw/qib/qib_pcie.c | 11 +- + drivers/infiniband/hw/qib/qib_sysfs.c | 96 ++-- + drivers/infiniband/hw/usnic/usnic_ib_main.c | 19 - + drivers/infiniband/hw/usnic/usnic_ib_sysfs.c | 100 ++--- + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 7 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c | 3 + + drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 34 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c | 5 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c | 2 +- + drivers/infiniband/sw/rdmavt/Kconfig | 1 - + drivers/infiniband/sw/rdmavt/ah.c | 1 - + drivers/infiniband/sw/rdmavt/cq.c | 2 +- + drivers/infiniband/sw/rdmavt/mr.c | 6 +- + drivers/infiniband/sw/rdmavt/qp.c | 10 +- + drivers/infiniband/sw/rdmavt/vt.c | 36 +- + drivers/infiniband/sw/rxe/Kconfig | 1 - + drivers/infiniband/sw/rxe/rxe_mr.c | 1 - + drivers/infiniband/sw/rxe/rxe_net.c | 18 - + drivers/infiniband/sw/rxe/rxe_req.c | 3 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 5 - + drivers/infiniband/sw/rxe/rxe_verbs.c | 56 +-- + drivers/infiniband/sw/rxe/rxe_verbs.h | 2 - + drivers/infiniband/sw/siw/Kconfig | 1 - + drivers/infiniband/sw/siw/siw.h | 1 - + drivers/infiniband/sw/siw/siw_cm.c | 2 +- + drivers/infiniband/sw/siw/siw_main.c | 52 +-- + drivers/infiniband/sw/siw/siw_verbs.c | 12 + + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 4 +- + drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 4 + + drivers/infiniband/ulp/ipoib/ipoib_main.c | 7 +- + drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 4 +- + drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 2 +- + drivers/infiniband/ulp/isert/ib_isert.c | 29 +- + drivers/infiniband/ulp/isert/ib_isert.h | 6 + + drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c | 62 +-- + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 74 ++-- + drivers/infiniband/ulp/rtrs/rtrs-clt.h | 1 + + drivers/infiniband/ulp/rtrs/rtrs-pri.h | 3 +- + drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c | 21 +- + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 119 ++--- + drivers/infiniband/ulp/rtrs/rtrs-srv.h | 2 +- + drivers/infiniband/ulp/rtrs/rtrs.c | 61 +-- + drivers/infiniband/ulp/srp/ib_srp.c | 48 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 14 +- + drivers/nvme/host/rdma.c | 2 +- + drivers/nvme/target/rdma.c | 3 +- + drivers/pci/p2pdma.c | 25 +- + include/linux/dma-mapping.h | 2 - + include/rdma/ib_umem.h | 42 ++ + include/rdma/ib_verbs.h | 164 +++---- + include/rdma/uverbs_ioctl.h | 15 +- + include/rdma/uverbs_types.h | 4 +- + include/uapi/rdma/ib_user_verbs.h | 14 - + kernel/dma/Kconfig | 5 - + kernel/dma/Makefile | 1 - + kernel/dma/virt.c | 61 --- + net/rds/ib.c | 10 - + net/rds/ib.h | 13 - + net/rds/ib_cm.c | 128 +++--- + net/rds/ib_recv.c | 18 +- + net/rds/ib_send.c | 8 + + tools/testing/scatterlist/main.c | 64 ++- + 140 files changed, 2455 insertions(+), 2588 deletions(-) + delete mode 100644 kernel/dma/virt.c +Merging net-next/master (e71d2b957ee4 Merge branch 'net-ipa-start-adding-ipa-v4-5-support') +$ git merge net-next/master +Removing tools/testing/selftests/bpf/test_tcpbpf_user.c +Removing tools/testing/selftests/bpf/tcp_server.py +Removing tools/testing/selftests/bpf/tcp_client.py +Auto-merging tools/bpf/bpftool/btf.c +Removing samples/bpf/test_ipip.sh +Auto-merging net/netfilter/nf_tables_api.c +Auto-merging net/netfilter/ipset/ip_set_core.c +Auto-merging net/ipv4/route.c +Removing net/dsa/tag_edsa.c +Auto-merging net/core/dev.c +Auto-merging net/9p/client.c +Auto-merging lib/nlattr.c +Auto-merging lib/Kconfig.debug +Removing include/uapi/linux/sdla.h +Removing include/uapi/linux/if_frad.h +Auto-merging include/rdma/ib_verbs.h +Removing include/linux/sdla.h +Auto-merging include/linux/netdevice.h +Removing include/linux/if_frad.h +Auto-merging drivers/soc/fsl/qbman/qman.c +Removing drivers/net/wimax/Makefile +Removing drivers/net/wimax/Kconfig +Removing drivers/net/wan/x25_asy.h +Removing drivers/net/wan/x25_asy.c +Removing drivers/net/wan/sdla.c +Removing drivers/net/wan/dlci.c +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Auto-merging drivers/net/ethernet/smsc/Kconfig +Auto-merging drivers/net/ethernet/ibm/ibmvnic.h +Auto-merging drivers/net/ethernet/ibm/ibmvnic.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/ibm/ibmvnic.c +Auto-merging MAINTAINERS +Removing Documentation/networking/framerelay.rst +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/net/dsa/ksz.txt +Recorded preimage for 'drivers/net/ethernet/ibm/ibmvnic.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/net/ethernet/ibm/ibmvnic.c'. +[master e06777c9b52e] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + CREDITS | 9 - + Documentation/ABI/testing/sysfs-kernel-btf | 8 + + Documentation/admin-guide/index.rst | 1 - + .../devicetree/bindings/net/can/fsl,flexcan.yaml | 5 +- + .../bindings/net/dsa/hirschmann,hellcreek.yaml | 127 ++ + Documentation/devicetree/bindings/net/dsa/ksz.txt | 125 -- + .../devicetree/bindings/net/dsa/microchip,ksz.yaml | 148 ++ + .../devicetree/bindings/net/ftgmac100.txt | 25 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/networking/can.rst | 70 +- + Documentation/networking/devlink/devlink-trap.rst | 4 + + Documentation/networking/devlink/netdevsim.rst | 3 +- + Documentation/networking/framerelay.rst | 44 - + Documentation/networking/index.rst | 2 +- + Documentation/networking/ip-sysctl.rst | 34 + + Documentation/networking/j1939.rst | 46 +- + Documentation/networking/kapi.rst | 21 - + Documentation/networking/mptcp-sysctl.rst | 26 + + Documentation/networking/page_pool.rst | 8 + + Documentation/process/magic-number.rst | 1 - + .../translations/it_IT/process/magic-number.rst | 1 - + .../translations/zh_CN/admin-guide/index.rst | 1 - + .../translations/zh_CN/process/magic-number.rst | 1 - + MAINTAINERS | 42 +- + arch/arm/configs/ixp4xx_defconfig | 1 - + arch/mips/configs/gpr_defconfig | 2 - + arch/mips/configs/mtx1_defconfig | 2 - + drivers/atm/lanai.c | 3 +- + drivers/atm/nicstar.c | 24 +- + drivers/bus/mhi/core/main.c | 11 + + drivers/crypto/caam/qi.c | 15 +- + drivers/infiniband/core/nldev.c | 10 +- + drivers/infiniband/hw/hfi1/driver.c | 4 +- + drivers/infiniband/hw/hfi1/ipoib.h | 27 - + drivers/infiniband/hw/hfi1/ipoib_main.c | 15 +- + drivers/infiniband/hw/hfi1/ipoib_tx.c | 2 +- + drivers/isdn/capi/capi.c | 1 + + drivers/media/pci/ttpci/av7110_av.c | 1 + + drivers/net/Kconfig | 9 +- + drivers/net/Makefile | 2 +- + drivers/net/bareudp.c | 2 +- + drivers/net/bonding/bond_main.c | 11 +- + drivers/net/bonding/bond_procfs.c | 1 + + drivers/net/can/at91_can.c | 14 +- + drivers/net/can/c_can/c_can.c | 20 +- + drivers/net/can/cc770/cc770.c | 14 +- + drivers/net/can/dev.c | 16 +- + drivers/net/can/flexcan.c | 161 +- + drivers/net/can/grcan.c | 10 +- + drivers/net/can/ifi_canfd/ifi_canfd.c | 10 +- + drivers/net/can/janz-ican3.c | 20 +- + drivers/net/can/kvaser_pciefd.c | 10 +- + drivers/net/can/m_can/m_can.c | 12 +- + drivers/net/can/mscan/mscan.c | 20 +- + drivers/net/can/pch_can.c | 14 +- + drivers/net/can/peak_canfd/peak_canfd.c | 16 +- + drivers/net/can/rcar/rcar_can.c | 14 +- + drivers/net/can/rcar/rcar_canfd.c | 12 +- + drivers/net/can/rx-offload.c | 2 +- + drivers/net/can/sja1000/sja1000.c | 16 +- + drivers/net/can/slcan.c | 32 +- + drivers/net/can/softing/softing_fw.c | 2 +- + drivers/net/can/softing/softing_main.c | 14 +- + drivers/net/can/spi/hi311x.c | 20 +- + drivers/net/can/spi/mcp251x.c | 20 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 15 +- + drivers/net/can/sun4i_can.c | 10 +- + drivers/net/can/ti_hecc.c | 8 +- + drivers/net/can/usb/Kconfig | 5 + + drivers/net/can/usb/ems_usb.c | 16 +- + drivers/net/can/usb/esd_usb2.c | 24 +- + drivers/net/can/usb/gs_usb.c | 12 +- + drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 22 +- + drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c | 61 +- + drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 22 +- + drivers/net/can/usb/mcba_usb.c | 10 +- + drivers/net/can/usb/peak_usb/pcan_usb.c | 18 +- + drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 29 +- + drivers/net/can/usb/peak_usb/pcan_usb_pro.c | 14 +- + drivers/net/can/usb/ucan.c | 20 +- + drivers/net/can/usb/usb_8dev.c | 17 +- + drivers/net/can/vxcan.c | 4 +- + drivers/net/can/xilinx_can.c | 16 +- + drivers/net/dsa/Kconfig | 2 + + drivers/net/dsa/Makefile | 1 + + drivers/net/dsa/hirschmann/Kconfig | 9 + + drivers/net/dsa/hirschmann/Makefile | 5 + + drivers/net/dsa/hirschmann/hellcreek.c | 1339 +++++++++++ + drivers/net/dsa/hirschmann/hellcreek.h | 286 +++ + drivers/net/dsa/hirschmann/hellcreek_hwtstamp.c | 479 ++++ + drivers/net/dsa/hirschmann/hellcreek_hwtstamp.h | 58 + + drivers/net/dsa/hirschmann/hellcreek_ptp.c | 452 ++++ + drivers/net/dsa/hirschmann/hellcreek_ptp.h | 76 + + drivers/net/dsa/microchip/ksz8795_spi.c | 6 + + drivers/net/dsa/microchip/ksz9477_spi.c | 6 + + drivers/net/dsa/microchip/ksz_common.c | 4 +- + drivers/net/dsa/mt7530.c | 51 +- + drivers/net/dsa/mt7530.h | 12 + + drivers/net/dsa/mv88e6xxx/chip.c | 66 +- + drivers/net/dsa/mv88e6xxx/chip.h | 10 + + drivers/net/dsa/mv88e6xxx/devlink.c | 105 +- + drivers/net/dsa/mv88e6xxx/global1.h | 2 + + drivers/net/dsa/mv88e6xxx/global1_vtu.c | 4 +- + drivers/net/dsa/mv88e6xxx/port.c | 36 + + drivers/net/dsa/mv88e6xxx/port.h | 3 + + drivers/net/dsa/mv88e6xxx/serdes.c | 123 +- + drivers/net/dsa/mv88e6xxx/serdes.h | 9 + + drivers/net/dsa/ocelot/felix.c | 27 +- + drivers/net/dummy.c | 2 +- + drivers/net/ethernet/8390/mac8390.c | 7 - + drivers/net/ethernet/8390/ne.c | 2 +- + drivers/net/ethernet/8390/ne2k-pci.c | 2 +- + drivers/net/ethernet/amazon/ena/ena_ethtool.c | 1 + + drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 2 +- + drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 2 + + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 + + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 4 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 33 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h | 4 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 1 + + drivers/net/ethernet/cadence/macb.h | 44 + + drivers/net/ethernet/cadence/macb_main.c | 151 +- + .../net/ethernet/cavium/liquidio/cn68xx_device.c | 1 - + drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 1 + + .../net/ethernet/cavium/thunder/nicvf_ethtool.c | 1 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 1 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 1 + + .../ethernet/chelsio/inline_crypto/chtls/chtls.h | 1 + + .../chelsio/inline_crypto/chtls/chtls_cm.c | 3 +- + drivers/net/ethernet/davicom/Kconfig | 2 +- + drivers/net/ethernet/davicom/dm9000.c | 9 +- + drivers/net/ethernet/dec/tulip/de2104x.c | 10 + + drivers/net/ethernet/dec/tulip/tulip_core.c | 4 + + drivers/net/ethernet/faraday/ftgmac100.c | 122 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 28 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 4 +- + drivers/net/ethernet/freescale/enetc/enetc.c | 51 +- + drivers/net/ethernet/freescale/enetc/enetc.h | 5 +- + drivers/net/ethernet/freescale/enetc/enetc_hw.h | 55 +- + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 10 +- + drivers/net/ethernet/freescale/enetc/enetc_qos.c | 84 +- + drivers/net/ethernet/freescale/enetc/enetc_vf.c | 10 +- + drivers/net/ethernet/google/gve/gve_ethtool.c | 1 + + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 3 + + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 1 + + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 102 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 17 +- + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 71 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 31 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 1 - + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 48 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 167 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 4 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 80 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 26 + + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.h | 11 + + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 56 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 1 + + drivers/net/ethernet/huawei/hinic/hinic_devlink.c | 12 +- + drivers/net/ethernet/huawei/hinic/hinic_port.h | 1 + + drivers/net/ethernet/ibm/ibmvnic.c | 398 ++-- + drivers/net/ethernet/ibm/ibmvnic.h | 27 +- + drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 1 + + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 5 +- + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 1 - + drivers/net/ethernet/intel/ice/ice_devlink.c | 17 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 4 +- + drivers/net/ethernet/marvell/mvneta.c | 65 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 23 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 139 +- + drivers/net/ethernet/marvell/octeontx2/af/Makefile | 3 +- + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 13 +- + drivers/net/ethernet/marvell/octeontx2/af/cgx.h | 5 + + drivers/net/ethernet/marvell/octeontx2/af/common.h | 12 +- + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 223 +- + drivers/net/ethernet/marvell/octeontx2/af/npc.h | 137 +- + .../ethernet/marvell/octeontx2/af/npc_profile.h | 101 +- + drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 377 +++- + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 98 +- + .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 15 + + .../net/ethernet/marvell/octeontx2/af/rvu_cpt.c | 233 ++ + .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 692 +++++- + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 507 ++++- + .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 785 +++++-- + .../net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c | 1336 +++++++++++ + .../net/ethernet/marvell/octeontx2/af/rvu_reg.c | 2 +- + .../net/ethernet/marvell/octeontx2/af/rvu_reg.h | 150 +- + .../net/ethernet/marvell/octeontx2/af/rvu_struct.h | 17 +- + .../net/ethernet/marvell/octeontx2/nic/Makefile | 2 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 21 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 75 +- + .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 58 +- + .../ethernet/marvell/octeontx2/nic/otx2_flows.c | 820 +++++++ + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 307 ++- + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 16 + + .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 5 + + drivers/net/ethernet/marvell/sky2.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 1 - + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 5 +- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 13 - + drivers/net/ethernet/mellanox/mlx4/fw_qos.h | 2 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 23 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h | 18 +- + .../net/ethernet/mellanox/mlx4/resource_tracker.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 11 +- + .../net/ethernet/mellanox/mlx5/core/en/params.c | 34 + + .../net/ethernet/mellanox/mlx5/core/en/params.h | 4 + + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 22 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 8 +- + .../mellanox/mlx5/core/en_accel/ktls_txrx.h | 2 +- + .../mellanox/mlx5/core/en_accel/tls_rxtx.c | 6 +- + .../mellanox/mlx5/core/en_accel/tls_rxtx.h | 4 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 5 + + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 30 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 18 +- + drivers/net/ethernet/mellanox/mlx5/core/fpga/sdk.h | 8 +- + .../mellanox/mlx5/core/steering/dr_buddy.c | 170 ++ + .../ethernet/mellanox/mlx5/core/steering/dr_cmd.c | 4 +- + .../mellanox/mlx5/core/steering/dr_icm_pool.c | 501 ++--- + .../mellanox/mlx5/core/steering/dr_matcher.c | 107 +- + .../ethernet/mellanox/mlx5/core/steering/dr_ste.c | 42 +- + .../mellanox/mlx5/core/steering/dr_types.h | 79 +- + .../ethernet/mellanox/mlx5/core/steering/mlx5dr.h | 32 + + drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c | 3 - + drivers/net/ethernet/mellanox/mlxsw/core.c | 11 +- + drivers/net/ethernet/mellanox/mlxsw/core_env.h | 3 + + drivers/net/ethernet/mellanox/mlxsw/reg.h | 91 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 1 + + .../net/ethernet/mellanox/mlxsw/spectrum_dpipe.c | 9 +- + .../net/ethernet/mellanox/mlxsw/spectrum_ipip.c | 37 +- + .../net/ethernet/mellanox/mlxsw/spectrum_ipip.h | 10 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c | 8 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.h | 7 - + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 2367 +++++++++++++++----- + .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 73 + + .../net/ethernet/mellanox/mlxsw/spectrum_trap.c | 8 +- + drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 1 + + drivers/net/ethernet/mellanox/mlxsw/trap.h | 1 + + drivers/net/ethernet/microchip/lan743x_ethtool.c | 9 +- + drivers/net/ethernet/microchip/lan743x_main.c | 77 +- + drivers/net/ethernet/microchip/lan743x_main.h | 4 +- + drivers/net/ethernet/mscc/ocelot.c | 294 ++- + drivers/net/ethernet/mscc/ocelot.h | 31 +- + drivers/net/ethernet/mscc/ocelot_net.c | 38 +- + drivers/net/ethernet/neterion/s2io.c | 41 +- + drivers/net/ethernet/neterion/s2io.h | 4 +- + drivers/net/ethernet/neterion/vxge/vxge-config.c | 2 +- + drivers/net/ethernet/netronome/nfp/crypto/tls.c | 2 +- + drivers/net/ethernet/netronome/nfp/nfp_devlink.c | 2 +- + drivers/net/ethernet/netronome/nfp/nfp_main.c | 21 +- + drivers/net/ethernet/netronome/nfp/nfp_main.h | 2 +- + drivers/net/ethernet/nvidia/forcedeth.c | 9 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 27 +- + drivers/net/ethernet/pensando/ionic/ionic_dev.c | 2 +- + drivers/net/ethernet/pensando/ionic/ionic_dev.h | 4 +- + .../net/ethernet/pensando/ionic/ionic_devlink.c | 2 +- + .../net/ethernet/pensando/ionic/ionic_devlink.h | 2 +- + drivers/net/ethernet/pensando/ionic/ionic_fw.c | 14 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 110 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.h | 6 + + drivers/net/ethernet/pensando/ionic/ionic_stats.c | 1 + + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 18 +- + drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c | 1 + + drivers/net/ethernet/realtek/r8169_main.c | 118 +- + drivers/net/ethernet/sfc/bitfield.h | 58 +- + drivers/net/ethernet/sfc/ef100_nic.c | 21 +- + drivers/net/ethernet/sfc/ef100_tx.c | 66 +- + drivers/net/ethernet/smsc/Kconfig | 6 +- + drivers/net/ethernet/smsc/smc911x.c | 17 +- + drivers/net/ethernet/smsc/smc91x.c | 9 +- + drivers/net/ethernet/socionext/netsec.c | 12 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 1 + + .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 46 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 6 +- + .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 2 + + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 24 + + drivers/net/ethernet/stmicro/stmmac/hwif.h | 3 + + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 4 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 54 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 22 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 355 +-- + drivers/net/ethernet/ti/am65-cpsw-nuss.h | 5 + + drivers/net/ethernet/ti/cpsw_ale.c | 41 +- + drivers/net/ethernet/ti/cpsw_ale.h | 1 + + drivers/net/ethernet/ti/cpsw_switchdev.c | 2 +- + drivers/net/ethernet/ti/tlan.c | 98 +- + drivers/net/ethernet/xilinx/Kconfig | 2 +- + drivers/net/ethernet/xilinx/xilinx_axienet.h | 5 + + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 115 +- + drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 56 +- + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 14 +- + drivers/net/fddi/skfp/drvfbi.c | 4 - + drivers/net/fddi/skfp/ecm.c | 7 +- + drivers/net/fddi/skfp/ess.c | 1 - + drivers/net/fddi/skfp/hwt.c | 4 - + drivers/net/fddi/skfp/pcmplc.c | 4 - + drivers/net/fddi/skfp/pmf.c | 4 - + drivers/net/fddi/skfp/queue.c | 4 - + drivers/net/fddi/skfp/rmt.c | 4 - + drivers/net/fddi/skfp/smtdef.c | 4 - + drivers/net/fddi/skfp/smtinit.c | 4 - + drivers/net/fddi/skfp/smttimer.c | 4 - + drivers/net/fddi/skfp/srf.c | 5 - + drivers/net/geneve.c | 3 +- + drivers/net/gtp.c | 2 +- + drivers/net/hamradio/hdlcdrv.c | 2 +- + drivers/net/hyperv/netvsc_drv.c | 1 + + drivers/net/hyperv/rndis_filter.c | 1 + + drivers/net/ieee802154/ca8210.c | 22 +- + drivers/net/ifb.c | 3 +- + drivers/net/ipa/gsi.c | 499 +++-- + drivers/net/ipa/gsi.h | 52 +- + drivers/net/ipa/gsi_reg.h | 159 +- + drivers/net/ipa/ipa_clock.c | 47 +- + drivers/net/ipa/ipa_clock.h | 5 +- + drivers/net/ipa/ipa_cmd.c | 6 +- + drivers/net/ipa/ipa_cmd.h | 21 +- + drivers/net/ipa/ipa_data-sc7180.c | 25 + + drivers/net/ipa/ipa_data-sdm845.c | 29 +- + drivers/net/ipa/ipa_data.h | 43 +- + drivers/net/ipa/ipa_endpoint.c | 84 +- + drivers/net/ipa/ipa_endpoint.h | 2 +- + drivers/net/ipa/ipa_interrupt.c | 6 +- + drivers/net/ipa/ipa_interrupt.h | 16 - + drivers/net/ipa/ipa_main.c | 268 ++- + drivers/net/ipa/ipa_mem.c | 10 +- + drivers/net/ipa/ipa_qmi.c | 8 +- + drivers/net/ipa/ipa_qmi_msg.h | 12 +- + drivers/net/ipa/ipa_reg.h | 418 +++- + drivers/net/ipa/ipa_table.c | 4 +- + drivers/net/ipa/ipa_uc.c | 46 +- + drivers/net/ipa/ipa_version.h | 1 + + drivers/net/ipvlan/ipvlan_main.c | 2 + + drivers/net/macsec.c | 1 + + drivers/net/macvlan.c | 4 +- + drivers/net/mhi_net.c | 316 +++ + drivers/net/mii.c | 20 +- + drivers/net/net_failover.c | 2 +- + drivers/net/netconsole.c | 1 + + drivers/net/netdevsim/dev.c | 8 +- + drivers/net/netdevsim/ethtool.c | 82 +- + drivers/net/netdevsim/fib.c | 265 ++- + drivers/net/netdevsim/netdevsim.h | 10 +- + drivers/net/nlmon.c | 1 + + drivers/net/phy/adin.c | 195 +- + drivers/net/phy/amd.c | 37 +- + drivers/net/phy/aquantia_main.c | 59 +- + drivers/net/phy/at803x.c | 50 +- + drivers/net/phy/bcm-cygnus.c | 2 +- + drivers/net/phy/bcm-phy-lib.c | 49 +- + drivers/net/phy/bcm-phy-lib.h | 1 + + drivers/net/phy/bcm54140.c | 46 +- + drivers/net/phy/bcm63xx.c | 20 +- + drivers/net/phy/bcm87xx.c | 50 +- + drivers/net/phy/broadcom.c | 70 +- + drivers/net/phy/cicada.c | 35 +- + drivers/net/phy/davicom.c | 63 +- + drivers/net/phy/dp83640.c | 43 +- + drivers/net/phy/dp83822.c | 54 +- + drivers/net/phy/dp83848.c | 47 +- + drivers/net/phy/dp83867.c | 44 +- + drivers/net/phy/dp83869.c | 42 +- + drivers/net/phy/dp83tc811.c | 53 +- + drivers/net/phy/icplus.c | 58 +- + drivers/net/phy/intel-xway.c | 71 +- + drivers/net/phy/lxt.c | 94 +- + drivers/net/phy/marvell.c | 188 +- + drivers/net/phy/mdio_bus.c | 9 +- + drivers/net/phy/meson-gxl.c | 37 +- + drivers/net/phy/micrel.c | 65 +- + drivers/net/phy/microchip.c | 24 +- + drivers/net/phy/microchip_t1.c | 29 +- + drivers/net/phy/mscc/mscc_main.c | 70 +- + drivers/net/phy/mscc/mscc_ptp.c | 18 +- + drivers/net/phy/mscc/mscc_ptp.h | 5 - + drivers/net/phy/national.c | 58 +- + drivers/net/phy/nxp-tja11xx.c | 42 +- + drivers/net/phy/phy-c45.c | 2 +- + drivers/net/phy/phy.c | 56 +- + drivers/net/phy/phy_device.c | 39 +- + drivers/net/phy/phy_led_triggers.c | 16 +- + drivers/net/phy/phylink.c | 5 +- + drivers/net/phy/qsemi.c | 42 +- + drivers/net/phy/realtek.c | 181 +- + drivers/net/phy/smsc.c | 55 +- + drivers/net/phy/ste10Xp.c | 53 +- + drivers/net/phy/vitesse.c | 61 +- + drivers/net/team/team.c | 10 +- + drivers/net/tun.c | 132 +- + drivers/net/usb/Kconfig | 9 + + drivers/net/usb/Makefile | 1 + + drivers/net/usb/aqc111.c | 2 +- + drivers/net/usb/asix_devices.c | 6 +- + drivers/net/usb/ax88172a.c | 2 +- + drivers/net/usb/ax88179_178a.c | 2 +- + drivers/net/usb/cdc_mbim.c | 2 +- + drivers/net/usb/cdc_ncm.c | 4 +- + drivers/net/usb/dm9601.c | 2 +- + drivers/net/usb/int51x1.c | 2 +- + drivers/net/usb/lan78xx.c | 168 +- + drivers/net/usb/mcs7830.c | 2 +- + drivers/net/usb/qmi_wwan.c | 41 +- + drivers/net/usb/r8152.c | 40 +- + drivers/net/usb/r8153_ecm.c | 162 ++ + drivers/net/usb/rndis_host.c | 2 +- + drivers/net/usb/sierra_net.c | 2 +- + drivers/net/usb/smsc75xx.c | 2 +- + drivers/net/usb/smsc95xx.c | 2 +- + drivers/net/usb/sr9700.c | 2 +- + drivers/net/usb/sr9800.c | 2 +- + drivers/net/usb/usbnet.c | 23 +- + drivers/net/veth.c | 4 +- + drivers/net/vrf.c | 1 + + drivers/net/vsockmon.c | 1 + + drivers/net/vxlan.c | 29 +- + drivers/net/wan/Kconfig | 60 - + drivers/net/wan/Makefile | 3 - + drivers/net/wan/dlci.c | 541 ----- + drivers/net/wan/hdlc_fr.c | 118 +- + drivers/net/wan/lmc/lmc_main.c | 9 +- + drivers/net/wan/sdla.c | 1655 -------------- + drivers/net/wan/x25_asy.c | 836 ------- + drivers/net/wan/x25_asy.h | 46 - + drivers/net/wimax/Kconfig | 18 - + drivers/net/wimax/Makefile | 2 - + drivers/net/wireguard/device.c | 2 +- + drivers/net/wireless/Kconfig | 13 - + drivers/net/wireless/ath/ath9k/ath9k.h | 1 - + drivers/net/wireless/ath/ath9k/debug.c | 4 +- + drivers/net/wireless/ath/ath9k/init.c | 19 - + drivers/net/wireless/ath/ath9k/main.c | 5 - + drivers/net/wireless/ath/carl9170/mac.c | 4 - + drivers/net/wireless/ath/carl9170/main.c | 1 - + drivers/net/wireless/broadcom/b43/main.c | 6 +- + drivers/net/wireless/broadcom/b43legacy/main.c | 6 +- + drivers/net/wireless/quantenna/qtnfmac/core.c | 78 +- + drivers/net/wireless/quantenna/qtnfmac/core.h | 4 - + .../wireless/quantenna/qtnfmac/pcie/pearl_pcie.c | 4 +- + .../wireless/quantenna/qtnfmac/pcie/topaz_pcie.c | 4 +- + drivers/net/wireless/ralink/rt2x00/rt2x00config.c | 1 - + drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 6 +- + drivers/net/wireless/ralink/rt2x00/rt2x00mac.c | 3 +- + drivers/net/wireless/rndis_wlan.c | 2 +- + drivers/net/xen-netfront.c | 3 +- + drivers/nfc/s3fwrn5/core.c | 3 +- + drivers/nfc/s3fwrn5/firmware.c | 2 +- + drivers/nfc/s3fwrn5/i2c.c | 4 +- + drivers/nfc/s3fwrn5/s3fwrn5.h | 11 +- + drivers/ptp/ptp_idt82p33.c | 274 ++- + drivers/ptp/ptp_idt82p33.h | 3 + + drivers/ptp/ptp_ines.c | 19 +- + drivers/s390/net/qeth_core.h | 22 +- + drivers/s390/net/qeth_core_main.c | 223 +- + drivers/s390/net/qeth_core_mpc.h | 40 +- + drivers/s390/net/qeth_ethtool.c | 243 +- + drivers/s390/net/qeth_l2_main.c | 33 +- + drivers/s390/net/qeth_l3_main.c | 5 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 + + drivers/scsi/fcoe/fcoe_transport.c | 1 + + drivers/soc/fsl/qbman/qman.c | 12 +- + drivers/soc/fsl/qbman/qman_test_api.c | 6 +- + drivers/soc/fsl/qbman/qman_test_stash.c | 6 +- + drivers/staging/Kconfig | 2 + + drivers/staging/Makefile | 1 + + drivers/staging/fsl-dpaa2/ethsw/ethsw-ethtool.c | 2 + + .../staging/wimax/Documentation}/i2400m.rst | 0 + .../staging/wimax/Documentation}/index.rst | 0 + .../staging/wimax/Documentation}/wimax.rst | 0 + {net => drivers/staging}/wimax/Kconfig | 6 + + {net => drivers/staging}/wimax/Makefile | 2 + + drivers/staging/wimax/TODO | 18 + + {net => drivers/staging}/wimax/debug-levels.h | 2 +- + {net => drivers/staging}/wimax/debugfs.c | 2 +- + drivers/{net => staging}/wimax/i2400m/Kconfig | 0 + drivers/{net => staging}/wimax/i2400m/Makefile | 0 + drivers/{net => staging}/wimax/i2400m/control.c | 2 +- + .../{net => staging}/wimax/i2400m/debug-levels.h | 2 +- + drivers/{net => staging}/wimax/i2400m/debugfs.c | 0 + drivers/{net => staging}/wimax/i2400m/driver.c | 2 +- + drivers/{net => staging}/wimax/i2400m/fw.c | 0 + drivers/{net => staging}/wimax/i2400m/i2400m-usb.h | 0 + drivers/{net => staging}/wimax/i2400m/i2400m.h | 4 +- + .../staging/wimax/i2400m/linux-wimax-i2400m.h | 0 + drivers/{net => staging}/wimax/i2400m/netdev.c | 0 + drivers/{net => staging}/wimax/i2400m/op-rfkill.c | 2 +- + drivers/{net => staging}/wimax/i2400m/rx.c | 0 + drivers/{net => staging}/wimax/i2400m/sysfs.c | 0 + drivers/{net => staging}/wimax/i2400m/tx.c | 0 + .../wimax/i2400m/usb-debug-levels.h | 2 +- + drivers/{net => staging}/wimax/i2400m/usb-fw.c | 0 + drivers/{net => staging}/wimax/i2400m/usb-notif.c | 0 + drivers/{net => staging}/wimax/i2400m/usb-rx.c | 0 + drivers/{net => staging}/wimax/i2400m/usb-tx.c | 0 + drivers/{net => staging}/wimax/i2400m/usb.c | 3 +- + {net => drivers/staging}/wimax/id-table.c | 2 +- + .../staging/wimax/linux-wimax-debug.h | 2 +- + .../wimax.h => drivers/staging/wimax/linux-wimax.h | 0 + .../wimax.h => drivers/staging/wimax/net-wimax.h | 2 +- + {net => drivers/staging}/wimax/op-msg.c | 2 +- + {net => drivers/staging}/wimax/op-reset.c | 4 +- + {net => drivers/staging}/wimax/op-rfkill.c | 4 +- + {net => drivers/staging}/wimax/op-state-get.c | 4 +- + {net => drivers/staging}/wimax/stack.c | 29 +- + {net => drivers/staging}/wimax/wimax-internal.h | 2 +- + include/dt-bindings/firmware/imx/rsrc.h | 1 + + include/keys/rxrpc-type.h | 56 +- + include/linux/atmdev.h | 1 + + include/linux/bpf.h | 8 + + include/linux/bpf_lsm.h | 30 + + include/linux/bpf_types.h | 1 + + include/linux/bpf_verifier.h | 2 +- + include/linux/can/dev.h | 38 +- + include/linux/can/dev/peak_canfd.h | 2 +- + include/linux/ethtool.h | 1 + + include/linux/genl_magic_struct.h | 2 +- + include/linux/ieee80211.h | 3 + + include/linux/if_bridge.h | 1 + + include/linux/if_frad.h | 92 - + include/linux/inetdevice.h | 4 +- + include/linux/key-type.h | 1 + + include/linux/lockdep.h | 11 + + include/linux/marvell_phy.h | 3 + + include/linux/mhi.h | 7 + + include/linux/module.h | 4 + + include/linux/netdev_features.h | 4 +- + include/linux/netdevice.h | 40 +- + include/linux/netfilter/ipset/ip_set.h | 5 + + include/linux/phy.h | 22 +- + include/linux/platform_data/hirschmann-hellcreek.h | 23 + + include/linux/ptp_classify.h | 7 +- + include/linux/ptp_clock_kernel.h | 13 + + include/linux/qed/qed_if.h | 1 + + include/linux/sctp.h | 20 + + include/linux/sdla.h | 240 -- + include/linux/skbuff.h | 33 + + include/linux/soc/marvell/octeontx2/asm.h | 29 + + include/linux/usb/r8152.h | 37 + + include/linux/usb/usbnet.h | 4 - + include/net/act_api.h | 6 + + include/net/bpf_sk_storage.h | 2 + + include/net/cfg80211.h | 22 +- + include/net/compat.h | 10 - + include/net/devlink.h | 13 +- + include/net/dsa.h | 8 + + include/net/dst.h | 12 +- + include/net/ieee80211_radiotap.h | 1 + + include/net/ip.h | 2 +- + include/net/ip_tunnels.h | 2 - + include/net/mac80211.h | 7 +- + include/net/mptcp.h | 24 +- + include/net/netfilter/ipv4/nf_reject.h | 10 + + include/net/netfilter/ipv6/nf_reject.h | 9 + + include/net/netfilter/nf_conntrack_l4proto.h | 14 + + include/net/netlink.h | 4 +- + include/net/netns/sctp.h | 8 + + include/net/nexthop.h | 42 +- + include/net/page_pool.h | 26 + + include/net/pkt_cls.h | 2 +- + include/net/pkt_sched.h | 5 + + include/net/sch_generic.h | 5 +- + include/net/sctp/constants.h | 2 + + include/net/sctp/sctp.h | 9 +- + include/net/sctp/sm.h | 4 + + include/net/sctp/structs.h | 12 +- + include/net/sock.h | 21 +- + include/net/tcp.h | 19 +- + include/net/tls.h | 32 +- + include/net/udp.h | 6 +- + include/net/xdp.h | 17 +- + include/rdma/ib_addr.h | 1 + + include/rdma/ib_verbs.h | 1 + + include/soc/fsl/qman.h | 3 +- + include/soc/mscc/ocelot.h | 18 +- + include/uapi/linux/bpf.h | 51 + + include/uapi/linux/can.h | 38 +- + include/uapi/linux/can/gw.h | 4 +- + include/uapi/linux/can/netlink.h | 1 + + include/uapi/linux/cfm_bridge.h | 64 + + include/uapi/linux/if_bridge.h | 126 ++ + include/uapi/linux/if_ether.h | 1 + + include/uapi/linux/if_frad.h | 123 - + include/uapi/linux/if_packet.h | 12 + + include/uapi/linux/mrp_bridge.h | 1 + + include/uapi/linux/netfilter/ipset/ip_set.h | 6 +- + include/uapi/linux/nl80211.h | 38 +- + include/uapi/linux/rtnetlink.h | 20 +- + include/uapi/linux/sctp.h | 7 + + include/uapi/linux/sdla.h | 117 - + include/uapi/linux/snmp.h | 1 + + include/uapi/linux/tls.h | 15 + + kernel/bpf/Makefile | 1 + + kernel/bpf/bpf_iter.c | 14 + + kernel/bpf/bpf_lsm.c | 88 + + kernel/bpf/bpf_task_storage.c | 315 +++ + kernel/bpf/btf.c | 411 +++- + kernel/bpf/hashtab.c | 144 +- + kernel/bpf/syscall.c | 3 +- + kernel/bpf/sysfs_btf.c | 2 +- + kernel/bpf/task_iter.c | 2 + + kernel/bpf/verifier.c | 182 +- + kernel/kcov.c | 2 + + kernel/module.c | 32 + + kernel/taskstats.c | 2 +- + kernel/trace/bpf_trace.c | 29 +- + lib/Kconfig.debug | 10 + + lib/nlattr.c | 42 +- + net/9p/client.c | 6 +- + net/9p/trans_common.c | 4 +- + net/9p/trans_fd.c | 4 +- + net/9p/trans_rdma.c | 2 + + net/9p/trans_virtio.c | 9 +- + net/Kconfig | 2 - + net/Makefile | 1 - + net/appletalk/aarp.c | 18 +- + net/appletalk/ddp.c | 7 +- + net/atm/raw.c | 12 +- + net/bridge/Kconfig | 11 + + net/bridge/Makefile | 2 + + net/bridge/br_cfm.c | 867 +++++++ + net/bridge/br_cfm_netlink.c | 726 ++++++ + net/bridge/br_device.c | 39 +- + net/bridge/br_if.c | 1 + + net/bridge/br_input.c | 41 +- + net/bridge/br_mdb.c | 30 +- + net/bridge/br_mrp.c | 59 +- + net/bridge/br_mrp_netlink.c | 2 +- + net/bridge/br_multicast.c | 13 +- + net/bridge/br_netlink.c | 117 +- + net/bridge/br_private.h | 107 +- + net/bridge/br_private_cfm.h | 147 ++ + net/bridge/br_private_mrp.h | 2 +- + net/bridge/br_vlan.c | 15 +- + net/bridge/netfilter/Kconfig | 2 +- + net/bridge/netfilter/nft_reject_bridge.c | 255 +-- + net/can/af_can.c | 2 +- + net/can/gw.c | 80 +- + net/can/j1939/main.c | 4 +- + net/core/bpf_sk_storage.c | 135 +- + net/core/datagram.c | 2 +- + net/core/dev.c | 30 +- + net/core/dev_ioctl.c | 2 +- + net/core/devlink.c | 37 +- + net/core/fib_rules.c | 4 +- + net/core/flow_dissector.c | 2 +- + net/core/page_pool.c | 70 +- + net/core/rtnetlink.c | 12 +- + net/core/skbuff.c | 18 +- + net/core/sock.c | 3 +- + net/core/xdp.c | 54 + + net/dcb/dcbnl.c | 16 +- + net/dccp/ackvec.c | 5 + + net/dccp/ccid.c | 2 +- + net/dccp/ccids/ccid2.c | 5 + + net/dccp/ccids/ccid3.c | 6 + + net/dccp/ccids/lib/loss_interval.c | 3 + + net/dccp/ccids/lib/packet_history.c | 3 + + net/dccp/feat.c | 6 + + net/dccp/output.c | 9 + + net/dccp/qpolicy.c | 6 +- + net/dccp/timer.c | 12 +- + net/decnet/dn_dev.c | 2 +- + net/dsa/Kconfig | 11 + + net/dsa/Makefile | 4 +- + net/dsa/dsa.c | 7 +- + net/dsa/dsa_priv.h | 2 - + net/dsa/slave.c | 92 +- + net/dsa/tag_ar9331.c | 3 - + net/dsa/tag_brcm.c | 3 - + net/dsa/tag_dsa.c | 332 ++- + net/dsa/tag_edsa.c | 206 -- + net/dsa/tag_gswip.c | 5 - + net/dsa/tag_hellcreek.c | 64 + + net/dsa/tag_ksz.c | 73 +- + net/dsa/tag_lan9303.c | 9 - + net/dsa/tag_mtk.c | 3 - + net/dsa/tag_ocelot.c | 7 - + net/dsa/tag_qca.c | 3 - + net/dsa/tag_trailer.c | 31 +- + net/ethernet/eth.c | 6 +- + net/ethtool/ioctl.c | 2 +- + net/ieee802154/nl-mac.c | 2 +- + net/ipv4/devinet.c | 5 +- + net/ipv4/fib_semantics.c | 7 +- + net/ipv4/fib_trie.c | 9 - + net/ipv4/ip_gre.c | 6 +- + net/ipv4/ip_tunnel_core.c | 9 - + net/ipv4/ip_vti.c | 2 +- + net/ipv4/ipconfig.c | 14 +- + net/ipv4/ipip.c | 2 +- + net/ipv4/metrics.c | 2 +- + net/ipv4/netfilter/nf_reject_ipv4.c | 128 +- + net/ipv4/nexthop.c | 255 ++- + net/ipv4/proc.c | 1 + + net/ipv4/route.c | 15 +- + net/ipv4/tcp.c | 128 +- + net/ipv4/tcp_input.c | 9 +- + net/ipv4/tcp_ipv4.c | 14 + + net/ipv4/tcp_lp.c | 7 + + net/ipv4/tcp_output.c | 22 +- + net/ipv4/tcp_recovery.c | 3 +- + net/ipv4/udp.c | 10 +- + net/ipv4/udp_diag.c | 2 +- + net/ipv4/udp_offload.c | 5 +- + net/ipv6/addrconf.c | 1 + + net/ipv6/calipso.c | 4 +- + net/ipv6/exthdrs.c | 5 - + net/ipv6/ip6_gre.c | 6 +- + net/ipv6/ip6_tunnel.c | 47 +- + net/ipv6/ip6_vti.c | 3 +- + net/ipv6/mcast.c | 2 +- + net/ipv6/netfilter/nf_reject_ipv6.c | 139 +- + net/ipv6/proc.c | 2 + + net/ipv6/route.c | 9 +- + net/ipv6/rpl.c | 2 +- + net/ipv6/rpl_iptunnel.c | 2 +- + net/ipv6/sit.c | 2 +- + net/ipv6/udp.c | 8 +- + net/ipv6/udp_offload.c | 8 +- + net/l3mdev/l3mdev.c | 1 + + net/lapb/lapb_iface.c | 82 +- + net/lapb/lapb_timer.c | 11 +- + net/llc/llc_conn.c | 2 + + net/mac80211/cfg.c | 11 - + net/mac80211/chan.c | 3 +- + net/mac80211/debugfs_netdev.c | 11 - + net/mac80211/debugfs_sta.c | 2 +- + net/mac80211/ieee80211_i.h | 10 +- + net/mac80211/iface.c | 54 +- + net/mac80211/main.c | 22 +- + net/mac80211/mesh.c | 30 + + net/mac80211/pm.c | 15 - + net/mac80211/rx.c | 21 +- + net/mac80211/tx.c | 44 +- + net/mac80211/util.c | 7 +- + net/mac80211/wme.c | 18 +- + net/mac802154/main.c | 8 +- + net/mpls/af_mpls.c | 2 + + net/mptcp/ctrl.c | 14 + + net/mptcp/options.c | 78 +- + net/mptcp/pm.c | 34 +- + net/mptcp/pm_netlink.c | 42 +- + net/mptcp/protocol.c | 1206 ++++++---- + net/mptcp/protocol.h | 115 +- + net/mptcp/subflow.c | 45 +- + net/netfilter/Kconfig | 10 + + net/netfilter/Makefile | 1 + + net/netfilter/ipset/ip_set_core.c | 6 +- + net/netfilter/ipset/ip_set_hash_gen.h | 45 +- + net/netfilter/ipset/ip_set_hash_ip.c | 7 +- + net/netfilter/ipset/ip_set_hash_ipmac.c | 6 +- + net/netfilter/ipset/ip_set_hash_ipmark.c | 7 +- + net/netfilter/ipset/ip_set_hash_ipport.c | 7 +- + net/netfilter/ipset/ip_set_hash_ipportip.c | 7 +- + net/netfilter/ipset/ip_set_hash_ipportnet.c | 7 +- + net/netfilter/ipset/ip_set_hash_mac.c | 6 +- + net/netfilter/ipset/ip_set_hash_net.c | 7 +- + net/netfilter/ipset/ip_set_hash_netiface.c | 11 +- + net/netfilter/ipset/ip_set_hash_netnet.c | 7 +- + net/netfilter/ipset/ip_set_hash_netport.c | 7 +- + net/netfilter/ipset/ip_set_hash_netportnet.c | 7 +- + net/netfilter/nf_conntrack_proto_tcp.c | 6 - + net/netfilter/nf_tables_api.c | 9 +- + net/netfilter/nfnetlink_acct.c | 2 +- + net/netfilter/nfnetlink_cthelper.c | 4 +- + net/netfilter/nft_ct.c | 2 +- + net/netfilter/nft_log.c | 2 +- + net/netfilter/nft_reject.c | 12 +- + net/netfilter/nft_reject_inet.c | 68 +- + net/netfilter/nft_reject_netdev.c | 189 ++ + net/netlabel/netlabel_calipso.c | 1 + + net/netlabel/netlabel_mgmt.c | 2 +- + net/nfc/core.c | 10 +- + net/nfc/digital_core.c | 3 + + net/nfc/nci/core.c | 2 + + net/nfc/nci/hci.c | 9 +- + net/nfc/netlink.c | 2 +- + net/openvswitch/conntrack.c | 8 + + net/openvswitch/flow.c | 4 + + net/openvswitch/meter.c | 2 +- + net/openvswitch/vport-internal_dev.c | 29 +- + net/openvswitch/vport.c | 4 +- + net/packet/af_packet.c | 38 +- + net/packet/internal.h | 5 +- + net/qrtr/ns.c | 8 - + net/qrtr/qrtr.c | 49 +- + net/rxrpc/Makefile | 1 + + net/rxrpc/ar-internal.h | 63 +- + net/rxrpc/call_accept.c | 14 +- + net/rxrpc/conn_client.c | 6 - + net/rxrpc/conn_event.c | 8 +- + net/rxrpc/conn_object.c | 2 - + net/rxrpc/conn_service.c | 2 - + net/rxrpc/insecure.c | 19 +- + net/rxrpc/key.c | 658 +----- + net/rxrpc/rxkad.c | 256 ++- + net/rxrpc/security.c | 98 +- + net/rxrpc/sendmsg.c | 45 +- + net/rxrpc/server_key.c | 143 ++ + net/sched/Makefile | 1 + + net/sched/act_api.c | 93 +- + net/sched/act_bpf.c | 2 +- + net/sched/act_ct.c | 9 +- + net/sched/act_ipt.c | 2 +- + net/sched/act_mirred.c | 21 +- + net/sched/act_simple.c | 4 +- + net/sched/cls_api.c | 18 +- + net/sched/cls_rsvp.h | 2 +- + net/sched/em_cmp.c | 2 +- + net/sched/sch_api.c | 2 +- + net/sched/sch_atm.c | 8 +- + net/sched/sch_cbs.c | 1 + + net/sched/sch_frag.c | 150 ++ + net/sched/sch_pie.c | 2 +- + net/sched/sch_taprio.c | 1 + + net/sctp/Kconfig | 1 + + net/sctp/associola.c | 4 + + net/sctp/ipv6.c | 44 +- + net/sctp/offload.c | 6 +- + net/sctp/output.c | 22 +- + net/sctp/protocol.c | 142 +- + net/sctp/sm_make_chunk.c | 21 + + net/sctp/sm_statefuns.c | 52 + + net/sctp/socket.c | 116 + + net/sctp/sysctl.c | 62 + + net/sctp/transport.c | 4 +- + net/smc/af_smc.c | 61 +- + net/smc/smc_cdc.c | 6 +- + net/smc/smc_clc.h | 5 + + net/smc/smc_core.h | 1 + + net/smc/smc_wr.c | 14 +- + net/socket.c | 26 +- + net/sunrpc/rpc_pipe.c | 3 +- + net/tipc/addr.c | 7 +- + net/tipc/addr.h | 1 + + net/tipc/bearer.c | 5 +- + net/tipc/core.c | 2 - + net/tipc/core.h | 15 +- + net/tipc/group.c | 3 +- + net/tipc/group.h | 3 +- + net/tipc/link.c | 2 +- + net/tipc/name_distr.c | 19 - + net/tipc/name_table.c | 11 +- + net/tipc/net.c | 2 +- + net/tipc/netlink_compat.c | 7 +- + net/tipc/node.c | 2 +- + net/tipc/socket.c | 131 +- + net/tipc/socket.h | 2 +- + net/tipc/subscr.c | 5 +- + net/tipc/subscr.h | 5 +- + net/tipc/topsrv.c | 6 +- + net/tls/tls_device.c | 2 +- + net/tls/tls_device_fallback.c | 13 +- + net/tls/tls_main.c | 3 + + net/tls/tls_sw.c | 34 +- + net/vmw_vsock/af_vsock.c | 3 +- + net/wireless/chan.c | 6 +- + net/wireless/core.c | 8 +- + net/wireless/nl80211.c | 85 +- + net/wireless/rdev-ops.h | 10 - + net/wireless/scan.c | 2 +- + net/wireless/trace.h | 5 - + net/wireless/util.c | 37 +- + net/wireless/wext-compat.c | 51 - + net/x25/af_x25.c | 38 +- + net/x25/x25_link.c | 47 +- + net/x25/x25_route.c | 3 - + net/xfrm/xfrm_input.c | 7 +- + net/xfrm/xfrm_interface.c | 19 +- + samples/bpf/hbm.c | 1 - + samples/bpf/test_ipip.sh | 179 -- + scripts/Makefile.modfinal | 20 +- + security/bpf/hooks.c | 2 + + security/keys/key.c | 2 + + tools/bpf/bpftool/.gitignore | 2 +- + tools/bpf/bpftool/Documentation/bpftool-map.rst | 3 +- + tools/bpf/bpftool/Makefile | 44 +- + tools/bpf/bpftool/bash-completion/bpftool | 2 +- + tools/bpf/bpftool/btf.c | 37 +- + tools/bpf/bpftool/main.c | 15 +- + tools/bpf/bpftool/main.h | 1 + + tools/bpf/bpftool/map.c | 4 +- + tools/bpf/resolve_btfids/Makefile | 9 - + tools/bpf/runqslower/Makefile | 55 +- + tools/build/Makefile | 4 - + tools/include/uapi/linux/bpf.h | 51 + + tools/lib/bpf/btf.c | 807 ++++--- + tools/lib/bpf/btf.h | 8 + + tools/lib/bpf/libbpf.map | 9 + + tools/lib/bpf/libbpf_probes.c | 1 + + tools/objtool/Makefile | 9 - + tools/perf/Makefile.perf | 4 - + tools/power/acpi/Makefile.config | 1 - + tools/scripts/Makefile.include | 10 + + tools/testing/selftests/bpf/.gitignore | 1 - + tools/testing/selftests/bpf/Makefile | 5 +- + tools/testing/selftests/bpf/btf_helpers.c | 259 +++ + tools/testing/selftests/bpf/btf_helpers.h | 19 + + tools/testing/selftests/bpf/prog_tests/btf.c | 40 +- + .../selftests/bpf/prog_tests/btf_dedup_split.c | 325 +++ + .../selftests/bpf/prog_tests/btf_skc_cls_ingress.c | 2 +- + tools/testing/selftests/bpf/prog_tests/btf_split.c | 99 + + tools/testing/selftests/bpf/prog_tests/btf_write.c | 43 + + .../selftests/bpf/prog_tests/hash_large_key.c | 43 + + .../selftests/bpf/prog_tests/sk_storage_tracing.c | 135 ++ + .../selftests/bpf/prog_tests/tcp_hdr_options.c | 12 +- + .../testing/selftests/bpf/prog_tests/tcpbpf_user.c | 141 ++ + .../selftests/bpf/prog_tests/test_local_storage.c | 204 +- + .../selftests/bpf/prog_tests/test_skb_pkt_end.c | 41 + + tools/testing/selftests/bpf/progs/local_storage.c | 103 +- + tools/testing/selftests/bpf/progs/skb_pkt_end.c | 54 + + .../selftests/bpf/progs/test_hash_large_key.c | 44 + + .../bpf/progs/test_sk_storage_trace_itself.c | 29 + + .../selftests/bpf/progs/test_sk_storage_tracing.c | 95 + + .../testing/selftests/bpf/progs/test_tcpbpf_kern.c | 86 +- + .../testing/selftests/bpf/progs/test_tunnel_kern.c | 42 +- + tools/testing/selftests/bpf/tcp_client.py | 50 - + tools/testing/selftests/bpf/tcp_server.py | 80 - + tools/testing/selftests/bpf/test_maps.c | 3 +- + tools/testing/selftests/bpf/test_progs.h | 11 + + tools/testing/selftests/bpf/test_tcpbpf.h | 2 + + tools/testing/selftests/bpf/test_tcpbpf_user.c | 165 -- + tools/testing/selftests/bpf/test_tunnel.sh | 43 +- + tools/testing/selftests/bpf/verifier/ctx_skb.c | 42 + + .../drivers/net/mlxsw/devlink_trap_l3_drops.sh | 36 + + .../selftests/drivers/net/mlxsw/rtnetlink.sh | 208 ++ + .../drivers/net/netdevsim/ethtool-coalesce.sh | 132 ++ + .../drivers/net/netdevsim/ethtool-common.sh | 53 + + .../drivers/net/netdevsim/ethtool-pause.sh | 63 +- + .../drivers/net/netdevsim/ethtool-ring.sh | 85 + + .../selftests/drivers/net/netdevsim/nexthop.sh | 436 ++++ + tools/testing/selftests/net/Makefile | 1 + + tools/testing/selftests/net/bareudp.sh | 546 +++++ + tools/testing/selftests/net/config | 7 + + .../selftests/net/forwarding/bridge_igmp.sh | 485 +++- + .../testing/selftests/net/forwarding/bridge_mld.sh | 558 +++++ + .../selftests/net/forwarding/gre_multipath_nh.sh | 356 +++ + tools/testing/selftests/net/forwarding/lib.sh | 107 + + .../selftests/net/forwarding/router_mpath_nh.sh | 70 +- + .../testing/selftests/net/forwarding/router_nh.sh | 160 ++ + tools/testing/selftests/net/mptcp/config | 10 + + tools/testing/selftests/net/mptcp/mptcp_join.sh | 242 +- + tools/testing/selftests/net/pmtu.sh | 79 +- + tools/testing/selftests/net/psock_fanout.c | 72 +- + tools/testing/selftests/net/timestamping.c | 47 +- + tools/testing/selftests/net/tls.c | 40 +- + 948 files changed, 34374 insertions(+), 14501 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/dsa/hirschmann,hellcreek.yaml + delete mode 100644 Documentation/devicetree/bindings/net/dsa/ksz.txt + create mode 100644 Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml + delete mode 100644 Documentation/networking/framerelay.rst + create mode 100644 Documentation/networking/mptcp-sysctl.rst + create mode 100644 drivers/net/dsa/hirschmann/Kconfig + create mode 100644 drivers/net/dsa/hirschmann/Makefile + create mode 100644 drivers/net/dsa/hirschmann/hellcreek.c + create mode 100644 drivers/net/dsa/hirschmann/hellcreek.h + create mode 100644 drivers/net/dsa/hirschmann/hellcreek_hwtstamp.c + create mode 100644 drivers/net/dsa/hirschmann/hellcreek_hwtstamp.h + create mode 100644 drivers/net/dsa/hirschmann/hellcreek_ptp.c + create mode 100644 drivers/net/dsa/hirschmann/hellcreek_ptp.h + create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.c + create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c + create mode 100644 drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/steering/dr_buddy.c + create mode 100644 drivers/net/mhi_net.c + create mode 100644 drivers/net/usb/r8153_ecm.c + delete mode 100644 drivers/net/wan/dlci.c + delete mode 100644 drivers/net/wan/sdla.c + delete mode 100644 drivers/net/wan/x25_asy.c + delete mode 100644 drivers/net/wan/x25_asy.h + delete mode 100644 drivers/net/wimax/Kconfig + delete mode 100644 drivers/net/wimax/Makefile + rename {Documentation/admin-guide/wimax => drivers/staging/wimax/Documentation}/i2400m.rst (100%) + rename {Documentation/admin-guide/wimax => drivers/staging/wimax/Documentation}/index.rst (100%) + rename {Documentation/admin-guide/wimax => drivers/staging/wimax/Documentation}/wimax.rst (100%) + rename {net => drivers/staging}/wimax/Kconfig (94%) + rename {net => drivers/staging}/wimax/Makefile (83%) + create mode 100644 drivers/staging/wimax/TODO + rename {net => drivers/staging}/wimax/debug-levels.h (96%) + rename {net => drivers/staging}/wimax/debugfs.c (97%) + rename drivers/{net => staging}/wimax/i2400m/Kconfig (100%) + rename drivers/{net => staging}/wimax/i2400m/Makefile (100%) + rename drivers/{net => staging}/wimax/i2400m/control.c (99%) + rename drivers/{net => staging}/wimax/i2400m/debug-levels.h (96%) + rename drivers/{net => staging}/wimax/i2400m/debugfs.c (100%) + rename drivers/{net => staging}/wimax/i2400m/driver.c (99%) + rename drivers/{net => staging}/wimax/i2400m/fw.c (100%) + rename drivers/{net => staging}/wimax/i2400m/i2400m-usb.h (100%) + rename drivers/{net => staging}/wimax/i2400m/i2400m.h (99%) + rename include/uapi/linux/wimax/i2400m.h => drivers/staging/wimax/i2400m/linux-wimax-i2400m.h (100%) + rename drivers/{net => staging}/wimax/i2400m/netdev.c (100%) + rename drivers/{net => staging}/wimax/i2400m/op-rfkill.c (99%) + rename drivers/{net => staging}/wimax/i2400m/rx.c (100%) + rename drivers/{net => staging}/wimax/i2400m/sysfs.c (100%) + rename drivers/{net => staging}/wimax/i2400m/tx.c (100%) + rename drivers/{net => staging}/wimax/i2400m/usb-debug-levels.h (95%) + rename drivers/{net => staging}/wimax/i2400m/usb-fw.c (100%) + rename drivers/{net => staging}/wimax/i2400m/usb-notif.c (100%) + rename drivers/{net => staging}/wimax/i2400m/usb-rx.c (100%) + rename drivers/{net => staging}/wimax/i2400m/usb-tx.c (100%) + rename drivers/{net => staging}/wimax/i2400m/usb.c (99%) + rename {net => drivers/staging}/wimax/id-table.c (99%) + rename include/linux/wimax/debug.h => drivers/staging/wimax/linux-wimax-debug.h (99%) + rename include/uapi/linux/wimax.h => drivers/staging/wimax/linux-wimax.h (100%) + rename include/net/wimax.h => drivers/staging/wimax/net-wimax.h (99%) + rename {net => drivers/staging}/wimax/op-msg.c (99%) + rename {net => drivers/staging}/wimax/op-reset.c (98%) + rename {net => drivers/staging}/wimax/op-rfkill.c (99%) + rename {net => drivers/staging}/wimax/op-state-get.c (96%) + rename {net => drivers/staging}/wimax/stack.c (97%) + rename {net => drivers/staging}/wimax/wimax-internal.h (99%) + delete mode 100644 include/linux/if_frad.h + create mode 100644 include/linux/platform_data/hirschmann-hellcreek.h + delete mode 100644 include/linux/sdla.h + create mode 100644 include/linux/soc/marvell/octeontx2/asm.h + create mode 100644 include/linux/usb/r8152.h + create mode 100644 include/uapi/linux/cfm_bridge.h + delete mode 100644 include/uapi/linux/if_frad.h + delete mode 100644 include/uapi/linux/sdla.h + create mode 100644 kernel/bpf/bpf_task_storage.c + create mode 100644 net/bridge/br_cfm.c + create mode 100644 net/bridge/br_cfm_netlink.c + create mode 100644 net/bridge/br_private_cfm.h + delete mode 100644 net/dsa/tag_edsa.c + create mode 100644 net/dsa/tag_hellcreek.c + create mode 100644 net/netfilter/nft_reject_netdev.c + create mode 100644 net/rxrpc/server_key.c + create mode 100644 net/sched/sch_frag.c + delete mode 100755 samples/bpf/test_ipip.sh + create mode 100644 tools/testing/selftests/bpf/btf_helpers.c + create mode 100644 tools/testing/selftests/bpf/btf_helpers.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/btf_dedup_split.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/btf_split.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/hash_large_key.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/sk_storage_tracing.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/tcpbpf_user.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/test_skb_pkt_end.c + create mode 100644 tools/testing/selftests/bpf/progs/skb_pkt_end.c + create mode 100644 tools/testing/selftests/bpf/progs/test_hash_large_key.c + create mode 100644 tools/testing/selftests/bpf/progs/test_sk_storage_trace_itself.c + create mode 100644 tools/testing/selftests/bpf/progs/test_sk_storage_tracing.c + delete mode 100755 tools/testing/selftests/bpf/tcp_client.py + delete mode 100755 tools/testing/selftests/bpf/tcp_server.py + delete mode 100644 tools/testing/selftests/bpf/test_tcpbpf_user.c + create mode 100755 tools/testing/selftests/drivers/net/netdevsim/ethtool-coalesce.sh + create mode 100644 tools/testing/selftests/drivers/net/netdevsim/ethtool-common.sh + create mode 100755 tools/testing/selftests/drivers/net/netdevsim/ethtool-ring.sh + create mode 100755 tools/testing/selftests/drivers/net/netdevsim/nexthop.sh + create mode 100755 tools/testing/selftests/net/bareudp.sh + create mode 100755 tools/testing/selftests/net/forwarding/bridge_mld.sh + create mode 100755 tools/testing/selftests/net/forwarding/gre_multipath_nh.sh + create mode 100755 tools/testing/selftests/net/forwarding/router_nh.sh +Merging bpf-next/for-next (bb1b25cab043 xdp: Remove the functions xsk_map_inc and xsk_map_put) +$ git merge bpf-next/for-next +Removing samples/bpf/bpf_load.h +Removing samples/bpf/bpf_load.c +Auto-merging net/xdp/xsk.c +Auto-merging kernel/trace/bpf_trace.c +Auto-merging kernel/bpf/verifier.c +Auto-merging drivers/net/ethernet/intel/i40e/i40e_xsk.c +Merge made by the 'recursive' strategy. + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 11 + + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 1 + + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 123 ++-- + drivers/net/ethernet/intel/i40e/i40e_xsk.h | 16 + + include/linux/bpf.h | 1 + + include/linux/ima.h | 6 + + include/net/xdp_sock_drv.h | 7 + + include/uapi/linux/bpf.h | 38 ++ + kernel/bpf/bpf_lsm.c | 52 ++ + kernel/bpf/core.c | 1 + + kernel/bpf/helpers.c | 13 + + kernel/bpf/task_iter.c | 54 +- + kernel/bpf/verifier.c | 179 +++--- + kernel/module.c | 5 + + kernel/trace/bpf_trace.c | 2 + + net/core/bpf_sk_storage.c | 4 +- + net/xdp/xsk.c | 61 +- + net/xdp/xsk.h | 2 - + net/xdp/xsk_queue.h | 93 ++- + net/xdp/xskmap.c | 20 +- + samples/bpf/.gitignore | 3 + + samples/bpf/Makefile | 20 +- + samples/bpf/bpf_load.c | 667 --------------------- + samples/bpf/bpf_load.h | 57 -- + samples/bpf/do_hbm_test.sh | 32 +- + samples/bpf/hbm.c | 111 ++-- + samples/bpf/hbm_kern.h | 2 +- + samples/bpf/ibumad_kern.c | 26 +- + samples/bpf/ibumad_user.c | 71 ++- + samples/bpf/lwt_len_hist.sh | 2 + + samples/bpf/task_fd_query_user.c | 101 +++- + samples/bpf/test_cgrp2_sock2.c | 61 +- + samples/bpf/test_cgrp2_sock2.sh | 21 +- + samples/bpf/test_lwt_bpf.sh | 0 + samples/bpf/test_overhead_user.c | 82 ++- + samples/bpf/xdp2skb_meta_kern.c | 2 +- + samples/bpf/xdpsock_user.c | 6 +- + scripts/Makefile.modfinal | 9 +- + scripts/bpf_helpers_doc.py | 4 + + security/integrity/ima/ima_main.c | 78 ++- + tools/bpf/bpftool/prog.c | 30 +- + tools/include/uapi/linux/bpf.h | 38 ++ + tools/lib/bpf/btf.c | 8 +- + tools/lib/bpf/xsk.h | 17 +- + tools/testing/selftests/bpf/Makefile | 3 +- + tools/testing/selftests/bpf/README.rst | 33 +- + tools/testing/selftests/bpf/config | 4 + + tools/testing/selftests/bpf/ima_setup.sh | 80 +++ + .../selftests/bpf/prog_tests/test_bprm_opts.c | 116 ++++ + tools/testing/selftests/bpf/prog_tests/test_ima.c | 74 +++ + tools/testing/selftests/bpf/progs/bpf_flow.c | 2 + + tools/testing/selftests/bpf/progs/bprm_opts.c | 34 ++ + tools/testing/selftests/bpf/progs/ima.c | 28 + + tools/testing/selftests/bpf/progs/profiler.inc.h | 2 + + tools/testing/selftests/bpf/test_verifier.c | 13 + + .../testing/selftests/bpf/verifier/ctx_sk_lookup.c | 7 + + .../selftests/bpf/verifier/direct_value_access.c | 3 + + tools/testing/selftests/bpf/verifier/map_ptr.c | 1 + + .../selftests/bpf/verifier/raw_tp_writable.c | 1 + + .../testing/selftests/bpf/verifier/ref_tracking.c | 4 + + tools/testing/selftests/bpf/verifier/regalloc.c | 8 + + tools/testing/selftests/bpf/verifier/wide_access.c | 46 +- + 62 files changed, 1416 insertions(+), 1180 deletions(-) + delete mode 100644 samples/bpf/bpf_load.c + delete mode 100644 samples/bpf/bpf_load.h + mode change 100644 => 100755 samples/bpf/lwt_len_hist.sh + mode change 100644 => 100755 samples/bpf/test_lwt_bpf.sh + create mode 100755 tools/testing/selftests/bpf/ima_setup.sh + create mode 100644 tools/testing/selftests/bpf/prog_tests/test_bprm_opts.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/test_ima.c + create mode 100644 tools/testing/selftests/bpf/progs/bprm_opts.c + create mode 100644 tools/testing/selftests/bpf/progs/ima.c +Merging ipsec-next/master (8be33ecfc1ff net: skb_vlan_untag(): don't reset transport offset if set by GRO layer) +$ git merge ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (3650b228f83a Linux 5.10-rc1) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (988187e88103 ipvs: replace atomic_add_return()) +$ git merge netfilter-next/master +Merge made by the 'recursive' strategy. + net/bridge/netfilter/Kconfig | 2 ++ + net/netfilter/ipvs/ip_vs_core.c | 2 +- + net/netfilter/ipvs/ip_vs_sync.c | 4 ++-- + 3 files changed, 5 insertions(+), 3 deletions(-) +Merging ipvs-next/master (988187e88103 ipvs: replace atomic_add_return()) +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (7ec8a926188e cw1200: fix missing destroy_workqueue() on error in cw1200_init_common) +$ git merge wireless-drivers-next/master +Auto-merging drivers/net/wireless/realtek/rtw88/fw.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath10k/htt_rx.c | 1 - + drivers/net/wireless/ath/ath6kl/testmode.c | 1 - + drivers/net/wireless/ath/ath9k/hw.c | 1 - + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 2 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 3 +- + .../wireless/broadcom/brcm80211/brcmfmac/fweh.c | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 7 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 22 +- + .../wireless/broadcom/brcm80211/brcmsmac/ampdu.c | 11 +- + drivers/net/wireless/cisco/airo.c | 124 ++- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 2 - + drivers/net/wireless/intersil/hostap/hostap_hw.c | 17 +- + .../net/wireless/intersil/hostap/hostap_ioctl.c | 15 +- + drivers/net/wireless/intersil/orinoco/hermes.c | 1 + + drivers/net/wireless/intersil/orinoco/hermes.h | 15 + + drivers/net/wireless/intersil/orinoco/hw.c | 32 +- + .../net/wireless/intersil/orinoco/orinoco_usb.c | 168 ++-- + drivers/net/wireless/intersil/prism54/isl_ioctl.c | 5 +- + drivers/net/wireless/marvell/mwifiex/main.c | 6 +- + drivers/net/wireless/marvell/mwifiex/pcie.c | 24 +- + drivers/net/wireless/marvell/mwifiex/pcie.h | 2 + + drivers/net/wireless/marvell/mwifiex/sdio.h | 2 - + drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 2 + + drivers/net/wireless/marvell/mwifiex/sta_event.c | 1 + + drivers/net/wireless/marvell/mwifiex/uap_cmd.c | 1 + + drivers/net/wireless/marvell/mwifiex/wmm.c | 1 + + drivers/net/wireless/mediatek/mt7601u/dma.c | 12 +- + drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c | 6 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 62 +- + drivers/net/wireless/ralink/rt2x00/rt2x00.h | 10 + + drivers/net/wireless/ray_cs.c | 6 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 3 + + .../realtek/rtlwifi/btcoexist/halbtc8723b2ant.c | 48 +- + .../realtek/rtlwifi/btcoexist/halbtc8821a1ant.c | 4 +- + .../realtek/rtlwifi/btcoexist/halbtc8821a2ant.c | 27 +- + .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 28 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/hw.c | 1 - + .../net/wireless/realtek/rtlwifi/rtl8188ee/phy.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/trx.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/trx.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/mac.c | 7 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/trx.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/hw.c | 1 - + .../net/wireless/realtek/rtlwifi/rtl8723ae/phy.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/trx.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/phy.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/trx.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 96 ++- + .../net/wireless/realtek/rtlwifi/rtl8821ae/table.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/table.h | 4 +- + drivers/net/wireless/realtek/rtlwifi/usb.c | 1 - + drivers/net/wireless/realtek/rtw88/coex.c | 904 +++++++++++++++------ + drivers/net/wireless/realtek/rtw88/coex.h | 41 +- + drivers/net/wireless/realtek/rtw88/debug.c | 4 +- + drivers/net/wireless/realtek/rtw88/fw.c | 6 +- + drivers/net/wireless/realtek/rtw88/fw.h | 11 +- + drivers/net/wireless/realtek/rtw88/mac80211.c | 9 +- + drivers/net/wireless/realtek/rtw88/main.c | 54 +- + drivers/net/wireless/realtek/rtw88/main.h | 20 +- + drivers/net/wireless/realtek/rtw88/phy.c | 6 + + drivers/net/wireless/realtek/rtw88/ps.c | 135 +-- + drivers/net/wireless/realtek/rtw88/ps.h | 3 +- + drivers/net/wireless/realtek/rtw88/reg.h | 17 +- + drivers/net/wireless/realtek/rtw88/rtw8723d.c | 95 ++- + drivers/net/wireless/realtek/rtw88/rtw8723d.h | 3 + + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 15 +- + drivers/net/wireless/realtek/rtw88/rtw8821c.h | 2 - + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 54 +- + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 118 +-- + drivers/net/wireless/realtek/rtw88/wow.c | 8 +- + drivers/net/wireless/rsi/rsi_91x_hal.c | 3 +- + drivers/net/wireless/rsi/rsi_91x_sdio.c | 6 +- + drivers/net/wireless/rsi/rsi_91x_sdio_ops.c | 173 ++-- + drivers/net/wireless/rsi/rsi_91x_usb.c | 36 +- + drivers/net/wireless/rsi/rsi_91x_usb_ops.c | 2 +- + drivers/net/wireless/rsi/rsi_sdio.h | 8 +- + drivers/net/wireless/st/cw1200/bh.c | 10 +- + drivers/net/wireless/st/cw1200/main.c | 2 + + drivers/net/wireless/st/cw1200/wsm.c | 8 +- + drivers/net/wireless/ti/wl1251/cmd.c | 2 +- + drivers/net/wireless/ti/wlcore/main.c | 4 +- + drivers/net/wireless/ti/wlcore/spi.c | 3 +- + drivers/net/wireless/wl3501_cs.c | 8 +- + drivers/net/wireless/zydas/zd1211rw/zd_usb.c | 15 - + 86 files changed, 1663 insertions(+), 953 deletions(-) +Merging bluetooth/master (7c6601813962 Bluetooth: Fix attempting to set RPA timeout when unsupported) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/btmtksdio.c | 2 +- + drivers/bluetooth/btqca.c | 36 ++++++------ + drivers/bluetooth/btqca.h | 22 +++++-- + drivers/bluetooth/btrtl.c | 123 +++++++++++++++++++++++++--------------- + drivers/bluetooth/btusb.c | 31 +++++++++- + drivers/bluetooth/hci_h5.c | 4 ++ + drivers/bluetooth/hci_ll.c | 1 + + drivers/bluetooth/hci_qca.c | 118 +++++++++++++++++++++++++------------- + include/net/bluetooth/mgmt.h | 4 +- + net/bluetooth/hci_conn.c | 12 +++- + net/bluetooth/hci_core.c | 2 +- + net/bluetooth/hci_debugfs.c | 50 ++++++++++++++++ + net/bluetooth/hci_event.c | 25 ++++---- + net/bluetooth/hci_request.c | 129 +++++++++++++++++++++--------------------- + net/bluetooth/hci_request.h | 2 + + net/bluetooth/hidp/core.c | 2 +- + net/bluetooth/l2cap_core.c | 10 +++- + net/bluetooth/mgmt.c | 4 +- + net/bluetooth/sco.c | 5 ++ + net/bluetooth/smp.c | 44 +------------- + net/bluetooth/smp.h | 2 + + 21 files changed, 388 insertions(+), 240 deletions(-) +Merging mac80211-next/master (0064c5c1b3bf net: xfrm: use core API for updating/providing stats) +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (5927aa13822a Revert "GFS2: Prevent delete work from occurring on glocks used for create") +$ git merge gfs2/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/filesystems/gfs2.rst | 37 ++++++++++++++++++------------------- + MAINTAINERS | 2 +- + fs/gfs2/glock.c | 9 +-------- + fs/gfs2/glops.c | 6 ++++-- + fs/gfs2/incore.h | 2 +- + fs/gfs2/inode.c | 37 +++++++++++++++++++++++++++++-------- + fs/gfs2/inode.h | 3 --- + fs/gfs2/rgrp.c | 4 ++++ + 8 files changed, 58 insertions(+), 42 deletions(-) +Merging mtd/mtd/next (22ca56a34b32 mtd: devices: powernv_flash: Add function names to headers and fix 'dev') +$ git merge mtd/mtd/next +Auto-merging drivers/mtd/nand/raw/diskonchip.c +Merge made by the 'recursive' strategy. + drivers/mtd/devices/docg3.c | 5 +- + drivers/mtd/devices/phram.c | 2 +- + drivers/mtd/devices/powernv_flash.c | 5 +- + drivers/mtd/mtdchar.c | 2 - + drivers/mtd/mtdcore.c | 2 +- + drivers/mtd/mtdpart.c | 2 +- + drivers/mtd/nand/onenand/onenand_base.c | 444 +++++++++++++------------- + drivers/mtd/nand/onenand/onenand_bbt.c | 32 +- + drivers/mtd/nand/raw/arasan-nand-controller.c | 1 + + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 6 +- + drivers/mtd/nand/raw/cafe_nand.c | 2 +- + drivers/mtd/nand/raw/diskonchip.c | 4 +- + drivers/mtd/nand/raw/omap2.c | 18 +- + drivers/mtd/nand/raw/omap_elm.c | 7 +- + drivers/mtd/nand/raw/s3c2410.c | 4 +- + drivers/mtd/nand/raw/sunxi_nand.c | 1 + + drivers/mtd/nand/spi/toshiba.c | 2 +- + drivers/mtd/spi-nor/controllers/hisi-sfc.c | 2 +- + drivers/mtd/ubi/build.c | 1 + + drivers/mtd/ubi/eba.c | 3 +- + drivers/mtd/ubi/gluebi.c | 2 +- + drivers/mtd/ubi/kapi.c | 2 +- + drivers/mtd/ubi/wl.c | 3 +- + 23 files changed, 278 insertions(+), 274 deletions(-) +Merging nand/nand/next (9ec8e263068f mtd: rawnand: gpmi: fix reference count leak in gpmi ops) +$ git merge nand/nand/next +Removing include/linux/platform_data/mtd-mxc_nand.h +Removing include/linux/mtd/nand_ecc.h +Removing include/linux/mtd/nand_bch.h +Auto-merging drivers/mtd/nand/raw/sunxi_nand.c +Auto-merging drivers/mtd/nand/raw/s3c2410.c +Auto-merging drivers/mtd/nand/raw/omap2.c +Removing drivers/mtd/nand/raw/nand_bch.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/gpmi-nand.yaml | 76 +++- + .../devicetree/bindings/mtd/nand-controller.yaml | 11 +- + .../devicetree/bindings/mtd/qcom_nandc.txt | 2 + + Documentation/driver-api/mtd/nand_ecc.rst | 2 +- + Documentation/driver-api/mtdnand.rst | 3 - + drivers/mtd/Kconfig | 1 + + drivers/mtd/maps/plat-ram.c | 11 +- + drivers/mtd/nand/Kconfig | 33 +- + drivers/mtd/nand/Makefile | 2 + + drivers/mtd/nand/core.c | 124 +++++++ + drivers/mtd/nand/ecc-sw-bch.c | 406 +++++++++++++++++++++ + .../mtd/nand/{raw/nand_ecc.c => ecc-sw-hamming.c} | 311 ++++++++++++---- + drivers/mtd/nand/ecc.c | 140 ++++++- + drivers/mtd/nand/onenand/onenand_omap2.c | 16 +- + drivers/mtd/nand/raw/Kconfig | 25 +- + drivers/mtd/nand/raw/Makefile | 2 - + drivers/mtd/nand/raw/au1550nd.c | 1 + + drivers/mtd/nand/raw/cs553x_nand.c | 3 +- + drivers/mtd/nand/raw/davinci_nand.c | 38 +- + drivers/mtd/nand/raw/fsl_elbc_nand.c | 1 - + drivers/mtd/nand/raw/fsl_ifc_nand.c | 1 - + drivers/mtd/nand/raw/fsl_upm.c | 1 - + drivers/mtd/nand/raw/fsmc_nand.c | 5 +- + drivers/mtd/nand/raw/gpmi-nand/Makefile | 3 +- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 8 +- + drivers/mtd/nand/raw/ingenic/ingenic_ecc.c | 2 - + drivers/mtd/nand/raw/lpc32xx_mlc.c | 1 - + drivers/mtd/nand/raw/lpc32xx_slc.c | 3 +- + drivers/mtd/nand/raw/marvell_nand.c | 6 - + drivers/mtd/nand/raw/meson_nand.c | 2 +- + drivers/mtd/nand/raw/mxc_nand.c | 75 +--- + drivers/mtd/nand/raw/mxic_nand.c | 2 +- + drivers/mtd/nand/raw/nand_base.c | 204 ++++++++--- + drivers/mtd/nand/raw/nand_bbt.c | 2 +- + drivers/mtd/nand/raw/nand_bch.c | 219 ----------- + drivers/mtd/nand/raw/nand_legacy.c | 9 +- + drivers/mtd/nand/raw/nandsim.c | 3 +- + drivers/mtd/nand/raw/ndfc.c | 3 +- + drivers/mtd/nand/raw/omap2.c | 31 +- + drivers/mtd/nand/raw/pasemi_nand.c | 1 - + drivers/mtd/nand/raw/qcom_nandc.c | 6 + + drivers/mtd/nand/raw/r852.c | 4 + + drivers/mtd/nand/raw/s3c2410.c | 1 - + drivers/mtd/nand/raw/sharpsl.c | 3 +- + drivers/mtd/nand/raw/sunxi_nand.c | 148 +++++--- + drivers/mtd/nand/raw/tmio_nand.c | 7 +- + drivers/mtd/nand/raw/txx9ndfmc.c | 5 +- + drivers/mtd/nand/spi/Kconfig | 1 + + drivers/mtd/nand/spi/core.c | 286 +++++++++------ + drivers/mtd/nand/spi/macronix.c | 20 + + drivers/mtd/sm_ftl.c | 30 +- + drivers/mtd/tests/mtd_nandecctest.c | 31 +- + include/linux/mtd/nand-ecc-sw-bch.h | 73 ++++ + include/linux/mtd/nand-ecc-sw-hamming.h | 91 +++++ + include/linux/mtd/nand.h | 56 +++ + include/linux/mtd/nand_bch.h | 66 ---- + include/linux/mtd/nand_ecc.h | 39 -- + include/linux/mtd/rawnand.h | 19 +- + include/linux/mtd/sharpsl.h | 1 - + include/linux/mtd/spinand.h | 9 + + include/linux/platform_data/mtd-mxc_nand.h | 19 - + 61 files changed, 1819 insertions(+), 885 deletions(-) + create mode 100644 drivers/mtd/nand/ecc-sw-bch.c + rename drivers/mtd/nand/{raw/nand_ecc.c => ecc-sw-hamming.c} (61%) + delete mode 100644 drivers/mtd/nand/raw/nand_bch.c + create mode 100644 include/linux/mtd/nand-ecc-sw-bch.h + create mode 100644 include/linux/mtd/nand-ecc-sw-hamming.h + delete mode 100644 include/linux/mtd/nand_bch.h + delete mode 100644 include/linux/mtd/nand_ecc.h + delete mode 100644 include/linux/platform_data/mtd-mxc_nand.h +Merging spi-nor/spi-nor/next (ad624dfd7bb6 mtd: spi-nor: micron-st: allow using MT35XU512ABA in Octal DTR mode) +$ git merge spi-nor/spi-nor/next +Merge made by the 'recursive' strategy. + drivers/mtd/spi-nor/core.c | 544 +++++++++++++++++++++++++++++++--------- + drivers/mtd/spi-nor/core.h | 26 ++ + drivers/mtd/spi-nor/micron-st.c | 115 ++++++++- + drivers/mtd/spi-nor/sfdp.c | 170 ++++++++++++- + drivers/mtd/spi-nor/sfdp.h | 8 + + drivers/mtd/spi-nor/spansion.c | 171 +++++++++++++ + include/linux/mtd/spi-nor.h | 53 +++- + 7 files changed, 948 insertions(+), 139 deletions(-) +Merging crypto/master (05c2a705917b crypto: ccree - rework cache parameters handling) +$ git merge crypto/master +Auto-merging net/mptcp/subflow.c +Auto-merging net/mptcp/options.c +Auto-merging include/linux/filter.h +Auto-merging fs/verity/fsverity_private.h +Auto-merging fs/crypto/fname.c +Auto-merging drivers/tee/tee_core.c +Auto-merging drivers/nfc/s3fwrn5/firmware.c +Auto-merging drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls.h +Auto-merging drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c +Removing drivers/char/hw_random/hisi-trng-v2.c +Auto-merging arch/x86/crypto/poly1305_glue.c +Removing arch/x86/crypto/aes_glue.c +Auto-merging arch/arm64/configs/defconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + arch/arm/crypto/aes-neonbs-glue.c | 8 +- + arch/arm/crypto/chacha-glue.c | 34 +- + arch/arm/crypto/chacha-neon-core.S | 97 ++- + arch/arm/crypto/sha1-ce-glue.c | 2 +- + arch/arm/crypto/sha1.h | 2 +- + arch/arm/crypto/sha1_glue.c | 2 +- + arch/arm/crypto/sha1_neon_glue.c | 2 +- + arch/arm/crypto/sha2-ce-glue.c | 2 +- + arch/arm/crypto/sha256_glue.c | 2 +- + arch/arm/crypto/sha256_neon_glue.c | 2 +- + arch/arm/crypto/sha512-glue.c | 2 +- + arch/arm/crypto/sha512-neon-glue.c | 2 +- + arch/arm64/configs/defconfig | 1 + + arch/arm64/crypto/aes-glue.c | 2 +- + arch/arm64/crypto/chacha-neon-core.S | 193 ++---- + arch/arm64/crypto/ghash-ce-core.S | 15 + + arch/arm64/crypto/ghash-ce-glue.c | 48 +- + arch/arm64/crypto/poly1305-armv8.pl | 2 +- + arch/arm64/crypto/poly1305-core.S_shipped | 2 +- + arch/arm64/crypto/poly1305-glue.c | 2 +- + arch/arm64/crypto/sha1-ce-glue.c | 2 +- + arch/arm64/crypto/sha2-ce-glue.c | 2 +- + arch/arm64/crypto/sha256-glue.c | 2 +- + arch/arm64/crypto/sha3-ce-glue.c | 2 +- + arch/arm64/crypto/sha512-ce-glue.c | 2 +- + arch/arm64/crypto/sha512-glue.c | 2 +- + arch/mips/cavium-octeon/crypto/octeon-crypto.h | 2 +- + arch/mips/cavium-octeon/crypto/octeon-md5.c | 14 +- + arch/mips/cavium-octeon/crypto/octeon-sha1.c | 2 +- + arch/mips/cavium-octeon/crypto/octeon-sha256.c | 2 +- + arch/mips/cavium-octeon/crypto/octeon-sha512.c | 2 +- + arch/powerpc/crypto/sha1-spe-glue.c | 2 +- + arch/powerpc/crypto/sha1.c | 2 +- + arch/powerpc/crypto/sha256-spe-glue.c | 4 +- + arch/s390/crypto/sha.h | 3 +- + arch/s390/crypto/sha1_s390.c | 2 +- + arch/s390/crypto/sha256_s390.c | 2 +- + arch/s390/crypto/sha3_256_s390.c | 1 - + arch/s390/crypto/sha3_512_s390.c | 1 - + arch/s390/crypto/sha512_s390.c | 2 +- + arch/s390/purgatory/purgatory.c | 2 +- + arch/sparc/crypto/crc32c_glue.c | 2 +- + arch/sparc/crypto/md5_glue.c | 9 +- + arch/sparc/crypto/sha1_glue.c | 2 +- + arch/sparc/crypto/sha256_glue.c | 2 +- + arch/sparc/crypto/sha512_glue.c | 2 +- + arch/x86/crypto/aes_glue.c | 1 - + arch/x86/crypto/poly1305_glue.c | 2 +- + arch/x86/crypto/sha1_ssse3_glue.c | 2 +- + arch/x86/crypto/sha256_ssse3_glue.c | 2 +- + arch/x86/crypto/sha512_ssse3_glue.c | 2 +- + arch/x86/purgatory/purgatory.c | 2 +- + crypto/Kconfig | 4 +- + crypto/aegis128-core.c | 245 ++++--- + crypto/aegis128-neon-inner.c | 122 +++- + crypto/aegis128-neon.c | 21 +- + crypto/af_alg.c | 10 +- + crypto/asymmetric_keys/asym_tpm.c | 2 +- + crypto/sha1_generic.c | 2 +- + crypto/sha256_generic.c | 2 +- + crypto/sha512_generic.c | 2 +- + crypto/sm2.c | 75 +-- + crypto/tcrypt.c | 83 +-- + crypto/testmgr.c | 141 ++-- + drivers/char/hw_random/Kconfig | 13 - + drivers/char/hw_random/Makefile | 1 - + drivers/char/hw_random/hisi-trng-v2.c | 99 --- + drivers/char/hw_random/imx-rngc.c | 4 +- + drivers/char/random.c | 2 +- + drivers/crypto/Kconfig | 2 +- + drivers/crypto/allwinner/Kconfig | 2 +- + drivers/crypto/allwinner/sun4i-ss/sun4i-ss.h | 2 +- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c | 23 +- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h | 3 +- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c | 3 +- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h | 3 +- + drivers/crypto/amcc/crypto4xx_alg.c | 2 +- + drivers/crypto/amcc/crypto4xx_core.c | 4 +- + drivers/crypto/atmel-authenc.h | 3 +- + drivers/crypto/atmel-sha.c | 4 +- + drivers/crypto/axis/artpec6_crypto.c | 3 +- + drivers/crypto/bcm/cipher.c | 3 +- + drivers/crypto/bcm/cipher.h | 3 +- + drivers/crypto/bcm/spu.h | 3 +- + drivers/crypto/caam/caamalg.c | 4 +- + drivers/crypto/caam/caamalg_qi.c | 12 +- + drivers/crypto/caam/caamalg_qi2.c | 3 +- + drivers/crypto/caam/compat.h | 3 +- + drivers/crypto/caam/intern.h | 8 + + drivers/crypto/caam/jr.c | 4 +- + drivers/crypto/cavium/cpt/cptpf_main.c | 10 +- + drivers/crypto/cavium/cpt/cptvf_main.c | 10 +- + drivers/crypto/cavium/nitrox/nitrox_aead.c | 11 +- + drivers/crypto/cavium/nitrox/nitrox_debugfs.c | 1 + + drivers/crypto/cavium/nitrox/nitrox_hal.c | 1 + + drivers/crypto/cavium/nitrox/nitrox_isr.c | 1 + + drivers/crypto/cavium/nitrox/nitrox_isr.h | 9 + + drivers/crypto/cavium/nitrox/nitrox_main.c | 13 - + drivers/crypto/cavium/nitrox/nitrox_mbx.c | 3 +- + drivers/crypto/cavium/nitrox/nitrox_req.h | 4 + + drivers/crypto/cavium/nitrox/nitrox_reqmgr.c | 7 +- + drivers/crypto/cavium/zip/zip_main.c | 10 +- + drivers/crypto/ccp/ccp-crypto-sha.c | 3 +- + drivers/crypto/ccp/ccp-crypto.h | 3 +- + drivers/crypto/ccree/cc_cipher.c | 3 + + drivers/crypto/ccree/cc_driver.c | 75 ++- + drivers/crypto/ccree/cc_driver.h | 9 +- + drivers/crypto/ccree/cc_pm.c | 2 +- + drivers/crypto/chelsio/chcr_algo.c | 3 +- + drivers/crypto/hisilicon/Kconfig | 8 + + drivers/crypto/hisilicon/Makefile | 1 + + drivers/crypto/hisilicon/hpre/hpre_main.c | 4 +- + drivers/crypto/hisilicon/qm.c | 220 +++--- + drivers/crypto/hisilicon/qm.h | 2 +- + drivers/crypto/hisilicon/sec2/sec.h | 2 - + drivers/crypto/hisilicon/sec2/sec_crypto.c | 25 +- + drivers/crypto/hisilicon/sec2/sec_main.c | 34 +- + drivers/crypto/hisilicon/sgl.c | 2 - + drivers/crypto/hisilicon/trng/Makefile | 2 + + drivers/crypto/hisilicon/trng/trng.c | 334 ++++++++++ + drivers/crypto/hisilicon/zip/zip_main.c | 30 +- + drivers/crypto/img-hash.c | 3 +- + drivers/crypto/inside-secure/safexcel.c | 2 +- + drivers/crypto/inside-secure/safexcel.h | 3 +- + drivers/crypto/inside-secure/safexcel_cipher.c | 3 +- + drivers/crypto/inside-secure/safexcel_hash.c | 3 +- + drivers/crypto/ixp4xx_crypto.c | 2 +- + drivers/crypto/marvell/cesa/hash.c | 3 +- + drivers/crypto/marvell/octeontx/otx_cptpf_main.c | 10 +- + drivers/crypto/marvell/octeontx/otx_cptvf_algs.c | 3 +- + drivers/crypto/marvell/octeontx/otx_cptvf_main.c | 10 +- + drivers/crypto/mediatek/mtk-sha.c | 3 +- + drivers/crypto/mxs-dcp.c | 3 +- + drivers/crypto/n2_core.c | 3 +- + drivers/crypto/nx/nx-sha256.c | 2 +- + drivers/crypto/nx/nx-sha512.c | 2 +- + drivers/crypto/nx/nx.c | 2 +- + drivers/crypto/omap-aes.c | 4 +- + drivers/crypto/omap-sham.c | 3 +- + drivers/crypto/padlock-sha.c | 3 +- + drivers/crypto/picoxcell_crypto.c | 3 +- + drivers/crypto/qat/Kconfig | 11 + + drivers/crypto/qat/Makefile | 1 + + drivers/crypto/qat/qat_4xxx/Makefile | 4 + + drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.c | 218 ++++++ + drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.h | 75 +++ + drivers/crypto/qat/qat_4xxx/adf_drv.c | 320 +++++++++ + drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.c | 49 +- + drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.h | 5 + + drivers/crypto/qat/qat_c3xxx/adf_drv.c | 11 +- + .../crypto/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c | 7 +- + drivers/crypto/qat/qat_c3xxxvf/adf_drv.c | 4 +- + drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.c | 49 +- + drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.h | 5 + + drivers/crypto/qat/qat_c62x/adf_drv.c | 11 +- + drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.c | 7 +- + drivers/crypto/qat/qat_c62xvf/adf_drv.c | 4 +- + drivers/crypto/qat/qat_common/Makefile | 2 + + drivers/crypto/qat/qat_common/adf_accel_devices.h | 65 +- + drivers/crypto/qat/qat_common/adf_accel_engine.c | 69 +- + drivers/crypto/qat/qat_common/adf_admin.c | 77 ++- + drivers/crypto/qat/qat_common/adf_cfg.c | 4 +- + drivers/crypto/qat/qat_common/adf_cfg_common.h | 3 +- + drivers/crypto/qat/qat_common/adf_cfg_strings.h | 3 +- + drivers/crypto/qat/qat_common/adf_common_drv.h | 19 +- + drivers/crypto/qat/qat_common/adf_dev_mgr.c | 11 +- + drivers/crypto/qat/qat_common/adf_gen2_hw_data.c | 181 +++++ + drivers/crypto/qat/qat_common/adf_gen2_hw_data.h | 123 ++++ + drivers/crypto/qat/qat_common/adf_gen4_hw_data.c | 101 +++ + drivers/crypto/qat/qat_common/adf_gen4_hw_data.h | 99 +++ + drivers/crypto/qat/qat_common/adf_hw_arbiter.c | 94 +-- + drivers/crypto/qat/qat_common/adf_isr.c | 7 +- + drivers/crypto/qat/qat_common/adf_sriov.c | 78 +-- + drivers/crypto/qat/qat_common/adf_transport.c | 130 ++-- + .../qat/qat_common/adf_transport_access_macros.h | 67 -- + .../crypto/qat/qat_common/adf_transport_debug.c | 32 +- + .../crypto/qat/qat_common/adf_transport_internal.h | 2 +- + drivers/crypto/qat/qat_common/adf_vf_isr.c | 5 +- + .../crypto/qat/qat_common/icp_qat_fw_init_admin.h | 6 +- + .../qat/qat_common/icp_qat_fw_loader_handle.h | 26 +- + drivers/crypto/qat/qat_common/icp_qat_hal.h | 63 +- + drivers/crypto/qat/qat_common/icp_qat_hw.h | 23 + + drivers/crypto/qat/qat_common/icp_qat_uclo.h | 132 +++- + drivers/crypto/qat/qat_common/qat_algs.c | 141 ++-- + drivers/crypto/qat/qat_common/qat_asym_algs.c | 13 +- + drivers/crypto/qat/qat_common/qat_crypto.c | 162 +++-- + drivers/crypto/qat/qat_common/qat_crypto.h | 26 +- + drivers/crypto/qat/qat_common/qat_hal.c | 421 +++++++++--- + drivers/crypto/qat/qat_common/qat_uclo.c | 737 ++++++++++++++++----- + .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c | 60 +- + .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h | 5 + + drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 9 +- + .../qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c | 7 +- + drivers/crypto/qat/qat_dh895xccvf/adf_drv.c | 4 +- + drivers/crypto/qce/common.c | 3 +- + drivers/crypto/qce/core.c | 18 +- + drivers/crypto/qce/sha.c | 2 +- + drivers/crypto/qce/sha.h | 3 +- + drivers/crypto/rockchip/rk3288_crypto.h | 3 +- + drivers/crypto/s5p-sss.c | 3 +- + drivers/crypto/sa2ul.c | 121 ++-- + drivers/crypto/sa2ul.h | 7 +- + drivers/crypto/sahara.c | 3 +- + drivers/crypto/stm32/stm32-hash.c | 3 +- + drivers/crypto/talitos.c | 13 +- + drivers/crypto/ux500/hash/hash_core.c | 3 +- + drivers/firmware/efi/embedded-firmware.c | 2 +- + .../chelsio/inline_crypto/ch_ipsec/chcr_ipsec.c | 3 +- + .../ethernet/chelsio/inline_crypto/chtls/chtls.h | 3 +- + drivers/nfc/s3fwrn5/firmware.c | 2 +- + drivers/tee/tee_core.c | 2 +- + fs/crypto/fname.c | 2 +- + fs/crypto/hkdf.c | 2 +- + fs/ubifs/auth.c | 1 - + fs/verity/fsverity_private.h | 2 +- + include/crypto/aead.h | 5 + + include/crypto/curve25519.h | 2 + + include/crypto/hash_info.h | 3 +- + include/crypto/sha1.h | 46 ++ + include/crypto/sha1_base.h | 5 +- + include/crypto/{sha.h => sha2.h} | 41 +- + include/crypto/sha256_base.h | 5 +- + include/crypto/sha512_base.h | 5 +- + include/crypto/sm3_base.h | 3 +- + include/linux/ccp.h | 3 +- + include/linux/filter.h | 2 +- + include/linux/purgatory.h | 2 +- + include/uapi/linux/if_alg.h | 16 + + kernel/crash_core.c | 2 +- + kernel/kexec_core.c | 1 - + kernel/kexec_file.c | 2 +- + lib/crypto/curve25519.c | 2 - + lib/crypto/sha256.c | 214 ++---- + lib/digsig.c | 2 +- + lib/mpi/ec.c | 3 - + lib/sha1.c | 2 +- + net/ipv6/seg6_hmac.c | 1 - + net/mptcp/crypto.c | 2 +- + net/mptcp/options.c | 2 +- + net/mptcp/subflow.c | 2 +- + security/integrity/integrity.h | 2 +- + security/keys/encrypted-keys/encrypted.c | 2 +- + security/keys/trusted-keys/trusted_tpm1.c | 2 +- + sound/soc/codecs/cros_ec_codec.c | 2 +- + 245 files changed, 4772 insertions(+), 1942 deletions(-) + delete mode 100644 arch/x86/crypto/aes_glue.c + delete mode 100644 drivers/char/hw_random/hisi-trng-v2.c + create mode 100644 drivers/crypto/hisilicon/trng/Makefile + create mode 100644 drivers/crypto/hisilicon/trng/trng.c + create mode 100644 drivers/crypto/qat/qat_4xxx/Makefile + create mode 100644 drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.c + create mode 100644 drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.h + create mode 100644 drivers/crypto/qat/qat_4xxx/adf_drv.c + create mode 100644 drivers/crypto/qat/qat_common/adf_gen2_hw_data.c + create mode 100644 drivers/crypto/qat/qat_common/adf_gen2_hw_data.h + create mode 100644 drivers/crypto/qat/qat_common/adf_gen4_hw_data.c + create mode 100644 drivers/crypto/qat/qat_common/adf_gen4_hw_data.h + create mode 100644 include/crypto/sha1.h + rename include/crypto/{sha.h => sha2.h} (77%) +Merging drm/drm-next (22f8c80566c4 Merge tag 'drm-misc-next-2020-11-18' of ssh://git.freedesktop.org/git/drm/drm-misc into drm-next) +$ git merge drm/drm-next +Auto-merging tools/testing/scatterlist/main.c +Auto-merging include/uapi/linux/media-bus-format.h +Auto-merging include/linux/console.h +Removing include/drm/ttm/ttm_set_memory.h +Removing include/drm/ttm/ttm_page_alloc.h +Auto-merging drivers/iommu/io-pgtable-arm.c +Removing drivers/gpu/drm/vkms/vkms_gem.c +Auto-merging drivers/gpu/drm/vc4/vc4_hdmi.c +Auto-merging drivers/gpu/drm/vc4/vc4_drv.h +Removing drivers/gpu/drm/ttm/ttm_page_alloc_dma.c +Removing drivers/gpu/drm/ttm/ttm_page_alloc.c +Auto-merging drivers/gpu/drm/rockchip/rockchip_lvds.c +Auto-merging drivers/gpu/drm/panfrost/panfrost_devfreq.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_gem.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_bo.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/nouveau/nouveau_bo.c +Auto-merging drivers/gpu/drm/mxsfb/mxsfb_kms.c +Auto-merging drivers/gpu/drm/mediatek/mtk_drm_crtc.c +Auto-merging drivers/gpu/drm/mcde/mcde_drv.c +Auto-merging drivers/gpu/drm/lima/lima_devfreq.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_perf.c +Auto-merging drivers/gpu/drm/i915/gvt/display.c +Auto-merging drivers/gpu/drm/i915/gt/intel_workarounds.c +Auto-merging drivers/gpu/drm/i915/gt/intel_mocs.c +Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/gt/intel_engine_cs.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_object_types.h +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/drm_gem_vram_helper.c +Auto-merging drivers/gpu/drm/ast/ast_mode.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/ast/ast_mode.c +Auto-merging drivers/gpu/drm/amd/display/dc/irq/dcn30/irq_service_dcn30.c +Auto-merging 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/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Resolved 'drivers/gpu/drm/ast/ast_mode.c' using previous resolution. +Resolved 'drivers/gpu/drm/nouveau/nouveau_bo.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d07e19aefd86] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/bridge/analogix,anx7625.yaml | 95 + + .../bindings/display/bridge/intel,keembay-dsi.yaml | 101 + + .../bindings/display/bridge/lontium,lt9611.yaml | 5 +- + .../devicetree/bindings/display/bridge/sii902x.txt | 4 + + .../bindings/display/intel,keembay-display.yaml | 72 + + .../bindings/display/intel,keembay-msscam.yaml | 43 + + .../bindings/display/panel/abt,y030xx067a.yaml | 62 + + .../bindings/display/panel/novatek,nt36672a.yaml | 87 + + .../bindings/display/panel/panel-simple-dsi.yaml | 7 + + .../bindings/display/panel/panel-simple.yaml | 2 + + .../bindings/display/ti/ti,am65x-dss.yaml | 11 + + .../bindings/display/ti/ti,j721e-dss.yaml | 11 + + .../devicetree/bindings/vendor-prefixes.yaml | 6 + + Documentation/driver-api/dma-buf.rst | 9 + + Documentation/gpu/drm-mm.rst | 4 +- + Documentation/gpu/i915.rst | 6 + + Documentation/gpu/todo.rst | 74 +- + Documentation/gpu/vkms.rst | 99 +- + MAINTAINERS | 18 +- + arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 4 + + drivers/dma-buf/dma-buf.c | 63 +- + drivers/dma-buf/dma-resv.c | 2 +- + drivers/dma-buf/heaps/heap-helpers.c | 10 +- + drivers/gpu/drm/Kconfig | 12 +- + drivers/gpu/drm/Makefile | 1 + + drivers/gpu/drm/amd/amdgpu/Makefile | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 56 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 27 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 34 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 48 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_df.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 181 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 41 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 98 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_fw_attestation.c | 142 + + drivers/gpu/drm/amd/amdgpu/amdgpu_fw_attestation.h | 30 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 93 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h | 5 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 11 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 39 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 169 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c | 523 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.h | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 114 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 10 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 167 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 38 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 324 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 45 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vf_error.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 293 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 10 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 110 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 2 +- + drivers/gpu/drm/amd/amdgpu/athub_v2_1.c | 1 + + drivers/gpu/drm/amd/amdgpu/atom.c | 24 +- + drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 6 - + drivers/gpu/drm/amd/amdgpu/atombios_i2c.c | 2 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/df_v1_7.c | 2 +- + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 180 +- + drivers/gpu/drm/amd/amdgpu/df_v3_6.h | 9 - + .../gpu/drm/amd/amdgpu/dimgrey_cavefish_reg_init.c | 54 + + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 275 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 19 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c | 13 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.h | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 49 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 24 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 193 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 4 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 6 + + drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 589 + + drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.h | 28 + + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 9 +- + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 39 + + drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 4 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c | 341 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_2.h | 32 + + drivers/gpu/drm/amd/amdgpu/nv.c | 154 +- + drivers/gpu/drm/amd/amdgpu/nv.h | 2 + + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 54 +- + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 56 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 29 +- + drivers/gpu/drm/amd/amdgpu/si.c | 2 +- + drivers/gpu/drm/amd/amdgpu/si_ih.c | 2 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 17 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 4 +- + drivers/gpu/drm/amd/amdgpu/umc_v8_7.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vangogh_reg_init.c | 50 + + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 12 +- + drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 6 + + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 43 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 3 - + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 4 +- + drivers/gpu/drm/amd/display/Kconfig | 10 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 958 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 3 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 2 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 126 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 - + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 4 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 39 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 17 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_trace.h | 565 +- + drivers/gpu/drm/amd/display/dc/Makefile | 5 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 187 +- + .../amd/display/dc/bios/command_table_helper2.c | 7 +- + .../dc/bios/dce112/command_table_helper2_dce112.c | 40 - + .../dc/bios/dce112/command_table_helper2_dce112.h | 3 - + drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 13 +- + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 8 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 36 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 27 +- + .../amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c | 3 +- + .../amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.c | 7 +- + .../drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 30 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 2 +- + .../gpu/drm/amd/display/dc/clk_mgr/dcn30/dalsmc.h | 1 + + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 14 +- + .../dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.c | 9 + + .../dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.h | 2 + + .../drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c | 241 + + .../drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.h | 164 + + .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 834 + + .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.h | 43 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 94 +- + drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 4 + + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 24 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 13 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 115 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 13 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 45 +- + drivers/gpu/drm/amd/display/dc/core/dc_sink.c | 1 - + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 12 +- + drivers/gpu/drm/amd/display/dc/dc.h | 43 +- + drivers/gpu/drm/amd/display/dc/dc_dsc.h | 10 +- + drivers/gpu/drm/amd/display/dc/dc_helper.c | 26 - + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 18 - + drivers/gpu/drm/amd/display/dc/dc_stream.h | 10 +- + drivers/gpu/drm/amd/display/dc/dc_trace.h | 39 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 12 +- + drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 20 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 4 +- + drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c | 4 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 24 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 51 +- + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 306 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 9 +- + drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 1 - + .../drm/amd/display/dc/dce100/dce100_resource.c | 9 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 16 +- + .../drm/amd/display/dc/dce110/dce110_resource.c | 11 +- + .../drm/amd/display/dc/dce112/dce112_resource.c | 11 +- + .../drm/amd/display/dc/dce120/dce120_resource.c | 9 +- + .../gpu/drm/amd/display/dc/dce60/dce60_resource.c | 7 - + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 13 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 2 - + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 153 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 1 - + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 13 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 5 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 31 - + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 2 + + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 8 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 8 - + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 4 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 6 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h | 18 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 59 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 9 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 2 +- + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.h | 2 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.c | 12 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.h | 4 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 41 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 3 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c | 15 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.h | 2 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 3 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 300 +- + drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 2 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c | 7 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.h | 2 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.c | 54 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.h | 5 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.h | 3 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 116 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h | 10 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 5 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 56 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.h | 9 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 124 +- + drivers/gpu/drm/amd/display/dc/dcn301/Makefile | 47 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_dccg.c | 75 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_dccg.h | 65 + + .../display/dc/dcn301/dcn301_dio_link_encoder.c | 192 + + .../display/dc/dcn301/dcn301_dio_link_encoder.h | 82 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_hubbub.c | 81 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_hubbub.h | 60 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_hwseq.c | 42 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_hwseq.h | 32 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_init.c | 145 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_init.h | 33 + + .../drm/amd/display/dc/dcn301/dcn301_panel_cntl.c | 218 + + .../drm/amd/display/dc/dcn301/dcn301_panel_cntl.h | 97 + + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 2011 + + .../drm/amd/display/dc/dcn301/dcn301_resource.h | 42 + + drivers/gpu/drm/amd/display/dc/dcn302/Makefile | 46 + + .../gpu/drm/amd/display/dc/dcn302/dcn302_dccg.h | 41 + + .../gpu/drm/amd/display/dc/dcn302/dcn302_hwseq.c | 233 + + .../gpu/drm/amd/display/dc/dcn302/dcn302_hwseq.h | 35 + + .../gpu/drm/amd/display/dc/dcn302/dcn302_init.c | 39 + + .../gpu/drm/amd/display/dc/dcn302/dcn302_init.h | 33 + + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 1563 + + .../drm/amd/display/dc/dcn302/dcn302_resource.h | 33 + + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 2 - + drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 24 +- + drivers/gpu/drm/amd/display/dc/dm_services.h | 42 +- + drivers/gpu/drm/amd/display/dc/dml/Makefile | 13 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 6 +- + .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 2 +- + .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 10 +- + .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 4 - + .../drm/amd/display/dc/dml/display_mode_structs.h | 2 - + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 2 - + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 2 - + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 24 +- + drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c | 6 +- + drivers/gpu/drm/amd/display/dc/dsc/rc_calc.h | 4 +- + drivers/gpu/drm/amd/display/dc/gpio/Makefile | 5 +- + .../amd/display/dc/gpio/dcn30/hw_factory_dcn30.c | 2 +- + .../amd/display/dc/gpio/dcn30/hw_factory_dcn30.h | 2 +- + .../amd/display/dc/gpio/dcn30/hw_translate_dcn30.c | 2 +- + .../amd/display/dc/gpio/dcn30/hw_translate_dcn30.h | 2 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 7 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 7 +- + drivers/gpu/drm/amd/display/dc/inc/core_status.h | 3 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 8 +- + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 41 +- + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 7 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 8 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 2 - + drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h | 6 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 5 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 2 - + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 3 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mcif_wb.h | 4 - + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 19 +- + drivers/gpu/drm/amd/display/dc/inc/hw/opp.h | 5 + + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 2 - + .../drm/amd/display/dc/inc/hw/timing_generator.h | 6 - + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 15 +- + drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/resource.h | 2 - + drivers/gpu/drm/amd/display/dc/irq/Makefile | 10 +- + .../amd/display/dc/irq/dcn30/irq_service_dcn30.c | 2 +- + .../amd/display/dc/irq/dcn30/irq_service_dcn30.h | 2 +- + .../amd/display/dc/irq/dcn302/irq_service_dcn302.c | 344 + + .../amd/display/dc/irq/dcn302/irq_service_dcn302.h | 33 + + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 4 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 54 +- + drivers/gpu/drm/amd/display/dmub/src/Makefile | 5 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn301.c | 55 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn301.h | 37 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn302.c | 55 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn302.h | 37 + + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 39 +- + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 16 +- + drivers/gpu/drm/amd/display/include/dal_types.h | 2 + + .../drm/amd/display/include/ddc_service_types.h | 2 + + drivers/gpu/drm/amd/display/include/dpcd_defs.h | 1 + + .../amd/display/include/grph_object_ctrl_defs.h | 13 + + .../drm/amd/display/modules/color/color_gamma.c | 124 +- + .../drm/amd/display/modules/color/color_gamma.h | 6 +- + .../drm/amd/display/modules/freesync/freesync.c | 55 +- + .../amd/display/modules/hdcp/hdcp1_transition.c | 2 +- + .../gpu/drm/amd/display/modules/hdcp/hdcp_log.c | 2 +- + .../drm/amd/display/modules/power/power_helpers.c | 8 +- + drivers/gpu/drm/amd/include/amd_shared.h | 2 + + .../amd/include/asic_reg/clk/clk_11_5_0_offset.h | 50 + + .../amd/include/asic_reg/clk/clk_11_5_0_sh_mask.h | 70 + + .../amd/include/asic_reg/dcn/dcn_3_0_1_offset.h | 13271 ++ + .../amd/include/asic_reg/dcn/dcn_3_0_1_sh_mask.h | 53357 ++++++ + .../amd/include/asic_reg/gc/gc_10_3_0_default.h | 1 + + .../drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 2 + + .../amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h | 33 + + .../drm/amd/include/asic_reg/gc/gc_9_4_1_sh_mask.h | 2 +- + .../include/asic_reg/mmhub/mmhub_2_3_0_default.h | 1253 + + .../include/asic_reg/mmhub/mmhub_2_3_0_offset.h | 2439 + + .../include/asic_reg/mmhub/mmhub_2_3_0_sh_mask.h | 10331 ++ + .../drm/amd/include/asic_reg/mp/mp_11_5_0_offset.h | 400 + + .../amd/include/asic_reg/mp/mp_11_5_0_sh_mask.h | 942 + + .../amd/include/asic_reg/nbio/nbio_7_2_0_offset.h | 31873 ++++ + .../amd/include/asic_reg/nbio/nbio_7_2_0_sh_mask.h | 152495 ++++++++++++++++++ + drivers/gpu/drm/amd/include/atombios.h | 20 +- + drivers/gpu/drm/amd/include/atomfirmware.h | 63 +- + .../drm/amd/include/dimgrey_cavefish_ip_offset.h | 1049 + + drivers/gpu/drm/amd/include/vangogh_ip_offset.h | 1516 + + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 21 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 49 +- + drivers/gpu/drm/amd/pm/inc/hwmgr.h | 21 +- + .../amd/pm/inc/smu11_driver_if_sienna_cichlid.h | 14 +- + .../gpu/drm/amd/pm/inc/smu11_driver_if_vangogh.h | 239 + + drivers/gpu/drm/amd/pm/inc/smu74_discrete.h | 3 +- + drivers/gpu/drm/amd/pm/inc/smu7_ppsmc.h | 6 + + drivers/gpu/drm/amd/pm/inc/smu_types.h | 74 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 4 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_5_pmfw.h | 120 + + drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h | 108 + + drivers/gpu/drm/amd/pm/powerplay/hwmgr/hwmgr.c | 10 +- + drivers/gpu/drm/amd/pm/powerplay/hwmgr/hwmgr_ppt.h | 8 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c | 123 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.h | 28 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h | 66 + + .../amd/pm/powerplay/hwmgr/process_pptables_v1_0.c | 192 +- + .../drm/amd/pm/powerplay/hwmgr/processpptables.c | 85 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 571 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.h | 20 + + .../drm/amd/pm/powerplay/hwmgr/smu7_powertune.c | 34 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_thermal.c | 11 + + .../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.c | 23 +- + .../pm/powerplay/hwmgr/vega10_processpptables.c | 88 +- + .../gpu/drm/amd/pm/powerplay/smumgr/fiji_smumgr.c | 3 +- + .../drm/amd/pm/powerplay/smumgr/polaris10_smumgr.c | 356 +- + .../drm/amd/pm/powerplay/smumgr/polaris10_smumgr.h | 1 + + .../gpu/drm/amd/pm/powerplay/smumgr/vegam_smumgr.c | 3 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 208 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/Makefile | 1 + + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 29 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 23 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 27 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 619 + + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 35 + + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 55 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 4 + + drivers/gpu/drm/amd/pm/swsmu/smu_internal.h | 8 +- + drivers/gpu/drm/arc/arcpgu_crtc.c | 4 +- + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 26 +- + drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 16 +- + drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 2 - + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 2 +- + drivers/gpu/drm/arm/hdlcd_crtc.c | 6 +- + drivers/gpu/drm/arm/hdlcd_drv.c | 2 +- + drivers/gpu/drm/arm/malidp_crtc.c | 26 +- + drivers/gpu/drm/arm/malidp_drv.c | 2 +- + drivers/gpu/drm/armada/armada_crtc.c | 30 +- + drivers/gpu/drm/armada/armada_drv.c | 10 +- + drivers/gpu/drm/armada/armada_gem.c | 12 +- + drivers/gpu/drm/armada/armada_gem.h | 2 - + drivers/gpu/drm/armada/armada_overlay.c | 2 +- + drivers/gpu/drm/aspeed/Kconfig | 1 + + drivers/gpu/drm/aspeed/aspeed_gfx.h | 2 +- + drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 80 +- + drivers/gpu/drm/ast/ast_cursor.c | 27 +- + drivers/gpu/drm/ast/ast_drv.c | 2 +- + drivers/gpu/drm/ast/ast_drv.h | 10 +- + drivers/gpu/drm/ast/ast_main.c | 7 +- + drivers/gpu/drm/ast/ast_mode.c | 27 +- + drivers/gpu/drm/ast/ast_tables.h | 6 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 17 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 7 +- + drivers/gpu/drm/bochs/bochs_drv.c | 2 +- + drivers/gpu/drm/bochs/bochs_kms.c | 1 - + drivers/gpu/drm/bridge/Kconfig | 13 + + drivers/gpu/drm/bridge/Makefile | 1 + + drivers/gpu/drm/bridge/adv7511/adv7511_audio.c | 6 +- + drivers/gpu/drm/bridge/analogix/Kconfig | 9 + + drivers/gpu/drm/bridge/analogix/Makefile | 1 + + drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 88 - + drivers/gpu/drm/bridge/analogix/anx7625.c | 1850 + + drivers/gpu/drm/bridge/analogix/anx7625.h | 390 + + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 1002 + + drivers/gpu/drm/bridge/lvds-codec.c | 11 +- + drivers/gpu/drm/bridge/sii902x.c | 100 +- + .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 2 +- + drivers/gpu/drm/bridge/tc358764.c | 107 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 146 +- + drivers/gpu/drm/bridge/ti-tpd12s015.c | 2 +- + drivers/gpu/drm/drm_atomic.c | 39 +- + drivers/gpu/drm/drm_atomic_helper.c | 34 +- + drivers/gpu/drm/drm_atomic_state_helper.c | 2 +- + drivers/gpu/drm/drm_atomic_uapi.c | 144 +- + drivers/gpu/drm/drm_blend.c | 13 + + drivers/gpu/drm/drm_bridge_connector.c | 2 +- + drivers/gpu/drm/drm_client.c | 38 +- + drivers/gpu/drm/drm_color_mgmt.c | 4 +- + drivers/gpu/drm/drm_connector.c | 8 +- + drivers/gpu/drm/drm_crtc.c | 40 + + drivers/gpu/drm/drm_crtc_internal.h | 3 + + drivers/gpu/drm/drm_dp_aux_dev.c | 2 +- + drivers/gpu/drm/drm_dp_helper.c | 235 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 4 +- + drivers/gpu/drm/drm_drv.c | 17 +- + drivers/gpu/drm/drm_edid.c | 6 +- + drivers/gpu/drm/drm_fb_helper.c | 276 +- + drivers/gpu/drm/drm_file.c | 2 + + drivers/gpu/drm/drm_fourcc.c | 1 + + drivers/gpu/drm/drm_framebuffer.c | 2 +- + drivers/gpu/drm/drm_gem.c | 84 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 100 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 53 +- + drivers/gpu/drm/drm_gem_ttm_helper.c | 37 + + drivers/gpu/drm/drm_gem_vram_helper.c | 298 +- + drivers/gpu/drm/drm_internal.h | 13 +- + drivers/gpu/drm/drm_ioctl.c | 2 +- + drivers/gpu/drm/drm_mode_object.c | 2 +- + drivers/gpu/drm/drm_modes.c | 4 +- + drivers/gpu/drm/drm_pci.c | 6 +- + drivers/gpu/drm/drm_plane.c | 73 + + drivers/gpu/drm/drm_prime.c | 37 +- + drivers/gpu/drm/drm_scdc_helper.c | 2 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 14 +- + drivers/gpu/drm/drm_vblank.c | 15 +- + drivers/gpu/drm/drm_vm.c | 3 - + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 15 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 4 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 18 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 27 +- + drivers/gpu/drm/exynos/exynos7_drm_decon.c | 1 + + drivers/gpu/drm/exynos/exynos_drm_crtc.c | 16 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 12 +- + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 1 + + drivers/gpu/drm/exynos/exynos_drm_gem.c | 23 +- + drivers/gpu/drm/exynos/exynos_drm_gem.h | 2 - + drivers/gpu/drm/exynos/exynos_drm_gsc.c | 1 + + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 8 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 5 +- + drivers/gpu/drm/gma500/accel_2d.c | 292 - + drivers/gpu/drm/gma500/cdv_device.c | 1 - + drivers/gpu/drm/gma500/cdv_intel_dp.c | 7 +- + drivers/gpu/drm/gma500/framebuffer.c | 110 +- + drivers/gpu/drm/gma500/gem.c | 22 +- + drivers/gpu/drm/gma500/gem.h | 3 + + drivers/gpu/drm/gma500/gtt.c | 52 +- + drivers/gpu/drm/gma500/gtt.h | 3 - + drivers/gpu/drm/gma500/mdfld_device.c | 1 - + drivers/gpu/drm/gma500/oaktrail_device.c | 1 - + drivers/gpu/drm/gma500/psb_device.c | 1 - + drivers/gpu/drm/gma500/psb_drv.c | 14 +- + drivers/gpu/drm/gma500/psb_drv.h | 11 - + drivers/gpu/drm/hisilicon/hibmc/Makefile | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 93 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 22 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 33 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c | 99 + + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 42 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 10 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 2 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 74 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 7 +- + drivers/gpu/drm/i915/display/intel_bios.c | 58 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 52 +- + drivers/gpu/drm/i915/display/intel_color.c | 124 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 13 +- + drivers/gpu/drm/i915/display/intel_csr.c | 12 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 770 +- + drivers/gpu/drm/i915/display/intel_ddi.h | 11 +- + drivers/gpu/drm/i915/display/intel_display.c | 488 +- + drivers/gpu/drm/i915/display/intel_display.h | 34 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 9 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 77 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 3 + + drivers/gpu/drm/i915/display/intel_display_types.h | 57 +- + drivers/gpu/drm/i915/display/intel_dp.c | 682 +- + drivers/gpu/drm/i915/display/intel_dp.h | 22 +- + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 3 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 554 +- + .../gpu/drm/i915/display/intel_dp_link_training.h | 17 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 38 +- + drivers/gpu/drm/i915/display/intel_dpio_phy.c | 23 +- + drivers/gpu/drm/i915/display/intel_dpio_phy.h | 2 + + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 120 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 17 + + drivers/gpu/drm/i915/display/intel_dsi.h | 1 + + drivers/gpu/drm/i915/display/intel_fbc.c | 7 + + drivers/gpu/drm/i915/display/intel_gmbus.c | 15 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 89 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 18 +- + drivers/gpu/drm/i915/display/intel_hotplug.c | 64 +- + drivers/gpu/drm/i915/display/intel_hotplug.h | 3 +- + drivers/gpu/drm/i915/display/intel_lspcon.c | 97 +- + drivers/gpu/drm/i915/display/intel_lspcon.h | 5 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 10 + + drivers/gpu/drm/i915/display/intel_opregion.c | 6 +- + drivers/gpu/drm/i915/display/intel_psr.c | 208 +- + drivers/gpu/drm/i915/display/intel_psr.h | 10 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 74 +- + drivers/gpu/drm/i915/display/intel_tc.c | 8 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 13 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 8 + + drivers/gpu/drm/i915/gem/i915_gem_client_blt.c | 18 +- + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 13 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 23 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 23 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 17 +- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 21 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 48 + + .../gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 18 +- + drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c | 14 +- + drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 6 +- + drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 17 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 39 +- + drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 6 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 37 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 6 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 11 +- + drivers/gpu/drm/i915/gt/intel_gtt.c | 10 +- + drivers/gpu/drm/i915/gt/intel_gtt.h | 2 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 129 +- + drivers/gpu/drm/i915/gt/intel_lrc.h | 4 - + drivers/gpu/drm/i915/gt/intel_lrc_reg.h | 3 + + drivers/gpu/drm/i915/gt/intel_mocs.c | 45 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 4 +- + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 1 + + drivers/gpu/drm/i915/gt/intel_rps.c | 58 +- + drivers/gpu/drm/i915/gt/intel_sseu.c | 2 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 143 +- + drivers/gpu/drm/i915/gt/mock_engine.c | 29 +- + .../gpu/drm/i915/gt/selftest_engine_heartbeat.c | 13 +- + drivers/gpu/drm/i915/gt/selftest_rps.c | 8 +- + drivers/gpu/drm/i915/gt/selftest_timeline.c | 378 +- + drivers/gpu/drm/i915/gt/sysfs_engines.c | 10 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 24 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 132 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 1 + + drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 31 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 80 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h | 5 + + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 6 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 28 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 2 + + drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h | 6 +- + drivers/gpu/drm/i915/gvt/display.c | 15 +- + drivers/gpu/drm/i915/gvt/handlers.c | 14 +- + drivers/gpu/drm/i915/gvt/reg.h | 4 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 67 +- + drivers/gpu/drm/i915/i915_debugfs.c | 5 +- + drivers/gpu/drm/i915/i915_drv.c | 72 +- + drivers/gpu/drm/i915/i915_drv.h | 15 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 2 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 68 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 10 +- + drivers/gpu/drm/i915/i915_irq.c | 770 +- + drivers/gpu/drm/i915/i915_irq.h | 3 + + drivers/gpu/drm/i915/i915_pci.c | 28 +- + drivers/gpu/drm/i915/i915_perf.c | 8 +- + drivers/gpu/drm/i915/i915_pmu.c | 96 +- + drivers/gpu/drm/i915/i915_pmu.h | 10 +- + drivers/gpu/drm/i915/i915_reg.h | 430 +- + drivers/gpu/drm/i915/i915_scatterlist.h | 19 +- + drivers/gpu/drm/i915/i915_suspend.c | 80 +- + drivers/gpu/drm/i915/i915_suspend.h | 4 +- + drivers/gpu/drm/i915/intel_device_info.c | 1 + + drivers/gpu/drm/i915/intel_device_info.h | 1 + + drivers/gpu/drm/i915/intel_dram.c | 23 +- + drivers/gpu/drm/i915/intel_memory_region.c | 2 +- + drivers/gpu/drm/i915/intel_pch.c | 6 +- + drivers/gpu/drm/i915/intel_pm.c | 37 +- + drivers/gpu/drm/i915/intel_pm.h | 2 - + drivers/gpu/drm/i915/intel_sideband.c | 15 + + drivers/gpu/drm/i915/intel_sideband.h | 2 + + drivers/gpu/drm/i915/intel_uncore.c | 207 +- + drivers/gpu/drm/i915/intel_uncore.h | 4 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 5 +- + drivers/gpu/drm/imx/dcss/dcss-crtc.c | 13 +- + drivers/gpu/drm/imx/dcss/dcss-kms.c | 16 +- + drivers/gpu/drm/imx/dcss/dcss-plane.c | 2 - + drivers/gpu/drm/imx/imx-drm-core.c | 2 +- + drivers/gpu/drm/imx/ipuv3-crtc.c | 16 +- + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 311 +- + drivers/gpu/drm/ingenic/ingenic-drm.h | 3 + + drivers/gpu/drm/ingenic/ingenic-ipu.c | 23 +- + drivers/gpu/drm/kmb/Kconfig | 13 + + drivers/gpu/drm/kmb/Makefile | 2 + + drivers/gpu/drm/kmb/kmb_crtc.c | 214 + + drivers/gpu/drm/kmb/kmb_drv.c | 602 + + drivers/gpu/drm/kmb/kmb_drv.h | 88 + + drivers/gpu/drm/kmb/kmb_dsi.c | 1561 + + drivers/gpu/drm/kmb/kmb_dsi.h | 387 + + drivers/gpu/drm/kmb/kmb_plane.c | 522 + + drivers/gpu/drm/kmb/kmb_plane.h | 67 + + drivers/gpu/drm/kmb/kmb_regs.h | 725 + + drivers/gpu/drm/lima/lima_devfreq.c | 13 +- + drivers/gpu/drm/lima/lima_devfreq.h | 1 - + drivers/gpu/drm/lima/lima_drv.c | 4 +- + drivers/gpu/drm/lima/lima_gem.c | 6 +- + drivers/gpu/drm/lima/lima_sched.c | 14 +- + drivers/gpu/drm/mcde/mcde_drv.c | 6 +- + drivers/gpu/drm/mediatek/mtk_disp_color.c | 5 +- + drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 5 +- + drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 5 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 27 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 11 +- + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 31 +- + drivers/gpu/drm/mediatek/mtk_drm_gem.h | 4 +- + drivers/gpu/drm/meson/meson_crtc.c | 12 +- + drivers/gpu/drm/meson/meson_drv.c | 14 +- + drivers/gpu/drm/meson/meson_dw_hdmi.c | 13 +- + drivers/gpu/drm/meson/meson_vclk.c | 8 +- + drivers/gpu/drm/meson/meson_venc.c | 4 +- + drivers/gpu/drm/mga/mga_dma.c | 10 +- + drivers/gpu/drm/mga/mga_state.c | 2 - + drivers/gpu/drm/mgag200/mgag200_drv.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 15 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 34 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 10 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 21 +- + drivers/gpu/drm/msm/msm_drv.c | 17 +- + drivers/gpu/drm/msm/msm_drv.h | 5 +- + drivers/gpu/drm/msm/msm_gem.c | 19 +- + drivers/gpu/drm/msm/msm_gem_prime.c | 13 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 2 +- + drivers/gpu/drm/mxsfb/mxsfb_kms.c | 16 +- + drivers/gpu/drm/nouveau/Kconfig | 1 + + drivers/gpu/drm/nouveau/dispnv50/head.c | 11 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 340 +- + drivers/gpu/drm/nouveau/nouveau_bo.h | 6 +- + drivers/gpu/drm/nouveau/nouveau_chan.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 14 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 1 - + drivers/gpu/drm/nouveau/nouveau_gem.c | 16 +- + drivers/gpu/drm/nouveau/nouveau_gem.h | 4 +- + drivers/gpu/drm/nouveau/nouveau_mem.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_mem.h | 4 +- + drivers/gpu/drm/nouveau/nouveau_prime.c | 22 +- + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 19 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 34 +- + drivers/gpu/drm/nouveau/nvkm/core/firmware.c | 9 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bios/pll.c | 1 - + drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c | 3 - + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv50.c | 1 - + drivers/gpu/drm/nouveau/nvkm/subdev/top/gk104.c | 1 - + drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 2 +- + drivers/gpu/drm/omapdrm/dss/Kconfig | 4 +- + drivers/gpu/drm/omapdrm/dss/base.c | 2 +- + drivers/gpu/drm/omapdrm/dss/dispc.c | 7 +- + drivers/gpu/drm/omapdrm/dss/dispc.h | 2 +- + drivers/gpu/drm/omapdrm/dss/dispc_coefs.c | 2 +- + drivers/gpu/drm/omapdrm/dss/dsi.c | 16 +- + drivers/gpu/drm/omapdrm/dss/dss.c | 7 +- + drivers/gpu/drm/omapdrm/dss/hdmi.h | 2 +- + drivers/gpu/drm/omapdrm/dss/hdmi4.c | 8 +- + drivers/gpu/drm/omapdrm/dss/hdmi4_cec.c | 2 +- + drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 2 +- + drivers/gpu/drm/omapdrm/dss/hdmi4_core.h | 2 +- + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 8 +- + drivers/gpu/drm/omapdrm/dss/hdmi5_core.c | 2 +- + drivers/gpu/drm/omapdrm/dss/hdmi5_core.h | 2 +- + drivers/gpu/drm/omapdrm/dss/hdmi_phy.c | 2 +- + drivers/gpu/drm/omapdrm/dss/hdmi_pll.c | 2 +- + drivers/gpu/drm/omapdrm/dss/hdmi_wp.c | 2 +- + drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c | 2 +- + drivers/gpu/drm/omapdrm/dss/omapdss.h | 2 +- + drivers/gpu/drm/omapdrm/dss/output.c | 2 +- + drivers/gpu/drm/omapdrm/dss/pll.c | 2 +- + drivers/gpu/drm/omapdrm/dss/venc.c | 7 +- + drivers/gpu/drm/omapdrm/dss/video-pll.c | 2 +- + drivers/gpu/drm/omapdrm/omap_connector.c | 2 +- + drivers/gpu/drm/omapdrm/omap_crtc.c | 23 +- + drivers/gpu/drm/omapdrm/omap_debugfs.c | 2 +- + drivers/gpu/drm/omapdrm/omap_dmm_priv.h | 2 +- + drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 9 +- + drivers/gpu/drm/omapdrm/omap_dmm_tiler.h | 2 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 13 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 2 +- + drivers/gpu/drm/omapdrm/omap_encoder.c | 2 +- + drivers/gpu/drm/omapdrm/omap_fb.c | 2 +- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 2 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 23 +- + drivers/gpu/drm/omapdrm/omap_gem.h | 2 - + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 2 +- + drivers/gpu/drm/omapdrm/omap_irq.c | 8 +- + drivers/gpu/drm/omapdrm/omap_plane.c | 2 +- + drivers/gpu/drm/omapdrm/tcm-sita.c | 2 +- + drivers/gpu/drm/panel/Kconfig | 42 + + drivers/gpu/drm/panel/Makefile | 4 + + drivers/gpu/drm/panel/panel-abt-y030xx067a.c | 363 + + drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 2 +- + drivers/gpu/drm/panel/panel-novatek-nt36672a.c | 711 + + drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 20 +- + drivers/gpu/drm/panel/panel-raydium-rm68200.c | 14 +- + drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 7 +- + drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 2 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c | 40 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 9 + + drivers/gpu/drm/panel/panel-samsung-sofef00.c | 351 + + drivers/gpu/drm/panel/panel-simple.c | 37 +- + drivers/gpu/drm/panel/panel-sitronix-st7703.c | 2 +- + drivers/gpu/drm/panel/panel-tdo-tl070wsh30.c | 250 + + drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 7 +- + drivers/gpu/drm/panel/panel-tpo-tpg110.c | 3 +- + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 7 +- + drivers/gpu/drm/panfrost/panfrost_device.c | 11 +- + drivers/gpu/drm/panfrost/panfrost_device.h | 7 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 4 +- + drivers/gpu/drm/panfrost/panfrost_gem.c | 2 + + drivers/gpu/drm/panfrost/panfrost_job.c | 182 +- + drivers/gpu/drm/panfrost/panfrost_mmu.c | 1 + + drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 14 +- + drivers/gpu/drm/pl111/pl111_debugfs.c | 2 +- + drivers/gpu/drm/pl111/pl111_display.c | 2 +- + drivers/gpu/drm/pl111/pl111_drv.c | 6 +- + drivers/gpu/drm/qxl/qxl_debugfs.c | 2 +- + drivers/gpu/drm/qxl/qxl_display.c | 28 +- + drivers/gpu/drm/qxl/qxl_draw.c | 14 +- + drivers/gpu/drm/qxl/qxl_drv.h | 30 +- + drivers/gpu/drm/qxl/qxl_ioctl.c | 5 +- + drivers/gpu/drm/qxl/qxl_kms.c | 4 +- + drivers/gpu/drm/qxl/qxl_object.c | 103 +- + drivers/gpu/drm/qxl/qxl_object.h | 27 +- + drivers/gpu/drm/qxl/qxl_prime.c | 12 +- + drivers/gpu/drm/qxl/qxl_release.c | 4 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 113 +- + drivers/gpu/drm/r128/ati_pcigart.c | 2 +- + drivers/gpu/drm/radeon/radeon.h | 4 +- + drivers/gpu/drm/radeon/radeon_asic.c | 1 + + drivers/gpu/drm/radeon/radeon_asic.h | 1 + + drivers/gpu/drm/radeon/radeon_display.c | 9 +- + drivers/gpu/drm/radeon/radeon_drv.c | 112 +- + drivers/gpu/drm/radeon/radeon_gem.c | 30 +- + drivers/gpu/drm/radeon/radeon_kms.c | 49 +- + drivers/gpu/drm/radeon/radeon_object.c | 126 +- + drivers/gpu/drm/radeon/radeon_object.h | 7 +- + drivers/gpu/drm/radeon/radeon_pm.c | 29 +- + drivers/gpu/drm/radeon/radeon_prime.c | 20 - + drivers/gpu/drm/radeon/radeon_ttm.c | 293 +- + drivers/gpu/drm/radeon/sumo_dpm.c | 20 + + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 21 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 2 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 4 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 9 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 35 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.h | 4 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 24 +- + drivers/gpu/drm/rockchip/rockchip_lvds.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_rgb.c | 1 + + drivers/gpu/drm/savage/savage_bci.c | 11 - + drivers/gpu/drm/scheduler/sched_entity.c | 3 + + drivers/gpu/drm/scheduler/sched_main.c | 2 +- + drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c | 40 +- + drivers/gpu/drm/selftests/test-drm_framebuffer.c | 3 +- + drivers/gpu/drm/selftests/test-drm_mm.c | 2 +- + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 2 +- + drivers/gpu/drm/sti/sti_crtc.c | 6 +- + drivers/gpu/drm/sti/sti_drv.c | 2 +- + drivers/gpu/drm/sti/sti_hdmi.c | 6 + + drivers/gpu/drm/sti/sti_hdmi.h | 6 - + drivers/gpu/drm/stm/drv.c | 2 +- + drivers/gpu/drm/stm/ltdc.c | 6 +- + drivers/gpu/drm/sun4i/sun4i_crtc.c | 17 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 2 +- + drivers/gpu/drm/tegra/dc.c | 20 +- + drivers/gpu/drm/tegra/drm.c | 9 +- + drivers/gpu/drm/tegra/gem.c | 31 +- + drivers/gpu/drm/tidss/tidss_crtc.c | 20 +- + drivers/gpu/drm/tidss/tidss_dispc.c | 9 +- + drivers/gpu/drm/tidss/tidss_drv.c | 2 +- + drivers/gpu/drm/tidss/tidss_plane.c | 2 + + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 70 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 46 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.h | 7 +- + drivers/gpu/drm/tiny/cirrus.c | 12 +- + drivers/gpu/drm/tiny/gm12u320.c | 68 +- + drivers/gpu/drm/tiny/hx8357d.c | 2 +- + drivers/gpu/drm/tiny/ili9225.c | 2 +- + drivers/gpu/drm/tiny/ili9341.c | 2 +- + drivers/gpu/drm/tiny/ili9486.c | 2 +- + drivers/gpu/drm/tiny/mi0283qt.c | 2 +- + drivers/gpu/drm/tiny/repaper.c | 2 +- + drivers/gpu/drm/tiny/st7586.c | 2 +- + drivers/gpu/drm/tiny/st7735r.c | 2 +- + drivers/gpu/drm/ttm/Makefile | 5 +- + drivers/gpu/drm/ttm/ttm_agp_backend.c | 5 +- + drivers/gpu/drm/ttm/ttm_bo.c | 290 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 175 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 43 +- + drivers/gpu/drm/ttm/ttm_memory.c | 13 +- + drivers/gpu/drm/ttm/ttm_page_alloc.c | 1189 - + drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 1239 - + drivers/gpu/drm/ttm/ttm_pool.c | 667 + + drivers/gpu/drm/ttm/ttm_range_manager.c | 4 +- + drivers/gpu/drm/ttm/ttm_resource.c | 12 +- + drivers/gpu/drm/ttm/ttm_tt.c | 260 +- + drivers/gpu/drm/tve200/tve200_drv.c | 6 +- + drivers/gpu/drm/udl/udl_connector.c | 8 +- + drivers/gpu/drm/udl/udl_drv.c | 5 +- + drivers/gpu/drm/udl/udl_drv.h | 6 +- + drivers/gpu/drm/udl/udl_main.c | 23 +- + drivers/gpu/drm/udl/udl_modeset.c | 12 +- + drivers/gpu/drm/v3d/v3d_drv.c | 38 +- + drivers/gpu/drm/v3d/v3d_gem.c | 2 + + drivers/gpu/drm/v3d/v3d_sched.c | 2 +- + drivers/gpu/drm/vboxvideo/vbox_drv.c | 4 +- + drivers/gpu/drm/vboxvideo/vbox_mode.c | 17 +- + drivers/gpu/drm/vc4/vc4_bo.c | 28 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 19 +- + drivers/gpu/drm/vc4/vc4_debugfs.c | 4 +- + drivers/gpu/drm/vc4/vc4_drv.c | 12 - + drivers/gpu/drm/vc4/vc4_drv.h | 6 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 25 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 3 +- + drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 6 +- + drivers/gpu/drm/vc4/vc4_hvs.c | 4 +- + drivers/gpu/drm/vc4/vc4_perfmon.c | 2 +- + drivers/gpu/drm/vc4/vc4_txp.c | 19 +- + drivers/gpu/drm/vc4/vc4_v3d.c | 4 +- + drivers/gpu/drm/vgem/vgem_drv.c | 39 +- + drivers/gpu/drm/vgem/vgem_fence.c | 2 +- + drivers/gpu/drm/via/via_dma.c | 2 - + drivers/gpu/drm/via/via_mm.c | 2 +- + drivers/gpu/drm/virtio/Makefile | 2 +- + drivers/gpu/drm/virtio/virtgpu_debugfs.c | 26 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 12 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 6 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 79 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 185 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 34 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 42 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 23 +- + drivers/gpu/drm/virtio/virtgpu_prime.c | 48 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 154 +- + drivers/gpu/drm/virtio/virtgpu_vram.c | 164 + + drivers/gpu/drm/vkms/Makefile | 1 - + drivers/gpu/drm/vkms/vkms_composer.c | 17 +- + drivers/gpu/drm/vkms/vkms_crtc.c | 24 +- + drivers/gpu/drm/vkms/vkms_drv.c | 32 +- + drivers/gpu/drm/vkms/vkms_drv.h | 29 - + drivers/gpu/drm/vkms/vkms_gem.c | 248 - + drivers/gpu/drm/vkms/vkms_plane.c | 12 +- + drivers/gpu/drm/vkms/vkms_writeback.c | 17 +- + drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 95 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 34 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 12 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 232 +- + drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 2 +- + drivers/gpu/drm/xen/xen_drm_front.c | 46 +- + drivers/gpu/drm/xen/xen_drm_front.h | 2 + + drivers/gpu/drm/xen/xen_drm_front_gem.c | 33 +- + drivers/gpu/drm/xen/xen_drm_front_gem.h | 6 +- + drivers/gpu/drm/xlnx/zynqmp_disp.c | 18 +- + drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 16 +- + drivers/gpu/drm/zte/zx_drm_drv.c | 2 +- + drivers/gpu/drm/zte/zx_vou.c | 6 +- + drivers/gpu/host1x/bus.c | 1 + + drivers/gpu/vga/vga_switcheroo.c | 7 +- + drivers/iommu/io-pgtable-arm.c | 11 +- + .../media/common/videobuf2/videobuf2-dma-contig.c | 17 +- + drivers/media/common/videobuf2/videobuf2-dma-sg.c | 19 +- + drivers/media/common/videobuf2/videobuf2-vmalloc.c | 21 +- + drivers/misc/fastrpc.c | 6 +- + drivers/usb/misc/sisusbvga/sisusb_con.c | 21 - + drivers/video/console/dummycon.c | 20 - + drivers/video/console/sticore.c | 10 +- + drivers/video/fbdev/atafb.c | 8 - + drivers/video/fbdev/atmel_lcdfb.c | 2 +- + drivers/video/fbdev/aty/radeon_base.c | 4 +- + drivers/video/fbdev/cirrusfb.c | 3 +- + drivers/video/fbdev/core/bitblit.c | 3 - + drivers/video/fbdev/core/fbcmap.c | 2 +- + drivers/video/fbdev/core/fbcon.c | 113 +- + drivers/video/fbdev/core/fbcon_ccw.c | 1 - + drivers/video/fbdev/core/fbcon_cw.c | 1 - + drivers/video/fbdev/core/fbcon_rotate.c | 4 +- + drivers/video/fbdev/core/fbcon_ud.c | 1 - + drivers/video/fbdev/core/fbmem.c | 49 +- + drivers/video/fbdev/core/softcursor.c | 2 - + drivers/video/fbdev/core/tileblit.c | 6 +- + drivers/video/fbdev/fsl-diu-fb.c | 3 +- + drivers/video/fbdev/matrox/matroxfb_base.c | 8 +- + drivers/video/fbdev/mx3fb.c | 2 - + drivers/video/fbdev/nvidia/nv_of.c | 3 +- + .../omap2/omapfb/displays/connector-analog-tv.c | 7 +- + .../fbdev/omap2/omapfb/displays/connector-dvi.c | 7 +- + .../fbdev/omap2/omapfb/displays/connector-hdmi.c | 7 +- + .../video/fbdev/omap2/omapfb/displays/panel-dpi.c | 7 +- + .../omapfb/displays/panel-sharp-ls037v7dw01.c | 7 +- + .../omap2/omapfb/displays/panel-sony-acx565akm.c | 7 +- + .../omap2/omapfb/displays/panel-tpo-td043mtea1.c | 7 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c | 10 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c | 10 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c | 10 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c | 16 +- + drivers/video/fbdev/omap2/omapfb/dss/venc.c | 6 +- + drivers/video/fbdev/omap2/omapfb/dss/video-pll.c | 20 +- + drivers/video/fbdev/riva/riva_hw.c | 14 +- + drivers/video/fbdev/sbuslib.c | 124 +- + drivers/video/fbdev/sh_mobile_lcdcfb.c | 7 +- + drivers/video/fbdev/sis/300vtbl.h | 2 - + drivers/video/fbdev/sis/sis_accel.h | 14 +- + drivers/video/hdmi.c | 11 +- + include/drm/amd_asic_type.h | 2 + + include/drm/drm_atomic.h | 16 +- + include/drm/drm_atomic_helper.h | 4 +- + include/drm/drm_client.h | 7 +- + include/drm/drm_connector.h | 2 +- + include/drm/drm_crtc.h | 16 + + include/drm/drm_device.h | 6 +- + include/drm/drm_dp_helper.h | 134 +- + include/drm/drm_drv.h | 92 +- + include/drm/drm_dsc.h | 3 +- + include/drm/drm_encoder.h | 1 - + include/drm/drm_gem.h | 7 +- + include/drm/drm_gem_cma_helper.h | 8 +- + include/drm/drm_gem_shmem_helper.h | 4 +- + include/drm/drm_gem_ttm_helper.h | 6 + + include/drm/drm_gem_vram_helper.h | 25 +- + include/drm/drm_mode_config.h | 25 +- + include/drm/drm_modeset_helper_vtables.h | 22 +- + include/drm/drm_plane.h | 21 + + include/drm/drm_prime.h | 5 +- + include/drm/i915_pciids.h | 141 +- + include/drm/ttm/ttm_bo_api.h | 126 +- + include/drm/ttm/ttm_bo_driver.h | 114 +- + include/drm/ttm/ttm_caching.h | 36 + + include/drm/ttm/ttm_page_alloc.h | 122 - + include/drm/ttm/ttm_placement.h | 15 - + include/drm/ttm/ttm_pool.h | 91 + + include/drm/ttm/ttm_resource.h | 12 +- + include/drm/ttm/ttm_set_memory.h | 150 - + include/drm/ttm/ttm_tt.h | 82 +- + include/linux/console.h | 1 - + include/linux/dma-buf-map.h | 266 + + include/linux/dma-buf.h | 18 +- + include/linux/font.h | 3 +- + include/linux/platform_data/shmob_drm.h | 2 - + include/linux/scatterlist.h | 6 - + include/uapi/drm/amdgpu_drm.h | 6 +- + include/uapi/drm/drm_fourcc.h | 156 +- + include/uapi/drm/drm_mode.h | 6 + + include/uapi/drm/virtgpu_drm.h | 39 +- + include/uapi/linux/kd.h | 2 +- + include/uapi/linux/media-bus-format.h | 3 +- + include/uapi/linux/virtio_gpu.h | 78 + + lib/fonts/font_10x18.c | 1 + + lib/fonts/font_6x10.c | 1 + + lib/fonts/font_6x11.c | 1 + + lib/fonts/font_6x8.c | 1 + + lib/fonts/font_7x14.c | 1 + + lib/fonts/font_8x16.c | 1 + + lib/fonts/font_8x8.c | 1 + + lib/fonts/font_acorn_8x8.c | 1 + + lib/fonts/font_mini_4x6.c | 1 + + lib/fonts/font_pearl_8x8.c | 1 + + lib/fonts/font_sun12x22.c | 1 + + lib/fonts/font_sun8x16.c | 1 + + lib/fonts/font_ter16x32.c | 1 + + tools/testing/scatterlist/main.c | 2 +- + 1013 files changed, 308732 insertions(+), 13559 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml + create mode 100644 Documentation/devicetree/bindings/display/bridge/intel,keembay-dsi.yaml + create mode 100644 Documentation/devicetree/bindings/display/intel,keembay-display.yaml + create mode 100644 Documentation/devicetree/bindings/display/intel,keembay-msscam.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/abt,y030xx067a.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/novatek,nt36672a.yaml + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fw_attestation.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fw_attestation.h + create mode 100755 drivers/gpu/drm/amd/amdgpu/dimgrey_cavefish_reg_init.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_2.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vangogh_reg_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dc_trace.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_dccg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_dccg.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_dio_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_dio_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_hubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_hubbub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_hwseq.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_hwseq.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_init.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_panel_cntl.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_panel_cntl.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_dccg.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_hwseq.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_hwseq.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_init.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.h + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn302/irq_service_dcn302.c + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn302/irq_service_dcn302.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn301.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn301.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn302.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn302.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/clk/clk_11_5_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/clk/clk_11_5_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_1_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_1_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_2_3_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_2_3_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_2_3_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_11_5_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_11_5_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_2_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_2_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/dimgrey_cavefish_ip_offset.h + create mode 100644 drivers/gpu/drm/amd/include/vangogh_ip_offset.h + create mode 100644 drivers/gpu/drm/amd/pm/inc/smu11_driver_if_vangogh.h + create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v11_5_pmfw.h + create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h + create mode 100644 drivers/gpu/drm/bridge/analogix/anx7625.c + create mode 100644 drivers/gpu/drm/bridge/analogix/anx7625.h + create mode 100644 drivers/gpu/drm/bridge/lontium-lt9611uxc.c + create mode 100644 drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c + create mode 100644 drivers/gpu/drm/kmb/Kconfig + create mode 100644 drivers/gpu/drm/kmb/Makefile + create mode 100644 drivers/gpu/drm/kmb/kmb_crtc.c + create mode 100644 drivers/gpu/drm/kmb/kmb_drv.c + create mode 100644 drivers/gpu/drm/kmb/kmb_drv.h + create mode 100644 drivers/gpu/drm/kmb/kmb_dsi.c + create mode 100644 drivers/gpu/drm/kmb/kmb_dsi.h + create mode 100644 drivers/gpu/drm/kmb/kmb_plane.c + create mode 100644 drivers/gpu/drm/kmb/kmb_plane.h + create mode 100644 drivers/gpu/drm/kmb/kmb_regs.h + create mode 100644 drivers/gpu/drm/panel/panel-abt-y030xx067a.c + create mode 100644 drivers/gpu/drm/panel/panel-novatek-nt36672a.c + create mode 100644 drivers/gpu/drm/panel/panel-samsung-sofef00.c + create mode 100644 drivers/gpu/drm/panel/panel-tdo-tl070wsh30.c + delete mode 100644 drivers/gpu/drm/ttm/ttm_page_alloc.c + delete mode 100644 drivers/gpu/drm/ttm/ttm_page_alloc_dma.c + create mode 100644 drivers/gpu/drm/ttm/ttm_pool.c + create mode 100644 drivers/gpu/drm/virtio/virtgpu_vram.c + delete mode 100644 drivers/gpu/drm/vkms/vkms_gem.c + create mode 100644 include/drm/ttm/ttm_caching.h + delete mode 100644 include/drm/ttm/ttm_page_alloc.h + create mode 100644 include/drm/ttm/ttm_pool.h + delete mode 100644 include/drm/ttm/ttm_set_memory.h + create mode 100644 include/linux/dma-buf-map.h +Merging amdgpu/drm-next (7ff818f97c30 drm/amdgpu: Enable GPU reset for vangogh) +$ git merge amdgpu/drm-next +Auto-merging drivers/gpu/drm/scheduler/sched_main.c +Auto-merging drivers/gpu/drm/radeon/radeon_ttm.c +Auto-merging drivers/gpu/drm/radeon/radeon_prime.c +Auto-merging drivers/gpu/drm/radeon/radeon_kms.c +Auto-merging drivers/gpu/drm/radeon/radeon_gem.c +Auto-merging drivers/gpu/drm/radeon/radeon_drv.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/radeon_drv.c +Auto-merging drivers/gpu/drm/radeon/radeon.h +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c +Auto-merging drivers/gpu/drm/amd/amdgpu/nv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c' using previous resolution. +Resolved 'drivers/gpu/drm/radeon/radeon_drv.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 611b00da2768] Merge remote-tracking branch 'amdgpu/drm-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/amd/amdgpu/Makefile | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 14 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 227 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fw_attestation.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 29 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 35 + + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 106 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pll.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h | 37 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 60 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 151 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 30 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 13 +- + drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 3 - + drivers/gpu/drm/amd/amdgpu/cik_ih.c | 2 + + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 16 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 3 - + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 44 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 42 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.h | 1 - + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 17 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.h | 10 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 63 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 5 + + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 70 +- + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 7 + + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 11 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 16 +- + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/si_dma.c | 14 +- + drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c | 3 + + drivers/gpu/drm/amd/amdgpu/smuio_v11_0.c | 77 + + drivers/gpu/drm/amd/amdgpu/smuio_v11_0.h | 30 + + drivers/gpu/drm/amd/amdgpu/smuio_v9_0.c | 77 + + drivers/gpu/drm/amd/amdgpu/smuio_v9_0.h | 30 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 61 +- + drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 10 +- + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 10 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 197 +- + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 7 + + drivers/gpu/drm/amd/amdgpu/vi.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 23 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 368 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 22 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 43 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h | 3 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 6 +- + drivers/gpu/drm/amd/display/dc/basics/fixpt31_32.c | 5 + + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 1 + + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 70 + + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 5 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 68 +- + .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 11 +- + .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 8 +- + .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.h | 10 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 20 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 56 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 4 + + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 19 +- + drivers/gpu/drm/amd/display/dc/dc.h | 12 +- + drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 5 + + drivers/gpu/drm/amd/display/dc/dc_link.h | 8 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 21 + + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 24 +- + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 7 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 12 + + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.h | 16 + + .../gpu/drm/amd/display/dc/dce/dce_panel_cntl.c | 36 +- + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 82 - + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 126 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.h | 4 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 13 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 64 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 1 + + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 82 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 44 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 23 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 8 +- + drivers/gpu/drm/amd/display/dc/dcn21/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_dccg.c | 129 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_dccg.h | 36 + + .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c | 2 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c | 4 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 62 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.h | 83 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c | 13 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.h | 4 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_dpp_cm.c | 12 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 7 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 59 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.h | 3 +- + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 193 +- + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 8 +- + .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 2 +- + .../drm/amd/display/dc/dml/display_mode_structs.h | 2 - + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 5 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 1 - + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 3 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 84 + + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 20 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 10 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 23 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 6 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.c | 5 - + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.h | 2 - + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c | 5 - + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.h | 1 - + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 26 +- + .../drm/amd/display/include/bios_parser_types.h | 5 + + .../drm/amd/display/include/ddc_service_types.h | 8 - + drivers/gpu/drm/amd/display/include/fixed31_32.h | 6 - + drivers/gpu/drm/amd/include/arct_ip_offset.h | 4 +- + .../amd/include/asic_reg/dcn/dcn_3_0_2_offset.h | 16159 +++++ + .../amd/include/asic_reg/dcn/dcn_3_0_2_sh_mask.h | 62376 +++++++++++++++++++ + drivers/gpu/drm/amd/include/atomfirmware.h | 1 + + .../drm/amd/include/dimgrey_cavefish_ip_offset.h | 2 +- + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 1 + + drivers/gpu/drm/amd/include/navi10_ip_offset.h | 2 +- + drivers/gpu/drm/amd/include/navi12_ip_offset.h | 2 +- + drivers/gpu/drm/amd/include/navi14_ip_offset.h | 2 +- + .../gpu/drm/amd/include/sienna_cichlid_ip_offset.h | 2 +- + drivers/gpu/drm/amd/include/vangogh_ip_offset.h | 2 +- + drivers/gpu/drm/amd/include/vega10_ip_offset.h | 76 +- + drivers/gpu/drm/amd/include/vega20_ip_offset.h | 2 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 12 +- + drivers/gpu/drm/amd/pm/inc/hwmgr.h | 1 + + drivers/gpu/drm/amd/pm/inc/rv_ppsmc.h | 3 +- + .../amd/pm/inc/smu11_driver_if_sienna_cichlid.h | 16 +- + .../gpu/drm/amd/pm/inc/smu11_driver_if_vangogh.h | 6 + + drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 6 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_5_pmfw.h | 11 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h | 11 +- + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 19 + + .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 13 +- + .../pm/powerplay/hwmgr/vega12_processpptables.c | 5 +- + drivers/gpu/drm/amd/pm/powerplay/si_dpm.c | 2 +- + .../drm/amd/pm/powerplay/smumgr/polaris10_smumgr.c | 1 + + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 26 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 22 - + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 62 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 207 + + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 7 + + drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c | 3 + + drivers/gpu/drm/amd/pm/swsmu/smu_internal.h | 1 + + drivers/gpu/drm/radeon/atom.h | 7 + + drivers/gpu/drm/radeon/atombios_crtc.c | 1 - + drivers/gpu/drm/radeon/atombios_encoders.c | 5 +- + drivers/gpu/drm/radeon/btc_dpm.c | 6 +- + drivers/gpu/drm/radeon/ci_dpm.c | 27 +- + drivers/gpu/drm/radeon/cik.c | 33 +- + drivers/gpu/drm/radeon/cik.h | 40 + + drivers/gpu/drm/radeon/cik_sdma.c | 7 +- + drivers/gpu/drm/radeon/cypress_dpm.c | 6 +- + drivers/gpu/drm/radeon/dce6_afmt.c | 1 + + drivers/gpu/drm/radeon/dce6_afmt.h | 52 + + drivers/gpu/drm/radeon/evergreen.c | 21 +- + drivers/gpu/drm/radeon/evergreen.h | 53 + + drivers/gpu/drm/radeon/evergreen_cs.c | 9 +- + drivers/gpu/drm/radeon/evergreen_dma.c | 5 +- + drivers/gpu/drm/radeon/evergreen_hdmi.c | 1 + + drivers/gpu/drm/radeon/evergreen_hdmi.h | 69 + + drivers/gpu/drm/radeon/kv_dpm.c | 205 +- + drivers/gpu/drm/radeon/ni.c | 25 +- + drivers/gpu/drm/radeon/ni.h | 37 + + drivers/gpu/drm/radeon/ni_dma.c | 3 +- + drivers/gpu/drm/radeon/ni_dpm.c | 5 +- + drivers/gpu/drm/radeon/ni_dpm.h | 3 + + drivers/gpu/drm/radeon/r100.c | 7 +- + drivers/gpu/drm/radeon/r300.c | 1 + + drivers/gpu/drm/radeon/r600.c | 15 +- + drivers/gpu/drm/radeon/r600.h | 58 + + drivers/gpu/drm/radeon/r600_cs.c | 10 +- + drivers/gpu/drm/radeon/r600_dma.c | 3 +- + drivers/gpu/drm/radeon/r600_hdmi.c | 1 + + drivers/gpu/drm/radeon/radeon.h | 6 + + drivers/gpu/drm/radeon/radeon_acpi.c | 3 +- + drivers/gpu/drm/radeon/radeon_atombios.c | 11 +- + drivers/gpu/drm/radeon/radeon_atombios.h | 45 + + drivers/gpu/drm/radeon/radeon_audio.c | 68 +- + drivers/gpu/drm/radeon/radeon_audio.h | 12 + + drivers/gpu/drm/radeon/radeon_combios.c | 6 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 4 +- + drivers/gpu/drm/radeon/radeon_cs.c | 12 +- + drivers/gpu/drm/radeon/radeon_device.c | 28 +- + drivers/gpu/drm/radeon/radeon_device.h | 32 + + drivers/gpu/drm/radeon/radeon_display.c | 22 +- + drivers/gpu/drm/radeon/radeon_dp_mst.c | 16 +- + drivers/gpu/drm/radeon/radeon_drv.c | 25 +- + drivers/gpu/drm/radeon/radeon_drv.h | 7 + + drivers/gpu/drm/radeon/radeon_encoders.c | 10 +- + drivers/gpu/drm/radeon/radeon_fence.c | 6 +- + drivers/gpu/drm/radeon/radeon_gem.c | 1 + + drivers/gpu/drm/radeon/radeon_i2c.c | 8 - + drivers/gpu/drm/radeon/radeon_ib.c | 1 + + drivers/gpu/drm/radeon/radeon_irq_kms.c | 9 +- + drivers/gpu/drm/radeon/radeon_kms.c | 4 +- + drivers/gpu/drm/radeon/radeon_kms.h | 39 + + drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 1 + + drivers/gpu/drm/radeon/radeon_legacy_encoders.h | 36 + + drivers/gpu/drm/radeon/radeon_mn.c | 1 + + drivers/gpu/drm/radeon/radeon_object.c | 3 +- + drivers/gpu/drm/radeon/radeon_pm.c | 1 + + drivers/gpu/drm/radeon/radeon_pm.h | 29 + + drivers/gpu/drm/radeon/radeon_prime.c | 1 + + drivers/gpu/drm/radeon/radeon_prime.h | 40 + + drivers/gpu/drm/radeon/radeon_ring.c | 3 + + drivers/gpu/drm/radeon/radeon_sync.c | 1 + + drivers/gpu/drm/radeon/radeon_ttm.c | 9 +- + drivers/gpu/drm/radeon/radeon_ttm.h | 37 + + drivers/gpu/drm/radeon/radeon_vm.c | 8 +- + drivers/gpu/drm/radeon/rv730_dpm.c | 4 +- + drivers/gpu/drm/radeon/rv740_dpm.c | 3 +- + drivers/gpu/drm/radeon/rv770.c | 1 + + drivers/gpu/drm/radeon/rv770.h | 39 + + drivers/gpu/drm/radeon/rv770_dpm.c | 2 + + drivers/gpu/drm/radeon/si.c | 15 +- + drivers/gpu/drm/radeon/si.h | 38 + + drivers/gpu/drm/radeon/si_dma.c | 3 +- + drivers/gpu/drm/radeon/si_dpm.c | 15 +- + drivers/gpu/drm/radeon/si_dpm.h | 5 + + drivers/gpu/drm/radeon/sumo_dpm.h | 1 + + drivers/gpu/drm/radeon/sumo_smc.c | 2 - + drivers/gpu/drm/radeon/trinity_dpm.c | 46 +- + drivers/gpu/drm/radeon/vce.h | 35 + + drivers/gpu/drm/radeon/vce_v1_0.c | 1 + + drivers/gpu/drm/radeon/vce_v2_0.c | 1 + + drivers/gpu/drm/scheduler/sched_entity.c | 4 +- + drivers/gpu/drm/scheduler/sched_main.c | 1 + + drivers/pci/pcie/err.c | 41 +- + include/uapi/drm/drm_fourcc.h | 33 +- + 267 files changed, 82749 insertions(+), 1838 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v11_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v11_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v9_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v9_0.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_dccg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_dccg.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_2_sh_mask.h + create mode 100644 drivers/gpu/drm/radeon/cik.h + create mode 100644 drivers/gpu/drm/radeon/dce6_afmt.h + create mode 100644 drivers/gpu/drm/radeon/evergreen.h + create mode 100644 drivers/gpu/drm/radeon/evergreen_hdmi.h + create mode 100644 drivers/gpu/drm/radeon/ni.h + create mode 100644 drivers/gpu/drm/radeon/r600.h + create mode 100644 drivers/gpu/drm/radeon/radeon_atombios.h + create mode 100644 drivers/gpu/drm/radeon/radeon_device.h + create mode 100644 drivers/gpu/drm/radeon/radeon_kms.h + create mode 100644 drivers/gpu/drm/radeon/radeon_legacy_encoders.h + create mode 100644 drivers/gpu/drm/radeon/radeon_pm.h + create mode 100644 drivers/gpu/drm/radeon/radeon_prime.h + create mode 100644 drivers/gpu/drm/radeon/radeon_ttm.h + create mode 100644 drivers/gpu/drm/radeon/rv770.h + create mode 100644 drivers/gpu/drm/radeon/si.h + create mode 100644 drivers/gpu/drm/radeon/vce.h +Merging drm-intel/for-linux-next (5cc2b61fb251 drm/i915/display: Suppress "Combo PHY A HW state changed unexpectedly") +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_perf.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/gvt/vgpu.c +Auto-merging drivers/gpu/drm/i915/gvt/kvmgt.c +Auto-merging drivers/gpu/drm/i915/gvt/handlers.c +Auto-merging drivers/gpu/drm/i915/gvt/gvt.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gvt/gvt.h +Auto-merging drivers/gpu/drm/i915/gvt/display.c +Auto-merging drivers/gpu/drm/i915/gt/intel_reset.c +Auto-merging drivers/gpu/drm/i915/display/intel_dpll_mgr.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Resolved 'drivers/gpu/drm/i915/gvt/gvt.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b5dad0586bb3] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/i915/display/icl_dsi.c | 5 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 10 +- + drivers/gpu/drm/i915/display/intel_atomic.h | 3 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 131 ++- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 9 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 20 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 259 +++- + drivers/gpu/drm/i915/display/intel_display.c | 1231 +++++++++++++------- + drivers/gpu/drm/i915/display/intel_display.h | 9 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 30 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 49 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 83 +- + drivers/gpu/drm/i915/display/intel_dp.c | 116 +- + drivers/gpu/drm/i915/display/intel_dp.h | 1 + + drivers/gpu/drm/i915/display/intel_dp_mst.c | 2 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 111 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 11 +- + drivers/gpu/drm/i915/display/intel_dsi.c | 2 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +- + drivers/gpu/drm/i915/display/intel_psr.c | 41 - + drivers/gpu/drm/i915/display/intel_psr.h | 4 - + drivers/gpu/drm/i915/display/intel_sprite.c | 161 ++- + drivers/gpu/drm/i915/display/intel_vdsc.c | 201 ++-- + drivers/gpu/drm/i915/display/intel_vdsc.h | 6 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 4 +- + drivers/gpu/drm/i915/gvt/display.c | 179 +++ + drivers/gpu/drm/i915/gvt/gtt.c | 64 + + drivers/gpu/drm/i915/gvt/gtt.h | 4 + + drivers/gpu/drm/i915/gvt/gvt.c | 13 +- + drivers/gpu/drm/i915/gvt/gvt.h | 5 +- + drivers/gpu/drm/i915/gvt/handlers.c | 44 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 2 +- + drivers/gpu/drm/i915/gvt/mmio.c | 5 + + drivers/gpu/drm/i915/gvt/mmio.h | 4 + + drivers/gpu/drm/i915/gvt/mpt.h | 2 +- + drivers/gpu/drm/i915/gvt/vgpu.c | 2 +- + drivers/gpu/drm/i915/i915_drv.c | 2 + + drivers/gpu/drm/i915/i915_drv.h | 2 +- + drivers/gpu/drm/i915/i915_irq.c | 17 +- + drivers/gpu/drm/i915/i915_reg.h | 24 + + drivers/gpu/drm/i915/intel_device_info.c | 2 +- + drivers/gpu/drm/i915/intel_gvt.c | 15 + + drivers/gpu/drm/i915/intel_gvt.h | 5 + + drivers/gpu/drm/i915/intel_pm.c | 272 +++-- + include/drm/i915_pciids.h | 15 +- + 45 files changed, 2256 insertions(+), 923 deletions(-) +Merging drm-tegra/drm/tegra/for-next (bf3a3cdcad40 drm/tegra: sor: Disable clocks on error in tegra_sor_init()) +$ git merge drm-tegra/drm/tegra/for-next +Auto-merging drivers/gpu/drm/tegra/drm.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/drm.c | 2 +- + drivers/gpu/drm/tegra/output.c | 1 - + drivers/gpu/drm/tegra/sor.c | 76 +++++++++++++++++++----------------------- + 3 files changed, 36 insertions(+), 43 deletions(-) +Merging drm-misc/for-linux-next (a96ee0f6b58d drm: panel: simple: Add BOE NV110WTM-N61) +$ git merge drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/radeon/radeon_ttm.c +Auto-merging drivers/gpu/drm/nouveau/dispnv50/disp.c +Auto-merging drivers/gpu/drm/mcde/mcde_drv.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp_mst.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Removing drivers/dma-buf/heaps/heap-helpers.h +Removing drivers/dma-buf/heaps/heap-helpers.c +Merge made by the 'recursive' strategy. + .../bindings/display/panel/panel-simple.yaml | 4 + + drivers/char/agp/Makefile | 6 +- + drivers/char/agp/agp.h | 5 + + drivers/dma-buf/dma-buf.c | 19 +- + drivers/dma-buf/dma-resv.c | 2 +- + drivers/dma-buf/heaps/Makefile | 1 - + drivers/dma-buf/heaps/cma_heap.c | 329 ++++++++++++--- + drivers/dma-buf/heaps/heap-helpers.c | 274 ------------- + drivers/dma-buf/heaps/heap-helpers.h | 53 --- + drivers/dma-buf/heaps/system_heap.c | 414 ++++++++++++++++--- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 53 ++- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 5 +- + drivers/gpu/drm/drm_atomic_helper.c | 8 +- + drivers/gpu/drm/drm_blend.c | 2 +- + drivers/gpu/drm/drm_bufs.c | 1 + + drivers/gpu/drm/drm_client.c | 4 - + drivers/gpu/drm/drm_crtc.c | 12 +- + drivers/gpu/drm/drm_fb_helper.c | 155 ++++--- + drivers/gpu/drm/drm_gem_shmem_helper.c | 40 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 4 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 7 +- + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 5 +- + drivers/gpu/drm/imx/dcss/dcss-dev.h | 3 + + drivers/gpu/drm/imx/dcss/dcss-plane.c | 24 +- + drivers/gpu/drm/imx/dcss/dcss-scaler.c | 47 ++- + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 18 + + drivers/gpu/drm/kmb/kmb_drv.c | 2 +- + drivers/gpu/drm/lima/lima_gem.c | 2 +- + drivers/gpu/drm/mcde/Kconfig | 1 + + drivers/gpu/drm/mcde/Makefile | 2 +- + drivers/gpu/drm/mcde/mcde_clk_div.c | 192 +++++++++ + drivers/gpu/drm/mcde/mcde_display.c | 456 ++++++++++++++++----- + drivers/gpu/drm/mcde/mcde_display_regs.h | 91 +++- + drivers/gpu/drm/mcde/mcde_drm.h | 10 + + drivers/gpu/drm/mcde/mcde_drv.c | 46 ++- + drivers/gpu/drm/meson/meson_dw_hdmi.c | 51 ++- + drivers/gpu/drm/mgag200/mgag200_drv.c | 1 - + drivers/gpu/drm/msm/msm_gem.c | 4 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 5 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 3 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 345 ++++++++++++---- + drivers/gpu/drm/panel/panel-simple.c | 204 +++++++-- + drivers/gpu/drm/panfrost/panfrost_gem.c | 2 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 54 ++- + drivers/gpu/drm/rockchip/Kconfig | 2 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 2 +- + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 2 +- + drivers/gpu/drm/ttm/ttm_pool.c | 22 + + drivers/gpu/drm/udl/udl_drv.c | 2 - + drivers/gpu/drm/v3d/v3d_bo.c | 2 +- + drivers/gpu/drm/vc4/vc4_txp.c | 4 +- + drivers/gpu/drm/vgem/vgem_drv.c | 3 +- + drivers/gpu/drm/via/via_irq.c | 3 +- + drivers/gpu/drm/via/via_verifier.c | 7 +- + drivers/gpu/drm/virtio/virtgpu_debugfs.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 8 +- + drivers/gpu/drm/virtio/virtgpu_fence.c | 13 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 7 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 1 - + drivers/gpu/drm/vkms/vkms_drv.c | 1 - + drivers/gpu/drm/vkms/vkms_writeback.c | 7 +- + drivers/staging/android/ashmem.c | 6 +- + drivers/video/fbdev/Kconfig | 2 +- + drivers/video/fbdev/core/fbcon.c | 25 +- + drivers/video/fbdev/geode/lxfb_ops.c | 1 + + .../video/fbdev/omap2/omapfb/dss/dispc-compat.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 2 +- + drivers/video/fbdev/pm2fb.c | 1 + + drivers/video/fbdev/s1d13xxxfb.c | 3 +- + drivers/video/of_display_timing.c | 1 + + drivers/video/of_videomode.c | 6 +- + include/drm/drm_fb_helper.h | 14 +- + include/drm/drm_gem_shmem_helper.h | 7 +- + include/drm/drm_modes.h | 3 + + include/drm/drm_modeset_helper_vtables.h | 13 +- + include/drm/ttm/ttm_bo_api.h | 2 + + include/linux/mm.h | 2 + + include/uapi/drm/drm_mode.h | 165 ++++++-- + include/uapi/linux/virtio_gpu.h | 4 + + mm/mmap.c | 2 +- + mm/util.c | 12 + + 85 files changed, 2349 insertions(+), 989 deletions(-) + delete mode 100644 drivers/dma-buf/heaps/heap-helpers.c + delete mode 100644 drivers/dma-buf/heaps/heap-helpers.h + create mode 100644 drivers/gpu/drm/mcde/mcde_clk_div.c +Merging drm-msm/msm-next (ff8b941a39d1 drm/msm/disp/dpu1/dpu_encoder: Remove a bunch of unused variables) +$ git merge drm-msm/msm-next +Auto-merging include/drm/drm_crtc.h +CONFLICT (content): Merge conflict in include/drm/drm_crtc.h +Auto-merging drivers/gpu/drm/msm/msm_gem.c +Auto-merging drivers/gpu/drm/msm/msm_drv.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_drv.h +Auto-merging drivers/gpu/drm/msm/msm_drv.c +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c +Auto-merging drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +Resolved 'drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c' using previous resolution. +Resolved 'drivers/gpu/drm/msm/msm_drv.h' using previous resolution. +Resolved 'include/drm/drm_crtc.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 05bd187035ab] Merge remote-tracking branch 'drm-msm/msm-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/display/msm/gpu.txt | 7 + + drivers/gpu/drm/msm/Makefile | 1 + + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 21 +- + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 20 +- + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 21 +- + drivers/gpu/drm/msm/adreno/a5xx_preempt.c | 18 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 4 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 23 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 6 + + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 32 +-- + drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 9 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 12 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 4 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 27 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 53 +++- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 18 ++ + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 56 ++-- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h | 37 ++- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 7 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 8 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c | 94 +++++++ + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.h | 68 +++++ + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h | 1 + + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 22 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 1 - + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 29 ++ + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 1 + + drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 1 + + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 8 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 7 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 15 +- + drivers/gpu/drm/msm/disp/mdp_kms.h | 9 +- + drivers/gpu/drm/msm/dp/dp_catalog.c | 13 + + drivers/gpu/drm/msm/dp/dp_catalog.h | 1 + + drivers/gpu/drm/msm/dp/dp_ctrl.c | 96 +++++-- + drivers/gpu/drm/msm/dp/dp_display.c | 208 ++++++++------ + drivers/gpu/drm/msm/dp/dp_link.c | 41 +-- + drivers/gpu/drm/msm/dp/dp_link.h | 1 + + drivers/gpu/drm/msm/dp/dp_panel.c | 5 + + drivers/gpu/drm/msm/dp/dp_power.c | 44 ++- + drivers/gpu/drm/msm/dp/dp_power.h | 2 +- + drivers/gpu/drm/msm/dp/dp_reg.h | 2 + + drivers/gpu/drm/msm/dsi/dsi_host.c | 9 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 22 ++ + drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 23 +- + drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c | 8 + + drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c | 5 +- + drivers/gpu/drm/msm/dsi/pll/dsi_pll_7nm.c | 8 + + drivers/gpu/drm/msm/msm_atomic.c | 62 +++-- + drivers/gpu/drm/msm/msm_debugfs.c | 10 +- + drivers/gpu/drm/msm/msm_drv.c | 22 +- + drivers/gpu/drm/msm/msm_drv.h | 84 ++---- + drivers/gpu/drm/msm/msm_fbdev.c | 1 + + drivers/gpu/drm/msm/msm_gem.c | 306 +++++++++++---------- + drivers/gpu/drm/msm/msm_gem.h | 138 ++++++++-- + drivers/gpu/drm/msm/msm_gem_shrinker.c | 119 ++++---- + drivers/gpu/drm/msm/msm_gem_submit.c | 157 +++++++---- + drivers/gpu/drm/msm/msm_gpu.c | 167 +++++++---- + drivers/gpu/drm/msm/msm_gpu.h | 20 +- + drivers/gpu/drm/msm/msm_kms.h | 33 ++- + drivers/gpu/drm/msm/msm_rd.c | 2 +- + drivers/gpu/drm/msm/msm_ringbuffer.c | 3 +- + drivers/gpu/drm/msm/msm_ringbuffer.h | 13 +- + include/drm/drm_crtc.h | 10 + + 65 files changed, 1511 insertions(+), 768 deletions(-) + create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c + create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.h +$ git am -3 ../patches/0001-drm-msm-gem-fix-up-for-drm-msm-Introduce-GEM-object-.patch +Applying: drm/msm/gem: fix up for "drm/msm: Introduce GEM object funcs" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/msm/msm_gem.h +$ git add -A . +$ git commit -v -a --amend +[master 2ff6032ceaf8] Merge remote-tracking branch 'drm-msm/msm-next' + Date: Mon Nov 30 13:45:49 2020 +1100 +Merging imx-drm/imx-drm/next (099e5bde9bd2 drm/imx: depend on COMMON_CLK to fix compile tests) +$ git merge imx-drm/imx-drm/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/Kconfig | 1 + + drivers/gpu/ipu-v3/ipu-di.c | 4 ---- + 2 files changed, 1 insertion(+), 4 deletions(-) +Merging etnaviv/etnaviv/next (4612bad5701e drm/etnaviv: Add lockdep annotations for context lock) +$ git merge etnaviv/etnaviv/next +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_mmu.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_drv.h +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_drv.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 3 -- + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 1 - + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 4 ++ + drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 78 ++++++++++++++++++++++--------- + 4 files changed, 59 insertions(+), 27 deletions(-) +Merging regmap/for-next (cc65f43aa88f Merge remote-tracking branch 'regmap/for-5.11' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/Kconfig | 6 +- + drivers/base/regmap/Makefile | 1 + + drivers/base/regmap/regmap-mmio.c | 90 ++- + drivers/base/regmap/regmap-sdw-mbq.c | 101 ++++ + drivers/base/regmap/regmap-sdw.c | 2 + + drivers/base/regmap/regmap.c | 11 +- + include/linux/regmap.h | 40 ++ + include/linux/soundwire/sdw_registers.h | 32 ++ + sound/soc/codecs/Kconfig | 7 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/rt715-sdca-sdw.c | 278 ++++++++++ + sound/soc/codecs/rt715-sdca-sdw.h | 170 ++++++ + sound/soc/codecs/rt715-sdca.c | 936 ++++++++++++++++++++++++++++++++ + sound/soc/codecs/rt715-sdca.h | 124 +++++ + 14 files changed, 1787 insertions(+), 13 deletions(-) + create mode 100644 drivers/base/regmap/regmap-sdw-mbq.c + 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 +$ git am -3 ../patches/0001-Revert-ASoC-SoundWire-rt715-sdca-First-version-of-rt.patch +Applying: Revert "ASoC/SoundWire: rt715-sdca: First version of rt715 sdw sdca codec driver" +$ git reset HEAD^ +Unstaged changes after reset: +M sound/soc/codecs/Kconfig +M sound/soc/codecs/Makefile +D sound/soc/codecs/rt715-sdca-sdw.c +D sound/soc/codecs/rt715-sdca-sdw.h +D sound/soc/codecs/rt715-sdca.c +D sound/soc/codecs/rt715-sdca.h +$ git add -A . +$ git commit -v -a --amend +[master cce7d01eb356] Merge remote-tracking branch 'regmap/for-next' + Date: Mon Nov 30 13:50:22 2020 +1100 +Merging sound/for-next (0183a855eeb7 ALSA: remove trailing semicolon in macro definition) +$ git merge sound/for-next +Removing sound/usb/debug.h +Merge made by the 'recursive' strategy. + Documentation/sound/alsa-configuration.rst | 5 + + include/sound/compress_driver.h | 16 + + include/sound/hda_codec.h | 2 +- + sound/core/compress_offload.c | 39 +- + sound/core/seq/seq_clientmgr.c | 1 - + sound/core/seq/seq_queue.c | 27 - + sound/core/seq/seq_queue.h | 3 - + sound/drivers/aloop.c | 6 +- + sound/drivers/pcsp/pcsp_input.c | 1 + + sound/firewire/amdtp-stream.h | 2 +- + sound/isa/sb/sb8_main.c | 1 + + sound/pci/emu10k1/emu10k1x.c | 4 +- + sound/pci/hda/patch_ca0132.c | 5 +- + sound/pci/rme32.c | 1 - + sound/pci/rme9652/hdspm.c | 9 +- + sound/pci/rme9652/rme9652.c | 7 - + sound/ppc/snd_ps3.c | 7 - + sound/soc/codecs/wcd-clsh-v2.c | 1 - + sound/soc/codecs/wl1273.c | 1 - + sound/soc/intel/skylake/skl-pcm.c | 1 - + sound/soc/ti/davinci-mcasp.c | 1 - + sound/usb/Makefile | 1 + + sound/usb/card.c | 14 +- + sound/usb/card.h | 53 +- + sound/usb/clock.c | 152 ++-- + sound/usb/clock.h | 11 +- + sound/usb/debug.h | 16 - + sound/usb/endpoint.c | 943 +++++++++++++---------- + sound/usb/endpoint.h | 57 +- + sound/usb/format.c | 125 +++- + sound/usb/helper.c | 10 + + sound/usb/helper.h | 3 + + sound/usb/implicit.c | 402 ++++++++++ + sound/usb/implicit.h | 14 + + sound/usb/mixer.c | 46 -- + sound/usb/pcm.c | 1117 ++++++++++------------------ + sound/usb/pcm.h | 7 +- + sound/usb/proc.c | 35 +- + sound/usb/quirks-table.h | 64 +- + sound/usb/quirks.c | 60 +- + sound/usb/quirks.h | 10 +- + sound/usb/stream.c | 24 +- + sound/usb/usbaudio.h | 5 +- + 43 files changed, 1812 insertions(+), 1497 deletions(-) + delete mode 100644 sound/usb/debug.h + create mode 100644 sound/usb/implicit.c + create mode 100644 sound/usb/implicit.h +Merging sound-asoc/for-next (7cd624c7d41a Merge remote-tracking branch 'asoc/for-5.11' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging sound/soc/ti/davinci-mcasp.c +Auto-merging sound/soc/soc-dapm.c +Auto-merging sound/soc/soc-core.c +Auto-merging sound/soc/intel/catpt/loader.c +Auto-merging sound/soc/intel/catpt/core.h +Removing sound/soc/fsl/wm1133-ev1.c +Removing sound/soc/fsl/phycore-ac97.c +Removing sound/soc/fsl/mx27vis-aic32x4.c +Removing sound/soc/fsl/imx-ssi.c +Removing sound/soc/fsl/imx-mc13783.c +Removing include/linux/platform_data/adau1977.h +Removing Documentation/devicetree/bindings/sound/st,stm32-sai.txt +Removing Documentation/devicetree/bindings/sound/st,stm32-adfsdm.txt +Removing Documentation/devicetree/bindings/sound/audio-graph-card.txt +Removing Documentation/devicetree/bindings/sound/adi,adau1977.txt +Merge made by the 'recursive' strategy. + .../bindings/iio/adc/st,stm32-dfsdm-adc.yaml | 7 +- + .../devicetree/bindings/sound/adi,adau1977.txt | 61 - + .../devicetree/bindings/sound/adi,adau1977.yaml | 92 + + .../bindings/sound/allwinner,sun4i-a10-i2s.yaml | 6 +- + .../devicetree/bindings/sound/audio-graph-card.txt | 337 --- + .../bindings/sound/audio-graph-card.yaml | 57 + + .../bindings/sound/audio-graph-port.yaml | 84 + + .../devicetree/bindings/sound/audio-graph.yaml | 45 + + .../devicetree/bindings/sound/fsl,aud2htx.yaml | 66 + + .../devicetree/bindings/sound/fsl,spdif.yaml | 1 + + .../devicetree/bindings/sound/fsl,xcvr.yaml | 104 + + .../bindings/sound/google,sc7180-trogdor.yaml | 138 + + .../bindings/sound/marvell,mmp-sspa.yaml | 25 +- + .../sound/mt8192-mt6359-rt1015-rt5682.yaml | 42 + + .../devicetree/bindings/sound/nau8315.txt | 18 + + .../bindings/sound/qcom,lpass-va-macro.yaml | 67 + + .../bindings/sound/qcom,lpass-wsa-macro.yaml | 69 + + .../devicetree/bindings/sound/qcom,sm8250.yaml | 159 + + .../devicetree/bindings/sound/renesas,rsnd.txt | 520 ---- + .../devicetree/bindings/sound/renesas,rsnd.yaml | 447 +++ + Documentation/devicetree/bindings/sound/rt5682.txt | 2 + + .../devicetree/bindings/sound/simple-card.yaml | 6 +- + .../devicetree/bindings/sound/st,stm32-adfsdm.txt | 63 - + .../devicetree/bindings/sound/st,stm32-sai.txt | 107 - + .../devicetree/bindings/sound/st,stm32-sai.yaml | 200 ++ + include/dt-bindings/sound/adi,adau1977.h | 15 + + include/linux/platform_data/adau1977.h | 44 - + include/sound/graph_card.h | 16 + + include/sound/intel-dsp-config.h | 7 + + include/sound/rt5682.h | 1 + + include/sound/simple_card_utils.h | 3 + + include/sound/soc-acpi.h | 6 + + include/sound/soc-component.h | 28 +- + include/sound/soc-dai.h | 38 +- + include/sound/soc-link.h | 6 +- + include/sound/soc-topology.h | 13 +- + include/sound/soc.h | 9 +- + include/sound/sof.h | 6 +- + include/sound/sof/dai.h | 16 +- + include/sound/sof/debug.h | 41 + + include/sound/sof/ext_manifest.h | 20 + + include/sound/sof/header.h | 14 +- + include/uapi/sound/asoc.h | 22 +- + include/uapi/sound/sof/abi.h | 2 +- + sound/hda/intel-dsp-config.c | 111 + + sound/soc/adi/Kconfig | 1 - + sound/soc/amd/raven/pci-acp3x.c | 4 +- + sound/soc/atmel/atmel-i2s.c | 4 +- + sound/soc/bcm/bcm2835-i2s.c | 4 +- + sound/soc/codecs/Kconfig | 33 +- + sound/soc/codecs/Makefile | 6 + + sound/soc/codecs/adau1977.c | 9 +- + sound/soc/codecs/adav80x.c | 1 + + sound/soc/codecs/ak4118.c | 2 + + sound/soc/codecs/ak5558.c | 2 +- + sound/soc/codecs/alc5623.c | 2 + + sound/soc/codecs/alc5632.c | 2 + + sound/soc/codecs/arizona.c | 1 + + sound/soc/codecs/bd28623.c | 2 +- + sound/soc/codecs/cs42l52.c | 1 + + sound/soc/codecs/cs42l56.c | 1 + + sound/soc/codecs/cs47l92.c | 1 + + sound/soc/codecs/da7218.c | 2 + + sound/soc/codecs/da7219.c | 2 + + sound/soc/codecs/da9055.c | 2 + + sound/soc/codecs/es7134.c | 4 +- + sound/soc/codecs/es7241.c | 2 +- + sound/soc/codecs/es8316.c | 2 + + sound/soc/codecs/gtm601.c | 2 +- + sound/soc/codecs/hdmi-codec.c | 43 +- + sound/soc/codecs/inno_rk3036.c | 2 +- + sound/soc/codecs/lpass-va-macro.c | 1504 ++++++++++ + sound/soc/codecs/lpass-wsa-macro.c | 2464 +++++++++++++++ + sound/soc/codecs/lpass-wsa-macro.h | 17 + + sound/soc/codecs/madera.c | 4 +- + sound/soc/codecs/max98090.c | 2 + + sound/soc/codecs/max98095.c | 2 + + sound/soc/codecs/max98371.c | 3 +- + sound/soc/codecs/max98373-sdw.c | 2 +- + sound/soc/codecs/max9867.c | 2 + + sound/soc/codecs/max98925.c | 3 +- + sound/soc/codecs/max98926.c | 3 +- + sound/soc/codecs/mt6359.c | 152 +- + sound/soc/codecs/mt6359.h | 15 +- + sound/soc/codecs/nau8315.c | 166 ++ + sound/soc/codecs/pcm1789-i2c.c | 2 + + sound/soc/codecs/pcm179x-i2c.c | 2 + + sound/soc/codecs/pcm512x.c | 134 +- + sound/soc/codecs/rk3328_codec.c | 2 +- + sound/soc/codecs/rt1015.c | 202 +- + sound/soc/codecs/rt1015.h | 42 + + sound/soc/codecs/rt1308-sdw.c | 2 +- + sound/soc/codecs/rt5660.c | 2 + + sound/soc/codecs/rt5682-i2c.c | 5 + + sound/soc/codecs/rt5682-sdw.c | 2 +- + sound/soc/codecs/rt5682.c | 3 + + sound/soc/codecs/rt5682.h | 14 + + sound/soc/codecs/rt700.c | 2 +- + sound/soc/codecs/rt711-sdw.c | 15 +- + sound/soc/codecs/rt711.c | 2 +- + sound/soc/codecs/rt715.c | 2 +- + sound/soc/codecs/tas2562.c | 2 + + sound/soc/codecs/tas571x.c | 4 +- + sound/soc/codecs/tlv320adcx140.c | 2 + + sound/soc/codecs/tlv320aic23-i2c.c | 2 + + sound/soc/codecs/ts3a227e.c | 2 + + sound/soc/codecs/tscs42xx.c | 6 +- + sound/soc/codecs/tscs454.c | 8 +- + sound/soc/codecs/wcd9335.c | 2 +- + sound/soc/codecs/wm5102.c | 4 +- + sound/soc/codecs/wm8350.c | 3 +- + sound/soc/codecs/wm8962.c | 1 + + sound/soc/codecs/wm8994.c | 6 +- + sound/soc/codecs/wm8997.c | 2 + + sound/soc/codecs/wm8998.c | 4 +- + sound/soc/fsl/Kconfig | 65 +- + sound/soc/fsl/Makefile | 14 +- + sound/soc/fsl/fsl_aud2htx.c | 308 ++ + sound/soc/fsl/fsl_aud2htx.h | 67 + + sound/soc/fsl/fsl_sai.c | 20 +- + sound/soc/fsl/fsl_sai.h | 1 + + sound/soc/fsl/fsl_spdif.c | 73 +- + sound/soc/fsl/fsl_spdif.h | 9 +- + sound/soc/fsl/fsl_xcvr.c | 1360 +++++++++ + sound/soc/fsl/fsl_xcvr.h | 266 ++ + sound/soc/fsl/imx-audmux.c | 28 +- + sound/soc/fsl/imx-mc13783.c | 156 - + sound/soc/fsl/imx-ssi.c | 651 ---- + sound/soc/fsl/mx27vis-aic32x4.c | 214 -- + sound/soc/fsl/phycore-ac97.c | 121 - + sound/soc/fsl/wm1133-ev1.c | 289 -- + sound/soc/generic/Kconfig | 2 +- + sound/soc/generic/audio-graph-card.c | 175 +- + sound/soc/intel/Kconfig | 5 +- + sound/soc/intel/atom/sst-atom-controls.c | 12 +- + sound/soc/intel/atom/sst-atom-controls.h | 4 +- + sound/soc/intel/atom/sst/sst.c | 2 +- + sound/soc/intel/atom/sst/sst_acpi.c | 8 + + sound/soc/intel/boards/Kconfig | 2 +- + sound/soc/intel/boards/bdw-rt5650.c | 17 +- + sound/soc/intel/boards/bdw-rt5677.c | 18 +- + sound/soc/intel/boards/broadwell.c | 20 +- + sound/soc/intel/boards/bytcht_cx2072x.c | 27 +- + sound/soc/intel/boards/bytcht_da7213.c | 27 +- + sound/soc/intel/boards/bytcht_es8316.c | 29 +- + sound/soc/intel/boards/bytcr_rt5640.c | 30 +- + sound/soc/intel/boards/bytcr_rt5651.c | 29 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 29 +- + sound/soc/intel/boards/cht_bsw_nau8824.c | 29 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 38 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 29 +- + sound/soc/intel/boards/sof_rt5682.c | 67 +- + sound/soc/intel/boards/sof_sdw.c | 10 + + sound/soc/intel/catpt/core.h | 10 +- + sound/soc/intel/catpt/device.c | 30 +- + sound/soc/intel/catpt/dsp.c | 56 +- + sound/soc/intel/catpt/loader.c | 2 +- + sound/soc/intel/catpt/pcm.c | 106 +- + sound/soc/intel/common/soc-acpi-intel-cml-match.c | 13 + + sound/soc/intel/keembay/kmb_platform.c | 22 +- + sound/soc/intel/keembay/kmb_platform.h | 8 +- + sound/soc/intel/skylake/skl-topology.c | 9 +- + sound/soc/jz4740/jz4740-i2s.c | 5 - + sound/soc/kirkwood/armada-370-db.c | 2 +- + sound/soc/mediatek/Kconfig | 24 + + sound/soc/mediatek/Makefile | 1 + + sound/soc/mediatek/common/mtk-afe-fe-dai.c | 13 +- + sound/soc/mediatek/common/mtk-base-afe.h | 1 + + sound/soc/mediatek/mt8192/Makefile | 16 + + sound/soc/mediatek/mt8192/mt8192-afe-clk.c | 669 +++++ + sound/soc/mediatek/mt8192/mt8192-afe-clk.h | 244 ++ + sound/soc/mediatek/mt8192/mt8192-afe-common.h | 170 ++ + sound/soc/mediatek/mt8192/mt8192-afe-control.c | 163 + + sound/soc/mediatek/mt8192/mt8192-afe-gpio.c | 308 ++ + sound/soc/mediatek/mt8192/mt8192-afe-gpio.h | 19 + + sound/soc/mediatek/mt8192/mt8192-afe-pcm.c | 2389 +++++++++++++++ + sound/soc/mediatek/mt8192/mt8192-dai-adda.c | 1471 +++++++++ + sound/soc/mediatek/mt8192/mt8192-dai-i2s.c | 2110 +++++++++++++ + sound/soc/mediatek/mt8192/mt8192-dai-pcm.c | 409 +++ + sound/soc/mediatek/mt8192/mt8192-dai-tdm.c | 778 +++++ + sound/soc/mediatek/mt8192/mt8192-interconnection.h | 65 + + .../mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 1060 +++++++ + sound/soc/mediatek/mt8192/mt8192-reg.h | 3131 ++++++++++++++++++++ + sound/soc/meson/Kconfig | 4 +- + sound/soc/meson/t9015.c | 2 +- + sound/soc/pxa/Kconfig | 14 +- + sound/soc/pxa/mmp-sspa.c | 4 + + sound/soc/pxa/pxa-ssp.c | 6 +- + sound/soc/qcom/Kconfig | 24 + + sound/soc/qcom/Makefile | 4 + + sound/soc/qcom/apq8016_sbc.c | 2 +- + sound/soc/qcom/common.c | 13 +- + sound/soc/qcom/lpass-apq8016.c | 2 +- + sound/soc/qcom/lpass-cpu.c | 12 +- + sound/soc/qcom/lpass-hdmi.c | 2 +- + sound/soc/qcom/lpass-ipq806x.c | 2 +- + sound/soc/qcom/lpass-sc7180.c | 10 +- + sound/soc/qcom/lpass.h | 1 + + sound/soc/qcom/qdsp6/q6adm.c | 10 +- + sound/soc/qcom/qdsp6/q6afe-clocks.c | 2 +- + sound/soc/qcom/qdsp6/q6afe.c | 10 +- + sound/soc/qcom/qdsp6/q6asm.c | 10 +- + sound/soc/qcom/sc7180.c | 391 +++ + sound/soc/qcom/sm8250.c | 229 ++ + sound/soc/rockchip/rockchip_i2s.c | 2 +- + sound/soc/rockchip/rockchip_pdm.c | 2 +- + sound/soc/rockchip/rockchip_spdif.c | 2 +- + sound/soc/samsung/i2s.c | 11 +- + sound/soc/samsung/midas_wm1811.c | 1 - + sound/soc/samsung/smdk_wm8994.c | 4 +- + sound/soc/samsung/snow.c | 2 +- + sound/soc/sh/Kconfig | 1 + + sound/soc/soc-component.c | 273 +- + sound/soc/soc-compress.c | 397 +-- + sound/soc/soc-core.c | 87 +- + sound/soc/soc-dai.c | 26 +- + sound/soc/soc-dapm.c | 6 +- + sound/soc/soc-link.c | 23 +- + sound/soc/soc-pcm.c | 146 +- + sound/soc/soc-topology.c | 326 +- + sound/soc/sof/Kconfig | 42 +- + sound/soc/sof/control.c | 42 +- + sound/soc/sof/debug.c | 117 + + sound/soc/sof/imx/Kconfig | 10 +- + sound/soc/sof/intel/Kconfig | 109 +- + sound/soc/sof/intel/hda-dsp.c | 2 +- + sound/soc/sof/intel/hda-pcm.c | 7 + + sound/soc/sof/intel/hda.h | 1 + + sound/soc/sof/intel/intel-ipc.c | 7 + + sound/soc/sof/intel/tgl.c | 16 + + sound/soc/sof/ipc.c | 9 + + sound/soc/sof/loader.c | 55 +- + sound/soc/sof/nocodec.c | 18 +- + sound/soc/sof/pcm.c | 14 +- + sound/soc/sof/sof-acpi-dev.c | 14 +- + sound/soc/sof/sof-audio.c | 12 +- + sound/soc/sof/sof-audio.h | 5 + + sound/soc/sof/sof-pci-dev.c | 21 + + sound/soc/sof/sof-priv.h | 2 + + sound/soc/sof/topology.c | 33 +- + sound/soc/stm/Kconfig | 1 + + sound/soc/sunxi/Kconfig | 1 + + sound/soc/sunxi/sun4i-i2s.c | 388 ++- + sound/soc/sunxi/sun8i-codec.c | 834 +++++- + sound/soc/tegra/Kconfig | 1 - + sound/soc/tegra/tegra186_dspk.c | 6 +- + sound/soc/tegra/tegra210_dmic.c | 6 +- + sound/soc/tegra/tegra210_i2s.c | 6 +- + sound/soc/tegra/tegra_alc5632.c | 4 +- + sound/soc/tegra/tegra_max98090.c | 8 +- + sound/soc/tegra/tegra_rt5640.c | 8 +- + sound/soc/tegra/tegra_rt5677.c | 4 +- + sound/soc/tegra/tegra_sgtl5000.c | 4 +- + sound/soc/tegra/tegra_wm8753.c | 8 +- + sound/soc/tegra/tegra_wm8903.c | 8 +- + sound/soc/tegra/tegra_wm9712.c | 4 +- + sound/soc/tegra/trimslice.c | 8 +- + sound/soc/ti/Kconfig | 9 +- + sound/soc/ti/davinci-evm.c | 3 +- + sound/soc/ti/davinci-i2s.c | 2 +- + sound/soc/ti/davinci-mcasp.c | 298 +- + sound/soc/uniphier/aio-ld11.c | 2 +- + sound/soc/uniphier/aio-pxs2.c | 2 +- + sound/soc/uniphier/evea.c | 2 +- + 264 files changed, 25230 insertions(+), 4639 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/sound/adi,adau1977.txt + create mode 100644 Documentation/devicetree/bindings/sound/adi,adau1977.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/audio-graph-card.txt + create mode 100644 Documentation/devicetree/bindings/sound/audio-graph-card.yaml + create mode 100644 Documentation/devicetree/bindings/sound/audio-graph-port.yaml + create mode 100644 Documentation/devicetree/bindings/sound/audio-graph.yaml + create mode 100644 Documentation/devicetree/bindings/sound/fsl,aud2htx.yaml + create mode 100644 Documentation/devicetree/bindings/sound/fsl,xcvr.yaml + create mode 100644 Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml + create mode 100644 Documentation/devicetree/bindings/sound/mt8192-mt6359-rt1015-rt5682.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nau8315.txt + create mode 100644 Documentation/devicetree/bindings/sound/qcom,lpass-va-macro.yaml + create mode 100644 Documentation/devicetree/bindings/sound/qcom,lpass-wsa-macro.yaml + create mode 100644 Documentation/devicetree/bindings/sound/qcom,sm8250.yaml + create mode 100644 Documentation/devicetree/bindings/sound/renesas,rsnd.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/st,stm32-adfsdm.txt + delete mode 100644 Documentation/devicetree/bindings/sound/st,stm32-sai.txt + create mode 100644 Documentation/devicetree/bindings/sound/st,stm32-sai.yaml + create mode 100644 include/dt-bindings/sound/adi,adau1977.h + delete mode 100644 include/linux/platform_data/adau1977.h + create mode 100644 include/sound/graph_card.h + create mode 100644 include/sound/sof/debug.h + create mode 100644 sound/soc/codecs/lpass-va-macro.c + create mode 100644 sound/soc/codecs/lpass-wsa-macro.c + create mode 100644 sound/soc/codecs/lpass-wsa-macro.h + create mode 100644 sound/soc/codecs/nau8315.c + create mode 100644 sound/soc/fsl/fsl_aud2htx.c + create mode 100644 sound/soc/fsl/fsl_aud2htx.h + create mode 100644 sound/soc/fsl/fsl_xcvr.c + create mode 100644 sound/soc/fsl/fsl_xcvr.h + delete mode 100644 sound/soc/fsl/imx-mc13783.c + delete mode 100644 sound/soc/fsl/imx-ssi.c + delete mode 100644 sound/soc/fsl/mx27vis-aic32x4.c + delete mode 100644 sound/soc/fsl/phycore-ac97.c + delete mode 100644 sound/soc/fsl/wm1133-ev1.c + create mode 100644 sound/soc/mediatek/mt8192/Makefile + create mode 100644 sound/soc/mediatek/mt8192/mt8192-afe-clk.c + create mode 100644 sound/soc/mediatek/mt8192/mt8192-afe-clk.h + create mode 100644 sound/soc/mediatek/mt8192/mt8192-afe-common.h + create mode 100644 sound/soc/mediatek/mt8192/mt8192-afe-control.c + create mode 100644 sound/soc/mediatek/mt8192/mt8192-afe-gpio.c + create mode 100644 sound/soc/mediatek/mt8192/mt8192-afe-gpio.h + create mode 100644 sound/soc/mediatek/mt8192/mt8192-afe-pcm.c + create mode 100644 sound/soc/mediatek/mt8192/mt8192-dai-adda.c + create mode 100644 sound/soc/mediatek/mt8192/mt8192-dai-i2s.c + create mode 100644 sound/soc/mediatek/mt8192/mt8192-dai-pcm.c + create mode 100644 sound/soc/mediatek/mt8192/mt8192-dai-tdm.c + create mode 100644 sound/soc/mediatek/mt8192/mt8192-interconnection.h + create mode 100644 sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c + create mode 100644 sound/soc/mediatek/mt8192/mt8192-reg.h + create mode 100644 sound/soc/qcom/sc7180.c + create mode 100644 sound/soc/qcom/sm8250.c +Merging modules/modules-next (2aec389e1915 params: clean up module-param macros) +$ git merge modules/modules-next +Auto-merging kernel/params.c +Auto-merging kernel/module.c +Auto-merging include/linux/module.h +Merge made by the 'recursive' strategy. + include/linux/module.h | 28 +++---- + include/linux/moduleparam.h | 12 +-- + kernel/module.c | 195 ++++++++++++++++++++++++++------------------ + kernel/params.c | 10 +-- + 4 files changed, 138 insertions(+), 107 deletions(-) +Merging input/next (f7bda6662fd4 Input: libps2 - fix fall-through warnings for Clang) +$ git merge input/next +Auto-merging drivers/input/mouse/elan_i2c_core.c +Auto-merging drivers/input/keyboard/cros_ec_keyb.c +Auto-merging arch/arm/boot/dts/tegra20-acer-a500-picasso.dts +Auto-merging arch/arm/boot/dts/s5pv210-aries.dtsi +Auto-merging arch/arm/boot/dts/motorola-mapphone-common.dtsi +Auto-merging arch/arm/boot/dts/imx53-ppd.dts +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/input/atmel,maxtouch.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/atmel,maxtouch.txt | 41 ---- + .../devicetree/bindings/input/atmel,maxtouch.yaml | 81 +++++++ + .../bindings/input/touchscreen/ektf2127.txt | 2 +- + MAINTAINERS | 2 +- + arch/arm/boot/dts/imx53-ppd.dts | 2 +- + arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 2 +- + arch/arm/boot/dts/imx6q-apalis-eval.dts | 2 +- + arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 2 +- + arch/arm/boot/dts/imx6q-apalis-ixora.dts | 2 +- + arch/arm/boot/dts/imx7-colibri-aster.dtsi | 2 +- + arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 2 +- + arch/arm/boot/dts/motorola-mapphone-common.dtsi | 2 +- + arch/arm/boot/dts/s5pv210-aries.dtsi | 2 +- + arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 2 +- + drivers/input/joystick/analog.c | 2 +- + drivers/input/joystick/xpad.c | 2 +- + drivers/input/keyboard/adp5589-keys.c | 189 ++++++---------- + drivers/input/keyboard/applespi.c | 9 + + drivers/input/keyboard/cros_ec_keyb.c | 9 +- + drivers/input/keyboard/gpio_keys.c | 2 +- + drivers/input/keyboard/nomadik-ske-keypad.c | 2 + + drivers/input/keyboard/omap4-keypad.c | 89 +++++--- + drivers/input/keyboard/pmic8xxx-keypad.c | 22 +- + drivers/input/keyboard/samsung-keypad.c | 3 +- + drivers/input/misc/ab8500-ponkey.c | 2 +- + drivers/input/misc/drv260x.c | 26 +-- + drivers/input/misc/drv2665.c | 10 +- + drivers/input/misc/drv2667.c | 14 +- + drivers/input/misc/mc13783-pwrbutton.c | 2 +- + drivers/input/misc/pcspkr.c | 1 + + drivers/input/misc/wm831x-on.c | 2 +- + drivers/input/mouse/cyapa.c | 2 +- + drivers/input/mouse/cyapa_gen5.c | 4 +- + drivers/input/mouse/elan_i2c_core.c | 2 +- + drivers/input/mouse/elantech.c | 2 +- + drivers/input/mouse/synaptics.c | 2 +- + drivers/input/mouse/vmmouse.c | 2 +- + drivers/input/rmi4/rmi_bus.c | 2 +- + drivers/input/rmi4/rmi_f01.c | 16 +- + drivers/input/rmi4/rmi_f11.c | 236 +++++++++++--------- + drivers/input/rmi4/rmi_f54.c | 6 + + drivers/input/rmi4/rmi_i2c.c | 4 + + drivers/input/serio/libps2.c | 2 +- + drivers/input/touchscreen/ads7846.c | 247 ++++++++------------- + drivers/input/touchscreen/atmel_mxt_ts.c | 43 +++- + drivers/input/touchscreen/cyttsp4_core.c | 14 ++ + drivers/input/touchscreen/cyttsp4_core.h | 14 -- + drivers/input/touchscreen/ektf2127.c | 32 ++- + drivers/input/touchscreen/goodix.c | 5 +- + drivers/input/touchscreen/imx6ul_tsc.c | 3 +- + drivers/input/touchscreen/resistive-adc-touch.c | 2 +- + drivers/input/touchscreen/st1232.c | 52 +++-- + drivers/input/touchscreen/surface3_spi.c | 2 +- + drivers/input/touchscreen/wm97xx-core.c | 2 +- + include/linux/input/adp5589.h | 7 - + 55 files changed, 650 insertions(+), 585 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/input/atmel,maxtouch.txt + create mode 100644 Documentation/devicetree/bindings/input/atmel,maxtouch.yaml +Merging block/for-next (090a2a2a647c Merge branch 'for-5.11/block' into for-next) +$ git merge block/for-next +Auto-merging net/socket.c +Auto-merging kernel/signal.c +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/ide.h +Auto-merging fs/io_uring.c +Auto-merging arch/x86/include/asm/mmu_context.h +Auto-merging arch/um/kernel/process.c +Auto-merging arch/sparc/include/asm/thread_info_64.h +Auto-merging arch/s390/kernel/entry.S +Auto-merging arch/s390/include/asm/thread_info.h +Auto-merging arch/s390/include/asm/cio.h +Auto-merging arch/s390/include/asm/ccwdev.h +Auto-merging arch/ia64/kernel/process.c +Auto-merging arch/hexagon/kernel/process.c +Auto-merging arch/arm/kernel/entry-common.S +Auto-merging arch/arm/include/asm/thread_info.h +Merge made by the 'recursive' strategy. + arch/alpha/include/asm/thread_info.h | 2 + + arch/alpha/kernel/entry.S | 2 +- + arch/alpha/kernel/signal.c | 2 +- + arch/arc/include/asm/thread_info.h | 4 +- + arch/arc/kernel/entry.S | 3 +- + arch/arc/kernel/signal.c | 2 +- + arch/arm/include/asm/thread_info.h | 7 +- + arch/arm/kernel/entry-common.S | 6 +- + arch/arm/kernel/entry-v7m.S | 2 +- + arch/arm/kernel/signal.c | 2 +- + arch/arm64/include/asm/thread_info.h | 5 +- + arch/arm64/kernel/signal.c | 2 +- + arch/c6x/include/asm/thread_info.h | 1 + + arch/c6x/kernel/asm-offsets.c | 1 + + arch/c6x/kernel/signal.c | 2 +- + arch/csky/include/asm/thread_info.h | 5 +- + arch/csky/kernel/signal.c | 2 +- + arch/h8300/include/asm/thread_info.h | 4 +- + arch/h8300/kernel/signal.c | 2 +- + arch/hexagon/include/asm/thread_info.h | 2 + + arch/hexagon/kernel/process.c | 2 +- + arch/ia64/include/asm/thread_info.h | 4 +- + arch/ia64/kernel/process.c | 3 +- + arch/m68k/include/asm/thread_info.h | 1 + + arch/m68k/kernel/signal.c | 3 +- + arch/mips/include/asm/thread_info.h | 4 +- + arch/mips/kernel/signal.c | 2 +- + arch/nds32/include/asm/thread_info.h | 2 + + arch/nds32/kernel/ex-exit.S | 2 +- + arch/nds32/kernel/signal.c | 2 +- + arch/nios2/include/asm/thread_info.h | 2 + + arch/nios2/kernel/signal.c | 3 +- + arch/openrisc/include/asm/thread_info.h | 2 + + arch/openrisc/kernel/signal.c | 2 +- + arch/parisc/include/asm/thread_info.h | 4 +- + arch/parisc/kernel/signal.c | 3 +- + arch/powerpc/include/asm/thread_info.h | 5 +- + arch/powerpc/kernel/signal.c | 2 +- + arch/riscv/include/asm/thread_info.h | 5 +- + arch/riscv/kernel/signal.c | 2 +- + arch/s390/include/asm/ccwdev.h | 2 + + arch/s390/include/asm/cio.h | 1 + + arch/s390/include/asm/thread_info.h | 2 + + arch/s390/kernel/entry.S | 11 +- + arch/s390/kernel/signal.c | 2 +- + arch/sh/include/asm/thread_info.h | 4 +- + arch/sh/kernel/signal_32.c | 2 +- + arch/sparc/include/asm/thread_info_32.h | 4 +- + arch/sparc/include/asm/thread_info_64.h | 6 +- + arch/sparc/kernel/signal_32.c | 2 +- + arch/sparc/kernel/signal_64.c | 2 +- + arch/um/include/asm/thread_info.h | 2 + + arch/um/kernel/process.c | 3 +- + arch/x86/entry/vdso/vma.c | 4 +- + arch/x86/entry/vsyscall/vsyscall_64.c | 2 +- + arch/x86/events/core.c | 2 +- + arch/x86/events/intel/ds.c | 2 +- + arch/x86/events/intel/lbr.c | 2 +- + arch/x86/include/asm/compat.h | 15 +- + arch/x86/include/asm/elf.h | 13 +- + arch/x86/include/asm/mmu.h | 9 +- + arch/x86/include/asm/mmu_context.h | 2 +- + arch/x86/include/asm/thread_info.h | 6 +- + arch/x86/kernel/perf_regs.c | 2 +- + arch/x86/kernel/process_64.c | 28 +- + arch/x86/kernel/signal.c | 4 +- + arch/x86/oprofile/backtrace.c | 2 +- + arch/xtensa/include/asm/thread_info.h | 5 +- + arch/xtensa/kernel/entry.S | 4 +- + arch/xtensa/kernel/signal.c | 3 +- + block/genhd.c | 211 +++--- + block/ioctl.c | 62 +- + drivers/block/amiflop.c | 98 +-- + drivers/block/aoe/aoecmd.c | 15 +- + drivers/block/ataflop.c | 135 ++-- + drivers/block/brd.c | 39 +- + drivers/block/drbd/drbd_main.c | 6 +- + drivers/block/floppy.c | 154 ++-- + drivers/block/loop.c | 40 +- + drivers/block/nbd.c | 88 +-- + drivers/block/pktcdvd.c | 9 +- + drivers/block/rbd.c | 43 +- + drivers/block/rnbd/rnbd-clt.c | 3 +- + drivers/block/swim.c | 17 - + drivers/block/virtio_blk.c | 3 +- + drivers/block/xen-blkfront.c | 2 +- + drivers/block/z2ram.c | 547 +++++++------- + drivers/block/zram/zram_drv.c | 7 +- + drivers/ide/ide-probe.c | 66 +- + drivers/ide/ide-tape.c | 2 - + drivers/md/bcache/request.c | 5 +- + drivers/md/dm-raid.c | 3 +- + drivers/md/dm.c | 8 +- + drivers/md/md-cluster.c | 8 +- + drivers/md/md-linear.c | 3 +- + drivers/md/md.c | 107 ++- + drivers/mtd/mtd_blkdevs.c | 28 - + drivers/nvme/host/core.c | 18 +- + drivers/s390/block/dasd.c | 23 +- + drivers/s390/block/dasd_devmap.c | 109 +++ + drivers/s390/block/dasd_eckd.c | 175 +++-- + drivers/s390/block/dasd_fba.c | 2 +- + drivers/s390/block/dasd_int.h | 114 ++- + drivers/s390/block/dasd_ioctl.c | 27 +- + drivers/s390/cio/chp.c | 15 + + drivers/s390/cio/chp.h | 1 + + drivers/s390/cio/chsc.c | 145 +++- + drivers/s390/cio/chsc.h | 3 +- + drivers/s390/cio/device.c | 15 +- + drivers/scsi/sd.c | 28 +- + fs/binfmt_elf.c | 4 +- + fs/block_dev.c | 7 - + fs/compat_binfmt_elf.c | 20 +- + fs/internal.h | 2 + + fs/io-wq.c | 10 - + fs/io-wq.h | 1 - + fs/io_uring.c | 1224 +++++++++++++++++-------------- + fs/namei.c | 40 +- + include/linux/bio.h | 6 - + include/linux/blkdev.h | 3 +- + include/linux/elf.h | 10 + + include/linux/entry-common.h | 7 +- + include/linux/entry-kvm.h | 4 +- + include/linux/genhd.h | 16 +- + include/linux/ide.h | 3 - + include/linux/sched/jobctl.h | 4 +- + include/linux/sched/signal.h | 18 +- + include/linux/socket.h | 1 + + include/linux/syscalls.h | 2 +- + include/linux/tracehook.h | 23 + + include/uapi/linux/io_uring.h | 15 + + kernel/entry/common.c | 14 +- + kernel/entry/kvm.c | 3 + + kernel/events/uprobes.c | 2 +- + kernel/signal.c | 40 +- + kernel/task_work.c | 13 +- + net/socket.c | 15 +- + 137 files changed, 2303 insertions(+), 1849 deletions(-) +Merging device-mapper/for-next (3f5dba110d12 dm writecache: remove BUG() and fail gracefully instead) +$ git merge device-mapper/for-next +Auto-merging drivers/md/dm.c +Merge made by the 'recursive' strategy. + Documentation/admin-guide/device-mapper/verity.rst | 7 +- + drivers/md/Kconfig | 22 +- + drivers/md/Makefile | 20 +- + drivers/md/dm-cache-target.c | 4 - + drivers/md/dm-integrity.c | 4 +- + ...vice-time.c => dm-ps-historical-service-time.c} | 0 + drivers/md/dm-ps-io-affinity.c | 272 +++++++++++++++++++++ + .../md/{dm-queue-length.c => dm-ps-queue-length.c} | 0 + .../md/{dm-round-robin.c => dm-ps-round-robin.c} | 0 + .../md/{dm-service-time.c => dm-ps-service-time.c} | 0 + drivers/md/dm-stripe.c | 2 +- + drivers/md/dm-switch.c | 1 + + drivers/md/dm-table.c | 6 - + drivers/md/dm-unstripe.c | 1 + + drivers/md/dm-verity-verify-sig.c | 9 +- + drivers/md/dm-writecache.c | 6 +- + drivers/md/dm-zero.c | 1 + + drivers/md/dm.c | 8 +- + 18 files changed, 334 insertions(+), 29 deletions(-) + rename drivers/md/{dm-historical-service-time.c => dm-ps-historical-service-time.c} (100%) + create mode 100644 drivers/md/dm-ps-io-affinity.c + rename drivers/md/{dm-queue-length.c => dm-ps-queue-length.c} (100%) + rename drivers/md/{dm-round-robin.c => dm-ps-round-robin.c} (100%) + rename drivers/md/{dm-service-time.c => dm-ps-service-time.c} (100%) +Merging pcmcia/pcmcia-next (46d079790663 pcmcia: make pccard_loop_tuple() static) +$ git merge pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (8223e885e74b mmc: mxc: Convert the driver to DT-only) +$ git merge mmc/next +Removing Documentation/devicetree/bindings/mmc/mtk-sd.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mmc/mtk-sd.txt | 75 --------- + Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 176 +++++++++++++++++++++ + Documentation/devicetree/bindings/mmc/owl-mmc.yaml | 4 +- + drivers/memstick/core/memstick.c | 1 - + drivers/memstick/core/mspro_block.c | 2 +- + drivers/memstick/host/jmb38x_ms.c | 2 +- + drivers/memstick/host/tifm_ms.c | 2 +- + drivers/misc/cardreader/rts5261.c | 61 +++++-- + drivers/misc/cardreader/rts5261.h | 39 +---- + drivers/misc/cardreader/rtsx_pcr.c | 5 + + drivers/mmc/core/core.c | 15 +- + drivers/mmc/core/host.h | 6 + + drivers/mmc/core/sd_ops.c | 49 +++++- + drivers/mmc/core/sd_ops.h | 1 + + drivers/mmc/host/Kconfig | 7 +- + drivers/mmc/host/davinci_mmc.c | 2 +- + drivers/mmc/host/dw_mmc.c | 17 +- + drivers/mmc/host/meson-gx-mmc.c | 2 +- + drivers/mmc/host/meson-mx-sdio.c | 5 +- + drivers/mmc/host/moxart-mmc.c | 5 +- + drivers/mmc/host/mtk-sd.c | 125 ++++++++++++--- + drivers/mmc/host/mxcmmc.c | 33 +--- + drivers/mmc/host/mxs-mmc.c | 18 +-- + drivers/mmc/host/owl-mmc.c | 9 +- + drivers/mmc/host/pxamci.c | 1 + + drivers/mmc/host/renesas_sdhi_core.c | 100 ++++++------ + drivers/mmc/host/rtsx_pci_sdmmc.c | 71 +++++++++ + drivers/mmc/host/s3cmci.c | 2 +- + drivers/mmc/host/sdhci-acpi.c | 38 ++++- + drivers/mmc/host/sdhci-esdhc-imx.c | 91 +---------- + drivers/mmc/host/sdhci-msm.c | 13 +- + drivers/mmc/host/sdhci-of-arasan.c | 4 + + drivers/mmc/host/sdhci-pci-gli.c | 20 +++ + drivers/mmc/host/sdhci-pic32.c | 11 +- + drivers/mmc/host/sdhci-sprd.c | 2 +- + drivers/mmc/host/sdhci-st.c | 2 +- + drivers/mmc/host/sdhci-tegra.c | 2 +- + drivers/mmc/host/sdhci.c | 8 +- + drivers/mmc/host/sunxi-mmc.c | 3 +- + drivers/mmc/host/tmio_mmc.c | 3 +- + drivers/mmc/host/tmio_mmc.h | 1 - + drivers/mmc/host/tmio_mmc_core.c | 4 +- + include/linux/mmc/host.h | 7 + + include/linux/rtsx_pci.h | 30 ++++ + 44 files changed, 676 insertions(+), 398 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mmc/mtk-sd.txt + create mode 100644 Documentation/devicetree/bindings/mmc/mtk-sd.yaml +Merging mfd/for-mfd-next (14639a22de65 mfd: cpcap: Fix interrupt regression with regmap clear_ack) +$ git merge mfd/for-mfd-next +Auto-merging include/uapi/linux/pci_regs.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-intel_pmt | 119 ++++ + .../devicetree/bindings/mfd/rohm,bd71837-pmic.yaml | 6 + + Documentation/devicetree/bindings/mfd/syscon.yaml | 4 + + MAINTAINERS | 6 + + drivers/gpio/gpio-tps65910.c | 12 +- + drivers/mfd/88pm800.c | 2 +- + drivers/mfd/88pm860x-core.c | 50 +- + drivers/mfd/Kconfig | 11 + + drivers/mfd/Makefile | 1 + + drivers/mfd/at91-usart.c | 12 +- + drivers/mfd/da9055-core.c | 8 +- + drivers/mfd/da9062-core.c | 24 +- + drivers/mfd/da9063-core.c | 8 +- + drivers/mfd/da9150-core.c | 6 +- + drivers/mfd/hi655x-pmic.c | 2 +- + drivers/mfd/htc-i2cpld.c | 2 + + drivers/mfd/intel_msic.c | 18 +- + drivers/mfd/intel_pmt.c | 223 ++++++++ + drivers/mfd/intel_quark_i2c_gpio.c | 4 +- + drivers/mfd/intel_soc_pmic_bxtwc.c | 14 +- + drivers/mfd/intel_soc_pmic_chtdc_ti.c | 10 +- + drivers/mfd/intel_soc_pmic_chtwc.c | 4 +- + drivers/mfd/intel_soc_pmic_crc.c | 10 +- + drivers/mfd/ioc3.c | 16 +- + drivers/mfd/lp8788.c | 4 +- + drivers/mfd/madera-core.c | 35 +- + drivers/mfd/max8925-core.c | 56 +- + drivers/mfd/motorola-cpcap.c | 6 +- + drivers/mfd/qcom-spmi-pmic.c | 4 + + drivers/mfd/rdc321x-southbridge.c | 4 +- + drivers/mfd/retu-mfd.c | 4 +- + drivers/mfd/rk808.c | 8 +- + drivers/mfd/stmfx.c | 10 +- + drivers/mfd/stmpe.c | 10 +- + drivers/mfd/sun4i-gpadc.c | 2 +- + drivers/mfd/tc3589x.c | 4 +- + drivers/mfd/tc6387xb.c | 2 +- + drivers/mfd/tc6393xb.c | 6 +- + drivers/mfd/tps65090.c | 2 +- + drivers/mfd/tps65217.c | 4 +- + drivers/mfd/tps6586x.c | 2 +- + drivers/mfd/tps65910.c | 40 +- + drivers/mfd/tps65911-comparator.c | 4 +- + drivers/mfd/tps80031.c | 2 +- + drivers/mfd/wm831x-core.c | 52 +- + drivers/mfd/wm8994-core.c | 4 +- + drivers/platform/x86/Kconfig | 34 ++ + drivers/platform/x86/Makefile | 3 + + drivers/platform/x86/intel_pmt_class.c | 297 ++++++++++ + drivers/platform/x86/intel_pmt_class.h | 52 ++ + drivers/platform/x86/intel_pmt_crashlog.c | 328 +++++++++++ + drivers/platform/x86/intel_pmt_telemetry.c | 160 ++++++ + include/linux/mfd/madera/core.h | 1 + + include/linux/mfd/madera/registers.h | 635 --------------------- + include/linux/mfd/rt5033-private.h | 28 +- + include/linux/mfd/tps65910.h | 40 -- + include/uapi/linux/pci_regs.h | 5 + + 57 files changed, 1513 insertions(+), 907 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-intel_pmt + create mode 100644 drivers/mfd/intel_pmt.c + create mode 100644 drivers/platform/x86/intel_pmt_class.c + create mode 100644 drivers/platform/x86/intel_pmt_class.h + create mode 100644 drivers/platform/x86/intel_pmt_crashlog.c + create mode 100644 drivers/platform/x86/intel_pmt_telemetry.c +Merging backlight/for-backlight-next (789eb04b6c56 backlight: pwm_bl: Fix interpolation) +$ git merge backlight/for-backlight-next +Merge made by the 'recursive' strategy. + drivers/video/backlight/pwm_bl.c | 70 ++++++++++++++++++---------------------- + 1 file changed, 31 insertions(+), 39 deletions(-) +Merging battery/for-next (faa2cec66798 power: supply: wm831x_power: remove unneeded break) +$ git merge battery/for-next +Merge made by the 'recursive' strategy. + .../bindings/power/reset/ocelot-reset.txt | 4 +- + arch/arm/mach-s3c/mach-h1940.c | 12 +- + arch/arm/mach-s3c/mach-rx1950.c | 11 +- + arch/arm/mach-sa1100/collie.c | 21 +++ + drivers/power/reset/ocelot-reset.c | 30 +++- + drivers/power/reset/qnap-poweroff.c | 8 +- + drivers/power/reset/syscon-poweroff.c | 8 +- + drivers/power/supply/ab8500_btemp.c | 2 +- + drivers/power/supply/axp20x_usb_power.c | 10 +- + drivers/power/supply/axp288_charger.c | 28 ++-- + drivers/power/supply/bq24190_charger.c | 21 ++- + drivers/power/supply/bq24735-charger.c | 1 - + drivers/power/supply/bq25890_charger.c | 2 +- + drivers/power/supply/collie_battery.c | 151 +++++++++++++++------ + drivers/power/supply/generic-adc-battery.c | 31 ++--- + drivers/power/supply/max17042_battery.c | 23 +++- + drivers/power/supply/max8997_charger.c | 67 +++++---- + drivers/power/supply/pm2301_charger.c | 3 +- + drivers/power/supply/s3c_adc_battery.c | 57 ++++---- + drivers/power/supply/wm831x_power.c | 1 - + include/linux/power/generic-adc-battery.h | 4 - + include/linux/s3c_adc_battery.h | 3 - + 22 files changed, 318 insertions(+), 180 deletions(-) +Merging regulator/for-next (ec0abec390d4 Merge remote-tracking branch 'regulator/for-5.11' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/arm,scmi.txt | 11 +- + .../devicetree/bindings/regulator/dlg,da9121.yaml | 47 +++ + .../bindings/regulator/fixed-regulator.yaml | 47 +++ + .../bindings/regulator/mcp16502-regulator.txt | 2 +- + .../bindings/regulator/qcom,rpmh-regulator.txt | 2 + + .../bindings/regulator/rohm,bd71837-regulator.yaml | 48 +++ + .../bindings/regulator/rohm,bd71847-regulator.yaml | 49 +++ + drivers/regulator/Kconfig | 21 ++ + drivers/regulator/Makefile | 2 + + drivers/regulator/as3722-regulator.c | 3 +- + drivers/regulator/bd718x7-regulator.c | 164 +++++++- + drivers/regulator/core.c | 14 +- + drivers/regulator/da9121-regulator.c | 108 ++++++ + drivers/regulator/fixed.c | 63 +++- + drivers/regulator/helpers.c | 2 + + drivers/regulator/lp872x.c | 2 +- + drivers/regulator/mcp16502.c | 135 ++++++- + drivers/regulator/of_regulator.c | 8 +- + drivers/regulator/qcom-rpmh-regulator.c | 31 ++ + drivers/regulator/scmi-regulator.c | 417 +++++++++++++++++++++ + include/linux/regulator/driver.h | 3 + + 21 files changed, 1130 insertions(+), 49 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/dlg,da9121.yaml + create mode 100644 drivers/regulator/da9121-regulator.c + create mode 100644 drivers/regulator/scmi-regulator.c +Merging security/next-testing (3650b228f83a Linux 5.10-rc1) +$ git merge security/next-testing +Already up to date. +Merging apparmor/apparmor-next (e37986097ba6 apparmor: Use true and false for bool variable) +$ git merge apparmor/apparmor-next +Already up to date. +Merging integrity/next-integrity (b000d5cb954f ima: defer arch_ima_get_secureboot() call to IMA init time) +$ git merge integrity/next-integrity +Auto-merging security/integrity/ima/ima_main.c +Auto-merging include/linux/ima.h +Merge made by the 'recursive' strategy. + include/linux/ima.h | 6 ++++++ + security/integrity/ima/ima_appraise.c | 17 +++++++++++------ + security/integrity/ima/ima_main.c | 1 + + 3 files changed, 18 insertions(+), 6 deletions(-) +Merging keys/keys-next (b6f61c314649 keys: Implement update for the big_key type) +$ git merge keys/keys-next +Already up to date. +Merging safesetid/safesetid-next (03ca0ec13892 LSM: SafeSetID: Fix warnings reported by test bot) +$ git merge safesetid/safesetid-next +Already up to date. +Merging selinux/next (3df98d79215a lsm,selinux: pass flowi_common instead of flowi to the LSM hooks) +$ git merge selinux/next +Auto-merging net/xfrm/xfrm_state.c +Auto-merging net/netfilter/nf_synproxy_core.c +Auto-merging net/ipv6/udp.c +Auto-merging net/ipv6/tcp_ipv6.c +Auto-merging net/ipv6/syncookies.c +Auto-merging net/ipv6/netfilter/nf_reject_ipv6.c +Auto-merging net/ipv6/icmp.c +Auto-merging net/ipv4/udp.c +Auto-merging net/ipv4/syncookies.c +Auto-merging net/ipv4/inet_connection_sock.c +Auto-merging net/dccp/ipv6.c +Auto-merging net/dccp/ipv4.c +Auto-merging drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c +Merge made by the 'recursive' strategy. + .../chelsio/inline_crypto/chtls/chtls_cm.c | 2 +- + drivers/net/wireguard/socket.c | 4 ++-- + include/linux/lsm_hook_defs.h | 4 ++-- + include/linux/lsm_hooks.h | 2 +- + include/linux/security.h | 23 +++++++++++-------- + include/net/flow.h | 10 +++++++++ + include/net/route.h | 6 ++--- + net/dccp/ipv4.c | 2 +- + net/dccp/ipv6.c | 6 ++--- + net/ipv4/icmp.c | 4 ++-- + net/ipv4/inet_connection_sock.c | 4 ++-- + net/ipv4/ip_output.c | 2 +- + net/ipv4/ping.c | 2 +- + net/ipv4/raw.c | 2 +- + net/ipv4/syncookies.c | 2 +- + net/ipv4/udp.c | 2 +- + net/ipv6/af_inet6.c | 2 +- + net/ipv6/datagram.c | 2 +- + net/ipv6/icmp.c | 6 ++--- + net/ipv6/inet6_connection_sock.c | 4 ++-- + net/ipv6/netfilter/nf_reject_ipv6.c | 2 +- + net/ipv6/ping.c | 2 +- + net/ipv6/raw.c | 2 +- + net/ipv6/syncookies.c | 2 +- + net/ipv6/tcp_ipv6.c | 4 ++-- + net/ipv6/udp.c | 2 +- + net/l2tp/l2tp_ip6.c | 2 +- + net/netfilter/nf_synproxy_core.c | 2 +- + net/xfrm/xfrm_state.c | 6 +++-- + security/security.c | 17 +++++++------- + security/selinux/hooks.c | 26 ++++++++++++++-------- + security/selinux/include/objsec.h | 1 - + security/selinux/include/xfrm.h | 2 +- + security/selinux/ss/services.c | 4 +--- + security/selinux/xfrm.c | 13 ++++++----- + 35 files changed, 101 insertions(+), 77 deletions(-) +Merging smack/next (9b0072e2b2b5 security/smack: remove unused varible 'rc') +$ git merge smack/next +Merge made by the 'recursive' strategy. + security/smack/smack_lsm.c | 3 +-- + security/smack/smackfs.c | 7 ++++--- + 2 files changed, 5 insertions(+), 5 deletions(-) +Merging tomoyo/master (1b6b924efeb9 tomoyo: Fix null pointer check) +$ git merge tomoyo/master +Merge made by the 'recursive' strategy. + security/tomoyo/common.c | 2 +- + security/tomoyo/domain.c | 4 +-- + security/tomoyo/memory.c | 4 +-- + security/tomoyo/securityfs_if.c | 6 ++--- + security/tomoyo/util.c | 55 ++++++++++++++++++++++------------------- + 5 files changed, 37 insertions(+), 34 deletions(-) +Merging tpmdd/next (1ce46c91fdfe tpm: Fix fall-through warnings for Clang) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + drivers/char/tpm/eventlog/tpm1.c | 1 + + security/keys/process_keys.c | 1 + + 2 files changed, 2 insertions(+) +Merging watchdog/master (3650b228f83a Linux 5.10-rc1) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (4dd6ce478003 iommu: Fix a check in iommu_check_bind_data()) +$ git merge iommu/next +Already up to date. +Merging audit/next (ba59eae72385 audit: fix macros warnings) +$ git merge audit/next +Merge made by the 'recursive' strategy. + include/linux/audit.h | 8 -------- + kernel/audit.c | 7 +++++-- + kernel/auditsc.c | 38 ++++++++++++-------------------------- + security/lsm_audit.c | 5 ----- + 4 files changed, 17 insertions(+), 41 deletions(-) +Merging devicetree/for-next (616fde2dd60f dt-bindings: misc: convert fsl,dpaa2-console from txt to YAML) +$ git merge devicetree/for-next +Removing Documentation/devicetree/bindings/misc/fsl,dpaa2-console.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/misc/fsl,dpaa2-console.txt | 11 ---------- + .../bindings/misc/fsl,dpaa2-console.yaml | 25 ++++++++++++++++++++++ + 2 files changed, 25 insertions(+), 11 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/misc/fsl,dpaa2-console.txt + create mode 100644 Documentation/devicetree/bindings/misc/fsl,dpaa2-console.yaml +Merging mailbox/mailbox-for-next (c7dacf5b0f32 mailbox: avoid timer start from callback) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (893e98cc5f63 Merge remote-tracking branch 'spi/for-5.11' into spi-next) +$ git merge spi/for-next +Auto-merging drivers/input/touchscreen/ads7846.c +Merge made by the 'recursive' strategy. + drivers/input/touchscreen/ads7846.c | 3 +- + drivers/spi/atmel-quadspi.c | 2 +- + drivers/spi/spi-amd.c | 5 +- + drivers/spi/spi-atmel.c | 6 +- + drivers/spi/spi-bcm63xx-hsspi.c | 4 +- + drivers/spi/spi-dw-bt1.c | 2 +- + drivers/spi/spi-img-spfi.c | 4 +- + drivers/spi/spi-imx.c | 33 +----- + drivers/spi/spi-mem.c | 3 +- + drivers/spi/spi-mt7621.c | 2 + + drivers/spi/spi-mtk-nor.c | 16 ++- + drivers/spi/spi-mxs.c | 1 + + drivers/spi/spi-pic32.c | 1 + + drivers/spi/spi-rockchip.c | 4 + + drivers/spi/spi-sprd.c | 1 + + drivers/spi/spi-st-ssc4.c | 5 +- + drivers/spi/spi-stm32-qspi.c | 8 +- + drivers/spi/spi-stm32.c | 1 + + drivers/spi/spi-sun6i.c | 199 ++++++++++++++++++++++++++++++++---- + drivers/spi/spi-synquacer.c | 15 +-- + drivers/spi/spi-tegra114.c | 2 + + drivers/spi/spi-tegra20-sflash.c | 1 + + drivers/spi/spi-tegra20-slink.c | 2 + + drivers/spi/spi-ti-qspi.c | 1 + + drivers/spi/spi.c | 67 ++++++------ + include/linux/spi/spi.h | 1 + + 26 files changed, 286 insertions(+), 103 deletions(-) +Merging tip/auto-latest (c1c38fd953ac Merge branch 'core/entry') +$ git merge tip/auto-latest +Auto-merging tools/power/cpupower/utils/helpers/misc.c +CONFLICT (content): Merge conflict in tools/power/cpupower/utils/helpers/misc.c +Auto-merging tools/power/cpupower/utils/helpers/helpers.h +Auto-merging net/core/dev.c +Auto-merging mm/Kconfig +Auto-merging lib/Kconfig.debug +Auto-merging kernel/trace/bpf_trace.c +Auto-merging kernel/time/timekeeping.h +Auto-merging kernel/time/timekeeping.c +Auto-merging kernel/sched/cpufreq_schedutil.c +Auto-merging kernel/printk/printk.c +Auto-merging kernel/auditsc.c +Auto-merging include/linux/tracehook.h +Auto-merging include/linux/mm.h +Removing include/linux/irq_cpustat.h +Auto-merging include/linux/entry-common.h +Auto-merging include/linux/cpuhotplug.h +Removing include/asm-generic/kmap_types.h +Auto-merging fs/btrfs/ctree.h +Auto-merging drivers/platform/x86/Makefile +Auto-merging drivers/platform/x86/Kconfig +Auto-merging drivers/pci/controller/vmd.c +Auto-merging arch/xtensa/Kconfig +Removing arch/x86/platform/uv/uv_sysfs.c +Auto-merging arch/x86/pci/i386.c +CONFLICT (content): Merge conflict in arch/x86/pci/i386.c +Auto-merging arch/x86/include/asm/msr-index.h +Removing arch/x86/include/asm/msidef.h +Removing arch/x86/include/asm/kmap_types.h +Removing arch/x86/include/asm/copy_mc_test.h +Auto-merging arch/x86/Kconfig +Removing arch/um/include/asm/kmap_types.h +Auto-merging arch/sparc/mm/srmmu.c +Removing arch/sparc/mm/highmem.c +Auto-merging arch/sparc/mm/Makefile +Removing arch/sparc/include/asm/kmap_types.h +Auto-merging arch/sparc/Kconfig +Removing arch/sh/include/asm/kmap_types.h +Auto-merging arch/powerpc/perf/core-book3s.c +Auto-merging arch/powerpc/mm/mem.c +Removing arch/powerpc/mm/highmem.c +Removing arch/powerpc/include/asm/kmap_types.h +Auto-merging arch/powerpc/Kconfig +Removing arch/parisc/include/asm/kmap_types.h +Removing arch/nds32/mm/highmem.c +Removing arch/mips/include/asm/kmap_types.h +Auto-merging arch/mips/Kconfig +Removing arch/microblaze/mm/highmem.c +Auto-merging arch/microblaze/Kconfig +Removing arch/ia64/include/asm/kmap_types.h +Auto-merging arch/csky/Kconfig +Auto-merging arch/arm64/kernel/topology.c +Auto-merging arch/arm64/Kconfig +Removing arch/arm/mm/highmem.c +Auto-merging arch/arm/mm/Makefile +Removing arch/arm/include/asm/kmap_types.h +Auto-merging arch/arm/include/asm/fixmap.h +Auto-merging arch/arm/Kconfig +Removing arch/arc/include/asm/kmap_types.h +Auto-merging arch/arc/Kconfig +Removing arch/alpha/include/asm/kmap_types.h +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Recorded preimage for 'arch/x86/pci/i386.c' +Resolved 'tools/power/cpupower/utils/helpers/misc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/x86/pci/i386.c'. +[master b19735fba67e] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-firmware-sgi_uv | 141 ++- + Documentation/admin-guide/kernel-parameters.txt | 2 + + Documentation/core-api/irq/irq-domain.rst | 6 + + Documentation/driver-api/io-mapping.rst | 96 +- + Documentation/scheduler/sched-domains.rst | 26 +- + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + + Documentation/x86/index.rst | 3 +- + Documentation/x86/{resctrl_ui.rst => resctrl.rst} | 93 ++ + Documentation/x86/sgx.rst | 211 ++++ + Documentation/x86/topology.rst | 9 + + MAINTAINERS | 25 +- + arch/Kconfig | 17 + + arch/alpha/include/asm/kmap_types.h | 15 - + arch/arc/Kconfig | 1 + + arch/arc/include/asm/highmem.h | 26 +- + arch/arc/include/asm/kmap_types.h | 14 - + arch/arc/mm/highmem.c | 54 +- + arch/arm/Kconfig | 1 + + arch/arm/include/asm/fixmap.h | 4 +- + arch/arm/include/asm/hardirq.h | 11 +- + arch/arm/include/asm/highmem.h | 33 +- + arch/arm/include/asm/irq.h | 2 + + arch/arm/include/asm/kmap_types.h | 10 - + arch/arm/mm/Makefile | 1 - + arch/arm/mm/highmem.c | 121 --- + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/hardirq.h | 7 +- + arch/arm64/kernel/topology.c | 10 + + arch/csky/Kconfig | 1 + + arch/csky/include/asm/fixmap.h | 4 +- + arch/csky/include/asm/highmem.h | 6 +- + arch/csky/mm/highmem.c | 75 +- + arch/ia64/include/asm/kmap_types.h | 13 - + arch/microblaze/Kconfig | 1 + + arch/microblaze/include/asm/fixmap.h | 4 +- + arch/microblaze/include/asm/highmem.h | 6 +- + arch/microblaze/mm/Makefile | 1 - + arch/microblaze/mm/highmem.c | 78 -- + arch/microblaze/mm/init.c | 5 - + arch/mips/Kconfig | 1 + + arch/mips/include/asm/fixmap.h | 4 +- + arch/mips/include/asm/highmem.h | 6 +- + arch/mips/include/asm/kmap_types.h | 13 - + arch/mips/kernel/process.c | 5 +- + arch/mips/kernel/smp.c | 25 +- + arch/mips/mm/highmem.c | 77 -- + arch/mips/mm/init.c | 4 - + arch/nds32/Kconfig.cpu | 1 + + arch/nds32/include/asm/fixmap.h | 4 +- + arch/nds32/include/asm/highmem.h | 22 +- + arch/nds32/mm/Makefile | 1 - + arch/nds32/mm/highmem.c | 48 - + arch/openrisc/mm/init.c | 1 - + arch/openrisc/mm/ioremap.c | 1 - + arch/parisc/include/asm/hardirq.h | 1 - + arch/parisc/include/asm/kmap_types.h | 13 - + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/fixmap.h | 4 +- + arch/powerpc/include/asm/highmem.h | 7 +- + arch/powerpc/include/asm/kmap_types.h | 13 - + arch/powerpc/mm/Makefile | 1 - + arch/powerpc/mm/highmem.c | 67 -- + arch/powerpc/mm/mem.c | 7 - + arch/powerpc/perf/core-book3s.c | 6 +- + arch/s390/pci/pci_irq.c | 4 +- + arch/sh/include/asm/fixmap.h | 8 - + arch/sh/include/asm/hardirq.h | 14 +- + arch/sh/include/asm/kmap_types.h | 15 - + arch/sh/kernel/irq.c | 2 +- + arch/sh/kernel/traps.c | 2 +- + arch/sh/mm/init.c | 8 - + arch/sparc/Kconfig | 1 + + arch/sparc/include/asm/highmem.h | 8 +- + arch/sparc/include/asm/kmap_types.h | 11 - + arch/sparc/include/asm/vaddrs.h | 4 +- + arch/sparc/mm/Makefile | 3 - + arch/sparc/mm/highmem.c | 115 -- + arch/sparc/mm/srmmu.c | 2 - + arch/um/include/asm/fixmap.h | 1 - + arch/um/include/asm/hardirq.h | 17 +- + arch/um/include/asm/kmap_types.h | 13 - + arch/x86/Kconfig | 22 +- + arch/x86/Kconfig.debug | 3 - + arch/x86/boot/compressed/Makefile | 2 +- + arch/x86/boot/compressed/head_64.S | 8 +- + arch/x86/boot/compressed/ident_map_64.c | 10 - + arch/x86/entry/common.c | 34 - + arch/x86/entry/vdso/Makefile | 8 +- + arch/x86/entry/vdso/extable.c | 46 + + arch/x86/entry/vdso/extable.h | 28 + + arch/x86/entry/vdso/vdso-layout.lds.S | 9 +- + arch/x86/entry/vdso/vdso.lds.S | 1 + + arch/x86/entry/vdso/vdso2c.h | 50 +- + arch/x86/entry/vdso/vsgx.S | 151 +++ + arch/x86/events/amd/core.c | 2 +- + arch/x86/events/intel/core.c | 4 +- + arch/x86/events/intel/cstate.c | 19 +- + arch/x86/events/intel/ds.c | 11 +- + arch/x86/events/intel/uncore.c | 6 + + arch/x86/events/intel/uncore_snb.c | 20 +- + arch/x86/events/msr.c | 1 + + arch/x86/events/perf_event.h | 2 +- + arch/x86/include/asm/acpi.h | 11 + + arch/x86/include/asm/apic.h | 16 +- + arch/x86/include/asm/apicdef.h | 16 +- + arch/x86/include/asm/atomic.h | 2 +- + arch/x86/include/asm/atomic64_64.h | 2 +- + arch/x86/include/asm/cacheinfo.h | 4 +- + arch/x86/include/asm/cmpxchg.h | 2 +- + arch/x86/include/asm/copy_mc_test.h | 75 -- + arch/x86/include/asm/cpufeatures.h | 2 + + arch/x86/include/asm/disabled-features.h | 8 +- + arch/x86/include/asm/efi.h | 5 +- + arch/x86/include/asm/enclu.h | 9 + + arch/x86/include/asm/fixmap.h | 15 +- + arch/x86/include/asm/fpu/api.h | 23 +- + arch/x86/include/asm/highmem.h | 13 +- + arch/x86/include/asm/hpet.h | 11 - + arch/x86/include/asm/hw_irq.h | 14 +- + arch/x86/include/asm/hyperv-tlfs.h | 7 + + arch/x86/include/asm/idtentry.h | 3 - + arch/x86/include/asm/inst.h | 15 - + arch/x86/include/asm/io_apic.h | 79 +- + arch/x86/include/asm/iomap.h | 13 +- + arch/x86/include/asm/irq_remapping.h | 9 - + arch/x86/include/asm/irqdomain.h | 3 + + arch/x86/include/asm/kmap_types.h | 13 - + arch/x86/include/asm/mce.h | 9 +- + arch/x86/include/asm/msi.h | 50 + + arch/x86/include/asm/msidef.h | 57 - + arch/x86/include/asm/msr-index.h | 9 + + arch/x86/include/asm/page_32_types.h | 8 +- + arch/x86/include/asm/page_64_types.h | 6 +- + arch/x86/include/asm/paravirt.h | 11 - + arch/x86/include/asm/paravirt_types.h | 1 - + arch/x86/include/asm/pgtable_32.h | 18 +- + arch/x86/include/asm/pgtable_64_types.h | 6 +- + arch/x86/include/asm/processor.h | 2 - + arch/x86/include/asm/stacktrace.h | 3 - + arch/x86/include/asm/thread_info.h | 11 +- + arch/x86/include/asm/trap_pf.h | 2 + + arch/x86/include/asm/uv/bios.h | 49 + + arch/x86/include/asm/uv/uv_geo.h | 103 ++ + arch/x86/include/asm/vdso.h | 5 + + arch/x86/include/asm/x86_init.h | 2 + + arch/x86/include/uapi/asm/sgx.h | 168 +++ + arch/x86/kernel/Makefile | 2 - + arch/x86/kernel/acpi/apei.c | 5 + + arch/x86/kernel/amd_nb.c | 4 +- + arch/x86/kernel/apic/apic.c | 73 +- + arch/x86/kernel/apic/apic_flat_64.c | 18 +- + arch/x86/kernel/apic/apic_noop.c | 10 +- + arch/x86/kernel/apic/apic_numachip.c | 16 +- + arch/x86/kernel/apic/bigsmp_32.c | 9 +- + arch/x86/kernel/apic/io_apic.c | 503 ++++----- + arch/x86/kernel/apic/ipi.c | 6 +- + arch/x86/kernel/apic/msi.c | 153 +-- + arch/x86/kernel/apic/probe_32.c | 9 +- + arch/x86/kernel/apic/vector.c | 49 + + arch/x86/kernel/apic/x2apic_cluster.c | 10 +- + arch/x86/kernel/apic/x2apic_phys.c | 17 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 12 +- + arch/x86/kernel/asm-offsets.c | 1 - + arch/x86/kernel/cpu/Makefile | 1 + + arch/x86/kernel/cpu/amd.c | 17 +- + arch/x86/kernel/cpu/cacheinfo.c | 8 +- + arch/x86/kernel/cpu/feat_ctl.c | 38 +- + arch/x86/kernel/cpu/hygon.c | 11 +- + arch/x86/kernel/cpu/mce/amd.c | 4 +- + arch/x86/kernel/cpu/mce/apei.c | 61 ++ + arch/x86/kernel/cpu/mce/core.c | 15 +- + arch/x86/kernel/cpu/mce/inject.c | 4 +- + arch/x86/kernel/cpu/mce/intel.c | 21 + + arch/x86/kernel/cpu/microcode/amd.c | 1 - + arch/x86/kernel/cpu/mshyperv.c | 29 + + arch/x86/kernel/cpu/mtrr/mtrr.c | 3 +- + arch/x86/kernel/cpu/resctrl/core.c | 4 + + arch/x86/kernel/cpu/resctrl/internal.h | 3 +- + arch/x86/kernel/cpu/resctrl/monitor.c | 82 +- + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 4 +- + arch/x86/kernel/cpu/sgx/Makefile | 5 + + arch/x86/kernel/cpu/sgx/arch.h | 338 ++++++ + arch/x86/kernel/cpu/sgx/driver.c | 194 ++++ + arch/x86/kernel/cpu/sgx/driver.h | 29 + + arch/x86/kernel/cpu/sgx/encl.c | 740 +++++++++++++ + arch/x86/kernel/cpu/sgx/encl.h | 119 +++ + arch/x86/kernel/cpu/sgx/encls.h | 231 ++++ + arch/x86/kernel/cpu/sgx/ioctl.c | 716 +++++++++++++ + arch/x86/kernel/cpu/sgx/main.c | 733 +++++++++++++ + arch/x86/kernel/cpu/sgx/sgx.h | 86 ++ + arch/x86/kernel/cpu/topology.c | 10 +- + arch/x86/kernel/cpuid.c | 7 +- + arch/x86/kernel/crash_dump_32.c | 48 +- + arch/x86/kernel/devicetree.c | 30 +- + arch/x86/kernel/dumpstack.c | 2 +- + arch/x86/kernel/head64.c | 1 - + arch/x86/kernel/head_64.S | 29 +- + arch/x86/kernel/hpet.c | 122 ++- + arch/x86/kernel/kvm.c | 6 + + arch/x86/kernel/msr.c | 7 +- + arch/x86/kernel/nmi.c | 6 +- + arch/x86/kernel/setup.c | 5 - + arch/x86/kernel/smpboot.c | 8 +- + arch/x86/kernel/traps.c | 23 +- + arch/x86/kernel/vmlinux.lds.S | 12 +- + arch/x86/kernel/x86_init.c | 1 + + arch/x86/kvm/irq_comm.c | 31 +- + arch/x86/lib/copy_mc.c | 4 - + arch/x86/lib/copy_mc_64.S | 10 - + arch/x86/lib/msr-smp.c | 7 +- + arch/x86/lib/usercopy.c | 22 +- + arch/x86/mm/fault.c | 45 +- + arch/x86/mm/highmem_32.c | 59 -- + arch/x86/mm/ident_map.c | 12 +- + arch/x86/mm/init.c | 6 +- + arch/x86/mm/init_32.c | 15 - + arch/x86/mm/iomap_32.c | 57 +- + arch/x86/pci/i386.c | 4 +- + arch/x86/pci/intel_mid_pci.c | 8 +- + arch/x86/pci/xen.c | 26 +- + arch/x86/platform/uv/Makefile | 2 +- + arch/x86/platform/uv/bios_uv.c | 55 + + arch/x86/platform/uv/uv_irq.c | 4 +- + arch/x86/platform/uv/uv_sysfs.c | 63 -- + arch/x86/xen/apic.c | 7 +- + arch/x86/xen/efi.c | 37 +- + arch/xtensa/Kconfig | 1 + + arch/xtensa/include/asm/fixmap.h | 59 +- + arch/xtensa/include/asm/highmem.h | 15 +- + arch/xtensa/mm/highmem.c | 62 +- + arch/xtensa/mm/init.c | 4 +- + arch/xtensa/mm/mmu.c | 3 +- + block/blk-mq.c | 4 +- + drivers/base/regmap/regmap-irq.c | 11 +- + drivers/cpuidle/coupled.c | 3 +- + drivers/edac/amd64_edac.c | 4 +- + drivers/edac/mce_amd.c | 4 +- + drivers/firmware/efi/Kconfig | 2 +- + drivers/firmware/efi/cper-x86.c | 11 +- + drivers/firmware/efi/libstub/efistub.h | 2 + + drivers/firmware/efi/libstub/secureboot.c | 44 +- + drivers/firmware/efi/libstub/x86-stub.c | 5 +- + drivers/gpu/drm/i915/i915_request.c | 4 +- + drivers/iommu/amd/amd_iommu_types.h | 2 +- + drivers/iommu/amd/init.c | 225 ++-- + drivers/iommu/amd/iommu.c | 93 +- + drivers/iommu/hyperv-iommu.c | 44 +- + drivers/iommu/intel/irq_remapping.c | 102 +- + drivers/iommu/irq_remapping.c | 14 - + drivers/iommu/irq_remapping.h | 3 - + drivers/net/ethernet/cavium/liquidio/lio_core.c | 9 +- + drivers/pci/controller/pci-hyperv.c | 6 +- + drivers/pci/controller/vmd.c | 9 +- + drivers/platform/x86/Kconfig | 11 + + drivers/platform/x86/Makefile | 3 + + drivers/platform/x86/uv_sysfs.c | 862 +++++++++++++++ + fs/aio.c | 1 - + fs/btrfs/ctree.h | 1 - + fs/proc/array.c | 4 +- + include/asm-generic/Kbuild | 2 +- + include/asm-generic/atomic-instrumented.h | 216 ++-- + include/asm-generic/hardirq.h | 6 +- + include/asm-generic/kmap_size.h | 12 + + include/asm-generic/kmap_types.h | 11 - + include/asm-generic/msi.h | 4 + + include/asm-generic/syscall.h | 24 +- + include/linux/atomic-arch-fallback.h | 90 +- + include/linux/atomic-fallback.h | 90 +- + include/linux/context_tracking.h | 6 +- + include/linux/cpuhotplug.h | 1 + + include/linux/cpumask.h | 6 + + include/linux/efi.h | 23 +- + include/linux/entry-common.h | 91 +- + include/linux/freelist.h | 129 +++ + include/linux/highmem-internal.h | 232 ++++ + include/linux/highmem.h | 294 ++---- + include/linux/hrtimer.h | 6 +- + include/linux/io-mapping.h | 38 +- + include/linux/irq.h | 15 - + include/linux/irq_cpustat.h | 28 - + include/linux/irq_work.h | 33 +- + include/linux/irqdomain.h | 10 +- + include/linux/irqflags.h | 8 +- + include/linux/kernel.h | 21 +- + include/linux/kprobes.h | 25 +- + include/linux/llist.h | 23 + + include/linux/mm.h | 7 + + include/linux/msi.h | 46 +- + include/linux/perf_event.h | 6 + + include/linux/preempt.h | 113 +- + include/linux/sched.h | 18 + + include/linux/sched/hotplug.h | 2 + + include/linux/sched/mm.h | 5 + + include/linux/sched/topology.h | 8 + + include/linux/seccomp.h | 2 +- + include/linux/smp.h | 19 +- + include/linux/stop_machine.h | 5 + + include/linux/thread_info.h | 48 + + include/linux/timer.h | 1 - + include/linux/tracehook.h | 17 +- + include/trace/syscall.h | 6 +- + include/uapi/linux/perf_event.h | 6 +- + include/uapi/linux/sched/types.h | 2 + + kernel/auditsc.c | 4 +- + kernel/bpf/stackmap.c | 2 +- + kernel/cgroup/cpuset.c | 33 +- + kernel/cpu.c | 9 +- + kernel/debug/debug_core.c | 6 +- + kernel/entry/common.c | 89 +- + kernel/events/core.c | 141 ++- + kernel/exit.c | 16 +- + kernel/fork.c | 13 +- + kernel/futex.c | 2 - + kernel/irq/Kconfig | 5 - + kernel/irq/chip.c | 2 +- + kernel/irq/generic-chip.c | 2 +- + kernel/irq/irqdesc.c | 51 - + kernel/irq/irqdomain.c | 32 +- + kernel/irq_work.c | 45 +- + kernel/kprobes.c | 314 ++---- + kernel/kthread.c | 21 + + kernel/printk/printk.c | 6 +- + kernel/ptrace.c | 16 +- + kernel/rcu/tree.c | 3 +- + kernel/sched/core.c | 1116 +++++++++++++++----- + kernel/sched/cpudeadline.c | 4 +- + kernel/sched/cpufreq_schedutil.c | 9 +- + kernel/sched/cpupri.c | 52 +- + kernel/sched/cpupri.h | 8 +- + kernel/sched/deadline.c | 101 +- + kernel/sched/fair.c | 114 +- + kernel/sched/idle.c | 7 +- + kernel/sched/membarrier.c | 147 ++- + kernel/sched/rt.c | 99 +- + kernel/sched/sched.h | 150 ++- + kernel/sched/stop_task.c | 5 +- + kernel/sched/topology.c | 61 +- + kernel/seccomp.c | 6 +- + kernel/smp.c | 52 +- + kernel/softirq.c | 107 +- + kernel/stop_machine.c | 27 +- + kernel/time/hrtimer.c | 2 +- + kernel/time/jiffies.c | 3 +- + kernel/time/tick-broadcast.c | 25 +- + kernel/time/tick-common.c | 12 +- + kernel/time/tick-internal.h | 1 - + kernel/time/tick-sched.c | 106 +- + kernel/time/timeconv.c | 6 +- + kernel/time/timekeeping.c | 85 +- + kernel/time/timekeeping.h | 2 +- + kernel/time/timer.c | 57 +- + kernel/time/timer_list.c | 66 +- + kernel/trace/bpf_trace.c | 2 +- + kernel/trace/trace_events.c | 8 +- + kernel/trace/trace_kprobe.c | 3 +- + kernel/tracepoint.c | 4 +- + kernel/workqueue.c | 4 + + lib/Kconfig.debug | 22 + + lib/cpumask.c | 18 + + lib/dump_stack.c | 2 + + lib/smp_processor_id.c | 5 + + mm/Kconfig | 3 + + mm/highmem.c | 272 ++++- + mm/mprotect.c | 7 + + net/core/dev.c | 3 +- + scripts/atomic/gen-atomic-fallback.sh | 63 +- + scripts/atomic/gen-atomic-instrumented.sh | 29 +- + scripts/atomic/gen-atomics.sh | 0 + security/integrity/ima/Makefile | 4 + + .../ima_arch.c => security/integrity/ima/ima_efi.c | 45 +- + tools/power/cpupower/lib/cpupower.c | 23 +- + tools/power/cpupower/lib/cpupower_intern.h | 5 + + tools/power/cpupower/utils/cpupower-info.c | 2 +- + tools/power/cpupower/utils/cpupower-set.c | 2 +- + tools/power/cpupower/utils/helpers/helpers.h | 8 +- + tools/power/cpupower/utils/helpers/misc.c | 45 + + tools/power/cpupower/utils/helpers/msr.c | 28 - + tools/power/x86/turbostat/turbostat.c | 29 +- + .../x86_energy_perf_policy.c | 109 +- + tools/testing/nvdimm/test/nfit.c | 103 -- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/sgx/.gitignore | 2 + + tools/testing/selftests/sgx/Makefile | 57 + + tools/testing/selftests/sgx/call.S | 44 + + tools/testing/selftests/sgx/defines.h | 21 + + tools/testing/selftests/sgx/load.c | 277 +++++ + tools/testing/selftests/sgx/main.c | 246 +++++ + tools/testing/selftests/sgx/main.h | 41 + + tools/testing/selftests/sgx/sign_key.S | 12 + + tools/testing/selftests/sgx/sign_key.pem | 39 + + tools/testing/selftests/sgx/sigstruct.c | 381 +++++++ + tools/testing/selftests/sgx/test_encl.c | 20 + + tools/testing/selftests/sgx/test_encl.lds | 40 + + tools/testing/selftests/sgx/test_encl_bootstrap.S | 89 ++ + tools/testing/selftests/x86/fsgsbase.c | 12 +- + .../testing/selftests/x86/raw_syscall_helper_32.S | 2 + + tools/testing/selftests/x86/thunks.S | 2 + + 397 files changed, 12473 insertions(+), 4493 deletions(-) + rename Documentation/x86/{resctrl_ui.rst => resctrl.rst} (90%) + create mode 100644 Documentation/x86/sgx.rst + delete mode 100644 arch/alpha/include/asm/kmap_types.h + delete mode 100644 arch/arc/include/asm/kmap_types.h + delete mode 100644 arch/arm/include/asm/kmap_types.h + delete mode 100644 arch/arm/mm/highmem.c + delete mode 100644 arch/ia64/include/asm/kmap_types.h + delete mode 100644 arch/microblaze/mm/highmem.c + delete mode 100644 arch/mips/include/asm/kmap_types.h + delete mode 100644 arch/nds32/mm/highmem.c + delete mode 100644 arch/parisc/include/asm/kmap_types.h + delete mode 100644 arch/powerpc/include/asm/kmap_types.h + delete mode 100644 arch/powerpc/mm/highmem.c + delete mode 100644 arch/sh/include/asm/kmap_types.h + delete mode 100644 arch/sparc/include/asm/kmap_types.h + delete mode 100644 arch/sparc/mm/highmem.c + delete mode 100644 arch/um/include/asm/kmap_types.h + create mode 100644 arch/x86/entry/vdso/extable.c + create mode 100644 arch/x86/entry/vdso/extable.h + create mode 100644 arch/x86/entry/vdso/vsgx.S + delete mode 100644 arch/x86/include/asm/copy_mc_test.h + create mode 100644 arch/x86/include/asm/enclu.h + delete mode 100644 arch/x86/include/asm/kmap_types.h + delete mode 100644 arch/x86/include/asm/msidef.h + create mode 100644 arch/x86/include/asm/uv/uv_geo.h + create mode 100644 arch/x86/include/uapi/asm/sgx.h + create mode 100644 arch/x86/kernel/cpu/sgx/Makefile + create mode 100644 arch/x86/kernel/cpu/sgx/arch.h + create mode 100644 arch/x86/kernel/cpu/sgx/driver.c + create mode 100644 arch/x86/kernel/cpu/sgx/driver.h + create mode 100644 arch/x86/kernel/cpu/sgx/encl.c + create mode 100644 arch/x86/kernel/cpu/sgx/encl.h + create mode 100644 arch/x86/kernel/cpu/sgx/encls.h + create mode 100644 arch/x86/kernel/cpu/sgx/ioctl.c + create mode 100644 arch/x86/kernel/cpu/sgx/main.c + create mode 100644 arch/x86/kernel/cpu/sgx/sgx.h + delete mode 100644 arch/x86/platform/uv/uv_sysfs.c + create mode 100644 drivers/platform/x86/uv_sysfs.c + create mode 100644 include/asm-generic/kmap_size.h + delete mode 100644 include/asm-generic/kmap_types.h + create mode 100644 include/linux/freelist.h + create mode 100644 include/linux/highmem-internal.h + delete mode 100644 include/linux/irq_cpustat.h + mode change 100644 => 100755 scripts/atomic/gen-atomics.sh + rename arch/x86/kernel/ima_arch.c => security/integrity/ima/ima_efi.c (60%) + create mode 100644 tools/testing/selftests/sgx/.gitignore + create mode 100644 tools/testing/selftests/sgx/Makefile + create mode 100644 tools/testing/selftests/sgx/call.S + create mode 100644 tools/testing/selftests/sgx/defines.h + create mode 100644 tools/testing/selftests/sgx/load.c + create mode 100644 tools/testing/selftests/sgx/main.c + create mode 100644 tools/testing/selftests/sgx/main.h + create mode 100644 tools/testing/selftests/sgx/sign_key.S + create mode 100644 tools/testing/selftests/sgx/sign_key.pem + create mode 100644 tools/testing/selftests/sgx/sigstruct.c + create mode 100644 tools/testing/selftests/sgx/test_encl.c + create mode 100644 tools/testing/selftests/sgx/test_encl.lds + create mode 100644 tools/testing/selftests/sgx/test_encl_bootstrap.S +Merging clockevents/timers/drivers/next (e588acdb8087 clocksource/drivers/riscv: Make RISCV_TIMER depends on RISCV_SBI) +$ git merge clockevents/timers/drivers/next +Removing drivers/clocksource/timer-nps.c +Auto-merging drivers/clocksource/Kconfig +Removing Documentation/devicetree/bindings/timer/renesas,tmu.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/timer/renesas,tmu.txt | 49 ---- + .../devicetree/bindings/timer/renesas,tmu.yaml | 99 +++++++ + drivers/clocksource/Kconfig | 12 +- + drivers/clocksource/Makefile | 1 - + drivers/clocksource/ingenic-timer.c | 2 +- + drivers/clocksource/timer-cadence-ttc.c | 18 +- + drivers/clocksource/timer-nps.c | 284 --------------------- + drivers/clocksource/timer-orion.c | 11 +- + drivers/clocksource/timer-sp804.c | 49 ++-- + include/dt-bindings/clock/ingenic,sysost.h | 10 +- + 10 files changed, 142 insertions(+), 393 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/timer/renesas,tmu.txt + create mode 100644 Documentation/devicetree/bindings/timer/renesas,tmu.yaml + delete mode 100644 drivers/clocksource/timer-nps.c +Merging edac/edac-for-next (8763e5cbb958 Merge remote-tracking branch 'ras/edac-spr' into edac-for-next) +$ git merge edac/edac-for-next +Auto-merging drivers/edac/amd64_edac.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 11 +- + drivers/edac/Kconfig | 9 + + drivers/edac/Makefile | 1 + + drivers/edac/amd64_edac.c | 34 +- + drivers/edac/amd76x_edac.c | 1 - + drivers/edac/e752x_edac.c | 1 - + drivers/edac/e7xxx_edac.c | 1 - + drivers/edac/edac_device.h | 11 +- + drivers/edac/edac_mc.c | 4 + + drivers/edac/i10nm_base.c | 39 +- + drivers/edac/i3000_edac.c | 1 - + drivers/edac/i3200_edac.c | 1 - + drivers/edac/i5000_edac.c | 2 +- + drivers/edac/i5400_edac.c | 2 +- + drivers/edac/i82443bxgx_edac.c | 1 - + drivers/edac/i82860_edac.c | 1 - + drivers/edac/i82875p_edac.c | 1 - + drivers/edac/i82975x_edac.c | 1 - + drivers/edac/ie31200_edac.c | 1 - + drivers/edac/igen6_edac.c | 977 +++++++++++++++++++++++++++++++++++++++++ + drivers/edac/r82600_edac.c | 1 - + drivers/edac/skx_base.c | 6 +- + drivers/edac/skx_common.c | 23 +- + drivers/edac/skx_common.h | 16 +- + drivers/edac/synopsys_edac.c | 3 +- + drivers/edac/x38_edac.c | 1 - + include/linux/edac.h | 16 +- + 27 files changed, 1099 insertions(+), 67 deletions(-) + create mode 100644 drivers/edac/igen6_edac.c +Merging irqchip/irq/irqchip-next (74cde1a53368 irqchip/gic-v3-its: Unconditionally save/restore the ITS state on suspend) +$ git merge irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (b111545d26c0 tracing: Remove the useless value assignment in test_create_synth_event()) +$ git merge ftrace/for-next +Auto-merging kernel/trace/trace_events.c +Auto-merging kernel/trace/bpf_trace.c +Auto-merging kernel/trace/Kconfig +Auto-merging include/linux/kprobes.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/kernel/ftrace.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/trace/ftrace-uses.rst | 84 ++++++++---- + MAINTAINERS | 1 + + arch/csky/kernel/probes/ftrace.c | 16 ++- + arch/nds32/kernel/ftrace.c | 4 +- + arch/parisc/kernel/ftrace.c | 24 +++- + arch/powerpc/include/asm/livepatch.h | 4 +- + arch/powerpc/kernel/kprobes-ftrace.c | 15 ++- + arch/s390/include/asm/livepatch.h | 5 +- + arch/s390/kernel/ftrace.c | 20 ++- + arch/x86/Kconfig | 1 + + arch/x86/include/asm/ftrace.h | 18 +++ + arch/x86/include/asm/livepatch.h | 4 +- + arch/x86/kernel/ftrace_64.S | 15 ++- + arch/x86/kernel/kprobes/ftrace.c | 15 ++- + fs/pstore/ftrace.c | 8 +- + include/linux/ftrace.h | 45 +++++-- + include/linux/kprobes.h | 2 +- + include/linux/trace_recursion.h | 232 +++++++++++++++++++++++++++++++++ + kernel/livepatch/Kconfig | 2 +- + kernel/livepatch/patch.c | 15 ++- + kernel/trace/Kconfig | 48 +++++++ + kernel/trace/Makefile | 1 + + kernel/trace/blktrace.c | 4 +- + kernel/trace/bpf_trace.c | 2 +- + kernel/trace/fgraph.c | 3 +- + kernel/trace/ftrace.c | 57 ++++---- + kernel/trace/ring_buffer.c | 12 +- + kernel/trace/synth_event_gen_test.c | 2 +- + kernel/trace/trace.c | 2 +- + kernel/trace/trace.h | 177 ------------------------- + kernel/trace/trace_benchmark.c | 6 +- + kernel/trace/trace_dynevent.c | 2 +- + kernel/trace/trace_dynevent.h | 6 +- + kernel/trace/trace_entries.h | 6 +- + kernel/trace/trace_event_perf.c | 15 ++- + kernel/trace/trace_events.c | 7 +- + kernel/trace/trace_events_filter.c | 2 +- + kernel/trace/trace_events_hist.c | 2 +- + kernel/trace/trace_events_synth.c | 4 +- + kernel/trace/trace_export.c | 2 +- + kernel/trace/trace_functions.c | 23 ++-- + kernel/trace/trace_functions_graph.c | 2 +- + kernel/trace/trace_hwlat.c | 4 +- + kernel/trace/trace_irqsoff.c | 2 +- + kernel/trace/trace_output.c | 6 +- + kernel/trace/trace_output.h | 1 + + kernel/trace/trace_recursion_record.c | 236 ++++++++++++++++++++++++++++++++++ + kernel/trace/trace_sched_wakeup.c | 2 +- + kernel/trace/trace_selftest.c | 27 ++-- + kernel/trace/trace_stack.c | 3 +- + kernel/trace/tracing_map.c | 6 +- + kernel/trace/tracing_map.h | 2 +- + 52 files changed, 862 insertions(+), 342 deletions(-) + create mode 100644 include/linux/trace_recursion.h + create mode 100644 kernel/trace/trace_recursion_record.c +Merging rcu/rcu/next (5ca88db79d8d torture: Add --kcsan-kmake-arg to torture.sh for KCSAN) +$ git merge rcu/rcu/next +Auto-merging lib/cpumask.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sched/core.c +Auto-merging kernel/rcu/tree.c +Auto-merging include/net/sock.h +Auto-merging include/net/sch_generic.h +Auto-merging include/linux/preempt.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/lockdep.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/cpumask.h +Auto-merging arch/xtensa/kernel/entry.S +Auto-merging arch/x86/kernel/smpboot.c +Auto-merging arch/x86/kernel/cpu/mtrr/mtrr.c +Auto-merging arch/arm/include/asm/assembler.h +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + .../RCU/Design/Requirements/Requirements.rst | 722 +++++++++++---------- + Documentation/RCU/checklist.rst | 7 + + Documentation/RCU/rcu_dereference.rst | 6 + + Documentation/RCU/stallwarn.rst | 23 +- + Documentation/RCU/whatisRCU.rst | 3 +- + Documentation/admin-guide/kernel-parameters.rst | 20 + + Documentation/admin-guide/kernel-parameters.txt | 26 +- + .../litmus-tests/locking/DCL-broken.litmus | 55 ++ + .../litmus-tests/locking/DCL-fixed.litmus | 56 ++ + .../litmus-tests/locking/RM-broken.litmus | 42 ++ + Documentation/litmus-tests/locking/RM-fixed.litmus | 42 ++ + Documentation/memory-barriers.txt | 2 +- + arch/arm/include/asm/assembler.h | 11 - + arch/arm/kernel/iwmmxt.S | 2 - + arch/arm/mach-ep93xx/crunch-bits.S | 2 - + arch/x86/kernel/cpu/aperfmperf.c | 16 +- + arch/x86/kernel/cpu/mtrr/mtrr.c | 2 - + arch/x86/kernel/smpboot.c | 1 + + arch/xtensa/kernel/entry.S | 2 +- + drivers/gpu/drm/i915/Kconfig.debug | 1 - + drivers/gpu/drm/i915/i915_utils.h | 3 +- + include/linux/bit_spinlock.h | 4 +- + include/linux/cpumask.h | 8 + + include/linux/kernel.h | 1 + + include/linux/list.h | 4 +- + include/linux/lockdep.h | 12 +- + include/linux/pagemap.h | 4 +- + include/linux/preempt.h | 37 +- + include/linux/rcu_segcblist.h | 1 + + include/linux/rcupdate.h | 49 +- + include/linux/rcupdate_trace.h | 4 +- + include/linux/rcutiny.h | 2 + + include/linux/rcutree.h | 1 + + include/linux/sched/task.h | 2 - + include/linux/srcu.h | 3 + + include/linux/srcutiny.h | 7 +- + include/linux/torture.h | 22 +- + include/linux/uaccess.h | 6 +- + include/net/sch_generic.h | 12 - + include/net/sock.h | 2 - + include/trace/events/rcu.h | 26 + + kernel/Kconfig.preempt | 4 - + kernel/kcsan/encoding.h | 20 +- + kernel/kcsan/selftest.c | 3 + + kernel/locking/locktorture.c | 37 +- + kernel/rcu/Kconfig | 20 +- + kernel/rcu/rcu.h | 32 +- + kernel/rcu/rcu_segcblist.c | 203 ++++-- + kernel/rcu/rcu_segcblist.h | 8 +- + kernel/rcu/rcuscale.c | 37 +- + kernel/rcu/rcutorture.c | 439 +++++++++++-- + kernel/rcu/refscale.c | 34 +- + kernel/rcu/srcutiny.c | 77 ++- + kernel/rcu/srcutree.c | 153 ++++- + kernel/rcu/tasks.h | 49 +- + kernel/rcu/tree.c | 295 ++++++--- + kernel/rcu/tree.h | 2 + + kernel/rcu/tree_exp.h | 2 +- + kernel/rcu/tree_plugin.h | 16 +- + kernel/rcu/tree_stall.h | 71 +- + kernel/scftorture.c | 55 +- + kernel/sched/core.c | 15 +- + kernel/sysctl.c | 11 + + kernel/torture.c | 121 +++- + lib/Kconfig.debug | 3 - + lib/cpumask.c | 132 ++++ + tools/include/nolibc/nolibc.h | 4 +- + tools/memory-model/Documentation/README | 76 +++ + .../Documentation/control-dependencies.txt | 258 ++++++++ + tools/memory-model/Documentation/glossary.txt | 178 +++++ + tools/memory-model/Documentation/litmus-tests.txt | 17 + + tools/memory-model/Documentation/locking.txt | 320 +++++++++ + tools/memory-model/Documentation/ordering.txt | 556 ++++++++++++++++ + tools/memory-model/README | 22 +- + tools/memory-model/litmus-tests/.gitignore | 2 +- + .../litmus-tests/CoRR+poonceonce+Once.litmus | 4 +- + .../litmus-tests/CoRW+poonceonce+Once.litmus | 4 +- + .../litmus-tests/CoWR+poonceonce+Once.litmus | 4 +- + .../litmus-tests/CoWW+poonceonce.litmus | 4 +- + .../IRIW+fencembonceonces+OnceOnce.litmus | 5 +- + .../litmus-tests/IRIW+poonceonces+OnceOnce.litmus | 5 +- + .../ISA2+pooncelock+pooncelock+pombonce.litmus | 7 +- + .../litmus-tests/ISA2+poonceonces.litmus | 6 +- + ...cerelease+poacquirerelease+poacquireonce.litmus | 6 +- + .../LB+fencembonceonce+ctrlonceonce.litmus | 5 +- + .../LB+poacquireonce+pooncerelease.litmus | 5 +- + .../litmus-tests/LB+poonceonces.litmus | 5 +- + .../MP+fencewmbonceonce+fencermbonceonce.litmus | 19 +- + .../litmus-tests/MP+onceassign+derefonce.litmus | 15 +- + .../MP+polockmbonce+poacquiresilsil.litmus | 8 +- + .../MP+polockonce+poacquiresilsil.litmus | 8 +- + tools/memory-model/litmus-tests/MP+polocks.litmus | 20 +- + .../litmus-tests/MP+poonceonces.litmus | 19 +- + .../MP+pooncerelease+poacquireonce.litmus | 19 +- + .../memory-model/litmus-tests/MP+porevlocks.litmus | 20 +- + .../litmus-tests/R+fencembonceonces.litmus | 5 +- + .../memory-model/litmus-tests/R+poonceonces.litmus | 5 +- + .../S+fencewmbonceonce+poacquireonce.litmus | 5 +- + .../memory-model/litmus-tests/S+poonceonces.litmus | 5 +- + .../litmus-tests/SB+fencembonceonces.litmus | 5 +- + .../litmus-tests/SB+poonceonces.litmus | 5 +- + .../litmus-tests/SB+rfionceonce-poonceonces.litmus | 5 +- + .../litmus-tests/WRC+poonceonces+Once.litmus | 5 +- + .../WRC+pooncerelease+fencermbonceonce+Once.litmus | 5 +- + .../Z6.0+pooncelock+poonceLock+pombonce.litmus | 7 +- + .../Z6.0+pooncelock+pooncelock+pombonce.litmus | 7 +- + ...release+poacquirerelease+fencembonceonce.litmus | 6 +- + tools/memory-model/scripts/README | 16 +- + tools/memory-model/scripts/checkalllitmus.sh | 29 +- + tools/memory-model/scripts/checkghlitmus.sh | 11 +- + tools/memory-model/scripts/checklitmus.sh | 25 +- + tools/memory-model/scripts/checklitmushist.sh | 2 +- + tools/memory-model/scripts/checktheselitmus.sh | 43 ++ + tools/memory-model/scripts/cmplitmushist.sh | 49 +- + tools/memory-model/scripts/hwfnseg.sh | 20 + + tools/memory-model/scripts/initlitmushist.sh | 2 +- + tools/memory-model/scripts/judgelitmus.sh | 120 +++- + tools/memory-model/scripts/newlitmushist.sh | 4 +- + tools/memory-model/scripts/parseargs.sh | 21 +- + tools/memory-model/scripts/runlitmus.sh | 80 +++ + tools/memory-model/scripts/runlitmushist.sh | 29 +- + tools/memory-model/scripts/simpletest.sh | 35 + + .../testing/selftests/rcutorture/bin/config2csv.sh | 67 ++ + .../selftests/rcutorture/bin/console-badness.sh | 3 +- + .../testing/selftests/rcutorture/bin/functions.sh | 36 +- + .../selftests/rcutorture/bin/kvm-check-branches.sh | 5 +- + .../selftests/rcutorture/bin/kvm-find-errors.sh | 8 +- + .../rcutorture/bin/kvm-recheck-rcuscale.sh | 2 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 23 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 81 ++- + .../selftests/rcutorture/bin/parse-console.sh | 2 +- + tools/testing/selftests/rcutorture/bin/torture.sh | 394 +++++++++++ + .../selftests/rcutorture/configs/rcu/SRCU-t | 4 +- + .../selftests/rcutorture/configs/rcu/SRCU-u | 4 +- + .../selftests/rcutorture/configs/rcu/TINY01 | 1 - + .../selftests/rcutorture/configs/rcu/TRACE01 | 6 +- + .../selftests/rcutorture/configs/rcu/TRACE02 | 6 +- + .../selftests/rcutorture/configs/rcu/TREE04.boot | 2 +- + .../selftests/rcutorture/configs/rcu/TREE08.boot | 2 +- + .../selftests/rcutorture/configs/rcuscale/CFcommon | 3 + + .../selftests/rcutorture/configs/rcuscale/TRACE01 | 15 + + .../rcutorture/configs/rcuscale/TRACE01.boot | 1 + + .../testing/selftests/rcutorture/doc/TINY_RCU.txt | 5 +- + .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 1 - + .../rcutorture/formal/srcu-cbmc/src/config.h | 1 - + 145 files changed, 4853 insertions(+), 1081 deletions(-) + create mode 100644 Documentation/litmus-tests/locking/DCL-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/DCL-fixed.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-fixed.litmus + create mode 100644 tools/memory-model/Documentation/README + create mode 100644 tools/memory-model/Documentation/control-dependencies.txt + create mode 100644 tools/memory-model/Documentation/glossary.txt + create mode 100644 tools/memory-model/Documentation/locking.txt + create mode 100644 tools/memory-model/Documentation/ordering.txt + create mode 100755 tools/memory-model/scripts/checktheselitmus.sh + create mode 100755 tools/memory-model/scripts/hwfnseg.sh + create mode 100755 tools/memory-model/scripts/runlitmus.sh + create mode 100755 tools/memory-model/scripts/simpletest.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/config2csv.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/torture.sh + create mode 100644 tools/testing/selftests/rcutorture/configs/rcuscale/TRACE01 + create mode 100644 tools/testing/selftests/rcutorture/configs/rcuscale/TRACE01.boot +Merging kvm/linux-next (e792415c5d3e KVM: MIPS/VZ: Fix build error caused by 'kvm_run' cleanup) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (90f0e16c649a Merge branch 'kvm-arm64/misc-5.11' into kvmarm-master/next) +$ git merge kvm-arm/next +Removing arch/arm64/kvm/regmap.c +Removing arch/arm64/kvm/hyp/smccc_wa.S +Removing arch/arm64/kvm/aarch32.c +Auto-merging arch/arm64/kernel/proton-pack.c +Auto-merging arch/arm64/include/asm/sysreg.h +Removing arch/arm64/include/asm/kvm_coproc.h +Auto-merging arch/arm64/include/asm/cpufeature.h +Auto-merging arch/arm64/include/asm/cpucaps.h +Auto-merging Documentation/arm64/memory.rst +Merge made by the 'recursive' strategy. + Documentation/arm64/memory.rst | 2 +- + arch/arm64/include/asm/cpucaps.h | 2 +- + arch/arm64/include/asm/cpufeature.h | 5 + + arch/arm64/include/asm/kvm_asm.h | 7 - + arch/arm64/include/asm/kvm_coproc.h | 38 --- + arch/arm64/include/asm/kvm_emulate.h | 70 +--- + arch/arm64/include/asm/kvm_host.h | 195 ++++++++--- + arch/arm64/include/asm/kvm_mmu.h | 86 +++-- + arch/arm64/include/asm/mmu.h | 29 -- + arch/arm64/include/asm/spectre.h | 63 ++++ + arch/arm64/include/asm/sysreg.h | 1 + + arch/arm64/include/uapi/asm/kvm.h | 3 - + arch/arm64/kernel/cpu_errata.c | 19 +- + arch/arm64/kernel/image-vars.h | 5 +- + arch/arm64/kernel/proton-pack.c | 84 ++--- + arch/arm64/kvm/Makefile | 4 +- + arch/arm64/kvm/aarch32.c | 232 ------------- + arch/arm64/kvm/arm.c | 136 +++++--- + arch/arm64/kvm/guest.c | 29 +- + arch/arm64/kvm/handle_exit.c | 24 +- + arch/arm64/kvm/hyp/Makefile | 2 +- + arch/arm64/kvm/hyp/aarch32.c | 4 +- + arch/arm64/kvm/hyp/exception.c | 331 ++++++++++++++++++ + arch/arm64/kvm/hyp/hyp-entry.S | 71 ++-- + arch/arm64/kvm/hyp/include/hyp/adjust_pc.h | 62 ++++ + arch/arm64/kvm/hyp/include/hyp/switch.h | 17 + + arch/arm64/kvm/hyp/nvhe/Makefile | 2 +- + arch/arm64/kvm/hyp/nvhe/host.S | 11 +- + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 232 +++++++------ + arch/arm64/kvm/hyp/nvhe/switch.c | 3 + + arch/arm64/kvm/hyp/nvhe/sysreg-sr.c | 11 - + arch/arm64/kvm/hyp/smccc_wa.S | 32 -- + arch/arm64/kvm/hyp/vgic-v2-cpuif-proxy.c | 2 + + arch/arm64/kvm/hyp/vgic-v3-sr.c | 2 + + arch/arm64/kvm/hyp/vhe/Makefile | 2 +- + arch/arm64/kvm/hyp/vhe/switch.c | 3 + + arch/arm64/kvm/inject_fault.c | 167 +++------ + arch/arm64/kvm/mmio.c | 2 +- + arch/arm64/kvm/mmu.c | 2 +- + arch/arm64/kvm/pmu-emul.c | 19 +- + arch/arm64/kvm/regmap.c | 224 ------------ + arch/arm64/kvm/reset.c | 57 +--- + arch/arm64/kvm/sys_regs.c | 374 +++++++-------------- + arch/arm64/kvm/sys_regs.h | 9 +- + arch/arm64/kvm/va_layout.c | 74 +++- + arch/arm64/kvm/vgic-sys-reg-v3.c | 4 - + include/kvm/arm_pmu.h | 3 - + tools/testing/selftests/kvm/aarch64/get-reg-list.c | 39 ++- + 48 files changed, 1329 insertions(+), 1466 deletions(-) + delete mode 100644 arch/arm64/include/asm/kvm_coproc.h + delete mode 100644 arch/arm64/kvm/aarch32.c + create mode 100644 arch/arm64/kvm/hyp/exception.c + create mode 100644 arch/arm64/kvm/hyp/include/hyp/adjust_pc.h + delete mode 100644 arch/arm64/kvm/hyp/smccc_wa.S + delete mode 100644 arch/arm64/kvm/regmap.c +Merging kvm-ppc/kvm-ppc-next (cf59eb13e151 KVM: PPC: Book3S: Fix symbol undeclared warnings) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (d121365715a0 s390/gmap: make gmap memcg aware) +$ git merge kvms390/next +Merge made by the 'recursive' strategy. + arch/s390/kvm/guestdbg.c | 8 ++++---- + arch/s390/kvm/intercept.c | 2 +- + arch/s390/kvm/interrupt.c | 10 +++++----- + arch/s390/kvm/kvm-s390.c | 20 ++++++++++---------- + arch/s390/kvm/priv.c | 4 ++-- + arch/s390/kvm/pv.c | 6 +++--- + arch/s390/kvm/vsie.c | 4 ++-- + arch/s390/mm/gmap.c | 30 +++++++++++++++--------------- + 8 files changed, 42 insertions(+), 42 deletions(-) +Merging xen-tip/linux-next (65cae18882f9 x86/xen: don't unbind uninitialized lock_kicker_irq) +$ git merge xen-tip/linux-next +Already up to date. +Merging percpu/for-next (eb4c8d15efda Merge branch 'for-5.11' into for-next) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + mm/percpu.c | 32 ++++++++++++++++++-------------- + 1 file changed, 18 insertions(+), 14 deletions(-) +Merging workqueues/for-next (ac87f8ff6cf1 workqueue: Kick a worker based on the actual activation of delayed works) +$ git merge workqueues/for-next +Auto-merging kernel/workqueue.c +Merge made by the 'recursive' strategy. + kernel/workqueue.c | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) +Merging drivers-x86/for-next (912b341585e3 platform/x86: mlx-platform: Remove PSU EEPROM from MSN274x platform configuration) +$ git merge drivers-x86/for-next +Auto-merging drivers/platform/x86/thinkpad_acpi.c +Auto-merging drivers/platform/x86/acer-wmi.c +Auto-merging drivers/platform/x86/Makefile +Auto-merging drivers/platform/x86/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-class-firmware-attributes | 258 ++++ + MAINTAINERS | 34 +- + drivers/platform/Kconfig | 2 + + drivers/platform/Makefile | 1 + + drivers/platform/mellanox/Kconfig | 10 + + drivers/platform/mellanox/Makefile | 1 + + drivers/platform/mellanox/mlxbf-pmc.c | 1478 ++++++++++++++++++++ + drivers/platform/surface/Kconfig | 59 + + drivers/platform/surface/Makefile | 11 + + drivers/platform/{x86 => surface}/surface3-wmi.c | 0 + .../platform/{x86 => surface}/surface3_button.c | 0 + drivers/platform/{x86 => surface}/surface3_power.c | 0 + drivers/platform/surface/surface_gpe.c | 321 +++++ + .../platform/{x86 => surface}/surfacepro3_button.c | 0 + drivers/platform/x86/Kconfig | 57 +- + drivers/platform/x86/Makefile | 10 +- + drivers/platform/x86/acer-wmi.c | 175 ++- + drivers/platform/x86/amd-pmc.c | 286 ++++ + drivers/platform/x86/asus-nb-wmi.c | 15 + + drivers/platform/x86/asus-wmi.c | 48 + + drivers/platform/x86/asus-wmi.h | 1 + + drivers/platform/x86/dell-wmi-sysman/Makefile | 8 + + .../x86/dell-wmi-sysman/biosattr-interface.c | 186 +++ + .../platform/x86/dell-wmi-sysman/dell-wmi-sysman.h | 191 +++ + .../platform/x86/dell-wmi-sysman/enum-attributes.c | 189 +++ + .../platform/x86/dell-wmi-sysman/int-attributes.c | 173 +++ + .../x86/dell-wmi-sysman/passobj-attributes.c | 187 +++ + .../x86/dell-wmi-sysman/passwordattr-interface.c | 153 ++ + .../x86/dell-wmi-sysman/string-attributes.c | 159 +++ + drivers/platform/x86/dell-wmi-sysman/sysman.c | 627 +++++++++ + drivers/platform/x86/i2c-multi-instantiate.c | 14 +- + drivers/platform/x86/intel-hid.c | 16 +- + drivers/platform/x86/intel_pmc_core.c | 2 +- + drivers/platform/x86/intel_pmt_class.c | 3 +- + drivers/platform/x86/mlx-platform.c | 12 +- + drivers/platform/x86/panasonic-laptop.c | 509 ++++++- + drivers/platform/x86/sony-laptop.c | 3 - + drivers/platform/x86/thinkpad_acpi.c | 162 ++- + drivers/platform/x86/wmi.c | 7 +- + include/linux/platform_data/x86/asus-wmi.h | 1 + + 40 files changed, 5153 insertions(+), 216 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-firmware-attributes + create mode 100644 drivers/platform/mellanox/mlxbf-pmc.c + create mode 100644 drivers/platform/surface/Kconfig + create mode 100644 drivers/platform/surface/Makefile + rename drivers/platform/{x86 => surface}/surface3-wmi.c (100%) + rename drivers/platform/{x86 => surface}/surface3_button.c (100%) + rename drivers/platform/{x86 => surface}/surface3_power.c (100%) + create mode 100644 drivers/platform/surface/surface_gpe.c + rename drivers/platform/{x86 => surface}/surfacepro3_button.c (100%) + create mode 100644 drivers/platform/x86/amd-pmc.c + create mode 100644 drivers/platform/x86/dell-wmi-sysman/Makefile + create mode 100644 drivers/platform/x86/dell-wmi-sysman/biosattr-interface.c + create mode 100644 drivers/platform/x86/dell-wmi-sysman/dell-wmi-sysman.h + create mode 100644 drivers/platform/x86/dell-wmi-sysman/enum-attributes.c + create mode 100644 drivers/platform/x86/dell-wmi-sysman/int-attributes.c + create mode 100644 drivers/platform/x86/dell-wmi-sysman/passobj-attributes.c + create mode 100644 drivers/platform/x86/dell-wmi-sysman/passwordattr-interface.c + create mode 100644 drivers/platform/x86/dell-wmi-sysman/string-attributes.c + create mode 100644 drivers/platform/x86/dell-wmi-sysman/sysman.c +Merging chrome-platform/for-next (de0f49487db3 platform/chrome: cros_ec_typec: Register partner altmodes) +$ git merge chrome-platform/for-next +Auto-merging include/linux/platform_data/cros_ec_commands.h +Merge made by the 'recursive' strategy. + drivers/platform/chrome/cros_ec_proto.c | 14 +- + drivers/platform/chrome/cros_ec_typec.c | 329 +++++++++++++++++++------ + include/linux/platform_data/cros_ec_commands.h | 155 ++++++++++++ + 3 files changed, 424 insertions(+), 74 deletions(-) +Merging hsi/for-next (41fff6e19bc8 HSI: omap_ssi: Don't jump to free ID in ssi_add_controller()) +$ git merge hsi/for-next +Merge made by the 'recursive' strategy. + drivers/hsi/controllers/omap_ssi_core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging leds/for-next (98650b087417 leds: turris-omnia: check for LED_COLOR_ID_RGB instead LED_COLOR_ID_MULTI) +$ git merge leds/for-next +Removing Documentation/devicetree/bindings/leds/leds-pwm.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-pwm.txt | 50 ------------- + .../devicetree/bindings/leds/leds-pwm.yaml | 70 ++++++++++++++++++ + Documentation/leds/leds-class.rst | 10 --- + drivers/leds/leds-lp50xx.c | 6 +- + drivers/leds/leds-netxbig.c | 35 ++++++--- + drivers/leds/leds-turris-omnia.c | 85 +++++++++++----------- + 6 files changed, 139 insertions(+), 117 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/leds/leds-pwm.txt + create mode 100644 Documentation/devicetree/bindings/leds/leds-pwm.yaml +Merging ipmi/for-next (368ffd9adc7a ipmi: msghandler: Suppress suspicious RCU usage warning) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_devintf.c | 1 - + drivers/char/ipmi/ipmi_msghandler.c | 3 ++- + drivers/char/ipmi/ipmi_watchdog.c | 8 ++++---- + 3 files changed, 6 insertions(+), 6 deletions(-) +Merging driver-core/driver-core-next (33c0c9bdf7a5 drivers: base: fix some kernel-doc markups) +$ git merge driver-core/driver-core-next +Merge made by the 'recursive' strategy. + drivers/base/class.c | 2 +- + drivers/base/core.c | 2 -- + drivers/base/devres.c | 2 +- + drivers/base/firmware_loader/fallback.c | 2 +- + fs/kernfs/dir.c | 2 +- + include/linux/device/class.h | 14 ++++++++++++++ + include/linux/kernfs.h | 2 +- + 7 files changed, 19 insertions(+), 7 deletions(-) +Merging usb/usb-next (ab37fa851c48 usb: typec: Add type sysfs attribute file for partners) +$ git merge usb/usb-next +Removing include/linux/platform_data/usb-ehci-mxc.h +Removing drivers/usb/host/imx21-hcd.h +Removing drivers/usb/host/imx21-hcd.c +Removing drivers/usb/host/imx21-dbg.c +Removing drivers/usb/host/ehci-mxc.c +Auto-merging drivers/platform/chrome/cros_ec_typec.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/connector/usb-connector.yaml +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-typec | 142 +- + .../bindings/connector/usb-connector.yaml | 19 + + .../devicetree/bindings/usb/brcm,usb-pinmap.yaml | 70 + + .../devicetree/bindings/usb/maxim,max33359.yaml | 75 + + MAINTAINERS | 8 + + arch/arm/mach-omap1/board-h2.c | 22 +- + drivers/platform/chrome/cros_ec_typec.c | 3 +- + drivers/usb/Makefile | 1 - + drivers/usb/atm/usbatm.c | 2 +- + drivers/usb/common/ulpi.c | 2 +- + drivers/usb/core/buffer.c | 6 +- + drivers/usb/core/config.c | 1 + + drivers/usb/core/endpoint.c | 2 +- + drivers/usb/core/hcd-pci.c | 6 +- + drivers/usb/core/hcd.c | 37 +- + drivers/usb/core/hub.c | 3 +- + drivers/usb/core/message.c | 35 +- + drivers/usb/core/port.c | 4 +- + drivers/usb/core/sysfs.c | 14 +- + drivers/usb/core/usb.c | 4 +- + drivers/usb/gadget/function/f_fs.c | 2 + + drivers/usb/gadget/function/f_loopback.c | 2 +- + drivers/usb/gadget/function/f_sourcesink.c | 1 + + drivers/usb/gadget/udc/core.c | 2 - + drivers/usb/gadget/udc/dummy_hcd.c | 8 +- + drivers/usb/gadget/udc/pxa27x_udc.c | 19 +- + drivers/usb/host/Kconfig | 17 - + drivers/usb/host/Makefile | 2 - + drivers/usb/host/ehci-fsl.c | 9 +- + drivers/usb/host/ehci-hcd.c | 2 +- + drivers/usb/host/ehci-mxc.c | 213 --- + drivers/usb/host/ehci-pmcmsp.c | 15 +- + drivers/usb/host/ehci-sched.c | 12 + + drivers/usb/host/fotg210-hcd.c | 2 +- + drivers/usb/host/imx21-dbg.c | 439 ----- + drivers/usb/host/imx21-hcd.c | 1933 -------------------- + drivers/usb/host/imx21-hcd.h | 431 ----- + drivers/usb/host/isp116x-hcd.c | 1 + + drivers/usb/host/isp1362.h | 54 - + drivers/usb/host/max3421-hcd.c | 4 +- + drivers/usb/host/ohci-at91.c | 11 +- + drivers/usb/host/ohci-hcd.c | 2 +- + drivers/usb/host/ohci-hub.c | 1 + + drivers/usb/host/ohci-omap.c | 9 +- + drivers/usb/host/ohci-pxa27x.c | 11 +- + drivers/usb/host/ohci-s3c2410.c | 12 +- + drivers/usb/host/oxu210hp-hcd.c | 1 + + drivers/usb/host/xhci-mem.c | 3 +- + drivers/usb/host/xhci-ring.c | 2 + + drivers/usb/host/xhci.c | 6 +- + drivers/usb/misc/Kconfig | 9 + + drivers/usb/misc/Makefile | 1 + + drivers/usb/misc/apple-mfi-fastcharge.c | 15 +- + drivers/usb/misc/brcmstb-usb-pinmap.c | 351 ++++ + drivers/usb/misc/iowarrior.c | 3 - + drivers/usb/misc/sisusbvga/Kconfig | 2 +- + drivers/usb/misc/yurex.c | 1 + + drivers/usb/musb/tusb6010.c | 1 + + drivers/usb/phy/phy-isp1301-omap.c | 21 +- + drivers/usb/storage/ene_ub6250.c | 1 + + drivers/usb/storage/freecom.c | 1 - + drivers/usb/storage/transport.c | 9 +- + drivers/usb/storage/uas.c | 1 + + drivers/usb/typec/class.c | 294 ++- + drivers/usb/typec/mux/intel_pmc_mux.c | 3 + + drivers/usb/typec/tcpm/tcpci.c | 72 +- + drivers/usb/typec/tcpm/tcpci.h | 18 +- + drivers/usb/typec/tcpm/tcpci_maxim.c | 35 +- + drivers/usb/typec/tcpm/tcpm.c | 113 +- + drivers/usb/typec/ucsi/ucsi.c | 125 +- + drivers/usb/typec/ucsi/ucsi.h | 2 + + drivers/usb/typec/ucsi/ucsi_acpi.c | 5 +- + drivers/usb/usbip/usbip_common.c | 5 - + include/dt-bindings/usb/pd.h | 8 + + include/linux/platform_data/usb-ehci-mxc.h | 14 - + include/linux/usb/hcd.h | 4 - + include/linux/usb/pd.h | 1 + + include/linux/usb/pd_vdo.h | 19 +- + include/linux/usb/tcpm.h | 19 + + include/linux/usb/typec.h | 2 + + include/linux/usb/typec_tbt.h | 6 +- + 81 files changed, 1490 insertions(+), 3353 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/brcm,usb-pinmap.yaml + create mode 100644 Documentation/devicetree/bindings/usb/maxim,max33359.yaml + delete mode 100644 drivers/usb/host/ehci-mxc.c + delete mode 100644 drivers/usb/host/imx21-dbg.c + delete mode 100644 drivers/usb/host/imx21-hcd.c + delete mode 100644 drivers/usb/host/imx21-hcd.h + create mode 100644 drivers/usb/misc/brcmstb-usb-pinmap.c + delete mode 100644 include/linux/platform_data/usb-ehci-mxc.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 (053af9e6e817 USB: serial: mos7720: defer state restore to a workqueue) +$ git merge usb-serial/usb-next +Auto-merging arch/mips/configs/mtx1_defconfig +Merge made by the 'recursive' strategy. + arch/arm/configs/badge4_defconfig | 1 - + arch/arm/configs/corgi_defconfig | 1 - + arch/arm/configs/pxa_defconfig | 1 - + arch/arm/configs/spitz_defconfig | 1 - + arch/mips/configs/mtx1_defconfig | 1 - + arch/mips/configs/rm200_defconfig | 1 - + arch/powerpc/configs/g5_defconfig | 1 - + arch/powerpc/configs/ppc6xx_defconfig | 1 - + drivers/usb/serial/Kconfig | 19 +- + drivers/usb/serial/Makefile | 1 - + drivers/usb/serial/digi_acceleport.c | 62 ++-- + drivers/usb/serial/iuu_phoenix.c | 2 - + drivers/usb/serial/keyspan_pda.c | 548 +++++++++++++++------------------- + drivers/usb/serial/mos7720.c | 236 +++------------ + include/linux/usb/serial.h | 2 - + 15 files changed, 299 insertions(+), 579 deletions(-) +Merging usb-chipidea-next/for-usb-next (d75fcc0d4da2 usb: chipidea: ci_hdrc_imx: Use of_device_get_match_data()) +$ git merge usb-chipidea-next/for-usb-next +Auto-merging drivers/usb/cdns3/gadget.c +Auto-merging drivers/usb/cdns3/core.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/usb/cdns,usb3.yaml | 5 ++ + drivers/usb/cdns3/cdns3-imx.c | 2 +- + drivers/usb/cdns3/core.c | 15 +--- + drivers/usb/cdns3/core.h | 4 + + drivers/usb/cdns3/gadget-export.h | 3 - + drivers/usb/cdns3/gadget.c | 2 +- + drivers/usb/cdns3/host-export.h | 6 ++ + drivers/usb/cdns3/host.c | 60 +++++++++++++- + drivers/usb/chipidea/Makefile | 5 +- + drivers/usb/chipidea/ci_hdrc_imx.c | 7 +- + drivers/usb/chipidea/trace.c | 23 ++++++ + drivers/usb/chipidea/trace.h | 92 ++++++++++++++++++++++ + drivers/usb/chipidea/udc.c | 10 ++- + drivers/usb/chipidea/usbmisc_imx.c | 7 +- + 14 files changed, 209 insertions(+), 32 deletions(-) + create mode 100644 drivers/usb/chipidea/trace.c + create mode 100644 drivers/usb/chipidea/trace.h +Merging phy-next/next (768a711e2d4b phy: samsung: phy-exynos-pcie: fix typo 'tunning') +$ git merge phy-next/next +Auto-merging drivers/phy/tegra/xusb.c +Auto-merging drivers/phy/samsung/phy-exynos-pcie.c +CONFLICT (content): Merge conflict in drivers/phy/samsung/phy-exynos-pcie.c +Auto-merging drivers/phy/qualcomm/phy-qcom-qmp.c +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Removing Documentation/devicetree/bindings/phy/phy-stm32-usbphyc.txt +Removing Documentation/devicetree/bindings/phy/phy-cadence-sierra.txt +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'drivers/phy/samsung/phy-exynos-pcie.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2ef5fb865232] Merge remote-tracking branch 'phy-next/next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/phy/amlogic,axg-mipi-dphy.yaml | 70 ++++ + .../phy/amlogic,meson-axg-mipi-pcie-analog.yaml | 21 +- + .../devicetree/bindings/phy/brcm-sata-phy.txt | 3 + + .../bindings/phy/marvell,mmp3-hsic-phy.yaml | 9 +- + .../devicetree/bindings/phy/phy-cadence-sierra.txt | 70 ---- + .../bindings/phy/phy-cadence-sierra.yaml | 152 ++++++++ + .../devicetree/bindings/phy/phy-stm32-usbphyc.txt | 73 ---- + .../devicetree/bindings/phy/phy-stm32-usbphyc.yaml | 138 +++++++ + .../devicetree/bindings/phy/qcom,qmp-phy.yaml | 6 + + MAINTAINERS | 8 + + drivers/phy/allwinner/phy-sun4i-usb.c | 9 +- + drivers/phy/allwinner/phy-sun50i-usb3.c | 4 +- + drivers/phy/allwinner/phy-sun6i-mipi-dphy.c | 4 +- + drivers/phy/allwinner/phy-sun9i-usb.c | 4 +- + drivers/phy/amlogic/Kconfig | 13 + + drivers/phy/amlogic/Makefile | 1 + + drivers/phy/amlogic/phy-meson-axg-mipi-dphy.c | 413 +++++++++++++++++++++ + .../phy/amlogic/phy-meson-axg-mipi-pcie-analog.c | 204 ++++++---- + drivers/phy/amlogic/phy-meson-axg-pcie.c | 4 +- + drivers/phy/amlogic/phy-meson-g12a-usb2.c | 4 +- + drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c | 4 +- + drivers/phy/amlogic/phy-meson-gxl-usb2.c | 4 +- + drivers/phy/broadcom/phy-bcm-cygnus-pcie.c | 4 +- + drivers/phy/broadcom/phy-bcm-kona-usb2.c | 4 +- + drivers/phy/broadcom/phy-bcm-ns-usb2.c | 4 +- + drivers/phy/broadcom/phy-bcm-ns-usb3.c | 159 +------- + drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c | 13 +- + drivers/phy/broadcom/phy-bcm-sr-pcie.c | 5 +- + drivers/phy/broadcom/phy-bcm-sr-usb.c | 4 +- + drivers/phy/broadcom/phy-brcm-sata.c | 40 +- + drivers/phy/cadence/cdns-dphy.c | 4 +- + drivers/phy/cadence/phy-cadence-salvo.c | 4 +- + drivers/phy/cadence/phy-cadence-sierra.c | 4 +- + drivers/phy/freescale/phy-fsl-imx8-mipi-dphy.c | 4 +- + drivers/phy/freescale/phy-fsl-imx8mq-usb.c | 6 +- + drivers/phy/lantiq/phy-lantiq-vrx200-pcie.c | 4 +- + drivers/phy/marvell/Kconfig | 12 + + drivers/phy/marvell/Makefile | 1 + + drivers/phy/marvell/phy-armada375-usb2.c | 4 +- + drivers/phy/marvell/phy-berlin-usb.c | 4 +- + drivers/phy/marvell/phy-mmp3-hsic.c | 82 ++++ + drivers/phy/marvell/phy-mmp3-usb.c | 4 +- + drivers/phy/marvell/phy-mvebu-sata.c | 4 +- + drivers/phy/marvell/phy-pxa-28nm-hsic.c | 4 +- + drivers/phy/marvell/phy-pxa-28nm-usb2.c | 4 +- + drivers/phy/marvell/phy-pxa-usb.c | 4 +- + drivers/phy/mediatek/phy-mtk-ufs.c | 4 +- + drivers/phy/phy-xgene.c | 4 +- + drivers/phy/qualcomm/phy-qcom-apq8064-sata.c | 4 +- + drivers/phy/qualcomm/phy-qcom-ipq4019-usb.c | 4 +- + drivers/phy/qualcomm/phy-qcom-ipq806x-sata.c | 4 +- + drivers/phy/qualcomm/phy-qcom-pcie2.c | 5 +- + drivers/phy/qualcomm/phy-qcom-qmp.c | 281 +++++++++++++- + drivers/phy/qualcomm/phy-qcom-qmp.h | 18 + + drivers/phy/qualcomm/phy-qcom-qusb2.c | 4 +- + drivers/phy/ralink/phy-ralink-usb.c | 4 +- + drivers/phy/renesas/phy-rcar-gen2.c | 4 +- + drivers/phy/renesas/phy-rcar-gen3-pcie.c | 4 +- + drivers/phy/renesas/phy-rcar-gen3-usb2.c | 4 +- + drivers/phy/renesas/phy-rcar-gen3-usb3.c | 4 +- + drivers/phy/rockchip/phy-rockchip-inno-hdmi.c | 4 +- + drivers/phy/samsung/phy-exynos-pcie.c | 2 +- + drivers/phy/samsung/phy-exynos5-usbdrd.c | 4 +- + drivers/phy/samsung/phy-exynos5250-sata.c | 5 +- + drivers/phy/samsung/phy-samsung-usb2.c | 4 +- + drivers/phy/st/phy-stm32-usbphyc.c | 15 +- + drivers/phy/tegra/phy-tegra194-p2u.c | 4 +- + drivers/phy/tegra/xusb.c | 10 +- + drivers/phy/ti/phy-omap-control.c | 17 +- + drivers/phy/ti/phy-omap-usb2.c | 4 +- + drivers/phy/ti/phy-ti-pipe3.c | 15 +- + 71 files changed, 1454 insertions(+), 578 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/amlogic,axg-mipi-dphy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/phy-cadence-sierra.txt + create mode 100644 Documentation/devicetree/bindings/phy/phy-cadence-sierra.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/phy-stm32-usbphyc.txt + create mode 100644 Documentation/devicetree/bindings/phy/phy-stm32-usbphyc.yaml + create mode 100644 drivers/phy/amlogic/phy-meson-axg-mipi-dphy.c + create mode 100644 drivers/phy/marvell/phy-mmp3-hsic.c +Merging tty/tty-next (f35a07f92616 tty: serial: bcm63xx: lower driver dependencies) +$ git merge tty/tty-next +Removing include/linux/serial_pnx8xxx.h +Removing include/linux/platform_data/serial-imx.h +Removing drivers/tty/synclinkmp.c +Removing drivers/tty/synclink.c +Removing drivers/tty/serial/pnx8xxx_uart.c +Auto-merging drivers/tty/serial/Makefile +Auto-merging drivers/tty/serial/Kconfig +Auto-merging drivers/tty/Makefile +Auto-merging drivers/tty/Kconfig +Auto-merging arch/powerpc/configs/ppc6xx_defconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/serial/omap_serial.txt | 1 + + .../devicetree/bindings/serial/renesas,scif.yaml | 1 + + arch/powerpc/configs/ppc6xx_defconfig | 2 - + drivers/tty/Kconfig | 27 - + drivers/tty/Makefile | 2 - + drivers/tty/goldfish.c | 18 +- + drivers/tty/hvc/hvc_opal.c | 2 +- + drivers/tty/hvc/hvc_vio.c | 2 +- + drivers/tty/n_gsm.c | 4 +- + drivers/tty/n_tty.c | 2 + + drivers/tty/nozomi.c | 5 +- + drivers/tty/pty.c | 2 + + drivers/tty/serdev/core.c | 6 +- + drivers/tty/serial/8250/8250_early.c | 3 - + drivers/tty/serial/8250/8250_mtk.c | 13 +- + drivers/tty/serial/8250/8250_omap.c | 43 +- + drivers/tty/serial/8250/serial_cs.c | 9 +- + drivers/tty/serial/Kconfig | 18 +- + drivers/tty/serial/Makefile | 1 - + drivers/tty/serial/amba-pl011.c | 2 +- + drivers/tty/serial/fsl_linflexuart.c | 19 +- + drivers/tty/serial/ifx6x60.c | 3 +- + drivers/tty/serial/imx.c | 52 +- + drivers/tty/serial/jsm/jsm_cls.c | 4 +- + drivers/tty/serial/lpc32xx_hs.c | 3 +- + drivers/tty/serial/max310x.c | 57 +- + drivers/tty/serial/msm_serial.c | 5 +- + drivers/tty/serial/mxs-auart.c | 21 +- + drivers/tty/serial/pmac_zilog.h | 8 +- + drivers/tty/serial/pnx8xxx_uart.c | 858 --- + drivers/tty/serial/serial-tegra.c | 7 +- + drivers/tty/serial/serial_mctrl_gpio.c | 2 +- + drivers/tty/serial/sifive.c | 3 +- + drivers/tty/serial/stm32-usart.c | 6 +- + drivers/tty/serial/xilinx_uartps.c | 1 + + drivers/tty/synclink.c | 7898 -------------------- + drivers/tty/synclink_gt.c | 3 +- + drivers/tty/synclinkmp.c | 5579 -------------- + drivers/tty/tty_audit.c | 12 +- + drivers/tty/tty_baudrate.c | 1 + + drivers/tty/tty_buffer.c | 1 + + drivers/tty/tty_io.c | 12 +- + drivers/tty/tty_jobctrl.c | 3 + + drivers/tty/tty_ldisc.c | 11 +- + drivers/tty/tty_port.c | 4 +- + drivers/tty/vt/consolemap.c | 3 +- + drivers/tty/vt/keyboard.c | 464 +- + include/linux/goldfish.h | 8 +- + include/linux/kbd_kern.h | 3 - + include/linux/platform_data/serial-imx.h | 15 - + include/linux/serial_8250.h | 5 + + include/linux/serial_pnx8xxx.h | 67 - + include/linux/tty.h | 1 + + include/uapi/linux/keyboard.h | 2 +- + include/uapi/linux/serial_core.h | 2 - + 55 files changed, 396 insertions(+), 14910 deletions(-) + delete mode 100644 drivers/tty/serial/pnx8xxx_uart.c + delete mode 100644 drivers/tty/synclink.c + delete mode 100644 drivers/tty/synclinkmp.c + delete mode 100644 include/linux/platform_data/serial-imx.h + delete mode 100644 include/linux/serial_pnx8xxx.h +Merging char-misc/char-misc-next (f80c21509984 coresight-stm: Fix W=1 warning in STM driver) +$ git merge char-misc/char-misc-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-driver-w1_therm | 2 +- + Documentation/admin-guide/spkguide.txt | 1 + + .../devicetree/bindings/nvmem/mtk-efuse.txt | 1 + + .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 17 +- + Documentation/w1/slaves/w1_therm.rst | 2 +- + drivers/accessibility/speakup/i18n.h | 6 + + drivers/accessibility/speakup/main.c | 64 +-- + drivers/accessibility/speakup/speakup_dummy.c | 7 +- + drivers/android/binder.c | 427 +-------------------- + drivers/android/binder_internal.h | 406 ++++++++++++++++++++ + drivers/android/binder_trace.h | 29 ++ + drivers/char/lp.c | 1 - + drivers/char/misc.c | 2 +- + drivers/char/mwave/mwavedd.c | 1 - + drivers/firmware/google/gsmi.c | 31 +- + drivers/firmware/raspberrypi.c | 2 +- + drivers/hwtracing/coresight/coresight-core.c | 10 +- + drivers/hwtracing/coresight/coresight-etb10.c | 4 +- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 50 ++- + drivers/hwtracing/coresight/coresight-funnel.c | 2 +- + drivers/hwtracing/coresight/coresight-priv.h | 2 + + drivers/hwtracing/coresight/coresight-replicator.c | 2 +- + drivers/hwtracing/coresight/coresight-stm.c | 2 +- + drivers/hwtracing/coresight/coresight-tmc-etf.c | 4 +- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 6 +- + drivers/hwtracing/coresight/coresight-tpiu.c | 2 +- + drivers/ipack/devices/ipoctal.c | 1 - + drivers/misc/c2port/core.c | 2 +- + drivers/misc/eeprom/at25.c | 3 + + drivers/misc/hisi_hikey_usb.c | 5 +- + drivers/misc/mei/bus.c | 20 +- + drivers/misc/mei/hbm.c | 1 - + drivers/misc/ocxl/config.c | 2 +- + drivers/misc/pci_endpoint_test.c | 2 +- + drivers/misc/ti-st/st_core.c | 2 +- + drivers/misc/uacce/uacce.c | 13 +- + drivers/misc/xilinx_sdfec.c | 28 +- + drivers/nvmem/core.c | 153 +++++++- + drivers/nvmem/imx-ocotp.c | 30 +- + drivers/nvmem/qfprom.c | 30 ++ + drivers/slimbus/Kconfig | 4 +- + drivers/slimbus/messaging.c | 1 + + drivers/slimbus/qcom-ngd-ctrl.c | 133 ++++++- + drivers/slimbus/slimbus.h | 2 +- + drivers/uio/uio.c | 4 +- + drivers/uio/uio_pci_generic.c | 37 +- + drivers/uio/uio_pruss.c | 27 +- + drivers/vme/bridges/vme_tsi148.c | 7 - + drivers/vme/vme.c | 13 +- + drivers/w1/slaves/w1_therm.c | 12 +- + include/linux/nvmem-provider.h | 17 + + include/linux/uio_driver.h | 16 + + 52 files changed, 1016 insertions(+), 632 deletions(-) +Merging extcon/extcon-next (54589b557a8d extcon: fsa9480: Support TI TSU6111 variant) +$ git merge extcon/extcon-next +Removing Documentation/devicetree/bindings/extcon/extcon-fsa9480.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/extcon/extcon-fsa9480.txt | 21 --- + .../bindings/extcon/extcon-usbc-tusb320.yaml | 41 +++++ + .../devicetree/bindings/extcon/fcs,fsa880.yaml | 52 ++++++ + drivers/extcon/Kconfig | 8 + + drivers/extcon/Makefile | 1 + + drivers/extcon/extcon-fsa9480.c | 1 + + drivers/extcon/extcon-usbc-tusb320.c | 184 +++++++++++++++++++++ + 7 files changed, 287 insertions(+), 21 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/extcon/extcon-fsa9480.txt + create mode 100644 Documentation/devicetree/bindings/extcon/extcon-usbc-tusb320.yaml + create mode 100644 Documentation/devicetree/bindings/extcon/fcs,fsa880.yaml + create mode 100644 drivers/extcon/extcon-usbc-tusb320.c +Merging soundwire/next (47edc0104c61 soundwire: qcom: Fix build failure when slimbus is module) +$ git merge soundwire/next +Auto-merging include/linux/soundwire/sdw_registers.h +Merge made by the 'recursive' strategy. + drivers/soundwire/bus.c | 55 +++++++++++++++++++++++++++------ + drivers/soundwire/qcom.c | 2 +- + drivers/soundwire/sysfs_slave_dpn.c | 1 + + include/linux/soundwire/sdw.h | 4 +++ + include/linux/soundwire/sdw_registers.h | 11 +++++++ + 5 files changed, 63 insertions(+), 10 deletions(-) +Merging thunderbolt/next (4e58171aa93f MAINTAINERS: Add Isaac as maintainer of Thunderbolt DMA traffic test driver) +$ git merge thunderbolt/next +Auto-merging drivers/thunderbolt/xdomain.c +Auto-merging drivers/thunderbolt/tb.h +Auto-merging drivers/thunderbolt/nhi.c +Auto-merging drivers/thunderbolt/debugfs.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-thunderbolt | 28 + + MAINTAINERS | 6 + + drivers/net/thunderbolt.c | 2 +- + drivers/thunderbolt/Kconfig | 13 + + drivers/thunderbolt/Makefile | 3 + + drivers/thunderbolt/ctl.c | 4 +- + drivers/thunderbolt/debugfs.c | 24 + + drivers/thunderbolt/dma_test.c | 736 ++++++++++++++++++++++++ + drivers/thunderbolt/nhi.c | 36 +- + drivers/thunderbolt/path.c | 13 +- + drivers/thunderbolt/switch.c | 33 +- + drivers/thunderbolt/tb.h | 8 + + drivers/thunderbolt/tunnel.c | 50 +- + drivers/thunderbolt/xdomain.c | 148 ++++- + include/linux/thunderbolt.h | 18 +- + 15 files changed, 1080 insertions(+), 42 deletions(-) + create mode 100644 drivers/thunderbolt/dma_test.c +Merging vfio/next (2e6cfd496f5b vfio iommu type1: Fix memory leak in vfio_iommu_type1_pin_pages) +$ git merge vfio/next +Already up to date. +Merging staging/staging-next (1de16e38f1fd staging: mt7621-pci: remove 'RALINK_PCI_IMBASEBAR0_ADDR' register) +$ git merge staging/staging-next +Removing tools/testing/selftests/android/run.sh +Removing tools/testing/selftests/android/ion/ipcsocket.h +Removing tools/testing/selftests/android/ion/ipcsocket.c +Removing tools/testing/selftests/android/ion/ionutils.h +Removing tools/testing/selftests/android/ion/ionutils.c +Removing tools/testing/selftests/android/ion/ionmap_test.c +Removing tools/testing/selftests/android/ion/ionapp_import.c +Removing tools/testing/selftests/android/ion/ionapp_export.c +Removing tools/testing/selftests/android/ion/ion_test.sh +Removing tools/testing/selftests/android/ion/ion.h +Removing tools/testing/selftests/android/ion/README +Removing tools/testing/selftests/android/ion/Makefile +Removing tools/testing/selftests/android/ion/.gitignore +Removing tools/testing/selftests/android/config +Removing tools/testing/selftests/android/Makefile +Auto-merging tools/testing/selftests/Makefile +Removing include/linux/platform_data/at91_adc.h +Removing include/linux/platform_data/ad7303.h +Removing include/linux/platform_data/ad7298.h +Removing drivers/staging/goldfish/goldfish_audio.c +Removing drivers/staging/goldfish/README +Removing drivers/staging/goldfish/Makefile +Removing drivers/staging/goldfish/Kconfig +Auto-merging drivers/staging/fsl-dpaa2/ethsw/ethsw-ethtool.c +Removing drivers/staging/android/uapi/ion.h +Removing drivers/staging/android/ion/ion_system_heap.c +Removing drivers/staging/android/ion/ion_page_pool.c +Removing drivers/staging/android/ion/ion_heap.c +Removing drivers/staging/android/ion/ion_cma_heap.c +Removing drivers/staging/android/ion/ion.h +Removing drivers/staging/android/ion/ion.c +Removing drivers/staging/android/ion/Makefile +Removing drivers/staging/android/ion/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/iio/temperature/tsys01.txt +Removing Documentation/devicetree/bindings/iio/temperature/tmp007.txt +Removing Documentation/devicetree/bindings/iio/temperature/mlx90632.txt +Removing Documentation/devicetree/bindings/iio/temperature/mlx90614.txt +Removing Documentation/devicetree/bindings/iio/temperature/maxim_thermocouple.txt +Removing Documentation/devicetree/bindings/iio/temperature/max31856.txt +Removing Documentation/devicetree/bindings/iio/sensorhub.txt +Removing Documentation/devicetree/bindings/iio/resolver/ad2s90.txt +Removing Documentation/devicetree/bindings/iio/proximity/vl53l0x.txt +Removing Documentation/devicetree/bindings/iio/proximity/sx9500.txt +Removing Documentation/devicetree/bindings/iio/proximity/as3935.txt +Removing Documentation/devicetree/bindings/iio/pressure/zpa2326.txt +Removing Documentation/devicetree/bindings/iio/pressure/ms5637.txt +Removing Documentation/devicetree/bindings/iio/pressure/ms5611.txt +Removing Documentation/devicetree/bindings/iio/pressure/hp03.txt +Removing Documentation/devicetree/bindings/iio/potentiometer/mcp4131.txt +Removing Documentation/devicetree/bindings/iio/potentiometer/mcp41010.txt +Removing Documentation/devicetree/bindings/iio/potentiometer/max5481.txt +Removing Documentation/devicetree/bindings/iio/potentiometer/ds1803.txt +Removing Documentation/devicetree/bindings/iio/potentiometer/ad5272.txt +Removing Documentation/devicetree/bindings/iio/magnetometer/pni,rm3100.txt +Removing Documentation/devicetree/bindings/iio/magnetometer/mmc35240.txt +Removing Documentation/devicetree/bindings/iio/magnetometer/mag3110.txt +Removing Documentation/devicetree/bindings/iio/magnetometer/hmc5843.txt +Removing Documentation/devicetree/bindings/iio/magnetometer/bmc150_magn.txt +Removing Documentation/devicetree/bindings/iio/magnetometer/ak8974.txt +Removing Documentation/devicetree/bindings/iio/light/vl6180.txt +Removing Documentation/devicetree/bindings/iio/light/vcnl4035.txt +Removing Documentation/devicetree/bindings/iio/light/uvis25.txt +Removing Documentation/devicetree/bindings/iio/light/us5182d.txt +Removing Documentation/devicetree/bindings/iio/light/renesas,isl29501.txt +Removing Documentation/devicetree/bindings/iio/light/opt3001.txt +Removing Documentation/devicetree/bindings/iio/light/max44009.txt +Removing Documentation/devicetree/bindings/iio/light/gp2ap020a00f.txt +Removing Documentation/devicetree/bindings/iio/light/cm36651.txt +Removing Documentation/devicetree/bindings/iio/light/apds9960.txt +Removing Documentation/devicetree/bindings/iio/light/apds9300.txt +Removing Documentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt +Removing Documentation/devicetree/bindings/iio/imu/adi,adis16480.txt +Removing Documentation/devicetree/bindings/iio/impedance-analyzer/ad5933.txt +Removing Documentation/devicetree/bindings/iio/humidity/htu21.txt +Removing Documentation/devicetree/bindings/iio/humidity/hts221.txt +Removing Documentation/devicetree/bindings/iio/humidity/hdc100x.txt +Removing Documentation/devicetree/bindings/iio/humidity/dht11.txt +Removing Documentation/devicetree/bindings/iio/health/max30102.txt +Removing Documentation/devicetree/bindings/iio/health/max30100.txt +Removing Documentation/devicetree/bindings/iio/gyroscope/nxp,fxas21002c.txt +Removing Documentation/devicetree/bindings/iio/dac/vf610-dac.txt +Removing Documentation/devicetree/bindings/iio/dac/ti,dac7612.txt +Removing Documentation/devicetree/bindings/iio/dac/ti,dac7512.txt +Removing Documentation/devicetree/bindings/iio/dac/ti,dac7311.txt +Removing Documentation/devicetree/bindings/iio/dac/ti,dac5571.txt +Removing Documentation/devicetree/bindings/iio/dac/mcp4725.txt +Removing Documentation/devicetree/bindings/iio/dac/max5821.txt +Removing Documentation/devicetree/bindings/iio/dac/lpc1850-dac.txt +Removing Documentation/devicetree/bindings/iio/dac/ds4424.txt +Removing Documentation/devicetree/bindings/iio/dac/ad7303.txt +Removing Documentation/devicetree/bindings/iio/dac/ad5758.txt +Removing Documentation/devicetree/bindings/iio/chemical/sensirion,sgp30.txt +Removing Documentation/devicetree/bindings/iio/chemical/bme680.txt +Removing Documentation/devicetree/bindings/iio/adc/ti-adc084s021.txt +Removing Documentation/devicetree/bindings/iio/adc/renesas,gyroadc.txt +Removing Documentation/devicetree/bindings/iio/adc/axp20x_adc.txt +Removing Documentation/devicetree/bindings/iio/adc/at91-sama5d2_adc.txt +Removing Documentation/devicetree/bindings/iio/accel/dmard06.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-iio | 10 + + Documentation/ABI/testing/sysfs-bus-iio-adc-mt6360 | 78 +++ + .../devicetree/bindings/iio/accel/dmard06.txt | 19 - + Documentation/devicetree/bindings/iio/adc/adc.txt | 6 + + .../devicetree/bindings/iio/adc/adi,ad7768-1.yaml | 32 + + .../bindings/iio/adc/at91-sama5d2_adc.txt | 50 -- + .../bindings/iio/adc/atmel,sama5d2-adc.yaml | 101 ++++ + .../devicetree/bindings/iio/adc/axp20x_adc.txt | 48 -- + .../bindings/iio/adc/mediatek,mt6360-adc.yaml | 31 + + .../bindings/iio/adc/renesas,gyroadc.txt | 98 ---- + .../bindings/iio/adc/renesas,rcar-gyroadc.yaml | 143 +++++ + .../devicetree/bindings/iio/adc/ti,adc084s021.yaml | 58 ++ + .../devicetree/bindings/iio/adc/ti-adc084s021.txt | 19 - + .../bindings/iio/adc/x-powers,axp209-adc.yaml | 67 +++ + .../devicetree/bindings/iio/chemical/bme680.txt | 11 - + .../bindings/iio/chemical/sensirion,sgp30.txt | 15 - + .../devicetree/bindings/iio/dac/ad5758.txt | 83 --- + .../devicetree/bindings/iio/dac/ad7303.txt | 23 - + .../devicetree/bindings/iio/dac/adi,ad5686.yaml | 57 ++ + .../devicetree/bindings/iio/dac/adi,ad5758.yaml | 129 ++++ + .../devicetree/bindings/iio/dac/adi,ad7303.yaml | 50 ++ + .../devicetree/bindings/iio/dac/ds4424.txt | 20 - + .../devicetree/bindings/iio/dac/fsl,vf610-dac.yaml | 55 ++ + .../devicetree/bindings/iio/dac/lpc1850-dac.txt | 19 - + .../devicetree/bindings/iio/dac/max5821.txt | 14 - + .../devicetree/bindings/iio/dac/maxim,ds4424.yaml | 45 ++ + .../devicetree/bindings/iio/dac/maxim,max5821.yaml | 44 ++ + .../devicetree/bindings/iio/dac/mcp4725.txt | 35 -- + .../bindings/iio/dac/microchip,mcp4725.yaml | 71 +++ + .../bindings/iio/dac/nxp,lpc1850-dac.yaml | 58 ++ + .../devicetree/bindings/iio/dac/ti,dac5571.txt | 24 - + .../devicetree/bindings/iio/dac/ti,dac5571.yaml | 52 ++ + .../devicetree/bindings/iio/dac/ti,dac7311.txt | 23 - + .../devicetree/bindings/iio/dac/ti,dac7311.yaml | 49 ++ + .../devicetree/bindings/iio/dac/ti,dac7512.txt | 20 - + .../devicetree/bindings/iio/dac/ti,dac7512.yaml | 42 ++ + .../devicetree/bindings/iio/dac/ti,dac7612.txt | 28 - + .../devicetree/bindings/iio/dac/ti,dac7612.yaml | 53 ++ + .../devicetree/bindings/iio/dac/vf610-dac.txt | 20 - + .../bindings/iio/gyroscope/nxp,fxas21002c.txt | 31 - + .../bindings/iio/gyroscope/nxp,fxas21002c.yaml | 95 +++ + .../devicetree/bindings/iio/health/max30100.txt | 28 - + .../devicetree/bindings/iio/health/max30102.txt | 33 -- + .../bindings/iio/health/maxim,max30100.yaml | 52 ++ + .../bindings/iio/health/maxim,max30102.yaml | 72 +++ + .../devicetree/bindings/iio/humidity/dht11.txt | 14 - + .../devicetree/bindings/iio/humidity/dht11.yaml | 41 ++ + .../devicetree/bindings/iio/humidity/hdc100x.txt | 17 - + .../devicetree/bindings/iio/humidity/hts221.txt | 30 - + .../devicetree/bindings/iio/humidity/htu21.txt | 13 - + .../bindings/iio/humidity/st,hts221.yaml | 52 ++ + .../bindings/iio/impedance-analyzer/ad5933.txt | 26 - + .../iio/impedance-analyzer/adi,ad5933.yaml | 59 ++ + .../devicetree/bindings/iio/imu/adi,adis16480.txt | 86 --- + .../devicetree/bindings/iio/imu/adi,adis16480.yaml | 130 +++++ + .../devicetree/bindings/iio/imu/st,lsm6dsx.yaml | 86 +++ + .../devicetree/bindings/iio/imu/st_lsm6dsx.txt | 48 -- + .../devicetree/bindings/iio/light/apds9300.txt | 21 - + .../devicetree/bindings/iio/light/apds9960.txt | 21 - + .../bindings/iio/light/avago,apds9300.yaml | 44 ++ + .../bindings/iio/light/avago,apds9960.yaml | 44 ++ + .../bindings/iio/light/capella,cm36651.yaml | 48 ++ + .../devicetree/bindings/iio/light/cm36651.txt | 26 - + .../devicetree/bindings/iio/light/gp2ap020a00f.txt | 21 - + .../devicetree/bindings/iio/light/max44009.txt | 24 - + .../bindings/iio/light/maxim,max44009.yaml | 45 ++ + .../devicetree/bindings/iio/light/opt3001.txt | 25 - + .../bindings/iio/light/renesas,isl29501.txt | 13 - + .../bindings/iio/light/sharp,gp2ap020a00f.yaml | 48 ++ + .../devicetree/bindings/iio/light/st,uvis25.yaml | 42 ++ + .../devicetree/bindings/iio/light/st,vl6180.yaml | 45 ++ + .../devicetree/bindings/iio/light/ti,opt3001.yaml | 47 ++ + .../bindings/iio/light/upisemi,us5182.yaml | 78 +++ + .../devicetree/bindings/iio/light/us5182d.txt | 45 -- + .../devicetree/bindings/iio/light/uvis25.txt | 22 - + .../devicetree/bindings/iio/light/vcnl4035.txt | 18 - + .../bindings/iio/light/vishay,vcnl4035.yaml | 45 ++ + .../devicetree/bindings/iio/light/vl6180.txt | 15 - + .../bindings/iio/magnetometer/ak8974.txt | 31 - + .../iio/magnetometer/asahi-kasei,ak8974.yaml | 57 ++ + .../bindings/iio/magnetometer/bmc150_magn.txt | 25 - + .../iio/magnetometer/bosch,bmc150_magn.yaml | 55 ++ + .../bindings/iio/magnetometer/fsl,mag3110.yaml | 48 ++ + .../bindings/iio/magnetometer/hmc5843.txt | 21 - + .../iio/magnetometer/honeywell,hmc5843.yaml | 43 ++ + .../bindings/iio/magnetometer/mag3110.txt | 27 - + .../bindings/iio/magnetometer/mmc35240.txt | 13 - + .../bindings/iio/magnetometer/pni,rm3100.txt | 20 - + .../bindings/iio/magnetometer/pni,rm3100.yaml | 42 ++ + .../bindings/iio/potentiometer/ad5272.txt | 27 - + .../bindings/iio/potentiometer/adi,ad5272.yaml | 50 ++ + .../bindings/iio/potentiometer/ds1803.txt | 21 - + .../bindings/iio/potentiometer/max5481.txt | 23 - + .../bindings/iio/potentiometer/mcp41010.txt | 28 - + .../bindings/iio/potentiometer/mcp4131.txt | 84 --- + .../iio/potentiometer/microchip,mcp41010.yaml | 48 ++ + .../iio/potentiometer/microchip,mcp4131.yaml | 103 ++++ + .../bindings/iio/pressure/hoperf,hp03.yaml | 47 ++ + .../devicetree/bindings/iio/pressure/hp03.txt | 17 - + .../bindings/iio/pressure/meas,ms5611.yaml | 57 ++ + .../devicetree/bindings/iio/pressure/ms5611.txt | 19 - + .../devicetree/bindings/iio/pressure/ms5637.txt | 17 - + .../bindings/iio/pressure/murata,zpa2326.yaml | 62 ++ + .../devicetree/bindings/iio/pressure/zpa2326.txt | 29 - + .../bindings/iio/proximity/ams,as3935.yaml | 71 +++ + .../devicetree/bindings/iio/proximity/as3935.txt | 34 -- + .../bindings/iio/proximity/semtech,sx9310.yaml | 63 ++ + .../bindings/iio/proximity/semtech,sx9500.yaml | 50 ++ + .../bindings/iio/proximity/st,vl53l0x.yaml | 42 ++ + .../devicetree/bindings/iio/proximity/sx9500.txt | 23 - + .../devicetree/bindings/iio/proximity/vl53l0x.txt | 18 - + .../devicetree/bindings/iio/resolver/ad2s90.txt | 31 - + .../bindings/iio/resolver/adi,ad2s90.yaml | 60 ++ + .../bindings/iio/samsung,sensorhub-rinato.yaml | 72 +++ + .../devicetree/bindings/iio/sensorhub.txt | 24 - + .../bindings/iio/temperature/max31856.txt | 24 - + .../bindings/iio/temperature/maxim,max31855k.yaml | 76 +++ + .../bindings/iio/temperature/maxim,max31856.yaml | 54 ++ + .../iio/temperature/maxim_thermocouple.txt | 24 - + .../bindings/iio/temperature/melexis,mlx90614.yaml | 50 ++ + .../bindings/iio/temperature/melexis,mlx90632.yaml | 55 ++ + .../bindings/iio/temperature/mlx90614.txt | 24 - + .../bindings/iio/temperature/mlx90632.txt | 28 - + .../bindings/iio/temperature/ti,tmp007.yaml | 57 ++ + .../devicetree/bindings/iio/temperature/tmp007.txt | 33 -- + .../devicetree/bindings/iio/temperature/tsys01.txt | 19 - + .../devicetree/bindings/trivial-devices.yaml | 54 ++ + MAINTAINERS | 14 +- + arch/mips/configs/generic/board-ranchu.config | 1 - + drivers/iio/accel/adis16201.c | 1 - + drivers/iio/accel/adis16209.c | 1 - + drivers/iio/accel/adxl372.c | 11 +- + drivers/iio/accel/bmc150-accel-core.c | 25 +- + drivers/iio/accel/mma8452.c | 2 +- + drivers/iio/adc/Kconfig | 13 +- + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/ad7292.c | 2 - + drivers/iio/adc/ad7298.c | 17 +- + drivers/iio/adc/ad7768-1.c | 41 ++ + drivers/iio/adc/ad7887.c | 55 +- + drivers/iio/adc/at91-sama5d2_adc.c | 84 ++- + drivers/iio/adc/at91_adc.c | 73 +-- + drivers/iio/adc/cpcap-adc.c | 1 + + drivers/iio/adc/exynos_adc.c | 7 +- + drivers/iio/adc/ingenic-adc.c | 2 +- + drivers/iio/adc/meson_saradc.c | 2 - + drivers/iio/adc/mt6360-adc.c | 372 ++++++++++++ + drivers/iio/adc/stm32-adc-core.c | 21 +- + drivers/iio/adc/stm32-adc.c | 29 +- + drivers/iio/buffer/industrialio-buffer-dmaengine.c | 3 +- + drivers/iio/buffer/industrialio-triggered-buffer.c | 31 +- + .../common/cros_ec_sensors/cros_ec_sensors_core.c | 15 +- + .../iio/common/hid-sensors/hid-sensor-trigger.c | 22 +- + drivers/iio/dac/Kconfig | 7 +- + drivers/iio/dac/ad5686.c | 13 + + drivers/iio/dac/ad5686.h | 1 + + drivers/iio/dac/ad5696-i2c.c | 20 + + drivers/iio/dac/ad7303.c | 2 - + drivers/iio/iio_core.h | 15 +- + drivers/iio/imu/bmi160/bmi160_core.c | 1 - + drivers/iio/imu/st_lsm6dsx/Kconfig | 4 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 2 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 207 ++++++- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 5 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 5 + + drivers/iio/industrialio-buffer.c | 12 - + drivers/iio/industrialio-core.c | 118 +++- + drivers/iio/industrialio-event.c | 28 +- + drivers/iio/light/apds9960.c | 2 +- + drivers/iio/light/tsl2563.c | 16 +- + drivers/iio/light/vcnl4035.c | 7 + + drivers/iio/magnetometer/bmc150_magn.c | 2 +- + drivers/iio/pressure/bmp280-regmap.c | 4 +- + drivers/iio/proximity/sx9310.c | 508 +++++++++++++++- + drivers/iio/proximity/vl53l0x-i2c.c | 7 + + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/android/Kconfig | 2 - + drivers/staging/android/Makefile | 2 - + drivers/staging/android/TODO | 5 - + drivers/staging/android/ion/Kconfig | 27 - + drivers/staging/android/ion/Makefile | 4 - + drivers/staging/android/ion/ion.c | 649 --------------------- + drivers/staging/android/ion/ion.h | 302 ---------- + drivers/staging/android/ion/ion_cma_heap.c | 138 ----- + drivers/staging/android/ion/ion_heap.c | 286 --------- + drivers/staging/android/ion/ion_page_pool.c | 155 ----- + drivers/staging/android/ion/ion_system_heap.c | 377 ------------ + drivers/staging/android/uapi/ion.h | 127 ---- + drivers/staging/comedi/drivers/ni_mio_common.c | 3 +- + .../staging/comedi/drivers/tests/ni_routes_test.c | 8 +- + drivers/staging/fieldbus/anybuss/hms-profinet.c | 5 +- + drivers/staging/fieldbus/dev_core.c | 2 +- + drivers/staging/fsl-dpaa2/ethsw/dpsw-cmd.h | 10 +- + drivers/staging/fsl-dpaa2/ethsw/dpsw.h | 6 +- + drivers/staging/fsl-dpaa2/ethsw/ethsw-ethtool.c | 2 +- + drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 9 +- + drivers/staging/gasket/gasket_interrupt.c | 15 +- + drivers/staging/gdm724x/gdm_mux.c | 10 +- + drivers/staging/goldfish/Kconfig | 7 - + drivers/staging/goldfish/Makefile | 6 - + drivers/staging/goldfish/README | 5 - + drivers/staging/goldfish/goldfish_audio.c | 383 ------------ + drivers/staging/greybus/audio_codec.c | 111 ++-- + drivers/staging/greybus/audio_manager_module.c | 3 +- + drivers/staging/greybus/audio_module.c | 8 +- + drivers/staging/hikey9xx/Kconfig | 1 + + drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 4 +- + drivers/staging/hikey9xx/hisi-spmi-controller.c | 4 +- + drivers/staging/iio/accel/adis16240.c | 1 + + drivers/staging/kpc2000/kpc2000/cell_probe.c | 71 ++- + drivers/staging/kpc2000/kpc2000/core.c | 3 +- + drivers/staging/kpc2000/kpc2000/dma_common_defs.h | 17 +- + drivers/staging/kpc2000/kpc_dma/dma.c | 21 +- + drivers/staging/kpc2000/kpc_dma/fileops.c | 28 +- + drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.c | 13 +- + drivers/staging/ks7010/ks7010_sdio.c | 4 +- + drivers/staging/most/sound/sound.c | 14 +- + drivers/staging/mt7621-dma/mtk-hsdma.c | 44 +- + drivers/staging/mt7621-pci/pci-mt7621.c | 101 +--- + drivers/staging/qlge/qlge_ethtool.c | 1 + + drivers/staging/qlge/qlge_main.c | 10 +- + drivers/staging/qlge/qlge_mpi.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_ap.c | 54 +- + drivers/staging/rtl8188eu/core/rtw_cmd.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_debug.c | 18 +- + drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 36 +- + drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_mlme.c | 18 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 122 ++-- + drivers/staging/rtl8188eu/core/rtw_recv.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 24 +- + drivers/staging/rtl8188eu/core/rtw_xmit.c | 10 +- + drivers/staging/rtl8188eu/hal/phy.c | 7 - + drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 10 +- + drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 4 +- + drivers/staging/rtl8188eu/include/osdep_intf.h | 1 - + drivers/staging/rtl8188eu/include/rtw_security.h | 3 - + drivers/staging/rtl8188eu/include/wifi.h | 34 -- + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 21 +- + drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 2 +- + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 9 - + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 6 +- + drivers/staging/rtl8192e/rtl819x_HTProc.c | 27 +- + drivers/staging/rtl8192u/ieee80211/dot11d.c | 12 +- + drivers/staging/rtl8192u/r8192U_core.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_ap.c | 51 +- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 46 +- + drivers/staging/rtl8723bs/core/rtw_efuse.c | 44 +- + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 15 +- + drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 14 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 49 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 128 ++-- + drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 70 +-- + drivers/staging/rtl8723bs/core/rtw_recv.c | 132 ++--- + drivers/staging/rtl8723bs/core/rtw_security.c | 380 +++++------- + drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 63 +- + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 98 ++-- + drivers/staging/rtl8723bs/core/rtw_xmit.c | 93 ++- + drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 7 +- + drivers/staging/rtl8723bs/hal/hal_com.c | 2 +- + drivers/staging/rtl8723bs/hal/hal_intf.c | 4 +- + drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 20 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 2 +- + drivers/staging/rtl8723bs/hal/sdio_halinit.c | 15 +- + drivers/staging/rtl8723bs/include/ieee80211.h | 35 +- + drivers/staging/rtl8723bs/include/osdep_service.h | 3 - + .../rtl8723bs/include/osdep_service_linux.h | 2 - + drivers/staging/rtl8723bs/include/rtw_ht.h | 2 +- + drivers/staging/rtl8723bs/include/rtw_io.h | 2 +- + drivers/staging/rtl8723bs/include/rtw_mlme.h | 16 +- + drivers/staging/rtl8723bs/include/rtw_mp.h | 10 +- + drivers/staging/rtl8723bs/include/rtw_pwrctrl.h | 6 +- + drivers/staging/rtl8723bs/include/rtw_recv.h | 4 +- + drivers/staging/rtl8723bs/include/rtw_security.h | 12 +- + drivers/staging/rtl8723bs/include/rtw_xmit.h | 8 +- + drivers/staging/rtl8723bs/include/sta_info.h | 2 +- + drivers/staging/rtl8723bs/include/wifi.h | 26 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 256 ++++---- + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 458 +++++++-------- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 38 +- + drivers/staging/rtl8723bs/os_dep/osdep_service.c | 2 +- + drivers/staging/rtl8723bs/os_dep/recv_linux.c | 14 +- + drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 2 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 189 +++--- + .../vc04_services/interface/vchiq_arm/vchiq_arm.h | 27 +- + .../vc04_services/interface/vchiq_arm/vchiq_cfg.h | 6 +- + .../interface/vchiq_arm/vchiq_connected.c | 3 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 277 +++++---- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 55 +- + .../interface/vchiq_arm/vchiq_debugfs.c | 8 +- + drivers/staging/vt6655/card.c | 2 +- + drivers/staging/vt6655/device_main.c | 12 +- + drivers/staging/vt6655/rxtx.c | 101 ++-- + drivers/staging/vt6656/main_usb.c | 1 + + drivers/staging/wfx/sta.c | 2 +- + drivers/staging/wimax/Kconfig | 1 + + drivers/staging/wimax/i2400m/control.c | 4 +- + drivers/staging/wimax/i2400m/driver.c | 9 +- + drivers/staging/wimax/i2400m/fw.c | 14 +- + drivers/staging/wimax/i2400m/netdev.c | 2 +- + drivers/staging/wimax/i2400m/tx.c | 6 +- + drivers/staging/wlan-ng/prism2mgmt.c | 4 +- + include/linux/iio/buffer.h | 3 - + include/linux/iio/iio-opaque.h | 2 + + include/linux/iio/iio.h | 6 + + include/linux/iio/trigger.h | 2 +- + include/linux/iio/triggered_buffer.h | 23 +- + include/linux/platform_data/ad7298.h | 19 - + include/linux/platform_data/ad7303.h | 20 - + include/linux/platform_data/ad7887.h | 4 - + include/linux/platform_data/at91_adc.h | 49 -- + tools/testing/selftests/Makefile | 3 +- + tools/testing/selftests/android/Makefile | 39 -- + tools/testing/selftests/android/config | 5 - + tools/testing/selftests/android/ion/.gitignore | 4 - + tools/testing/selftests/android/ion/Makefile | 20 - + tools/testing/selftests/android/ion/README | 101 ---- + tools/testing/selftests/android/ion/ion.h | 134 ----- + tools/testing/selftests/android/ion/ion_test.sh | 58 -- + .../testing/selftests/android/ion/ionapp_export.c | 127 ---- + .../testing/selftests/android/ion/ionapp_import.c | 79 --- + tools/testing/selftests/android/ion/ionmap_test.c | 136 ----- + tools/testing/selftests/android/ion/ionutils.c | 253 -------- + tools/testing/selftests/android/ion/ionutils.h | 55 -- + tools/testing/selftests/android/ion/ipcsocket.c | 227 ------- + tools/testing/selftests/android/ion/ipcsocket.h | 35 -- + tools/testing/selftests/android/run.sh | 3 - + 329 files changed, 6951 insertions(+), 8031 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-mt6360 + delete mode 100644 Documentation/devicetree/bindings/iio/accel/dmard06.txt + delete mode 100644 Documentation/devicetree/bindings/iio/adc/at91-sama5d2_adc.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/atmel,sama5d2-adc.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/adc/axp20x_adc.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/mediatek,mt6360-adc.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/adc/renesas,gyroadc.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/renesas,rcar-gyroadc.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,adc084s021.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/adc/ti-adc084s021.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/x-powers,axp209-adc.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/chemical/bme680.txt + delete mode 100644 Documentation/devicetree/bindings/iio/chemical/sensirion,sgp30.txt + delete mode 100644 Documentation/devicetree/bindings/iio/dac/ad5758.txt + delete mode 100644 Documentation/devicetree/bindings/iio/dac/ad7303.txt + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad5686.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad5758.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad7303.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/dac/ds4424.txt + create mode 100644 Documentation/devicetree/bindings/iio/dac/fsl,vf610-dac.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/dac/lpc1850-dac.txt + delete mode 100644 Documentation/devicetree/bindings/iio/dac/max5821.txt + create mode 100644 Documentation/devicetree/bindings/iio/dac/maxim,ds4424.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/maxim,max5821.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/dac/mcp4725.txt + create mode 100644 Documentation/devicetree/bindings/iio/dac/microchip,mcp4725.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/nxp,lpc1850-dac.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/dac/ti,dac5571.txt + create mode 100644 Documentation/devicetree/bindings/iio/dac/ti,dac5571.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/dac/ti,dac7311.txt + create mode 100644 Documentation/devicetree/bindings/iio/dac/ti,dac7311.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/dac/ti,dac7512.txt + create mode 100644 Documentation/devicetree/bindings/iio/dac/ti,dac7512.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/dac/ti,dac7612.txt + create mode 100644 Documentation/devicetree/bindings/iio/dac/ti,dac7612.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/dac/vf610-dac.txt + delete mode 100644 Documentation/devicetree/bindings/iio/gyroscope/nxp,fxas21002c.txt + create mode 100644 Documentation/devicetree/bindings/iio/gyroscope/nxp,fxas21002c.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/health/max30100.txt + delete mode 100644 Documentation/devicetree/bindings/iio/health/max30102.txt + create mode 100644 Documentation/devicetree/bindings/iio/health/maxim,max30100.yaml + create mode 100644 Documentation/devicetree/bindings/iio/health/maxim,max30102.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/humidity/dht11.txt + create mode 100644 Documentation/devicetree/bindings/iio/humidity/dht11.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/humidity/hdc100x.txt + delete mode 100644 Documentation/devicetree/bindings/iio/humidity/hts221.txt + delete mode 100644 Documentation/devicetree/bindings/iio/humidity/htu21.txt + create mode 100644 Documentation/devicetree/bindings/iio/humidity/st,hts221.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/impedance-analyzer/ad5933.txt + create mode 100644 Documentation/devicetree/bindings/iio/impedance-analyzer/adi,ad5933.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/imu/adi,adis16480.txt + create mode 100644 Documentation/devicetree/bindings/iio/imu/adi,adis16480.yaml + create mode 100644 Documentation/devicetree/bindings/iio/imu/st,lsm6dsx.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt + delete mode 100644 Documentation/devicetree/bindings/iio/light/apds9300.txt + delete mode 100644 Documentation/devicetree/bindings/iio/light/apds9960.txt + create mode 100644 Documentation/devicetree/bindings/iio/light/avago,apds9300.yaml + create mode 100644 Documentation/devicetree/bindings/iio/light/avago,apds9960.yaml + create mode 100644 Documentation/devicetree/bindings/iio/light/capella,cm36651.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/light/cm36651.txt + delete mode 100644 Documentation/devicetree/bindings/iio/light/gp2ap020a00f.txt + delete mode 100644 Documentation/devicetree/bindings/iio/light/max44009.txt + create mode 100644 Documentation/devicetree/bindings/iio/light/maxim,max44009.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/light/opt3001.txt + delete mode 100644 Documentation/devicetree/bindings/iio/light/renesas,isl29501.txt + create mode 100644 Documentation/devicetree/bindings/iio/light/sharp,gp2ap020a00f.yaml + create mode 100644 Documentation/devicetree/bindings/iio/light/st,uvis25.yaml + create mode 100644 Documentation/devicetree/bindings/iio/light/st,vl6180.yaml + create mode 100644 Documentation/devicetree/bindings/iio/light/ti,opt3001.yaml + create mode 100644 Documentation/devicetree/bindings/iio/light/upisemi,us5182.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/light/us5182d.txt + delete mode 100644 Documentation/devicetree/bindings/iio/light/uvis25.txt + delete mode 100644 Documentation/devicetree/bindings/iio/light/vcnl4035.txt + create mode 100644 Documentation/devicetree/bindings/iio/light/vishay,vcnl4035.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/light/vl6180.txt + delete mode 100644 Documentation/devicetree/bindings/iio/magnetometer/ak8974.txt + create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/asahi-kasei,ak8974.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/magnetometer/bmc150_magn.txt + create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/bosch,bmc150_magn.yaml + create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/fsl,mag3110.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/magnetometer/hmc5843.txt + create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/honeywell,hmc5843.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/magnetometer/mag3110.txt + delete mode 100644 Documentation/devicetree/bindings/iio/magnetometer/mmc35240.txt + delete mode 100644 Documentation/devicetree/bindings/iio/magnetometer/pni,rm3100.txt + create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/pni,rm3100.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/potentiometer/ad5272.txt + create mode 100644 Documentation/devicetree/bindings/iio/potentiometer/adi,ad5272.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/potentiometer/ds1803.txt + delete mode 100644 Documentation/devicetree/bindings/iio/potentiometer/max5481.txt + delete mode 100644 Documentation/devicetree/bindings/iio/potentiometer/mcp41010.txt + delete mode 100644 Documentation/devicetree/bindings/iio/potentiometer/mcp4131.txt + create mode 100644 Documentation/devicetree/bindings/iio/potentiometer/microchip,mcp41010.yaml + create mode 100644 Documentation/devicetree/bindings/iio/potentiometer/microchip,mcp4131.yaml + create mode 100644 Documentation/devicetree/bindings/iio/pressure/hoperf,hp03.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/pressure/hp03.txt + create mode 100644 Documentation/devicetree/bindings/iio/pressure/meas,ms5611.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/pressure/ms5611.txt + delete mode 100644 Documentation/devicetree/bindings/iio/pressure/ms5637.txt + create mode 100644 Documentation/devicetree/bindings/iio/pressure/murata,zpa2326.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/pressure/zpa2326.txt + create mode 100644 Documentation/devicetree/bindings/iio/proximity/ams,as3935.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/proximity/as3935.txt + create mode 100644 Documentation/devicetree/bindings/iio/proximity/semtech,sx9500.yaml + create mode 100644 Documentation/devicetree/bindings/iio/proximity/st,vl53l0x.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/proximity/sx9500.txt + delete mode 100644 Documentation/devicetree/bindings/iio/proximity/vl53l0x.txt + delete mode 100644 Documentation/devicetree/bindings/iio/resolver/ad2s90.txt + create mode 100644 Documentation/devicetree/bindings/iio/resolver/adi,ad2s90.yaml + create mode 100644 Documentation/devicetree/bindings/iio/samsung,sensorhub-rinato.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/sensorhub.txt + delete mode 100644 Documentation/devicetree/bindings/iio/temperature/max31856.txt + create mode 100644 Documentation/devicetree/bindings/iio/temperature/maxim,max31855k.yaml + create mode 100644 Documentation/devicetree/bindings/iio/temperature/maxim,max31856.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/temperature/maxim_thermocouple.txt + create mode 100644 Documentation/devicetree/bindings/iio/temperature/melexis,mlx90614.yaml + create mode 100644 Documentation/devicetree/bindings/iio/temperature/melexis,mlx90632.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/temperature/mlx90614.txt + delete mode 100644 Documentation/devicetree/bindings/iio/temperature/mlx90632.txt + create mode 100644 Documentation/devicetree/bindings/iio/temperature/ti,tmp007.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/temperature/tmp007.txt + delete mode 100644 Documentation/devicetree/bindings/iio/temperature/tsys01.txt + create mode 100644 drivers/iio/adc/mt6360-adc.c + delete mode 100644 drivers/staging/android/ion/Kconfig + delete mode 100644 drivers/staging/android/ion/Makefile + delete mode 100644 drivers/staging/android/ion/ion.c + delete mode 100644 drivers/staging/android/ion/ion.h + delete mode 100644 drivers/staging/android/ion/ion_cma_heap.c + delete mode 100644 drivers/staging/android/ion/ion_heap.c + delete mode 100644 drivers/staging/android/ion/ion_page_pool.c + delete mode 100644 drivers/staging/android/ion/ion_system_heap.c + delete mode 100644 drivers/staging/android/uapi/ion.h + delete mode 100644 drivers/staging/goldfish/Kconfig + delete mode 100644 drivers/staging/goldfish/Makefile + delete mode 100644 drivers/staging/goldfish/README + delete mode 100644 drivers/staging/goldfish/goldfish_audio.c + delete mode 100644 include/linux/platform_data/ad7298.h + delete mode 100644 include/linux/platform_data/ad7303.h + delete mode 100644 include/linux/platform_data/at91_adc.h + delete mode 100644 tools/testing/selftests/android/Makefile + delete mode 100644 tools/testing/selftests/android/config + delete mode 100644 tools/testing/selftests/android/ion/.gitignore + delete mode 100644 tools/testing/selftests/android/ion/Makefile + delete mode 100644 tools/testing/selftests/android/ion/README + delete mode 100644 tools/testing/selftests/android/ion/ion.h + delete mode 100755 tools/testing/selftests/android/ion/ion_test.sh + delete mode 100644 tools/testing/selftests/android/ion/ionapp_export.c + delete mode 100644 tools/testing/selftests/android/ion/ionapp_import.c + delete mode 100644 tools/testing/selftests/android/ion/ionmap_test.c + delete mode 100644 tools/testing/selftests/android/ion/ionutils.c + delete mode 100644 tools/testing/selftests/android/ion/ionutils.h + delete mode 100644 tools/testing/selftests/android/ion/ipcsocket.c + delete mode 100644 tools/testing/selftests/android/ion/ipcsocket.h + delete mode 100755 tools/testing/selftests/android/run.sh +Merging mux/for-next (05f19f7f8944 mux: adgs1408: Add mod_devicetable.h and remove of_match_ptr) +$ git merge mux/for-next +Auto-merging drivers/mux/adgs1408.c +Merge made by the 'recursive' strategy. +Merging icc/icc-next (8fb0f9de8eaf Merge branch 'icc-5.11' into HEAD) +$ git merge icc/icc-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/interconnect/qcom,sdm660.yaml | 147 ++++ + MAINTAINERS | 8 + + drivers/interconnect/Kconfig | 1 + + drivers/interconnect/Makefile | 1 + + drivers/interconnect/qcom/Kconfig | 9 + + drivers/interconnect/qcom/Makefile | 2 + + drivers/interconnect/qcom/bcm-voter.c | 15 +- + drivers/interconnect/qcom/sdm660.c | 922 +++++++++++++++++++++ + drivers/interconnect/samsung/Kconfig | 13 + + drivers/interconnect/samsung/Makefile | 4 + + drivers/interconnect/samsung/exynos.c | 199 +++++ + include/dt-bindings/interconnect/qcom,sdm660.h | 116 +++ + 12 files changed, 1426 insertions(+), 11 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sdm660.yaml + create mode 100644 drivers/interconnect/qcom/sdm660.c + create mode 100644 drivers/interconnect/samsung/Kconfig + create mode 100644 drivers/interconnect/samsung/Makefile + create mode 100644 drivers/interconnect/samsung/exynos.c + create mode 100644 include/dt-bindings/interconnect/qcom,sdm660.h +Merging dmaengine/next (5d051f37f49d dmaengine: ti: drop of_match_ptr and mark of_device_id table as maybe unused) +$ git merge dmaengine/next +Auto-merging drivers/dma/pl330.c +Auto-merging drivers/dma/idxd/submit.c +CONFLICT (content): Merge conflict in drivers/dma/idxd/submit.c +Auto-merging drivers/dma/idxd/registers.h +CONFLICT (content): Merge conflict in drivers/dma/idxd/registers.h +Auto-merging drivers/dma/idxd/init.c +Auto-merging drivers/dma/idxd/idxd.h +Auto-merging drivers/dma/idxd/device.c +CONFLICT (content): Merge conflict in drivers/dma/idxd/device.c +Auto-merging drivers/dma/Kconfig +Resolved 'drivers/dma/idxd/device.c' using previous resolution. +Resolved 'drivers/dma/idxd/registers.h' using previous resolution. +Resolved 'drivers/dma/idxd/submit.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master e056cbcb2c4f] Merge remote-tracking branch 'dmaengine/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/stable/sysfs-driver-dma-idxd | 14 + + .../bindings/dma/allwinner,sun50i-a64-dma.yaml | 5 +- + .../devicetree/bindings/dma/atmel-xdma.txt | 3 +- + .../devicetree/bindings/dma/qcom,gpi.yaml | 88 + + drivers/dma/Kconfig | 10 + + drivers/dma/at_xdmac.c | 163 +- + drivers/dma/dma-jz4780.c | 2 +- + drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 2 +- + drivers/dma/dw/core.c | 6 + + drivers/dma/hisi_dma.c | 5 +- + drivers/dma/idma64.c | 8 +- + drivers/dma/idxd/cdev.c | 49 +- + drivers/dma/idxd/device.c | 102 +- + drivers/dma/idxd/dma.c | 9 - + drivers/dma/idxd/idxd.h | 33 +- + drivers/dma/idxd/init.c | 109 +- + drivers/dma/idxd/irq.c | 146 +- + drivers/dma/idxd/registers.h | 22 + + drivers/dma/idxd/submit.c | 35 +- + drivers/dma/idxd/sysfs.c | 127 ++ + drivers/dma/imx-dma.c | 33 +- + drivers/dma/imx-sdma.c | 38 +- + drivers/dma/ipu/ipu_idmac.c | 11 +- + drivers/dma/k3dma.c | 9 +- + drivers/dma/milbeaut-xdmac.c | 5 +- + drivers/dma/moxart-dma.c | 5 +- + drivers/dma/mv_xor.c | 2 +- + drivers/dma/mv_xor_v2.c | 4 +- + drivers/dma/mxs-dma.c | 37 +- + drivers/dma/pl330.c | 2 - + drivers/dma/ppc4xx/adma.c | 4 +- + drivers/dma/pxa_dma.c | 5 +- + drivers/dma/qcom/Kconfig | 23 + + drivers/dma/qcom/Makefile | 2 + + drivers/dma/qcom/gpi.c | 2303 ++++++++++++++++++++ + drivers/dma/qcom/qcom_adm.c | 903 ++++++++ + drivers/dma/sf-pdma/sf-pdma.c | 12 +- + drivers/dma/ste_dma40.c | 5 +- + drivers/dma/stm32-dmamux.c | 2 +- + drivers/dma/stm32-mdma.c | 2 +- + drivers/dma/sun6i-dma.c | 25 + + drivers/dma/tegra210-adma.c | 7 +- + drivers/dma/ti/dma-crossbar.c | 6 +- + drivers/dma/ti/k3-udma-glue.c | 64 +- + drivers/dma/ti/k3-udma.c | 10 +- + include/dt-bindings/dma/jz4775-dma.h | 44 + + include/dt-bindings/dma/qcom-gpi.h | 11 + + include/dt-bindings/dma/x2000-dma.h | 54 + + include/linux/dma/qcom-gpi-dma.h | 83 + + include/linux/dmaengine.h | 5 + + 50 files changed, 4364 insertions(+), 290 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/qcom,gpi.yaml + create mode 100644 drivers/dma/qcom/gpi.c + create mode 100644 drivers/dma/qcom/qcom_adm.c + create mode 100644 include/dt-bindings/dma/jz4775-dma.h + create mode 100644 include/dt-bindings/dma/qcom-gpi.h + create mode 100644 include/dt-bindings/dma/x2000-dma.h + create mode 100644 include/linux/dma/qcom-gpi-dma.h +Merging cgroup/for-next (5a7b5f32c5aa cgroup/cgroup.c: replace 'of->kn->priv' with of_cft()) +$ git merge cgroup/for-next +Auto-merging kernel/cgroup/cgroup.c +Merge made by the 'recursive' strategy. + kernel/cgroup/cgroup.c | 30 +++++++++++++++--------------- + 1 file changed, 15 insertions(+), 15 deletions(-) +Merging scsi/for-next (f9123bc98a4f Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/target/target_core_user.c +Auto-merging drivers/scsi/bnx2fc/bnx2fc_fcoe.c +Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.c +Auto-merging drivers/infiniband/ulp/isert/ib_isert.c +Auto-merging block/blk-mq.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-fc_host | 23 + + .../ABI/testing/sysfs-class-fc_remote_ports | 23 + + MAINTAINERS | 9 + + block/blk-mq.c | 2 +- + drivers/infiniband/ulp/isert/ib_isert.c | 6 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 2 +- + drivers/message/fusion/mptbase.c | 1 - + drivers/s390/scsi/zfcp_aux.c | 11 + + drivers/s390/scsi/zfcp_def.h | 1 + + drivers/s390/scsi/zfcp_ext.h | 2 - + drivers/s390/scsi/zfcp_fsf.c | 19 + + drivers/s390/scsi/zfcp_fsf.h | 11 + + drivers/s390/scsi/zfcp_qdio.c | 47 + + drivers/s390/scsi/zfcp_qdio.h | 2 + + drivers/scsi/aacraid/commctrl.c | 22 +- + drivers/scsi/aacraid/linit.c | 61 +- + drivers/scsi/advansys.c | 16 +- + drivers/scsi/aic7xxx/aic79xx_osm.c | 3 +- + drivers/scsi/aic94xx/aic94xx_task.c | 1 - + drivers/scsi/arcmsr/arcmsr.h | 1 + + drivers/scsi/arcmsr/arcmsr_hba.c | 26 +- + drivers/scsi/be2iscsi/be_main.c | 2 +- + drivers/scsi/be2iscsi/be_mgmt.c | 4 - + drivers/scsi/bnx2fc/bnx2fc.h | 1 - + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 6 +- + drivers/scsi/bnx2fc/bnx2fc_hwi.c | 1 - + drivers/scsi/dc395x.c | 15 +- + drivers/scsi/device_handler/scsi_dh_alua.c | 10 +- + drivers/scsi/esas2r/esas2r_disc.c | 3 +- + drivers/scsi/esas2r/esas2r_init.c | 5 +- + drivers/scsi/esas2r/esas2r_int.c | 8 +- + drivers/scsi/esas2r/esas2r_main.c | 8 +- + drivers/scsi/fcoe/fcoe.c | 3 +- + drivers/scsi/fcoe/fcoe_sysfs.c | 4 +- + drivers/scsi/hpsa.c | 26 +- + drivers/scsi/hptiop.c | 1 - + drivers/scsi/ibmvscsi/ibmvfc.c | 195 ++- + drivers/scsi/ibmvscsi/ibmvfc.h | 28 +- + drivers/scsi/ipr.c | 1 - + drivers/scsi/isci/init.c | 18 +- + drivers/scsi/isci/phy.c | 2 - + drivers/scsi/iscsi_tcp.c | 4 +- + drivers/scsi/libfc/fc_elsct.c | 2 +- + {include/scsi => drivers/scsi/libfc}/fc_encode.h | 60 +- + drivers/scsi/libfc/fc_exch.c | 3 +- + drivers/scsi/libfc/fc_fcp.c | 2 +- + drivers/scsi/libfc/fc_libfc.c | 2 +- + drivers/scsi/libfc/fc_lport.c | 2 +- + drivers/scsi/libfc/fc_rport.c | 2 +- + drivers/scsi/libiscsi.c | 2 +- + drivers/scsi/lpfc/lpfc.h | 15 +- + drivers/scsi/lpfc/lpfc_attr.c | 89 +- + drivers/scsi/lpfc/lpfc_bsg.c | 138 +-- + drivers/scsi/lpfc/lpfc_crtn.h | 18 +- + drivers/scsi/lpfc/lpfc_ct.c | 452 ++++++- + drivers/scsi/lpfc/lpfc_debugfs.c | 23 +- + drivers/scsi/lpfc/lpfc_disc.h | 47 +- + drivers/scsi/lpfc/lpfc_els.c | 1295 +++++++++++--------- + drivers/scsi/lpfc/lpfc_hbadisc.c | 797 ++++-------- + drivers/scsi/lpfc/lpfc_hw.h | 7 +- + drivers/scsi/lpfc/lpfc_hw4.h | 22 +- + drivers/scsi/lpfc/lpfc_init.c | 190 ++- + drivers/scsi/lpfc/lpfc_mem.c | 11 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 215 ++-- + drivers/scsi/lpfc/lpfc_nvme.c | 381 ++---- + drivers/scsi/lpfc/lpfc_nvme.h | 4 +- + drivers/scsi/lpfc/lpfc_nvmet.c | 77 +- + drivers/scsi/lpfc/lpfc_scsi.c | 1177 +++++++++++++----- + drivers/scsi/lpfc/lpfc_sli.c | 744 +++++++---- + drivers/scsi/lpfc/lpfc_sli.h | 7 +- + drivers/scsi/lpfc/lpfc_sli4.h | 14 +- + drivers/scsi/lpfc/lpfc_version.h | 4 +- + drivers/scsi/lpfc/lpfc_vport.c | 128 +- + drivers/scsi/megaraid/megaraid_sas.h | 2 - + drivers/scsi/megaraid/megaraid_sas_base.c | 134 +- + drivers/scsi/mpt3sas/mpt3sas_base.h | 102 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 6 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 1246 ++++++++++++++++--- + drivers/scsi/mpt3sas/mpt3sas_transport.c | 312 ++++- + drivers/scsi/mvumi.c | 1 - + drivers/scsi/pcmcia/nsp_cs.c | 2 - + drivers/scsi/pm8001/pm8001_hwi.c | 90 +- + drivers/scsi/pm8001/pm8001_init.c | 2 +- + drivers/scsi/pm8001/pm8001_sas.c | 13 +- + drivers/scsi/pm8001/pm8001_sas.h | 2 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 130 +- + drivers/scsi/pm8001/pm80xx_hwi.h | 6 + + drivers/scsi/qedf/qedf.h | 1 - + drivers/scsi/qla2xxx/qla_def.h | 2 + + drivers/scsi/qla2xxx/qla_init.c | 3 + + drivers/scsi/qla2xxx/qla_mbx.c | 1 - + drivers/scsi/qla2xxx/qla_target.c | 22 +- + drivers/scsi/qla2xxx/qla_target.h | 1 + + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 70 +- + drivers/scsi/qla4xxx/ql4_os.c | 3 - + drivers/scsi/scsi_devinfo.c | 3 +- + drivers/scsi/scsi_lib.c | 149 ++- + drivers/scsi/scsi_sysfs.c | 2 +- + drivers/scsi/scsi_transport_fc.c | 417 ++++++- + drivers/scsi/smartpqi/smartpqi_init.c | 14 +- + drivers/scsi/smartpqi/smartpqi_sas_transport.c | 1 - + drivers/scsi/st.c | 1 - + drivers/scsi/sym53c8xx_2/sym_hipd.c | 1 - + drivers/scsi/ufs/Kconfig | 2 +- + drivers/scsi/ufs/ufs-exynos.c | 15 +- + drivers/scsi/ufs/ufs-exynos.h | 13 - + drivers/scsi/ufs/ufs-hisi.c | 13 +- + drivers/scsi/ufs/ufs-hisi.h | 13 - + drivers/scsi/ufs/ufs-mediatek.c | 253 ++-- + drivers/scsi/ufs/ufs-mediatek.h | 34 +- + drivers/scsi/ufs/ufs-qcom.c | 34 +- + drivers/scsi/ufs/ufs-qcom.h | 11 - + drivers/scsi/ufs/ufs-sysfs.c | 7 + + drivers/scsi/ufs/ufs.h | 1 + + drivers/scsi/ufs/ufshcd-pltfrm.c | 17 + + drivers/scsi/ufs/ufshcd-pltfrm.h | 1 + + drivers/scsi/ufs/ufshcd.c | 181 ++- + drivers/scsi/ufs/ufshcd.h | 45 +- + drivers/scsi/ufs/unipro.h | 6 +- + drivers/target/loopback/tcm_loop.c | 14 +- + drivers/target/target_core_device.c | 59 +- + drivers/target/target_core_sbc.c | 139 ++- + drivers/target/target_core_tmr.c | 166 +-- + drivers/target/target_core_tpg.c | 2 +- + drivers/target/target_core_transport.c | 170 +-- + drivers/target/target_core_user.c | 164 ++- + drivers/target/tcm_fc/tfc_cmd.c | 3 +- + drivers/target/tcm_fc/tfc_io.c | 1 - + drivers/target/tcm_fc/tfc_sess.c | 2 +- + include/scsi/fc_frame.h | 30 + + include/scsi/scsi_transport_fc.h | 36 + + include/target/target_core_base.h | 22 +- + include/target/target_core_fabric.h | 2 +- + include/trace/events/ufs.h | 24 +- + include/uapi/scsi/fc/fc_els.h | 114 +- + 135 files changed, 7098 insertions(+), 3799 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-fc_host + create mode 100644 Documentation/ABI/testing/sysfs-class-fc_remote_ports + rename {include/scsi => drivers/scsi/libfc}/fc_encode.h (94%) +Merging scsi-mkp/for-next (3256b4682386 scsi: fnic: Validate io_req before others) +$ git merge scsi-mkp/for-next +Auto-merging drivers/scsi/ufs/ufshcd.c +Merge made by the 'recursive' strategy. + drivers/scsi/NCR5380.c | 18 +- + drivers/scsi/atari_scsi.c | 10 +- + drivers/scsi/fnic/fnic.h | 3 +- + drivers/scsi/fnic/fnic_fcs.c | 10 +- + drivers/scsi/fnic/fnic_main.c | 2 + + drivers/scsi/fnic/fnic_scsi.c | 17 +- + drivers/scsi/pm8001/pm8001_ctl.c | 7 +- + drivers/scsi/pm8001/pm8001_hwi.c | 1370 +++++++++++++------------------ + drivers/scsi/pm8001/pm8001_init.c | 104 ++- + drivers/scsi/pm8001/pm8001_sas.c | 136 ++-- + drivers/scsi/pm8001/pm8001_sas.h | 45 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 1596 ++++++++++++++++--------------------- + drivers/scsi/ufs/ufshcd.c | 2 +- + 13 files changed, 1394 insertions(+), 1926 deletions(-) +Merging vhost/linux-next (502cb1133adb vhost_vdpa: switch to vmemdup_user()) +$ git merge vhost/linux-next +Merge made by the 'recursive' strategy. + drivers/vhost/scsi.c | 4 +- + drivers/vhost/vdpa.c | 90 ++- + drivers/vhost/vringh.c | 6 +- + drivers/virtio/virtio_mem.c | 1789 +++++++++++++++++++++++++++++++------------ + mm/memory_hotplug.c | 105 ++- + 5 files changed, 1447 insertions(+), 547 deletions(-) +Merging rpmsg/for-next (ca08b94fd559 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Auto-merging Documentation/devicetree/bindings/arm/stm32/st,stm32-syscon.yaml +Merge made by the 'recursive' strategy. + .../bindings/arm/stm32/st,stm32-syscon.yaml | 1 + + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 12 +- + .../bindings/remoteproc/qcom,wcnss-pil.txt | 20 ++- + .../bindings/remoteproc/st,stm32-rproc.yaml | 21 ++- + .../bindings/remoteproc/ti,k3-r5f-rproc.yaml | 2 + + drivers/hwspinlock/sprd_hwspinlock.c | 17 +- + drivers/remoteproc/ingenic_rproc.c | 2 +- + drivers/remoteproc/mtk_common.h | 2 +- + drivers/remoteproc/mtk_scp.c | 24 +-- + drivers/remoteproc/qcom_common.h | 6 + + drivers/remoteproc/qcom_q6v5.c | 8 +- + drivers/remoteproc/qcom_q6v5.h | 3 +- + drivers/remoteproc/qcom_q6v5_adsp.c | 6 +- + drivers/remoteproc/qcom_q6v5_mss.c | 124 ++++++++++---- + drivers/remoteproc/qcom_q6v5_pas.c | 7 +- + drivers/remoteproc/qcom_q6v5_wcss.c | 2 +- + drivers/remoteproc/qcom_sysmon.c | 121 ++++++++++---- + drivers/remoteproc/qcom_wcnss.c | 109 ++++++++++-- + drivers/remoteproc/remoteproc_core.c | 63 +++++++ + drivers/remoteproc/remoteproc_sysfs.c | 33 +--- + drivers/remoteproc/stm32_rproc.c | 2 +- + drivers/remoteproc/ti_k3_dsp_remoteproc.c | 4 +- + drivers/remoteproc/ti_k3_r5_remoteproc.c | 113 +++++++++++-- + drivers/rpmsg/Kconfig | 9 + + drivers/rpmsg/Makefile | 1 + + drivers/rpmsg/rpmsg_core.c | 44 +++++ + drivers/rpmsg/rpmsg_internal.h | 14 +- + drivers/rpmsg/rpmsg_ns.c | 126 ++++++++++++++ + drivers/rpmsg/virtio_rpmsg_bus.c | 186 ++++++++------------- + include/linux/remoteproc.h | 1 + + include/linux/rpmsg.h | 63 ++++++- + include/linux/rpmsg/byteorder.h | 67 ++++++++ + include/linux/rpmsg/ns.h | 45 +++++ + include/uapi/linux/rpmsg_types.h | 11 ++ + 34 files changed, 961 insertions(+), 308 deletions(-) + create mode 100644 drivers/rpmsg/rpmsg_ns.c + create mode 100644 include/linux/rpmsg/byteorder.h + create mode 100644 include/linux/rpmsg/ns.h + create mode 100644 include/uapi/linux/rpmsg_types.h +Merging gpio/for-next (6c33287665e0 pinctrl: pinctrl-microchip-sgpio: Add pinctrl driver for Microsemi Serial GPIO) +$ git merge gpio/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-xilinx.txt | 2 + + .../bindings/pinctrl/microchip,sparx5-sgpio.yaml | 145 +++++ + Documentation/driver-api/gpio/driver.rst | 67 +- + MAINTAINERS | 12 + + drivers/gpio/TODO | 49 -- + drivers/gpio/gpio-104-idi-48.c | 6 +- + drivers/gpio/gpio-mxc.c | 102 +-- + drivers/gpio/gpio-stmpe.c | 10 +- + drivers/gpio/gpio-xilinx.c | 49 +- + drivers/gpio/gpiolib-acpi.c | 138 ++-- + drivers/gpio/gpiolib-acpi.h | 2 + + drivers/gpio/gpiolib-cdev.c | 24 +- + drivers/gpio/gpiolib.c | 256 ++------ + drivers/gpio/gpiolib.h | 1 + + drivers/pinctrl/Kconfig | 16 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/pinctrl-microchip-sgpio.c | 709 +++++++++++++++++++++ + include/linux/gpio/consumer.h | 4 +- + include/linux/gpio/driver.h | 71 --- + 19 files changed, 1154 insertions(+), 510 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/microchip,sparx5-sgpio.yaml + create mode 100644 drivers/pinctrl/pinctrl-microchip-sgpio.c +Merging gpio-brgl/gpio/for-next (5300ebb695fa gpio: exar: use devm action for freeing the IDA and drop remove()) +$ git merge gpio-brgl/gpio/for-next +Auto-merging drivers/gpio/gpiolib.h +Auto-merging drivers/gpio/gpiolib.c +Auto-merging drivers/gpio/gpiolib-cdev.c +Auto-merging drivers/gpio/gpio-sifive.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-pca95xx.yaml | 1 + + drivers/gpio/Kconfig | 1 + + drivers/gpio/gpio-exar.c | 155 ++++++++++----------- + drivers/gpio/gpio-mockup.c | 11 +- + drivers/gpio/gpio-rcar.c | 87 ++++++++---- + drivers/gpio/gpio-sifive.c | 14 +- + drivers/gpio/gpio-tegra.c | 22 ++- + drivers/gpio/gpiolib-cdev.c | 33 +++-- + drivers/gpio/gpiolib-devres.c | 27 +--- + drivers/gpio/gpiolib-of.c | 14 +- + drivers/gpio/gpiolib-sysfs.c | 2 +- + drivers/gpio/gpiolib.c | 31 ++--- + drivers/gpio/gpiolib.h | 2 + + 13 files changed, 226 insertions(+), 174 deletions(-) +Merging gpio-intel/for-next (e709a7b5a066 gpiolib: acpi: Make Intel GPIO tree official for GPIO ACPI work) +$ git merge gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (8e5008b1a9a0 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Removing drivers/pinctrl/freescale/pinctrl-imx21.c +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/mscc,ocelot-pinctrl.txt | 3 +- + .../bindings/pinctrl/qcom,msm8953-pinctrl.yaml | 167 ++ + .../bindings/pinctrl/qcom,sc7280-pinctrl.yaml | 158 ++ + .../bindings/pinctrl/qcom,sdx55-pinctrl.yaml | 154 ++ + arch/arm64/configs/defconfig | 1 + + drivers/pinctrl/core.c | 2 + + drivers/pinctrl/freescale/Kconfig | 7 - + drivers/pinctrl/freescale/Makefile | 1 - + drivers/pinctrl/freescale/pinctrl-imx21.c | 330 ---- + drivers/pinctrl/intel/Kconfig | 25 + + drivers/pinctrl/intel/Makefile | 3 + + drivers/pinctrl/intel/pinctrl-alderlake.c | 437 +++++ + drivers/pinctrl/intel/pinctrl-elkhartlake.c | 513 ++++++ + drivers/pinctrl/intel/pinctrl-lakefield.c | 375 ++++ + drivers/pinctrl/intel/pinctrl-lynxpoint.c | 10 +- + drivers/pinctrl/mediatek/pinctrl-mt7622.c | 13 +- + drivers/pinctrl/meson/Kconfig | 17 +- + drivers/pinctrl/meson/pinctrl-meson-a1.c | 4 +- + drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c | 3 + + drivers/pinctrl/meson/pinctrl-meson-axg.c | 4 +- + drivers/pinctrl/meson/pinctrl-meson-g12a.c | 4 +- + drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 4 +- + drivers/pinctrl/meson/pinctrl-meson-gxl.c | 4 +- + drivers/pinctrl/meson/pinctrl-meson.c | 8 + + drivers/pinctrl/meson/pinctrl-meson.h | 1 + + drivers/pinctrl/meson/pinctrl-meson8-pmx.c | 2 + + drivers/pinctrl/nomadik/pinctrl-nomadik-db8500.c | 10 +- + drivers/pinctrl/pinctrl-amd.c | 43 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 22 +- + drivers/pinctrl/pinctrl-ingenic.c | 1267 +++++--------- + drivers/pinctrl/pinctrl-ocelot.c | 186 +- + drivers/pinctrl/qcom/Kconfig | 77 +- + drivers/pinctrl/qcom/Makefile | 3 + + drivers/pinctrl/qcom/pinctrl-msm.c | 2 + + drivers/pinctrl/qcom/pinctrl-msm8953.c | 1844 ++++++++++++++++++++ + drivers/pinctrl/qcom/pinctrl-sc7280.c | 1495 ++++++++++++++++ + drivers/pinctrl/qcom/pinctrl-sdx55.c | 1018 +++++++++++ + drivers/pinctrl/renesas/core.c | 2 + + drivers/pinctrl/renesas/core.h | 4 + + drivers/pinctrl/renesas/gpio.c | 2 +- + drivers/pinctrl/renesas/pfc-r8a7778.c | 55 +- + drivers/pinctrl/renesas/pfc-r8a7790.c | 146 +- + drivers/pinctrl/renesas/pfc-r8a7791.c | 18 + + drivers/pinctrl/renesas/pfc-r8a77950.c | 45 +- + drivers/pinctrl/renesas/pfc-r8a77951.c | 59 +- + drivers/pinctrl/renesas/pfc-r8a7796.c | 57 +- + drivers/pinctrl/renesas/pfc-r8a77965.c | 57 +- + drivers/pinctrl/renesas/pfc-r8a77990.c | 57 +- + drivers/pinctrl/renesas/pfc-sh73a0.c | 2 +- + drivers/pinctrl/renesas/pinctrl.c | 68 +- + drivers/pinctrl/renesas/sh_pfc.h | 12 +- + drivers/pinctrl/sunxi/pinctrl-sun50i-a100.c | 2 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 9 +- + include/linux/pinctrl/pinctrl.h | 4 +- + 54 files changed, 7311 insertions(+), 1505 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8953-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sc7280-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sdx55-pinctrl.yaml + delete mode 100644 drivers/pinctrl/freescale/pinctrl-imx21.c + create mode 100644 drivers/pinctrl/intel/pinctrl-alderlake.c + create mode 100644 drivers/pinctrl/intel/pinctrl-elkhartlake.c + create mode 100644 drivers/pinctrl/intel/pinctrl-lakefield.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-msm8953.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sc7280.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sdx55.c +Merging pinctrl-intel/for-next (0b74e40a4e41 pinctrl: baytrail: Avoid clearing debounce value when turning it off) +$ git merge pinctrl-intel/for-next +Already up to date. +Merging pinctrl-samsung/for-next (c5564a50d990 pinctrl: samsung: s3c24xx: remove unneeded break) +$ git merge pinctrl-samsung/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 5 ----- + 1 file changed, 5 deletions(-) +Merging pwm/for-next (228fe8e4deb2 pwm: keembay: Fix build failure with -Os) +$ git merge pwm/for-next +Removing Documentation/devicetree/bindings/pwm/atmel-tcb-pwm.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pwm/atmel-tcb-pwm.txt | 16 -- + .../devicetree/bindings/pwm/intel,keembay-pwm.yaml | 47 +++ + .../devicetree/bindings/pwm/intel,lgm-pwm.yaml | 44 +++ + .../devicetree/bindings/pwm/pwm-mediatek.txt | 1 + + .../devicetree/bindings/pwm/pwm-mtk-disp.txt | 1 + + .../soc/microchip/atmel,at91rm9200-tcb.yaml | 34 ++- + drivers/pwm/Kconfig | 71 ++++- + drivers/pwm/Makefile | 3 + + drivers/pwm/core.c | 2 +- + drivers/pwm/pwm-ab8500.c | 4 +- + drivers/pwm/pwm-atmel-tcb.c | 264 ++++++++++------- + drivers/pwm/pwm-atmel.c | 4 +- + drivers/pwm/pwm-bcm-iproc.c | 4 +- + drivers/pwm/pwm-bcm-kona.c | 4 +- + drivers/pwm/pwm-bcm2835.c | 4 +- + drivers/pwm/pwm-berlin.c | 4 +- + drivers/pwm/pwm-brcmstb.c | 4 +- + drivers/pwm/pwm-clps711x.c | 4 +- + drivers/pwm/pwm-crc.c | 2 +- + drivers/pwm/pwm-dwc.c | 319 +++++++++++++++++++++ + drivers/pwm/pwm-ep93xx.c | 4 +- + drivers/pwm/pwm-fsl-ftm.c | 4 +- + drivers/pwm/pwm-hibvt.c | 7 +- + drivers/pwm/pwm-img.c | 4 +- + drivers/pwm/pwm-imx-tpm.c | 10 +- + drivers/pwm/pwm-imx1.c | 25 +- + drivers/pwm/pwm-imx27.c | 25 +- + drivers/pwm/pwm-intel-lgm.c | 244 ++++++++++++++++ + drivers/pwm/pwm-iqs620a.c | 2 +- + drivers/pwm/pwm-keembay.c | 245 ++++++++++++++++ + drivers/pwm/pwm-lp3943.c | 1 + + drivers/pwm/pwm-lpc18xx-sct.c | 4 +- + drivers/pwm/pwm-lpc32xx.c | 4 +- + drivers/pwm/pwm-lpss-platform.c | 39 ++- + drivers/pwm/pwm-lpss.c | 7 +- + drivers/pwm/pwm-mediatek.c | 23 +- + drivers/pwm/pwm-meson.c | 4 +- + drivers/pwm/pwm-mtk-disp.c | 4 +- + drivers/pwm/pwm-pxa.c | 4 +- + drivers/pwm/pwm-rcar.c | 6 +- + drivers/pwm/pwm-renesas-tpu.c | 4 +- + drivers/pwm/pwm-rockchip.c | 4 +- + drivers/pwm/pwm-samsung.c | 4 +- + drivers/pwm/pwm-sifive.c | 4 +- + drivers/pwm/pwm-spear.c | 4 +- + drivers/pwm/pwm-sti.c | 54 ++-- + drivers/pwm/pwm-sun4i.c | 4 +- + drivers/pwm/pwm-tegra.c | 4 +- + drivers/pwm/pwm-tiecap.c | 4 +- + drivers/pwm/pwm-tiehrpwm.c | 16 +- + drivers/pwm/pwm-vt8500.c | 4 +- + drivers/pwm/pwm-zx.c | 5 +- + 52 files changed, 1278 insertions(+), 335 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/pwm/atmel-tcb-pwm.txt + create mode 100644 Documentation/devicetree/bindings/pwm/intel,keembay-pwm.yaml + create mode 100644 Documentation/devicetree/bindings/pwm/intel,lgm-pwm.yaml + create mode 100644 drivers/pwm/pwm-dwc.c + create mode 100644 drivers/pwm/pwm-intel-lgm.c + create mode 100644 drivers/pwm/pwm-keembay.c +Merging userns/for-next (4762edf556ad Merge of signal-for-v5.11, and exec-for-v5.11 for testing in linux-next) +$ git merge userns/for-next +Auto-merging kernel/fork.c +Auto-merging kernel/bpf/task_iter.c +CONFLICT (content): Merge conflict in kernel/bpf/task_iter.c +Auto-merging kernel/bpf/syscall.c +Auto-merging include/linux/syscalls.h +Auto-merging fs/locks.c +Auto-merging fs/io_uring.c +Auto-merging fs/exec.c +Auto-merging drivers/android/binder.c +Resolved 'kernel/bpf/task_iter.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b952acad50a8] Merge remote-tracking branch 'userns/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/files.rst | 8 +- + arch/powerpc/platforms/cell/spufs/coredump.c | 2 +- + drivers/android/binder.c | 2 +- + fs/autofs/dev-ioctl.c | 5 +- + fs/coredump.c | 5 +- + fs/exec.c | 26 +++--- + fs/file.c | 124 +++++++++++++-------------- + fs/io_uring.c | 2 +- + fs/locks.c | 14 +-- + fs/notify/dnotify/dnotify.c | 2 +- + fs/open.c | 2 +- + fs/proc/fd.c | 48 ++++------- + include/linux/fdtable.h | 40 +++++---- + include/linux/syscalls.h | 12 --- + kernel/bpf/syscall.c | 20 +---- + kernel/bpf/task_iter.c | 33 ++----- + kernel/fork.c | 12 +-- + kernel/kcmp.c | 29 ++----- + 18 files changed, 149 insertions(+), 237 deletions(-) +Merging ktest/for-next (ff131efff141 ktest.pl: Fix spelling mistake "Cant" -> "Can't") +$ git merge ktest/for-next +Already up to date. +Merging random/dev (ab9a7e27044b random: avoid warnings for !CONFIG_NUMA builds) +$ git merge random/dev +Already up to date. +Merging kselftest/next (c2e46f6b3e35 selftests/cgroup: Fix build on older distros) +$ git merge kselftest/next +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'recursive' strategy. + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/cgroup/cgroup_util.c | 4 +- + tools/testing/selftests/gpio/Makefile | 25 +-- + tools/testing/selftests/intel_pstate/aperf.c | 22 +- + tools/testing/selftests/memfd/fuse_test.c | 2 +- + tools/testing/selftests/memfd/memfd_test.c | 2 +- + tools/testing/selftests/run_kselftest.sh | 2 +- + tools/testing/selftests/vDSO/Makefile | 16 +- + tools/testing/selftests/vDSO/vdso_config.h | 92 ++++++++ + tools/testing/selftests/vDSO/vdso_test_abi.c | 244 +++++++++++++++++++++ + .../selftests/vDSO/vdso_test_clock_getres.c | 124 +++++++++++ + .../test_vdso.c => vDSO/vdso_test_correctness.c} | 115 +++++++++- + tools/testing/selftests/vm/userfaultfd.c | 4 +- + tools/testing/selftests/x86/Makefile | 2 +- + 14 files changed, 621 insertions(+), 34 deletions(-) + create mode 100644 tools/testing/selftests/vDSO/vdso_config.h + create mode 100644 tools/testing/selftests/vDSO/vdso_test_abi.c + create mode 100644 tools/testing/selftests/vDSO/vdso_test_clock_getres.c + rename tools/testing/selftests/{x86/test_vdso.c => vDSO/vdso_test_correctness.c} (73%) +Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC") +$ git merge y2038/y2038 +Already up to date. +Merging livepatching/for-next (59fc1e476962 Merge branch 'for-5.10/flive-patching' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (c5348c8a239b coresight-stm: Fix W=1 warning in STM driver) +$ git merge coresight/next +Merge made by the 'recursive' strategy. +Merging rtc/rtc-next (673536cc5f21 rtc: pcf8523: use BIT) +$ git merge rtc/rtc-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/driver-api/driver-model/devres.rst | 6 + + MAINTAINERS | 2 +- + arch/alpha/kernel/rtc.c | 2 +- + drivers/mfd/menelaus.c | 2 +- + drivers/rtc/Kconfig | 21 +-- + drivers/rtc/class.c | 51 +++---- + drivers/rtc/nvmem.c | 91 +------------ + drivers/rtc/rtc-88pm80x.c | 2 +- + drivers/rtc/rtc-88pm860x.c | 2 +- + drivers/rtc/rtc-ab-b5ze-s3.c | 2 +- + drivers/rtc/rtc-ab-eoz9.c | 2 +- + drivers/rtc/rtc-ab3100.c | 2 +- + drivers/rtc/rtc-ab8500.c | 2 +- + drivers/rtc/rtc-abx80x.c | 2 +- + drivers/rtc/rtc-ac100.c | 2 +- + drivers/rtc/rtc-armada38x.c | 2 +- + drivers/rtc/rtc-aspeed.c | 2 +- + drivers/rtc/rtc-at91rm9200.c | 108 ++++++++++++++- + drivers/rtc/rtc-at91sam9.c | 2 +- + drivers/rtc/rtc-au1xxx.c | 2 +- + drivers/rtc/rtc-bd70528.c | 2 +- + drivers/rtc/rtc-brcmstb-waketimer.c | 5 +- + drivers/rtc/rtc-cadence.c | 2 +- + drivers/rtc/rtc-cmos.c | 6 +- + drivers/rtc/rtc-coh901331.c | 2 +- + drivers/rtc/rtc-cpcap.c | 8 +- + drivers/rtc/rtc-cros-ec.c | 2 +- + drivers/rtc/rtc-da9052.c | 2 +- + drivers/rtc/rtc-da9063.c | 4 +- + drivers/rtc/rtc-davinci.c | 2 +- + drivers/rtc/rtc-digicolor.c | 2 +- + drivers/rtc/rtc-dm355evm.c | 2 +- + drivers/rtc/rtc-ds1305.c | 5 +- + drivers/rtc/rtc-ds1307.c | 83 ++++-------- + drivers/rtc/rtc-ds1343.c | 5 +- + drivers/rtc/rtc-ds1347.c | 2 +- + drivers/rtc/rtc-ds1374.c | 2 +- + drivers/rtc/rtc-ds1511.c | 6 +- + drivers/rtc/rtc-ds1553.c | 6 +- + drivers/rtc/rtc-ds1672.c | 2 +- + drivers/rtc/rtc-ds1685.c | 5 +- + drivers/rtc/rtc-ds1742.c | 6 +- + drivers/rtc/rtc-ds2404.c | 2 +- + drivers/rtc/rtc-ds3232.c | 2 +- + drivers/rtc/rtc-ep93xx.c | 2 +- + drivers/rtc/rtc-fsl-ftm-alarm.c | 2 +- + drivers/rtc/rtc-ftrtc010.c | 2 +- + drivers/rtc/rtc-goldfish.c | 2 +- + drivers/rtc/rtc-hym8563.c | 7 +- + drivers/rtc/rtc-imx-sc.c | 2 +- + drivers/rtc/rtc-imxdi.c | 2 +- + drivers/rtc/rtc-isl12026.c | 4 +- + drivers/rtc/rtc-isl1208.c | 4 +- + drivers/rtc/rtc-jz4740.c | 2 +- + drivers/rtc/rtc-lpc32xx.c | 2 +- + drivers/rtc/rtc-ls1x.c | 2 +- + drivers/rtc/rtc-m41t80.c | 2 +- + drivers/rtc/rtc-m48t59.c | 5 +- + drivers/rtc/rtc-m48t86.c | 5 +- + drivers/rtc/rtc-mc13xxx.c | 2 +- + drivers/rtc/rtc-meson-vrtc.c | 2 +- + drivers/rtc/rtc-meson.c | 4 +- + drivers/rtc/rtc-mpc5121.c | 2 +- + drivers/rtc/rtc-mrst.c | 2 +- + drivers/rtc/rtc-mt2712.c | 2 +- + drivers/rtc/rtc-mt6397.c | 2 +- + drivers/rtc/rtc-mv.c | 2 +- + drivers/rtc/rtc-mxc.c | 25 +--- + drivers/rtc/rtc-mxc_v2.c | 2 +- + drivers/rtc/rtc-omap.c | 13 +- + drivers/rtc/rtc-pcap.c | 2 +- + drivers/rtc/rtc-pcf2123.c | 2 +- + drivers/rtc/rtc-pcf2127.c | 72 +++++----- + drivers/rtc/rtc-pcf85063.c | 4 +- + drivers/rtc/rtc-pcf8523.c | 34 ++--- + drivers/rtc/rtc-pcf85363.c | 4 +- + drivers/rtc/rtc-pcf8563.c | 2 +- + drivers/rtc/rtc-pic32.c | 2 +- + drivers/rtc/rtc-pl030.c | 2 +- + drivers/rtc/rtc-pl031.c | 8 +- + drivers/rtc/rtc-pm8xxx.c | 2 +- + drivers/rtc/rtc-ps3.c | 2 +- + drivers/rtc/rtc-r9701.c | 2 +- + drivers/rtc/rtc-rc5t619.c | 2 +- + drivers/rtc/rtc-rk808.c | 2 +- + drivers/rtc/rtc-rp5c01.c | 5 +- + drivers/rtc/rtc-rs5c348.c | 2 +- + drivers/rtc/rtc-rv3028.c | 6 +- + drivers/rtc/rtc-rv3029c2.c | 4 +- + drivers/rtc/rtc-rv3032.c | 8 +- + drivers/rtc/rtc-rv8803.c | 5 +- + drivers/rtc/rtc-rx6110.c | 165 +++++++++++++++++++---- + drivers/rtc/rtc-rx8010.c | 2 +- + drivers/rtc/rtc-rx8581.c | 4 +- + drivers/rtc/rtc-s35390a.c | 2 +- + drivers/rtc/rtc-sa1100.c | 2 +- + drivers/rtc/rtc-sc27xx.c | 42 +----- + drivers/rtc/rtc-sd3078.c | 2 +- + drivers/rtc/rtc-sh.c | 2 +- + drivers/rtc/rtc-sirfsoc.c | 2 +- + drivers/rtc/rtc-snvs.c | 69 ++++------ + drivers/rtc/rtc-st-lpc.c | 2 +- + drivers/rtc/rtc-starfire.c | 2 +- + drivers/rtc/rtc-stk17ta8.c | 5 +- + drivers/rtc/rtc-stmp3xxx.c | 2 +- + drivers/rtc/rtc-sun4v.c | 2 +- + drivers/rtc/rtc-sun6i.c | 10 +- + drivers/rtc/rtc-sunxi.c | 2 +- + drivers/rtc/rtc-tegra.c | 2 +- + drivers/rtc/rtc-test.c | 2 +- + drivers/rtc/rtc-tps6586x.c | 2 +- + drivers/rtc/rtc-tps65910.c | 2 +- + drivers/rtc/rtc-tx4939.c | 5 +- + drivers/rtc/rtc-vr41xx.c | 2 +- + drivers/rtc/rtc-vt8500.c | 2 +- + drivers/rtc/rtc-wilco-ec.c | 2 +- + drivers/rtc/rtc-wm831x.c | 2 +- + drivers/rtc/rtc-xgene.c | 2 +- + drivers/rtc/rtc-zynqmp.c | 2 +- + drivers/rtc/sysfs.c | 2 - + include/linux/rtc.h | 22 +-- + 121 files changed, 555 insertions(+), 558 deletions(-) +Merging nvdimm/libnvdimm-for-next (a1b8638ba132 Linux 5.9-rc7) +$ git merge nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (3650b228f83a Linux 5.10-rc1) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (3650b228f83a Linux 5.10-rc1) +$ git merge ntb/ntb-next +Already up to date. +Merging seccomp/for-next/seccomp (7ef95e3dbcee Merge branch 'for-linus/seccomp' into for-next/seccomp) +$ git merge seccomp/for-next/seccomp +Auto-merging kernel/seccomp.c +Auto-merging include/linux/seccomp.h +Auto-merging arch/csky/include/asm/Kbuild +CONFLICT (content): Merge conflict in arch/csky/include/asm/Kbuild +Auto-merging arch/Kconfig +Resolved 'arch/csky/include/asm/Kbuild' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master fe57f34f2b21] Merge remote-tracking branch 'seccomp/for-next/seccomp' +$ git diff -M --stat --summary HEAD^.. + arch/Kconfig | 17 ++ + arch/arm/include/asm/Kbuild | 1 - + arch/arm/include/asm/seccomp.h | 11 + + arch/arm64/include/asm/seccomp.h | 9 + + arch/csky/include/asm/Kbuild | 1 - + arch/csky/include/asm/seccomp.h | 11 + + arch/parisc/include/asm/Kbuild | 1 - + arch/parisc/include/asm/seccomp.h | 22 ++ + arch/powerpc/include/asm/seccomp.h | 23 ++ + arch/riscv/include/asm/seccomp.h | 10 + + arch/s390/include/asm/seccomp.h | 9 + + arch/sh/include/asm/seccomp.h | 10 + + arch/x86/include/asm/seccomp.h | 20 ++ + arch/xtensa/include/asm/Kbuild | 1 - + arch/xtensa/include/asm/seccomp.h | 11 + + fs/proc/base.c | 6 + + include/linux/seccomp.h | 7 + + kernel/seccomp.c | 296 ++++++++++++++++++++- + .../testing/selftests/seccomp/seccomp_benchmark.c | 151 +++++++++-- + tools/testing/selftests/seccomp/settings | 2 +- + 20 files changed, 589 insertions(+), 30 deletions(-) + create mode 100644 arch/arm/include/asm/seccomp.h + create mode 100644 arch/csky/include/asm/seccomp.h + create mode 100644 arch/parisc/include/asm/seccomp.h + create mode 100644 arch/xtensa/include/asm/seccomp.h +Merging kspp/for-next/kspp (f2f20a989227 orphans: Disable CONFIG_LD_ORPHAN_WARN for ld.lld 10.0.1) +$ git merge kspp/for-next/kspp +Auto-merging init/Kconfig +Auto-merging arch/x86/boot/compressed/Makefile +Auto-merging arch/x86/Kconfig +Auto-merging arch/powerpc/Makefile +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/boot/compressed/Makefile +Auto-merging arch/arm/Makefile +Auto-merging arch/arm/Kconfig +Auto-merging arch/Kconfig +Auto-merging Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + Makefile | 6 ++++++ + arch/Kconfig | 9 +++++++++ + arch/arm/Kconfig | 1 + + arch/arm/Makefile | 4 ---- + arch/arm/boot/compressed/Makefile | 4 +++- + arch/arm64/Kconfig | 1 + + arch/arm64/Makefile | 4 ---- + arch/powerpc/Kconfig | 1 + + arch/powerpc/Makefile | 1 - + arch/x86/Kconfig | 1 + + arch/x86/Makefile | 3 --- + arch/x86/boot/compressed/Makefile | 4 +++- + init/Kconfig | 10 ++++++++++ + scripts/lld-version.sh | 20 ++++++++++++++++++++ + 15 files changed, 56 insertions(+), 14 deletions(-) + create mode 100755 scripts/lld-version.sh +Merging gnss/gnss-next (48778464bb7d Linux 5.8-rc2) +$ git merge gnss/gnss-next +Already up to date. +Merging fsi/next (4a851d714ead fsi: aspeed: Support CFAM reset GPIO) +$ git merge fsi/next +Already up to date. +Merging slimbus/for-next (567d838588d8 slimbus: qcom-ngd-ctrl: remove redundant out of memory messages) +$ git merge slimbus/for-next +Merge made by the 'recursive' strategy. +Merging nvmem/for-next (292b72c982a6 nvmem: imx-ocotp: add support for the unaliged word count) +$ git merge nvmem/for-next +Merge made by the 'recursive' strategy. +Merging xarray/main (80c1dbebf308 XArray: Fix splitting to non-zero orders) +$ git merge xarray/main +Merge made by the 'recursive' strategy. + lib/test_xarray.c | 26 ++++++++++++++------------ + lib/xarray.c | 11 ++++++----- + 2 files changed, 20 insertions(+), 17 deletions(-) +Merging hyperv/hyperv-next (206ad34d52a2 hv_netvsc: Validate number of allocated sub-channels) +$ git merge hyperv/hyperv-next +Auto-merging drivers/net/hyperv/rndis_filter.c +Merge made by the 'recursive' strategy. + drivers/hv/channel.c | 174 ++++++++++++++++++++++++++++++++++++-- + drivers/hv/hyperv_vmbus.h | 3 +- + drivers/hv/ring_buffer.c | 29 ++++++- + drivers/hv/vmbus_drv.c | 17 ++-- + drivers/net/hyperv/hyperv_net.h | 13 +++ + drivers/net/hyperv/netvsc.c | 22 +++-- + drivers/net/hyperv/rndis_filter.c | 6 ++ + drivers/scsi/storvsc_drv.c | 26 +++++- + include/linux/hyperv.h | 23 +++++ + 9 files changed, 288 insertions(+), 25 deletions(-) +Merging auxdisplay/auxdisplay (351dcacc6d77 auxdisplay: panel: Remove redundant charlcd_ops structures) +$ git merge auxdisplay/auxdisplay +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + .../bindings/auxdisplay/modtronix,lcd2s.yaml | 58 +++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + drivers/auxdisplay/Kconfig | 33 +- + drivers/auxdisplay/Makefile | 2 + + drivers/auxdisplay/charlcd.c | 412 ++++++--------------- + drivers/auxdisplay/charlcd.h | 86 ++++- + drivers/auxdisplay/hd44780.c | 120 ++++-- + drivers/auxdisplay/hd44780_common.c | 361 ++++++++++++++++++ + drivers/auxdisplay/hd44780_common.h | 33 ++ + drivers/auxdisplay/lcd2s.c | 402 ++++++++++++++++++++ + drivers/auxdisplay/panel.c | 173 ++++----- + 11 files changed, 1218 insertions(+), 464 deletions(-) + create mode 100644 Documentation/devicetree/bindings/auxdisplay/modtronix,lcd2s.yaml + create mode 100644 drivers/auxdisplay/hd44780_common.c + create mode 100644 drivers/auxdisplay/hd44780_common.h + create mode 100644 drivers/auxdisplay/lcd2s.c +Merging kgdb/kgdb/for-next (d081a6e35316 kdb: Fix pager search for multi-line strings) +$ git merge kgdb/kgdb/for-next +Already up to date. +Merging pidfd/for-next (e06ce5515b74 Merge branch 'pidfd_o_nonblock' into for-next) +$ git merge pidfd/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging hmm/hmm (3650b228f83a Linux 5.10-rc1) +$ git merge hmm/hmm +Already up to date. +Merging fpga/for-next (aaf8fe39c952 Revert "fpga: dfl: fix the definitions of type & feature_id for dfl devices") +$ git merge fpga/for-next +Merge made by the 'recursive' strategy. + drivers/fpga/altera-pr-ip-core-plat.c | 10 ----- + drivers/fpga/altera-pr-ip-core.c | 4 +- + drivers/fpga/altera-ps-spi.c | 14 +----- + drivers/fpga/dfl-fme-mgr.c | 13 +----- + drivers/fpga/fpga-mgr.c | 81 +++++++++++++++++++++++++++++------ + drivers/fpga/ice40-spi.c | 14 +----- + drivers/fpga/machxo2-spi.c | 14 +----- + drivers/fpga/socfpga.c | 14 +----- + drivers/fpga/ts73xx-fpga.c | 14 +----- + drivers/fpga/xilinx-spi.c | 14 +----- + drivers/fpga/zynqmp-fpga.c | 21 +-------- + include/linux/fpga/fpga-mgr.h | 2 + + 12 files changed, 80 insertions(+), 135 deletions(-) +Merging kunit/test (3650b228f83a Linux 5.10-rc1) +$ git merge kunit/test +Already up to date. +Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and devm_ioremap_nocache) +$ git merge generic-ioremap/for-next +Already up to date. +Merging cfi/cfi/next (5de15b610f78 mtd: hyperbus: add Renesas RPC-IF driver) +$ git merge cfi/cfi/next +Already up to date. +Merging kunit-next/kunit (3650b228f83a Linux 5.10-rc1) +$ git merge kunit-next/kunit +Already up to date. +Merging trivial/for-next (9ff9b0d392ea Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge trivial/for-next +Already up to date. +Merging zx2c4/for-next (16fbf79b0f83 Linux 5.6-rc7) +$ git merge zx2c4/for-next +Already up to date. +Merging mhi/mhi-next (10ea8bcda5ae bus: mhi: core: Fix device hierarchy) +$ git merge mhi/mhi-next +Auto-merging include/linux/mhi.h +Auto-merging drivers/bus/mhi/core/main.c +Merge made by the 'recursive' strategy. + drivers/bus/mhi/Kconfig | 9 + + drivers/bus/mhi/Makefile | 4 + + drivers/bus/mhi/core/boot.c | 75 ++++---- + drivers/bus/mhi/core/debugfs.c | 4 +- + drivers/bus/mhi/core/init.c | 54 ++++-- + drivers/bus/mhi/core/internal.h | 7 +- + drivers/bus/mhi/core/main.c | 16 +- + drivers/bus/mhi/core/pm.c | 238 ++++++++++++++++------- + drivers/bus/mhi/pci_generic.c | 345 ++++++++++++++++++++++++++++++++++ + drivers/net/wireless/ath/ath11k/mhi.c | 4 - + include/linux/mhi.h | 18 +- + net/qrtr/mhi.c | 6 + + 12 files changed, 644 insertions(+), 136 deletions(-) + create mode 100644 drivers/bus/mhi/pci_generic.c +Merging notifications/notifications-pipe-core (841a0dfa5113 watch_queue: sample: Display mount tree change notifications) +$ git merge notifications/notifications-pipe-core +Auto-merging security/security.c +Auto-merging kernel/sys_ni.c +Auto-merging include/uapi/asm-generic/unistd.h +CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h +Auto-merging include/linux/watch_queue.h +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/lsm_hook_defs.h +Auto-merging include/linux/dcache.h +Auto-merging fs/namespace.c +Auto-merging fs/mount.h +Auto-merging fs/Makefile +Auto-merging fs/Kconfig +Auto-merging arch/xtensa/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/xtensa/kernel/syscalls/syscall.tbl +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/sparc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/sparc/kernel/syscalls/syscall.tbl +Auto-merging arch/sh/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/sh/kernel/syscalls/syscall.tbl +Auto-merging arch/s390/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/s390/kernel/syscalls/syscall.tbl +Auto-merging arch/powerpc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/powerpc/kernel/syscalls/syscall.tbl +Auto-merging arch/parisc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/parisc/kernel/syscalls/syscall.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_o32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_o32.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n64.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n64.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n32.tbl +Auto-merging arch/microblaze/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/microblaze/kernel/syscalls/syscall.tbl +Auto-merging arch/m68k/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/m68k/kernel/syscalls/syscall.tbl +Auto-merging arch/ia64/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/ia64/kernel/syscalls/syscall.tbl +Auto-merging arch/arm64/include/asm/unistd32.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd32.h +Auto-merging arch/arm/tools/syscall.tbl +CONFLICT (content): Merge conflict in arch/arm/tools/syscall.tbl +Auto-merging arch/alpha/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/alpha/kernel/syscalls/syscall.tbl +Auto-merging Documentation/watch_queue.rst +Resolved 'arch/alpha/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/arm/tools/syscall.tbl' using previous resolution. +Resolved 'arch/arm64/include/asm/unistd32.h' using previous resolution. +Resolved 'arch/ia64/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/m68k/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/microblaze/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n32.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n64.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_o32.tbl' using previous resolution. +Resolved 'arch/parisc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/powerpc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/s390/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/sh/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/sparc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_32.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_64.tbl' using previous resolution. +Resolved 'arch/xtensa/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'include/uapi/asm-generic/unistd.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master fd582b9eae67] Merge remote-tracking branch 'notifications/notifications-pipe-core' +$ git diff -M --stat --summary HEAD^.. + Documentation/watch_queue.rst | 12 +- + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd32.h | 2 + + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + fs/Kconfig | 9 ++ + fs/Makefile | 1 + + fs/mount.h | 18 +++ + fs/mount_notify.c | 222 ++++++++++++++++++++++++++++ + fs/namespace.c | 22 +++ + include/linux/dcache.h | 1 + + include/linux/lsm_hook_defs.h | 3 + + include/linux/lsm_hooks.h | 6 + + include/linux/security.h | 8 + + include/linux/syscalls.h | 2 + + include/linux/watch_queue.h | 7 +- + include/uapi/asm-generic/unistd.h | 2 + + include/uapi/linux/watch_queue.h | 31 +++- + kernel/sys_ni.c | 3 + + samples/watch_queue/watch_test.c | 41 ++++- + security/security.c | 7 + + 34 files changed, 409 insertions(+), 4 deletions(-) + create mode 100644 fs/mount_notify.c +$ git am -3 ../patches/0001-rest-of-merge-fix-up-for-syscall-conflict.patch +Applying: rest of merge fix up for syscall conflict +$ git reset HEAD^ +Unstaged changes after reset: +M arch/arm64/include/asm/unistd.h +M include/uapi/asm-generic/unistd.h +$ git add -A . +$ git commit -v -a --amend +[master eded0a7e757e] Merge remote-tracking branch 'notifications/notifications-pipe-core' + Date: Mon Nov 30 17:15:38 2020 +1100 +Merging memblock/for-next (5bdba520c1b3 mm: memblock: drop __init from memblock functions to make it inline) +$ git merge memblock/for-next +Merge made by the 'recursive' strategy. + include/linux/memblock.h | 18 +++++++++--------- + mm/memblock.c | 3 +++ + 2 files changed, 12 insertions(+), 9 deletions(-) +Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) +$ git merge init/init-user-pointers +Already up to date. +Merging counters/counters (3650b228f83a Linux 5.10-rc1) +$ git merge counters/counters +Already up to date. +Merging akpm-current/current (ab573a2b40b2 lib/lzo/lzo1x_compress.c: make lzogeneric1x_1_compress() static) +$ git merge --no-ff akpm-current/current +Removing tools/testing/selftests/vm/gup_benchmark.c +Auto-merging mm/mmap.c +Auto-merging mm/memory_hotplug.c +Auto-merging mm/memblock.c +Auto-merging mm/highmem.c +CONFLICT (content): Merge conflict in mm/highmem.c +Auto-merging mm/filemap.c +Auto-merging mm/Kconfig +Auto-merging lib/cpumask.c +Auto-merging lib/cmdline.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/trace/blktrace.c +Auto-merging kernel/sysctl.c +Auto-merging kernel/resource.c +Auto-merging kernel/reboot.c +Auto-merging kernel/ptrace.c +Auto-merging kernel/kthread.c +Auto-merging kernel/fork.c +Auto-merging kernel/crash_core.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging init/main.c +Auto-merging include/linux/sched.h +CONFLICT (content): Merge conflict in include/linux/sched.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/mmzone.h +Auto-merging include/linux/mm.h +CONFLICT (content): Merge conflict in include/linux/mm.h +Auto-merging include/linux/memcontrol.h +Auto-merging include/linux/kernel.h +CONFLICT (content): Merge conflict in include/linux/kernel.h +Auto-merging include/linux/highmem.h +Auto-merging include/linux/dcache.h +Auto-merging fs/proc/base.c +Auto-merging fs/proc/array.c +Auto-merging fs/coredump.c +Auto-merging fs/aio.c +Auto-merging drivers/vhost/vringh.c +Auto-merging drivers/ide/ide-probe.c +Auto-merging drivers/gpu/drm/drm_atomic.c +Auto-merging drivers/gpio/gpio-xilinx.c +Auto-merging drivers/firmware/efi/efi.c +Auto-merging drivers/block/zram/zram_drv.c +Auto-merging arch/x86/mm/fault.c +Auto-merging arch/x86/kernel/tboot.c +Auto-merging arch/x86/entry/vdso/vma.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/sparc/Kconfig +Auto-merging arch/s390/kernel/vdso.c +Auto-merging arch/s390/configs/debug_defconfig +Auto-merging arch/s390/Kconfig +Auto-merging arch/riscv/mm/pageattr.c +Auto-merging arch/riscv/include/asm/set_memory.h +Auto-merging arch/riscv/Kconfig +CONFLICT (content): Merge conflict in arch/riscv/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/m68k/Kconfig.cpu +Auto-merging arch/ia64/Kconfig +Auto-merging arch/arm64/mm/mmu.c +Auto-merging arch/arm64/mm/init.c +Auto-merging arch/arm64/mm/fault.c +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/mm/init.c +Auto-merging arch/arm/mach-omap2/Kconfig +Auto-merging arch/arm/configs/omap2plus_defconfig +Auto-merging arch/arm/Kconfig +Auto-merging arch/arc/Kconfig +CONFLICT (content): Merge conflict in arch/arc/Kconfig +Auto-merging arch/alpha/kernel/process.c +Auto-merging arch/alpha/Kconfig +Auto-merging arch/Kconfig +CONFLICT (content): Merge conflict in arch/Kconfig +Auto-merging MAINTAINERS +Resolved 'arch/Kconfig' using previous resolution. +Resolved 'arch/arc/Kconfig' using previous resolution. +Resolved 'arch/riscv/Kconfig' using previous resolution. +Resolved 'include/linux/kernel.h' using previous resolution. +Resolved 'include/linux/mm.h' using previous resolution. +Resolved 'include/linux/sched.h' using previous resolution. +Resolved 'mm/highmem.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5d5e4b61a3de] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-kernel-reboot | 32 + + Documentation/admin-guide/blockdev/zram.rst | 5 + + Documentation/admin-guide/cgroup-v1/memcg_test.rst | 23 +- + Documentation/admin-guide/cgroup-v1/memory.rst | 61 +- + Documentation/admin-guide/cgroup-v2.rst | 8 + + Documentation/admin-guide/kdump/vmcoreinfo.rst | 6 + + Documentation/admin-guide/mm/transhuge.rst | 15 - + Documentation/admin-guide/sysctl/vm.rst | 19 +- + Documentation/core-api/memory-allocation.rst | 4 + + Documentation/core-api/pin_user_pages.rst | 6 +- + Documentation/dev-tools/index.rst | 1 + + Documentation/dev-tools/kfence.rst | 297 +++++++ + Documentation/filesystems/proc.rst | 2 + + Documentation/trace/events-kmem.rst | 2 +- + Documentation/vm/memory-model.rst | 3 +- + Documentation/vm/unevictable-lru.rst | 22 +- + MAINTAINERS | 17 +- + arch/Kconfig | 13 + + arch/alpha/Kconfig | 8 + + arch/alpha/include/asm/mmzone.h | 14 +- + arch/alpha/include/asm/page.h | 7 +- + arch/alpha/include/asm/pgtable.h | 12 +- + arch/alpha/include/asm/sparsemem.h | 18 + + arch/alpha/kernel/process.c | 2 +- + arch/alpha/kernel/setup.c | 1 + + arch/arc/Kconfig | 3 +- + arch/arc/include/asm/page.h | 20 +- + arch/arc/mm/init.c | 29 +- + arch/arm/Kconfig | 10 +- + arch/arm/configs/omap2plus_defconfig | 1 - + arch/arm/kernel/vdso.c | 9 - + arch/arm/mach-bcm/Kconfig | 1 - + arch/arm/mach-davinci/Kconfig | 1 - + arch/arm/mach-exynos/Kconfig | 1 - + arch/arm/mach-highbank/Kconfig | 1 - + arch/arm/mach-omap2/Kconfig | 1 - + arch/arm/mach-s5pv210/Kconfig | 1 - + arch/arm/mach-tango/Kconfig | 1 - + arch/arm/mm/init.c | 78 -- + arch/arm64/Kconfig | 10 +- + arch/arm64/include/asm/cacheflush.h | 1 + + arch/arm64/include/asm/kfence.h | 17 + + arch/arm64/include/asm/pgtable.h | 1 + + arch/arm64/kernel/vdso.c | 39 +- + arch/arm64/mm/fault.c | 4 + + arch/arm64/mm/init.c | 68 -- + arch/arm64/mm/mmu.c | 7 +- + arch/arm64/mm/pageattr.c | 6 +- + arch/ia64/Kconfig | 11 +- + arch/ia64/include/asm/meminit.h | 2 - + arch/ia64/mm/contig.c | 58 +- + arch/ia64/mm/discontig.c | 44 +- + arch/ia64/mm/init.c | 14 - + arch/ia64/mm/numa.c | 30 - + arch/m68k/Kconfig.cpu | 31 +- + arch/m68k/include/asm/page.h | 2 + + arch/m68k/include/asm/page_mm.h | 7 +- + arch/m68k/include/asm/virtconvert.h | 5 - + arch/m68k/mm/init.c | 8 +- + arch/mips/mm/pgtable-32.c | 1 - + arch/mips/mm/pgtable-64.c | 1 - + arch/mips/vdso/genvdso.c | 4 - + arch/powerpc/Kconfig | 5 +- + arch/riscv/Kconfig | 4 +- + arch/riscv/include/asm/pgtable.h | 2 - + arch/riscv/include/asm/set_memory.h | 1 + + arch/riscv/mm/pageattr.c | 31 + + arch/s390/Kconfig | 4 +- + arch/s390/configs/debug_defconfig | 2 +- + arch/s390/configs/defconfig | 2 +- + arch/s390/kernel/vdso.c | 11 +- + arch/sparc/Kconfig | 4 +- + arch/x86/Kconfig | 6 +- + arch/x86/entry/vdso/vma.c | 17 - + arch/x86/include/asm/kfence.h | 59 ++ + arch/x86/include/asm/set_memory.h | 1 + + arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 2 +- + arch/x86/kernel/tboot.c | 1 + + arch/x86/mm/fault.c | 5 + + arch/x86/mm/pat/set_memory.c | 4 +- + drivers/base/memory.c | 2 +- + drivers/block/zram/zram_drv.c | 21 +- + drivers/dax/device.c | 4 +- + drivers/dax/kmem.c | 2 +- + drivers/dma-buf/sync_file.c | 3 +- + drivers/edac/ghes_edac.c | 4 +- + drivers/firmware/efi/efi.c | 1 + + drivers/gpio/gpio-thunderx.c | 11 +- + drivers/gpio/gpio-xilinx.c | 65 +- + drivers/gpu/drm/drm_atomic.c | 3 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 2 +- + drivers/hwtracing/intel_th/msu.c | 2 +- + drivers/ide/falconide.c | 2 - + drivers/ide/ide-probe.c | 3 - + drivers/misc/lkdtm/Makefile | 1 + + drivers/misc/lkdtm/bugs.c | 50 ++ + drivers/misc/lkdtm/core.c | 3 + + drivers/misc/lkdtm/fortify.c | 82 ++ + drivers/misc/lkdtm/lkdtm.h | 19 +- + drivers/net/wireless/ath/ath10k/spectral.c | 2 +- + drivers/net/wireless/ath/ath11k/spectral.c | 2 +- + drivers/net/wireless/ath/ath9k/common-spectral.c | 2 +- + drivers/pinctrl/pinctrl-utils.c | 2 +- + drivers/rapidio/rio.c | 81 -- + drivers/vhost/vringh.c | 3 +- + drivers/virtio/virtio_balloon.c | 4 +- + drivers/xen/unpopulated-alloc.c | 14 +- + fs/aio.c | 14 +- + fs/buffer.c | 56 +- + fs/coredump.c | 3 +- + fs/iomap/seek.c | 125 +-- + fs/nfs/callback_proc.c | 5 + + fs/ntfs/file.c | 5 +- + fs/ntfs/inode.c | 2 - + fs/ntfs/logfile.c | 3 +- + fs/ocfs2/cluster/tcp.c | 1 - + fs/ocfs2/namei.c | 21 +- + fs/proc/array.c | 28 + + fs/proc/base.c | 2 +- + fs/proc/kcore.c | 2 - + fs/proc/page.c | 40 +- + fs/proc/proc_net.c | 4 +- + fs/proc/task_mmu.c | 4 +- + fs/ramfs/inode.c | 12 + + fs/userfaultfd.c | 20 +- + include/asm-generic/bitops/find.h | 19 + + include/asm-generic/getorder.h | 2 +- + include/linux/bitmap.h | 67 +- + include/linux/bitops.h | 24 +- + include/linux/cgroup-defs.h | 15 - + include/linux/compaction.h | 12 - + include/linux/dcache.h | 1 + + include/linux/highmem.h | 19 +- + include/linux/huge_mm.h | 93 +- + include/linux/iommu-helper.h | 4 +- + include/linux/kernel.h | 173 +--- + include/linux/kfence.h | 202 +++++ + include/linux/log2.h | 3 +- + include/linux/math.h | 177 ++++ + include/linux/memcontrol.h | 147 +++- + include/linux/memremap.h | 6 + + include/linux/migrate.h | 4 +- + include/linux/mm.h | 115 +-- + include/linux/mm_types.h | 10 +- + include/linux/mmap_lock.h | 94 +- + include/linux/mmzone.h | 54 +- + include/linux/nmi.h | 1 + + include/linux/page-flags.h | 7 +- + include/linux/page_ext.h | 8 + + include/linux/pagemap.h | 6 +- + include/linux/pagevec.h | 7 - + include/linux/poison.h | 4 - + include/linux/rcu_node_tree.h | 2 + + include/linux/relay.h | 29 +- + include/linux/rio_drv.h | 3 - + include/linux/rmap.h | 1 - + include/linux/sched.h | 8 + + include/linux/set_memory.h | 5 + + include/linux/shmem_fs.h | 6 +- + include/linux/slab.h | 18 + + include/linux/slab_def.h | 3 + + include/linux/slub_def.h | 3 + + include/linux/string.h | 75 +- + include/linux/swap.h | 4 +- + include/linux/units.h | 2 +- + include/linux/vmalloc.h | 8 +- + include/linux/wait.h | 4 +- + include/linux/zsmalloc.h | 1 - + include/trace/events/mmap_lock.h | 107 +++ + include/trace/events/sched.h | 84 ++ + include/uapi/linux/const.h | 5 + + include/uapi/linux/ethtool.h | 2 +- + include/uapi/linux/kernel.h | 9 +- + include/uapi/linux/lightnvm.h | 2 +- + include/uapi/linux/mroute6.h | 2 +- + include/uapi/linux/netfilter/x_tables.h | 2 +- + include/uapi/linux/netlink.h | 2 +- + include/uapi/linux/sysctl.h | 2 +- + include/uapi/linux/userfaultfd.h | 9 + + init/main.c | 9 +- + ipc/shm.c | 8 +- + kernel/acct.c | 7 +- + kernel/cgroup/cgroup.c | 12 - + kernel/crash_core.c | 1 + + kernel/fail_function.c | 6 +- + kernel/fork.c | 3 +- + kernel/gcov/gcc_4_7.c | 10 +- + kernel/hung_task.c | 44 + + kernel/kthread.c | 29 +- + kernel/power/hibernate.c | 2 +- + kernel/power/power.h | 2 +- + kernel/power/snapshot.c | 52 +- + kernel/ptrace.c | 2 +- + kernel/reboot.c | 230 ++++- + kernel/relay.c | 107 +-- + kernel/resource.c | 24 +- + kernel/sysctl.c | 8 +- + kernel/trace/blktrace.c | 2 +- + kernel/watchdog.c | 21 + + kernel/watchdog_hld.c | 1 + + lib/Kconfig | 9 + + lib/Kconfig.debug | 18 + + lib/Kconfig.kfence | 72 ++ + lib/Makefile | 7 +- + lib/{test_bits.c => bits_kunit.c} | 0 + lib/cmdline.c | 16 +- + lib/cmdline_kunit.c | 100 +++ + lib/cpumask.c | 60 +- + lib/errname.c | 1 + + lib/error-inject.c | 2 + + lib/errseq.c | 1 + + lib/find_bit.c | 17 +- + ...{test_linear_ranges.c => linear_ranges_kunit.c} | 0 + lib/{list-test.c => list_kunit.c} | 0 + lib/lz4/lz4_decompress.c | 6 +- + lib/lz4/lz4defs.h | 1 + + lib/lzo/lzo1x_compress.c | 2 +- + lib/math/div64.c | 4 +- + lib/math/int_pow.c | 2 +- + lib/math/int_sqrt.c | 3 +- + lib/math/reciprocal_div.c | 9 +- + lib/stackdepot.c | 14 +- + lib/string.c | 4 - + lib/test_bitmap.c | 143 ++++ + lib/test_firmware.c | 9 +- + lib/test_free_pages.c | 5 + + lib/test_kmod.c | 26 +- + lib/test_lockup.c | 16 + + lib/zlib_dfltcc/dfltcc_inflate.c | 3 + + mm/Kconfig | 38 +- + mm/Kconfig.debug | 28 +- + mm/Makefile | 5 +- + mm/backing-dev.c | 8 +- + mm/cma.c | 4 +- + mm/compaction.c | 123 ++- + mm/filemap.c | 945 ++++++++++++--------- + mm/gup.c | 141 +-- + mm/{gup_benchmark.c => gup_test.c} | 111 ++- + mm/gup_test.h | 32 + + mm/highmem.c | 59 ++ + mm/huge_memory.c | 109 ++- + mm/hugetlb.c | 27 +- + mm/init-mm.c | 1 + + mm/internal.h | 9 +- + mm/kasan/common.c | 19 + + mm/kasan/generic.c | 3 +- + mm/kfence/Makefile | 6 + + mm/kfence/core.c | 830 ++++++++++++++++++ + mm/kfence/kfence.h | 107 +++ + mm/kfence/kfence_test.c | 823 ++++++++++++++++++ + mm/kfence/report.c | 244 ++++++ + mm/khugepaged.c | 58 +- + mm/ksm.c | 50 +- + mm/madvise.c | 24 +- + mm/mapping_dirty_helpers.c | 6 +- + mm/memblock.c | 80 ++ + mm/memcontrol.c | 233 +++-- + mm/memory-failure.c | 214 ++--- + mm/memory.c | 24 +- + mm/memory_hotplug.c | 32 +- + mm/mempolicy.c | 8 +- + mm/memremap.c | 20 + + mm/migrate.c | 177 ++-- + mm/mlock.c | 63 +- + mm/mm_init.c | 1 + + mm/mmap.c | 65 +- + mm/mmap_lock.c | 187 ++++ + mm/mmzone.c | 15 +- + mm/mremap.c | 280 ++++-- + mm/msync.c | 6 +- + mm/nommu.c | 8 +- + mm/oom_kill.c | 14 +- + mm/page_alloc.c | 414 +++++---- + mm/page_counter.c | 4 +- + mm/page_ext.c | 10 +- + mm/page_idle.c | 4 - + mm/page_isolation.c | 10 +- + mm/page_poison.c | 56 +- + mm/page_vma_mapped.c | 9 +- + mm/process_vm_access.c | 2 +- + mm/rmap.c | 21 +- + mm/shmem.c | 257 ++---- + mm/slab.c | 40 +- + mm/slab.h | 4 +- + mm/slab_common.c | 15 +- + mm/slub.c | 216 +++-- + mm/swap.c | 256 ++---- + mm/swap_state.c | 14 +- + mm/swapfile.c | 14 +- + mm/truncate.c | 261 +++--- + mm/vmalloc.c | 100 ++- + mm/vmscan.c | 248 +++--- + mm/vmstat.c | 36 +- + mm/workingset.c | 10 +- + mm/zsmalloc.c | 65 +- + mm/zswap.c | 189 +++-- + scripts/checkpatch.pl | 299 +++++-- + sound/core/pcm_lib.c | 4 +- + tools/include/linux/poison.h | 6 +- + tools/testing/selftests/lkdtm/tests.txt | 1 + + tools/testing/selftests/vm/.gitignore | 4 +- + tools/testing/selftests/vm/Makefile | 39 +- + tools/testing/selftests/vm/check_config.sh | 31 + + tools/testing/selftests/vm/config | 2 +- + tools/testing/selftests/vm/gup_benchmark.c | 143 ---- + tools/testing/selftests/vm/gup_test.c | 194 +++++ + tools/testing/selftests/vm/hmm-tests.c | 10 +- + tools/testing/selftests/vm/mremap_test.c | 344 ++++++++ + tools/testing/selftests/vm/run_vmtests | 43 +- + 309 files changed, 9286 insertions(+), 4152 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-reboot + create mode 100644 Documentation/dev-tools/kfence.rst + create mode 100644 arch/alpha/include/asm/sparsemem.h + create mode 100644 arch/arm64/include/asm/kfence.h + create mode 100644 arch/x86/include/asm/kfence.h + create mode 100644 drivers/misc/lkdtm/fortify.c + create mode 100644 include/linux/kfence.h + create mode 100644 include/linux/math.h + create mode 100644 include/trace/events/mmap_lock.h + create mode 100644 lib/Kconfig.kfence + rename lib/{test_bits.c => bits_kunit.c} (100%) + create mode 100644 lib/cmdline_kunit.c + rename lib/{test_linear_ranges.c => linear_ranges_kunit.c} (100%) + rename lib/{list-test.c => list_kunit.c} (100%) + rename mm/{gup_benchmark.c => gup_test.c} (60%) + create mode 100644 mm/gup_test.h + create mode 100644 mm/kfence/Makefile + create mode 100644 mm/kfence/core.c + create mode 100644 mm/kfence/kfence.h + create mode 100644 mm/kfence/kfence_test.c + create mode 100644 mm/kfence/report.c + create mode 100644 mm/mmap_lock.c + create mode 100644 tools/testing/selftests/vm/check_config.sh + delete mode 100644 tools/testing/selftests/vm/gup_benchmark.c + create mode 100644 tools/testing/selftests/vm/gup_test.c + create mode 100644 tools/testing/selftests/vm/mremap_test.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +Rebasing (1/92)
Rebasing (2/92)
Rebasing (3/92)
Rebasing (4/92)
Rebasing (5/92)
Rebasing (6/92)
Rebasing (7/92)
Rebasing (8/92)
Rebasing (9/92)
Rebasing (10/92)
Rebasing (11/92)
Rebasing (12/92)
Rebasing (13/92)
Rebasing (14/92)
Rebasing (15/92)
Rebasing (16/92)
Rebasing (17/92)
Rebasing (18/92)
Rebasing (19/92)
Rebasing (20/92)
Rebasing (21/92)
Rebasing (22/92)
Rebasing (23/92)
Rebasing (24/92)
Rebasing (25/92)
Rebasing (26/92)
Rebasing (27/92)
Rebasing (28/92)
Rebasing (29/92)
Rebasing (30/92)
Rebasing (31/92)
Rebasing (32/92)
Rebasing (33/92)
Rebasing (34/92)
Rebasing (35/92)
Rebasing (36/92)
Rebasing (37/92)
Rebasing (38/92)
Rebasing (39/92)
Rebasing (40/92)
Rebasing (41/92)
Rebasing (42/92)
Rebasing (43/92)
Rebasing (44/92)
Rebasing (45/92)
Rebasing (46/92)
Rebasing (47/92)
Rebasing (48/92)
Rebasing (49/92)
Rebasing (50/92)
Rebasing (51/92)
Rebasing (52/92)
Rebasing (53/92)
error: could not apply 44a7127eb3a4... arm64: mte: add in-kernel MTE helpers +Resolve all conflicts manually, mark them as resolved with +"git add/rm <conflicted_files>", then run "git rebase --continue". +You can instead skip this commit: run "git rebase --skip". +To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply 44a7127eb3a4... arm64: mte: add in-kernel MTE helpers +Auto-merging arch/arm64/kernel/mte.c +CONFLICT (content): Merge conflict in arch/arm64/kernel/mte.c +Auto-merging arch/arm64/include/asm/mte.h +Rebasing (54/92)
Rebasing (55/92)
Rebasing (56/92)
Rebasing (57/92)
error: could not apply 0d9e31220ccd... arm64: mte: convert gcr_user into an exclude mask +Resolve all conflicts manually, mark them as resolved with +"git add/rm <conflicted_files>", then run "git rebase --continue". +You can instead skip this commit: run "git rebase --skip". +To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply 0d9e31220ccd... arm64: mte: convert gcr_user into an exclude mask +Auto-merging arch/arm64/kernel/mte.c +CONFLICT (content): Merge conflict in arch/arm64/kernel/mte.c +Auto-merging arch/arm64/include/asm/processor.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/processor.h +Rebasing (58/92)
error: could not apply 0af4b4820d0b... arm64: mte: switch GCR_EL1 in kernel entry and exit +Resolve all conflicts manually, mark them as resolved with +"git add/rm <conflicted_files>", then run "git rebase --continue". +You can instead skip this commit: run "git rebase --skip". +To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply 0af4b4820d0b... arm64: mte: switch GCR_EL1 in kernel entry and exit +Auto-merging arch/arm64/kernel/mte.c +CONFLICT (content): Merge conflict in arch/arm64/kernel/mte.c +Auto-merging arch/arm64/kernel/entry.S +CONFLICT (content): Merge conflict in arch/arm64/kernel/entry.S +Auto-merging arch/arm64/kernel/asm-offsets.c +Auto-merging arch/arm64/include/asm/mte.h +Rebasing (59/92)
Rebasing (60/92)
Rebasing (61/92)
Rebasing (62/92)
Rebasing (63/92)
Rebasing (64/92)
Rebasing (65/92)
Rebasing (66/92)
Rebasing (67/92)
Rebasing (68/92)
Rebasing (69/92)
Rebasing (70/92)
Rebasing (71/92)
Rebasing (72/92)
Rebasing (73/92)
Rebasing (74/92)
Rebasing (75/92)
Rebasing (76/92)
Rebasing (77/92)
Rebasing (78/92)
Rebasing (79/92)
Rebasing (80/92)
Rebasing (81/92)
Rebasing (82/92)
Rebasing (83/92)
Rebasing (84/92)
Rebasing (85/92)
Rebasing (86/92)
Rebasing (87/92)
Rebasing (88/92)
Rebasing (89/92)
Rebasing (90/92)
Rebasing (91/92)
Rebasing (92/92)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + f7ab772ab0e0...76761ffa9ea1 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (76761ffa9ea1 mm/memcg: bail out early when !memcg in mem_cgroup_lruvec) +$ git merge --no-ff akpm/master +Removing mm/kasan/generic_report.c +Merge made by the 'recursive' strategy. + Documentation/dev-tools/kasan.rst | 264 ++++--- + arch/Kconfig | 8 +- + arch/arm/boot/compressed/string.c | 6 +- + arch/arm64/Kconfig | 9 +- + arch/arm64/Makefile | 7 +- + arch/arm64/include/asm/assembler.h | 2 +- + arch/arm64/include/asm/cache.h | 3 + + arch/arm64/include/asm/esr.h | 1 + + arch/arm64/include/asm/kasan.h | 5 +- + arch/arm64/include/asm/memory.h | 15 +- + arch/arm64/include/asm/mte-def.h | 14 + + arch/arm64/include/asm/mte-kasan.h | 67 ++ + arch/arm64/include/asm/mte.h | 22 +- + arch/arm64/include/asm/processor.h | 2 +- + arch/arm64/include/asm/string.h | 5 +- + arch/arm64/include/asm/uaccess.h | 23 + + arch/arm64/kernel/asm-offsets.c | 3 + + arch/arm64/kernel/cpufeature.c | 3 + + arch/arm64/kernel/entry.S | 41 + + arch/arm64/kernel/head.S | 2 +- + arch/arm64/kernel/hibernate.c | 5 + + arch/arm64/kernel/image-vars.h | 2 +- + arch/arm64/kernel/kaslr.c | 3 +- + arch/arm64/kernel/module.c | 6 +- + arch/arm64/kernel/mte.c | 139 +++- + arch/arm64/kernel/setup.c | 2 +- + arch/arm64/kernel/sleep.S | 2 +- + arch/arm64/kernel/smp.c | 2 + + arch/arm64/lib/mte.S | 16 + + arch/arm64/mm/copypage.c | 9 + + arch/arm64/mm/fault.c | 59 ++ + arch/arm64/mm/kasan_init.c | 19 +- + arch/arm64/mm/mteswap.c | 9 + + arch/arm64/mm/proc.S | 23 +- + arch/arm64/mm/ptdump.c | 6 +- + arch/s390/boot/string.c | 1 + + arch/s390/pci/pci_mmio.c | 4 +- + arch/x86/boot/compressed/misc.h | 1 + + arch/x86/boot/compressed/string.c | 6 +- + arch/x86/include/asm/syscall_wrapper.h | 2 +- + arch/x86/kernel/acpi/wakeup_64.S | 2 +- + arch/x86/kvm/x86.c | 2 +- + drivers/firmware/efi/runtime-wrappers.c | 2 +- + fs/buffer.c | 2 +- + fs/dax.c | 9 +- + fs/eventpoll.c | 159 ++-- + fs/exec.c | 8 + + fs/iomap/buffered-io.c | 2 +- + include/linux/compiler_attributes.h | 2 +- + include/linux/kasan-checks.h | 2 +- + include/linux/kasan.h | 358 ++++++--- + include/linux/memcontrol.h | 332 ++++---- + include/linux/mm.h | 52 +- + include/linux/mm_types.h | 15 +- + include/linux/mmap_lock.h | 16 +- + include/linux/mmdebug.h | 13 + + include/linux/moduleloader.h | 3 +- + include/linux/page-flags-layout.h | 2 +- + include/linux/page-flags.h | 11 +- + include/linux/sched.h | 2 +- + include/linux/string.h | 2 +- + include/trace/events/writeback.h | 2 +- + init/init_task.c | 2 +- + kernel/fork.c | 11 +- + kernel/kcsan/core.c | 10 +- + lib/Kconfig.kasan | 65 +- + lib/crc32.c | 4 +- + lib/crypto/aes.c | 4 +- + lib/test_kasan.c | 2 +- + lib/test_kasan_module.c | 2 +- + mm/debug.c | 4 +- + mm/gup.c | 2 + + mm/huge_memory.c | 4 +- + mm/kasan/Makefile | 25 +- + mm/kasan/common.c | 834 +++++---------------- + mm/kasan/generic.c | 86 +-- + mm/kasan/generic_report.c | 165 ---- + mm/kasan/hw_tags.c | 204 +++++ + mm/kasan/init.c | 17 +- + mm/kasan/kasan.h | 182 ++++- + mm/kasan/quarantine.c | 29 +- + mm/kasan/report.c | 317 +++----- + mm/kasan/report_generic.c | 327 ++++++++ + mm/kasan/report_hw_tags.c | 42 ++ + mm/kasan/{tags_report.c => report_sw_tags.c} | 29 +- + mm/kasan/shadow.c | 517 +++++++++++++ + mm/kasan/{tags.c => sw_tags.c} | 39 +- + mm/memcontrol.c | 209 +++--- + mm/memory.c | 36 +- + mm/mempool.c | 4 +- + mm/page_alloc.c | 17 +- + mm/page_io.c | 6 +- + mm/page_poison.c | 2 +- + mm/ptdump.c | 13 +- + mm/slab.c | 2 +- + mm/slab.h | 52 +- + mm/slab_common.c | 5 +- + mm/slub.c | 34 +- + mm/swap.c | 57 +- + mm/workingset.c | 2 +- + scripts/Makefile.lib | 2 + + tools/testing/selftests/arm64/mte/Makefile | 2 +- + .../selftests/arm64/mte/check_gcr_el1_cswitch.c | 155 ++++ + virt/kvm/coalesced_mmio.c | 2 +- + virt/kvm/kvm_main.c | 2 +- + 105 files changed, 3367 insertions(+), 1974 deletions(-) + create mode 100644 arch/arm64/include/asm/mte-def.h + create mode 100644 arch/arm64/include/asm/mte-kasan.h + delete mode 100644 mm/kasan/generic_report.c + create mode 100644 mm/kasan/hw_tags.c + create mode 100644 mm/kasan/report_generic.c + create mode 100644 mm/kasan/report_hw_tags.c + rename mm/kasan/{tags_report.c => report_sw_tags.c} (78%) + create mode 100644 mm/kasan/shadow.c + rename mm/kasan/{tags.c => sw_tags.c} (88%) + create mode 100644 tools/testing/selftests/arm64/mte/check_gcr_el1_cswitch.c diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..8d8cd09286b0 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20201130 |