diff options
| -rw-r--r-- | Next/SHA1s | 336 | ||||
| -rw-r--r-- | Next/Trees | 338 | ||||
| -rw-r--r-- | Next/merge.log | 13562 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 14237 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..1ad43810a4f4 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,336 @@ +Name SHA1 +---- ---- +origin 454859c552da78b0f587205d308401922b56863e +fixes e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +kbuild-current bcbcf50f521843445c9ea320a0569874f88c4b7a +arc-current 83520d62cc5a94d2ff0e2d37c8204fca13dd2637 +arm-current 30e3b4f256b4e366a61658c294f6a21b8626dda7 +arm64-fixes 185f2e5f51c2029efd9dd26cceb968a44fe053c6 +arm-soc-fixes 1180042dc6030c6e26530d4cfe0338fe8e447ca4 +drivers-memory-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +m68k-current a65a802aadba072ca7514fc0c301fd7fdc6fc6cb +powerpc-fixes 791f9e36599d94af5a76d3f74d04e16326761aae +s390-fixes ad31a8c05196a3dc5283b193e9c74a72022d3c65 +sparc 05a59d79793d482f628a31753c671f2e92178a21 +fscrypt-current d19d8d345eecd9247cbe6cbf27aef271bd88aba7 +net 8a12f8836145ffe37e9c8733dce18c22fb668b66 +bpf 144748eb0c445091466c9b741ebd0bfcc5914f3d +ipsec ef19e111337f6c3dca7019a8bad5fbc6fb18d635 +netfilter fbea31808ca124dd73ff6bb1e67c9af4607c3e32 +ipvs fbea31808ca124dd73ff6bb1e67c9af4607c3e32 +wireless-drivers 65db391dd874db42279713405f29f4ac93682d13 +mac80211 6f235a69e59484e382dc31952025b0308efedc17 +rdma-fixes 7582207b1059129e59eb92026fca2cfc088a74fc +sound-current 9c3195778c71d7f0795d48e2f04a12c9d80d8b98 +sound-asoc-fixes a07a4db9b2a7dfb3109fda61b5e353ad34b65f86 +regmap-fixes 78d889705732ba856feee4d7bfa74a12fe48c480 +regulator-fixes 6068cc31dedd8326bf4546b194dd316f70f96ff5 +spi-fixes 10cba9666c4e63e9cd73af2620b9b48b8634f210 +pci-current cf673bd0cc973b25961d41355990beaed710068f +driver-core.current eed6e41813deb9ee622cd9242341f21430d7789f +tty.current e49d033bddf5b565044e2abe4241353959bc9120 +usb.current 363eaa3a450abb4e63bd6e3ad79d1f7a0f717814 +usb-gadget-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +usb-serial-fixes 0d02ec6b3136c73c09e7859f0d0e4e2c4c07b49b +usb-chipidea-fixes cf97d7af246831ea23c216f17205f91319afc85f +phy da848f9a0e139bd0ad21afbdd425214d9f3d3b91 +staging.current e49d033bddf5b565044e2abe4241353959bc9120 +char-misc.current e49d033bddf5b565044e2abe4241353959bc9120 +soundwire-fixes fde5d7f27108a444aa288ab9dfaa0a0c25e80b6d +thunderbolt-fixes 08fe7ae1857080f5075df5ac7fef2ecd4e289117 +input-current 56cfe6f820a6315291eb5a1b82bb49633b993d3b +crypto-current 0de9dc80625b0ca1cb9730c5ed1c5a8cab538369 +ide 6800cd8cbc6e35989f8d1aa20fac58031231b90f +vfio-fixes e0146a108ce4d2c22b9510fd12268e3ee72a0161 +kselftest-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +modules-fixes 57baec7b1b0459ef885e816d8c28a9d9a62bb8de +dmaengine-fixes 868833fbffbe51c487df4f95d4de9194264a4b30 +backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +mtd-fixes 2fb164f0ce95e504e2688b4f984893c29ebd19ab +mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6 +v4l-dvb-fixes 0e37b4fa67f55ff4282caebd042a4bfa7348f2a4 +reset-fixes b460e0a9e2404450a0cc4c5e6476483d6cda1b26 +mips-fixes 9ae31e2ab293bf4d9c42e7079b156072f8a7f8ca +at91-fixes 2c69c8a1736eace8de491d480e6e577a27c2087c +omap-fixes fc85dc42a38405099f97aa2af709fe9504a82508 +kvm-fixes 55626ca9c6909d077eca71bccbe15fef6e5ad917 +kvms390-fixes 735931f9a51ab09cf795721b37696b420484625f +hwmon-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +nvdimm-fixes 392be0bda730df3c71241b2a16bbecac78ee627d +btrfs-fixes 3b7ec4d1b5cbc9ac08b540b403d7c363b3a65a61 +vfs-fixes 4f0ed93fb92d3528c73c80317509df3f800a222b +dma-mapping-fixes d17405d52bacd14fe7fdbb10c0434934ea496914 +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes a3790a8a94fc0234c5d38013b48e74ef221ec84c +samsung-krzk-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +pinctrl-samsung-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +devicetree-fixes 649cab56de8eb2952498de9b752761ca980cb88a +scsi-fixes 5cd0f6f57639c5afbb36100c69281fee82c95ee7 +drm-fixes 6fdb8e5aba6a33fe5f1a0bd1bcf0cf2884437ead +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes e49d033bddf5b565044e2abe4241353959bc9120 +mmc-fixes a5e13c6df0e41702d2b2c77c8ad41677ebb065b3 +rtc-fixes bd33335aa93d615cac77d991c448b986761e7a8d +gnss-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +hyperv-fixes 37df9f3fedb6aeaff5564145e8162aab912c9284 +soc-fsl-fixes 2663b3388551230cbc4606a40fabf3331ceb59e4 +risc-v-fixes 1adbc2941eee8acbe3c7dc6b51cdbc5a9bf19565 +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes 2e8496f31d0be8f43849b2980b069f3a9805d047 +spdx e49d033bddf5b565044e2abe4241353959bc9120 +gpio-brgl-fixes 23cf00ddd2e1aacf1873e43f5e0c519c120daf7a +gpio-intel-fixes b41ba2ec54a70908067034f139aa23d0dd2985ce +pinctrl-intel-fixes 39c1f1bd8adf29840ef52225ce95f390e3d7b2cf +erofs-fixes 9f377622a484de0818c49ee01e0ab4eedf6acd81 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 7fd53f41f771d250eb08db08650940f017e37c26 +ubifs-fixes 78c7d49f55d8631b67c09f9bfbe8155211a9ea06 +memblock-fixes 17cbe03872be8878e2f84047424350d036915df1 +cel-fixes e49d033bddf5b565044e2abe4241353959bc9120 +drm-misc-fixes 3b943360a20f3e4b2e0133c7cd7138b51fd93de6 +kspp-gustavo 36f9ff9e03de89691274a6aec45aa079bd3ae405 +kbuild 601ce994fc7108f99900b2603e8a831d99e53af5 +compiler-attributes 19c329f6808995b142b3966301f217c831e7cf31 +dma-mapping a7f3d3d3600c8ed119eb0d2483de0062ce2e3707 +asm-generic 38489db09b109c22eedf6cd3846ef742bceb45fe +arc def9d2780727cec3313ed3522d0123158d87224d +arm 0ae6d1f52670c2cfc4002377395f1ad4461d1654 +arm64 a4fa7f23457671a4d4c2a2fc971ec7293db35ce6 +arm-perf 2c2e21e78a945b174629944281997bbcb839e6bb +arm-soc 73a049e384c83d709322d34cee6fcc9a3068a98e +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic b8d4083299478ad156a864c1e416124472272899 +aspeed 697dabd5d3700e23d8cbd86e4cb8a49744766b48 +at91 969bbb49f36c4764ba59fb764f162abc4204a4af +drivers-memory 8568dec31b2ea6b951cb7bf29b4100c24b934579 +imx-mxs 1f0f76f795d501e41235372ad4c5be4e115e8c31 +keystone 9d2e21ed98a24584daa3c90698ce81f5cc307a27 +mediatek 068acd3c4e4cb68878c37f541639f0e7c75508a7 +mvebu 79e93f9dc81ab9967dc7ae64a6d8467eed98e1f3 +omap 44e97f6fb29badd34311b72e3f970dc2908672e0 +qcom 02fb73baa6b46ac44df9c1ca784028f195e5856c +raspberrypi fbdcf1d2012639e3abdbb97bb6dea9105673d57e +realtek 486f29df69413411a205d3101bae0427a892bee4 +renesas e9903a1559e0802fcdc79f28c7e79db04a59678d +reset d4e4dffec50bb7ea20f9a72a273582efe23769cb +rockchip 3b6c3c12b77ca10e62910915c4067305591e5449 +samsung-krzk 8a4d4cd15c393963ab07cddb699ee0ced2792899 +scmi 4c2443962313db5925ccc9745451d1f63eb86211 +stm32 6ed9269265e10669d62280a869652dbe26f43ecb +sunxi 9fa021aa01fdc9576f4b523543210017af22fbb8 +tegra 93b9ea9ca307789ed41c641235207b35e68effe9 +ti-k3 1e3d655fe7b48c2341d63f981774742e21744f53 +ti-k3-new 112e5934ff3a7505e583365213a27f990922b76b +clk 4b5c93f311077bdc7f073e7a77fe3380ca2106c5 +clk-imx 054ef44ea3ef2883e0f63c9a54c91c07f321a0b4 +clk-renesas f2fb4fe62390b293bc6edc04cc7002940c441359 +clk-samsung 34138a59b92c1a30649a18ec442d2e61f3bc34dd +csky 74cdb26644775597974a3c6d56c7212f60a9fcb1 +h8300 6e5e55227c959716103945e7140614c4c2faf439 +m68k 7accea0c95a1ce4cf1bbf622c42b00c27a2dd51d +m68knommu 9116e156f714054b317cc8cd2df3801aaa0fba5d +microblaze bbcee72c2f7ad889be7513d5e700165c3cb30e60 +mips 7cba4128c2c6e9c67a819c5946ed8066c7306418 +nds32 40e0dd851e7b7afe219820fb270b09016e41d4fc +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 1683f7de65dbf0a2c6a7d639173fe92430a28930 +parisc-hd 711d090f0e021c2fdffc247c43350ebc9be51953 +powerpc 69931cc387cca289e0415c79ce5389119670066d +fsl a76bea0287ce13d28494b19649d80d8ee5e7b757 +soc-fsl ccdfc4ae4d41c30e1461f44ee0e4c415b88350f8 +risc-v 7d0bc44bd0ea163a251d4aa778d1b6fcf6174d22 +s390 46c48eb6d500dd97390cf4e39db48397034ec4e6 +sh 2882b7626f4903a8e9250b328cdf7396a6deecac +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml ddad5187fc2a12cb84c9d1ac8ecb816708a2986b +xtensa 6a8eb99e130f3f7658de2776934374fe1c41279e +pidfd 8fac44cbbaa2c7501c1819aa358abdc3874089b6 +fscrypt a14d0b6764917b21ee6fdfd2a8a4c2920fbefcce +fscache d2ebca8ed45e953901246d6644bc6cbdb724f534 +afs 8409f67b6437c4b327ee95a71081b9c7bfee0b00 +btrfs 3c17501206137b37297d8143d9901c38ddd26176 +ceph 558b4510f622a3d96cf9d95050a04e7793d343c7 +cifs 2d4691384cf460e668a6b1c9a34595035d37b264 +cifsd bc7f2fa87b28134d375a5f0cb1fc905868a6f600 +configfs 14fbbc8297728e880070f7b077b3301a8c698ef9 +ecryptfs 902af369942f8d0a6bdaa8466ff0d84d3d9b03a8 +erofs df7bb621ce5ad12c32e2518f8a564d3ea29149c7 +exfat f9b23f1f6ca05790a50ee965223a5cfafec24980 +ext3 652a066ee95915fc104f45a79d2ae54737d46f4a +ext4 64395d950bc476106b39341e42ebfd4d2eb71d2c +f2fs e8851507996dc5fcaa1a3fc5d501aa770ee5c2ba +fsverity 07c99001312cbf90a357d4877a358f796eede65b +fuse 0d02ec6b3136c73c09e7859f0d0e4e2c4c07b49b +jfs b462cecfa32315cd5acbbaa0968a7deabb4e29af +nfs e49d033bddf5b565044e2abe4241353959bc9120 +nfs-anna 4f8be1f53bf615102d103c0509ffa9596f65b718 +nfsd c3213d260a23e263ef85ba21ac68c9e7578020b5 +cel b73ac6808b0f7994a05ebc38571e2e9eaf98a0f4 +orangefs c1048828c3dbd96c7e371fae658e5f40e6a45e99 +overlayfs d46b7cd683366b8f59cb898c1bae6cff38d7f8f3 +ubifs 42119dbe571eb419dae99b81dd20fa42f47464e1 +v9fs f8b139e2f24112f4e21f1eb02c7fc7600fea4b8d +xfs 25dfa65f814951a33072bcbae795989d817858da +zonefs 6980d29ce4da223ad7f0751c7f1d61d3c6b54ab3 +iomap ad89b66cbad18ca146cbc75f64706d4ca6635973 +djw-vfs 9b8523423b23ee3dfd88e32f5b7207be56a4e782 +file-locks b8da9b10e26cee58eba7b0fd72717127edfb316b +vfs f85ebc25fa88c8648e860a725e730a86ee095691 +printk 94a67011a2255d21203d1a766de93da15ed452f2 +pci e9d14c046bcffdf06052380ea610185fa6223cd4 +pstore 9d843e8fafc7c0b15d8f511d146c0c3d7c816634 +hid 360b9faeeef3881ba427e6ec118d33ac9247a7e6 +i2c c0dccb2c9def962402590e587fd6b35f44e1aeed +i3c e43d5c7c3c3459b428431754672052503c5db9c8 +dmi 3cb4d29a2633170208c96240c7e85148679ceee3 +hwmon-staging 02bb6badc9fb03056eb405e189efa62b1825782b +jc_docs a4f413348f268c4313f58ca383173ee5986d968a +v4l-dvb c1c1d437b1f0a84de6b53416026f7ea1ef3df996 +v4l-dvb-next 1e28eed17697bcf343c6743f0028cc3b5dd88bf0 +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm dde8740bd9b505c58ec8b2277d5d55c6951b7e42 +cpufreq-arm c3135d28a1e099bcc12c2c2a2a154275f49ce86b +cpupower a38fd8748464831584a19438cbb3082b5a2dab15 +devfreq 3dee37a4b6ae85073fde94f37347a169ff42b6b6 +opp a8bb0e872bfb962de4653ce8f8723c0e1f712ce3 +thermal 76e524fa8791870c86183924363e6b76278088d0 +thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 67f8e65e4fc19e24993e8780f41279eeffbd0610 +dlm 2fd8db2dd05d895961c7c7b9fa02d72f385560e4 +swiotlb fcf044891c84e38fc90eb736b818781bccf94e38 +rdma 704d68f5f2df46f7195a62bc21014e71a7f67a99 +net-next 3cd52c1e32fe7dfee09815ced702db9ee9f84ec9 +bpf-next 957dca3df624abcbf895f5081fc664693aa0b363 +ipsec-next 6ad2dd6c14d3989b44cdc17f1e7258bf613dd070 +mlx5-next e71b75f73763d88665b3a19c5a4d52d559aa7732 +netfilter-next 56f15e2cb1f77fbcf9df38de7e5dcb4b37070196 +ipvs-next db3685b4046f8b629bbf73caa33751ce567ea8ff +wireless-drivers-next 13ce240a932fe9c809ec6e79ffc5a4d4ecf534ee +bluetooth 8ce85ada0a05e21a5386ba5c417c52ab00fcd0d1 +mac80211-next 4b837ad53be2ab100dfaa99dc73a9443a8a2392d +gfs2 7d6eec37a105e0466356884d2bf8d1a7e7c74fa2 +mtd 28f0be44b263ca4b59ea63c801db3830e65fbe99 +nand 32cbc7cb70b07041e82f897f96b3035358470b14 +spi-nor b206b82d1726f6f878891791069ab0aea2e31113 +crypto 059c5342812c448f21bed1881a75134320e9c8a2 +drm 41d1d0c51f5ffd5c2c35e82e4a675b185cccea13 +drm-misc 167b400217121338a2beb78e09e2c77bd95491f5 +amdgpu 6504048e0b39fba1a21bca7be8bb74afa7b3937f +drm-intel 70bfb30743d5da73058b0a2271e9c127a84fb494 +drm-tegra 7b6f846785f41d57917e36851c120cfbe87f0809 +drm-msm 0ba17e7a5548af3a943679c8b6c4582f9fc4a537 +imx-drm 74181df8c6db48e4737237186989fdcb1414e0f3 +etnaviv 7d614ab2f20503ed8766363d41f8607337571adf +regmap ccac12acc0c0d66b26ce7834e2dcf54ae159e63a +sound 884c7094a272fb674423bd5a473caa3c714045fe +sound-asoc 1faa37b8f4789efe1e6af9d203957b158dd1887c +modules 33121347fb1c359bd6e3e680b9f2c6ced5734a81 +input 73e7f1732e800a88cafab31d75548c6fcfdd8c47 +block 794dda440c66efc684c6ade7a269782a9af4ae71 +device-mapper db7b93e38106e58ac2ea24eaaea7ed760a319120 +pcmcia e9d503fef7da2cc0610ce9cd056d0347ec9cafc4 +mmc 2970134b927834e9249659a70aac48e62dff804a +mfd 43e72121b5f667b10ba5adae96880e388dda55d1 +backlight 225be60f3853572f682b7ad3d0c1d4008edb6c6b +battery 04722cec1436c732d39153ce6ae2ebf71ac3ade7 +regulator dc6c17ce1886ca52d5c82d9472c63fa9a7dfae2b +security 215042ece9807690490b454af09a7edd35dfdd93 +apparmor d108370c644b153382632b3e5511ade575c91c86 +integrity 5d5ef1af839d1188f0b97ca11e5e0aeab3925578 +keys e377c31f788fc98815e1ab90b5a35704ce35843a +safesetid 03ca0ec138927b16fab0dad7b869f42eb2849c94 +selinux 1fb057dcde11b355fc9acde95cee3b2caa5dafb0 +smack 7ef4c19d245f3dc233fd4be5acea436edd1d83d8 +tomoyo 5dc33592e95534dc8455ce3e9baaaf3dae0fff82 +tpmdd 8b12a62a4e3ed4ae99c715034f557eb391d6b196 +watchdog 1e28eed17697bcf343c6743f0028cc3b5dd88bf0 +iommu 2b2b52ac637ec30607b1ae7a289a2e963ce168b4 +audit b75d8f38bcc9599af42635530c00268c71911f11 +devicetree 56ddc4cd4c8f9d65c0ac5544df4645376b327cbc +mailbox 6b50df2b8c208a04d44b8df5b7baaf668ceb8fc3 +spi edf47ef9faaf8ee100526572f5e08ad744368796 +tip e571028ea527748ab22cd3a97c2d795db281ac59 +clockevents 323397ef4d0005a01fee2834f88ff17e86500618 +edac faf042d15093164879f1a5d9b9805190ac6f7d40 +irqchip 5fbecd2389f48e1415799c63130d0cdce1cf3f60 +ftrace ceaaa12904df07d07ea8975abbf04c4d60e46956 +rcu 420d9384a0b98b51e74684d55d7853dfc113d660 +kvm 657f1d86a38e4b5d13551948c02cc8fc6987e3a5 +kvm-arm c90e53cd9614896db5f44f3be939580c59b0c4a8 +kvm-ppc 72476aaa469179222b92c380de60c76b4cb9a318 +kvms390 c3171e94cc1cdcc3229565244112e869f052b8d9 +xen-tip d120198bd5ff1d41808b6914e1eb89aff937415c +percpu df1c002198a80b89b8b18ccf219456d95483d4a1 +workqueues 89e28ce60cb65971c73359c66d076aa20a395cd5 +drivers-x86 e72457fce9c339193b8da34967ca09e901cb3ed9 +chrome-platform c6e939c63c80c26460b25cf1150ebe8396e8adcf +hsi aa57e77b3d28f0df07149d88c47bc0f3aa77330b +leds d9dfac5419d08e5f0048b53effd5b64de5801882 +ipmi 07cbd87b0416d7b6b8419b2a56bc63659de5d066 +driver-core c2f3f755f5c717f3621b33ef06d974b9cec4a104 +usb e9fcb07704fcef6fa6d0333fd2b3a62442eaf45b +usb-gadget a38fd8748464831584a19438cbb3082b5a2dab15 +usb-serial 5fec21e74bfc1db764fdab013162d839cc889290 +usb-chipidea-next df4aed23d67d7584cf36fdc26fd6b134ec222e4f +tty 88d8cb7b5f2177dfec9f12377762534dd7c64005 +char-misc e76e8b56fe1ab1e9d28e341fac614ddb1a82f8e5 +extcon 7b1222b224aff41739319ae81cd266825464ad8f +phy-next cbc336c09b6d6dfb24d20c955599123308fa2fe2 +soundwire 14968dd36a507866be0edfc2a05d48c997da5d99 +thunderbolt 2e7a5b3e22368b65583d1b717e267de0a5906c32 +vfio 6a2a235aa6275ffd8db3ef9e0e86cb638b1187d1 +staging f9b9263a25dc3d2eaaa829e207434db6951ca7bc +mux 3516bd729358a2a9b090c1905bd2a3fa926e24c6 +icc 27d19a8b4abb2d9a5ad69d21f981b2d84bd7f9be +dmaengine 84b0aa2e0d91d7974c6cfcb3a1ce230e7366293e +cgroup dd3f4e4972f146a685930ccfed95e4e1d13d952a +scsi bce99128eaf7d2864865f958515794e991bf8159 +scsi-mkp 857a80bbd7321161f986588160d97815d1b1206a +vhost 723c7003c1ab435f7e8320790b2a52c466ab6a48 +rpmsg 2c2564b9d64df9386849c343a712fe3c8e9b9e93 +gpio 7ac554888233468a9fd7c4f28721396952dd9959 +gpio-brgl e1b7033ecdac56c1cc4dff72d67cac25d449efc6 +gpio-intel 058459043e71b5c1703194ea71aab576c0ff4f4d +pinctrl b60bab1ddf426da07853d6e8805e0e9a27248011 +pinctrl-intel 5b613df3f499e305f3aecd58090a71ec0d92930d +pinctrl-renesas 61232cd6efca6e4d2705993850d014343ba604c4 +pinctrl-samsung a38fd8748464831584a19438cbb3082b5a2dab15 +pwm 9666cec380d60808eb86d3be4caf84faeebe3081 +userns 95ebabde382c371572297915b104e55403674e73 +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +random ab9a7e27044b87ff2be47b8f8e095400e7fccc44 +kselftest e75074781f1735c1976bc551e29ccf2ba9a4b17f +y2038 c4e71212a245017d2ab05f322f7722f0b87a55da +livepatching c150bbbb1731c5b6c0b232320c450dcd3b5c9fde +coresight 1efbcec2ef8c037f1e801c76e4b9434ee2400be7 +rtc 8d69f62fddf6c1a8c7745120c4d6aab9322b001a +nvdimm 30c10d32152dd09c2158e9cab8a6c7adaa09278e +at24 fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +ntb 5c8fe583cce542aa0b84adc939ce85293de36e5e +seccomp a3fc712c5b37aec802438fe0de095d7f6f3827a3 +kspp 414eece95b98b209cef0f49cfcac108fd00b8ced +gnss 994adcbd37148acfa593c9ec2880a81ef97c7041 +fsi 4a851d714eadeabd65c7e321a2e7830f77d945c4 +slimbus 0320ed0a82364b3b175ab83ad11c7e4d9ad828a9 +nvmem 9e1a5761c274fdd62d0588519ea3754c58d3c768 +xarray 2c7e57a02708a69d0194f9ef2a7b7e54f5a0484a +hyperv 0975694befc06a235cfce5b40d20206c5d8c6593 +auxdisplay 701454bce906241ba7f50e2773881560d6404d29 +kgdb 2bbd9b0f2b4ec0afa80b52b1a68bd3bc80618275 +hmm fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +fpga a78a51a851ed3edc83264a67e2ba77a34f27965f +kunit a38fd8748464831584a19438cbb3082b5a2dab15 +generic-ioremap 4bdc0d676a643140bdf17dbf7eafedee3d496a3c +cfi f3907773d60229afa8e6c0a3ee5085715192a9cb +kunit-next de2fcb3e62013738f22bbb42cbd757d9a242574e +trivial 9ff9b0d392ea08090cd1780fb196f36dbb586529 +zx2c4 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e +mhi ec32332df7645e0ba463a08d483fe97665167071 +memblock 097d43d8570457c1af9b09fab15412697b177f35 +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +iomem-mmap-vs-gup 5f962ee843e6952120069e140d9fbb5125ad6daf +rust add74f8473c5ca7d8947c760ff355df991a259bb +akpm-current f47d46143d3f5112742277c65aca632174d88b41 +akpm 9f651e1e639aaa1429f709503788edbc012917a0 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..b02567d6e7bb --- /dev/null +++ b/Next/Trees @@ -0,0 +1,338 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#for-stable +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#master +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master +mac80211 git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git#master +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +usb-chipidea-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#for-usb-fixes +phy git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-linus +dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus +i3c-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/fixes +drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes git git://git.freedesktop.org/git/drm/drm.git#drm-fixes +amdgpu-fixes git git://people.freedesktop.org/~agd5f/linux#drm-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix +risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +pidfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +integrity-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#fixes +kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +ubifs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#fixes +memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +cel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-rc +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +actions git git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git#for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +drivers-memory git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-next +mvebu git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +raspberrypi git git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git#for-next +realtek git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek.git#for-next +renesas git git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +stm32 git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +ti-k3 git git://git.kernel.org/pub/scm/linux/kernel/git/kristo/linux.git#ti-k3-next +ti-k3-new git git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux.git#ti-k3-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next +csky git git://github.com/c-sky/csky-linux.git#linux-next +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +nds32 git git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git#next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh git git://git.libc.org/linux-sh#for-next +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#master +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache-next +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +cifsd git https://github.com/smfrench/smb3-kernel.git#cifsd-for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#fsverity +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +cel git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-next +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +ubifs git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next +v9fs git git://github.com/martinetd/linux#9p-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next +djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +fbdev git git://github.com/bzolnier/linux.git#fbdev-for-next +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +thermal-rzhang git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next +thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#master +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.git#drm-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next-testing +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +safesetid git https://github.com/micah-morton/linux.git#safesetid-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#next +tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master +tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvm-ppc git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#kvm-ppc-next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git#for-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#for-usb-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +vfio git git://github.com/awilliam/linux-vfio.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +icc git git://git.linaro.org/people/georgi.djakov/linux.git#icc-next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +y2038 git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038 +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +coresight git git://git.linaro.org/kernel/coresight.git#next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/xarray.git#main +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git https://github.com/ojeda/linux.git#auxdisplay +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#for-next +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +generic-ioremap git git://git.infradead.org/users/hch/ioremap.git#for-next +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +zx2c4 git git://git.kernel.org/pub/scm/linux/kernel/git/zx2c4/linux.git#for-next +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +init git git://git.infradead.org/users/hch/misc.git#init-user-pointers +counters git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#counters +iomem-mmap-vs-gup git git://anongit.freedesktop.org/drm/drm#topic/iomem-mmap-vs-gup +rust git https://github.com/Rust-for-Linux/linux.git#rust-next +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..6bce642556d9 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,13562 @@ +$ date -R +Thu, 08 Apr 2021 08:53:34 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 67% (6075/9011)
Updating files: 68% (6128/9011)
Updating files: 69% (6218/9011)
Updating files: 70% (6308/9011)
Updating files: 71% (6398/9011)
Updating files: 72% (6488/9011)
Updating files: 73% (6579/9011)
Updating files: 74% (6669/9011)
Updating files: 75% (6759/9011)
Updating files: 76% (6849/9011)
Updating files: 77% (6939/9011)
Updating files: 78% (7029/9011)
Updating files: 79% (7119/9011)
Updating files: 80% (7209/9011)
Updating files: 81% (7299/9011)
Updating files: 82% (7390/9011)
Updating files: 83% (7480/9011)
Updating files: 84% (7570/9011)
Updating files: 85% (7660/9011)
Updating files: 86% (7750/9011)
Updating files: 87% (7840/9011)
Updating files: 88% (7930/9011)
Updating files: 89% (8020/9011)
Updating files: 90% (8110/9011)
Updating files: 91% (8201/9011)
Updating files: 92% (8291/9011)
Updating files: 93% (8381/9011)
Updating files: 94% (8471/9011)
Updating files: 95% (8561/9011)
Updating files: 96% (8651/9011)
Updating files: 97% (8741/9011)
Updating files: 98% (8831/9011)
Updating files: 99% (8921/9011)
Updating files: 100% (9011/9011)
Updating files: 100% (9011/9011), done. +HEAD is now at 2d743660786e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs +Merging origin/master (454859c552da Merge tag 'arc-5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc) +$ git merge origin/master +Updating 2d743660786e..454859c552da +Fast-forward + arch/arc/boot/dts/haps_hs.dts | 2 +- + arch/arc/kernel/signal.c | 4 +-- + arch/arc/kernel/unwind.c | 27 +++++++++--------- + arch/arm/boot/dts/armada-385-turris-omnia.dts | 4 ++- + arch/arm/boot/dts/bcm2711.dtsi | 12 -------- + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 2 ++ + arch/arm/boot/dts/omap4.dtsi | 5 ++++ + arch/arm/boot/dts/omap44xx-clocks.dtsi | 8 ------ + arch/arm/boot/dts/omap5.dtsi | 5 ++++ + arch/arm/mach-keystone/keystone.c | 4 +-- + arch/arm/mach-omap1/ams-delta-fiq-handler.S | 1 + + arch/arm/mach-omap2/omap-secure.c | 39 ++++++++++++++++++++++++++ + arch/arm/mach-omap2/omap-secure.h | 1 + + arch/arm/mach-omap2/pmic-cpcap.c | 4 +-- + arch/arm/mach-pxa/mainstone.c | 8 ++++-- + arch/arm64/boot/dts/freescale/imx8mm-pinfunc.h | 2 +- + arch/arm64/boot/dts/freescale/imx8mq-pinfunc.h | 2 +- + arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 6 ++-- + arch/parisc/include/asm/cmpxchg.h | 2 +- + arch/parisc/include/asm/processor.h | 1 - + arch/parisc/math-emu/fpu.h | 32 ++------------------- + drivers/bus/mvebu-mbus.c | 2 +- + drivers/char/agp/Kconfig | 2 +- + drivers/platform/x86/intel-hid.c | 16 ++++++----- + drivers/regulator/bd9571mwv-regulator.c | 8 +++--- + drivers/soc/fsl/qbman/qman.c | 2 +- + 26 files changed, 108 insertions(+), 93 deletions(-) +Merging fixes/fixes (e71ba9452f0b Linux 5.11-rc2) +$ git merge fixes/fixes +Already up to date. +Merging kbuild-current/fixes (bcbcf50f5218 kbuild: fix ld-version.sh to not be affected by locale) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (83520d62cc5a ARC: treewide: avoid the pointer addition with NULL pointer) +$ git merge arc-current/for-curr +Already up to date. +Merging arm-current/fixes (30e3b4f256b4 ARM: footbridge: fix PCI interrupt mapping) +$ git merge arm-current/fixes +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 8 +++++++- + arch/arm/mach-footbridge/cats-pci.c | 4 ++-- + arch/arm/mach-footbridge/ebsa285-pci.c | 4 ++-- + arch/arm/mach-footbridge/netwinder-pci.c | 2 +- + arch/arm/mach-footbridge/personal-pci.c | 5 ++--- + arch/arm/mm/mmu.c | 3 +-- + arch/arm/mm/pmsa-v7.c | 4 +++- + arch/arm/mm/pmsa-v8.c | 4 +++- + 8 files changed, 21 insertions(+), 13 deletions(-) +Merging arm64-fixes/for-next/fixes (185f2e5f51c2 arm64: fix inline asm in load_unaligned_zeropad()) +$ git merge arm64-fixes/for-next/fixes +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/word-at-a-time.h | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) +Merging arm-soc-fixes/arm/fixes (1180042dc603 Merge tag 'mvebu-fixes-5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into arm/fixes) +$ git merge arm-soc-fixes/arm/fixes +Already up to date. +Merging drivers-memory-fixes/fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge drivers-memory-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (a65a802aadba m68k: Fix virt_addr_valid() W=1 compiler warnings) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (791f9e36599d powerpc/vdso: Make sure vdso_wrapper.o is rebuilt everytime vdso.so is rebuilt) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/kernel/Makefile | 4 ++++ + arch/powerpc/kernel/ptrace/Makefile | 4 ++-- + arch/powerpc/kernel/ptrace/ptrace-decl.h | 14 -------------- + arch/powerpc/kernel/ptrace/ptrace-fpu.c | 10 ++++++++++ + arch/powerpc/kernel/ptrace/ptrace-novsx.c | 8 ++++++++ + arch/powerpc/kernel/ptrace/ptrace-view.c | 2 -- + arch/powerpc/kernel/signal_32.c | 20 ++++++++------------ + 7 files changed, 32 insertions(+), 30 deletions(-) +Merging s390-fixes/fixes (ad31a8c05196 s390/setup: use memblock_free_late() to free old stack) +$ git merge s390-fixes/fixes +Merge made by the 'recursive' strategy. + arch/s390/include/asm/stacktrace.h | 1 + + arch/s390/kernel/cpcmd.c | 6 ++++-- + arch/s390/kernel/dumpstack.c | 12 +++++++++++- + arch/s390/kernel/irq.c | 2 +- + arch/s390/kernel/setup.c | 2 +- + 5 files changed, 18 insertions(+), 5 deletions(-) +Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net) +$ git merge sparc/master +Already up to date. +Merging fscrypt-current/for-stable (d19d8d345eec fscrypt: fix inline encryption not used on new files) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (8a12f8836145 net: hso: fix null-ptr-deref during tty device unregistration) +$ git merge net/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/brcm,bcm4908-enet.yaml | 2 +- + .../bindings/net/ethernet-controller.yaml | 2 +- + .../devicetree/bindings/net/micrel-ksz90x1.txt | 96 +++++++++++++++++++- + Documentation/networking/ethtool-netlink.rst | 10 +-- + MAINTAINERS | 8 ++ + drivers/net/can/spi/mcp251x.c | 24 +++-- + drivers/net/can/usb/peak_usb/pcan_usb_core.c | 6 +- + drivers/net/dsa/lantiq_gswip.c | 9 +- + drivers/net/ethernet/amd/pcnet32.c | 5 +- + drivers/net/ethernet/amd/xgbe/xgbe.h | 6 +- + drivers/net/ethernet/broadcom/bcm4908_enet.c | 1 + + drivers/net/ethernet/cadence/macb_main.c | 7 ++ + drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c | 23 ++++- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 3 +- + drivers/net/ethernet/freescale/gianfar.c | 6 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 7 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e.h | 1 + + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 53 +++++++++-- + drivers/net/ethernet/intel/i40e/i40e_main.c | 19 ++-- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 9 ++ + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 4 +- + drivers/net/ethernet/intel/ice/ice.h | 4 +- + drivers/net/ethernet/intel/ice/ice_common.c | 2 +- + drivers/net/ethernet/intel/ice/ice_controlq.h | 4 +- + drivers/net/ethernet/intel/ice/ice_dcb.c | 38 ++++++-- + drivers/net/ethernet/intel/ice/ice_dcb_nl.c | 2 - + drivers/net/ethernet/intel/ice/ice_ethtool.c | 4 +- + drivers/net/ethernet/intel/ice/ice_lib.c | 5 +- + drivers/net/ethernet/intel/ice/ice_main.c | 52 ++++++++--- + drivers/net/ethernet/intel/ice/ice_switch.c | 15 ++-- + drivers/net/ethernet/intel/ice/ice_type.h | 1 + + drivers/net/ethernet/mellanox/mlx5/core/dev.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 36 ++++++-- + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.h | 10 +++ + .../ethernet/mellanox/mlx5/core/en/tc_tun_encap.c | 23 ++--- + .../ethernet/mellanox/mlx5/core/en/tc_tun_geneve.c | 29 ++++++ + .../ethernet/mellanox/mlx5/core/en/tc_tun_gre.c | 1 + + .../mellanox/mlx5/core/en/tc_tun_mplsoudp.c | 1 + + .../ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 6 ++ + .../ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c | 40 ++++----- + .../ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 5 +- + .../net/ethernet/mellanox/mlx5/core/en_accel/tls.h | 3 + + .../mellanox/mlx5/core/en_accel/tls_stats.c | 49 ++++++---- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 22 ++--- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 21 ++++- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 10 --- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 6 -- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 13 ++- + .../ethernet/mellanox/mlx5/core/esw/indir_table.c | 10 +-- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 68 ++++++++------ + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 15 ++++ + .../net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 19 ++-- + .../net/ethernet/mellanox/mlxsw/spectrum_ipip.c | 7 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c | 7 +- + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 2 +- + drivers/net/ethernet/netronome/nfp/bpf/cmsg.c | 1 + + drivers/net/ethernet/netronome/nfp/flower/main.h | 8 ++ + .../net/ethernet/netronome/nfp/flower/metadata.c | 16 +++- + .../net/ethernet/netronome/nfp/flower/offload.c | 48 +++++++++- + drivers/net/ethernet/xilinx/xilinx_axienet.h | 12 +++ + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 12 +-- + drivers/net/geneve.c | 24 ++++- + drivers/net/ieee802154/atusb.c | 1 + + drivers/net/phy/bcm-phy-lib.c | 13 ++- + drivers/net/tun.c | 48 ++++++++++ + drivers/net/usb/hso.c | 33 +++---- + drivers/net/virtio_net.c | 10 ++- + drivers/net/vxlan.c | 18 +++- + drivers/net/wan/hdlc_fr.c | 5 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/notif-wait.c | 10 +-- + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 1 + + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 7 +- + drivers/net/wireless/intel/iwlwifi/mvm/rfi.c | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 17 ++-- + .../wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c | 31 +------ + .../net/wireless/intel/iwlwifi/pcie/ctxt-info.c | 3 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 27 +++++- + .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 35 ++++++++ + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 7 +- + drivers/net/wireless/mediatek/mt76/mt7921/regs.h | 4 +- + include/linux/avf/virtchnl.h | 2 - + include/linux/bpf.h | 2 + + include/linux/ethtool.h | 22 +++-- + include/linux/mlx5/mlx5_ifc.h | 10 ++- + include/linux/virtio_net.h | 16 ++-- + include/net/netns/xfrm.h | 4 +- + include/net/red.h | 4 +- + include/net/sock.h | 15 +++- + include/net/xfrm.h | 4 +- + include/uapi/linux/can.h | 2 +- + include/uapi/linux/ethtool.h | 54 ++++++----- + kernel/bpf/disasm.c | 2 +- + kernel/bpf/inode.c | 4 +- + kernel/bpf/stackmap.c | 12 ++- + kernel/bpf/trampoline.c | 30 +++++++ + kernel/bpf/verifier.c | 5 ++ + net/batman-adv/translation-table.c | 2 + + net/can/bcm.c | 10 ++- + net/can/isotp.c | 11 ++- + net/can/raw.c | 14 +-- + net/core/neighbour.c | 2 +- + net/core/sock.c | 12 +-- + net/core/xdp.c | 3 +- + net/dsa/dsa2.c | 8 +- + net/dsa/switch.c | 15 ++-- + net/ethtool/common.c | 17 ++++ + net/ethtool/eee.c | 4 +- + net/ethtool/ioctl.c | 18 +--- + net/hsr/hsr_device.c | 1 + + net/hsr/hsr_forward.c | 6 -- + net/ieee802154/nl-mac.c | 7 +- + net/ieee802154/nl802154.c | 68 ++++++++++++-- + net/ipv4/ah4.c | 2 +- + net/ipv4/esp4.c | 2 +- + net/ipv4/esp4_offload.c | 17 +++- + net/ipv4/ip_vti.c | 6 +- + net/ipv4/udp.c | 4 + + net/ipv6/ah6.c | 2 +- + net/ipv6/esp6.c | 2 +- + net/ipv6/esp6_offload.c | 17 +++- + net/ipv6/ip6_vti.c | 6 +- + net/ipv6/raw.c | 2 +- + net/mac802154/llsec.c | 2 +- + net/mptcp/protocol.c | 100 ++++++++++----------- + net/ncsi/ncsi-manage.c | 20 +++-- + net/nfc/llcp_sock.c | 10 +++ + net/openvswitch/conntrack.c | 8 +- + net/qrtr/qrtr.c | 5 +- + net/rds/message.c | 4 +- + net/rds/send.c | 2 +- + net/sched/act_api.c | 3 + + net/sched/cls_api.c | 2 +- + net/sched/sch_htb.c | 5 +- + net/sctp/ipv6.c | 7 +- + net/tipc/bearer.h | 6 +- + net/tipc/crypto.c | 3 +- + net/tipc/net.c | 2 +- + net/tipc/node.c | 2 +- + net/tipc/socket.c | 2 +- + net/xfrm/xfrm_compat.c | 12 ++- + net/xfrm/xfrm_device.c | 2 - + net/xfrm/xfrm_interface.c | 3 + + net/xfrm/xfrm_output.c | 23 +++-- + net/xfrm/xfrm_state.c | 11 +-- + tools/lib/bpf/ringbuf.c | 2 +- + tools/lib/bpf/xsk.c | 57 +++++++----- + .../testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 44 +++++++++ + tools/testing/selftests/bpf/progs/bpf_tcp_nogpl.c | 19 ++++ + .../selftests/net/forwarding/vxlan_bridge_1d.sh | 13 ++- + 155 files changed, 1472 insertions(+), 590 deletions(-) + create mode 100644 tools/testing/selftests/bpf/progs/bpf_tcp_nogpl.c +Merging bpf/master (144748eb0c44 bpf, sockmap: Fix incorrect fwd_alloc accounting) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + include/linux/skmsg.h | 7 ++++++- + net/core/skmsg.c | 12 +++++------- + 2 files changed, 11 insertions(+), 8 deletions(-) +Merging ipsec/master (ef19e111337f xfrm/compat: Cleanup WARN()s that can be user-triggered) +$ git merge ipsec/master +Already up to date. +Merging netfilter/master (fbea31808ca1 netfilter: conntrack: do not print icmpv6 as unknown via /proc) +$ git merge netfilter/master +Merge made by the 'recursive' strategy. + net/netfilter/nf_conntrack_standalone.c | 1 + + net/netfilter/nf_flow_table_offload.c | 6 +++--- + 2 files changed, 4 insertions(+), 3 deletions(-) +Merging ipvs/master (fbea31808ca1 netfilter: conntrack: do not print icmpv6 as unknown via /proc) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (65db391dd874 iwlwifi: mvm: fix beacon protection checks) +$ git merge wireless-drivers/master +Already up to date. +Merging mac80211/master (6f235a69e594 ch_ktls: fix enum-conversion warning) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (7582207b1059 RDMA/rtrs-clt: Close rtrs client conn before destroying rtrs clt session files) +$ git merge rdma-fixes/for-rc +Merge made by the 'recursive' strategy. + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging sound-current/for-linus (9c3195778c71 Merge tag 'asoc-fix-v5.12-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ git merge sound-current/for-linus +Auto-merging sound/drivers/aloop.c +Merge made by the 'recursive' strategy. + sound/drivers/aloop.c | 11 ++++++++--- + sound/pci/hda/patch_conexant.c | 1 + + sound/soc/bcm/cygnus-ssp.c | 4 +++- + sound/soc/codecs/lpass-rx-macro.c | 2 +- + sound/soc/codecs/lpass-tx-macro.c | 2 +- + sound/soc/codecs/max98373-i2c.c | 1 + + sound/soc/codecs/max98373-sdw.c | 1 + + sound/soc/codecs/max98373.c | 2 ++ + sound/soc/codecs/wm8960.c | 8 +++++++- + sound/soc/fsl/fsl_esai.c | 8 +++++--- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 12 ++++++------ + sound/soc/sof/core.c | 8 +++++++- + sound/soc/sof/intel/apl.c | 3 ++- + sound/soc/sof/intel/cnl.c | 19 ++----------------- + sound/soc/sof/intel/hda-dsp.c | 21 +++++++++++++++++---- + sound/soc/sof/intel/hda.h | 1 + + sound/soc/sof/intel/icl.c | 3 ++- + sound/soc/sof/intel/pci-tgl.c | 2 +- + sound/soc/sof/intel/tgl.c | 18 +++++++++++++++++- + sound/soc/sunxi/sun4i-codec.c | 5 +++++ + 20 files changed, 90 insertions(+), 42 deletions(-) +Merging sound-asoc-fixes/for-linus (a07a4db9b2a7 Merge remote-tracking branch 'asoc/for-5.12' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + sound/soc/codecs/tlv320aic32x4.c | 12 ++++++------ + sound/soc/meson/axg-frddr.c | 26 ++++++++++++++++++++------ + 2 files changed, 26 insertions(+), 12 deletions(-) +Merging regmap-fixes/for-linus (78d889705732 Merge remote-tracking branch 'regmap/for-5.12' into regmap-linus) +$ git merge regmap-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-debugfs.c | 1 + + 1 file changed, 1 insertion(+) +Merging regulator-fixes/for-linus (6068cc31dedd Merge remote-tracking branch 'regulator/for-5.12' into regulator-linus) +$ git merge regulator-fixes/for-linus +Already up to date! +Merge made by the 'recursive' strategy. +Merging spi-fixes/for-linus (10cba9666c4e Merge remote-tracking branch 'spi/for-5.12' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + .../bindings/spi/mediatek,spi-mtk-nor.yaml | 1 + + drivers/spi/spi-ath79.c | 3 +-- + drivers/spi/spi-bcm63xx-hsspi.c | 7 ++++++- + drivers/spi/spi-bcm63xx.c | 6 +++++- + drivers/spi/spi-stm32.c | 3 ++- + drivers/spi/spi-ti-qspi.c | 20 ++++++++++++++------ + 6 files changed, 29 insertions(+), 11 deletions(-) +Merging pci-current/for-linus (cf673bd0cc97 PCI: switchtec: Fix Spectre v1 vulnerability) +$ git merge pci-current/for-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 ++-- + drivers/pci/switch/switchtec.c | 9 ++++++--- + 2 files changed, 8 insertions(+), 5 deletions(-) +Merging driver-core.current/driver-core-linus (eed6e41813de driver core: Fix locking bug in deferred_probe_timeout_work_func()) +$ git merge driver-core.current/driver-core-linus +Merge made by the 'recursive' strategy. + drivers/base/dd.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) +Merging tty.current/tty-linus (e49d033bddf5 Linux 5.12-rc6) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (363eaa3a450a usbip: synchronize event handler with sysfs code paths) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/cdns3/cdnsp-gadget.c | 4 ++++ + drivers/usb/usbip/stub_dev.c | 11 +++++++++-- + drivers/usb/usbip/usbip_common.h | 3 +++ + drivers/usb/usbip/usbip_event.c | 2 ++ + drivers/usb/usbip/vhci_hcd.c | 1 + + drivers/usb/usbip/vhci_sysfs.c | 30 +++++++++++++++++++++++++----- + drivers/usb/usbip/vudc_dev.c | 1 + + drivers/usb/usbip/vudc_sysfs.c | 5 +++++ + 8 files changed, 50 insertions(+), 7 deletions(-) +Merging usb-gadget-fixes/fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (0d02ec6b3136 Linux 5.12-rc4) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/for-usb-fixes (cf97d7af2468 usb: cdnsp: Fixes issue with dequeuing requests after disabling endpoint) +$ git merge usb-chipidea-fixes/for-usb-fixes +Already up to date. +Merging phy/fixes (da848f9a0e13 phy: qcom-qmp: add hbr3_hbr2 voltage and premphasis swing table) +$ git merge phy/fixes +Merge made by the 'recursive' strategy. + drivers/phy/ingenic/phy-ingenic-usb.c | 4 ++-- + drivers/phy/marvell/Kconfig | 4 ++-- + drivers/phy/qualcomm/phy-qcom-qmp.c | 23 +++++++++++++++++++++-- + drivers/phy/ralink/phy-mt7621-pci.c | 6 +++--- + drivers/phy/ti/phy-j721e-wiz.c | 1 + + 5 files changed, 29 insertions(+), 9 deletions(-) +Merging staging.current/staging-linus (e49d033bddf5 Linux 5.12-rc6) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (e49d033bddf5 Linux 5.12-rc6) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (fde5d7f27108 soundwire: bus: Fix device found flag correctly) +$ git merge soundwire-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/soundwire/bus.c | 3 ++- + drivers/soundwire/cadence_master.c | 4 ++-- + 2 files changed, 4 insertions(+), 3 deletions(-) +Merging thunderbolt-fixes/fixes (08fe7ae18570 thunderbolt: Fix off by one in tb_port_find_retimer()) +$ git merge thunderbolt-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/thunderbolt/retimer.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging input-current/for-linus (56cfe6f820a6 Input: elants_i2c - drop zero-checking of ABS_MT_TOUCH_MAJOR resolution) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/joystick/n64joy.c | 4 +-- + drivers/input/keyboard/nspire-keypad.c | 56 +++++++++++++++++++--------------- + drivers/input/serio/i8042-x86ia64io.h | 1 + + drivers/input/touchscreen/elants_i2c.c | 5 ++- + drivers/input/touchscreen/s6sy761.c | 4 +-- + 5 files changed, 38 insertions(+), 32 deletions(-) +Merging crypto-current/master (0de9dc80625b hwrng: timeriomem - Use device-managed registration API) +$ git merge crypto-current/master +Already up to date. +Merging ide/master (6800cd8cbc6e ide-acpi: use %*ph to print small buffer) +$ git merge ide/master +Auto-merging include/linux/ide.h +Auto-merging drivers/ide/sis5513.c +Auto-merging drivers/ide/ide-acpi.c +Auto-merging drivers/ide/hpt366.c +Auto-merging drivers/ide/Kconfig +Merge made by the 'recursive' strategy. + drivers/ide/Kconfig | 2 +- + drivers/ide/aec62xx.c | 3 +-- + drivers/ide/alim15x3.c | 3 +-- + drivers/ide/amd74xx.c | 3 +-- + drivers/ide/atiixp.c | 3 +-- + drivers/ide/cmd64x.c | 3 +-- + drivers/ide/cs5520.c | 3 +-- + drivers/ide/cs5530.c | 3 +-- + drivers/ide/cs5535.c | 3 +-- + drivers/ide/cs5536.c | 3 +-- + drivers/ide/cy82c693.c | 3 +-- + drivers/ide/delkin_cb.c | 32 ++++++-------------------------- + drivers/ide/hpt366.c | 5 ++--- + drivers/ide/ide-acpi.c | 5 +---- + drivers/ide/ide-pci-generic.c | 3 +-- + drivers/ide/it8172.c | 3 +-- + drivers/ide/it8213.c | 3 +-- + drivers/ide/it821x.c | 3 +-- + drivers/ide/jmicron.c | 3 +-- + drivers/ide/ns87415.c | 3 +-- + drivers/ide/opti621.c | 3 +-- + drivers/ide/pdc202xx_new.c | 3 +-- + drivers/ide/pdc202xx_old.c | 3 +-- + drivers/ide/piix.c | 3 +-- + drivers/ide/sc1200.c | 43 ++++++++++++++----------------------------- + drivers/ide/serverworks.c | 3 +-- + drivers/ide/setup-pci.c | 29 ++++++----------------------- + drivers/ide/siimage.c | 3 +-- + drivers/ide/sis5513.c | 3 +-- + drivers/ide/sl82c105.c | 3 +-- + drivers/ide/slc90e66.c | 3 +-- + drivers/ide/triflex.c | 24 ++++++++---------------- + drivers/ide/via82cxxx.c | 3 +-- + include/linux/ide.h | 8 +------- + 34 files changed, 65 insertions(+), 161 deletions(-) +Merging vfio-fixes/for-linus (e0146a108ce4 vfio/nvlink: Add missing SPAPR_TCE_IOMMU depends) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (a38fd8748464 Linux 5.12-rc2) +$ 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 (868833fbffbe dmaengine: xilinx: dpdma: Fix race condition in done IRQ) +$ git merge dmaengine-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/dma/xilinx/xilinx_dpdma.c | 31 +++++++++++++++++++------------ + 1 file changed, 19 insertions(+), 12 deletions(-) +Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (2fb164f0ce95 mtd: rawnand: mtk: Fix WAITRDY break condition and timeout) +$ git merge mtd-fixes/mtd/fixes +Merge made by the 'recursive' strategy. + drivers/mtd/nand/raw/mtk_nand.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (0e37b4fa67f5 media: coda: fix macroblocks count control usage) +$ git merge v4l-dvb-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/media/platform/coda/coda-common.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +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 (9ae31e2ab293 MIPS: kernel: setup.c: fix compilation error) +$ git merge mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (2c69c8a1736e ARM: dts: at91: sam9x60: fix mux-mask to match product's datasheet) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (fc85dc42a384 ARM: OMAP2+: Fix uninitialized sr_inst) +$ git merge omap-fixes/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/omap3.dtsi | 3 +++ + arch/arm/mach-omap2/board-generic.c | 2 +- + arch/arm/mach-omap2/sr_device.c | 2 +- + 3 files changed, 5 insertions(+), 2 deletions(-) +Merging kvm-fixes/master (55626ca9c690 selftests: kvm: Check that TSC page value is small after KVM_SET_CLOCK(0)) +$ 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 (a38fd8748464 Linux 5.12-rc2) +$ git merge hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (392be0bda730 cxl/mem: Force array size of mem_commands[] to CXL_MEM_COMMAND_ID_MAX) +$ git merge nvdimm-fixes/libnvdimm-fixes +Merge made by the 'recursive' strategy. + drivers/cxl/mem.c | 143 +++++++++++++++++++++++++++++++----------------------- + 1 file changed, 83 insertions(+), 60 deletions(-) +Merging btrfs-fixes/next-fixes (3b7ec4d1b5cb Merge branch 'misc-5.12' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Already up to date! +Merge made by the 'recursive' strategy. +Merging vfs-fixes/fixes (4f0ed93fb92d LOOKUP_MOUNTPOINT: we are cleaning "jumped" flag too late) +$ git merge vfs-fixes/fixes +Merge made by the 'recursive' strategy. + fs/namei.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging dma-mapping-fixes/for-linus (d17405d52bac dma-mapping: benchmark: fix kernel crash when dma_map_single fails) +$ git merge dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge i3c-fixes/i3c/fixes +Already up to date. +Merging drivers-x86-fixes/fixes (a3790a8a94fc platform/x86: intel-hid: Fix spurious wakeups caused by tablet-mode events during suspend) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (649cab56de8e of: properly check for error returned by fdt_get_name()) +$ git merge devicetree-fixes/dt/linus +Merge made by the 'recursive' strategy. + drivers/of/fdt.c | 36 +++++++++++++++++++++++------------- + drivers/of/overlay.c | 2 +- + drivers/of/unittest.c | 15 ++++++++++----- + 3 files changed, 34 insertions(+), 19 deletions(-) +Merging scsi-fixes/fixes (5cd0f6f57639 scsi: scsi_transport_srp: Don't block target in SRP_PORT_LOST state) +$ git merge scsi-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/scsi/hpsa_cmd.h | 78 +++++++++++++++++++++---------------- + drivers/scsi/pm8001/pm8001_hwi.c | 8 ++-- + drivers/scsi/scsi_transport_srp.c | 2 +- + drivers/scsi/ufs/ufshcd.c | 31 +++++++-------- + drivers/target/iscsi/iscsi_target.c | 3 +- + 5 files changed, 65 insertions(+), 57 deletions(-) +Merging drm-fixes/drm-fixes (6fdb8e5aba6a Merge tag 'imx-drm-fixes-2021-04-01' of git://git.pengutronix.de/git/pza/linux into drm-fixes) +$ git merge drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) +$ git merge amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (e49d033bddf5 Linux 5.12-rc6) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (a5e13c6df0e4 Linux 5.12-rc5) +$ git merge mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt()) +$ git merge rtc-fixes/rtc-fixes +Merge made by the 'recursive' strategy. + drivers/rtc/rtc-cmos.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging gnss-fixes/gnss-linus (a38fd8748464 Linux 5.12-rc2) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (37df9f3fedb6 video: hyperv_fb: Fix a double free in hvfb_probe) +$ 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 (1adbc2941eee riscv: Make NUMA depend on MMU) +$ git merge risc-v-fixes/fixes +Already up to date. +Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range()) +$ git merge pidfd-fixes/fixes +Merge made by the 'recursive' strategy. + fs/file.c | 85 ++++++++++++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 57 insertions(+), 28 deletions(-) +Merging fpga-fixes/fixes (2e8496f31d0b firmware: stratix10-svc: reset COMMAND_RECONFIG_FLAG_PARTIAL to 0) +$ git merge fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (e49d033bddf5 Linux 5.12-rc6) +$ git merge spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (23cf00ddd2e1 gpio: sysfs: Obey valid_mask) +$ git merge gpio-brgl-fixes/gpio/for-current +Merge made by the 'recursive' strategy. + drivers/gpio/gpiolib-sysfs.c | 8 ++++++++ + 1 file changed, 8 insertions(+) +Merging gpio-intel-fixes/fixes (b41ba2ec54a7 gpiolib: Read "gpio-line-names" from a firmware node) +$ git merge gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (39c1f1bd8adf pinctrl: intel: check REVID register value for device presence) +$ git merge pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (9f377622a484 erofs: fix bio->bi_max_vecs behavior change) +$ 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 (7fd53f41f771 kunit: tool: Disable PAGE_POISONING under --alltests) +$ 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 (17cbe03872be mm/memblock: Fix typo in comment of memblock_phys_alloc_try_nid()) +$ git merge memblock-fixes/fixes +Already up to date. +Merging cel-fixes/for-rc (e49d033bddf5 Linux 5.12-rc6) +$ git merge cel-fixes/for-rc +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (3b943360a20f drm/panel: panel-dsi-cm: disable TE for now) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/panel/panel-dsi-cm.c | 12 +++++++++--- + drivers/gpu/drm/xen/xen_drm_front.c | 6 ++++-- + drivers/gpu/drm/xen/xen_drm_front_conn.h | 1 - + 3 files changed, 13 insertions(+), 6 deletions(-) +Merging kspp-gustavo/for-next/kspp (36f9ff9e03de lib: Fix fall-through warnings for Clang) +$ git merge kspp-gustavo/for-next/kspp +Already up to date. +Merging kbuild/for-next (601ce994fc71 Merge branch 'kbuild' into for-next) +$ git merge kbuild/for-next +Removing scripts/test_dwarf5_support.sh +Removing scripts/Makefile.modsign +Auto-merging arch/arm64/Kconfig +Auto-merging Makefile +Merge made by the 'recursive' strategy. + .gitignore | 2 + + Documentation/devicetree/bindings/Makefile | 2 +- + Documentation/dontdiff | 2 + + Documentation/kbuild/Kconfig.recursion-issue-02 | 2 +- + Documentation/kbuild/kconfig-language.rst | 23 +- + Documentation/kbuild/kconfig.rst | 8 + + Makefile | 231 ++++++-------- + arch/Kconfig | 3 +- + arch/arm64/Kconfig | 3 + + arch/arm64/Makefile | 2 +- + init/Kconfig | 75 +++-- + kernel/configs/tiny-base.config | 1 + + lib/Kconfig.debug | 13 +- + scripts/Kbuild.include | 80 ----- + scripts/Kconfig.include | 6 + + scripts/Makefile.asm-generic | 4 +- + scripts/Makefile.build | 15 +- + scripts/Makefile.clean | 2 +- + scripts/Makefile.compiler | 75 +++++ + scripts/Makefile.dtbinst | 2 +- + scripts/Makefile.headersinst | 2 +- + scripts/Makefile.lib | 16 +- + scripts/Makefile.modinst | 113 ++++++- + scripts/Makefile.modpost | 32 +- + scripts/Makefile.modsign | 29 -- + scripts/as-version.sh | 82 +++++ + scripts/cc-version.sh | 20 +- + scripts/dummy-tools/gcc | 6 + + scripts/kconfig/Makefile | 17 +- + scripts/kconfig/conf.c | 353 ++++++++++++++++----- + scripts/kconfig/confdata.c | 231 ++------------ + scripts/kconfig/expr.h | 6 - + scripts/kconfig/lexer.l | 3 - + scripts/kconfig/lkc.h | 5 - + scripts/kconfig/lxdialog/util.c | 4 +- + scripts/kconfig/mconf.c | 2 + + scripts/kconfig/menu.c | 22 -- + scripts/kconfig/parser.y | 20 +- + scripts/kconfig/streamline_config.pl | 4 +- + scripts/kconfig/symbol.c | 1 - + scripts/kconfig/tests/choice/Kconfig | 2 +- + .../kconfig/tests/choice_value_with_m_dep/Kconfig | 2 +- + scripts/kconfig/tests/conftest.py | 4 + + scripts/kconfig/tests/inter_choice/Kconfig | 2 +- + scripts/ld-version.sh | 11 +- + scripts/link-vmlinux.sh | 12 + + scripts/min-tool-version.sh | 39 +++ + scripts/mod/modpost.c | 48 +-- + scripts/modules-check.sh | 4 +- + scripts/test_dwarf5_support.sh | 8 - + 50 files changed, 913 insertions(+), 738 deletions(-) + create mode 100644 kernel/configs/tiny-base.config + create mode 100644 scripts/Makefile.compiler + delete mode 100644 scripts/Makefile.modsign + create mode 100755 scripts/as-version.sh + create mode 100755 scripts/min-tool-version.sh + delete mode 100755 scripts/test_dwarf5_support.sh +Merging compiler-attributes/compiler-attributes (19c329f68089 Linux 5.11-rc4) +$ git merge compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/for-next (a7f3d3d3600c dma-mapping: add unlikely hint to error path in dma_mapping_error) +$ git merge dma-mapping/for-next +Merge made by the 'recursive' strategy. + Documentation/core-api/dma-api.rst | 88 ++++++++++++++ + drivers/iommu/dma-iommu.c | 103 ++++++++++++----- + drivers/media/usb/uvc/uvc_video.c | 94 +++++++++++---- + drivers/media/usb/uvc/uvcvideo.h | 5 +- + include/linux/dma-map-ops.h | 19 +++ + include/linux/dma-mapping.h | 37 +++++- + kernel/dma/map_benchmark.c | 23 ++-- + kernel/dma/mapping.c | 148 ++++++++++++++++++++++-- + tools/testing/selftests/dma/dma_map_benchmark.c | 22 +++- + 9 files changed, 456 insertions(+), 83 deletions(-) +Merging asm-generic/master (38489db09b10 Merge branch 'asm-generic-fixes' into asm-generic) +$ git merge asm-generic/master +Already up to date! +Merge made by the 'recursive' strategy. +Merging arc/for-next (def9d2780727 Linux 5.5-rc7) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (0ae6d1f52670 Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Removing arch/arm/tools/syscalltbl.sh +Removing arch/arm/tools/syscallhdr.sh +Merge made by the 'recursive' strategy. + arch/arm/boot/compressed/Makefile | 4 +- + arch/arm/include/asm/kexec.h | 3 - + arch/arm/include/asm/memory.h | 15 -- + arch/arm/include/uapi/asm/Kbuild | 1 - + arch/arm/include/uapi/asm/unistd.h | 1 - + arch/arm/kernel/entry-common.S | 8 +- + arch/arm/kernel/hw_breakpoint.c | 2 +- + arch/arm/kernel/machine_kexec.c | 8 - + arch/arm/kernel/suspend.c | 19 ++- + arch/arm/mm/cache-v7.S | 58 +++---- + arch/arm/mm/proc-v7.S | 39 +++-- + arch/arm/probes/kprobes/test-arm.c | 294 ++++++++++++++++++------------------ + arch/arm/probes/kprobes/test-core.h | 1 + + arch/arm/tools/Makefile | 26 ++-- + arch/arm/tools/syscallhdr.sh | 31 ---- + arch/arm/tools/syscalltbl.sh | 22 --- + 16 files changed, 229 insertions(+), 303 deletions(-) + delete mode 100644 arch/arm/tools/syscallhdr.sh + delete mode 100644 arch/arm/tools/syscalltbl.sh +Merging arm64/for-next/core (a4fa7f234576 Merge branches 'for-next/misc', 'for-next/kselftest', 'for-next/xntable', 'for-next/vdso', 'for-next/fiq', 'for-next/epan' and 'for-next/kasan-vmalloc' into for-next/core) +$ git merge arm64/for-next/core +Auto-merging arch/arm64/mm/mmu.c +Auto-merging arch/arm64/kernel/stacktrace.c +Auto-merging arch/arm64/kernel/process.c +Auto-merging arch/arm64/kernel/cpufeature.c +Auto-merging arch/arm64/include/asm/cpucaps.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/cpucaps.h +Auto-merging arch/arm64/Kconfig +Resolved 'arch/arm64/include/asm/cpucaps.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master aa47bfd81d7e] Merge remote-tracking branch 'arm64/for-next/core' +$ git diff -M --stat --summary HEAD^.. + Documentation/arm64/tagged-address-abi.rst | 2 +- + arch/arm64/Kconfig | 21 +- + arch/arm64/configs/defconfig | 1 + + arch/arm64/include/asm/arch_gicv3.h | 2 +- + arch/arm64/include/asm/arch_timer.h | 21 -- + arch/arm64/include/asm/assembler.h | 8 +- + arch/arm64/include/asm/barrier.h | 23 +- + arch/arm64/include/asm/cpucaps.h | 3 +- + arch/arm64/include/asm/daifflags.h | 10 +- + arch/arm64/include/asm/irq.h | 4 + + arch/arm64/include/asm/irq_work.h | 2 + + arch/arm64/include/asm/irqflags.h | 16 +- + arch/arm64/include/asm/pgalloc.h | 19 +- + arch/arm64/include/asm/pgtable-hwdef.h | 15 ++ + arch/arm64/include/asm/pgtable-prot.h | 5 +- + arch/arm64/include/asm/pgtable.h | 31 ++- + arch/arm64/include/asm/smp.h | 1 + + arch/arm64/include/asm/stacktrace.h | 24 +-- + arch/arm64/include/asm/sysreg.h | 3 +- + arch/arm64/include/asm/vdso/gettimeofday.h | 6 +- + arch/arm64/kernel/cpufeature.c | 12 ++ + arch/arm64/kernel/entry.S | 128 +++++------ + arch/arm64/kernel/irq.c | 35 ++- + arch/arm64/kernel/kaslr.c | 18 +- + arch/arm64/kernel/module.c | 16 +- + arch/arm64/kernel/process.c | 2 +- + arch/arm64/kernel/smp.c | 1 + + arch/arm64/kernel/stacktrace.c | 24 +++ + arch/arm64/kernel/vdso.c | 22 +- + arch/arm64/mm/fault.c | 18 +- + arch/arm64/mm/kasan_init.c | 29 ++- + arch/arm64/mm/mmu.c | 41 +++- + arch/arm64/mm/proc.S | 48 ++--- + include/linux/irq.h | 2 + + mm/mmap.c | 6 + + tools/testing/selftests/arm64/Makefile | 2 +- + tools/testing/selftests/arm64/bti/.gitignore | 2 + + tools/testing/selftests/arm64/bti/Makefile | 61 ++++++ + tools/testing/selftests/arm64/bti/assembler.h | 80 +++++++ + tools/testing/selftests/arm64/bti/btitest.h | 23 ++ + tools/testing/selftests/arm64/bti/compiler.h | 21 ++ + tools/testing/selftests/arm64/bti/gen/.gitignore | 2 + + tools/testing/selftests/arm64/bti/signal.c | 37 ++++ + tools/testing/selftests/arm64/bti/signal.h | 21 ++ + tools/testing/selftests/arm64/bti/start.S | 14 ++ + tools/testing/selftests/arm64/bti/syscall.S | 23 ++ + tools/testing/selftests/arm64/bti/system.c | 22 ++ + tools/testing/selftests/arm64/bti/system.h | 28 +++ + tools/testing/selftests/arm64/bti/test.c | 234 +++++++++++++++++++++ + tools/testing/selftests/arm64/bti/teststubs.S | 39 ++++ + tools/testing/selftests/arm64/bti/trampoline.S | 29 +++ + tools/testing/selftests/arm64/mte/Makefile | 15 +- + .../selftests/arm64/mte/check_ksm_options.c | 5 +- + tools/testing/selftests/arm64/mte/check_user_mem.c | 3 +- + .../testing/selftests/arm64/mte/mte_common_util.c | 39 ++-- + 55 files changed, 1072 insertions(+), 247 deletions(-) + create mode 100644 tools/testing/selftests/arm64/bti/.gitignore + create mode 100644 tools/testing/selftests/arm64/bti/Makefile + create mode 100644 tools/testing/selftests/arm64/bti/assembler.h + create mode 100644 tools/testing/selftests/arm64/bti/btitest.h + create mode 100644 tools/testing/selftests/arm64/bti/compiler.h + create mode 100644 tools/testing/selftests/arm64/bti/gen/.gitignore + create mode 100644 tools/testing/selftests/arm64/bti/signal.c + create mode 100644 tools/testing/selftests/arm64/bti/signal.h + create mode 100644 tools/testing/selftests/arm64/bti/start.S + create mode 100644 tools/testing/selftests/arm64/bti/syscall.S + create mode 100644 tools/testing/selftests/arm64/bti/system.c + create mode 100644 tools/testing/selftests/arm64/bti/system.h + create mode 100644 tools/testing/selftests/arm64/bti/test.c + create mode 100644 tools/testing/selftests/arm64/bti/teststubs.S + create mode 100644 tools/testing/selftests/arm64/bti/trampoline.S +Merging arm-perf/for-next/perf (2c2e21e78a94 arm64: perf: Remove redundant initialization in perf_event.c) +$ git merge arm-perf/for-next/perf +Merge made by the 'recursive' strategy. + Documentation/admin-guide/perf/hisi-pmu.rst | 54 +++ + arch/arm64/kernel/perf_event.c | 5 +- + drivers/perf/arm-cci.c | 12 +- + drivers/perf/arm-ccn.c | 31 +- + drivers/perf/arm-cmn.c | 22 +- + drivers/perf/arm_dmc620_pmu.c | 2 +- + drivers/perf/arm_dsu_pmu.c | 5 +- + drivers/perf/arm_pmu_platform.c | 54 ++- + drivers/perf/arm_smmuv3_pmu.c | 36 +- + drivers/perf/arm_spe_pmu.c | 3 +- + drivers/perf/fsl_imx8_ddr_perf.c | 7 +- + drivers/perf/hisilicon/Makefile | 3 +- + drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c | 348 +++++++++++------ + drivers/perf/hisilicon/hisi_uncore_hha_pmu.c | 301 ++++++++++----- + drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c | 355 ++++++++++++----- + drivers/perf/hisilicon/hisi_uncore_pa_pmu.c | 500 ++++++++++++++++++++++++ + drivers/perf/hisilicon/hisi_uncore_pmu.c | 79 +++- + drivers/perf/hisilicon/hisi_uncore_pmu.h | 20 +- + drivers/perf/hisilicon/hisi_uncore_sllc_pmu.c | 530 ++++++++++++++++++++++++++ + drivers/perf/qcom_l2_pmu.c | 2 +- + drivers/perf/qcom_l3_pmu.c | 4 +- + drivers/perf/thunderx2_pmu.c | 4 +- + drivers/perf/xgene_pmu.c | 4 +- + include/linux/cpuhotplug.h | 2 + + 24 files changed, 1959 insertions(+), 424 deletions(-) + create mode 100644 drivers/perf/hisilicon/hisi_uncore_pa_pmu.c + create mode 100644 drivers/perf/hisilicon/hisi_uncore_sllc_pmu.c +Merging arm-soc/for-next (73a049e384c8 soc: document merges) +$ git merge arm-soc/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/mach-omap2/sr_device.c +Removing arch/arm/mach-omap2/omap_hwmod_7xx_data.c +Removing arch/arm/mach-omap2/omap_hwmod_54xx_data.c +Removing arch/arm/mach-omap2/omap_hwmod_44xx_data.c +Removing arch/arm/boot/dts/stm32h743-pinctrl.dtsi +Removing arch/arm/boot/dts/ste-href-tvk1281618.dtsi +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + Documentation/arm/index.rst | 1 + + Documentation/arm/stm32/stm32h750-overview.rst | 34 + + .../devicetree/bindings/arm/bcm/brcm,bcm4908.yaml | 1 + + .../arm/bcm/raspberrypi,bcm2835-firmware.yaml | 20 + + Documentation/devicetree/bindings/arm/fsl.yaml | 16 + + .../devicetree/bindings/arm/mediatek.yaml | 36 + + Documentation/devicetree/bindings/arm/qcom.yaml | 18 + + .../devicetree/bindings/arm/stm32/stm32.yaml | 21 + + Documentation/devicetree/bindings/arm/sunxi.yaml | 5 + + .../devicetree/bindings/clock/imx8qxp-lpcg.yaml | 6 +- + .../devicetree/bindings/mailbox/fsl,mu.yaml | 5 +- + .../devicetree/bindings/nvmem/mtk-efuse.txt | 1 + + .../bindings/phy/nvidia,tegra124-xusb-padctl.txt | 1 + + .../devicetree/bindings/power/brcm,bcm-pmb.yaml | 1 + + .../devicetree/bindings/serial/mtk-uart.txt | 1 + + .../devicetree/bindings/serial/st,stm32-uart.yaml | 3 +- + .../devicetree/bindings/soc/mediatek/pwrap.txt | 1 + + .../bindings/timer/mediatek,mtk-timer.txt | 1 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm/Kconfig | 2 +- + arch/arm/Kconfig.debug | 6 +- + arch/arm/Makefile | 2 +- + arch/arm/arm-soc-for-next-contents.txt | 125 +++ + arch/arm/boot/dts/Makefile | 11 +- + arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 4 +- + arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 4 +- + arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 4 +- + arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts | 5 + + arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 4 +- + arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 4 +- + arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 4 +- + arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 4 +- + arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 4 +- + arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 4 +- + arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 5 + + arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts | 4 +- + arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 4 +- + arch/arm/boot/dts/bcm4709-linksys-ea9200.dts | 9 +- + arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 4 +- + arch/arm/boot/dts/bcm4709-netgear-r8000.dts | 4 +- + arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 4 +- + arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 26 +- + arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts | 9 +- + arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts | 9 +- + arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts | 4 +- + arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 9 +- + arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts | 9 +- + arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 4 +- + arch/arm/boot/dts/bcm47094-phicomm-k3.dts | 4 +- + arch/arm/boot/dts/dra7-l4.dtsi | 75 +- + arch/arm/boot/dts/dra7.dtsi | 220 ++++-- + arch/arm/boot/dts/ep7209.dtsi | 17 +- + arch/arm/boot/dts/ep7211-edb7211.dts | 2 +- + arch/arm/boot/dts/imx50-kobo-aura.dts | 16 +- + arch/arm/boot/dts/imx51.dtsi | 2 +- + arch/arm/boot/dts/imx53-qsb-common.dtsi | 2 + + arch/arm/boot/dts/imx53.dtsi | 2 +- + arch/arm/boot/dts/imx6dl-plybas.dts | 6 +- + arch/arm/boot/dts/imx6q-b450v3.dts | 5 + + arch/arm/boot/dts/imx6q-b650v3.dts | 5 + + arch/arm/boot/dts/imx6q-b850v3.dts | 5 + + arch/arm/boot/dts/imx6q-ba16.dtsi | 21 + + arch/arm/boot/dts/imx6q-bx50v3.dtsi | 12 +- + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-gw560x.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-gw5903.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-gw5904.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-gw5907.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-gw5910.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-gw5912.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-gw5913.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 38 +- + arch/arm/boot/dts/imx6qdl-ts7970.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 24 +- + arch/arm/boot/dts/imx6sl-tolino-shine2hd.dts | 7 +- + arch/arm/boot/dts/imx6ull-colibri.dtsi | 12 +- + arch/arm/boot/dts/imx7d-mba7.dts | 2 - + arch/arm/boot/dts/imx7d-remarkable2.dts | 146 ++++ + arch/arm/boot/dts/iwg20d-q7-common.dtsi | 4 +- + arch/arm/boot/dts/ls1021a.dtsi | 3 +- + arch/arm/boot/dts/mstar-v7.dtsi | 23 + + arch/arm/boot/dts/mt2701.dtsi | 19 +- + arch/arm/boot/dts/mt6589.dtsi | 1 + + arch/arm/boot/dts/mt7623.dtsi | 26 +- + arch/arm/boot/dts/mt7623n.dtsi | 4 +- + arch/arm/boot/dts/mt7629.dtsi | 12 +- + arch/arm/boot/dts/omap4-l4.dtsi | 43 +- + arch/arm/boot/dts/omap4.dtsi | 169 ++-- + arch/arm/boot/dts/omap4460.dtsi | 13 +- + arch/arm/boot/dts/omap5-l4.dtsi | 67 +- + arch/arm/boot/dts/omap5.dtsi | 204 +++-- + arch/arm/boot/dts/r7s9210-rza2mevb.dts | 55 +- + arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ca.dts | 159 ++-- + .../dts/r8a7742-iwg21d-q7-dbcm-ov5640-single.dtsi | 32 + + .../dts/r8a7742-iwg21d-q7-dbcm-ov7725-single.dtsi | 29 + + arch/arm/boot/dts/r8a7742-iwg21d-q7.dts | 4 +- + arch/arm/boot/dts/r8a7742.dtsi | 4 +- + arch/arm/boot/dts/r8a7743-sk-rzg1m.dts | 2 +- + arch/arm/boot/dts/r8a7743.dtsi | 2 +- + arch/arm/boot/dts/r8a7744.dtsi | 2 +- + arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts | 4 +- + arch/arm/boot/dts/r8a7745-sk-rzg1e.dts | 2 +- + arch/arm/boot/dts/r8a7745.dtsi | 2 +- + arch/arm/boot/dts/r8a77470.dtsi | 2 +- + arch/arm/boot/dts/r8a7790-lager.dts | 11 +- + arch/arm/boot/dts/r8a7790-stout.dts | 4 +- + arch/arm/boot/dts/r8a7790.dtsi | 4 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 19 +- + arch/arm/boot/dts/r8a7791-porter.dts | 6 +- + arch/arm/boot/dts/r8a7791.dtsi | 2 +- + arch/arm/boot/dts/r8a7792-blanche.dts | 2 +- + arch/arm/boot/dts/r8a7792-wheat.dts | 2 +- + arch/arm/boot/dts/r8a7792.dtsi | 2 +- + arch/arm/boot/dts/r8a7793-gose.dts | 11 +- + arch/arm/boot/dts/r8a7793.dtsi | 2 +- + arch/arm/boot/dts/r8a7794-alt.dts | 5 +- + arch/arm/boot/dts/r8a7794-silk.dts | 8 +- + arch/arm/boot/dts/r8a7794.dtsi | 2 +- + arch/arm/boot/dts/ste-ab8500.dtsi | 4 +- + arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi | 214 ++++- + arch/arm/boot/dts/ste-href-tvk1281618-r3.dtsi | 210 ++++- + arch/arm/boot/dts/ste-href-tvk1281618.dtsi | 218 ----- + arch/arm/boot/dts/ste-href520-tvk.dts | 4 +- + arch/arm/boot/dts/ste-hrefprev60-tvk.dts | 2 +- + arch/arm/boot/dts/ste-hrefv60plus-tvk.dts | 4 +- + arch/arm/boot/dts/ste-ux500-samsung-janice.dts | 48 +- + arch/arm/boot/dts/stm32h7-pinctrl.dtsi | 275 +++++++ + arch/arm/boot/dts/stm32h743-pinctrl.dtsi | 306 ------- + arch/arm/boot/dts/stm32h743.dtsi | 177 ++++- + arch/arm/boot/dts/stm32h743i-disco.dts | 2 +- + arch/arm/boot/dts/stm32h743i-eval.dts | 2 +- + arch/arm/boot/dts/stm32h750.dtsi | 6 + + arch/arm/boot/dts/stm32h750i-art-pi.dts | 229 ++++++ + arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 21 +- + arch/arm/boot/dts/stm32mp151.dtsi | 8 + + arch/arm/boot/dts/stm32mp153c-dhcom-drc02.dts | 4 + + .../dts/stm32mp157a-icore-stm32mp1-ctouch2.dts | 47 ++ + .../dts/stm32mp157a-icore-stm32mp1-edimm2.2.dts | 47 ++ + arch/arm/boot/dts/stm32mp157a-icore-stm32mp1.dtsi | 196 +++++ + ...m32mp157a-microgea-stm32mp1-microdev2.0-of7.dts | 154 ++++ + .../stm32mp157a-microgea-stm32mp1-microdev2.0.dts | 55 ++ + .../boot/dts/stm32mp157a-microgea-stm32mp1.dtsi | 148 ++++ + arch/arm/boot/dts/stm32mp157c-dhcom-pdk2.dts | 4 + + arch/arm/boot/dts/stm32mp157c-dhcom-picoitx.dts | 4 + + arch/arm/boot/dts/stm32mp15xx-dhcom-drc02.dtsi | 12 +- + arch/arm/boot/dts/stm32mp15xx-dhcom-picoitx.dtsi | 12 +- + arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 64 ++ + arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi | 35 + + arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi | 4 + + arch/arm/boot/dts/sun4i-a10-topwise-a721.dts | 242 ++++++ + arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 2 +- + arch/arm/boot/dts/sun6i-a31-m9.dts | 2 +- + arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts | 2 +- + arch/arm/boot/dts/sun6i-a31.dtsi | 6 +- + arch/arm/boot/dts/sun6i-a31s-primo81.dts | 2 +- + arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi | 2 +- + arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 2 +- + .../dts/sun6i-a31s-yones-toptech-bs1078-v2.dts | 2 +- + .../boot/dts/sun6i-reference-design-tablet.dtsi | 2 +- + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 6 +- + arch/arm/boot/dts/sun8i-a33-olinuxino.dts | 2 +- + arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 2 +- + .../boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts | 4 +- + arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts | 4 +- + arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts | 4 +- + arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 4 +- + arch/arm/boot/dts/sun8i-a83t.dtsi | 5 +- + .../boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts | 25 + + arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 11 + + arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts | 2 +- + arch/arm/boot/dts/sun8i-r16-parrot.dts | 2 +- + .../boot/dts/sun8i-reference-design-tablet.dtsi | 2 +- + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 12 + + arch/arm/boot/dts/tegra124-peripherals-opp.dtsi | 5 + + arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 16 +- + arch/arm/boot/dts/tegra20-cpu-opp.dtsi | 2 + + arch/arm/boot/dts/tegra20-paz00.dts | 14 +- + arch/arm/boot/dts/tegra20-peripherals-opp.dtsi | 1 + + arch/arm/boot/dts/tegra20-ventana.dts | 78 +- + arch/arm/boot/dts/tegra30-apalis.dtsi | 1 + + .../dts/tegra30-asus-nexus7-grouper-common.dtsi | 14 +- + .../dts/tegra30-asus-nexus7-grouper-ti-pmic.dtsi | 1 + + arch/arm/boot/dts/tegra30-beaver.dts | 1 + + arch/arm/boot/dts/tegra30-cardhu-a04.dts | 48 -- + arch/arm/boot/dts/tegra30-cardhu.dtsi | 84 +- + arch/arm/boot/dts/tegra30-colibri.dtsi | 1 + + arch/arm/boot/dts/tegra30-cpu-opp.dtsi | 3 + + arch/arm/boot/dts/tegra30-ouya.dts | 16 +- + arch/arm/boot/dts/tegra30-peripherals-opp.dtsi | 3 + + arch/arm/configs/at91_dt_defconfig | 5 +- + arch/arm/configs/ezx_defconfig | 1 - + arch/arm/configs/imote2_defconfig | 1 - + arch/arm/configs/multi_v7_defconfig | 2 +- + arch/arm/configs/pxa_defconfig | 1 - + arch/arm/configs/sama5_defconfig | 51 +- + arch/arm/configs/shmobile_defconfig | 1 - + arch/arm/configs/socfpga_defconfig | 2 +- + arch/arm/configs/u8500_defconfig | 14 + + arch/arm/mach-at91/pm.c | 19 +- + arch/arm/mach-imx/Kconfig | 2 +- + arch/arm/mach-imx/pm-imx5.c | 2 +- + arch/arm/mach-mstar/Kconfig | 1 + + arch/arm/mach-omap2/Kconfig | 3 - + arch/arm/mach-omap2/Makefile | 11 +- + arch/arm/mach-omap2/common.h | 9 - + arch/arm/mach-omap2/io.c | 12 +- + arch/arm/mach-omap2/omap_hwmod.c | 8 - + arch/arm/mach-omap2/omap_hwmod.h | 14 +- + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 877 --------------------- + arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 467 ----------- + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 719 ----------------- + arch/arm/mach-omap2/pdata-quirks.c | 31 +- + arch/arm/mach-omap2/sr_device.c | 7 + + arch/arm/mach-socfpga/Kconfig | 4 +- + arch/arm/mach-stm32/board-dt.c | 1 + + arch/arm/mach-ux500/platsmp.c | 2 +- + arch/arm64/Kconfig.platforms | 17 +- + .../dts/allwinner/sun50i-a64-amarula-relic.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-nanopi-a64.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-olinuxino.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 2 +- + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 2 +- + .../boot/dts/allwinner/sun50i-a64-pinetab.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 2 +- + .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 2 +- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 6 +- + .../boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 40 +- + .../boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 16 +- + .../boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 24 +- + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 4 +- + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 8 +- + arch/arm64/boot/dts/altera/Makefile | 2 +- + arch/arm64/boot/dts/arm/juno-base.dtsi | 5 +- + arch/arm64/boot/dts/arm/juno-r1.dts | 4 + + arch/arm64/boot/dts/arm/juno-r2.dts | 4 + + arch/arm64/boot/dts/broadcom/bcm4908/Makefile | 1 + + .../broadcom/bcm4908/bcm4906-netgear-r8000p.dts | 107 ++- + .../bcm4908/bcm4906-tplink-archer-c2300-v1.dts | 182 +++++ + .../broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts | 44 +- + arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | 47 +- + arch/arm64/boot/dts/freescale/Makefile | 4 + + .../dts/freescale/fsl-ls1028a-kontron-sl28.dts | 80 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 1 + + arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 1 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 12 +- + .../arm64/boot/dts/freescale/fsl-lx2160a-cex7.dtsi | 24 + + .../dts/freescale/fsl-lx2160a-clearfog-itx.dtsi | 64 ++ + arch/arm64/boot/dts/freescale/imx8-ss-adma.dtsi | 8 + + arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi | 68 ++ + arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi | 184 +++++ + arch/arm64/boot/dts/freescale/imx8-ss-ddr.dtsi | 18 + + arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi | 202 +++++ + arch/arm64/boot/dts/freescale/imx8-ss-lsio.dtsi | 311 ++++++++ + .../dts/freescale/imx8mm-icore-mx8mm-ctouch2.dts | 97 +++ + .../dts/freescale/imx8mm-icore-mx8mm-edimm2.2.dts | 97 +++ + .../boot/dts/freescale/imx8mm-icore-mx8mm.dtsi | 232 ++++++ + .../boot/dts/freescale/imx8mm-nitrogen-r2.dts | 314 +++++++- + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 2 +- + .../boot/dts/freescale/imx8mn-beacon-som.dtsi | 6 +- + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 2 + + .../dts/freescale/imx8mp-phyboard-pollux-rdk.dts | 56 +- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 39 + + .../dts/freescale/imx8mq-kontron-pitx-imx8m.dts | 613 ++++++++++++++ + .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 70 +- + .../arm64/boot/dts/freescale/imx8mq-librem5-r2.dts | 2 +- + .../arm64/boot/dts/freescale/imx8mq-librem5-r3.dts | 4 + + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 24 +- + arch/arm64/boot/dts/freescale/imx8qm-mek.dts | 144 ++++ + arch/arm64/boot/dts/freescale/imx8qm-ss-conn.dtsi | 21 + + arch/arm64/boot/dts/freescale/imx8qm-ss-dma.dtsi | 51 ++ + arch/arm64/boot/dts/freescale/imx8qm-ss-lsio.dtsi | 61 ++ + arch/arm64/boot/dts/freescale/imx8qm.dtsi | 176 +++++ + arch/arm64/boot/dts/freescale/imx8qxp-ai_ml.dts | 20 +- + .../dts/freescale/imx8qxp-colibri-eval-v3.dtsi | 8 +- + arch/arm64/boot/dts/freescale/imx8qxp-colibri.dtsi | 12 +- + arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 50 +- + arch/arm64/boot/dts/freescale/imx8qxp-ss-adma.dtsi | 37 + + arch/arm64/boot/dts/freescale/imx8qxp-ss-conn.dtsi | 25 + + arch/arm64/boot/dts/freescale/imx8qxp-ss-lsio.dtsi | 61 ++ + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 423 +--------- + arch/arm64/boot/dts/intel/Makefile | 6 +- + arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 222 +++--- + arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts | 14 +- + .../boot/dts/intel/socfpga_agilex_socdk_nand.dts | 18 +- + arch/arm64/boot/dts/intel/socfpga_n5x_socdk.dts | 12 +- + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 3 +- + arch/arm64/boot/dts/marvell/armada-7040-db.dts | 14 +- + .../dts/marvell/armada-8040-clearfog-gt-8k.dts | 127 +++ + arch/arm64/boot/dts/marvell/armada-8040-db.dts | 21 +- + arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi | 19 +- + arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 19 + + arch/arm64/boot/dts/marvell/cn9130-db.dts | 12 +- + arch/arm64/boot/dts/marvell/cn9131-db.dts | 9 +- + arch/arm64/boot/dts/marvell/cn9132-db.dts | 11 +- + arch/arm64/boot/dts/mediatek/Makefile | 8 + + arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 8 +- + arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 12 + + arch/arm64/boot/dts/mediatek/mt7622.dtsi | 9 +- + arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 6 +- + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 15 +- + arch/arm64/boot/dts/mediatek/mt8183-evb.dts | 4 + + .../dts/mediatek/mt8183-kukui-jacuzzi-damu.dts | 31 + + .../mt8183-kukui-jacuzzi-juniper-sku16.dts | 13 + + .../dts/mediatek/mt8183-kukui-jacuzzi-juniper.dtsi | 27 + + .../boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi | 474 +++++++++++ + .../boot/dts/mediatek/mt8183-kukui-kakadu.dts | 13 + + .../boot/dts/mediatek/mt8183-kukui-kakadu.dtsi | 378 +++++++++ + .../dts/mediatek/mt8183-kukui-kodama-sku16.dts | 21 + + .../dts/mediatek/mt8183-kukui-kodama-sku272.dts | 21 + + .../dts/mediatek/mt8183-kukui-kodama-sku288.dts | 21 + + .../dts/mediatek/mt8183-kukui-kodama-sku32.dts | 21 + + .../boot/dts/mediatek/mt8183-kukui-kodama.dtsi | 343 ++++++++ + arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts | 378 +++++++++ + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 158 +++- + arch/arm64/boot/dts/mediatek/mt8516.dtsi | 9 +- + arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi | 3 +- + arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 2 +- + arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 2 +- + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 2 +- + arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 3 +- + .../arm64/boot/dts/nvidia/tegra194-p3668-0000.dtsi | 4 + + .../arm64/boot/dts/nvidia/tegra194-p3668-0001.dtsi | 4 + + arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi | 1 - + arch/arm64/boot/dts/qcom/Makefile | 13 + + arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 2 +- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 4 +- + arch/arm64/boot/dts/qcom/msm8994.dtsi | 4 +- + arch/arm64/boot/dts/qcom/pm8150.dtsi | 4 +- + arch/arm64/boot/dts/qcom/pm8350.dtsi | 25 + + arch/arm64/boot/dts/qcom/pm8350b.dtsi | 25 + + arch/arm64/boot/dts/qcom/pm8350c.dtsi | 25 + + arch/arm64/boot/dts/qcom/pmk8350.dtsi | 25 + + arch/arm64/boot/dts/qcom/pmr735a.dtsi | 25 + + arch/arm64/boot/dts/qcom/pmr735b.dtsi | 25 + + arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 18 +- + .../boot/dts/qcom/sc7180-trogdor-coachz-r1-lte.dts | 18 + + .../boot/dts/qcom/sc7180-trogdor-coachz-r1.dts | 154 ++++ + .../boot/dts/qcom/sc7180-trogdor-coachz-r2-lte.dts | 18 + + .../boot/dts/qcom/sc7180-trogdor-coachz-r2.dts | 15 + + .../arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 240 ++++++ + .../qcom/sc7180-trogdor-lazor-limozeen-nots-r4.dts | 34 + + .../qcom/sc7180-trogdor-lazor-limozeen-nots.dts | 26 + + .../dts/qcom/sc7180-trogdor-lazor-limozeen.dts | 42 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r0.dts | 9 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 9 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts | 5 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts | 4 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r3.dts | 10 + + arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 39 +- + .../boot/dts/qcom/sc7180-trogdor-pompom-r1-lte.dts | 14 + + .../boot/dts/qcom/sc7180-trogdor-pompom-r1.dts | 26 + + .../boot/dts/qcom/sc7180-trogdor-pompom-r2-lte.dts | 14 + + .../boot/dts/qcom/sc7180-trogdor-pompom-r2.dts | 44 ++ + .../arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 288 +++++++ + arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 35 +- + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 162 ++-- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 51 +- + arch/arm64/boot/dts/qcom/sc7280-idp.dts | 47 ++ + arch/arm64/boot/dts/qcom/sc7280.dtsi | 608 ++++++++++++++ + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 27 +- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 139 +++- + arch/arm64/boot/dts/qcom/sm8150.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 4 - + arch/arm64/boot/dts/qcom/sm8250.dtsi | 548 +++++++------ + arch/arm64/boot/dts/qcom/sm8350-hdk.dts | 319 ++++++++ + arch/arm64/boot/dts/qcom/sm8350-mtp.dts | 116 +++ + arch/arm64/boot/dts/qcom/sm8350.dtsi | 726 ++++++++++++++++- + .../boot/dts/renesas/beacon-renesom-baseboard.dtsi | 4 +- + arch/arm64/boot/dts/renesas/hihope-common.dtsi | 3 + + arch/arm64/boot/dts/renesas/hihope-rev4.dtsi | 2 +- + .../boot/dts/renesas/r8a774a1-beacon-rzg2m-kit.dts | 3 + + .../boot/dts/renesas/r8a774b1-beacon-rzg2n-kit.dts | 3 + + arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts | 6 +- + .../boot/dts/renesas/r8a774e1-beacon-rzg2h-kit.dts | 3 + + .../arm64/boot/dts/renesas/r8a77950-salvator-x.dts | 37 +- + arch/arm64/boot/dts/renesas/r8a77950.dtsi | 5 + + .../arm64/boot/dts/renesas/r8a77951-salvator-x.dts | 37 +- + .../boot/dts/renesas/r8a77951-salvator-xs.dts | 37 +- + .../arm64/boot/dts/renesas/r8a77960-salvator-x.dts | 46 -- + .../boot/dts/renesas/r8a77960-salvator-xs.dts | 46 -- + .../boot/dts/renesas/r8a77961-salvator-xs.dts | 46 -- + arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts | 11 + + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 340 +++++++- + .../arm64/boot/dts/renesas/r8a77965-salvator-x.dts | 45 -- + .../boot/dts/renesas/r8a77965-salvator-xs.dts | 45 -- + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 16 +- + arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 9 +- + .../boot/dts/renesas/r8a779a0-falcon-cpu.dtsi | 79 +- + .../boot/dts/renesas/r8a779a0-falcon-csi-dsi.dtsi | 15 + + .../boot/dts/renesas/r8a779a0-falcon-ethernet.dtsi | 15 + + arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts | 50 +- + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 263 +++++- + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 52 +- + arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 1 + + arch/arm64/boot/dts/renesas/ulcb.dtsi | 12 +- + arch/arm64/configs/defconfig | 35 +- + drivers/bus/ti-sysc.c | 87 +- + drivers/clk/Kconfig | 1 + + drivers/clk/Makefile | 4 +- + drivers/clk/bcm/clk-raspberrypi.c | 2 +- + drivers/clk/socfpga/Kconfig | 19 + + drivers/clk/socfpga/Makefile | 11 +- + drivers/clk/tegra/clk-pll.c | 12 - + drivers/clk/tegra/clk-tegra210.c | 53 +- + drivers/clk/ti/clk-54xx.c | 2 + + drivers/dma/Kconfig | 2 +- + drivers/edac/Kconfig | 2 +- + drivers/edac/altera_edac.c | 17 +- + drivers/firmware/Kconfig | 2 +- + drivers/firmware/imx/scu-pd.c | 41 +- + drivers/firmware/raspberrypi.c | 69 +- + drivers/fpga/Kconfig | 8 +- + drivers/gpio/gpio-raspberrypi-exp.c | 2 +- + drivers/i2c/busses/Kconfig | 2 +- + drivers/input/touchscreen/raspberrypi-ts.c | 2 +- + drivers/mfd/Kconfig | 4 +- + drivers/net/ethernet/stmicro/stmmac/Kconfig | 4 +- + drivers/pci/controller/dwc/pci-dra7xx.c | 13 +- + drivers/pinctrl/pinctrl-at91.c | 2 + + drivers/pwm/Kconfig | 9 + + drivers/pwm/Makefile | 1 + + drivers/pwm/pwm-raspberrypi-poe.c | 206 +++++ + drivers/reset/Kconfig | 6 +- + drivers/reset/reset-raspberrypi.c | 2 +- + drivers/soc/bcm/bcm63xx/bcm-pmb.c | 30 + + drivers/soc/bcm/raspberrypi-power.c | 2 +- + drivers/soc/imx/soc-imx.c | 12 + + drivers/soc/mediatek/mt8167-pm-domains.h | 7 + + drivers/soc/mediatek/mt8173-pm-domains.h | 10 + + drivers/soc/mediatek/mt8183-mmsys.h | 54 ++ + drivers/soc/mediatek/mt8183-pm-domains.h | 15 + + drivers/soc/mediatek/mt8192-pm-domains.h | 21 + + drivers/soc/mediatek/mtk-mmsys.c | 303 ++----- + drivers/soc/mediatek/mtk-mmsys.h | 215 +++++ + drivers/soc/mediatek/mtk-mutex.c | 52 +- + drivers/soc/mediatek/mtk-pm-domains.c | 11 +- + drivers/soc/mediatek/mtk-pm-domains.h | 2 + + drivers/soc/mediatek/mtk-pmic-wrap.c | 97 ++- + drivers/soc/renesas/rmobile-sysc.c | 4 +- + drivers/soc/tegra/pmc.c | 259 +++++- + drivers/soc/tegra/regulators-tegra30.c | 2 +- + drivers/soc/ti/omap_prm.c | 16 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 2 +- + drivers/tee/optee/Makefile | 3 + + drivers/tee/optee/call.c | 4 + + drivers/tee/optee/core.c | 10 - + drivers/tee/optee/optee_trace.h | 67 ++ + include/dt-bindings/clock/omap5.h | 2 + + .../dt-bindings/pwm/raspberrypi,firmware-poe-pwm.h | 13 + + include/dt-bindings/soc/bcm-pmb.h | 1 + + include/linux/clk/tegra.h | 4 +- + include/soc/at91/pm.h | 16 + + include/soc/bcm2835/raspberrypi-firmware.h | 10 + + 462 files changed, 15773 insertions(+), 5473 deletions(-) + create mode 100644 Documentation/arm/stm32/stm32h750-overview.rst + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/imx7d-remarkable2.dts + create mode 100644 arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ov5640-single.dtsi + create mode 100644 arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ov7725-single.dtsi + delete mode 100644 arch/arm/boot/dts/ste-href-tvk1281618.dtsi + create mode 100644 arch/arm/boot/dts/stm32h7-pinctrl.dtsi + delete mode 100644 arch/arm/boot/dts/stm32h743-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/stm32h750.dtsi + create mode 100644 arch/arm/boot/dts/stm32h750i-art-pi.dts + create mode 100644 arch/arm/boot/dts/stm32mp157a-icore-stm32mp1-ctouch2.dts + create mode 100644 arch/arm/boot/dts/stm32mp157a-icore-stm32mp1-edimm2.2.dts + create mode 100644 arch/arm/boot/dts/stm32mp157a-icore-stm32mp1.dtsi + create mode 100644 arch/arm/boot/dts/stm32mp157a-microgea-stm32mp1-microdev2.0-of7.dts + create mode 100644 arch/arm/boot/dts/stm32mp157a-microgea-stm32mp1-microdev2.0.dts + create mode 100644 arch/arm/boot/dts/stm32mp157a-microgea-stm32mp1.dtsi + create mode 100644 arch/arm/boot/dts/sun4i-a10-topwise-a721.dts + delete mode 100644 arch/arm/mach-omap2/omap_hwmod_44xx_data.c + delete mode 100644 arch/arm/mach-omap2/omap_hwmod_54xx_data.c + delete mode 100644 arch/arm/mach-omap2/omap_hwmod_7xx_data.c + create mode 100644 arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8-ss-adma.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8-ss-ddr.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8-ss-lsio.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-icore-mx8mm-ctouch2.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-icore-mx8mm-edimm2.2.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-icore-mx8mm.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-kontron-pitx-imx8m.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8qm-mek.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8qm-ss-conn.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8qm-ss-dma.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8qm-ss-lsio.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8qm.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8qxp-ss-adma.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8qxp-ss-conn.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8qxp-ss-lsio.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-damu.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-juniper-sku16.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-juniper.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-kodama-sku16.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-kodama-sku272.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-kodama-sku288.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-kodama-sku32.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-kodama.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts + create mode 100644 arch/arm64/boot/dts/qcom/pm8350.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm8350b.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm8350c.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmk8350.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmr735a.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmr735b.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1-lte.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r2-lte.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r2.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r4.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1-lte.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2-lte.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-idp.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7280.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sm8350-hdk.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779a0-falcon-csi-dsi.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779a0-falcon-ethernet.dtsi + create mode 100644 drivers/clk/socfpga/Kconfig + create mode 100644 drivers/pwm/pwm-raspberrypi-poe.c + create mode 100644 drivers/soc/mediatek/mt8183-mmsys.h + create mode 100644 drivers/soc/mediatek/mtk-mmsys.h + create mode 100644 drivers/tee/optee/optee_trace.h + create mode 100644 include/dt-bindings/pwm/raspberrypi,firmware-poe-pwm.h + create mode 100644 include/soc/at91/pm.h +Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) +$ git merge actions/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/owl-s500-roseapplepi.dts | 132 +++++++++++++++++++++++++++-- + 1 file changed, 126 insertions(+), 6 deletions(-) +Merging amlogic/for-next (b8d408329947 Merge branch 'v5.13/dt64' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/amlogic.yaml | 3 + + arch/arm64/boot/dts/amlogic/Makefile | 3 + + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 6 ++ + .../boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 52 ++++++++- + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 6 ++ + .../dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dts | 86 +++++++++++++++ + .../boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dts | 113 +++++++++++++++++++ + .../boot/dts/amlogic/meson-gxm-minix-neo-u9h.dts | 120 +++++++++++++++++++++ + 8 files changed, 388 insertions(+), 1 deletion(-) + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dts +Merging aspeed/for-next (697dabd5d370 Merge branches 'soc-for-v5.12' and 'dt-for-v5.12' into for-next) +$ git merge aspeed/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging at91/at91-next (969bbb49f36c Merge branch 'at91-dt' into at91-next) +$ git merge at91/at91-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/at91-sam9x60ek.dts | 3 ++- + arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 3 ++- + arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts | 3 ++- + arch/arm/boot/dts/at91-sama5d2_icp.dts | 3 ++- + arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts | 3 ++- + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 3 ++- + arch/arm/boot/dts/at91-sama5d3_xplained.dts | 3 ++- + arch/arm/boot/dts/at91sam9260ek.dts | 3 ++- + arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 3 ++- + arch/arm/boot/dts/sama5d2.dtsi | 4 ++-- + arch/arm/boot/dts/sama5d3.dtsi | 2 +- + 11 files changed, 21 insertions(+), 12 deletions(-) +Merging drivers-memory/for-next (8568dec31b2e Merge branch 'mem-ctrl-next' into for-next) +$ git merge drivers-memory/for-next +Removing Documentation/devicetree/bindings/memory-controllers/nvidia,tegra20-mc.txt +Merge made by the 'recursive' strategy. + .../memory-controllers/nvidia,tegra124-emc.yaml | 7 +- + .../memory-controllers/nvidia,tegra20-emc.txt | 4 +- + .../memory-controllers/nvidia,tegra20-mc.txt | 40 --- + .../memory-controllers/nvidia,tegra20-mc.yaml | 79 +++++ + .../memory-controllers/nvidia,tegra30-emc.yaml | 7 +- + drivers/memory/fsl-corenet-cf.c | 4 +- + drivers/memory/omap-gpmc.c | 7 +- + drivers/memory/pl353-smc.c | 2 +- + drivers/memory/tegra/mc.c | 9 + + drivers/memory/tegra/mc.h | 4 +- + drivers/memory/tegra/tegra124-emc.c | 16 +- + drivers/memory/tegra/tegra20-emc.c | 20 +- + drivers/memory/tegra/tegra20.c | 332 +++++++++++++++++++++ + drivers/memory/tegra/tegra30-emc.c | 18 +- + include/soc/tegra/mc.h | 7 + + 15 files changed, 473 insertions(+), 83 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/nvidia,tegra20-mc.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/nvidia,tegra20-mc.yaml +Merging imx-mxs/for-next (1f0f76f795d5 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging keystone/next (9d2e21ed98a2 Merge branch 'for_5.12/drivers-soc' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (068acd3c4e4c Merge branch 'v5.12-next/dts64-2' into for-next) +$ git merge mediatek/for-next +Merge made by the 'recursive' strategy. + .../bindings/arm/mediatek/mediatek,mmsys.txt | 1 + + arch/arm64/boot/dts/mediatek/mt8167.dtsi | 270 +++++++++++++++++++++ + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 60 ++--- + drivers/soc/mediatek/mt8167-mmsys.h | 35 +++ + drivers/soc/mediatek/mtk-mmsys.c | 11 + + 5 files changed, 348 insertions(+), 29 deletions(-) + create mode 100644 drivers/soc/mediatek/mt8167-mmsys.h +Merging mvebu/for-next (79e93f9dc81a Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/armada-385-atl-x530.dts | 235 ++++++++++++++++++++++++++++++ + 2 files changed, 236 insertions(+) + create mode 100644 arch/arm/boot/dts/armada-385-atl-x530.dts +Merging omap/for-next (44e97f6fb29b Merge branch 'fixes' into for-next) +$ git merge omap/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 - + arch/arm/boot/dts/am335x-boneblack.dts | 132 +++---- + arch/arm/boot/dts/am335x-pocketbeagle.dts | 140 ++++---- + arch/arm/boot/dts/am33xx-l4.dtsi | 28 +- + arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi | 59 ++- + arch/arm/boot/dts/omap3-echo.dts | 476 +++++++++++++++++-------- + arch/arm/configs/omap2plus_defconfig | 151 +++++++- + arch/arm/mach-omap1/timer.c | 2 +- + arch/arm/mach-omap2/omap_hwmod.c | 1 + + arch/arm/mach-omap2/omap_twl.c | 2 +- + arch/arm/mach-omap2/pm-debug.c | 4 +- + arch/arm/mach-omap2/powerdomain.c | 12 +- + arch/arm/plat-omap/dma.c | 3 +- + 13 files changed, 676 insertions(+), 340 deletions(-) +Merging qcom/for-next (02fb73baa6b4 Merge branches 'arm64-defconfig-for-5.13', 'arm64-for-5.13', 'drivers-for-5.13' and 'dts-for-5.13' into for-next) +$ git merge qcom/for-next +Auto-merging drivers/soc/qcom/qcom-geni-se.c +Auto-merging arch/arm64/configs/defconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/msm/qcom,llcc.yaml | 1 + + .../devicetree/bindings/firmware/qcom,scm.txt | 1 + + .../devicetree/bindings/power/qcom,rpmpd.yaml | 2 + + .../devicetree/bindings/soc/qcom/qcom,aoss-qmp.txt | 1 + + .../devicetree/bindings/soc/qcom/qcom,wcnss.txt | 7 + + MAINTAINERS | 1 + + .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 6 +- + arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts | 52 +- + arch/arm/boot/dts/qcom-msm8974.dtsi | 9 + + arch/arm64/boot/dts/qcom/Makefile | 2 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 4 +- + arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi | 4 + + arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi | 4 + + .../boot/dts/qcom/msm8998-oneplus-cheeseburger.dts | 42 + + .../boot/dts/qcom/msm8998-oneplus-common.dtsi | 514 ++++++++++++ + .../boot/dts/qcom/msm8998-oneplus-dumpling.dts | 25 + + arch/arm64/boot/dts/qcom/msm8998.dtsi | 2 + + .../arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 10 + + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 60 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 4 +- + arch/arm64/boot/dts/qcom/sc7280-idp.dts | 212 +++++ + arch/arm64/boot/dts/qcom/sc7280.dtsi | 520 ++++++++++++ + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 4 +- + .../boot/dts/qcom/sdm845-xiaomi-beryllium.dts | 71 ++ + arch/arm64/boot/dts/qcom/sdm845.dtsi | 12 + + arch/arm64/boot/dts/qcom/sm8150.dtsi | 549 +++++++++++++ + arch/arm64/boot/dts/qcom/sm8250.dtsi | 125 ++- + arch/arm64/boot/dts/qcom/sm8350.dtsi | 911 +++++++++++++++++++++ + arch/arm64/configs/defconfig | 2 + + drivers/bus/qcom-ebi2.c | 4 +- + drivers/firmware/qcom_scm-legacy.c | 4 +- + drivers/firmware/qcom_scm-smc.c | 12 +- + drivers/firmware/qcom_scm.c | 89 +- + drivers/firmware/qcom_scm.h | 7 +- + drivers/soc/qcom/llcc-qcom.c | 19 + + drivers/soc/qcom/qcom-geni-se.c | 3 + + drivers/soc/qcom/qcom_aoss.c | 1 + + drivers/soc/qcom/qmi_encdec.c | 8 +- + drivers/soc/qcom/rpmh-rsc.c | 65 +- + drivers/soc/qcom/rpmhpd.c | 56 ++ + drivers/soc/qcom/smem.c | 2 +- + drivers/soc/qcom/wcnss_ctrl.c | 15 +- + include/dt-bindings/power/qcom-rpmpd.h | 26 + + include/linux/soc/qcom/apr.h | 2 +- + include/linux/soc/qcom/irq.h | 2 +- + include/linux/soc/qcom/llcc-qcom.h | 6 +- + include/linux/soc/qcom/qmi.h | 4 +- + 47 files changed, 3338 insertions(+), 144 deletions(-) + create mode 100644 arch/arm64/boot/dts/qcom/msm8998-oneplus-cheeseburger.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8998-oneplus-dumpling.dts +Merging raspberrypi/for-next (fbdcf1d20126 ARM: dts: bcm2711: Add the CEC interrupt controller) +$ git merge raspberrypi/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/bcm2711.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/bcm2711.dtsi +Resolved 'arch/arm/boot/dts/bcm2711.dtsi' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f30e4f014291] Merge remote-tracking branch 'raspberrypi/for-next' +$ git diff -M --stat --summary HEAD^.. +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 (e9903a1559e0 Merge branch 'renesas-arm-dt-for-v5.13' into renesas-next) +$ git merge renesas/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging reset/reset/next (d4e4dffec50b reset: oxnas: replace file name with short description) +$ git merge reset/reset/next +Merge made by the 'recursive' strategy. + drivers/reset/reset-bcm6345.c | 2 +- + drivers/reset/reset-oxnas.c | 2 +- + drivers/reset/reset-zynqmp.c | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) +Merging rockchip/for-next (3b6c3c12b77c Merge branch 'v5.13-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 1 + + .../bindings/clock/rockchip,rk3568-cru.yaml | 60 + + arch/arm/boot/dts/rk322x.dtsi | 2 +- + arch/arm/boot/dts/rv1108.dtsi | 3 +- + arch/arm64/boot/dts/rockchip/Makefile | 1 + + arch/arm64/boot/dts/rockchip/px30.dtsi | 24 +- + arch/arm64/boot/dts/rockchip/rk3308.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts | 5 + + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 21 +- + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts | 133 ++ + arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi | 40 +- + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 51 - + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 13 + + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +- + drivers/clk/rockchip/Kconfig | 29 +- + drivers/clk/rockchip/Makefile | 1 + + drivers/clk/rockchip/clk-cpu.c | 53 +- + drivers/clk/rockchip/clk-px30.c | 7 +- + drivers/clk/rockchip/clk-rk3036.c | 7 +- + drivers/clk/rockchip/clk-rk3128.c | 7 +- + drivers/clk/rockchip/clk-rk3188.c | 14 +- + drivers/clk/rockchip/clk-rk3228.c | 7 +- + drivers/clk/rockchip/clk-rk3288.c | 7 +- + drivers/clk/rockchip/clk-rk3308.c | 7 +- + drivers/clk/rockchip/clk-rk3328.c | 7 +- + drivers/clk/rockchip/clk-rk3368.c | 14 +- + drivers/clk/rockchip/clk-rk3399.c | 15 +- + drivers/clk/rockchip/clk-rk3568.c | 1725 ++++++++++++++++++++ + drivers/clk/rockchip/clk-rv1108.c | 7 +- + drivers/clk/rockchip/clk.h | 54 +- + include/dt-bindings/clock/rk3568-cru.h | 926 +++++++++++ + 32 files changed, 3078 insertions(+), 169 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3568-cru.yaml + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts + create mode 100644 drivers/clk/rockchip/clk-rk3568.c + create mode 100644 include/dt-bindings/clock/rk3568-cru.h +Merging samsung-krzk/for-next (8a4d4cd15c39 Merge branch 'next/soc' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 24 +++++----- + arch/arm/boot/dts/exynos3250-monk.dts | 4 +- + arch/arm/boot/dts/exynos3250-rinato.dts | 4 +- + arch/arm/boot/dts/exynos4210-i9100.dts | 56 +++++++++++++++++++++- + arch/arm/boot/dts/exynos4412-midas.dtsi | 6 +-- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 5 +- + arch/arm/boot/dts/exynos4412-odroidx.dts | 3 +- + arch/arm/boot/dts/exynos4412-p4note.dtsi | 4 +- + arch/arm/boot/dts/exynos4412-ppmu-common.dtsi | 48 +++++++++---------- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 2 +- + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 2 +- + arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 28 +++++------ + arch/arm/boot/dts/s5pv210-fascinate4g.dts | 2 +- + arch/arm/mach-exynos/platsmp.c | 28 +++++------ + arch/arm/mach-s3c/mach-rx1950.c | 11 +++-- + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 2 +- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 6 +-- + 17 files changed, 145 insertions(+), 90 deletions(-) +Merging scmi/for-linux-next (4c2443962313 Merge tag 'scmi-updates-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge scmi/for-linux-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 + + drivers/clk/clk-scmi.c | 28 +- + drivers/cpufreq/scmi-cpufreq.c | 107 ++-- + drivers/firmware/arm_scmi/base.c | 142 ++--- + drivers/firmware/arm_scmi/bus.c | 100 +++- + drivers/firmware/arm_scmi/clock.c | 129 ++--- + drivers/firmware/arm_scmi/common.h | 133 ++++- + drivers/firmware/arm_scmi/driver.c | 798 ++++++++++++++++++++++++++--- + drivers/firmware/arm_scmi/notify.c | 328 +++++++++--- + drivers/firmware/arm_scmi/notify.h | 40 +- + drivers/firmware/arm_scmi/perf.c | 262 +++++----- + drivers/firmware/arm_scmi/power.c | 134 ++--- + drivers/firmware/arm_scmi/reset.c | 146 +++--- + drivers/firmware/arm_scmi/scmi_pm_domain.c | 26 +- + drivers/firmware/arm_scmi/sensors.c | 232 +++++---- + drivers/firmware/arm_scmi/system.c | 63 ++- + drivers/firmware/arm_scmi/voltage.c | 126 ++--- + drivers/hwmon/scmi-hwmon.c | 24 +- + drivers/iio/common/Kconfig | 1 + + drivers/iio/common/Makefile | 1 + + drivers/iio/common/scmi_sensors/Kconfig | 18 + + drivers/iio/common/scmi_sensors/Makefile | 5 + + drivers/iio/common/scmi_sensors/scmi_iio.c | 683 ++++++++++++++++++++++++ + drivers/regulator/scmi-regulator.c | 42 +- + drivers/reset/reset-scmi.c | 33 +- + include/linux/scmi_protocol.h | 200 ++++---- + 26 files changed, 2844 insertions(+), 963 deletions(-) + create mode 100644 drivers/iio/common/scmi_sensors/Kconfig + create mode 100644 drivers/iio/common/scmi_sensors/Makefile + create mode 100644 drivers/iio/common/scmi_sensors/scmi_iio.c +Merging stm32/stm32-next (6ed9269265e1 ARM: dts: stm32: Add PTP clock to Ethernet controller) +$ git merge stm32/stm32-next +Already up to date. +Merging sunxi/sunxi/for-next (9fa021aa01fd Merge tags 'sunxi-dt-for-5.13-1' and 'sunxi-fixes-for-5.12' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 ++ + .../boot/dts/allwinner/sun50i-a64-pine64-lts.dts | 4 +++ + .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 2 +- + .../boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 16 +++++++++-- + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 4 +-- + drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 33 ++++++++++++++-------- + drivers/clk/sunxi/clk-sun6i-ar100.c | 2 +- + drivers/clk/sunxi/clk-sun9i-core.c | 8 +++--- + drivers/clk/sunxi/clk-usb.c | 2 +- + 9 files changed, 51 insertions(+), 22 deletions(-) +Merging tegra/for-next (93b9ea9ca307 Merge branch for-5.13/arm64/dt into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + drivers/phy/tegra/xusb-tegra186.c | 550 ++++++++++- + drivers/phy/tegra/xusb-tegra210.c | 1877 +++++++++++++++++++++++++++++-------- + drivers/phy/tegra/xusb.c | 92 +- + drivers/phy/tegra/xusb.h | 22 +- + drivers/usb/host/xhci-tegra.c | 613 +++++++++--- + include/linux/phy/tegra/xusb.h | 10 +- + 6 files changed, 2609 insertions(+), 555 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 (112e5934ff3a arm64: dts: ti: k3-am64-main: Fix ospi compatible) +$ git merge ti-k3-new/ti-k3-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/ti/k3.yaml | 9 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm64/boot/dts/ti/Makefile | 8 +- + arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 675 +++++++++++++++++++++ + arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi | 103 ++++ + arch/arm64/boot/dts/ti/k3-am64.dtsi | 105 ++++ + arch/arm64/boot/dts/ti/k3-am642-evm.dts | 468 ++++++++++++++ + arch/arm64/boot/dts/ti/k3-am642-sk.dts | 334 ++++++++++ + arch/arm64/boot/dts/ti/k3-am642.dtsi | 65 ++ + arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi | 655 ++++++++++++++++++++ + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 395 ++++++++++++ + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 9 + + arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic.dts | 61 ++ + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 4 +- + .../boot/dts/ti/k3-am6548-iot2050-advanced.dts | 60 ++ + .../boot/dts/ti/k3-j7200-common-proc-board.dts | 94 +++ + arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 86 ++- + arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 51 ++ + arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi | 36 ++ + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 279 ++++++++- + arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi | 4 +- + include/dt-bindings/pinctrl/k3.h | 5 +- + 23 files changed, 3501 insertions(+), 11 deletions(-) + create mode 100644 arch/arm64/boot/dts/ti/k3-am64-main.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am64.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am642-evm.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am642-sk.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am642.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced.dts +Merging clk/clk-next (4b5c93f31107 Merge branch 'clk-allwinner' into clk-next) +$ git merge clk/clk-next +Merge made by the 'recursive' strategy. + drivers/clk/at91/sama7g5.c | 6 +- + drivers/clk/clk.c | 67 +++++++---------- + drivers/clk/qcom/camcc-sc7180.c | 50 ++++++------- + drivers/clk/renesas/clk-div6.c | 3 +- + drivers/clk/renesas/clk-mstp.c | 2 +- + drivers/clk/renesas/r8a7795-cpg-mssr.c | 6 ++ + drivers/clk/renesas/r8a77965-cpg-mssr.c | 1 + + drivers/clk/renesas/r8a77990-cpg-mssr.c | 1 + + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 11 +++ + drivers/clk/renesas/r9a06g032-clocks.c | 12 +-- + drivers/clk/renesas/rcar-cpg-lib.c | 2 +- + drivers/clk/renesas/rcar-gen2-cpg.c | 3 +- + drivers/clk/renesas/rcar-gen3-cpg.c | 2 +- + drivers/clk/renesas/rcar-usb2-clock-sel.c | 5 +- + drivers/clk/renesas/renesas-cpg-mssr.c | 2 +- + drivers/clk/socfpga/clk-agilex.c | 117 ++++++++++++++++-------------- + drivers/clk/socfpga/clk-gate-a10.c | 8 +- + drivers/clk/socfpga/clk-gate-s10.c | 15 ++-- + drivers/clk/socfpga/clk-gate.c | 13 ++-- + drivers/clk/socfpga/clk-periph-a10.c | 11 +-- + drivers/clk/socfpga/clk-periph-s10.c | 42 ++++++----- + drivers/clk/socfpga/clk-periph.c | 8 +- + drivers/clk/socfpga/clk-pll-a10.c | 12 +-- + drivers/clk/socfpga/clk-pll-s10.c | 43 ++++++----- + drivers/clk/socfpga/clk-pll.c | 18 +++-- + drivers/clk/socfpga/clk-s10.c | 68 ++++++++--------- + drivers/clk/socfpga/stratix10-clk.h | 24 +++--- + 27 files changed, 285 insertions(+), 267 deletions(-) +Merging clk-imx/for-next (054ef44ea3ef clk: imx: Reference preceded by free) +$ git merge clk-imx/for-next +Merge made by the 'recursive' strategy. + drivers/clk/imx/clk-imx25.c | 12 +--------- + drivers/clk/imx/clk-imx27.c | 13 +--------- + drivers/clk/imx/clk-imx35.c | 10 +------- + drivers/clk/imx/clk-imx5.c | 30 +++-------------------- + drivers/clk/imx/clk-imx6q.c | 16 +------------ + drivers/clk/imx/clk-imx6sl.c | 16 +------------ + drivers/clk/imx/clk-imx6sll.c | 24 +------------------ + drivers/clk/imx/clk-imx6sx.c | 16 +------------ + drivers/clk/imx/clk-imx7d.c | 22 +---------------- + drivers/clk/imx/clk-imx7ulp.c | 31 ++---------------------- + drivers/clk/imx/clk-imx8mm.c | 18 ++------------ + drivers/clk/imx/clk-imx8mn.c | 18 ++------------ + drivers/clk/imx/clk-imx8mp.c | 32 +------------------------ + drivers/clk/imx/clk-imx8mq.c | 22 ++++------------- + drivers/clk/imx/clk-lpcg-scu.c | 1 + + drivers/clk/imx/clk-scu.c | 1 + + drivers/clk/imx/clk.c | 41 +++++++++++++++++++++++++------- + drivers/clk/imx/clk.h | 4 ++-- + include/dt-bindings/clock/imx8mp-clock.h | 3 --- + 19 files changed, 58 insertions(+), 272 deletions(-) +Merging clk-renesas/renesas-clk (f2fb4fe62390 clk: renesas: Zero init clk_init_data) +$ git merge clk-renesas/renesas-clk +Already up to date. +Merging clk-samsung/for-next (34138a59b92c clk: exynos7: Mark aclk_fsys1_200 as critical) +$ git merge clk-samsung/for-next +Merge made by the 'recursive' strategy. + drivers/clk/samsung/clk-exynos7.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) +Merging csky/linux-next (74cdb2664477 csky: Fixup typos) +$ git merge csky/linux-next +Merge made by the 'recursive' strategy. + arch/csky/include/asm/asid.h | 2 +- + arch/csky/include/asm/barrier.h | 2 +- + arch/csky/include/asm/vdso.h | 2 +- + arch/csky/kernel/entry.S | 1 - + 4 files changed, 3 insertions(+), 4 deletions(-) +Merging h8300/h8300-next (6e5e55227c95 Merge tag 'v5.11' into h8300-next) +$ git merge h8300/h8300-next +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Merge made by the 'recursive' strategy. + arch/h8300/Kconfig.cpu | 4 ++ + arch/h8300/boot/dts/edosk2674.dts | 10 ++++- + arch/h8300/boot/dts/h8300h_sim.dts | 2 +- + arch/h8300/boot/dts/h8s_sim.dts | 2 +- + arch/h8300/configs/edosk2674_defconfig | 10 ++--- + arch/h8300/configs/h8300h-sim_defconfig | 8 +--- + arch/h8300/configs/h8s-sim_defconfig | 8 +--- + arch/h8300/kernel/setup.c | 2 +- + arch/h8300/lib/memset.S | 17 +++++---- + drivers/clocksource/h8300_timer8.c | 20 +++++----- + drivers/irqchip/irq-renesas-h8300h.c | 19 +++++++++- + drivers/irqchip/irq-renesas-h8s.c | 67 +++++++++++++++++++++++++-------- + drivers/net/ethernet/smsc/Kconfig | 1 - + drivers/net/ethernet/smsc/smc91x.c | 10 +++++ + drivers/tty/serial/sh-sci.c | 5 +-- + 15 files changed, 123 insertions(+), 62 deletions(-) +Merging m68k/for-next (7accea0c95a1 m68k: fpsp040,ifpsp060: Remove meaningless EXTRA_LDFLAGS) +$ git merge m68k/for-next +Removing arch/m68k/kernel/syscalls/syscalltbl.sh +Removing arch/m68k/kernel/syscalls/syscallhdr.sh +Merge made by the 'recursive' strategy. + arch/m68k/configs/amiga_defconfig | 5 ----- + arch/m68k/configs/apollo_defconfig | 5 ----- + arch/m68k/configs/atari_defconfig | 5 ----- + arch/m68k/configs/bvme6000_defconfig | 5 ----- + arch/m68k/configs/hp300_defconfig | 5 ----- + arch/m68k/configs/mac_defconfig | 5 ----- + arch/m68k/configs/multi_defconfig | 5 ----- + arch/m68k/configs/mvme147_defconfig | 5 ----- + arch/m68k/configs/mvme16x_defconfig | 5 ----- + arch/m68k/configs/q40_defconfig | 5 ----- + arch/m68k/configs/sun3_defconfig | 5 ----- + arch/m68k/configs/sun3x_defconfig | 5 ----- + arch/m68k/fpsp040/Makefile | 4 ---- + arch/m68k/ifpsp060/Makefile | 2 -- + arch/m68k/include/asm/mvme147hw.h | 3 +++ + arch/m68k/include/asm/page_mm.h | 2 +- + arch/m68k/kernel/syscalls/Makefile | 14 ++++--------- + arch/m68k/kernel/syscalls/syscallhdr.sh | 36 --------------------------------- + arch/m68k/kernel/syscalls/syscalltbl.sh | 32 ----------------------------- + arch/m68k/kernel/syscalltable.S | 3 +-- + arch/m68k/mvme147/config.c | 14 +++++++------ + arch/m68k/mvme16x/config.c | 14 +++++++------ + 22 files changed, 25 insertions(+), 159 deletions(-) + delete mode 100644 arch/m68k/kernel/syscalls/syscallhdr.sh + delete mode 100644 arch/m68k/kernel/syscalls/syscalltbl.sh +Merging m68knommu/for-next (9116e156f714 m68k: fix flatmem memory model setup) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. +Merging microblaze/next (bbcee72c2f7a microblaze: Fix a typo) +$ git merge microblaze/next +Removing arch/microblaze/kernel/syscalls/syscalltbl.sh +Removing arch/microblaze/kernel/syscalls/syscallhdr.sh +Merge made by the 'recursive' strategy. + arch/microblaze/kernel/syscall_table.S | 3 +-- + arch/microblaze/kernel/syscalls/Makefile | 14 +++-------- + arch/microblaze/kernel/syscalls/syscallhdr.sh | 36 --------------------------- + arch/microblaze/kernel/syscalls/syscalltbl.sh | 32 ------------------------ + arch/microblaze/lib/uaccess_old.S | 2 +- + arch/microblaze/mm/init.c | 2 +- + 6 files changed, 7 insertions(+), 82 deletions(-) + delete mode 100644 arch/microblaze/kernel/syscalls/syscallhdr.sh + delete mode 100644 arch/microblaze/kernel/syscalls/syscalltbl.sh +Merging mips/mips-next (7cba4128c2c6 MIPS: Fix new sparse warnings) +$ git merge mips/mips-next +Removing arch/mips/sgi-ip27/TODO +Removing arch/mips/loongson64/platform.c +Removing arch/mips/kvm/trap_emul.c +Removing arch/mips/kvm/dyntrans.c +Removing arch/mips/kvm/commpage.h +Removing arch/mips/kvm/commpage.c +Removing arch/mips/kernel/syscalls/syscalltbl.sh +Removing arch/mips/kernel/syscalls/syscallhdr.sh +Removing arch/mips/configs/malta_kvm_guest_defconfig +Merge made by the 'recursive' strategy. + .../display/panel/kingdisplay,kd035g6-54nt.yaml | 1 - + .../interrupt-controller/loongson,liointc.yaml | 36 +- + arch/mips/Kconfig | 29 +- + arch/mips/Kconfig.debug | 1 + + arch/mips/bcm63xx/clk.c | 2 +- + arch/mips/bmips/dma.c | 2 +- + .../mips/boot/dts/brcm/bcm3368-netgear-cvg834g.dts | 2 +- + arch/mips/boot/dts/brcm/bcm3368.dtsi | 5 +- + .../boot/dts/brcm/bcm63268-comtrend-vr-3032u.dts | 2 +- + arch/mips/boot/dts/brcm/bcm63268.dtsi | 137 +- + arch/mips/boot/dts/brcm/bcm6328.dtsi | 124 +- + .../boot/dts/brcm/bcm6358-neufbox4-sercomm.dts | 2 +- + arch/mips/boot/dts/brcm/bcm6358.dtsi | 89 +- + .../boot/dts/brcm/bcm6362-neufbox6-sercomm.dts | 2 +- + arch/mips/boot/dts/brcm/bcm6362.dtsi | 134 +- + arch/mips/boot/dts/brcm/bcm6368.dtsi | 133 +- + arch/mips/boot/dts/brcm/bcm93384wvg.dts | 2 +- + arch/mips/boot/dts/brcm/bcm93384wvg_viper.dts | 2 +- + arch/mips/boot/dts/brcm/bcm96368mvwg.dts | 2 +- + arch/mips/boot/dts/brcm/bcm97125cbmb.dts | 2 +- + arch/mips/boot/dts/brcm/bcm97346dbsmb.dts | 4 +- + arch/mips/boot/dts/brcm/bcm97358svmb.dts | 4 +- + arch/mips/boot/dts/brcm/bcm97360svmb.dts | 2 +- + arch/mips/boot/dts/brcm/bcm97362svmb.dts | 4 +- + arch/mips/boot/dts/brcm/bcm97420c.dts | 2 +- + arch/mips/boot/dts/brcm/bcm97425svmb.dts | 4 +- + arch/mips/boot/dts/brcm/bcm97435svmb.dts | 4 +- + arch/mips/boot/dts/brcm/bcm9ejtagprb.dts | 2 +- + arch/mips/boot/dts/ingenic/gcw0.dts | 1 - + arch/mips/boot/dts/loongson/Makefile | 1 + + arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi | 243 +++ + .../boot/dts/loongson/loongson64_2core_2k1000.dts | 10 + + arch/mips/cavium-octeon/oct_ilm.c | 2 +- + arch/mips/configs/bigsur_defconfig | 4 - + arch/mips/configs/loongson2k_defconfig | 353 ++++ + arch/mips/configs/loongson3_defconfig | 9 +- + arch/mips/configs/malta_kvm_defconfig | 3 - + arch/mips/configs/malta_kvm_guest_defconfig | 436 ----- + arch/mips/configs/maltaup_xpa_defconfig | 3 - + arch/mips/configs/rbtx49xx_defconfig | 3 - + arch/mips/configs/sb1250_swarm_defconfig | 20 +- + arch/mips/configs/workpad_defconfig | 9 +- + arch/mips/crypto/.gitignore | 2 + + arch/mips/include/asm/Kbuild | 7 +- + arch/mips/include/asm/asmmacro.h | 3 +- + arch/mips/include/asm/io.h | 14 +- + arch/mips/include/asm/kvm_host.h | 238 --- + arch/mips/include/asm/mach-generic/spaces.h | 12 - + arch/mips/include/asm/mach-loongson64/boot_param.h | 27 - + .../include/asm/mach-loongson64/builtin_dtbs.h | 1 + + arch/mips/include/asm/mach-loongson64/loongson.h | 27 +- + arch/mips/include/asm/mach-ralink/mt7621.h | 7 +- + arch/mips/include/asm/octeon/cvmx-address.h | 2 +- + arch/mips/include/asm/octeon/cvmx-bootinfo.h | 2 + + arch/mips/include/asm/page.h | 9 +- + arch/mips/include/asm/processor.h | 9 - + arch/mips/include/asm/thread_info.h | 6 - + arch/mips/include/asm/uaccess.h | 468 ++---- + arch/mips/kernel/access-helper.h | 19 + + arch/mips/kernel/asm-offsets.c | 1 - + arch/mips/kernel/cevt-r4k.c | 4 - + arch/mips/kernel/cpu-probe.c | 3 - + arch/mips/kernel/ftrace.c | 8 - + arch/mips/kernel/process.c | 2 - + arch/mips/kernel/scall32-o32.S | 8 +- + arch/mips/kernel/scall64-n32.S | 3 +- + arch/mips/kernel/scall64-n64.S | 3 +- + arch/mips/kernel/scall64-o32.S | 4 +- + arch/mips/kernel/smp-bmips.c | 27 +- + arch/mips/kernel/spinlock_test.c | 8 +- + arch/mips/kernel/syscalls/Makefile | 41 +- + arch/mips/kernel/syscalls/syscallhdr.sh | 36 - + arch/mips/kernel/syscalls/syscalltbl.sh | 36 - + arch/mips/kernel/traps.c | 105 +- + arch/mips/kernel/unaligned.c | 205 +-- + arch/mips/kernel/vdso.c | 5 +- + arch/mips/kvm/Kconfig | 34 - + arch/mips/kvm/Makefile | 7 +- + arch/mips/kvm/commpage.c | 32 - + arch/mips/kvm/commpage.h | 24 - + arch/mips/kvm/dyntrans.c | 143 -- + arch/mips/kvm/emulate.c | 1688 +------------------- + arch/mips/kvm/entry.c | 33 - + arch/mips/kvm/interrupt.c | 123 +- + arch/mips/kvm/interrupt.h | 20 - + arch/mips/kvm/mips.c | 68 +- + arch/mips/kvm/mmu.c | 405 ----- + arch/mips/kvm/tlb.c | 174 -- + arch/mips/kvm/trap_emul.c | 1306 --------------- + arch/mips/kvm/vz.c | 5 +- + arch/mips/lib/memcpy.S | 28 +- + arch/mips/lib/memset.S | 3 - + arch/mips/lib/strncpy_user.S | 48 +- + arch/mips/lib/strnlen_user.S | 44 +- + arch/mips/loongson64/Makefile | 2 +- + arch/mips/loongson64/env.c | 33 +- + arch/mips/loongson64/init.c | 23 +- + arch/mips/loongson64/numa.c | 17 +- + arch/mips/loongson64/platform.c | 42 - + arch/mips/loongson64/time.c | 24 + + arch/mips/mm/Makefile | 6 + + arch/mips/mm/maccess.c | 10 + + arch/mips/mm/physaddr.c | 56 + + arch/mips/mm/tlbex.c | 9 +- + arch/mips/mti-malta/Platform | 6 +- + arch/mips/mti-malta/malta-time.c | 5 - + arch/mips/pci/pci-ar2315.c | 1 + + arch/mips/pci/pci-mt7620.c | 5 +- + arch/mips/pci/pci-xtalk-bridge.c | 2 +- + arch/mips/ralink/Kconfig | 1 + + arch/mips/ralink/clk.c | 14 + + arch/mips/ralink/common.h | 3 +- + arch/mips/ralink/mt7620.c | 2 +- + arch/mips/ralink/mt7621.c | 31 +- + arch/mips/ralink/of.c | 2 + + arch/mips/ralink/rt288x.c | 2 +- + arch/mips/ralink/rt305x.c | 2 +- + arch/mips/ralink/rt3883.c | 2 +- + arch/mips/sgi-ip27/TODO | 19 - + arch/mips/sgi-ip27/ip27-timer.c | 4 +- + drivers/firmware/broadcom/bcm47xx_nvram.c | 92 +- + drivers/irqchip/irq-loongson-liointc.c | 60 +- + 122 files changed, 2031 insertions(+), 5813 deletions(-) + create mode 100644 arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi + create mode 100644 arch/mips/boot/dts/loongson/loongson64_2core_2k1000.dts + create mode 100644 arch/mips/configs/loongson2k_defconfig + delete mode 100644 arch/mips/configs/malta_kvm_guest_defconfig + create mode 100644 arch/mips/crypto/.gitignore + create mode 100644 arch/mips/kernel/access-helper.h + delete mode 100644 arch/mips/kernel/syscalls/syscallhdr.sh + delete mode 100644 arch/mips/kernel/syscalls/syscalltbl.sh + delete mode 100644 arch/mips/kvm/commpage.c + delete mode 100644 arch/mips/kvm/commpage.h + delete mode 100644 arch/mips/kvm/dyntrans.c + delete mode 100644 arch/mips/kvm/trap_emul.c + delete mode 100644 arch/mips/loongson64/platform.c + create mode 100644 arch/mips/mm/maccess.c + create mode 100644 arch/mips/mm/physaddr.c + delete mode 100644 arch/mips/sgi-ip27/TODO +Merging nds32/next (40e0dd851e7b nds32: Fix bogus reference to <asm/procinfo.h>) +$ git merge nds32/next +Already up to date. +Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (1683f7de65db soc: litex: Remove duplicated header file inclusion) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (711d090f0e02 parisc: syscalls: switch to generic syscallhdr.sh) +$ git merge parisc-hd/for-next +Removing arch/parisc/kernel/syscalls/syscalltbl.sh +Removing arch/parisc/kernel/syscalls/syscallhdr.sh +Merge made by the 'recursive' strategy. + arch/parisc/include/asm/Kbuild | 1 - + arch/parisc/kernel/syscall.S | 16 ++++++-------- + arch/parisc/kernel/syscalls/Makefile | 30 ++++++++------------------ + arch/parisc/kernel/syscalls/syscallhdr.sh | 36 ------------------------------- + arch/parisc/kernel/syscalls/syscalltbl.sh | 36 ------------------------------- + 5 files changed, 16 insertions(+), 103 deletions(-) + delete mode 100644 arch/parisc/kernel/syscalls/syscallhdr.sh + delete mode 100644 arch/parisc/kernel/syscalls/syscalltbl.sh +Merging powerpc/next (69931cc387cc powerpc/powernv: Remove unneeded variable: "rc") +$ git merge powerpc/next +Auto-merging drivers/i2c/busses/Kconfig +Auto-merging arch/powerpc/kernel/signal_32.c +Auto-merging arch/powerpc/kernel/ptrace/ptrace-view.c +Merge made by the 'recursive' strategy. + arch/powerpc/Kconfig | 18 +- + arch/powerpc/Makefile | 6 - + arch/powerpc/include/asm/barrier.h | 16 - + arch/powerpc/include/asm/book3s/32/kup.h | 126 ++-- + arch/powerpc/include/asm/book3s/32/tlbflush.h | 2 +- + arch/powerpc/include/asm/book3s/64/kup.h | 24 +- + arch/powerpc/include/asm/book3s/64/mmu-hash.h | 1 - + arch/powerpc/include/asm/futex.h | 12 +- + arch/powerpc/include/asm/hvcall.h | 1 + + arch/powerpc/include/asm/hvconsole.h | 3 + + arch/powerpc/include/asm/hydra.h | 2 - + arch/powerpc/include/asm/interrupt.h | 17 +- + arch/powerpc/include/asm/irq.h | 2 - + arch/powerpc/include/asm/kfence.h | 33 + + arch/powerpc/include/asm/kup.h | 27 +- + arch/powerpc/include/asm/nohash/32/kup-8xx.h | 56 +- + arch/powerpc/include/asm/pgtable.h | 2 - + arch/powerpc/include/asm/ppc_asm.h | 10 - + arch/powerpc/include/asm/processor.h | 8 +- + arch/powerpc/include/asm/ptrace.h | 8 +- + arch/powerpc/include/asm/qspinlock.h | 21 +- + arch/powerpc/include/asm/reg.h | 2 +- + arch/powerpc/include/asm/simple_spinlock.h | 6 +- + arch/powerpc/include/asm/spinlock.h | 3 + + arch/powerpc/include/asm/thread_info.h | 1 - + arch/powerpc/include/asm/uaccess.h | 96 ++- + arch/powerpc/include/asm/unistd.h | 1 + + arch/powerpc/kernel/asm-offsets.c | 7 - + arch/powerpc/kernel/eeh.c | 2 + + arch/powerpc/kernel/entry_32.S | 796 ++++----------------- + arch/powerpc/kernel/fadump.c | 2 +- + arch/powerpc/kernel/fpu.S | 2 - + arch/powerpc/kernel/head_32.h | 198 ++--- + arch/powerpc/kernel/head_40x.S | 271 +++---- + arch/powerpc/kernel/head_44x.S | 10 +- + arch/powerpc/kernel/head_8xx.S | 151 ++-- + arch/powerpc/kernel/head_book3s_32.S | 233 +++--- + arch/powerpc/kernel/head_booke.h | 203 ++++-- + arch/powerpc/kernel/head_fsl_booke.S | 70 +- + arch/powerpc/kernel/idle_6xx.S | 14 +- + arch/powerpc/kernel/idle_e500.S | 14 +- + arch/powerpc/kernel/interrupt.c | 41 +- + arch/powerpc/kernel/iommu.c | 3 +- + arch/powerpc/kernel/irq.c | 43 +- + arch/powerpc/kernel/kgdb.c | 2 +- + arch/powerpc/kernel/misc_32.S | 39 - + arch/powerpc/kernel/misc_64.S | 22 - + arch/powerpc/kernel/process.c | 9 +- + arch/powerpc/kernel/prom.c | 2 +- + arch/powerpc/kernel/prom_init.c | 2 +- + arch/powerpc/kernel/ptrace/ptrace-view.c | 30 +- + arch/powerpc/kernel/ptrace/ptrace.c | 2 - + arch/powerpc/kernel/setup-common.c | 3 +- + arch/powerpc/kernel/setup_32.c | 2 +- + arch/powerpc/kernel/setup_64.c | 5 +- + arch/powerpc/kernel/signal.h | 33 + + arch/powerpc/kernel/signal_32.c | 2 +- + arch/powerpc/kernel/signal_64.c | 317 ++++---- + arch/powerpc/kernel/stacktrace.c | 108 +-- + arch/powerpc/kernel/syscalls.c | 12 +- + arch/powerpc/kernel/traps.c | 18 +- + arch/powerpc/kernel/uprobes.c | 7 + + arch/powerpc/kernel/vector.S | 2 - + arch/powerpc/lib/checksum_wrappers.c | 15 +- + arch/powerpc/lib/code-patching.c | 13 +- + arch/powerpc/lib/sstep.c | 9 - + arch/powerpc/math-emu/math.c | 4 +- + arch/powerpc/mm/book3s32/Makefile | 1 + + arch/powerpc/mm/book3s32/hash_low.S | 14 - + arch/powerpc/mm/book3s32/kuep.c | 40 ++ + arch/powerpc/mm/book3s32/mmu.c | 2 +- + arch/powerpc/mm/book3s64/hash_utils.c | 4 +- + arch/powerpc/mm/book3s64/mmu_context.c | 2 +- + arch/powerpc/mm/book3s64/pkeys.c | 20 +- + arch/powerpc/mm/fault.c | 16 +- + arch/powerpc/mm/init_32.c | 3 + + arch/powerpc/mm/mem.c | 2 +- + arch/powerpc/mm/mmu_decl.h | 5 + + arch/powerpc/mm/nohash/8xx.c | 4 +- + arch/powerpc/platforms/Kconfig.cputype | 4 +- + arch/powerpc/platforms/chrp/pci.c | 3 +- + arch/powerpc/platforms/embedded6xx/Kconfig | 5 - + arch/powerpc/platforms/maple/pci.c | 2 +- + arch/powerpc/platforms/powernv/opal-prd.c | 5 +- + arch/powerpc/platforms/pseries/hotplug-cpu.c | 14 + + arch/powerpc/platforms/pseries/lparcfg.c | 2 + + arch/powerpc/platforms/pseries/pseries.h | 4 +- + arch/powerpc/platforms/pseries/setup.c | 8 + + arch/powerpc/sysdev/fsl_pci.c | 2 +- + arch/powerpc/sysdev/xive/spapr.c | 2 +- + drivers/i2c/busses/Kconfig | 2 +- + drivers/misc/cxl/context.c | 2 +- + drivers/misc/cxl/fault.c | 2 +- + .../selftests/powerpc/security/entry_flush.c | 2 +- + .../selftests/powerpc/security/flush_utils.h | 4 + + .../testing/selftests/powerpc/security/rfi_flush.c | 2 +- + tools/testing/selftests/powerpc/tm/tm-trap.c | 4 +- + 97 files changed, 1434 insertions(+), 1970 deletions(-) + create mode 100644 arch/powerpc/include/asm/kfence.h + create mode 100644 arch/powerpc/mm/book3s32/kuep.c +Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges) +$ git merge fsl/next +Already up to date. +Merging soc-fsl/next (ccdfc4ae4d41 Revert "soc: fsl: qe: introduce qe_io{read,write}* wrappers") +$ git merge soc-fsl/next +Merge made by the 'recursive' strategy. + drivers/soc/fsl/guts.c | 2 +- + drivers/soc/fsl/qbman/bman.c | 1 - + drivers/soc/fsl/qbman/bman_portal.c | 3 +- + drivers/soc/fsl/qbman/qman_portal.c | 3 +- + drivers/soc/fsl/qe/gpio.c | 20 +++--- + drivers/soc/fsl/qe/qe.c | 24 +++---- + drivers/soc/fsl/qe/qe_common.c | 3 +- + drivers/soc/fsl/qe/qe_ic.c | 4 +- + drivers/soc/fsl/qe/qe_io.c | 36 +++++------ + drivers/soc/fsl/qe/ucc_fast.c | 68 ++++++++++---------- + drivers/soc/fsl/qe/ucc_slow.c | 42 ++++++------ + drivers/tty/serial/ucc_uart.c | 124 ++++++++++++++++++------------------ + include/linux/fsl/guts.h | 4 +- + include/soc/fsl/qe/qe.h | 34 +++------- + 14 files changed, 176 insertions(+), 192 deletions(-) +Merging risc-v/for-next (7d0bc44bd0ea kbuild: buildtar: add riscv support) +$ git merge risc-v/for-next +Auto-merging arch/riscv/mm/kasan_init.c +CONFLICT (content): Merge conflict in arch/riscv/mm/kasan_init.c +Auto-merging arch/riscv/kernel/sbi.c +Auto-merging arch/riscv/Kconfig +Resolved 'arch/riscv/mm/kasan_init.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 0b33281797ee] Merge remote-tracking branch 'risc-v/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 2 +- + arch/riscv/Kconfig | 3 ++ + arch/riscv/include/asm/string.h | 5 +++ + arch/riscv/kernel/sbi.c | 6 +-- + arch/riscv/kernel/smp.c | 16 +++++++ + arch/riscv/mm/init.c | 6 ++- + arch/riscv/mm/kasan_init.c | 57 ++++++++----------------- + scripts/package/buildtar | 8 ++++ + 8 files changed, 57 insertions(+), 46 deletions(-) +Merging s390/for-next (46c48eb6d500 Merge branch 'features' into for-next) +$ git merge s390/for-next +Merge made by the 'recursive' strategy. + Documentation/s390/pci.rst | 14 +- + arch/s390/Kconfig.debug | 8 + + arch/s390/configs/debug_defconfig | 1 + + arch/s390/crypto/crc32be-vx.S | 4 +- + arch/s390/include/asm/ccwdev.h | 3 - + arch/s390/include/asm/pci.h | 5 +- + arch/s390/include/asm/qdio.h | 22 +-- + arch/s390/include/asm/spinlock_types.h | 2 +- + arch/s390/kernel/os_info.c | 2 +- + arch/s390/kernel/uv.c | 43 ++++- + arch/s390/mm/page-states.c | 8 +- + arch/s390/pci/pci.c | 135 ++++++++++----- + arch/s390/pci/pci_bus.c | 33 ++++ + arch/s390/pci/pci_bus.h | 2 + + arch/s390/pci/pci_event.c | 82 ++++----- + arch/s390/pci/pci_sysfs.c | 9 + + drivers/pci/hotplug/s390_pci_hpc.c | 60 +------ + drivers/s390/char/con3215.c | 3 +- + drivers/s390/char/sclp.c | 6 +- + drivers/s390/char/sclp_con.c | 28 +-- + drivers/s390/char/sclp_tty.c | 18 +- + drivers/s390/char/sclp_vt220.c | 9 +- + drivers/s390/cio/Makefile | 4 +- + drivers/s390/cio/cio_debug.h | 3 + + drivers/s390/cio/cio_debugfs.c | 23 +++ + drivers/s390/cio/cio_inject.c | 171 ++++++++++++++++++ + drivers/s390/cio/cio_inject.h | 18 ++ + drivers/s390/cio/css.c | 6 +- + drivers/s390/cio/ioasm.c | 23 ++- + drivers/s390/cio/qdio.h | 10 -- + drivers/s390/cio/qdio_main.c | 63 +------ + drivers/s390/cio/qdio_setup.c | 49 +----- + drivers/s390/crypto/vfio_ap_ops.c | 308 +++++++++++++++++++++++---------- + drivers/s390/crypto/vfio_ap_private.h | 2 + + drivers/s390/net/qeth_core.h | 3 +- + drivers/s390/net/qeth_core_main.c | 102 +++++------ + drivers/s390/scsi/zfcp_qdio.c | 7 +- + 37 files changed, 787 insertions(+), 502 deletions(-) + create mode 100644 drivers/s390/cio/cio_debugfs.c + create mode 100644 drivers/s390/cio/cio_inject.c + create mode 100644 drivers/s390/cio/cio_inject.h +Merging sh/for-next (2882b7626f49 sh: kernel: traps: remove unused variable) +$ git merge sh/for-next +Auto-merging drivers/sh/maple/maple.c +Merge made by the 'recursive' strategy. + arch/sh/boards/mach-landisk/irq.c | 4 ++-- + arch/sh/boot/Makefile | 4 ++-- + arch/sh/boot/compressed/.gitignore | 5 ----- + arch/sh/boot/compressed/Makefile | 32 +++++++++++++------------------- + arch/sh/boot/compressed/ashiftrt.S | 2 ++ + arch/sh/boot/compressed/ashldi3.c | 2 ++ + arch/sh/boot/compressed/ashlsi3.S | 2 ++ + arch/sh/boot/compressed/ashrsi3.S | 2 ++ + arch/sh/boot/compressed/lshrsi3.S | 2 ++ + arch/sh/include/asm/checksum_32.h | 5 +++-- + arch/sh/include/asm/uaccess.h | 4 ++-- + arch/sh/kernel/cpu/sh4a/smp-shx3.c | 5 +++-- + arch/sh/kernel/crash_dump.c | 4 ++-- + arch/sh/kernel/traps.c | 1 - + arch/sh/kernel/traps_32.c | 8 ++++---- + arch/sh/math-emu/math.c | 4 ++-- + arch/sh/mm/nommu.c | 4 ++-- + drivers/sh/maple/maple.c | 5 ++++- + 18 files changed, 49 insertions(+), 46 deletions(-) + create mode 100644 arch/sh/boot/compressed/ashiftrt.S + create mode 100644 arch/sh/boot/compressed/ashldi3.c + create mode 100644 arch/sh/boot/compressed/ashlsi3.S + create mode 100644 arch/sh/boot/compressed/ashrsi3.S + create mode 100644 arch/sh/boot/compressed/lshrsi3.S +Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge sparc-next/master +Already up to date. +Merging uml/linux-next (ddad5187fc2a um: irq.h: include <asm-generic/irq.h>) +$ git merge uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (6a8eb99e130f xtensa: ISS: add GDBIO implementation to semihosting interface) +$ git merge xtensa/xtensa-for-next +Removing arch/xtensa/kernel/syscalls/syscalltbl.sh +Removing arch/xtensa/kernel/syscalls/syscallhdr.sh +Merge made by the 'recursive' strategy. + arch/xtensa/Kconfig | 30 +++++- + arch/xtensa/Makefile | 9 +- + arch/xtensa/boot/Makefile | 4 - + arch/xtensa/boot/boot-elf/Makefile | 11 +-- + arch/xtensa/boot/boot-redboot/Makefile | 6 +- + arch/xtensa/include/asm/initialize_mmu.h | 2 +- + arch/xtensa/include/asm/pgtable.h | 4 +- + arch/xtensa/kernel/head.S | 4 +- + arch/xtensa/kernel/pci.c | 2 +- + arch/xtensa/kernel/syscall.c | 8 +- + arch/xtensa/kernel/syscalls/Makefile | 14 +-- + arch/xtensa/kernel/syscalls/syscallhdr.sh | 36 ------- + arch/xtensa/kernel/syscalls/syscalltbl.sh | 32 ------- + arch/xtensa/mm/cache.c | 9 +- + arch/xtensa/mm/misc.S | 36 +------ + .../platforms/iss/include/platform/simcall-gdbio.h | 34 +++++++ + .../platforms/iss/include/platform/simcall-iss.h | 73 +++++++++++++++ + .../platforms/iss/include/platform/simcall.h | 104 ++++++++------------- + 18 files changed, 198 insertions(+), 220 deletions(-) + delete mode 100644 arch/xtensa/kernel/syscalls/syscallhdr.sh + delete mode 100644 arch/xtensa/kernel/syscalls/syscalltbl.sh + create mode 100644 arch/xtensa/platforms/iss/include/platform/simcall-gdbio.h + create mode 100644 arch/xtensa/platforms/iss/include/platform/simcall-iss.h +Merging pidfd/for-next (8fac44cbbaa2 Merge branch 'fs/idmapped_mounts/helpers' into for-next) +$ git merge pidfd/for-next +Auto-merging fs/namei.c +Merge made by the 'recursive' strategy. + fs/ext4/ialloc.c | 2 +- + fs/inode.c | 4 +- + fs/libfs.c | 1 + + fs/namei.c | 25 +++------ + fs/xattr.c | 14 ++--- + fs/xfs/xfs_inode.c | 10 ++-- + fs/xfs/xfs_symlink.c | 4 +- + include/linux/fs.h | 141 +++++++++++++++++++++++++++++++++++++++++++++++++-- + 8 files changed, 161 insertions(+), 40 deletions(-) +Merging fscrypt/master (a14d0b676491 fscrypt: allow deleting files with unsupported encryption policy) +$ git merge fscrypt/master +Already up to date. +Merging fscache/fscache-next (d2ebca8ed45e afs: Use the fscache_write_begin() helper) +$ git merge fscache/fscache-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/index.rst | 1 + + Documentation/filesystems/netfs_library.rst | 526 ++++++++++++ + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/afs/Kconfig | 1 + + fs/afs/dir.c | 225 +++-- + fs/afs/file.c | 483 +++-------- + fs/afs/fs_operation.c | 4 +- + fs/afs/fsclient.c | 108 +-- + fs/afs/inode.c | 7 +- + fs/afs/internal.h | 59 +- + fs/afs/rxrpc.c | 150 ++-- + fs/afs/write.c | 657 +++++++-------- + fs/afs/yfsclient.c | 82 +- + fs/cachefiles/Makefile | 1 + + fs/cachefiles/interface.c | 5 +- + fs/cachefiles/internal.h | 9 + + fs/cachefiles/io.c | 403 +++++++++ + fs/fscache/Kconfig | 1 + + fs/fscache/Makefile | 1 + + fs/fscache/internal.h | 4 + + fs/fscache/io.c | 116 +++ + fs/fscache/page.c | 2 +- + fs/fscache/stats.c | 1 + + fs/netfs/Kconfig | 23 + + fs/netfs/Makefile | 5 + + fs/netfs/internal.h | 97 +++ + fs/netfs/read_helper.c | 1180 +++++++++++++++++++++++++++ + fs/netfs/stats.c | 59 ++ + include/linux/fscache-cache.h | 4 + + include/linux/fscache.h | 50 +- + include/linux/netfs.h | 228 ++++++ + include/linux/pagemap.h | 21 + + include/linux/uio.h | 11 + + include/net/af_rxrpc.h | 2 +- + include/trace/events/afs.h | 74 +- + include/trace/events/netfs.h | 201 +++++ + lib/iov_iter.c | 313 ++++++- + mm/filemap.c | 59 ++ + mm/readahead.c | 70 ++ + net/rxrpc/recvmsg.c | 9 +- + 41 files changed, 4162 insertions(+), 1092 deletions(-) + create mode 100644 Documentation/filesystems/netfs_library.rst + create mode 100644 fs/cachefiles/io.c + create mode 100644 fs/fscache/io.c + create mode 100644 fs/netfs/Kconfig + create mode 100644 fs/netfs/Makefile + create mode 100644 fs/netfs/internal.h + create mode 100644 fs/netfs/read_helper.c + create mode 100644 fs/netfs/stats.c + create mode 100644 include/linux/netfs.h + create mode 100644 include/trace/events/netfs.h +Merging afs/afs-next (8409f67b6437 afs: Adjust the fileserver rotation algorithm to reprobe/retry more quickly) +$ git merge afs/afs-next +Already up to date. +Merging btrfs/for-next (3c1750120613 Merge branch 'for-next-next-v5.12-20210406' into for-next-20210406) +$ git merge btrfs/for-next +Auto-merging include/linux/pagemap.h +Merge made by the 'recursive' strategy. + fs/btrfs/Makefile | 2 +- + fs/btrfs/backref.c | 33 +- + fs/btrfs/block-group.c | 190 ++++++++- + fs/btrfs/block-group.h | 2 + + fs/btrfs/btrfs_inode.h | 33 +- + fs/btrfs/check-integrity.c | 14 +- + fs/btrfs/compression.c | 4 +- + fs/btrfs/ctree.c | 984 +++---------------------------------------- + fs/btrfs/ctree.h | 76 ++-- + fs/btrfs/delayed-inode.c | 35 +- + fs/btrfs/delayed-ref.c | 31 +- + fs/btrfs/disk-io.c | 160 +++++-- + fs/btrfs/extent-tree.c | 21 +- + fs/btrfs/extent_io.c | 441 ++++++++++++++++--- + fs/btrfs/extent_io.h | 4 +- + fs/btrfs/file-item.c | 1 + + fs/btrfs/file.c | 118 +++--- + fs/btrfs/free-space-cache.c | 9 +- + fs/btrfs/inode.c | 125 +++--- + fs/btrfs/ioctl.c | 33 +- + fs/btrfs/lzo.c | 9 +- + fs/btrfs/ordered-data.c | 19 +- + fs/btrfs/ordered-data.h | 4 +- + fs/btrfs/qgroup.c | 47 +-- + fs/btrfs/raid56.c | 70 +-- + fs/btrfs/reflink.c | 65 ++- + fs/btrfs/relocation.c | 448 +++++++++++++++----- + fs/btrfs/scrub.c | 8 - + fs/btrfs/send.c | 43 +- + fs/btrfs/space-info.c | 4 +- + fs/btrfs/subpage.c | 140 ++++++ + fs/btrfs/subpage.h | 7 + + fs/btrfs/super.c | 26 ++ + fs/btrfs/sysfs.c | 50 +++ + fs/btrfs/transaction.c | 59 ++- + fs/btrfs/transaction.h | 9 +- + fs/btrfs/tree-checker.c | 5 + + fs/btrfs/tree-log.c | 21 +- + fs/btrfs/tree-mod-log.c | 909 +++++++++++++++++++++++++++++++++++++++ + fs/btrfs/tree-mod-log.h | 53 +++ + fs/btrfs/volumes.c | 107 +++-- + fs/btrfs/volumes.h | 1 + + include/linux/pagemap.h | 9 + + include/trace/events/btrfs.h | 12 + + 44 files changed, 2868 insertions(+), 1573 deletions(-) + create mode 100644 fs/btrfs/tree-mod-log.c + create mode 100644 fs/btrfs/tree-mod-log.h +Merging ceph/master (558b4510f622 ceph: defer flushing the capsnap if the Fb is used) +$ git merge ceph/master +Already up to date. +Merging cifs/for-next (2d4691384cf4 cifs: escape spaces in share names) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/Makefile | 5 +++-- + fs/cifs/cifsfs.c | 3 ++- + fs/cifs/cifsglob.h | 2 -- + fs/cifs/connect.c | 17 ++++++++++++++++- + 4 files changed, 21 insertions(+), 6 deletions(-) +Merging cifsd/cifsd-for-next (bc7f2fa87b28 Merge pull request #36 from namjaejeon/cifsd-for-next) +$ git merge cifsd/cifsd-for-next +Auto-merging fs/Makefile +Auto-merging fs/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/filesystems/index.rst +Merge made by the 'recursive' strategy. + Documentation/filesystems/cifs/cifsd.rst | 152 + + Documentation/filesystems/cifs/index.rst | 10 + + Documentation/filesystems/index.rst | 2 +- + MAINTAINERS | 12 +- + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/cifsd/Kconfig | 65 + + fs/cifsd/Makefile | 13 + + fs/cifsd/asn1.c | 702 +++ + fs/cifsd/asn1.h | 29 + + fs/cifsd/auth.c | 1323 +++++ + fs/cifsd/auth.h | 90 + + fs/cifsd/buffer_pool.c | 264 + + fs/cifsd/buffer_pool.h | 20 + + fs/cifsd/connection.c | 412 ++ + fs/cifsd/connection.h | 208 + + fs/cifsd/crypto_ctx.c | 287 + + fs/cifsd/crypto_ctx.h | 77 + + fs/cifsd/glob.h | 66 + + fs/cifsd/ksmbd_server.h | 284 + + fs/cifsd/ksmbd_work.c | 93 + + fs/cifsd/ksmbd_work.h | 110 + + fs/cifsd/mgmt/ksmbd_ida.c | 69 + + fs/cifsd/mgmt/ksmbd_ida.h | 41 + + fs/cifsd/mgmt/share_config.c | 239 + + fs/cifsd/mgmt/share_config.h | 81 + + fs/cifsd/mgmt/tree_connect.c | 123 + + fs/cifsd/mgmt/tree_connect.h | 56 + + fs/cifsd/mgmt/user_config.c | 70 + + fs/cifsd/mgmt/user_config.h | 66 + + fs/cifsd/mgmt/user_session.c | 346 ++ + fs/cifsd/mgmt/user_session.h | 109 + + fs/cifsd/misc.c | 295 ++ + fs/cifsd/misc.h | 38 + + fs/cifsd/ndr.c | 347 ++ + fs/cifsd/ndr.h | 21 + + fs/cifsd/netmisc.c | 59 + + fs/cifsd/nterr.c | 674 +++ + fs/cifsd/nterr.h | 552 ++ + fs/cifsd/ntlmssp.h | 169 + + fs/cifsd/oplock.c | 1669 ++++++ + fs/cifsd/oplock.h | 133 + + fs/cifsd/server.c | 638 +++ + fs/cifsd/server.h | 60 + + fs/cifsd/smb2misc.c | 435 ++ + fs/cifsd/smb2ops.c | 300 ++ + fs/cifsd/smb2pdu.c | 8332 ++++++++++++++++++++++++++++++ + fs/cifsd/smb2pdu.h | 1646 ++++++ + fs/cifsd/smb_common.c | 657 +++ + fs/cifsd/smb_common.h | 550 ++ + fs/cifsd/smbacl.c | 1317 +++++ + fs/cifsd/smbacl.h | 201 + + fs/cifsd/smberr.h | 235 + + fs/cifsd/smbfsctl.h | 90 + + fs/cifsd/smbstatus.h | 1822 +++++++ + fs/cifsd/transport_ipc.c | 893 ++++ + fs/cifsd/transport_ipc.h | 54 + + fs/cifsd/transport_rdma.c | 2034 ++++++++ + fs/cifsd/transport_rdma.h | 61 + + fs/cifsd/transport_tcp.c | 618 +++ + fs/cifsd/transport_tcp.h | 13 + + fs/cifsd/unicode.c | 383 ++ + fs/cifsd/unicode.h | 356 ++ + fs/cifsd/uniupr.h | 268 + + fs/cifsd/vfs.c | 1927 +++++++ + fs/cifsd/vfs.h | 273 + + fs/cifsd/vfs_cache.c | 834 +++ + fs/cifsd/vfs_cache.h | 192 + + 68 files changed, 33565 insertions(+), 2 deletions(-) + create mode 100644 Documentation/filesystems/cifs/cifsd.rst + create mode 100644 Documentation/filesystems/cifs/index.rst + create mode 100644 fs/cifsd/Kconfig + create mode 100644 fs/cifsd/Makefile + create mode 100644 fs/cifsd/asn1.c + create mode 100644 fs/cifsd/asn1.h + create mode 100644 fs/cifsd/auth.c + create mode 100644 fs/cifsd/auth.h + create mode 100644 fs/cifsd/buffer_pool.c + create mode 100644 fs/cifsd/buffer_pool.h + create mode 100644 fs/cifsd/connection.c + create mode 100644 fs/cifsd/connection.h + create mode 100644 fs/cifsd/crypto_ctx.c + create mode 100644 fs/cifsd/crypto_ctx.h + create mode 100644 fs/cifsd/glob.h + create mode 100644 fs/cifsd/ksmbd_server.h + create mode 100644 fs/cifsd/ksmbd_work.c + create mode 100644 fs/cifsd/ksmbd_work.h + create mode 100644 fs/cifsd/mgmt/ksmbd_ida.c + create mode 100644 fs/cifsd/mgmt/ksmbd_ida.h + create mode 100644 fs/cifsd/mgmt/share_config.c + create mode 100644 fs/cifsd/mgmt/share_config.h + create mode 100644 fs/cifsd/mgmt/tree_connect.c + create mode 100644 fs/cifsd/mgmt/tree_connect.h + create mode 100644 fs/cifsd/mgmt/user_config.c + create mode 100644 fs/cifsd/mgmt/user_config.h + create mode 100644 fs/cifsd/mgmt/user_session.c + create mode 100644 fs/cifsd/mgmt/user_session.h + create mode 100644 fs/cifsd/misc.c + create mode 100644 fs/cifsd/misc.h + create mode 100644 fs/cifsd/ndr.c + create mode 100644 fs/cifsd/ndr.h + create mode 100644 fs/cifsd/netmisc.c + create mode 100644 fs/cifsd/nterr.c + create mode 100644 fs/cifsd/nterr.h + create mode 100644 fs/cifsd/ntlmssp.h + create mode 100644 fs/cifsd/oplock.c + create mode 100644 fs/cifsd/oplock.h + create mode 100644 fs/cifsd/server.c + create mode 100644 fs/cifsd/server.h + create mode 100644 fs/cifsd/smb2misc.c + create mode 100644 fs/cifsd/smb2ops.c + create mode 100644 fs/cifsd/smb2pdu.c + create mode 100644 fs/cifsd/smb2pdu.h + create mode 100644 fs/cifsd/smb_common.c + create mode 100644 fs/cifsd/smb_common.h + create mode 100644 fs/cifsd/smbacl.c + create mode 100644 fs/cifsd/smbacl.h + create mode 100644 fs/cifsd/smberr.h + create mode 100644 fs/cifsd/smbfsctl.h + create mode 100644 fs/cifsd/smbstatus.h + create mode 100644 fs/cifsd/transport_ipc.c + create mode 100644 fs/cifsd/transport_ipc.h + create mode 100644 fs/cifsd/transport_rdma.c + create mode 100644 fs/cifsd/transport_rdma.h + create mode 100644 fs/cifsd/transport_tcp.c + create mode 100644 fs/cifsd/transport_tcp.h + create mode 100644 fs/cifsd/unicode.c + create mode 100644 fs/cifsd/unicode.h + create mode 100644 fs/cifsd/uniupr.h + create mode 100644 fs/cifsd/vfs.c + create mode 100644 fs/cifsd/vfs.h + create mode 100644 fs/cifsd/vfs_cache.c + create mode 100644 fs/cifsd/vfs_cache.h +Merging configfs/for-next (14fbbc829772 configfs: fix a use-after-free in __configfs_open_file) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (902af369942f ecryptfs: use DEFINE_MUTEX() for mutex lock) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/crypto.c +Merge made by the 'recursive' strategy. + fs/ecryptfs/crypto.c | 3 +-- + fs/ecryptfs/ecryptfs_kernel.h | 2 +- + fs/ecryptfs/keystore.c | 2 +- + 3 files changed, 3 insertions(+), 4 deletions(-) +Merging erofs/dev (df7bb621ce5a erofs: enable big pcluster feature) +$ git merge erofs/dev +Merge made by the 'recursive' strategy. + fs/erofs/Kconfig | 14 --- + fs/erofs/Makefile | 2 +- + fs/erofs/data.c | 19 +--- + fs/erofs/decompressor.c | 272 ++++++++++++++++++++++++++++++------------------ + fs/erofs/erofs_fs.h | 54 ++++++++-- + fs/erofs/inode.c | 7 ++ + fs/erofs/internal.h | 85 ++++++++++----- + fs/erofs/pcpubuf.c | 134 ++++++++++++++++++++++++ + fs/erofs/super.c | 147 +++++++++++++++++++++++++- + fs/erofs/utils.c | 12 --- + fs/erofs/zdata.c | 254 +++++++++++++++++++++++++++++--------------- + fs/erofs/zdata.h | 14 +-- + fs/erofs/zmap.c | 164 +++++++++++++++++++++++------ + 13 files changed, 871 insertions(+), 307 deletions(-) + create mode 100644 fs/erofs/pcpubuf.c +Merging exfat/dev (f9b23f1f6ca0 exfat: speed up iterate/lookup by fixing start point of traversing cluster chain) +$ git merge exfat/dev +Merge made by the 'recursive' strategy. + fs/exfat/balloc.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++------- + fs/exfat/dir.c | 26 +++++++++++---- + fs/exfat/exfat_fs.h | 11 +++++-- + fs/exfat/fatent.c | 41 +++++++++++++++++------ + fs/exfat/file.c | 53 ++++++++++++++++++++++++++++++ + fs/exfat/inode.c | 3 +- + fs/exfat/namei.c | 11 +++++-- + fs/exfat/super.c | 1 + + 8 files changed, 206 insertions(+), 35 deletions(-) +Merging ext3/for_next (652a066ee959 Pull kmap_local ext2 conversion from Ira Weiny.) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd.h | 2 +- + 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/ext2/dir.c | 94 +++++++----- + fs/ext2/ext2.h | 12 +- + fs/ext2/namei.c | 34 +++-- + fs/ext2/super.c | 2 +- + fs/notify/fanotify/fanotify.c | 166 +++++++++++++++------ + fs/notify/fanotify/fanotify.h | 46 +++++- + fs/notify/fanotify/fanotify_user.c | 219 +++++++++++++++++++++++----- + fs/notify/fdinfo.c | 3 +- + fs/notify/group.c | 1 - + fs/notify/inotify/inotify_fsnotify.c | 9 +- + fs/notify/inotify/inotify_user.c | 7 +- + fs/notify/mark.c | 4 - + fs/notify/notification.c | 64 ++++---- + fs/quota/quota.c | 50 ++++++- + include/linux/fanotify.h | 36 ++++- + include/linux/fsnotify_backend.h | 29 ++-- + include/linux/sched/user.h | 3 - + include/linux/syscalls.h | 2 + + include/linux/user_namespace.h | 4 + + include/uapi/asm-generic/unistd.h | 4 +- + include/uapi/linux/dqblk_xfs.h | 5 +- + kernel/sys_ni.c | 1 + + kernel/sysctl.c | 12 +- + kernel/ucount.c | 4 + + 42 files changed, 624 insertions(+), 207 deletions(-) +Merging ext4/dev (64395d950bc4 ext4: initialize ret to suppress smatch warning) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (e8851507996d f2fs: modify open brace '{' following function definitions) +$ git merge f2fs/dev +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/segment.h +Auto-merging fs/f2fs/segment.c +Auto-merging fs/f2fs/data.c +Removing fs/f2fs/compress.h +Auto-merging fs/f2fs/checkpoint.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 31 ++++++- + Documentation/filesystems/f2fs.rst | 6 ++ + fs/f2fs/Kconfig | 16 ++-- + fs/f2fs/checkpoint.c | 8 +- + fs/f2fs/compress.c | 1 + + fs/f2fs/compress.h | 0 + fs/f2fs/data.c | 123 ++++++++++++++++++++++------ + fs/f2fs/f2fs.h | 46 ++++++++--- + fs/f2fs/file.c | 49 ++++++----- + fs/f2fs/gc.c | 89 +++++++++++++++----- + fs/f2fs/gc.h | 6 ++ + fs/f2fs/inline.c | 3 +- + fs/f2fs/inode.c | 2 +- + fs/f2fs/node.c | 11 +++ + fs/f2fs/node.h | 1 + + fs/f2fs/segment.c | 140 +++++++++++++++++++++++--------- + fs/f2fs/segment.h | 16 +++- + fs/f2fs/super.c | 97 ++++++++++++++++------ + fs/f2fs/sysfs.c | 47 +++++++++++ + fs/f2fs/verity.c | 75 ++++++++++++----- + include/linux/f2fs_fs.h | 2 +- + 21 files changed, 591 insertions(+), 178 deletions(-) + delete mode 100644 fs/f2fs/compress.h +Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl) +$ git merge fsverity/fsverity +Already up to date. +Merging fuse/for-next (0d02ec6b3136 Linux 5.12-rc4) +$ git merge fuse/for-next +Already up to date. +Merging jfs/jfs-next (b462cecfa323 fs: Fix typo issue) +$ git merge jfs/jfs-next +Merge made by the 'recursive' strategy. + fs/jfs/jfs_dmap.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging nfs/linux-next (e49d033bddf5 Linux 5.12-rc6) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (4f8be1f53bf6 nfs: we don't support removing system.nfs4_acl) +$ git merge nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (c3213d260a23 SUNRPC: Fix oops in the rpc_xdr_buf event class) +$ git merge nfsd/nfsd-next +Already up to date. +Merging cel/for-next (b73ac6808b0f NFSD: Use DEFINE_SPINLOCK() for spinlock) +$ git merge cel/for-next +Merge made by the 'recursive' strategy. + fs/nfs_common/nfsacl.c | 71 ++ + fs/nfsd/Kconfig | 6 +- + fs/nfsd/netns.h | 6 +- + fs/nfsd/nfs2acl.c | 87 +-- + fs/nfsd/nfs3acl.c | 39 +- + fs/nfsd/nfs3proc.c | 97 +-- + fs/nfsd/nfs3xdr.c | 1043 +++++++++++++++++----------- + fs/nfsd/nfs4proc.c | 40 +- + fs/nfsd/nfs4recover.c | 8 +- + fs/nfsd/nfs4state.c | 82 ++- + fs/nfsd/nfs4xdr.c | 110 +-- + fs/nfsd/nfsctl.c | 28 +- + fs/nfsd/nfsd.h | 7 +- + fs/nfsd/nfsfh.c | 2 +- + fs/nfsd/nfsfh.h | 2 +- + fs/nfsd/nfsproc.c | 53 +- + fs/nfsd/nfssvc.c | 42 +- + fs/nfsd/nfsxdr.c | 413 ++++++----- + fs/nfsd/state.h | 4 + + fs/nfsd/trace.h | 24 + + fs/nfsd/vfs.c | 9 +- + fs/nfsd/vfs.h | 2 +- + fs/nfsd/xdr.h | 23 +- + fs/nfsd/xdr3.h | 37 +- + fs/nfsd/xdr4.h | 2 +- + include/linux/nfsacl.h | 3 + + include/linux/sunrpc/svc.h | 25 + + include/linux/sunrpc/svc_rdma.h | 11 +- + include/linux/sunrpc/svc_xprt.h | 2 + + include/linux/sunrpc/xdr.h | 34 + + include/trace/events/sunrpc.h | 1 + + include/uapi/linux/nfsd/nfsfh.h | 27 +- + net/sunrpc/svc_xprt.c | 34 +- + net/sunrpc/svcauth_unix.c | 9 - + net/sunrpc/svcsock.c | 24 +- + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 8 +- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 174 ++--- + net/sunrpc/xprtrdma/svc_rdma_rw.c | 111 +-- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 69 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 15 +- + 40 files changed, 1599 insertions(+), 1185 deletions(-) +Merging orangefs/for-next (c1048828c3db orangefs: add splice file operations) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (d46b7cd68336 ovl: plumb through flush method) +$ git merge overlayfs/overlayfs-next +Auto-merging fs/overlayfs/file.c +Merge made by the 'recursive' strategy. + fs/overlayfs/file.c | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) +Merging ubifs/next (42119dbe571e ubifs: Fix error return code in alloc_wbufs()) +$ git merge ubifs/next +Already up to date. +Merging v9fs/9p-next (f8b139e2f241 fs: 9p: fix v9fs_file_open writeback fid error check) +$ git merge v9fs/9p-next +Merge made by the 'recursive' strategy. + fs/9p/v9fs.c | 2 +- + fs/9p/vfs_file.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging xfs/for-next (25dfa65f8149 xfs: fix xfs_trans slab cache name) +$ git merge xfs/for-next +Auto-merging fs/xfs/xfs_symlink.c +Auto-merging fs/xfs/xfs_inode.c +Merge made by the 'recursive' strategy. + Documentation/admin-guide/xfs.rst | 2 +- + fs/xfs/libxfs/xfs_ag.c | 115 ++++++++++++++++++++++ + fs/xfs/libxfs/xfs_ag.h | 2 + + fs/xfs/libxfs/xfs_ag_resv.c | 6 +- + fs/xfs/libxfs/xfs_alloc.c | 8 +- + fs/xfs/libxfs/xfs_bmap.c | 9 +- + fs/xfs/libxfs/xfs_dir2_data.c | 2 +- + fs/xfs/libxfs/xfs_dir2_leaf.c | 10 +- + fs/xfs/libxfs/xfs_dir2_node.c | 2 +- + fs/xfs/libxfs/xfs_dir2_priv.h | 3 +- + fs/xfs/libxfs/xfs_errortag.h | 4 +- + fs/xfs/libxfs/xfs_ialloc.c | 4 +- + fs/xfs/libxfs/xfs_iext_tree.c | 2 +- + fs/xfs/libxfs/xfs_inode_fork.c | 22 +++-- + fs/xfs/libxfs/xfs_inode_fork.h | 2 + + fs/xfs/libxfs/xfs_types.c | 18 ++-- + fs/xfs/scrub/agheader.c | 33 ++----- + fs/xfs/scrub/common.c | 23 ++--- + fs/xfs/scrub/common.h | 5 +- + fs/xfs/scrub/health.c | 3 +- + fs/xfs/scrub/quota.c | 6 +- + fs/xfs/scrub/repair.c | 6 +- + fs/xfs/scrub/scrub.c | 2 +- + fs/xfs/xfs_aops.c | 2 +- + fs/xfs/xfs_buf_item.c | 141 +++++++++++++++++++++------ + fs/xfs/xfs_error.c | 5 + + fs/xfs/xfs_fsmap.c | 14 +-- + fs/xfs/xfs_fsops.c | 199 ++++++++++++++++++++++++-------------- + fs/xfs/xfs_icache.c | 2 +- + fs/xfs/xfs_inode.c | 30 +++++- + fs/xfs/xfs_inode.h | 14 ++- + fs/xfs/xfs_iops.c | 34 ++++++- + fs/xfs/xfs_log_recover.c | 4 +- + fs/xfs/xfs_mount.h | 2 +- + fs/xfs/xfs_qm.c | 2 +- + fs/xfs/xfs_super.c | 128 +++++++++++++----------- + fs/xfs/xfs_symlink.c | 2 +- + fs/xfs/xfs_trans.c | 12 +-- + fs/xfs/xfs_xattr.c | 2 + + 39 files changed, 610 insertions(+), 272 deletions(-) +Merging zonefs/for-next (6980d29ce4da zonefs: fix to update .i_wr_refcnt correctly in zonefs_open_zone()) +$ git merge zonefs/for-next +Already up to date. +Merging iomap/iomap-for-next (ad89b66cbad1 iomap: improve the warnings from iomap_swapfile_activate) +$ git merge iomap/iomap-for-next +Merge made by the 'recursive' strategy. + fs/iomap/swapfile.c | 38 ++++++++++++++++++++++---------------- + 1 file changed, 22 insertions(+), 16 deletions(-) +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 (b8da9b10e26c fs/locks: print full locks information) +$ git merge file-locks/locks-next +Auto-merging fs/locks.c +Merge made by the 'recursive' strategy. + fs/locks.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 56 insertions(+), 9 deletions(-) +Merging vfs/for-next (f85ebc25fa88 Merge branch 'work.misc' into for-next) +$ git merge vfs/for-next +Auto-merging include/linux/fs.h +Auto-merging fs/nfsd/nfsproc.c +Auto-merging fs/nfs/inode.c +Auto-merging fs/hostfs/hostfs_kern.c +Auto-merging fs/ecryptfs/ecryptfs_kernel.h +Auto-merging fs/cifs/inode.c +Auto-merging fs/cifs/file.c +CONFLICT (content): Merge conflict in fs/cifs/file.c +Auto-merging fs/afs/inode.c +Resolved 'fs/cifs/file.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9676751a0823] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/powerpc/platforms/cell/spufs/coredump.c | 3 +- + arch/powerpc/platforms/cell/spufs/inode.c | 10 +- + drivers/infiniband/hw/qib/qib_fs.c | 68 +---------- + fs/9p/vfs_inode.c | 4 +- + fs/9p/vfs_inode_dotl.c | 14 +-- + fs/afs/inode.c | 6 +- + fs/autofs/autofs_i.h | 1 + + fs/autofs/waitq.c | 72 +++--------- + fs/binfmt_elf.c | 4 +- + fs/binfmt_elf_fdpic.c | 3 +- + fs/buffer.c | 6 +- + fs/ceph/caps.c | 8 +- + fs/ceph/dir.c | 2 + + fs/ceph/export.c | 9 +- + fs/ceph/inode.c | 41 ++++++- + fs/cifs/cifsproto.h | 2 +- + fs/cifs/dir.c | 19 ++-- + fs/cifs/file.c | 2 +- + fs/cifs/inode.c | 57 +++++----- + fs/cifs/readdir.c | 4 +- + fs/coredump.c | 72 +++++++----- + fs/d_path.c | 10 +- + fs/ecryptfs/ecryptfs_kernel.h | 17 +-- + fs/ecryptfs/inode.c | 163 ++++++++++++--------------- + fs/fuse/dir.c | 6 +- + fs/fuse/inode.c | 2 +- + fs/fuse/readdir.c | 2 +- + fs/gfs2/glops.c | 22 ++-- + fs/hostfs/hostfs_kern.c | 1 - + fs/nfs/inode.c | 6 +- + fs/nfsd/nfsproc.c | 2 +- + fs/ocfs2/dlmglue.c | 12 +- + fs/openpromfs/inode.c | 67 ++++++----- + fs/orangefs/orangefs-utils.c | 2 +- + fs/overlayfs/namei.c | 4 +- + fs/vboxsf/dir.c | 4 +- + fs/vboxsf/super.c | 4 +- + fs/vboxsf/utils.c | 68 +++++++---- + fs/vboxsf/vfsmod.h | 4 +- + include/linux/binfmts.h | 1 + + include/linux/coredump.h | 14 +-- + include/linux/dcache.h | 4 +- + include/linux/fs.h | 5 + + 43 files changed, 384 insertions(+), 443 deletions(-) +Merging printk/for-next (94a67011a225 Merge branch 'for-5.13' into for-next) +$ git merge printk/for-next +Auto-merging mm/slub.c +Auto-merging arch/powerpc/xmon/xmon.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/core-api/printk-formats.rst | 28 +- + MAINTAINERS | 8 +- + arch/powerpc/kernel/nvram_64.c | 8 +- + arch/powerpc/xmon/xmon.c | 6 +- + arch/um/kernel/kmsg_dump.c | 13 +- + drivers/hv/vmbus_drv.c | 4 +- + drivers/mtd/mtdoops.c | 17 +- + fs/pstore/platform.c | 5 +- + include/linux/kmsg_dump.h | 47 ++- + kernel/debug/kdb/kdb_main.c | 10 +- + kernel/printk/internal.h | 7 +- + kernel/printk/printk.c | 478 +++++++++++++++--------------- + kernel/printk/printk_safe.c | 30 +- + lib/test_printf.c | 90 +++++- + lib/vsprintf.c | 76 ++++- + mm/slub.c | 13 +- + 16 files changed, 502 insertions(+), 338 deletions(-) +Merging pci/next (e9d14c046bcf Merge branch 'remotes/lorenzo/pci/misc') +$ git merge pci/next +Auto-merging drivers/net/ethernet/realtek/r8169_main.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/pci/hisilicon-pcie.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pci/hisilicon-pcie.txt | 43 --- + .../devicetree/bindings/pci/ti,j721e-pci-ep.yaml | 9 +- + .../devicetree/bindings/pci/ti,j721e-pci-host.yaml | 20 +- + MAINTAINERS | 1 - + arch/arm/mach-iop32x/n2100.c | 8 +- + drivers/ata/ahci_brcm.c | 46 +-- + drivers/iommu/intel/irq_remapping.c | 3 +- + drivers/net/ethernet/realtek/r8169_main.c | 14 - + drivers/pci/ats.c | 2 +- + drivers/pci/controller/Kconfig | 4 +- + drivers/pci/controller/Makefile | 7 +- + drivers/pci/controller/cadence/pci-j721e.c | 24 +- + drivers/pci/controller/dwc/Kconfig | 3 +- + drivers/pci/controller/dwc/Makefile | 7 +- + drivers/pci/controller/dwc/pci-keystone.c | 14 +- + drivers/pci/controller/dwc/pci-layerscape-ep.c | 2 +- + drivers/pci/controller/dwc/pcie-tegra194.c | 4 +- + drivers/pci/controller/mobiveil/Kconfig | 3 +- + drivers/pci/controller/pci-host-common.c | 1 + + drivers/pci/controller/pci-hyperv.c | 4 - + drivers/pci/controller/pci-tegra.c | 343 +++++++++++--------- + drivers/pci/controller/pci-thunder-ecam.c | 2 +- + drivers/pci/controller/pci-thunder-pem.c | 13 +- + drivers/pci/controller/pci-xgene.c | 3 +- + drivers/pci/controller/pcie-brcmstb.c | 20 +- + drivers/pci/controller/pcie-iproc-msi.c | 2 +- + drivers/pci/controller/pcie-mediatek.c | 6 +- + drivers/pci/controller/pcie-microchip-host.c | 12 +- + drivers/pci/controller/pcie-rcar-host.c | 355 ++++++++++----------- + drivers/pci/controller/pcie-xilinx.c | 246 ++++++-------- + drivers/pci/controller/vmd.c | 63 +++- + drivers/pci/endpoint/functions/pci-epf-ntb.c | 16 +- + drivers/pci/endpoint/functions/pci-epf-test.c | 19 +- + drivers/pci/endpoint/pci-epc-core.c | 2 + + drivers/pci/hotplug/acpi_pcihp.c | 2 +- + drivers/pci/msi.c | 45 +-- + drivers/pci/of.c | 22 +- + drivers/pci/pci-acpi.c | 2 +- + drivers/pci/pci-sysfs.c | 54 +++- + drivers/pci/pci.c | 17 + + drivers/pci/pci.h | 8 +- + drivers/pci/pcie/aer.c | 6 +- + drivers/pci/pcie/pme.c | 2 +- + drivers/pci/pcie/rcec.c | 2 +- + drivers/pci/probe.c | 5 +- + drivers/pci/quirks.c | 28 +- + drivers/pci/vpd.c | 164 +--------- + include/linux/msi.h | 17 +- + include/linux/pci.h | 5 +- + include/linux/pci_ids.h | 2 - + 50 files changed, 793 insertions(+), 909 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/pci/hisilicon-pcie.txt +Merging pstore/for-next/pstore (9d843e8fafc7 pstore: Add mem_type property DT parsing support) +$ git merge pstore/for-next/pstore +Merge made by the 'recursive' strategy. + Documentation/admin-guide/ramoops.rst | 4 +++- + .../devicetree/bindings/reserved-memory/ramoops.txt | 10 ++++++++-- + fs/pstore/ram.c | 7 ++++++- + fs/pstore/ram_core.c | 18 ++++++++++++++++-- + 4 files changed, 33 insertions(+), 6 deletions(-) +Merging hid/for-next (360b9faeeef3 Merge branch 'for-5.13/magicmouse' into for-next) +$ git merge hid/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 15 + + drivers/hid/Kconfig | 20 +- + drivers/hid/Makefile | 6 +- + drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 40 +- + drivers/hid/amd-sfh-hid/amd_sfh_pcie.h | 1 - + drivers/hid/hid-alps.c | 1 + + drivers/hid/hid-asus.c | 3 + + drivers/hid/hid-cp2112.c | 22 +- + drivers/hid/hid-debug.c | 1 + + drivers/hid/hid-elan.c | 17 +- + drivers/hid/hid-ft260.c | 1054 ++++++++++++++++++++ + drivers/hid/hid-google-hammer.c | 2 + + drivers/hid/hid-ids.h | 16 +- + drivers/hid/hid-input.c | 22 +- + drivers/hid/hid-lenovo.c | 147 ++- + drivers/hid/hid-lg.c | 24 - + drivers/hid/hid-logitech-dj.c | 131 ++- + drivers/hid/hid-magicmouse.c | 158 ++- + drivers/hid/hid-plantronics.c | 60 +- + drivers/hid/hid-quirks.c | 5 +- + drivers/hid/hid-thrustmaster.c | 370 +++++++ + drivers/hid/i2c-hid/i2c-hid-acpi.c | 52 +- + drivers/hid/intel-ish-hid/ishtp-fw-loader.c | 4 +- + drivers/hid/intel-ish-hid/ishtp-hid-client.c | 4 +- + drivers/hid/intel-ish-hid/ishtp/bus.c | 15 +- + drivers/hid/intel-ish-hid/ishtp/hbm.c | 6 +- + drivers/hid/intel-ish-hid/ishtp/hbm.h | 1 + + drivers/hid/surface-hid/Kconfig | 42 + + drivers/hid/surface-hid/Makefile | 7 + + drivers/hid/surface-hid/surface_hid.c | 253 +++++ + drivers/hid/surface-hid/surface_hid_core.c | 272 +++++ + drivers/hid/surface-hid/surface_hid_core.h | 77 ++ + drivers/hid/surface-hid/surface_kbd.c | 300 ++++++ + drivers/hid/usbhid/hiddev.c | 6 +- + drivers/hid/wacom_wac.c | 8 +- + drivers/platform/chrome/cros_ec_ishtp.c | 4 +- + drivers/platform/surface/Kconfig | 27 + + drivers/platform/surface/Makefile | 1 + + .../platform/surface/surface_aggregator_registry.c | 641 ++++++++++++ + include/linux/hid.h | 5 + + include/linux/intel-ish-client-if.h | 2 +- + 41 files changed, 3631 insertions(+), 211 deletions(-) + create mode 100644 drivers/hid/hid-ft260.c + create mode 100644 drivers/hid/hid-thrustmaster.c + create mode 100644 drivers/hid/surface-hid/Kconfig + create mode 100644 drivers/hid/surface-hid/Makefile + create mode 100644 drivers/hid/surface-hid/surface_hid.c + create mode 100644 drivers/hid/surface-hid/surface_hid_core.c + create mode 100644 drivers/hid/surface-hid/surface_hid_core.h + create mode 100644 drivers/hid/surface-hid/surface_kbd.c + create mode 100644 drivers/platform/surface/surface_aggregator_registry.c +Merging i2c/i2c/for-next (c0dccb2c9def Merge branch 'i2c/for-5.13' into i2c/for-next) +$ git merge i2c/i2c/for-next +Auto-merging drivers/i2c/busses/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/i2c-gpio.yaml | 2 +- + Documentation/devicetree/bindings/i2c/i2c-imx.yaml | 3 - + MAINTAINERS | 5 + + drivers/i2c/busses/Kconfig | 10 + + drivers/i2c/busses/Makefile | 1 + + drivers/i2c/busses/i2c-cp2615.c | 330 +++++++++++++++++++++ + drivers/i2c/busses/i2c-designware-common.c | 3 + + drivers/i2c/busses/i2c-designware-core.h | 8 + + drivers/i2c/busses/i2c-designware-master.c | 136 ++++++++- + drivers/i2c/busses/i2c-designware-pcidrv.c | 61 ++++ + drivers/i2c/busses/i2c-exynos5.c | 2 +- + drivers/i2c/busses/i2c-hix5hd2.c | 2 +- + drivers/i2c/busses/i2c-jz4780.c | 4 +- + drivers/i2c/busses/i2c-mlxbf.c | 14 +- + drivers/i2c/busses/i2c-powermac.c | 5 - + drivers/i2c/busses/i2c-qcom-cci.c | 4 +- + drivers/i2c/busses/i2c-rcar.c | 84 +++++- + drivers/i2c/busses/i2c-scmi.c | 2 - + drivers/i2c/busses/i2c-stm32f4.c | 2 +- + drivers/i2c/busses/i2c-stm32f7.c | 70 ++--- + drivers/i2c/busses/i2c-tegra-bpmp.c | 79 +++-- + drivers/i2c/i2c-core-base.c | 9 +- + drivers/i2c/i2c-dev.c | 9 +- + include/linux/i2c.h | 2 + + 24 files changed, 731 insertions(+), 116 deletions(-) + create mode 100644 drivers/i2c/busses/i2c-cp2615.c +Merging i3c/i3c/next (e43d5c7c3c34 dt-bindings: i3c: Fix silvaco,i3c-master-v1 compatible string) +$ git merge i3c/i3c/next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/i3c/silvaco,i3c-master.yaml | 2 +- + drivers/i3c/master/svc-i3c-master.c | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) +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 (02bb6badc9fb hwmon: (mlxreg-fan) Add support for fan drawers capability and present registers) +$ git merge hwmon-staging/hwmon-next +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + .../devicetree/bindings/trivial-devices.yaml | 6 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/hwmon/bpa-rs600.rst | 74 ++ + Documentation/hwmon/corsair-psu.rst | 13 +- + Documentation/hwmon/index.rst | 4 + + Documentation/hwmon/ir36021.rst | 63 ++ + Documentation/hwmon/nzxt-kraken2.rst | 42 + + Documentation/hwmon/stpddc60.rst | 90 ++ + Documentation/hwmon/tps53679.rst | 13 +- + MAINTAINERS | 14 + + drivers/hwmon/Kconfig | 10 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/adc128d818.c | 2 +- + drivers/hwmon/adm9240.c | 982 ++++++++++----------- + drivers/hwmon/applesmc.c | 34 +- + drivers/hwmon/corsair-psu.c | 355 ++++++-- + drivers/hwmon/ds1621.c | 2 +- + drivers/hwmon/ftsteutates.c | 4 +- + drivers/hwmon/hwmon.c | 2 +- + drivers/hwmon/ina209.c | 6 +- + drivers/hwmon/ina2xx.c | 11 +- + drivers/hwmon/ina3221.c | 2 +- + drivers/hwmon/it87.c | 12 +- + drivers/hwmon/lineage-pem.c | 8 +- + drivers/hwmon/lm63.c | 2 +- + drivers/hwmon/ltc2945.c | 4 +- + drivers/hwmon/ltc2990.c | 4 +- + drivers/hwmon/ltc4151.c | 2 +- + drivers/hwmon/ltc4215.c | 8 +- + drivers/hwmon/ltc4222.c | 4 +- + drivers/hwmon/ltc4260.c | 4 +- + drivers/hwmon/ltc4261.c | 4 +- + drivers/hwmon/max16065.c | 18 +- + drivers/hwmon/max6697.c | 2 +- + drivers/hwmon/mlxreg-fan.c | 51 +- + drivers/hwmon/nct6683.c | 11 +- + drivers/hwmon/nzxt-kraken2.c | 234 +++++ + drivers/hwmon/occ/common.c | 69 +- + drivers/hwmon/occ/sysfs.c | 4 +- + drivers/hwmon/pmbus/Kconfig | 32 +- + drivers/hwmon/pmbus/Makefile | 3 + + drivers/hwmon/pmbus/bpa-rs600.c | 172 ++++ + drivers/hwmon/pmbus/inspur-ipsps.c | 28 +- + drivers/hwmon/pmbus/ir36021.c | 79 ++ + drivers/hwmon/pmbus/pmbus.h | 1 + + drivers/hwmon/pmbus/pmbus_core.c | 27 +- + drivers/hwmon/pmbus/stpddc60.c | 248 ++++++ + drivers/hwmon/pmbus/tps53679.c | 51 +- + drivers/hwmon/s3c-hwmon.c | 4 +- + drivers/hwmon/sch5627.c | 24 +- + drivers/hwmon/sch5636.c | 20 +- + drivers/hwmon/smm665.c | 4 +- + drivers/hwmon/stts751.c | 20 +- + drivers/hwmon/vexpress-hwmon.c | 12 +- + drivers/hwmon/xgene-hwmon.c | 14 +- + 55 files changed, 2134 insertions(+), 778 deletions(-) + create mode 100644 Documentation/hwmon/bpa-rs600.rst + create mode 100644 Documentation/hwmon/ir36021.rst + create mode 100644 Documentation/hwmon/nzxt-kraken2.rst + create mode 100644 Documentation/hwmon/stpddc60.rst + create mode 100644 drivers/hwmon/nzxt-kraken2.c + create mode 100644 drivers/hwmon/pmbus/bpa-rs600.c + create mode 100644 drivers/hwmon/pmbus/ir36021.c + create mode 100644 drivers/hwmon/pmbus/stpddc60.c +Merging jc_docs/docs-next (a4f413348f26 Documentation: filesystesm api-summary: add namespace.c) +$ git merge jc_docs/docs-next +Auto-merging MAINTAINERS +Auto-merging Documentation/virt/kvm/api.rst +Auto-merging Documentation/process/submitting-patches.rst +Removing Documentation/driver-api/driver-model/class.rst +Removing Documentation/admin-guide/reporting-bugs.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging .mailmap +Merge made by the 'recursive' strategy. + .mailmap | 5 +- + CREDITS | 2 +- + Documentation/admin-guide/LSM/LoadPin.rst | 6 +- + Documentation/admin-guide/cgroup-v1/memory.rst | 7 +- + Documentation/admin-guide/dynamic-debug-howto.rst | 2 +- + Documentation/admin-guide/index.rst | 1 - + Documentation/admin-guide/kernel-parameters.rst | 1 + + Documentation/admin-guide/kernel-parameters.txt | 3 +- + Documentation/admin-guide/mm/numaperf.rst | 2 +- + Documentation/admin-guide/reporting-bugs.rst | 187 --- + Documentation/admin-guide/reporting-issues.rst | 1083 +++++++++-------- + Documentation/admin-guide/sysrq.rst | 4 +- + Documentation/arch.rst | 26 + + Documentation/arm/marvell.rst | 159 +-- + Documentation/arm/uefi.rst | 7 + + Documentation/conf.py | 31 +- + Documentation/core-api/rbtree.rst | 2 +- + Documentation/dev-tools/checkpatch.rst | 755 ++++++++++++ + Documentation/dev-tools/index.rst | 1 + + .../devicetree/bindings/submitting-patches.rst | 4 +- + Documentation/driver-api/driver-model/class.rst | 149 --- + Documentation/driver-api/driver-model/device.rst | 23 +- + Documentation/driver-api/driver-model/index.rst | 1 - + Documentation/driver-api/gpio/intro.rst | 2 +- + Documentation/fb/fbcon.rst | 4 +- + Documentation/features/arch-support.txt | 1 + + Documentation/features/vm/TLB/arch-support.txt | 2 +- + Documentation/filesystems/api-summary.rst | 9 + + Documentation/filesystems/proc.rst | 4 + + Documentation/filesystems/vfat.rst | 2 +- + Documentation/hid/intel-ish-hid.rst | 2 +- + Documentation/index.rst | 20 +- + Documentation/input/event-codes.rst | 10 +- + Documentation/input/ff.rst | 6 +- + Documentation/input/gameport-programming.rst | 35 +- + Documentation/input/input-programming.rst | 20 +- + Documentation/input/input.rst | 8 +- + Documentation/input/multi-touch-protocol.rst | 8 +- + Documentation/input/notifier.rst | 3 +- + Documentation/input/uinput.rst | 2 +- + Documentation/leds/leds-lm3556.rst | 28 +- + Documentation/livepatch/shadow-vars.rst | 4 +- + Documentation/powerpc/booting.rst | 2 +- + Documentation/powerpc/dawr-power9.rst | 2 +- + Documentation/powerpc/eeh-pci-error-recovery.rst | 2 +- + Documentation/powerpc/elfnote.rst | 2 +- + Documentation/powerpc/firmware-assisted-dump.rst | 4 +- + Documentation/powerpc/kaslr-booke32.rst | 2 +- + Documentation/powerpc/mpc52xx.rst | 2 +- + Documentation/powerpc/papr_hcalls.rst | 4 +- + Documentation/powerpc/transactional_memory.rst | 4 +- + Documentation/process/submitting-patches.rst | 91 +- + Documentation/scsi/ChangeLog.megaraid | 2 +- + Documentation/sphinx/rstFlatTable.py | 4 +- + .../it_IT/process/submit-checklist.rst | 14 +- + Documentation/translations/ja_JP/SubmitChecklist | 8 +- + Documentation/translations/ko_KR/howto.rst | 18 +- + .../translations/zh_CN/admin-guide/README.rst | 347 ++++++ + .../translations/zh_CN/admin-guide/bug-bisect.rst | 81 ++ + .../translations/zh_CN/admin-guide/bug-hunting.rst | 340 ++++++ + .../translations/zh_CN/admin-guide/index.rst | 19 +- + .../translations/zh_CN/admin-guide/init.rst | 54 + + .../zh_CN/admin-guide/reporting-issues.rst | 1269 ++++++++++++++++++++ + .../zh_CN/admin-guide/security-bugs.rst | 74 ++ + .../zh_CN/admin-guide/tainted-kernels.rst | 157 +++ + .../translations/zh_CN/admin-guide/unicode.rst | 170 +++ + .../translations/zh_CN/disclaimer-zh_CN.rst | 2 +- + Documentation/translations/zh_CN/index.rst | 2 + + .../translations/zh_CN/kernel-hacking/hacking.rst | 708 +++++++++++ + .../translations/zh_CN/kernel-hacking/index.rst | 22 + + .../translations/zh_CN/process/1.Intro.rst | 195 +-- + .../translations/zh_CN/process/2.Process.rst | 345 +++--- + .../translations/zh_CN/process/3.Early-stage.rst | 139 ++- + .../translations/zh_CN/process/4.Coding.rst | 279 ++--- + .../translations/zh_CN/process/5.Posting.rst | 243 ++-- + .../translations/zh_CN/process/6.Followthrough.rst | 165 +-- + .../zh_CN/process/7.AdvancedTopics.rst | 141 ++- + .../translations/zh_CN/process/8.Conclusion.rst | 60 +- + Documentation/translations/zh_CN/process/index.rst | 10 +- + .../zh_CN/process/submit-checklist.rst | 14 +- + .../translations/zh_CN/riscv/boot-image-header.rst | 67 ++ + Documentation/translations/zh_CN/riscv/index.rst | 28 + + .../translations/zh_CN/riscv/patch-acceptance.rst | 31 + + Documentation/translations/zh_CN/riscv/pmu.rst | 233 ++++ + .../translations/zh_CN/sound/hd-audio/controls.rst | 102 ++ + .../translations/zh_CN/sound/hd-audio/index.rst | 14 + + Documentation/translations/zh_CN/sound/index.rst | 22 + + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + + Documentation/virt/kvm/api.rst | 2 +- + Documentation/watchdog/pcwd-watchdog.rst | 2 +- + MAINTAINERS | 17 +- + fs/eventpoll.c | 52 +- + fs/namespace.c | 14 +- + scripts/checkpatch.pl | 133 +- + scripts/get_abi.pl | 74 +- + scripts/kernel-doc | 53 +- + tools/scripts/Makefile.include | 3 +- + 97 files changed, 6524 insertions(+), 1952 deletions(-) + delete mode 100644 Documentation/admin-guide/reporting-bugs.rst + create mode 100644 Documentation/arch.rst + create mode 100644 Documentation/dev-tools/checkpatch.rst + delete mode 100644 Documentation/driver-api/driver-model/class.rst + create mode 100644 Documentation/translations/zh_CN/admin-guide/README.rst + create mode 100644 Documentation/translations/zh_CN/admin-guide/bug-bisect.rst + create mode 100644 Documentation/translations/zh_CN/admin-guide/bug-hunting.rst + create mode 100644 Documentation/translations/zh_CN/admin-guide/init.rst + create mode 100644 Documentation/translations/zh_CN/admin-guide/reporting-issues.rst + create mode 100644 Documentation/translations/zh_CN/admin-guide/security-bugs.rst + create mode 100644 Documentation/translations/zh_CN/admin-guide/tainted-kernels.rst + create mode 100644 Documentation/translations/zh_CN/admin-guide/unicode.rst + create mode 100644 Documentation/translations/zh_CN/kernel-hacking/hacking.rst + create mode 100644 Documentation/translations/zh_CN/kernel-hacking/index.rst + create mode 100644 Documentation/translations/zh_CN/riscv/boot-image-header.rst + create mode 100644 Documentation/translations/zh_CN/riscv/index.rst + create mode 100644 Documentation/translations/zh_CN/riscv/patch-acceptance.rst + create mode 100644 Documentation/translations/zh_CN/riscv/pmu.rst + create mode 100644 Documentation/translations/zh_CN/sound/hd-audio/controls.rst + create mode 100644 Documentation/translations/zh_CN/sound/hd-audio/index.rst + create mode 100644 Documentation/translations/zh_CN/sound/index.rst +Merging v4l-dvb/master (c1c1d437b1f0 MAINTAINERS: update ovti,ov2680.yaml reference) +$ git merge v4l-dvb/master +Removing include/media/vp8-ctrls.h +Auto-merging include/media/rc-map.h +Removing include/linux/platform_data/media/camera-mx3.h +Removing include/linux/platform_data/media/camera-mx2.h +Auto-merging drivers/media/rc/keymaps/Makefile +Auto-merging drivers/media/platform/rockchip/rkisp1/rkisp1-params.c +Auto-merging drivers/media/platform/coda/coda-common.c +Removing drivers/media/pci/mantis/mantis_core.c +Auto-merging drivers/media/pci/ivtv/ivtv-driver.c +Auto-merging drivers/media/pci/cx25821/cx25821-alsa.c +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Removing Documentation/devicetree/bindings/media/renesas,drif.txt +Removing Documentation/devicetree/bindings/media/qcom,camss.txt +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master db35cfb10df3] Merge remote-tracking branch 'v4l-dvb/master' +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/mediatek/mediatek,disp.txt | 2 +- + .../devicetree/bindings/i3c/cdns,i3c-master.txt | 6 +- + .../devicetree/bindings/i3c/snps,dw-i3c-master.txt | 6 +- + .../bindings/media/mediatek-jpeg-decoder.txt | 2 +- + .../bindings/media/mediatek-jpeg-encoder.txt | 2 +- + .../devicetree/bindings/media/mediatek-mdp.txt | 2 +- + .../devicetree/bindings/media/mediatek-vcodec.txt | 57 +- + .../bindings/media/nxp,imx7-mipi-csi2.yaml | 108 +- + .../devicetree/bindings/media/nxp,imx8-jpeg.yaml | 84 + + .../devicetree/bindings/media/qcom,camss.txt | 236 --- + .../bindings/media/qcom,msm8916-camss.yaml | 256 +++ + .../bindings/media/qcom,msm8996-camss.yaml | 387 ++++ + .../bindings/media/qcom,sdm660-camss.yaml | 398 ++++ + .../bindings/media/qcom,sdm845-camss.yaml | 371 ++++ + Documentation/devicetree/bindings/media/rc.yaml | 2 + + .../devicetree/bindings/media/renesas,drif.txt | 177 -- + .../devicetree/bindings/media/renesas,drif.yaml | 279 +++ + Documentation/driver-api/media/camera-sensor.rst | 3 +- + Documentation/driver-api/media/index.rst | 2 + + .../driver-api/media/maintainer-entry-profile.rst | 206 ++ + Documentation/driver-api/media/v4l2-subdev.rst | 4 +- + .../maintainer/maintainer-entry-profile.rst | 1 + + .../media/cec/cec-ioc-adap-g-caps.rst | 4 +- + .../media/cec/cec-ioc-adap-g-conn-info.rst | 6 +- + .../media/cec/cec-ioc-adap-g-log-addrs.rst | 12 +- + .../userspace-api/media/cec/cec-ioc-dqevent.rst | 10 +- + .../userspace-api/media/cec/cec-ioc-g-mode.rst | 4 +- + .../userspace-api/media/cec/cec-ioc-receive.rst | 8 +- + .../userspace-api/media/cec/cec-pin-error-inj.rst | 2 +- + .../userspace-api/media/dvb/fe-type-t.rst | 2 +- + .../media/mediactl/media-ioc-device-info.rst | 2 +- + .../media/mediactl/media-ioc-enum-entities.rst | 2 +- + .../media/mediactl/media-ioc-enum-links.rst | 6 +- + .../media/mediactl/media-ioc-g-topology.rst | 12 +- + .../userspace-api/media/mediactl/media-types.rst | 4 +- + Documentation/userspace-api/media/rc/rc-tables.rst | 2 +- + Documentation/userspace-api/media/v4l/buffer.rst | 22 +- + .../media/v4l/colorspaces-details.rst | 31 - + Documentation/userspace-api/media/v4l/common.rst | 1 + + Documentation/userspace-api/media/v4l/control.rst | 13 +- + Documentation/userspace-api/media/v4l/dev-meta.rst | 2 +- + .../userspace-api/media/v4l/dev-overlay.rst | 9 +- + .../userspace-api/media/v4l/dev-raw-vbi.rst | 4 +- + Documentation/userspace-api/media/v4l/dev-rds.rst | 4 +- + Documentation/userspace-api/media/v4l/dev-sdr.rst | 2 +- + .../userspace-api/media/v4l/dev-sliced-vbi.rst | 50 +- + .../userspace-api/media/v4l/dev-subdev.rst | 6 +- + Documentation/userspace-api/media/v4l/diff-v4l.rst | 10 +- + .../userspace-api/media/v4l/ext-ctrls-camera.rst | 14 +- + .../media/v4l/ext-ctrls-codec-stateless.rst | 519 ++++- + .../userspace-api/media/v4l/ext-ctrls-codec.rst | 672 +++---- + .../media/v4l/ext-ctrls-colorimetry.rst | 93 + + .../userspace-api/media/v4l/ext-ctrls-dv.rst | 2 +- + .../userspace-api/media/v4l/ext-ctrls-flash.rst | 7 +- + .../userspace-api/media/v4l/ext-ctrls-jpeg.rst | 13 +- + .../userspace-api/media/v4l/field-order.rst | 2 +- + .../userspace-api/media/v4l/pixfmt-compressed.rst | 27 +- + .../userspace-api/media/v4l/pixfmt-packed-yuv.rst | 36 +- + .../userspace-api/media/v4l/pixfmt-reserved.rst | 10 +- + .../userspace-api/media/v4l/pixfmt-rgb.rst | 9 +- + .../media/v4l/pixfmt-srggb10-ipu3.rst | 12 +- + .../userspace-api/media/v4l/pixfmt-srggb10p.rst | 2 +- + .../userspace-api/media/v4l/pixfmt-srggb12p.rst | 2 +- + .../userspace-api/media/v4l/pixfmt-srggb14.rst | 2 + + .../userspace-api/media/v4l/pixfmt-srggb14p.rst | 6 +- + .../userspace-api/media/v4l/pixfmt-srggb16.rst | 2 + + .../userspace-api/media/v4l/pixfmt-srggb8.rst | 3 +- + .../userspace-api/media/v4l/pixfmt-v4l2-mplane.rst | 4 +- + .../userspace-api/media/v4l/pixfmt-v4l2.rst | 4 +- + .../userspace-api/media/v4l/pixfmt-yuv-luma.rst | 10 + + .../userspace-api/media/v4l/pixfmt-yuv-planar.rst | 34 +- + .../userspace-api/media/v4l/subdev-formats.rst | 30 +- + .../media/v4l/v4l2-selection-flags.rst | 14 +- + .../media/v4l/v4l2-selection-targets.rst | 12 +- + Documentation/userspace-api/media/v4l/vbi_525.svg | 4 +- + Documentation/userspace-api/media/v4l/vbi_625.svg | 4 +- + .../userspace-api/media/v4l/vbi_hsync.svg | 4 +- + .../userspace-api/media/v4l/vidioc-create-bufs.rst | 2 +- + .../userspace-api/media/v4l/vidioc-cropcap.rst | 4 +- + .../media/v4l/vidioc-dbg-g-chip-info.rst | 6 +- + .../media/v4l/vidioc-dbg-g-register.rst | 4 +- + .../userspace-api/media/v4l/vidioc-decoder-cmd.rst | 6 +- + .../userspace-api/media/v4l/vidioc-dqevent.rst | 21 +- + .../media/v4l/vidioc-dv-timings-cap.rst | 6 +- + .../userspace-api/media/v4l/vidioc-encoder-cmd.rst | 6 +- + .../media/v4l/vidioc-enum-dv-timings.rst | 2 +- + .../userspace-api/media/v4l/vidioc-enum-fmt.rst | 10 +- + .../media/v4l/vidioc-enum-frameintervals.rst | 7 +- + .../media/v4l/vidioc-enum-framesizes.rst | 8 +- + .../media/v4l/vidioc-enum-freq-bands.rst | 4 +- + .../userspace-api/media/v4l/vidioc-enuminput.rst | 8 +- + .../userspace-api/media/v4l/vidioc-enumoutput.rst | 6 +- + .../userspace-api/media/v4l/vidioc-enumstd.rst | 6 +- + .../userspace-api/media/v4l/vidioc-expbuf.rst | 2 +- + .../userspace-api/media/v4l/vidioc-g-audio.rst | 6 +- + .../userspace-api/media/v4l/vidioc-g-audioout.rst | 2 +- + .../userspace-api/media/v4l/vidioc-g-crop.rst | 2 +- + .../userspace-api/media/v4l/vidioc-g-ctrl.rst | 2 +- + .../media/v4l/vidioc-g-dv-timings.rst | 18 +- + .../userspace-api/media/v4l/vidioc-g-edid.rst | 2 +- + .../userspace-api/media/v4l/vidioc-g-enc-index.rst | 6 +- + .../userspace-api/media/v4l/vidioc-g-ext-ctrls.rst | 76 +- + .../userspace-api/media/v4l/vidioc-g-fbuf.rst | 6 +- + .../userspace-api/media/v4l/vidioc-g-fmt.rst | 2 +- + .../userspace-api/media/v4l/vidioc-g-frequency.rst | 2 +- + .../userspace-api/media/v4l/vidioc-g-jpegcomp.rst | 4 +- + .../userspace-api/media/v4l/vidioc-g-modulator.rst | 5 +- + .../userspace-api/media/v4l/vidioc-g-parm.rst | 11 +- + .../userspace-api/media/v4l/vidioc-g-priority.rst | 2 +- + .../userspace-api/media/v4l/vidioc-g-selection.rst | 2 +- + .../media/v4l/vidioc-g-sliced-vbi-cap.rst | 29 +- + .../userspace-api/media/v4l/vidioc-g-tuner.rst | 10 +- + .../userspace-api/media/v4l/vidioc-querycap.rst | 8 +- + .../userspace-api/media/v4l/vidioc-queryctrl.rst | 27 +- + .../userspace-api/media/v4l/vidioc-reqbufs.rst | 14 +- + .../media/v4l/vidioc-s-hw-freq-seek.rst | 2 +- + .../v4l/vidioc-subdev-enum-frame-interval.rst | 2 +- + .../media/v4l/vidioc-subdev-enum-frame-size.rst | 2 +- + .../media/v4l/vidioc-subdev-enum-mbus-code.rst | 12 +- + .../media/v4l/vidioc-subdev-g-crop.rst | 2 +- + .../media/v4l/vidioc-subdev-g-fmt.rst | 4 +- + .../media/v4l/vidioc-subdev-g-frame-interval.rst | 2 +- + .../media/v4l/vidioc-subdev-g-selection.rst | 2 +- + .../media/v4l/vidioc-subdev-querycap.rst | 4 +- + .../media/v4l/vidioc-subscribe-event.rst | 4 +- + .../userspace-api/media/videodev2.h.rst.exceptions | 3 + + MAINTAINERS | 56 +- + drivers/clk/clk-ast2600.c | 4 +- + drivers/media/Kconfig | 2 +- + drivers/media/cec/core/cec-notifier.c | 33 +- + drivers/media/cec/core/cec-pin-error-inj.c | 2 +- + drivers/media/common/b2c2/flexcop-hw-filter.c | 2 +- + drivers/media/common/saa7146/saa7146_core.c | 2 +- + drivers/media/common/saa7146/saa7146_video.c | 3 +- + drivers/media/common/siano/smscoreapi.c | 42 +- + drivers/media/common/siano/smscoreapi.h | 5 - + drivers/media/common/siano/smsdvb-main.c | 58 +- + drivers/media/common/videobuf2/frame_vector.c | 1 - + drivers/media/common/videobuf2/videobuf2-dma-sg.c | 2 +- + drivers/media/dvb-core/dvb_ca_en50221.c | 32 +- + drivers/media/dvb-core/dvb_frontend.c | 93 +- + drivers/media/dvb-core/dvbdev.c | 1 + + drivers/media/dvb-frontends/drx39xyj/drxj.c | 2 +- + drivers/media/dvb-frontends/lgdt3306a.c | 37 +- + drivers/media/dvb-frontends/m88ds3103.c | 4 +- + drivers/media/i2c/adv748x/adv748x.h | 10 +- + drivers/media/i2c/adv7511-v4l2.c | 70 +- + drivers/media/i2c/adv7604.c | 116 +- + drivers/media/i2c/adv7842.c | 27 +- + drivers/media/i2c/ccs/ccs-core.c | 6 +- + drivers/media/i2c/ccs/ccs-data.h | 2 +- + drivers/media/i2c/ccs/ccs-quirk.h | 4 +- + drivers/media/i2c/et8ek8/et8ek8_driver.c | 2 +- + drivers/media/i2c/hi556.c | 2 +- + drivers/media/i2c/imx214.c | 2 +- + drivers/media/i2c/imx219.c | 51 +- + drivers/media/i2c/imx258.c | 30 +- + drivers/media/i2c/imx274.c | 10 +- + drivers/media/i2c/imx319.c | 2 +- + drivers/media/i2c/imx334.c | 2 +- + drivers/media/i2c/imx355.c | 2 +- + drivers/media/i2c/m5mols/m5mols.h | 4 +- + drivers/media/i2c/max2175.c | 3 +- + drivers/media/i2c/ov02a10.c | 2 +- + drivers/media/i2c/ov13858.c | 2 +- + drivers/media/i2c/ov2740.c | 2 +- + drivers/media/i2c/ov5640.c | 2 +- + drivers/media/i2c/ov5648.c | 2 +- + drivers/media/i2c/ov5670.c | 2 +- + drivers/media/i2c/ov5675.c | 2 +- + drivers/media/i2c/ov5695.c | 2 +- + drivers/media/i2c/ov8856.c | 2 +- + drivers/media/i2c/ov8865.c | 5 +- + drivers/media/i2c/ov9734.c | 2 +- + drivers/media/i2c/s5k5baf.c | 2 +- + drivers/media/i2c/s5k6aa.c | 2 +- + drivers/media/i2c/tvp514x_regs.h | 6 +- + drivers/media/mc/mc-entity.c | 1 + + drivers/media/pci/bt8xx/bttv-cards.c | 20 +- + drivers/media/pci/cobalt/cobalt-driver.c | 10 +- + drivers/media/pci/cx18/cx18-av-audio.c | 2 +- + drivers/media/pci/cx18/cx18-av-core.c | 4 +- + drivers/media/pci/cx18/cx18-firmware.c | 2 +- + drivers/media/pci/cx23885/cx23885-alsa.c | 2 +- + drivers/media/pci/cx23885/cx23885-cards.c | 28 +- + drivers/media/pci/cx23885/cx23885-core.c | 22 +- + drivers/media/pci/cx25821/cx25821-alsa.c | 2 +- + drivers/media/pci/cx25821/cx25821-core.c | 10 +- + drivers/media/pci/cx88/cx88-cards.c | 2 +- + drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 2 +- + drivers/media/pci/ivtv/ivtv-driver.c | 2 +- + drivers/media/pci/mantis/mantis_ca.c | 1 - + drivers/media/pci/mantis/mantis_core.c | 200 -- + drivers/media/pci/mantis/mantis_core.h | 2 - + drivers/media/pci/mantis/mantis_dma.c | 20 +- + drivers/media/pci/mantis/mantis_pci.c | 2 +- + drivers/media/pci/ngene/ngene-cards.c | 6 +- + drivers/media/pci/ngene/ngene-core.c | 56 +- + drivers/media/pci/pt1/pt1.c | 6 +- + drivers/media/pci/saa7134/saa7134-core.c | 2 +- + drivers/media/pci/saa7164/saa7164-encoder.c | 20 +- + drivers/media/pci/saa7164/saa7164-types.h | 4 +- + drivers/media/pci/solo6x10/solo6x10-core.c | 2 +- + drivers/media/pci/sta2x11/Kconfig | 1 + + drivers/media/pci/sta2x11/sta2x11_vip.h | 2 + + drivers/media/pci/tw68/tw68-core.c | 2 +- + drivers/media/pci/tw68/tw68-risc.c | 3 +- + drivers/media/pci/tw68/tw68-video.c | 2 +- + drivers/media/pci/tw686x/tw686x-audio.c | 13 +- + drivers/media/pci/tw686x/tw686x-core.c | 2 +- + drivers/media/pci/tw686x/tw686x-video.c | 17 +- + drivers/media/pci/tw686x/tw686x.h | 10 +- + drivers/media/platform/Kconfig | 19 + + drivers/media/platform/Makefile | 1 + + drivers/media/platform/allegro-dvt/nal-h264.h | 2 +- + drivers/media/platform/aspeed-video.c | 9 +- + drivers/media/platform/coda/coda-common.c | 2 +- + drivers/media/platform/exynos-gsc/gsc-core.h | 21 +- + drivers/media/platform/exynos4-is/fimc-core.h | 12 +- + drivers/media/platform/exynos4-is/fimc-is.h | 21 +- + drivers/media/platform/exynos4-is/fimc-isp.h | 17 +- + drivers/media/platform/exynos4-is/fimc-lite.h | 2 + + drivers/media/platform/exynos4-is/fimc-reg.h | 1 + + drivers/media/platform/exynos4-is/media-dev.c | 6 +- + drivers/media/platform/exynos4-is/media-dev.h | 7 +- + drivers/media/platform/fsl-viu.c | 6 +- + drivers/media/platform/imx-jpeg/Kconfig | 11 + + drivers/media/platform/imx-jpeg/Makefile | 3 + + drivers/media/platform/imx-jpeg/mxc-jpeg-hw.c | 168 ++ + drivers/media/platform/imx-jpeg/mxc-jpeg-hw.h | 140 ++ + drivers/media/platform/imx-jpeg/mxc-jpeg.c | 2127 ++++++++++++++++++++ + drivers/media/platform/imx-jpeg/mxc-jpeg.h | 180 ++ + drivers/media/platform/imx-pxp.c | 9 +- + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h | 14 +- + drivers/media/platform/mtk-mdp/mtk_mdp_comp.h | 1 - + drivers/media/platform/mtk-mdp/mtk_mdp_core.h | 10 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 21 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 18 +- + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 108 +- + .../media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 40 +- + .../media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 4 +- + drivers/media/platform/mtk-vcodec/vdec_drv_if.h | 8 +- + .../media/platform/mtk-vcodec/venc/venc_vp8_if.c | 4 +- + drivers/media/platform/mtk-vcodec/venc_ipi_msg.h | 14 +- + drivers/media/platform/mtk-vpu/mtk_vpu.c | 4 +- + drivers/media/platform/mtk-vpu/mtk_vpu.h | 18 +- + drivers/media/platform/omap3isp/isp.c | 16 +- + drivers/media/platform/pxa_camera.c | 4 +- + drivers/media/platform/qcom/camss/Makefile | 6 + + drivers/media/platform/qcom/camss/camss-csid-170.c | 599 ++++++ + drivers/media/platform/qcom/camss/camss-csid-4-1.c | 328 +++ + drivers/media/platform/qcom/camss/camss-csid-4-7.c | 404 ++++ + .../media/platform/qcom/camss/camss-csid-gen1.h | 27 + + .../media/platform/qcom/camss/camss-csid-gen2.h | 39 + + drivers/media/platform/qcom/camss/camss-csid.c | 661 +----- + drivers/media/platform/qcom/camss/camss-csid.h | 150 +- + .../platform/qcom/camss/camss-csiphy-2ph-1-0.c | 22 +- + .../platform/qcom/camss/camss-csiphy-3ph-1-0.c | 197 +- + drivers/media/platform/qcom/camss/camss-csiphy.c | 104 +- + drivers/media/platform/qcom/camss/camss-csiphy.h | 2 +- + drivers/media/platform/qcom/camss/camss-ispif.c | 119 +- + drivers/media/platform/qcom/camss/camss-ispif.h | 3 +- + drivers/media/platform/qcom/camss/camss-vfe-170.c | 786 ++++++++ + drivers/media/platform/qcom/camss/camss-vfe-4-1.c | 144 +- + drivers/media/platform/qcom/camss/camss-vfe-4-7.c | 277 ++- + drivers/media/platform/qcom/camss/camss-vfe-4-8.c | 1195 +++++++++++ + drivers/media/platform/qcom/camss/camss-vfe-gen1.c | 742 +++++++ + drivers/media/platform/qcom/camss/camss-vfe-gen1.h | 117 ++ + drivers/media/platform/qcom/camss/camss-vfe.c | 847 +------- + drivers/media/platform/qcom/camss/camss-vfe.h | 128 +- + drivers/media/platform/qcom/camss/camss-video.c | 52 + + drivers/media/platform/qcom/camss/camss.c | 435 +++- + drivers/media/platform/qcom/camss/camss.h | 19 +- + drivers/media/platform/qcom/venus/core.c | 116 +- + drivers/media/platform/qcom/venus/core.h | 26 + + drivers/media/platform/qcom/venus/firmware.c | 42 +- + drivers/media/platform/qcom/venus/helpers.c | 71 +- + drivers/media/platform/qcom/venus/helpers.h | 3 +- + drivers/media/platform/qcom/venus/hfi_cmds.c | 59 +- + drivers/media/platform/qcom/venus/hfi_helper.h | 39 +- + drivers/media/platform/qcom/venus/hfi_parser.c | 12 +- + .../media/platform/qcom/venus/hfi_plat_bufs_v6.c | 6 +- + .../media/platform/qcom/venus/hfi_platform_v6.c | 138 +- + drivers/media/platform/qcom/venus/hfi_venus.c | 164 +- + drivers/media/platform/qcom/venus/hfi_venus_io.h | 118 +- + drivers/media/platform/qcom/venus/pm_helpers.c | 139 +- + drivers/media/platform/qcom/venus/pm_helpers.h | 7 +- + drivers/media/platform/qcom/venus/vdec.c | 36 +- + drivers/media/platform/qcom/venus/vdec_ctrls.c | 23 +- + drivers/media/platform/qcom/venus/venc.c | 54 +- + drivers/media/platform/qcom/venus/venc_ctrls.c | 70 +- + drivers/media/platform/rcar-vin/rcar-vin.h | 19 +- + .../media/platform/rockchip/rkisp1/rkisp1-params.c | 445 ++-- + .../platform/rockchip/rkisp1/rkisp1-resizer.c | 9 +- + drivers/media/platform/s3c-camif/camif-core.h | 16 +- + drivers/media/platform/s5p-jpeg/jpeg-core.h | 18 +- + drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 51 +- + drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 16 + + drivers/media/platform/sti/bdisp/bdisp-filter.h | 4 +- + .../media/platform/sti/c8sectpfe/c8sectpfe-core.c | 2 +- + .../platform/sti/c8sectpfe/c8sectpfe-debugfs.h | 3 +- + drivers/media/platform/sti/hva/hva-h264.c | 10 +- + drivers/media/platform/sti/hva/hva.h | 2 +- + .../media/platform/sunxi/sun6i-csi/sun6i_video.c | 4 +- + drivers/media/platform/ti-vpe/cal-camerarx.c | 1 + + drivers/media/platform/ti-vpe/cal-video.c | 332 ++- + drivers/media/platform/ti-vpe/cal.c | 16 +- + drivers/media/platform/ti-vpe/cal.h | 21 +- + drivers/media/platform/ti-vpe/csc.c | 4 +- + drivers/media/platform/ti-vpe/sc.c | 4 +- + drivers/media/platform/ti-vpe/vpdma.c | 3 +- + drivers/media/platform/vsp1/vsp1_dl.c | 2 +- + drivers/media/platform/vsp1/vsp1_drm.h | 4 +- + drivers/media/platform/xilinx/xilinx-vipp.c | 1 + + drivers/media/radio/radio-maxiradio.c | 2 +- + drivers/media/radio/radio-si476x.c | 6 +- + drivers/media/rc/img-ir/img-ir-hw.c | 2 +- + drivers/media/rc/ite-cir.c | 349 +--- + drivers/media/rc/ite-cir.h | 51 +- + drivers/media/rc/keymaps/Makefile | 2 + + drivers/media/rc/keymaps/rc-minix-neo.c | 55 + + drivers/media/rc/keymaps/rc-xbox-360.c | 83 + + drivers/media/spi/cxd2880-spi.c | 4 +- + drivers/media/test-drivers/vidtv/vidtv_psi.c | 1 - + drivers/media/test-drivers/vim2m.c | 14 +- + drivers/media/test-drivers/vivid/vivid-core.c | 6 +- + drivers/media/test-drivers/vivid/vivid-core.h | 1 + + drivers/media/test-drivers/vivid/vivid-ctrls.c | 13 + + .../media/test-drivers/vivid/vivid-kthread-cap.c | 10 +- + drivers/media/test-drivers/vivid/vivid-vid-out.c | 2 +- + drivers/media/tuners/it913x.h | 2 +- + drivers/media/tuners/m88rs6000t.c | 6 +- + drivers/media/tuners/mt2063.c | 6 +- + drivers/media/tuners/qt1010.h | 8 +- + drivers/media/tuners/tda827x.h | 10 +- + drivers/media/tuners/tuner-i2c.h | 4 +- + drivers/media/usb/b2c2/flexcop-usb.c | 1 - + drivers/media/usb/cx231xx/cx231xx.h | 2 - + drivers/media/usb/dvb-usb-v2/anysee.c | 21 +- + drivers/media/usb/dvb-usb-v2/dvb_usb.h | 34 +- + drivers/media/usb/dvb-usb/dvb-usb-init.c | 70 +- + drivers/media/usb/dvb-usb/dvb-usb.h | 75 +- + drivers/media/usb/em28xx/em28xx-cards.c | 4 + + drivers/media/usb/em28xx/em28xx-dvb.c | 1 + + drivers/media/usb/em28xx/em28xx.h | 4 +- + drivers/media/usb/gspca/sq905.c | 2 +- + drivers/media/usb/gspca/w996Xcf.c | 3 +- + drivers/media/usb/pwc/pwc-dec23.c | 2 +- + drivers/media/usb/pwc/pwc-if.c | 8 - + drivers/media/usb/ttusb-dec/ttusb_dec.c | 4 - + drivers/media/usb/usbtv/usbtv-video.c | 6 +- + drivers/media/usb/uvc/uvc_driver.c | 34 +- + drivers/media/usb/zr364xx/zr364xx.c | 13 +- + drivers/media/v4l2-core/v4l2-common.c | 5 + + drivers/media/v4l2-core/v4l2-ctrls.c | 170 +- + drivers/media/v4l2-core/v4l2-dev.c | 5 +- + drivers/media/v4l2-core/v4l2-fwnode.c | 31 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 3 +- + drivers/media/v4l2-core/v4l2-jpeg.c | 59 +- + drivers/media/v4l2-core/v4l2-mc.c | 8 +- + drivers/staging/media/atomisp/Kconfig | 3 +- + drivers/staging/media/atomisp/Makefile | 5 +- + drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 16 +- + drivers/staging/media/atomisp/i2c/atomisp-lm3554.c | 38 +- + drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 2 - + drivers/staging/media/atomisp/i2c/gc2235.h | 2 +- + drivers/staging/media/atomisp/pci/atomisp_cmd.c | 105 +- + drivers/staging/media/atomisp/pci/atomisp_cmd.h | 2 +- + drivers/staging/media/atomisp/pci/atomisp_compat.h | 10 +- + .../media/atomisp/pci/atomisp_compat_css20.c | 14 +- + drivers/staging/media/atomisp/pci/atomisp_fops.c | 3 + + drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 8 +- + drivers/staging/media/atomisp/pci/hmm/hmm_bo.c | 13 +- + .../staging/media/atomisp/pci/ia_css_firmware.h | 2 + + drivers/staging/media/atomisp/pci/ia_css_mipi.h | 17 - + .../isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 3 +- + .../atomisp/pci/isp/modes/interface/isp_types.h | 41 +- + .../atomisp/pci/runtime/isp_param/src/isp_param.c | 3 +- + .../atomisp/pci/runtime/isys/src/virtual_isys.c | 12 +- + .../media/atomisp/pci/runtime/queue/src/queue.c | 44 +- + .../media/atomisp/pci/runtime/rmgr/src/rmgr_vbuf.c | 41 +- + .../media/atomisp/pci/runtime/spctrl/src/spctrl.c | 7 +- + .../media/atomisp/pci/runtime/timer/src/timer.c | 7 +- + drivers/staging/media/atomisp/pci/sh_css.c | 15 +- + .../staging/media/atomisp/pci/sh_css_firmware.c | 2 +- + drivers/staging/media/atomisp/pci/sh_css_mipi.c | 11 - + drivers/staging/media/atomisp/pci/sh_css_params.c | 10 +- + drivers/staging/media/hantro/hantro.h | 3 +- + drivers/staging/media/hantro/hantro_drv.c | 2 +- + drivers/staging/media/hantro/hantro_g1_vp8_dec.c | 55 +- + drivers/staging/media/hantro/hantro_hw.h | 16 +- + drivers/staging/media/hantro/hantro_vp8.c | 10 +- + .../staging/media/hantro/rk3399_vpu_hw_vp8_dec.c | 55 +- + drivers/staging/media/imx/Kconfig | 9 +- + drivers/staging/media/imx/Makefile | 6 +- + drivers/staging/media/imx/TODO | 9 +- + drivers/staging/media/imx/imx-ic-prp.c | 4 +- + drivers/staging/media/imx/imx-ic-prpencvf.c | 24 +- + drivers/staging/media/imx/imx-media-capture.c | 687 ++++--- + drivers/staging/media/imx/imx-media-csc-scaler.c | 2 +- + drivers/staging/media/imx/imx-media-csi.c | 33 +- + drivers/staging/media/imx/imx-media-dev-common.c | 4 + + drivers/staging/media/imx/imx-media-utils.c | 23 +- + drivers/staging/media/imx/imx-media-vdic.c | 7 +- + drivers/staging/media/imx/imx-media.h | 12 +- + drivers/staging/media/imx/imx6-mipi-csi2.c | 6 +- + drivers/staging/media/imx/imx7-media-csi.c | 1014 +++++----- + drivers/staging/media/imx/imx7-mipi-csis.c | 419 ++-- + drivers/staging/media/ipu3/include/intel-ipu3.h | 2 +- + drivers/staging/media/ipu3/ipu3-css-fw.h | 1 + + drivers/staging/media/ipu3/ipu3-css-pool.h | 4 +- + drivers/staging/media/ipu3/ipu3-v4l2.c | 5 + + drivers/staging/media/ipu3/ipu3.h | 5 - + .../staging/media/meson/vdec/codec_hevc_common.h | 4 +- + drivers/staging/media/omap4iss/iss.c | 9 +- + drivers/staging/media/omap4iss/iss_regs.h | 16 +- + drivers/staging/media/omap4iss/iss_video.c | 3 + + drivers/staging/media/rkvdec/rkvdec.c | 50 +- + drivers/staging/media/rkvdec/rkvdec.h | 1 - + drivers/staging/media/sunxi/cedrus/cedrus.c | 2 +- + drivers/staging/media/sunxi/cedrus/cedrus.h | 2 +- + drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 2 +- + drivers/staging/media/sunxi/cedrus/cedrus_vp8.c | 113 +- + drivers/staging/media/tegra-video/csi.h | 2 +- + include/linux/iio/dac/mcp4725.h | 2 +- + include/linux/platform_data/media/camera-mx2.h | 31 - + include/linux/platform_data/media/camera-mx3.h | 43 - + include/media/cec.h | 2 +- + include/media/davinci/isif.h | 8 +- + include/media/davinci/vpbe_osd.h | 6 +- + include/media/dvbdev.h | 2 +- + include/media/i2c/adv7343.h | 2 +- + include/media/i2c/mt9t112.h | 2 +- + include/media/i2c/noon010pc30.h | 1 + + include/media/i2c/ov772x.h | 2 +- + include/media/i2c/s5c73m3.h | 1 + + include/media/i2c/s5k4ecgx.h | 6 +- + include/media/i2c/s5k6aa.h | 1 + + include/media/i2c/tvp514x.h | 11 +- + include/media/i2c/tw9910.h | 8 +- + include/media/media-entity.h | 7 +- + include/media/rc-map.h | 2 + + include/media/v4l2-async.h | 12 +- + include/media/v4l2-ctrls.h | 9 +- + include/media/v4l2-fwnode.h | 21 - + include/media/v4l2-h264.h | 6 +- + include/media/v4l2-jpeg.h | 22 + + include/media/v4l2-mc.h | 8 +- + include/media/videobuf2-core.h | 6 +- + include/media/vp8-ctrls.h | 114 -- + include/uapi/linux/cec.h | 3 +- + include/uapi/linux/rkisp1-config.h | 16 +- + include/uapi/linux/uvcvideo.h | 10 +- + include/uapi/linux/v4l2-controls.h | 241 ++- + include/uapi/linux/v4l2-subdev.h | 12 +- + include/uapi/linux/videodev2.h | 23 +- + tools/memory-model/Documentation/glossary.txt | 2 +- + 457 files changed, 16489 insertions(+), 6973 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/nxp,imx8-jpeg.yaml + delete mode 100644 Documentation/devicetree/bindings/media/qcom,camss.txt + create mode 100644 Documentation/devicetree/bindings/media/qcom,msm8916-camss.yaml + create mode 100644 Documentation/devicetree/bindings/media/qcom,msm8996-camss.yaml + create mode 100644 Documentation/devicetree/bindings/media/qcom,sdm660-camss.yaml + create mode 100644 Documentation/devicetree/bindings/media/qcom,sdm845-camss.yaml + delete mode 100644 Documentation/devicetree/bindings/media/renesas,drif.txt + create mode 100644 Documentation/devicetree/bindings/media/renesas,drif.yaml + create mode 100644 Documentation/driver-api/media/maintainer-entry-profile.rst + create mode 100644 Documentation/userspace-api/media/v4l/ext-ctrls-colorimetry.rst + delete mode 100644 drivers/media/pci/mantis/mantis_core.c + create mode 100644 drivers/media/platform/imx-jpeg/Kconfig + create mode 100644 drivers/media/platform/imx-jpeg/Makefile + create mode 100644 drivers/media/platform/imx-jpeg/mxc-jpeg-hw.c + create mode 100644 drivers/media/platform/imx-jpeg/mxc-jpeg-hw.h + create mode 100644 drivers/media/platform/imx-jpeg/mxc-jpeg.c + create mode 100644 drivers/media/platform/imx-jpeg/mxc-jpeg.h + create mode 100644 drivers/media/platform/qcom/camss/camss-csid-170.c + create mode 100644 drivers/media/platform/qcom/camss/camss-csid-4-1.c + create mode 100644 drivers/media/platform/qcom/camss/camss-csid-4-7.c + create mode 100644 drivers/media/platform/qcom/camss/camss-csid-gen1.h + create mode 100644 drivers/media/platform/qcom/camss/camss-csid-gen2.h + create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-170.c + create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-4-8.c + create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-gen1.c + create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-gen1.h + create mode 100644 drivers/media/rc/keymaps/rc-minix-neo.c + create mode 100644 drivers/media/rc/keymaps/rc-xbox-360.c + delete mode 100644 include/linux/platform_data/media/camera-mx2.h + delete mode 100644 include/linux/platform_data/media/camera-mx3.h + delete mode 100644 include/media/vp8-ctrls.h +Merging v4l-dvb-next/master (1e28eed17697 Linux 5.12-rc3) +$ git merge v4l-dvb-next/master +Already up to date. +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 (dde8740bd9b5 Merge branch 'acpi-processor-fixes' into linux-next) +$ git merge pm/linux-next +Auto-merging drivers/pci/pci.c +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 4 +- + Documentation/firmware-guide/acpi/debug.rst | 36 ++---- + MAINTAINERS | 16 +++ + arch/x86/include/asm/smp.h | 2 +- + arch/x86/kernel/smpboot.c | 26 ++-- + drivers/acpi/ac.c | 2 +- + drivers/acpi/acpi_processor.c | 33 ++--- + drivers/acpi/acpi_video.c | 4 +- + drivers/acpi/apei/erst.c | 2 +- + drivers/acpi/apei/hest.c | 2 +- + drivers/acpi/cppc_acpi.c | 11 +- + drivers/acpi/hed.c | 1 - + drivers/acpi/internal.h | 1 + + drivers/acpi/numa/hmat.c | 2 +- + drivers/acpi/pci_irq.c | 34 ++--- + drivers/acpi/pci_link.c | 164 +++++++++++------------- + drivers/acpi/pmic/intel_pmic_chtcrc.c | 2 +- + drivers/acpi/power.c | 15 +-- + drivers/acpi/processor_driver.c | 6 +- + drivers/acpi/processor_idle.c | 42 +++--- + drivers/acpi/processor_pdc.c | 7 +- + drivers/acpi/processor_perflib.c | 50 ++++---- + drivers/acpi/processor_throttling.c | 102 +++++++-------- + drivers/acpi/resource.c | 2 +- + drivers/acpi/scan.c | 4 +- + drivers/acpi/sleep.h | 1 - + drivers/acpi/sysfs.c | 14 +- + drivers/acpi/utils.c | 14 ++ + drivers/base/power/domain.c | 36 ------ + drivers/cpufreq/ia64-acpi-cpufreq.c | 4 +- + drivers/cpufreq/intel_pstate.c | 101 +++++++-------- + drivers/hwmon/acpi_power_meter.c | 29 +++-- + drivers/idle/intel_idle.c | 4 +- + drivers/iio/light/acpi-als.c | 4 +- + drivers/pci/pci.c | 16 +-- + drivers/powercap/intel_rapl_common.c | 1 + + drivers/powercap/intel_rapl_msr.c | 1 + + include/acpi/acpi_drivers.h | 12 -- + include/acpi/cppc_acpi.h | 40 ++++++ + include/linux/acpi.h | 5 + + kernel/sched/cpufreq_schedutil.c | 29 ++--- + tools/power/pm-graph/sleepgraph.py | 2 +- + 42 files changed, 397 insertions(+), 486 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (c3135d28a1e0 cpufreq: dt: dev_pm_opp_of_cpumask_add_table() may return -EPROBE_DEFER) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Auto-merging kernel/sched/core.c +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/topology.h | 10 +- + arch/arm64/kernel/topology.c | 109 ++++++---------- + drivers/base/arch_topology.c | 89 ++++++++++++- + drivers/cpufreq/Kconfig.arm | 10 ++ + drivers/cpufreq/cppc_cpufreq.c | 259 ++++++++++++++++++++++++++++++++++---- + drivers/cpufreq/cpufreq-dt.c | 9 +- + drivers/cpufreq/s5pv210-cpufreq.c | 14 +-- + include/linux/arch_topology.h | 19 ++- + kernel/sched/core.c | 1 + + 9 files changed, 401 insertions(+), 119 deletions(-) +Merging cpupower/cpupower (a38fd8748464 Linux 5.12-rc2) +$ git merge cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (3dee37a4b6ae PM / devfreq: imx8m-ddrc: Remove unneeded of_match_ptr()) +$ git merge devfreq/devfreq-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-devfreq | 5 +- + .../devicetree/bindings/devfreq/rk3399_dmc.txt | 75 +++++++++++----------- + drivers/devfreq/Kconfig | 2 +- + drivers/devfreq/devfreq.c | 14 +++- + drivers/devfreq/governor.h | 5 +- + drivers/devfreq/imx-bus.c | 2 +- + drivers/devfreq/imx8m-ddrc.c | 16 +---- + drivers/devfreq/rk3399_dmc.c | 20 ++---- + include/linux/devfreq.h | 9 +++ + 9 files changed, 70 insertions(+), 78 deletions(-) +Merging opp/opp/linux-next (a8bb0e872bfb memory: samsung: exynos5422-dmc: Convert to use resource-managed OPP API) +$ git merge opp/opp/linux-next +Auto-merging include/linux/qcom-geni-se.h +Auto-merging drivers/tty/serial/qcom_geni_serial.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/lima/lima_devfreq.c | 47 +++-------- + drivers/gpu/drm/lima/lima_devfreq.h | 3 - + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 37 ++------- + drivers/gpu/drm/panfrost/panfrost_devfreq.h | 2 - + drivers/memory/samsung/exynos5422-dmc.c | 13 +-- + drivers/mmc/host/sdhci-msm.c | 19 ++--- + drivers/opp/core.c | 122 ++++++++++++++++++++++------ + drivers/opp/of.c | 36 ++++++++ + drivers/spi/spi-geni-qcom.c | 16 ++-- + drivers/spi/spi-qcom-qspi.c | 18 ++-- + drivers/tty/serial/qcom_geni_serial.c | 23 ++---- + include/linux/pm_opp.h | 44 ++++++++-- + include/linux/qcom-geni-se.h | 2 - + 13 files changed, 217 insertions(+), 165 deletions(-) +Merging thermal/thermal/linux-next (76e524fa8791 dt-bindings: thermal: tsens: Document ipq8064 bindings) +$ git merge thermal/thermal/linux-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/thermal/qcom-tsens.yaml | 58 ++++- + .../bindings/thermal/rcar-gen3-thermal.yaml | 43 +++- + MAINTAINERS | 3 +- + drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 2 +- + drivers/thermal/amlogic_thermal.c | 4 +- + drivers/thermal/cpufreq_cooling.c | 49 ++--- + drivers/thermal/cpuidle_cooling.c | 37 ++-- + drivers/thermal/devfreq_cooling.c | 25 +-- + drivers/thermal/gov_power_allocator.c | 8 +- + drivers/thermal/hisi_thermal.c | 6 +- + drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 91 +++++--- + drivers/thermal/qcom/tsens-8960.c | 233 ++++++++++----------- + drivers/thermal/qcom/tsens-v1.c | 4 +- + drivers/thermal/qcom/tsens.c | 162 +++++++++++--- + drivers/thermal/qcom/tsens.h | 4 +- + drivers/thermal/rcar_gen3_thermal.c | 3 +- + drivers/thermal/sun8i_thermal.c | 4 +- + drivers/thermal/tegra/soctherm.c | 2 +- + drivers/thermal/thermal_core.c | 39 ++-- + drivers/thermal/thermal_of.c | 7 +- + drivers/thermal/ti-soc-thermal/ti-bandgap.c | 1 - + include/linux/thermal.h | 2 +- + include/uapi/linux/thermal.h | 2 +- + 23 files changed, 483 insertions(+), 306 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 (2fd8db2dd05d fs: dlm: fix missing unlock on error in accept_from_sock()) +$ git merge dlm/next +Merge made by the 'recursive' strategy. + fs/dlm/config.c | 86 ++++++++++++++++-------- + fs/dlm/config.h | 1 - + fs/dlm/debug_fs.c | 1 + + fs/dlm/lock.c | 2 - + fs/dlm/lockspace.c | 20 +++--- + fs/dlm/lowcomms.c | 194 ++++++++++++++++++++++++++++++----------------------- + fs/dlm/lowcomms.h | 5 ++ + fs/dlm/midcomms.c | 33 +++++---- + fs/dlm/rcom.c | 2 - + 9 files changed, 202 insertions(+), 142 deletions(-) +Merging swiotlb/linux-next (fcf044891c84 ARM: Qualify enabling of swiotlb_init()) +$ git merge swiotlb/linux-next +Auto-merging drivers/iommu/dma-iommu.c +Merge made by the 'recursive' strategy. + arch/arm/mm/init.c | 6 +- + arch/arm/xen/mm.c | 2 +- + arch/powerpc/platforms/pseries/svm.c | 6 +- + arch/x86/xen/pci-swiotlb-xen.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_internal.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 2 +- + drivers/iommu/dma-iommu.c | 23 +- + drivers/pci/xen-pcifront.c | 2 +- + drivers/xen/swiotlb-xen.c | 182 +++++----- + include/linux/swiotlb.h | 68 +++- + include/xen/swiotlb-xen.h | 3 +- + kernel/dma/direct.c | 8 +- + kernel/dma/direct.h | 6 +- + kernel/dma/swiotlb.c | 505 ++++++++++----------------- + 14 files changed, 342 insertions(+), 477 deletions(-) +Merging rdma/for-next (704d68f5f2df RDMA/hns: Reorganize doorbell update interfaces for all queues) +$ git merge rdma/for-next +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c +Auto-merging drivers/infiniband/ulp/rtrs/rtrs-clt.c +Auto-merging drivers/infiniband/hw/mlx5/qp.c +Auto-merging drivers/infiniband/hw/mlx5/devx.c +Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v2.c +Auto-merging drivers/infiniband/hw/cxgb4/cm.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/infiniband/hisilicon-hns-roce.txt | 2 +- + MAINTAINERS | 5 +- + drivers/infiniband/core/cache.c | 84 +- + drivers/infiniband/core/cm.c | 15 +- + drivers/infiniband/core/cma.c | 28 +- + drivers/infiniband/core/cma_configfs.c | 8 +- + drivers/infiniband/core/cma_priv.h | 8 +- + drivers/infiniband/core/core_priv.h | 28 +- + drivers/infiniband/core/counters.c | 62 +- + drivers/infiniband/core/device.c | 37 +- + drivers/infiniband/core/mad.c | 32 +- + drivers/infiniband/core/multicast.c | 8 +- + drivers/infiniband/core/nldev.c | 2 +- + drivers/infiniband/core/opa_smi.h | 4 +- + drivers/infiniband/core/rdma_core.c | 4 +- + drivers/infiniband/core/roce_gid_mgmt.c | 52 +- + drivers/infiniband/core/rw.c | 25 +- + drivers/infiniband/core/sa.h | 2 +- + drivers/infiniband/core/sa_query.c | 22 +- + drivers/infiniband/core/security.c | 8 +- + drivers/infiniband/core/smi.c | 12 +- + drivers/infiniband/core/smi.h | 4 +- + drivers/infiniband/core/sysfs.c | 16 +- + drivers/infiniband/core/umem.c | 4 - + drivers/infiniband/core/umem_dmabuf.c | 4 + + drivers/infiniband/core/user_mad.c | 4 +- + drivers/infiniband/core/uverbs_cmd.c | 2 +- + drivers/infiniband/core/uverbs_ioctl.c | 32 +- + drivers/infiniband/core/verbs.c | 29 +- + drivers/infiniband/hw/bnxt_re/bnxt_re.h | 1 + + drivers/infiniband/hw/bnxt_re/hw_counters.c | 4 +- + drivers/infiniband/hw/bnxt_re/hw_counters.h | 4 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 10 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.h | 10 +- + drivers/infiniband/hw/bnxt_re/main.c | 40 + + drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 4 + + drivers/infiniband/hw/bnxt_re/qplib_rcfw.h | 2 + + drivers/infiniband/hw/cxgb4/cm.c | 3 +- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 11 - + drivers/infiniband/hw/cxgb4/provider.c | 12 +- + drivers/infiniband/hw/cxgb4/t4.h | 33 - + drivers/infiniband/hw/efa/efa.h | 14 +- + drivers/infiniband/hw/efa/efa_main.c | 10 +- + drivers/infiniband/hw/efa/efa_verbs.c | 14 +- + drivers/infiniband/hw/hfi1/chip.c | 4 +- + drivers/infiniband/hw/hfi1/chip.h | 5 - + drivers/infiniband/hw/hfi1/driver.c | 2 +- + drivers/infiniband/hw/hfi1/exp_rcv.c | 6 +- + drivers/infiniband/hw/hfi1/hfi.h | 16 +- + drivers/infiniband/hw/hfi1/init.c | 5 +- + drivers/infiniband/hw/hfi1/iowait.h | 2 +- + drivers/infiniband/hw/hfi1/ipoib.h | 2 +- + drivers/infiniband/hw/hfi1/ipoib_main.c | 4 +- + drivers/infiniband/hw/hfi1/mad.c | 128 +- + drivers/infiniband/hw/hfi1/mad.h | 2 +- + drivers/infiniband/hw/hfi1/msix.c | 12 +- + drivers/infiniband/hw/hfi1/netdev_rx.c | 2 +- + drivers/infiniband/hw/hfi1/sdma.c | 2 +- + drivers/infiniband/hw/hfi1/sysfs.c | 2 +- + drivers/infiniband/hw/hfi1/verbs.c | 8 +- + drivers/infiniband/hw/hfi1/verbs.h | 4 +- + drivers/infiniband/hw/hfi1/verbs_txreq.h | 5 - + drivers/infiniband/hw/hfi1/vnic.h | 2 +- + drivers/infiniband/hw/hfi1/vnic_main.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_alloc.c | 3 + + drivers/infiniband/hw/hns/hns_roce_cmd.c | 35 +- + drivers/infiniband/hw/hns/hns_roce_cq.c | 92 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 63 +- + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 44 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 1504 ++++++++++++-------- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 212 ++- + drivers/infiniband/hw/hns/hns_roce_main.c | 74 +- + drivers/infiniband/hw/hns/hns_roce_pd.c | 59 + + drivers/infiniband/hw/hns/hns_roce_qp.c | 122 +- + drivers/infiniband/hw/hns/hns_roce_srq.c | 5 +- + drivers/infiniband/hw/i40iw/i40iw.h | 9 - + drivers/infiniband/hw/i40iw/i40iw_cm.c | 4 +- + drivers/infiniband/hw/i40iw/i40iw_hmc.c | 4 +- + drivers/infiniband/hw/i40iw/i40iw_main.c | 2 +- + drivers/infiniband/hw/i40iw/i40iw_osdep.h | 22 - + drivers/infiniband/hw/i40iw/i40iw_puda.c | 2 +- + drivers/infiniband/hw/i40iw/i40iw_utils.c | 2 +- + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 14 +- + drivers/infiniband/hw/i40iw/i40iw_virtchnl.c | 2 +- + drivers/infiniband/hw/mlx4/alias_GUID.c | 16 +- + drivers/infiniband/hw/mlx4/mad.c | 46 +- + drivers/infiniband/hw/mlx4/main.c | 47 +- + drivers/infiniband/hw/mlx4/mlx4_ib.h | 26 +- + drivers/infiniband/hw/mlx5/cong.c | 8 +- + drivers/infiniband/hw/mlx5/counters.c | 10 +- + drivers/infiniband/hw/mlx5/counters.h | 2 +- + drivers/infiniband/hw/mlx5/devx.c | 64 +- + drivers/infiniband/hw/mlx5/fs.c | 9 +- + drivers/infiniband/hw/mlx5/ib_rep.c | 4 +- + drivers/infiniband/hw/mlx5/ib_rep.h | 4 +- + drivers/infiniband/hw/mlx5/ib_virt.c | 16 +- + drivers/infiniband/hw/mlx5/mad.c | 16 +- + drivers/infiniband/hw/mlx5/main.c | 92 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 157 +- + drivers/infiniband/hw/mlx5/mr.c | 160 +-- + drivers/infiniband/hw/mlx5/odp.c | 185 +-- + drivers/infiniband/hw/mlx5/qp.c | 17 +- + drivers/infiniband/hw/mthca/mthca_av.c | 6 +- + drivers/infiniband/hw/mthca/mthca_dev.h | 8 +- + drivers/infiniband/hw/mthca/mthca_mad.c | 4 +- + drivers/infiniband/hw/mthca/mthca_provider.c | 10 +- + drivers/infiniband/hw/mthca/mthca_qp.c | 2 +- + drivers/infiniband/hw/ocrdma/ocrdma_ah.c | 2 +- + drivers/infiniband/hw/ocrdma/ocrdma_ah.h | 2 +- + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 4 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 4 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.h | 7 +- + drivers/infiniband/hw/qedr/main.c | 8 +- + drivers/infiniband/hw/qedr/verbs.c | 9 +- + drivers/infiniband/hw/qedr/verbs.h | 11 +- + drivers/infiniband/hw/qib/qib.h | 34 +- + drivers/infiniband/hw/qib/qib_common.h | 7 - + drivers/infiniband/hw/qib/qib_file_ops.c | 5 +- + drivers/infiniband/hw/qib/qib_iba6120.c | 2 +- + drivers/infiniband/hw/qib/qib_iba7220.c | 4 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 4 +- + drivers/infiniband/hw/qib/qib_init.c | 2 +- + drivers/infiniband/hw/qib/qib_mad.c | 4 +- + drivers/infiniband/hw/qib/qib_qp.c | 4 +- + drivers/infiniband/hw/qib/qib_sysfs.c | 2 +- + drivers/infiniband/hw/qib/qib_verbs.c | 6 +- + drivers/infiniband/hw/qib/qib_verbs.h | 6 +- + drivers/infiniband/hw/usnic/usnic_ib_main.c | 2 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 6 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.h | 6 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma.h | 10 - + drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 2 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c | 2 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c | 12 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h | 45 +- + drivers/infiniband/sw/rdmavt/mad.c | 5 +- + drivers/infiniband/sw/rdmavt/mad.h | 2 +- + drivers/infiniband/sw/rdmavt/vt.c | 34 +- + drivers/infiniband/sw/rdmavt/vt.h | 11 +- + drivers/infiniband/sw/rxe/rxe_comp.c | 4 +- + drivers/infiniband/sw/rxe/rxe_hw_counters.c | 4 +- + drivers/infiniband/sw/rxe/rxe_hw_counters.h | 4 +- + drivers/infiniband/sw/rxe/rxe_loc.h | 30 +- + drivers/infiniband/sw/rxe/rxe_mr.c | 271 ++-- + drivers/infiniband/sw/rxe/rxe_pool.c | 14 +- + drivers/infiniband/sw/rxe/rxe_req.c | 10 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 34 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 32 +- + drivers/infiniband/sw/rxe/rxe_verbs.h | 60 +- + drivers/infiniband/sw/siw/iwarp.h | 13 - + drivers/infiniband/sw/siw/siw_cm.c | 19 +- + drivers/infiniband/sw/siw/siw_mem.h | 5 - + drivers/infiniband/sw/siw/siw_verbs.c | 8 +- + drivers/infiniband/sw/siw/siw_verbs.h | 10 +- + drivers/infiniband/ulp/ipoib/ipoib.h | 4 +- + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 2 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 14 +- + drivers/infiniband/ulp/iser/iscsi_iser.h | 1 - + drivers/infiniband/ulp/isert/ib_isert.c | 16 +- + drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c | 13 +- + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 30 +- + drivers/infiniband/ulp/rtrs/rtrs-pri.h | 1 + + drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c | 20 +- + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 24 +- + drivers/infiniband/ulp/rtrs/rtrs.c | 32 +- + drivers/infiniband/ulp/rtrs/rtrs.h | 3 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 3 +- + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 2 +- + include/linux/mlx5/driver.h | 2 +- + include/rdma/ib_cache.h | 18 +- + include/rdma/ib_mad.h | 2 +- + include/rdma/ib_sa.h | 15 +- + include/rdma/ib_verbs.h | 192 ++- + include/rdma/iw_cm.h | 1 + + include/rdma/rdma_cm.h | 2 +- + include/rdma/rdma_counter.h | 16 +- + include/rdma/rdma_vt.h | 18 +- + include/rdma/rw.h | 18 +- + include/rdma/uverbs_ioctl.h | 81 +- + include/uapi/rdma/hns-abi.h | 2 + + include/uapi/rdma/mlx5_user_ioctl_cmds.h | 1 + + 181 files changed, 2921 insertions(+), 2507 deletions(-) +Merging net-next/master (3cd52c1e32fe net: fealnx: use module_pci_driver to simplify the code) +$ git merge net-next/master +Removing tools/testing/selftests/drivers/net/mlxsw/spectrum-2/q_in_vni_veto.sh +Auto-merging tools/lib/bpf/xsk.c +Removing tools/lib/bpf/libbpf_util.h +Removing tools/bpf/Makefile.helpers +Auto-merging net/tipc/socket.c +Auto-merging net/tipc/node.c +Auto-merging net/tipc/net.c +Auto-merging net/tipc/crypto.c +CONFLICT (content): Merge conflict in net/tipc/crypto.c +Auto-merging net/sched/cls_api.c +Auto-merging net/rds/send.c +Auto-merging net/qrtr/qrtr.c +Auto-merging net/openvswitch/conntrack.c +Removing net/netfilter/nf_log_netdev.c +Removing net/netfilter/nf_log_common.c +Auto-merging net/netfilter/nf_flow_table_offload.c +Auto-merging net/netfilter/nf_conntrack_standalone.c +Auto-merging net/mptcp/protocol.c +Removing net/ipv6/netfilter/nf_log_ipv6.c +Auto-merging net/ipv6/ip6_vti.c +Auto-merging net/ipv4/udp.c +Removing net/ipv4/netfilter/nf_log_ipv4.c +Removing net/ipv4/netfilter/nf_log_arp.c +Auto-merging net/ipv4/esp4.c +Auto-merging net/ethtool/ioctl.c +Removing net/decnet/TODO +Auto-merging net/core/skmsg.c +CONFLICT (content): Merge conflict in net/core/skmsg.c +Removing net/bridge/netfilter/nf_log_bridge.c +Removing net/ax25/TODO +Auto-merging kernel/sysctl.c +Auto-merging kernel/fork.c +Auto-merging kernel/bpf/verifier.c +Auto-merging kernel/bpf/disasm.c +Auto-merging init/Kconfig +Auto-merging include/uapi/linux/ethtool.h +Auto-merging include/net/sock.h +Auto-merging include/linux/skmsg.h +CONFLICT (content): Merge conflict in include/linux/skmsg.h +Auto-merging include/linux/mlx5/driver.h +Auto-merging include/linux/ethtool.h +CONFLICT (content): Merge conflict in include/linux/ethtool.h +Auto-merging include/linux/bpf.h +CONFLICT (content): Merge conflict in include/linux/bpf.h +Auto-merging include/linux/avf/virtchnl.h +Removing include/linux/atm_suni.h +Removing fs/jffs2/TODO +Removing fs/befs/TODO +Removing drivers/staging/fsl-dpaa2/ethsw/ethsw.h +Removing drivers/staging/fsl-dpaa2/ethsw/ethsw.c +Removing drivers/staging/fsl-dpaa2/ethsw/dpsw.h +Removing drivers/staging/fsl-dpaa2/ethsw/TODO +Removing drivers/staging/fsl-dpaa2/ethsw/README +Removing drivers/staging/fsl-dpaa2/ethsw/Makefile +Removing drivers/staging/fsl-dpaa2/Makefile +Removing drivers/staging/fsl-dpaa2/Kconfig +Removing drivers/scsi/aacraid/TODO +Auto-merging drivers/s390/net/qeth_core_main.c +Auto-merging drivers/net/vxlan.c +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/net/tun.c +Auto-merging drivers/net/geneve.c +Auto-merging drivers/net/ethernet/xilinx/xilinx_axienet_main.c +Auto-merging drivers/net/ethernet/xilinx/xilinx_axienet.h +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Auto-merging drivers/net/ethernet/realtek/r8169_main.c +Auto-merging drivers/net/ethernet/netronome/nfp/flower/main.h +Auto-merging drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.c +Auto-merging drivers/net/ethernet/mellanox/mlxsw/spectrum.h +Auto-merging drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_stats.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_stats.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/en_main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/dev.c +Auto-merging drivers/net/ethernet/intel/ice/ice_type.h +Auto-merging drivers/net/ethernet/intel/ice/ice_switch.c +Auto-merging drivers/net/ethernet/intel/ice/ice_main.c +Auto-merging drivers/net/ethernet/intel/ice/ice_lib.c +Auto-merging drivers/net/ethernet/intel/ice/ice_ethtool.c +Auto-merging drivers/net/ethernet/intel/ice/ice_dcb.c +Auto-merging drivers/net/ethernet/intel/ice/ice_controlq.h +Auto-merging drivers/net/ethernet/intel/ice/ice_common.c +Auto-merging drivers/net/ethernet/intel/ice/ice.h +Auto-merging drivers/net/ethernet/intel/i40e/i40e_xsk.c +Auto-merging drivers/net/ethernet/intel/i40e/i40e_main.c +Auto-merging drivers/net/ethernet/intel/i40e/i40e_ethtool.c +Auto-merging drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +Auto-merging drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +Auto-merging drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c +Auto-merging drivers/net/ethernet/cadence/macb_main.c +Auto-merging drivers/net/ethernet/broadcom/bcm4908_enet.c +Auto-merging drivers/net/dsa/lantiq_gswip.c +Auto-merging drivers/net/can/usb/peak_usb/pcan_usb_core.c +Auto-merging drivers/net/can/spi/mcp251x.c +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging Documentation/networking/ethtool-netlink.rst +Auto-merging Documentation/devicetree/bindings/net/brcm,bcm4908-enet.yaml +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'drivers/net/ethernet/mellanox/mlx5/core/en_main.c' using previous resolution. +Resolved 'include/linux/bpf.h' using previous resolution. +Recorded preimage for 'include/linux/ethtool.h' +Recorded preimage for 'include/linux/skmsg.h' +Recorded preimage for 'net/core/skmsg.c' +Recorded preimage for 'net/tipc/crypto.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'include/linux/ethtool.h'. +Recorded resolution for 'include/linux/skmsg.h'. +Recorded resolution for 'net/core/skmsg.c'. +Recorded resolution for 'net/tipc/crypto.c'. +[master d2d047ed5dc6] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-net-phydev | 12 + + Documentation/admin-guide/sysctl/net.rst | 11 + + Documentation/bpf/bpf_design_QA.rst | 15 + + Documentation/bpf/btf.rst | 17 +- + Documentation/bpf/index.rst | 9 +- + .../devicetree/bindings/net/actions,owl-emac.yaml | 92 + + .../devicetree/bindings/net/brcm,bcm4908-enet.yaml | 17 +- + .../bindings/net/brcm,bcm6368-mdio-mux.yaml | 76 + + .../devicetree/bindings/net/dsa/lantiq-gswip.txt | 4 + + .../devicetree/bindings/net/xilinx_axienet.txt | 25 +- + .../device_drivers/ethernet/microsoft/netvsc.rst | 14 +- + .../networking/device_drivers/fddi/defza.rst | 2 +- + .../networking/devlink/devlink-health.rst | 17 +- + Documentation/networking/dsa/configuration.rst | 330 +- + Documentation/networking/dsa/dsa.rst | 372 ++- + Documentation/networking/ethtool-netlink.rst | 66 +- + Documentation/networking/index.rst | 1 + + Documentation/networking/ip-sysctl.rst | 10 +- + .../networking/nexthop-group-resilient.rst | 293 ++ + Documentation/networking/nf_flowtable.rst | 172 +- + Documentation/networking/phy.rst | 4 +- + Documentation/networking/switchdev.rst | 200 +- + Documentation/networking/x25-iface.rst | 65 +- + Documentation/userspace-api/ebpf/index.rst | 17 + + Documentation/userspace-api/ebpf/syscall.rst | 24 + + Documentation/userspace-api/index.rst | 1 + + MAINTAINERS | 18 +- + arch/s390/net/bpf_jit_comp.c | 64 +- + arch/x86/net/bpf_jit_comp.c | 5 + + arch/x86/net/bpf_jit_comp32.c | 198 ++ + drivers/atm/fore200e.c | 1 - + drivers/atm/suni.c | 1 - + drivers/isdn/hardware/mISDN/hfcmulti.c | 9 +- + drivers/isdn/hardware/mISDN/iohelper.h | 14 +- + drivers/isdn/mISDN/dsp_core.c | 13 +- + drivers/isdn/mISDN/l1oip_core.c | 9 +- + drivers/net/Kconfig | 1 + + drivers/net/Makefile | 2 +- + drivers/net/bareudp.c | 1 + + drivers/net/bonding/bond_alb.c | 2 +- + drivers/net/bonding/bond_main.c | 2 +- + drivers/net/bonding/bond_options.c | 9 + + drivers/net/can/Kconfig | 2 +- + drivers/net/can/c_can/c_can.c | 153 +- + drivers/net/can/c_can/c_can.h | 43 +- + drivers/net/can/c_can/c_can_pci.c | 31 +- + drivers/net/can/c_can/c_can_platform.c | 6 +- + drivers/net/can/dev/bittiming.c | 28 +- + drivers/net/can/dev/netlink.c | 27 +- + drivers/net/can/dev/skb.c | 37 +- + drivers/net/can/grcan.c | 2 +- + drivers/net/can/m_can/m_can.c | 167 +- + drivers/net/can/m_can/m_can.h | 2 + + drivers/net/can/m_can/tcan4x5x.h | 1 - + drivers/net/can/rcar/rcar_can.c | 2 +- + drivers/net/can/rcar/rcar_canfd.c | 2 +- + drivers/net/can/sja1000/sja1000.c | 2 +- + drivers/net/can/spi/hi311x.c | 2 +- + drivers/net/can/spi/mcp251x.c | 2 +- + drivers/net/can/spi/mcp251xfd/Kconfig | 1 + + drivers/net/can/spi/mcp251xfd/Makefile | 3 + + drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 125 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd-dump.c | 285 ++ + drivers/net/can/spi/mcp251xfd/mcp251xfd-dump.h | 45 + + drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c | 64 +- + .../net/can/spi/mcp251xfd/mcp251xfd-timestamp.c | 71 + + drivers/net/can/spi/mcp251xfd/mcp251xfd.h | 28 + + drivers/net/can/usb/ems_usb.c | 2 +- + drivers/net/can/usb/esd_usb2.c | 4 +- + drivers/net/can/usb/gs_usb.c | 2 +- + drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 2 +- + drivers/net/can/usb/mcba_usb.c | 2 +- + drivers/net/can/usb/peak_usb/pcan_usb.c | 47 + + drivers/net/can/usb/peak_usb/pcan_usb_core.c | 6 +- + drivers/net/can/usb/peak_usb/pcan_usb_core.h | 2 + + drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 46 +- + drivers/net/can/usb/peak_usb/pcan_usb_pro.c | 46 +- + drivers/net/can/usb/peak_usb/pcan_usb_pro.h | 6 + + drivers/net/can/usb/ucan.c | 8 +- + drivers/net/can/usb/usb_8dev.c | 2 +- + drivers/net/can/xilinx_can.c | 10 +- + drivers/net/dsa/Kconfig | 17 +- + drivers/net/dsa/b53/Kconfig | 1 + + drivers/net/dsa/b53/b53_common.c | 23 +- + drivers/net/dsa/b53/b53_mmap.c | 55 + + drivers/net/dsa/b53/b53_priv.h | 4 - + drivers/net/dsa/b53/b53_spi.c | 14 + + drivers/net/dsa/bcm_sf2.c | 121 +- + drivers/net/dsa/bcm_sf2.h | 2 + + drivers/net/dsa/bcm_sf2_regs.h | 8 +- + drivers/net/dsa/hirschmann/hellcreek.c | 378 ++- + drivers/net/dsa/hirschmann/hellcreek.h | 7 + + drivers/net/dsa/lantiq_gswip.c | 162 +- + drivers/net/dsa/mt7530.c | 153 +- + drivers/net/dsa/mt7530.h | 1 + + drivers/net/dsa/mv88e6xxx/chip.c | 503 +++- + drivers/net/dsa/mv88e6xxx/chip.h | 20 +- + drivers/net/dsa/mv88e6xxx/global1.c | 19 +- + drivers/net/dsa/mv88e6xxx/global1.h | 2 + + drivers/net/dsa/mv88e6xxx/global2.h | 8 + + drivers/net/dsa/mv88e6xxx/global2_scratch.c | 6 +- + drivers/net/dsa/mv88e6xxx/port.c | 418 ++- + drivers/net/dsa/mv88e6xxx/port.h | 50 + + drivers/net/dsa/mv88e6xxx/serdes.c | 338 ++- + drivers/net/dsa/mv88e6xxx/serdes.h | 98 +- + drivers/net/dsa/ocelot/felix.c | 4 +- + drivers/net/dsa/ocelot/felix_vsc9959.c | 4 +- + drivers/net/dsa/sja1105/sja1105_flower.c | 9 +- + drivers/net/dsa/sja1105/sja1105_main.c | 16 - + drivers/net/ethernet/3com/3c509.c | 1 + + drivers/net/ethernet/Kconfig | 1 + + drivers/net/ethernet/Makefile | 1 + + drivers/net/ethernet/actions/Kconfig | 26 + + drivers/net/ethernet/actions/Makefile | 6 + + drivers/net/ethernet/actions/owl-emac.c | 1625 ++++++++++ + drivers/net/ethernet/actions/owl-emac.h | 280 ++ + drivers/net/ethernet/amazon/ena/ena_com.c | 4 +- + drivers/net/ethernet/amazon/ena/ena_com.h | 2 +- + drivers/net/ethernet/amazon/ena/ena_ethtool.c | 25 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 23 +- + drivers/net/ethernet/amd/amd8111e.c | 362 ++- + drivers/net/ethernet/amd/hplance.c | 3 + + drivers/net/ethernet/atheros/ag71xx.c | 4 +- + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 30 +- + drivers/net/ethernet/atheros/atlx/atl2.c | 24 +- + drivers/net/ethernet/broadcom/bcm4908_enet.c | 146 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 3 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 108 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 9 + + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 20 +- + drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 1 - + drivers/net/ethernet/brocade/bna/bnad_ethtool.c | 266 +- + drivers/net/ethernet/cadence/macb.h | 14 + + drivers/net/ethernet/cadence/macb_main.c | 48 +- + .../net/ethernet/cavium/liquidio/cn23xx_pf_regs.h | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c | 3 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 2 +- + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.c | 11 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 13 +- + drivers/net/ethernet/dec/tulip/de2104x.c | 13 +- + drivers/net/ethernet/dec/tulip/winbond-840.c | 13 +- + drivers/net/ethernet/dlink/sundance.c | 15 +- + drivers/net/ethernet/faraday/ftmac100.c | 13 +- + drivers/net/ethernet/fealnx.c | 13 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 12 +- + drivers/net/ethernet/freescale/dpaa2/Kconfig | 8 + + drivers/net/ethernet/freescale/dpaa2/Makefile | 2 + + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 68 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 10 +- + .../net/ethernet/freescale/dpaa2/dpaa2-ethtool.c | 40 + + .../freescale/dpaa2/dpaa2-switch-ethtool.c} | 2 +- + .../net/ethernet/freescale/dpaa2/dpaa2-switch.c | 3159 ++++++++++++++++++++ + .../net/ethernet/freescale/dpaa2/dpaa2-switch.h | 186 ++ + drivers/net/ethernet/freescale/dpaa2/dpkg.h | 5 +- + drivers/net/ethernet/freescale/dpaa2/dpmac.h | 24 +- + drivers/net/ethernet/freescale/dpaa2/dpni.c | 6 + + drivers/net/ethernet/freescale/dpaa2/dpni.h | 162 +- + drivers/net/ethernet/freescale/dpaa2/dprtc.h | 3 - + .../ethernet/freescale/dpaa2}/dpsw-cmd.h | 218 +- + .../ethsw => net/ethernet/freescale/dpaa2}/dpsw.c | 750 +++-- + drivers/net/ethernet/freescale/dpaa2/dpsw.h | 752 +++++ + drivers/net/ethernet/freescale/enetc/enetc.c | 1188 ++++++-- + drivers/net/ethernet/freescale/enetc/enetc.h | 87 +- + drivers/net/ethernet/freescale/enetc/enetc_cbdr.c | 82 +- + .../net/ethernet/freescale/enetc/enetc_ethtool.c | 19 +- + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 83 +- + drivers/net/ethernet/freescale/enetc/enetc_qos.c | 5 + + drivers/net/ethernet/freescale/enetc/enetc_vf.c | 8 + + drivers/net/ethernet/google/gve/gve_ethtool.c | 8 +- + drivers/net/ethernet/hisilicon/hns/hnae.h | 6 - + drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 22 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 27 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h | 4 - + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 16 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c | 41 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 95 +- + .../net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c | 26 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 10 +- + drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 106 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 12 +- + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 5 + + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 173 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 9 +- + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 21 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 14 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 70 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 25 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 10 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 2079 ++++++++----- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 63 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 26 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 39 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.h | 2 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 20 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c | 1 - + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.h | 7 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 64 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 1 - + drivers/net/ethernet/hisilicon/hns_mdio.c | 4 +- + drivers/net/ethernet/huawei/hinic/hinic_ethtool.c | 29 +- + .../net/ethernet/huawei/hinic/hinic_hw_api_cmd.c | 8 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_if.c | 2 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c | 6 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_qp.c | 1 - + drivers/net/ethernet/huawei/hinic/hinic_rx.c | 8 +- + drivers/net/ethernet/huawei/hinic/hinic_tx.c | 1 + + drivers/net/ethernet/ibm/ibmvnic.c | 5 +- + drivers/net/ethernet/intel/e1000/e1000_hw.c | 1 + + drivers/net/ethernet/intel/e1000e/ich8lan.c | 4 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 18 +- + drivers/net/ethernet/intel/e1000e/phy.c | 2 +- + drivers/net/ethernet/intel/e1000e/ptp.c | 2 +- + drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c | 4 +- + drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c | 2 +- + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 4 +- + drivers/net/ethernet/intel/fm10k/fm10k_mbx.c | 4 +- + drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_common.c | 6 +- + drivers/net/ethernet/intel/i40e/i40e_dcb.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_ddp.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 18 +- + drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 10 +- + drivers/net/ethernet/intel/i40e/i40e_nvm.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_ptp.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 17 +- + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 13 +- + drivers/net/ethernet/intel/iavf/Makefile | 2 +- + drivers/net/ethernet/intel/iavf/iavf.h | 12 + + drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 631 ++++ + drivers/net/ethernet/intel/iavf/iavf_fdir.c | 773 +++++ + drivers/net/ethernet/intel/iavf/iavf_fdir.h | 113 + + drivers/net/ethernet/intel/iavf/iavf_main.c | 31 +- + drivers/net/ethernet/intel/iavf/iavf_txrx.c | 2 +- + drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 196 +- + drivers/net/ethernet/intel/ice/Makefile | 2 +- + drivers/net/ethernet/intel/ice/ice.h | 33 +- + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 4 +- + drivers/net/ethernet/intel/ice/ice_arfs.c | 6 +- + drivers/net/ethernet/intel/ice/ice_base.c | 23 + + drivers/net/ethernet/intel/ice/ice_common.c | 58 +- + drivers/net/ethernet/intel/ice/ice_common.h | 6 +- + drivers/net/ethernet/intel/ice/ice_controlq.h | 4 +- + drivers/net/ethernet/intel/ice/ice_dcb.c | 2 +- + drivers/net/ethernet/intel/ice/ice_ethtool.c | 105 +- + drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c | 4 + + drivers/net/ethernet/intel/ice/ice_fdir.c | 488 ++- + drivers/net/ethernet/intel/ice/ice_fdir.h | 58 + + drivers/net/ethernet/intel/ice/ice_flex_pipe.c | 568 +++- + drivers/net/ethernet/intel/ice/ice_flex_pipe.h | 3 +- + drivers/net/ethernet/intel/ice/ice_flex_type.h | 91 +- + drivers/net/ethernet/intel/ice/ice_flow.c | 747 ++++- + drivers/net/ethernet/intel/ice/ice_flow.h | 160 +- + drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 18 + + drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 22 + + drivers/net/ethernet/intel/ice/ice_lib.c | 288 +- + drivers/net/ethernet/intel/ice/ice_main.c | 293 +- + drivers/net/ethernet/intel/ice/ice_protocol_type.h | 10 + + drivers/net/ethernet/intel/ice/ice_sched.c | 2 +- + drivers/net/ethernet/intel/ice/ice_switch.c | 2 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 26 +- + drivers/net/ethernet/intel/ice/ice_txrx.h | 8 + + drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 1 + + drivers/net/ethernet/intel/ice/ice_type.h | 34 +- + drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c | 2204 ++++++++++++++ + drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.h | 55 + + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 86 +- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h | 8 + + drivers/net/ethernet/intel/ice/ice_xsk.c | 12 +- + drivers/net/ethernet/intel/igb/e1000_mbx.c | 2 +- + drivers/net/ethernet/intel/igb/e1000_phy.c | 1 + + drivers/net/ethernet/intel/igb/igb_ethtool.c | 41 +- + drivers/net/ethernet/intel/igb/igb_main.c | 21 +- + drivers/net/ethernet/intel/igb/igb_ptp.c | 1 + + drivers/net/ethernet/intel/igc/Makefile | 2 +- + drivers/net/ethernet/intel/igc/igc.h | 18 +- + drivers/net/ethernet/intel/igc/igc_defines.h | 5 - + drivers/net/ethernet/intel/igc/igc_i225.c | 2 +- + drivers/net/ethernet/intel/igc/igc_main.c | 476 ++- + drivers/net/ethernet/intel/igc/igc_ptp.c | 25 +- + drivers/net/ethernet/intel/igc/igc_xdp.c | 60 + + drivers/net/ethernet/intel/igc/igc_xdp.h | 13 + + drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 16 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 40 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 1 + + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 15 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 5 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 1 + + drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 11 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 1 + + drivers/net/ethernet/intel/ixgbevf/vf.c | 18 +- + drivers/net/ethernet/lantiq_xrx200.c | 4 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 6 +- + drivers/net/ethernet/marvell/mvneta.c | 25 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 13 +- + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 60 +- + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 28 +- + drivers/net/ethernet/marvell/octeontx2/af/npc.h | 7 + + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 17 +- + .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 4 +- + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 10 +- + .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 196 +- + .../net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c | 79 +- + .../net/ethernet/marvell/octeontx2/nic/Makefile | 2 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 20 + + .../ethernet/marvell/octeontx2/nic/otx2_flows.c | 47 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 37 + + .../net/ethernet/marvell/octeontx2/nic/otx2_reg.h | 1 + + .../net/ethernet/marvell/octeontx2/nic/otx2_tc.c | 787 +++++ + drivers/net/ethernet/marvell/skge.c | 9 +- + drivers/net/ethernet/marvell/sky2.c | 11 +- + drivers/net/ethernet/mediatek/Makefile | 2 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 42 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 23 +- + drivers/net/ethernet/mediatek/mtk_ppe.c | 511 ++++ + drivers/net/ethernet/mediatek/mtk_ppe.h | 287 ++ + drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c | 217 ++ + drivers/net/ethernet/mediatek/mtk_ppe_offload.c | 484 +++ + drivers/net/ethernet/mediatek/mtk_ppe_regs.h | 144 + + drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 12 + + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 10 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 32 +- + drivers/net/ethernet/mellanox/mlx5/core/dev.c | 3 - + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 10 +- + .../ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 44 +- + .../net/ethernet/mellanox/mlx5/core/en/devlink.c | 38 +- + .../net/ethernet/mellanox/mlx5/core/en/devlink.h | 6 + + drivers/net/ethernet/mellanox/mlx5/core/en/fs.h | 60 +- + .../mellanox/mlx5/core/en/fs_tt_redirect.c | 605 ++++ + .../mellanox/mlx5/core/en/fs_tt_redirect.h | 26 + + .../net/ethernet/mellanox/mlx5/core/en/params.c | 488 ++- + .../net/ethernet/mellanox/mlx5/core/en/params.h | 44 +- + drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 396 ++- + drivers/net/ethernet/mellanox/mlx5/core/en/ptp.h | 32 +- + drivers/net/ethernet/mellanox/mlx5/core/en/qos.c | 4 +- + .../net/ethernet/mellanox/mlx5/core/en/rep/tc.c | 91 +- + .../ethernet/mellanox/mlx5/core/en/reporter_rx.c | 177 +- + .../ethernet/mellanox/mlx5/core/en/reporter_tx.c | 21 +- + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 54 +- + .../net/ethernet/mellanox/mlx5/core/en/tc_priv.h | 1 + + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.h | 10 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_encap.c | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en/trap.c | 203 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 15 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 56 +- + .../mellanox/mlx5/core/en_accel/ipsec_fs.c | 4 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c | 95 +- + .../net/ethernet/mellanox/mlx5/core/en_common.c | 27 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 18 +- + drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 147 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 905 ++---- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 304 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.h | 10 + + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 118 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 225 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 13 +- + .../ethernet/mellanox/mlx5/core/esw/devlink_port.c | 2 +- + .../ethernet/mellanox/mlx5/core/esw/indir_table.h | 6 +- + .../net/ethernet/mellanox/mlx5/core/esw/sample.c | 585 ++++ + .../net/ethernet/mellanox/mlx5/core/esw/sample.h | 42 + + .../net/ethernet/mellanox/mlx5/core/esw/vporttbl.c | 140 + + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 170 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 73 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 372 +-- + .../net/ethernet/mellanox/mlx5/core/fpga/ipsec.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 14 +- + drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 13 +- + drivers/net/ethernet/mellanox/mlx5/core/health.c | 6 +- + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 19 +- + .../ethernet/mellanox/mlx5/core/ipoib/ipoib_vlan.c | 1 + + drivers/net/ethernet/mellanox/mlx5/core/lag.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/lib/clock.h | 11 + + .../net/ethernet/mellanox/mlx5/core/lib/crypto.c | 2 +- + .../ethernet/mellanox/mlx5/core/lib/fs_chains.c | 52 +- + .../ethernet/mellanox/mlx5/core/lib/fs_chains.h | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/lib/gid.c | 15 +- + drivers/net/ethernet/mellanox/mlx5/core/lib/mlx5.h | 9 + + drivers/net/ethernet/mellanox/mlx5/core/main.c | 143 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 8 +- + .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/rl.c | 139 +- + .../net/ethernet/mellanox/mlx5/core/sf/dev/dev.h | 2 +- + .../ethernet/mellanox/mlx5/core/sf/dev/driver.c | 14 +- + .../net/ethernet/mellanox/mlx5/core/sf/devlink.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/sf/hw_table.c | 1 + + .../mellanox/mlx5/core/steering/dr_ste_v0.c | 2 +- + .../mellanox/mlx5/core/steering/dr_ste_v1.c | 19 +- + drivers/net/ethernet/mellanox/mlxsw/core.c | 6 +- + drivers/net/ethernet/mellanox/mlxsw/core.h | 21 +- + .../mellanox/mlxsw/core_acl_flex_actions.c | 131 + + .../mellanox/mlxsw/core_acl_flex_actions.h | 11 + + drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 27 +- + drivers/net/ethernet/mellanox/mlxsw/pci.c | 55 +- + drivers/net/ethernet/mellanox/mlxsw/pci_hw.h | 71 + + drivers/net/ethernet/mellanox/mlxsw/reg.h | 130 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 215 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 76 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 25 + + .../mellanox/mlxsw/spectrum_acl_flex_actions.c | 83 + + .../net/ethernet/mellanox/mlxsw/spectrum_dpipe.c | 21 +- + .../net/ethernet/mellanox/mlxsw/spectrum_flow.c | 2 +- + .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 23 + + .../net/ethernet/mellanox/mlxsw/spectrum_ipip.c | 10 +- + .../net/ethernet/mellanox/mlxsw/spectrum_ipip.h | 3 +- + .../ethernet/mellanox/mlxsw/spectrum_matchall.c | 245 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.h | 1 - + .../ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c | 15 +- + .../net/ethernet/mellanox/mlxsw/spectrum_qdisc.c | 5 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 682 ++++- + .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 12 +- + .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 21 +- + .../net/ethernet/mellanox/mlxsw/spectrum_span.h | 16 + + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 74 +- + .../net/ethernet/mellanox/mlxsw/spectrum_trap.c | 213 +- + drivers/net/ethernet/microchip/encx24j600.c | 15 +- + drivers/net/ethernet/microchip/lan743x_ethtool.c | 4 +- + drivers/net/ethernet/microchip/lan743x_main.c | 2 +- + drivers/net/ethernet/moxa/moxart_ether.c | 1 - + drivers/net/ethernet/mscc/Kconfig | 3 +- + drivers/net/ethernet/mscc/ocelot.c | 105 +- + drivers/net/ethernet/mscc/ocelot_flower.c | 5 + + drivers/net/ethernet/mscc/ocelot_mrp.c | 225 +- + drivers/net/ethernet/mscc/ocelot_net.c | 214 +- + drivers/net/ethernet/mscc/ocelot_ptp.c | 2 + + drivers/net/ethernet/mscc/ocelot_vcap.c | 1 + + drivers/net/ethernet/neterion/s2io.c | 2 +- + drivers/net/ethernet/netronome/nfp/abm/main.c | 4 +- + drivers/net/ethernet/netronome/nfp/flower/main.h | 4 +- + .../net/ethernet/netronome/nfp/flower/qos_conf.c | 156 +- + drivers/net/ethernet/netronome/nfp/nfp_app.h | 1 - + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 79 +- + drivers/net/ethernet/netronome/nfp/nfp_port.h | 2 - + drivers/net/ethernet/nxp/lpc_eth.c | 9 +- + drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h | 9 - + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 1 + + drivers/net/ethernet/pensando/ionic/Makefile | 1 + + drivers/net/ethernet/pensando/ionic/ionic.h | 6 + + .../net/ethernet/pensando/ionic/ionic_bus_pci.c | 4 + + drivers/net/ethernet/pensando/ionic/ionic_dev.c | 107 +- + drivers/net/ethernet/pensando/ionic/ionic_dev.h | 33 +- + .../net/ethernet/pensando/ionic/ionic_ethtool.c | 109 +- + drivers/net/ethernet/pensando/ionic/ionic_if.h | 242 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 530 +++- + drivers/net/ethernet/pensando/ionic/ionic_lif.h | 98 +- + drivers/net/ethernet/pensando/ionic/ionic_main.c | 43 +- + drivers/net/ethernet/pensando/ionic/ionic_phc.c | 589 ++++ + .../net/ethernet/pensando/ionic/ionic_rx_filter.c | 21 + + .../net/ethernet/pensando/ionic/ionic_rx_filter.h | 1 + + drivers/net/ethernet/pensando/ionic/ionic_stats.c | 392 +-- + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 870 +++--- + drivers/net/ethernet/pensando/ionic/ionic_txrx.h | 3 + + drivers/net/ethernet/qlogic/qed/qed_l2.c | 1 + + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 1 + + drivers/net/ethernet/qlogic/qede/qede_fp.c | 26 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 1 - + .../net/ethernet/qualcomm/rmnet/rmnet_handlers.c | 10 +- + drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h | 12 - + .../ethernet/qualcomm/rmnet/rmnet_map_command.c | 11 +- + .../net/ethernet/qualcomm/rmnet/rmnet_map_data.c | 56 +- + drivers/net/ethernet/realtek/r8169_main.c | 23 +- + drivers/net/ethernet/renesas/sh_eth.c | 10 +- + drivers/net/ethernet/renesas/sh_eth.h | 114 +- + drivers/net/ethernet/sfc/falcon/net_driver.h | 2 +- + drivers/net/ethernet/sfc/rx.c | 11 +- + drivers/net/ethernet/sfc/tx.c | 15 +- + drivers/net/ethernet/smsc/smc91x.c | 2 +- + drivers/net/ethernet/smsc/smsc911x.c | 2 + + drivers/net/ethernet/socionext/netsec.c | 16 +- + drivers/net/ethernet/stmicro/stmmac/Makefile | 1 + + drivers/net/ethernet/stmicro/stmmac/common.h | 36 + + drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c | 60 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 395 ++- + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.h | 1 + + .../net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 2 + + .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 1 - + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 24 +- + .../net/ethernet/stmicro/stmmac/dwmac1000_dma.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 15 + + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 8 + + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 16 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h | 24 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c | 30 +- + drivers/net/ethernet/stmicro/stmmac/dwmac5.c | 136 + + drivers/net/ethernet/stmicro/stmmac/dwmac5.h | 44 + + drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h | 22 +- + drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c | 8 +- + drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 6 + + drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 15 +- + drivers/net/ethernet/stmicro/stmmac/hwif.h | 19 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 67 +- + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 124 +- + .../net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 11 + + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1406 +++++++-- + drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 111 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 2 - + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 30 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 35 + + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h | 23 + + drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 124 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_xdp.c | 40 + + drivers/net/ethernet/stmicro/stmmac/stmmac_xdp.h | 12 + + drivers/net/ethernet/sun/cassini.c | 1 + + drivers/net/ethernet/sun/sungem.c | 4 +- + drivers/net/ethernet/ti/cpsw.c | 14 +- + drivers/net/ethernet/ti/cpsw_new.c | 14 +- + drivers/net/ethernet/ti/cpsw_priv.c | 11 +- + drivers/net/ethernet/toshiba/spider_net.c | 42 +- + drivers/net/ethernet/toshiba/tc35815.c | 3 +- + drivers/net/ethernet/via/via-velocity.c | 2 +- + drivers/net/ethernet/xilinx/xilinx_axienet.h | 8 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 35 +- + drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 4 +- + drivers/net/ethernet/xircom/xirc2ps_cs.c | 2 - + drivers/net/fddi/Kconfig | 16 - + drivers/net/fddi/defxx.c | 96 +- + drivers/net/fddi/defxx.h | 5 +- + drivers/net/fddi/defza.c | 2 +- + drivers/net/fddi/skfp/h/smt.h | 12 +- + drivers/net/fddi/skfp/smt.c | 4 +- + drivers/net/geneve.c | 1 + + drivers/net/hyperv/hyperv_net.h | 6 +- + drivers/net/hyperv/netvsc.c | 55 +- + drivers/net/hyperv/netvsc_drv.c | 51 +- + drivers/net/ieee802154/mac802154_hwsim.c | 2 +- + drivers/net/ipa/Kconfig | 5 +- + drivers/net/ipa/Makefile | 4 +- + drivers/net/ipa/gsi.c | 52 +- + drivers/net/ipa/gsi.h | 4 +- + drivers/net/ipa/gsi_private.h | 4 +- + drivers/net/ipa/gsi_reg.h | 69 +- + drivers/net/ipa/gsi_trans.c | 9 +- + drivers/net/ipa/gsi_trans.h | 5 +- + drivers/net/ipa/ipa.h | 7 +- + drivers/net/ipa/ipa_cmd.c | 28 +- + drivers/net/ipa/ipa_cmd.h | 19 +- + .../ipa/{ipa_data-sdm845.c => ipa_data-v3.5.1.c} | 228 +- + .../net/ipa/{ipa_data-sc7180.c => ipa_data-v4.2.c} | 158 +- + drivers/net/ipa/ipa_data.h | 128 +- + drivers/net/ipa/ipa_endpoint.c | 60 +- + drivers/net/ipa/ipa_endpoint.h | 30 +- + drivers/net/ipa/ipa_interrupt.c | 54 +- + drivers/net/ipa/ipa_interrupt.h | 1 + + drivers/net/ipa/ipa_main.c | 266 +- + drivers/net/ipa/ipa_mem.c | 6 +- + drivers/net/ipa/ipa_mem.h | 12 +- + drivers/net/ipa/ipa_qmi.c | 14 +- + drivers/net/ipa/ipa_qmi.h | 14 +- + drivers/net/ipa/ipa_qmi_msg.c | 78 +- + drivers/net/ipa/ipa_qmi_msg.h | 6 +- + drivers/net/ipa/ipa_reg.h | 495 +-- + drivers/net/ipa/ipa_resource.c | 182 ++ + drivers/net/ipa/ipa_resource.h | 27 + + drivers/net/ipa/ipa_smp2p.h | 2 +- + drivers/net/ipa/ipa_table.c | 91 +- + drivers/net/ipa/ipa_table.h | 11 +- + drivers/net/ipa/ipa_uc.c | 5 +- + drivers/net/ipa/ipa_version.h | 29 +- + drivers/net/mdio.c | 2 +- + drivers/net/mdio/Kconfig | 11 + + drivers/net/mdio/Makefile | 1 + + drivers/net/mdio/mdio-bcm-unimac.c | 16 +- + drivers/net/mdio/mdio-bitbang.c | 4 +- + drivers/net/mdio/mdio-cavium.c | 2 +- + drivers/net/mdio/mdio-gpio.c | 10 +- + drivers/net/mdio/mdio-ipq4019.c | 4 +- + drivers/net/mdio/mdio-ipq8064.c | 4 +- + drivers/net/mdio/mdio-mscc-miim.c | 8 +- + drivers/net/mdio/mdio-mux-bcm-iproc.c | 14 +- + drivers/net/mdio/mdio-mux-bcm6368.c | 184 ++ + drivers/net/mdio/mdio-mux-gpio.c | 8 +- + drivers/net/mdio/mdio-mux-mmioreg.c | 6 +- + drivers/net/mdio/mdio-mux-multiplexer.c | 2 +- + drivers/net/mdio/mdio-mux.c | 6 +- + drivers/net/mdio/mdio-octeon.c | 8 +- + drivers/net/mdio/mdio-thunder.c | 10 +- + drivers/net/mdio/mdio-xgene.c | 6 +- + drivers/net/mdio/of_mdio.c | 10 +- + drivers/net/mhi/mhi.h | 1 + + drivers/net/mhi/net.c | 7 +- + drivers/net/mhi/proto_mbim.c | 62 +- + drivers/net/netdevsim/Makefile | 4 + + drivers/net/netdevsim/dev.c | 17 +- + drivers/net/netdevsim/ethtool.c | 36 + + drivers/net/netdevsim/fib.c | 147 +- + drivers/net/netdevsim/health.c | 11 +- + drivers/net/netdevsim/netdevsim.h | 18 + + drivers/net/netdevsim/psample.c | 264 ++ + drivers/net/pcs/pcs-xpcs.c | 257 +- + drivers/net/phy/Kconfig | 6 + + drivers/net/phy/Makefile | 1 + + drivers/net/phy/at803x.c | 31 - + drivers/net/phy/broadcom.c | 76 +- + drivers/net/phy/marvell-88x2222.c | 519 ++++ + drivers/net/phy/marvell10g.c | 2 + + drivers/net/phy/mdio-boardinfo.c | 2 +- + drivers/net/phy/mdio_bus.c | 2 +- + drivers/net/phy/mscc/mscc_main.c | 217 +- + drivers/net/phy/phy-c45.c | 8 + + drivers/net/phy/phy_device.c | 11 + + drivers/net/phy/phylink.c | 5 +- + drivers/net/phy/smsc.c | 7 +- + drivers/net/plip/plip.c | 2 + + drivers/net/ppp/ppp_deflate.c | 1 - + drivers/net/ppp/ppp_generic.c | 22 + + drivers/net/ppp/pppoe.c | 27 +- + drivers/net/tun.c | 15 +- + drivers/net/usb/asix_devices.c | 12 +- + drivers/net/usb/ax88179_178a.c | 6 +- + drivers/net/usb/cdc_ether.c | 27 +- + drivers/net/usb/cdc_ncm.c | 56 +- + drivers/net/usb/dm9601.c | 4 +- + drivers/net/usb/lan78xx.c | 1 - + drivers/net/usb/mcs7830.c | 4 +- + drivers/net/usb/sierra_net.c | 4 +- + drivers/net/usb/smsc75xx.c | 4 +- + drivers/net/usb/sr9700.c | 4 +- + drivers/net/usb/sr9800.c | 4 +- + drivers/net/usb/usbnet.c | 38 +- + drivers/net/veth.c | 40 +- + drivers/net/virtio_net.c | 110 +- + drivers/net/vmxnet3/vmxnet3_ethtool.c | 53 +- + drivers/net/vxlan.c | 2 + + drivers/net/wan/farsync.c | 3 +- + drivers/net/wan/hdlc_x25.c | 30 +- + drivers/net/wan/lapbether.c | 85 +- + drivers/net/wan/z85230.h | 39 - + drivers/net/wireless/mediatek/mt76/mt7615/soc.c | 4 +- + .../net/wireless/mediatek/mt76/mt7915/debugfs.c | 36 +- + .../net/wireless/mediatek/mt76/mt7921/debugfs.c | 18 +- + drivers/net/xen-netfront.c | 18 +- + drivers/nfc/fdp/fdp.c | 49 +- + drivers/nfc/pn533/pn533.c | 3 + + drivers/nfc/s3fwrn5/core.c | 12 +- + drivers/of/of_net.c | 3 + + drivers/phy/phy-core-mipi-dphy.c | 2 - + drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c | 8 +- + drivers/ptp/ptp_clockmatrix.c | 4 +- + drivers/ptp/ptp_pch.c | 21 +- + drivers/s390/net/qeth_core_main.c | 18 +- + drivers/s390/net/qeth_l3_main.c | 31 +- + drivers/scsi/aacraid/TODO | 3 - + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/fsl-dpaa2/Kconfig | 19 - + drivers/staging/fsl-dpaa2/Makefile | 6 - + drivers/staging/fsl-dpaa2/ethsw/Makefile | 10 - + drivers/staging/fsl-dpaa2/ethsw/README | 106 - + drivers/staging/fsl-dpaa2/ethsw/TODO | 13 - + drivers/staging/fsl-dpaa2/ethsw/dpsw.h | 594 ---- + drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 1839 ------------ + drivers/staging/fsl-dpaa2/ethsw/ethsw.h | 80 - + fs/befs/TODO | 14 - + fs/jffs2/TODO | 37 - + fs/proc/proc_sysctl.c | 6 + + include/linux/atm_suni.h | 12 - + include/linux/avf/virtchnl.h | 278 ++ + include/linux/bpf-cgroup.h | 57 +- + include/linux/bpf.h | 152 +- + include/linux/bpf_local_storage.h | 3 +- + include/linux/bpf_lsm.h | 22 - + include/linux/bpf_types.h | 8 +- + include/linux/bpf_verifier.h | 3 + + include/linux/btf.h | 7 + + include/linux/can/bittiming.h | 79 + + include/linux/can/dev.h | 14 +- + include/linux/can/skb.h | 3 +- + include/linux/dsa/ocelot.h | 5 - + include/linux/etherdevice.h | 4 +- + include/linux/ethtool.h | 12 + + include/linux/filter.h | 44 +- + include/linux/if_bridge.h | 40 + + include/linux/if_rmnet.h | 65 +- + include/linux/marvell_phy.h | 1 + + include/linux/mlx5/device.h | 2 + + include/linux/mlx5/driver.h | 15 +- + include/linux/mlx5/eswitch.h | 9 +- + include/linux/netdevice.h | 138 +- + include/linux/netfilter/ipset/ip_set.h | 2 - + include/linux/netfilter/nfnetlink.h | 29 + + include/linux/pcs/pcs-xpcs.h | 5 + + include/linux/phy.h | 1 + + include/linux/phylink.h | 2 + + include/linux/platform_data/hirschmann-hellcreek.h | 1 + + include/linux/ppp_channel.h | 3 + + include/linux/ptp_pch.h | 22 + + include/linux/qed/qed_chain.h | 8 +- + include/linux/sched.h | 5 + + include/linux/skbuff.h | 33 +- + include/linux/skmsg.h | 162 +- + include/linux/stmmac.h | 43 + + include/linux/sysctl.h | 2 + + include/linux/udp.h | 22 +- + include/linux/usb/usbnet.h | 11 +- + include/net/bpf_sk_storage.h | 1 - + include/net/dsa.h | 16 + + include/net/flow_dissector.h | 6 +- + include/net/flow_offload.h | 6 + + include/net/gro.h | 13 + + include/net/if_inet6.h | 37 +- + include/net/ipv6.h | 1 + + include/net/ipv6_stubs.h | 2 + + include/net/lapb.h | 2 +- + include/net/mld.h | 3 + + include/net/mptcp.h | 48 +- + include/net/net_namespace.h | 10 - + include/net/netfilter/ipv6/nf_conntrack_ipv6.h | 3 - + include/net/netfilter/ipv6/nf_defrag_ipv6.h | 6 + + include/net/netfilter/nf_conntrack.h | 7 + + include/net/netfilter/nf_conntrack_ecache.h | 33 +- + include/net/netfilter/nf_flow_table.h | 64 +- + include/net/netfilter/nf_log.h | 25 - + include/net/netfilter/nf_tables.h | 25 +- + include/net/netns/conntrack.h | 4 - + include/net/netns/ipv4.h | 133 +- + include/net/netns/ipv6.h | 28 +- + include/net/netns/mib.h | 30 +- + include/net/netns/netfilter.h | 6 - + include/net/netns/nftables.h | 7 - + include/net/netns/x_tables.h | 1 - + include/net/nexthop.h | 76 +- + include/net/pkt_sched.h | 9 + + include/net/psample.h | 21 +- + include/net/sch_generic.h | 14 + + include/net/sock.h | 3 + + include/net/switchdev.h | 1 + + include/net/tc_act/tc_police.h | 52 + + include/net/tcp.h | 86 +- + include/net/udp.h | 30 +- + include/net/xdp_sock.h | 19 - + include/soc/mscc/ocelot.h | 25 +- + include/soc/mscc/ocelot_ptp.h | 2 - + include/trace/events/xdp.h | 62 +- + include/uapi/linux/bpf.h | 767 ++++- + include/uapi/linux/btf.h | 5 +- + include/uapi/linux/ethtool.h | 45 +- + include/uapi/linux/ethtool_netlink.h | 17 + + include/uapi/linux/icmp.h | 42 + + include/uapi/linux/icmpv6.h | 3 + + include/uapi/linux/if_fddi.h | 2 +- + include/uapi/linux/mptcp.h | 11 + + include/uapi/linux/nexthop.h | 47 +- + include/uapi/linux/pkt_cls.h | 2 + + include/uapi/linux/psample.h | 7 + + include/uapi/linux/rtnetlink.h | 8 + + include/vdso/time64.h | 1 + + init/Kconfig | 1 + + kernel/bpf/Makefile | 3 +- + kernel/bpf/arraymap.c | 40 + + kernel/bpf/bpf_inode_storage.c | 2 +- + kernel/bpf/bpf_iter.c | 16 + + kernel/bpf/bpf_local_storage.c | 39 +- + kernel/bpf/bpf_lsm.c | 8 +- + kernel/bpf/bpf_task_storage.c | 100 +- + kernel/bpf/btf.c | 325 +- + kernel/bpf/core.c | 47 +- + kernel/bpf/cpumap.c | 9 +- + kernel/bpf/devmap.c | 47 +- + kernel/bpf/disasm.c | 13 +- + kernel/bpf/hashtab.c | 67 +- + kernel/bpf/helpers.c | 17 +- + kernel/bpf/local_storage.c | 5 +- + kernel/bpf/lpm_trie.c | 3 + + kernel/bpf/syscall.c | 5 +- + kernel/bpf/verifier.c | 728 ++++- + kernel/fork.c | 5 + + kernel/sysctl.c | 65 + + kernel/trace/bpf_trace.c | 6 + + lib/test_rhashtable.c | 9 +- + net/6lowpan/nhc_udp.c | 4 +- + net/8021q/vlan_core.c | 10 +- + net/8021q/vlan_dev.c | 21 + + net/9p/client.c | 4 +- + net/9p/error.c | 2 +- + net/9p/trans_fd.c | 2 +- + net/Kconfig | 14 +- + net/ax25/TODO | 20 - + net/ax25/af_ax25.c | 1 + + net/batman-adv/bridge_loop_avoidance.c | 5 +- + net/batman-adv/multicast.c | 6 +- + net/bpf/test_run.c | 276 +- + net/bridge/br_arp_nd_proxy.c | 4 +- + net/bridge/br_device.c | 49 + + net/bridge/br_fdb.c | 50 + + net/bridge/br_input.c | 1 + + net/bridge/br_mdb.c | 148 +- + net/bridge/br_mrp.c | 7 + + net/bridge/br_multicast_eht.c | 141 +- + net/bridge/br_private.h | 20 + + net/bridge/br_stp.c | 27 + + net/bridge/br_vlan.c | 128 + + net/bridge/br_vlan_tunnel.c | 2 +- + net/bridge/netfilter/Kconfig | 4 - + net/bridge/netfilter/Makefile | 3 - + net/bridge/netfilter/ebtables.c | 39 +- + net/bridge/netfilter/nf_log_bridge.c | 79 - + net/ceph/osdmap.c | 2 +- + net/core/Makefile | 6 +- + net/core/bpf_sk_storage.c | 2 +- + net/core/dev.c | 390 ++- + net/core/dev_addr_lists.c | 4 +- + net/core/drop_monitor.c | 2 +- + net/core/filter.c | 276 +- + net/core/flow_dissector.c | 41 +- + net/core/net-procfs.c | 3 - + net/core/net-sysfs.c | 177 +- + net/core/netevent.c | 2 +- + net/core/rtnetlink.c | 15 +- + net/core/skbuff.c | 70 +- + net/core/skmsg.c | 383 ++- + net/core/sock_map.c | 191 +- + net/core/sysctl_net_core.c | 10 + + net/decnet/TODO | 40 - + net/decnet/dn_nsp_in.c | 2 +- + net/decnet/dn_route.c | 49 +- + net/dsa/Kconfig | 17 +- + net/dsa/dsa_priv.h | 23 +- + net/dsa/port.c | 197 +- + net/dsa/slave.c | 47 +- + net/dsa/tag_brcm.c | 107 +- + net/dsa/tag_mtk.c | 14 +- + net/dsa/tag_ocelot.c | 8 - + net/dsa/tag_rtl4_a.c | 2 +- + net/ethernet/eth.c | 13 +- + net/ethtool/Makefile | 2 +- + net/ethtool/fec.c | 238 ++ + net/ethtool/ioctl.c | 21 + + net/ethtool/netlink.c | 19 + + net/ethtool/netlink.h | 4 + + net/hsr/hsr_debugfs.c | 2 +- + net/ipv4/Makefile | 2 +- + net/ipv4/af_inet.c | 1 + + net/ipv4/bpf_tcp_ca.c | 43 + + net/ipv4/esp4.c | 4 +- + net/ipv4/icmp.c | 134 +- + net/ipv4/ip_output.c | 4 +- + net/ipv4/netfilter/Kconfig | 10 +- + net/ipv4/netfilter/Makefile | 4 - + net/ipv4/netfilter/nf_defrag_ipv4.c | 20 +- + net/ipv4/netfilter/nf_log_arp.c | 172 -- + net/ipv4/netfilter/nf_log_ipv4.c | 395 --- + net/ipv4/nexthop.c | 1556 +++++++++- + net/ipv4/ping.c | 4 +- + net/ipv4/route.c | 183 +- + net/ipv4/sysctl_net_ipv4.c | 249 +- + net/ipv4/tcp.c | 17 +- + net/ipv4/tcp_bpf.c | 134 +- + net/ipv4/tcp_cubic.c | 24 +- + net/ipv4/tcp_input.c | 10 +- + net/ipv4/tcp_ipv4.c | 24 +- + net/ipv4/tcp_lp.c | 4 +- + net/ipv4/tcp_output.c | 20 +- + net/ipv4/udp.c | 37 + + net/ipv4/udp_bpf.c | 79 +- + net/ipv4/udp_offload.c | 27 +- + net/ipv6/addrconf.c | 11 +- + net/ipv6/addrconf_core.c | 9 +- + net/ipv6/af_inet6.c | 4 +- + net/ipv6/exthdrs.c | 5 +- + net/ipv6/icmp.c | 16 +- + net/ipv6/ip6_gre.c | 7 +- + net/ipv6/ip6_tunnel.c | 5 +- + net/ipv6/ip6_vti.c | 3 +- + net/ipv6/mcast.c | 1100 ++++--- + net/ipv6/netfilter/Kconfig | 5 +- + net/ipv6/netfilter/Makefile | 3 - + net/ipv6/netfilter/nf_conntrack_reasm.c | 68 +- + net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 15 +- + net/ipv6/netfilter/nf_log_ipv6.c | 427 --- + net/ipv6/route.c | 33 +- + net/ipv6/seg6_local.c | 11 +- + net/ipv6/sit.c | 7 +- + net/ipv6/sysctl_net_ipv6.c | 38 +- + net/ipv6/tcp_ipv6.c | 17 +- + net/ipv6/udp.c | 4 + + net/ipv6/udp_offload.c | 3 +- + net/iucv/af_iucv.c | 4 +- + net/kcm/kcmsock.c | 4 +- + net/l2tp/l2tp_core.c | 2 +- + net/l3mdev/l3mdev.c | 4 +- + net/lapb/lapb_iface.c | 4 +- + net/lapb/lapb_timer.c | 19 +- + net/llc/llc_c_ev.c | 4 +- + net/llc/llc_core.c | 4 +- + net/llc/llc_pdu.c | 2 +- + net/llc/llc_s_ac.c | 2 +- + net/mac80211/cfg.c | 2 +- + net/mptcp/mib.c | 3 + + net/mptcp/mib.h | 3 + + net/mptcp/options.c | 292 +- + net/mptcp/pm.c | 64 +- + net/mptcp/pm_netlink.c | 328 +- + net/mptcp/protocol.c | 62 +- + net/mptcp/protocol.h | 89 +- + net/mptcp/subflow.c | 43 +- + net/ncsi/internal.h | 2 +- + net/netfilter/Kconfig | 20 +- + net/netfilter/Makefile | 6 +- + net/netfilter/ipset/ip_set_core.c | 17 +- + net/netfilter/ipvs/ip_vs_core.c | 2 +- + net/netfilter/ipvs/ip_vs_ftp.c | 2 - + net/netfilter/nf_conntrack_acct.c | 2 +- + net/netfilter/nf_conntrack_core.c | 7 +- + net/netfilter/nf_conntrack_ecache.c | 31 +- + net/netfilter/nf_conntrack_netlink.c | 77 +- + net/netfilter/nf_conntrack_proto_dccp.c | 1 + + net/netfilter/nf_conntrack_standalone.c | 10 +- + net/netfilter/nf_flow_table_core.c | 143 +- + net/netfilter/nf_flow_table_ip.c | 453 +-- + net/netfilter/nf_flow_table_offload.c | 223 +- + net/netfilter/nf_log.c | 10 - + net/netfilter/nf_log_common.c | 224 -- + net/netfilter/nf_log_netdev.c | 78 - + net/netfilter/nf_log_syslog.c | 1089 +++++++ + net/netfilter/nf_tables_api.c | 664 ++-- + net/netfilter/nf_tables_offload.c | 30 +- + net/netfilter/nf_tables_trace.c | 9 +- + net/netfilter/nfnetlink.c | 67 +- + net/netfilter/nfnetlink_acct.c | 14 +- + net/netfilter/nfnetlink_cthelper.c | 11 +- + net/netfilter/nfnetlink_cttimeout.c | 63 +- + net/netfilter/nfnetlink_log.c | 11 +- + net/netfilter/nfnetlink_queue.c | 12 +- + net/netfilter/nft_chain_filter.c | 11 +- + net/netfilter/nft_compat.c | 11 +- + net/netfilter/nft_ct.c | 1 + + net/netfilter/nft_dynset.c | 6 +- + net/netfilter/nft_flow_offload.c | 211 +- + net/netfilter/nft_log.c | 20 +- + net/netfilter/x_tables.c | 46 +- + net/netfilter/xt_LOG.c | 1 + + net/netfilter/xt_NFLOG.c | 1 + + net/netfilter/xt_TRACE.c | 1 + + net/netlabel/netlabel_mgmt.c | 2 +- + net/nfc/digital_core.c | 2 +- + net/nfc/digital_dep.c | 2 +- + net/nfc/nci/core.c | 2 +- + net/nfc/nci/uart.c | 4 +- + net/openvswitch/conntrack.c | 6 +- + net/openvswitch/vport-netdev.c | 7 +- + net/openvswitch/vport.c | 8 +- + net/openvswitch/vport.h | 2 +- + net/packet/af_packet.c | 2 +- + net/psample/psample.c | 45 +- + net/qrtr/qrtr.c | 42 +- + net/rds/recv.c | 4 - + net/rds/send.c | 2 +- + net/rose/rose_route.c | 2 + + net/sched/act_police.c | 59 +- + net/sched/act_sample.c | 27 +- + net/sched/cls_api.c | 3 + + net/sched/cls_flower.c | 40 +- + net/sched/sch_cbq.c | 4 +- + net/sched/sch_generic.c | 75 +- + net/sched/sch_taprio.c | 64 +- + net/sctp/sm_make_chunk.c | 2 +- + net/sctp/sm_statefuns.c | 10 +- + net/sctp/socket.c | 2 +- + net/smc/smc_core.h | 1 - + net/socket.c | 2 +- + net/tipc/addr.c | 1 + + net/tipc/addr.h | 46 +- + net/tipc/bearer.c | 95 +- + net/tipc/crypto.c | 12 +- + net/tipc/monitor.c | 63 +- + net/tipc/msg.c | 23 +- + net/tipc/name_distr.c | 93 +- + net/tipc/name_table.c | 428 +-- + net/tipc/name_table.h | 63 +- + net/tipc/net.c | 8 +- + net/tipc/netlink_compat.c | 2 +- + net/tipc/node.c | 35 +- + net/tipc/socket.c | 319 +- + net/tipc/subscr.c | 86 +- + net/tipc/subscr.h | 17 +- + net/tipc/udp_media.c | 2 + + net/tls/tls_device.c | 2 +- + net/tls/tls_sw.c | 4 +- + net/vmw_vsock/af_vsock.c | 2 +- + net/wireless/reg.c | 2 +- + net/x25/af_x25.c | 2 +- + net/xdp/xsk.c | 114 +- + net/xdp/xsk_queue.h | 30 +- + net/xdp/xskmap.c | 17 +- + net/xfrm/xfrm_policy.c | 2 +- + net/xfrm/xfrm_user.c | 2 +- + samples/bpf/do_hbm_test.sh | 2 +- + samples/bpf/sampleip_kern.c | 1 - + samples/bpf/trace_event_kern.c | 1 - + samples/bpf/xdpsock_user.c | 55 +- + samples/pktgen/README.rst | 18 + + samples/pktgen/functions.sh | 7 +- + samples/pktgen/parameters.sh | 15 +- + .../pktgen/pktgen_bench_xmit_mode_netif_receive.sh | 3 - + .../pktgen/pktgen_bench_xmit_mode_queue_xmit.sh | 3 - + samples/pktgen/pktgen_sample01_simple.sh | 25 +- + samples/pktgen/pktgen_sample02_multiqueue.sh | 29 +- + .../pktgen/pktgen_sample03_burst_single_flow.sh | 15 +- + samples/pktgen/pktgen_sample04_many_flows.sh | 17 +- + samples/pktgen/pktgen_sample05_flow_per_thread.sh | 17 +- + ...tgen_sample06_numa_awared_queue_irq_affinity.sh | 31 +- + scripts/{bpf_helpers_doc.py => bpf_doc.py} | 191 +- + security/selinux/nlmsgtab.c | 5 +- + tools/bpf/Makefile.helpers | 60 - + tools/bpf/bpf_dbg.c | 2 +- + tools/bpf/bpf_exp.y | 14 +- + tools/bpf/bpftool/.gitignore | 1 - + tools/bpf/bpftool/Documentation/Makefile | 11 +- + tools/bpf/bpftool/Documentation/bpftool-gen.rst | 78 +- + tools/bpf/bpftool/bash-completion/bpftool | 17 +- + tools/bpf/bpftool/btf.c | 11 + + tools/bpf/bpftool/btf_dumper.c | 1 + + tools/bpf/bpftool/common.c | 1 + + tools/bpf/bpftool/feature.c | 4 + + tools/bpf/bpftool/gen.c | 72 +- + tools/bpf/bpftool/main.c | 3 +- + tools/bpf/bpftool/map.c | 2 +- + tools/bpf/bpftool/prog.c | 1 + + tools/bpf/bpftool/xlated_dumper.c | 3 + + tools/bpf/resolve_btfids/main.c | 11 +- + tools/bpf/runqslower/Makefile | 9 +- + tools/bpf/runqslower/runqslower.bpf.c | 33 +- + tools/include/uapi/linux/bpf.h | 767 ++++- + tools/include/uapi/linux/btf.h | 5 +- + tools/lib/bpf/Build | 2 +- + tools/lib/bpf/Makefile | 3 +- + tools/lib/bpf/bpf_helpers.h | 21 +- + tools/lib/bpf/btf.c | 763 ++--- + tools/lib/bpf/btf.h | 9 + + tools/lib/bpf/btf_dump.c | 12 +- + tools/lib/bpf/libbpf.c | 517 +++- + tools/lib/bpf/libbpf.h | 19 +- + tools/lib/bpf/libbpf.map | 11 + + tools/lib/bpf/libbpf_internal.h | 40 +- + tools/lib/bpf/libbpf_util.h | 47 - + tools/lib/bpf/linker.c | 1963 ++++++++++++ + tools/lib/bpf/strset.c | 176 ++ + tools/lib/bpf/strset.h | 21 + + tools/lib/bpf/xsk.c | 258 +- + tools/lib/bpf/xsk.h | 87 +- + tools/perf/MANIFEST | 2 +- + tools/testing/selftests/bpf/.gitignore | 2 + + tools/testing/selftests/bpf/Makefile | 61 +- + tools/testing/selftests/bpf/Makefile.docs | 82 + + tools/testing/selftests/bpf/README.rst | 62 + + tools/testing/selftests/bpf/bpf_tcp_helpers.h | 29 +- + tools/testing/selftests/bpf/btf_helpers.c | 4 + + tools/testing/selftests/bpf/get_cgroup_id_user.c | 6 +- + .../selftests/bpf/map_tests/array_map_batch_ops.c | 5 - + .../bpf/map_tests/lpm_trie_map_batch_ops.c | 158 + + .../selftests/bpf/prog_tests/attach_probe.c | 40 +- + .../selftests/bpf/prog_tests/bpf_verif_scale.c | 1 + + tools/testing/selftests/bpf/prog_tests/btf.c | 176 +- + .../testing/selftests/bpf/prog_tests/core_reloc.c | 1 + + tools/testing/selftests/bpf/prog_tests/for_each.c | 130 + + .../testing/selftests/bpf/prog_tests/kfunc_call.c | 59 + + .../selftests/bpf/prog_tests/prog_run_xattr.c | 51 +- + tools/testing/selftests/bpf/prog_tests/sk_lookup.c | 83 +- + .../selftests/bpf/prog_tests/sockmap_basic.c | 40 + + .../selftests/bpf/prog_tests/sockmap_listen.c | 144 +- + .../selftests/bpf/prog_tests/static_linked.c | 40 + + .../selftests/bpf/prog_tests/task_local_storage.c | 92 + + tools/testing/selftests/bpf/prog_tests/test_ima.c | 6 +- + tools/testing/selftests/bpf/progs/bind4_prog.c | 25 + + tools/testing/selftests/bpf/progs/bind6_prog.c | 25 + + tools/testing/selftests/bpf/progs/bpf_cubic.c | 36 +- + tools/testing/selftests/bpf/progs/bpf_dctcp.c | 22 +- + .../bpf/progs/btf_dump_test_case_syntax.c | 7 + + .../testing/selftests/bpf/progs/core_reloc_types.h | 5 + + tools/testing/selftests/bpf/progs/fentry_test.c | 2 +- + tools/testing/selftests/bpf/progs/fexit_test.c | 4 +- + .../selftests/bpf/progs/for_each_array_map_elem.c | 61 + + .../selftests/bpf/progs/for_each_hash_map_elem.c | 95 + + .../testing/selftests/bpf/progs/kfunc_call_test.c | 47 + + .../selftests/bpf/progs/kfunc_call_test_subprog.c | 42 + + tools/testing/selftests/bpf/progs/loop6.c | 99 + + tools/testing/selftests/bpf/progs/skb_pkt_end.c | 1 - + .../selftests/bpf/progs/task_local_storage.c | 64 + + .../bpf/progs/task_local_storage_exit_creds.c | 32 + + .../selftests/bpf/progs/task_ls_recursion.c | 70 + + .../selftests/bpf/progs/test_core_reloc_size.c | 3 + + .../selftests/bpf/progs/test_global_func10.c | 2 +- + tools/testing/selftests/bpf/progs/test_sk_lookup.c | 62 +- + .../selftests/bpf/progs/test_sockmap_listen.c | 26 +- + .../bpf/progs/test_sockmap_skb_verdict_attach.c | 18 + + .../selftests/bpf/progs/test_static_linked1.c | 30 + + .../selftests/bpf/progs/test_static_linked2.c | 31 + + tools/testing/selftests/bpf/progs/test_tc_tunnel.c | 113 +- + tools/testing/selftests/bpf/test_bpftool_build.sh | 21 - + tools/testing/selftests/bpf/test_btf.h | 3 + + tools/testing/selftests/bpf/test_doc_build.sh | 13 + + tools/testing/selftests/bpf/test_progs.h | 11 + + tools/testing/selftests/bpf/test_sockmap.c | 2 +- + tools/testing/selftests/bpf/test_tc_tunnel.sh | 15 +- + tools/testing/selftests/bpf/test_verifier.c | 4 +- + tools/testing/selftests/bpf/test_xsk.sh | 138 +- + tools/testing/selftests/bpf/verifier/calls.c | 12 +- + .../testing/selftests/bpf/verifier/ctx_sk_lookup.c | 1 + + tools/testing/selftests/bpf/verifier/dead_code.c | 10 +- + tools/testing/selftests/bpf/vmtest.sh | 59 +- + tools/testing/selftests/bpf/xdpxceiver.c | 862 +++--- + tools/testing/selftests/bpf/xdpxceiver.h | 98 +- + tools/testing/selftests/bpf/xsk_prereqs.sh | 30 +- + .../net/mlxsw/devlink_trap_l3_exceptions.sh | 31 + + .../selftests/drivers/net/mlxsw/rtnetlink.sh | 82 + + .../drivers/net/mlxsw/spectrum-2/q_in_vni_veto.sh | 77 - + .../selftests/drivers/net/mlxsw/tc_restrictions.sh | 21 +- + .../selftests/drivers/net/mlxsw/tc_sample.sh | 657 ++++ + .../drivers/net/netdevsim/ethtool-common.sh | 5 +- + .../selftests/drivers/net/netdevsim/ethtool-fec.sh | 110 + + .../selftests/drivers/net/netdevsim/nexthop.sh | 620 ++++ + .../selftests/drivers/net/netdevsim/psample.sh | 181 ++ + tools/testing/selftests/net/Makefile | 1 + + tools/testing/selftests/net/fib_nexthops.sh | 549 +++- + .../selftests/net/forwarding/dual_vxlan_bridge.sh | 366 +++ + .../selftests/net/forwarding/fib_offload_lib.sh | 2 +- + .../net/forwarding/gre_multipath_nh_res.sh | 361 +++ + tools/testing/selftests/net/forwarding/lib.sh | 14 + + .../net/forwarding/router_mpath_nh_res.sh | 400 +++ + .../testing/selftests/net/forwarding/tc_police.sh | 56 + + tools/testing/selftests/net/mptcp/diag.sh | 55 +- + tools/testing/selftests/net/mptcp/mptcp_connect.c | 10 +- + tools/testing/selftests/net/mptcp/mptcp_connect.sh | 22 +- + tools/testing/selftests/net/mptcp/mptcp_join.sh | 248 +- + tools/testing/selftests/net/mptcp/pm_netlink.sh | 6 +- + tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 34 +- + tools/testing/selftests/net/mptcp/simult_flows.sh | 13 +- + tools/testing/selftests/net/so_txtime.c | 247 +- + tools/testing/selftests/net/so_txtime.sh | 97 +- + tools/testing/selftests/net/udpgro_fwd.sh | 251 ++ + tools/testing/selftests/netfilter/nft_flowtable.sh | 82 + + .../tc-testing/tc-tests/actions/police.json | 48 + + .../tc-testing/tc-tests/actions/simple.json | 24 + + 1143 files changed, 65933 insertions(+), 21007 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/actions,owl-emac.yaml + create mode 100644 Documentation/devicetree/bindings/net/brcm,bcm6368-mdio-mux.yaml + create mode 100644 Documentation/networking/nexthop-group-resilient.rst + create mode 100644 Documentation/userspace-api/ebpf/index.rst + create mode 100644 Documentation/userspace-api/ebpf/syscall.rst + create mode 100644 drivers/net/can/spi/mcp251xfd/mcp251xfd-dump.c + create mode 100644 drivers/net/can/spi/mcp251xfd/mcp251xfd-dump.h + create mode 100644 drivers/net/can/spi/mcp251xfd/mcp251xfd-timestamp.c + create mode 100644 drivers/net/ethernet/actions/Kconfig + create mode 100644 drivers/net/ethernet/actions/Makefile + create mode 100644 drivers/net/ethernet/actions/owl-emac.c + create mode 100644 drivers/net/ethernet/actions/owl-emac.h + rename drivers/{staging/fsl-dpaa2/ethsw/ethsw-ethtool.c => net/ethernet/freescale/dpaa2/dpaa2-switch-ethtool.c} (99%) + create mode 100644 drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c + create mode 100644 drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.h + rename drivers/{staging/fsl-dpaa2/ethsw => net/ethernet/freescale/dpaa2}/dpsw-cmd.h (65%) + rename drivers/{staging/fsl-dpaa2/ethsw => net/ethernet/freescale/dpaa2}/dpsw.c (64%) + create mode 100644 drivers/net/ethernet/freescale/dpaa2/dpsw.h + create mode 100644 drivers/net/ethernet/intel/iavf/iavf_fdir.c + create mode 100644 drivers/net/ethernet/intel/iavf/iavf_fdir.h + create mode 100644 drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.h + create mode 100644 drivers/net/ethernet/intel/igc/igc_xdp.c + create mode 100644 drivers/net/ethernet/intel/igc/igc_xdp.h + create mode 100644 drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c + create mode 100644 drivers/net/ethernet/mediatek/mtk_ppe.c + create mode 100644 drivers/net/ethernet/mediatek/mtk_ppe.h + create mode 100644 drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c + create mode 100644 drivers/net/ethernet/mediatek/mtk_ppe_offload.c + create mode 100644 drivers/net/ethernet/mediatek/mtk_ppe_regs.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/fs_tt_redirect.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/fs_tt_redirect.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/esw/sample.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/esw/sample.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/esw/vporttbl.c + create mode 100644 drivers/net/ethernet/pensando/ionic/ionic_phc.c + create mode 100644 drivers/net/ethernet/stmicro/stmmac/stmmac_xdp.c + create mode 100644 drivers/net/ethernet/stmicro/stmmac/stmmac_xdp.h + rename drivers/net/ipa/{ipa_data-sdm845.c => ipa_data-v3.5.1.c} (52%) + rename drivers/net/ipa/{ipa_data-sc7180.c => ipa_data-v4.2.c} (60%) + create mode 100644 drivers/net/ipa/ipa_resource.c + create mode 100644 drivers/net/ipa/ipa_resource.h + create mode 100644 drivers/net/mdio/mdio-mux-bcm6368.c + create mode 100644 drivers/net/netdevsim/psample.c + create mode 100644 drivers/net/phy/marvell-88x2222.c + delete mode 100644 drivers/scsi/aacraid/TODO + delete mode 100644 drivers/staging/fsl-dpaa2/Kconfig + delete mode 100644 drivers/staging/fsl-dpaa2/Makefile + delete mode 100644 drivers/staging/fsl-dpaa2/ethsw/Makefile + delete mode 100644 drivers/staging/fsl-dpaa2/ethsw/README + delete mode 100644 drivers/staging/fsl-dpaa2/ethsw/TODO + delete mode 100644 drivers/staging/fsl-dpaa2/ethsw/dpsw.h + delete mode 100644 drivers/staging/fsl-dpaa2/ethsw/ethsw.c + delete mode 100644 drivers/staging/fsl-dpaa2/ethsw/ethsw.h + delete mode 100644 fs/befs/TODO + delete mode 100644 fs/jffs2/TODO + delete mode 100644 include/linux/atm_suni.h + create mode 100644 include/linux/ptp_pch.h + delete mode 100644 net/ax25/TODO + delete mode 100644 net/bridge/netfilter/nf_log_bridge.c + delete mode 100644 net/decnet/TODO + create mode 100644 net/ethtool/fec.c + delete mode 100644 net/ipv4/netfilter/nf_log_arp.c + delete mode 100644 net/ipv4/netfilter/nf_log_ipv4.c + delete mode 100644 net/ipv6/netfilter/nf_log_ipv6.c + delete mode 100644 net/netfilter/nf_log_common.c + delete mode 100644 net/netfilter/nf_log_netdev.c + create mode 100644 net/netfilter/nf_log_syslog.c + rename scripts/{bpf_helpers_doc.py => bpf_doc.py} (82%) + delete mode 100644 tools/bpf/Makefile.helpers + delete mode 100644 tools/lib/bpf/libbpf_util.h + create mode 100644 tools/lib/bpf/linker.c + create mode 100644 tools/lib/bpf/strset.c + create mode 100644 tools/lib/bpf/strset.h + create mode 100644 tools/testing/selftests/bpf/Makefile.docs + create mode 100644 tools/testing/selftests/bpf/map_tests/lpm_trie_map_batch_ops.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/for_each.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/kfunc_call.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/static_linked.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/task_local_storage.c + create mode 100644 tools/testing/selftests/bpf/progs/for_each_array_map_elem.c + create mode 100644 tools/testing/selftests/bpf/progs/for_each_hash_map_elem.c + create mode 100644 tools/testing/selftests/bpf/progs/kfunc_call_test.c + create mode 100644 tools/testing/selftests/bpf/progs/kfunc_call_test_subprog.c + create mode 100644 tools/testing/selftests/bpf/progs/loop6.c + create mode 100644 tools/testing/selftests/bpf/progs/task_local_storage.c + create mode 100644 tools/testing/selftests/bpf/progs/task_local_storage_exit_creds.c + create mode 100644 tools/testing/selftests/bpf/progs/task_ls_recursion.c + create mode 100644 tools/testing/selftests/bpf/progs/test_sockmap_skb_verdict_attach.c + create mode 100644 tools/testing/selftests/bpf/progs/test_static_linked1.c + create mode 100644 tools/testing/selftests/bpf/progs/test_static_linked2.c + create mode 100755 tools/testing/selftests/bpf/test_doc_build.sh + delete mode 100755 tools/testing/selftests/drivers/net/mlxsw/spectrum-2/q_in_vni_veto.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/tc_sample.sh + create mode 100755 tools/testing/selftests/drivers/net/netdevsim/ethtool-fec.sh + create mode 100755 tools/testing/selftests/drivers/net/netdevsim/psample.sh + create mode 100755 tools/testing/selftests/net/forwarding/dual_vxlan_bridge.sh + create mode 100755 tools/testing/selftests/net/forwarding/gre_multipath_nh_res.sh + create mode 100755 tools/testing/selftests/net/forwarding/router_mpath_nh_res.sh + create mode 100755 tools/testing/selftests/net/udpgro_fwd.sh +Merging bpf-next/for-next (957dca3df624 bpf, inode: Remove second initialization of the bpf_preload_lock) +$ git merge bpf-next/for-next +Auto-merging kernel/bpf/inode.c +Auto-merging include/linux/bpf.h +Merge made by the 'recursive' strategy. + include/linux/bpf-cgroup.h | 1 - + include/linux/bpf.h | 1 - + kernel/bpf/core.c | 7 +++---- + kernel/bpf/inode.c | 2 -- + net/ipv4/udp_bpf.c | 2 -- + tools/lib/bpf/bpf_helpers.h | 2 +- + tools/lib/bpf/linker.c | 2 +- + tools/testing/selftests/bpf/config | 2 ++ + tools/testing/selftests/bpf/progs/sockmap_tcp_msg_prog.c | 12 ------------ + 9 files changed, 7 insertions(+), 24 deletions(-) +Merging ipsec-next/master (6ad2dd6c14d3 ipv6: fix clang Wformat warning) +$ git merge ipsec-next/master +Auto-merging net/ipv6/esp6_offload.c +Auto-merging net/ipv6/esp6.c +Auto-merging net/ipv6/ah6.c +Auto-merging net/ipv4/esp4.c +Merge made by the 'recursive' strategy. + net/ipv4/esp4.c | 2 +- + net/ipv6/ah6.c | 2 +- + net/ipv6/esp6.c | 2 +- + net/ipv6/esp6_offload.c | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) +Merging mlx5-next/mlx5-next (e71b75f73763 net/mlx5: Implement sriov_get_vf_total_msix/count() callbacks) +$ git merge mlx5-next/mlx5-next +Auto-merging include/linux/pci.h +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging include/linux/mlx5/eswitch.h +Auto-merging include/linux/mlx5/driver.h +Auto-merging drivers/pci/pci.h +Auto-merging drivers/pci/pci-sysfs.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eq.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +Auto-merging drivers/infiniband/hw/mlx5/main.c +Auto-merging drivers/infiniband/hw/mlx5/ib_rep.c +Auto-merging drivers/infiniband/hw/mlx5/fs.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-pci | 29 ++++++ + drivers/infiniband/hw/mlx5/fs.c | 2 +- + drivers/infiniband/hw/mlx5/ib_rep.c | 5 +- + drivers/infiniband/hw/mlx5/main.c | 3 +- + .../net/ethernet/mellanox/mlx5/core/en/health.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 27 +++--- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 34 ++++--- + drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/lib/eq.h | 15 ++- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 6 ++ + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 12 +++ + drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c | 73 +++++++++++++++ + drivers/net/ethernet/mellanox/mlx5/core/sriov.c | 48 +++++++++- + drivers/net/ethernet/mellanox/mlx5/core/wq.c | 5 - + drivers/pci/iov.c | 102 +++++++++++++++++++-- + drivers/pci/pci-sysfs.c | 3 +- + drivers/pci/pci.h | 3 +- + include/linux/mlx5/driver.h | 6 +- + include/linux/mlx5/eswitch.h | 5 +- + include/linux/mlx5/mlx5_ifc.h | 32 +++++-- + include/linux/pci.h | 8 ++ + 22 files changed, 363 insertions(+), 62 deletions(-) +Merging netfilter-next/master (56f15e2cb1f7 ethtool: document PHY tunable callbacks) +$ git merge netfilter-next/master +Already up to date. +Merging ipvs-next/master (db3685b4046f net: remove obsolete members from struct net) +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (13ce240a932f rtw88: 8822c: support FW crash dump when FW crash) +$ git merge wireless-drivers-next/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath10k/snoc.c | 29 +- + drivers/net/wireless/ath/ath11k/ahb.c | 2 +- + drivers/net/wireless/ath/ath11k/ce.c | 58 +- + drivers/net/wireless/ath/ath11k/ce.h | 1 + + drivers/net/wireless/ath/ath11k/core.c | 45 +- + drivers/net/wireless/ath/ath11k/core.h | 6 + + .../net/wireless/ath/ath11k/debugfs_htt_stats.c | 2 +- + drivers/net/wireless/ath/ath11k/dp_rx.c | 476 ++++++------ + drivers/net/wireless/ath/ath11k/dp_tx.c | 6 +- + drivers/net/wireless/ath/ath11k/hal.c | 96 ++- + drivers/net/wireless/ath/ath11k/hal.h | 33 +- + drivers/net/wireless/ath/ath11k/hal_desc.h | 13 +- + drivers/net/wireless/ath/ath11k/hal_tx.c | 3 + + drivers/net/wireless/ath/ath11k/hal_tx.h | 1 + + drivers/net/wireless/ath/ath11k/hif.h | 10 + + drivers/net/wireless/ath/ath11k/hw.c | 796 +++++++++++++++++++++ + drivers/net/wireless/ath/ath11k/hw.h | 53 ++ + drivers/net/wireless/ath/ath11k/mac.c | 88 ++- + drivers/net/wireless/ath/ath11k/mac.h | 2 + + drivers/net/wireless/ath/ath11k/mhi.c | 116 ++- + drivers/net/wireless/ath/ath11k/pci.c | 194 +++-- + drivers/net/wireless/ath/ath11k/pci.h | 21 +- + drivers/net/wireless/ath/ath11k/qmi.c | 118 +-- + drivers/net/wireless/ath/ath11k/qmi.h | 9 +- + drivers/net/wireless/ath/ath11k/rx_desc.h | 212 +++++- + drivers/net/wireless/ath/ath11k/wmi.c | 64 +- + drivers/net/wireless/microchip/wilc1000/netdev.c | 14 +- + drivers/net/wireless/microchip/wilc1000/sdio.c | 2 +- + drivers/net/wireless/microchip/wilc1000/wlan.c | 56 +- + drivers/net/wireless/microchip/wilc1000/wlan.h | 6 + + drivers/net/wireless/realtek/rtw88/coex.c | 5 + + drivers/net/wireless/realtek/rtw88/coex.h | 1 + + drivers/net/wireless/realtek/rtw88/debug.c | 41 ++ + drivers/net/wireless/realtek/rtw88/mac.c | 19 + + drivers/net/wireless/realtek/rtw88/mac.h | 4 + + drivers/net/wireless/realtek/rtw88/main.c | 104 ++- + drivers/net/wireless/realtek/rtw88/main.h | 11 + + drivers/net/wireless/realtek/rtw88/reg.h | 1 + + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 10 + + 39 files changed, 2217 insertions(+), 511 deletions(-) +Merging bluetooth/master (4aa0df73e9c4 Bluetooth: virtio_bt: Use virtio_cread16 instead of virtio_cread) +$ git merge bluetooth/master +Removing Documentation/devicetree/bindings/net/broadcom-bluetooth.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/broadcom-bluetooth.txt | 56 --- + .../bindings/net/broadcom-bluetooth.yaml | 118 ++++++ + .../devicetree/bindings/serial/ingenic,uart.yaml | 2 +- + drivers/bluetooth/Kconfig | 10 + + drivers/bluetooth/Makefile | 2 + + drivers/bluetooth/btintel.c | 232 ++++++++++-- + drivers/bluetooth/btintel.h | 19 +- + drivers/bluetooth/btusb.c | 408 ++++++++------------- + drivers/bluetooth/hci_bcm.c | 19 + + drivers/bluetooth/hci_intel.c | 7 +- + drivers/bluetooth/hci_qca.c | 17 +- + drivers/bluetooth/virtio_bt.c | 401 ++++++++++++++++++++ + include/net/bluetooth/hci.h | 1 + + include/net/bluetooth/hci_core.h | 17 +- + include/net/bluetooth/l2cap.h | 1 + + include/net/bluetooth/mgmt.h | 1 + + include/uapi/linux/virtio_bt.h | 31 ++ + include/uapi/linux/virtio_ids.h | 1 + + net/bluetooth/6lowpan.c | 5 +- + net/bluetooth/Kconfig | 7 + + net/bluetooth/Makefile | 1 + + net/bluetooth/aosp.c | 35 ++ + net/bluetooth/aosp.h | 16 + + net/bluetooth/ecdh_helper.h | 2 +- + net/bluetooth/hci_conn.c | 14 +- + net/bluetooth/hci_core.c | 5 + + net/bluetooth/hci_debugfs.c | 8 +- + net/bluetooth/hci_event.c | 50 ++- + net/bluetooth/hci_request.c | 67 ++-- + net/bluetooth/l2cap_core.c | 43 ++- + net/bluetooth/l2cap_sock.c | 8 + + net/bluetooth/mgmt.c | 19 +- + net/bluetooth/msft.c | 8 + + net/bluetooth/msft.h | 6 + + net/bluetooth/sco.c | 4 +- + net/bluetooth/smp.c | 113 +++--- + 36 files changed, 1289 insertions(+), 465 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/net/broadcom-bluetooth.txt + create mode 100644 Documentation/devicetree/bindings/net/broadcom-bluetooth.yaml + create mode 100644 drivers/bluetooth/virtio_bt.c + create mode 100644 include/uapi/linux/virtio_bt.h + create mode 100644 net/bluetooth/aosp.c + create mode 100644 net/bluetooth/aosp.h +$ git reset --hard HEAD^ +HEAD is now at 14090121cbbd Merge remote-tracking branch 'wireless-drivers-next/master' +Merging next-20210407 version of bluetooth +$ git merge -m next-20210407/bluetooth 8ce85ada0a05e21a5386ba5c417c52ab00fcd0d1 +Removing Documentation/devicetree/bindings/net/broadcom-bluetooth.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/broadcom-bluetooth.txt | 56 --- + .../bindings/net/broadcom-bluetooth.yaml | 118 ++++++ + .../devicetree/bindings/serial/ingenic,uart.yaml | 2 +- + drivers/bluetooth/btintel.c | 232 ++++++++++-- + drivers/bluetooth/btintel.h | 19 +- + drivers/bluetooth/btusb.c | 408 ++++++++------------- + drivers/bluetooth/hci_bcm.c | 19 + + drivers/bluetooth/hci_intel.c | 7 +- + drivers/bluetooth/hci_qca.c | 17 +- + include/net/bluetooth/hci.h | 1 + + include/net/bluetooth/hci_core.h | 1 + + include/net/bluetooth/l2cap.h | 1 + + include/net/bluetooth/mgmt.h | 1 + + net/bluetooth/6lowpan.c | 5 +- + net/bluetooth/ecdh_helper.h | 2 +- + net/bluetooth/hci_conn.c | 14 +- + net/bluetooth/hci_debugfs.c | 8 +- + net/bluetooth/hci_event.c | 50 ++- + net/bluetooth/hci_request.c | 67 ++-- + net/bluetooth/l2cap_core.c | 43 ++- + net/bluetooth/l2cap_sock.c | 8 + + net/bluetooth/mgmt.c | 14 +- + net/bluetooth/sco.c | 4 +- + net/bluetooth/smp.c | 113 +++--- + 24 files changed, 748 insertions(+), 462 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/net/broadcom-bluetooth.txt + create mode 100644 Documentation/devicetree/bindings/net/broadcom-bluetooth.yaml +Merging mac80211-next/master (4b837ad53be2 Merge branch 'netfilter-flowtable') +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (7d6eec37a105 gfs2: Allocate bufdata object before taking log lock) +$ git merge gfs2/for-next +Auto-merging fs/gfs2/glops.c +Merge made by the 'recursive' strategy. + fs/gfs2/bmap.c | 148 +++++++++++++++++++++++++-------------------------- + fs/gfs2/bmap.h | 13 +++-- + fs/gfs2/dir.c | 52 +++++++++--------- + fs/gfs2/file.c | 5 +- + fs/gfs2/glock.c | 2 +- + fs/gfs2/glops.c | 2 +- + fs/gfs2/incore.h | 3 +- + fs/gfs2/log.c | 6 ++- + fs/gfs2/meta_io.c | 19 ++++--- + fs/gfs2/meta_io.h | 6 +-- + fs/gfs2/ops_fstype.c | 1 - + fs/gfs2/quota.c | 4 +- + fs/gfs2/recovery.c | 4 +- + fs/gfs2/rgrp.c | 2 +- + fs/gfs2/trans.c | 46 ++++++++-------- + 15 files changed, 164 insertions(+), 149 deletions(-) +Merging mtd/mtd/next (28f0be44b263 include: linux: mtd: Remove duplicate include of nand.h) +$ git merge mtd/mtd/next +Merge made by the 'recursive' strategy. + .../mtd/partitions/linksys,ns-partitions.yaml | 74 ++++++++++++++++ + .../bindings/mtd/partitions/nvmem-cells.yaml | 99 ++++++++++++++++++++++ + Documentation/devicetree/bindings/nvmem/nvmem.yaml | 3 - + drivers/mtd/chips/cfi_cmdset_0001.c | 1 + + drivers/mtd/chips/cfi_cmdset_0002.c | 2 + + drivers/mtd/chips/cfi_cmdset_0020.c | 2 + + drivers/mtd/ftl.c | 14 +-- + drivers/mtd/inftlcore.c | 13 +-- + drivers/mtd/maps/physmap-bt1-rom.c | 2 +- + drivers/mtd/maps/physmap-core.c | 4 +- + drivers/mtd/mtdblock.c | 14 +-- + drivers/mtd/mtdblock_ro.c | 13 +-- + drivers/mtd/mtdchar.c | 40 ++++----- + drivers/mtd/mtdcore.c | 18 +++- + drivers/mtd/mtdpart.c | 2 +- + drivers/mtd/mtdswap.c | 14 +-- + drivers/mtd/nand/onenand/onenand_samsung.c | 1 + + drivers/mtd/nand/raw/fsmc_nand.c | 1 + + drivers/mtd/nand/raw/stm32_fmc2_nand.c | 2 + + drivers/mtd/nftlcore.c | 13 +-- + drivers/mtd/parsers/Kconfig | 24 +++++- + drivers/mtd/parsers/Makefile | 3 + + drivers/mtd/parsers/ofpart_bcm4908.c | 64 ++++++++++++++ + drivers/mtd/parsers/ofpart_bcm4908.h | 15 ++++ + drivers/mtd/parsers/{ofpart.c => ofpart_core.c} | 38 ++++++++- + drivers/mtd/parsers/ofpart_linksys_ns.c | 50 +++++++++++ + drivers/mtd/parsers/ofpart_linksys_ns.h | 18 ++++ + drivers/mtd/parsers/qcomsmempart.c | 9 +- + drivers/mtd/rfd_ftl.c | 13 +-- + include/linux/mtd/blktrans.h | 11 +++ + include/linux/mtd/mtd.h | 4 + + include/linux/mtd/rawnand.h | 1 - + include/uapi/mtd/mtd-abi.h | 2 + + 33 files changed, 462 insertions(+), 122 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/partitions/linksys,ns-partitions.yaml + create mode 100644 Documentation/devicetree/bindings/mtd/partitions/nvmem-cells.yaml + create mode 100644 drivers/mtd/parsers/ofpart_bcm4908.c + create mode 100644 drivers/mtd/parsers/ofpart_bcm4908.h + rename drivers/mtd/parsers/{ofpart.c => ofpart_core.c} (84%) + create mode 100644 drivers/mtd/parsers/ofpart_linksys_ns.c + create mode 100644 drivers/mtd/parsers/ofpart_linksys_ns.h +Merging nand/nand/next (32cbc7cb70b0 mtd: rawnand: qcom: Use dma_mapping_error() for error check) +$ git merge nand/nand/next +Auto-merging include/linux/mtd/rawnand.h +Auto-merging drivers/mtd/nand/raw/fsmc_nand.c +Auto-merging drivers/mtd/mtdcore.c +Removing Documentation/devicetree/bindings/mtd/qcom_nandc.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/nand-controller.yaml | 7 + + .../devicetree/bindings/mtd/qcom,nandc.yaml | 196 +++++++++++++++ + .../devicetree/bindings/mtd/qcom_nandc.txt | 142 ----------- + drivers/mtd/mtdcore.c | 3 + + drivers/mtd/nand/ecc-sw-bch.c | 10 +- + drivers/mtd/nand/ecc-sw-hamming.c | 10 +- + drivers/mtd/nand/raw/atmel/nand-controller.c | 6 +- + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 69 +++++- + drivers/mtd/nand/raw/fsmc_nand.c | 2 + + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 2 +- + drivers/mtd/nand/raw/mxc_nand.c | 2 +- + drivers/mtd/nand/raw/nand_base.c | 145 +++++++++-- + drivers/mtd/nand/raw/nand_bbt.c | 5 + + drivers/mtd/nand/raw/omap2.c | 14 +- + drivers/mtd/nand/raw/qcom_nandc.c | 265 +++++++++++++-------- + drivers/mtd/nand/raw/r852.c | 5 +- + drivers/mtd/nand/raw/rockchip-nand-controller.c | 2 +- + drivers/mtd/nand/spi/core.c | 2 + + drivers/mtd/nand/spi/gigadevice.c | 69 +++++- + include/linux/mtd/nand-ecc-sw-bch.h | 2 - + include/linux/mtd/nand-ecc-sw-hamming.h | 2 - + include/linux/mtd/nand.h | 22 ++ + include/linux/mtd/rawnand.h | 14 ++ + 23 files changed, 683 insertions(+), 313 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/qcom,nandc.yaml + delete mode 100644 Documentation/devicetree/bindings/mtd/qcom_nandc.txt +Merging spi-nor/spi-nor/next (b206b82d1726 mtd: spi-nor: winbond: add OTP support to w25q32fw/jw) +$ git merge spi-nor/spi-nor/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 + + drivers/mtd/spi-nor/Makefile | 2 +- + drivers/mtd/spi-nor/controllers/intel-spi.c | 1 - + drivers/mtd/spi-nor/controllers/intel-spi.h | 2 +- + drivers/mtd/spi-nor/core.c | 445 ++-------------------- + drivers/mtd/spi-nor/core.h | 69 +++- + drivers/mtd/spi-nor/issi.c | 3 +- + drivers/mtd/spi-nor/macronix.c | 3 +- + drivers/mtd/spi-nor/otp.c | 376 ++++++++++++++++++ + drivers/mtd/spi-nor/sfdp.c | 72 ++-- + drivers/mtd/spi-nor/sfdp.h | 3 +- + drivers/mtd/spi-nor/spansion.c | 12 +- + drivers/mtd/spi-nor/swp.c | 427 +++++++++++++++++++++ + drivers/mtd/spi-nor/winbond.c | 22 +- + include/linux/mfd/lpc_ich.h | 2 +- + include/linux/mtd/spi-nor.h | 8 + + include/linux/platform_data/{ => x86}/intel-spi.h | 0 + 17 files changed, 958 insertions(+), 491 deletions(-) + create mode 100644 drivers/mtd/spi-nor/otp.c + create mode 100644 drivers/mtd/spi-nor/swp.c + rename include/linux/platform_data/{ => x86}/intel-spi.h (100%) +Merging crypto/master (059c5342812c crypto: hisilicon/sec - Fixes AES algorithm mode parameter problem) +$ git merge crypto/master +Auto-merging net/bluetooth/smp.c +Auto-merging drivers/crypto/nx/nx.c +Auto-merging crypto/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/rng/brcm,bcm2835.yaml | 21 + + arch/arm/crypto/aes-cipher-core.S | 42 +- + arch/arm/crypto/blake2b-neon-glue.c | 4 +- + arch/arm/crypto/blake2s-core.S | 21 + + arch/arm/crypto/chacha-scalar-core.S | 43 +- + arch/arm/crypto/poly1305-glue.c | 2 +- + arch/arm64/crypto/poly1305-glue.c | 2 +- + arch/mips/crypto/poly1305-glue.c | 2 +- + arch/powerpc/crypto/sha1-spe-glue.c | 2 +- + arch/x86/crypto/poly1305_glue.c | 6 +- + crypto/Kconfig | 10 + + crypto/Makefile | 6 + + crypto/aegis.h | 19 + + crypto/aegis128-core.c | 15 - + crypto/aegis128-neon.c | 10 +- + crypto/api.c | 2 +- + crypto/asymmetric_keys/public_key.c | 4 +- + crypto/asymmetric_keys/x509_cert_parser.c | 49 +- + crypto/asymmetric_keys/x509_public_key.c | 4 +- + crypto/ecc.c | 291 +++++-- + crypto/ecc.h | 53 +- + crypto/ecc_curve_defs.h | 49 ++ + crypto/ecdh.c | 72 +- + crypto/ecdh_helper.c | 4 +- + crypto/ecdsa.c | 376 +++++++++ + crypto/ecdsasignature.asn1 | 4 + + crypto/fcrypt.c | 5 +- + crypto/jitterentropy.c | 8 +- + crypto/keywrap.c | 4 +- + crypto/rng.c | 10 +- + crypto/serpent_generic.c | 39 +- + crypto/testmgr.c | 42 +- + crypto/testmgr.h | 458 ++++++++++- + drivers/char/hw_random/ba431-rng.c | 16 +- + drivers/char/hw_random/bcm2835-rng.c | 27 +- + drivers/char/hw_random/cctrng.c | 20 +- + drivers/char/hw_random/core.c | 2 +- + drivers/char/hw_random/intel-rng.c | 2 +- + drivers/char/hw_random/omap-rng.c | 14 +- + drivers/char/hw_random/pic32-rng.c | 3 +- + drivers/char/hw_random/xiphera-trng.c | 4 +- + drivers/char/random.c | 21 +- + drivers/crypto/allwinner/sun4i-ss/sun4i-ss-core.c | 21 +- + .../crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c | 9 +- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c | 3 +- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-prng.c | 1 + + .../crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c | 9 +- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c | 5 +- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.c | 4 +- + drivers/crypto/amcc/crypto4xx_alg.c | 12 +- + drivers/crypto/amcc/crypto4xx_core.c | 18 +- + drivers/crypto/amcc/crypto4xx_core.h | 4 +- + drivers/crypto/amcc/crypto4xx_reg_def.h | 8 +- + drivers/crypto/amcc/crypto4xx_sa.h | 18 +- + drivers/crypto/amcc/crypto4xx_trng.h | 2 +- + drivers/crypto/amlogic/amlogic-gxl-cipher.c | 6 +- + drivers/crypto/amlogic/amlogic-gxl-core.c | 3 - + drivers/crypto/atmel-ecc.c | 30 +- + drivers/crypto/bcm/cipher.c | 7 +- + drivers/crypto/bcm/spu.c | 16 +- + drivers/crypto/bcm/spu2.c | 43 +- + drivers/crypto/bcm/util.c | 4 +- + drivers/crypto/caam/caamalg_qi2.c | 3 + + drivers/crypto/caam/caampkc.c | 3 +- + drivers/crypto/cavium/cpt/cptpf_main.c | 1 - + drivers/crypto/cavium/nitrox/nitrox_isr.c | 4 +- + drivers/crypto/cavium/nitrox/nitrox_reqmgr.c | 9 +- + drivers/crypto/ccp/sev-dev.c | 6 + + drivers/crypto/ccp/tee-dev.c | 57 +- + drivers/crypto/ccp/tee-dev.h | 20 +- + drivers/crypto/chelsio/chcr_algo.c | 8 +- + drivers/crypto/chelsio/chcr_core.c | 2 +- + drivers/crypto/hisilicon/Kconfig | 2 + + drivers/crypto/hisilicon/hpre/hpre.h | 18 +- + drivers/crypto/hisilicon/hpre/hpre_crypto.c | 910 ++++++++++++++++++++- + drivers/crypto/hisilicon/hpre/hpre_main.c | 126 +-- + drivers/crypto/hisilicon/qm.c | 338 ++++++-- + drivers/crypto/hisilicon/qm.h | 21 +- + drivers/crypto/hisilicon/sec/sec_algs.c | 2 +- + drivers/crypto/hisilicon/sec/sec_drv.c | 7 +- + drivers/crypto/hisilicon/sec/sec_drv.h | 2 +- + drivers/crypto/hisilicon/sec2/sec.h | 10 +- + drivers/crypto/hisilicon/sec2/sec_crypto.c | 124 +-- + drivers/crypto/hisilicon/sec2/sec_crypto.h | 6 +- + drivers/crypto/hisilicon/sec2/sec_main.c | 198 ++--- + drivers/crypto/hisilicon/zip/zip.h | 50 +- + drivers/crypto/hisilicon/zip/zip_crypto.c | 710 +++++++++------- + drivers/crypto/hisilicon/zip/zip_main.c | 65 +- + drivers/crypto/inside-secure/safexcel.c | 2 +- + drivers/crypto/keembay/keembay-ocs-aes-core.c | 4 +- + drivers/crypto/keembay/keembay-ocs-hcu-core.c | 4 +- + drivers/crypto/keembay/ocs-hcu.c | 8 +- + drivers/crypto/nx/nx-aes-cbc.c | 2 +- + drivers/crypto/nx/nx-aes-ccm.c | 2 +- + drivers/crypto/nx/nx-aes-ctr.c | 2 +- + drivers/crypto/nx/nx-aes-ecb.c | 2 +- + drivers/crypto/nx/nx-aes-gcm.c | 2 +- + drivers/crypto/nx/nx-aes-xcbc.c | 2 +- + drivers/crypto/nx/nx-common-powernv.c | 4 +- + drivers/crypto/nx/nx-sha256.c | 2 +- + drivers/crypto/nx/nx-sha512.c | 2 +- + drivers/crypto/nx/nx.c | 5 +- + drivers/crypto/nx/nx_debugfs.c | 2 +- + drivers/crypto/qat/qat_c3xxxvf/adf_drv.c | 4 +- + drivers/crypto/qat/qat_c62xvf/adf_drv.c | 4 +- + drivers/crypto/qat/qat_common/adf_isr.c | 29 +- + drivers/crypto/qat/qat_common/adf_pf2vf_msg.c | 2 +- + drivers/crypto/qat/qat_common/adf_vf2pf_msg.c | 4 +- + drivers/crypto/qat/qat_common/adf_vf_isr.c | 17 +- + drivers/crypto/qat/qat_common/qat_algs.c | 32 +- + drivers/crypto/qat/qat_dh895xccvf/adf_drv.c | 4 +- + drivers/crypto/qce/cipher.h | 1 - + drivers/crypto/qce/common.c | 25 +- + drivers/crypto/qce/common.h | 3 +- + drivers/crypto/qce/sha.c | 143 ++-- + drivers/crypto/qce/skcipher.c | 69 +- + drivers/crypto/s5p-sss.c | 2 +- + drivers/crypto/ux500/cryp/cryp.c | 5 +- + drivers/crypto/ux500/cryp/cryp.h | 2 +- + drivers/crypto/ux500/cryp/cryp_core.c | 9 +- + drivers/crypto/ux500/cryp/cryp_irq.c | 2 +- + drivers/crypto/ux500/cryp/cryp_irq.h | 4 +- + drivers/crypto/ux500/cryp/cryp_irqp.h | 4 +- + drivers/crypto/ux500/cryp/cryp_p.h | 14 +- + drivers/crypto/ux500/hash/hash_core.c | 17 +- + drivers/crypto/vmx/aes.c | 2 +- + drivers/crypto/vmx/aes_cbc.c | 2 +- + drivers/crypto/vmx/aes_ctr.c | 2 +- + drivers/crypto/vmx/aes_xts.c | 2 +- + drivers/crypto/vmx/ghash.c | 2 +- + drivers/crypto/vmx/vmx.c | 2 +- + include/crypto/acompress.h | 2 + + include/crypto/aead.h | 2 + + include/crypto/akcipher.h | 2 + + include/crypto/chacha.h | 9 +- + include/crypto/ecc_curve.h | 60 ++ + include/crypto/ecdh.h | 3 +- + include/crypto/hash.h | 4 + + include/crypto/internal/poly1305.h | 3 +- + include/crypto/kpp.h | 2 + + include/crypto/poly1305.h | 6 +- + include/crypto/rng.h | 2 + + include/crypto/skcipher.h | 2 + + include/keys/asymmetric-type.h | 6 + + include/linux/oid_registry.h | 10 +- + include/trace/events/random.h | 83 -- + include/uapi/misc/uacce/hisi_qm.h | 1 + + lib/crypto/poly1305-donna32.c | 3 +- + lib/crypto/poly1305-donna64.c | 3 +- + lib/crypto/poly1305.c | 3 +- + lib/oid_registry.c | 24 + + net/bluetooth/ecdh_helper.c | 2 - + net/bluetooth/selftest.c | 2 +- + net/bluetooth/smp.c | 6 +- + security/integrity/digsig_asymmetric.c | 30 +- + 155 files changed, 3821 insertions(+), 1615 deletions(-) + create mode 100644 crypto/ecdsa.c + create mode 100644 crypto/ecdsasignature.asn1 + create mode 100644 include/crypto/ecc_curve.h +Merging drm/drm-next (41d1d0c51f5f Merge tag 'drm-intel-gt-next-2021-04-06' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) +$ git merge drm/drm-next +Auto-merging scripts/checkpatch.pl +Auto-merging lib/vsprintf.c +Auto-merging lib/test_printf.c +Auto-merging kernel/irq/manage.c +Auto-merging include/drm/ttm/ttm_bo_api.h +Auto-merging drivers/media/v4l2-core/v4l2-ioctl.c +Auto-merging drivers/gpu/drm/tegra/dc.c +Auto-merging drivers/gpu/drm/panfrost/panfrost_devfreq.h +Auto-merging drivers/gpu/drm/panfrost/panfrost_devfreq.c +Auto-merging drivers/gpu/drm/omapdrm/dss/dsi.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/omapdrm/dss/dsi.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_ttm.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_bo.c +Auto-merging drivers/gpu/drm/msm/msm_atomic.c +Auto-merging drivers/gpu/drm/lima/lima_devfreq.h +Auto-merging drivers/gpu/drm/lima/lima_devfreq.c +Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.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/gt/intel_ggtt_fencing.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_internal.c +Removing drivers/gpu/drm/i915/gem/i915_gem_fence.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp_link_training.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Removing drivers/gpu/drm/gma500/blitter.h +Removing drivers/gpu/drm/gma500/blitter.c +Removing drivers/gpu/drm/gma500/accel_2d.c +Auto-merging drivers/gpu/drm/exynos/exynos5433_drm_decon.c +Removing drivers/gpu/drm/ast/ast_cursor.c +Removing drivers/gpu/drm/arc/arcpgu_sim.c +Removing drivers/gpu/drm/arc/arcpgu_regs.h +Removing drivers/gpu/drm/arc/arcpgu_hdmi.c +Removing drivers/gpu/drm/arc/arcpgu_drv.c +Removing drivers/gpu/drm/arc/arcpgu_crtc.c +Removing drivers/gpu/drm/arc/arcpgu.h +Removing drivers/gpu/drm/arc/Makefile +Removing drivers/gpu/drm/arc/Kconfig +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +Auto-merging drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c +Auto-merging drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c +Auto-merging drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c +Auto-merging drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_priv.h +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt +Removing Documentation/devicetree/bindings/display/renesas,du.txt +Removing Documentation/devicetree/bindings/display/mxsfb.txt +Removing Documentation/devicetree/bindings/display/imx/hdmi.txt +Removing Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt +Removing Documentation/devicetree/bindings/display/bridge/dw_hdmi.txt +Auto-merging Documentation/core-api/printk-formats.rst +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c' using previous resolution. +Resolved 'drivers/gpu/drm/omapdrm/dss/dsi.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master db3f59622d0f] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/core-api/printk-formats.rst | 18 + + .../display/allwinner,sun8i-a83t-dw-hdmi.yaml | 4 +- + .../bindings/display/brcm,bcm2711-hdmi.yaml | 2 +- + .../bindings/display/bridge/analogix,anx7625.yaml | 15 + + .../bindings/display/bridge/chipone,icn6211.yaml | 99 + + .../devicetree/bindings/display/bridge/dw_hdmi.txt | 33 - + .../bindings/display/bridge/lontium,lt8912b.yaml | 102 + + .../bindings/display/bridge/renesas,dw-hdmi.txt | 88 - + .../bindings/display/bridge/renesas,dw-hdmi.yaml | 125 + + .../bindings/display/bridge/synopsys,dw-hdmi.yaml | 55 + + .../devicetree/bindings/display/fsl,lcdif.yaml | 110 + + .../bindings/display/imx/fsl,imx6-hdmi.yaml | 126 + + .../devicetree/bindings/display/imx/hdmi.txt | 65 - + .../bindings/display/mediatek/mediatek,dpi.yaml | 12 +- + .../devicetree/bindings/display/mxsfb.txt | 87 - + .../bindings/display/panel/panel-simple.yaml | 2 + + .../devicetree/bindings/display/renesas,du.txt | 145 - + .../devicetree/bindings/display/renesas,du.yaml | 831 + + .../bindings/display/rockchip/dw_hdmi-rockchip.txt | 74 - + .../display/rockchip/rockchip,dw-hdmi.yaml | 156 + + Documentation/driver-api/dma-buf.rst | 76 + + Documentation/gpu/drm-kms-helpers.rst | 12 + + Documentation/gpu/index.rst | 1 + + Documentation/gpu/rfc/index.rst | 17 + + Documentation/gpu/todo.rst | 76 +- + MAINTAINERS | 30 +- + arch/x86/kernel/early-quirks.c | 1 + + drivers/dma-buf/dma-heap.c | 12 + + drivers/dma-buf/heaps/cma_heap.c | 1 + + drivers/dma-buf/heaps/system_heap.c | 1 + + drivers/gpu/drm/Kconfig | 4 +- + drivers/gpu/drm/Makefile | 7 +- + drivers/gpu/drm/amd/amdgpu/Kconfig | 9 - + drivers/gpu/drm/amd/amdgpu/Makefile | 14 +- + drivers/gpu/drm/amd/amdgpu/aldebaran_reg_init.c | 54 + + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 58 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 + + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_aldebaran.c | 47 + + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 16 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.h | 30 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 53 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 43 - + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 73 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 184 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 269 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 72 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 128 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 53 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | 3 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 150 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 31 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 23 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 54 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 37 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 133 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 95 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rap.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 191 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 43 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h | 105 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 486 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 17 +- + drivers/gpu/drm/amd/amdgpu/athub_v2_1.c | 6 +- + drivers/gpu/drm/amd/amdgpu/atom.c | 4 +- + drivers/gpu/drm/amd/amdgpu/atom.h | 2 - + drivers/gpu/drm/amd/amdgpu/cik.c | 77 + + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 2 + + .../gpu/drm/amd/amdgpu/dimgrey_cavefish_reg_init.c | 0 + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 161 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 1286 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.h | 40 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 75 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c | 54 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 152 +- + drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 3 + + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 65 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.h | 1 + + drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 1329 + + drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.h | 28 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 48 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 221 +- + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 1 + + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 378 + + drivers/gpu/drm/amd/amdgpu/psp_v13_0.h | 30 + + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 181 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4.c | 232 + + drivers/gpu/drm/amd/amdgpu/sdma_v4_4.h | 28 + + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 4 +- + drivers/gpu/drm/amd/amdgpu/si.c | 111 + + drivers/gpu/drm/amd/amdgpu/smuio_v13_0.c | 121 + + drivers/gpu/drm/amd/amdgpu/smuio_v13_0.h | 30 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 360 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 12 + + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 48 + + drivers/gpu/drm/amd/amdgpu/ta_secureDisplay_if.h | 1 + + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 99 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.h | 1 + + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 24 +- + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 32 +- + drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 49 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 190 + + drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 5 +- + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 492 + + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx8.asm | 1 + + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm | 204 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 17 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 25 + + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 57 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 5 - + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 6 + + drivers/gpu/drm/amd/amdkfd/kfd_iommu.h | 9 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 8 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 8 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 8 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 8 + + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 9 + + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 66 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 5 +- + drivers/gpu/drm/amd/display/Kconfig | 14 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 752 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 66 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 293 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h | 37 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 474 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.h | 5 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 44 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 113 +- + .../amd/display/amdgpu_dm/amdgpu_dm_irq_params.h | 9 + + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 17 +- + drivers/gpu/drm/amd/display/dc/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/basics/dc_common.c | 20 +- + drivers/gpu/drm/amd/display/dc/basics/dc_common.h | 4 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 5 +- + .../drm/amd/display/dc/bios/bios_parser_helper.c | 5 +- + .../drm/amd/display/dc/bios/bios_parser_helper.h | 2 +- + .../gpu/drm/amd/display/dc/bios/command_table.c | 21 + + .../gpu/drm/amd/display/dc/bios/command_table2.c | 93 +- + .../gpu/drm/amd/display/dc/bios/command_table2.h | 3 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 17 +- + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 2 +- + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 4 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 306 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 36 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 5 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 18 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 43 + + drivers/gpu/drm/amd/display/dc/core/dc_stat.c | 64 + + drivers/gpu/drm/amd/display/dc/dc.h | 27 +- + drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 3 +- + drivers/gpu/drm/amd/display/dc/dc_ddc_types.h | 10 - + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 34 + + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 8 + + drivers/gpu/drm/amd/display/dc/dc_dsc.h | 11 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 2 + + drivers/gpu/drm/amd/display/dc/dc_link.h | 19 +- + drivers/gpu/drm/amd/display/dc/dc_stat.h | 42 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 21 +- + drivers/gpu/drm/amd/display/dc/dce/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 40 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.h | 4 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 52 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 84 + + drivers/gpu/drm/amd/display/dc/dce/dce_opp.c | 4 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 10 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_outbox.c | 60 + + drivers/gpu/drm/amd/display/dc/dce/dmub_outbox.h | 33 + + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 19 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 91 +- + .../drm/amd/display/dc/dce110/dce110_resource.c | 2 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 300 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 8 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 1 - + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 2 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 6 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 1 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 15 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 124 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 16 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 1 - + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 16 +- + .../display/dc/dcn30/dcn30_dio_stream_encoder.c | 1 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c | 4 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_dpp_cm.c | 4 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_dwb_cm.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 100 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h | 4 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 1 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 26 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 25 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.h | 1 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_init.c | 1 - + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 7 +- + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 7 +- + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 2 + + .../amd/display/dc/dml/dcn20/display_mode_vba_20.c | 1 + + .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 1 + + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 2 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 3 - + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 105 +- + .../amd/display/dc/gpio/dce110/hw_factory_dce110.c | 4 - + drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c | 9 +- + drivers/gpu/drm/amd/display/dc/inc/clock_source.h | 5 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 15 + + drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h | 3 +- + drivers/gpu/drm/amd/display/dc/inc/hw/aux_engine.h | 4 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h | 21 + + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 1 + + .../drm/amd/display/dc/inc/hw/timing_generator.h | 12 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 7 +- + drivers/gpu/drm/amd/display/dc/inc/resource.h | 5 + + .../amd/display/dc/irq/dcn20/irq_service_dcn20.c | 31 + + .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 34 + + .../amd/display/dc/irq/dcn30/irq_service_dcn30.c | 38 + + .../amd/display/dc/irq/dcn302/irq_service_dcn302.c | 30 + + drivers/gpu/drm/amd/display/dc/irq_types.h | 3 +- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 55 + + drivers/gpu/drm/amd/display/dmub/dmub_srv_stat.h | 41 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 1495 +- + .../drm/amd/display/dmub/inc/dmub_trace_buffer.h | 3 +- + drivers/gpu/drm/amd/display/dmub/src/Makefile | 2 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 57 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 35 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c | 7 + + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 84 +- + .../gpu/drm/amd/display/dmub/src/dmub_srv_stat.c | 105 + + .../drm/amd/display/modules/freesync/freesync.c | 28 +- + .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 3 +- + drivers/gpu/drm/amd/include/aldebaran_ip_offset.h | 1738 + + .../amd/include/asic_reg/dcn/dcn_3_0_0_offset.h | 2 +- + .../drm/amd/include/asic_reg/gc/gc_9_4_2_offset.h | 7683 +++++ + .../drm/amd/include/asic_reg/gc/gc_9_4_2_sh_mask.h | 32949 +++++++++++++++++++ + .../amd/include/asic_reg/mmhub/mmhub_1_7_offset.h | 5125 +++ + .../amd/include/asic_reg/mmhub/mmhub_1_7_sh_mask.h | 32178 ++++++++++++++++++ + .../drm/amd/include/asic_reg/mp/mp_13_0_2_offset.h | 361 + + .../amd/include/asic_reg/mp/mp_13_0_2_sh_mask.h | 531 + + .../amd/include/asic_reg/sdma/sdma_4_4_0_offset.h | 5224 +++ + .../amd/include/asic_reg/sdma/sdma_4_4_0_sh_mask.h | 13922 ++++++++ + .../include/asic_reg/smuio/smuio_13_0_2_offset.h | 516 + + .../include/asic_reg/smuio/smuio_13_0_2_sh_mask.h | 1163 + + .../amd/include/asic_reg/thm/thm_13_0_2_offset.h | 346 + + .../amd/include/asic_reg/thm/thm_13_0_2_sh_mask.h | 1297 + + .../amd/include/asic_reg/umc/umc_6_7_0_offset.h | 2620 ++ + .../amd/include/asic_reg/umc/umc_6_7_0_sh_mask.h | 10796 ++++++ + .../amd/include/asic_reg/vcn/vcn_2_6_0_offset.h | 1462 + + .../amd/include/asic_reg/vcn/vcn_2_6_0_sh_mask.h | 4535 +++ + drivers/gpu/drm/amd/include/atomfirmware.h | 129 +- + .../drm/amd/include/ivsrcid/dcn/irqsrcs_dcn_1_0.h | 2 + + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 127 +- + drivers/gpu/drm/amd/include/soc15_ih_clientid.h | 9 +- + drivers/gpu/drm/amd/include/vi_structs.h | 32 +- + drivers/gpu/drm/amd/pm/Makefile | 1 + + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 228 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 1012 +- + drivers/gpu/drm/amd/pm/inc/aldebaran_ppsmc.h | 126 + + drivers/gpu/drm/amd/pm/inc/amdgpu_pm.h | 2 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 91 +- + drivers/gpu/drm/amd/pm/inc/arcturus_ppsmc.h | 7 + + drivers/gpu/drm/amd/pm/inc/rv_ppsmc.h | 1 + + .../gpu/drm/amd/pm/inc/smu11_driver_if_navi10.h | 98 +- + .../gpu/drm/amd/pm/inc/smu13_driver_if_aldebaran.h | 512 + + drivers/gpu/drm/amd/pm/inc/smu_types.h | 28 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 19 +- + drivers/gpu/drm/amd/pm/inc/smu_v13_0.h | 272 + + drivers/gpu/drm/amd/pm/inc/smu_v13_0_pptable.h | 165 + + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 12 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 46 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 4 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 9 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 4 +- + .../drm/amd/pm/powerplay/hwmgr/vega10_pptable.h | 6 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 2 +- + drivers/gpu/drm/amd/pm/powerplay/kv_dpm.c | 2 +- + drivers/gpu/drm/amd/pm/powerplay/si_dpm.c | 8 +- + drivers/gpu/drm/amd/pm/powerplay/sislands_smc.h | 10 +- + drivers/gpu/drm/amd/pm/swsmu/Makefile | 2 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 468 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 18 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 621 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 44 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 26 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 62 +- + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 30 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile | 30 + + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 1530 + + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.h | 72 + + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 1811 + + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 18 +- + drivers/gpu/drm/arc/Kconfig | 10 - + drivers/gpu/drm/arc/Makefile | 3 - + drivers/gpu/drm/arc/arcpgu.h | 37 - + drivers/gpu/drm/arc/arcpgu_crtc.c | 217 - + drivers/gpu/drm/arc/arcpgu_drv.c | 224 - + drivers/gpu/drm/arc/arcpgu_hdmi.c | 48 - + drivers/gpu/drm/arc/arcpgu_regs.h | 31 - + drivers/gpu/drm/arc/arcpgu_sim.c | 108 - + .../drm/arm/display/komeda/komeda_format_caps.h | 11 - + .../drm/arm/display/komeda/komeda_framebuffer.c | 4 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 3 + + drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 21 +- + drivers/gpu/drm/arm/hdlcd_crtc.c | 30 +- + drivers/gpu/drm/arm/malidp_drv.c | 3 + + drivers/gpu/drm/arm/malidp_mw.c | 7 +- + drivers/gpu/drm/arm/malidp_planes.c | 79 +- + drivers/gpu/drm/armada/armada_overlay.c | 113 +- + drivers/gpu/drm/armada/armada_plane.c | 115 +- + drivers/gpu/drm/armada/armada_plane.h | 2 +- + drivers/gpu/drm/aspeed/aspeed_gfx.h | 8 +- + drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 15 +- + drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 69 +- + drivers/gpu/drm/ast/Makefile | 3 +- + drivers/gpu/drm/ast/ast_cursor.c | 286 - + drivers/gpu/drm/ast/ast_drv.c | 2 + + drivers/gpu/drm/ast/ast_drv.h | 47 +- + drivers/gpu/drm/ast/ast_mode.c | 388 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 107 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 7 - + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 135 +- + drivers/gpu/drm/bridge/Kconfig | 27 + + drivers/gpu/drm/bridge/Makefile | 2 + + drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 27 +- + drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 27 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 1 + + drivers/gpu/drm/bridge/analogix/anx7625.c | 34 + + drivers/gpu/drm/bridge/analogix/anx7625.h | 1 + + .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 2 +- + drivers/gpu/drm/bridge/chipone-icn6211.c | 293 + + drivers/gpu/drm/bridge/lontium-lt8912b.c | 765 + + drivers/gpu/drm/bridge/lontium-lt9611.c | 8 +- + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 2 +- + drivers/gpu/drm/bridge/panel.c | 12 + + drivers/gpu/drm/bridge/tc358767.c | 20 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 18 +- + drivers/gpu/drm/drm_atomic.c | 47 +- + drivers/gpu/drm/drm_atomic_helper.c | 90 +- + drivers/gpu/drm/drm_connector.c | 1 + + drivers/gpu/drm/drm_crtc.c | 7 +- + drivers/gpu/drm/drm_displayid.c | 132 + + drivers/gpu/drm/drm_dp_mst_topology.c | 94 +- + drivers/gpu/drm/drm_drv.c | 2 +- + drivers/gpu/drm/drm_edid.c | 171 +- + drivers/gpu/drm/drm_framebuffer.c | 11 +- + drivers/gpu/drm/drm_gem.c | 2 + + drivers/gpu/drm/drm_gem_atomic_helper.c | 432 + + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 63 - + drivers/gpu/drm/drm_gem_vram_helper.c | 42 +- + drivers/gpu/drm/drm_ioc32.c | 15 +- + drivers/gpu/drm/drm_mipi_dbi.c | 5 +- + drivers/gpu/drm/drm_panel_orientation_quirks.c | 14 + + drivers/gpu/drm/drm_plane.c | 66 +- + drivers/gpu/drm/drm_probe_helper.c | 7 +- + drivers/gpu/drm/drm_property.c | 4 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 50 +- + drivers/gpu/drm/drm_syncobj.c | 12 + + drivers/gpu/drm/drm_sysfs.c | 9 +- + drivers/gpu/drm/drm_vblank.c | 25 +- + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 9 +- + drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 4 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 7 +- + drivers/gpu/drm/exynos/exynos_drm_plane.c | 20 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 24 +- + drivers/gpu/drm/gma500/Kconfig | 11 +- + drivers/gpu/drm/gma500/Makefile | 17 +- + drivers/gpu/drm/gma500/accel_2d.c | 60 - + drivers/gpu/drm/gma500/blitter.c | 43 - + drivers/gpu/drm/gma500/blitter.h | 16 - + drivers/gpu/drm/gma500/cdv_device.c | 2 +- + drivers/gpu/drm/gma500/cdv_device.h | 1 - + drivers/gpu/drm/gma500/cdv_intel_crt.c | 15 +- + drivers/gpu/drm/gma500/cdv_intel_display.c | 23 +- + drivers/gpu/drm/gma500/gtt.c | 11 - + drivers/gpu/drm/gma500/intel_gmbus.c | 4 +- + drivers/gpu/drm/gma500/oaktrail_device.c | 2 +- + drivers/gpu/drm/gma500/psb_device.c | 2 +- + drivers/gpu/drm/gma500/psb_drv.c | 38 +- + drivers/gpu/drm/gma500/psb_drv.h | 6 +- + drivers/gpu/drm/gma500/psb_intel_display.c | 2 +- + drivers/gpu/drm/gma500/psb_intel_reg.h | 32 - + drivers/gpu/drm/gma500/psb_irq.c | 110 - + drivers/gpu/drm/gma500/psb_irq.h | 4 - + drivers/gpu/drm/gud/Kconfig | 14 + + drivers/gpu/drm/gud/Makefile | 4 + + drivers/gpu/drm/gud/gud_connector.c | 729 + + drivers/gpu/drm/gud/gud_drv.c | 661 + + drivers/gpu/drm/gud/gud_internal.h | 154 + + drivers/gpu/drm/gud/gud_pipe.c | 552 + + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 39 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 47 +- + drivers/gpu/drm/i915/Kconfig.profile | 14 + + drivers/gpu/drm/i915/Makefile | 6 +- + drivers/gpu/drm/i915/TODO.txt | 41 + + drivers/gpu/drm/i915/display/i9xx_plane.c | 123 +- + drivers/gpu/drm/i915/display/i9xx_plane.h | 4 + + drivers/gpu/drm/i915/display/icl_dsi.c | 28 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 2 +- + drivers/gpu/drm/i915/display/intel_bios.c | 166 +- + drivers/gpu/drm/i915/display/intel_bios.h | 2 + + drivers/gpu/drm/i915/display/intel_bw.c | 22 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 22 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 23 +- + drivers/gpu/drm/i915/display/intel_crt.c | 6 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 276 +- + drivers/gpu/drm/i915/display/intel_csr.c | 12 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 2658 +- + drivers/gpu/drm/i915/display/intel_ddi.h | 23 +- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 1394 + + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h | 100 + + drivers/gpu/drm/i915/display/intel_display.c | 2908 +- + drivers/gpu/drm/i915/display/intel_display.h | 50 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 162 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 231 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 32 + + drivers/gpu/drm/i915/display/intel_display_types.h | 117 +- + drivers/gpu/drm/i915/display/intel_dp.c | 134 +- + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 31 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 17 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 3 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 509 + + drivers/gpu/drm/i915/display/intel_dpll.h | 18 + + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 95 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 9 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 2 +- + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 2 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 4 +- + drivers/gpu/drm/i915/display/intel_fdi.c | 138 + + drivers/gpu/drm/i915/display/intel_fdi.h | 3 + + drivers/gpu/drm/i915/display/intel_frontbuffer.c | 2 + + drivers/gpu/drm/i915/display/intel_gmbus.c | 2 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 67 +- + drivers/gpu/drm/i915/display/intel_lpe_audio.c | 5 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 6 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 36 +- + drivers/gpu/drm/i915/display/intel_panel.c | 4 +- + drivers/gpu/drm/i915/display/intel_pps.c | 1 + + drivers/gpu/drm/i915/display/intel_psr.c | 611 +- + drivers/gpu/drm/i915/display/intel_psr.h | 10 +- + drivers/gpu/drm/i915/display/intel_quirks.c | 2 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 1718 +- + drivers/gpu/drm/i915/display/intel_sprite.h | 7 - + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 27 +- + drivers/gpu/drm/i915/display/intel_vga.c | 8 +- + drivers/gpu/drm/i915/display/skl_scaler.c | 556 + + drivers/gpu/drm/i915/display/skl_scaler.h | 29 + + drivers/gpu/drm/i915/display/skl_universal_plane.c | 2266 ++ + drivers/gpu/drm/i915/display/skl_universal_plane.h | 37 + + drivers/gpu/drm/i915/display/vlv_dsi.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 15 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 79 +- + drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 4 + + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 67 +- + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 72 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 335 +- + drivers/gpu/drm/i915/gem/i915_gem_fence.c | 95 - + drivers/gpu/drm/i915/gem/i915_gem_internal.c | 6 +- + drivers/gpu/drm/i915/gem/i915_gem_ioctls.h | 2 - + drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 35 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 10 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 122 +- + drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 6 + + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 23 +- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 109 +- + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 116 +- + drivers/gpu/drm/i915/gem/i915_gem_pm.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_region.c | 16 +- + drivers/gpu/drm/i915/gem/i915_gem_region.h | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 41 +- + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 39 +- + drivers/gpu/drm/i915/gem/i915_gem_shrinker.h | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 18 +- + drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 2 - + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 918 +- + .../gpu/drm/i915/gem/selftests/huge_gem_object.c | 4 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 38 +- + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 8 +- + .../drm/i915/gem/selftests/i915_gem_coherency.c | 14 +- + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 10 +- + .../gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 2 +- + .../drm/i915/gem/selftests/i915_gem_execbuffer.c | 2 +- + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 21 +- + .../gpu/drm/i915/gem/selftests/i915_gem_object.c | 2 +- + .../drm/i915/gem/selftests/i915_gem_object_blt.c | 10 +- + drivers/gpu/drm/i915/gem/selftests/i915_gem_phys.c | 10 +- + drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c | 2 +- + drivers/gpu/drm/i915/gt/debugfs_gt.c | 2 +- + drivers/gpu/drm/i915/gt/gen2_engine_cs.c | 2 +- + drivers/gpu/drm/i915/gt/gen6_engine_cs.c | 8 +- + drivers/gpu/drm/i915/gt/gen6_ppgtt.h | 4 +- + drivers/gpu/drm/i915/gt/gen6_renderstate.c | 20 +- + drivers/gpu/drm/i915/gt/gen7_renderstate.c | 20 +- + drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 13 +- + drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 13 +- + drivers/gpu/drm/i915/gt/gen8_renderstate.c | 20 +- + drivers/gpu/drm/i915/gt/gen9_renderstate.c | 20 +- + drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 23 +- + drivers/gpu/drm/i915/gt/intel_context.c | 3 +- + drivers/gpu/drm/i915/gt/intel_context.h | 3 +- + drivers/gpu/drm/i915/gt/intel_context_param.h | 11 +- + drivers/gpu/drm/i915/gt/intel_context_types.h | 7 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 73 +- + drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 27 +- + drivers/gpu/drm/i915/gt/intel_engine_heartbeat.h | 3 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 7 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.h | 3 +- + drivers/gpu/drm/i915/gt/intel_engine_types.h | 3 +- + drivers/gpu/drm/i915/gt/intel_engine_user.c | 3 +- + drivers/gpu/drm/i915/gt/intel_engine_user.h | 3 +- + .../gpu/drm/i915/gt/intel_execlists_submission.c | 146 +- + .../gpu/drm/i915/gt/intel_execlists_submission.h | 2 + + drivers/gpu/drm/i915/gt/intel_ggtt.c | 46 +- + drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 23 +- + drivers/gpu/drm/i915/gt/intel_ggtt_fencing.h | 21 +- + drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 3 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 47 +- + drivers/gpu/drm/i915/gt/intel_gt.h | 3 + + drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.c | 47 +- + drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.h | 5 + + .../gpu/drm/i915/gt/intel_gt_buffer_pool_types.h | 4 +- + drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c | 1 - + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 3 +- + drivers/gpu/drm/i915/gt/intel_gt_irq.h | 3 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 3 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.h | 3 +- + drivers/gpu/drm/i915/gt/intel_gt_pm_irq.c | 3 +- + drivers/gpu/drm/i915/gt/intel_gt_pm_irq.h | 3 +- + drivers/gpu/drm/i915/gt/intel_gt_requests.c | 31 +- + drivers/gpu/drm/i915/gt/intel_gt_requests.h | 3 +- + drivers/gpu/drm/i915/gt/intel_gt_types.h | 11 +- + drivers/gpu/drm/i915/gt/intel_gtt.c | 52 +- + drivers/gpu/drm/i915/gt/intel_gtt.h | 13 + + drivers/gpu/drm/i915/gt/intel_llc.c | 3 +- + drivers/gpu/drm/i915/gt/intel_llc.h | 3 +- + drivers/gpu/drm/i915/gt/intel_llc_types.h | 3 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 55 +- + drivers/gpu/drm/i915/gt/intel_lrc_reg.h | 5 +- + drivers/gpu/drm/i915/gt/intel_mocs.c | 21 +- + drivers/gpu/drm/i915/gt/intel_mocs.h | 22 +- + drivers/gpu/drm/i915/gt/intel_ppgtt.c | 9 +- + drivers/gpu/drm/i915/gt/intel_rc6.c | 8 +- + drivers/gpu/drm/i915/gt/intel_rc6.h | 3 +- + drivers/gpu/drm/i915/gt/intel_rc6_types.h | 3 +- + drivers/gpu/drm/i915/gt/intel_region_lmem.c | 105 +- + drivers/gpu/drm/i915/gt/intel_region_lmem.h | 6 +- + drivers/gpu/drm/i915/gt/intel_renderstate.c | 29 +- + drivers/gpu/drm/i915/gt/intel_renderstate.h | 20 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 33 +- + drivers/gpu/drm/i915/gt/intel_reset.h | 3 +- + drivers/gpu/drm/i915/gt/intel_reset_types.h | 2 +- + drivers/gpu/drm/i915/gt/intel_ring.c | 8 +- + drivers/gpu/drm/i915/gt/intel_ring.h | 4 +- + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 330 +- + drivers/gpu/drm/i915/gt/intel_ring_types.h | 3 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 3 +- + drivers/gpu/drm/i915/gt/intel_rps.h | 3 +- + drivers/gpu/drm/i915/gt/intel_rps_types.h | 3 +- + drivers/gpu/drm/i915/gt/intel_sseu.c | 3 +- + drivers/gpu/drm/i915/gt/intel_sseu.h | 3 +- + drivers/gpu/drm/i915/gt/intel_timeline.c | 429 +- + drivers/gpu/drm/i915/gt/intel_timeline.h | 23 +- + drivers/gpu/drm/i915/gt/intel_timeline_types.h | 20 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 92 +- + drivers/gpu/drm/i915/gt/intel_workarounds.h | 3 +- + drivers/gpu/drm/i915/gt/intel_workarounds_types.h | 3 +- + drivers/gpu/drm/i915/gt/mock_engine.c | 51 +- + drivers/gpu/drm/i915/gt/mock_engine.h | 21 +- + drivers/gpu/drm/i915/gt/selftest_context.c | 7 +- + drivers/gpu/drm/i915/gt/selftest_engine.c | 3 +- + drivers/gpu/drm/i915/gt/selftest_engine.h | 3 +- + drivers/gpu/drm/i915/gt/selftest_engine_cs.c | 12 +- + .../gpu/drm/i915/gt/selftest_engine_heartbeat.c | 17 +- + drivers/gpu/drm/i915/gt/selftest_engine_pm.c | 11 +- + drivers/gpu/drm/i915/gt/selftest_execlists.c | 77 +- + drivers/gpu/drm/i915/gt/selftest_gt_pm.c | 4 +- + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 29 +- + drivers/gpu/drm/i915/gt/selftest_llc.c | 3 +- + drivers/gpu/drm/i915/gt/selftest_llc.h | 3 +- + drivers/gpu/drm/i915/gt/selftest_lrc.c | 19 +- + drivers/gpu/drm/i915/gt/selftest_mocs.c | 40 +- + drivers/gpu/drm/i915/gt/selftest_rc6.c | 3 +- + drivers/gpu/drm/i915/gt/selftest_rc6.h | 3 +- + drivers/gpu/drm/i915/gt/selftest_ring_submission.c | 4 +- + drivers/gpu/drm/i915/gt/selftest_timeline.c | 180 +- + drivers/gpu/drm/i915/gt/selftest_workarounds.c | 101 +- + drivers/gpu/drm/i915/gt/shmem_utils.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 4 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 16 +- + drivers/gpu/drm/i915/gt/uc/intel_huc.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 6 +- + drivers/gpu/drm/i915/gvt/cfg_space.c | 5 +- + drivers/gpu/drm/i915/gvt/display.c | 107 +- + drivers/gpu/drm/i915/gvt/display.h | 14 +- + drivers/gpu/drm/i915/gvt/dmabuf.c | 2 +- + drivers/gpu/drm/i915/gvt/firmware.c | 10 +- + drivers/gpu/drm/i915/gvt/gtt.c | 16 +- + drivers/gpu/drm/i915/gvt/gvt.c | 31 +- + drivers/gpu/drm/i915/gvt/gvt.h | 13 +- + drivers/gpu/drm/i915/gvt/handlers.c | 261 +- + drivers/gpu/drm/i915/gvt/interrupt.c | 37 - + drivers/gpu/drm/i915/gvt/interrupt.h | 7 - + drivers/gpu/drm/i915/gvt/kvmgt.c | 4 +- + drivers/gpu/drm/i915/gvt/vgpu.c | 2 - + drivers/gpu/drm/i915/i915_active.c | 20 +- + drivers/gpu/drm/i915/i915_buddy.c | 3 + + drivers/gpu/drm/i915/i915_buddy.h | 7 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 104 +- + drivers/gpu/drm/i915/i915_debugfs.c | 6 +- + drivers/gpu/drm/i915/i915_drv.c | 92 +- + drivers/gpu/drm/i915/i915_drv.h | 150 +- + drivers/gpu/drm/i915/i915_gem.c | 258 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 7 +- + drivers/gpu/drm/i915/i915_getparam.c | 5 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- + drivers/gpu/drm/i915/i915_irq.c | 106 +- + drivers/gpu/drm/i915/i915_memcpy.c | 2 +- + drivers/gpu/drm/i915/i915_memcpy.h | 2 +- + drivers/gpu/drm/i915/i915_params.c | 5 + + drivers/gpu/drm/i915/i915_params.h | 5 +- + drivers/gpu/drm/i915/i915_pci.c | 20 +- + drivers/gpu/drm/i915/i915_perf.c | 140 +- + drivers/gpu/drm/i915/i915_perf_types.h | 8 + + drivers/gpu/drm/i915/i915_pmu.c | 2 +- + drivers/gpu/drm/i915/i915_priolist_types.h | 11 +- + drivers/gpu/drm/i915/i915_reg.h | 55 +- + drivers/gpu/drm/i915/i915_request.c | 142 +- + drivers/gpu/drm/i915/i915_request.h | 49 +- + drivers/gpu/drm/i915/i915_scheduler.c | 52 +- + drivers/gpu/drm/i915/i915_scheduler.h | 16 +- + drivers/gpu/drm/i915/i915_selftest.h | 2 + + drivers/gpu/drm/i915/i915_suspend.c | 4 +- + drivers/gpu/drm/i915/i915_switcheroo.c | 4 +- + drivers/gpu/drm/i915/i915_vgpu.c | 2 +- + drivers/gpu/drm/i915/i915_vma.c | 30 +- + drivers/gpu/drm/i915/i915_vma.h | 20 +- + drivers/gpu/drm/i915/intel_device_info.c | 13 +- + drivers/gpu/drm/i915/intel_device_info.h | 6 +- + drivers/gpu/drm/i915/intel_dram.c | 6 + + drivers/gpu/drm/i915/intel_memory_region.c | 54 +- + drivers/gpu/drm/i915/intel_memory_region.h | 22 +- + drivers/gpu/drm/i915/intel_pch.c | 11 +- + drivers/gpu/drm/i915/intel_pch.h | 3 + + drivers/gpu/drm/i915/intel_pm.c | 406 +- + drivers/gpu/drm/i915/intel_pm.h | 5 + + drivers/gpu/drm/i915/intel_runtime_pm.c | 2 +- + drivers/gpu/drm/i915/intel_uncore.c | 20 +- + drivers/gpu/drm/i915/selftests/i915_buddy.c | 48 + + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 94 +- + drivers/gpu/drm/i915/selftests/i915_request.c | 211 +- + drivers/gpu/drm/i915/selftests/igt_spinner.c | 136 +- + drivers/gpu/drm/i915/selftests/igt_spinner.h | 5 + + .../gpu/drm/i915/selftests/intel_memory_region.c | 95 +- + drivers/gpu/drm/i915/selftests/mock_gtt.c | 2 +- + drivers/gpu/drm/i915/selftests/mock_region.c | 4 +- + drivers/gpu/drm/imx/dcss/dcss-plane.c | 64 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 92 +- + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 83 +- + drivers/gpu/drm/ingenic/ingenic-ipu.c | 77 +- + drivers/gpu/drm/kmb/kmb_plane.c | 50 +- + drivers/gpu/drm/lima/lima_devfreq.c | 11 +- + drivers/gpu/drm/lima/lima_devfreq.h | 2 + + drivers/gpu/drm/lima/lima_sched.c | 6 +- + drivers/gpu/drm/mcde/mcde_display.c | 10 +- + drivers/gpu/drm/mcde/mcde_dsi.c | 2 +- + drivers/gpu/drm/mediatek/mtk_cec.c | 6 +- + drivers/gpu/drm/mediatek/mtk_dpi.c | 32 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 23 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 2 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 1 + + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 103 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 9 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 175 +- + drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c | 1 + + drivers/gpu/drm/meson/meson_overlay.c | 31 +- + drivers/gpu/drm/meson/meson_plane.c | 51 +- + drivers/gpu/drm/meson/meson_venc.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 25 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 8 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 54 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h | 2 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 18 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 57 +- + drivers/gpu/drm/msm/msm_atomic.c | 4 +- + drivers/gpu/drm/mxsfb/mxsfb_kms.c | 23 +- + drivers/gpu/drm/nouveau/dispnv50/wndw.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 40 +- + drivers/gpu/drm/nouveau/nouveau_bo.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 9 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 3 +- + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 12 +- + drivers/gpu/drm/nouveau/nouveau_ttm.h | 8 +- + drivers/gpu/drm/omapdrm/dss/dispc.c | 5 +- + drivers/gpu/drm/omapdrm/dss/dsi.c | 3 +- + drivers/gpu/drm/omapdrm/dss/omapdss.h | 9 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 9 +- + drivers/gpu/drm/omapdrm/omap_plane.c | 56 +- + drivers/gpu/drm/panel/panel-lvds.c | 2 +- + drivers/gpu/drm/panel/panel-novatek-nt35510.c | 3 +- + drivers/gpu/drm/panel/panel-samsung-s6d16d0.c | 4 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c | 1 - + drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 4 +- + drivers/gpu/drm/panel/panel-simple.c | 87 +- + drivers/gpu/drm/panel/panel-sony-acx424akp.c | 3 +- + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 10 +- + drivers/gpu/drm/panfrost/panfrost_devfreq.h | 2 + + drivers/gpu/drm/panfrost/panfrost_job.c | 11 +- + drivers/gpu/drm/panfrost/panfrost_mmu.c | 39 +- + drivers/gpu/drm/pl111/pl111_display.c | 4 +- + drivers/gpu/drm/qxl/qxl_cmd.c | 3 +- + drivers/gpu/drm/qxl/qxl_display.c | 368 +- + drivers/gpu/drm/qxl/qxl_draw.c | 8 +- + drivers/gpu/drm/qxl/qxl_drv.h | 6 +- + drivers/gpu/drm/qxl/qxl_dumb.c | 2 +- + drivers/gpu/drm/qxl/qxl_gem.c | 2 +- + drivers/gpu/drm/qxl/qxl_image.c | 2 +- + drivers/gpu/drm/qxl/qxl_irq.c | 1 + + drivers/gpu/drm/qxl/qxl_kms.c | 30 +- + drivers/gpu/drm/qxl/qxl_object.c | 57 +- + drivers/gpu/drm/qxl/qxl_object.h | 7 +- + drivers/gpu/drm/qxl/qxl_prime.c | 4 +- + drivers/gpu/drm/qxl/qxl_release.c | 77 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 35 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 10 +- + drivers/gpu/drm/radeon/nislands_smc.h | 10 +- + drivers/gpu/drm/radeon/r100.c | 84 +- + drivers/gpu/drm/radeon/r300.c | 33 +- + drivers/gpu/drm/radeon/r420.c | 28 +- + drivers/gpu/drm/radeon/r600.c | 27 +- + drivers/gpu/drm/radeon/radeon.h | 31 +- + drivers/gpu/drm/radeon/radeon_asic.h | 8 +- + drivers/gpu/drm/radeon/radeon_cs.c | 12 +- + drivers/gpu/drm/radeon/radeon_device.c | 47 +- + drivers/gpu/drm/radeon/radeon_dp_mst.c | 20 +- + drivers/gpu/drm/radeon/radeon_fence.c | 42 +- + drivers/gpu/drm/radeon/radeon_gem.c | 20 +- + drivers/gpu/drm/radeon/radeon_ib.c | 26 +- + drivers/gpu/drm/radeon/radeon_kms.c | 1 + + drivers/gpu/drm/radeon/radeon_mode.h | 2 +- + drivers/gpu/drm/radeon/radeon_object.c | 10 +- + drivers/gpu/drm/radeon/radeon_pm.c | 32 +- + drivers/gpu/drm/radeon/radeon_ring.c | 80 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 128 +- + drivers/gpu/drm/radeon/rs400.c | 25 +- + drivers/gpu/drm/radeon/rs600.c | 8 +- + drivers/gpu/drm/radeon/rv515.c | 56 +- + drivers/gpu/drm/radeon/si_dpm.c | 5 +- + drivers/gpu/drm/radeon/sislands_smc.h | 10 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 17 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 20 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 79 +- + drivers/gpu/drm/rockchip/rockchip_lvds.c | 2 +- + drivers/gpu/drm/scheduler/sched_entity.c | 8 +- + drivers/gpu/drm/scheduler/sched_main.c | 22 +- + drivers/gpu/drm/sti/sti_cursor.c | 41 +- + drivers/gpu/drm/sti/sti_gdp.c | 77 +- + drivers/gpu/drm/sti/sti_hqvdp.c | 75 +- + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 9 +- + drivers/gpu/drm/stm/ltdc.c | 96 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 6 +- + drivers/gpu/drm/sun4i/sun4i_layer.c | 15 +- + drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 59 +- + drivers/gpu/drm/sun4i/sun8i_ui_layer.h | 5 + + drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 78 +- + drivers/gpu/drm/sun4i/sun8i_vi_layer.h | 11 + + drivers/gpu/drm/tegra/dc.c | 116 +- + drivers/gpu/drm/tegra/drm.c | 3 + + drivers/gpu/drm/tegra/hub.c | 62 +- + drivers/gpu/drm/tegra/plane.c | 4 +- + drivers/gpu/drm/tidss/tidss_kms.c | 4 + + drivers/gpu/drm/tidss/tidss_plane.c | 53 +- + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 39 +- + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 1 - + drivers/gpu/drm/tilcdc/tilcdc_plane.c | 46 +- + drivers/gpu/drm/tiny/Kconfig | 10 + + drivers/gpu/drm/tiny/Makefile | 1 + + drivers/gpu/drm/tiny/arcpgu.c | 434 + + drivers/gpu/drm/tiny/cirrus.c | 43 +- + drivers/gpu/drm/tiny/gm12u320.c | 28 +- + drivers/gpu/drm/tiny/hx8357d.c | 4 +- + drivers/gpu/drm/tiny/ili9225.c | 4 +- + drivers/gpu/drm/tiny/ili9341.c | 4 +- + drivers/gpu/drm/tiny/ili9486.c | 4 +- + drivers/gpu/drm/tiny/mi0283qt.c | 4 +- + drivers/gpu/drm/tiny/repaper.c | 3 +- + drivers/gpu/drm/tiny/st7586.c | 4 +- + drivers/gpu/drm/tiny/st7735r.c | 4 +- + drivers/gpu/drm/ttm/Makefile | 7 +- + drivers/gpu/drm/ttm/ttm_agp_backend.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 424 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 26 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 24 +- + drivers/gpu/drm/ttm/ttm_device.c | 268 + + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 8 +- + drivers/gpu/drm/ttm/ttm_module.c | 54 +- + drivers/gpu/drm/ttm/ttm_module.h | 8 +- + drivers/gpu/drm/ttm/ttm_pool.c | 157 +- + drivers/gpu/drm/ttm/ttm_range_manager.c | 4 +- + drivers/gpu/drm/ttm/ttm_resource.c | 11 +- + drivers/gpu/drm/ttm/ttm_tt.c | 105 +- + drivers/gpu/drm/tve200/tve200_display.c | 4 +- + drivers/gpu/drm/udl/udl_modeset.c | 34 +- + drivers/gpu/drm/v3d/v3d_sched.c | 42 +- + drivers/gpu/drm/vboxvideo/vbox_mode.c | 82 +- + drivers/gpu/drm/vboxvideo/vbox_ttm.c | 7 +- + drivers/gpu/drm/vc4/vc4_kms.c | 17 +- + drivers/gpu/drm/vc4/vc4_plane.c | 76 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 1 + + drivers/gpu/drm/virtio/virtgpu_plane.c | 19 +- + drivers/gpu/drm/vkms/vkms_crtc.c | 11 +- + drivers/gpu/drm/vkms/vkms_plane.c | 30 +- + drivers/gpu/drm/vkms/vkms_writeback.c | 7 +- + drivers/gpu/drm/vmwgfx/Makefile | 2 +- + drivers/gpu/drm/{ttm => vmwgfx}/ttm_memory.c | 23 +- + .../ttm => drivers/gpu/drm/vmwgfx}/ttm_memory.h | 5 +- + drivers/gpu/drm/vmwgfx/ttm_object.c | 25 +- + drivers/gpu/drm/vmwgfx/ttm_object.h | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_binding.c | 9 +- + drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 5 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 28 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 14 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 45 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 13 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 20 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 18 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 103 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 14 +- + drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 4 + + drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 16 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 21 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 20 +- + drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_so.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 21 +- + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 17 +- + drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 69 +- + drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 5 +- + drivers/gpu/drm/xen/Kconfig | 10 +- + drivers/gpu/drm/xen/xen_drm_front_kms.c | 3 +- + drivers/gpu/drm/xlnx/zynqmp_disp.c | 32 +- + drivers/gpu/drm/zte/zx_plane.c | 49 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 85 +- + drivers/video/fbdev/amba-clcd.c | 17 +- + drivers/video/fbdev/core/fb_defio.c | 35 - + drivers/video/fbdev/core/fbmem.c | 4 - + drivers/video/fbdev/efifb.c | 3 + + drivers/video/fbdev/omap/hwa742.c | 42 +- + drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 2 - + drivers/video/fbdev/omap2/omapfb/omapfb.h | 2 +- + drivers/video/fbdev/simplefb.c | 5 +- + include/drm/amd_asic_type.h | 15 +- + include/drm/drm_atomic.h | 4 + + include/drm/drm_displayid.h | 30 +- + include/drm/drm_dp_helper.h | 5 + + include/drm/drm_drv.h | 2 +- + include/drm/drm_edid.h | 3 + + include/drm/drm_encoder.h | 18 + + include/drm/drm_gem_atomic_helper.h | 113 + + include/drm/drm_gem_framebuffer_helper.h | 7 - + include/drm/drm_gem_vram_helper.h | 6 +- + include/drm/drm_modeset_helper_vtables.h | 31 +- + include/drm/drm_plane.h | 25 +- + include/drm/drm_simple_kms_helper.h | 29 +- + include/drm/drm_vblank.h | 1 - + include/drm/gpu_scheduler.h | 23 +- + include/drm/gud.h | 333 + + include/drm/i915_pciids.h | 11 + + include/drm/ttm/ttm_bo_api.h | 50 +- + include/drm/ttm/ttm_bo_driver.h | 330 +- + include/drm/ttm/ttm_device.h | 317 + + include/drm/ttm/ttm_resource.h | 4 +- + include/drm/ttm/ttm_tt.h | 14 +- + include/linux/dma-heap.h | 9 + + include/linux/fb.h | 3 - + include/linux/hdmi.h | 2 +- + include/linux/interrupt.h | 4 + + include/linux/lockdep.h | 5 + + include/linux/platform_data/simplefb.h | 1 + + include/linux/vgaarb.h | 4 +- + include/uapi/drm/amdgpu_drm.h | 34 + + include/uapi/drm/drm.h | 125 +- + include/uapi/drm/drm_mode.h | 3 +- + include/uapi/drm/i915_drm.h | 1 + + include/uapi/linux/kfd_ioctl.h | 4 +- + kernel/irq/manage.c | 11 +- + lib/test_printf.c | 18 + + lib/vsprintf.c | 39 + + scripts/checkpatch.pl | 6 +- + 943 files changed, 166012 insertions(+), 19901 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/chipone,icn6211.yaml + delete mode 100644 Documentation/devicetree/bindings/display/bridge/dw_hdmi.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/lontium,lt8912b.yaml + delete mode 100644 Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.yaml + create mode 100644 Documentation/devicetree/bindings/display/bridge/synopsys,dw-hdmi.yaml + create mode 100644 Documentation/devicetree/bindings/display/fsl,lcdif.yaml + create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx6-hdmi.yaml + delete mode 100644 Documentation/devicetree/bindings/display/imx/hdmi.txt + delete mode 100644 Documentation/devicetree/bindings/display/mxsfb.txt + delete mode 100644 Documentation/devicetree/bindings/display/renesas,du.txt + create mode 100644 Documentation/devicetree/bindings/display/renesas,du.yaml + delete mode 100644 Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt + create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip,dw-hdmi.yaml + create mode 100644 Documentation/gpu/rfc/index.rst + create mode 100644 drivers/gpu/drm/amd/amdgpu/aldebaran_reg_init.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_aldebaran.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h + mode change 100755 => 100644 drivers/gpu/drm/amd/amdgpu/dimgrey_cavefish_reg_init.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v13_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v13_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v4_4.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v4_4.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v13_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v13_0.h + create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_stat.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dc_stat.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dmub_outbox.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dmub_outbox.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/dmub_srv_stat.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_srv_stat.c + create mode 100644 drivers/gpu/drm/amd/include/aldebaran_ip_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_4_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_4_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_1_7_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_1_7_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma/sdma_4_4_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma/sdma_4_4_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_13_0_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_13_0_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/thm/thm_13_0_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/thm/thm_13_0_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_7_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_7_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_2_6_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_2_6_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/pm/inc/aldebaran_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/pm/inc/smu13_driver_if_aldebaran.h + create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v13_0.h + create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v13_0_pptable.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c + delete mode 100644 drivers/gpu/drm/arc/Kconfig + delete mode 100644 drivers/gpu/drm/arc/Makefile + delete mode 100644 drivers/gpu/drm/arc/arcpgu.h + delete mode 100644 drivers/gpu/drm/arc/arcpgu_crtc.c + delete mode 100644 drivers/gpu/drm/arc/arcpgu_drv.c + delete mode 100644 drivers/gpu/drm/arc/arcpgu_hdmi.c + delete mode 100644 drivers/gpu/drm/arc/arcpgu_regs.h + delete mode 100644 drivers/gpu/drm/arc/arcpgu_sim.c + delete mode 100644 drivers/gpu/drm/ast/ast_cursor.c + create mode 100644 drivers/gpu/drm/bridge/chipone-icn6211.c + create mode 100644 drivers/gpu/drm/bridge/lontium-lt8912b.c + create mode 100644 drivers/gpu/drm/drm_displayid.c + create mode 100644 drivers/gpu/drm/drm_gem_atomic_helper.c + delete mode 100644 drivers/gpu/drm/gma500/accel_2d.c + delete mode 100644 drivers/gpu/drm/gma500/blitter.c + delete mode 100644 drivers/gpu/drm/gma500/blitter.h + create mode 100644 drivers/gpu/drm/gud/Kconfig + create mode 100644 drivers/gpu/drm/gud/Makefile + create mode 100644 drivers/gpu/drm/gud/gud_connector.c + create mode 100644 drivers/gpu/drm/gud/gud_drv.c + create mode 100644 drivers/gpu/drm/gud/gud_internal.h + create mode 100644 drivers/gpu/drm/gud/gud_pipe.c + create mode 100644 drivers/gpu/drm/i915/TODO.txt + create mode 100644 drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c + create mode 100644 drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h + create mode 100644 drivers/gpu/drm/i915/display/skl_scaler.c + create mode 100644 drivers/gpu/drm/i915/display/skl_scaler.h + create mode 100644 drivers/gpu/drm/i915/display/skl_universal_plane.c + create mode 100644 drivers/gpu/drm/i915/display/skl_universal_plane.h + delete mode 100644 drivers/gpu/drm/i915/gem/i915_gem_fence.c + create mode 100644 drivers/gpu/drm/tiny/arcpgu.c + create mode 100644 drivers/gpu/drm/ttm/ttm_device.c + rename drivers/gpu/drm/{ttm => vmwgfx}/ttm_memory.c (97%) + rename {include/drm/ttm => drivers/gpu/drm/vmwgfx}/ttm_memory.h (97%) + create mode 100644 include/drm/drm_gem_atomic_helper.h + create mode 100644 include/drm/gud.h + create mode 100644 include/drm/ttm/ttm_device.h +$ git am -3 ../patches/0001-merge-fix-for-drm-Switch-to-p4cc-format-modifier.patch +Applying: merge fix for "drm: Switch to %p4cc format modifier" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/i915/display/skl_universal_plane.c +$ git add -A . +$ git commit -v -a --amend +[master 66714bd6d1a0] Merge remote-tracking branch 'drm/drm-next' + Date: Thu Apr 8 14:08:43 2021 +1000 +Merging drm-misc/for-linux-next (167b40021712 drm/vblank: Do not store a new vblank timestamp in drm_vblank_restore()) +$ git merge drm-misc/for-linux-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/arm/display/include/malidp_utils.h | 3 --- + drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 6 +++--- + drivers/gpu/drm/arm/display/komeda/komeda_pipeline.c | 16 +++++++++++----- + .../drm/arm/display/komeda/komeda_pipeline_state.c | 19 +++++++++++-------- + drivers/gpu/drm/bridge/Kconfig | 1 + + drivers/gpu/drm/drm_modes.c | 3 +++ + drivers/gpu/drm/drm_vblank.c | 3 ++- + 7 files changed, 31 insertions(+), 20 deletions(-) +Merging amdgpu/drm-next (6504048e0b39 drm/amdgpu/smu7: fix CAC setting on TOPAZ) +$ git merge amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +Auto-merging drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_priv.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdgpu/Makefile | 9 +- + drivers/gpu/drm/amd/amdgpu/aldebaran.c | 407 +++++++ + drivers/gpu/drm/amd/amdgpu/aldebaran.h | 32 + + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 153 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 12 - + drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 300 +++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 71 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 50 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 45 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 39 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 106 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 51 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 160 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 98 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 85 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 10 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 28 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 17 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 5 +- + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 151 ++- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 26 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 103 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c | 20 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4.h | 12 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 13 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.h | 9 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 48 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 2 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 3 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h | 1 + + drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 8 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.h | 1 + + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 1 - + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 8 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h | 1 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 16 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.h | 1 + + drivers/gpu/drm/amd/amdgpu/nv.c | 30 +- + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 25 + + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 8 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 5 +- + drivers/gpu/drm/amd/amdgpu/si_dma.c | 5 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 23 +- + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 75 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 4 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_1.h | 2 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 281 +++++ + drivers/gpu/drm/amd/amdgpu/umc_v6_7.h | 37 + + drivers/gpu/drm/amd/amdgpu/umc_v8_7.c | 4 +- + drivers/gpu/drm/amd/amdgpu/umc_v8_7.h | 2 +- + drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 2 +- + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 2 +- + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 4 +- + 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 | 143 ++- + drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 116 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 749 ++++++++++++- + drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c | 7 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 20 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 108 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 206 +++- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 15 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 2 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 224 +++- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 6 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 12 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 72 ++ + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 134 +-- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_trace.h | 40 + + drivers/gpu/drm/amd/display/dc/Makefile | 5 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 190 ++++ + drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 1154 ++++++++++---------- + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 120 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 13 + + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 7 + + .../drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c | 29 +- + .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 105 +- + .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.h | 28 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 49 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 24 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 215 +++- + .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 303 +++++ + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 24 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 7 + + drivers/gpu/drm/amd/display/dc/dc.h | 3 +- + drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 6 + + drivers/gpu/drm/amd/display/dc/dc_link.h | 19 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 16 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 19 +- + drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 6 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 29 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 9 +- + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 16 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 40 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 7 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 3 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 16 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 3 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 16 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.h | 3 - + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 34 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 3 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 3 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 3 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 2 +- + .../gpu/drm/amd/display/dc/dcn301/dcn301_init.c | 3 +- + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 4 +- + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 2 +- + .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 28 +- + .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 28 +- + .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 28 +- + .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 28 +- + .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 2 +- + .../drm/amd/display/dc/dml/display_mode_structs.h | 4 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 8 +- + .../amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 28 +- + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 27 + + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 10 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 1 + + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 13 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 5 +- + drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h | 86 ++ + .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 29 +- + .../amd/display/dc/irq/dcn30/irq_service_dcn30.c | 25 +- + .../amd/display/dc/irq/dcn302/irq_service_dcn302.c | 30 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 54 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 146 ++- + drivers/gpu/drm/amd/display/include/logger_types.h | 3 + + .../drm/amd/display/modules/color/color_gamma.c | 6 +- + .../drm/amd/display/modules/color/color_gamma.h | 4 +- + .../drm/amd/display/modules/freesync/freesync.c | 41 +- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 10 +- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 4 +- + .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 37 +- + .../amd/display/modules/hdcp/hdcp1_transition.c | 6 +- + .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 10 +- + .../amd/display/modules/hdcp/hdcp2_transition.c | 10 +- + .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 10 + + .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 7 +- + drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 12 +- + .../drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 6 + + .../amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h | 9 + + drivers/gpu/drm/amd/include/atombios.h | 4 +- + drivers/gpu/drm/amd/include/atomfirmware.h | 38 +- + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 14 + + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 14 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 198 +++- + drivers/gpu/drm/amd/pm/inc/aldebaran_ppsmc.h | 3 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 128 +-- + .../gpu/drm/amd/pm/inc/smu13_driver_if_aldebaran.h | 11 +- + drivers/gpu/drm/amd/pm/inc/smu_types.h | 3 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 4 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h | 2 +- + drivers/gpu/drm/amd/pm/inc/smu_v13_0.h | 5 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 13 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 3 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 4 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 4 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 401 ++++--- + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 1 + + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 25 + + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 18 + + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 4 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 1 - + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 71 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 58 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 30 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 5 + + drivers/gpu/drm/drm_atomic.c | 4 +- + drivers/gpu/drm/radeon/r600_cs.c | 6 +- + drivers/gpu/drm/radeon/radeon_object.c | 2 + + drivers/gpu/drm/radeon/radeon_pm.c | 36 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 11 +- + drivers/gpu/drm/scheduler/sched_main.c | 103 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 14 + + drivers/usb/host/xhci-pci.c | 3 + + include/drm/gpu_scheduler.h | 3 + + 238 files changed, 6735 insertions(+), 2704 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/aldebaran.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/aldebaran.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v6_7.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v6_7.h + create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h +Merging drm-intel/for-linux-next (70bfb30743d5 drm/i915/display: Eliminate IS_GEN9_{BC,LP}) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_runtime_pm.c +Auto-merging drivers/gpu/drm/i915/intel_device_info.h +Auto-merging drivers/gpu/drm/i915/intel_device_info.c +Auto-merging drivers/gpu/drm/i915/i915_pci.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/i915_debugfs.c +Auto-merging drivers/gpu/drm/i915/gt/intel_workarounds.c +Auto-merging drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c +Auto-merging drivers/gpu/drm/i915/gt/intel_ggtt.c +Auto-merging drivers/gpu/drm/i915/gt/gen8_engine_cs.c +Auto-merging drivers/gpu/drm/i915/display/skl_universal_plane.c +Auto-merging drivers/gpu/drm/i915/display/intel_vdsc.c +Auto-merging drivers/gpu/drm/i915/display/intel_overlay.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp_link_training.h +Auto-merging drivers/gpu/drm/i915/display/intel_dp_link_training.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp_link_training.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp_aux.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_debugfs.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.h +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/Makefile +Resolved 'drivers/gpu/drm/i915/display/intel_display.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/display/intel_dp_link_training.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_runtime_pm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6227939fc30b] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/drm_dp_helper.c | 24 +- + drivers/gpu/drm/i915/Makefile | 4 + + drivers/gpu/drm/i915/display/g4x_dp.c | 1432 ++++++++++++++++ + drivers/gpu/drm/i915/display/g4x_dp.h | 30 + + drivers/gpu/drm/i915/display/g4x_hdmi.c | 616 +++++++ + drivers/gpu/drm/i915/display/g4x_hdmi.h | 19 + + drivers/gpu/drm/i915/display/i9xx_plane.c | 77 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 14 +- + drivers/gpu/drm/i915/display/intel_acpi.c | 22 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 7 +- + drivers/gpu/drm/i915/display/intel_audio.c | 48 +- + drivers/gpu/drm/i915/display/intel_bios.c | 1117 +++++++------ + drivers/gpu/drm/i915/display/intel_bios.h | 17 +- + drivers/gpu/drm/i915/display/intel_bw.c | 10 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 92 +- + drivers/gpu/drm/i915/display/intel_color.c | 32 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 8 +- + drivers/gpu/drm/i915/display/intel_crt.c | 12 +- + drivers/gpu/drm/i915/display/intel_crt.h | 1 - + drivers/gpu/drm/i915/display/intel_crtc.c | 20 +- + drivers/gpu/drm/i915/display/intel_csr.c | 6 +- + drivers/gpu/drm/i915/display/intel_cursor.c | 29 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 176 +- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 12 +- + drivers/gpu/drm/i915/display/intel_display.c | 1171 ++----------- + drivers/gpu/drm/i915/display/intel_display.h | 14 - + .../gpu/drm/i915/display/intel_display_debugfs.c | 49 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 87 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 100 +- + drivers/gpu/drm/i915/display/intel_dp.c | 1720 ++------------------ + drivers/gpu/drm/i915/display/intel_dp.h | 11 - + drivers/gpu/drm/i915/display/intel_dp_aux.c | 12 +- + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 84 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 35 +- + .../gpu/drm/i915/display/intel_dp_link_training.h | 3 + + drivers/gpu/drm/i915/display/intel_dp_mst.c | 22 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 18 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 28 +- + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 4 +- + drivers/gpu/drm/i915/display/intel_fb.c | 962 +++++++++++ + drivers/gpu/drm/i915/display/intel_fb.h | 54 + + drivers/gpu/drm/i915/display/intel_fbc.c | 75 +- + drivers/gpu/drm/i915/display/intel_fdi.c | 6 +- + drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 8 +- + drivers/gpu/drm/i915/display/intel_gmbus.c | 14 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 63 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 654 +------- + drivers/gpu/drm/i915/display/intel_hdmi.h | 3 - + drivers/gpu/drm/i915/display/intel_lvds.c | 12 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 12 +- + drivers/gpu/drm/i915/display/intel_panel.c | 20 +- + drivers/gpu/drm/i915/display/intel_pipe_crc.c | 16 +- + drivers/gpu/drm/i915/display/intel_pps.c | 21 +- + drivers/gpu/drm/i915/display/intel_psr.c | 58 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 8 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 74 +- + drivers/gpu/drm/i915/display/intel_sprite.h | 1 - + drivers/gpu/drm/i915/display/intel_tc.c | 8 +- + drivers/gpu/drm/i915/display/intel_tv.c | 8 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 12 +- + drivers/gpu/drm/i915/display/intel_vga.c | 4 +- + drivers/gpu/drm/i915/display/intel_vrr.h | 1 - + drivers/gpu/drm/i915/display/skl_scaler.c | 8 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 240 ++- + drivers/gpu/drm/i915/display/skl_universal_plane.h | 2 - + drivers/gpu/drm/i915/display/vlv_dsi.c | 46 +- + drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 2 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 56 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 55 +- + drivers/gpu/drm/i915/i915_debugfs.c | 16 +- + drivers/gpu/drm/i915/i915_drv.c | 13 +- + drivers/gpu/drm/i915/i915_drv.h | 150 +- + drivers/gpu/drm/i915/i915_irq.c | 79 +- + drivers/gpu/drm/i915/i915_pci.c | 3 +- + drivers/gpu/drm/i915/i915_sysfs.c | 30 +- + drivers/gpu/drm/i915/i915_vma_types.h | 12 +- + drivers/gpu/drm/i915/intel_device_info.c | 2 +- + drivers/gpu/drm/i915/intel_device_info.h | 6 + + drivers/gpu/drm/i915/intel_pm.c | 152 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 2 +- + drivers/gpu/drm/i915/intel_step.c | 106 ++ + drivers/gpu/drm/i915/intel_step.h | 40 + + drivers/gpu/drm/i915/selftests/i915_vma.c | 219 ++- + include/drm/drm_dp_helper.h | 6 +- + include/drm/drm_hdcp.h | 5 +- + 85 files changed, 5578 insertions(+), 4949 deletions(-) + create mode 100644 drivers/gpu/drm/i915/display/g4x_dp.c + create mode 100644 drivers/gpu/drm/i915/display/g4x_dp.h + create mode 100644 drivers/gpu/drm/i915/display/g4x_hdmi.c + create mode 100644 drivers/gpu/drm/i915/display/g4x_hdmi.h + create mode 100644 drivers/gpu/drm/i915/display/intel_fb.c + create mode 100644 drivers/gpu/drm/i915/display/intel_fb.h + create mode 100644 drivers/gpu/drm/i915/intel_step.c + create mode 100644 drivers/gpu/drm/i915/intel_step.h +Merging drm-tegra/drm/tegra/for-next (7b6f846785f4 drm/tegra: Support sector layout on Tegra194) +$ git merge drm-tegra/drm/tegra/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/dc.c | 113 ++++++++++++++++-- + drivers/gpu/drm/tegra/dc.h | 6 + + drivers/gpu/drm/tegra/drm.c | 27 +++-- + drivers/gpu/drm/tegra/drm.h | 5 + + drivers/gpu/drm/tegra/fb.c | 10 ++ + drivers/gpu/drm/tegra/gem.h | 6 + + drivers/gpu/drm/tegra/gr2d.c | 4 +- + drivers/gpu/drm/tegra/gr3d.c | 4 +- + drivers/gpu/drm/tegra/hub.c | 41 ++++++- + drivers/gpu/drm/tegra/plane.c | 32 ++++++ + drivers/gpu/drm/tegra/vic.c | 4 +- + drivers/gpu/host1x/bus.c | 31 +++++ + drivers/gpu/host1x/cdma.c | 11 +- + drivers/gpu/host1x/debug.c | 14 ++- + drivers/gpu/host1x/dev.c | 6 + + drivers/gpu/host1x/dev.h | 13 ++- + drivers/gpu/host1x/hw/cdma_hw.c | 2 +- + drivers/gpu/host1x/hw/channel_hw.c | 10 +- + drivers/gpu/host1x/hw/debug_hw.c | 2 +- + drivers/gpu/host1x/hw/hw_host1x07_vm.h | 2 +- + drivers/gpu/host1x/intr.c | 28 +++-- + drivers/gpu/host1x/intr.h | 4 +- + drivers/gpu/host1x/job.c | 5 +- + drivers/gpu/host1x/syncpt.c | 202 ++++++++++++++++++++------------- + drivers/gpu/host1x/syncpt.h | 4 +- + drivers/staging/media/tegra-video/vi.c | 6 +- + include/linux/host1x.h | 18 ++- + 27 files changed, 460 insertions(+), 150 deletions(-) +Merging drm-msm/msm-next (0ba17e7a5548 drm/msm: add compatibles for sm8150/sm8250 display) +$ git merge drm-msm/msm-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 4 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 18 +++++--- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 + + drivers/gpu/drm/msm/msm_debugfs.c | 14 ++---- + drivers/gpu/drm/msm/msm_drv.c | 22 ++++++--- + drivers/gpu/drm/msm/msm_drv.h | 18 ++++++-- + drivers/gpu/drm/msm/msm_fb.c | 3 +- + drivers/gpu/drm/msm/msm_gem.c | 65 ++++++++++++++++++++++----- + drivers/gpu/drm/msm/msm_gem.h | 72 +++++++++++++++++++++++++++--- + drivers/gpu/drm/msm/msm_gem_shrinker.c | 72 +++++++++++++++++++++--------- + 11 files changed, 223 insertions(+), 71 deletions(-) +Merging imx-drm/imx-drm/next (74181df8c6db drm/imx: ipuv3-plane: Remove two unnecessary export symbols) +$ git merge imx-drm/imx-drm/next +Auto-merging drivers/gpu/drm/imx/ipuv3-plane.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/imx/ipuv3-plane.c +Auto-merging drivers/gpu/drm/imx/imx-ldb.c +Auto-merging drivers/gpu/drm/imx/imx-drm-core.c +Resolved 'drivers/gpu/drm/imx/ipuv3-plane.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a99a3dac4132] Merge remote-tracking branch 'imx-drm/imx-drm/next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/imx/imx-drm-core.c | 21 ++++++++++++- + drivers/gpu/drm/imx/imx-ldb.c | 5 +++ + drivers/gpu/drm/imx/ipuv3-crtc.c | 11 ++++++- + drivers/gpu/drm/imx/ipuv3-plane.c | 62 ++++++++++++++++++++++++++++++++------ + drivers/gpu/ipu-v3/ipu-dc.c | 5 +++ + drivers/gpu/ipu-v3/ipu-di.c | 7 +++++ + 6 files changed, 99 insertions(+), 12 deletions(-) +Merging etnaviv/etnaviv/next (7d614ab2f205 drm/etnaviv: fix NULL check before some freeing functions is not needed) +$ git merge etnaviv/etnaviv/next +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/etnaviv/etnaviv_dump.c | 8 ++++---- + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 3 +-- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 12 ++++++++++++ + include/uapi/drm/etnaviv_drm.h | 3 +++ + 4 files changed, 20 insertions(+), 6 deletions(-) +Merging regmap/for-next (ccac12acc0c0 Merge remote-tracking branch 'regmap/for-5.13' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-irq.c | 126 ++++++++++++++++++++++++++++++--------- + include/linux/regmap.h | 16 +++++ + 2 files changed, 113 insertions(+), 29 deletions(-) +Merging sound/for-next (884c7094a272 ALSA: usb-audio: Drop implicit fb quirk entries dubbed for capture) +$ git merge sound/for-next +Auto-merging sound/usb/quirks.c +Auto-merging sound/pci/hda/patch_realtek.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 9 + + include/sound/control.h | 35 +- + include/sound/hda_register.h | 8 +- + include/uapi/linux/virtio_ids.h | 1 + + include/uapi/linux/virtio_snd.h | 334 +++++++++++ + sound/Kconfig | 2 + + sound/Makefile | 3 +- + sound/core/Kconfig | 6 + + sound/core/Makefile | 2 + + sound/core/control.c | 184 +++++- + sound/core/control_led.c | 773 ++++++++++++++++++++++++ + sound/core/init.c | 2 - + sound/core/oss/pcm_oss.c | 8 +- + sound/core/pcm_memory.c | 12 +- + sound/core/pcm_native.c | 4 +- + sound/core/seq_device.c | 15 +- + sound/drivers/vx/vx_core.c | 2 +- + sound/firewire/bebob/bebob.h | 2 + + sound/firewire/bebob/bebob_command.c | 36 ++ + sound/firewire/bebob/bebob_stream.c | 163 ++--- + sound/hda/Kconfig | 7 +- + sound/hda/hdac_stream.c | 2 +- + sound/pci/asihpi/hpicmn.h | 2 +- + sound/pci/asihpi/hpidspcd.h | 2 +- + sound/pci/ctxfi/ct20k1reg.h | 2 +- + sound/pci/ctxfi/ct20k2reg.h | 2 +- + sound/pci/ctxfi/ctamixer.c | 2 +- + sound/pci/ctxfi/ctamixer.h | 2 +- + sound/pci/ctxfi/ctatc.c | 2 +- + sound/pci/ctxfi/ctatc.h | 2 +- + sound/pci/ctxfi/ctdaio.c | 2 +- + sound/pci/ctxfi/ctdaio.h | 2 +- + sound/pci/ctxfi/cthardware.h | 2 +- + sound/pci/ctxfi/cthw20k1.h | 2 +- + sound/pci/ctxfi/cthw20k2.h | 2 +- + sound/pci/ctxfi/ctimap.h | 2 +- + sound/pci/ctxfi/ctmixer.h | 2 +- + sound/pci/ctxfi/ctpcm.h | 2 +- + sound/pci/ctxfi/ctresource.c | 2 +- + sound/pci/ctxfi/ctresource.h | 2 +- + sound/pci/ctxfi/ctsrc.c | 2 +- + sound/pci/ctxfi/ctsrc.h | 2 +- + sound/pci/ctxfi/ctvmem.c | 2 +- + sound/pci/ctxfi/ctvmem.h | 2 +- + sound/pci/hda/Kconfig | 4 +- + sound/pci/hda/hda_auto_parser.h | 2 +- + sound/pci/hda/hda_codec.c | 69 +-- + sound/pci/hda/hda_generic.c | 162 +---- + sound/pci/hda/hda_generic.h | 15 +- + sound/pci/hda/hda_jack.c | 73 ++- + sound/pci/hda/hda_jack.h | 8 + + sound/pci/hda/hda_local.h | 18 +- + sound/pci/hda/patch_ca0132.c | 4 +- + sound/pci/hda/patch_cirrus.c | 1090 +++++++++++++++++++++++++++++++++- + sound/pci/hda/patch_hdmi.c | 25 +- + sound/pci/hda/patch_realtek.c | 17 +- + sound/pci/hda/patch_sigmatel.c | 6 +- + sound/pci/hda/thinkpad_helper.c | 2 +- + sound/pci/mixart/mixart_hwdep.c | 3 +- + sound/pci/rme9652/hdsp.c | 3 +- + sound/pci/rme9652/hdspm.c | 3 +- + sound/pci/rme9652/rme9652.c | 3 +- + sound/pci/vx222/vx222_ops.c | 10 +- + sound/ppc/keywest.c | 5 - + sound/ppc/snd_ps3_reg.h | 2 +- + sound/usb/card.c | 14 +- + sound/usb/implicit.c | 15 +- + sound/usb/midi.c | 123 +++- + sound/usb/midi.h | 2 + + sound/usb/mixer.c | 78 ++- + sound/usb/mixer.h | 1 + + sound/usb/mixer_quirks.c | 62 +- + sound/usb/quirks-table.h | 63 ++ + sound/usb/quirks.c | 19 +- + sound/usb/usbaudio.h | 2 + + sound/virtio/Kconfig | 10 + + sound/virtio/Makefile | 13 + + sound/virtio/virtio_card.c | 449 ++++++++++++++ + sound/virtio/virtio_card.h | 111 ++++ + sound/virtio/virtio_chmap.c | 219 +++++++ + sound/virtio/virtio_ctl_msg.c | 310 ++++++++++ + sound/virtio/virtio_ctl_msg.h | 78 +++ + sound/virtio/virtio_jack.c | 233 ++++++++ + sound/virtio/virtio_pcm.c | 513 ++++++++++++++++ + sound/virtio/virtio_pcm.h | 124 ++++ + sound/virtio/virtio_pcm_msg.c | 414 +++++++++++++ + sound/virtio/virtio_pcm_ops.c | 464 +++++++++++++++ + 87 files changed, 5977 insertions(+), 518 deletions(-) + create mode 100644 include/uapi/linux/virtio_snd.h + create mode 100644 sound/core/control_led.c + create mode 100644 sound/virtio/Kconfig + create mode 100644 sound/virtio/Makefile + create mode 100644 sound/virtio/virtio_card.c + create mode 100644 sound/virtio/virtio_card.h + create mode 100644 sound/virtio/virtio_chmap.c + create mode 100644 sound/virtio/virtio_ctl_msg.c + create mode 100644 sound/virtio/virtio_ctl_msg.h + create mode 100644 sound/virtio/virtio_jack.c + create mode 100644 sound/virtio/virtio_pcm.c + create mode 100644 sound/virtio/virtio_pcm.h + create mode 100644 sound/virtio/virtio_pcm_msg.c + create mode 100644 sound/virtio/virtio_pcm_ops.c +Merging sound-asoc/for-next (1faa37b8f478 Merge remote-tracking branch 'asoc/for-5.13' into asoc-next) +$ git merge sound-asoc/for-next +Removing include/sound/rt5645.h +Removing include/linux/platform_data/asoc-mx27vis.h +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/sound/mchp-i2s-mcc.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/ak5558.txt | 2 +- + .../bindings/sound/audio-graph-port.yaml | 104 +- + .../devicetree/bindings/sound/fsl,rpmsg.yaml | 108 ++ + .../devicetree/bindings/sound/fsl-asoc-card.txt | 2 + + .../bindings/sound/intel,keembay-i2s.yaml | 2 +- + .../bindings/sound/marvell,mmp-sspa.yaml | 6 +- + .../devicetree/bindings/sound/mchp,i2s-mcc.yaml | 108 ++ + .../devicetree/bindings/sound/mchp-i2s-mcc.txt | 43 - + .../devicetree/bindings/sound/mt6359-accdet.yaml | 164 ++ + .../sound/mt8183-mt6358-ts3a227-max98357.txt | 1 + + .../bindings/sound/nvidia,tegra186-dspk.yaml | 11 +- + .../bindings/sound/nvidia,tegra210-admaif.yaml | 11 +- + .../bindings/sound/nvidia,tegra210-ahub.yaml | 27 +- + .../bindings/sound/nvidia,tegra210-dmic.yaml | 11 +- + .../bindings/sound/nvidia,tegra210-i2s.yaml | 11 +- + .../devicetree/bindings/sound/renesas,rsnd.yaml | 5 +- + .../devicetree/bindings/sound/rt1019.yaml | 35 + + Documentation/devicetree/bindings/sound/rt5682.txt | 2 +- + .../bindings/sound/socionext,uniphier-aio.yaml | 8 +- + .../bindings/sound/socionext,uniphier-evea.yaml | 8 +- + MAINTAINERS | 3 +- + drivers/extcon/Kconfig | 8 - + drivers/extcon/Makefile | 1 - + drivers/firmware/dmi_scan.c | 1 + + drivers/mfd/arizona-core.c | 20 - + drivers/reset/core.c | 215 +++ + drivers/spi/spi-imx.c | 5 +- + include/linux/platform_data/asoc-mx27vis.h | 12 - + include/linux/reset.h | 315 ++++ + include/sound/rt5645.h | 32 - + include/sound/simple_card_utils.h | 7 +- + include/sound/soc-component.h | 7 +- + include/sound/soc-dpcm.h | 10 +- + include/sound/soc.h | 36 +- + include/sound/sof.h | 1 + + sound/soc/amd/Kconfig | 7 +- + sound/soc/amd/acp-da7219-max98357a.c | 386 +++- + sound/soc/amd/renoir/acp3x-pdm-dma.c | 2 - + sound/soc/amd/renoir/rn-pci-acp3x.c | 2 +- + sound/soc/atmel/Kconfig | 3 + + sound/soc/atmel/atmel-classd.c | 6 +- + sound/soc/atmel/atmel-i2s.c | 2 +- + sound/soc/atmel/mchp-i2s-mcc.c | 161 +- + sound/soc/bcm/cygnus-ssp.c | 2 +- + sound/soc/codecs/Kconfig | 51 +- + sound/soc/codecs/Makefile | 16 +- + sound/soc/codecs/ab8500-codec.c | 7 - + sound/soc/codecs/ad1836.c | 2 - + sound/soc/codecs/adau1977.c | 2 - + sound/soc/codecs/ak5558.c | 101 +- + .../soc/codecs/arizona-jack.c | 577 +++--- + sound/soc/codecs/arizona.h | 46 +- + sound/soc/codecs/cros_ec_codec.c | 2 +- + sound/soc/codecs/cs4270.c | 1 + + sound/soc/codecs/cs42l42.c | 323 ++-- + sound/soc/codecs/cs42l42.h | 28 +- + sound/soc/codecs/cx2072x.c | 11 +- + sound/soc/codecs/da7219-aad.c | 2 +- + sound/soc/codecs/da732x.c | 17 +- + sound/soc/codecs/da732x.h | 12 +- + sound/soc/codecs/hdac_hdmi.c | 14 +- + sound/soc/codecs/hdac_hdmi.h | 2 +- + sound/soc/codecs/hdmi-codec.c | 3 +- + sound/soc/codecs/jz4760.c | 11 +- + sound/soc/codecs/jz4770.c | 7 +- + sound/soc/codecs/lm49453.c | 2 - + sound/soc/codecs/lpass-rx-macro.c | 3 +- + sound/soc/codecs/lpass-va-macro.c | 2 +- + sound/soc/codecs/lpass-wsa-macro.c | 2 + + sound/soc/codecs/madera.h | 2 +- + sound/soc/codecs/max98090.c | 2 +- + sound/soc/codecs/max98373.c | 14 + + sound/soc/codecs/max98373.h | 3 + + sound/soc/codecs/max98390.c | 62 + + sound/soc/codecs/max98390.h | 2 + + sound/soc/codecs/mt6358.c | 4 +- + sound/soc/codecs/mt6359-accdet.c | 1080 ++++++++++++ + sound/soc/codecs/mt6359-accdet.h | 128 ++ + sound/soc/codecs/mt6359.c | 4 +- + sound/soc/codecs/mt6359.h | 1864 ++++++++++++++++++-- + sound/soc/codecs/nau8825.c | 11 +- + sound/soc/codecs/pcm1681.c | 2 +- + sound/soc/codecs/rt1011.c | 49 +- + sound/soc/codecs/rt1015.c | 27 +- + sound/soc/codecs/rt1015.h | 10 + + sound/soc/codecs/rt1015p.c | 10 + + sound/soc/codecs/rt1016.c | 11 +- + sound/soc/codecs/rt1019.c | 940 ++++++++++ + sound/soc/codecs/rt1019.h | 320 ++++ + sound/soc/codecs/rt1305.c | 6 +- + sound/soc/codecs/rt1308-sdw.c | 2 +- + sound/soc/codecs/rt1308.c | 10 +- + sound/soc/codecs/rt1316-sdw.c | 744 ++++++++ + sound/soc/codecs/rt1316-sdw.h | 55 + + sound/soc/codecs/rt5631.c | 4 +- + sound/soc/codecs/rt5640.c | 12 +- + sound/soc/codecs/rt5645.c | 47 +- + sound/soc/codecs/rt5645.h | 2 - + sound/soc/codecs/rt5651.c | 6 +- + sound/soc/codecs/rt5659.c | 4 +- + sound/soc/codecs/rt5660.c | 4 +- + sound/soc/codecs/rt5663.c | 4 +- + sound/soc/codecs/rt5665.c | 4 +- + sound/soc/codecs/rt5668.c | 8 +- + sound/soc/codecs/rt5670.c | 55 +- + sound/soc/codecs/rt5670.h | 2 + + sound/soc/codecs/rt5677.c | 6 +- + sound/soc/codecs/rt5682-i2c.c | 2 +- + sound/soc/codecs/rt5682-sdw.c | 6 +- + sound/soc/codecs/rt5682.c | 14 +- + sound/soc/codecs/rt5682.h | 1 + + sound/soc/codecs/rt700-sdw.c | 2 +- + sound/soc/codecs/rt700.c | 2 +- + sound/soc/codecs/rt711-sdca-sdw.c | 425 +++++ + sound/soc/codecs/rt711-sdca-sdw.h | 99 ++ + sound/soc/codecs/rt711-sdca.c | 1492 ++++++++++++++++ + sound/soc/codecs/rt711-sdca.h | 238 +++ + sound/soc/codecs/rt711-sdw.c | 2 +- + sound/soc/codecs/rt711.c | 2 +- + sound/soc/codecs/rt715-sdca-sdw.c | 278 +++ + sound/soc/codecs/rt715-sdca-sdw.h | 170 ++ + sound/soc/codecs/rt715-sdca.c | 1075 +++++++++++ + sound/soc/codecs/rt715-sdca.h | 136 ++ + sound/soc/codecs/rt715-sdw.c | 2 +- + sound/soc/codecs/rt715.c | 2 +- + sound/soc/codecs/sgtl5000.c | 6 +- + sound/soc/codecs/sigmadsp-regmap.c | 2 +- + sound/soc/codecs/sigmadsp.h | 2 +- + sound/soc/codecs/sti-sas.c | 3 - + sound/soc/codecs/tas2562.c | 3 +- + sound/soc/codecs/tas2770.c | 2 +- + sound/soc/codecs/tlv320aic3x-i2c.c | 70 + + sound/soc/codecs/tlv320aic3x-spi.c | 76 + + sound/soc/codecs/tlv320aic3x.c | 108 +- + sound/soc/codecs/tlv320aic3x.h | 12 + + sound/soc/codecs/tlv320dac33.c | 2 +- + sound/soc/codecs/tscs454.c | 7 +- + sound/soc/codecs/wcd-clsh-v2.h | 6 +- + sound/soc/codecs/wcd9335.c | 2 +- + sound/soc/codecs/wcd934x.c | 2 - + sound/soc/codecs/wm2200.c | 7 - + sound/soc/codecs/wm5102.c | 12 +- + sound/soc/codecs/wm5110.c | 12 +- + sound/soc/codecs/wm8524.c | 2 +- + sound/soc/codecs/wm8903.c | 2 - + sound/soc/codecs/wm8958-dsp2.c | 16 +- + sound/soc/codecs/wm8960.c | 12 +- + sound/soc/codecs/wm8962.c | 23 +- + sound/soc/codecs/wm8978.c | 2 +- + sound/soc/codecs/wm8994.h | 2 +- + sound/soc/codecs/wm8996.c | 2 +- + sound/soc/codecs/wm8997.c | 14 +- + sound/soc/codecs/wm8998.c | 9 + + sound/soc/codecs/wm_adsp.c | 2 +- + sound/soc/codecs/wm_hubs.h | 2 +- + sound/soc/dwc/local.h | 6 +- + sound/soc/fsl/Kconfig | 32 + + sound/soc/fsl/Makefile | 6 + + sound/soc/fsl/fsl-asoc-card.c | 17 +- + sound/soc/fsl/fsl_asrc.c | 59 +- + sound/soc/fsl/fsl_asrc_dma.c | 5 +- + sound/soc/fsl/fsl_audmix.c | 3 +- + sound/soc/fsl/fsl_dma.c | 3 - + sound/soc/fsl/fsl_easrc.c | 9 +- + sound/soc/fsl/fsl_esai.c | 50 +- + sound/soc/fsl/fsl_micfil.c | 27 +- + sound/soc/fsl/fsl_rpmsg.c | 279 +++ + sound/soc/fsl/fsl_rpmsg.h | 35 + + sound/soc/fsl/fsl_sai.c | 62 +- + sound/soc/fsl/fsl_sai.h | 4 + + sound/soc/fsl/fsl_spdif.c | 33 +- + sound/soc/fsl/fsl_ssi.c | 7 +- + sound/soc/fsl/fsl_xcvr.c | 19 +- + sound/soc/fsl/imx-audio-rpmsg.c | 140 ++ + sound/soc/fsl/imx-hdmi.c | 5 - + sound/soc/fsl/imx-pcm-rpmsg.c | 918 ++++++++++ + sound/soc/fsl/imx-pcm-rpmsg.h | 512 ++++++ + sound/soc/fsl/imx-rpmsg.c | 150 ++ + sound/soc/fsl/mpc5200_dma.c | 2 +- + sound/soc/fsl/mpc8610_hpcd.c | 2 +- + sound/soc/fsl/p1022_ds.c | 2 +- + sound/soc/generic/audio-graph-card.c | 114 +- + sound/soc/generic/simple-card-utils.c | 22 +- + sound/soc/generic/simple-card.c | 117 +- + sound/soc/intel/Makefile | 2 +- + sound/soc/intel/atom/sst-mfld-dsp.h | 4 +- + sound/soc/intel/atom/sst/sst_acpi.c | 2 +- + sound/soc/intel/atom/sst/sst_loader.c | 2 +- + sound/soc/intel/boards/Kconfig | 1 + + sound/soc/intel/boards/bxt_da7219_max98357a.c | 1 + + sound/soc/intel/boards/bytcr_rt5640.c | 31 +- + sound/soc/intel/boards/bytcr_wm5102.c | 36 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 77 +- + sound/soc/intel/boards/kbl_da7219_max98357a.c | 58 +- + sound/soc/intel/boards/kbl_da7219_max98927.c | 10 +- + sound/soc/intel/boards/kbl_rt5663_max98927.c | 14 +- + sound/soc/intel/boards/sof_realtek_common.c | 105 ++ + sound/soc/intel/boards/sof_realtek_common.h | 7 + + sound/soc/intel/boards/sof_rt5682.c | 35 +- + sound/soc/intel/boards/sof_wm8804.c | 6 +- + sound/soc/intel/common/soc-acpi-intel-byt-match.c | 40 +- + sound/soc/intel/common/soc-acpi-intel-cml-match.c | 2 +- + sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 13 + + sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 23 - + sound/soc/intel/skylake/Makefile | 2 +- + sound/soc/intel/skylake/skl-topology.c | 17 +- + sound/soc/intel/skylake/skl.h | 2 +- + sound/soc/mediatek/Kconfig | 1 + + sound/soc/mediatek/common/mtk-btcvsd.c | 2 +- + sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.h | 4 +- + sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 4 +- + sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 6 +- + .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 29 + + sound/soc/meson/aiu-acodec-ctrl.c | 2 +- + sound/soc/meson/aiu-codec-ctrl.c | 2 +- + sound/soc/meson/aiu.c | 4 +- + sound/soc/meson/aiu.h | 2 +- + sound/soc/meson/axg-fifo.c | 11 +- + sound/soc/meson/axg-tdmin.c | 2 +- + sound/soc/meson/axg-tdmout.c | 2 +- + sound/soc/mxs/mxs-saif.c | 10 - + sound/soc/pxa/mmp-pcm.c | 2 +- + sound/soc/pxa/mmp-sspa.c | 1 - + sound/soc/qcom/lpass-cpu.c | 2 +- + sound/soc/qcom/lpass-hdmi.c | 4 - + sound/soc/qcom/lpass-platform.c | 2 +- + sound/soc/qcom/qdsp6/q6afe-clocks.c | 209 +-- + sound/soc/qcom/qdsp6/q6afe-dai.c | 4 +- + sound/soc/qcom/qdsp6/q6afe.c | 9 +- + sound/soc/qcom/qdsp6/q6afe.h | 4 +- + sound/soc/qcom/qdsp6/q6asm.h | 6 +- + sound/soc/samsung/i2s.c | 3 +- + sound/soc/samsung/s3c24xx_simtec.c | 5 + + sound/soc/samsung/smdk_wm8994.c | 1 + + sound/soc/samsung/snow.c | 5 +- + sound/soc/samsung/tm2_wm5110.c | 5 +- + sound/soc/sh/dma-sh7760.c | 1 - + sound/soc/sh/rcar/adg.c | 15 +- + sound/soc/sh/rcar/cmd.c | 15 +- + sound/soc/sh/rcar/core.c | 103 +- + sound/soc/sh/rcar/ctu.c | 2 + + sound/soc/sh/rcar/rsnd.h | 6 +- + sound/soc/sh/rcar/ssi.c | 46 +- + sound/soc/sh/rcar/ssiu.c | 22 +- + sound/soc/sh/siu_pcm.c | 6 +- + sound/soc/soc-component.c | 16 +- + sound/soc/soc-compress.c | 11 +- + sound/soc/soc-core.c | 40 +- + sound/soc/soc-dai.c | 2 +- + sound/soc/soc-dapm.c | 24 +- + sound/soc/soc-ops.c | 2 +- + sound/soc/soc-pcm.c | 513 +++--- + sound/soc/soc-topology.c | 16 +- + sound/soc/sof/core.c | 5 +- + sound/soc/sof/debug.c | 21 +- + sound/soc/sof/intel/hda-dai.c | 44 + + sound/soc/sof/intel/hda-dsp.c | 11 +- + sound/soc/sof/intel/hda.c | 2 - + sound/soc/sof/pcm.c | 37 +- + sound/soc/sof/sof-audio.c | 27 + + sound/soc/sof/sof-audio.h | 2 + + sound/soc/sof/topology.c | 190 +- + sound/soc/sti/sti_uniperif.c | 2 + + sound/soc/sti/uniperif.h | 4 +- + sound/soc/stm/stm32_adfsdm.c | 2 +- + sound/soc/sunxi/sun4i-i2s.c | 2 - + sound/soc/sunxi/sun8i-codec.c | 2 +- + sound/soc/tegra/tegra20_ac97.c | 21 + + sound/soc/tegra/tegra20_ac97.h | 1 + + sound/soc/tegra/tegra20_das.c | 8 +- + sound/soc/tegra/tegra20_das.h | 6 +- + sound/soc/tegra/tegra20_i2s.c | 60 +- + sound/soc/tegra/tegra20_i2s.h | 1 + + sound/soc/tegra/tegra20_spdif.c | 16 +- + sound/soc/tegra/tegra30_ahub.c | 168 +- + sound/soc/tegra/tegra30_ahub.h | 5 +- + sound/soc/tegra/tegra30_i2s.c | 65 +- + sound/soc/tegra/tegra_audio_graph_card.c | 1 + + sound/soc/ti/ams-delta.c | 2 +- + sound/soc/ti/omap-abe-twl6040.c | 2 +- + sound/soc/ti/omap-mcbsp.c | 3 +- + sound/soc/uniphier/aio-cpu.c | 7 +- + sound/soc/ux500/mop500.c | 6 +- + sound/soc/ux500/mop500_ab8500.h | 2 +- + 284 files changed, 15613 insertions(+), 2472 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/fsl,rpmsg.yaml + create mode 100644 Documentation/devicetree/bindings/sound/mchp,i2s-mcc.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/mchp-i2s-mcc.txt + create mode 100644 Documentation/devicetree/bindings/sound/mt6359-accdet.yaml + create mode 100644 Documentation/devicetree/bindings/sound/rt1019.yaml + delete mode 100644 include/linux/platform_data/asoc-mx27vis.h + delete mode 100644 include/sound/rt5645.h + rename drivers/extcon/extcon-arizona.c => sound/soc/codecs/arizona-jack.c (76%) + create mode 100644 sound/soc/codecs/mt6359-accdet.c + create mode 100644 sound/soc/codecs/mt6359-accdet.h + create mode 100644 sound/soc/codecs/rt1019.c + create mode 100644 sound/soc/codecs/rt1019.h + create mode 100644 sound/soc/codecs/rt1316-sdw.c + create mode 100644 sound/soc/codecs/rt1316-sdw.h + create mode 100644 sound/soc/codecs/rt711-sdca-sdw.c + create mode 100644 sound/soc/codecs/rt711-sdca-sdw.h + create mode 100644 sound/soc/codecs/rt711-sdca.c + create mode 100644 sound/soc/codecs/rt711-sdca.h + create mode 100644 sound/soc/codecs/rt715-sdca-sdw.c + create mode 100644 sound/soc/codecs/rt715-sdca-sdw.h + create mode 100644 sound/soc/codecs/rt715-sdca.c + create mode 100644 sound/soc/codecs/rt715-sdca.h + create mode 100644 sound/soc/codecs/tlv320aic3x-i2c.c + create mode 100644 sound/soc/codecs/tlv320aic3x-spi.c + create mode 100644 sound/soc/fsl/fsl_rpmsg.c + create mode 100644 sound/soc/fsl/fsl_rpmsg.h + create mode 100644 sound/soc/fsl/imx-audio-rpmsg.c + create mode 100644 sound/soc/fsl/imx-pcm-rpmsg.c + create mode 100644 sound/soc/fsl/imx-pcm-rpmsg.h + create mode 100644 sound/soc/fsl/imx-rpmsg.c +Merging modules/modules-next (33121347fb1c module: treat exit sections the same as init sections when !CONFIG_MODULE_UNLOAD) +$ git merge modules/modules-next +Merge made by the 'recursive' strategy. + kernel/module.c | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) +Merging input/next (73e7f1732e80 Input: imx_keypad - convert to a DT-only driver) +$ git merge input/next +Removing Documentation/devicetree/bindings/input/touchscreen/iqs5xx.txt +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-driver-input-exc3000 | 9 + + .../devicetree/bindings/input/atmel,maxtouch.yaml | 32 + + .../devicetree/bindings/input/iqs626a.yaml | 843 +++++++++ + .../bindings/input/touchscreen/azoteq,iqs5xx.yaml | 75 + + .../bindings/input/touchscreen/iqs5xx.txt | 80 - + Documentation/input/devices/rotary-encoder.rst | 8 +- + drivers/input/Makefile | 1 + + drivers/input/keyboard/gpio_keys.c | 89 +- + drivers/input/keyboard/imx_keypad.c | 13 +- + drivers/input/keyboard/tca6416-keypad.c | 3 +- + drivers/input/keyboard/tegra-kbc.c | 5 +- + drivers/input/misc/Kconfig | 11 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/ims-pcu.c | 1 - + drivers/input/misc/iqs626a.c | 1838 ++++++++++++++++++++ + drivers/input/misc/max8997_haptic.c | 9 +- + drivers/input/mouse/elan_i2c.h | 7 +- + drivers/input/mouse/elan_i2c_core.c | 58 +- + .../of_touchscreen.c => touchscreen.c} | 13 +- + drivers/input/touchscreen/Kconfig | 4 - + drivers/input/touchscreen/Makefile | 1 - + drivers/input/touchscreen/ar1021_i2c.c | 5 +- + drivers/input/touchscreen/atmel_mxt_ts.c | 83 +- + drivers/input/touchscreen/bu21029_ts.c | 4 +- + drivers/input/touchscreen/cyttsp_core.c | 18 +- + drivers/input/touchscreen/exc3000.c | 253 +-- + drivers/input/touchscreen/iqs5xx.c | 171 +- + drivers/input/touchscreen/lpc32xx_ts.c | 10 +- + drivers/input/touchscreen/melfas_mip4.c | 5 +- + drivers/input/touchscreen/mms114.c | 4 +- + drivers/input/touchscreen/silead.c | 2 +- + drivers/input/touchscreen/stmfts.c | 3 +- + drivers/input/touchscreen/tsc2007.h | 4 +- + drivers/input/touchscreen/tsc2007_core.c | 60 +- + drivers/input/touchscreen/wacom_i2c.c | 56 +- + drivers/input/touchscreen/wm831x-ts.c | 3 +- + drivers/input/touchscreen/zinitix.c | 4 +- + include/dt-bindings/input/atmel-maxtouch.h | 10 + + 38 files changed, 3333 insertions(+), 463 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/iqs626a.yaml + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/azoteq,iqs5xx.yaml + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/iqs5xx.txt + create mode 100644 drivers/input/misc/iqs626a.c + rename drivers/input/{touchscreen/of_touchscreen.c => touchscreen.c} (93%) + create mode 100644 include/dt-bindings/input/atmel-maxtouch.h +Merging block/for-next (794dda440c66 Merge branch 'for-5.13/block' into for-next) +$ git merge block/for-next +Auto-merging kernel/fork.c +Removing drivers/block/xsysace.c +Removing drivers/block/umem.h +Removing drivers/block/umem.c +Auto-merging arch/mips/configs/maltaup_xpa_defconfig +Auto-merging arch/mips/configs/malta_kvm_defconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/ata/nvidia,tegra124-ahci.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 90 ++ + .../devicetree/bindings/ata/ahci-ceva.txt | 4 + + .../devicetree/bindings/ata/nvidia,tegra-ahci.yaml | 176 +++ + .../bindings/ata/nvidia,tegra124-ahci.txt | 44 - + Documentation/filesystems/locking.rst | 2 - + Documentation/scsi/BusLogic.rst | 26 +- + Documentation/scsi/scsi_mid_low_api.rst | 4 - + MAINTAINERS | 1 - + arch/microblaze/boot/dts/system.dts | 8 - + arch/mips/configs/malta_defconfig | 1 - + arch/mips/configs/malta_kvm_defconfig | 1 - + arch/mips/configs/maltaup_xpa_defconfig | 1 - + arch/powerpc/boot/dts/icon.dts | 7 - + arch/powerpc/configs/44x/icon_defconfig | 1 - + block/bfq-cgroup.c | 2 + + block/bfq-iosched.c | 399 ++++- + block/bfq-iosched.h | 15 + + block/bfq-wf2q.c | 8 + + block/bio-integrity.c | 3 +- + block/blk-core.c | 6 +- + block/blk-map.c | 120 +- + block/blk-mq-tag.c | 8 +- + block/blk-settings.c | 53 +- + block/blk-sysfs.c | 9 +- + block/blk-zoned.c | 8 - + block/blk.h | 17 +- + block/bounce.c | 138 +- + block/elevator.c | 3 +- + block/scsi_ioctl.c | 2 +- + drivers/ata/ahci.c | 5 + + drivers/ata/ahci.h | 1 + + drivers/ata/ahci_ceva.c | 41 +- + drivers/ata/ahci_tegra.c | 60 +- + drivers/ata/ahci_xgene.c | 2 +- + drivers/ata/ata_generic.c | 2 +- + drivers/ata/libahci.c | 5 + + drivers/ata/libahci_platform.c | 4 +- + drivers/ata/libata-acpi.c | 3 +- + drivers/ata/libata-pmp.c | 2 +- + drivers/ata/libata-sata.c | 4 +- + drivers/ata/libata-scsi.c | 3 +- + drivers/ata/libata-transport.c | 6 +- + drivers/ata/pata_acpi.c | 6 +- + drivers/ata/pata_ali.c | 6 +- + drivers/ata/pata_amd.c | 6 +- + drivers/ata/pata_arasan_cf.c | 15 +- + drivers/ata/pata_artop.c | 4 +- + drivers/ata/pata_atiixp.c | 3 +- + drivers/ata/pata_cs5520.c | 2 + + drivers/ata/pata_cs5530.c | 2 +- + drivers/ata/pata_hpt366.c | 1 + + drivers/ata/pata_hpt37x.c | 6 +- + drivers/ata/pata_hpt3x2n.c | 2 +- + drivers/ata/pata_it821x.c | 4 +- + drivers/ata/pata_ixp4xx_cf.c | 6 +- + drivers/ata/pata_jmicron.c | 2 +- + drivers/ata/pata_legacy.c | 106 +- + drivers/ata/pata_marvell.c | 2 +- + drivers/ata/pata_ns87415.c | 4 +- + drivers/ata/pata_opti.c | 2 +- + drivers/ata/pata_optidma.c | 5 +- + drivers/ata/pata_pdc2027x.c | 10 +- + drivers/ata/pata_pdc202xx_old.c | 4 +- + drivers/ata/pata_piccolo.c | 2 +- + drivers/ata/pata_platform.c | 4 +- + drivers/ata/pata_sil680.c | 2 + + drivers/ata/pata_sis.c | 2 +- + drivers/ata/pata_sl82c105.c | 2 +- + drivers/ata/pata_triflex.c | 7 +- + drivers/ata/pata_via.c | 2 +- + drivers/ata/sata_dwc_460ex.c | 10 + + drivers/ata/sata_mv.c | 18 +- + drivers/block/Kconfig | 25 +- + drivers/block/Makefile | 2 - + drivers/block/drbd/drbd_interval.c | 8 +- + drivers/block/drbd/drbd_main.c | 35 +- + drivers/block/drbd/drbd_nl.c | 17 +- + drivers/block/drbd/drbd_receiver.c | 26 +- + drivers/block/drbd/drbd_state.c | 7 +- + drivers/block/floppy.c | 136 +- + drivers/block/mtip32xx/mtip32xx.c | 13 +- + drivers/block/paride/pd.c | 11 - + drivers/block/rsxx/core.c | 2 +- + drivers/block/swim.c | 2 - + drivers/block/swim3.c | 34 +- + drivers/block/umem.c | 1130 -------------- + drivers/block/umem.h | 132 -- + drivers/block/xen-blkfront.c | 6 +- + drivers/block/xsysace.c | 1273 ---------------- + drivers/cdrom/gdrom.c | 5 +- + drivers/md/md.c | 26 +- + drivers/md/md.h | 2 + + drivers/md/raid0.c | 14 +- + drivers/md/raid10.c | 434 +++++- + drivers/md/raid10.h | 1 + + drivers/nvme/host/core.c | 286 ++-- + drivers/nvme/host/fc.c | 14 +- + drivers/nvme/host/lightnvm.c | 2 +- + drivers/nvme/host/multipath.c | 12 +- + drivers/nvme/host/nvme.h | 10 +- + drivers/nvme/host/pci.c | 26 +- + drivers/nvme/host/rdma.c | 7 +- + drivers/nvme/host/tcp.c | 16 +- + drivers/nvme/target/admin-cmd.c | 4 +- + drivers/nvme/target/configfs.c | 6 + + drivers/nvme/target/core.c | 33 +- + drivers/nvme/target/discovery.c | 6 +- + drivers/nvme/target/fabrics-cmd.c | 17 +- + drivers/nvme/target/fc.c | 1 + + drivers/nvme/target/loop.c | 6 +- + drivers/nvme/target/nvmet.h | 8 +- + drivers/nvme/target/tcp.c | 40 +- + drivers/s390/block/dasd.c | 17 +- + drivers/s390/block/dasd_devmap.c | 15 +- + drivers/s390/block/dasd_eckd.c | 1 + + drivers/s390/block/dasd_fba.c | 10 +- + drivers/s390/block/dasd_int.h | 3 +- + drivers/scsi/BusLogic.c | 205 +-- + drivers/scsi/BusLogic.h | 11 - + drivers/scsi/Kconfig | 2 +- + drivers/scsi/advansys.c | 321 +--- + drivers/scsi/aha1542.c | 105 +- + drivers/scsi/esas2r/esas2r_main.c | 1 - + drivers/scsi/hosts.c | 7 +- + drivers/scsi/scsi_debugfs.c | 1 - + drivers/scsi/scsi_lib.c | 52 +- + drivers/scsi/scsi_scan.c | 6 +- + drivers/scsi/scsi_sysfs.c | 2 - + drivers/scsi/sg.c | 10 +- + drivers/scsi/sr_ioctl.c | 12 +- + drivers/scsi/st.c | 20 +- + drivers/scsi/st.h | 2 - + drivers/target/target_core_pscsi.c | 4 +- + fs/block_dev.c | 3 - + fs/io-wq.c | 312 ++-- + fs/io-wq.h | 1 + + fs/io_uring.c | 1566 ++++++++++---------- + include/linux/blkdev.h | 39 +- + include/linux/nvme.h | 10 + + include/linux/task_work.h | 2 + + include/scsi/scsi_cmnd.h | 7 +- + include/scsi/scsi_host.h | 6 - + include/trace/events/io_uring.h | 11 +- + include/uapi/linux/io_uring.h | 17 + + kernel/fork.c | 2 +- + kernel/task_work.c | 35 +- + mm/Kconfig | 9 +- + 147 files changed, 3025 insertions(+), 5179 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ata/nvidia,tegra-ahci.yaml + delete mode 100644 Documentation/devicetree/bindings/ata/nvidia,tegra124-ahci.txt + delete mode 100644 drivers/block/umem.c + delete mode 100644 drivers/block/umem.h + delete mode 100644 drivers/block/xsysace.c +Merging device-mapper/for-next (db7b93e38106 dm integrity: add the "reset_recalculate" feature flag) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + drivers/md/dm-cache-target.c | 2 +- + drivers/md/dm-ebs-target.c | 6 +- + drivers/md/dm-integrity.c | 21 +- + drivers/md/dm-ioctl.c | 294 +++++++++++++++---------- + drivers/md/dm-thin.c | 2 +- + drivers/md/dm-verity-target.c | 40 +++- + drivers/md/dm-writecache.c | 2 +- + drivers/md/dm.c | 63 +++--- + drivers/md/persistent-data/dm-btree-internal.h | 2 +- + drivers/md/persistent-data/dm-btree-spine.c | 6 +- + include/uapi/linux/dm-ioctl.h | 18 +- + 11 files changed, 283 insertions(+), 173 deletions(-) +Merging pcmcia/pcmcia-next (e9d503fef7da pcmcia: rsrc_nonstatic: Fix call-back function as reference formatting) +$ git merge pcmcia/pcmcia-next +Merge made by the 'recursive' strategy. + drivers/pcmcia/cistpl.c | 12 ++++++------ + drivers/pcmcia/ds.c | 7 ++----- + drivers/pcmcia/pcmcia_cis.c | 10 +++++----- + drivers/pcmcia/pcmcia_resource.c | 11 ++++++----- + drivers/pcmcia/rsrc_nonstatic.c | 22 +++++++++++----------- + 5 files changed, 30 insertions(+), 32 deletions(-) +Merging mmc/next (2970134b9278 mmc: sdhci-pci: Fix initialization of some SD cards for Intel BYT-based controllers) +$ git merge mmc/next +Removing Documentation/devicetree/bindings/mmc/sdhci-of-dwcmshc.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 20 ++ + Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 1 + + .../devicetree/bindings/mmc/sdhci-of-dwcmshc.txt | 20 -- + .../bindings/mmc/snps,dwcmshc-sdhci.yaml | 87 ++++++ + drivers/memstick/core/memstick.c | 21 +- + drivers/memstick/core/mspro_block.c | 3 +- + drivers/mmc/core/block.c | 58 ++-- + drivers/mmc/core/core.c | 186 +----------- + drivers/mmc/core/core.h | 8 - + drivers/mmc/core/host.c | 40 ++- + drivers/mmc/core/mmc_ops.c | 39 +-- + drivers/mmc/core/queue.c | 11 +- + drivers/mmc/core/queue.h | 1 - + drivers/mmc/core/sd.c | 6 + + drivers/mmc/core/sdio.c | 28 +- + drivers/mmc/host/Kconfig | 2 + + drivers/mmc/host/cavium.c | 3 +- + drivers/mmc/host/dw_mmc-k3.c | 2 +- + drivers/mmc/host/dw_mmc.c | 16 +- + drivers/mmc/host/renesas_sdhi.h | 2 + + drivers/mmc/host/renesas_sdhi_core.c | 38 ++- + drivers/mmc/host/sdhci-acpi.c | 2 + + drivers/mmc/host/sdhci-brcmstb.c | 1 - + drivers/mmc/host/sdhci-esdhc-imx.c | 24 +- + drivers/mmc/host/sdhci-esdhc-mcf.c | 8 +- + drivers/mmc/host/sdhci-of-aspeed.c | 2 +- + drivers/mmc/host/sdhci-of-dwcmshc.c | 313 +++++++++++++++++++-- + drivers/mmc/host/sdhci-pci-core.c | 31 +- + drivers/mmc/host/sdhci-pci-gli.c | 8 + + drivers/mmc/host/sdhci-pci-o2micro.c | 8 + + drivers/mmc/host/sdhci-pci.h | 2 + + drivers/mmc/host/sdhci-st.c | 19 +- + drivers/mmc/host/sdhci-tegra.c | 34 +-- + drivers/mmc/host/sdhci.c | 113 ++++---- + drivers/mmc/host/sdhci_am654.c | 2 +- + drivers/mmc/host/tmio_mmc.h | 3 +- + drivers/mmc/host/tmio_mmc_core.c | 56 ++-- + drivers/mmc/host/uniphier-sd.c | 5 +- + drivers/mmc/host/via-sdmmc.c | 3 +- + include/linux/mmc/host.h | 5 - + include/linux/mmc/sdio.h | 2 +- + 41 files changed, 744 insertions(+), 489 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mmc/sdhci-of-dwcmshc.txt + create mode 100644 Documentation/devicetree/bindings/mmc/snps,dwcmshc-sdhci.yaml +Merging mfd/for-mfd-next (43e72121b5f6 mfd: intel_quark_i2c_gpio: Don't play dirty trick with const) +$ git merge mfd/for-mfd-next +Removing include/linux/mfd/ab3100.h +Auto-merging drivers/pwm/Makefile +Auto-merging drivers/pwm/Kconfig +Auto-merging drivers/platform/x86/intel_pmt_class.c +Auto-merging drivers/mfd/intel_quark_i2c_gpio.c +Removing drivers/mfd/ab3100-otp.c +Removing drivers/mfd/ab3100-core.c +Auto-merging drivers/mfd/Kconfig +Auto-merging drivers/input/misc/Makefile +Auto-merging drivers/input/misc/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/mfd/rn5t618.txt +Auto-merging CREDITS +Merge made by the 'recursive' strategy. + CREDITS | 3 + + Documentation/devicetree/bindings/input/input.yaml | 7 + + .../devicetree/bindings/mfd/actions,atc260x.yaml | 183 ++++ + .../devicetree/bindings/mfd/netronix,ntxec.yaml | 76 ++ + .../devicetree/bindings/mfd/ricoh,rn5t618.yaml | 111 +++ + Documentation/devicetree/bindings/mfd/rn5t618.txt | 52 -- + .../devicetree/bindings/mfd/rohm,bd9576-pmic.yaml | 123 +++ + .../devicetree/bindings/mfd/ti,lp87524-q1.yaml | 4 + + .../devicetree/bindings/mfd/ti,lp87561-q1.yaml | 4 + + .../devicetree/bindings/mfd/ti,lp87565-q1.yaml | 4 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 68 +- + drivers/input/misc/Kconfig | 11 + + drivers/input/misc/Makefile | 2 +- + drivers/input/misc/atc260x-onkey.c | 305 +++++++ + drivers/mfd/Kconfig | 67 +- + drivers/mfd/Makefile | 7 +- + drivers/mfd/ab3100-core.c | 929 --------------------- + drivers/mfd/ab3100-otp.c | 240 ------ + drivers/mfd/ab8500-core.c | 37 +- + drivers/mfd/arizona-spi.c | 4 +- + drivers/mfd/atc260x-core.c | 310 +++++++ + drivers/mfd/atc260x-i2c.c | 64 ++ + drivers/mfd/da9063-i2c.c | 10 + + drivers/mfd/ene-kb3930.c | 2 +- + drivers/mfd/intel-lpss-acpi.c | 32 +- + drivers/mfd/intel-lpss-pci.c | 46 +- + drivers/mfd/intel-lpss.c | 2 +- + drivers/mfd/intel-lpss.h | 4 +- + drivers/mfd/intel-m10-bmc.c | 30 +- + drivers/mfd/intel_pmt.c | 112 ++- + drivers/mfd/intel_quark_i2c_gpio.c | 79 +- + drivers/mfd/lm3533-core.c | 2 +- + drivers/mfd/mfd-core.c | 7 +- + drivers/mfd/ntxec.c | 271 ++++++ + drivers/mfd/rn5t618.c | 3 + + drivers/mfd/rohm-bd9576.c | 189 +++++ + drivers/mfd/sec-core.c | 14 +- + drivers/mfd/stm32-timers.c | 7 +- + drivers/mfd/stmpe.c | 14 +- + drivers/platform/x86/intel_pmt_class.c | 46 + + drivers/platform/x86/intel_pmt_class.h | 1 + + drivers/platform/x86/intel_pmt_telemetry.c | 20 - + drivers/power/supply/Kconfig | 2 +- + .../abx500 => drivers/power/supply}/ab8500-bm.h | 297 ++++++- + .../power/supply/ab8500-chargalg.h | 6 +- + drivers/power/supply/ab8500_bmdata.c | 3 +- + drivers/power/supply/ab8500_btemp.c | 45 +- + drivers/power/supply/ab8500_charger.c | 27 +- + drivers/power/supply/ab8500_fg.c | 20 +- + drivers/power/supply/abx500_chargalg.c | 22 +- + drivers/power/supply/pm2301_charger.c | 4 +- + drivers/pwm/Kconfig | 8 + + drivers/pwm/Makefile | 1 + + drivers/pwm/pwm-ntxec.c | 184 ++++ + drivers/rtc/Kconfig | 8 + + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-ntxec.c | 145 ++++ + drivers/watchdog/Kconfig | 13 + + drivers/watchdog/Makefile | 1 + + drivers/watchdog/bd9576_wdt.c | 291 +++++++ + include/linux/mfd/ab3100.h | 128 --- + include/linux/mfd/abx500.h | 276 ------ + include/linux/mfd/atc260x/atc2603c.h | 281 +++++++ + include/linux/mfd/atc260x/atc2609a.h | 308 +++++++ + include/linux/mfd/atc260x/core.h | 58 ++ + include/linux/mfd/core.h | 6 +- + include/linux/mfd/da9063/registers.h | 3 + + include/linux/mfd/db8500-prcmu.h | 2 +- + include/linux/mfd/intel-m10-bmc.h | 7 +- + include/linux/mfd/lp87565.h | 3 - + include/linux/mfd/ntxec.h | 38 + + include/linux/mfd/rn5t618.h | 1 + + include/linux/mfd/rohm-bd957x.h | 140 ++++ + include/linux/mfd/rohm-generic.h | 2 + + 75 files changed, 3867 insertions(+), 1968 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/actions,atc260x.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/netronix,ntxec.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/ricoh,rn5t618.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/rn5t618.txt + create mode 100644 Documentation/devicetree/bindings/mfd/rohm,bd9576-pmic.yaml + create mode 100644 drivers/input/misc/atc260x-onkey.c + delete mode 100644 drivers/mfd/ab3100-core.c + delete mode 100644 drivers/mfd/ab3100-otp.c + create mode 100644 drivers/mfd/atc260x-core.c + create mode 100644 drivers/mfd/atc260x-i2c.c + create mode 100644 drivers/mfd/ntxec.c + create mode 100644 drivers/mfd/rohm-bd9576.c + rename {include/linux/mfd/abx500 => drivers/power/supply}/ab8500-bm.h (58%) + rename include/linux/mfd/abx500/ux500_chargalg.h => drivers/power/supply/ab8500-chargalg.h (93%) + create mode 100644 drivers/pwm/pwm-ntxec.c + create mode 100644 drivers/rtc/rtc-ntxec.c + create mode 100644 drivers/watchdog/bd9576_wdt.c + delete mode 100644 include/linux/mfd/ab3100.h + create mode 100644 include/linux/mfd/atc260x/atc2603c.h + create mode 100644 include/linux/mfd/atc260x/atc2609a.h + create mode 100644 include/linux/mfd/atc260x/core.h + create mode 100644 include/linux/mfd/ntxec.h + create mode 100644 include/linux/mfd/rohm-bd957x.h +Merging backlight/for-backlight-next (225be60f3853 dt-bindings: backlight: qcom-wled: Add PMI8994 compatible) +$ git merge backlight/for-backlight-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml | 1 + + 1 file changed, 1 insertion(+) +Merging battery/for-next (04722cec1436 power: supply: bq25980: Move props from battery node) +$ git merge battery/for-next +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/power/supply/twl-charger.txt +Removing Documentation/devicetree/bindings/power/supply/tps65217_charger.txt +Removing Documentation/devicetree/bindings/power/supply/tps65090.txt +Removing Documentation/devicetree/bindings/power/supply/ti,bq24735.txt +Removing Documentation/devicetree/bindings/power/supply/sc27xx-fg.txt +Removing Documentation/devicetree/bindings/power/supply/sc2731_charger.txt +Removing Documentation/devicetree/bindings/power/supply/sbs_sbs-charger.txt +Removing Documentation/devicetree/bindings/power/supply/sbs,sbs-manager.txt +Removing Documentation/devicetree/bindings/power/supply/rx51-battery.txt +Removing Documentation/devicetree/bindings/power/supply/rt9455_charger.txt +Removing Documentation/devicetree/bindings/power/supply/qcom_smbb.txt +Removing Documentation/devicetree/bindings/power/supply/qcom,coincell-charger.txt +Removing Documentation/devicetree/bindings/power/supply/power_supply.txt +Removing Documentation/devicetree/bindings/power/supply/olpc_battery.txt +Removing Documentation/devicetree/bindings/power/supply/microchip,ucs1002.txt +Removing Documentation/devicetree/bindings/power/supply/maxim,max14656.txt +Removing Documentation/devicetree/bindings/power/supply/maxim,ds2760.txt +Removing Documentation/devicetree/bindings/power/supply/max8903-charger.txt +Removing Documentation/devicetree/bindings/power/supply/max17042_battery.txt +Removing Documentation/devicetree/bindings/power/supply/max17040_battery.txt +Removing Documentation/devicetree/bindings/power/supply/ltc2941.txt +Removing Documentation/devicetree/bindings/power/supply/lt3651-charger.txt +Removing Documentation/devicetree/bindings/power/supply/lp8727_charger.txt +Removing Documentation/devicetree/bindings/power/supply/lego_ev3_battery.txt +Removing Documentation/devicetree/bindings/power/supply/isp1704.txt +Removing Documentation/devicetree/bindings/power/supply/da9150-fg.txt +Removing Documentation/devicetree/bindings/power/supply/da9150-charger.txt +Removing Documentation/devicetree/bindings/power/supply/cpcap-charger.txt +Removing Documentation/devicetree/bindings/power/supply/cpcap-battery.txt +Removing Documentation/devicetree/bindings/power/supply/bq25890.txt +Removing Documentation/devicetree/bindings/power/supply/bq24257.txt +Removing Documentation/devicetree/bindings/power/supply/bq24190.txt +Removing Documentation/devicetree/bindings/power/supply/bq2415x.txt +Removing Documentation/devicetree/bindings/power/supply/battery.txt +Removing Documentation/devicetree/bindings/power/supply/axp20x_usb_power.txt +Removing Documentation/devicetree/bindings/power/supply/axp20x_battery.txt +Removing Documentation/devicetree/bindings/power/supply/axp20x_ac_power.txt +Removing Documentation/devicetree/bindings/power/supply/act8945a-charger.txt +Removing Documentation/devicetree/bindings/power/supply/ab8500/charger.txt +Removing Documentation/devicetree/bindings/power/supply/ab8500/chargalg.txt +Removing Documentation/devicetree/bindings/power/supply/ab8500/btemp.txt +Merge made by the 'recursive' strategy. + .../bindings/power/reset/ltc2952-poweroff.txt | 4 + + .../bindings/power/supply/ab8500/btemp.txt | 16 -- + .../bindings/power/supply/ab8500/chargalg.txt | 16 -- + .../bindings/power/supply/ab8500/charger.txt | 25 --- + .../bindings/power/supply/act8945a-charger.txt | 44 ------ + .../power/supply/active-semi,act8945a-charger.yaml | 76 +++++++++ + .../bindings/power/supply/axp20x_ac_power.txt | 25 --- + .../bindings/power/supply/axp20x_battery.txt | 20 --- + .../bindings/power/supply/axp20x_usb_power.txt | 41 ----- + .../devicetree/bindings/power/supply/battery.txt | 3 - + .../devicetree/bindings/power/supply/bq2415x.txt | 47 ------ + .../devicetree/bindings/power/supply/bq2415x.yaml | 98 ++++++++++++ + .../devicetree/bindings/power/supply/bq24190.txt | 61 -------- + .../devicetree/bindings/power/supply/bq24190.yaml | 92 +++++++++++ + .../devicetree/bindings/power/supply/bq24257.txt | 62 -------- + .../devicetree/bindings/power/supply/bq24257.yaml | 124 +++++++++++++++ + .../devicetree/bindings/power/supply/bq24735.yaml | 89 +++++++++++ + .../devicetree/bindings/power/supply/bq25890.txt | 60 -------- + .../devicetree/bindings/power/supply/bq25890.yaml | 123 +++++++++++++++ + .../devicetree/bindings/power/supply/bq27xxx.yaml | 3 +- + .../bindings/power/supply/cpcap-battery.txt | 31 ---- + .../bindings/power/supply/cpcap-battery.yaml | 87 +++++++++++ + .../bindings/power/supply/cpcap-charger.txt | 40 ----- + .../bindings/power/supply/cpcap-charger.yaml | 106 +++++++++++++ + .../bindings/power/supply/da9150-charger.txt | 26 ---- + .../devicetree/bindings/power/supply/da9150-fg.txt | 23 --- + .../bindings/power/supply/dlg,da9150-charger.yaml | 52 +++++++ + .../power/supply/dlg,da9150-fuel-gauge.yaml | 51 +++++++ + .../devicetree/bindings/power/supply/isp1704.txt | 17 --- + .../devicetree/bindings/power/supply/isp1704.yaml | 42 +++++ + .../bindings/power/supply/lego,ev3-battery.yaml | 55 +++++++ + .../bindings/power/supply/lego_ev3_battery.txt | 21 --- + .../bindings/power/supply/lltc,lt3651-charger.yaml | 44 ++++++ + .../bindings/power/supply/lltc,ltc294x.yaml | 66 ++++++++ + .../bindings/power/supply/lp8727_charger.txt | 43 ------ + .../bindings/power/supply/lt3651-charger.txt | 29 ---- + .../devicetree/bindings/power/supply/ltc2941.txt | 28 ---- + .../bindings/power/supply/max17040_battery.txt | 52 ------- + .../bindings/power/supply/max17042_battery.txt | 35 ----- + .../bindings/power/supply/max8903-charger.txt | 24 --- + .../bindings/power/supply/maxim,ds2760.txt | 26 ---- + .../bindings/power/supply/maxim,ds2760.yaml | 43 ++++++ + .../bindings/power/supply/maxim,max14656.txt | 23 --- + .../bindings/power/supply/maxim,max14656.yaml | 45 ++++++ + .../bindings/power/supply/maxim,max17040.yaml | 95 ++++++++++++ + .../bindings/power/supply/maxim,max17042.yaml | 78 ++++++++++ + .../bindings/power/supply/maxim,max8903.yaml | 67 ++++++++ + .../bindings/power/supply/microchip,ucs1002.txt | 27 ---- + .../bindings/power/supply/microchip,ucs1002.yaml | 51 +++++++ + .../bindings/power/supply/nokia,n900-battery.yaml | 49 ++++++ + .../bindings/power/supply/olpc-battery.yaml | 27 ++++ + .../bindings/power/supply/olpc_battery.txt | 5 - + .../bindings/power/supply/power_supply.txt | 2 - + .../power/supply/qcom,coincell-charger.txt | 48 ------ + .../bindings/power/supply/qcom,pm8941-charger.yaml | 169 +++++++++++++++++++++ + .../power/supply/qcom,pm8941-coincell.yaml | 57 +++++++ + .../devicetree/bindings/power/supply/qcom_smbb.txt | 150 ------------------ + .../bindings/power/supply/richtek,rt9455.yaml | 90 +++++++++++ + .../bindings/power/supply/rohm,bd99954.yaml | 2 +- + .../bindings/power/supply/rt9455_charger.txt | 46 ------ + .../bindings/power/supply/rx51-battery.txt | 25 --- + .../bindings/power/supply/sbs,sbs-battery.yaml | 7 +- + .../bindings/power/supply/sbs,sbs-charger.yaml | 55 +++++++ + .../bindings/power/supply/sbs,sbs-manager.txt | 66 -------- + .../bindings/power/supply/sbs,sbs-manager.yaml | 107 +++++++++++++ + .../bindings/power/supply/sbs_sbs-charger.txt | 21 --- + .../bindings/power/supply/sc2731-charger.yaml | 53 +++++++ + .../bindings/power/supply/sc2731_charger.txt | 40 ----- + .../devicetree/bindings/power/supply/sc27xx-fg.txt | 59 ------- + .../bindings/power/supply/sc27xx-fg.yaml | 98 ++++++++++++ + .../fg.txt => stericsson,ab8500-battery.txt} | 32 +--- + .../power/supply/stericsson,ab8500-btemp.yaml | 73 +++++++++ + .../power/supply/stericsson,ab8500-chargalg.yaml | 37 +++++ + .../power/supply/stericsson,ab8500-charger.yaml | 123 +++++++++++++++ + .../power/supply/stericsson,ab8500-fg.yaml | 72 +++++++++ + .../bindings/power/supply/ti,bq24735.txt | 39 ----- + .../bindings/power/supply/ti,lp8727.yaml | 90 +++++++++++ + .../bindings/power/supply/tps65090-charger.yaml | 36 +++++ + .../devicetree/bindings/power/supply/tps65090.txt | 17 --- + .../bindings/power/supply/tps65217-charger.yaml | 43 ++++++ + .../bindings/power/supply/tps65217_charger.txt | 17 --- + .../bindings/power/supply/twl-charger.txt | 30 ---- + .../bindings/power/supply/twl4030-charger.yaml | 68 +++++++++ + .../supply/x-powers,axp20x-ac-power-supply.yaml | 32 ++++ + .../x-powers,axp20x-battery-power-supply.yaml | 30 ++++ + .../supply/x-powers,axp20x-usb-power-supply.yaml | 33 ++++ + Documentation/power/power_supply_class.rst | 2 +- + MAINTAINERS | 9 +- + drivers/power/reset/Makefile | 2 +- + drivers/power/reset/at91-reset.c | 4 +- + drivers/power/reset/hisi-reboot.c | 4 +- + drivers/power/reset/ltc2952-poweroff.c | 8 + + drivers/power/reset/vexpress-poweroff.c | 2 +- + drivers/power/supply/88pm860x_battery.c | 4 +- + drivers/power/supply/Kconfig | 6 +- + drivers/power/supply/axp20x_usb_power.c | 4 +- + drivers/power/supply/bq25980_charger.c | 40 ++--- + drivers/power/supply/bq27xxx_battery.c | 169 +++++++++++++-------- + drivers/power/supply/bq27xxx_battery_i2c.c | 2 + + drivers/power/supply/charger-manager.c | 2 +- + drivers/power/supply/cpcap-charger.c | 7 +- + drivers/power/supply/cw2015_battery.c | 6 + + drivers/power/supply/ds2781_battery.c | 8 +- + drivers/power/supply/lp8788-charger.c | 2 +- + drivers/power/supply/max17042_battery.c | 8 +- + drivers/power/supply/max1721x_battery.c | 14 +- + drivers/power/supply/max8997_charger.c | 14 +- + drivers/power/supply/pm2301_charger.c | 2 +- + drivers/power/supply/power_supply_core.c | 4 +- + drivers/power/supply/s3c_adc_battery.c | 19 +-- + drivers/power/supply/sbs-battery.c | 28 ++-- + drivers/power/supply/sbs-charger.c | 24 +-- + drivers/power/supply/sbs-manager.c | 78 ++++------ + drivers/power/supply/smb347-charger.c | 65 ++++---- + drivers/power/supply/tps65090-charger.c | 2 +- + drivers/power/supply/tps65217_charger.c | 2 +- + drivers/power/supply/z2_battery.c | 3 - + include/linux/power/bq27xxx_battery.h | 2 +- + include/linux/power_supply.h | 14 +- + 119 files changed, 3136 insertions(+), 1728 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/power/supply/ab8500/btemp.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/ab8500/chargalg.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/ab8500/charger.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/act8945a-charger.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/active-semi,act8945a-charger.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/axp20x_ac_power.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/axp20x_battery.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/axp20x_usb_power.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/battery.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/bq2415x.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/bq2415x.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/bq24190.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/bq24190.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/bq24257.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/bq24257.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/bq24735.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/bq25890.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/bq25890.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/cpcap-battery.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/cpcap-battery.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/cpcap-charger.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/cpcap-charger.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/da9150-charger.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/da9150-fg.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/dlg,da9150-charger.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/dlg,da9150-fuel-gauge.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/isp1704.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/isp1704.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/lego,ev3-battery.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/lego_ev3_battery.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/lltc,lt3651-charger.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/lltc,ltc294x.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/lp8727_charger.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/lt3651-charger.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/ltc2941.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/max17040_battery.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/max17042_battery.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/max8903-charger.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/maxim,ds2760.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/maxim,ds2760.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/maxim,max14656.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/maxim,max14656.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/maxim,max17040.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/maxim,max17042.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/maxim,max8903.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/microchip,ucs1002.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/microchip,ucs1002.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/nokia,n900-battery.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/olpc-battery.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/olpc_battery.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/power_supply.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/qcom,coincell-charger.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/qcom,pm8941-charger.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/qcom,pm8941-coincell.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/qcom_smbb.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/richtek,rt9455.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/rt9455_charger.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/rx51-battery.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/sbs,sbs-charger.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/sbs,sbs-manager.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/sbs,sbs-manager.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/sbs_sbs-charger.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/sc2731-charger.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/sc2731_charger.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/sc27xx-fg.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/sc27xx-fg.yaml + rename Documentation/devicetree/bindings/power/supply/{ab8500/fg.txt => stericsson,ab8500-battery.txt} (52%) + create mode 100644 Documentation/devicetree/bindings/power/supply/stericsson,ab8500-btemp.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/stericsson,ab8500-chargalg.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/stericsson,ab8500-charger.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/stericsson,ab8500-fg.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/ti,bq24735.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/ti,lp8727.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/tps65090-charger.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/tps65090.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/tps65217-charger.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/tps65217_charger.txt + delete mode 100644 Documentation/devicetree/bindings/power/supply/twl-charger.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/twl4030-charger.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/x-powers,axp20x-ac-power-supply.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/x-powers,axp20x-battery-power-supply.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/x-powers,axp20x-usb-power-supply.yaml +Merging regulator/for-next (dc6c17ce1886 Merge remote-tracking branch 'regulator/for-5.13' into regulator-next) +$ git merge regulator/for-next +Auto-merging drivers/regulator/scmi-regulator.c +Removing Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt +Merge made by the 'recursive' strategy. + .../bindings/regulator/qcom,rpmh-regulator.txt | 180 --------------------- + .../bindings/regulator/qcom,rpmh-regulator.yaml | 162 +++++++++++++++++++ + drivers/regulator/bd9576-regulator.c | 11 +- + drivers/regulator/helpers.c | 101 +++++++++++- + drivers/regulator/mt6360-regulator.c | 4 +- + drivers/regulator/pf8x00-regulator.c | 1 + + drivers/regulator/qcom-rpmh-regulator.c | 62 ++++++- + drivers/regulator/qcom_spmi-regulator.c | 2 + + drivers/regulator/scmi-regulator.c | 4 +- + include/linux/regulator/driver.h | 7 + + 10 files changed, 334 insertions(+), 200 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt + create mode 100644 Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.yaml +Merging security/next-testing (215042ece980 Merge branch 'landlock_lsm' into next-testing) +$ git merge security/next-testing +Auto-merging security/selinux/ss/services.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/syscalls.h +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/arm64/include/asm/unistd.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd.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 arch/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/userspace-api/index.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/unistd.h' 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 2aa96334c86d] Merge remote-tracking branch 'security/next-testing' +$ git diff -M --stat --summary HEAD^.. + Documentation/security/index.rst | 1 + + Documentation/security/landlock.rst | 79 + + Documentation/userspace-api/index.rst | 1 + + Documentation/userspace-api/landlock.rst | 307 +++ + MAINTAINERS | 15 + + arch/Kconfig | 7 + + arch/alpha/kernel/syscalls/syscall.tbl | 3 + + arch/arm/tools/syscall.tbl | 3 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 6 + + arch/ia64/kernel/syscalls/syscall.tbl | 3 + + arch/m68k/kernel/syscalls/syscall.tbl | 3 + + arch/microblaze/kernel/syscalls/syscall.tbl | 3 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 3 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 3 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 3 + + arch/parisc/kernel/syscalls/syscall.tbl | 3 + + arch/powerpc/kernel/syscalls/syscall.tbl | 3 + + arch/s390/kernel/syscalls/syscall.tbl | 3 + + arch/sh/kernel/syscalls/syscall.tbl | 3 + + arch/sparc/kernel/syscalls/syscall.tbl | 3 + + arch/um/Kconfig | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 3 + + arch/x86/entry/syscalls/syscall_64.tbl | 3 + + arch/xtensa/kernel/syscalls/syscall.tbl | 3 + + fs/super.c | 1 + + include/linux/lsm_hook_defs.h | 1 + + include/linux/lsm_hooks.h | 4 + + include/linux/security.h | 4 + + include/linux/syscalls.h | 7 + + include/uapi/asm-generic/unistd.h | 8 +- + include/uapi/linux/landlock.h | 128 ++ + kernel/sys_ni.c | 5 + + samples/Kconfig | 7 + + samples/Makefile | 1 + + samples/landlock/.gitignore | 1 + + samples/landlock/Makefile | 13 + + samples/landlock/sandboxer.c | 238 ++ + security/Kconfig | 11 +- + security/Makefile | 2 + + security/landlock/Kconfig | 21 + + security/landlock/Makefile | 4 + + security/landlock/common.h | 20 + + security/landlock/cred.c | 46 + + security/landlock/cred.h | 58 + + security/landlock/fs.c | 687 ++++++ + security/landlock/fs.h | 56 + + security/landlock/limits.h | 21 + + security/landlock/object.c | 67 + + security/landlock/object.h | 91 + + security/landlock/ptrace.c | 120 + + security/landlock/ptrace.h | 14 + + security/landlock/ruleset.c | 473 ++++ + security/landlock/ruleset.h | 165 ++ + security/landlock/setup.c | 40 + + security/landlock/setup.h | 18 + + security/landlock/syscalls.c | 445 ++++ + security/security.c | 51 +- + security/selinux/hooks.c | 58 +- + security/selinux/include/objsec.h | 6 + + security/selinux/ss/services.c | 3 +- + security/smack/smack.h | 6 + + security/smack/smack_lsm.c | 35 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/landlock/.gitignore | 2 + + tools/testing/selftests/landlock/Makefile | 24 + + tools/testing/selftests/landlock/base_test.c | 219 ++ + tools/testing/selftests/landlock/common.h | 183 ++ + tools/testing/selftests/landlock/config | 7 + + tools/testing/selftests/landlock/fs_test.c | 2792 ++++++++++++++++++++++++ + tools/testing/selftests/landlock/ptrace_test.c | 337 +++ + tools/testing/selftests/landlock/true.c | 5 + + 72 files changed, 6896 insertions(+), 77 deletions(-) + create mode 100644 Documentation/security/landlock.rst + create mode 100644 Documentation/userspace-api/landlock.rst + create mode 100644 include/uapi/linux/landlock.h + create mode 100644 samples/landlock/.gitignore + create mode 100644 samples/landlock/Makefile + create mode 100644 samples/landlock/sandboxer.c + create mode 100644 security/landlock/Kconfig + create mode 100644 security/landlock/Makefile + create mode 100644 security/landlock/common.h + create mode 100644 security/landlock/cred.c + create mode 100644 security/landlock/cred.h + create mode 100644 security/landlock/fs.c + create mode 100644 security/landlock/fs.h + create mode 100644 security/landlock/limits.h + create mode 100644 security/landlock/object.c + create mode 100644 security/landlock/object.h + create mode 100644 security/landlock/ptrace.c + create mode 100644 security/landlock/ptrace.h + create mode 100644 security/landlock/ruleset.c + create mode 100644 security/landlock/ruleset.h + create mode 100644 security/landlock/setup.c + create mode 100644 security/landlock/setup.h + create mode 100644 security/landlock/syscalls.c + create mode 100644 tools/testing/selftests/landlock/.gitignore + create mode 100644 tools/testing/selftests/landlock/Makefile + create mode 100644 tools/testing/selftests/landlock/base_test.c + create mode 100644 tools/testing/selftests/landlock/common.h + create mode 100644 tools/testing/selftests/landlock/config + create mode 100644 tools/testing/selftests/landlock/fs_test.c + create mode 100644 tools/testing/selftests/landlock/ptrace_test.c + create mode 100644 tools/testing/selftests/landlock/true.c +Merging apparmor/apparmor-next (d108370c644b apparmor: fix error check) +$ git merge apparmor/apparmor-next +Auto-merging security/apparmor/policy_unpack.c +Auto-merging security/apparmor/policy.c +Auto-merging security/apparmor/lsm.c +Auto-merging security/apparmor/label.c +Auto-merging security/apparmor/include/label.h +Auto-merging security/apparmor/include/file.h +Auto-merging security/apparmor/apparmorfs.c +Merge made by the 'recursive' strategy. + security/apparmor/apparmorfs.c | 4 +-- + security/apparmor/include/file.h | 2 +- + security/apparmor/include/label.h | 1 + + security/apparmor/include/policy.h | 6 ++-- + security/apparmor/label.c | 4 +-- + security/apparmor/lsm.c | 22 +++++++------- + security/apparmor/path.c | 2 +- + security/apparmor/policy.c | 59 ++++++++++++++++++++++++++++++++------ + security/apparmor/policy_unpack.c | 2 +- + 9 files changed, 73 insertions(+), 29 deletions(-) +Merging integrity/next-integrity (5d5ef1af839d Merge branch 'ima-module-signing' into next-integrity) +$ git merge integrity/next-integrity +Auto-merging init/Kconfig +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 6 ++--- + certs/Kconfig | 2 +- + certs/Makefile | 8 ++++++ + certs/system_certificates.S | 13 +++++++++- + certs/system_keyring.c | 47 +++++++++++++++++++++++++++-------- + include/keys/system_keyring.h | 7 ++++++ + init/Kconfig | 6 ++--- + security/integrity/digsig.c | 2 ++ + security/integrity/ima/ima_main.c | 6 +++++ + security/integrity/ima/ima_template.c | 4 +-- + 10 files changed, 81 insertions(+), 20 deletions(-) +Merging keys/keys-next (e377c31f788f integrity: Load mokx variables into the blacklist keyring) +$ git merge keys/keys-next +Auto-merging scripts/Makefile +Auto-merging include/keys/system_keyring.h +Auto-merging certs/system_keyring.c +CONFLICT (content): Merge conflict in certs/system_keyring.c +Auto-merging certs/Makefile +Auto-merging certs/Kconfig +Resolved 'certs/system_keyring.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d613c576af0d] Merge remote-tracking branch 'keys/keys-next' +$ git diff -M --stat --summary HEAD^.. + certs/Kconfig | 17 ++++++ + certs/Makefile | 21 ++++++- + certs/blacklist.c | 64 ++++++++++++++++++++ + certs/blacklist.h | 2 + + certs/common.c | 57 ++++++++++++++++++ + certs/common.h | 9 +++ + certs/revocation_certificates.S | 21 +++++++ + certs/system_keyring.c | 68 ++++------------------ + include/keys/system_keyring.h | 15 +++++ + scripts/Makefile | 1 + + .../integrity/platform_certs/keyring_handler.c | 11 ++++ + security/integrity/platform_certs/load_uefi.c | 20 ++++++- + 12 files changed, 245 insertions(+), 61 deletions(-) + create mode 100644 certs/common.c + create mode 100644 certs/common.h + create mode 100644 certs/revocation_certificates.S +Merging safesetid/safesetid-next (03ca0ec13892 LSM: SafeSetID: Fix warnings reported by test bot) +$ git merge safesetid/safesetid-next +Already up to date. +Merging selinux/next (1fb057dcde11 smack: differentiate between subjective and objective task credentials) +$ git merge selinux/next +Auto-merging security/smack/smack_lsm.c +Auto-merging security/smack/smack.h +Auto-merging security/selinux/ss/services.c +Auto-merging security/selinux/selinuxfs.c +Auto-merging security/selinux/include/security.h +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging security/integrity/ima/ima_main.c +Auto-merging security/apparmor/lsm.c +Auto-merging kernel/bpf/bpf_lsm.c +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/lsm_hook_defs.h +Auto-merging fs/nfs/internal.h +Merge made by the 'recursive' strategy. + drivers/android/binder.c | 11 ++- + fs/nfs/fs_context.c | 3 + + fs/nfs/internal.h | 1 + + fs/nfs/super.c | 6 +- + include/linux/cred.h | 2 +- + include/linux/lsm_hook_defs.h | 6 +- + include/linux/lsm_hooks.h | 18 +++- + include/linux/nfs_fs_sb.h | 1 + + include/linux/security.h | 18 +++- + kernel/audit.c | 4 +- + kernel/auditfilter.c | 3 +- + kernel/auditsc.c | 8 +- + kernel/bpf/bpf_lsm.c | 3 +- + net/netlabel/netlabel_unlabeled.c | 2 +- + net/netlabel/netlabel_user.h | 2 +- + security/apparmor/lsm.c | 3 +- + security/integrity/ima/ima_appraise.c | 2 +- + security/integrity/ima/ima_main.c | 14 +-- + security/security.c | 20 +++- + security/selinux/hooks.c | 170 ++++++++++++++++++++++++++-------- + security/selinux/ima.c | 87 ++++++++++++++++- + security/selinux/include/ima.h | 6 ++ + security/selinux/include/security.h | 2 +- + security/selinux/selinuxfs.c | 6 ++ + security/selinux/ss/hashtab.c | 2 +- + security/selinux/ss/services.c | 2 +- + security/smack/smack.h | 18 +++- + security/smack/smack_lsm.c | 39 +++++--- + 28 files changed, 369 insertions(+), 90 deletions(-) +Merging smack/next (7ef4c19d245f smackfs: restrict bytes count in smackfs write functions) +$ git merge smack/next +Already up to date. +Merging tomoyo/master (5dc33592e955 lockdep: Allow tuning tracing capacity constants.) +$ git merge tomoyo/master +Auto-merging lib/Kconfig.debug +Merge made by the 'recursive' strategy. + kernel/locking/lockdep.c | 2 +- + kernel/locking/lockdep_internals.h | 8 ++++---- + lib/Kconfig.debug | 40 ++++++++++++++++++++++++++++++++++++++ + 3 files changed, 45 insertions(+), 5 deletions(-) +Merging tpmdd/next (8b12a62a4e3e Merge tag 'drm-fixes-2021-03-19' of git://anongit.freedesktop.org/drm/drm) +$ git merge tpmdd/next +Already up to date. +Merging watchdog/master (1e28eed17697 Linux 5.12-rc3) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (2b2b52ac637e Merge branches 'iommu/fixes', 'arm/mediatek', 'unisoc', 'x86/vt-d', 'x86/amd' and 'core' into next) +$ git merge iommu/next +Auto-merging include/linux/cpuhotplug.h +Auto-merging drivers/soc/fsl/qbman/qman_portal.c +Auto-merging drivers/iommu/dma-iommu.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_iommu.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 15 +- + .../devicetree/bindings/iommu/sprd,iommu.yaml | 57 ++ + arch/powerpc/include/asm/fsl_pamu_stash.h | 12 +- + arch/x86/events/amd/iommu.c | 1 + + arch/x86/events/amd/iommu.h | 19 - + drivers/acpi/arm64/iort.c | 13 +- + drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 4 - + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 5 +- + drivers/iommu/Kconfig | 16 +- + drivers/iommu/Makefile | 3 +- + drivers/iommu/amd/amd_iommu.h | 2 - + drivers/iommu/amd/amd_iommu_types.h | 1 - + drivers/iommu/amd/init.c | 5 - + drivers/iommu/amd/iommu.c | 116 +--- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 236 ++++--- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 14 +- + drivers/iommu/arm/arm-smmu/arm-smmu.c | 111 +--- + drivers/iommu/arm/arm-smmu/arm-smmu.h | 2 +- + drivers/iommu/dma-iommu.c | 23 +- + drivers/iommu/fsl_pamu.c | 293 +-------- + drivers/iommu/fsl_pamu.h | 12 +- + drivers/iommu/fsl_pamu_domain.c | 688 ++------------------- + drivers/iommu/fsl_pamu_domain.h | 46 -- + drivers/iommu/intel/dmar.c | 68 +- + drivers/iommu/intel/iommu.c | 178 ++---- + drivers/iommu/intel/pasid.c | 73 ++- + drivers/iommu/intel/pasid.h | 6 +- + drivers/iommu/intel/svm.c | 82 ++- + drivers/iommu/io-pgfault.c | 461 ++++++++++++++ + drivers/iommu/iommu-sva-lib.h | 53 ++ + drivers/iommu/iommu.c | 142 ++--- + drivers/iommu/iova.c | 96 ++- + drivers/iommu/mtk_iommu.c | 17 +- + drivers/iommu/mtk_iommu_v1.c | 10 +- + drivers/iommu/of_iommu.c | 5 - + drivers/iommu/sprd-iommu.c | 577 +++++++++++++++++ + drivers/misc/uacce/uacce.c | 39 +- + drivers/soc/fsl/qbman/qman_portal.c | 55 +- + drivers/vfio/vfio_iommu_type1.c | 31 +- + drivers/vhost/vdpa.c | 10 +- + include/linux/amd-iommu.h | 30 +- + include/linux/cpuhotplug.h | 2 +- + include/linux/dma-iommu.h | 7 +- + include/linux/intel-iommu.h | 10 +- + include/linux/intel-svm.h | 23 +- + include/linux/io-pgtable.h | 4 - + include/linux/iommu.h | 104 +--- + include/linux/iova.h | 6 +- + include/trace/events/intel_iommu.h | 120 ---- + include/uapi/linux/iommu.h | 3 +- + 50 files changed, 1926 insertions(+), 1980 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iommu/sprd,iommu.yaml + create mode 100644 drivers/iommu/io-pgfault.c + create mode 100644 drivers/iommu/sprd-iommu.c +Merging audit/next (b75d8f38bcc9 audit: drop /proc/PID/loginuid documentation Format field) +$ git merge audit/next +Auto-merging kernel/auditsc.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/procfs-audit_loginuid | 27 ++++++++++++++++++++++++++ + MAINTAINERS | 2 ++ + kernel/audit.h | 12 ++++++------ + kernel/auditsc.c | 11 ++++------- + 4 files changed, 39 insertions(+), 13 deletions(-) + create mode 100644 Documentation/ABI/stable/procfs-audit_loginuid +Merging devicetree/for-next (56ddc4cd4c8f docs: dt: update writing-schema.rst references) +$ git merge devicetree/for-next +Auto-merging scripts/checkpatch.pl +Auto-merging scripts/Makefile.lib +Auto-merging drivers/of/overlay.c +Auto-merging drivers/of/fdt.c +Removing arch/powerpc/kexec/ima.c +Removing arch/powerpc/include/asm/ima.h +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml +Auto-merging Documentation/devicetree/bindings/submitting-patches.rst +Auto-merging Documentation/devicetree/bindings/sound/renesas,rsnd.yaml +Removing Documentation/devicetree/bindings/net/wireless/brcm,bcm43xx-fmac.txt +Removing Documentation/devicetree/bindings/media/video-mux.txt +Auto-merging Documentation/devicetree/bindings/input/input.yaml +Auto-merging Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml +Auto-merging Documentation/devicetree/bindings/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/Makefile | 5 +- + .../arm/bcm/raspberrypi,bcm2835-firmware.yaml | 5 +- + Documentation/devicetree/bindings/arm/cpus.yaml | 2 - + .../clock/allwinner,sun4i-a10-pll1-clk.yaml | 2 +- + .../bindings/clock/armada3700-tbg-clock.txt | 2 +- + .../devicetree/bindings/clock/milbeaut-clock.yaml | 12 +- + Documentation/devicetree/bindings/ddr/lpddr3.txt | 5 + + .../bindings/display/allwinner,sun4i-a10-tcon.yaml | 1 - + .../bindings/display/brcm,bcm2835-dsi0.yaml | 6 - + .../devicetree/bindings/display/msm/dpu.txt | 4 +- + .../bindings/display/panel/panel-dpi.yaml | 2 +- + .../devicetree/bindings/dma/qcom,gpi.yaml | 2 +- + .../bindings/gpio/socionext,uniphier-gpio.yaml | 3 +- + .../bindings/i2c/xlnx,xps-iic-2.00.a.yaml | 2 +- + Documentation/devicetree/bindings/i3c/i3c.yaml | 7 +- + .../bindings/iio/adc/brcm,iproc-static-adc.yaml | 5 - + .../bindings/iio/gyroscope/nxp,fxas21002c.yaml | 2 +- + .../bindings/iio/light/capella,cm3605.yaml | 1 - + .../bindings/iio/light/upisemi,us5182.yaml | 4 +- + Documentation/devicetree/bindings/index.rst | 7 +- + Documentation/devicetree/bindings/input/input.yaml | 1 - + .../interrupt-controller/loongson,htpic.yaml | 2 +- + .../devicetree/bindings/leds/leds-lgm.yaml | 26 +- + .../bindings/media/qcom,sm8250-venus.yaml | 167 ++++++++ + .../bindings/media/video-interfaces.yaml | 127 ------ + .../devicetree/bindings/media/video-mux.txt | 60 --- + .../devicetree/bindings/media/video-mux.yaml | 106 +++++ + .../memory-controllers/nvidia,tegra210-emc.yaml | 2 +- + .../devicetree/bindings/net/can/fsl,flexcan.yaml | 1 - + .../bindings/net/wireless/brcm,bcm4329-fmac.yaml | 101 +++++ + .../bindings/net/wireless/brcm,bcm43xx-fmac.txt | 38 -- + .../devicetree/bindings/nvmem/nvmem-consumer.yaml | 4 +- + .../devicetree/bindings/phy/ti,phy-j721e-wiz.yaml | 2 +- + .../devicetree/bindings/power/supply/bq256xx.yaml | 1 - + .../bindings/power/supply/cw2015_battery.yaml | 2 +- + .../bindings/power/supply/ltc4162-l.yaml | 2 - + .../bindings/power/supply/power-supply.yaml | 22 - + .../bindings/regulator/qcom-labibb-regulator.yaml | 1 - + .../bindings/remoteproc/ti,omap-remoteproc.yaml | 2 +- + .../devicetree/bindings/serial/serial.yaml | 2 +- + .../devicetree/bindings/sound/ak4642.yaml | 2 - + .../bindings/sound/google,cros-ec-codec.yaml | 2 +- + .../devicetree/bindings/sound/renesas,rsnd.yaml | 1 - + .../bindings/spi/amlogic,meson-gx-spicc.yaml | 4 +- + .../devicetree/bindings/spi/spi-controller.yaml | 21 +- + Documentation/devicetree/bindings/spi/spi-mux.yaml | 8 +- + .../devicetree/bindings/spi/st,stm32-spi.yaml | 6 - + .../devicetree/bindings/submitting-patches.rst | 6 +- + .../bindings/thermal/qcom-spmi-adc-tm5.yaml | 2 - + .../devicetree/bindings/trivial-devices.yaml | 3 + + Documentation/devicetree/bindings/usb/usb.yaml | 1 - + .../devicetree/bindings/vendor-prefixes.yaml | 6 + + .../devicetree/{ => bindings}/writing-schema.rst | 17 +- + Documentation/devicetree/changesets.rst | 8 +- + .../devicetree/dynamic-resolution-notes.rst | 8 +- + Documentation/devicetree/index.rst | 19 +- + Documentation/devicetree/kernel-api.rst | 57 +++ + Documentation/devicetree/of_unittest.rst | 6 +- + Documentation/devicetree/overlay-notes.rst | 8 +- + Documentation/devicetree/usage-model.rst | 8 +- + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/kexec.h | 4 - + arch/arm64/kernel/machine_kexec_file.c | 196 +-------- + arch/powerpc/Kconfig | 2 +- + arch/powerpc/include/asm/ima.h | 30 -- + arch/powerpc/include/asm/kexec.h | 16 +- + arch/powerpc/kexec/Makefile | 7 - + arch/powerpc/kexec/elf_64.c | 30 +- + arch/powerpc/kexec/file_load.c | 183 +------- + arch/powerpc/kexec/file_load_64.c | 47 +-- + arch/powerpc/kexec/ima.c | 219 ---------- + arch/x86/include/asm/kexec.h | 5 - + arch/x86/kernel/crash.c | 14 +- + arch/x86/kernel/kexec-bzimage64.c | 2 +- + arch/x86/kernel/machine_kexec_64.c | 4 +- + drivers/of/Makefile | 6 + + drivers/of/address.c | 3 + + drivers/of/base.c | 328 ++++++++------- + drivers/of/device.c | 7 +- + drivers/of/dynamic.c | 23 +- + drivers/of/fdt.c | 40 +- + drivers/of/irq.c | 14 +- + drivers/of/kexec.c | 458 +++++++++++++++++++++ + drivers/of/of_reserved_mem.c | 6 +- + drivers/of/overlay.c | 19 +- + drivers/of/platform.c | 12 +- + drivers/of/property.c | 71 ++-- + drivers/of/unittest-data/Makefile | 48 +++ + drivers/of/unittest-data/overlay_base.dts | 90 +--- + drivers/of/unittest-data/overlay_common.dtsi | 91 ++++ + drivers/of/unittest-data/static_base_1.dts | 4 + + drivers/of/unittest-data/static_base_2.dts | 4 + + drivers/of/unittest-data/testcases.dts | 23 +- + drivers/of/unittest-data/testcases_common.dtsi | 19 + + drivers/of/unittest-data/tests-interrupts.dtsi | 11 +- + include/linux/kexec.h | 8 + + include/linux/of.h | 70 +++- + scripts/Makefile.lib | 34 +- + scripts/checkpatch.pl | 2 +- + security/integrity/ima/ima.h | 4 - + security/integrity/ima/ima_kexec.c | 9 +- + 101 files changed, 1655 insertions(+), 1450 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/qcom,sm8250-venus.yaml + delete mode 100644 Documentation/devicetree/bindings/media/video-mux.txt + create mode 100644 Documentation/devicetree/bindings/media/video-mux.yaml + create mode 100644 Documentation/devicetree/bindings/net/wireless/brcm,bcm4329-fmac.yaml + delete mode 100644 Documentation/devicetree/bindings/net/wireless/brcm,bcm43xx-fmac.txt + rename Documentation/devicetree/{ => bindings}/writing-schema.rst (95%) + create mode 100644 Documentation/devicetree/kernel-api.rst + delete mode 100644 arch/powerpc/include/asm/ima.h + delete mode 100644 arch/powerpc/kexec/ima.c + create mode 100644 drivers/of/kexec.c + create mode 100644 drivers/of/unittest-data/overlay_common.dtsi + create mode 100644 drivers/of/unittest-data/static_base_1.dts + create mode 100644 drivers/of/unittest-data/static_base_2.dts + create mode 100644 drivers/of/unittest-data/testcases_common.dtsi +Merging mailbox/mailbox-for-next (6b50df2b8c20 mailbox: arm_mhuv2: Skip calling kfree() with invalid pointer) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (edf47ef9faaf Merge remote-tracking branch 'spi/for-5.13' into spi-next) +$ git merge spi/for-next +Auto-merging drivers/spi/spi-imx.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/spi/cadence-quadspi.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/cadence-quadspi.txt | 68 --- + .../devicetree/bindings/spi/cdns,qspi-nor.yaml | 143 ++++++ + .../devicetree/bindings/spi/spi-mt65xx.txt | 2 + + .../devicetree/bindings/spi/spi-nxp-fspi.txt | 2 + + .../devicetree/bindings/spi/spi-slave-mt27xx.txt | 1 + + Documentation/spi/spi-summary.rst | 7 +- + MAINTAINERS | 7 + + arch/arm/mach-pxa/icontrol.c | 12 +- + arch/arm/mach-pxa/zeus.c | 6 +- + drivers/spi/Kconfig | 10 + + drivers/spi/Makefile | 1 + + drivers/spi/spi-atmel.c | 4 - + drivers/spi/spi-axi-spi-engine.c | 12 +- + drivers/spi/spi-bcm-qspi.c | 2 +- + drivers/spi/spi-bcm63xx.c | 2 +- + drivers/spi/spi-bitbang.c | 9 +- + drivers/spi/spi-butterfly.c | 13 +- + drivers/spi/spi-cadence-quadspi.c | 8 +- + drivers/spi/spi-dln2.c | 3 +- + drivers/spi/spi-falcon.c | 2 +- + drivers/spi/spi-fsi.c | 27 +- + drivers/spi/spi-fsl-espi.c | 17 +- + drivers/spi/spi-hisi-kunpeng.c | 505 +++++++++++++++++++++ + drivers/spi/spi-imx.c | 2 +- + drivers/spi/spi-jcore.c | 3 +- + drivers/spi/spi-lm70llp.c | 13 +- + drivers/spi/spi-mem.c | 6 +- + drivers/spi/spi-mtk-nor.c | 2 +- + drivers/spi/spi-nxp-fspi.c | 115 ++++- + drivers/spi/spi-omap-100k.c | 8 +- + drivers/spi/spi-omap2-mcspi.c | 24 +- + drivers/spi/spi-orion.c | 6 +- + drivers/spi/spi-pl022.c | 108 +---- + drivers/spi/spi-pxa2xx-pci.c | 2 +- + drivers/spi/spi-pxa2xx.c | 2 +- + drivers/spi/spi-rockchip.c | 19 +- + drivers/spi/spi-sh.c | 4 +- + drivers/spi/spi-slave-mt27xx.c | 36 +- + drivers/spi/spi-sprd-adi.c | 2 +- + drivers/spi/spi-stm32.c | 36 +- + drivers/spi/spi-tegra20-sflash.c | 3 +- + drivers/spi/spi-topcliff-pch.c | 3 +- + drivers/spi/spi.c | 22 +- + drivers/staging/greybus/spilib.c | 5 +- + include/linux/amba/pl022.h | 10 - + include/linux/parport.h | 12 +- + include/linux/spi/spi.h | 20 +- + 47 files changed, 972 insertions(+), 354 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/spi/cadence-quadspi.txt + create mode 100644 Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml + create mode 100644 drivers/spi/spi-hisi-kunpeng.c +Merging tip/auto-latest (e571028ea527 Merge branch 'core/entry') +$ git merge tip/auto-latest +Auto-merging net/core/skbuff.c +Auto-merging kernel/sched/cpufreq_schedutil.c +Auto-merging kernel/sched/core.c +Removing kernel/locking/rtmutex.h +Removing kernel/locking/rtmutex-debug.h +Removing kernel/locking/rtmutex-debug.c +Auto-merging kernel/locking/lockdep.c +Auto-merging include/linux/sched.h +Auto-merging include/linux/lockdep.h +Auto-merging include/linux/irq.h +Auto-merging drivers/usb/usbip/usbip_common.h +Auto-merging drivers/pci/controller/pci-hyperv.c +Auto-merging drivers/net/ethernet/dlink/sundance.c +Auto-merging arch/x86/net/bpf_jit_comp.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/mmu/tdp_mmu.c +Auto-merging arch/x86/kvm/mmu/mmu.c +Auto-merging arch/x86/kernel/smpboot.c +Auto-merging arch/x86/kernel/setup.c +Removing arch/x86/kernel/paravirt_patch.c +Auto-merging arch/x86/kernel/machine_kexec_64.c +Auto-merging arch/x86/kernel/acpi/boot.c +Removing arch/x86/include/asm/alternative-asm.h +Auto-merging arch/x86/events/amd/iommu.h +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-firmware-sgi_uv | 2 +- + Documentation/admin-guide/kernel-parameters.txt | 32 +- + MAINTAINERS | 1 + + arch/arm/include/asm/paravirt.h | 14 +- + arch/arm/include/asm/spinlock.h | 2 +- + arch/arm/kernel/paravirt.c | 9 +- + arch/arm64/include/asm/paravirt.h | 14 +- + arch/arm64/kernel/paravirt.c | 13 +- + arch/s390/kernel/stacktrace.c | 6 - + arch/x86/Kconfig | 10 +- + arch/x86/Makefile | 9 + + arch/x86/boot/compressed/Makefile | 1 + + arch/x86/boot/compressed/efi_thunk_64.S | 2 +- + arch/x86/boot/compressed/head_64.S | 172 +++++- + arch/x86/boot/compressed/idt_64.c | 14 + + arch/x86/boot/compressed/kaslr.c | 4 +- + arch/x86/boot/compressed/mem_encrypt.S | 130 +++- + arch/x86/boot/compressed/misc.c | 9 +- + arch/x86/boot/compressed/misc.h | 6 + + arch/x86/boot/compressed/sev-es.c | 23 +- + arch/x86/crypto/crc32-pclmul_glue.c | 2 +- + arch/x86/crypto/curve25519-x86_64.c | 6 +- + arch/x86/crypto/twofish-x86_64-asm_64-3way.S | 2 +- + arch/x86/crypto/twofish_glue_3way.c | 2 +- + arch/x86/entry/entry_32.S | 103 +--- + arch/x86/entry/entry_64.S | 4 +- + arch/x86/entry/vdso/vdso2c.c | 2 +- + arch/x86/entry/vdso/vdso2c.h | 2 +- + arch/x86/entry/vdso/vdso32/system_call.S | 4 +- + arch/x86/entry/vdso/vma.c | 2 +- + arch/x86/entry/vdso/vsgx.S | 2 +- + arch/x86/events/amd/core.c | 2 +- + arch/x86/events/amd/iommu.h | 2 +- + arch/x86/events/core.c | 2 +- + arch/x86/events/intel/bts.c | 2 +- + arch/x86/events/intel/core.c | 14 +- + arch/x86/events/intel/ds.c | 13 +- + arch/x86/events/intel/lbr.c | 12 +- + arch/x86/events/intel/p4.c | 6 +- + arch/x86/events/intel/pt.c | 2 +- + arch/x86/events/intel/uncore_snbep.c | 12 +- + arch/x86/events/zhaoxin/core.c | 2 +- + arch/x86/hyperv/hv_init.c | 4 +- + arch/x86/hyperv/mmu.c | 10 +- + arch/x86/include/asm/agp.h | 2 +- + arch/x86/include/asm/alternative-asm.h | 114 ---- + arch/x86/include/asm/alternative.h | 142 ++++- + arch/x86/include/asm/cmpxchg.h | 2 +- + arch/x86/include/asm/cpu.h | 7 +- + arch/x86/include/asm/cpufeature.h | 41 +- + arch/x86/include/asm/cpufeatures.h | 5 +- + arch/x86/include/asm/elf.h | 10 +- + arch/x86/include/asm/idtentry.h | 2 +- + arch/x86/include/asm/inat.h | 2 +- + arch/x86/include/asm/insn-eval.h | 4 +- + arch/x86/include/asm/insn.h | 44 +- + arch/x86/include/asm/intel_pconfig.h | 2 +- + arch/x86/include/asm/intel_pt.h | 2 +- + arch/x86/include/asm/io.h | 2 +- + arch/x86/include/asm/irq_stack.h | 2 +- + arch/x86/include/asm/irqflags.h | 7 +- + arch/x86/include/asm/jump_label.h | 16 +- + arch/x86/include/asm/kprobes.h | 21 +- + arch/x86/include/asm/kvm_host.h | 4 +- + arch/x86/include/asm/mshyperv.h | 2 +- + arch/x86/include/asm/msr-index.h | 3 +- + arch/x86/include/asm/nops.h | 176 ++---- + arch/x86/include/asm/nospec-branch.h | 3 +- + arch/x86/include/asm/paravirt.h | 173 +++--- + arch/x86/include/asm/paravirt_types.h | 216 +++---- + arch/x86/include/asm/pgtable.h | 2 +- + arch/x86/include/asm/processor.h | 27 +- + arch/x86/include/asm/ptrace.h | 5 +- + arch/x86/include/asm/segment.h | 30 +- + arch/x86/include/asm/set_memory.h | 4 +- + arch/x86/include/asm/setup.h | 5 - + arch/x86/include/asm/smap.h | 5 +- + arch/x86/include/asm/special_insns.h | 4 +- + arch/x86/include/asm/stackprotector.h | 79 +-- + arch/x86/include/asm/suspend_32.h | 6 +- + arch/x86/include/asm/switch_to.h | 7 +- + arch/x86/include/asm/syscall_wrapper.h | 1 + + arch/x86/include/asm/thread_info.h | 8 +- + arch/x86/include/asm/tlbflush.h | 48 +- + arch/x86/include/asm/trace/hyperv.h | 2 +- + arch/x86/include/asm/uv/uv_geo.h | 2 +- + arch/x86/include/asm/uv/uv_hub.h | 2 +- + arch/x86/include/uapi/asm/bootparam.h | 4 +- + arch/x86/include/uapi/asm/debugreg.h | 1 + + arch/x86/include/uapi/asm/msgbuf.h | 2 +- + arch/x86/include/uapi/asm/sgx.h | 2 +- + arch/x86/include/uapi/asm/shmbuf.h | 2 +- + arch/x86/include/uapi/asm/sigcontext.h | 2 +- + arch/x86/kernel/Makefile | 3 +- + arch/x86/kernel/acpi/boot.c | 4 +- + arch/x86/kernel/acpi/sleep.c | 2 +- + arch/x86/kernel/alternative.c | 258 +++----- + arch/x86/kernel/amd_nb.c | 2 +- + arch/x86/kernel/apic/apic.c | 10 +- + arch/x86/kernel/apic/io_apic.c | 8 +- + arch/x86/kernel/apic/vector.c | 17 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 3 + + arch/x86/kernel/apm_32.c | 6 +- + arch/x86/kernel/asm-offsets.c | 7 - + arch/x86/kernel/asm-offsets_32.c | 5 - + arch/x86/kernel/cpu/amd.c | 5 - + arch/x86/kernel/cpu/common.c | 13 +- + arch/x86/kernel/cpu/cyrix.c | 2 +- + arch/x86/kernel/cpu/hygon.c | 4 +- + arch/x86/kernel/cpu/intel.c | 113 +++- + arch/x86/kernel/cpu/mce/core.c | 2 +- + arch/x86/kernel/cpu/mce/inject.c | 6 + + arch/x86/kernel/cpu/mce/intel.c | 1 + + arch/x86/kernel/cpu/mce/severity.c | 14 +- + arch/x86/kernel/cpu/microcode/core.c | 8 +- + arch/x86/kernel/cpu/mshyperv.c | 4 +- + arch/x86/kernel/cpu/mtrr/cleanup.c | 2 +- + arch/x86/kernel/cpu/mtrr/mtrr.c | 2 +- + arch/x86/kernel/cpu/resctrl/core.c | 2 +- + arch/x86/kernel/cpu/resctrl/monitor.c | 6 +- + arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 4 +- + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 6 +- + arch/x86/kernel/cpu/sgx/arch.h | 2 +- + arch/x86/kernel/cpu/sgx/ioctl.c | 14 +- + arch/x86/kernel/cpu/sgx/main.c | 177 +++--- + arch/x86/kernel/cpu/sgx/sgx.h | 23 +- + arch/x86/kernel/cpu/topology.c | 4 +- + arch/x86/kernel/cpu/vmware.c | 7 +- + arch/x86/kernel/doublefault_32.c | 4 +- + arch/x86/kernel/e820.c | 2 +- + arch/x86/kernel/fpu/xstate.c | 2 +- + arch/x86/kernel/ftrace.c | 4 +- + arch/x86/kernel/head64.c | 2 +- + arch/x86/kernel/head_32.S | 18 +- + arch/x86/kernel/idt.c | 2 +- + arch/x86/kernel/irq.c | 2 +- + arch/x86/kernel/jump_label.c | 32 +- + arch/x86/kernel/kgdb.c | 4 +- + arch/x86/kernel/kprobes/core.c | 596 ++++++++++++------- + arch/x86/kernel/kprobes/ftrace.c | 2 +- + arch/x86/kernel/kprobes/opt.c | 9 +- + arch/x86/kernel/kvm.c | 13 +- + arch/x86/kernel/kvmclock.c | 2 +- + arch/x86/kernel/machine_kexec_64.c | 2 +- + arch/x86/kernel/paravirt-spinlocks.c | 9 + + arch/x86/kernel/paravirt.c | 77 +-- + arch/x86/kernel/paravirt_patch.c | 99 ---- + arch/x86/kernel/process.c | 9 +- + arch/x86/kernel/pvclock.c | 2 +- + arch/x86/kernel/relocate_kernel_32.S | 2 +- + arch/x86/kernel/relocate_kernel_64.S | 2 +- + arch/x86/kernel/setup.c | 102 ++-- + arch/x86/kernel/setup_percpu.c | 1 - + arch/x86/kernel/sev-es-shared.c | 16 +- + arch/x86/kernel/sev-es.c | 99 ++-- + arch/x86/kernel/signal.c | 2 +- + arch/x86/kernel/smp.c | 4 +- + arch/x86/kernel/smpboot.c | 2 +- + arch/x86/kernel/stacktrace.c | 6 - + arch/x86/kernel/static_call.c | 4 +- + arch/x86/kernel/sysfb_efi.c | 2 +- + arch/x86/kernel/tboot.c | 44 +- + arch/x86/kernel/tls.c | 8 +- + arch/x86/kernel/topology.c | 2 +- + arch/x86/kernel/traps.c | 16 +- + arch/x86/kernel/tsc.c | 9 +- + arch/x86/kernel/tsc_sync.c | 2 +- + arch/x86/kernel/umip.c | 4 +- + arch/x86/kernel/uprobes.c | 8 +- + arch/x86/kvm/cpuid.c | 2 +- + arch/x86/kvm/emulate.c | 2 +- + arch/x86/kvm/irq_comm.c | 2 +- + arch/x86/kvm/mmu/mmu.c | 2 +- + arch/x86/kvm/mmu/mmu_internal.h | 2 +- + arch/x86/kvm/mmu/tdp_mmu.c | 6 +- + arch/x86/kvm/pmu.h | 2 +- + arch/x86/kvm/svm/avic.c | 4 +- + arch/x86/kvm/svm/sev.c | 2 +- + arch/x86/kvm/svm/svm.c | 2 +- + arch/x86/kvm/vmx/nested.c | 2 +- + arch/x86/kvm/vmx/posted_intr.c | 2 +- + arch/x86/kvm/vmx/vmx.c | 6 +- + arch/x86/kvm/x86.c | 14 +- + arch/x86/lib/atomic64_386_32.S | 2 +- + arch/x86/lib/atomic64_cx8_32.S | 2 +- + arch/x86/lib/copy_page_64.S | 2 +- + arch/x86/lib/copy_user_64.S | 2 +- + arch/x86/lib/inat.c | 2 +- + arch/x86/lib/insn-eval.c | 50 +- + arch/x86/lib/insn.c | 230 ++++++-- + arch/x86/lib/memcpy_64.S | 2 +- + arch/x86/lib/memmove_64.S | 2 +- + arch/x86/lib/memset_64.S | 2 +- + arch/x86/lib/mmx_32.c | 2 +- + arch/x86/lib/msr-smp.c | 4 +- + arch/x86/lib/retpoline.S | 2 +- + arch/x86/math-emu/fpu_trig.c | 11 +- + arch/x86/math-emu/reg_ld_str.c | 2 +- + arch/x86/math-emu/reg_round.S | 2 +- + arch/x86/mm/fault.c | 4 +- + arch/x86/mm/init.c | 8 +- + arch/x86/mm/init_64.c | 6 +- + arch/x86/mm/kaslr.c | 2 +- + arch/x86/mm/kmmio.c | 2 +- + arch/x86/mm/mem_encrypt.c | 6 + + arch/x86/mm/mem_encrypt_boot.S | 2 +- + arch/x86/mm/mem_encrypt_identity.c | 35 +- + arch/x86/mm/pat/memtype.c | 2 +- + arch/x86/mm/pat/set_memory.c | 2 +- + arch/x86/mm/pkeys.c | 2 +- + arch/x86/mm/pti.c | 11 +- + arch/x86/mm/tlb.c | 182 +++--- + arch/x86/net/bpf_jit_comp.c | 12 +- + arch/x86/pci/fixup.c | 2 +- + arch/x86/platform/efi/efi_64.c | 4 +- + arch/x86/platform/efi/quirks.c | 4 +- + arch/x86/platform/intel-quark/imr.c | 2 +- + arch/x86/platform/intel/iosf_mbi.c | 4 +- + arch/x86/platform/olpc/olpc-xo15-sci.c | 2 +- + arch/x86/platform/olpc/olpc_dt.c | 2 +- + arch/x86/platform/pvh/head.S | 20 +- + arch/x86/platform/uv/uv_nmi.c | 2 +- + arch/x86/power/cpu.c | 8 +- + arch/x86/realmode/init.c | 2 +- + arch/x86/tools/insn_decoder_test.c | 10 +- + arch/x86/tools/insn_sanity.c | 8 +- + arch/x86/xen/enlighten_pv.c | 5 +- + arch/x86/xen/mmu_pv.c | 13 +- + arch/x86/xen/time.c | 26 +- + drivers/atm/eni.c | 2 +- + drivers/clocksource/clksrc-dbx500-prcmu.c | 8 +- + drivers/clocksource/dw_apb_timer_of.c | 2 +- + drivers/clocksource/hyperv_timer.c | 2 +- + drivers/clocksource/timer-atmel-tcb.c | 4 +- + drivers/clocksource/timer-fsl-ftm.c | 2 +- + drivers/clocksource/timer-microchip-pit64b.c | 2 +- + drivers/clocksource/timer-of.c | 4 +- + drivers/clocksource/timer-ti-dm-systimer.c | 2 +- + drivers/clocksource/timer-vf-pit.c | 2 +- + drivers/firewire/ohci.c | 4 +- + drivers/firmware/efi/libstub/Makefile | 3 +- + drivers/gpu/drm/i915/i915_gem.h | 2 +- + drivers/irqchip/irq-aspeed-vic.c | 4 +- + drivers/irqchip/irq-bcm7120-l2.c | 2 +- + drivers/irqchip/irq-csky-apb-intc.c | 2 +- + drivers/irqchip/irq-gic-v2m.c | 2 +- + drivers/irqchip/irq-gic-v3-its.c | 10 +- + drivers/irqchip/irq-gic-v3.c | 2 +- + drivers/irqchip/irq-loongson-pch-pic.c | 2 +- + drivers/irqchip/irq-meson-gpio.c | 2 +- + drivers/irqchip/irq-mtk-cirq.c | 2 +- + drivers/irqchip/irq-mxs.c | 4 +- + drivers/irqchip/irq-sun4i.c | 2 +- + drivers/irqchip/irq-ti-sci-inta.c | 2 +- + drivers/irqchip/irq-vic.c | 4 +- + drivers/irqchip/irq-xilinx-intc.c | 2 +- + drivers/net/ethernet/dlink/sundance.c | 2 +- + drivers/net/ethernet/jme.c | 10 +- + drivers/net/ethernet/jme.h | 2 +- + drivers/net/wireless/ath/ath10k/mac.c | 2 + + drivers/net/wireless/ath/ath9k/beacon.c | 2 +- + drivers/pci/controller/pci-hyperv.c | 2 +- + drivers/usb/usbip/usbip_common.h | 1 + + drivers/xen/time.c | 3 +- + include/linux/bottom_half.h | 8 +- + include/linux/clocksource.h | 2 +- + include/linux/cpumask.h | 6 +- + include/linux/entry-common.h | 4 +- + include/linux/hardirq.h | 1 + + include/linux/interrupt.h | 33 +- + include/linux/irq.h | 4 +- + include/linux/irqdesc.h | 2 +- + include/linux/kcov.h | 1 + + include/linux/lockdep.h | 20 +- + include/linux/mutex.h | 4 +- + include/linux/preempt.h | 6 +- + include/linux/psi.h | 1 - + include/linux/psi_types.h | 3 +- + include/linux/rcupdate.h | 3 +- + include/linux/rtmutex.h | 35 +- + include/linux/rwsem.h | 2 +- + include/linux/sched.h | 6 +- + include/linux/smp.h | 50 +- + include/linux/stacktrace.h | 19 + + include/linux/static_call.h | 26 +- + include/linux/static_call_types.h | 18 + + include/linux/timex.h | 2 +- + include/linux/ww_mutex.h | 17 +- + include/trace/events/xen.h | 2 +- + include/uapi/linux/ptrace.h | 10 + + kernel/cpu.c | 194 +++--- + kernel/entry/common.c | 2 +- + kernel/events/core.c | 24 +- + kernel/events/ring_buffer.c | 9 +- + kernel/futex.c | 29 +- + kernel/irq/chip.c | 8 +- + kernel/irq/dummychip.c | 2 +- + kernel/irq/ipi.c | 2 +- + kernel/irq/irq_sim.c | 31 +- + kernel/irq/irqdesc.c | 2 +- + kernel/irq/irqdomain.c | 8 +- + kernel/irq/manage.c | 12 +- + kernel/irq/matrix.c | 11 +- + kernel/irq/migration.c | 2 +- + kernel/irq/msi.c | 2 +- + kernel/irq/resend.c | 2 +- + kernel/irq/timings.c | 8 +- + kernel/locking/Makefile | 2 - + kernel/locking/lockdep.c | 24 +- + kernel/locking/lockdep_proc.c | 2 +- + kernel/locking/locktorture.c | 146 +++-- + kernel/locking/mcs_spinlock.h | 2 +- + kernel/locking/mutex.c | 4 +- + kernel/locking/osq_lock.c | 4 +- + kernel/locking/rtmutex-debug.c | 182 ------ + kernel/locking/rtmutex-debug.h | 37 -- + kernel/locking/rtmutex.c | 432 +++++--------- + kernel/locking/rtmutex.h | 35 -- + kernel/locking/rtmutex_common.h | 105 ++-- + kernel/locking/rwsem.c | 4 +- + kernel/locking/spinlock.c | 4 +- + kernel/ptrace.c | 25 + + kernel/sched/clock.c | 2 +- + kernel/sched/core.c | 44 +- + kernel/sched/cpuacct.c | 2 +- + kernel/sched/cpufreq_schedutil.c | 2 +- + kernel/sched/cpupri.c | 4 +- + kernel/sched/cputime.c | 6 +- + kernel/sched/deadline.c | 12 +- + kernel/sched/debug.c | 2 +- + kernel/sched/fair.c | 216 +++---- + kernel/sched/features.h | 2 +- + kernel/sched/idle.c | 10 +- + kernel/sched/loadavg.c | 2 +- + kernel/sched/pelt.c | 2 +- + kernel/sched/pelt.h | 2 +- + kernel/sched/psi.c | 139 ++--- + kernel/sched/rt.c | 6 +- + kernel/sched/sched.h | 23 +- + kernel/sched/stats.c | 2 +- + kernel/sched/stats.h | 37 +- + kernel/sched/topology.c | 95 ++- + kernel/smp.c | 464 +++++++++++---- + kernel/softirq.c | 355 +++++++++-- + kernel/stop_machine.c | 1 + + kernel/time/alarmtimer.c | 6 +- + kernel/time/clocksource.c | 4 +- + kernel/time/hrtimer.c | 18 +- + kernel/time/jiffies.c | 2 +- + kernel/time/ntp.c | 2 +- + kernel/time/posix-cpu-timers.c | 6 +- + kernel/time/test_udelay.c | 7 +- + kernel/time/tick-broadcast-hrtimer.c | 2 +- + kernel/time/tick-broadcast.c | 4 +- + kernel/time/tick-oneshot.c | 2 +- + kernel/time/tick-sched.c | 4 +- + kernel/time/tick-sched.h | 2 +- + kernel/time/time.c | 2 +- + kernel/time/timekeeping.c | 46 +- + kernel/time/timer.c | 4 +- + kernel/time/vsyscall.c | 2 +- + kernel/up.c | 38 +- + net/core/skbuff.c | 1 + + net/mac80211/iface.c | 1 + + net/mac80211/rx.c | 1 + + scripts/gcc-x86_32-has-stack-protector.sh | 6 +- + tools/arch/x86/include/asm/inat.h | 2 +- + tools/arch/x86/include/asm/insn.h | 44 +- + tools/arch/x86/include/asm/msr-index.h | 2 - + tools/arch/x86/include/asm/nops.h | 81 +++ + tools/arch/x86/kcpuid/Makefile | 24 + + tools/arch/x86/kcpuid/cpuid.csv | 400 +++++++++++++ + tools/arch/x86/kcpuid/kcpuid.c | 657 +++++++++++++++++++++ + tools/arch/x86/lib/inat.c | 2 +- + tools/arch/x86/lib/insn.c | 230 ++++++-- + tools/include/linux/kconfig.h | 73 +++ + tools/include/linux/static_call_types.h | 18 + + tools/objtool/arch/x86/decode.c | 302 ++++++---- + tools/objtool/arch/x86/include/arch/cfi_regs.h | 12 +- + tools/objtool/builtin-check.c | 43 +- + tools/objtool/builtin-orc.c | 5 +- + tools/objtool/check.c | 39 +- + tools/objtool/include/objtool/arch.h | 1 - + tools/objtool/include/objtool/builtin.h | 5 +- + tools/objtool/objtool.c | 64 ++ + tools/objtool/sync-check.sh | 18 +- + tools/perf/arch/x86/tests/insn-x86.c | 9 +- + tools/perf/arch/x86/util/archinsn.c | 9 +- + tools/perf/check-headers.sh | 15 +- + tools/perf/trace/beauty/tracepoints/x86_msr.sh | 2 +- + .../util/intel-pt-decoder/intel-pt-insn-decoder.c | 17 +- + tools/power/x86/turbostat/turbostat.c | 2 +- + tools/testing/selftests/sgx/load.c | 69 ++- + tools/testing/selftests/sgx/main.c | 26 +- + .../testing/selftests/timers/clocksource-switch.c | 4 +- + tools/testing/selftests/timers/leap-a-day.c | 2 +- + tools/testing/selftests/timers/leapcrash.c | 4 +- + tools/testing/selftests/timers/threadtest.c | 2 +- + tools/testing/selftests/x86/thunks_32.S | 2 + + 399 files changed, 6106 insertions(+), 4088 deletions(-) + delete mode 100644 arch/x86/include/asm/alternative-asm.h + delete mode 100644 arch/x86/kernel/paravirt_patch.c + delete mode 100644 kernel/locking/rtmutex-debug.c + delete mode 100644 kernel/locking/rtmutex-debug.h + delete mode 100644 kernel/locking/rtmutex.h + create mode 100644 tools/arch/x86/include/asm/nops.h + create mode 100644 tools/arch/x86/kcpuid/Makefile + create mode 100644 tools/arch/x86/kcpuid/cpuid.csv + create mode 100644 tools/arch/x86/kcpuid/kcpuid.c + create mode 100644 tools/include/linux/kconfig.h +$ git am -3 ../patches/0001-x86-fix-up-for-bpf-Use-NOP_ATOMIC5-instead-of-emit_n.patch +Applying: x86: fix up for "bpf: Use NOP_ATOMIC5 instead of emit_nops(&prog, 5) for BPF_TRAMP_F_CALL_ORIG" +$ git reset HEAD^ +Unstaged changes after reset: +M arch/x86/net/bpf_jit_comp.c +$ git add -A . +$ git commit -v -a --amend +[master 2e28301063a0] Merge remote-tracking branch 'tip/auto-latest' + Date: Thu Apr 8 16:05:55 2021 +1000 +Merging clockevents/timers/drivers/next (323397ef4d00 clocksource/drivers/dw_apb_timer_of: Add handling for potential memory leak) +$ git merge clockevents/timers/drivers/next +Auto-merging drivers/clocksource/timer-ti-dm-systimer.c +Auto-merging drivers/clocksource/sh_cmt.c +Auto-merging drivers/clocksource/dw_apb_timer_of.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/timer/ingenic,tcu.yaml | 30 ++++++++++++++++------ + .../devicetree/bindings/timer/renesas,cmt.yaml | 4 +++ + .../devicetree/bindings/timer/renesas,tmu.yaml | 6 +++++ + drivers/clocksource/dw_apb_timer_of.c | 26 +++++++++++++++---- + drivers/clocksource/ingenic-ost.c | 9 ++++--- + drivers/clocksource/ingenic-timer.c | 2 ++ + drivers/clocksource/sh_cmt.c | 5 ++-- + drivers/clocksource/timer-npcm7xx.c | 1 + + drivers/clocksource/timer-pistachio.c | 4 +-- + drivers/clocksource/timer-ti-dm-systimer.c | 13 +++++----- + 10 files changed, 73 insertions(+), 27 deletions(-) +Merging edac/edac-for-next (faf042d15093 Merge branch 'edac-amd64' into edac-for-next) +$ git merge edac/edac-for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging irqchip/irq/irqchip-next (ea4aeaa5c889 irqchip/irq-mst: Support polarity configuration) +$ git merge irqchip/irq/irqchip-next +Auto-merging kernel/irq/irqdomain.c +Merge made by the 'recursive' strategy. + .../interrupt-controller/nuvoton,wpcm450-aic.yaml | 39 +++++ + .../bindings/interrupt-controller/qcom,pdc.txt | 1 + + arch/mips/netlogic/common/irq.c | 6 +- + drivers/irqchip/Kconfig | 6 + + drivers/irqchip/Makefile | 1 + + drivers/irqchip/irq-gic-v3-mbi.c | 2 +- + drivers/irqchip/irq-hip04.c | 4 +- + drivers/irqchip/irq-mbigen.c | 4 +- + drivers/irqchip/irq-mst-intc.c | 98 ++++++++++++- + drivers/irqchip/irq-sifive-plic.c | 4 +- + drivers/irqchip/irq-stm32-exti.c | 7 + + drivers/irqchip/irq-wpcm450-aic.c | 161 +++++++++++++++++++++ + drivers/sh/intc/core.c | 49 +++---- + include/linux/irqdomain.h | 6 - + kernel/irq/irqdomain.c | 3 - + 15 files changed, 337 insertions(+), 54 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/nuvoton,wpcm450-aic.yaml + create mode 100644 drivers/irqchip/irq-wpcm450-aic.c +$ git reset --hard HEAD^ +HEAD is now at 39f22b943851 Merge remote-tracking branch 'edac/edac-for-next' +Merging next-20210407 version of irqchip +$ git merge -m next-20210407/irqchip 5fbecd2389f48e1415799c63130d0cdce1cf3f60 +Already up to date. +Merging ftrace/for-next (ceaaa12904df ftrace: Simplify the calculation of page number for ftrace_page->records some more) +$ git merge ftrace/for-next +Auto-merging kernel/trace/ftrace.c +Auto-merging kernel/trace/bpf_trace.c +Auto-merging include/trace/events/io_uring.h +Auto-merging arch/x86/kernel/kprobes/ftrace.c +CONFLICT (content): Merge conflict in arch/x86/kernel/kprobes/ftrace.c +Auto-merging arch/riscv/kernel/probes/ftrace.c +Resolved 'arch/x86/kernel/kprobes/ftrace.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 379e1b0ffc22] Merge remote-tracking branch 'ftrace/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/microblaze/include/asm/ftrace.h | 2 +- + arch/nds32/kernel/ftrace.c | 2 +- + arch/powerpc/include/asm/ftrace.h | 4 +- + arch/sh/kernel/ftrace.c | 2 +- + arch/sparc/include/asm/ftrace.h | 2 +- + fs/tracefs/inode.c | 2 +- + include/linux/ftrace.h | 4 +- + include/linux/ring_buffer.h | 5 +- + include/linux/seq_buf.h | 25 +++ + include/linux/trace_events.h | 8 +- + include/linux/tracepoint.h | 2 +- + include/trace/events/io_uring.h | 2 +- + include/trace/events/rcu.h | 2 +- + include/trace/events/sched.h | 2 +- + include/trace/events/timer.h | 2 +- + init/main.c | 6 +- + kernel/trace/bpf_trace.c | 5 +- + kernel/trace/fgraph.c | 4 +- + kernel/trace/ftrace.c | 53 +++--- + kernel/trace/ring_buffer.c | 142 +++++++++++++--- + kernel/trace/synth_event_gen_test.c | 2 +- + kernel/trace/trace.c | 262 ++++++++++++++++++++++++++---- + kernel/trace/trace.h | 16 +- + kernel/trace/trace_event_perf.c | 2 +- + kernel/trace/trace_events.c | 214 +++++++++++++++++++++++- + kernel/trace/trace_events_filter.c | 18 +- + kernel/trace/trace_events_hist.c | 100 ++++++++---- + kernel/trace/trace_events_synth.c | 2 +- + kernel/trace/trace_events_trigger.c | 45 +++-- + kernel/trace/trace_functions_graph.c | 2 +- + kernel/trace/trace_hwlat.c | 4 +- + kernel/trace/trace_kprobe.c | 2 +- + kernel/trace/trace_output.c | 2 +- + kernel/trace/trace_printk.c | 11 ++ + kernel/trace/trace_probe.c | 6 +- + kernel/trace/trace_probe.h | 2 +- + kernel/trace/trace_probe_tmpl.h | 2 +- + kernel/trace/trace_selftest.c | 4 +- + kernel/trace/trace_seq.c | 12 +- + scripts/recordmcount.pl | 26 +-- + tools/tracing/latency/latency-collector.c | 4 +- + 41 files changed, 799 insertions(+), 215 deletions(-) +Merging rcu/rcu/next (420d9384a0b9 rcu: Reject RCU_LOCKDEP_WARN() false positives) +$ git merge rcu/rcu/next +Auto-merging mm/slub.c +Auto-merging kernel/time/timer.c +Auto-merging kernel/time/tick-sched.c +Auto-merging kernel/time/clocksource.c +Auto-merging kernel/softirq.c +Auto-merging kernel/sched/cputime.c +Auto-merging kernel/locking/lockdep.c +Auto-merging include/trace/events/rcu.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/rcupdate.h +Auto-merging include/linux/clocksource.h +Auto-merging arch/x86/kernel/tsc.c +Auto-merging arch/x86/kernel/kvmclock.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/kernel-parameters.rst +Merge made by the 'recursive' strategy. + .../Memory-Ordering/Tree-RCU-Memory-Ordering.rst | 6 +- + Documentation/RCU/RTFP.txt | 2 +- + Documentation/admin-guide/kernel-parameters.rst | 7 + + Documentation/admin-guide/kernel-parameters.txt | 54 ++- + Documentation/dev-tools/kcsan.rst | 7 +- + .../litmus-tests/locking/DCL-broken.litmus | 55 +++ + .../litmus-tests/locking/DCL-fixed.litmus | 56 +++ + .../litmus-tests/locking/RM-broken.litmus | 42 ++ + Documentation/litmus-tests/locking/RM-fixed.litmus | 42 ++ + arch/x86/kernel/kvmclock.c | 2 +- + arch/x86/kernel/tsc.c | 3 +- + include/linux/clocksource.h | 2 +- + include/linux/kcsan-checks.h | 6 + + include/linux/kcsan.h | 7 + + include/linux/mm.h | 4 + + include/linux/rcu_segcblist.h | 7 +- + include/linux/rculist_nulls.h | 2 +- + include/linux/rcupdate.h | 4 +- + include/linux/rcutiny.h | 8 +- + include/linux/rcutree.h | 3 +- + include/linux/slab.h | 2 + + include/linux/timer.h | 2 - + include/linux/vmalloc.h | 2 +- + include/trace/events/rcu.h | 29 ++ + kernel/kcsan/Makefile | 4 +- + kernel/kcsan/atomic.h | 5 + + kernel/kcsan/core.c | 7 +- + kernel/kcsan/debugfs.c | 9 +- + kernel/kcsan/encoding.h | 5 + + kernel/kcsan/kcsan.h | 8 +- + kernel/kcsan/{kcsan-test.c => kcsan_test.c} | 118 +++-- + kernel/kcsan/report.c | 5 + + kernel/kcsan/selftest.c | 5 + + kernel/locking/lockdep.c | 6 +- + kernel/rcu/rcu_segcblist.c | 3 +- + kernel/rcu/rcuscale.c | 15 +- + kernel/rcu/rcutorture.c | 201 +++++---- + kernel/rcu/refscale.c | 109 ++++- + kernel/rcu/srcutree.c | 17 +- + kernel/rcu/sync.c | 4 +- + kernel/rcu/tasks.h | 97 ++++- + kernel/rcu/tiny.c | 40 ++ + kernel/rcu/tree.c | 224 ++++++---- + kernel/rcu/tree.h | 11 +- + kernel/rcu/tree_exp.h | 1 + + kernel/rcu/tree_plugin.h | 418 +++++++++++------- + kernel/rcu/tree_stall.h | 11 +- + kernel/rcu/update.c | 2 +- + kernel/softirq.c | 2 +- + kernel/time/clocksource.c | 138 +++++- + kernel/time/timer.c | 14 - + kernel/torture.c | 6 +- + lib/Kconfig.kcsan | 5 +- + lib/bitmap.c | 49 ++- + lib/test_bitmap.c | 46 +- + mm/oom_kill.c | 2 +- + mm/slab.c | 2 + + mm/slab.h | 3 + + mm/slab_common.c | 16 +- + mm/slob.c | 2 + + mm/slub.c | 10 + + mm/util.c | 5 +- + mm/vmalloc.c | 2 + + .../memory-model/Documentation/access-marking.txt | 479 +++++++++++++++++++++ + tools/memory-model/Documentation/explanation.txt | 2 +- + tools/memory-model/Documentation/locking.txt | 320 ++++++++++++++ + tools/memory-model/Documentation/simple.txt | 1 - + tools/memory-model/litmus-tests/.gitignore | 2 +- + tools/memory-model/scripts/README | 16 +- + tools/memory-model/scripts/checkalllitmus.sh | 29 +- + tools/memory-model/scripts/checkghlitmus.sh | 11 +- + tools/memory-model/scripts/checklitmus.sh | 25 +- + tools/memory-model/scripts/checklitmushist.sh | 2 +- + tools/memory-model/scripts/checktheselitmus.sh | 43 ++ + tools/memory-model/scripts/cmplitmushist.sh | 49 ++- + tools/memory-model/scripts/hwfnseg.sh | 20 + + tools/memory-model/scripts/initlitmushist.sh | 2 +- + tools/memory-model/scripts/judgelitmus.sh | 120 +++++- + tools/memory-model/scripts/newlitmushist.sh | 4 +- + tools/memory-model/scripts/parseargs.sh | 21 +- + tools/memory-model/scripts/runlitmus.sh | 80 ++++ + tools/memory-model/scripts/runlitmushist.sh | 29 +- + tools/memory-model/scripts/simpletest.sh | 35 ++ + tools/testing/selftests/rcutorture/bin/cpus2use.sh | 1 - + tools/testing/selftests/rcutorture/bin/jitter.sh | 20 +- + .../selftests/rcutorture/bin/jitterstart.sh | 37 ++ + .../testing/selftests/rcutorture/bin/jitterstop.sh | 23 + + .../testing/selftests/rcutorture/bin/kvm-again.sh | 184 ++++++++ + .../testing/selftests/rcutorture/bin/kvm-build.sh | 6 +- + .../selftests/rcutorture/bin/kvm-end-run-stats.sh | 40 ++ + .../selftests/rcutorture/bin/kvm-find-errors.sh | 2 +- + .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 2 +- + .../selftests/rcutorture/bin/kvm-recheck.sh | 2 +- + .../testing/selftests/rcutorture/bin/kvm-remote.sh | 227 ++++++++++ + .../rcutorture/bin/kvm-test-1-run-batch.sh | 67 +++ + .../rcutorture/bin/kvm-test-1-run-qemu.sh | 176 ++++++++ + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 218 +++------- + .../selftests/rcutorture/bin/kvm-transform.sh | 54 ++- + tools/testing/selftests/rcutorture/bin/kvm.sh | 143 +++--- + tools/testing/selftests/rcutorture/bin/torture.sh | 4 +- + .../selftests/rcutorture/configs/rcu/CFLIST | 4 +- + .../rcutorture/configs/rcu/{SRCU-t => SRCU-T} | 0 + .../configs/rcu/{SRCU-t.boot => SRCU-T.boot} | 0 + .../rcutorture/configs/rcu/{SRCU-u => SRCU-U} | 0 + .../configs/rcu/{SRCU-u.boot => SRCU-U.boot} | 0 + .../selftests/rcutorture/configs/rcu/TREE03.boot | 1 + + .../selftests/rcutorture/configs/rcu/TREE04.boot | 2 +- + .../selftests/rcutorture/configs/rcu/TREE08.boot | 2 +- + .../selftests/rcutorture/configs/rcuscale/TREE | 2 +- + .../selftests/rcutorture/configs/rcuscale/TREE54 | 2 +- + .../rcutorture/configs/rcuscale/ver_functions.sh | 2 +- + .../rcutorture/configs/refscale/NOPREEMPT | 2 +- + .../selftests/rcutorture/configs/refscale/PREEMPT | 2 +- + .../rcutorture/configs/refscale/ver_functions.sh | 2 +- + .../rcutorture/formal/srcu-cbmc/src/locks.h | 2 +- + 115 files changed, 3646 insertions(+), 854 deletions(-) + create mode 100644 Documentation/litmus-tests/locking/DCL-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/DCL-fixed.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-fixed.litmus + rename kernel/kcsan/{kcsan-test.c => kcsan_test.c} (94%) + create mode 100644 tools/memory-model/Documentation/access-marking.txt + create mode 100644 tools/memory-model/Documentation/locking.txt + create mode 100755 tools/memory-model/scripts/checktheselitmus.sh + create mode 100755 tools/memory-model/scripts/hwfnseg.sh + create mode 100755 tools/memory-model/scripts/runlitmus.sh + create mode 100755 tools/memory-model/scripts/simpletest.sh + create mode 100644 tools/testing/selftests/rcutorture/bin/jitterstart.sh + create mode 100644 tools/testing/selftests/rcutorture/bin/jitterstop.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-again.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-end-run-stats.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-remote.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-test-1-run-batch.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-test-1-run-qemu.sh + rename tools/testing/selftests/rcutorture/configs/rcu/{SRCU-t => SRCU-T} (100%) + rename tools/testing/selftests/rcutorture/configs/rcu/{SRCU-t.boot => SRCU-T.boot} (100%) + rename tools/testing/selftests/rcutorture/configs/rcu/{SRCU-u => SRCU-U} (100%) + rename tools/testing/selftests/rcutorture/configs/rcu/{SRCU-u.boot => SRCU-U.boot} (100%) +Merging kvm/next (657f1d86a38e Merge branch 'kvm-tdp-fix-rcu' into HEAD) +$ git merge kvm/next +Auto-merging arch/x86/kvm/x86.h +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/kvm/vmx/nested.c +Auto-merging arch/x86/kvm/svm/svm.c +Auto-merging arch/x86/kvm/svm/sev.c +Auto-merging arch/x86/kvm/svm/nested.c +CONFLICT (content): Merge conflict in arch/x86/kvm/svm/nested.c +Auto-merging arch/x86/kvm/svm/avic.c +Auto-merging arch/x86/kvm/mmu/tdp_mmu.c +Auto-merging arch/x86/kvm/mmu/mmu_internal.h +Auto-merging arch/x86/kvm/mmu/mmu.c +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/x86/include/asm/cpufeatures.h +Resolved 'arch/x86/kvm/svm/nested.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master cab056d1bd5e] Merge remote-tracking branch 'kvm/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/virt/kvm/locking.rst | 49 +-- + arch/x86/include/asm/cpufeatures.h | 1 + + arch/x86/include/asm/kvm_host.h | 21 +- + arch/x86/include/asm/svm.h | 4 +- + arch/x86/kvm/lapic.c | 2 +- + arch/x86/kvm/mmu.h | 23 +- + arch/x86/kvm/mmu/mmu.c | 375 +++++++++------- + arch/x86/kvm/mmu/mmu_audit.c | 2 +- + arch/x86/kvm/mmu/mmu_internal.h | 10 + + arch/x86/kvm/mmu/paging_tmpl.h | 3 +- + arch/x86/kvm/mmu/spte.c | 159 ++++--- + arch/x86/kvm/mmu/spte.h | 141 ++++-- + arch/x86/kvm/mmu/tdp_mmu.c | 99 ++--- + arch/x86/kvm/svm/avic.c | 24 +- + arch/x86/kvm/svm/nested.c | 495 ++++++++++++--------- + arch/x86/kvm/svm/sev.c | 27 +- + arch/x86/kvm/svm/svm.c | 867 +++++++++++++++++-------------------- + arch/x86/kvm/svm/svm.h | 64 ++- + arch/x86/kvm/svm/vmenter.S | 47 +- + arch/x86/kvm/vmx/nested.c | 28 +- + arch/x86/kvm/vmx/vmx.c | 232 ++++------ + arch/x86/kvm/vmx/vmx.h | 19 +- + arch/x86/kvm/x86.c | 111 +++-- + arch/x86/kvm/x86.h | 10 + + 24 files changed, 1509 insertions(+), 1304 deletions(-) +Merging kvm-arm/next (c90e53cd9614 Merge branch 'kvm-arm64/debug-5.13' into kvmarm-master/next) +$ git merge kvm-arm/next +Auto-merging tools/testing/selftests/kvm/lib/kvm_util.c +Auto-merging tools/testing/selftests/kvm/include/kvm_util.h +Auto-merging tools/testing/selftests/kvm/Makefile +Auto-merging tools/testing/selftests/kvm/.gitignore +Auto-merging kernel/time/timekeeping.c +Auto-merging kernel/time/clocksource.c +Auto-merging include/linux/clocksource.h +Auto-merging drivers/irqchip/irq-gic-v3-its.c +Auto-merging arch/arm64/include/asm/sysreg.h +Auto-merging arch/arm64/include/asm/pgtable-prot.h +Auto-merging arch/arm64/include/asm/barrier.h +Auto-merging arch/arm64/include/asm/assembler.h +Auto-merging arch/arm64/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/virt/kvm/api.rst +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-bus-coresight-devices-trbe | 14 + + Documentation/devicetree/bindings/arm/ete.yaml | 75 ++ + Documentation/devicetree/bindings/arm/trbe.yaml | 49 + + Documentation/trace/coresight/coresight-trbe.rst | 38 + + Documentation/virt/kvm/api.rst | 13 +- + Documentation/virt/kvm/arm/index.rst | 1 + + Documentation/virt/kvm/arm/ptp_kvm.rst | 25 + + Documentation/virt/kvm/devices/arm-vgic-its.rst | 2 +- + Documentation/virt/kvm/devices/arm-vgic-v3.rst | 2 +- + MAINTAINERS | 4 +- + arch/arm/include/asm/hypervisor.h | 3 + + arch/arm64/Kconfig | 7 - + arch/arm64/include/asm/assembler.h | 27 +- + arch/arm64/include/asm/barrier.h | 1 + + arch/arm64/include/asm/el2_setup.h | 13 + + arch/arm64/include/asm/fpsimd.h | 11 + + arch/arm64/include/asm/fpsimdmacros.h | 10 +- + arch/arm64/include/asm/hyp_image.h | 7 + + arch/arm64/include/asm/hypervisor.h | 3 + + arch/arm64/include/asm/kvm_arm.h | 2 + + arch/arm64/include/asm/kvm_asm.h | 9 + + arch/arm64/include/asm/kvm_host.h | 46 +- + arch/arm64/include/asm/kvm_hyp.h | 14 +- + arch/arm64/include/asm/kvm_mmu.h | 25 +- + arch/arm64/include/asm/kvm_pgtable.h | 164 ++- + arch/arm64/include/asm/pgtable-prot.h | 4 +- + arch/arm64/include/asm/sections.h | 1 + + arch/arm64/include/asm/sysreg.h | 57 +- + arch/arm64/kernel/asm-offsets.c | 3 + + arch/arm64/kernel/cpu-reset.S | 5 +- + arch/arm64/kernel/hyp-stub.S | 3 +- + arch/arm64/kernel/image-vars.h | 34 +- + arch/arm64/kernel/vmlinux.lds.S | 74 +- + arch/arm64/kvm/arm.c | 212 +++- + arch/arm64/kvm/debug.c | 118 +- + arch/arm64/kvm/fpsimd.c | 26 +- + arch/arm64/kvm/guest.c | 6 +- + arch/arm64/kvm/handle_exit.c | 45 + + arch/arm64/kvm/hyp/Makefile | 2 +- + arch/arm64/kvm/hyp/fpsimd.S | 10 + + arch/arm64/kvm/hyp/include/hyp/switch.h | 107 +- + arch/arm64/kvm/hyp/include/nvhe/early_alloc.h | 14 + + arch/arm64/kvm/hyp/include/nvhe/gfp.h | 68 ++ + arch/arm64/kvm/hyp/include/nvhe/mem_protect.h | 36 + + arch/arm64/kvm/hyp/include/nvhe/memory.h | 52 + + arch/arm64/kvm/hyp/include/nvhe/mm.h | 96 ++ + arch/arm64/kvm/hyp/include/nvhe/spinlock.h | 92 ++ + arch/arm64/kvm/hyp/nvhe/Makefile | 9 +- + arch/arm64/kvm/hyp/nvhe/cache.S | 13 + + arch/arm64/kvm/hyp/nvhe/debug-sr.c | 56 +- + arch/arm64/kvm/hyp/nvhe/early_alloc.c | 54 + + arch/arm64/kvm/hyp/nvhe/gen-hyprel.c | 18 + + arch/arm64/kvm/hyp/nvhe/host.S | 18 +- + arch/arm64/kvm/hyp/nvhe/hyp-init.S | 54 +- + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 75 +- + arch/arm64/kvm/hyp/nvhe/hyp-smp.c | 6 +- + arch/arm64/kvm/hyp/nvhe/hyp.lds.S | 1 + + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 279 +++++ + arch/arm64/kvm/hyp/nvhe/mm.c | 173 +++ + arch/arm64/kvm/hyp/nvhe/page_alloc.c | 195 ++++ + arch/arm64/kvm/hyp/nvhe/psci-relay.c | 4 +- + arch/arm64/kvm/hyp/nvhe/setup.c | 214 ++++ + arch/arm64/kvm/hyp/nvhe/stub.c | 22 + + arch/arm64/kvm/hyp/nvhe/switch.c | 26 +- + arch/arm64/kvm/hyp/nvhe/tlb.c | 4 +- + arch/arm64/kvm/hyp/pgtable.c | 410 +++++-- + arch/arm64/kvm/hyp/reserved_mem.c | 113 ++ + arch/arm64/kvm/hyp/vhe/switch.c | 4 +- + arch/arm64/kvm/hypercalls.c | 80 +- + arch/arm64/kvm/mmu.c | 136 ++- + arch/arm64/kvm/perf.c | 3 +- + arch/arm64/kvm/pmu.c | 8 +- + arch/arm64/kvm/reset.c | 46 +- + arch/arm64/kvm/sys_regs.c | 1 + + arch/arm64/kvm/va_layout.c | 7 + + arch/arm64/kvm/vgic/vgic-init.c | 12 +- + arch/arm64/kvm/vgic/vgic-its.c | 6 +- + arch/arm64/kvm/vgic/vgic-kvm-device.c | 3 + + arch/arm64/kvm/vgic/vgic-mmio-v3.c | 81 +- + arch/arm64/kvm/vgic/vgic-mmio.c | 10 +- + arch/arm64/kvm/vgic/vgic-v3.c | 66 +- + arch/arm64/kvm/vgic/vgic-v4.c | 38 + + arch/arm64/kvm/vgic/vgic.h | 2 + + arch/arm64/lib/clear_page.S | 4 +- + arch/arm64/lib/copy_page.S | 4 +- + arch/arm64/mm/init.c | 3 + + drivers/clocksource/arm_arch_timer.c | 36 + + drivers/firmware/psci/psci.c | 2 + + drivers/firmware/smccc/Makefile | 2 +- + drivers/firmware/smccc/kvm_guest.c | 50 + + drivers/firmware/smccc/smccc.c | 1 + + drivers/hwtracing/coresight/Kconfig | 24 +- + drivers/hwtracing/coresight/Makefile | 1 + + drivers/hwtracing/coresight/coresight-core.c | 29 +- + drivers/hwtracing/coresight/coresight-etm-perf.c | 119 +- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 161 ++- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 19 +- + drivers/hwtracing/coresight/coresight-etm4x.h | 83 +- + drivers/hwtracing/coresight/coresight-platform.c | 6 + + drivers/hwtracing/coresight/coresight-priv.h | 3 + + drivers/hwtracing/coresight/coresight-trbe.c | 1157 ++++++++++++++++++++ + drivers/hwtracing/coresight/coresight-trbe.h | 152 +++ + drivers/irqchip/irq-gic-v3-its.c | 18 +- + drivers/ptp/Kconfig | 2 +- + drivers/ptp/Makefile | 2 + + drivers/ptp/ptp_kvm_arm.c | 28 + + drivers/ptp/{ptp_kvm.c => ptp_kvm_common.c} | 84 +- + drivers/ptp/ptp_kvm_x86.c | 97 ++ + include/kvm/arm_vgic.h | 1 + + include/linux/arm-smccc.h | 41 + + include/linux/bug.h | 3 + + include/linux/clocksource.h | 6 + + include/linux/clocksource_ids.h | 12 + + include/linux/coresight.h | 13 + + include/linux/ptp_kvm.h | 19 + + include/linux/timekeeping.h | 12 +- + include/uapi/linux/kvm.h | 1 + + include/uapi/linux/perf_event.h | 13 +- + kernel/time/clocksource.c | 2 + + kernel/time/timekeeping.c | 1 + + lib/bug.c | 54 +- + tools/testing/selftests/kvm/.gitignore | 1 + + tools/testing/selftests/kvm/Makefile | 1 + + tools/testing/selftests/kvm/aarch64/vgic_init.c | 551 ++++++++++ + tools/testing/selftests/kvm/include/kvm_util.h | 9 + + tools/testing/selftests/kvm/lib/kvm_util.c | 75 ++ + 126 files changed, 6120 insertions(+), 659 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-coresight-devices-trbe + create mode 100644 Documentation/devicetree/bindings/arm/ete.yaml + create mode 100644 Documentation/devicetree/bindings/arm/trbe.yaml + create mode 100644 Documentation/trace/coresight/coresight-trbe.rst + create mode 100644 Documentation/virt/kvm/arm/ptp_kvm.rst + create mode 100644 arch/arm64/kvm/hyp/include/nvhe/early_alloc.h + create mode 100644 arch/arm64/kvm/hyp/include/nvhe/gfp.h + create mode 100644 arch/arm64/kvm/hyp/include/nvhe/mem_protect.h + create mode 100644 arch/arm64/kvm/hyp/include/nvhe/memory.h + create mode 100644 arch/arm64/kvm/hyp/include/nvhe/mm.h + create mode 100644 arch/arm64/kvm/hyp/include/nvhe/spinlock.h + create mode 100644 arch/arm64/kvm/hyp/nvhe/cache.S + create mode 100644 arch/arm64/kvm/hyp/nvhe/early_alloc.c + create mode 100644 arch/arm64/kvm/hyp/nvhe/mem_protect.c + create mode 100644 arch/arm64/kvm/hyp/nvhe/mm.c + create mode 100644 arch/arm64/kvm/hyp/nvhe/page_alloc.c + create mode 100644 arch/arm64/kvm/hyp/nvhe/setup.c + create mode 100644 arch/arm64/kvm/hyp/nvhe/stub.c + create mode 100644 arch/arm64/kvm/hyp/reserved_mem.c + create mode 100644 drivers/firmware/smccc/kvm_guest.c + create mode 100644 drivers/hwtracing/coresight/coresight-trbe.c + create mode 100644 drivers/hwtracing/coresight/coresight-trbe.h + create mode 100644 drivers/ptp/ptp_kvm_arm.c + rename drivers/ptp/{ptp_kvm.c => ptp_kvm_common.c} (60%) + create mode 100644 drivers/ptp/ptp_kvm_x86.c + create mode 100644 include/linux/clocksource_ids.h + create mode 100644 include/linux/ptp_kvm.h + create mode 100644 tools/testing/selftests/kvm/aarch64/vgic_init.c +Merging kvm-ppc/kvm-ppc-next (72476aaa4691 KVM: PPC: Book3S HV: Fix host radix SLB optimisation with hash guests) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (c3171e94cc1c KVM: s390: VSIE: fix MVPG handling for prefixing and MSO) +$ git merge kvms390/next +Merge made by the 'recursive' strategy. + Documentation/virt/kvm/s390-diag.rst | 33 +++++++++++ + arch/s390/include/asm/kvm_host.h | 1 + + arch/s390/include/asm/smp.h | 1 + + arch/s390/kernel/smp.c | 1 + + arch/s390/kvm/diag.c | 31 +++++++++- + arch/s390/kvm/gaccess.c | 30 ++++++++-- + arch/s390/kvm/gaccess.h | 60 ++++++++++++++----- + arch/s390/kvm/kvm-s390.c | 8 ++- + arch/s390/kvm/kvm-s390.h | 8 +++ + arch/s390/kvm/vsie.c | 109 ++++++++++++++++++++++++++++++++--- + 10 files changed, 250 insertions(+), 32 deletions(-) +Merging xen-tip/linux-next (d120198bd5ff xen/evtchn: Change irq_info lock to raw_spinlock_t) +$ git merge xen-tip/linux-next +Merge made by the 'recursive' strategy. + drivers/xen/events/events_base.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) +Merging percpu/for-next (df1c002198a8 Merge branch 'for-5.12' into for-next) +$ git merge percpu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (89e28ce60cb6 workqueue/watchdog: Make unbound workqueues aware of touch_softlockup_watchdog() 84;0;0c84;0;0c There are two workqueue-specific watchdog timestamps:) +$ git merge workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (e72457fce9c3 platform/x86: intel-hid: Fix spurious wakeups caused by tablet-mode events during suspend) +$ git merge drivers-x86/for-next +Auto-merging drivers/platform/x86/thinkpad_acpi.c +CONFLICT (content): Merge conflict in drivers/platform/x86/thinkpad_acpi.c +Auto-merging drivers/platform/x86/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst +Resolved 'drivers/platform/x86/thinkpad_acpi.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 713a4b39c163] Merge remote-tracking branch 'drivers-x86/for-next' +$ git diff -M --stat --summary HEAD^.. + .../admin-guide/laptops/thinkpad-acpi.rst | 20 + + .../driver-api/surface_aggregator/client.rst | 4 +- + .../driver-api/surface_aggregator/clients/dtx.rst | 718 +++++++++++ + .../surface_aggregator/clients/index.rst | 1 + + Documentation/userspace-api/ioctl/ioctl-number.rst | 2 + + MAINTAINERS | 18 +- + drivers/platform/mellanox/mlxbf-bootctl.c | 2 +- + drivers/platform/surface/Kconfig | 42 + + drivers/platform/surface/Makefile | 2 + + drivers/platform/surface/aggregator/controller.c | 10 +- + .../platform/surface/surface_aggregator_registry.c | 9 +- + drivers/platform/surface/surface_dtx.c | 1289 ++++++++++++++++++++ + .../platform/surface/surface_platform_profile.c | 190 +++ + drivers/platform/surface/surfacepro3_button.c | 2 - + drivers/platform/x86/Kconfig | 3 +- + drivers/platform/x86/asus-laptop.c | 2 +- + drivers/platform/x86/classmate-laptop.c | 2 +- + drivers/platform/x86/dell/dell-smbios-wmi.c | 3 +- + drivers/platform/x86/dell/dell-wmi-descriptor.c | 3 +- + .../x86/dell/dell-wmi-sysman/biosattr-interface.c | 3 +- + .../dell/dell-wmi-sysman/passwordattr-interface.c | 3 +- + drivers/platform/x86/dell/dell-wmi.c | 3 +- + drivers/platform/x86/hp-wmi.c | 101 +- + drivers/platform/x86/intel-wmi-sbl-fw-update.c | 3 +- + drivers/platform/x86/intel-wmi-thunderbolt.c | 3 +- + drivers/platform/x86/lg-laptop.c | 2 +- + drivers/platform/x86/thinkpad_acpi.c | 134 +- + drivers/platform/x86/touchscreen_dmi.c | 2 +- + drivers/platform/x86/wmi-bmof.c | 3 +- + drivers/platform/x86/wmi.c | 6 +- + drivers/platform/x86/xo15-ebook.c | 6 +- + include/linux/surface_aggregator/controller.h | 74 +- + include/linux/surface_aggregator/device.h | 31 +- + include/linux/wmi.h | 2 +- + include/uapi/linux/surface_aggregator/dtx.h | 146 +++ + 35 files changed, 2739 insertions(+), 105 deletions(-) + create mode 100644 Documentation/driver-api/surface_aggregator/clients/dtx.rst + create mode 100644 drivers/platform/surface/surface_dtx.c + create mode 100644 drivers/platform/surface/surface_platform_profile.c + create mode 100644 include/uapi/linux/surface_aggregator/dtx.h +Merging chrome-platform/for-next (c6e939c63c80 platform/chrome: cros_ec_typec: fix clang -Wformat warning) +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. + drivers/platform/chrome/cros_ec_typec.c | 24 ++++++++++++------------ + drivers/platform/chrome/wilco_ec/telemetry.c | 2 +- + 2 files changed, 13 insertions(+), 13 deletions(-) +Merging hsi/for-next (aa57e77b3d28 HSI: Fix PM usage counter unbalance in ssi_hw_init) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (d9dfac5419d0 leds: rt4505: Add support for Richtek RT4505 flash LED controller) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-rt4505.yaml | 57 +++ + drivers/leds/Kconfig | 7 +- + drivers/leds/Makefile | 2 +- + drivers/leds/blink/Kconfig | 35 +- + drivers/leds/blink/Makefile | 2 +- + drivers/leds/flash/Kconfig | 11 + + drivers/leds/flash/Makefile | 1 + + drivers/leds/flash/leds-rt4505.c | 430 +++++++++++++++++++++ + 8 files changed, 521 insertions(+), 24 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/leds-rt4505.yaml + create mode 100644 drivers/leds/flash/leds-rt4505.c +Merging ipmi/for-next (07cbd87b0416 ipmi_si: Join string literals back) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_msghandler.c | 60 +++++++++-------------- + drivers/char/ipmi/ipmi_plat_data.c | 2 +- + drivers/char/ipmi/ipmi_si.h | 8 +-- + drivers/char/ipmi/ipmi_si_hardcode.c | 73 ++++++++++----------------- + drivers/char/ipmi/ipmi_si_hotmod.c | 24 +++------ + drivers/char/ipmi/ipmi_si_intf.c | 38 +++++---------- + drivers/char/ipmi/ipmi_si_pci.c | 22 ++------- + drivers/char/ipmi/ipmi_si_platform.c | 95 +++++++++++++++--------------------- + drivers/char/ipmi/ipmi_ssif.c | 81 ++++++++---------------------- + 9 files changed, 137 insertions(+), 266 deletions(-) +Merging driver-core/driver-core-next (c2f3f755f5c7 Revert "driver core: platform: Make platform_get_irq_optional() optional") +$ git merge driver-core/driver-core-next +Auto-merging drivers/regulator/qcom_spmi-regulator.c +Auto-merging drivers/power/supply/sbs-battery.c +Auto-merging drivers/power/supply/axp20x_usb_power.c +Auto-merging drivers/of/property.c +CONFLICT (content): Merge conflict in drivers/of/property.c +Auto-merging drivers/clk/clk.c +Auto-merging drivers/base/dd.c +Auto-merging MAINTAINERS +Resolved 'drivers/of/property.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5397957c2e3b] Merge remote-tracking branch 'driver-core/driver-core-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 6 ++ + drivers/base/attribute_container.c | 4 + + drivers/base/auxiliary.c | 5 -- + drivers/base/base.h | 2 + + drivers/base/component.c | 9 +- + drivers/base/core.c | 112 +++++++++++++++++++++--- + drivers/base/cpu.c | 6 +- + drivers/base/dd.c | 48 +++++++--- + drivers/base/devcoredump.c | 19 ++-- + drivers/base/devres.c | 6 +- + drivers/base/devtmpfs.c | 6 +- + drivers/base/platform-msi.c | 3 +- + drivers/base/platform.c | 11 ++- + drivers/base/swnode.c | 101 +++++++++++---------- + drivers/base/test/property-entry-test.c | 61 ++++++++++--- + drivers/clk/clk.c | 2 + + drivers/extcon/extcon-gpio.c | 15 +--- + drivers/extcon/extcon-intel-int3496.c | 16 +--- + drivers/extcon/extcon-palmas.c | 17 ++-- + drivers/extcon/extcon-qcom-spmi-misc.c | 17 ++-- + drivers/hwmon/raspberrypi-hwmon.c | 17 ++-- + drivers/media/pci/intel/ipu3/cio2-bridge.c | 4 +- + drivers/of/property.c | 47 ++++++---- + drivers/platform/x86/gpd-pocket-fan.c | 17 ++-- + drivers/power/supply/axp20x_usb_power.c | 17 ++-- + drivers/power/supply/bq24735-charger.c | 18 ++-- + drivers/power/supply/ltc2941-battery-gauge.c | 20 ++--- + drivers/power/supply/sbs-battery.c | 16 ++-- + drivers/regulator/qcom_spmi-regulator.c | 34 ++----- + drivers/watchdog/retu_wdt.c | 22 ++--- + fs/debugfs/file.c | 3 +- + include/linux/device.h | 6 +- + include/linux/devm-helpers.h | 53 +++++++++++ + include/linux/platform_device.h | 3 + + include/linux/property.h | 13 +-- + tools/testing/selftests/firmware/fw_namespace.c | 2 +- + 36 files changed, 455 insertions(+), 303 deletions(-) + create mode 100644 include/linux/devm-helpers.h +Merging usb/usb-next (e9fcb07704fc xhci: prevent double-fetch of transfer and transfer event TRBs) +$ git merge usb/usb-next +Auto-merging include/linux/power_supply.h +Removing include/linux/platform_data/usb-mx2.h +Auto-merging arch/arm64/boot/dts/mediatek/mt8183.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mp.dtsi +Auto-merging arch/arm/configs/multi_v7_defconfig +Removing Documentation/devicetree/bindings/usb/usb-nop-xceiv.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/usb/dwc3-xilinx.txt | 28 +- + .../devicetree/bindings/usb/fsl,imx8mp-dwc3.yaml | 9 +- + .../devicetree/bindings/usb/generic-ehci.yaml | 6 + + .../devicetree/bindings/usb/mediatek,mtk-xhci.yaml | 16 +- + .../devicetree/bindings/usb/mediatek,mtu3.yaml | 12 +- + .../devicetree/bindings/usb/qcom,dwc3.yaml | 1 + + .../devicetree/bindings/usb/usb-device.yaml | 6 +- + .../devicetree/bindings/usb/usb-nop-xceiv.txt | 43 --- + .../devicetree/bindings/usb/usb-nop-xceiv.yaml | 64 ++++ + arch/arm/configs/multi_v7_defconfig | 2 +- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 4 +- + drivers/usb/chipidea/ci_hdrc_tegra.c | 8 +- + drivers/usb/chipidea/host.c | 2 +- + drivers/usb/common/common.c | 76 +++++ + drivers/usb/common/debug.c | 22 +- + drivers/usb/core/devices.c | 21 +- + drivers/usb/core/driver.c | 10 +- + drivers/usb/core/endpoint.c | 35 +- + drivers/usb/core/hcd.c | 6 +- + drivers/usb/core/hub.c | 97 ++++-- + drivers/usb/core/sysfs.c | 5 +- + drivers/usb/core/usb.c | 8 +- + drivers/usb/dwc2/core.h | 2 +- + drivers/usb/dwc2/debugfs.c | 2 + + drivers/usb/dwc2/hcd_queue.c | 2 +- + drivers/usb/dwc3/Kconfig | 9 + + drivers/usb/dwc3/Makefile | 1 + + drivers/usb/dwc3/core.c | 16 +- + drivers/usb/dwc3/core.h | 38 ++- + drivers/usb/dwc3/debug.h | 2 +- + drivers/usb/dwc3/debugfs.c | 14 +- + drivers/usb/dwc3/dwc3-exynos.c | 2 +- + drivers/usb/dwc3/dwc3-imx8mp.c | 2 +- + drivers/usb/dwc3/dwc3-keystone.c | 2 +- + drivers/usb/dwc3/dwc3-of-simple.c | 1 - + drivers/usb/dwc3/dwc3-pci.c | 2 +- + drivers/usb/dwc3/dwc3-qcom.c | 2 +- + drivers/usb/dwc3/dwc3-st.c | 2 +- + drivers/usb/dwc3/dwc3-xilinx.c | 339 +++++++++++++++++++ + drivers/usb/dwc3/gadget.c | 72 ++-- + drivers/usb/dwc3/gadget.h | 6 +- + drivers/usb/dwc3/io.h | 2 +- + drivers/usb/dwc3/trace.c | 2 +- + drivers/usb/dwc3/trace.h | 8 +- + drivers/usb/gadget/function/f_fs.c | 14 +- + drivers/usb/gadget/function/f_mass_storage.c | 2 - + drivers/usb/gadget/function/f_printer.c | 2 +- + drivers/usb/gadget/function/f_uac1.c | 272 +++++++++++---- + drivers/usb/gadget/function/f_uac2.c | 263 +++++++++++---- + drivers/usb/gadget/function/f_uvc.c | 8 +- + drivers/usb/gadget/function/u_audio.c | 6 +- + drivers/usb/gadget/function/uvc_configfs.c | 2 +- + drivers/usb/gadget/legacy/mass_storage.c | 4 +- + drivers/usb/gadget/legacy/multi.c | 14 +- + drivers/usb/gadget/legacy/webcam.c | 3 +- + drivers/usb/gadget/udc/aspeed-vhub/core.c | 3 +- + drivers/usb/gadget/udc/aspeed-vhub/epn.c | 2 +- + drivers/usb/gadget/udc/dummy_hcd.c | 2 +- + drivers/usb/gadget/udc/fotg210-udc.c | 28 +- + drivers/usb/gadget/udc/pch_udc.c | 241 +++++++------- + drivers/usb/gadget/udc/s3c2410_udc.c | 24 +- + drivers/usb/gadget/udc/snps_udc_plat.c | 4 +- + drivers/usb/host/Kconfig | 1 + + drivers/usb/host/Makefile | 6 +- + drivers/usb/host/ehci-hcd.c | 15 +- + drivers/usb/host/ehci-hub.c | 4 +- + drivers/usb/host/ehci-platform.c | 5 + + drivers/usb/host/ehci.h | 1 + + drivers/usb/host/fotg210-hcd.c | 12 +- + drivers/usb/host/isp116x-hcd.c | 7 +- + drivers/usb/host/isp116x.h | 1 - + drivers/usb/host/isp1362-hcd.c | 8 +- + drivers/usb/host/isp1362.h | 1 - + drivers/usb/host/sl811-hcd.c | 16 +- + drivers/usb/host/sl811.h | 1 - + drivers/usb/host/sl811_cs.c | 2 +- + drivers/usb/host/uhci-hcd.c | 12 +- + drivers/usb/host/uhci-hcd.h | 4 - + drivers/usb/host/xhci-hub.c | 320 +++++++++++------- + drivers/usb/host/xhci-mem.c | 14 +- + drivers/usb/host/xhci-mtk-sch.c | 369 ++++++++++++++------- + drivers/usb/host/xhci-mtk.c | 50 ++- + drivers/usb/host/xhci-mtk.h | 47 +-- + drivers/usb/host/xhci-ring.c | 48 ++- + drivers/usb/host/xhci.c | 46 ++- + drivers/usb/host/xhci.h | 8 + + drivers/usb/misc/ehset.c | 76 ++--- + drivers/usb/misc/ezusb.c | 16 +- + drivers/usb/misc/usbsevseg.c | 60 +--- + drivers/usb/mtu3/mtu3_host.c | 30 +- + drivers/usb/mtu3/mtu3_plat.c | 7 +- + drivers/usb/renesas_usbhs/fifo.c | 4 +- + drivers/usb/typec/Kconfig | 15 +- + drivers/usb/typec/Makefile | 2 +- + drivers/usb/typec/bus.c | 2 + + drivers/usb/typec/bus.h | 19 +- + drivers/usb/typec/class.c | 91 +---- + drivers/usb/typec/class.h | 76 +++++ + drivers/usb/typec/mux.c | 4 +- + drivers/usb/typec/mux.h | 21 ++ + drivers/usb/typec/stusb160x.c | 4 +- + drivers/usb/typec/tcpm/fusb302.c | 5 +- + drivers/usb/typec/tcpm/tcpci.c | 17 +- + drivers/usb/typec/tcpm/tcpci.h | 16 + + drivers/usb/typec/tcpm/tcpci_maxim.c | 2 +- + drivers/usb/typec/tcpm/tcpm.c | 90 +++-- + drivers/usb/typec/tipd/Kconfig | 12 + + drivers/usb/typec/tipd/Makefile | 6 + + drivers/usb/typec/{tps6598x.c => tipd/core.c} | 68 ++-- + drivers/usb/typec/tipd/tps6598x.h | 189 +++++++++++ + drivers/usb/typec/tipd/trace.c | 9 + + drivers/usb/typec/tipd/trace.h | 283 ++++++++++++++++ + drivers/usb/typec/ucsi/ucsi.c | 2 +- + include/linux/platform_data/usb-mx2.h | 29 -- + include/linux/power_supply.h | 7 + + include/linux/usb.h | 6 +- + include/linux/usb/ch9.h | 62 +--- + include/linux/usb/ehci_pdriver.h | 1 + + include/uapi/linux/usb/video.h | 3 +- + tools/usb/usbip/doc/usbip.8 | 42 ++- + tools/usb/usbip/doc/usbipd.8 | 26 ++ + tools/usb/usbip/libsrc/list.h | 10 +- + tools/usb/usbip/src/usbip_list.c | 3 +- + 123 files changed, 2918 insertions(+), 1298 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/usb/usb-nop-xceiv.txt + create mode 100644 Documentation/devicetree/bindings/usb/usb-nop-xceiv.yaml + create mode 100644 drivers/usb/dwc3/dwc3-xilinx.c + create mode 100644 drivers/usb/typec/class.h + create mode 100644 drivers/usb/typec/mux.h + create mode 100644 drivers/usb/typec/tipd/Kconfig + create mode 100644 drivers/usb/typec/tipd/Makefile + rename drivers/usb/typec/{tps6598x.c => tipd/core.c} (91%) + create mode 100644 drivers/usb/typec/tipd/tps6598x.h + create mode 100644 drivers/usb/typec/tipd/trace.c + create mode 100644 drivers/usb/typec/tipd/trace.h + delete mode 100644 include/linux/platform_data/usb-mx2.h +Merging usb-gadget/next (a38fd8748464 Linux 5.12-rc2) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (5fec21e74bfc USB: serial: xr: claim both interfaces) +$ git merge usb-serial/usb-next +Merge made by the 'recursive' strategy. + drivers/usb/serial/io_edgeport.c | 45 +--------- + drivers/usb/serial/iuu_phoenix.c | 4 +- + drivers/usb/serial/keyspan.c | 20 ----- + drivers/usb/serial/pl2303.c | 175 +++++++++++++++++++++++++++++++-------- + drivers/usb/serial/usb-serial.c | 135 ++++++++++++++++++++++-------- + drivers/usb/serial/xr_serial.c | 31 ++++++- + include/linux/usb/serial.h | 8 +- + 7 files changed, 280 insertions(+), 138 deletions(-) +Merging usb-chipidea-next/for-usb-next (df4aed23d67d usb: cdnsp: remove redundant initialization of variable ret) +$ git merge usb-chipidea-next/for-usb-next +Auto-merging include/linux/usb.h +Auto-merging drivers/usb/typec/tipd/core.c +CONFLICT (content): Merge conflict in drivers/usb/typec/tipd/core.c +Auto-merging drivers/usb/typec/tcpm/tcpm.c +Auto-merging drivers/usb/typec/Makefile +Auto-merging drivers/usb/host/sl811-hcd.c +Auto-merging drivers/usb/dwc3/gadget.c +CONFLICT (content): Merge conflict in drivers/usb/dwc3/gadget.c +Auto-merging drivers/usb/dwc3/core.h +Auto-merging drivers/usb/dwc3/core.c +Auto-merging drivers/usb/core/usb.c +Resolved 'drivers/usb/dwc3/gadget.c' using previous resolution. +Resolved 'drivers/usb/typec/tipd/core.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master aca8e1bbe11e] Merge remote-tracking branch 'usb-chipidea-next/for-usb-next' +$ git diff -M --stat --summary HEAD^.. + drivers/usb/cdns3/cdns3-gadget.c | 73 ++++++---- + drivers/usb/cdns3/cdns3-gadget.h | 3 + + drivers/usb/cdns3/cdns3-imx.c | 34 +++++ + drivers/usb/cdns3/cdns3-plat.c | 23 ++- + drivers/usb/cdns3/cdns3-trace.h | 5 +- + drivers/usb/cdns3/cdnsp-mem.c | 3 +- + drivers/usb/cdns3/core.c | 29 +++- + drivers/usb/cdns3/drd.c | 15 ++ + drivers/usb/cdns3/drd.h | 2 +- + drivers/usb/typec/Makefile | 3 + + drivers/usb/typec/tipd/core.c | 2 + + drivers/usb/typec/tps6598x.h | 189 +++++++++++++++++++++++++ + drivers/usb/typec/tps6598x_trace.h | 283 +++++++++++++++++++++++++++++++++++++ + 13 files changed, 626 insertions(+), 38 deletions(-) + create mode 100644 drivers/usb/typec/tps6598x.h + create mode 100644 drivers/usb/typec/tps6598x_trace.h +Merging tty/tty-next (88d8cb7b5f21 tty: synclink_gt: drop redundant tty-port initialisation) +$ git merge tty/tty-next +Auto-merging sound/soc/ti/ams-delta.c +Auto-merging net/nfc/nci/uart.c +CONFLICT (content): Merge conflict in net/nfc/nci/uart.c +Removing include/uapi/linux/cyclades.h +Auto-merging include/linux/pci_ids.h +Removing include/linux/isicom.h +Removing include/linux/cyclades.h +Auto-merging drivers/tty/serial/sh-sci.c +Removing drivers/tty/rocket_int.h +Removing drivers/tty/rocket.h +Removing drivers/tty/rocket.c +Removing drivers/tty/isicom.c +Removing drivers/tty/cyclades.c +Auto-merging drivers/s390/char/con3215.c +Auto-merging arch/arm/boot/dts/stm32mp151.dtsi +Auto-merging MAINTAINERS +Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst +Removing Documentation/driver-api/serial/rocket.rst +Removing Documentation/driver-api/serial/cyclades_z.rst +Auto-merging Documentation/devicetree/bindings/serial/st,stm32-uart.yaml +Resolved 'net/nfc/nci/uart.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 97d29dc39b6f] Merge remote-tracking branch 'tty/tty-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/devices.txt | 12 +- + Documentation/devicetree/bindings/serial/8250.yaml | 1 + + .../bindings/serial/brcm,bcm7271-uart.yaml | 95 + + .../devicetree/bindings/serial/samsung_uart.yaml | 14 +- + .../devicetree/bindings/serial/st,stm32-uart.yaml | 29 +- + Documentation/driver-api/serial/cyclades_z.rst | 11 - + Documentation/driver-api/serial/index.rst | 1 - + Documentation/driver-api/serial/rocket.rst | 185 - + Documentation/process/magic-number.rst | 4 - + .../translations/it_IT/process/magic-number.rst | 4 - + .../translations/zh_CN/process/magic-number.rst | 4 - + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 - + MAINTAINERS | 30 +- + arch/arm/boot/dts/stm32mp151.dtsi | 24 +- + arch/powerpc/configs/ppc6xx_defconfig | 1 - + arch/xtensa/platforms/iss/console.c | 45 +- + drivers/accessibility/speakup/spk_ttyio.c | 1 - + drivers/bluetooth/hci_ldisc.c | 1 - + drivers/char/pcmcia/synclink_cs.c | 2 - + drivers/irqchip/irq-stm32-exti.c | 7 + + drivers/misc/ti-st/st_core.c | 1 - + drivers/net/caif/caif_serial.c | 18 +- + drivers/net/can/slcan.c | 1 - + drivers/net/hamradio/6pack.c | 1 - + drivers/net/hamradio/mkiss.c | 1 - + drivers/net/ppp/ppp_async.c | 1 - + drivers/net/ppp/ppp_synctty.c | 1 - + drivers/net/slip/slip.c | 1 - + drivers/pps/clients/pps-ldisc.c | 3 - + drivers/s390/char/con3215.c | 56 +- + drivers/staging/fwserial/fwserial.c | 19 +- + drivers/staging/gdm724x/gdm_tty.c | 2 +- + drivers/staging/greybus/uart.c | 16 +- + drivers/tty/Kconfig | 56 +- + drivers/tty/Makefile | 3 - + drivers/tty/amiserial.c | 33 +- + drivers/tty/cyclades.c | 4119 -------------------- + drivers/tty/hvc/hvcs.c | 24 - + drivers/tty/ipwireless/tty.c | 11 +- + drivers/tty/isicom.c | 1699 -------- + drivers/tty/moxa.c | 25 +- + drivers/tty/mxser.c | 31 +- + drivers/tty/n_gsm.c | 22 +- + drivers/tty/n_hdlc.c | 1 - + drivers/tty/n_null.c | 1 - + drivers/tty/n_r3964.c | 1 - + drivers/tty/n_tty.c | 2 +- + drivers/tty/nozomi.c | 26 +- + drivers/tty/pty.c | 4 + + drivers/tty/rocket.c | 3127 --------------- + drivers/tty/rocket.h | 111 - + drivers/tty/rocket_int.h | 1214 ------ + drivers/tty/serial/8250/8250_bcm7271.c | 1202 ++++++ + drivers/tty/serial/8250/8250_exar.c | 17 +- + drivers/tty/serial/8250/8250_fsl.c | 5 +- + drivers/tty/serial/8250/8250_of.c | 1 + + drivers/tty/serial/8250/8250_port.c | 24 +- + drivers/tty/serial/8250/Kconfig | 15 +- + drivers/tty/serial/8250/Makefile | 1 + + drivers/tty/serial/8250/serial_cs.c | 12 +- + drivers/tty/serial/Kconfig | 3 +- + drivers/tty/serial/imx.c | 16 +- + drivers/tty/serial/jsm/jsm_tty.c | 24 +- + drivers/tty/serial/kgdb_nmi.c | 4 +- + drivers/tty/serial/liteuart.c | 4 +- + drivers/tty/serial/max310x.c | 2 +- + drivers/tty/serial/pch_uart.c | 22 +- + drivers/tty/serial/samsung_tty.c | 507 ++- + drivers/tty/serial/sc16is7xx.c | 2 +- + drivers/tty/serial/sh-sci.c | 2 +- + drivers/tty/serial/stm32-usart.c | 247 +- + drivers/tty/serial/stm32-usart.h | 9 +- + drivers/tty/synclink_gt.c | 64 +- + drivers/tty/tty_io.c | 12 +- + drivers/tty/tty_ioctl.c | 3 +- + drivers/tty/vcc.c | 72 +- + drivers/tty/vt/keyboard.c | 2 +- + drivers/tty/vt/vt.c | 3 +- + drivers/usb/serial/mos7720.c | 2 +- + drivers/video/console/vgacon.c | 5 +- + include/linux/cyclades.h | 364 -- + include/linux/isicom.h | 85 - + include/linux/pci_ids.h | 29 - + include/linux/serial_s3c.h | 16 + + include/linux/tty.h | 2 +- + include/linux/tty_ldisc.h | 3 - + include/net/nfc/nci_core.h | 2 - + include/uapi/linux/cyclades.h | 494 --- + include/uapi/linux/major.h | 2 - + include/uapi/linux/serial.h | 4 +- + net/nfc/nci/uart.c | 148 +- + sound/soc/codecs/cx20442.c | 1 - + sound/soc/ti/ams-delta.c | 1 - + 93 files changed, 2214 insertions(+), 12322 deletions(-) + create mode 100644 Documentation/devicetree/bindings/serial/brcm,bcm7271-uart.yaml + delete mode 100644 Documentation/driver-api/serial/cyclades_z.rst + delete mode 100644 Documentation/driver-api/serial/rocket.rst + delete mode 100644 drivers/tty/cyclades.c + delete mode 100644 drivers/tty/isicom.c + delete mode 100644 drivers/tty/rocket.c + delete mode 100644 drivers/tty/rocket.h + delete mode 100644 drivers/tty/rocket_int.h + create mode 100644 drivers/tty/serial/8250/8250_bcm7271.c + delete mode 100644 include/linux/cyclades.h + delete mode 100644 include/linux/isicom.h + delete mode 100644 include/uapi/linux/cyclades.h +Merging char-misc/char-misc-next (e76e8b56fe1a MAINTAINERS: Add CoreSight header files) +$ git merge char-misc/char-misc-next +Removing include/linux/pps-gpio.h +Removing include/dt-bindings/phy/phy-cadence-torrent.h +Auto-merging drivers/soundwire/cadence_master.c +Auto-merging drivers/soundwire/bus.c +Auto-merging drivers/phy/ti/phy-j721e-wiz.c +Auto-merging drivers/phy/qualcomm/phy-qcom-qmp.c +CONFLICT (content): Merge conflict in drivers/phy/qualcomm/phy-qcom-qmp.c +Auto-merging drivers/phy/marvell/Kconfig +Auto-merging drivers/misc/uacce/uacce.c +Auto-merging drivers/hwtracing/coresight/coresight-etm4x-core.c +Auto-merging drivers/hwtracing/coresight/coresight-etm-perf.c +Auto-merging drivers/hwtracing/coresight/coresight-core.c +Auto-merging drivers/fpga/Kconfig +Auto-merging drivers/android/binder.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/phy/ti,phy-j721e-wiz.yaml +Removing Documentation/devicetree/bindings/phy/phy-mvebu-utmi.txt +Removing Documentation/devicetree/bindings/phy/bcm-ns-usb3-phy.txt +Removing Documentation/devicetree/bindings/phy/bcm-ns-usb2-phy.txt +Auto-merging Documentation/devicetree/bindings/nvmem/mtk-efuse.txt +Resolved 'drivers/phy/qualcomm/phy-qcom-qmp.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a83c1281aa9b] Merge remote-tracking branch 'char-misc/char-misc-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-bus-pci-devices-pvpanic | 4 +- + Documentation/ABI/testing/sysfs-driver-xdata | 49 + + .../bindings/fpga/xilinx-pr-decoupler.txt | 24 +- + .../devicetree/bindings/nvmem/brcm,nvram.yaml | 34 + + .../devicetree/bindings/nvmem/mtk-efuse.txt | 1 + + .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 1 + + .../devicetree/bindings/phy/bcm-ns-usb2-phy.txt | 21 - + .../devicetree/bindings/phy/bcm-ns-usb2-phy.yaml | 59 + + .../devicetree/bindings/phy/bcm-ns-usb3-phy.txt | 34 - + .../devicetree/bindings/phy/bcm-ns-usb3-phy.yaml | 62 + + .../bindings/phy/brcm,brcmstb-usb-phy.yaml | 3 + + .../bindings/phy/marvell,armada-3700-utmi-phy.yaml | 57 + + .../phy/marvell,armada-cp110-utmi-phy.yaml | 109 + + .../devicetree/bindings/phy/mediatek,dsi-phy.yaml | 13 +- + .../devicetree/bindings/phy/mediatek,hdmi-phy.yaml | 11 +- + .../devicetree/bindings/phy/mediatek,tphy.yaml | 3 +- + .../devicetree/bindings/phy/mediatek,ufs-phy.yaml | 7 +- + .../bindings/phy/microchip,sparx5-serdes.yaml | 100 + + .../bindings/phy/phy-cadence-sierra.yaml | 17 +- + .../bindings/phy/phy-cadence-torrent.yaml | 22 +- + .../devicetree/bindings/phy/phy-mvebu-utmi.txt | 38 - + .../devicetree/bindings/phy/phy-stm32-usbphyc.yaml | 5 + + .../devicetree/bindings/phy/qcom,qmp-phy.yaml | 2 + + .../bindings/phy/qcom,qmp-usb3-dp-phy.yaml | 3 +- + .../bindings/phy/qcom,usb-snps-femto-v2.yaml | 1 + + .../devicetree/bindings/phy/ti,phy-j721e-wiz.yaml | 4 + + .../devicetree/bindings/soundwire/qcom,sdw.txt | 20 + + Documentation/fpga/dfl.rst | 26 + + Documentation/misc-devices/dw-xdata-pcie.rst | 40 + + MAINTAINERS | 17 +- + drivers/android/binder.c | 198 +- + drivers/android/binder_internal.h | 18 + + drivers/char/applicom.c | 2 +- + drivers/char/lp.c | 4 +- + drivers/char/mwave/tp3780i.c | 6 +- + drivers/char/mwave/tp3780i.h | 2 +- + drivers/char/virtio_console.c | 23 +- + drivers/firmware/google/gsmi.c | 14 +- + drivers/fpga/Kconfig | 9 +- + drivers/fpga/xilinx-pr-decoupler.c | 45 +- + drivers/fpga/xilinx-spi.c | 24 +- + drivers/greybus/es2.c | 2 +- + drivers/hwtracing/coresight/coresight-core.c | 2 +- + drivers/hwtracing/coresight/coresight-etm-perf.c | 2 +- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 1 + + drivers/misc/Kconfig | 19 +- + drivers/misc/Makefile | 3 +- + drivers/misc/ad525x_dpot.c | 3 + + drivers/misc/dw-xdata-pcie.c | 420 +++ + drivers/misc/genwqe/card_ddcb.c | 10 +- + drivers/misc/kgdbts.c | 74 +- + drivers/misc/lis3lv02d/lis3lv02d.c | 27 +- + drivers/misc/pvpanic/Kconfig | 27 + + drivers/misc/pvpanic/Makefile | 8 + + drivers/misc/{pvpanic.c => pvpanic/pvpanic-mmio.c} | 89 +- + drivers/misc/pvpanic/pvpanic-pci.c | 125 + + drivers/misc/pvpanic/pvpanic.c | 113 + + drivers/misc/pvpanic/pvpanic.h | 21 + + drivers/misc/sgi-xp/xp_main.c | 4 +- + drivers/misc/sgi-xp/xpc_main.c | 2 +- + drivers/misc/uacce/uacce.c | 2 +- + drivers/misc/vmw_balloon.c | 11 +- + drivers/misc/vmw_vmci/vmci_doorbell.c | 2 +- + drivers/misc/vmw_vmci/vmci_guest.c | 2 +- + drivers/misc/vmw_vmci/vmci_host.c | 2 +- + drivers/most/most_cdev.c | 6 +- + drivers/mux/gpio.c | 19 +- + drivers/nvmem/Kconfig | 10 + + drivers/nvmem/Makefile | 2 + + drivers/nvmem/brcm_nvram.c | 78 + + drivers/nvmem/core.c | 95 + + drivers/nvmem/qcom-spmi-sdam.c | 2 +- + drivers/nvmem/qfprom.c | 44 + + drivers/nvmem/snvs_lpgpr.c | 2 +- + drivers/phy/Kconfig | 1 + + drivers/phy/Makefile | 1 + + drivers/phy/broadcom/Kconfig | 2 +- + drivers/phy/cadence/Kconfig | 2 + + drivers/phy/cadence/phy-cadence-sierra.c | 419 ++- + drivers/phy/cadence/phy-cadence-torrent.c | 475 +++- + drivers/phy/hisilicon/phy-hi6220-usb.c | 2 +- + drivers/phy/hisilicon/phy-hix5hd2-sata.c | 2 +- + drivers/phy/intel/phy-intel-lgm-combo.c | 2 +- + drivers/phy/marvell/Kconfig | 8 + + drivers/phy/marvell/Makefile | 1 + + drivers/phy/marvell/phy-mvebu-cp110-utmi.c | 384 +++ + drivers/phy/microchip/Kconfig | 13 + + drivers/phy/microchip/Makefile | 6 + + drivers/phy/microchip/sparx5_serdes.c | 2513 ++++++++++++++++++ + drivers/phy/microchip/sparx5_serdes.h | 136 + + drivers/phy/microchip/sparx5_serdes_regs.h | 2695 ++++++++++++++++++++ + drivers/phy/phy-core.c | 30 + + drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c | 4 +- + drivers/phy/qualcomm/phy-qcom-qmp.c | 509 +++- + drivers/phy/qualcomm/phy-qcom-qmp.h | 77 +- + drivers/phy/qualcomm/phy-qcom-usb-hs.c | 1 + + drivers/phy/rockchip/phy-rockchip-typec.c | 1 + + drivers/phy/st/Kconfig | 1 + + drivers/phy/st/phy-stm32-usbphyc.c | 65 + + drivers/phy/ti/phy-j721e-wiz.c | 448 +++- + drivers/phy/ti/phy-tusb1210.c | 27 +- + drivers/phy/xilinx/phy-zynqmp.c | 58 +- + drivers/pps/clients/pps-gpio.c | 108 +- + drivers/soundwire/Makefile | 2 +- + drivers/soundwire/bus.c | 97 +- + drivers/soundwire/bus.h | 2 + + drivers/soundwire/bus_type.c | 15 +- + drivers/soundwire/cadence_master.c | 12 +- + drivers/soundwire/dmi-quirks.c | 96 + + drivers/soundwire/generic_bandwidth_allocation.c | 15 +- + drivers/soundwire/intel.c | 24 +- + drivers/soundwire/intel_init.c | 9 + + drivers/soundwire/qcom.c | 652 ++++- + drivers/soundwire/slave.c | 9 +- + drivers/soundwire/stream.c | 28 +- + drivers/uio/Kconfig | 17 + + drivers/uio/Makefile | 1 + + drivers/uio/uio_dfl.c | 66 + + drivers/virt/acrn/vm.c | 2 +- + drivers/w1/slaves/w1_ds2780.c | 2 +- + drivers/w1/slaves/w1_ds2781.c | 2 +- + drivers/w1/slaves/w1_therm.c | 7 +- + include/dt-bindings/mux/ti-serdes.h | 5 + + include/dt-bindings/phy/phy-cadence-torrent.h | 13 - + include/dt-bindings/phy/phy-cadence.h | 20 + + include/dt-bindings/phy/phy-ti.h | 21 + + include/linux/nvmem-consumer.h | 4 + + include/linux/phy/phy.h | 26 + + include/linux/pps-gpio.h | 19 - + include/linux/soundwire/sdw.h | 36 +- + include/uapi/linux/android/binder.h | 20 + + include/uapi/linux/map_to_7segment.h | 14 - + scripts/spdxcheck.py | 2 +- + 133 files changed, 10662 insertions(+), 928 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-xdata + create mode 100644 Documentation/devicetree/bindings/nvmem/brcm,nvram.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/bcm-ns-usb2-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/bcm-ns-usb2-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/bcm-ns-usb3-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/bcm-ns-usb3-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/marvell,armada-3700-utmi-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/marvell,armada-cp110-utmi-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/microchip,sparx5-serdes.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/phy-mvebu-utmi.txt + create mode 100644 Documentation/misc-devices/dw-xdata-pcie.rst + create mode 100644 drivers/misc/dw-xdata-pcie.c + create mode 100644 drivers/misc/pvpanic/Kconfig + create mode 100644 drivers/misc/pvpanic/Makefile + rename drivers/misc/{pvpanic.c => pvpanic/pvpanic-mmio.c} (62%) + create mode 100644 drivers/misc/pvpanic/pvpanic-pci.c + create mode 100644 drivers/misc/pvpanic/pvpanic.c + create mode 100644 drivers/misc/pvpanic/pvpanic.h + create mode 100644 drivers/nvmem/brcm_nvram.c + create mode 100644 drivers/phy/marvell/phy-mvebu-cp110-utmi.c + create mode 100644 drivers/phy/microchip/Kconfig + create mode 100644 drivers/phy/microchip/Makefile + create mode 100644 drivers/phy/microchip/sparx5_serdes.c + create mode 100644 drivers/phy/microchip/sparx5_serdes.h + create mode 100644 drivers/phy/microchip/sparx5_serdes_regs.h + create mode 100644 drivers/soundwire/dmi-quirks.c + create mode 100644 drivers/uio/uio_dfl.c + delete mode 100644 include/dt-bindings/phy/phy-cadence-torrent.h + create mode 100644 include/dt-bindings/phy/phy-cadence.h + create mode 100644 include/dt-bindings/phy/phy-ti.h + delete mode 100644 include/linux/pps-gpio.h +Merging extcon/extcon-next (7b1222b224af extcon: qcom-spmi: Add support for VBUS detection) +$ git merge extcon/extcon-next +Auto-merging drivers/extcon/extcon-qcom-spmi-misc.c +Removing Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.txt +Merge made by the 'recursive' strategy. + .../bindings/extcon/qcom,pm8941-misc.txt | 41 --------- + .../bindings/extcon/qcom,pm8941-misc.yaml | 62 ++++++++++++++ + drivers/extcon/extcon-max8997.c | 4 + + drivers/extcon/extcon-qcom-spmi-misc.c | 99 +++++++++++++++++----- + drivers/extcon/extcon-sm5502.c | 22 ++++- + 5 files changed, 166 insertions(+), 62 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.txt + create mode 100644 Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml +Merging phy-next/next (cbc336c09b6d phy: fix resource_size.cocci warnings) +$ git merge phy-next/next +Already up to date. +Merging soundwire/next (14968dd36a50 soundwire: intel_init: test link->cdns) +$ git merge soundwire/next +Already up to date. +Merging thunderbolt/next (2e7a5b3e2236 thunderbolt: Unlock on error path in tb_domain_add()) +$ git merge thunderbolt/next +Auto-merging drivers/thunderbolt/tb.c +Auto-merging drivers/thunderbolt/switch.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-thunderbolt | 35 +- + drivers/net/thunderbolt.c | 56 ++- + drivers/thunderbolt/ctl.c | 21 +- + drivers/thunderbolt/ctl.h | 8 +- + drivers/thunderbolt/debugfs.c | 37 +- + drivers/thunderbolt/dma_test.c | 35 +- + drivers/thunderbolt/domain.c | 89 +++-- + drivers/thunderbolt/eeprom.c | 105 +++-- + drivers/thunderbolt/icm.c | 34 +- + drivers/thunderbolt/property.c | 71 ++++ + drivers/thunderbolt/switch.c | 26 +- + drivers/thunderbolt/tb.c | 52 ++- + drivers/thunderbolt/tb.h | 45 +-- + drivers/thunderbolt/test.c | 492 ++++++++++++++++++++++++ + drivers/thunderbolt/tunnel.c | 102 +++-- + drivers/thunderbolt/tunnel.h | 8 +- + drivers/thunderbolt/xdomain.c | 416 ++++++++++++-------- + include/linux/thunderbolt.h | 54 ++- + 18 files changed, 1244 insertions(+), 442 deletions(-) +Merging vfio/next (6a2a235aa627 Merge branches 'v5.13/vfio/embed-vfio_device', 'v5.13/vfio/misc' and 'v5.13/vfio/nvlink' into v5.13/vfio/next) +$ git merge vfio/next +Auto-merging drivers/vfio/vfio_iommu_type1.c +Removing drivers/vfio/pci/vfio_pci_nvlink2.c +Merge made by the 'recursive' strategy. + Documentation/driver-api/vfio.rst | 48 +- + drivers/vfio/fsl-mc/vfio_fsl_mc.c | 127 ++++-- + drivers/vfio/fsl-mc/vfio_fsl_mc_private.h | 1 + + drivers/vfio/mdev/mdev_private.h | 7 +- + drivers/vfio/mdev/vfio_mdev.c | 53 ++- + drivers/vfio/pci/Kconfig | 6 - + drivers/vfio/pci/Makefile | 1 - + drivers/vfio/pci/vfio_pci.c | 274 ++++++------ + drivers/vfio/pci/vfio_pci_config.c | 2 +- + drivers/vfio/pci/vfio_pci_igd.c | 53 +++ + drivers/vfio/pci/vfio_pci_nvlink2.c | 490 --------------------- + drivers/vfio/pci/vfio_pci_private.h | 15 +- + .../platform/reset/vfio_platform_calxedaxgmac.c | 2 +- + drivers/vfio/platform/vfio_amba.c | 8 +- + drivers/vfio/platform/vfio_platform.c | 20 +- + drivers/vfio/platform/vfio_platform_common.c | 56 +-- + drivers/vfio/platform/vfio_platform_private.h | 5 +- + drivers/vfio/vfio.c | 210 +++------ + drivers/vfio/vfio_iommu_type1.c | 14 +- + include/linux/vfio.h | 37 +- + include/uapi/linux/vfio.h | 38 +- + 21 files changed, 485 insertions(+), 982 deletions(-) + delete mode 100644 drivers/vfio/pci/vfio_pci_nvlink2.c +Merging staging/staging-next (f9b9263a25dc staging: rtl8192u: Fix potential infinite loop) +$ git merge staging/staging-next +Removing drivers/staging/wimax/wimax-internal.h +Removing drivers/staging/wimax/stack.c +Removing drivers/staging/wimax/op-state-get.c +Removing drivers/staging/wimax/op-rfkill.c +Removing drivers/staging/wimax/op-reset.c +Removing drivers/staging/wimax/op-msg.c +Removing drivers/staging/wimax/net-wimax.h +Removing drivers/staging/wimax/linux-wimax.h +Removing drivers/staging/wimax/linux-wimax-debug.h +Removing drivers/staging/wimax/id-table.c +Removing drivers/staging/wimax/i2400m/usb.c +Removing drivers/staging/wimax/i2400m/usb-tx.c +Removing drivers/staging/wimax/i2400m/usb-rx.c +Removing drivers/staging/wimax/i2400m/usb-notif.c +Removing drivers/staging/wimax/i2400m/usb-fw.c +Removing drivers/staging/wimax/i2400m/usb-debug-levels.h +Removing drivers/staging/wimax/i2400m/tx.c +Removing drivers/staging/wimax/i2400m/sysfs.c +Removing drivers/staging/wimax/i2400m/rx.c +Removing drivers/staging/wimax/i2400m/op-rfkill.c +Removing drivers/staging/wimax/i2400m/netdev.c +Removing drivers/staging/wimax/i2400m/linux-wimax-i2400m.h +Removing drivers/staging/wimax/i2400m/i2400m.h +Removing drivers/staging/wimax/i2400m/i2400m-usb.h +Removing drivers/staging/wimax/i2400m/fw.c +Removing drivers/staging/wimax/i2400m/driver.c +Removing drivers/staging/wimax/i2400m/debugfs.c +Removing drivers/staging/wimax/i2400m/debug-levels.h +Removing drivers/staging/wimax/i2400m/control.c +Removing drivers/staging/wimax/i2400m/Makefile +Removing drivers/staging/wimax/i2400m/Kconfig +Removing drivers/staging/wimax/debugfs.c +Removing drivers/staging/wimax/debug-levels.h +Removing drivers/staging/wimax/TODO +Removing drivers/staging/wimax/Makefile +Removing drivers/staging/wimax/Kconfig +Removing drivers/staging/wimax/Documentation/wimax.rst +Removing drivers/staging/wimax/Documentation/index.rst +Removing drivers/staging/wimax/Documentation/i2400m.rst +Auto-merging drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +Removing drivers/staging/most/sound/Makefile +Removing drivers/staging/most/sound/Kconfig +Removing drivers/staging/iio/cdc/ad7150.c +Removing drivers/staging/gasket/gasket_sysfs.h +Removing drivers/staging/gasket/gasket_sysfs.c +Removing drivers/staging/gasket/gasket_page_table.h +Removing drivers/staging/gasket/gasket_page_table.c +Removing drivers/staging/gasket/gasket_ioctl.h +Removing drivers/staging/gasket/gasket_ioctl.c +Removing drivers/staging/gasket/gasket_interrupt.h +Removing drivers/staging/gasket/gasket_interrupt.c +Removing drivers/staging/gasket/gasket_core.h +Removing drivers/staging/gasket/gasket_core.c +Removing drivers/staging/gasket/gasket_constants.h +Removing drivers/staging/gasket/gasket.h +Removing drivers/staging/gasket/apex_driver.c +Removing drivers/staging/gasket/apex.h +Removing drivers/staging/gasket/TODO +Removing drivers/staging/gasket/Makefile +Removing drivers/staging/gasket/Kconfig +Auto-merging drivers/staging/fwserial/fwserial.c +Auto-merging drivers/staging/Makefile +Auto-merging drivers/staging/Kconfig +Auto-merging drivers/iio/light/acpi-als.c +Auto-merging drivers/iio/common/scmi_sensors/scmi_iio.c +CONFLICT (content): Merge conflict in drivers/iio/common/scmi_sensors/scmi_iio.c +Auto-merging MAINTAINERS +Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst +Removing Documentation/ABI/testing/sysfs-bus-iio-lptimer-stm32 +Removing Documentation/ABI/testing/sysfs-bus-iio-humidity-hdc100x +Removing Documentation/ABI/testing/sysfs-bus-iio-counter-104-quad-8 +Auto-merging CREDITS +Resolved 'drivers/iio/common/scmi_sensors/scmi_iio.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 94cd1d0445bf] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + CREDITS | 8 + + Documentation/ABI/testing/sysfs-bus-iio | 173 ++ + .../ABI/testing/sysfs-bus-iio-counter-104-quad-8 | 133 -- + .../ABI/testing/sysfs-bus-iio-distance-srf08 | 8 - + ...iio-humidity-hdc2010 => sysfs-bus-iio-humidity} | 3 +- + .../ABI/testing/sysfs-bus-iio-humidity-hdc100x | 9 - + .../ABI/testing/sysfs-bus-iio-lptimer-stm32 | 62 - + Documentation/ABI/testing/sysfs-bus-iio-proximity | 14 + + .../ABI/testing/sysfs-bus-iio-proximity-as3935 | 9 - + .../bindings/counter/interrupt-counter.yaml | 62 + + .../bindings/iio/accel/bosch,bmi088.yaml | 68 + + .../bindings/iio/adc/mediatek,mt2701-auxadc.yaml | 1 + + .../devicetree/bindings/iio/adc/ti,ads131e08.yaml | 181 ++ + .../devicetree/bindings/iio/cdc/adi,ad7150.yaml | 69 + + .../devicetree/bindings/iio/imu/adi,adis16475.yaml | 9 - + .../proximity/google,cros-ec-mkbp-proximity.yaml | 37 + + .../devicetree/bindings/iio/st,st-sensors.yaml | 1 + + .../devicetree/bindings/mfd/google,cros-ec.yaml | 7 + + Documentation/driver-api/driver-model/devres.rst | 3 +- + Documentation/driver-api/iio/buffers.rst | 15 +- + Documentation/iio/iio_configfs.rst | 3 +- + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + + MAINTAINERS | 24 +- + drivers/counter/104-quad-8.c | 653 +------ + drivers/counter/Kconfig | 14 +- + drivers/counter/Makefile | 1 + + drivers/counter/interrupt-cnt.c | 244 +++ + drivers/counter/stm32-lptimer-cnt.c | 297 +--- + drivers/hwmon/ntc_thermistor.c | 27 +- + drivers/iio/Kconfig | 2 + + drivers/iio/Makefile | 2 + + drivers/iio/accel/Kconfig | 18 + + drivers/iio/accel/Makefile | 2 + + drivers/iio/accel/adis16201.c | 2 +- + drivers/iio/accel/adxl372.c | 2 - + drivers/iio/accel/bma180.c | 3 +- + drivers/iio/accel/bma220_spi.c | 2 +- + drivers/iio/accel/bmc150-accel-core.c | 19 +- + drivers/iio/accel/bmi088-accel-core.c | 567 ++++++ + drivers/iio/accel/bmi088-accel-spi.c | 83 + + drivers/iio/accel/bmi088-accel.h | 18 + + drivers/iio/accel/cros_ec_accel_legacy.c | 2 +- + drivers/iio/accel/da280.c | 2 +- + drivers/iio/accel/da311.c | 2 +- + drivers/iio/accel/dmard10.c | 2 +- + drivers/iio/accel/hid-sensor-accel-3d.c | 23 +- + drivers/iio/accel/kxcjk-1013.c | 16 +- + drivers/iio/accel/mc3230.c | 2 +- + drivers/iio/accel/mma7660.c | 2 +- + drivers/iio/accel/mma8452.c | 47 +- + drivers/iio/accel/mxc4005.c | 1 - + drivers/iio/accel/sca3000.c | 27 +- + drivers/iio/accel/ssp_accel_sensor.c | 14 +- + drivers/iio/accel/stk8312.c | 3 +- + drivers/iio/accel/stk8ba50.c | 3 +- + drivers/iio/adc/Kconfig | 16 +- + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/ad7124.c | 459 +++-- + drivers/iio/adc/ad7292.c | 2 +- + drivers/iio/adc/ad7298.c | 6 - + drivers/iio/adc/ad7476.c | 18 +- + drivers/iio/adc/ad7606.c | 1 - + drivers/iio/adc/ad7766.c | 16 +- + drivers/iio/adc/ad7768-1.c | 1 - + drivers/iio/adc/ad7887.c | 6 - + drivers/iio/adc/ad7923.c | 47 +- + drivers/iio/adc/ad799x.c | 6 - + drivers/iio/adc/ad_sigma_delta.c | 13 +- + drivers/iio/adc/adi-axi-adc.c | 14 +- + drivers/iio/adc/at91_adc.c | 3 +- + drivers/iio/adc/cpcap-adc.c | 2 +- + drivers/iio/adc/exynos_adc.c | 4 +- + drivers/iio/adc/ina2xx-adc.c | 14 +- + drivers/iio/adc/max1027.c | 1 - + drivers/iio/adc/mt6360-adc.c | 3 +- + drivers/iio/adc/nau7802.c | 6 +- + drivers/iio/adc/npcm_adc.c | 15 +- + drivers/iio/adc/palmas_gpadc.c | 18 +- + drivers/iio/adc/spear_adc.c | 20 +- + drivers/iio/adc/stm32-adc.c | 39 +- + drivers/iio/adc/stm32-dfsdm-adc.c | 10 +- + drivers/iio/adc/sun4i-gpadc-iio.c | 4 +- + drivers/iio/adc/ti-adc084s021.c | 6 +- + drivers/iio/adc/ti-ads131e08.c | 948 ++++++++++ + drivers/iio/adc/ti_am335x_adc.c | 18 +- + drivers/iio/adc/xilinx-xadc-core.c | 1 - + drivers/iio/buffer/industrialio-buffer-dmaengine.c | 35 +- + drivers/iio/buffer/industrialio-triggered-buffer.c | 10 +- + drivers/iio/buffer/kfifo_buf.c | 45 +- + drivers/iio/cdc/Kconfig | 17 + + drivers/iio/cdc/Makefile | 6 + + drivers/iio/cdc/ad7150.c | 673 ++++++++ + drivers/iio/chemical/atlas-sensor.c | 1 - + drivers/iio/chemical/bme680_i2c.c | 3 +- + drivers/iio/chemical/bme680_spi.c | 3 +- + drivers/iio/chemical/ccs811.c | 1 - + drivers/iio/chemical/scd30_core.c | 17 +- + drivers/iio/chemical/scd30_serial.c | 2 +- + .../iio/common/cros_ec_sensors/cros_ec_lid_angle.c | 3 +- + .../iio/common/cros_ec_sensors/cros_ec_sensors.c | 3 +- + .../common/cros_ec_sensors/cros_ec_sensors_core.c | 33 +- + .../iio/common/hid-sensors/hid-sensor-attributes.c | 83 +- + .../iio/common/hid-sensors/hid-sensor-trigger.c | 4 +- + drivers/iio/common/scmi_sensors/scmi_iio.c | 19 +- + drivers/iio/common/st_sensors/st_sensors_buffer.c | 2 +- + drivers/iio/common/st_sensors/st_sensors_trigger.c | 4 +- + drivers/iio/dac/Kconfig | 5 +- + drivers/iio/dac/ad5064.c | 2 +- + drivers/iio/dac/ad5360.c | 2 +- + drivers/iio/dac/ad5380.c | 2 +- + drivers/iio/dac/ad5446.c | 2 +- + drivers/iio/dac/ad5504.c | 6 +- + drivers/iio/dac/ad5624r_spi.c | 4 +- + drivers/iio/dac/ad5686.c | 14 +- + drivers/iio/dac/ad5686.h | 2 + + drivers/iio/dac/ad5696-i2c.c | 6 +- + drivers/iio/dac/ad5755.c | 4 +- + drivers/iio/dac/ad5758.c | 2 +- + drivers/iio/dac/ad5766.c | 2 +- + drivers/iio/dac/ad5770r.c | 4 +- + drivers/iio/dac/ad5791.c | 4 +- + drivers/iio/dac/ad7303.c | 2 +- + drivers/iio/dac/ltc2632.c | 4 +- + drivers/iio/dac/max517.c | 10 +- + drivers/iio/dac/max5821.c | 2 +- + drivers/iio/dac/mcp4725.c | 2 +- + drivers/iio/dac/stm32-dac.c | 2 +- + drivers/iio/dac/ti-dac082s085.c | 2 +- + drivers/iio/dac/ti-dac5571.c | 2 +- + drivers/iio/dac/ti-dac7311.c | 2 +- + drivers/iio/dummy/iio_simple_dummy_buffer.c | 68 +- + drivers/iio/gyro/adxrs290.c | 1 - + drivers/iio/gyro/bmg160_core.c | 2 - + drivers/iio/gyro/fxas21002c_core.c | 1 - + drivers/iio/gyro/hid-sensor-gyro-3d.c | 19 +- + drivers/iio/gyro/itg3200_buffer.c | 3 +- + drivers/iio/gyro/ssp_gyro_sensor.c | 14 +- + drivers/iio/health/afe4403.c | 1 - + drivers/iio/health/afe4404.c | 1 - + drivers/iio/health/max30100.c | 16 +- + drivers/iio/health/max30102.c | 16 +- + drivers/iio/humidity/am2315.c | 2 +- + drivers/iio/humidity/hid-sensor-humidity.c | 16 +- + drivers/iio/humidity/hts221_buffer.c | 1 - + drivers/iio/iio_core.h | 32 +- + drivers/iio/iio_core_trigger.h | 4 +- + drivers/iio/imu/adis16400.c | 22 +- + drivers/iio/imu/adis16460.c | 4 +- + drivers/iio/imu/adis16475.c | 123 +- + drivers/iio/imu/adis16480.c | 133 +- + drivers/iio/imu/adis_trigger.c | 21 +- + drivers/iio/imu/fxos8700_i2c.c | 3 +- + drivers/iio/imu/fxos8700_spi.c | 3 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c | 14 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c | 13 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 72 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 10 + + drivers/iio/imu/kmx61.c | 1 - + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 15 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 3 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c | 3 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 3 +- + drivers/iio/industrialio-buffer.c | 517 ++++-- + drivers/iio/industrialio-core.c | 198 ++- + drivers/iio/industrialio-event.c | 9 +- + drivers/iio/industrialio-trigger.c | 72 +- + drivers/iio/inkern.c | 16 +- + drivers/iio/light/acpi-als.c | 117 +- + drivers/iio/light/apds9960.c | 16 +- + drivers/iio/light/cros_ec_light_prox.c | 3 +- + drivers/iio/light/gp2ap002.c | 3 +- + drivers/iio/light/gp2ap020a00f.c | 1 - + drivers/iio/light/hid-sensor-als.c | 34 +- + drivers/iio/light/hid-sensor-prox.c | 32 +- + drivers/iio/light/opt3001.c | 2 +- + drivers/iio/light/rpr0521.c | 1 - + drivers/iio/light/si1145.c | 1 - + drivers/iio/light/st_uvis25_core.c | 1 - + drivers/iio/light/stk3310.c | 2 +- + drivers/iio/light/vcnl4000.c | 1 - + drivers/iio/light/vcnl4035.c | 1 - + drivers/iio/magnetometer/bmc150_magn.c | 1 - + drivers/iio/magnetometer/hid-sensor-magn-3d.c | 32 +- + drivers/iio/magnetometer/rm3100-core.c | 1 - + drivers/iio/magnetometer/st_magn.h | 1 + + drivers/iio/magnetometer/st_magn_core.c | 1 + + drivers/iio/magnetometer/st_magn_i2c.c | 5 + + drivers/iio/magnetometer/st_magn_spi.c | 5 + + drivers/iio/magnetometer/yamaha-yas530.c | 4 +- + drivers/iio/orientation/hid-sensor-incl-3d.c | 20 +- + drivers/iio/orientation/hid-sensor-rotation.c | 37 +- + .../iio/position/hid-sensor-custom-intel-hinge.c | 20 +- + drivers/iio/potentiometer/max5481.c | 4 +- + drivers/iio/potentiometer/max5487.c | 4 +- + drivers/iio/potentiostat/lmp91000.c | 3 +- + drivers/iio/pressure/cros_ec_baro.c | 3 +- + drivers/iio/pressure/hid-sensor-press.c | 20 +- + drivers/iio/pressure/zpa2326.c | 5 +- + drivers/iio/proximity/Kconfig | 11 + + drivers/iio/proximity/Makefile | 1 + + drivers/iio/proximity/as3935.c | 1 - + drivers/iio/proximity/cros_ec_mkbp_proximity.c | 271 +++ + drivers/iio/proximity/sx9310.c | 53 +- + drivers/iio/proximity/sx9500.c | 3 +- + drivers/iio/proximity/vcnl3020.c | 97 +- + drivers/iio/temperature/hid-sensor-temperature.c | 16 +- + drivers/iio/temperature/tmp007.c | 36 +- + drivers/iio/test/Kconfig | 9 + + drivers/iio/test/Makefile | 7 + + drivers/iio/test/iio-test-format.c | 198 +++ + drivers/iio/trigger/iio-trig-hrtimer.c | 37 +- + drivers/iio/trigger/iio-trig-interrupt.c | 2 +- + drivers/iio/trigger/iio-trig-loop.c | 2 +- + drivers/iio/trigger/iio-trig-sysfs.c | 3 +- + drivers/most/Kconfig | 10 + + drivers/most/Makefile | 1 + + .../most/sound/sound.c => most/most_snd.c} | 0 + drivers/regulator/Kconfig | 9 + + drivers/regulator/Makefile | 1 + + .../hikey9xx => regulator}/hi6421v600-regulator.c | 0 + drivers/rtc/rtc-hid-sensor-time.c | 4 +- + drivers/staging/Kconfig | 4 - + drivers/staging/Makefile | 2 - + drivers/staging/android/uapi/ashmem.h | 2 - + .../clocking-wizard/clk-xlnx-clock-wizard.c | 369 +++- + drivers/staging/comedi/comedi_buf.c | 52 +- + drivers/staging/comedi/drivers/addi_apci_16xx.c | 2 +- + drivers/staging/comedi/drivers/das800.c | 2 +- + drivers/staging/comedi/drivers/dt2814.c | 152 +- + .../staging/comedi/drivers/tests/example_test.c | 2 +- + .../staging/comedi/drivers/tests/ni_routes_test.c | 81 +- + drivers/staging/comedi/drivers/tests/unittest.h | 2 +- + drivers/staging/emxx_udc/emxx_udc.c | 1 - + drivers/staging/fbtft/fbtft-sysfs.c | 2 +- + drivers/staging/fwserial/fwserial.c | 6 +- + drivers/staging/gasket/Kconfig | 25 - + drivers/staging/gasket/Makefile | 10 - + drivers/staging/gasket/TODO | 22 - + drivers/staging/gasket/apex.h | 30 - + drivers/staging/gasket/apex_driver.c | 726 -------- + drivers/staging/gasket/gasket.h | 122 -- + drivers/staging/gasket/gasket_constants.h | 44 - + drivers/staging/gasket/gasket_core.c | 1815 -------------------- + drivers/staging/gasket/gasket_core.h | 638 ------- + drivers/staging/gasket/gasket_interrupt.c | 515 ------ + drivers/staging/gasket/gasket_interrupt.h | 95 - + drivers/staging/gasket/gasket_ioctl.c | 388 ----- + drivers/staging/gasket/gasket_ioctl.h | 28 - + drivers/staging/gasket/gasket_page_table.c | 1359 --------------- + drivers/staging/gasket/gasket_page_table.h | 249 --- + drivers/staging/gasket/gasket_sysfs.c | 398 ----- + drivers/staging/gasket/gasket_sysfs.h | 175 -- + drivers/staging/greybus/arche-platform.c | 10 +- + drivers/staging/greybus/audio_module.c | 4 +- + drivers/staging/greybus/audio_topology.c | 12 +- + drivers/staging/greybus/camera.c | 13 +- + drivers/staging/greybus/sdio.c | 1 - + drivers/staging/hikey9xx/Kconfig | 11 - + drivers/staging/hikey9xx/Makefile | 1 - + drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 8 +- + .../hikey9xx/hisilicon,hisi-spmi-controller.yaml | 18 +- + drivers/staging/iio/TODO | 4 - + drivers/staging/iio/cdc/Kconfig | 10 - + drivers/staging/iio/cdc/Makefile | 3 +- + drivers/staging/iio/cdc/ad7150.c | 655 ------- + drivers/staging/iio/frequency/ad9832.c | 4 +- + drivers/staging/iio/frequency/ad9834.c | 67 +- + drivers/staging/iio/impedance-analyzer/ad5933.c | 23 +- + drivers/staging/kpc2000/kpc2000/pcie.h | 1 - + drivers/staging/kpc2000/kpc2000_i2c.c | 6 +- + drivers/staging/kpc2000/kpc2000_spi.c | 2 +- + drivers/staging/most/Kconfig | 2 - + drivers/staging/most/Makefile | 1 - + drivers/staging/most/sound/Kconfig | 14 - + drivers/staging/most/sound/Makefile | 4 - + drivers/staging/mt7621-pci/pci-mt7621.c | 1 - + drivers/staging/netlogic/Kconfig | 1 + + drivers/staging/nvec/nvec_ps2.c | 2 +- + drivers/staging/octeon-usb/octeon-hcd.c | 32 +- + drivers/staging/octeon/ethernet-spi.c | 2 +- + drivers/staging/qlge/qlge_devlink.c | 10 +- + drivers/staging/qlge/qlge_devlink.h | 2 +- + drivers/staging/qlge/qlge_main.c | 17 +- + drivers/staging/ralink-gdma/ralink-gdma.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_ap.c | 6 - + drivers/staging/rtl8188eu/core/rtw_debug.c | 8 +- + drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 6 +- + drivers/staging/rtl8188eu/core/rtw_mlme.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 12 +- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_recv.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_security.c | 78 +- + drivers/staging/rtl8188eu/core/rtw_xmit.c | 7 +- + drivers/staging/rtl8188eu/hal/odm_hwconfig.c | 11 +- + drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c | 12 +- + drivers/staging/rtl8188eu/include/odm_hwconfig.h | 8 +- + drivers/staging/rtl8188eu/include/osdep_intf.h | 2 +- + drivers/staging/rtl8188eu/include/osdep_service.h | 13 - + drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 4 - + drivers/staging/rtl8188eu/include/rtw_efuse.h | 20 - + drivers/staging/rtl8188eu/include/usb_ops_linux.h | 3 - + drivers/staging/rtl8188eu/include/wifi.h | 156 -- + drivers/staging/rtl8188eu/include/wlan_bssdef.h | 2 +- + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 88 +- + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 22 +- + drivers/staging/rtl8188eu/os_dep/osdep_service.c | 31 - + drivers/staging/rtl8188eu/os_dep/rtw_android.c | 6 +- + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 34 +- + drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 135 +- + drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 14 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 5 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 4 +- + drivers/staging/rtl8192e/rtl819x_BA.h | 40 +- + drivers/staging/rtl8192e/rtl819x_BAProc.c | 127 +- + drivers/staging/rtl8192e/rtl819x_HT.h | 23 +- + drivers/staging/rtl8192e/rtl819x_HTProc.c | 58 +- + drivers/staging/rtl8192e/rtl819x_TS.h | 18 +- + drivers/staging/rtl8192e/rtl819x_TSProc.c | 62 +- + drivers/staging/rtl8192e/rtllib_rx.c | 170 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 14 +- + drivers/staging/rtl8192e/rtllib_tx.c | 8 +- + drivers/staging/rtl8192e/rtllib_wx.c | 76 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 42 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 4 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 6 +- + .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 4 +- + drivers/staging/rtl8192u/r8190_rtl8256.c | 7 +- + drivers/staging/rtl8192u/r8192U.h | 6 +- + drivers/staging/rtl8192u/r8192U_core.c | 5 +- + drivers/staging/rtl8192u/r8192U_wx.c | 159 +- + drivers/staging/rtl8712/drv_types.h | 2 - + drivers/staging/rtl8712/ieee80211.c | 18 +- + drivers/staging/rtl8712/mlme_osdep.h | 4 +- + drivers/staging/rtl8712/rtl8712_recv.h | 2 +- + drivers/staging/rtl8712/rtl8712_xmit.c | 13 +- + drivers/staging/rtl8712/rtl8712_xmit.h | 5 +- + drivers/staging/rtl8712/rtl871x_cmd.h | 10 + + drivers/staging/rtl8712/rtl871x_event.h | 1 + + drivers/staging/rtl8712/rtl871x_io.h | 1 - + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 14 +- + drivers/staging/rtl8712/rtl871x_mlme.c | 16 +- + drivers/staging/rtl8712/rtl871x_mlme.h | 1 - + drivers/staging/rtl8712/rtl871x_mp.c | 1 + + drivers/staging/rtl8712/rtl871x_mp.h | 1 + + drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 3 + + drivers/staging/rtl8712/rtl871x_pwrctrl.h | 3 - + drivers/staging/rtl8712/rtl871x_recv.c | 27 +- + drivers/staging/rtl8712/rtl871x_recv.h | 12 +- + drivers/staging/rtl8712/rtl871x_security.c | 10 +- + drivers/staging/rtl8712/rtl871x_security.h | 4 +- + drivers/staging/rtl8712/rtl871x_xmit.c | 3 +- + drivers/staging/rtl8712/rtl871x_xmit.h | 12 +- + drivers/staging/rtl8712/sta_info.h | 1 - + drivers/staging/rtl8712/wifi.h | 195 +-- + drivers/staging/rtl8712/xmit_osdep.h | 8 +- + drivers/staging/rtl8723bs/TODO | 1 - + drivers/staging/rtl8723bs/core/rtw_ap.c | 334 +--- + drivers/staging/rtl8723bs/core/rtw_btcoex.c | 12 +- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 133 +- + drivers/staging/rtl8723bs/core/rtw_eeprom.c | 56 +- + drivers/staging/rtl8723bs/core/rtw_efuse.c | 25 +- + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 151 +- + drivers/staging/rtl8723bs/core/rtw_io.c | 7 +- + drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 110 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 345 +--- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 728 +------- + drivers/staging/rtl8723bs/core/rtw_odm.c | 6 +- + drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 282 +-- + drivers/staging/rtl8723bs/core/rtw_recv.c | 939 +++------- + drivers/staging/rtl8723bs/core/rtw_security.c | 243 +-- + drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 35 - + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 383 +---- + drivers/staging/rtl8723bs/core/rtw_xmit.c | 388 +---- + drivers/staging/rtl8723bs/hal/Hal8723BReg.h | 16 +- + drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 258 ++- + drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.h | 54 +- + drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 224 +-- + drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.h | 48 +- + drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h | 188 +- + drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c | 10 +- + drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.h | 6 +- + drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c | 6 +- + drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.h | 2 +- + drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c | 12 +- + drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.h | 6 +- + drivers/staging/rtl8723bs/hal/HalPhyRf.c | 8 +- + drivers/staging/rtl8723bs/hal/HalPhyRf.h | 25 +- + drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 70 +- + drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.h | 12 +- + drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c | 59 +- + drivers/staging/rtl8723bs/hal/hal_btcoex.c | 171 +- + drivers/staging/rtl8723bs/hal/hal_com.c | 166 +- + drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 250 +-- + drivers/staging/rtl8723bs/hal/hal_intf.c | 37 +- + drivers/staging/rtl8723bs/hal/hal_pwr_seq.c | 22 +- + drivers/staging/rtl8723bs/hal/odm.c | 1728 +++++++++---------- + drivers/staging/rtl8723bs/hal/odm.h | 412 ++--- + drivers/staging/rtl8723bs/hal/odm_CfoTracking.c | 28 +- + drivers/staging/rtl8723bs/hal/odm_CfoTracking.h | 4 +- + drivers/staging/rtl8723bs/hal/odm_DIG.c | 66 +- + drivers/staging/rtl8723bs/hal/odm_DIG.h | 32 +- + .../rtl8723bs/hal/odm_DynamicBBPowerSaving.c | 8 +- + .../rtl8723bs/hal/odm_DynamicBBPowerSaving.h | 4 +- + drivers/staging/rtl8723bs/hal/odm_DynamicTxPower.c | 2 +- + drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.c | 6 +- + drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.h | 4 +- + drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 35 +- + drivers/staging/rtl8723bs/hal/odm_HWConfig.h | 79 +- + drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c | 2 +- + drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h | 4 +- + drivers/staging/rtl8723bs/hal/odm_PathDiv.c | 4 +- + drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c | 16 +- + drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.h | 16 +- + drivers/staging/rtl8723bs/hal/odm_debug.c | 2 +- + drivers/staging/rtl8723bs/hal/odm_debug.h | 4 +- + drivers/staging/rtl8723bs/hal/odm_interface.h | 11 - + drivers/staging/rtl8723bs/hal/odm_types.h | 47 +- + drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 1342 +-------------- + drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 20 +- + drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 432 +---- + drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 72 +- + drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c | 4 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 20 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 86 +- + drivers/staging/rtl8723bs/hal/sdio_halinit.c | 534 +----- + drivers/staging/rtl8723bs/hal/sdio_ops.c | 99 +- + drivers/staging/rtl8723bs/include/HalPwrSeqCmd.h | 12 +- + drivers/staging/rtl8723bs/include/HalVerDef.h | 62 +- + drivers/staging/rtl8723bs/include/autoconf.h | 3 - + drivers/staging/rtl8723bs/include/basic_types.h | 4 +- + drivers/staging/rtl8723bs/include/drv_conf.h | 10 - + drivers/staging/rtl8723bs/include/drv_types.h | 211 +-- + drivers/staging/rtl8723bs/include/drv_types_sdio.h | 5 - + drivers/staging/rtl8723bs/include/hal_btcoex.h | 4 +- + drivers/staging/rtl8723bs/include/hal_com.h | 50 +- + drivers/staging/rtl8723bs/include/hal_com_h2c.h | 185 +- + drivers/staging/rtl8723bs/include/hal_com_phycfg.h | 40 +- + drivers/staging/rtl8723bs/include/hal_com_reg.h | 14 +- + drivers/staging/rtl8723bs/include/hal_data.h | 48 +- + drivers/staging/rtl8723bs/include/hal_intf.h | 72 +- + drivers/staging/rtl8723bs/include/hal_phy.h | 85 +- + drivers/staging/rtl8723bs/include/hal_phy_cfg.h | 6 +- + drivers/staging/rtl8723bs/include/hal_pwr_seq.h | 22 +- + drivers/staging/rtl8723bs/include/ieee80211.h | 202 +-- + drivers/staging/rtl8723bs/include/ioctl_cfg80211.h | 4 +- + drivers/staging/rtl8723bs/include/osdep_intf.h | 12 +- + drivers/staging/rtl8723bs/include/osdep_service.h | 39 +- + .../rtl8723bs/include/osdep_service_linux.h | 29 +- + drivers/staging/rtl8723bs/include/recv_osdep.h | 8 +- + drivers/staging/rtl8723bs/include/rtl8723b_cmd.h | 8 +- + drivers/staging/rtl8723bs/include/rtl8723b_hal.h | 48 +- + drivers/staging/rtl8723bs/include/rtl8723b_recv.h | 44 - + drivers/staging/rtl8723bs/include/rtl8723b_rf.h | 2 +- + drivers/staging/rtl8723bs/include/rtl8723b_spec.h | 10 - + drivers/staging/rtl8723bs/include/rtl8723b_xmit.h | 8 +- + drivers/staging/rtl8723bs/include/rtw_cmd.h | 251 +-- + drivers/staging/rtl8723bs/include/rtw_debug.h | 50 - + drivers/staging/rtl8723bs/include/rtw_eeprom.h | 4 +- + drivers/staging/rtl8723bs/include/rtw_efuse.h | 10 +- + drivers/staging/rtl8723bs/include/rtw_event.h | 11 - + drivers/staging/rtl8723bs/include/rtw_ht.h | 12 +- + drivers/staging/rtl8723bs/include/rtw_io.h | 113 +- + drivers/staging/rtl8723bs/include/rtw_ioctl_set.h | 16 +- + drivers/staging/rtl8723bs/include/rtw_mlme.h | 124 +- + drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 87 +- + drivers/staging/rtl8723bs/include/rtw_mp.h | 135 +- + drivers/staging/rtl8723bs/include/rtw_pwrctrl.h | 91 +- + drivers/staging/rtl8723bs/include/rtw_recv.h | 62 +- + drivers/staging/rtl8723bs/include/rtw_rf.h | 36 +- + drivers/staging/rtl8723bs/include/rtw_security.h | 40 +- + drivers/staging/rtl8723bs/include/rtw_wifi_regd.h | 12 - + drivers/staging/rtl8723bs/include/rtw_xmit.h | 60 +- + drivers/staging/rtl8723bs/include/sdio_ops.h | 7 - + drivers/staging/rtl8723bs/include/sta_info.h | 26 +- + drivers/staging/rtl8723bs/include/wifi.h | 99 +- + drivers/staging/rtl8723bs/include/wlan_bssdef.h | 51 +- + drivers/staging/rtl8723bs/include/xmit_osdep.h | 14 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 310 +--- + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 679 +------- + drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 24 +- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 536 +----- + drivers/staging/rtl8723bs/os_dep/osdep_service.c | 8 +- + drivers/staging/rtl8723bs/os_dep/recv_linux.c | 96 +- + drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 122 +- + drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c | 97 +- + drivers/staging/rtl8723bs/os_dep/wifi_regd.c | 4 +- + drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 62 +- + drivers/staging/sm750fb/sm750.h | 32 +- + drivers/staging/unisys/visornic/visornic_main.c | 34 +- + .../vc04_services/bcm2835-audio/bcm2835-pcm.c | 10 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 8 +- + .../interface/vchiq_arm/vchiq_debugfs.h | 2 +- + .../staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 4 +- + drivers/staging/vt6655/baseband.c | 6 +- + drivers/staging/vt6655/channel.c | 42 +- + drivers/staging/vt6656/card.c | 3 +- + drivers/staging/wfx/hif_rx.c | 6 +- + drivers/staging/wfx/sta.c | 2 +- + drivers/staging/wimax/Documentation/i2400m.rst | 283 --- + drivers/staging/wimax/Documentation/index.rst | 19 - + drivers/staging/wimax/Documentation/wimax.rst | 89 - + drivers/staging/wimax/Kconfig | 47 - + drivers/staging/wimax/Makefile | 15 - + drivers/staging/wimax/TODO | 18 - + drivers/staging/wimax/debug-levels.h | 29 - + drivers/staging/wimax/debugfs.c | 38 - + drivers/staging/wimax/i2400m/Kconfig | 37 - + drivers/staging/wimax/i2400m/Makefile | 23 - + drivers/staging/wimax/i2400m/control.c | 1434 ---------------- + drivers/staging/wimax/i2400m/debug-levels.h | 32 - + drivers/staging/wimax/i2400m/debugfs.c | 253 --- + drivers/staging/wimax/i2400m/driver.c | 1003 ----------- + drivers/staging/wimax/i2400m/fw.c | 1666 ------------------ + drivers/staging/wimax/i2400m/i2400m-usb.h | 275 --- + drivers/staging/wimax/i2400m/i2400m.h | 970 ----------- + drivers/staging/wimax/i2400m/linux-wimax-i2400m.h | 572 ------ + drivers/staging/wimax/i2400m/netdev.c | 603 ------- + drivers/staging/wimax/i2400m/op-rfkill.c | 196 --- + drivers/staging/wimax/i2400m/rx.c | 1394 --------------- + drivers/staging/wimax/i2400m/sysfs.c | 65 - + drivers/staging/wimax/i2400m/tx.c | 1015 ----------- + drivers/staging/wimax/i2400m/usb-debug-levels.h | 28 - + drivers/staging/wimax/i2400m/usb-fw.c | 365 ---- + drivers/staging/wimax/i2400m/usb-notif.c | 258 --- + drivers/staging/wimax/i2400m/usb-rx.c | 462 ----- + drivers/staging/wimax/i2400m/usb-tx.c | 273 --- + drivers/staging/wimax/i2400m/usb.c | 765 --------- + drivers/staging/wimax/id-table.c | 130 -- + drivers/staging/wimax/linux-wimax-debug.h | 491 ------ + drivers/staging/wimax/linux-wimax.h | 239 --- + drivers/staging/wimax/net-wimax.h | 503 ------ + drivers/staging/wimax/op-msg.c | 391 ----- + drivers/staging/wimax/op-reset.c | 108 -- + drivers/staging/wimax/op-rfkill.c | 431 ----- + drivers/staging/wimax/op-state-get.c | 52 - + drivers/staging/wimax/stack.c | 616 ------- + drivers/staging/wimax/wimax-internal.h | 85 - + drivers/staging/wlan-ng/p80211conv.h | 3 - + drivers/staging/wlan-ng/p80211netdev.c | 2 +- + include/linux/hid-sensor-hub.h | 9 +- + include/linux/hid-sensor-ids.h | 1 + + include/linux/iio/adc/adi-axi-adc.h | 2 +- + include/linux/iio/buffer-dmaengine.h | 7 +- + include/linux/iio/buffer.h | 4 +- + include/linux/iio/buffer_impl.h | 21 +- + include/linux/iio/common/cros_ec_sensors_core.h | 3 +- + include/linux/iio/consumer.h | 15 + + include/linux/iio/iio-opaque.h | 14 + + include/linux/iio/iio.h | 7 +- + include/linux/iio/imu/adis.h | 10 + + include/linux/iio/kfifo_buf.h | 11 +- + include/linux/iio/sysfs.h | 3 + + include/linux/iio/trigger.h | 3 +- + include/linux/iio/types.h | 2 + + include/linux/platform_data/cros_ec_commands.h | 1 + + include/linux/platform_data/invensense_mpu6050.h | 2 +- + include/uapi/linux/iio/buffer.h | 10 + + tools/iio/Makefile | 1 + + tools/iio/iio_event_monitor.c | 69 +- + tools/iio/iio_generic_buffer.c | 153 +- + tools/iio/iio_utils.c | 18 +- + tools/iio/iio_utils.h | 9 +- + 563 files changed, 10788 insertions(+), 38995 deletions(-) + delete mode 100644 Documentation/ABI/testing/sysfs-bus-iio-counter-104-quad-8 + rename Documentation/ABI/testing/{sysfs-bus-iio-humidity-hdc2010 => sysfs-bus-iio-humidity} (79%) + delete mode 100644 Documentation/ABI/testing/sysfs-bus-iio-humidity-hdc100x + delete mode 100644 Documentation/ABI/testing/sysfs-bus-iio-lptimer-stm32 + create mode 100644 Documentation/devicetree/bindings/counter/interrupt-counter.yaml + create mode 100644 Documentation/devicetree/bindings/iio/accel/bosch,bmi088.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,ads131e08.yaml + create mode 100644 Documentation/devicetree/bindings/iio/cdc/adi,ad7150.yaml + create mode 100644 Documentation/devicetree/bindings/iio/proximity/google,cros-ec-mkbp-proximity.yaml + create mode 100644 drivers/counter/interrupt-cnt.c + create mode 100644 drivers/iio/accel/bmi088-accel-core.c + create mode 100644 drivers/iio/accel/bmi088-accel-spi.c + create mode 100644 drivers/iio/accel/bmi088-accel.h + create mode 100644 drivers/iio/adc/ti-ads131e08.c + create mode 100644 drivers/iio/cdc/Kconfig + create mode 100644 drivers/iio/cdc/Makefile + create mode 100644 drivers/iio/cdc/ad7150.c + create mode 100644 drivers/iio/proximity/cros_ec_mkbp_proximity.c + create mode 100644 drivers/iio/test/Kconfig + create mode 100644 drivers/iio/test/Makefile + create mode 100644 drivers/iio/test/iio-test-format.c + rename drivers/{staging/most/sound/sound.c => most/most_snd.c} (100%) + rename drivers/{staging/hikey9xx => regulator}/hi6421v600-regulator.c (100%) + delete mode 100644 drivers/staging/gasket/Kconfig + delete mode 100644 drivers/staging/gasket/Makefile + delete mode 100644 drivers/staging/gasket/TODO + delete mode 100644 drivers/staging/gasket/apex.h + delete mode 100644 drivers/staging/gasket/apex_driver.c + delete mode 100644 drivers/staging/gasket/gasket.h + delete mode 100644 drivers/staging/gasket/gasket_constants.h + delete mode 100644 drivers/staging/gasket/gasket_core.c + delete mode 100644 drivers/staging/gasket/gasket_core.h + delete mode 100644 drivers/staging/gasket/gasket_interrupt.c + delete mode 100644 drivers/staging/gasket/gasket_interrupt.h + delete mode 100644 drivers/staging/gasket/gasket_ioctl.c + delete mode 100644 drivers/staging/gasket/gasket_ioctl.h + delete mode 100644 drivers/staging/gasket/gasket_page_table.c + delete mode 100644 drivers/staging/gasket/gasket_page_table.h + delete mode 100644 drivers/staging/gasket/gasket_sysfs.c + delete mode 100644 drivers/staging/gasket/gasket_sysfs.h + delete mode 100644 drivers/staging/iio/cdc/ad7150.c + delete mode 100644 drivers/staging/most/sound/Kconfig + delete mode 100644 drivers/staging/most/sound/Makefile + delete mode 100644 drivers/staging/wimax/Documentation/i2400m.rst + delete mode 100644 drivers/staging/wimax/Documentation/index.rst + delete mode 100644 drivers/staging/wimax/Documentation/wimax.rst + delete mode 100644 drivers/staging/wimax/Kconfig + delete mode 100644 drivers/staging/wimax/Makefile + delete mode 100644 drivers/staging/wimax/TODO + delete mode 100644 drivers/staging/wimax/debug-levels.h + delete mode 100644 drivers/staging/wimax/debugfs.c + delete mode 100644 drivers/staging/wimax/i2400m/Kconfig + delete mode 100644 drivers/staging/wimax/i2400m/Makefile + delete mode 100644 drivers/staging/wimax/i2400m/control.c + delete mode 100644 drivers/staging/wimax/i2400m/debug-levels.h + delete mode 100644 drivers/staging/wimax/i2400m/debugfs.c + delete mode 100644 drivers/staging/wimax/i2400m/driver.c + delete mode 100644 drivers/staging/wimax/i2400m/fw.c + delete mode 100644 drivers/staging/wimax/i2400m/i2400m-usb.h + delete mode 100644 drivers/staging/wimax/i2400m/i2400m.h + delete mode 100644 drivers/staging/wimax/i2400m/linux-wimax-i2400m.h + delete mode 100644 drivers/staging/wimax/i2400m/netdev.c + delete mode 100644 drivers/staging/wimax/i2400m/op-rfkill.c + delete mode 100644 drivers/staging/wimax/i2400m/rx.c + delete mode 100644 drivers/staging/wimax/i2400m/sysfs.c + delete mode 100644 drivers/staging/wimax/i2400m/tx.c + delete mode 100644 drivers/staging/wimax/i2400m/usb-debug-levels.h + delete mode 100644 drivers/staging/wimax/i2400m/usb-fw.c + delete mode 100644 drivers/staging/wimax/i2400m/usb-notif.c + delete mode 100644 drivers/staging/wimax/i2400m/usb-rx.c + delete mode 100644 drivers/staging/wimax/i2400m/usb-tx.c + delete mode 100644 drivers/staging/wimax/i2400m/usb.c + delete mode 100644 drivers/staging/wimax/id-table.c + delete mode 100644 drivers/staging/wimax/linux-wimax-debug.h + delete mode 100644 drivers/staging/wimax/linux-wimax.h + delete mode 100644 drivers/staging/wimax/net-wimax.h + delete mode 100644 drivers/staging/wimax/op-msg.c + delete mode 100644 drivers/staging/wimax/op-reset.c + delete mode 100644 drivers/staging/wimax/op-rfkill.c + delete mode 100644 drivers/staging/wimax/op-state-get.c + delete mode 100644 drivers/staging/wimax/stack.c + delete mode 100644 drivers/staging/wimax/wimax-internal.h + create mode 100644 include/uapi/linux/iio/buffer.h +$ git am -3 ../patches/0001-iio-adc-merge-fix-for-spi-core-remove-delay_usecs-fi.patch +Applying: iio: adc: merge fix for "spi: core: remove 'delay_usecs' field from spi_transfer" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/iio/adc/ti-ads131e08.c +$ git add -A . +$ git commit -v -a --amend +[master 187da5845259] Merge remote-tracking branch 'staging/staging-next' + Date: Thu Apr 8 18:13:08 2021 +1000 +Merging mux/for-next (3516bd729358 Merge tag 's390-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) +$ git merge mux/for-next +Already up to date. +Merging icc/icc-next (27d19a8b4abb Merge branch 'icc-fixes' into icc-next) +$ git merge icc/icc-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/interconnect/qcom,rpmh.yaml | 10 + + .../bindings/interconnect/qcom,sdm660.yaml | 147 ++++ + MAINTAINERS | 1 + + drivers/interconnect/qcom/Kconfig | 18 + + drivers/interconnect/qcom/Makefile | 4 + + drivers/interconnect/qcom/icc-rpm.c | 4 +- + drivers/interconnect/qcom/sdm660.c | 922 +++++++++++++++++++++ + drivers/interconnect/qcom/sm8350.c | 633 ++++++++++++++ + drivers/interconnect/qcom/sm8350.h | 168 ++++ + include/dt-bindings/interconnect/qcom,sdm660.h | 116 +++ + include/dt-bindings/interconnect/qcom,sm8350.h | 172 ++++ + 11 files changed, 2193 insertions(+), 2 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sdm660.yaml + create mode 100644 drivers/interconnect/qcom/sdm660.c + create mode 100644 drivers/interconnect/qcom/sm8350.c + create mode 100644 drivers/interconnect/qcom/sm8350.h + create mode 100644 include/dt-bindings/interconnect/qcom,sdm660.h + create mode 100644 include/dt-bindings/interconnect/qcom,sm8350.h +Merging dmaengine/next (84b0aa2e0d91 dmaengine: dw-edma: Add pcim_iomap_table return check) +$ git merge dmaengine/next +Auto-merging include/linux/pci.h +Auto-merging drivers/pci/pci.c +Merge made by the 'recursive' strategy. + drivers/dma/dw-edma/dw-edma-core.c | 178 +++++++++++------- + drivers/dma/dw-edma/dw-edma-core.h | 37 ++-- + drivers/dma/dw-edma/dw-edma-pcie.c | 277 +++++++++++++++++++++------- + drivers/dma/dw-edma/dw-edma-v0-core.c | 300 ++++++++++++++++++++++++------- + drivers/dma/dw-edma/dw-edma-v0-core.h | 2 +- + drivers/dma/dw-edma/dw-edma-v0-debugfs.c | 77 ++++---- + drivers/dma/dw-edma/dw-edma-v0-debugfs.h | 4 +- + drivers/dma/dw-edma/dw-edma-v0-regs.h | 291 +++++++++++++++++++----------- + drivers/dma/xilinx/xilinx_dma.c | 8 + + drivers/pci/pci.c | 30 ++++ + include/linux/pci.h | 1 + + 11 files changed, 850 insertions(+), 355 deletions(-) +Merging cgroup/for-next (dd3f4e4972f1 cgroup: misc: mark dummy misc_cg_res_total_usage() static inline) +$ git merge cgroup/for-next +Auto-merging init/Kconfig +Auto-merging arch/x86/kvm/svm/svm.h +Auto-merging arch/x86/kvm/svm/sev.c +Merge made by the 'recursive' strategy. + Documentation/admin-guide/cgroup-v1/index.rst | 1 + + Documentation/admin-guide/cgroup-v1/misc.rst | 4 + + Documentation/admin-guide/cgroup-v2.rst | 73 ++++- + arch/x86/kvm/svm/sev.c | 70 ++++- + arch/x86/kvm/svm/svm.h | 1 + + include/linux/cgroup_subsys.h | 4 + + include/linux/misc_cgroup.h | 132 +++++++++ + init/Kconfig | 14 + + kernel/cgroup/Makefile | 1 + + kernel/cgroup/misc.c | 407 ++++++++++++++++++++++++++ + 10 files changed, 695 insertions(+), 12 deletions(-) + create mode 100644 Documentation/admin-guide/cgroup-v1/misc.rst + create mode 100644 include/linux/misc_cgroup.h + create mode 100644 kernel/cgroup/misc.c +Merging scsi/for-next (bce99128eaf7 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging include/scsi/scsi_host.h +Auto-merging include/scsi/scsi_cmnd.h +Auto-merging drivers/target/target_core_pscsi.c +Auto-merging drivers/target/iscsi/iscsi_target.c +CONFLICT (content): Merge conflict in drivers/target/iscsi/iscsi_target.c +Auto-merging drivers/scsi/sg.c +Auto-merging drivers/scsi/scsi_sysfs.c +Auto-merging drivers/scsi/scsi_scan.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/pm8001/pm8001_hwi.c +Auto-merging drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c +Auto-merging drivers/scsi/ibmvscsi/ibmvscsi.c +Auto-merging drivers/scsi/ibmvscsi/ibmvfc.c +Auto-merging drivers/scsi/advansys.c +Auto-merging drivers/scsi/BusLogic.c +Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.c +Auto-merging block/blk-mq-sched.c +Resolved 'drivers/target/iscsi/iscsi_target.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b333e975961f] Merge remote-tracking branch 'scsi/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/ufs/ufshcd-pltfrm.txt | 2 + + block/blk-mq-sched.c | 17 +- + block/blk-mq.c | 38 +- + block/blk-mq.h | 25 +- + block/kyber-iosched.c | 3 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 14 +- + drivers/message/fusion/mptbase.c | 6 +- + drivers/message/fusion/mptbase.h | 2 +- + drivers/message/fusion/mptsas.c | 2 +- + drivers/scsi/3w-9xxx.c | 14 +- + drivers/scsi/3w-sas.c | 13 +- + drivers/scsi/3w-xxxx.c | 6 +- + drivers/scsi/53c700.c | 2 +- + drivers/scsi/BusLogic.c | 2 +- + drivers/scsi/FlashPoint.c | 6 +- + drivers/scsi/a100u2w.c | 13 +- + drivers/scsi/aacraid/aachba.c | 8 +- + drivers/scsi/aacraid/commctrl.c | 2 +- + drivers/scsi/aacraid/commsup.c | 4 +- + drivers/scsi/aacraid/rx.c | 2 +- + drivers/scsi/advansys.c | 2 +- + drivers/scsi/aic94xx/aic94xx_dump.c | 186 +----- + drivers/scsi/aic94xx/aic94xx_hwi.c | 4 +- + drivers/scsi/aic94xx/aic94xx_sds.c | 2 +- + drivers/scsi/atp870u.c | 7 +- + drivers/scsi/be2iscsi/be_iscsi.c | 2 +- + drivers/scsi/be2iscsi/be_main.c | 6 +- + drivers/scsi/be2iscsi/be_mgmt.c | 2 +- + drivers/scsi/bfa/bfa_fc.h | 4 +- + drivers/scsi/bfa/bfa_fcs_lport.c | 20 +- + drivers/scsi/bfa/bfad_bsg.c | 2 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 +- + drivers/scsi/bnx2fc/bnx2fc_hwi.c | 2 +- + drivers/scsi/bnx2fc/bnx2fc_tgt.c | 2 +- + drivers/scsi/bnx2i/bnx2i_hwi.c | 85 ++- + drivers/scsi/bnx2i/bnx2i_sysfs.c | 2 +- + drivers/scsi/csiostor/csio_hw_t5.c | 2 +- + drivers/scsi/csiostor/csio_scsi.c | 4 +- + drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 2 +- + drivers/scsi/cxlflash/main.c | 8 +- + drivers/scsi/cxlflash/superpipe.c | 6 +- + drivers/scsi/cxlflash/vlun.c | 8 +- + drivers/scsi/dc395x.c | 11 +- + drivers/scsi/esas2r/esas2r_log.c | 7 + + drivers/scsi/esp_scsi.c | 4 +- + drivers/scsi/fcoe/fcoe.c | 2 +- + drivers/scsi/fcoe/fcoe_ctlr.c | 4 +- + drivers/scsi/fnic/fnic_debugfs.c | 3 +- + drivers/scsi/fnic/fnic_fcs.c | 16 +- + drivers/scsi/fnic/fnic_scsi.c | 6 +- + drivers/scsi/fnic/fnic_trace.c | 18 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 31 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 73 ++- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 23 +- + drivers/scsi/initio.c | 18 +- + drivers/scsi/ipr.c | 8 +- + drivers/scsi/isci/host.c | 37 +- + drivers/scsi/isci/phy.c | 34 +- + drivers/scsi/isci/port.c | 62 +- + drivers/scsi/isci/port_config.c | 37 +- + drivers/scsi/isci/remote_device.c | 33 +- + drivers/scsi/isci/remote_node_context.c | 13 +- + drivers/scsi/isci/remote_node_table.c | 64 +- + drivers/scsi/isci/request.c | 60 +- + drivers/scsi/isci/task.c | 3 +- + drivers/scsi/libfc/fc_fcp.c | 2 +- + drivers/scsi/libfc/fc_lport.c | 12 +- + drivers/scsi/libfc/fc_rport.c | 2 +- + drivers/scsi/lpfc/lpfc.h | 3 +- + drivers/scsi/lpfc/lpfc_attr.c | 14 +- + drivers/scsi/lpfc/lpfc_bsg.c | 6 +- + drivers/scsi/lpfc/lpfc_crtn.h | 4 +- + drivers/scsi/lpfc/lpfc_ct.c | 12 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 21 +- + drivers/scsi/lpfc/lpfc_disc.h | 3 +- + drivers/scsi/lpfc/lpfc_els.c | 641 ++++++++++----------- + drivers/scsi/lpfc/lpfc_hbadisc.c | 8 +- + drivers/scsi/lpfc/lpfc_init.c | 2 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 272 ++++----- + drivers/scsi/lpfc/lpfc_nvme.c | 4 +- + drivers/scsi/lpfc/lpfc_nvmet.c | 5 +- + drivers/scsi/lpfc/lpfc_scsi.c | 122 ++-- + drivers/scsi/lpfc/lpfc_sli.c | 41 +- + drivers/scsi/lpfc/lpfc_version.h | 6 +- + drivers/scsi/lpfc/lpfc_vport.c | 10 +- + drivers/scsi/mac53c94.c | 13 +- + drivers/scsi/megaraid/megaraid_mbox.c | 2 +- + drivers/scsi/megaraid/megaraid_mm.c | 2 +- + drivers/scsi/megaraid/megaraid_sas.h | 5 + + drivers/scsi/megaraid/megaraid_sas_base.c | 98 +++- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 89 ++- + drivers/scsi/megaraid/megaraid_sas_fusion.h | 2 + + drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 2 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 510 ++++++++++------ + drivers/scsi/mpt3sas/mpt3sas_base.h | 5 +- + drivers/scsi/mpt3sas/mpt3sas_config.c | 10 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 40 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 58 +- + drivers/scsi/mpt3sas/mpt3sas_transport.c | 7 +- + drivers/scsi/mvumi.c | 9 +- + drivers/scsi/myrb.c | 55 +- + drivers/scsi/myrs.c | 18 +- + drivers/scsi/nsp32.c | 31 +- + drivers/scsi/pm8001/pm8001_ctl.c | 4 +- + drivers/scsi/pm8001/pm8001_hwi.c | 8 +- + drivers/scsi/pm8001/pm8001_init.c | 10 +- + drivers/scsi/pm8001/pm8001_sas.c | 9 +- + drivers/scsi/pm8001/pm8001_sas.h | 1 - + drivers/scsi/pm8001/pm80xx_hwi.c | 18 +- + drivers/scsi/pmcraid.c | 70 ++- + drivers/scsi/qedi/qedi_main.c | 4 +- + drivers/scsi/qla1280.c | 10 +- + drivers/scsi/qla2xxx/qla_attr.c | 8 +- + drivers/scsi/qla2xxx/qla_bsg.c | 7 +- + drivers/scsi/qla2xxx/qla_dbg.c | 16 +- + drivers/scsi/qla2xxx/qla_dbg.h | 2 +- + drivers/scsi/qla2xxx/qla_def.h | 15 +- + drivers/scsi/qla2xxx/qla_gbl.h | 3 + + drivers/scsi/qla2xxx/qla_gs.c | 14 +- + drivers/scsi/qla2xxx/qla_init.c | 115 +++- + drivers/scsi/qla2xxx/qla_inline.h | 46 ++ + drivers/scsi/qla2xxx/qla_iocb.c | 84 ++- + drivers/scsi/qla2xxx/qla_isr.c | 11 +- + drivers/scsi/qla2xxx/qla_mbx.c | 38 +- + drivers/scsi/qla2xxx/qla_mr.c | 16 +- + drivers/scsi/qla2xxx/qla_mr.h | 8 +- + drivers/scsi/qla2xxx/qla_nvme.c | 10 +- + drivers/scsi/qla2xxx/qla_nx2.c | 10 +- + drivers/scsi/qla2xxx/qla_os.c | 217 +++---- + drivers/scsi/qla2xxx/qla_sup.c | 9 +- + drivers/scsi/qla2xxx/qla_target.c | 11 +- + drivers/scsi/qla2xxx/qla_version.h | 4 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 19 +- + drivers/scsi/qla4xxx/ql4_mbx.c | 4 +- + drivers/scsi/qla4xxx/ql4_os.c | 6 +- + drivers/scsi/scsi.c | 13 + + drivers/scsi/scsi_debug.c | 229 +++++++- + drivers/scsi/scsi_dh.c | 2 +- + drivers/scsi/scsi_lib.c | 100 +++- + drivers/scsi/scsi_priv.h | 5 +- + drivers/scsi/scsi_scan.c | 23 +- + drivers/scsi/scsi_sysfs.c | 6 +- + drivers/scsi/sd.c | 2 +- + drivers/scsi/sd_zbc.c | 2 +- + drivers/scsi/sg.c | 2 +- + drivers/scsi/sim710.c | 14 +- + drivers/scsi/storvsc_drv.c | 84 ++- + drivers/scsi/ufs/cdns-pltfrm.c | 4 + + drivers/scsi/ufs/ufs-debugfs.c | 90 +++ + drivers/scsi/ufs/ufs-debugfs.h | 2 + + drivers/scsi/ufs/ufs-exynos.c | 3 +- + drivers/scsi/ufs/ufs-qcom.c | 4 +- + drivers/scsi/ufs/ufs-sysfs.c | 2 +- + drivers/scsi/ufs/ufs.h | 10 +- + drivers/scsi/ufs/ufshcd-pci.c | 169 ++++++ + drivers/scsi/ufs/ufshcd-pltfrm.c | 6 +- + drivers/scsi/ufs/ufshcd.c | 257 ++++----- + drivers/scsi/ufs/ufshcd.h | 30 +- + drivers/scsi/ufs/ufshci.h | 18 +- + drivers/target/iscsi/iscsi_target.c | 19 +- + drivers/target/iscsi/iscsi_target_configfs.c | 3 +- + drivers/target/iscsi/iscsi_target_nego.c | 1 - + drivers/target/iscsi/iscsi_target_stat.c | 1 - + drivers/target/iscsi/iscsi_target_util.c | 17 - + drivers/target/loopback/tcm_loop.c | 60 +- + drivers/target/loopback/tcm_loop.h | 1 - + drivers/target/sbp/sbp_target.c | 8 +- + drivers/target/target_core_configfs.c | 25 +- + drivers/target/target_core_device.c | 10 +- + drivers/target/target_core_fabric_configfs.c | 58 ++ + drivers/target/target_core_file.c | 3 +- + drivers/target/target_core_iblock.c | 81 ++- + drivers/target/target_core_iblock.h | 10 + + drivers/target/target_core_internal.h | 2 + + drivers/target/target_core_pr.c | 36 +- + drivers/target/target_core_pscsi.c | 5 +- + drivers/target/target_core_sbc.c | 4 +- + drivers/target/target_core_stat.c | 3 - + drivers/target/target_core_tmr.c | 4 + + drivers/target/target_core_transport.c | 300 +++++++--- + drivers/target/target_core_user.c | 95 +-- + drivers/target/target_core_xcopy.c | 10 +- + drivers/target/tcm_fc/tfc_cmd.c | 14 +- + drivers/usb/gadget/function/f_tcm.c | 36 +- + drivers/vhost/scsi.c | 58 +- + drivers/xen/xen-scsiback.c | 21 +- + include/linux/blk-mq.h | 13 +- + include/linux/hyperv.h | 1 + + include/linux/sbitmap.h | 85 ++- + include/scsi/scsi_cmnd.h | 3 + + include/scsi/scsi_device.h | 8 +- + include/scsi/scsi_dh.h | 2 +- + include/scsi/scsi_host.h | 84 +-- + include/target/target_core_backend.h | 2 + + include/target/target_core_base.h | 59 +- + include/target/target_core_fabric.h | 21 +- + include/trace/events/ufs.h | 21 + + lib/sbitmap.c | 210 ++++--- + 198 files changed, 3843 insertions(+), 2689 deletions(-) +Merging scsi-mkp/for-next (857a80bbd732 scsi: libsas: Clean up whitespace) +$ git merge scsi-mkp/for-next +Auto-merging drivers/scsi/ufs/ufshcd.c +CONFLICT (content): Merge conflict in drivers/scsi/ufs/ufshcd.c +Auto-merging drivers/scsi/smartpqi/smartpqi_init.c +Resolved 'drivers/scsi/ufs/ufshcd.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master da7c1a6b6e0d] Merge remote-tracking branch 'scsi-mkp/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/message/fusion/lsi/mpi.h | 4 +- + drivers/message/fusion/lsi/mpi_ioc.h | 2 +- + drivers/message/fusion/mptdebug.h | 7 +- + drivers/message/fusion/mptlan.c | 9 +- + drivers/message/fusion/mptsas.c | 6 +- + drivers/scsi/aic94xx/aic94xx.h | 2 +- + drivers/scsi/bfa/bfa_fcs.h | 3 - + drivers/scsi/device_handler/scsi_dh_alua.c | 35 +- + drivers/scsi/fnic/fnic_main.c | 3 - + drivers/scsi/libsas/sas_ata.c | 74 +- + drivers/scsi/libsas/sas_discover.c | 2 +- + drivers/scsi/libsas/sas_expander.c | 13 +- + drivers/scsi/lpfc/lpfc_attr.c | 6 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 4 + + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 7 +- + drivers/scsi/mvsas/mv_sas.h | 2 +- + drivers/scsi/qedf/qedf.h | 2 - + drivers/scsi/qedf/qedf_dbg.h | 1 - + drivers/scsi/smartpqi/smartpqi.h | 310 ++- + drivers/scsi/smartpqi/smartpqi_init.c | 3107 +++++++++++++++--------- + drivers/scsi/smartpqi/smartpqi_sas_transport.c | 39 +- + drivers/scsi/smartpqi/smartpqi_sis.c | 9 +- + drivers/scsi/smartpqi/smartpqi_sis.h | 1 + + drivers/scsi/ufs/ufshcd.c | 28 +- + drivers/scsi/ufs/ufshci.h | 22 +- + drivers/target/target_core_device.c | 2 +- + drivers/target/target_core_rd.c | 27 +- + drivers/target/target_core_rd.h | 1 + + drivers/target/target_core_spc.c | 6 +- + include/scsi/libfcoe.h | 2 +- + 30 files changed, 2330 insertions(+), 1406 deletions(-) +Merging vhost/linux-next (723c7003c1ab vdpa: introduce virtio pci driver) +$ git merge vhost/linux-next +Auto-merging drivers/Makefile +Merge made by the 'recursive' strategy. + drivers/Makefile | 1 + + drivers/vdpa/Kconfig | 7 + + drivers/vdpa/Makefile | 1 + + drivers/vdpa/virtio_pci/Makefile | 2 + + drivers/vdpa/virtio_pci/vp_vdpa.c | 458 ++++++++++++++++++++++++++++++++++++++ + 5 files changed, 469 insertions(+) + create mode 100644 drivers/vdpa/virtio_pci/Makefile + create mode 100644 drivers/vdpa/virtio_pci/vp_vdpa.c +Merging rpmsg/for-next (2c2564b9d64d Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Removing drivers/hwspinlock/sirf_hwspinlock.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/remoteproc/imx-rproc.txt +Removing Documentation/devicetree/bindings/hwlock/sirf,hwspinlock.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwlock/sirf,hwspinlock.txt | 28 - + .../bindings/remoteproc/fsl,imx-rproc.yaml | 90 ++++ + .../devicetree/bindings/remoteproc/imx-rproc.txt | 33 -- + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 15 + + .../bindings/remoteproc/qcom,wcnss-pil.txt | 6 + + MAINTAINERS | 2 + + drivers/hwspinlock/Kconfig | 11 - + drivers/hwspinlock/Makefile | 1 - + drivers/hwspinlock/sirf_hwspinlock.c | 105 ---- + drivers/remoteproc/Kconfig | 6 +- + drivers/remoteproc/imx_rproc.c | 267 ++++++++- + drivers/remoteproc/ingenic_rproc.c | 2 +- + drivers/remoteproc/keystone_remoteproc.c | 2 +- + drivers/remoteproc/mtk_scp.c | 6 +- + drivers/remoteproc/omap_remoteproc.c | 2 +- + drivers/remoteproc/pru_rproc.c | 26 +- + drivers/remoteproc/qcom_pil_info.c | 2 +- + drivers/remoteproc/qcom_q6v5_adsp.c | 2 +- + drivers/remoteproc/qcom_q6v5_mss.c | 26 +- + drivers/remoteproc/qcom_q6v5_pas.c | 2 +- + drivers/remoteproc/qcom_q6v5_wcss.c | 595 +++++++++++++++++++-- + drivers/remoteproc/qcom_wcnss.c | 10 +- + drivers/remoteproc/remoteproc_cdev.c | 21 +- + drivers/remoteproc/remoteproc_core.c | 337 ++++++++++-- + drivers/remoteproc/remoteproc_coredump.c | 8 +- + drivers/remoteproc/remoteproc_debugfs.c | 2 +- + drivers/remoteproc/remoteproc_elf_loader.c | 21 +- + drivers/remoteproc/remoteproc_internal.h | 12 +- + drivers/remoteproc/remoteproc_sysfs.c | 21 +- + drivers/remoteproc/st_slim_rproc.c | 2 +- + drivers/remoteproc/stm32_rproc.c | 168 +++--- + drivers/remoteproc/ti_k3_dsp_remoteproc.c | 2 +- + drivers/remoteproc/ti_k3_r5_remoteproc.c | 2 +- + drivers/remoteproc/wkup_m3_rproc.c | 2 +- + drivers/rpmsg/qcom_glink_native.c | 17 + + drivers/rpmsg/qcom_smd.c | 16 + + drivers/rpmsg/rpmsg_char.c | 11 +- + drivers/rpmsg/virtio_rpmsg_bus.c | 62 ++- + include/linux/remoteproc.h | 25 +- + include/linux/rpmsg.h | 3 +- + include/uapi/linux/rpmsg.h | 13 +- + 41 files changed, 1549 insertions(+), 435 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/hwlock/sirf,hwspinlock.txt + create mode 100644 Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml + delete mode 100644 Documentation/devicetree/bindings/remoteproc/imx-rproc.txt + delete mode 100644 drivers/hwspinlock/sirf_hwspinlock.c +Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file) +$ git merge gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (e1b7033ecdac Merge tag 'intel-gpio-v5.13-1' of gitolite.kernel.org:pub/scm/linux/kernel/git/andy/linux-gpio-intel into gpio/for-next) +$ git merge gpio-brgl/gpio/for-next +Auto-merging lib/bitmap.c +Auto-merging kernel/irq/irqdomain.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/gpio/gpio-mockup.rst | 11 +- + Documentation/admin-guide/gpio/gpio-sim.rst | 72 ++ + Documentation/admin-guide/kernel-parameters.txt | 10 +- + Documentation/core-api/irq/irq-domain.rst | 22 +- + .../bindings/gpio/realtek,otto-gpio.yaml | 78 ++ + Documentation/driver-api/gpio/consumer.rst | 2 +- + Documentation/driver-api/gpio/drivers-on-gpio.rst | 6 + + Documentation/filesystems/configfs.rst | 6 +- + drivers/gpio/Kconfig | 24 +- + drivers/gpio/Makefile | 2 + + drivers/gpio/gpio-aggregator.c | 39 +- + drivers/gpio/gpio-mockup.c | 9 +- + drivers/gpio/gpio-omap.c | 5 +- + drivers/gpio/gpio-realtek-otto.c | 325 ++++++++ + drivers/gpio/gpio-sch.c | 198 ++++- + drivers/gpio/gpio-sim.c | 875 +++++++++++++++++++++ + drivers/gpio/gpiolib-acpi.c | 7 + + drivers/gpio/gpiolib-acpi.h | 4 + + drivers/gpio/gpiolib-of.c | 6 +- + drivers/gpio/gpiolib.c | 62 +- + fs/configfs/configfs_internal.h | 22 +- + fs/configfs/dir.c | 245 +++++- + include/linux/bitmap.h | 127 +-- + include/linux/configfs.h | 3 +- + include/linux/gpio/driver.h | 12 +- + include/linux/irqdomain.h | 19 +- + kernel/irq/irqdomain.c | 20 +- + lib/bitmap.c | 42 +- + lib/cmdline.c | 1 + + samples/configfs/configfs_sample.c | 153 ++++ + tools/gpio/gpio-utils.c | 18 +- + tools/testing/selftests/gpio/.gitignore | 2 + + tools/testing/selftests/gpio/Makefile | 4 +- + tools/testing/selftests/gpio/config | 1 + + tools/testing/selftests/gpio/gpio-chip-info.c | 57 ++ + tools/testing/selftests/gpio/gpio-line-name.c | 55 ++ + tools/testing/selftests/gpio/gpio-sim.sh | 229 ++++++ + 37 files changed, 2544 insertions(+), 229 deletions(-) + create mode 100644 Documentation/admin-guide/gpio/gpio-sim.rst + create mode 100644 Documentation/devicetree/bindings/gpio/realtek,otto-gpio.yaml + create mode 100644 drivers/gpio/gpio-realtek-otto.c + create mode 100644 drivers/gpio/gpio-sim.c + create mode 100644 tools/testing/selftests/gpio/gpio-chip-info.c + create mode 100644 tools/testing/selftests/gpio/gpio-line-name.c + create mode 100755 tools/testing/selftests/gpio/gpio-sim.sh +Merging gpio-intel/for-next (058459043e71 gpio: ich: Switch to be dependent on LPC_ICH) +$ git merge gpio-intel/for-next +Auto-merging drivers/gpio/gpiolib-acpi.c +Auto-merging drivers/gpio/Kconfig +Merge made by the 'recursive' strategy. + drivers/gpio/Kconfig | 8 +++----- + drivers/gpio/gpio-ich.c | 2 -- + drivers/gpio/gpiolib-acpi.c | 14 ++++++++++++++ + 3 files changed, 17 insertions(+), 7 deletions(-) +Merging pinctrl/for-next (b60bab1ddf42 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Auto-merging include/linux/gpio/driver.h +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/gpio/brcm,bcm6345-gpio.txt +Merge made by the 'recursive' strategy. + .../arm/marvell/cp110-system-controller.txt | 4 +- + .../devicetree/bindings/gpio/brcm,bcm6345-gpio.txt | 46 -- + .../bindings/gpio/brcm,bcm6345-gpio.yaml | 86 +++ + .../bindings/mfd/brcm,bcm6318-gpio-sysctl.yaml | 177 ++++++ + .../bindings/mfd/brcm,bcm63268-gpio-sysctl.yaml | 194 +++++++ + .../bindings/mfd/brcm,bcm6328-gpio-sysctl.yaml | 162 ++++++ + .../bindings/mfd/brcm,bcm6358-gpio-sysctl.yaml | 130 +++++ + .../bindings/mfd/brcm,bcm6362-gpio-sysctl.yaml | 236 ++++++++ + .../bindings/mfd/brcm,bcm6368-gpio-sysctl.yaml | 246 ++++++++ + .../bindings/pinctrl/brcm,bcm6318-pinctrl.yaml | 143 +++++ + .../bindings/pinctrl/brcm,bcm63268-pinctrl.yaml | 164 ++++++ + .../bindings/pinctrl/brcm,bcm6328-pinctrl.yaml | 127 ++++ + .../bindings/pinctrl/brcm,bcm6358-pinctrl.yaml | 93 +++ + .../bindings/pinctrl/brcm,bcm6362-pinctrl.yaml | 206 +++++++ + .../bindings/pinctrl/brcm,bcm6368-pinctrl.yaml | 217 +++++++ + .../devicetree/bindings/pinctrl/qcom,pmic-gpio.txt | 12 + + Documentation/driver-api/gpio/legacy.rst | 2 +- + Documentation/driver-api/index.rst | 2 +- + .../driver-api/{pinctl.rst => pin-control.rst} | 37 ++ + MAINTAINERS | 2 +- + arch/arm64/Kconfig.platforms | 2 - + drivers/gpio/gpio-regmap.c | 5 + + drivers/pinctrl/Kconfig | 7 +- + drivers/pinctrl/bcm/Kconfig | 62 ++ + drivers/pinctrl/bcm/Makefile | 7 + + drivers/pinctrl/bcm/pinctrl-bcm6318.c | 498 ++++++++++++++++ + drivers/pinctrl/bcm/pinctrl-bcm63268.c | 643 +++++++++++++++++++++ + drivers/pinctrl/bcm/pinctrl-bcm6328.c | 404 +++++++++++++ + drivers/pinctrl/bcm/pinctrl-bcm6358.c | 369 ++++++++++++ + drivers/pinctrl/bcm/pinctrl-bcm6362.c | 617 ++++++++++++++++++++ + drivers/pinctrl/bcm/pinctrl-bcm6368.c | 523 +++++++++++++++++ + drivers/pinctrl/bcm/pinctrl-bcm63xx.c | 109 ++++ + drivers/pinctrl/bcm/pinctrl-bcm63xx.h | 43 ++ + drivers/pinctrl/core.c | 37 +- + drivers/pinctrl/intel/pinctrl-intel.c | 5 +- + drivers/pinctrl/mediatek/pinctrl-moore.c | 2 + + drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 4 + + drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h | 2 + + drivers/pinctrl/mediatek/pinctrl-paris.c | 2 + + drivers/pinctrl/mvebu/pinctrl-armada-cp110.c | 4 +- + drivers/pinctrl/pinconf.c | 4 +- + drivers/pinctrl/pinctrl-equilibrium.c | 16 +- + drivers/pinctrl/pinctrl-ingenic.c | 4 +- + drivers/pinctrl/pinctrl-k210.c | 1 - + drivers/pinctrl/pinctrl-rockchip.c | 14 + + drivers/pinctrl/pinctrl-single.c | 65 ++- + drivers/pinctrl/pinmux.c | 106 +++- + drivers/pinctrl/qcom/Kconfig | 2 +- + drivers/pinctrl/qcom/pinctrl-sc7280.c | 24 + + drivers/pinctrl/qcom/pinctrl-sc8180x.c | 123 +++- + drivers/pinctrl/qcom/pinctrl-sm8350.c | 21 + + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 6 + + drivers/pinctrl/renesas/core.c | 20 - + drivers/pinctrl/renesas/core.h | 8 - + drivers/pinctrl/renesas/pfc-r8a73a4.c | 48 +- + drivers/pinctrl/renesas/pfc-r8a7740.c | 46 +- + drivers/pinctrl/renesas/pfc-r8a7778.c | 1 - + drivers/pinctrl/renesas/pfc-r8a7791.c | 387 ++++++++++++- + drivers/pinctrl/renesas/pfc-r8a7792.c | 1 - + drivers/pinctrl/renesas/pfc-r8a77950.c | 1 - + drivers/pinctrl/renesas/pfc-r8a77951.c | 31 +- + drivers/pinctrl/renesas/pfc-r8a7796.c | 31 +- + drivers/pinctrl/renesas/pfc-r8a77965.c | 35 +- + drivers/pinctrl/renesas/pfc-r8a77970.c | 1 - + drivers/pinctrl/renesas/pfc-r8a77980.c | 1 - + drivers/pinctrl/renesas/pfc-r8a77990.c | 35 +- + drivers/pinctrl/renesas/pfc-r8a77995.c | 1 - + drivers/pinctrl/renesas/pfc-r8a779a0.c | 1 - + drivers/pinctrl/renesas/pfc-sh73a0.c | 46 +- + drivers/pinctrl/renesas/pinctrl.c | 109 +++- + drivers/pinctrl/renesas/sh_pfc.h | 24 +- + drivers/pinctrl/stm32/pinctrl-stm32.c | 5 +- + drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 3 +- + include/linux/gpio/driver.h | 9 + + include/linux/gpio/regmap.h | 4 + + kernel/irq/generic-chip.c | 1 + + 76 files changed, 6552 insertions(+), 314 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/gpio/brcm,bcm6345-gpio.txt + create mode 100644 Documentation/devicetree/bindings/gpio/brcm,bcm6345-gpio.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/brcm,bcm6318-gpio-sysctl.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/brcm,bcm63268-gpio-sysctl.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/brcm,bcm6328-gpio-sysctl.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/brcm,bcm6358-gpio-sysctl.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/brcm,bcm6362-gpio-sysctl.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/brcm,bcm6368-gpio-sysctl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,bcm6318-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,bcm63268-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,bcm6328-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,bcm6358-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,bcm6362-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,bcm6368-pinctrl.yaml + rename Documentation/driver-api/{pinctl.rst => pin-control.rst} (97%) + create mode 100644 drivers/pinctrl/bcm/pinctrl-bcm6318.c + create mode 100644 drivers/pinctrl/bcm/pinctrl-bcm63268.c + create mode 100644 drivers/pinctrl/bcm/pinctrl-bcm6328.c + create mode 100644 drivers/pinctrl/bcm/pinctrl-bcm6358.c + create mode 100644 drivers/pinctrl/bcm/pinctrl-bcm6362.c + create mode 100644 drivers/pinctrl/bcm/pinctrl-bcm6368.c + create mode 100644 drivers/pinctrl/bcm/pinctrl-bcm63xx.c + create mode 100644 drivers/pinctrl/bcm/pinctrl-bcm63xx.h +Merging pinctrl-intel/for-next (5b613df3f499 pinctrl: intel: No need to disable IRQs in the handler) +$ git merge pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (61232cd6efca pinctrl: renesas: r8a7791: Add bias pinconf support) +$ git merge pinctrl-renesas/renesas-pinctrl +Already up to date. +Merging pinctrl-samsung/for-next (a38fd8748464 Linux 5.12-rc2) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (9666cec380d6 pwm: Drop function pwmchip_add_with_polarity()) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + drivers/pwm/core.c | 48 +++++++------------------------------ + drivers/pwm/pwm-ab8500.c | 54 +++++++++++++++++++----------------------- + drivers/pwm/pwm-atmel-hlcdc.c | 3 +-- + drivers/pwm/pwm-atmel-tcb.c | 42 ++++++++++++++++++++++---------- + drivers/pwm/pwm-atmel.c | 1 - + drivers/pwm/pwm-bcm-iproc.c | 1 - + drivers/pwm/pwm-bcm-kona.c | 3 +-- + drivers/pwm/pwm-bcm2835.c | 36 +++++++++++++++++++++------- + drivers/pwm/pwm-berlin.c | 1 - + drivers/pwm/pwm-brcmstb.c | 1 - + drivers/pwm/pwm-clps711x.c | 1 - + drivers/pwm/pwm-crc.c | 1 - + drivers/pwm/pwm-cros-ec.c | 4 +++- + drivers/pwm/pwm-dwc.c | 1 - + drivers/pwm/pwm-ep93xx.c | 1 - + drivers/pwm/pwm-fsl-ftm.c | 1 - + drivers/pwm/pwm-hibvt.c | 1 - + drivers/pwm/pwm-img.c | 1 - + drivers/pwm/pwm-imx-tpm.c | 5 +--- + drivers/pwm/pwm-imx1.c | 1 - + drivers/pwm/pwm-imx27.c | 1 - + drivers/pwm/pwm-intel-lgm.c | 1 - + drivers/pwm/pwm-iqs620a.c | 1 - + drivers/pwm/pwm-jz4740.c | 1 - + drivers/pwm/pwm-keembay.c | 1 - + drivers/pwm/pwm-lp3943.c | 1 - + drivers/pwm/pwm-lpc18xx-sct.c | 1 - + drivers/pwm/pwm-lpc32xx.c | 1 - + drivers/pwm/pwm-lpss.c | 1 - + drivers/pwm/pwm-mediatek.c | 1 - + drivers/pwm/pwm-meson.c | 1 - + drivers/pwm/pwm-mtk-disp.c | 1 - + drivers/pwm/pwm-mxs.c | 1 - + drivers/pwm/pwm-omap-dmtimer.c | 1 - + drivers/pwm/pwm-pca9685.c | 1 - + drivers/pwm/pwm-pxa.c | 1 - + drivers/pwm/pwm-rcar.c | 1 - + drivers/pwm/pwm-renesas-tpu.c | 1 - + drivers/pwm/pwm-rockchip.c | 1 - + drivers/pwm/pwm-samsung.c | 1 - + drivers/pwm/pwm-sifive.c | 1 - + drivers/pwm/pwm-sl28cpld.c | 1 - + drivers/pwm/pwm-spear.c | 1 - + drivers/pwm/pwm-sprd.c | 4 +++- + drivers/pwm/pwm-sti.c | 1 - + drivers/pwm/pwm-stm32-lp.c | 1 - + drivers/pwm/pwm-stm32.c | 1 - + drivers/pwm/pwm-stmpe.c | 1 - + drivers/pwm/pwm-sun4i.c | 1 - + drivers/pwm/pwm-tegra.c | 1 - + drivers/pwm/pwm-tiecap.c | 1 - + drivers/pwm/pwm-tiehrpwm.c | 1 - + drivers/pwm/pwm-twl-led.c | 1 - + drivers/pwm/pwm-twl.c | 1 - + drivers/pwm/pwm-vt8500.c | 1 - + include/linux/pwm.h | 2 -- + 56 files changed, 99 insertions(+), 148 deletions(-) +Merging userns/for-next (95ebabde382c capabilities: Don't allow writing ambiguous v3 file capabilities) +$ git merge userns/for-next +Already up to date. +Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) +$ git merge ktest/for-next +Already up to date. +Merging random/dev (ab9a7e27044b random: avoid warnings for !CONFIG_NUMA builds) +$ git merge random/dev +Already up to date. +Merging kselftest/next (e75074781f17 selftests/resctrl: Change a few printed messages) +$ git merge kselftest/next +Auto-merging tools/testing/selftests/timers/clocksource-switch.c +Merge made by the 'recursive' strategy. + Documentation/dev-tools/kselftest.rst | 4 +- + tools/testing/selftests/lib.mk | 3 +- + tools/testing/selftests/resctrl/.gitignore | 2 + + tools/testing/selftests/resctrl/Makefile | 2 +- + tools/testing/selftests/resctrl/README | 4 +- + tools/testing/selftests/resctrl/cache.c | 52 ++++++- + tools/testing/selftests/resctrl/cat_test.c | 57 +++---- + .../selftests/resctrl/{cqm_test.c => cmt_test.c} | 75 +++------- + tools/testing/selftests/resctrl/config | 2 + + tools/testing/selftests/resctrl/fill_buf.c | 4 +- + tools/testing/selftests/resctrl/mba_test.c | 43 +++--- + tools/testing/selftests/resctrl/mbm_test.c | 42 +++--- + tools/testing/selftests/resctrl/resctrl.h | 29 +++- + tools/testing/selftests/resctrl/resctrl_tests.c | 163 ++++++++++++++------- + tools/testing/selftests/resctrl/resctrl_val.c | 95 +++++++----- + tools/testing/selftests/resctrl/resctrlfs.c | 134 ++++++++++------- + 16 files changed, 412 insertions(+), 299 deletions(-) + create mode 100644 tools/testing/selftests/resctrl/.gitignore + rename tools/testing/selftests/resctrl/{cqm_test.c => cmt_test.c} (56%) + create mode 100644 tools/testing/selftests/resctrl/config +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 (c150bbbb1731 Merge branch 'for-5.13/signal' into for-next) +$ git merge livepatching/for-next +Auto-merging kernel/signal.c +Merge made by the 'recursive' strategy. + kernel/livepatch/transition.c | 5 ++--- + kernel/signal.c | 4 +--- + 2 files changed, 3 insertions(+), 6 deletions(-) +Merging coresight/next (1efbcec2ef8c coresight: cti: Reduce scope for the variable “cs_fwnode” in cti_plat_create_connection()) +$ git merge coresight/next +Merge made by the 'recursive' strategy. +Merging rtc/rtc-next (8d69f62fddf6 rtc: rx6110: add ACPI bindings to I2C) +$ git merge rtc/rtc-next +Auto-merging drivers/rtc/Kconfig +Merge made by the 'recursive' strategy. + drivers/rtc/Kconfig | 1 + + drivers/rtc/rtc-imxdi.c | 4 +--- + drivers/rtc/rtc-m48t59.c | 2 +- + drivers/rtc/rtc-mxc.c | 2 +- + drivers/rtc/rtc-rv3028.c | 4 ++-- + drivers/rtc/rtc-rx6110.c | 7 +++++++ + drivers/rtc/rtc-tps65910.c | 1 + + 7 files changed, 14 insertions(+), 7 deletions(-) +Merging nvdimm/libnvdimm-for-next (30c10d32152d Merge branch 'for-5.12/cxl' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging at24/at24/for-next (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (5c8fe583cce5 Linux 5.11-rc1) +$ git merge ntb/ntb-next +Already up to date. +Merging seccomp/for-next/seccomp (a3fc712c5b37 seccomp: Fix "cacheable" typo in comments) +$ git merge seccomp/for-next/seccomp +Merge made by the 'recursive' strategy. + fs/proc/array.c | 2 ++ + init/init_task.c | 2 +- + kernel/seccomp.c | 2 +- + 3 files changed, 4 insertions(+), 2 deletions(-) +Merging kspp/for-next/kspp (414eece95b98 Merge tag 'clang-lto-v5.12-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux) +$ git merge kspp/for-next/kspp +Already up to date. +Merging gnss/gnss-next (994adcbd3714 gnss: drop stray semicolons) +$ git merge gnss/gnss-next +Merge made by the 'recursive' strategy. + drivers/gnss/mtk.c | 2 +- + drivers/gnss/serial.c | 2 +- + drivers/gnss/sirf.c | 2 +- + drivers/gnss/ubx.c | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) +Merging fsi/next (4a851d714ead fsi: aspeed: Support CFAM reset GPIO) +$ git merge fsi/next +Already up to date. +Merging slimbus/for-next (0320ed0a8236 drivers: slimbus: Fix word resposible -> responsible in slimbus.h) +$ git merge slimbus/for-next +Auto-merging drivers/of/platform.c +Auto-merging drivers/nvmem/Makefile +CONFLICT (content): Merge conflict in drivers/nvmem/Makefile +Auto-merging drivers/nvmem/Kconfig +CONFLICT (content): Merge conflict in drivers/nvmem/Kconfig +Resolved 'drivers/nvmem/Kconfig' using previous resolution. +Resolved 'drivers/nvmem/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4d1f332e3ccc] Merge remote-tracking branch 'slimbus/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/slimbus/slimbus.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging nvmem/for-next (9e1a5761c274 nvmem: qfprom: Add support for fuse blowing on sc7280) +$ git merge nvmem/for-next +Auto-merging Documentation/devicetree/bindings/nvmem/mtk-efuse.txt +Merge made by the 'recursive' strategy. +Merging xarray/main (2c7e57a02708 idr test suite: Improve reporting from idr_find_test_1) +$ git merge xarray/main +Already up to date. +Merging hyperv/hyperv-next (0975694befc0 Drivers: hv: vmbus: Remove unused linux/version.h header) +$ git merge hyperv/hyperv-next +Auto-merging include/linux/hyperv.h +Auto-merging drivers/hv/vmbus_drv.c +Auto-merging drivers/clocksource/hyperv_timer.c +Auto-merging arch/x86/kernel/cpu/mshyperv.c +Auto-merging arch/x86/include/asm/mshyperv.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/mshyperv.h +Auto-merging arch/x86/hyperv/hv_init.c +Resolved 'arch/x86/include/asm/mshyperv.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 81c798da5d4e] Merge remote-tracking branch 'hyperv/hyperv-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/hyperv/hv_apic.c | 2 + + arch/x86/hyperv/hv_init.c | 104 ++++++++-------- + arch/x86/hyperv/hv_proc.c | 1 - + arch/x86/hyperv/hv_spinlock.c | 8 +- + arch/x86/include/asm/hyperv-tlfs.h | 131 ++++++++++--------- + arch/x86/include/asm/mshyperv.h | 67 ++-------- + arch/x86/kernel/cpu/mshyperv.c | 32 ++--- + drivers/clocksource/hyperv_timer.c | 249 +++++++++++++++++++++++++------------ + drivers/hv/Kconfig | 1 + + drivers/hv/channel.c | 2 +- + drivers/hv/channel_mgmt.c | 7 +- + drivers/hv/connection.c | 2 +- + drivers/hv/hv.c | 94 +++++++++++--- + drivers/hv/hv_balloon.c | 89 +++++++++++++ + drivers/hv/ring_buffer.c | 1 - + drivers/hv/vmbus_drv.c | 89 +++++++++++-- + include/asm-generic/hyperv-tlfs.h | 70 ++++++++++- + include/asm-generic/mshyperv.h | 24 ++-- + include/clocksource/hyperv_timer.h | 3 +- + include/linux/hyperv.h | 8 +- + 20 files changed, 648 insertions(+), 336 deletions(-) +$ git am -3 ../patches/0001-fix-up-for-x86-paravirt-Switch-time-pvops-functions-.patch +Applying: fix up for "x86/paravirt: Switch time pvops functions to use static_call()" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/clocksource/hyperv_timer.c +$ git add -A . +$ git commit -v -a --amend +[master 9456cfdf4862] Merge remote-tracking branch 'hyperv/hyperv-next' + Date: Thu Apr 8 19:10:25 2021 +1000 +Merging auxdisplay/auxdisplay (701454bce906 auxdisplay: Remove in_interrupt() usage.) +$ git merge auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (2bbd9b0f2b4e kernel: debug: Ordinary typo fixes in the file gdbstub.c) +$ git merge kgdb/kgdb/for-next +Auto-merging kernel/debug/kdb/kdb_main.c +Merge made by the 'recursive' strategy. + kernel/debug/gdbstub.c | 4 +- + kernel/debug/kdb/kdb_bp.c | 75 ++++--- + kernel/debug/kdb/kdb_main.c | 446 ++++++++++++++++++++++++----------------- + kernel/debug/kdb/kdb_private.h | 5 +- + kernel/debug/kdb/kdb_support.c | 18 -- + 5 files changed, 313 insertions(+), 235 deletions(-) +Merging hmm/hmm (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge hmm/hmm +Already up to date. +Merging fpga/for-next (a78a51a851ed fpga: dfl: pci: add DID for D5005 PAC cards) +$ git merge fpga/for-next +Auto-merging drivers/fpga/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/fpga/fpga-region.txt | 187 ++++++++++----------- + drivers/fpga/dfl-afu-error.c | 10 +- + drivers/fpga/dfl-afu-main.c | 35 ++-- + drivers/fpga/dfl-afu.h | 2 +- + drivers/fpga/dfl-pci.c | 18 +- + 5 files changed, 127 insertions(+), 125 deletions(-) +Merging kunit/test (a38fd8748464 Linux 5.12-rc2) +$ 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 (f3907773d602 mtd: cfi_cmdset_0002: remove redundant assignment to variable timeo) +$ git merge cfi/cfi/next +Auto-merging drivers/mtd/chips/cfi_cmdset_0002.c +Merge made by the 'recursive' strategy. + drivers/mtd/chips/cfi_cmdset_0002.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) +Merging kunit-next/kunit (de2fcb3e6201 Documentation: kunit: add tips for using current->kunit_test) +$ git merge kunit-next/kunit +Merge made by the 'recursive' strategy. + Documentation/dev-tools/kunit/tips.rst | 78 +++++++++++++++++++++++++++++++++- + include/kunit/test-bug.h | 29 +++++++++++++ + lib/kunit/.kunitconfig | 3 ++ + lib/kunit/assert.c | 61 ++++++++++++++++++-------- + lib/kunit/test.c | 39 +++++++++++++++-- + tools/testing/kunit/kunit.py | 4 +- + tools/testing/kunit/kunit_kernel.py | 2 + + tools/testing/kunit/kunit_tool_test.py | 6 +++ + 8 files changed, 198 insertions(+), 24 deletions(-) + create mode 100644 include/kunit/test-bug.h + create mode 100644 lib/kunit/.kunitconfig +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 (ec32332df764 bus: mhi: core: Sanity check values from remote device before use) +$ git merge mhi/mhi-next +Merge made by the 'recursive' strategy. + drivers/bus/mhi/core/boot.c | 64 +++---- + drivers/bus/mhi/core/debugfs.c | 2 +- + drivers/bus/mhi/core/init.c | 72 ++++--- + drivers/bus/mhi/core/internal.h | 20 +- + drivers/bus/mhi/core/main.c | 404 ++++++++++++++++++++++++++++------------ + drivers/bus/mhi/core/pm.c | 119 +++++++----- + drivers/bus/mhi/pci_generic.c | 281 +++++++++++++++++++++++++--- + include/linux/mhi.h | 26 ++- + 8 files changed, 720 insertions(+), 268 deletions(-) +Merging memblock/for-next (097d43d85704 mm: memblock: remove return value of memblock_free_all()) +$ git merge memblock/for-next +Already up to date. +Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) +$ git merge init/init-user-pointers +Already up to date. +Merging counters/counters (e71ba9452f0b Linux 5.11-rc2) +$ git merge counters/counters +Already up to date. +Merging iomem-mmap-vs-gup/topic/iomem-mmap-vs-gup (5f962ee843e6 mm: unexport follow_pfn) +$ git merge iomem-mmap-vs-gup/topic/iomem-mmap-vs-gup +Auto-merging security/Kconfig +Auto-merging mm/memory.c +Auto-merging include/linux/mm.h +Auto-merging drivers/media/common/videobuf2/frame_vector.c +Merge made by the 'recursive' strategy. + drivers/media/common/videobuf2/frame_vector.c | 2 +- + drivers/media/v4l2-core/videobuf-dma-contig.c | 2 +- + include/linux/mm.h | 4 +-- + mm/memory.c | 46 +++++++++++++++++---------- + mm/nommu.c | 28 ++++++++++++---- + security/Kconfig | 13 ++++++++ + 6 files changed, 68 insertions(+), 27 deletions(-) +Merging rust/rust-next (add74f8473c5 Rust support) +$ git merge rust/rust-next +Auto-merging scripts/kconfig/confdata.c +Auto-merging scripts/Makefile.lib +Auto-merging scripts/Makefile.build +Auto-merging lib/Kconfig.debug +Auto-merging init/Kconfig +Auto-merging Makefile +CONFLICT (content): Merge conflict in Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/index.rst +Auto-merging .gitignore +Resolved 'Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6aa61eea701c] Merge remote-tracking branch 'rust/rust-next' +$ git diff -M --stat --summary HEAD^.. + .gitignore | 2 + + .rustfmt.toml | 12 + + Documentation/doc-guide/kernel-doc.rst | 3 + + Documentation/index.rst | 1 + + Documentation/kbuild/kbuild.rst | 4 + + Documentation/process/changes.rst | 9 + + Documentation/rust/arch-support.rst | 29 ++ + Documentation/rust/coding.rst | 92 +++++ + Documentation/rust/docs.rst | 109 ++++++ + Documentation/rust/index.rst | 20 + + Documentation/rust/quick-start.rst | 199 ++++++++++ + MAINTAINERS | 13 + + Makefile | 147 ++++++- + arch/arm64/rust/target.json | 40 ++ + arch/powerpc/rust/target.json | 30 ++ + arch/x86/rust/target.json | 42 ++ + drivers/char/Kconfig | 12 + + drivers/char/Makefile | 2 + + drivers/char/rust_example.rs | 162 ++++++++ + include/linux/kallsyms.h | 2 +- + include/linux/spinlock.h | 17 +- + init/Kconfig | 27 ++ + kernel/kallsyms.c | 7 + + kernel/livepatch/core.c | 4 +- + lib/Kconfig.debug | 100 +++++ + rust/.gitignore | 5 + + rust/Makefile | 150 ++++++++ + rust/compiler_builtins.rs | 135 +++++++ + rust/exports.c | 17 + + rust/helpers.c | 60 +++ + rust/kernel/allocator.rs | 68 ++++ + rust/kernel/bindings.rs | 21 + + rust/kernel/bindings_helper.h | 16 + + rust/kernel/buffer.rs | 39 ++ + rust/kernel/c_types.rs | 133 +++++++ + rust/kernel/chrdev.rs | 144 +++++++ + rust/kernel/error.rs | 103 +++++ + rust/kernel/file_operations.rs | 523 +++++++++++++++++++++++++ + rust/kernel/lib.rs | 208 ++++++++++ + rust/kernel/miscdev.rs | 98 +++++ + rust/kernel/module_param.rs | 497 ++++++++++++++++++++++++ + rust/kernel/prelude.rs | 18 + + rust/kernel/printk.rs | 85 +++++ + rust/kernel/random.rs | 50 +++ + rust/kernel/static_assert.rs | 38 ++ + rust/kernel/sync/arc.rs | 184 +++++++++ + rust/kernel/sync/condvar.rs | 138 +++++++ + rust/kernel/sync/guard.rs | 82 ++++ + rust/kernel/sync/locked_by.rs | 112 ++++++ + rust/kernel/sync/mod.rs | 68 ++++ + rust/kernel/sync/mutex.rs | 101 +++++ + rust/kernel/sync/spinlock.rs | 108 ++++++ + rust/kernel/sysctl.rs | 185 +++++++++ + rust/kernel/types.rs | 73 ++++ + rust/kernel/user_ptr.rs | 249 ++++++++++++ + rust/module.rs | 676 +++++++++++++++++++++++++++++++++ + scripts/Makefile.build | 19 + + scripts/Makefile.lib | 15 +- + scripts/kallsyms.c | 33 +- + scripts/kconfig/confdata.c | 67 +++- + scripts/rust-version.sh | 31 ++ + tools/include/linux/kallsyms.h | 2 +- + tools/include/linux/lockdep.h | 2 +- + tools/lib/perf/include/perf/event.h | 2 +- + tools/lib/symbol/kallsyms.h | 2 +- + 65 files changed, 5606 insertions(+), 36 deletions(-) + create mode 100644 .rustfmt.toml + create mode 100644 Documentation/rust/arch-support.rst + create mode 100644 Documentation/rust/coding.rst + create mode 100644 Documentation/rust/docs.rst + create mode 100644 Documentation/rust/index.rst + create mode 100644 Documentation/rust/quick-start.rst + create mode 100644 arch/arm64/rust/target.json + create mode 100644 arch/powerpc/rust/target.json + create mode 100644 arch/x86/rust/target.json + create mode 100644 drivers/char/rust_example.rs + create mode 100644 rust/.gitignore + create mode 100644 rust/Makefile + create mode 100644 rust/compiler_builtins.rs + create mode 100644 rust/exports.c + create mode 100644 rust/helpers.c + create mode 100644 rust/kernel/allocator.rs + create mode 100644 rust/kernel/bindings.rs + create mode 100644 rust/kernel/bindings_helper.h + create mode 100644 rust/kernel/buffer.rs + create mode 100644 rust/kernel/c_types.rs + create mode 100644 rust/kernel/chrdev.rs + create mode 100644 rust/kernel/error.rs + create mode 100644 rust/kernel/file_operations.rs + create mode 100644 rust/kernel/lib.rs + create mode 100644 rust/kernel/miscdev.rs + create mode 100644 rust/kernel/module_param.rs + create mode 100644 rust/kernel/prelude.rs + create mode 100644 rust/kernel/printk.rs + create mode 100644 rust/kernel/random.rs + create mode 100644 rust/kernel/static_assert.rs + create mode 100644 rust/kernel/sync/arc.rs + create mode 100644 rust/kernel/sync/condvar.rs + create mode 100644 rust/kernel/sync/guard.rs + create mode 100644 rust/kernel/sync/locked_by.rs + create mode 100644 rust/kernel/sync/mod.rs + create mode 100644 rust/kernel/sync/mutex.rs + create mode 100644 rust/kernel/sync/spinlock.rs + create mode 100644 rust/kernel/sysctl.rs + create mode 100644 rust/kernel/types.rs + create mode 100644 rust/kernel/user_ptr.rs + create mode 100644 rust/module.rs + create mode 100755 scripts/rust-version.sh +Merging akpm-current/current (f47d46143d3f mm-vmalloc-remove-unmap_kernel_range-fix-fix) +$ git merge --no-ff akpm-current/current +Auto-merging tools/scripts/Makefile.include +Auto-merging scripts/checkpatch.pl +Auto-merging net/sunrpc/svc_xprt.c +Auto-merging mm/vmalloc.c +Auto-merging mm/util.c +Auto-merging mm/slub.c +CONFLICT (content): Merge conflict in mm/slub.c +Auto-merging mm/slab_common.c +Auto-merging mm/slab.h +Auto-merging mm/slab.c +Auto-merging mm/oom_kill.c +Auto-merging mm/mmap.c +Auto-merging mm/memory.c +Auto-merging mm/filemap.c +Auto-merging mm/Kconfig +Auto-merging lib/iov_iter.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/watchdog.c +CONFLICT (content): Merge conflict in kernel/watchdog.c +Auto-merging kernel/task_work.c +Auto-merging kernel/sysctl.c +Auto-merging kernel/fork.c +Auto-merging init/main.c +Auto-merging init/Kconfig +CONFLICT (content): Merge conflict in init/Kconfig +Auto-merging include/linux/vmalloc.h +Auto-merging include/linux/smp.h +Auto-merging include/linux/slab.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/cred.h +Auto-merging include/linux/blkdev.h +Auto-merging include/linux/bitmap.h +CONFLICT (content): Merge conflict in include/linux/bitmap.h +Auto-merging fs/proc/proc_sysctl.c +Auto-merging fs/inode.c +Auto-merging fs/gfs2/glock.c +Auto-merging fs/buffer.c +Auto-merging fs/btrfs/reflink.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/compression.c +Auto-merging fs/block_dev.c +Auto-merging drivers/scsi/esas2r/esas2r_main.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/infiniband/core/umem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_mman.c +Auto-merging block/blk-settings.c +CONFLICT (content): Merge conflict in block/blk-settings.c +Auto-merging arch/x86/mm/pat/set_memory.c +Auto-merging arch/x86/mm/init_64.c +CONFLICT (content): Merge conflict in arch/x86/mm/init_64.c +Auto-merging arch/x86/kernel/cpu/resctrl/pseudo_lock.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/riscv/mm/init.c +Auto-merging arch/powerpc/mm/mem.c +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/mips/loongson64/numa.c +Auto-merging arch/microblaze/mm/init.c +Auto-merging arch/arm64/mm/mmu.c +Auto-merging arch/arm64/mm/init.c +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/mm/init.c +Auto-merging arch/Kconfig +Auto-merging Makefile +CONFLICT (content): Merge conflict in Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/filesystems/proc.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +CONFLICT (content): Merge conflict in Documentation/admin-guide/kernel-parameters.txt +Auto-merging .mailmap +Resolved 'Documentation/admin-guide/kernel-parameters.txt' using previous resolution. +Recorded preimage for 'Makefile' +Resolved 'arch/x86/mm/init_64.c' using previous resolution. +Resolved 'block/blk-settings.c' using previous resolution. +Resolved 'include/linux/bitmap.h' using previous resolution. +Recorded preimage for 'init/Kconfig' +Resolved 'kernel/watchdog.c' using previous resolution. +Resolved 'mm/slub.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'Makefile'. +Recorded resolution for 'init/Kconfig'. +[master 28e0332a89f9] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + .mailmap | 1 + + Documentation/ABI/testing/debugfs-moxtet | 4 +- + Documentation/ABI/testing/debugfs-turris-mox-rwtm | 2 +- + Documentation/ABI/testing/sysfs-bus-moxtet-devices | 6 +- + .../testing/sysfs-class-led-driver-turris-omnia | 2 +- + .../ABI/testing/sysfs-firmware-turris-mox-rwtm | 10 +- + Documentation/ABI/testing/sysfs-kernel-mm-cma | 25 + + Documentation/admin-guide/kdump/kdump.rst | 3 +- + Documentation/admin-guide/kernel-parameters.txt | 43 + + Documentation/admin-guide/mm/memory-hotplug.rst | 9 + + Documentation/admin-guide/mm/transhuge.rst | 2 +- + Documentation/admin-guide/mm/userfaultfd.rst | 107 ++- + Documentation/core-api/cachetlb.rst | 4 +- + Documentation/core-api/mm-api.rst | 5 + + Documentation/dev-tools/gdb-kernel-debugging.rst | 2 +- + Documentation/dev-tools/kasan.rst | 345 ++++---- + .../bindings/leds/cznic,turris-omnia-leds.yaml | 2 +- + Documentation/filesystems/proc.rst | 37 +- + Documentation/vm/page_owner.rst | 2 +- + Documentation/vm/transhuge.rst | 5 - + MAINTAINERS | 30 +- + arch/Kconfig | 31 + + arch/alpha/mm/init.c | 1 - + arch/arc/mm/init.c | 1 - + arch/arm/include/asm/pgtable-3level.h | 2 - + arch/arm/include/asm/pgtable.h | 3 + + arch/arm/mm/copypage-v4mc.c | 1 + + arch/arm/mm/copypage-v6.c | 1 + + arch/arm/mm/copypage-xscale.c | 1 + + arch/arm/mm/init.c | 2 - + arch/arm64/Kconfig | 4 + + .../boot/dts/marvell/armada-3720-turris-mox.dts | 2 +- + arch/arm64/include/asm/memory.h | 4 +- + arch/arm64/include/asm/mte-kasan.h | 39 +- + arch/arm64/include/asm/vmalloc.h | 24 + + arch/arm64/kernel/sleep.S | 2 +- + arch/arm64/mm/hugetlbpage.c | 7 +- + arch/arm64/mm/init.c | 4 +- + arch/arm64/mm/mmu.c | 26 - + arch/csky/abiv1/cacheflush.c | 1 + + arch/csky/mm/init.c | 1 - + arch/h8300/mm/init.c | 2 - + arch/hexagon/mm/init.c | 1 - + arch/ia64/Kconfig | 6 +- + arch/ia64/include/asm/pgtable.h | 2 +- + arch/ia64/include/asm/ptrace.h | 8 +- + arch/ia64/kernel/acpi.c | 7 +- + arch/ia64/kernel/efi.c | 11 +- + arch/ia64/kernel/fsys.S | 4 +- + arch/ia64/kernel/head.S | 6 - + arch/ia64/kernel/mca.c | 4 +- + arch/ia64/kernel/pal.S | 6 +- + arch/ia64/mm/hugetlbpage.c | 3 +- + arch/ia64/mm/init.c | 8 +- + arch/m68k/include/asm/bitops.h | 6 +- + arch/m68k/mm/init.c | 1 - + arch/microblaze/mm/init.c | 1 - + arch/mips/loongson64/numa.c | 1 - + arch/mips/mm/cache.c | 1 + + arch/mips/mm/hugetlbpage.c | 4 +- + arch/mips/mm/init.c | 1 - + arch/mips/sgi-ip27/ip27-memory.c | 1 - + arch/nds32/mm/cacheflush.c | 2 +- + arch/nds32/mm/init.c | 1 - + arch/nios2/mm/cacheflush.c | 1 + + arch/nios2/mm/init.c | 1 - + arch/openrisc/mm/init.c | 2 - + arch/parisc/mm/hugetlbpage.c | 2 +- + arch/parisc/mm/init.c | 2 - + arch/powerpc/Kconfig | 7 +- + arch/powerpc/include/asm/vmalloc.h | 20 + + arch/powerpc/kernel/isa-bridge.c | 4 +- + arch/powerpc/kernel/module.c | 22 +- + arch/powerpc/kernel/pci_64.c | 2 +- + arch/powerpc/mm/book3s64/radix_pgtable.c | 21 - + arch/powerpc/mm/hugetlbpage.c | 3 +- + arch/powerpc/mm/ioremap.c | 2 +- + arch/powerpc/mm/mem.c | 1 - + arch/powerpc/sysdev/xive/common.c | 4 - + arch/riscv/mm/init.c | 1 - + arch/s390/mm/hugetlbpage.c | 2 +- + arch/s390/mm/init.c | 2 - + arch/sh/include/asm/bitops.h | 5 +- + arch/sh/include/asm/tlb.h | 10 +- + arch/sh/mm/cache-sh4.c | 1 + + arch/sh/mm/cache-sh7705.c | 1 + + arch/sh/mm/hugetlbpage.c | 2 +- + arch/sh/mm/init.c | 1 - + arch/sparc/include/asm/pgtable_32.h | 3 + + arch/sparc/mm/hugetlbpage.c | 2 +- + arch/sparc/mm/init_32.c | 2 - + arch/sparc/mm/init_64.c | 1 - + arch/sparc/mm/tlb.c | 1 + + arch/um/kernel/mem.c | 1 - + arch/x86/Kconfig | 4 + + arch/x86/include/asm/kfence.h | 7 +- + arch/x86/include/asm/vmalloc.h | 20 + + arch/x86/kernel/acpi/wakeup_64.S | 2 +- + arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 2 +- + arch/x86/mm/init_32.c | 2 - + arch/x86/mm/init_64.c | 205 +++-- + arch/x86/mm/ioremap.c | 19 - + arch/x86/mm/pat/set_memory.c | 8 + + arch/x86/mm/pgtable.c | 13 - + arch/xtensa/mm/init.c | 1 - + block/blk-cgroup.c | 17 +- + block/blk-settings.c | 1 + + drivers/acpi/acpi_memhotplug.c | 5 +- + drivers/base/firmware_loader/main.c | 2 + + drivers/base/memory.c | 20 +- + drivers/block/brd.c | 1 + + drivers/block/loop.c | 1 + + drivers/bus/moxtet.c | 4 +- + drivers/firmware/turris-mox-rwtm.c | 4 +- + drivers/gpio/gpio-moxtet.c | 4 +- + drivers/gpu/drm/i915/Kconfig | 1 + + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 9 +- + drivers/gpu/drm/i915/i915_drv.h | 3 - + drivers/gpu/drm/i915/i915_mm.c | 117 +-- + drivers/infiniband/core/umem.c | 12 +- + drivers/isdn/capi/kcapi_proc.c | 1 + + drivers/leds/leds-turris-omnia.c | 4 +- + drivers/mailbox/armada-37xx-rwtm-mailbox.c | 4 +- + drivers/md/bcache/super.c | 1 + + drivers/net/wireless/intersil/hostap/hostap_proc.c | 1 + + drivers/nvdimm/btt.c | 1 + + drivers/nvdimm/pmem.c | 1 + + drivers/pci/pci.c | 2 +- + drivers/scsi/esas2r/esas2r_main.c | 1 + + drivers/scsi/scsicam.c | 1 + + drivers/watchdog/armada_37xx_wdt.c | 4 +- + fs/aio.c | 14 +- + fs/block_dev.c | 2 +- + fs/btrfs/compression.c | 5 +- + fs/btrfs/extent_io.c | 22 +- + fs/btrfs/inode.c | 33 +- + fs/btrfs/reflink.c | 6 +- + fs/btrfs/zlib.c | 5 +- + fs/btrfs/zstd.c | 5 +- + fs/buffer.c | 92 +- + fs/dax.c | 8 +- + fs/direct-io.c | 5 +- + fs/gfs2/glock.c | 3 +- + fs/hfsplus/catalog.c | 16 +- + fs/hfsplus/dir.c | 4 +- + fs/hfsplus/hfsplus_raw.h | 12 +- + fs/hfsplus/xattr.c | 18 +- + fs/hugetlbfs/inode.c | 6 +- + fs/inode.c | 2 +- + fs/iomap/direct-io.c | 24 +- + fs/ocfs2/aops.c | 11 +- + fs/ocfs2/blockcheck.c | 2 +- + fs/ocfs2/file.c | 11 +- + fs/ocfs2/namei.c | 17 +- + fs/ocfs2/stack_o2cb.c | 36 +- + fs/ocfs2/stackglue.c | 2 +- + fs/proc/base.c | 4 +- + fs/proc/fd.c | 20 +- + fs/proc/generic.c | 13 +- + fs/proc/inode.c | 18 +- + fs/proc/page.c | 40 +- + fs/proc/proc_sysctl.c | 2 +- + fs/proc/task_mmu.c | 3 + + fs/userfaultfd.c | 149 +++- + include/asm-generic/bitops/find.h | 108 ++- + include/asm-generic/bitops/le.h | 38 +- + include/asm-generic/bitsperlong.h | 12 + + include/dt-bindings/bus/moxtet.h | 2 +- + include/linux/align.h | 15 + + include/linux/armada-37xx-rwtm-mailbox.h | 2 +- + include/linux/async.h | 1 - + include/linux/bitmap.h | 11 +- + include/linux/bitops.h | 12 - + include/linux/blkdev.h | 1 - + include/linux/buffer_head.h | 4 + + include/linux/cma.h | 4 +- + include/linux/compaction.h | 1 - + include/linux/compat.h | 1 - + include/linux/compiler-gcc.h | 8 +- + include/linux/crc8.h | 2 +- + include/linux/cred.h | 1 - + include/linux/fs.h | 4 +- + include/linux/gfp.h | 35 +- + include/linux/highmem.h | 35 +- + include/linux/huge_mm.h | 3 - + include/linux/hugetlb.h | 33 +- + include/linux/init_task.h | 1 - + include/linux/initrd.h | 2 + + include/linux/io-mapping.h | 3 + + include/linux/io.h | 9 - + include/linux/kasan.h | 53 +- + include/linux/kernel.h | 9 +- + include/linux/memcontrol.h | 290 ++++--- + include/linux/memory.h | 8 +- + include/linux/memory_hotplug.h | 21 +- + include/linux/memremap.h | 8 +- + include/linux/migrate.h | 7 +- + include/linux/mm.h | 76 +- + include/linux/mmzone.h | 18 +- + include/linux/moxtet.h | 2 +- + include/linux/page-flags-layout.h | 62 +- + include/linux/pagemap.h | 15 + + include/linux/pagewalk.h | 4 +- + include/linux/pgtable.h | 12 + + include/linux/proc_fs.h | 1 + + include/linux/sched.h | 10 +- + include/linux/sched/mm.h | 27 +- + include/linux/shmem_fs.h | 26 +- + include/linux/shrinker.h | 7 +- + include/linux/slab.h | 2 + + include/linux/slub_def.h | 2 + + include/linux/smp.h | 8 + + include/linux/swap.h | 22 + + include/linux/userfaultfd_k.h | 49 +- + include/linux/vm_event_item.h | 8 + + include/linux/vmalloc.h | 65 +- + include/linux/vmstat.h | 24 +- + include/linux/wait.h | 4 +- + include/net/page_pool.h | 2 +- + include/trace/events/cma.h | 68 +- + include/trace/events/kmem.h | 24 +- + include/trace/events/migrate.h | 25 +- + include/trace/events/mmflags.h | 7 + + include/uapi/linux/mempolicy.h | 7 + + include/uapi/linux/userfaultfd.h | 38 +- + init/Kconfig | 17 + + init/initramfs.c | 38 +- + init/main.c | 3 +- + ipc/sem.c | 10 +- + kernel/async.c | 66 +- + kernel/cgroup/cgroup.c | 34 +- + kernel/cgroup/rstat.c | 63 +- + kernel/crash_core.c | 7 + + kernel/cred.c | 2 +- + kernel/dma/remap.c | 1 - + kernel/exit.c | 67 +- + kernel/fork.c | 36 +- + kernel/gcov/Kconfig | 1 + + kernel/gcov/base.c | 49 ++ + kernel/gcov/clang.c | 260 +----- + kernel/gcov/fs.c | 110 +++ + kernel/gcov/gcc_4_7.c | 173 +--- + kernel/gcov/gcov.h | 14 +- + kernel/hung_task.c | 44 + + kernel/kexec_core.c | 4 +- + kernel/kexec_file.c | 4 +- + kernel/kmod.c | 2 +- + kernel/resource.c | 45 +- + kernel/sysctl.c | 10 +- + kernel/task_work.c | 3 + + kernel/umh.c | 2 + + kernel/watchdog.c | 88 +- + lib/Kconfig.debug | 17 +- + lib/Kconfig.kasan | 9 +- + lib/Makefile | 1 + + lib/bch.c | 2 +- + lib/crc8.c | 2 +- + lib/decompress_unlzma.c | 2 +- + lib/find_bit.c | 68 +- + lib/genalloc.c | 7 +- + lib/iov_iter.c | 8 +- + lib/list_sort.c | 2 +- + lib/stackdepot.c | 6 +- + lib/test_kasan.c | 53 +- + lib/test_slub.c | 124 +++ + mm/Kconfig | 23 +- + mm/Makefile | 7 +- + mm/cma.c | 62 +- + mm/cma.h | 25 +- + mm/cma_debug.c | 8 +- + mm/cma_sysfs.c | 112 +++ + mm/compaction.c | 112 ++- + mm/debug_vm_pgtable.c | 4 +- + mm/dmapool.c | 2 +- + mm/filemap.c | 83 +- + mm/frontswap.c | 12 +- + mm/gup.c | 323 ++++--- + mm/gup_test.c | 29 +- + mm/gup_test.h | 3 +- + mm/highmem.c | 11 +- + mm/huge_memory.c | 81 +- + mm/hugetlb.c | 703 ++++++++++----- + mm/hugetlb_cgroup.c | 9 +- + mm/internal.h | 55 +- + mm/interval_tree.c | 2 +- + mm/io-mapping.c | 29 + + mm/ioremap.c | 225 +---- + mm/kasan/common.c | 47 +- + mm/kasan/generic.c | 12 +- + mm/kasan/kasan.h | 23 +- + mm/kasan/report_generic.c | 4 +- + mm/kasan/shadow.c | 10 +- + mm/kasan/sw_tags.c | 2 +- + mm/kfence/core.c | 1 + + mm/khugepaged.c | 63 +- + mm/kmemleak.c | 2 +- + mm/ksm.c | 17 +- + mm/list_lru.c | 6 +- + mm/memcontrol.c | 787 +++++++---------- + mm/memory.c | 145 ++-- + mm/memory_hotplug.c | 171 +++- + mm/mempolicy.c | 88 +- + mm/mempool.c | 6 +- + mm/memremap.c | 22 +- + mm/migrate.c | 91 +- + mm/mlock.c | 4 +- + mm/mm_init.c | 4 - + mm/mmap.c | 24 +- + mm/mremap.c | 6 +- + mm/msync.c | 6 +- + mm/oom_kill.c | 2 +- + mm/page-writeback.c | 9 +- + mm/page_alloc.c | 442 +++++++--- + mm/page_owner.c | 22 +- + mm/page_poison.c | 4 +- + mm/percpu-vm.c | 7 +- + mm/process_vm_access.c | 1 - + mm/shmem.c | 97 +-- + mm/slab.c | 43 +- + mm/slab.h | 24 +- + mm/slab_common.c | 10 +- + mm/slub.c | 213 ++--- + mm/sparse.c | 3 +- + mm/swap.c | 69 +- + mm/swap_state.c | 17 +- + mm/swapfile.c | 4 +- + mm/truncate.c | 19 +- + mm/userfaultfd.c | 62 +- + mm/util.c | 36 +- + mm/vmalloc.c | 591 ++++++++++--- + mm/vmscan.c | 411 ++++++--- + mm/vmstat.c | 35 +- + mm/workingset.c | 1 - + mm/zsmalloc.c | 6 +- + mm/zswap.c | 2 +- + net/core/page_pool.c | 111 ++- + net/sunrpc/svc_xprt.c | 38 +- + samples/vfio-mdev/mdpy.c | 4 +- + scripts/Makefile.kasan | 16 +- + scripts/checkpatch.pl | 11 + + scripts/gdb/linux/cpus.py | 23 +- + scripts/gdb/linux/symbols.py | 3 +- + scripts/spelling.txt | 26 +- + security/Kconfig.hardening | 4 +- + tools/arch/ia64/include/asm/barrier.h | 3 - + tools/include/asm-generic/bitops/find.h | 85 +- + tools/include/asm-generic/bitsperlong.h | 3 + + tools/include/linux/bitmap.h | 18 +- + tools/include/uapi/asm/errno.h | 2 - + tools/lib/bitmap.c | 4 +- + tools/lib/find_bit.c | 56 +- + tools/scripts/Makefile.include | 1 + + tools/testing/selftests/cgroup/test_kmem.c | 22 +- + tools/testing/selftests/kvm/lib/sparsebit.c | 1 - + tools/testing/selftests/mincore/mincore_selftest.c | 1 - + tools/testing/selftests/powerpc/mm/tlbie_test.c | 1 - + tools/testing/selftests/proc/Makefile | 1 + + tools/testing/selftests/proc/proc-subset-pid.c | 121 +++ + tools/testing/selftests/vm/gup_test.c | 36 +- + tools/testing/selftests/vm/mremap_dontunmap.c | 52 ++ + tools/testing/selftests/vm/userfaultfd.c | 962 ++++++++++----------- + 361 files changed, 7227 insertions(+), 4916 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cma + create mode 100644 include/linux/align.h + create mode 100644 lib/test_slub.c + create mode 100644 mm/cma_sysfs.c + create mode 100644 mm/io-mapping.c + create mode 100644 tools/testing/selftests/proc/proc-subset-pid.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/28)
Rebasing (2/28)
Rebasing (3/28)
Rebasing (4/28)
Rebasing (5/28)
Rebasing (6/28)
Rebasing (7/28)
Rebasing (8/28)
Rebasing (9/28)
Rebasing (10/28)
Rebasing (11/28)
Rebasing (12/28)
Rebasing (13/28)
Rebasing (14/28)
Rebasing (15/28)
Rebasing (16/28)
Rebasing (17/28)
Rebasing (18/28)
Rebasing (19/28)
Rebasing (20/28)
Rebasing (21/28)
Rebasing (22/28)
Rebasing (23/28)
Rebasing (24/28)
Rebasing (25/28)
Rebasing (26/28)
Rebasing (27/28)
Rebasing (28/28)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + b5bf0eb83948...9f651e1e639a akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (9f651e1e639a memfd_secret: use unsigned int rather than long as syscall flags type) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + Documentation/admin-guide/devices.txt | 2 +- + arch/alpha/include/asm/io.h | 5 - + arch/arm/configs/dove_defconfig | 1 - + arch/arm/configs/magician_defconfig | 1 - + arch/arm/configs/moxart_defconfig | 1 - + arch/arm/configs/mps2_defconfig | 1 - + arch/arm/configs/mvebu_v5_defconfig | 1 - + arch/arm/configs/xcep_defconfig | 1 - + arch/arm/include/asm/bug.h | 1 + + arch/arm/include/asm/io.h | 5 - + arch/arm/kernel/process.c | 11 + + arch/arm/kernel/traps.c | 1 + + arch/arm64/include/asm/Kbuild | 1 - + arch/arm64/include/asm/cacheflush.h | 6 - + arch/arm64/include/asm/kfence.h | 2 +- + arch/arm64/include/asm/set_memory.h | 17 ++ + arch/arm64/include/uapi/asm/unistd.h | 1 + + arch/arm64/kernel/machine_kexec.c | 1 + + arch/arm64/mm/mmu.c | 6 +- + arch/arm64/mm/pageattr.c | 23 +- + arch/hexagon/configs/comet_defconfig | 1 - + arch/hexagon/include/asm/io.h | 1 - + arch/ia64/include/asm/io.h | 1 - + arch/ia64/include/asm/uaccess.h | 18 -- + arch/m68k/atari/time.c | 7 - + arch/m68k/configs/amcore_defconfig | 1 - + arch/m68k/include/asm/io_mm.h | 5 - + arch/mips/include/asm/io.h | 5 - + arch/openrisc/configs/or1ksim_defconfig | 1 - + arch/parisc/include/asm/io.h | 5 - + arch/parisc/include/asm/pdc_chassis.h | 1 - + arch/powerpc/include/asm/io.h | 5 - + arch/riscv/Kconfig | 4 +- + arch/riscv/include/asm/set_memory.h | 4 +- + arch/riscv/include/asm/unistd.h | 1 + + arch/riscv/mm/pageattr.c | 8 +- + arch/s390/include/asm/io.h | 5 - + arch/sh/configs/edosk7705_defconfig | 1 - + arch/sh/configs/se7206_defconfig | 1 - + arch/sh/configs/sh2007_defconfig | 1 - + arch/sh/configs/sh7724_generic_defconfig | 1 - + arch/sh/configs/sh7770_generic_defconfig | 1 - + arch/sh/configs/sh7785lcr_32bit_defconfig | 1 - + arch/sh/include/asm/io.h | 5 - + arch/sparc/configs/sparc64_defconfig | 1 - + arch/sparc/include/asm/io_64.h | 5 - + arch/um/drivers/cow.h | 7 - + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/include/asm/set_memory.h | 4 +- + arch/x86/mm/pat/set_memory.c | 8 +- + arch/xtensa/configs/xip_kc705_defconfig | 1 - + drivers/auxdisplay/panel.c | 7 - + drivers/char/Kconfig | 10 - + drivers/char/mem.c | 231 ---------------- + drivers/gpu/drm/qxl/qxl_drv.c | 1 - + drivers/media/usb/pwc/pwc-uncompress.c | 3 - + drivers/net/ethernet/adaptec/starfire.c | 8 - + drivers/net/ethernet/amd/atarilance.c | 8 - + drivers/net/ethernet/amd/pcnet32.c | 7 - + .../net/wireless/intersil/orinoco/orinoco_nortel.c | 8 - + .../net/wireless/intersil/orinoco/orinoco_pci.c | 8 - + .../net/wireless/intersil/orinoco/orinoco_plx.c | 8 - + .../net/wireless/intersil/orinoco/orinoco_tmd.c | 8 - + drivers/parport/parport_ip32.c | 12 - + drivers/platform/x86/dell/dell_rbu.c | 3 - + drivers/scsi/53c700.c | 1 - + drivers/scsi/53c700.h | 1 - + drivers/scsi/ch.c | 6 - + drivers/scsi/ips.c | 20 -- + drivers/scsi/ips.h | 20 -- + drivers/scsi/lasi700.c | 1 - + drivers/scsi/megaraid/mbox_defs.h | 2 - + drivers/scsi/megaraid/mega_common.h | 2 - + drivers/scsi/megaraid/megaraid_mbox.c | 2 - + drivers/scsi/megaraid/megaraid_mbox.h | 2 - + drivers/scsi/qla1280.c | 12 - + drivers/scsi/sni_53c710.c | 1 - + drivers/staging/comedi/drivers/ni_routes.c | 1 - + drivers/staging/comedi/drivers/ni_routes.h | 1 - + .../comedi/drivers/ni_routing/ni_device_routes.c | 1 - + .../comedi/drivers/ni_routing/ni_device_routes.h | 1 - + .../drivers/ni_routing/ni_device_routes/all.h | 1 - + .../ni_routing/ni_device_routes/pci-6070e.c | 1 - + .../drivers/ni_routing/ni_device_routes/pci-6220.c | 1 - + .../drivers/ni_routing/ni_device_routes/pci-6221.c | 1 - + .../drivers/ni_routing/ni_device_routes/pci-6229.c | 1 - + .../drivers/ni_routing/ni_device_routes/pci-6251.c | 1 - + .../drivers/ni_routing/ni_device_routes/pci-6254.c | 1 - + .../drivers/ni_routing/ni_device_routes/pci-6259.c | 1 - + .../drivers/ni_routing/ni_device_routes/pci-6534.c | 1 - + .../drivers/ni_routing/ni_device_routes/pci-6602.c | 1 - + .../drivers/ni_routing/ni_device_routes/pci-6713.c | 1 - + .../drivers/ni_routing/ni_device_routes/pci-6723.c | 1 - + .../drivers/ni_routing/ni_device_routes/pci-6733.c | 1 - + .../ni_routing/ni_device_routes/pxi-6030e.c | 1 - + .../drivers/ni_routing/ni_device_routes/pxi-6224.c | 1 - + .../drivers/ni_routing/ni_device_routes/pxi-6225.c | 1 - + .../drivers/ni_routing/ni_device_routes/pxi-6251.c | 1 - + .../drivers/ni_routing/ni_device_routes/pxi-6733.c | 1 - + .../ni_routing/ni_device_routes/pxie-6251.c | 1 - + .../ni_routing/ni_device_routes/pxie-6535.c | 1 - + .../ni_routing/ni_device_routes/pxie-6738.c | 1 - + .../comedi/drivers/ni_routing/ni_route_values.c | 1 - + .../comedi/drivers/ni_routing/ni_route_values.h | 1 - + .../drivers/ni_routing/ni_route_values/all.h | 1 - + .../drivers/ni_routing/ni_route_values/ni_660x.c | 1 - + .../ni_routing/ni_route_values/ni_eseries.c | 1 - + .../ni_routing/ni_route_values/ni_mseries.c | 1 - + .../drivers/ni_routing/tools/convert_c_to_py.c | 1 - + .../drivers/ni_routing/tools/convert_csv_to_c.py | 7 - + .../drivers/ni_routing/tools/convert_py_to_csv.py | 1 - + .../drivers/ni_routing/tools/csv_collection.py | 1 - + .../drivers/ni_routing/tools/make_blank_csv.py | 1 - + .../comedi/drivers/ni_routing/tools/ni_names.py | 1 - + .../staging/comedi/drivers/tests/example_test.c | 1 - + .../staging/comedi/drivers/tests/ni_routes_test.c | 1 - + drivers/staging/comedi/drivers/tests/unittest.h | 1 - + drivers/video/fbdev/matrox/matroxfb_base.c | 9 - + drivers/video/fbdev/vga16fb.c | 10 - + fs/configfs/configfs_internal.h | 4 +- + fs/configfs/dir.c | 4 +- + fs/configfs/file.c | 4 +- + fs/configfs/inode.c | 4 +- + fs/configfs/item.c | 4 +- + fs/configfs/mount.c | 4 +- + fs/configfs/symlink.c | 4 +- + fs/fat/fatent.c | 2 +- + fs/nfs/dir.c | 7 - + fs/nfs/nfs4proc.c | 6 - + fs/nfs/nfs4renewd.c | 6 - + fs/nfs/nfs4state.c | 6 - + fs/nfs/nfs4xdr.c | 6 - + fs/nfsd/nfs4proc.c | 6 - + fs/nfsd/nfs4xdr.c | 6 - + fs/nfsd/xdr4.h | 6 - + fs/ocfs2/acl.c | 4 +- + fs/ocfs2/acl.h | 4 +- + fs/ocfs2/alloc.c | 4 +- + fs/ocfs2/alloc.h | 4 +- + fs/ocfs2/aops.c | 4 +- + fs/ocfs2/aops.h | 4 +- + fs/ocfs2/blockcheck.c | 4 +- + fs/ocfs2/blockcheck.h | 4 +- + fs/ocfs2/buffer_head_io.c | 4 +- + fs/ocfs2/buffer_head_io.h | 4 +- + fs/ocfs2/cluster/heartbeat.c | 4 +- + fs/ocfs2/cluster/heartbeat.h | 4 +- + fs/ocfs2/cluster/masklog.c | 4 +- + fs/ocfs2/cluster/masklog.h | 4 +- + fs/ocfs2/cluster/netdebug.c | 4 +- + fs/ocfs2/cluster/nodemanager.c | 4 +- + fs/ocfs2/cluster/nodemanager.h | 4 +- + fs/ocfs2/cluster/ocfs2_heartbeat.h | 4 +- + fs/ocfs2/cluster/ocfs2_nodemanager.h | 4 +- + fs/ocfs2/cluster/quorum.c | 4 +- + fs/ocfs2/cluster/quorum.h | 4 +- + fs/ocfs2/cluster/sys.c | 4 +- + fs/ocfs2/cluster/sys.h | 4 +- + fs/ocfs2/cluster/tcp.c | 4 +- + fs/ocfs2/cluster/tcp.h | 4 +- + fs/ocfs2/cluster/tcp_internal.h | 4 +- + fs/ocfs2/dcache.c | 4 +- + fs/ocfs2/dcache.h | 4 +- + fs/ocfs2/dir.c | 4 +- + fs/ocfs2/dir.h | 4 +- + fs/ocfs2/dlm/dlmapi.h | 4 +- + fs/ocfs2/dlm/dlmast.c | 4 +- + fs/ocfs2/dlm/dlmcommon.h | 4 +- + fs/ocfs2/dlm/dlmconvert.c | 4 +- + fs/ocfs2/dlm/dlmconvert.h | 4 +- + fs/ocfs2/dlm/dlmdebug.c | 4 +- + fs/ocfs2/dlm/dlmdebug.h | 4 +- + fs/ocfs2/dlm/dlmdomain.c | 4 +- + fs/ocfs2/dlm/dlmdomain.h | 4 +- + fs/ocfs2/dlm/dlmlock.c | 4 +- + fs/ocfs2/dlm/dlmmaster.c | 4 +- + fs/ocfs2/dlm/dlmrecovery.c | 4 +- + fs/ocfs2/dlm/dlmthread.c | 4 +- + fs/ocfs2/dlm/dlmunlock.c | 4 +- + fs/ocfs2/dlmfs/dlmfs.c | 4 +- + fs/ocfs2/dlmfs/userdlm.c | 4 +- + fs/ocfs2/dlmfs/userdlm.h | 4 +- + fs/ocfs2/dlmglue.c | 4 +- + fs/ocfs2/dlmglue.h | 4 +- + fs/ocfs2/export.c | 4 +- + fs/ocfs2/export.h | 4 +- + fs/ocfs2/extent_map.c | 4 +- + fs/ocfs2/extent_map.h | 4 +- + fs/ocfs2/file.c | 4 +- + fs/ocfs2/file.h | 4 +- + fs/ocfs2/filecheck.c | 4 +- + fs/ocfs2/filecheck.h | 4 +- + fs/ocfs2/heartbeat.c | 4 +- + fs/ocfs2/heartbeat.h | 4 +- + fs/ocfs2/inode.c | 4 +- + fs/ocfs2/inode.h | 4 +- + fs/ocfs2/journal.c | 4 +- + fs/ocfs2/journal.h | 4 +- + fs/ocfs2/localalloc.c | 4 +- + fs/ocfs2/localalloc.h | 4 +- + fs/ocfs2/locks.c | 4 +- + fs/ocfs2/locks.h | 4 +- + fs/ocfs2/mmap.c | 4 +- + fs/ocfs2/move_extents.c | 4 +- + fs/ocfs2/move_extents.h | 4 +- + fs/ocfs2/namei.c | 4 +- + fs/ocfs2/namei.h | 4 +- + fs/ocfs2/ocfs1_fs_compat.h | 4 +- + fs/ocfs2/ocfs2.h | 4 +- + fs/ocfs2/ocfs2_fs.h | 4 +- + fs/ocfs2/ocfs2_ioctl.h | 4 +- + fs/ocfs2/ocfs2_lockid.h | 4 +- + fs/ocfs2/ocfs2_lockingver.h | 4 +- + fs/ocfs2/refcounttree.c | 4 +- + fs/ocfs2/refcounttree.h | 4 +- + fs/ocfs2/reservations.c | 4 +- + fs/ocfs2/reservations.h | 4 +- + fs/ocfs2/resize.c | 4 +- + fs/ocfs2/resize.h | 4 +- + fs/ocfs2/slot_map.c | 4 +- + fs/ocfs2/slot_map.h | 4 +- + fs/ocfs2/stack_o2cb.c | 4 +- + fs/ocfs2/stack_user.c | 4 +- + fs/ocfs2/stackglue.c | 4 +- + fs/ocfs2/stackglue.h | 4 +- + fs/ocfs2/suballoc.c | 4 +- + fs/ocfs2/suballoc.h | 4 +- + fs/ocfs2/super.c | 4 +- + fs/ocfs2/super.h | 4 +- + fs/ocfs2/symlink.c | 4 +- + fs/ocfs2/symlink.h | 4 +- + fs/ocfs2/sysfile.c | 4 +- + fs/ocfs2/sysfile.h | 4 +- + fs/ocfs2/uptodate.c | 4 +- + fs/ocfs2/uptodate.h | 4 +- + fs/ocfs2/xattr.c | 4 +- + fs/ocfs2/xattr.h | 4 +- + fs/reiserfs/procfs.c | 10 - + include/asm-generic/io.h | 11 - + include/linux/configfs.h | 4 +- + include/linux/fs.h | 2 +- + include/linux/genl_magic_func.h | 1 - + include/linux/genl_magic_struct.h | 1 - + include/linux/mm.h | 2 +- + include/linux/pgtable.h | 10 +- + include/linux/secretmem.h | 30 +++ + include/linux/set_memory.h | 16 +- + include/linux/syscalls.h | 1 + + include/linux/vmalloc.h | 7 +- + include/uapi/asm-generic/unistd.h | 6 +- + include/uapi/linux/if_bonding.h | 11 - + include/uapi/linux/magic.h | 1 + + include/uapi/linux/nfs4.h | 6 - + include/xen/interface/elfnote.h | 10 - + include/xen/interface/hvm/hvm_vcpu.h | 10 - + include/xen/interface/io/xenbus.h | 10 - + ipc/sem.c | 2 +- + kernel/configs/android-base.config | 1 - + kernel/power/hibernate.c | 5 +- + kernel/power/snapshot.c | 4 +- + kernel/sys.c | 14 +- + kernel/sys_ni.c | 2 + + kernel/umh.c | 6 +- + kernel/up.c | 2 +- + kernel/user_namespace.c | 6 +- + mm/Kconfig | 3 + + mm/Makefile | 1 + + mm/balloon_compaction.c | 4 +- + mm/compaction.c | 4 +- + mm/filemap.c | 2 +- + mm/gup.c | 12 +- + mm/highmem.c | 2 +- + mm/huge_memory.c | 6 +- + mm/hugetlb.c | 6 +- + mm/internal.h | 5 +- + mm/kasan/kasan.h | 8 +- + mm/kasan/quarantine.c | 4 +- + mm/kasan/shadow.c | 4 +- + mm/kfence/report.c | 2 +- + mm/khugepaged.c | 2 +- + mm/ksm.c | 6 +- + mm/madvise.c | 4 +- + mm/memcontrol.c | 18 +- + mm/memory-failure.c | 2 +- + mm/memory.c | 14 +- + mm/mempolicy.c | 4 +- + mm/migrate.c | 8 +- + mm/mlock.c | 3 +- + mm/mmap.c | 9 +- + mm/mprotect.c | 2 +- + mm/mremap.c | 2 +- + mm/nommu.c | 10 - + mm/oom_kill.c | 2 +- + mm/page-writeback.c | 4 +- + mm/page_alloc.c | 14 +- + mm/page_owner.c | 2 +- + mm/percpu-internal.h | 2 +- + mm/percpu.c | 2 +- + mm/pgalloc-track.h | 6 +- + mm/secretmem.c | 261 ++++++++++++++++++ + mm/slab.c | 8 +- + mm/slub.c | 2 +- + mm/swap_slots.c | 2 +- + mm/swap_state.c | 2 +- + mm/vmalloc.c | 129 +-------- + mm/vmstat.c | 2 +- + mm/zpool.c | 2 +- + mm/zsmalloc.c | 2 +- + samples/configfs/configfs_sample.c | 2 - + scripts/checksyscalls.sh | 4 + + scripts/spelling.txt | 3 + + tools/testing/selftests/vm/.gitignore | 1 + + tools/testing/selftests/vm/Makefile | 3 +- + tools/testing/selftests/vm/memfd_secret.c | 296 +++++++++++++++++++++ + tools/testing/selftests/vm/run_vmtests.sh | 17 ++ + tools/usb/hcd-tests.sh | 2 - + 317 files changed, 959 insertions(+), 1293 deletions(-) + create mode 100644 arch/arm64/include/asm/set_memory.h + create mode 100644 include/linux/secretmem.h + create mode 100644 mm/secretmem.c + create mode 100644 tools/testing/selftests/vm/memfd_secret.c diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..4e9aa7efd5c9 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20210408 |